From 732eb3c4ccaac3312fe9334b5d77b3b88140c971 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Fri, 18 Sep 2015 13:46:47 +0000
Subject: [PATCH 001/884] nixos: cleanup version module, allow setting
 nixosVersion with env variable

---
 nixos/modules/misc/version.nix | 48 +++++++++++++++++++---------------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index b4b0281fe587..ee6948db3d3a 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -2,13 +2,21 @@
 
 with lib;
 
+let
+  cfg = config.system;
+
+  releaseFile = "${toString pkgs.path}/.version";
+  suffixFile = "${toString pkgs.path}/.version-suffix";
+  revisionFile = "${toString pkgs.path}/.git-revision";
+in
+
 {
 
-  options = {
+  options.system = {
 
-    system.stateVersion = mkOption {
+    stateVersion = mkOption {
       type = types.str;
-      default = config.system.nixosRelease;
+      default = cfg.nixosRelease;
       description = ''
         Every once in a while, a new NixOS release may change
         configuration defaults in a way incompatible with stateful
@@ -22,38 +30,40 @@ with lib;
       '';
     };
 
-    system.nixosVersion = mkOption {
+    nixosVersion = mkOption {
       internal = true;
       type = types.str;
       description = "NixOS version.";
     };
 
-    system.nixosRelease = mkOption {
+    nixosRelease = mkOption {
       readOnly = true;
       type = types.str;
-      default = readFile "${toString pkgs.path}/.version";
+      default = readFile releaseFile;
       description = "NixOS release.";
     };
 
-    system.nixosVersionSuffix = mkOption {
+    nixosVersionSuffix = mkOption {
       internal = true;
       type = types.str;
+      default = if pathExists suffixFile then readFile suffixFile else "pre-git";
       description = "NixOS version suffix.";
     };
 
-    system.nixosRevision = mkOption {
+    nixosRevision = mkOption {
       internal = true;
       type = types.str;
+      default = if pathExists revisionFile then readFile revisionFile else "master";
       description = "NixOS Git revision hash.";
     };
 
-    system.nixosCodeName = mkOption {
+    nixosCodeName = mkOption {
       readOnly = true;
       type = types.str;
       description = "NixOS release code name.";
     };
 
-    system.defaultChannel = mkOption {
+    defaultChannel = mkOption {
       internal = true;
       type = types.str;
       default = https://nixos.org/channels/nixos-unstable;
@@ -64,18 +74,14 @@ with lib;
 
   config = {
 
-    system.nixosVersion = mkDefault (config.system.nixosRelease + config.system.nixosVersionSuffix);
+    system = {
+      # This is set here rather than up there so that changing this
+      # env variable will not rebuild the manual
+      nixosVersion = mkDefault (maybeEnv "NIXOS_VERSION" (cfg.nixosRelease + cfg.nixosVersionSuffix));
 
-    system.nixosVersionSuffix =
-      let suffixFile = "${toString pkgs.path}/.version-suffix"; in
-      mkDefault (if pathExists suffixFile then readFile suffixFile else "pre-git");
-
-    system.nixosRevision =
-      let fn = "${toString pkgs.path}/.git-revision"; in
-      mkDefault (if pathExists fn then readFile fn else "master");
-
-    # Note: code names must only increase in alphabetical order.
-    system.nixosCodeName = "Emu";
+      # Note: code names must only increase in alphabetical order.
+      nixosCodeName = "Emu";
+    };
 
     # Generate /etc/os-release.  See
     # http://0pointer.de/public/systemd-man/os-release.html for the

From 42b586e5df14c1d6f95faf90f8f653f03b4c588a Mon Sep 17 00:00:00 2001
From: Christian Zagrodnick <cz@flyingcircus.io>
Date: Wed, 2 Dec 2015 09:08:18 +0100
Subject: [PATCH 002/884] pythonPackage shortuuid: init at 0.4.2

---
 lib/maintainers.nix                |  1 +
 pkgs/top-level/python-packages.nix | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index e0d5b478e86c..10a503268210 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -326,6 +326,7 @@
   wyvie = "Elijah Rum <elijahrum@gmail.com>";
   yarr = "Dmitry V. <savraz@gmail.com>";
   z77z = "Marco Maggesi <maggesi@math.unifi.it>";
+  zagy = "Christian Zagrodnick <cz@flyingcircus.io>";
   zef = "Zef Hemel <zef@zef.me>";
   zimbatm = "zimbatm <zimbatm@zimbatm.com>";
   zoomulator = "Kim Simmons <zoomulator@gmail.com>";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 433fb88ee2b1..c79ceaf77246 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17296,6 +17296,28 @@ in modules // {
   };
 
 
+  shortuuid = buildPythonPackage rec {
+    name = "shortuuid-${version}";
+    version = "0.4.2";
+
+    disabled = isPy26;
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/s/shortuuid/${name}.tar.gz";
+      md5 = "142e3ae4e7cd32d41a71deb359db4cfe";
+    };
+
+    buildInputs = with self; [pep8];
+
+    meta = {
+      description = "A generator library for concise, unambiguous and URL-safe UUIDs.";
+      homepage = https://github.com/stochastic-technologies/shortuuid/;
+      license = licenses.bsd3;
+      maintainers = with maintainers; [ zagy ];
+    };
+  };
+
+
   simplejson = buildPythonPackage (rec {
     name = "simplejson-3.3.0";
 

From 230898ceb2e85ae11dbead2430a829babe2ab452 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 15 Dec 2015 16:46:37 +0300
Subject: [PATCH 003/884] chrootenv-user: don't unshare user namespace if we
 are root

---
 .../build-fhs-userenv/chroot-user.rb          | 39 ++++++++++++-------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/pkgs/build-support/build-fhs-userenv/chroot-user.rb b/pkgs/build-support/build-fhs-userenv/chroot-user.rb
index 97316ac43695..250e6a908434 100755
--- a/pkgs/build-support/build-fhs-userenv/chroot-user.rb
+++ b/pkgs/build-support/build-fhs-userenv/chroot-user.rb
@@ -53,6 +53,7 @@ $unshare = make_fcall 'unshare', [Fiddle::TYPE_INT], Fiddle::TYPE_INT
 
 MS_BIND = 0x1000
 MS_REC  = 0x4000
+MS_SLAVE  = 0x80000
 $mount = make_fcall 'mount', [Fiddle::TYPE_VOIDP,
                               Fiddle::TYPE_VOIDP,
                               Fiddle::TYPE_VOIDP,
@@ -92,23 +93,31 @@ root = Dir.mktmpdir 'chrootenv'
 # we don't use threads at all.
 $cpid = $fork.call
 if $cpid == 0
-  # Save user UID and GID
-  uid = Process.uid
-  gid = Process.gid
+  # If we are root, no need to create new user namespace.
+  if Process.uid == 0
+    $unshare.call CLONE_NEWNS
+    # Mark all mounted filesystems as slave so changes
+    # don't propagate to the parent mount namespace.
+    $mount.call nil, '/', nil, MS_REC | MS_SLAVE, nil
+  else
+    # Save user UID and GID
+    uid = Process.uid
+    gid = Process.gid
 
-  # Create new mount and user namespaces
-  # CLONE_NEWUSER requires a program to be non-threaded, hence
-  # native fork above.
-  $unshare.call CLONE_NEWNS | CLONE_NEWUSER
+    # Create new mount and user namespaces
+    # CLONE_NEWUSER requires a program to be non-threaded, hence
+    # native fork above.
+    $unshare.call CLONE_NEWNS | CLONE_NEWUSER
 
-  # Map users and groups to the parent namespace
-  begin
-    # setgroups is only available since Linux 3.19
-    write_file '/proc/self/setgroups', 'deny'
-  rescue
+    # Map users and groups to the parent namespace
+    begin
+      # setgroups is only available since Linux 3.19
+      write_file '/proc/self/setgroups', 'deny'
+    rescue
+    end
+    write_file '/proc/self/uid_map', "#{uid} #{uid} 1"
+    write_file '/proc/self/gid_map', "#{gid} #{gid} 1"
   end
-  write_file '/proc/self/uid_map', "#{uid} #{uid} 1"
-  write_file '/proc/self/gid_map', "#{gid} #{gid} 1"
 
   # Do rbind mounts.
   mounts.each do |from, rto|
@@ -117,6 +126,8 @@ if $cpid == 0
     $mount.call from, to, nil, MS_BIND | MS_REC, nil
   end
 
+  # Don't make root private so privilege drops inside chroot are possible
+  File.chmod(0755, root)
   # Chroot!
   Dir.chroot root
   Dir.chdir '/'

From d6c1150195817427dffa57740d183a3286e2a0f4 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 15 Dec 2015 21:31:12 +0300
Subject: [PATCH 004/884] chrootenv: symlink su and sudo stuff

---
 pkgs/build-support/build-fhs-chrootenv/env.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/build-support/build-fhs-chrootenv/env.nix b/pkgs/build-support/build-fhs-chrootenv/env.nix
index c00d3865afab..610f450cfebd 100644
--- a/pkgs/build-support/build-fhs-chrootenv/env.nix
+++ b/pkgs/build-support/build-fhs-chrootenv/env.nix
@@ -81,6 +81,11 @@ let
       ln -s /host-etc/resolv.conf resolv.conf
       ln -s /host-etc/nsswitch.conf nsswitch.conf
 
+      # symlink sudo and su stuff
+      ln -s /host-etc/login.defs login.defs
+      ln -s /host-etc/sudoers sudoers
+      ln -s /host-etc/sudoers.d sudoers.d
+
       # symlink other core stuff
       ln -s /host-etc/localtime localtime
       ln -s /host-etc/machine-id machine-id

From ed4219964d9974aec463070bb639f7013d1ffedf Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 15 Dec 2015 21:32:32 +0300
Subject: [PATCH 005/884] chrootenv: add setuid wrappers to path

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

diff --git a/pkgs/build-support/build-fhs-chrootenv/env.nix b/pkgs/build-support/build-fhs-chrootenv/env.nix
index 610f450cfebd..d28773f00ace 100644
--- a/pkgs/build-support/build-fhs-chrootenv/env.nix
+++ b/pkgs/build-support/build-fhs-chrootenv/env.nix
@@ -56,7 +56,7 @@ let
     export PS1='${name}-chrootenv:\u@\h:\w\$ '
     export LOCALE_ARCHIVE='/usr/lib/locale/locale-archive'
     export LD_LIBRARY_PATH='/run/opengl-driver/lib:/run/opengl-driver-32/lib:/usr/lib:/usr/lib32'
-    export PATH='/usr/bin:/usr/sbin'
+    export PATH='/var/setuid-wrappers:/usr/bin:/usr/sbin'
     ${profile}
   '';
 

From 9a82dd87f7bfa6be85ecd70e118811accdd04a4d Mon Sep 17 00:00:00 2001
From: Svein Ove Aas <sveina@gmail.com>
Date: Wed, 23 Dec 2015 00:29:47 +0100
Subject: [PATCH 006/884] zfs:Add zfs.devNodes option for zpool import -d

---
 nixos/modules/tasks/filesystems/zfs.nix | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index dedd3f5ca451..14c6b05f95c7 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -73,6 +73,21 @@ in
         '';
       };
 
+      devNodes = mkOption {
+        type = types.path;
+        default = "/dev";
+        example = "/dev/disk/by-id";
+        description = ''
+          Name of directory from which to import ZFS devices.
+
+          Usually /dev works. However, ZFS import may fail if a device node is renamed.
+          It should therefore use stable device names, such as from /dev/disk/by-id.
+
+          The default remains /dev for 15.09, due to backwards compatibility concerns.
+          It will change to /dev/disk/by-id in the next NixOS release.
+        '';
+      };
+
       forceImportRoot = mkOption {
         type = types.bool;
         default = true;
@@ -214,7 +229,7 @@ in
             done
             ''] ++ (map (pool: ''
             echo "importing root ZFS pool \"${pool}\"..."
-            zpool import -d /dev/disk/by-id -N $ZFS_FORCE "${pool}"
+            zpool import -d ${cfgZfs.devNodes} -N $ZFS_FORCE "${pool}"
         '') rootPools));
       };
 
@@ -255,7 +270,7 @@ in
             };
             script = ''
               zpool_cmd="${zfsUserPkg}/sbin/zpool"
-              ("$zpool_cmd" list "${pool}" >/dev/null) || "$zpool_cmd" import -d /dev/disk/by-id -N ${optionalString cfgZfs.forceImportAll "-f"} "${pool}"
+              ("$zpool_cmd" list "${pool}" >/dev/null) || "$zpool_cmd" import -d ${cfgZfs.devNodes} -N ${optionalString cfgZfs.forceImportAll "-f"} "${pool}"
             '';
           };
       in listToAttrs (map createImportService dataPools) // {

From 7688206a0bfaddf950a1fb85b84fabdc1232e7f8 Mon Sep 17 00:00:00 2001
From: Svein Ove Aas <sveina@gmail.com>
Date: Wed, 23 Dec 2015 00:33:06 +0100
Subject: [PATCH 007/884] zfs:Change default for -d to /dev/disk/by-id

---
 nixos/modules/tasks/filesystems/zfs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index 14c6b05f95c7..f4c42b162206 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -75,7 +75,7 @@ in
 
       devNodes = mkOption {
         type = types.path;
-        default = "/dev";
+        default = "/dev/disk/by-id";
         example = "/dev/disk/by-id";
         description = ''
           Name of directory from which to import ZFS devices.

From 873a9202f65d5cdcf80307e5f8f3e6dd5c341fe1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 23 Dec 2015 23:58:42 +0100
Subject: [PATCH 008/884] nixos/neo4j: rename 'host' to 'listenAddress'

More descriptive option name.
---
 nixos/modules/rename.nix                   | 2 ++
 nixos/modules/services/databases/neo4j.nix | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 28ac1c3e888a..26b7c9af53cf 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -14,6 +14,8 @@ with lib;
     (mkRenamedOptionModule [ "networking" "enableWLAN" ] [ "networking" "wireless" "enable" ])
     (mkRenamedOptionModule [ "networking" "enableRT73Firmware" ] [ "networking" "enableRalinkFirmware" ])
 
+    (mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "listenAddress" ])
+
     # Old Grub-related options.
     (mkRenamedOptionModule [ "boot" "initrd" "extraKernelModules" ] [ "boot" "initrd" "kernelModules" ])
     (mkRenamedOptionModule [ "boot" "extraKernelParams" ] [ "boot" "kernelParams" ])
diff --git a/nixos/modules/services/databases/neo4j.nix b/nixos/modules/services/databases/neo4j.nix
index 3cf22db7da2b..1413839ce220 100644
--- a/nixos/modules/services/databases/neo4j.nix
+++ b/nixos/modules/services/databases/neo4j.nix
@@ -7,7 +7,7 @@ let
 
   serverConfig = pkgs.writeText "neo4j-server.properties" ''
     org.neo4j.server.database.location=${cfg.dataDir}/data/graph.db
-    org.neo4j.server.webserver.address=${cfg.host}
+    org.neo4j.server.webserver.address=${cfg.listenAddress}
     org.neo4j.server.webserver.port=${toString cfg.port}
     ${optionalString cfg.enableHttps ''
       org.neo4j.server.webserver.https.enabled=true
@@ -52,7 +52,7 @@ in {
       type = types.package;
     };
 
-    host = mkOption {
+    listenAddress = mkOption {
       description = "Neo4j listen address.";
       default = "127.0.0.1";
       type = types.str;

From 79367816a965c3aed93b9fd52658469ad818f82c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 24 Dec 2015 00:04:04 +0100
Subject: [PATCH 009/884] nixos/mpd: rename 'host' to 'listenAddress'

More descriptive option name.
---
 nixos/modules/rename.nix             | 1 +
 nixos/modules/services/audio/mpd.nix | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 26b7c9af53cf..57f86b4812f4 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -14,6 +14,7 @@ with lib;
     (mkRenamedOptionModule [ "networking" "enableWLAN" ] [ "networking" "wireless" "enable" ])
     (mkRenamedOptionModule [ "networking" "enableRT73Firmware" ] [ "networking" "enableRalinkFirmware" ])
 
+    (mkRenamedOptionModule [ "services" "mpd" "network" "host" ] [ "services" "mpd" "network" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "listenAddress" ])
 
     # Old Grub-related options.
diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix
index 5515f827b290..5d5fef667941 100644
--- a/nixos/modules/services/audio/mpd.nix
+++ b/nixos/modules/services/audio/mpd.nix
@@ -18,7 +18,7 @@ let
     user                "${cfg.user}"
     group               "${cfg.group}"
 
-    ${optionalString (cfg.network.host != "any") ''bind_to_address "${cfg.network.host}"''}
+    ${optionalString (cfg.network.listenAddress != "any") ''bind_to_address "${cfg.network.listenAddress}"''}
     ${optionalString (cfg.network.port != 6600)  ''port "${toString cfg.network.port}"''}
 
     ${cfg.extraConfig}
@@ -75,7 +75,7 @@ in {
 
       network = {
 
-        host = mkOption {
+        listenAddress = mkOption {
           default = "any";
           description = ''
             This setting sets the address for the daemon to listen on. Careful attention

From e0b0b9723c282c6fc181a4428dcbb121a180d631 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 24 Dec 2015 00:06:40 +0100
Subject: [PATCH 010/884] nixos/docker-registry: rename 'host' to
 'listenAddress'

More descriptive option name.
---
 nixos/modules/rename.nix                        | 1 +
 nixos/modules/services/misc/docker-registry.nix | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 57f86b4812f4..b099a528d9b6 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -14,6 +14,7 @@ with lib;
     (mkRenamedOptionModule [ "networking" "enableWLAN" ] [ "networking" "wireless" "enable" ])
     (mkRenamedOptionModule [ "networking" "enableRT73Firmware" ] [ "networking" "enableRalinkFirmware" ])
 
+    (mkRenamedOptionModule [ "services" "dockerRegistry" "host" ] [ "services" "dockerRegistry" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "mpd" "network" "host" ] [ "services" "mpd" "network" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "listenAddress" ])
 
diff --git a/nixos/modules/services/misc/docker-registry.nix b/nixos/modules/services/misc/docker-registry.nix
index f472e530a70b..0a0e160a7cc3 100644
--- a/nixos/modules/services/misc/docker-registry.nix
+++ b/nixos/modules/services/misc/docker-registry.nix
@@ -15,7 +15,7 @@ in {
       type = types.bool;
     };
 
-    host = mkOption {
+    listenAddress = mkOption {
       description = "Docker registry host or ip to bind to.";
       default = "127.0.0.1";
       type = types.str;
@@ -50,7 +50,7 @@ in {
       after = [ "network.target" ];
 
       environment = {
-        REGISTRY_HOST = cfg.host;
+        REGISTRY_HOST = cfg.listenAddress;
         REGISTRY_PORT = toString cfg.port;
         GUNICORN_OPTS = "[--preload]"; # see https://github.com/docker/docker-registry#sqlalchemy
         STORAGE_PATH = cfg.storagePath;
@@ -65,7 +65,7 @@ in {
       };
 
       postStart = ''
-        until ${pkgs.curl}/bin/curl -s -o /dev/null 'http://${cfg.host}:${toString cfg.port}/'; do
+        until ${pkgs.curl}/bin/curl -s -o /dev/null 'http://${cfg.listenAddress}:${toString cfg.port}/'; do
           sleep 1;
         done
       '';

From 6b10df7eaa28e7f1d107603f9e252bc6f1f78acd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 24 Dec 2015 00:13:15 +0100
Subject: [PATCH 011/884] nixos/subsonic: rename 'host' to 'listenAddress'

More descriptive option name.
---
 nixos/modules/rename.nix                 | 1 +
 nixos/modules/services/misc/subsonic.nix | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index b099a528d9b6..c9e91cca2ec5 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -17,6 +17,7 @@ with lib;
     (mkRenamedOptionModule [ "services" "dockerRegistry" "host" ] [ "services" "dockerRegistry" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "mpd" "network" "host" ] [ "services" "mpd" "network" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "listenAddress" ])
+    (mkRenamedOptionModule [ "services" "subsonic" "host" ] [ "services" "subsonic" "listenAddress" ])
 
     # Old Grub-related options.
     (mkRenamedOptionModule [ "boot" "initrd" "extraKernelModules" ] [ "boot" "initrd" "kernelModules" ])
diff --git a/nixos/modules/services/misc/subsonic.nix b/nixos/modules/services/misc/subsonic.nix
index 4d164ad8d65f..2831e95b9480 100644
--- a/nixos/modules/services/misc/subsonic.nix
+++ b/nixos/modules/services/misc/subsonic.nix
@@ -21,7 +21,7 @@ in
         '';
       };
 
-      host = mkOption {
+      listenAddress = mkOption {
         type = types.string;
         default = "0.0.0.0";
         description = ''
@@ -115,7 +115,7 @@ in
         ExecStart = ''
           ${pkgs.jre}/bin/java -Xmx${toString cfg.maxMemory}m \
             -Dsubsonic.home=${cfg.home} \
-            -Dsubsonic.host=${cfg.host} \
+            -Dsubsonic.host=${cfg.listenAddress} \
             -Dsubsonic.port=${toString cfg.port} \
             -Dsubsonic.httpsPort=${toString cfg.httpsPort} \
             -Dsubsonic.contextPath=${cfg.contextPath} \

From 38ca880612ff37695659b8b56af70553b2193f5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 24 Dec 2015 00:14:40 +0100
Subject: [PATCH 012/884] nixos/cadvisor: rename 'host' to 'listenAddress'

More descriptive option name.
---
 nixos/modules/rename.nix                       | 1 +
 nixos/modules/services/monitoring/cadvisor.nix | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index c9e91cca2ec5..6522cc240bb6 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -14,6 +14,7 @@ with lib;
     (mkRenamedOptionModule [ "networking" "enableWLAN" ] [ "networking" "wireless" "enable" ])
     (mkRenamedOptionModule [ "networking" "enableRT73Firmware" ] [ "networking" "enableRalinkFirmware" ])
 
+    (mkRenamedOptionModule [ "services" "cadvisor" "host" ] [ "services" "cadvisor" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "dockerRegistry" "host" ] [ "services" "dockerRegistry" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "mpd" "network" "host" ] [ "services" "mpd" "network" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "listenAddress" ])
diff --git a/nixos/modules/services/monitoring/cadvisor.nix b/nixos/modules/services/monitoring/cadvisor.nix
index b6cf397f35c0..425e0ee9230f 100644
--- a/nixos/modules/services/monitoring/cadvisor.nix
+++ b/nixos/modules/services/monitoring/cadvisor.nix
@@ -14,7 +14,7 @@ in {
         description = "Whether to enable cadvisor service.";
       };
 
-      host = mkOption {
+      listenAddress = mkOption {
         default = "127.0.0.1";
         type = types.str;
         description = "Cadvisor listening host";
@@ -71,7 +71,7 @@ in {
       after = [ "network.target" "docker.service" "influxdb.service" ];
 
       postStart = mkBefore ''
-        until ${pkgs.curl}/bin/curl -s -o /dev/null 'http://${cfg.host}:${toString cfg.port}/containers/'; do
+        until ${pkgs.curl}/bin/curl -s -o /dev/null 'http://${cfg.listenAddress}:${toString cfg.port}/containers/'; do
           sleep 1;
         done
       '';
@@ -79,7 +79,7 @@ in {
       serviceConfig = {
         ExecStart = ''${pkgs.cadvisor}/bin/cadvisor \
           -logtostderr=true \
-          -listen_ip=${cfg.host} \
+          -listen_ip=${cfg.listenAddress} \
           -port=${toString cfg.port} \
           ${optionalString (cfg.storageDriver != null) ''
             -storage_driver ${cfg.storageDriver} \

From 8b9f3c8c35eb3d8c85cf168618b264c76bca687b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 24 Dec 2015 00:20:39 +0100
Subject: [PATCH 013/884] nixos/graphite: rename 'host' to 'listenAddress'

More descriptive option name.
---
 nixos/modules/rename.nix                       |  2 ++
 nixos/modules/services/monitoring/graphite.nix | 12 ++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 6522cc240bb6..88d33aac7d0d 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -16,6 +16,8 @@ with lib;
 
     (mkRenamedOptionModule [ "services" "cadvisor" "host" ] [ "services" "cadvisor" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "dockerRegistry" "host" ] [ "services" "dockerRegistry" "listenAddress" ])
+    (mkRenamedOptionModule [ "services" "graphite" "api" "host" ] [ "services" "graphite" "api" "listenAddress" ])
+    (mkRenamedOptionModule [ "services" "graphite" "web" "host" ] [ "services" "graphite" "web" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "mpd" "network" "host" ] [ "services" "mpd" "network" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "subsonic" "host" ] [ "services" "subsonic" "listenAddress" ])
diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix
index 57abb959fdb7..c4ccde5d528d 100644
--- a/nixos/modules/services/monitoring/graphite.nix
+++ b/nixos/modules/services/monitoring/graphite.nix
@@ -77,7 +77,7 @@ in {
         type = types.bool;
       };
 
-      host = mkOption {
+      listenAddress = mkOption {
         description = "Graphite web frontend listen address.";
         default = "127.0.0.1";
         type = types.str;
@@ -121,7 +121,7 @@ in {
         type = types.listOf types.str;
       };
 
-      host = mkOption {
+      listenAddress = mkOption {
         description = "Graphite web service listen address.";
         default = "127.0.0.1";
         type = types.str;
@@ -292,7 +292,7 @@ in {
       };
 
       graphiteUrl = mkOption {
-        default = "http://${cfg.web.host}:${toString cfg.web.port}";
+        default = "http://${cfg.web.listenAddress}:${toString cfg.web.port}";
         description = "Host where graphite service runs.";
         type = types.str;
       };
@@ -337,7 +337,7 @@ in {
 
       graphiteUrl = mkOption {
         description = "URL to your graphite service.";
-        default = "http://${cfg.web.host}:${toString cfg.web.port}";
+        default = "http://${cfg.web.listenAddress}:${toString cfg.web.port}";
         type = types.str;
       };
 
@@ -452,7 +452,7 @@ in {
         serviceConfig = {
           ExecStart = ''
             ${pkgs.python27Packages.waitress}/bin/waitress-serve \
-            --host=${cfg.web.host} --port=${toString cfg.web.port} \
+            --host=${cfg.web.listenAddress} --port=${toString cfg.web.port} \
             --call django.core.handlers.wsgi:WSGIHandler'';
           User = "graphite";
           Group = "graphite";
@@ -494,7 +494,7 @@ in {
         serviceConfig = {
           ExecStart = ''
             ${pkgs.python27Packages.waitress}/bin/waitress-serve \
-            --host=${cfg.api.host} --port=${toString cfg.api.port} \
+            --host=${cfg.api.listenAddress} --port=${toString cfg.api.port} \
             graphite_api.app:app
           '';
           User = "graphite";

From 19aed49163da022eb0d7b6820bf19097fefa2dc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 24 Dec 2015 00:20:56 +0100
Subject: [PATCH 014/884] nixos/statsd: rename 'host' to 'listenAddress'

More descriptive option name.
---
 nixos/modules/rename.nix                     | 1 +
 nixos/modules/services/monitoring/statsd.nix | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 88d33aac7d0d..87aa25f883fc 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -20,6 +20,7 @@ with lib;
     (mkRenamedOptionModule [ "services" "graphite" "web" "host" ] [ "services" "graphite" "web" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "mpd" "network" "host" ] [ "services" "mpd" "network" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "listenAddress" ])
+    (mkRenamedOptionModule [ "services" "statsd" "host" ] [ "services" "statsd" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "subsonic" "host" ] [ "services" "subsonic" "listenAddress" ])
 
     # Old Grub-related options.
diff --git a/nixos/modules/services/monitoring/statsd.nix b/nixos/modules/services/monitoring/statsd.nix
index 39fabc27d6c8..df2adb9f2766 100644
--- a/nixos/modules/services/monitoring/statsd.nix
+++ b/nixos/modules/services/monitoring/statsd.nix
@@ -11,7 +11,7 @@ let
 
   configFile = pkgs.writeText "statsd.conf" ''
     {
-      address: "${cfg.host}",
+      address: "${cfg.listenAddress}",
       port: "${toString cfg.port}",
       mgmt_address: "${cfg.mgmt_address}",
       mgmt_port: "${toString cfg.mgmt_port}",
@@ -48,7 +48,7 @@ in
       type = types.bool;
     };
 
-    host = mkOption {
+    listenAddress = mkOption {
       description = "Address that statsd listens on over UDP";
       default = "127.0.0.1";
       type = types.str;

From 6c2fc3a5ac7e059cefa2cd0248acc9a2cb88be79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 24 Dec 2015 00:22:47 +0100
Subject: [PATCH 015/884] nixos/shout: rename 'host' to 'listenAddress'

More descriptive option name.
---
 nixos/modules/rename.nix                    | 1 +
 nixos/modules/services/networking/shout.nix | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 87aa25f883fc..266aa13e60b3 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -20,6 +20,7 @@ with lib;
     (mkRenamedOptionModule [ "services" "graphite" "web" "host" ] [ "services" "graphite" "web" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "mpd" "network" "host" ] [ "services" "mpd" "network" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "listenAddress" ])
+    (mkRenamedOptionModule [ "services" "shout" "host" ] [ "services" "shout" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "statsd" "host" ] [ "services" "statsd" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "subsonic" "host" ] [ "services" "subsonic" "listenAddress" ])
 
diff --git a/nixos/modules/services/networking/shout.nix b/nixos/modules/services/networking/shout.nix
index fe3cba8f1492..f069fe7bec96 100644
--- a/nixos/modules/services/networking/shout.nix
+++ b/nixos/modules/services/networking/shout.nix
@@ -19,7 +19,7 @@ in {
       '';
     };
 
-    host = mkOption {
+    listenAddress = mkOption {
       type = types.string;
       default = "0.0.0.0";
       description = "IP interface to listen on for http connections.";
@@ -66,7 +66,7 @@ in {
         "${pkgs.shout}/bin/shout"
         (if cfg.private then "--private" else "--public")
         "--port" (toString cfg.port)
-        "--host" (toString cfg.host)
+        "--host" (toString cfg.listenAddress)
         "--home" shoutHome
       ];
       serviceConfig = {

From 46924e77a2c1c9bf0f018a8dc9d878958e243d20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 24 Dec 2015 00:23:51 +0100
Subject: [PATCH 016/884] nixos/sslh: rename 'host' to 'listenAddress'

More descriptive option name.
---
 nixos/modules/rename.nix                   | 1 +
 nixos/modules/services/networking/sslh.nix | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 266aa13e60b3..f406c29753f0 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -21,6 +21,7 @@ with lib;
     (mkRenamedOptionModule [ "services" "mpd" "network" "host" ] [ "services" "mpd" "network" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "shout" "host" ] [ "services" "shout" "listenAddress" ])
+    (mkRenamedOptionModule [ "services" "sslh" "host" ] [ "services" "sslh" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "statsd" "host" ] [ "services" "statsd" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "subsonic" "host" ] [ "services" "subsonic" "listenAddress" ])
 
diff --git a/nixos/modules/services/networking/sslh.nix b/nixos/modules/services/networking/sslh.nix
index c87fe914df8b..bd584a3a85d3 100644
--- a/nixos/modules/services/networking/sslh.nix
+++ b/nixos/modules/services/networking/sslh.nix
@@ -16,7 +16,7 @@ let
 
     listen:
     (
-      { host: "${cfg.host}"; port: "${toString cfg.port}"; }
+      { host: "${cfg.listenAddress}"; port: "${toString cfg.port}"; }
     );
 
     ${cfg.appendConfig}
@@ -56,7 +56,7 @@ in
         description = "PID file path for sslh daemon.";
       };
 
-      host = mkOption {
+      listenAddress = mkOption {
         type = types.str;
         default = config.networking.hostName;
         description = "Listening hostname.";

From 7334ecd41a62c59299598ab89f92ad1b56abecb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 24 Dec 2015 00:28:09 +0100
Subject: [PATCH 017/884] nixos/elasticsearch: rename 'host' to 'listenAddress'

More descriptive option name.
---
 nixos/modules/rename.nix                        | 1 +
 nixos/modules/services/search/elasticsearch.nix | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index f406c29753f0..2e1a264263fe 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -16,6 +16,7 @@ with lib;
 
     (mkRenamedOptionModule [ "services" "cadvisor" "host" ] [ "services" "cadvisor" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "dockerRegistry" "host" ] [ "services" "dockerRegistry" "listenAddress" ])
+    (mkRenamedOptionModule [ "services" "elasticsearch" "host" ] [ "services" "elasticsearch" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "graphite" "api" "host" ] [ "services" "graphite" "api" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "graphite" "web" "host" ] [ "services" "graphite" "web" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "mpd" "network" "host" ] [ "services" "mpd" "network" "listenAddress" ])
diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix
index 3436bd01d848..b3f0a5251d71 100644
--- a/nixos/modules/services/search/elasticsearch.nix
+++ b/nixos/modules/services/search/elasticsearch.nix
@@ -6,7 +6,7 @@ let
   cfg = config.services.elasticsearch;
 
   esConfig = ''
-    network.host: ${cfg.host}
+    network.host: ${cfg.listenAddress}
     network.port: ${toString cfg.port}
     network.tcp.port: ${toString cfg.tcp_port}
     cluster.name: ${cfg.cluster_name}
@@ -43,7 +43,7 @@ in {
       type = types.package;
     };
 
-    host = mkOption {
+    listenAddress = mkOption {
       description = "Elasticsearch listen address.";
       default = "127.0.0.1";
       type = types.str;
@@ -142,7 +142,7 @@ in {
         ln -s ${esPlugins}/plugins ${cfg.dataDir}/plugins
       '';
       postStart = mkBefore ''
-        until ${pkgs.curl}/bin/curl -s -o /dev/null ${cfg.host}:${toString cfg.port}; do
+        until ${pkgs.curl}/bin/curl -s -o /dev/null ${cfg.listenAddress}:${toString cfg.port}; do
           sleep 1
         done
       '';

From c7c3c95d92832b5a13524897e7b5583c98201a1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 24 Dec 2015 00:28:27 +0100
Subject: [PATCH 018/884] nixos/kibana: rename 'host' to 'listenAddress'

More descriptive option name.
---
 nixos/modules/rename.nix                 | 1 +
 nixos/modules/services/search/kibana.nix | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 2e1a264263fe..63ff2019d880 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -19,6 +19,7 @@ with lib;
     (mkRenamedOptionModule [ "services" "elasticsearch" "host" ] [ "services" "elasticsearch" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "graphite" "api" "host" ] [ "services" "graphite" "api" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "graphite" "web" "host" ] [ "services" "graphite" "web" "listenAddress" ])
+    (mkRenamedOptionModule [ "services" "kibana" "host" ] [ "services" "kibana" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "mpd" "network" "host" ] [ "services" "mpd" "network" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "shout" "host" ] [ "services" "shout" "listenAddress" ])
diff --git a/nixos/modules/services/search/kibana.nix b/nixos/modules/services/search/kibana.nix
index f47ab8f55861..f9071ef66e72 100644
--- a/nixos/modules/services/search/kibana.nix
+++ b/nixos/modules/services/search/kibana.nix
@@ -8,7 +8,7 @@ let
   cfgFile = pkgs.writeText "kibana.json" (builtins.toJSON (
     (filterAttrsRecursive (n: v: v != null) ({
       server = {
-        host = cfg.host;
+        host = cfg.listenAddress;
         port = cfg.port;
         ssl = {
           cert = cfg.cert;
@@ -44,7 +44,7 @@ in {
   options.services.kibana = {
     enable = mkEnableOption "enable kibana service";
 
-    host = mkOption {
+    listenAddress = mkOption {
       description = "Kibana listening host";
       default = "127.0.0.1";
       type = types.str;

From 9ac80c1f15d86302eaa3707e967b014794931073 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Thu, 24 Dec 2015 17:45:51 +0200
Subject: [PATCH 019/884] installation-cd-graphical: Enable the 'synaptics'
 touchpad driver

This is needed to get touchpad working in the installer on several
laptops. Tested on a Thinkpad X250.
---
 nixos/modules/profiles/graphical.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/profiles/graphical.nix b/nixos/modules/profiles/graphical.nix
index 75ac5e41f83e..8ee1628f876c 100644
--- a/nixos/modules/profiles/graphical.nix
+++ b/nixos/modules/profiles/graphical.nix
@@ -8,6 +8,7 @@
     enable = true;
     displayManager.kdm.enable = true;
     desktopManager.kde4.enable = true;
+    synaptics.enable = true; # for touchpad support on many laptops
   };
 
   environment.systemPackages = [ pkgs.glxinfo ];

From a193ea37008ed7295eb8d5e49f4d2341cc890b26 Mon Sep 17 00:00:00 2001
From: Jakob Gillich <jakob@gillich.me>
Date: Thu, 24 Dec 2015 22:36:19 +0100
Subject: [PATCH 020/884] dnsmasq: create state dir for dhcp leases file

ref #11718
---
 nixos/modules/services/networking/dnsmasq.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/networking/dnsmasq.nix b/nixos/modules/services/networking/dnsmasq.nix
index 6907d63d7611..fcf5aa5f175b 100644
--- a/nixos/modules/services/networking/dnsmasq.nix
+++ b/nixos/modules/services/networking/dnsmasq.nix
@@ -5,8 +5,10 @@ with lib;
 let
   cfg = config.services.dnsmasq;
   dnsmasq = pkgs.dnsmasq;
+  stateDir = "/var/lib/dnsmasq";
 
   dnsmasqConf = pkgs.writeText "dnsmasq.conf" ''
+    dhcp-leasefile=${stateDir}/dnsmasq.leases
     ${optionalString cfg.resolveLocalQueries ''
       conf-file=/etc/dnsmasq-conf.conf
       resolv-file=/etc/dnsmasq-resolv.conf
@@ -76,12 +78,11 @@ in
 
     services.dbus.packages = [ dnsmasq ];
 
-    users.extraUsers = singleton
-      { name = "dnsmasq";
-        uid = config.ids.uids.dnsmasq;
-        description = "Dnsmasq daemon user";
-        home = "/var/empty";
-      };
+    users.extraUsers = singleton {
+      name = "dnsmasq";
+      uid = config.ids.uids.dnsmasq;
+      description = "Dnsmasq daemon user";
+    };
 
     systemd.services.dnsmasq = {
         description = "Dnsmasq Daemon";
@@ -89,6 +90,9 @@ in
         wantedBy = [ "multi-user.target" ];
         path = [ dnsmasq ];
         preStart = ''
+          mkdir -m 755 -p ${stateDir}
+          touch ${stateDir}/dnsmasq.leases
+          chown -R dnsmasq ${stateDir}
           touch /etc/dnsmasq-{conf,resolv}.conf
           dnsmasq --test
         '';

From 0ca96aa43c2d8c36ce6515a4ff407bc4417496fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lengyel=20Bal=C3=A1zs?= <ikervagyok@gmail.com>
Date: Thu, 24 Dec 2015 02:58:57 +0100
Subject: [PATCH 021/884] wine: add initial pulseaudio support

---
 pkgs/misc/emulators/wine/base.nix     | 5 ++++-
 pkgs/misc/emulators/wine/default.nix  | 2 ++
 pkgs/misc/emulators/wine/packages.nix | 4 ++++
 pkgs/top-level/all-packages.nix       | 3 +++
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix
index 1e2d656fb0ef..e031627a032d 100644
--- a/pkgs/misc/emulators/wine/base.nix
+++ b/pkgs/misc/emulators/wine/base.nix
@@ -1,5 +1,6 @@
 { stdenv, lib, pkgArches,
   name, version, src, monos, geckos, platforms,
+  pulseaudioSupport,
   buildScript ? null, configureFlags ? ""
 }:
 
@@ -19,7 +20,9 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
 
   nativeBuildInputs = toBuildInputs pkgArches (pkgs: (with pkgs; [
     freetype fontconfig mesa mesa_noglu.osmesa libdrm libpng libjpeg openssl gnutls cups ncurses
-  ]) ++ (with pkgs.xorg; [
+  ])
+  ++ lib.optional pulseaudioSupport pkgs.libpulseaudio
+  ++ (with pkgs.xorg; [
     xlibsWrapper libXi libXcursor libXinerama libXrandr libXrender libXxf86vm libXcomposite
   ]));
 
diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix
index 5261f79de107..a402fba69f67 100644
--- a/pkgs/misc/emulators/wine/default.nix
+++ b/pkgs/misc/emulators/wine/default.nix
@@ -9,11 +9,13 @@
 { lib, pkgs, system, callPackage,
   wineRelease ? "stable",
   wineBuild ? (if system == "x86_64-linux" then "wineWow" else "wine32"),
+  pulseaudioSupport ? false,
   libtxc_dxtn_Name ? "libtxc_dxtn_s2tc" }:
 
 let wine-build = build: release:
       lib.getAttr build (callPackage ./packages.nix {
         wineRelease = release;
+        inherit pulseaudioSupport;
       });
 
 in if wineRelease == "staging" then
diff --git a/pkgs/misc/emulators/wine/packages.nix b/pkgs/misc/emulators/wine/packages.nix
index ce983b993144..1a7e32efcbe1 100644
--- a/pkgs/misc/emulators/wine/packages.nix
+++ b/pkgs/misc/emulators/wine/packages.nix
@@ -1,4 +1,5 @@
 { system, stdenv, stdenv_32bit, lib, pkgs, pkgsi686Linux, fetchurl,
+  pulseaudioSupport,
   wineRelease ? "stable"
 }:
 
@@ -30,6 +31,7 @@ in {
     name = "wine-${version}";
     inherit (sources) version src;
     inherit (pkgsi686Linux) lib stdenv;
+    inherit pulseaudioSupport;
     pkgArches = [ pkgsi686Linux ];
     geckos = with sources; [ wineGecko32 ];
     monos = with sources; [ wineMono ];
@@ -39,6 +41,7 @@ in {
     name = "wine64-${version}";
     inherit (sources) version src;
     inherit lib stdenv;
+    inherit pulseaudioSupport;
     pkgArches = [ pkgs ];
     geckos = with sources; [ wineGecko64 ];
     monos = with sources; [ wineMono ];
@@ -50,6 +53,7 @@ in {
     inherit (sources) version src;
     inherit lib;
     stdenv = stdenv_32bit;
+    inherit pulseaudioSupport;
     pkgArches = [ pkgs pkgsi686Linux ];
     geckos = with sources; [ wineGecko32 wineGecko64 ];
     monos = with sources; [ wineMono ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8be89661b677..3c25d094673f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15691,6 +15691,9 @@ let
   wine = callPackage ../misc/emulators/wine {
     wineRelease = config.wine.release or "stable";
     wineBuild = config.wine.build or "wine32";
+    pulseaudioSupport = if (config ? pulseaudio)
+                        then config.pulseaudio
+                        else stdenv.isLinux;
   };
   wineStable = wine.override { wineRelease = "stable"; };
   wineUnstable = lowPrio (wine.override { wineRelease = "unstable"; });

From e675b2d92d97c9b561982c9709e1207e89371af6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lengyel=20Bal=C3=A1zs?= <ikervagyok@gmail.com>
Date: Sat, 26 Dec 2015 00:56:16 +0100
Subject: [PATCH 022/884] wineStaging: remove explicit dependency on
 libpulseaudio

pulseaudio is now configured via `pulseaudioSupport` and available for wineStable too
---
 pkgs/misc/emulators/wine/staging.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/misc/emulators/wine/staging.nix b/pkgs/misc/emulators/wine/staging.nix
index 93e2e6fd1800..da4456c0ef98 100644
--- a/pkgs/misc/emulators/wine/staging.nix
+++ b/pkgs/misc/emulators/wine/staging.nix
@@ -15,7 +15,7 @@ let v = (import ./versions.nix).staging;
 in assert (builtins.parseDrvName wineUnstable.name).version == version;
 
 stdenv.lib.overrideDerivation wineUnstable (self: {
-  nativeBuildInputs = build-inputs [ "libpulseaudio" libtxc_dxtn_Name ] self.nativeBuildInputs; 
+  nativeBuildInputs = build-inputs [ libtxc_dxtn_Name ] self.nativeBuildInputs; 
   buildInputs = build-inputs [ "perl" "utillinux" "autoconf" ] self.buildInputs;
 
   name = "${self.name}-staging";

From ac7e9231048e76012961fbabf5a03adcb7c36470 Mon Sep 17 00:00:00 2001
From: Jakob Gillich <jakob@gillich.me>
Date: Fri, 25 Dec 2015 01:17:42 +0100
Subject: [PATCH 023/884] fish: add module to support it as default shell

* Patched fish to load /etc/fish/config.fish if it exists (by default,
  it only loads config relative to itself)
* Added fish-foreign-env package to parse the system environment

closes #5331
---
 nixos/modules/module-list.nix            |   1 +
 nixos/modules/programs/fish.nix          | 114 ++++++++++++
 pkgs/shells/fish-foreign-env/default.nix |  28 +++
 pkgs/shells/fish/builtin_status.patch    | 216 +++++++++++++++++++++++
 pkgs/shells/fish/default.nix             |  17 +-
 pkgs/shells/fish/etc_config.patch        |  17 ++
 pkgs/top-level/all-packages.nix          |   2 +
 7 files changed, 394 insertions(+), 1 deletion(-)
 create mode 100644 nixos/modules/programs/fish.nix
 create mode 100644 pkgs/shells/fish-foreign-env/default.nix
 create mode 100644 pkgs/shells/fish/builtin_status.patch
 create mode 100644 pkgs/shells/fish/etc_config.patch

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 5c1cde98d3dc..c53485f6f65b 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -64,6 +64,7 @@
   ./programs/dconf.nix
   ./programs/environment.nix
   ./programs/freetds.nix
+  ./programs/fish.nix
   ./programs/ibus.nix
   ./programs/kbdlight.nix
   ./programs/light.nix
diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix
new file mode 100644
index 000000000000..b4259f7ec87d
--- /dev/null
+++ b/nixos/modules/programs/fish.nix
@@ -0,0 +1,114 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfge = config.environment;
+
+  cfg = config.programs.fish;
+
+  fishAliases = concatStringsSep "\n" (
+    mapAttrsFlatten (k: v: "alias ${k} '${v}'") cfg.shellAliases
+  );
+
+in
+
+{
+
+  options = {
+
+    programs.fish = {
+
+      enable = mkOption {
+        default = false;
+        description = ''
+          Whether to configure fish as an interactive shell.
+        '';
+        type = types.bool;
+      };
+
+      shellAliases = mkOption {
+        default = config.environment.shellAliases;
+        description = ''
+          Set of aliases for fish shell. See <option>environment.shellAliases</option>
+          for an option format description.
+        '';
+        type = types.attrs;
+      };
+
+      shellInit = mkOption {
+        default = "";
+        description = ''
+          Shell script code called during fish shell initialisation.
+        '';
+        type = types.lines;
+      };
+
+      loginShellInit = mkOption {
+        default = "";
+        description = ''
+          Shell script code called during fish login shell initialisation.
+        '';
+        type = types.lines;
+      };
+
+      interactiveShellInit = mkOption {
+        default = "";
+        description = ''
+          Shell script code called during interactive fish shell initialisation.
+        '';
+        type = types.lines;
+      };
+
+      promptInit = mkOption {
+        default = "";
+        description = ''
+          Shell script code used to initialise fish prompt.
+        '';
+        type = types.lines;
+      };
+
+    };
+
+  };
+
+  config = mkIf cfg.enable {
+
+    environment.etc."fish/foreign-env/shellInit".text = cfge.shellInit;
+    environment.etc."fish/foreign-env/loginShellInit".text = cfge.loginShellInit;
+    environment.etc."fish/foreign-env/interactiveShellInit".text = cfge.interactiveShellInit;
+
+    environment.etc."fish/config.fish".text = ''
+      # /etc/fish/config.fish: DO NOT EDIT -- this file has been generated automatically.
+
+      set fish_function_path $fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions
+
+      fenv source ${config.system.build.setEnvironment} 1> /dev/null
+      fenv source /etc/fish/foreign-env/shellInit 1> /dev/null
+
+      ${cfg.shellInit}
+
+      if builtin status --is-login
+        fenv source /etc/fish/foreign-env/loginShellInit 1> /dev/null
+        ${cfg.loginShellInit}
+      end
+
+      if builtin status --is-interactive
+        ${fishAliases}
+        fenv source /etc/fish/foreign-env/interactiveShellInit 1> /dev/null
+        ${cfg.interactiveShellInit}
+      end
+    '';
+
+    environment.systemPackages = [ pkgs.fish ];
+
+    environment.shells = [
+      "/run/current-system/sw/bin/fish"
+      "/var/run/current-system/sw/bin/fish"
+      "${pkgs.fish}/bin/fish"
+    ];
+
+  };
+
+}
diff --git a/pkgs/shells/fish-foreign-env/default.nix b/pkgs/shells/fish-foreign-env/default.nix
new file mode 100644
index 000000000000..f3e08924150c
--- /dev/null
+++ b/pkgs/shells/fish-foreign-env/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, gnused, bash, coreutils }:
+
+stdenv.mkDerivation rec {
+  name = "fish-foreign-env-${version}";
+  version = "git-20151223";
+
+  src = fetchFromGitHub {
+    owner = "oh-my-fish";
+    repo = "plugin-foreign-env";
+    rev = "2dfe5b73fd2101702c83d1d7b566e2b9332c5ddc";
+    sha256 = "17jxlbljp7k2azcl1miz5h5xfyazlf9z9lrddcrnm6r7c1w1zdh5";
+  };
+
+  buildCommand = ''
+    mkdir -p $out/share/fish-foreign-env/functions/
+    cp $src/functions/* $out/share/fish-foreign-env/functions/
+    sed -e "s|sed|${gnused}/bin/sed|" \
+        -e "s|bash|${bash}/bin/bash|" \
+        -e "s|\| tr|\| ${coreutils}/bin/tr|" \
+        -i $out/share/fish-foreign-env/functions/*
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A foreign environment interface for Fish shell";
+    license = licenses.mit;
+    maintainers = with maintainers; [ jgillich ];
+  };
+}
diff --git a/pkgs/shells/fish/builtin_status.patch b/pkgs/shells/fish/builtin_status.patch
new file mode 100644
index 000000000000..dd6d79713b4c
--- /dev/null
+++ b/pkgs/shells/fish/builtin_status.patch
@@ -0,0 +1,216 @@
+commit 5145ca56b0ac1e5e284ab6dfa6fdecc5e86e59b8
+Author: Jakob Gillich <jakob@gillich.me>
+Date:   Sat Dec 26 04:57:06 2015 +0100
+
+    prefix status command with builtin
+
+diff --git a/etc/config.fish b/etc/config.fish
+index 0683f40..9297a85 100644
+--- a/etc/config.fish
++++ b/etc/config.fish
+@@ -6,7 +6,7 @@
+ # Some things should only be done for login terminals
+ #
+ 
+-if status --is-login
++if builtin status --is-login
+ 
+ 	#
+ 	# Set some value for LANG if nothing was set before, and this is a
+diff --git a/share/functions/__fish_config_interactive.fish b/share/functions/__fish_config_interactive.fish
+index 9b27fb9..d1c704b 100644
+--- a/share/functions/__fish_config_interactive.fish
++++ b/share/functions/__fish_config_interactive.fish
+@@ -101,7 +101,7 @@ function __fish_config_interactive -d "Initializations that should be performed
+         eval "$__fish_bin_dir/fish -c 'fish_update_completions > /dev/null ^/dev/null' &"
+     end
+ 
+-	if status -i
++	if builtin status -i
+ 		#
+ 		# Print a greeting
+ 		#
+@@ -128,14 +128,14 @@ function __fish_config_interactive -d "Initializations that should be performed
+ 	#
+ 
+ 	function __fish_repaint --on-variable fish_color_cwd --description "Event handler, repaints the prompt when fish_color_cwd changes"
+-		if status --is-interactive
++		if builtin status --is-interactive
+ 			set -e __fish_prompt_cwd
+ 			commandline -f repaint ^/dev/null
+ 		end
+ 	end
+ 
+ 	function __fish_repaint_root --on-variable fish_color_cwd_root --description "Event handler, repaints the prompt when fish_color_cwd_root changes"
+-		if status --is-interactive
++		if builtin  status --is-interactive
+ 			set -e __fish_prompt_cwd
+ 			commandline -f repaint ^/dev/null
+ 		end
+@@ -191,7 +191,7 @@ function __fish_config_interactive -d "Initializations that should be performed
+ 	# Notify vte-based terminals when $PWD changes (issue #906)
+ 	if test "$VTE_VERSION" -ge 3405 -o "$TERM_PROGRAM" = "Apple_Terminal"
+ 		function __update_vte_cwd --on-variable PWD --description 'Notify VTE of change to $PWD'
+-			status --is-command-substitution; and return
++			builtin status --is-command-substitution; and return
+ 			printf '\033]7;file://%s%s\a' (hostname) (pwd | __fish_urlencode)
+ 		end
+ 	end
+diff --git a/share/functions/__fish_git_prompt.fish b/share/functions/__fish_git_prompt.fish
+index 0117894..4e4b60f 100644
+--- a/share/functions/__fish_git_prompt.fish
++++ b/share/functions/__fish_git_prompt.fish
+@@ -728,7 +728,7 @@ for var in repaint describe_style show_informative_status showdirtystate showsta
+ 	set varargs $varargs --on-variable __fish_git_prompt_$var
+ end
+ function __fish_git_prompt_repaint $varargs --description "Event handler, repaints prompt when functionality changes"
+-	if status --is-interactive
++	if builtin status --is-interactive
+ 		if test $argv[3] = __fish_git_prompt_show_informative_status
+ 			# Clear characters that have different defaults with/without informative status
+ 			for name in cleanstate dirtystate invalidstate stagedstate stateseparator untrackedfiles upstream_ahead upstream_behind
+@@ -746,7 +746,7 @@ for var in '' _prefix _suffix _bare _merging _cleanstate _invalidstate _upstream
+ end
+ set varargs $varargs --on-variable __fish_git_prompt_showcolorhints
+ function __fish_git_prompt_repaint_color $varargs --description "Event handler, repaints prompt when any color changes"
+-	if status --is-interactive
++	if builtin status --is-interactive
+ 		set -l var $argv[3]
+ 		set -e _$var
+ 		set -e _{$var}_done
+@@ -766,7 +766,7 @@ for var in cleanstate dirtystate invalidstate stagedstate stashstate statesepara
+ 	set varargs $varargs --on-variable __fish_git_prompt_char_$var
+ end
+ function __fish_git_prompt_repaint_char $varargs --description "Event handler, repaints prompt when any char changes"
+-	if status --is-interactive
++	if builtin status --is-interactive
+ 		set -e _$argv[3]
+ 		commandline -f repaint ^/dev/null
+ 	end
+diff --git a/share/functions/cd.fish b/share/functions/cd.fish
+index 8faa469..10168d7 100644
+--- a/share/functions/cd.fish
++++ b/share/functions/cd.fish
+@@ -5,7 +5,7 @@
+ function cd --description "Change directory"
+ 
+ 	# Skip history in subshells
+-	if status --is-command-substitution
++	if builtin status --is-command-substitution
+ 		builtin cd $argv
+ 		return $status
+ 	end
+@@ -33,4 +33,3 @@ function cd --description "Change directory"
+ 
+ 	return $cd_status
+ end
+-
+diff --git a/share/functions/eval.fish b/share/functions/eval.fish
+index 052d417..5eeb12a 100644
+--- a/share/functions/eval.fish
++++ b/share/functions/eval.fish
+@@ -23,17 +23,17 @@ function eval -S -d "Evaluate parameters as a command"
+ 	# used interactively, like less, wont work using eval.
+ 
+ 	set -l mode
+-	if status --is-interactive-job-control
++	if builtin status --is-interactive-job-control
+ 		set mode interactive
+ 	else
+-		if status --is-full-job-control
++		if builtin status --is-full-job-control
+ 			set mode full
+ 		else
+ 			set mode none
+ 		end
+ 	end
+-	if status --is-interactive
+-		status --job-control full
++	if builtin status --is-interactive
++		builtin status --job-control full
+ 	end
+ 	__fish_restore_status $status_copy
+ 
+@@ -60,6 +60,6 @@ function eval -S -d "Evaluate parameters as a command"
+ 	echo "begin; $argv "\n" ;end <&3 3<&-" | source 3<&0
+ 	set -l res $status
+ 
+-	status --job-control $mode
++	builtin status --job-control $mode
+ 	return $res
+ end
+diff --git a/share/functions/history.fish b/share/functions/history.fish
+index fd2b91f..12d28d7 100644
+--- a/share/functions/history.fish
++++ b/share/functions/history.fish
+@@ -38,7 +38,7 @@ function history --description "Deletes an item from history"
+         end
+     else
+         #Execute history builtin without any argument
+-        if status --is-interactive
++        if builtin status --is-interactive
+             builtin history | eval $pager
+         else
+             builtin history
+diff --git a/share/functions/psub.fish b/share/functions/psub.fish
+index 67863ad..dd0e08b 100644
+--- a/share/functions/psub.fish
++++ b/share/functions/psub.fish
+@@ -40,7 +40,7 @@ function psub --description "Read from stdin into a file and output the filename
+ 
+ 	end
+ 
+-	if not status --is-command-substitution
++	if not builtin status --is-command-substitution
+ 		echo psub: Not inside of command substitution >&2
+ 		return 1
+ 	end
+diff --git a/share/tools/web_config/sample_prompts/classic_git.fish b/share/tools/web_config/sample_prompts/classic_git.fish
+index 39f3ab8..601fa19 100644
+--- a/share/tools/web_config/sample_prompts/classic_git.fish
++++ b/share/tools/web_config/sample_prompts/classic_git.fish
+@@ -17,25 +17,25 @@ function fish_prompt --description 'Write out the prompt'
+ 		set -g __fish_classic_git_functions_defined
+ 
+ 		function __fish_repaint_user --on-variable fish_color_user --description "Event handler, repaint when fish_color_user changes"
+-			if status --is-interactive
++			if builtin status --is-interactive
+ 				commandline -f repaint ^/dev/null
+ 			end
+ 		end
+-		
++
+ 		function __fish_repaint_host --on-variable fish_color_host --description "Event handler, repaint when fish_color_host changes"
+-			if status --is-interactive
++			if builtin status --is-interactive
+ 				commandline -f repaint ^/dev/null
+ 			end
+ 		end
+-		
++
+ 		function __fish_repaint_status --on-variable fish_color_status --description "Event handler; repaint when fish_color_status changes"
+-			if status --is-interactive
++			if builtin status --is-interactive
+ 				commandline -f repaint ^/dev/null
+ 			end
+ 		end
+ 
+ 		function __fish_repaint_bind_mode --on-variable fish_key_bindings --description "Event handler; repaint when fish_key_bindings changes"
+-			if status --is-interactive
++			if builtin status --is-interactive
+ 				commandline -f repaint ^/dev/null
+ 			end
+ 		end
+diff --git a/tests/test_util.fish b/tests/test_util.fish
+index 22744b3..576dbc4 100644
+--- a/tests/test_util.fish
++++ b/tests/test_util.fish
+@@ -4,7 +4,7 @@
+ if test "$argv[1]" = (status -f)
+     echo 'test_util.fish requires sourcing script as argument to `source`' >&2
+     echo 'use `source test_util.fish (status -f); or exit`' >&2
+-    status --print-stack-trace >&2
++    builtin status --print-stack-trace >&2
+     exit 1
+ end
+ 
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index ef3794d5144c..6fa250a4ea73 100644
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, ncurses, nettools, python, which, groff, gettext, man_db, bc, libiconv, coreutils }:
+{ stdenv, fetchurl, ncurses, nettools, python, which, groff, gettext, man_db,
+  bc, libiconv, coreutils, gnused, kbd }:
 
 stdenv.mkDerivation rec {
   name = "fish-${version}";
@@ -9,6 +10,9 @@ stdenv.mkDerivation rec {
     sha256 = "0ympqz7llmf0hafxwglykplw6j5cz82yhlrw50lw4bnf2kykjqx7";
   };
 
+  # builtin_status has been upstreamed https://github.com/fish-shell/fish-shell/pull/2636
+  patches = [ ./etc_config.patch ./builtin_status.patch ];
+
   buildInputs = [ ncurses libiconv ];
 
   # Required binaries during execution
@@ -18,15 +22,26 @@ stdenv.mkDerivation rec {
                           ++ [ bc coreutils ];
 
   postInstall = ''
+    sed -e "s|expr|${coreutils}/bin/expr|" \
+        -e "s|if which unicode_start|if true|" \
+        -e "s|unicode_start|${kbd}/bin/unicode_start|" \
+        -i "$out/etc/fish/config.fish"
     sed -e "s|bc|${bc}/bin/bc|" \
         -e "s|/usr/bin/seq|${coreutils}/bin/seq|" \
         -i "$out/share/fish/functions/seq.fish" \
            "$out/share/fish/functions/math.fish"
     sed -i "s|which |${which}/bin/which |" "$out/share/fish/functions/type.fish"
+    sed -e "s|\|cut|\|${coreutils}/bin/cut|" -i "$out/share/fish/functions/fish_prompt.fish"
     sed -i "s|nroff |${groff}/bin/nroff |" "$out/share/fish/functions/__fish_print_help.fish"
     sed -e "s|gettext |${gettext}/bin/gettext |" \
         -e "s|which |${which}/bin/which |" \
         -i "$out/share/fish/functions/_.fish"
+    sed -e "s|uname|${coreutils}/bin/uname|" \
+        -i "$out/share/fish/functions/__fish_pwd.fish" \
+           "$out/share/fish/functions/prompt_pwd.fish"
+    sed -e "s|sed |${gnused}/bin/sed |" \
+        -i "$out/share/fish/functions/alias.fish" \
+           "$out/share/fish/functions/prompt_pwd.fish"
     substituteInPlace "$out/share/fish/functions/fish_default_key_bindings.fish" \
       --replace "clear;" "${ncurses}/bin/clear;"
   '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
diff --git a/pkgs/shells/fish/etc_config.patch b/pkgs/shells/fish/etc_config.patch
new file mode 100644
index 000000000000..c48e734cc905
--- /dev/null
+++ b/pkgs/shells/fish/etc_config.patch
@@ -0,0 +1,17 @@
+commit 0ec07a7018bd69513b0bca6e2f22dbf8575a5b5e
+Author: Jakob Gillich <jakob@gillich.me>
+Date:   Fri Dec 25 01:59:29 2015 +0100
+
+    load /etc/fish/config.fish if it exists
+
+diff --git a/etc/config.fish b/etc/config.fish
+index 0683f40..33f4da7 100644
+--- a/etc/config.fish
++++ b/etc/config.fish
+@@ -37,3 +37,6 @@ if status --is-login
+        end
+ end
+
++if test -f /etc/fish/config.fish
++  source /etc/fish/config.fish
++end
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2a8c459a0194..05a575e4f828 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3737,6 +3737,8 @@ let
     python = python27Full;
   };
 
+  fish-foreign-env = callPackage ../shells/fish-foreign-env { };
+
   mksh = callPackage ../shells/mksh { };
 
   pash = callPackage ../shells/pash { };

From c930e03e60d69bb90decd464131dbc673457f26c Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 26 Dec 2015 16:15:10 +0100
Subject: [PATCH 024/884] josm: add desktop item

Also add platforms to package meta section.
---
 pkgs/applications/misc/josm/default.nix | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix
index 275cc8ff2adb..32f452695ed5 100644
--- a/pkgs/applications/misc/josm/default.nix
+++ b/pkgs/applications/misc/josm/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, bash, jre8 }:
+{ fetchurl, stdenv, makeDesktopItem, unzip, bash, jre8 }:
 
 stdenv.mkDerivation rec {
   name = "josm-${version}";
@@ -13,6 +13,16 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ jre8 ];
 
+  desktopItem = makeDesktopItem {
+    name = "josm";
+    exec = "josm";
+    icon = "josm";
+    desktopName = "JOSM";
+    genericName = "OpenStreetMap Editor";
+    comment = meta.description;
+    categories = "Education;Geoscience;Maps;";
+  };
+
   installPhase = ''
     mkdir -p $out/bin $out/share/java
     cp -v $src $out/share/java/josm.jar
@@ -21,6 +31,11 @@ stdenv.mkDerivation rec {
     exec ${jre8}/bin/java -jar $out/share/java/josm.jar "\$@"
     EOF
     chmod 755 $out/bin/josm
+
+    mkdir -p $out/share/applications
+    cp $desktopItem/share/applications"/"* $out/share/applications
+    mkdir -p $out/share/pixmaps
+    ${unzip}/bin/unzip -p $src images/logo_48x48x32.png > $out/share/pixmaps/josm.png
   '';
 
   meta = with stdenv.lib; {
@@ -28,5 +43,6 @@ stdenv.mkDerivation rec {
     homepage = https://josm.openstreetmap.de/;
     license = licenses.gpl2Plus;
     maintainers = [ maintainers.rycee ];
+    platforms = platforms.all;
   };
 }

From 69ba5b12d981375c6a6d4311f0fe9b05a6c63a5a Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 26 Dec 2015 16:19:24 +0100
Subject: [PATCH 025/884] gpsprune: add desktop item

Also add platforms to package meta section.
---
 pkgs/applications/misc/gpsprune/default.nix | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix
index dead3b83dcf8..04d3b7874b44 100644
--- a/pkgs/applications/misc/gpsprune/default.nix
+++ b/pkgs/applications/misc/gpsprune/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, bash, jre8 }:
+{ fetchurl, stdenv, makeDesktopItem, unzip, bash, jre8 }:
 
 stdenv.mkDerivation rec {
   name = "gpsprune-${version}";
@@ -13,6 +13,16 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ jre8 ];
 
+  desktopItem = makeDesktopItem {
+    name = "gpsprune";
+    exec = "gpsprune";
+    icon = "gpsprune";
+    desktopName = "GpsPrune";
+    genericName = "GPS Data Editor";
+    comment = meta.description;
+    categories = "Education;Geoscience;";
+  };
+
   installPhase = ''
     mkdir -p $out/bin $out/share/java
     cp -v $src $out/share/java/gpsprune.jar
@@ -21,6 +31,11 @@ stdenv.mkDerivation rec {
     exec ${jre8}/bin/java -jar $out/share/java/gpsprune.jar "\$@"
     EOF
     chmod 755 $out/bin/gpsprune
+
+    mkdir -p $out/share/applications
+    cp $desktopItem/share/applications"/"* $out/share/applications
+    mkdir -p $out/share/pixmaps
+    ${unzip}/bin/unzip -p $src tim/prune/gui/images/window_icon_64.png > $out/share/pixmaps/gpsprune.png
   '';
 
   meta = with stdenv.lib; {
@@ -28,5 +43,6 @@ stdenv.mkDerivation rec {
     homepage = http://activityworkshop.net/software/gpsprune/;
     license = licenses.gpl2Plus;
     maintainers = [ maintainers.rycee ];
+    platforms = platforms.all;
   };
 }

From 7de67f48a5c51e791951c9480ef18b1657ad74ba Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 27 Dec 2015 20:21:43 +0000
Subject: [PATCH 026/884] thinkfan: 0.8.1 -> 0.9.2

---
 pkgs/tools/system/thinkfan/default.nix | 27 ++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/pkgs/tools/system/thinkfan/default.nix b/pkgs/tools/system/thinkfan/default.nix
index c513e475e580..3e97a4b64a31 100644
--- a/pkgs/tools/system/thinkfan/default.nix
+++ b/pkgs/tools/system/thinkfan/default.nix
@@ -1,22 +1,25 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, cmake }:
 
-let
-
-  version = "0.8.1";
-  
-in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "thinkfan-${version}";
+  version = "0.9.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/thinkfan/thinkfan-${version}.tar.gz";
-    sha256 = "04akla66r8k10x0jvmcpfi92hj2sppygcl7hhwn8n8zsvvf0yqxs";
+    sha256 = "0ydgabk2758f6j64g1r9vdsd221nqsv5rwnphm81s7i2vgra1nlh";
   };
-  
+
+  nativeBuildInputs = [ cmake ];
+
+  unpackPhase = ''
+    sourceRoot="$PWD/${name}";
+    mkdir $sourceRoot;
+    tar xzvf "$src" -C $sourceRoot;
+  '';
+
   installPhase = ''
-    mkdir -p $out/bin
-    mv thinkfan $out/bin/
+    mkdir -p $out/bin;
+    mv thinkfan $out/bin/;
   '';
 
   meta = {

From 9c431b77ff815ea0ef560bf679191a1e1c96eb75 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 25 Dec 2015 00:18:15 +0300
Subject: [PATCH 027/884] make-initrd: store all files with root as owner

---
 pkgs/build-support/kernel/make-initrd.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/kernel/make-initrd.sh b/pkgs/build-support/kernel/make-initrd.sh
index 08961a1b49c2..89021caa5834 100644
--- a/pkgs/build-support/kernel/make-initrd.sh
+++ b/pkgs/build-support/kernel/make-initrd.sh
@@ -39,7 +39,7 @@ mkdir -p $out
 for PREP in $prepend; do
   cat $PREP >> $out/initrd
 done
-(cd root && find * -print0 | cpio -o -H newc --null | perl $cpioClean | $compressor >> $out/initrd)
+(cd root && find * -print0 | cpio -o -H newc -R 0:0 --null | perl $cpioClean | $compressor >> $out/initrd)
 
 if [ -n "$makeUInitrd" ]; then
     mv $out/initrd $out/initrd.gz

From cb0ddd9d6a4244961151578e01969d1692eff303 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Mon, 28 Dec 2015 11:00:18 +0100
Subject: [PATCH 028/884] qtile: 0.10.2 -> 0.10.3

---
 pkgs/applications/window-managers/qtile/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix
index cd353c7c215c..3f38be669274 100644
--- a/pkgs/applications/window-managers/qtile/default.nix
+++ b/pkgs/applications/window-managers/qtile/default.nix
@@ -7,13 +7,13 @@ in
 
 buildPythonPackage rec {
   name = "qtile-${version}";
-  version = "0.10.2";
+  version = "0.10.3";
 
   src = fetchFromGitHub {
     owner = "qtile";
     repo = "qtile";
     rev = "v${version}";
-    sha256 = "0dhdwjr4pdlzli68fa8glrnsjzxp6agdab9cnmpsqlwiwh97x9a6";
+    sha256 = "02252sfcniijkpk5rfgb800wvdpl223xrx1bhrxpzgggpgfbnmn6";
   };
 
   patches = [

From e3630bcf89b2d325743e20516ffc261ab635b9b1 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Fri, 25 Dec 2015 10:01:04 +0100
Subject: [PATCH 029/884] rkt: align stage1 information with upstream source

We rely on the upstream tests and hence should not change the
constellation.

See: https://github.com/coreos/rkt/blob/v0.14.0/stage1/usr_from_coreos/coreos-common.mk

Additionally add the "fly" stage1.
---
 pkgs/applications/virtualization/rkt/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix
index eb2a5d737a3e..801f658d0380 100644
--- a/pkgs/applications/virtualization/rkt/default.nix
+++ b/pkgs/applications/virtualization/rkt/default.nix
@@ -2,11 +2,11 @@
 , fetchurl, fetchFromGitHub }:
 
 let
-  coreosImageRelease = "835.9.0";
-  coreosImageSystemdVersion = "225";
+  coreosImageRelease = "794.1.0";
+  coreosImageSystemdVersion = "222";
 
   # TODO: track https://github.com/coreos/rkt/issues/1758 to allow "host" flavor.
-  stage1Flavours = [ "coreos" ];
+  stage1Flavours = [ "coreos" "fly" ];
 
 in stdenv.mkDerivation rec {
   version = "0.14.0";
@@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
 
   stage1BaseImage = fetchurl {
     url = "http://stable.release.core-os.net/amd64-usr/${coreosImageRelease}/coreos_production_pxe_image.cpio.gz";
-    sha256 = "51dc10b4269b9c1801c233de49da817d29ca8d858bb0881df94dc90f7e86ce70";
+    sha256 = "05nzl3av6cawr8v203a8c95c443g6h1nfy2n4jmgvn0j4iyy44ym";
   };
 
   buildInputs = [ autoconf automake go file git wget gnupg1 squashfsTools cpio ];

From 254eebd8a0782430dfb0b78bef3b657ad0caed8a Mon Sep 17 00:00:00 2001
From: Nathan Zadoks <nathan@nathan7.eu>
Date: Sun, 27 Dec 2015 16:36:17 +0100
Subject: [PATCH 030/884] command-not-found: add NIX_AUTO_RUN

---
 nixos/modules/programs/command-not-found/command-not-found.nix | 2 +-
 nixos/modules/programs/command-not-found/command-not-found.pl  | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/programs/command-not-found/command-not-found.nix b/nixos/modules/programs/command-not-found/command-not-found.nix
index 9524d91ea3bc..9d3f61f5ff9b 100644
--- a/nixos/modules/programs/command-not-found/command-not-found.nix
+++ b/nixos/modules/programs/command-not-found/command-not-found.nix
@@ -16,7 +16,7 @@ let
     isExecutable = true;
     inherit (pkgs) perl;
     perlFlags = concatStrings (map (path: "-I ${path}/lib/perl5/site_perl ")
-      [ pkgs.perlPackages.DBI pkgs.perlPackages.DBDSQLite ]);
+      [ pkgs.perlPackages.DBI pkgs.perlPackages.DBDSQLite pkgs.perlPackages.StringShellQuote ]);
   };
 
 in
diff --git a/nixos/modules/programs/command-not-found/command-not-found.pl b/nixos/modules/programs/command-not-found/command-not-found.pl
index b233d973a4ab..5bdda26592e6 100644
--- a/nixos/modules/programs/command-not-found/command-not-found.pl
+++ b/nixos/modules/programs/command-not-found/command-not-found.pl
@@ -3,6 +3,7 @@
 use strict;
 use DBI;
 use DBD::SQLite;
+use String::ShellQuote;
 use Config;
 
 my $program = $ARGV[0];
@@ -31,6 +32,8 @@ the package ‘$package’, which I will now install for you.
 EOF
         ;
         exit 126 if system("nix-env", "-iA", "nixos.$package") == 0;
+    } elsif ($ENV{"NIX_AUTO_RUN"} // "") {
+        exec("nix-shell", "-p", $package, "--run", shell_quote("exec", @ARGV));
     } else {
         print STDERR <<EOF;
 The program ‘$program’ is currently not installed. You can install it by typing:

From efd9562df02e70d5eb97c9fe11238ae8135bbf4b Mon Sep 17 00:00:00 2001
From: Nathan Zadoks <nathan@nathan7.eu>
Date: Sun, 27 Dec 2015 16:36:46 +0100
Subject: [PATCH 031/884] fish: pass all of argv to command-not-found

---
 pkgs/shells/fish/command-not-found.patch | 13 +++++++++++++
 pkgs/shells/fish/default.nix             |  2 ++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/shells/fish/command-not-found.patch

diff --git a/pkgs/shells/fish/command-not-found.patch b/pkgs/shells/fish/command-not-found.patch
new file mode 100644
index 000000000000..aaca001dcb67
--- /dev/null
+++ b/pkgs/shells/fish/command-not-found.patch
@@ -0,0 +1,13 @@
+diff --git a/share/functions/__fish_config_interactive.fish b/share/functions/__fish_config_interactive.fish
+index c3864a8..a12ac4d 100644
+--- a/share/functions/__fish_config_interactive.fish
++++ b/share/functions/__fish_config_interactive.fish
+@@ -230,7 +230,7 @@ function __fish_config_interactive -d "Initializations that should be performed
+ 		# Check for NixOS handler
+ 		else if test -f /run/current-system/sw/bin/command-not-found
+ 			function __fish_command_not_found_handler --on-event fish_command_not_found
+-				/run/current-system/sw/bin/command-not-found $argv[1]
++				/run/current-system/sw/bin/command-not-found $argv
+ 			end
+ 		# Ubuntu Feisty places this command in the regular path instead
+ 		else if type -q -p command-not-found
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index ef3794d5144c..c2fcfa3e7c18 100644
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -4,6 +4,8 @@ stdenv.mkDerivation rec {
   name = "fish-${version}";
   version = "2.2.0";
 
+  patches = [ ./command-not-found.patch ];
+
   src = fetchurl {
     url = "http://fishshell.com/files/${version}/${name}.tar.gz";
     sha256 = "0ympqz7llmf0hafxwglykplw6j5cz82yhlrw50lw4bnf2kykjqx7";

From e60c4995fdea8ab86115149f89fca84275480fb7 Mon Sep 17 00:00:00 2001
From: Arda Xi <arda@ardaxi.com>
Date: Mon, 28 Dec 2015 14:49:53 +0100
Subject: [PATCH 032/884] command-not-found: pass all of argv to helper

---
 .../modules/programs/command-not-found/command-not-found.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/programs/command-not-found/command-not-found.nix b/nixos/modules/programs/command-not-found/command-not-found.nix
index 9d3f61f5ff9b..9741aa7ca539 100644
--- a/nixos/modules/programs/command-not-found/command-not-found.nix
+++ b/nixos/modules/programs/command-not-found/command-not-found.nix
@@ -30,7 +30,7 @@ in
         local p=/run/current-system/sw/bin/command-not-found
         if [ -x $p -a -f /nix/var/nix/profiles/per-user/root/channels/nixos/programs.sqlite ]; then
           # Run the helper program.
-          $p "$1"
+          $p "$@"
           # Retry the command if we just installed it.
           if [ $? = 126 ]; then
             "$@"
@@ -51,7 +51,7 @@ in
         local p=/run/current-system/sw/bin/command-not-found
         if [ -x $p -a -f /nix/var/nix/profiles/per-user/root/channels/nixos/programs.sqlite ]; then
           # Run the helper program.
-          $p "$1"
+          $p "$@"
 
           # Retry the command if we just installed it.
           if [ $? = 126 ]; then

From 3c0268334dca1842d73aae2cb4cdd48db9bb535d Mon Sep 17 00:00:00 2001
From: Christian Theune <ct@flyingcircus.io>
Date: Tue, 29 Dec 2015 09:13:27 +0100
Subject: [PATCH 033/884] syncthing: 0.12.9 -> 0.12.10

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

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index e1825ace20d1..1256d8ae05e2 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2285,7 +2285,7 @@ let
   };
 
   osext = buildFromGitHub {
-    rev = "10da29423eb9a6269092eebdc2be32209612d9d2";
+    rev = "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc";
     owner = "kardianos";
     repo = "osext";
     sha256 = "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a";
@@ -3092,11 +3092,11 @@ let
   };
 
   syncthing = buildFromGitHub rec {
-    version = "0.12.9";
+    version = "0.12.10";
     rev = "v${version}";
     owner = "syncthing";
     repo = "syncthing";
-    sha256 = "0d420bmx1ifhjgbc65bflnawqddi4h86p7fvxzzqwfsaj94fsfbi";
+    sha256 = "1xvar4mm6f33mg8d8z8h49cni6sj1vfns379zspqvszs404fra0z";
     buildFlags = [ "-tags noupgrade,release" ];
     disabled = isGo14;
     buildInputs = [

From b6c06e216bb3bface40eb8ea6576b25f9b2971dd Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Sat, 14 Nov 2015 21:17:29 -0500
Subject: [PATCH 034/884] ruby: new bundler infrastructure

This improves our Bundler integration (i.e. `bundlerEnv`).

Before describing the implementation differences, I'd like to point a
breaking change: buildRubyGem now expects `gemName` and `version` as
arguments, rather than a `name` attribute in the form of
"<gem-name>-<version>".

Now for the differences in implementation.

The previous implementation installed all gems at once in a single
derivation. This was made possible by using a set of monkey-patches to
prevent Bundler from downloading gems impurely, and to help Bundler
find and activate all required gems prior to installation. This had
several downsides:

* The patches were really hard to understand, and required subtle
  interaction with the rest of the build environment.
* A single install failure would cause the entire derivation to fail.

The new implementation takes a different approach: we install gems into
separate derivations, and then present Bundler with a symlink forest
thereof. This has a couple benefits over the existing approach:

* Fewer patches are required, with less interplay with the rest of the
  build environment.
* Changes to one gem no longer cause a rebuild of the entire dependency
  graph.
* Builds take 20% less time (using gitlab as a reference).

It's unfortunate that we still have to muck with Bundler's internals,
though it's unavoidable with the way that Bundler is currently designed.
There are a number improvements that could be made in Bundler that would
simplify our packaging story:

* Bundler requires all installed gems reside within the same prefix
  (GEM_HOME), unlike RubyGems which allows for multiple prefixes to
  be specified through GEM_PATH. It would be ideal if Bundler allowed
  for packages to be installed and sourced from multiple prefixes.
* Bundler installs git sources very differently from how RubyGems
  installs gem packages, and, unlike RubyGems, it doesn't provide a
  public interface (CLI or programmatic) to guide the installation of a
  single gem. We are presented with the options of either
  reimplementing a considerable portion Bundler, or patch and use parts
  of its internals; I choose the latter. Ideally, there would be a way
  to install gems from git sources in a manner similar to how we drive
  `gem` to install gem packages.
* When a bundled program is executed (via `bundle exec` or a
  binstub that does `require 'bundler/setup'`), the setup process reads
  the Gemfile.lock, activates the dependencies, re-serializes the lock
  file it read earlier, and then attempts to overwrite the Gemfile.lock
  if the contents aren't bit-identical. I think the reasoning is that
  by merely running an application with a newer version of Bundler, you'll
  automatically keep the Gemfile.lock up-to-date with any changes in the
  format. Unfortunately, that doesn't play well with any form of
  packaging, because bundler will immediately cause the application to
  abort when it attempts to write to the read-only Gemfile.lock in the
  store. We work around this by normalizing the Gemfile.lock with the
  version of Bundler that we'll use at runtime before we copy it into
  the store. This feels fragile, but it's the best we can do without
  changes upstream, or resorting to more delicate hacks.

With all of the challenges in using Bundler, one might wonder why we
can't just cut Bundler out of the picture and use RubyGems. After all,
Nix provides most of the isolation that Bundler is used for anyway.

The problem, however, is that almost every Rails application calls
`Bundler::require` at startup (by way of the default project templates).
Because bundler will then, by default, `require` each gem listed in the
Gemfile, Rails applications are almost always written such that none of
the source files explicitly require their dependencies. That leaves us
with two options: support and use Bundler, or maintain massive patches
for every Rails application that we package.

Closes #8612
---
 pkgs/applications/misc/jekyll/default.nix     |   2 -
 .../cluster/panamax/api/default.nix           |   8 +-
 .../networking/cluster/panamax/ui/default.nix |   7 +-
 .../ruby/build-ruby-gem/default.nix           | 208 ++++++++++
 .../ruby/build-ruby-gem/gem-post-build.rb     |  77 ++++
 .../ruby/build-ruby-gem/nix-bundle-install.rb | 153 ++++++++
 .../interpreters/ruby/bundix/Gemfile          |   4 -
 .../interpreters/ruby/bundix/Gemfile.lock     |  18 -
 .../interpreters/ruby/bundix/default.nix      |  25 +-
 .../interpreters/ruby/bundix/gemset.nix       |  22 --
 .../interpreters/ruby/bundler-env/default.nix | 357 +++---------------
 .../ruby/bundler-env/gen-bin-stubs.rb         |  46 +++
 .../ruby/bundler-env/monkey_patches.rb        | 246 ------------
 .../ruby/bundler-env/package-1.8.rb           |  29 --
 .../development/interpreters/ruby/bundler.nix |  17 +-
 pkgs/development/interpreters/ruby/gem.nix    | 136 -------
 .../default.nix}                              |  28 +-
 .../mkrf_conf_xapian.rb                       |   0
 .../xapian-Rakefile                           |   0
 .../interpreters/ruby/load-ruby-env.nix       |  69 ----
 .../interpreters/ruby/rubygems.nix            |  36 +-
 pkgs/development/libraries/gecode/3.nix       |  21 ++
 pkgs/development/tools/vagrant/default.nix    |   3 +-
 pkgs/tools/audio/mpdcron/default.nix          |   2 +-
 pkgs/tools/misc/fluentd/default.nix           |   2 -
 pkgs/top-level/all-packages.nix               |  17 +-
 26 files changed, 646 insertions(+), 887 deletions(-)
 create mode 100644 pkgs/development/interpreters/ruby/build-ruby-gem/default.nix
 create mode 100644 pkgs/development/interpreters/ruby/build-ruby-gem/gem-post-build.rb
 create mode 100644 pkgs/development/interpreters/ruby/build-ruby-gem/nix-bundle-install.rb
 delete mode 100644 pkgs/development/interpreters/ruby/bundix/Gemfile
 delete mode 100644 pkgs/development/interpreters/ruby/bundix/Gemfile.lock
 delete mode 100644 pkgs/development/interpreters/ruby/bundix/gemset.nix
 create mode 100644 pkgs/development/interpreters/ruby/bundler-env/gen-bin-stubs.rb
 delete mode 100644 pkgs/development/interpreters/ruby/bundler-env/monkey_patches.rb
 delete mode 100644 pkgs/development/interpreters/ruby/bundler-env/package-1.8.rb
 delete mode 100644 pkgs/development/interpreters/ruby/gem.nix
 rename pkgs/development/interpreters/ruby/{bundler-env/default-gem-config.nix => gemconfig/default.nix} (82%)
 rename pkgs/development/interpreters/ruby/{bundler-env => gemconfig}/mkrf_conf_xapian.rb (100%)
 rename pkgs/development/interpreters/ruby/{bundler-env => gemconfig}/xapian-Rakefile (100%)
 delete mode 100644 pkgs/development/interpreters/ruby/load-ruby-env.nix
 create mode 100644 pkgs/development/libraries/gecode/3.nix

diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/applications/misc/jekyll/default.nix
index 5e9505e9f320..e11e7361ffa3 100644
--- a/pkgs/applications/misc/jekyll/default.nix
+++ b/pkgs/applications/misc/jekyll/default.nix
@@ -8,8 +8,6 @@ bundlerEnv {
   lockfile = ./Gemfile.lock;
   gemset = ./gemset.nix;
 
-  buildInputs = [ curl ];
-
   meta = with lib; {
     description = "Simple, blog aware, static site generator";
     homepage    =  http://jekyllrb.com/;
diff --git a/pkgs/applications/networking/cluster/panamax/api/default.nix b/pkgs/applications/networking/cluster/panamax/api/default.nix
index dcfef83f1bec..6e20f7c23038 100644
--- a/pkgs/applications/networking/cluster/panamax/api/default.nix
+++ b/pkgs/applications/networking/cluster/panamax/api/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, buildEnv, fetchgit, fetchurl, makeWrapper, bundlerEnv, bundler_HEAD
+{ stdenv, buildEnv, fetchgit, fetchurl, makeWrapper, bundlerEnv, bundler
 , ruby, libxslt, libxml2, sqlite, openssl, docker
-, dataDir ? "/var/lib/panamax-api" }:
+, dataDir ? "/var/lib/panamax-api" }@args:
 
 with stdenv.lib;
 
@@ -14,9 +14,9 @@ stdenv.mkDerivation rec {
     gemset = ./gemset.nix;
     gemfile = ./Gemfile;
     lockfile = ./Gemfile.lock;
-    buildInputs = [ openssl ];
   };
-  bundler = bundler_HEAD.override { inherit ruby; };
+
+  bundler = args.bundler.override { inherit ruby; };
 
   database_yml = builtins.toFile "database.yml" ''
     production:
diff --git a/pkgs/applications/networking/cluster/panamax/ui/default.nix b/pkgs/applications/networking/cluster/panamax/ui/default.nix
index 3dac10613625..88e0efc18a64 100644
--- a/pkgs/applications/networking/cluster/panamax/ui/default.nix
+++ b/pkgs/applications/networking/cluster/panamax/ui/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchgit, fetchurl, makeWrapper, bundlerEnv, bundler_HEAD
-, ruby, rubygemsFun, openssl, sqlite, dataDir ? "/var/lib/panamax-ui"}:
+{ stdenv, fetchgit, fetchurl, makeWrapper, bundlerEnv, bundler
+, ruby, openssl, sqlite, dataDir ? "/var/lib/panamax-ui"}@args:
 
 with stdenv.lib;
 
@@ -13,10 +13,9 @@ stdenv.mkDerivation rec {
     gemset = ./gemset.nix;
     gemfile = ./Gemfile;
     lockfile = ./Gemfile.lock;
-    buildInputs = [ openssl ];
   };
 
-  bundler = bundler_HEAD.override { inherit ruby; };
+  bundler = args.bundler.override { inherit ruby; };
 
   src = fetchgit {
     rev = "refs/tags/v${version}";
diff --git a/pkgs/development/interpreters/ruby/build-ruby-gem/default.nix b/pkgs/development/interpreters/ruby/build-ruby-gem/default.nix
new file mode 100644
index 000000000000..d050faca2454
--- /dev/null
+++ b/pkgs/development/interpreters/ruby/build-ruby-gem/default.nix
@@ -0,0 +1,208 @@
+# This builds gems in a way that is compatible with bundler.
+#
+# Bundler installs gems from git sources _very_ differently from how RubyGems
+# installes gem packages, though they both install gem packages similarly.
+#
+# We monkey-patch Bundler to remove any impurities and then drive its internals
+# to install git gems.
+#
+# For the sake of simplicity, gem packages are installed with the standard `gem`
+# program.
+#
+# Note that bundler does not support multiple prefixes; it assumes that all
+# gems are installed in a common prefix, and has no support for specifying
+# otherwise. Therefore, if you want to be able to use the resulting derivations
+# with bundler, you need to create a symlink forrest first, which is what
+# `bundlerEnv` does for you.
+#
+# Normal gem packages can be used outside of bundler; a binstub is created in
+# $out/bin.
+
+{ lib, ruby, rubygems, bundler, fetchurl, fetchgit, makeWrapper, git, buildRubyGem
+} @ defs:
+
+lib.makeOverridable (
+
+{ name ? null
+, gemName
+, version ? null
+, type ? "gem"
+, document ? [] # e.g. [ "ri" "rdoc" ]
+, platform ? "ruby"
+, ruby ? defs.ruby
+, stdenv ? ruby.stdenv
+, namePrefix ? "${ruby.name}" + "-"
+, buildInputs ? []
+, doCheck ? false
+, meta ? {}
+, patches ? []
+, gemPath ? []
+, dontStrip ? true
+, remotes ? ["https://rubygems.org"]
+# Assume we don't have to build unless strictly necessary (e.g. the source is a
+# git checkout).
+# If you need to apply patches, make sure to set `dontBuild = false`;
+, dontBuild ? true
+, propagatedBuildInputs ? []
+, propagatedUserEnvPkgs ? []
+, buildFlags ? null
+, passthru ? {}
+, ...} @ attrs:
+
+if ! builtins.elem type [ "git" "gem" ]
+then throw "buildRubyGem: don't know how to build a gem of type \"${type}\""
+else
+
+let
+  shellEscape = x: "'${lib.replaceChars ["'"] [("'\\'" + "'")] x}'";
+  rubygems = (attrs.rubygems or defs.rubygems).override {
+    inherit ruby;
+  };
+  src = attrs.src or (
+    if type == "gem"
+    then fetchurl {
+      urls = map (remote: "${remote}/gems/${gemName}-${version}.gem") remotes;
+      inherit (attrs) sha256;
+    } else fetchgit {
+      inherit (attrs) url rev sha256 fetchSubmodules;
+      leaveDotGit = true;
+    }
+  );
+  documentFlag =
+    if document == []
+    then "-N"
+    else "--document ${lib.concatStringsSep "," document}";
+
+in
+
+stdenv.mkDerivation (attrs // {
+  inherit ruby rubygems;
+  inherit doCheck;
+  inherit dontBuild;
+  inherit dontStrip;
+  inherit type;
+
+  buildInputs = [
+    ruby rubygems makeWrapper
+  ] ++ lib.optionals (type == "git") [ git bundler ]
+    ++ buildInputs;
+
+  name = attrs.name or (namePrefix + gemName);
+
+  inherit src;
+
+  phases = attrs.phases or [ "unpackPhase" "patchPhase" "buildPhase" "installPhase" "fixupPhase" ];
+
+  unpackPhase = attrs.unpackPhase or ''
+    runHook preUnpack
+
+    if [[ -f $src && $src == *.gem ]]; then
+      if [[ -z "$dontBuild" ]]; then
+        # we won't know the name of the directory that RubyGems creates,
+        # so we'll just use a glob to find it and move it over.
+        gempkg="$src"
+        sourceRoot=source
+        gem unpack $gempkg --target=container
+        cp -r container/* $sourceRoot
+        rm -r container
+
+        # copy out the original gemspec, for convenience during patching /
+        # overrides.
+        gem specification $gempkg  --ruby > original.gemspec
+        gemspec=$(readlink -f .)/original.gemspec
+      else
+        gempkg="$src"
+      fi
+    else
+      # Fall back to the original thing for everything else.
+      dontBuild=""
+      preUnpack="" postUnpack="" unpackPhase
+    fi
+
+    runHook postUnpack
+  '';
+
+  buildPhase = attrs.buildPhase or ''
+    runHook preBuild
+
+    if [[ "$type" == "gem" ]]; then
+      if [[ -z "$gemspec" ]]; then
+        gemspec="$(find . -name '*.gemspec')"
+        echo "found the following gemspecs:"
+        echo "$gemspec"
+        gemspec="$(echo "$gemspec" | head -n1)"
+      fi
+
+      exec 3>&1
+      output="$(gem build $gemspec | tee >(cat - >&3))"
+      exec 3>&-
+
+      gempkg=$(echo "$output" | grep -oP 'File: \K(.*)')
+
+      echo "gem package built: $gempkg"
+    fi
+
+    runHook postBuild
+  '';
+
+  # Note:
+  #   We really do need to keep the $out/${ruby.gemPath}/cache.
+  #   This is very important in order for many parts of RubyGems/Bundler to not blow up.
+  #   See https://github.com/bundler/bundler/issues/3327
+  installPhase = attrs.installPhase or ''
+    runHook preInstall
+
+    export GEM_HOME=$out/${ruby.gemPath}
+    mkdir -p $GEM_HOME
+
+    echo "buildFlags: $buildFlags"
+
+    ${lib.optionalString (type == "git") ''
+    ruby ${./nix-bundle-install.rb} \
+      ${gemName} \
+      ${attrs.url} \
+      ${src} \
+      ${attrs.rev} \
+      ${version} \
+      ${shellEscape (toString buildFlags)}
+    ''}
+
+    ${lib.optionalString (type == "gem") ''
+    if [[ -z "$gempkg" ]]; then
+      echo "failure: \$gempkg path unspecified" 1>&2
+      exit 1
+    elif [[ ! -f "$gempkg" ]]; then
+      echo "failure: \$gempkg path invalid" 1>&2
+      exit 1
+    fi
+
+    gem install \
+      --local \
+      --force \
+      --http-proxy 'http://nodtd.invalid' \
+      --ignore-dependencies \
+      --build-root '/' \
+      --backtrace \
+      ${documentFlag} \
+      $gempkg $gemFlags -- $buildFlags
+
+    # looks like useless files which break build repeatability and consume space
+    rm -fv $out/${ruby.gemPath}/doc/*/*/created.rid || true
+    rm -fv $out/${ruby.gemPath}/gems/*/ext/*/mkmf.log || true
+
+    # write out metadata and binstubs
+    spec=$(echo $out/${ruby.gemPath}/specifications/*.gemspec)
+    ruby ${./gem-post-build.rb} "$spec"
+    ''}
+
+    runHook postInstall
+  '';
+
+  propagatedBuildInputs = gemPath ++ propagatedBuildInputs;
+  propagatedUserEnvPkgs = gemPath ++ propagatedUserEnvPkgs;
+
+  passthru = passthru // { isRubyGem = true; };
+  inherit meta;
+})
+
+)
diff --git a/pkgs/development/interpreters/ruby/build-ruby-gem/gem-post-build.rb b/pkgs/development/interpreters/ruby/build-ruby-gem/gem-post-build.rb
new file mode 100644
index 000000000000..112a9accc335
--- /dev/null
+++ b/pkgs/development/interpreters/ruby/build-ruby-gem/gem-post-build.rb
@@ -0,0 +1,77 @@
+require 'rbconfig'
+require 'rubygems'
+require 'rubygems/specification'
+require 'fileutils'
+
+ruby = File.join(ENV["ruby"], "bin", RbConfig::CONFIG['ruby_install_name'])
+out = ENV["out"]
+bin_path = File.join(ENV["out"], "bin")
+gem_home = ENV["GEM_HOME"]
+gem_path = ENV["GEM_PATH"].split(":")
+install_path = Dir.glob("#{gem_home}/gems/*").first
+gemspec_path = ARGV[0]
+
+if defined?(Encoding.default_internal)
+  Encoding.default_internal = Encoding::UTF_8
+  Encoding.default_external = Encoding::UTF_8
+end
+
+gemspec_content = File.read(gemspec_path)
+spec = nil
+if gemspec_content[0..2] == "---" # YAML header
+  spec = Gem::Specification.from_yaml(gemspec_content)
+else
+  spec = Gem::Specification.load(gemspec_path)
+end
+
+FileUtils.mkdir_p("#{out}/nix-support")
+
+# write meta-data
+meta = "#{out}/nix-support/gem-meta"
+FileUtils.mkdir_p(meta)
+FileUtils.ln_s(gemspec_path, "#{meta}/spec")
+File.open("#{meta}/name", "w") do |f|
+  f.write(spec.name)
+end
+File.open("#{meta}/install-path", "w") do |f|
+  f.write(install_path)
+end
+File.open("#{meta}/require-paths", "w") do |f|
+  f.write(spec.require_paths.join(" "))
+end
+File.open("#{meta}/executables", "w") do |f|
+  f.write(spec.executables.join(" "))
+end
+
+# add this gem to the GEM_PATH for dependencies
+File.open("#{out}/nix-support/setup-hook", "a") do |f|
+  f.puts("addToSearchPath GEM_PATH #{gem_home}")
+  spec.require_paths.each do |dir|
+    f.puts("addToSearchPath RUBYLIB #{install_path}/#{dir}")
+  end
+end
+
+# create regular rubygems binstubs
+FileUtils.mkdir_p(bin_path)
+spec.executables.each do |exe|
+  File.open("#{bin_path}/#{exe}", "w") do |f|
+    f.write(<<-EOF)
+#!#{ruby}
+#
+# This file was generated by Nix.
+#
+# The application '#{exe}' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+gem_path = ENV["GEM_PATH"]
+ENV["GEM_PATH"] = "\#{gem_path}\#{":" unless gem_path.nil? || gem_path.empty?}#{(gem_path+[gem_home]).join(":")}"
+
+require 'rubygems'
+
+load Gem.bin_path(#{spec.name.inspect}, #{exe.inspect})
+    EOF
+  end
+
+  FileUtils.chmod("+x", "#{bin_path}/#{exe}")
+end
diff --git a/pkgs/development/interpreters/ruby/build-ruby-gem/nix-bundle-install.rb b/pkgs/development/interpreters/ruby/build-ruby-gem/nix-bundle-install.rb
new file mode 100644
index 000000000000..647b83b52c38
--- /dev/null
+++ b/pkgs/development/interpreters/ruby/build-ruby-gem/nix-bundle-install.rb
@@ -0,0 +1,153 @@
+require 'rbconfig'
+require 'bundler/vendored_thor'
+require 'bundler'
+require 'rubygems/command'
+require 'fileutils'
+require 'pathname'
+require 'tmpdir'
+
+# Options:
+#
+#   name        - the gem name
+#   uri         - git repo uri
+#   repo        - path to local checkout
+#   ref         - the commit hash
+#   version     - gem version
+#   build-flags - build arguments
+
+ruby = File.join(ENV["ruby"], "bin", RbConfig::CONFIG['ruby_install_name'])
+out = ENV["out"]
+bin_dir = File.join(ENV["out"], "bin")
+
+name        = ARGV[0]
+uri         = ARGV[1]
+REPO        = ARGV[2]
+ref         = ARGV[3]
+version     = ARGV[4]
+build_flags = ARGV[5]
+
+# options to pass to bundler
+options = {
+  "name"    => name,
+  "uri"     => uri,
+  "ref"     => ref,
+  "version" => version,
+}
+
+# Monkey-patch Bundler to use our local checkout.
+# I wish we didn't have to do this, but bundler does not expose an API to do
+# these kinds of things.
+Bundler.module_eval do
+  def self.requires_sudo?
+    false
+  end
+
+  def self.root
+    # we don't have a Gemfile, so it doesn't make sense to try to make paths
+    # relative to the (non existent) parent directory thereof, so we give a
+    # nonsense path here.
+    Pathname.new("/no-root-path")
+  end
+
+  def self.bundle_path
+    Pathname.new(ENV["GEM_HOME"])
+  end
+
+  def self.locked_gems
+    nil
+  end
+end
+
+Bundler::Source::Git.class_eval do
+  def allow_git_ops?
+    true
+  end
+end
+
+Bundler::Source::Git::GitProxy.class_eval do
+  def checkout
+    unless path.exist?
+      FileUtils.mkdir_p(path.dirname)
+      FileUtils.cp_r(File.join(REPO, ".git"), path)
+      system("chmod -R +w #{path}")
+    end
+  end
+
+  def copy_to(destination, submodules=false)
+    unless File.exist?(destination.join(".git"))
+      FileUtils.mkdir_p(destination.dirname)
+      FileUtils.cp_r(REPO, destination)
+      system("chmod -R +w #{destination}")
+    end
+  end
+end
+
+# UI
+verbose = false
+no_color = false
+Bundler.ui = Bundler::UI::Shell.new({"no-color" => no_color})
+Bundler.ui.level = "debug" if verbose
+
+# Install
+source = Bundler::Source::Git.new(options)
+spec = source.specs.search_all(name).first
+Bundler.rubygems.with_build_args [build_flags] do
+  source.install(spec)
+end
+
+msg = spec.post_install_message
+if msg
+  Bundler.ui.confirm "Post-install message from #{name}:"
+  Bundler.ui.info msg
+end
+
+# Write out the binstubs
+if spec.executables.any?
+  FileUtils.mkdir_p(bin_dir)
+  spec.executables.each do |exe|
+    wrapper = File.join(bin_dir, exe)
+    File.open(wrapper, "w") do |f|
+      stub = generate_stub(spec.name, exe)
+      f.write(<<-EOF)
+#!#{ruby}
+#
+# This file was generated by Nix.
+#
+# The application '#{exe}' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path(#{spec.name.inspect}, #{exe.inspect})
+EOF
+    end
+
+    FileUtils.chmod("+x", wrapper)
+  end
+end
+
+# Write out metadata
+meta = "#{out}/nix-support/gem-meta"
+FileUtils.mkdir_p(meta)
+FileUtils.ln_s(spec.loaded_from.to_s, "#{meta}/spec")
+File.open("#{meta}/name", "w") do |f|
+  f.write spec.name
+end
+File.open("#{meta}/install-path", "w") do |f|
+  f.write source.install_path.to_s
+end
+File.open("#{meta}/require-paths", "w") do |f|
+  f.write spec.require_paths.join(" ")
+end
+File.open("#{meta}/executables", "w") do |f|
+  f.write spec.executables.join(" ")
+end
+
+# make the lib available during bundler/git installs
+File.open("#{out}/nix-support/setup-hook", "a") do |f|
+  spec.require_paths.each do |dir|
+    f.puts("addToSearchPath RUBYLIB #{source.install_path}/#{dir}")
+  end
+end
diff --git a/pkgs/development/interpreters/ruby/bundix/Gemfile b/pkgs/development/interpreters/ruby/bundix/Gemfile
deleted file mode 100644
index 4899cafc3738..000000000000
--- a/pkgs/development/interpreters/ruby/bundix/Gemfile
+++ /dev/null
@@ -1,4 +0,0 @@
-source "http://rubygems.org"
-gem "bundix",
-  :git => "https://github.com/cstrahan/bundix.git",
-  :ref => "v1.0.3"
diff --git a/pkgs/development/interpreters/ruby/bundix/Gemfile.lock b/pkgs/development/interpreters/ruby/bundix/Gemfile.lock
deleted file mode 100644
index f241a3bafd4f..000000000000
--- a/pkgs/development/interpreters/ruby/bundix/Gemfile.lock
+++ /dev/null
@@ -1,18 +0,0 @@
-GIT
-  remote: https://github.com/cstrahan/bundix.git
-  revision: c879cf901ff8084b4c97aaacfb5ecbdb0f95cc03
-  ref: v1.0.3
-  specs:
-    bundix (1.0.2)
-      thor (~> 0.19.1)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    thor (0.19.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundix!
diff --git a/pkgs/development/interpreters/ruby/bundix/default.nix b/pkgs/development/interpreters/ruby/bundix/default.nix
index 0196adb8f4c8..b5a49043c60b 100644
--- a/pkgs/development/interpreters/ruby/bundix/default.nix
+++ b/pkgs/development/interpreters/ruby/bundix/default.nix
@@ -1,9 +1,20 @@
-{ ruby, bundlerEnv }:
+{ ruby, fetchgit, buildRubyGem, bundler }:
 
-bundlerEnv {
-  name = "bundix";
-  inherit ruby;
-  gemset = ./gemset.nix;
-  gemfile = ./Gemfile;
-  lockfile = ./Gemfile.lock;
+let
+  thor = buildRubyGem {
+    gemName = "thor";
+    version = "0.19.1";
+    type = "gem";
+    sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z";
+  };
+
+in buildRubyGem {
+  gemName = "bundix";
+  version = "1.0.4";
+  gemPath = [ thor bundler ];
+  src = fetchgit {
+    url = "https://github.com/cstrahan/bundix.git";
+    rev = "6dcf1f71c61584f5c9b919ee9df7b0c554862076";
+    sha256 = "1w17bvc9srcgr4ry81ispcj35g9kxihbyknmqp8rnd4h5090b7b2";
+  };
 }
diff --git a/pkgs/development/interpreters/ruby/bundix/gemset.nix b/pkgs/development/interpreters/ruby/bundix/gemset.nix
deleted file mode 100644
index f8f6546671d9..000000000000
--- a/pkgs/development/interpreters/ruby/bundix/gemset.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "bundix" = {
-    version = "1.0.2";
-    source = {
-      type = "git";
-      url = "https://github.com/cstrahan/bundix.git";
-      rev = "c879cf901ff8084b4c97aaacfb5ecbdb0f95cc03";
-      sha256 = "05kmdnq4qa5h8l3asv05cjpnyplnqqx6hrqybj2cjlzmdxnkkgyj";
-      fetchSubmodules = false;
-    };
-    dependencies = [
-      "thor"
-    ];
-  };
-  "thor" = {
-    version = "0.19.1";
-    source = {
-      type = "gem";
-      sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z";
-    };
-  };
-}
\ No newline at end of file
diff --git a/pkgs/development/interpreters/ruby/bundler-env/default.nix b/pkgs/development/interpreters/ruby/bundler-env/default.nix
index 9fa6e52c4557..c7570d815e3b 100644
--- a/pkgs/development/interpreters/ruby/bundler-env/default.nix
+++ b/pkgs/development/interpreters/ruby/bundler-env/default.nix
@@ -1,312 +1,75 @@
 { stdenv, runCommand, writeText, writeScript, writeScriptBin, ruby, lib
-, callPackage, defaultGemConfig, fetchurl, fetchgit, buildRubyGem , bundler_HEAD
+, callPackage, defaultGemConfig, fetchurl, fetchgit, buildRubyGem, buildEnv
+, rubygems
 , git
+, makeWrapper
+, bundler
+, tree
 }@defs:
 
-# This is a work-in-progress.
-# The idea is that his will replace load-ruby-env.nix.
-
 { name, gemset, gemfile, lockfile, ruby ? defs.ruby, gemConfig ? defaultGemConfig
-, enableParallelBuilding ? false # TODO: this might not work, given the env-var shinanigans.
-, postInstall ? null
-, documentation ? false
+, postBuild ? null
+, document ? []
 , meta ? {}
+, ignoreCollisions ? false
 , ...
 }@args:
 
 let
 
   shellEscape = x: "'${lib.replaceChars ["'"] [("'\\'" + "'")] x}'";
-  const = x: y: x;
-  bundler = bundler_HEAD.override { inherit ruby; };
-  inherit (builtins) attrValues;
-
-  gemName = attrs: "${attrs.name}-${attrs.version}.gem";
-
-  fetchers.path = attrs: attrs.source.path;
-  fetchers.gem = attrs: fetchurl {
-    url = "${attrs.source.source or "https://rubygems.org"}/downloads/${gemName attrs}";
-    inherit (attrs.source) sha256;
-  };
-  fetchers.git = attrs: fetchgit {
-    inherit (attrs.source) url rev sha256 fetchSubmodules;
-    leaveDotGit = true;
-  };
-
-  applySrc = attrs:
-    attrs // {
-      src = (fetchers."${attrs.source.type}" attrs);
-    };
-
+  importedGemset = import gemset;
   applyGemConfigs = attrs:
-    if gemConfig ? "${attrs.name}"
-    then attrs // gemConfig."${attrs.name}" attrs
-    else attrs;
-
-  needsPatch = attrs:
-    (attrs ? patches) || (attrs ? prePatch) || (attrs ? postPatch);
-
-  # patch a gem or source tree.
-  # for gems, the gem is unpacked, patched, and then repacked.
-  # see: https://github.com/fedora-ruby/gem-patch/blob/master/lib/rubygems/patcher.rb
-  applyPatches = attrs:
-    if !needsPatch attrs
-    then attrs
-    else attrs // { src =
-      stdenv.mkDerivation {
-        name = gemName attrs;
-        phases = [ "unpackPhase" "patchPhase" "installPhase" ];
-        buildInputs = [ ruby ] ++ attrs.buildInputs or [];
-        patches = attrs.patches or [ ];
-        prePatch = attrs.prePatch or "true";
-        postPatch = attrs.postPatch or "true";
-        unpackPhase = ''
-          runHook preUnpack
-
-          if [[ -f ${attrs.src} ]]; then
-            isGem=1
-            # we won't know the name of the directory that RubyGems creates,
-            # so we'll just use a glob to find it and move it over.
-            gem unpack ${attrs.src} --target=container
-            cp -r container/* contents
-            rm -r container
-          else
-            cp -r ${attrs.src} contents
-            chmod -R +w contents
-          fi
-
-          cd contents
-          runHook postUnpack
-        '';
-        installPhase = ''
-          runHook preInstall
-
-          if [[ -n "$isGem" ]]; then
-            ${writeScript "repack.rb" ''
-              #!${ruby}/bin/ruby
-              require 'rubygems'
-              require 'rubygems/package'
-              require 'fileutils'
-
-              Encoding.default_internal = Encoding::UTF_8
-              Encoding.default_external = Encoding::UTF_8
-
-              if Gem::VERSION < '2.0'
-                load "${./package-1.8.rb}"
-              end
-
-              out = ENV['out']
-              files = Dir['**/{.[^\.]*,*}']
-
-              package = Gem::Package.new("${attrs.src}")
-              patched_package = Gem::Package.new(package.spec.file_name)
-              patched_package.spec = package.spec.clone
-              patched_package.spec.files = files
-
-              patched_package.build(false)
-
-              FileUtils.cp(patched_package.spec.file_name, out)
-            ''}
-          else
-            cp -r . $out
-          fi
-
-          runHook postInstall
-        '';
-      };
-    };
-
-  instantiate = (attrs:
-    applyPatches (applyGemConfigs (applySrc attrs))
+    (if gemConfig ? "${attrs.gemName}"
+    then attrs // gemConfig."${attrs.gemName}" attrs
+    else attrs);
+  configuredGemset = lib.flip lib.mapAttrs importedGemset (name: attrs:
+    applyGemConfigs (attrs // { gemName = name; })
   );
+  hasBundler = builtins.hasAttr "bundler" importedGemset;
+  bundler = if hasBundler then gems.bundler else defs.bundler.override (attrs: { inherit ruby; });
+  rubygems = defs.rubygems.override (attrs: { inherit ruby; });
+  gems = lib.flip lib.mapAttrs configuredGemset (name: attrs:
+    buildRubyGem ((removeAttrs attrs ["source"]) // attrs.source // {
+      inherit ruby rubygems;
+      gemName = name;
+      gemPath = map (gemName: gems."${gemName}") (attrs.dependencies or []);
+    }));
+  # We have to normalize the Gemfile.lock, otherwise bundler tries to be
+  # helpful by doing so at run time, causing executables to immediately bail
+  # out. Yes, I'm serious.
+  confFiles = runCommand "gemfile-and-lockfile" {} ''
+    mkdir -p $out
+    cp ${gemfile} $out/Gemfile
+    cp ${lockfile} $out/Gemfile.lock
 
-  instantiated = lib.flip lib.mapAttrs (import gemset) (name: attrs:
-    instantiate (attrs // { inherit name; })
-  );
-
-  needsPreInstall = attrs:
-    (attrs ? preInstall) || (attrs ? buildInputs) || (attrs ? nativeBuildInputs);
-
-  # TODO: support cross compilation? look at stdenv/generic/default.nix.
-  runPreInstallers = lib.fold (next: acc:
-    if !needsPreInstall next
-    then acc
-    else acc + ''
-      ${writeScript "${next.name}-pre-install" ''
-        #!${stdenv.shell}
-
-        export nativeBuildInputs="${toString ((next.nativeBuildInputs or []) ++ (next.buildInputs or []))}"
-
-        source ${stdenv}/setup
-
-        header "running pre-install script for ${next.name}"
-
-        ${next.preInstall or ""}
-
-        ${ruby}/bin/ruby -e 'print ENV.inspect' > env/${next.name}
-
-        stopNest
-      ''}
-    ''
-  ) "" (attrValues instantiated);
-
-  # copy *.gem to ./gems
-  copyGems = lib.fold (next: acc:
-    if next.source.type == "gem"
-    then acc + "cp ${next.src} gems/${gemName next}\n"
-    else acc
-  ) "" (attrValues instantiated);
-
-  runRuby = name: env: command:
-    runCommand name env ''
-      ${ruby}/bin/ruby ${writeText name command}
-    '';
-
-  # TODO: include json_pure, so the version of ruby doesn't matter.
-  # not all rubies have support for JSON built-in,
-  # so we'll convert JSON to ruby expressions.
-  json2rb = writeScript "json2rb" ''
-    #!${ruby}/bin/ruby
-    begin
-      require 'json'
-    rescue LoadError => ex
-      require 'json_pure'
-    end
-
-    puts JSON.parse(STDIN.read).inspect
+    cd $out
+    chmod +w Gemfile.lock
+    source ${rubygems}/nix-support/setup-hook
+    export GEM_PATH=${bundler}/${ruby.gemPath}
+    ${ruby}/bin/ruby -rubygems -e \
+      "require 'bundler'; Bundler.definition.lock('Gemfile.lock')"
   '';
+  envPaths = lib.attrValues gems ++ lib.optional (!hasBundler) bundler;
+  bundlerEnv = buildEnv {
+    inherit name ignoreCollisions;
+    paths = envPaths;
+    pathsToLink = [ "/lib" ];
+    postBuild = ''
+      source ${rubygems}/nix-support/setup-hook
 
-  # dump the instantiated gemset as a ruby expression.
-  serializedGemset = runCommand "gemset.rb" { json = builtins.toJSON instantiated; } ''
-    printf '%s' "$json" | ${json2rb} > $out
-  '';
-
-  # this is a mapping from a source type and identifier (uri/path/etc)
-  # to the pure store path.
-  # we'll use this from the patched bundler to make fetching sources pure.
-  sources = runRuby "sources.rb" { gemset = serializedGemset; } ''
-    out    = ENV['out']
-    gemset = eval(File.read(ENV['gemset']))
-
-    sources = {
-      "git"  => { },
-      "path" => { },
-      "gem"  => { },
-      "svn"  => { }
-    }
-
-    gemset.each_value do |spec|
-      type = spec["source"]["type"]
-      val = spec["src"]
-      key =
-        case type
-        when "gem"
-          spec["name"]
-        when "git"
-          spec["source"]["url"]
-        when "path"
-          spec["source"]["originalPath"]
-        when "svn"
-          nil # TODO
-        end
-
-      sources[type][key] = val if key
-    end
-
-    File.open(out, "wb") do |f|
-      f.print sources.inspect
-    end
-  '';
-
-  # rewrite PATH sources to point into the nix store.
-  purifiedLockfile = runRuby "purifiedLockfile" {} ''
-    out     = ENV['out']
-    sources = eval(File.read("${sources}"))
-    paths   = sources["path"]
-
-    lockfile = File.read("${lockfile}")
-
-    paths.each_pair do |impure, pure|
-      lockfile.gsub!(/^  remote: #{Regexp.escape(impure)}/, "  remote: #{pure}")
-    end
-
-    File.open(out, "wb") do |f|
-      f.print lockfile
-    end
-  '';
-
-  needsBuildFlags = attrs: attrs ? buildFlags;
-
-  mkBuildFlags = spec:
-    "export BUNDLE_BUILD__${lib.toUpper spec.name}='${lib.concatStringsSep " " (map shellEscape spec.buildFlags)}'";
-
-  allBuildFlags =
-    lib.concatStringsSep "\n"
-      (map mkBuildFlags
-        (lib.filter needsBuildFlags (attrValues instantiated)));
-
-  derivation = stdenv.mkDerivation {
-    inherit name;
-
-    buildInputs = [
-      ruby
-      bundler
-      git
-    ] ++ args.buildInputs or [];
-
-    phases = [ "installPhase" "fixupPhase" ];
-
-    outputs = [
-      "out"    # the installed libs/bins
-      "bundle" # supporting files for bundler
-    ];
-
-    installPhase = ''
-      mkdir -p $bundle
-      export BUNDLE_GEMFILE=$bundle/Gemfile
-      cp ${gemfile} $BUNDLE_GEMFILE
-      cp ${purifiedLockfile} $BUNDLE_GEMFILE.lock
-
-      export NIX_GEM_SOURCES=${sources}
-      export NIX_BUNDLER_GEMPATH=${bundler}/${ruby.gemPath}
-
-      export GEM_HOME=$out/${ruby.gemPath}
-      export GEM_PATH=$NIX_BUNDLER_GEMPATH:$GEM_HOME
-      mkdir -p $GEM_HOME
-
-      ${allBuildFlags}
-
-      mkdir gems
-      cp ${bundler}/${bundler.ruby.gemPath}/cache/bundler-*.gem gems
-      ${copyGems}
-
-      ${lib.optionalString (!documentation) ''
-        mkdir home
-        HOME="$(pwd -P)/home"
-        echo "gem: --no-rdoc --no-ri" > $HOME/.gemrc
-      ''}
-
-      mkdir env
-      ${runPreInstallers}
-
-      mkdir $out/bin
-      cp ${./monkey_patches.rb} monkey_patches.rb
-      export RUBYOPT="-rmonkey_patches.rb -I $(pwd -P)"
-      bundler install --frozen --binstubs ${lib.optionalString enableParallelBuilding "--jobs $NIX_BUILD_CORES"}
-      RUBYOPT=""
-
-      runHook postInstall
-    '';
-
-    inherit postInstall;
-
+      ${ruby}/bin/ruby ${./gen-bin-stubs.rb} \
+        "${ruby}/bin/ruby" \
+        "${confFiles}/Gemfile" \
+        "$out/${ruby.gemPath}" \
+        "${bundler}/${ruby.gemPath}" \
+        ${shellEscape (toString envPaths)}
+    '' + lib.optionalString (postBuild != null) postBuild;
     passthru = {
-      inherit ruby;
-      inherit bundler;
-
+      inherit ruby bundler meta gems;
       env = let
         irbrc = builtins.toFile "irbrc" ''
-          if not ENV["OLD_IRBRC"].empty?
+          if !(ENV["OLD_IRBRC"].nil? || ENV["OLD_IRBRC"].empty?)
             require ENV["OLD_IRBRC"]
           end
           require 'rubygems'
@@ -314,12 +77,12 @@ let
         '';
         in stdenv.mkDerivation {
           name = "interactive-${name}-environment";
-          nativeBuildInputs = [ ruby derivation ];
+          nativeBuildInputs = [ ruby bundlerEnv ];
           shellHook = ''
-            export BUNDLE_GEMFILE=${derivation.bundle}/Gemfile
-            export GEM_HOME=${derivation}/${ruby.gemPath}
-            export NIX_BUNDLER_GEMPATH=${bundler}/${ruby.gemPath}
-            export GEM_PATH=$NIX_BUNDLER_GEMPATH:$GEM_HOME
+            export BUNDLE_GEMFILE=${confFiles}/Gemfile
+            export BUNDLE_PATH=${bundlerEnv}/${ruby.gemPath}
+            export GEM_HOME=${bundlerEnv}/${ruby.gemPath}
+            export GEM_PATH=${bundlerEnv}/${ruby.gemPath}
             export OLD_IRBRC="$IRBRC"
             export IRBRC=${irbrc}
           '';
@@ -331,8 +94,8 @@ let
           '';
         };
     };
-
-    inherit meta;
   };
 
-in derivation
+in
+
+bundlerEnv
diff --git a/pkgs/development/interpreters/ruby/bundler-env/gen-bin-stubs.rb b/pkgs/development/interpreters/ruby/bundler-env/gen-bin-stubs.rb
new file mode 100644
index 000000000000..fac9c9ad9446
--- /dev/null
+++ b/pkgs/development/interpreters/ruby/bundler-env/gen-bin-stubs.rb
@@ -0,0 +1,46 @@
+require 'rbconfig'
+require 'rubygems'
+require 'rubygems/specification'
+require 'fileutils'
+
+# args/settings
+out = ENV["out"]
+ruby = ARGV[0]
+gemfile = ARGV[1]
+bundle_path = ARGV[2]
+bundler_gem_path = ARGV[3]
+paths = ARGV[4].split
+
+# generate binstubs
+FileUtils.mkdir_p("#{out}/bin")
+paths.each do |path|
+  next unless File.directory?("#{path}/nix-support/gem-meta")
+
+  name = File.read("#{path}/nix-support/gem-meta/name")
+  executables = File.read("#{path}/nix-support/gem-meta/executables").split
+  executables.each do |exe|
+    File.open("#{out}/bin/#{exe}", "w") do |f|
+      f.write(<<-EOF)
+#!#{ruby}
+#
+# This file was generated by Nix.
+#
+# The application '#{exe}' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+ENV["BUNDLE_GEMFILE"] = "#{gemfile}"
+ENV["BUNDLE_PATH"] = "#{bundle_path}"
+
+gem_path = ENV["GEM_PATH"]
+ENV["GEM_PATH"] = "\#{gem_path}\#{":" unless gem_path.nil? || gem_path.empty?}#{bundler_gem_path}"
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path(#{name.inspect}, #{exe.inspect})
+EOF
+      FileUtils.chmod("+x", "#{out}/bin/#{exe}")
+    end
+  end
+end
diff --git a/pkgs/development/interpreters/ruby/bundler-env/monkey_patches.rb b/pkgs/development/interpreters/ruby/bundler-env/monkey_patches.rb
deleted file mode 100644
index f68a20212cee..000000000000
--- a/pkgs/development/interpreters/ruby/bundler-env/monkey_patches.rb
+++ /dev/null
@@ -1,246 +0,0 @@
-require 'bundler'
-
-# Undo the RUBYOPT trickery.
-opt = ENV['RUBYOPT'].dup
-opt.gsub!(/-rmonkey_patches.rb -I [^ ]*/, '')
-ENV['RUBYOPT'] = opt
-
-Bundler.module_eval do
-  class << self
-    # mappings from original uris to store paths.
-    def nix_gem_sources
-      @nix_gem_sources ||=
-        begin
-          src = ENV['NIX_GEM_SOURCES']
-          eval(Bundler.read_file(src))
-        end
-    end
-
-    # extract the gemspecs from the gems pulled from Rubygems.
-    def nix_gemspecs
-      @nix_gemspecs ||= Dir.glob("gems/*.gem").map do |path|
-        Bundler.rubygems.spec_from_gem(path)
-      end
-    end
-
-    # swap out ENV
-    def nix_with_env(env, &block)
-      if env
-        old_env = ENV.to_hash
-        begin
-          ENV.replace(env)
-          block.call
-        ensure
-          ENV.replace(old_env)
-        end
-      else
-        block.call
-      end
-    end
-
-    # map a git uri to a fetchgit store path.
-    def nix_git(uri)
-      Pathname.new(nix_gem_sources["git"][uri])
-    end
-  end
-end
-
-Bundler::Source::Git::GitProxy.class_eval do
-  def checkout
-    unless path.exist?
-      FileUtils.mkdir_p(path.dirname)
-      FileUtils.cp_r(Bundler.nix_git(@uri).join(".git"), path)
-      system("chmod -R +w #{path}")
-    end
-  end
-
-  def copy_to(destination, submodules=false)
-    unless File.exist?(destination.join(".git"))
-      FileUtils.mkdir_p(destination.dirname)
-      FileUtils.cp_r(Bundler.nix_git(@uri), destination)
-      system("chmod -R +w #{destination}")
-    end
-  end
-end
-
-Bundler::Fetcher.class_eval do
-  def use_api
-    true
-  end
-
-  def fetch_dependency_remote_specs(gem_names)
-    Bundler.ui.debug "Query Gemcutter Dependency Endpoint API: #{gem_names.join(',')}"
-    deps_list = []
-
-    spec_list = gem_names.map do |name|
-      spec = Bundler.nix_gemspecs.detect {|spec| spec.name == name }
-      if spec.nil?
-        msg = "WARNING: Could not find gemspec for '#{name}'"
-        Bundler.ui.warn msg
-        nil
-      else
-        dependencies = spec.dependencies.
-          select {|dep| dep.type != :development}.
-          map do |dep|
-            deps_list << dep.name
-            dep
-          end
-
-        [spec.name, spec.version, spec.platform, dependencies]
-      end
-    end
-
-    spec_list.compact!
-
-    [spec_list, deps_list.uniq]
-  end
-end
-
-Bundler::Source::Rubygems.class_eval do
-  # We copy all gems into $PWD/gems, and this allows RubyGems to find those
-  # gems during installation.
-  def fetchers
-    @fetchers ||= [
-      Bundler::Fetcher.new(URI.parse("file://#{File.expand_path(Dir.pwd)}"))
-    ]
-  end
-
-  # Look-up gems that were originally from RubyGems.
-  def remote_specs
-    @remote_specs ||=
-      begin
-        lockfile = Bundler::LockfileParser.new(Bundler.read_file(Bundler.default_lockfile))
-        gem_names = lockfile.specs.
-          select {|spec| spec.source.is_a?(Bundler::Source::Rubygems)}.
-          map {|spec| spec.name}
-        idx = Bundler::Index.new
-        api_fetchers.each do |f|
-          Bundler.ui.info "Fetching source index from #{f.uri}"
-          idx.use f.specs(gem_names, self)
-        end
-        idx
-      end
-  end
-end
-
-Bundler::Installer.class_eval do
-
-  # WHY:
-  # This allows us to provide a typical Nix experience, where
-  # `buildInputs` and/or `preInstall` may set up the $PATH and other env-vars
-  # as needed. By swapping out the environment per install, we can have finer
-  # grained control than we would have otherwise.
-  #
-  # HOW:
-  # This is a wrapper around the original `install_gem_from_spec`.
-  # We expect that a "pre-installer" might exist at `pre-installers/<gem-name>`,
-  # and if it does, we execute it.
-  # The pre-installer is expected to dump its environment variables as a Ruby
-  # hash to `env/<gem-name>`.
-  # We then swap out the environment for the duration of the install,
-  # and then set it back to what it was originally.
-  alias original_install_gem_from_spec install_gem_from_spec
-  def install_gem_from_spec(spec, standalone = false, worker = 0)
-    env_dump = "env/#{spec.name}"
-    if File.exist?(env_dump)
-      env = eval(Bundler.read_file(env_dump))
-      unless env
-        Bundler.ui.error "The environment variables for #{spec.name} could not be loaded!"
-        exit 1
-      end
-      Bundler.nix_with_env(env) do
-        original_install_gem_from_spec(spec, standalone, worker)
-      end
-    else
-      original_install_gem_from_spec(spec, standalone, worker)
-    end
-  end
-
-  def generate_bundler_executable_stubs(spec, options = {})
-    return if spec.executables.empty?
-
-    out = ENV['out']
-
-    spec.executables.each do |executable|
-      next if executable == "bundle" || executable == "bundler"
-
-      binstub_path = "#{out}/bin/#{executable}"
-
-      File.open(binstub_path, 'w', 0777 & ~File.umask) do |f|
-        f.print <<-TEXT
-#!#{RbConfig.ruby}
-
-old_gemfile  = ENV["BUNDLE_GEMFILE"]
-old_gem_home = ENV["GEM_HOME"]
-old_gem_path = ENV["GEM_PATH"]
-
-ENV["BUNDLE_GEMFILE"] =
-  "#{ENV["BUNDLE_GEMFILE"]}"
-ENV["GEM_HOME"] =
-  "#{ENV["GEM_HOME"]}"
-ENV["GEM_PATH"] =
-  "#{ENV["NIX_BUNDLER_GEMPATH"]}:\#{ENV["GEM_HOME"]}\#{old_gem_path ? ":\#{old_gem_path}" : ""}}"
-
-require 'rubygems'
-require 'bundler/setup'
-
-ENV["BUNDLE_GEMFILE"] = old_gemfile
-ENV["GEM_HOME"]       = old_gem_home
-ENV["GEM_PATH"]       = old_gem_path
-
-load Gem.bin_path('#{spec.name}', '#{executable}')
-TEXT
-      end
-    end
-  end
-end
-
-Gem::Installer.class_eval do
-  # Make the wrappers automagically use bundler.
-  #
-  # Stage 1.
-  #   Set $BUNDLE_GEMFILE so bundler knows what gems to load.
-  #   Set $GEM_HOME to the installed gems, because bundler looks there for
-  #     non-Rubygems installed gems (e.g. git/svn/path sources).
-  #   Set $GEM_PATH to include both bundler and installed gems.
-  #
-  # Stage 2.
-  #   Setup bundler, locking down the gem versions.
-  #
-  # Stage 3.
-  #   Reset $BUNDLE_GEMFILE, $GEM_HOME, $GEM_PATH.
-  #
-  # Stage 4.
-  #   Run the actual executable.
-  def app_script_text(bin_file_name)
-    return <<-TEXT
-#!#{RbConfig.ruby}
-#
-# This file was generated by Nix's RubyGems.
-#
-# The application '#{spec.name}' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-old_gemfile  = ENV["BUNDLE_GEMFILE"]
-old_gem_home = ENV["GEM_HOME"]
-old_gem_path = ENV["GEM_PATH"]
-
-ENV["BUNDLE_GEMFILE"] =
-  "#{ENV["BUNDLE_GEMFILE"]}"
-ENV["GEM_HOME"] =
-  "#{ENV["GEM_HOME"]}"
-ENV["GEM_PATH"] =
-  "#{ENV["NIX_BUNDLER_GEMPATH"]}:\#{ENV["GEM_HOME"]}\#{old_gem_path ? ":\#{old_gem_path}" : ""}}"
-
-require 'rubygems'
-require 'bundler/setup'
-
-ENV["BUNDLE_GEMFILE"] = old_gemfile
-ENV["GEM_HOME"]       = old_gem_home
-ENV["GEM_PATH"]       = old_gem_path
-
-load Gem.bin_path('#{spec.name}', '#{bin_file_name}')
-TEXT
-  end
-end
diff --git a/pkgs/development/interpreters/ruby/bundler-env/package-1.8.rb b/pkgs/development/interpreters/ruby/bundler-env/package-1.8.rb
deleted file mode 100644
index 079b65f97ece..000000000000
--- a/pkgs/development/interpreters/ruby/bundler-env/package-1.8.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-require 'rubygems/installer'
-require 'rubygems/builder'
-
-# Simulate RubyGems 2.0 behavior.
-
-module Gem::Package
-  def self.new(gem)
-    @gem = gem
-    self
-  end
-
-  def self.extract_files(dir)
-    installer = Gem::Installer.new @gem
-    installer.unpack(dir)
-  end
-
-  def self.build(skip_validation=false)
-    builder = Gem::Builder.new(spec)
-    builder.build
-  end
-
-  def self.spec=(spec)
-    @spec = spec
-  end
-
-  def self.spec
-    @spec ||= Gem::Installer.new(@gem).spec
-  end
-end
diff --git a/pkgs/development/interpreters/ruby/bundler.nix b/pkgs/development/interpreters/ruby/bundler.nix
index 3789170f57fe..cdcd12990e27 100644
--- a/pkgs/development/interpreters/ruby/bundler.nix
+++ b/pkgs/development/interpreters/ruby/bundler.nix
@@ -1,17 +1,10 @@
 { buildRubyGem, makeWrapper, ruby, coreutils }:
 
-buildRubyGem {
-  name = "bundler-1.10.6";
-  namePrefix = "";
+buildRubyGem rec {
+  inherit ruby;
+  name = "${gemName}-${version}";
+  gemName = "bundler";
+  version = "1.10.6";
   sha256 = "1vlzfq0bkkj4jyq6av0y55mh5nj5n0f3mfbmmifwgkh44g8k6agv";
   dontPatchShebangs = true;
-  postInstall = ''
-    find $out -type f -perm -0100 | while read f; do
-      substituteInPlace $f \
-         --replace "/usr/bin/env" "${coreutils}/bin/env"
-    done
-
-    wrapProgram $out/bin/bundler \
-      --prefix PATH ":" ${ruby}/bin
-  '';
 }
diff --git a/pkgs/development/interpreters/ruby/gem.nix b/pkgs/development/interpreters/ruby/gem.nix
deleted file mode 100644
index bbc38226266b..000000000000
--- a/pkgs/development/interpreters/ruby/gem.nix
+++ /dev/null
@@ -1,136 +0,0 @@
-{ lib, ruby, rubygemsFun, fetchurl, makeWrapper, git } @ defs:
-
-lib.makeOverridable (
-
-{ name
-, ruby ? defs.ruby
-, rubygems ? (rubygemsFun ruby)
-, stdenv ? ruby.stdenv
-, namePrefix ? "${lib.replaceStrings ["-"] ["_"] ruby.name}" + "-"
-, buildInputs ? []
-, doCheck ? false
-, dontBuild ? true
-, meta ? {}
-, gemPath ? []
-, ...} @ attrs:
-
-stdenv.mkDerivation (attrs // {
-  inherit ruby rubygems;
-  inherit doCheck;
-
-  buildInputs = [ ruby rubygems makeWrapper git ] ++ buildInputs;
-
-  name = namePrefix + name;
-
-  src = if attrs ? src
-    then attrs.src
-    else fetchurl {
-      url = "http://rubygems.org/downloads/${attrs.name}.gem";
-      inherit (attrs) sha256;
-    };
-
-  phases = [ "unpackPhase" "patchPhase" "buildPhase" "checkPhase" "installPhase" "fixupPhase" ];
-
-  # The source is expected to either be a gem package or a directory.
-  #
-  # - Gem packages are already built, so they don't even need to be unpacked.
-  #   They will skip the buildPhase.
-  # - A directory containing the sources will need to go through all of the
-  #   usual phases.
-  unpackPhase= ''
-    gemRegex="\.gem"
-    if [[ $src =~ $gemRegex ]]
-    then
-      runHook preUnpack
-      echo "source is a gem package, won't unpack"
-      gempkg=$src
-      dontBuild=1
-      runHook postUnpack
-    else
-      # Fall back to the original thing for everything else.
-      unpackPhase
-    fi
-  '';
-
-  checkPhase = "true";
-
-  buildPhase = ''
-    runHook preBuild
-
-    # TODO: Investigate. The complete working tree is touched by fetchgit.
-    if [ -d .git ]; then
-      git reset
-    fi
-
-    gemspec=$(find . -name '*.gemspec')
-    echo "found the following gemspecs:"
-    echo "$gemspec"
-
-    gemspec=$(echo "$gemspec" | head -n1)
-    echo "building $gemspec"
-
-    exec 3>&1
-    output=$(gem build $gemspec | tee >(cat - >&3))
-    exec 3>&-
-
-    gempkg=$(echo "$output" | grep -oP 'File: \K(.*)')
-
-    echo "gem package built: $gempkg"
-
-    runHook postBuild
-  '';
-
-  installPhase = ''
-    runHook preInstall
-
-    # NOTE: This does NOT build the unpacked gem, but installs $src directly.
-    #       Gems that have not been downloaded from rubygems.org may need a
-    #       separate buildPhase.
-    #       --ignore-dependencies is necessary as rubygems otherwise always
-    #       connects to the repository, thus breaking pure builds.
-    GEM_HOME=$out/${ruby.gemPath} \
-      gem install \
-      --local \
-      --force \
-      --http-proxy "http://nodtd.invalid" \
-      --ignore-dependencies \
-      --build-root "/" \
-      --backtrace \
-      $gempkg $gemFlags -- $buildFlags
-
-    # Yes, we really do need the $out/${ruby.gemPath}/cache.
-    # This is very important in order for many parts of RubyGems/Bundler to not blow up.
-    # See https://github.com/bundler/bundler/issues/3327
-
-    mkdir -p $out/bin
-    for prog in $out/${ruby.gemPath}/gems/*/bin/*; do
-      makeWrapper $prog $out/bin/$(basename $prog) \
-        --prefix GEM_PATH : "$out/${ruby.gemPath}:$GEM_PATH" \
-        --prefix RUBYLIB : "${rubygems}/lib" \
-        $extraWrapperFlags ''${extraWrapperFlagsArray[@]}
-    done
-        #--prefix RUBYOPT rubygems \
-
-    # looks like useless files which break build repeatability and consume space
-    rm -fv $out/${ruby.gemPath}/doc/*/*/created.rid || true
-    rm -fv $out/${ruby.gemPath}/gems/*/ext/*/mkmf.log || true
-
-    mkdir -p $out/nix-support
-
-    cat > $out/nix-support/setup-hook <<EOF
-    if [[ "\$GEM_PATH" != *$out* ]]; then
-      addToSearchPath GEM_PATH $out/${ruby.gemPath}
-    fi
-    EOF
-
-    runHook postInstall
-  '';
-
-  propagatedBuildInputs = gemPath;
-  propagatedUserEnvPkgs = gemPath;
-
-  passthru.isRubyGem = true;
-  inherit meta;
-})
-
-)
diff --git a/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix b/pkgs/development/interpreters/ruby/gemconfig/default.nix
similarity index 82%
rename from pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix
rename to pkgs/development/interpreters/ruby/gemconfig/default.nix
index 36925bcdf558..ae8c0ee6e6ad 100644
--- a/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix
+++ b/pkgs/development/interpreters/ruby/gemconfig/default.nix
@@ -20,7 +20,7 @@
 { lib, fetchurl, writeScript, ruby, kerberos, libxml2, libxslt, python, stdenv, which
 , libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick
 , pkgconfig , ncurses, xapian, gpgme, utillinux, fetchpatch, tzdata, icu, libffi
-, cmake, libssh2, openssl, mysql, darwin
+, cmake, libssh2, openssl, mysql, darwin, git, perl, gecode_3, curl
 }:
 
 let
@@ -32,6 +32,14 @@ in
     buildInputs = [ which icu zlib ];
   };
 
+  dep-selector-libgecode = attrs: {
+    USE_SYSTEM_GECODE = true;
+    postInstall = ''
+      installPath=$(cat $out/nix-support/gem-meta/install-path)
+      sed -i $installPath/lib/dep-selector-libgecode.rb -e 's@VENDORED_GECODE_DIR =.*@VENDORED_GECODE_DIR = "${gecode_3}"@'
+    '';
+  };
+
   ffi = attrs: {
     buildInputs = [ libffi pkgconfig ];
   };
@@ -40,11 +48,12 @@ in
     buildInputs = [ gpgme ];
   };
 
+  # note that you need version >= v3.16.14.8,
+  # otherwise the gem will fail to link to the libv8 binary.
+  # see: https://github.com/cowboyd/libv8/pull/161
   libv8 = attrs: {
     buildInputs = [ which v8 python ];
-    buildFlags = [
-      "--with-system-v8=true"
-    ];
+    buildFlags = [ "--with-system-v8=true" ];
   };
 
   mysql2 = attrs: {
@@ -73,12 +82,20 @@ in
     buildInputs = lib.optional stdenv.isDarwin darwin.libobjc;
   };
 
+  patron = attrs: {
+    buildInputs = [ curl ];
+  };
+
   pg = attrs: {
     buildFlags = [
       "--with-pg-config=${postgresql}/bin/pg_config"
     ];
   };
 
+  puma = attrs: {
+    buildInputs = [ openssl ];
+  };
+
   rmagick = attrs: {
     buildInputs = [ imagemagick pkgconfig ];
   };
@@ -95,6 +112,7 @@ in
   };
 
   sup = attrs: {
+    dontBuild = false;
     # prevent sup from trying to dynamically install `xapian-ruby`.
     postPatch = ''
       cp ${./mkrf_conf_xapian.rb} ext/mkrf_conf_xapian.rb
@@ -118,6 +136,7 @@ in
   };
 
   tzinfo = attrs: {
+    dontBuild = false;
     postPatch = ''
       substituteInPlace lib/tzinfo/zoneinfo_data_source.rb \
         --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
@@ -130,6 +149,7 @@ in
 
   xapian-ruby = attrs: {
     # use the system xapian
+    dontBuild = false;
     buildInputs = [ xapian pkgconfig zlib ];
     postPatch = ''
       cp ${./xapian-Rakefile} Rakefile
diff --git a/pkgs/development/interpreters/ruby/bundler-env/mkrf_conf_xapian.rb b/pkgs/development/interpreters/ruby/gemconfig/mkrf_conf_xapian.rb
similarity index 100%
rename from pkgs/development/interpreters/ruby/bundler-env/mkrf_conf_xapian.rb
rename to pkgs/development/interpreters/ruby/gemconfig/mkrf_conf_xapian.rb
diff --git a/pkgs/development/interpreters/ruby/bundler-env/xapian-Rakefile b/pkgs/development/interpreters/ruby/gemconfig/xapian-Rakefile
similarity index 100%
rename from pkgs/development/interpreters/ruby/bundler-env/xapian-Rakefile
rename to pkgs/development/interpreters/ruby/gemconfig/xapian-Rakefile
diff --git a/pkgs/development/interpreters/ruby/load-ruby-env.nix b/pkgs/development/interpreters/ruby/load-ruby-env.nix
deleted file mode 100644
index c4356ed5f50f..000000000000
--- a/pkgs/development/interpreters/ruby/load-ruby-env.nix
+++ /dev/null
@@ -1,69 +0,0 @@
-{ ruby, lib, callPackage, gemFixes, fetchurl, fetchgit, buildRubyGem }@defs:
-
-# This function builds a set of gems. You first convert your Gemfile to an attrset
-# called a "gemset", and then use this function to build the gemset.
-#
-# A gemset looks like the following:
-#
-#   {
-#     libv8 = {
-#       version = "3.16.14.7";
-#       src = {
-#         type = "gem";
-#         sha256 = "...";
-#       };
-#     };
-#     therubyracer = {
-#       version = "0.12.1";
-#       dependencies = [ "libv8" ];
-#       src = {
-#         type = "gem";
-#         sha256 = "...";
-#       };
-#     };
-#   }
-#
-# If you use these gems as build inputs, the GEM_PATH will be updated
-# appropriately, and command like `bundle exec` should work out of the box.
-
-{ gemset, ruby ? defs.ruby, fixes ? gemFixes }@args:
-
-let
-  const = x: y: x;
-
-  fetchers.path = attrs: attrs.src.path;
-  fetchers.gem = attrs: fetchurl {
-    url = "${attrs.src.source or "https://rubygems.org"}/downloads/${attrs.name}-${attrs.version}.gem";
-    inherit (attrs.src) sha256;
-  };
-  fetchers.git = attrs: fetchgit {
-    inherit (attrs.src) url rev sha256 fetchSubmodules;
-    leaveDotGit = true;
-  };
-
-  instantiate = (attrs:
-    let
-      defaultAttrs = {
-        name = "${attrs.name}-${attrs.version}";
-        inherit ruby gemPath;
-      };
-      gemPath = map (name: gemset''."${name}") (attrs.dependencies or []);
-      fixedAttrs = attrs // (fixes."${attrs.name}" or (const {})) attrs;
-      withSource = fixedAttrs //
-        (if (lib.isDerivation fixedAttrs.src || builtins.isString fixedAttrs.src)
-           then {}
-           else { src = (fetchers."${fixedAttrs.src.type}" fixedAttrs); });
-
-    in
-      buildRubyGem (withSource // defaultAttrs)
-  );
-
-  gemset' = if builtins.isAttrs gemset then gemset else import gemset;
-
-  gemset'' = lib.flip lib.mapAttrs gemset' (name: attrs:
-    if (lib.isDerivation attrs)
-      then attrs
-      else instantiate (attrs // { inherit name; })
-  );
-
-in gemset''
diff --git a/pkgs/development/interpreters/ruby/rubygems.nix b/pkgs/development/interpreters/ruby/rubygems.nix
index f4942b840919..b6ac04808979 100644
--- a/pkgs/development/interpreters/ruby/rubygems.nix
+++ b/pkgs/development/interpreters/ruby/rubygems.nix
@@ -1,37 +1,35 @@
-args @ { makeWrapper, ruby, ... }: with args;
+{ stdenv, lib, fetchurl, makeWrapper, ruby }:
 
-rec {
-  name = "rubygems-" + version;
+stdenv.mkDerivation rec {
+  name = "rubygems-${version}";
   version = "2.4.1";
   src = fetchurl {
     url = "http://production.cf.rubygems.org/rubygems/${name}.tgz";
     sha256 = "0cpr6cx3h74ykpb0cp4p4xg7a8j0bhz3sk271jq69l4mm4zy4h4f";
   };
 
-  buildInputs = [ruby makeWrapper];
-  configureFlags = [];
+  patches = [ ./gem_hook.patch ];
 
-  doInstall = fullDepEntry (''
+  buildInputs = [ruby makeWrapper];
+
+  buildPhase = ":";
+
+  installPhase = ''
     ruby setup.rb --prefix=$out/
+
     wrapProgram $out/bin/gem --prefix RUBYLIB : $out/lib
-    find $out -type f -name "*.rb" | xargs sed -i "s@/usr/bin/env@$(type -p env)@g"
+
+    find $out -type f -name "*.rb" |
+      xargs sed -i "s@/usr/bin/env@$(type -p env)@g"
+
     mkdir -pv $out/nix-support
     cat > $out/nix-support/setup-hook <<EOF
     export RUBYOPT=rubygems
     addToSearchPath RUBYLIB $out/lib
-    EOF'') ["minInit" "addInputs" "doUnpack" "defEnsureDir"];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["doPatch" "doInstall"];
+    EOF
+  '';
 
   meta = {
-    description = "Ruby gems package collection";
-    longDescription = ''
-      Nix can create nix packages from gems.
-
-      To use it by installing gem-nix package.
-    '';
+    description = "A package management framework for Ruby";
   };
-
-  patches = [ ./gem_hook.patch ];
 }
diff --git a/pkgs/development/libraries/gecode/3.nix b/pkgs/development/libraries/gecode/3.nix
new file mode 100644
index 000000000000..a0f3dc636f92
--- /dev/null
+++ b/pkgs/development/libraries/gecode/3.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, perl }:
+
+stdenv.mkDerivation rec {
+  name = "gecode-${version}";
+  version = "3.7.3";
+
+  src = fetchurl {
+    url = "http://www.gecode.org/download/${name}.tar.gz";
+    sha256 = "0k45jas6p3cyldgyir1314ja3174sayn2h2ly3z9b4dl3368pk77";
+  };
+
+  buildInputs = [ perl ];
+
+  meta = with stdenv.lib; {
+    license = licenses.mit;
+    homepage = http://www.gecode.org;
+    description = "Toolkit for developing constraint-based systems";
+    platforms = platforms.all;
+    maintainers = [ maintainers.manveru ];
+  };
+}
diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix
index b3b2040559aa..36df8bba1b9f 100644
--- a/pkgs/development/tools/vagrant/default.nix
+++ b/pkgs/development/tools/vagrant/default.nix
@@ -7,7 +7,8 @@ let
   version = "1.8.0";
   rake = buildRubyGem {
     inherit ruby;
-    name = "rake-10.4.2";
+    gemName = "rake";
+    version = "10.4.2";
     sha256 = "1rn03rqlf1iv6n87a78hkda2yqparhhaivfjpizblmxvlw2hk5r8";
   };
 
diff --git a/pkgs/tools/audio/mpdcron/default.nix b/pkgs/tools/audio/mpdcron/default.nix
index d368ee321afe..f113eaf8145e 100644
--- a/pkgs/tools/audio/mpdcron/default.nix
+++ b/pkgs/tools/audio/mpdcron/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, autoconf, automake, libtool, pkgconfig, glib, libdaemon, buildRubyGem
+{ stdenv, fetchgit, autoconf, automake, libtool, pkgconfig, glib, libdaemon
 , mpd_clientlib, curl, sqlite, ruby, bundlerEnv, libnotify, pandoc }:
 
 let
diff --git a/pkgs/tools/misc/fluentd/default.nix b/pkgs/tools/misc/fluentd/default.nix
index 800e1c6f67a1..1a1871e22da6 100644
--- a/pkgs/tools/misc/fluentd/default.nix
+++ b/pkgs/tools/misc/fluentd/default.nix
@@ -8,8 +8,6 @@ bundlerEnv {
   lockfile = ./Gemfile.lock;
   gemset = ./gemset.nix;
 
-  buildInputs = [ curl ];
-
   meta = with lib; {
     description = "A data collector";
     homepage    = http://www.fluentd.org/;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 402d00e31794..09dcae2b16cc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5278,11 +5278,9 @@ let
     ruby = ruby_2_1_3;
   };
   bundler = callPackage ../development/interpreters/ruby/bundler.nix { };
-  bundler_HEAD = import ../development/interpreters/ruby/bundler-head.nix {
-    inherit buildRubyGem coreutils fetchgit;
-  };
-  defaultGemConfig = callPackage ../development/interpreters/ruby/bundler-env/default-gem-config.nix { };
-  buildRubyGem = callPackage ../development/interpreters/ruby/gem.nix { };
+  bundler_HEAD = bundler;
+  defaultGemConfig = callPackage ../development/interpreters/ruby/gemconfig/default.nix { };
+  buildRubyGem = callPackage ../development/interpreters/ruby/build-ruby-gem { };
   bundlerEnv = callPackage ../development/interpreters/ruby/bundler-env { };
 
   inherit (callPackage ../development/interpreters/ruby {})
@@ -5298,10 +5296,7 @@ let
   ruby_2_1 = ruby_2_1_7;
   ruby_2_2 = ruby_2_2_3;
 
-  rubygemsFun = ruby: builderDefsPackage (callPackage ../development/interpreters/ruby/rubygems.nix) {
-    inherit ruby;
-  };
-  rubygems = hiPrio (rubygemsFun ruby);
+  rubygems = hiPrio (callPackage ../development/interpreters/ruby/rubygems.nix {});
 
   rq = callPackage ../applications/networking/cluster/rq { };
 
@@ -6449,7 +6444,9 @@ let
 
   gdbm = callPackage ../development/libraries/gdbm { };
 
-  gecode = callPackage ../development/libraries/gecode { };
+  gecode_3 = callPackage ../development/libraries/gecode/3.nix { };
+  gecode_4 = callPackage ../development/libraries/gecode { };
+  gecode = gecode_4;
 
   gegl = callPackage ../development/libraries/gegl { };
 

From 57210ce1c10b761696941d830ccb6d7f7846c449 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 26 Dec 2015 01:09:00 +0000
Subject: [PATCH 035/884] wpa_supplicant module: remove obsolete option

networking.WLANInterface has been obsolete for years
---
 .../services/networking/wpa_supplicant.nix      | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix
index 9e04bd401906..bef4b2bc0b99 100644
--- a/nixos/modules/services/networking/wpa_supplicant.nix
+++ b/nixos/modules/services/networking/wpa_supplicant.nix
@@ -3,14 +3,8 @@
 with lib;
 
 let
-
   cfg = config.networking.wireless;
   configFile = "/etc/wpa_supplicant.conf";
-
-  ifaces =
-    cfg.interfaces ++
-    optional (config.networking.WLANInterface != "") config.networking.WLANInterface;
-
 in
 
 {
@@ -18,12 +12,6 @@ in
   ###### interface
 
   options = {
-
-    networking.WLANInterface = mkOption {
-      default = "";
-      description = "Obsolete. Use <option>networking.wireless.interfaces</option> instead.";
-    };
-
     networking.wireless = {
       enable = mkOption {
         type = types.bool;
@@ -95,8 +83,9 @@ in
     services.dbus.packages = [ pkgs.wpa_supplicant ];
 
     # FIXME: start a separate wpa_supplicant instance per interface.
-    jobs.wpa_supplicant =
-      { description = "WPA Supplicant";
+    jobs.wpa_supplicant = let
+      ifaces = cfg.interfaces;
+    in { description = "WPA Supplicant";
 
         wantedBy = [ "network.target" ];
 

From 9dceabc95dfefc01cef566ffa463c7731da88180 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 26 Dec 2015 01:12:32 +0000
Subject: [PATCH 036/884] wpa_supplicant module: refactor

---
 .../services/networking/wpa_supplicant.nix    | 75 ++++++++-----------
 1 file changed, 32 insertions(+), 43 deletions(-)

diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix
index bef4b2bc0b99..5979ab7fbe33 100644
--- a/nixos/modules/services/networking/wpa_supplicant.nix
+++ b/nixos/modules/services/networking/wpa_supplicant.nix
@@ -5,12 +5,7 @@ with lib;
 let
   cfg = config.networking.wireless;
   configFile = "/etc/wpa_supplicant.conf";
-in
-
-{
-
-  ###### interface
-
+in {
   options = {
     networking.wireless = {
       enable = mkOption {
@@ -73,19 +68,17 @@ in
     };
   };
 
+  config = mkMerge [
+    (mkIf cfg.enable {
+      environment.systemPackages =  [ pkgs.wpa_supplicant ];
 
-  ###### implementation
+      services.dbus.packages = [ pkgs.wpa_supplicant ];
 
-  config = mkIf cfg.enable {
-
-    environment.systemPackages =  [ pkgs.wpa_supplicant ];
-
-    services.dbus.packages = [ pkgs.wpa_supplicant ];
-
-    # FIXME: start a separate wpa_supplicant instance per interface.
-    jobs.wpa_supplicant = let
-      ifaces = cfg.interfaces;
-    in { description = "WPA Supplicant";
+      # FIXME: start a separate wpa_supplicant instance per interface.
+      systemd.services.wpa_supplicant = let
+        ifaces = cfg.interfaces;
+      in {
+        description = "WPA Supplicant";
 
         wantedBy = [ "network.target" ];
 
@@ -101,37 +94,33 @@ in
           fi
         '';
 
-        script =
-          ''
-            ${if ifaces == [] then ''
-              for i in $(cd /sys/class/net && echo *); do
-                DEVTYPE=
-                source /sys/class/net/$i/uevent
-                if [ "$DEVTYPE" = "wlan" -o -e /sys/class/net/$i/wireless ]; then
-                  ifaces="$ifaces''${ifaces:+ -N} -i$i"
-                fi
-              done
-            '' else ''
-              ifaces="${concatStringsSep " -N " (map (i: "-i${i}") ifaces)}"
-            ''}
-            exec wpa_supplicant -s -u -D${cfg.driver} -c ${configFile} $ifaces
-          '';
+        script = ''
+          ${if ifaces == [] then ''
+            for i in $(cd /sys/class/net && echo *); do
+              DEVTYPE=
+              source /sys/class/net/$i/uevent
+              if [ "$DEVTYPE" = "wlan" -o -e /sys/class/net/$i/wireless ]; then
+                ifaces="$ifaces''${ifaces:+ -N} -i$i"
+              fi
+            done
+          '' else ''
+            ifaces="${concatStringsSep " -N " (map (i: "-i${i}") ifaces)}"
+          ''}
+          exec wpa_supplicant -s -u -D${cfg.driver} -c ${configFile} $ifaces
+        '';
       };
 
-    powerManagement.resumeCommands =
-      ''
+      powerManagement.resumeCommands = ''
         ${config.systemd.package}/bin/systemctl try-restart wpa_supplicant
       '';
 
-    assertions = [{ assertion = !cfg.userControlled.enable || cfg.interfaces != [];
-                    message = "user controlled wpa_supplicant needs explicit networking.wireless.interfaces";}];
-
-    # Restart wpa_supplicant when a wlan device appears or disappears.
-    services.udev.extraRules =
-      ''
+      # Restart wpa_supplicant when a wlan device appears or disappears.
+      services.udev.extraRules = ''
         ACTION=="add|remove", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", RUN+="${config.systemd.package}/bin/systemctl try-restart wpa_supplicant.service"
       '';
-
-  };
-
+    })
+    {
+      meta.maintainers = with lib.maintainers; [ globin ];
+    }
+  ];
 }

From 56a53ff458d470e6d2ccf1c2712af0ff594e25c4 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 29 Dec 2015 10:21:38 +0000
Subject: [PATCH 037/884] wpa_supplicant module: add networks option

---
 nixos/doc/manual/configuration/wireless.xml   | 14 +++-
 .../services/networking/wpa_supplicant.nix    | 66 ++++++++++++-------
 2 files changed, 56 insertions(+), 24 deletions(-)

diff --git a/nixos/doc/manual/configuration/wireless.xml b/nixos/doc/manual/configuration/wireless.xml
index 373a9168cc87..13e4283d241c 100644
--- a/nixos/doc/manual/configuration/wireless.xml
+++ b/nixos/doc/manual/configuration/wireless.xml
@@ -18,8 +18,18 @@ NixOS will start wpa_supplicant for you if you enable this setting:
 networking.wireless.enable = true;
 </programlisting>
 
-NixOS currently does not generate wpa_supplicant's
-configuration file, <literal>/etc/wpa_supplicant.conf</literal>. You should edit this file
+NixOS lets you specify networks for wpa_supplicant declaratively:
+<programlisting>
+networking.wireless.networks = {
+  echelon = {
+    psk = "abcdefgh";
+  };
+  "free.wifi" = {};
+}
+</programlisting>
+
+When no networks are set it will default to using a configuration file at
+<literal>/etc/wpa_supplicant.conf</literal>. You should edit this file
 yourself to define wireless networks, WPA keys and so on (see
 wpa_supplicant.conf(5)).
 </para>
diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix
index 5979ab7fbe33..1292ca7f08e0 100644
--- a/nixos/modules/services/networking/wpa_supplicant.nix
+++ b/nixos/modules/services/networking/wpa_supplicant.nix
@@ -4,33 +4,29 @@ with lib;
 
 let
   cfg = config.networking.wireless;
-  configFile = "/etc/wpa_supplicant.conf";
+  configFile = if cfg.networks != {} then pkgs.writeText "wpa_supplicant.conf" ''
+    ${optionalString cfg.userControlled.enable ''
+      ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=${cfg.userControlled.group}
+      update_config=1''}
+    ${concatStringsSep "\n" (mapAttrsToList (ssid: networkConfig: ''
+      network={
+        ssid="${ssid}"
+        ${optionalString (networkConfig.psk != null) ''psk="${networkConfig.psk}"''}
+        ${optionalString (networkConfig.psk == null) ''key_mgmt=NONE''}
+      }
+    '') cfg.networks)}
+  '' else "/etc/wpa_supplicant.conf";
 in {
   options = {
     networking.wireless = {
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Whether to start <command>wpa_supplicant</command> to scan for
-          and associate with wireless networks.  Note: NixOS currently
-          does not manage <command>wpa_supplicant</command>'s
-          configuration file, <filename>${configFile}</filename>.  You
-          should edit this file yourself to define wireless networks,
-          WPA keys and so on (see
-          <citerefentry><refentrytitle>wpa_supplicant.conf</refentrytitle>
-          <manvolnum>5</manvolnum></citerefentry>), or use
-          networking.wireless.userControlled.* to allow users to add entries
-          through <command>wpa_cli</command> and <command>wpa_gui</command>.
-        '';
-      };
+      enable = mkEnableOption "wpa_supplicant";
 
       interfaces = mkOption {
         type = types.listOf types.str;
         default = [];
         example = [ "wlan0" "wlan1" ];
         description = ''
-          The interfaces <command>wpa_supplicant</command> will use.  If empty, it will
+          The interfaces <command>wpa_supplicant</command> will use. If empty, it will
           automatically use all wireless interfaces.
         '';
       };
@@ -41,6 +37,34 @@ in {
         description = "Force a specific wpa_supplicant driver.";
       };
 
+      networks = mkOption {
+        type = types.attrsOf (types.submodule {
+          options = {
+            psk = mkOption {
+              type = types.nullOr types.str;
+              default = null;
+              description = ''
+                The network's pre-shared key in plaintext defaulting
+                to being a network without any authentication.
+              '';
+            };
+          };
+        });
+        description = ''
+          The network definitions to automatically connect to when
+           <command>wpa_supplicant</command> is running. If this
+           parameter is left empty wpa_supplicant will use
+          /etc/wpa_supplicant.conf as the configuration file.
+        '';
+        default = {};
+        example = literalExample ''
+          echelon = {
+            psk = "abcdefgh";
+          };
+          "free.wifi" = {};
+        '';
+      };
+
       userControlled = {
         enable = mkOption {
           type = types.bool;
@@ -51,10 +75,8 @@ in {
             to depend on a large package such as NetworkManager just to pick nearby
             access points.
 
-            When you want to use this, make sure ${configFile} doesn't exist.
-            It will be created for you.
-
-            Currently it is also necessary to explicitly specify networking.wireless.interfaces.
+            When using a declarative network specification you cannot persist any
+            settings via wpa_gui or wpa_cli.
           '';
         };
 

From 4bf7afc78ee061ecf2a9e54b202e37239d50428b Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 29 Dec 2015 10:22:03 +0000
Subject: [PATCH 038/884] wpa_supplicant module: remove preStart hack

If the config file is managed imperatively we shouldn't touch it.
---
 nixos/modules/services/networking/wpa_supplicant.nix | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix
index 1292ca7f08e0..397811f96266 100644
--- a/nixos/modules/services/networking/wpa_supplicant.nix
+++ b/nixos/modules/services/networking/wpa_supplicant.nix
@@ -106,16 +106,6 @@ in {
 
         path = [ pkgs.wpa_supplicant ];
 
-        preStart = ''
-          touch -a ${configFile}
-          chmod 600 ${configFile}
-        '' + optionalString cfg.userControlled.enable ''
-          if [ ! -s ${configFile} ]; then
-            echo "ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=${cfg.userControlled.group}" >> ${configFile}
-            echo "update_config=1" >> ${configFile}
-          fi
-        '';
-
         script = ''
           ${if ifaces == [] then ''
             for i in $(cd /sys/class/net && echo *); do

From 952563d6201268180e27e33f4ed0f3dbe054f2be Mon Sep 17 00:00:00 2001
From: Emery <emery@v36.space>
Date: Tue, 29 Dec 2015 11:13:12 +0100
Subject: [PATCH 039/884] WindowLab: initial pkg at 1.40

http://nickgravgaard.com/windowlab/
---
 nixos/modules/module-list.nix                 |  1 +
 .../x11/window-managers/windowlab.nix         | 22 ++++++++++++
 .../window-managers/windowlab/default.nix     | 34 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 4 files changed, 59 insertions(+)
 create mode 100644 nixos/modules/services/x11/window-managers/windowlab.nix
 create mode 100644 pkgs/applications/window-managers/windowlab/default.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 5c1cde98d3dc..7fc41b0e9ca7 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -441,6 +441,7 @@
   ./services/x11/window-managers/metacity.nix
   ./services/x11/window-managers/none.nix
   ./services/x11/window-managers/twm.nix
+  ./services/x11/window-managers/windowlab.nix
   ./services/x11/window-managers/wmii.nix
   ./services/x11/window-managers/xmonad.nix
   ./services/x11/xfs.nix
diff --git a/nixos/modules/services/x11/window-managers/windowlab.nix b/nixos/modules/services/x11/window-managers/windowlab.nix
new file mode 100644
index 000000000000..fb891a39fa41
--- /dev/null
+++ b/nixos/modules/services/x11/window-managers/windowlab.nix
@@ -0,0 +1,22 @@
+{lib, pkgs, config, ...}:
+
+let
+  cfg = config.services.xserver.windowManager.windowlab;
+in
+
+{
+  options = {
+    services.xserver.windowManager.windowlab.enable =
+      lib.mkEnableOption "windowlab";
+  };
+
+  config = lib.mkIf cfg.enable {
+    services.xserver.windowManager = {
+      session =
+        [{ name  = "windowlab";
+           start = "${pkgs.windowlab}/bin/windowlab";
+        }];
+    };
+    environment.systemPackages = [ pkgs.windowlab ];
+  };
+}
diff --git a/pkgs/applications/window-managers/windowlab/default.nix b/pkgs/applications/window-managers/windowlab/default.nix
new file mode 100644
index 000000000000..39865c4b3e7d
--- /dev/null
+++ b/pkgs/applications/window-managers/windowlab/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, pkgconfig
+, libX11, libXext, libXft }:
+
+let version = "1.40"; in
+stdenv.mkDerivation {
+  name = "windowlab-${version}";
+
+  src = fetchurl {
+    url = "http://nickgravgaard.com/windowlab/windowlab-${version}.tar";
+    sha256 = "1fx4jwq4s98p2wpvawsiww7d6568bpjgcjpks61dzfj8p2j32s4d";
+  };
+
+  buildInputs = [ pkgconfig libX11 libXext libXft ];
+
+  postPatch =
+    ''
+      mv Makefile Makefile.orig
+      echo \
+         "
+          DEFINES += -DXFT
+          EXTRA_INC += $(pkg-config --cflags xft)
+          EXTRA_LIBS += $(pkg-config --libs xft)
+         " > Makefile
+      sed "s|/usr/local|$out|g" Makefile.orig >> Makefile
+    '';
+
+  meta = with stdenv.lib;
+    { description = "Small and simple stacking window manager";
+      homepage    = "http://nickgravgaard.com/windowlab/";
+      license     = licenses.gpl2;
+      maintainers = with maintainers; [ ehmry ];
+      platforms   = platforms.linux;
+    };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e8ceb32a499d..929ac7f40502 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13571,6 +13571,8 @@ let
     freerdp = freerdpUnstable;
   };
 
+  windowlab = callPackage ../applications/window-managers/windowlab { };
+
   windowmaker = callPackage ../applications/window-managers/windowmaker { };
 
   alsamixer.app = callPackage ../applications/window-managers/windowmaker/dockapps/alsamixer.app.nix { };

From f9232183d03636f442ecfb37e4caea64c69e2682 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 30 Dec 2015 11:37:20 +0100
Subject: [PATCH 040/884] harfbuzz: update 1.0.6 -> 1.1.2

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

diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index 26c5d2fa8254..d2546ebd496d 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -8,11 +8,11 @@
 # (icu is a ~30 MB dependency, the rest is very small in comparison)
 
 stdenv.mkDerivation rec {
-  name = "harfbuzz-1.0.6";
+  name = "harfbuzz-1.1.2";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/harfbuzz/release/${name}.tar.bz2";
-    sha256 = "09ivk5m4y09ar4zi9r6db7gp234cy05h0ach7w22g9kqvkxsf5pn";
+    sha256 = "07s6z3hbrb4rdfgzmln169wxz4nm5y7qbr02ik5c7drxpn85fb2a";
   };
 
   outputs = [ "out" "doc" ];

From cfbe24992fa675b84460ac20ff6a00509192e094 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 30 Dec 2015 11:46:24 +0100
Subject: [PATCH 041/884] at-spi2-*: maintenance updates on 2.18.*

---
 pkgs/development/libraries/at-spi2-atk/default.nix  | 4 ++--
 pkgs/development/libraries/at-spi2-core/default.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix
index f5d806ff67a5..f3538a122218 100644
--- a/pkgs/development/libraries/at-spi2-atk/default.nix
+++ b/pkgs/development/libraries/at-spi2-atk/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   versionMajor = "2.18";
-  versionMinor = "0";
+  versionMinor = "1";
   moduleName   = "at-spi2-atk";
   name = "${moduleName}-${versionMajor}.${versionMinor}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
-    sha256 = "0xgkrnx04vaklbkzc7bzym9s0qhj8aiz4knqlxgx3vxnacsb6vaa";
+    sha256 = "0bf1g5cj84rmx7p1q547vwbc0hlpcs2wrxnmv96lckfkhs9mzcf4";
   };
 
   buildInputs = [ python pkgconfig popt atk libX11 libICE xorg.libXtst libXi
diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix
index b49d1ddb8040..808de07c52fd 100644
--- a/pkgs/development/libraries/at-spi2-core/default.nix
+++ b/pkgs/development/libraries/at-spi2-core/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   versionMajor = "2.18";
-  versionMinor = "0";
+  versionMinor = "3";
   moduleName   = "at-spi2-core";
   name = "${moduleName}-${versionMajor}.${versionMinor}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
-    sha256 = "0xna0gnlqvzy6209klirywcm7ianazshg6pkk828g07bnrywgvhs";
+    sha256 = "0afn4x04j5l352vj0dccb2hkpzg3l2vhr8h1yv89fpqmjkfnm8md";
   };
 
   outputs = [ "out" "doc" ];

From 343e7af697e719604f0ce7c2ff2a8035a48c6a22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 30 Dec 2015 11:48:30 +0100
Subject: [PATCH 042/884] pango: maintenance update 1.18.0 -> 1.18.1

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

diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix
index e7106b9877e0..07a987c8ff66 100644
--- a/pkgs/development/libraries/pango/default.nix
+++ b/pkgs/development/libraries/pango/default.nix
@@ -4,14 +4,14 @@
 
 let
   ver_maj = "1.38";
-  ver_min = "0";
+  ver_min = "1";
 in
 stdenv.mkDerivation rec {
   name = "pango-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/pango/${ver_maj}/${name}.tar.xz";
-    sha256 = "0v12gi7f01iq3z852pclpnmkbcksbvpcmiazmklkx1dd9fbpakhx";
+    sha256 = "1dsf45m51i4rcyvh5wlxxrjfhvn5b67d5ckjc6vdcxbddjgmc80k";
   };
 
   buildInputs = with stdenv.lib; [ gobjectIntrospection ]

From 00aec448aba9e9d5d7edd53504f824dc4156b779 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 30 Dec 2015 11:57:33 +0100
Subject: [PATCH 043/884] gdk-pixbuf: maintenance update 2.32.1 -> 2.32.3

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

diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index dbd3a679d482..18562d1d12e3 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -3,14 +3,14 @@
 
 let
   ver_maj = "2.32";
-  ver_min = "1";
+  ver_min = "3";
 in
 stdenv.mkDerivation rec {
   name = "gdk-pixbuf-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gdk-pixbuf/${ver_maj}/${name}.tar.xz";
-    sha256 = "1g7kjxv67jcdasi14n7jan4icrnnppd1m99wrdmpv32k4m7vfcj4";
+    sha256 = "0cfh87aqyqbfcwpbv1ihgmgfcn66il5q2n8yjyl8gxkjmkqp2rrb";
   };
 
   setupHook = ./setup-hook.sh;

From b01ae3cee07e03d628b041929cf1daa488b730a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 30 Dec 2015 11:58:06 +0100
Subject: [PATCH 044/884] gtk2: maintenance update 2.24.28 -> 2.24.29

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

diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix
index e821e693b0ce..8830e1425b68 100644
--- a/pkgs/development/libraries/gtk+/2.x.nix
+++ b/pkgs/development/libraries/gtk+/2.x.nix
@@ -8,11 +8,11 @@ assert xineramaSupport -> xorg.libXinerama != null;
 assert cupsSupport -> cups != null;
 
 stdenv.mkDerivation rec {
-  name = "gtk+-2.24.28";
+  name = "gtk+-2.24.29";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtk+/2.24/${name}.tar.xz";
-    sha256 = "0mj6xn40py9r9lvzg633fal81xfwfm89d9mvz7jk4lmwk0g49imj";
+    sha256 = "1f1ifv1ijrda4jx831l24d3ww65v5gf56r464fi11n6k02bcah87";
   };
 
   enableParallelBuilding = true;

From a5b68eb4f6a0d1ac128c103891d8b959363964de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 30 Dec 2015 10:40:18 +0100
Subject: [PATCH 045/884] xorg: add meta.platforms

Add it to the generator script (generate-expr-from-tarballs.pl) and then
add the updated generated file (pkgs/servers/x11/xorg/default.nix) after
performing the steps outlined in the generator script.

NOTE: People seem to have updated .../default.nix manually (even though
it has a "THIS IS A GENERATED FILE.  DO NOT EDIT!" header), so I had to
skip some changes to not downgrade several packages.
---
 pkgs/servers/x11/xorg/default.nix             | 224 ++++++++++++++++++
 .../x11/xorg/generate-expr-from-tarballs.pl   |   1 +
 2 files changed, 225 insertions(+)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 75feb46a7fa0..29653b6f1e15 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -25,6 +25,7 @@ let
       sha256 = "1zi4p07mp6jmk030p4gmglwxcwp0lzs5mi31y1b4rp8lsqxdxizw";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   bdftopcf = (mkDerivation "bdftopcf" {
@@ -35,6 +36,7 @@ let
       sha256 = "09i03sk878cmx2i40lkpsysn7zqcvlczb30j7x3lryb11jz4gx1q";
     };
     buildInputs = [pkgconfig libXfont ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libXfont ;};
 
   bigreqsproto = (mkDerivation "bigreqsproto" {
@@ -45,6 +47,7 @@ let
       sha256 = "07hvfm84scz8zjw14riiln2v4w03jlhp756ypwhq27g48jmic8a6";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   compositeproto = (mkDerivation "compositeproto" {
@@ -55,6 +58,7 @@ let
       sha256 = "1z0crmf669hirw4s7972mmp8xig80kfndja9h559haqbpvq5k4q4";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   damageproto = (mkDerivation "damageproto" {
@@ -65,6 +69,7 @@ let
       sha256 = "0nzwr5pv9hg7c21n995pdiv0zqhs91yz3r8rn3aska4ykcp12z2w";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   dmxproto = (mkDerivation "dmxproto" {
@@ -75,6 +80,7 @@ let
       sha256 = "02b5x9dkgajizm8dqyx2w6hmqx3v25l67mgf35nj6sz0lgk52877";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   dri2proto = (mkDerivation "dri2proto" {
@@ -85,6 +91,7 @@ let
       sha256 = "015az1vfdqmil1yay5nlsmpf6cf7vcbpslxjb72cfkzlvrv59dgr";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   dri3proto = (mkDerivation "dri3proto" {
@@ -95,6 +102,7 @@ let
       sha256 = "0x609xvnl8jky5m8jdklw4nymx3irkv32w99dfd8nl800bblkgh1";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   encodings = (mkDerivation "encodings" {
@@ -105,6 +113,7 @@ let
       sha256 = "0ffmaw80vmfwdgvdkp6495xgsqszb6s0iira5j0j6pd4i0lk3mnf";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   fixesproto = (mkDerivation "fixesproto" {
@@ -115,6 +124,7 @@ let
       sha256 = "1ki4wiq2iivx5g4w5ckzbjbap759kfqd72yg18m3zpbb4hqkybxs";
     };
     buildInputs = [pkgconfig xextproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit xextproto ;};
 
   fontadobe100dpi = (mkDerivation "fontadobe100dpi" {
@@ -125,6 +135,7 @@ let
       sha256 = "0m60f5bd0caambrk8ksknb5dks7wzsg7g7xaf0j21jxmx8rq9h5j";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
   fontadobe75dpi = (mkDerivation "fontadobe75dpi" {
@@ -135,6 +146,7 @@ let
       sha256 = "02advcv9lyxpvrjv8bjh1b797lzg6jvhipclz49z8r8y98g4l0n6";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
   fontadobeutopia100dpi = (mkDerivation "fontadobeutopia100dpi" {
@@ -145,6 +157,7 @@ let
       sha256 = "19dd9znam1ah72jmdh7i6ny2ss2r6m21z9v0l43xvikw48zmwvyi";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
   fontadobeutopia75dpi = (mkDerivation "fontadobeutopia75dpi" {
@@ -155,6 +168,7 @@ let
       sha256 = "152wigpph5wvl4k9m3l4mchxxisgsnzlx033mn5iqrpkc6f72cl7";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
   fontadobeutopiatype1 = (mkDerivation "fontadobeutopiatype1" {
@@ -165,6 +179,7 @@ let
       sha256 = "0xw0pdnzj5jljsbbhakc6q9ha2qnca1jr81zk7w70yl9bw83b54p";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit mkfontdir mkfontscale ;};
 
   fontalias = (mkDerivation "fontalias" {
@@ -175,6 +190,7 @@ let
       sha256 = "16ic8wfwwr3jicaml7b5a0sk6plcgc1kg84w02881yhwmqm3nicb";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   fontarabicmisc = (mkDerivation "fontarabicmisc" {
@@ -185,6 +201,7 @@ let
       sha256 = "1x246dfnxnmflzf0qzy62k8jdpkb6jkgspcjgbk8jcq9lw99npah";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf mkfontdir ;};
 
   fontbh100dpi = (mkDerivation "fontbh100dpi" {
@@ -195,6 +212,7 @@ let
       sha256 = "10cl4gm38dw68jzln99ijix730y7cbx8np096gmpjjwff1i73h13";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
   fontbh75dpi = (mkDerivation "fontbh75dpi" {
@@ -205,6 +223,7 @@ let
       sha256 = "073jmhf0sr2j1l8da97pzsqj805f7mf9r2gy92j4diljmi8sm1il";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
   fontbhlucidatypewriter100dpi = (mkDerivation "fontbhlucidatypewriter100dpi" {
@@ -215,6 +234,7 @@ let
       sha256 = "1fqzckxdzjv4802iad2fdrkpaxl4w0hhs9lxlkyraq2kq9ik7a32";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
   fontbhlucidatypewriter75dpi = (mkDerivation "fontbhlucidatypewriter75dpi" {
@@ -225,6 +245,7 @@ let
       sha256 = "0cfbxdp5m12cm7jsh3my0lym9328cgm7fa9faz2hqj05wbxnmhaa";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
   fontbhttf = (mkDerivation "fontbhttf" {
@@ -235,6 +256,7 @@ let
       sha256 = "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit mkfontdir mkfontscale ;};
 
   fontbhtype1 = (mkDerivation "fontbhtype1" {
@@ -245,6 +267,7 @@ let
       sha256 = "1hb3iav089albp4sdgnlh50k47cdjif9p4axm0kkjvs8jyi5a53n";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit mkfontdir mkfontscale ;};
 
   fontbitstream100dpi = (mkDerivation "fontbitstream100dpi" {
@@ -255,6 +278,7 @@ let
       sha256 = "1kmn9jbck3vghz6rj3bhc3h0w6gh0qiaqm90cjkqsz1x9r2dgq7b";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf mkfontdir ;};
 
   fontbitstream75dpi = (mkDerivation "fontbitstream75dpi" {
@@ -265,6 +289,7 @@ let
       sha256 = "13plbifkvfvdfym6gjbgy9wx2xbdxi9hfrl1k22xayy02135wgxs";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf mkfontdir ;};
 
   fontbitstreamtype1 = (mkDerivation "fontbitstreamtype1" {
@@ -275,6 +300,7 @@ let
       sha256 = "1256z0jhcf5gbh1d03593qdwnag708rxqa032izmfb5dmmlhbsn6";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit mkfontdir mkfontscale ;};
 
   fontcronyxcyrillic = (mkDerivation "fontcronyxcyrillic" {
@@ -285,6 +311,7 @@ let
       sha256 = "0ai1v4n61k8j9x2a1knvfbl2xjxk3xxmqaq3p9vpqrspc69k31kf";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf mkfontdir ;};
 
   fontcursormisc = (mkDerivation "fontcursormisc" {
@@ -295,6 +322,7 @@ let
       sha256 = "0dd6vfiagjc4zmvlskrbjz85jfqhf060cpys8j0y1qpcbsrkwdhp";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf mkfontdir ;};
 
   fontdaewoomisc = (mkDerivation "fontdaewoomisc" {
@@ -305,6 +333,7 @@ let
       sha256 = "1s2bbhizzgbbbn5wqs3vw53n619cclxksljvm759h9p1prqdwrdw";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf mkfontdir ;};
 
   fontdecmisc = (mkDerivation "fontdecmisc" {
@@ -315,6 +344,7 @@ let
       sha256 = "0yzza0l4zwyy7accr1s8ab7fjqkpwggqydbm2vc19scdby5xz7g1";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf mkfontdir ;};
 
   fontibmtype1 = (mkDerivation "fontibmtype1" {
@@ -325,6 +355,7 @@ let
       sha256 = "1pyjll4adch3z5cg663s6vhi02k8m6488f0mrasg81ssvg9jinzx";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit mkfontdir mkfontscale ;};
 
   fontisasmisc = (mkDerivation "fontisasmisc" {
@@ -335,6 +366,7 @@ let
       sha256 = "0rx8q02rkx673a7skkpnvfkg28i8gmqzgf25s9yi0lar915sn92q";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf mkfontdir ;};
 
   fontjismisc = (mkDerivation "fontjismisc" {
@@ -345,6 +377,7 @@ let
       sha256 = "0rdc3xdz12pnv951538q6wilx8mrdndpkphpbblszsv7nc8cw61b";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf mkfontdir ;};
 
   fontmicromisc = (mkDerivation "fontmicromisc" {
@@ -355,6 +388,7 @@ let
       sha256 = "1dldxlh54zq1yzfnrh83j5vm0k4ijprrs5yl18gm3n9j1z0q2cws";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf mkfontdir ;};
 
   fontmisccyrillic = (mkDerivation "fontmisccyrillic" {
@@ -365,6 +399,7 @@ let
       sha256 = "0q2ybxs8wvylvw95j6x9i800rismsmx4b587alwbfqiw6biy63z4";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf mkfontdir ;};
 
   fontmiscethiopic = (mkDerivation "fontmiscethiopic" {
@@ -375,6 +410,7 @@ let
       sha256 = "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit mkfontdir mkfontscale ;};
 
   fontmiscmeltho = (mkDerivation "fontmiscmeltho" {
@@ -385,6 +421,7 @@ let
       sha256 = "148793fqwzrc3bmh2vlw5fdiwjc2n7vs25cic35gfp452czk489p";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit mkfontdir mkfontscale ;};
 
   fontmiscmisc = (mkDerivation "fontmiscmisc" {
@@ -395,6 +432,7 @@ let
       sha256 = "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
   fontmuttmisc = (mkDerivation "fontmuttmisc" {
@@ -405,6 +443,7 @@ let
       sha256 = "13qghgr1zzpv64m0p42195k1kc77pksiv059fdvijz1n6kdplpxx";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf mkfontdir ;};
 
   fontschumachermisc = (mkDerivation "fontschumachermisc" {
@@ -415,6 +454,7 @@ let
       sha256 = "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
   fontscreencyrillic = (mkDerivation "fontscreencyrillic" {
@@ -425,6 +465,7 @@ let
       sha256 = "0yayf1qlv7irf58nngddz2f1q04qkpr5jwp4aja2j5gyvzl32hl2";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf mkfontdir ;};
 
   fontsonymisc = (mkDerivation "fontsonymisc" {
@@ -435,6 +476,7 @@ let
       sha256 = "1xfgcx4gsgik5mkgkca31fj3w72jw9iw76qyrajrsz1lp8ka6hr0";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf mkfontdir ;};
 
   fontsproto = (mkDerivation "fontsproto" {
@@ -445,6 +487,7 @@ let
       sha256 = "1f2sdsd74y34nnaf4m1zlcbhyv8xb6irnisc99f84c4ivnq4d415";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   fontsunmisc = (mkDerivation "fontsunmisc" {
@@ -455,6 +498,7 @@ let
       sha256 = "1q6jcqrffg9q5f5raivzwx9ffvf7r11g6g0b125na1bhpz5ly7s8";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf mkfontdir ;};
 
   fontutil = (mkDerivation "fontutil" {
@@ -465,6 +509,7 @@ let
       sha256 = "08drjb6cf84pf5ysghjpb4i7xkd2p86k3wl2a0jxs1jif6qbszma";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   fontwinitzkicyrillic = (mkDerivation "fontwinitzkicyrillic" {
@@ -475,6 +520,7 @@ let
       sha256 = "181n1bgq8vxfxqicmy1jpm1hnr6gwn1kdhl6hr4frjigs1ikpldb";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit bdftopcf mkfontdir ;};
 
   fontxfree86type1 = (mkDerivation "fontxfree86type1" {
@@ -485,6 +531,7 @@ let
       sha256 = "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit mkfontdir mkfontscale ;};
 
   gccmakedep = (mkDerivation "gccmakedep" {
@@ -495,6 +542,7 @@ let
       sha256 = "1r1fpy5ni8chbgx7j5sz0008fpb6vbazpy1nifgdhgijyzqxqxdj";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   glamoregl = (mkDerivation "glamoregl" {
@@ -505,6 +553,7 @@ let
       sha256 = "1jg5clihklb9drh1jd7nhhdsszla6nv7xmbvm8yvakh5wrb1nlv6";
     };
     buildInputs = [pkgconfig dri2proto xorgserver ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit dri2proto xorgserver ;};
 
   glproto = (mkDerivation "glproto" {
@@ -515,6 +564,7 @@ let
       sha256 = "0h5ykmcddwid5qj6sbrszgkcypwn3mslvswxpgy2n2iixnyr9amd";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   iceauth = (mkDerivation "iceauth" {
@@ -525,6 +575,7 @@ let
       sha256 = "02izdyzhwpgiyjd8brzilwvwnfr72ncjb6mzz3y1icwrxqnsy5hj";
     };
     buildInputs = [pkgconfig libICE xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libICE xproto ;};
 
   imake = (mkDerivation "imake" {
@@ -535,6 +586,7 @@ let
       sha256 = "0zpk8p044jh14bis838shbf4100bjg7mccd7bq54glpsq552q339";
     };
     buildInputs = [pkgconfig xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit xproto ;};
 
   inputproto = (mkDerivation "inputproto" {
@@ -545,6 +597,7 @@ let
       sha256 = "1lf1jlxp0fc8h6fjdffhd084dqab94966l1zm3rwwsis0mifwiss";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   kbproto = (mkDerivation "kbproto" {
@@ -555,6 +608,7 @@ let
       sha256 = "0mxqj1pzhjpz9495vrjnpi10kv2n1s4vs7di0sh3yvipfq5j30pq";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   libAppleWM = (mkDerivation "libAppleWM" {
@@ -565,6 +619,7 @@ let
       sha256 = "0r8x28n45q89x91mz8mv0zkkcxi8wazkac886fyvflhiv2y8ap2y";
     };
     buildInputs = [pkgconfig applewmproto libX11 libXext xextproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit applewmproto libX11 libXext xextproto ;};
 
   libFS = (mkDerivation "libFS" {
@@ -575,6 +630,7 @@ let
       sha256 = "1wy4km3qwwajbyl8y9pka0zwizn7d9pfiyjgzba02x3a083lr79f";
     };
     buildInputs = [pkgconfig fontsproto xproto xtrans ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto xproto xtrans ;};
 
   libICE = (mkDerivation "libICE" {
@@ -585,6 +641,7 @@ let
       sha256 = "00p2b6bsg6kcdbb39bv46339qcywxfl4hsrz8asm4hy6q7r34w4g";
     };
     buildInputs = [pkgconfig xproto xtrans ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit xproto xtrans ;};
 
   libSM = (mkDerivation "libSM" {
@@ -595,6 +652,7 @@ let
       sha256 = "1gc7wavgs435g9qkp9jw4lhmaiq6ip9llv49f054ad6ryp4sib0b";
     };
     buildInputs = [pkgconfig libICE libuuid xproto xtrans ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libICE libuuid xproto xtrans ;};
 
   libWindowsWM = (mkDerivation "libWindowsWM" {
@@ -605,6 +663,7 @@ let
       sha256 = "1p0flwb67xawyv6yhri9w17m1i4lji5qnd0gq8v1vsfb8zw7rw15";
     };
     buildInputs = [pkgconfig windowswmproto libX11 libXext xextproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit windowswmproto libX11 libXext xextproto ;};
 
   libX11 = (mkDerivation "libX11" {
@@ -615,6 +674,7 @@ let
       sha256 = "04c1vj53xq2xgyxx5vhln3wm2d76hh1n95fvs3myhligkz1sfcfg";
     };
     buildInputs = [pkgconfig inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ;};
 
   libXScrnSaver = (mkDerivation "libXScrnSaver" {
@@ -625,6 +685,7 @@ let
       sha256 = "07ff4r20nkkrj7h08f9fwamds9b3imj8jz5iz6y38zqw6jkyzwcg";
     };
     buildInputs = [pkgconfig scrnsaverproto libX11 libXext xextproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit scrnsaverproto libX11 libXext xextproto ;};
 
   libXau = (mkDerivation "libXau" {
@@ -635,6 +696,7 @@ let
       sha256 = "1wm4pv12f36cwzhldpp7vy3lhm3xdcnp4f184xkxsp7b18r7gm7x";
     };
     buildInputs = [pkgconfig xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit xproto ;};
 
   libXaw = (mkDerivation "libXaw" {
@@ -645,6 +707,7 @@ let
       sha256 = "1kdhxplwrn43d9jp3v54llp05kwx210lrsdvqb6944jp29rhdy4f";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto libXmu libXpm xproto libXt ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 libXext xextproto libXmu libXpm xproto libXt ;};
 
   libXcomposite = (mkDerivation "libXcomposite" {
@@ -655,6 +718,7 @@ let
       sha256 = "0y21nfpa5s8qmx0srdlilyndas3sgl0c6rc26d5fx2vx436m1qpd";
     };
     buildInputs = [pkgconfig compositeproto libX11 libXfixes xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit compositeproto libX11 libXfixes xproto ;};
 
   libXcursor = (mkDerivation "libXcursor" {
@@ -665,6 +729,7 @@ let
       sha256 = "1prkdicl5y5yx32h1azh6gjfbijvjp415javv8dsakd13jrarilv";
     };
     buildInputs = [pkgconfig fixesproto libX11 libXfixes xproto libXrender ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fixesproto libX11 libXfixes xproto libXrender ;};
 
   libXdamage = (mkDerivation "libXdamage" {
@@ -675,6 +740,7 @@ let
       sha256 = "1bamagq7g6s0d23l8rb3nppj8ifqj05f7z9bhbs4fdg8az3ffgvw";
     };
     buildInputs = [pkgconfig damageproto fixesproto libX11 xextproto libXfixes xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit damageproto fixesproto libX11 xextproto libXfixes xproto ;};
 
   libXdmcp = (mkDerivation "libXdmcp" {
@@ -685,6 +751,7 @@ let
       sha256 = "1qp4yhxbfnpj34swa0fj635kkihdkwaiw7kf55cg5zqqg630kzl1";
     };
     buildInputs = [pkgconfig xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit xproto ;};
 
   libXext = (mkDerivation "libXext" {
@@ -695,6 +762,7 @@ let
       sha256 = "0dbfn5bznnrhqzvkrcmw4c44yvvpwdcsrvzxf4rk27r36b9x865m";
     };
     buildInputs = [pkgconfig libX11 xextproto xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 xextproto xproto ;};
 
   libXfixes = (mkDerivation "libXfixes" {
@@ -705,6 +773,7 @@ let
       sha256 = "0rs7qgzr6dpr62db7sd91c1b47hzhzfr010qwnpcm8sg122w1gk3";
     };
     buildInputs = [pkgconfig fixesproto libX11 xextproto xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fixesproto libX11 xextproto xproto ;};
 
   libXfont = (mkDerivation "libXfont" {
@@ -715,6 +784,7 @@ let
       sha256 = "1630v3sfvwwlimb2ja10c84ql6v1mw9bdfhvan7pbybkgi99h25p";
     };
     buildInputs = [pkgconfig libfontenc fontsproto freetype xproto xtrans zlib ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;};
 
   libXft = (mkDerivation "libXft" {
@@ -725,6 +795,7 @@ let
       sha256 = "0k6wzi5rzs0d0n338ms8n8lfyhq914hw4yl2j7553wqxfqjci8zm";
     };
     buildInputs = [pkgconfig fontconfig freetype libX11 xproto libXrender ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontconfig freetype libX11 xproto libXrender ;};
 
   libXi = (mkDerivation "libXi" {
@@ -735,6 +806,7 @@ let
       sha256 = "0ad21jy40d8b2f9ldadx7lkspmvka1i9r5jqqfwxdxyqnpgdfr6r";
     };
     buildInputs = [pkgconfig inputproto libX11 libXext xextproto libXfixes xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit inputproto libX11 libXext xextproto libXfixes xproto ;};
 
   libXinerama = (mkDerivation "libXinerama" {
@@ -745,6 +817,7 @@ let
       sha256 = "1qlqfvzw45gdzk9xirgwlp2qgj0hbsyiqj8yh8zml2bk2ygnjibs";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xineramaproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 libXext xextproto xineramaproto ;};
 
   libXmu = (mkDerivation "libXmu" {
@@ -755,6 +828,7 @@ let
       sha256 = "02wx6jw7i0q5qwx87yf94fsn3h0xpz1k7dz1nkwfwm1j71ydqvkm";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xproto libXt ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 libXext xextproto xproto libXt ;};
 
   libXp = (mkDerivation "libXp" {
@@ -765,6 +839,7 @@ let
       sha256 = "0mwc2jwmq03b1m9ihax5c6gw2ln8rc70zz4fsj3kb7440nchqdkz";
     };
     buildInputs = [pkgconfig printproto libX11 libXau libXext xextproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit printproto libX11 libXau libXext xextproto ;};
 
   libXpm = (mkDerivation "libXpm" {
@@ -775,6 +850,7 @@ let
       sha256 = "07041q4k8m4nirzl7lrqn8by2zylx0xvh6n0za301qqs3njszgf5";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xproto libXt ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 libXext xextproto xproto libXt ;};
 
   libXpresent = (mkDerivation "libXpresent" {
@@ -785,6 +861,7 @@ let
       sha256 = "12kvvar3ihf6sw49h6ywfdiwmb8i1gh8wasg1zhzp6hs2hay06n1";
     };
     buildInputs = [pkgconfig presentproto libX11 xextproto xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit presentproto libX11 xextproto xproto ;};
 
   libXrandr = (mkDerivation "libXrandr" {
@@ -795,6 +872,7 @@ let
       sha256 = "0n6ycs1arf4wb1cal9il6v7vbxbf21qhs9sbfl8xndgwnxclk1kg";
     };
     buildInputs = [pkgconfig randrproto renderproto libX11 libXext xextproto xproto libXrender ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit randrproto renderproto libX11 libXext xextproto xproto libXrender ;};
 
   libXrender = (mkDerivation "libXrender" {
@@ -805,6 +883,7 @@ let
       sha256 = "06myx7044qqdswxndsmd82fpp670klnizkgzdm194h51h1wyabzw";
     };
     buildInputs = [pkgconfig renderproto libX11 xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit renderproto libX11 xproto ;};
 
   libXres = (mkDerivation "libXres" {
@@ -815,6 +894,7 @@ let
       sha256 = "1rd0bzn67cpb2qkc946gch2183r4bdjfhs6cpqbipy47m9a91296";
     };
     buildInputs = [pkgconfig resourceproto libX11 libXext xextproto xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit resourceproto libX11 libXext xextproto xproto ;};
 
   libXt = (mkDerivation "libXt" {
@@ -825,6 +905,7 @@ let
       sha256 = "06lz6i7rbrp19kgikpaz4c97fw7n31k2h2aiikczs482g2zbdvj6";
     };
     buildInputs = [pkgconfig libICE kbproto libSM libX11 xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libICE kbproto libSM libX11 xproto ;};
 
   libXtst = (mkDerivation "libXtst" {
@@ -835,6 +916,7 @@ let
       sha256 = "1ngn161nq679ffmbwl81i2hn75jjg5b3ffv6n4jilpvyazypy2pg";
     };
     buildInputs = [pkgconfig inputproto recordproto libX11 libXext xextproto libXi ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit inputproto recordproto libX11 libXext xextproto libXi ;};
 
   libXv = (mkDerivation "libXv" {
@@ -845,6 +927,7 @@ let
       sha256 = "09a5j6bisysiipd0nw6s352565bp0n6gbyhv5hp63s3cd3w95zjm";
     };
     buildInputs = [pkgconfig videoproto libX11 libXext xextproto xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit videoproto libX11 libXext xextproto xproto ;};
 
   libXvMC = (mkDerivation "libXvMC" {
@@ -855,6 +938,7 @@ let
       sha256 = "0mjp1b21dvkaz7r0iq085r92nh5vkpmx99awfgqq9hgzyvgxf0q7";
     };
     buildInputs = [pkgconfig videoproto libX11 libXext xextproto xproto libXv ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit videoproto libX11 libXext xextproto xproto libXv ;};
 
   libXxf86dga = (mkDerivation "libXxf86dga" {
@@ -865,6 +949,7 @@ let
       sha256 = "0zn7aqj8x0951d8zb2h2andldvwkzbsc4cs7q023g6nzq6vd9v4f";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xf86dgaproto xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 libXext xextproto xf86dgaproto xproto ;};
 
   libXxf86misc = (mkDerivation "libXxf86misc" {
@@ -875,6 +960,7 @@ let
       sha256 = "0nvbq9y6k6m9hxdvg3crycqsnnxf1859wrisqcs37z9fhq044gsn";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xf86miscproto xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 libXext xextproto xf86miscproto xproto ;};
 
   libXxf86vm = (mkDerivation "libXxf86vm" {
@@ -885,6 +971,7 @@ let
       sha256 = "0mydhlyn72i7brjwypsqrpkls3nm6vxw0li8b2nw0caz7kwjgvmg";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xf86vidmodeproto xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 libXext xextproto xf86vidmodeproto xproto ;};
 
   libdmx = (mkDerivation "libdmx" {
@@ -895,6 +982,7 @@ let
       sha256 = "00djlxas38kbsrglcmwmxfbmxjdchlbj95pqwjvdg8jn5rns6zf9";
     };
     buildInputs = [pkgconfig dmxproto libX11 libXext xextproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit dmxproto libX11 libXext xextproto ;};
 
   libfontenc = (mkDerivation "libfontenc" {
@@ -905,6 +993,7 @@ let
       sha256 = "08gxmrhgw97mv0pvkfmd46zzxrn6zdw4g27073zl55gwwqq8jn3h";
     };
     buildInputs = [pkgconfig xproto zlib ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit xproto zlib ;};
 
   libpciaccess = (mkDerivation "libpciaccess" {
@@ -915,6 +1004,7 @@ let
       sha256 = "1krgryi9ngjr66242v0v5mczihgv0y7rrvx0563arr318mjn9y07";
     };
     buildInputs = [pkgconfig zlib ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit zlib ;};
 
   libpthreadstubs = (mkDerivation "libpthreadstubs" {
@@ -925,6 +1015,7 @@ let
       sha256 = "16bjv3in19l84hbri41iayvvg4ls9gv1ma0x0qlbmwy67i7dbdim";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   libxcb = (mkDerivation "libxcb" {
@@ -935,6 +1026,7 @@ let
       sha256 = "0c4xyvdyx5adh8dzyhnrmvwwz24gri4z1czxmxqm63i0gmngs85p";
     };
     buildInputs = [pkgconfig libxslt libpthreadstubs python libXau xcbproto libXdmcp ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libxslt libpthreadstubs python libXau xcbproto libXdmcp ;};
 
   libxkbfile = (mkDerivation "libxkbfile" {
@@ -945,6 +1037,7 @@ let
       sha256 = "0smimr14zvail7ar68n7spvpblpdnih3jxrva7cpa6cn602px0ai";
     };
     buildInputs = [pkgconfig kbproto libX11 ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit kbproto libX11 ;};
 
   libxshmfence = (mkDerivation "libxshmfence" {
@@ -955,6 +1048,7 @@ let
       sha256 = "032b0nlkdrpbimdld4gqvhqx53rzn8fawvf1ybhzn7lcswgjs6yj";
     };
     buildInputs = [pkgconfig xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit xproto ;};
 
   lndir = (mkDerivation "lndir" {
@@ -965,6 +1059,7 @@ let
       sha256 = "0pdngiy8zdhsiqx2am75yfcl36l7kd7d7nl0rss8shcdvsqgmx29";
     };
     buildInputs = [pkgconfig xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit xproto ;};
 
   luit = (mkDerivation "luit" {
@@ -975,6 +1070,7 @@ let
       sha256 = "0dn694mk56x6hdk6y9ylx4f128h5jcin278gnw2gb807rf3ygc1h";
     };
     buildInputs = [pkgconfig libfontenc ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libfontenc ;};
 
   makedepend = (mkDerivation "makedepend" {
@@ -985,6 +1081,7 @@ let
       sha256 = "09alw99r6y2bbd1dc786n3jfgv4j520apblyn7cw6jkjydshba7p";
     };
     buildInputs = [pkgconfig xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit xproto ;};
 
   mkfontdir = (mkDerivation "mkfontdir" {
@@ -995,6 +1092,7 @@ let
       sha256 = "0c3563kw9fg15dpgx4dwvl12qz6sdqdns1pxa574hc7i5m42mman";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   mkfontscale = (mkDerivation "mkfontscale" {
@@ -1005,6 +1103,7 @@ let
       sha256 = "081z8lwh9c1gyrx3ad12whnpv3jpfbqsc366mswpfm48mwl54vcc";
     };
     buildInputs = [pkgconfig libfontenc freetype xproto zlib ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libfontenc freetype xproto zlib ;};
 
   presentproto = (mkDerivation "presentproto" {
@@ -1015,6 +1114,7 @@ let
       sha256 = "1kir51aqg9cwazs14ivcldcn3mzadqgykc9cg87rm40zf947sb41";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   printproto = (mkDerivation "printproto" {
@@ -1025,6 +1125,7 @@ let
       sha256 = "06liap8n4s25sgp27d371cc7yg9a08dxcr3pmdjp761vyin3360j";
     };
     buildInputs = [pkgconfig libXau ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libXau ;};
 
   randrproto = (mkDerivation "randrproto" {
@@ -1035,6 +1136,7 @@ let
       sha256 = "0s4496z61y5q45q20gldwpf788b9nsa8hb13gnck1mwwwwrmarsc";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   recordproto = (mkDerivation "recordproto" {
@@ -1045,6 +1147,7 @@ let
       sha256 = "0w3kgr1zabwf79bpc28dcnj0fpni6r53rpi82ngjbalj5s6m8xx7";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   renderproto = (mkDerivation "renderproto" {
@@ -1055,6 +1158,7 @@ let
       sha256 = "0dr5xw6s0qmqg0q5pdkb4jkdhaja0vbfqla79qh5j1xjj9dmlwq6";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   resourceproto = (mkDerivation "resourceproto" {
@@ -1065,6 +1169,7 @@ let
       sha256 = "0638iyfiiyjw1hg3139pai0j6m65gkskrvd9684zgc6ydcx00riw";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   scrnsaverproto = (mkDerivation "scrnsaverproto" {
@@ -1075,6 +1180,7 @@ let
       sha256 = "0rfdbfwd35d761xkfifcscx56q0n56043ixlmv70r4v4l66hmdwb";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   sessreg = (mkDerivation "sessreg" {
@@ -1085,6 +1191,7 @@ let
       sha256 = "0z013rskwmdadd8cdlxvh4asmgim61qijyzfbqmr1q1mg1jpf4am";
     };
     buildInputs = [pkgconfig xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit xproto ;};
 
   setxkbmap = (mkDerivation "setxkbmap" {
@@ -1095,6 +1202,7 @@ let
       sha256 = "1qfk097vjysqb72pq89h0la3462kbb2dh1d11qzs2fr67ybb7pd9";
     };
     buildInputs = [pkgconfig libX11 libxkbfile ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 libxkbfile ;};
 
   smproxy = (mkDerivation "smproxy" {
@@ -1105,6 +1213,7 @@ let
       sha256 = "0rkjyzmsdqmlrkx8gy2j4q6iksk58hcc92xzdprkf8kml9ar3wbc";
     };
     buildInputs = [pkgconfig libICE libSM libXmu libXt ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libICE libSM libXmu libXt ;};
 
   twm = (mkDerivation "twm" {
@@ -1115,6 +1224,7 @@ let
       sha256 = "02iicvhkp3i7q5rliyymiq9bppjr0pzfs6rgb78kppryqdx1cxf5";
     };
     buildInputs = [pkgconfig libICE libSM libX11 libXext libXmu xproto libXt ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libICE libSM libX11 libXext libXmu xproto libXt ;};
 
   utilmacros = (mkDerivation "utilmacros" {
@@ -1125,6 +1235,7 @@ let
       sha256 = "1fnhpryf55l0yqajxn0cxan3kvsjzi67nlanz8clwqzf54cb2d98";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   videoproto = (mkDerivation "videoproto" {
@@ -1135,6 +1246,7 @@ let
       sha256 = "1dnlkd9nb0m135lgd6hd61vc29sdyarsyya8aqpx7z10p261dbld";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   windowswmproto = (mkDerivation "windowswmproto" {
@@ -1145,6 +1257,7 @@ let
       sha256 = "0syjxgy4m8l94qrm03nvn5k6bkxc8knnlld1gbllym97nvnv0ny0";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   x11perf = (mkDerivation "x11perf" {
@@ -1155,6 +1268,7 @@ let
       sha256 = "0lb716yfdb8f11h4cz93d1bapqdxf1xplsb21kbp4xclq7g9hw78";
     };
     buildInputs = [pkgconfig libX11 libXext libXft libXmu xproto libXrender ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 libXext libXft libXmu xproto libXrender ;};
 
   xauth = (mkDerivation "xauth" {
@@ -1165,6 +1279,7 @@ let
       sha256 = "13y2invb0894b1in03jbglximbz6v31y2kr4yjjgica8xciibkjn";
     };
     buildInputs = [pkgconfig libX11 libXau libXext libXmu xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 libXau libXext libXmu xproto ;};
 
   xbacklight = (mkDerivation "xbacklight" {
@@ -1175,6 +1290,7 @@ let
       sha256 = "0arnd1j8vzhzmw72mqhjjcb2qwcbs9qphsy3ps593ajyld8wzxhp";
     };
     buildInputs = [pkgconfig libxcb xcbutil ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libxcb xcbutil ;};
 
   xbitmaps = (mkDerivation "xbitmaps" {
@@ -1185,6 +1301,7 @@ let
       sha256 = "178ym90kwidia6nas4qr5n5yqh698vv8r02js0r4vg3b6lsb0w9n";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   xcbproto = (mkDerivation "xcbproto" {
@@ -1195,6 +1312,7 @@ let
       sha256 = "0bp3f53l9fy5x3mn1rkj1g81aiyzl90wacwvqdgy831aa3kfxb5l";
     };
     buildInputs = [pkgconfig python ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit python ;};
 
   xcbutil = (mkDerivation "xcbutil" {
@@ -1205,6 +1323,7 @@ let
       sha256 = "1sahmrgbpyki4bb72hxym0zvxwnycmswsxiisgqlln9vrdlr9r26";
     };
     buildInputs = [pkgconfig gperf m4 libxcb xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit gperf m4 libxcb xproto ;};
 
   xcbutilcursor = (mkDerivation "xcbutilcursor" {
@@ -1215,6 +1334,7 @@ let
       sha256 = "0fpv46zb7kz04qxwvpax4cpd2kd8yhsm2n0if1isniqdh5xkcrgd";
     };
     buildInputs = [pkgconfig gperf m4 libxcb xcbutilimage xcbutilrenderutil xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit gperf m4 libxcb xcbutilimage xcbutilrenderutil xproto ;};
 
   xcbutilerrors = (mkDerivation "xcbutilerrors" {
@@ -1225,6 +1345,7 @@ let
       sha256 = "158rm913dg3hxrrhyvvxr8bcm0pjy5jws70dhy2s12w1krv829k8";
     };
     buildInputs = [pkgconfig gperf m4 libxcb xcbproto xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit gperf m4 libxcb xcbproto xproto ;};
 
   xcbutilimage = (mkDerivation "xcbutilimage" {
@@ -1235,6 +1356,7 @@ let
       sha256 = "1z1gxacg7q4cw6jrd26gvi5y04npsyavblcdad1xccc8swvnmf9d";
     };
     buildInputs = [pkgconfig gperf m4 libxcb xcbutil xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit gperf m4 libxcb xcbutil xproto ;};
 
   xcbutilkeysyms = (mkDerivation "xcbutilkeysyms" {
@@ -1245,6 +1367,7 @@ let
       sha256 = "1nbd45pzc1wm6v5drr5338j4nicbgxa5hcakvsvm5pnyy47lky0f";
     };
     buildInputs = [pkgconfig gperf m4 libxcb xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit gperf m4 libxcb xproto ;};
 
   xcbutilrenderutil = (mkDerivation "xcbutilrenderutil" {
@@ -1255,6 +1378,7 @@ let
       sha256 = "0nza1csdvvxbmk8vgv8vpmq7q8h05xrw3cfx9lwxd1hjzd47xsf6";
     };
     buildInputs = [pkgconfig gperf m4 libxcb xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit gperf m4 libxcb xproto ;};
 
   xcbutilwm = (mkDerivation "xcbutilwm" {
@@ -1265,6 +1389,7 @@ let
       sha256 = "0gra7hfyxajic4mjd63cpqvd20si53j1q3rbdlkqkahfciwq3gr8";
     };
     buildInputs = [pkgconfig gperf m4 libxcb xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit gperf m4 libxcb xproto ;};
 
   xclock = (mkDerivation "xclock" {
@@ -1275,6 +1400,7 @@ let
       sha256 = "1l3xv4bsca6bwxx73jyjz0blav86i7vwffkhdb1ac81y9slyrki3";
     };
     buildInputs = [pkgconfig libX11 libXaw libXft libxkbfile libXmu xproto libXrender libXt ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 libXaw libXft libxkbfile libXmu xproto libXrender libXt ;};
 
   xcmiscproto = (mkDerivation "xcmiscproto" {
@@ -1285,6 +1411,7 @@ let
       sha256 = "1pyjv45wivnwap2wvsbrzdvjc5ql8bakkbkrvcv6q9bjjf33ccmi";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   xcmsdb = (mkDerivation "xcmsdb" {
@@ -1295,6 +1422,7 @@ let
       sha256 = "1ik7gzlp2igz183x70883000ygp99r20x3aah6xhaslbpdhm6n75";
     };
     buildInputs = [pkgconfig libX11 ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 ;};
 
   xcompmgr = (mkDerivation "xcompmgr" {
@@ -1305,6 +1433,7 @@ let
       sha256 = "14k89mz13jxgp4h2pz0yq0fbkw1lsfcb3acv8vkknc9i4ld9n168";
     };
     buildInputs = [pkgconfig libXcomposite libXdamage libXext libXfixes libXrender ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libXcomposite libXdamage libXext libXfixes libXrender ;};
 
   xcursorgen = (mkDerivation "xcursorgen" {
@@ -1315,6 +1444,7 @@ let
       sha256 = "0v7nncj3kaa8c0524j7ricdf4rvld5i7c3m6fj55l5zbah7r3j1i";
     };
     buildInputs = [pkgconfig libpng libX11 libXcursor ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libpng libX11 libXcursor ;};
 
   xcursorthemes = (mkDerivation "xcursorthemes" {
@@ -1325,6 +1455,7 @@ let
       sha256 = "11mv661nj1p22sqkv87ryj2lcx4m68a04b0rs6iqh3fzp42jrzg3";
     };
     buildInputs = [pkgconfig libXcursor ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libXcursor ;};
 
   xdm = (mkDerivation "xdm" {
@@ -1335,6 +1466,7 @@ let
       sha256 = "0iqw11977lpr9nk1is4fca84d531vck0mq7jldwl44m0vrnl5nnl";
     };
     buildInputs = [pkgconfig libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ;};
 
   xdpyinfo = (mkDerivation "xdpyinfo" {
@@ -1345,6 +1477,7 @@ let
       sha256 = "0ldgrj4w2fa8jng4b3f3biaj0wyn8zvya88pnk70d7k12pcqw8rh";
     };
     buildInputs = [pkgconfig libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ;};
 
   xdriinfo = (mkDerivation "xdriinfo" {
@@ -1355,6 +1488,7 @@ let
       sha256 = "0681d0y8liqakkpz7mmsf689jcxrvs5291r20qi78mc9xxk3gfjc";
     };
     buildInputs = [pkgconfig glproto libX11 ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit glproto libX11 ;};
 
   xev = (mkDerivation "xev" {
@@ -1365,6 +1499,7 @@ let
       sha256 = "0krivhrxpq6719103r541xpi3i3a0y15f7ypc4lnrx8sdhmfcjnr";
     };
     buildInputs = [pkgconfig libX11 xproto libXrandr ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 xproto libXrandr ;};
 
   xextproto = (mkDerivation "xextproto" {
@@ -1375,6 +1510,7 @@ let
       sha256 = "1c2vma9gqgc2v06rfxdiqgwhxmzk2cbmknwf1ng3m76vr0xb5x7k";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   xeyes = (mkDerivation "xeyes" {
@@ -1385,6 +1521,7 @@ let
       sha256 = "08d5x2kar5kg4yammw6hhk10iva6jmh8cqq176a1z7nm1il9hplp";
     };
     buildInputs = [pkgconfig libX11 libXext libXmu libXrender libXt ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 libXext libXmu libXrender libXt ;};
 
   xf86bigfontproto = (mkDerivation "xf86bigfontproto" {
@@ -1395,6 +1532,7 @@ let
       sha256 = "0j0n7sj5xfjpmmgx6n5x556rw21hdd18fwmavp95wps7qki214ms";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   xf86dgaproto = (mkDerivation "xf86dgaproto" {
@@ -1405,6 +1543,7 @@ let
       sha256 = "0l4hx48207mx0hp09026r6gy9nl3asbq0c75hri19wp1118zcpmc";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   xf86driproto = (mkDerivation "xf86driproto" {
@@ -1415,6 +1554,7 @@ let
       sha256 = "07v69m0g2dfzb653jni4x656jlr7l84c1k39j8qc8vfb45r8sjww";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   xf86inputevdev = (mkDerivation "xf86inputevdev" {
@@ -1425,6 +1565,7 @@ let
       sha256 = "05yihr84rf209yyjvin8ab55h504b30c7dck8kgrwykvn272k5yh";
     };
     buildInputs = [pkgconfig inputproto udev xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit inputproto udev xorgserver xproto ;};
 
   xf86inputjoystick = (mkDerivation "xf86inputjoystick" {
@@ -1435,6 +1576,7 @@ let
       sha256 = "038mfqairyyqvz02rk7v3i070sab1wr0k6fkxvyvxdgkfbnqcfzf";
     };
     buildInputs = [pkgconfig inputproto kbproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit inputproto kbproto xorgserver xproto ;};
 
   xf86inputkeyboard = (mkDerivation "xf86inputkeyboard" {
@@ -1445,6 +1587,7 @@ let
       sha256 = "04d27kwqq03fc26an6051hs3i0bff8albhnngzyd59wxpwwzzj0s";
     };
     buildInputs = [pkgconfig inputproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit inputproto xorgserver xproto ;};
 
   xf86inputlibinput = (mkDerivation "xf86inputlibinput" {
@@ -1455,6 +1598,7 @@ let
       sha256 = "0hcs05zx9mpyi9wajsps9qsbyq4v0c9wysp2l48qnr4l8587qw18";
     };
     buildInputs = [pkgconfig inputproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit inputproto xorgserver xproto ;};
 
   xf86inputmouse = (mkDerivation "xf86inputmouse" {
@@ -1465,6 +1609,7 @@ let
       sha256 = "1kn5kx3qyn9qqvd6s24a2l1wfgck2pgfvzl90xpl024wfxsx719l";
     };
     buildInputs = [pkgconfig inputproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit inputproto xorgserver xproto ;};
 
   xf86inputsynaptics = (mkDerivation "xf86inputsynaptics" {
@@ -1475,6 +1620,7 @@ let
       sha256 = "009zx199pilcvlaqm6fx4mg94q81d6vvl5rznmw3frzkfh6117yk";
     };
     buildInputs = [pkgconfig inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ;};
 
   xf86inputvmmouse = (mkDerivation "xf86inputvmmouse" {
@@ -1485,6 +1631,7 @@ let
       sha256 = "06ckn4hlkpig5vnivl0zj8a7ykcgvrsj8b3iccl1pgn1gaamix8a";
     };
     buildInputs = [pkgconfig inputproto udev randrproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit inputproto udev randrproto xorgserver xproto ;};
 
   xf86inputvoid = (mkDerivation "xf86inputvoid" {
@@ -1495,6 +1642,7 @@ let
       sha256 = "171k8b8s42s3w73l7ln9jqwk88w4l7r1km2blx1vy898c854yvpr";
     };
     buildInputs = [pkgconfig xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit xorgserver xproto ;};
 
   xf86miscproto = (mkDerivation "xf86miscproto" {
@@ -1505,6 +1653,7 @@ let
       sha256 = "15dhcdpv61fyj6rhzrhnwri9hlw8rjfy05z1vik118lc99mfrf25";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   xf86videoark = (mkDerivation "xf86videoark" {
@@ -1515,6 +1664,7 @@ let
       sha256 = "07p5vdsj2ckxb6wh02s61akcv4qfg6s1d5ld3jn3lfaayd3f1466";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess xextproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libpciaccess xextproto xorgserver xproto ;};
 
   xf86videoast = (mkDerivation "xf86videoast" {
@@ -1525,6 +1675,7 @@ let
       sha256 = "1pm2cy81ma7ldsw0yfk28b33h9z2hcj5rccrxhfxfgvxsiavrnqy";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
   xf86videoati = (mkDerivation "xf86videoati" {
@@ -1535,6 +1686,7 @@ let
       sha256 = "0k6kw69mcarlmxlb4jlhz887jxqr94qx2pin04xcv2ysp3pdj5i5";
     };
     buildInputs = [pkgconfig fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
 
   xf86videochips = (mkDerivation "xf86videochips" {
@@ -1545,6 +1697,7 @@ let
       sha256 = "073bcdsvvsg19mb963sa5v7x2zs19y0q6javmgpiwfaqkz7zbblr";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
   xf86videocirrus = (mkDerivation "xf86videocirrus" {
@@ -1555,6 +1708,7 @@ let
       sha256 = "1asifc6ld2g9kap15vfhvsvyl69lj7pw3d9ra9mi4najllh7pj7d";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
   xf86videodummy = (mkDerivation "xf86videodummy" {
@@ -1565,6 +1719,7 @@ let
       sha256 = "1046p64xap69vlsmsz5rjv0djc970yhvq44fmllmas0mqp5lzy2n";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ;};
 
   xf86videofbdev = (mkDerivation "xf86videofbdev" {
@@ -1575,6 +1730,7 @@ let
       sha256 = "06ym7yy017lanj730hfkpfk4znx3dsj8jq3qvyzsn8w294kb7m4x";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ;};
 
   xf86videogeode = (mkDerivation "xf86videogeode" {
@@ -1585,6 +1741,7 @@ let
       sha256 = "0h9w6cfj7s86rg72c6qci8f733hg4g7paan5fwmmj7p74ckd9d07";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
   xf86videoglide = (mkDerivation "xf86videoglide" {
@@ -1595,6 +1752,7 @@ let
       sha256 = "1vaav6kx4n00q4fawgqnjmbdkppl0dir2dkrj4ad372mxrvl9c4y";
     };
     buildInputs = [pkgconfig xextproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit xextproto xorgserver xproto ;};
 
   xf86videoglint = (mkDerivation "xf86videoglint" {
@@ -1605,6 +1763,7 @@ let
       sha256 = "08a2aark2yn9irws9c78d9q44dichr03i9zbk61jgr54ncxqhzv5";
     };
     buildInputs = [pkgconfig libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ;};
 
   xf86videoi128 = (mkDerivation "xf86videoi128" {
@@ -1615,6 +1774,7 @@ let
       sha256 = "171b8lbxr56w3isph947dnw7x87hc46v6m3mcxdcz44gk167x0pq";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
   xf86videoi740 = (mkDerivation "xf86videoi740" {
@@ -1625,6 +1785,7 @@ let
       sha256 = "0973zzmdsvlmplcax1c91is7v78lcwy6d9mwp11npgqzl782vq0w";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
   xf86videointel = (mkDerivation "xf86videointel" {
@@ -1635,6 +1796,7 @@ let
       sha256 = "0x11dig1wmpjz5n35sh30zs58ar8q8836w3zrkwkvgxj6q6smvvr";
     };
     buildInputs = [pkgconfig dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ;};
 
   xf86videomach64 = (mkDerivation "xf86videomach64" {
@@ -1645,6 +1807,7 @@ let
       sha256 = "07xlf5nsjm0x18ij5gyy4lf8hwpl10i8chi3skpqjh84drdri61y";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
 
   xf86videomga = (mkDerivation "xf86videomga" {
@@ -1655,6 +1818,7 @@ let
       sha256 = "0kyl8w99arviv27pc349zsy2vinnm7mdpy34vr9nzisicw5nkij8";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
 
   xf86videomodesetting = (mkDerivation "xf86videomodesetting" {
@@ -1665,6 +1829,7 @@ let
       sha256 = "0p6pjn5bnd2wr3lmas4b12zcq12d9ilvssga93fzlg90fdahikwh";
     };
     buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto libX11 xextproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libdrm udev libpciaccess randrproto libX11 xextproto xorgserver xproto ;};
 
   xf86videoneomagic = (mkDerivation "xf86videoneomagic" {
@@ -1675,6 +1840,7 @@ let
       sha256 = "1whb2kgyqaxdjim27ya404acz50izgmafwnb6y9m89q5n6b97y3j";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libpciaccess xorgserver xproto ;};
 
   xf86videonewport = (mkDerivation "xf86videonewport" {
@@ -1685,6 +1851,7 @@ let
       sha256 = "1yafmp23jrfdmc094i6a4dsizapsc9v0pl65cpc8w1kvn7343k4i";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto randrproto renderproto videoproto xorgserver xproto ;};
 
   xf86videonouveau = (mkDerivation "xf86videonouveau" {
@@ -1695,6 +1862,7 @@ let
       sha256 = "0j3847rnffy81iaxxi6vnd8saadrc9jahfmckr0sjgkzg2rf4kzq";
     };
     buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
   xf86videonv = (mkDerivation "xf86videonv" {
@@ -1705,6 +1873,7 @@ let
       sha256 = "1gqh1khc4zalip5hh2nksgs7i3piqq18nncgmsx9qvzi05azd5c3";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
   xf86videoopenchrome = (mkDerivation "xf86videoopenchrome" {
@@ -1715,6 +1884,7 @@ let
       sha256 = "1v8j4i1r268n4fc5gq54zg1x50j0rhw71f3lba7411mcblg2z7p4";
     };
     buildInputs = [pkgconfig fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ;};
 
   xf86videoqxl = (mkDerivation "xf86videoqxl" {
@@ -1725,6 +1895,7 @@ let
       sha256 = "1368dd5mihn3s098n7wa3fpjkp8pnamabfjjipkqs9zyrcvncy3m";
     };
     buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xf86dgaproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xf86dgaproto xorgserver xproto ;};
 
   xf86videor128 = (mkDerivation "xf86videor128" {
@@ -1735,6 +1906,7 @@ let
       sha256 = "0g9m1n5184h05mq14vb6k288zm6g81a9m048id00l8v8f6h33mc0";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ;};
 
   xf86videos3virge = (mkDerivation "xf86videos3virge" {
@@ -1745,6 +1917,7 @@ let
       sha256 = "1nm4cngjbw226q63rdacw6nx5lgxv7l7rsa8vhpr0gs80pg6igjx";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
   xf86videosavage = (mkDerivation "xf86videosavage" {
@@ -1755,6 +1928,7 @@ let
       sha256 = "0qzshncynjdmyhavhqw4x5ha3gwbygi0zbsy158fpg1jcnla9kpx";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
 
   xf86videosiliconmotion = (mkDerivation "xf86videosiliconmotion" {
@@ -1765,6 +1939,7 @@ let
       sha256 = "1sqv0y31mi4zmh9yaxqpzg7p8y2z01j6qys433hb8n4yznllkm79";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess videoproto xextproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libpciaccess videoproto xextproto xorgserver xproto ;};
 
   xf86videosis = (mkDerivation "xf86videosis" {
@@ -1775,6 +1950,7 @@ let
       sha256 = "1znkqwdyd6am23xbsfjzamq125j5rrylg5mzqky4scv9gxbz5wy8";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ;};
 
   xf86videosuncg6 = (mkDerivation "xf86videosuncg6" {
@@ -1785,6 +1961,7 @@ let
       sha256 = "04fgwgk02m4nimlv67rrg1wnyahgymrn6rb2cjj1l8bmzkii4glr";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto randrproto renderproto xorgserver xproto ;};
 
   xf86videosunffb = (mkDerivation "xf86videosunffb" {
@@ -1795,6 +1972,7 @@ let
       sha256 = "07z3ngifwg2d4jgq8pms47n5lr2yn0ai72g86xxjnb3k20n5ym7s";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto xextproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto randrproto renderproto xextproto xorgserver xproto ;};
 
   xf86videotdfx = (mkDerivation "xf86videotdfx" {
@@ -1805,6 +1983,7 @@ let
       sha256 = "0dvdrhyn1iv6rr85v1c52s1gl0j1qrxgv7x0r7qn3ba0gj38i2is";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
 
   xf86videotga = (mkDerivation "xf86videotga" {
@@ -1815,6 +1994,7 @@ let
       sha256 = "0cb161lvdgi6qnf1sfz722qn38q7kgakcvj7b45ba3i0020828r0";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;};
 
   xf86videotrident = (mkDerivation "xf86videotrident" {
@@ -1825,6 +2005,7 @@ let
       sha256 = "1bhkwic2acq9za4yz4bwj338cwv5mdrgr2qmgkhlj3bscbg1imgc";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;};
 
   xf86videov4l = (mkDerivation "xf86videov4l" {
@@ -1835,6 +2016,7 @@ let
       sha256 = "0pcjc75hgbih3qvhpsx8d4fljysfk025slxcqyyhr45dzch93zyb";
     };
     buildInputs = [pkgconfig randrproto videoproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit randrproto videoproto xorgserver xproto ;};
 
   xf86videovesa = (mkDerivation "xf86videovesa" {
@@ -1845,6 +2027,7 @@ let
       sha256 = "1haiw8r1z8ihk68d0jqph2wsld13w4qkl86biq46fvyxg7cg9pbv";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;};
 
   xf86videovmware = (mkDerivation "xf86videovmware" {
@@ -1855,6 +2038,7 @@ let
       sha256 = "1k50whwnkzxam2ihc1sw456dx0pvr76naycm4qhyjxqv9d72879w";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ;};
 
   xf86videovoodoo = (mkDerivation "xf86videovoodoo" {
@@ -1865,6 +2049,7 @@ let
       sha256 = "1s6p7yxmi12q4y05va53rljwyzd6ry492r1pgi7wwq6cznivhgly";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ;};
 
   xf86videowsfb = (mkDerivation "xf86videowsfb" {
@@ -1875,6 +2060,7 @@ let
       sha256 = "0hr8397wpd0by1hc47fqqrnaw3qdqd8aqgwgzv38w5k3l3jy6p4p";
     };
     buildInputs = [pkgconfig xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit xorgserver xproto ;};
 
   xf86videoxgi = (mkDerivation "xf86videoxgi" {
@@ -1885,6 +2071,7 @@ let
       sha256 = "10xd2vah0pnpw5spn40n4p95mpmgvdkly4i1cz51imnlfsw7g8si";
     };
     buildInputs = [pkgconfig fontsproto glproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xineramaproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto glproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xineramaproto xorgserver xproto ;};
 
   xf86vidmodeproto = (mkDerivation "xf86vidmodeproto" {
@@ -1895,6 +2082,7 @@ let
       sha256 = "0w47d7gfa8zizh2bshdr2rffvbr4jqjv019mdgyh6cmplyd4kna5";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   xfs = (mkDerivation "xfs" {
@@ -1905,6 +2093,7 @@ let
       sha256 = "1ylz4r7adf567rnlbb52yi9x3qi4pyv954kkhm7ld4f0fkk7a2x4";
     };
     buildInputs = [pkgconfig libXfont xproto xtrans ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libXfont xproto xtrans ;};
 
   xgamma = (mkDerivation "xgamma" {
@@ -1915,6 +2104,7 @@ let
       sha256 = "1lr2nb1fhg5fk2fchqxdxyl739602ggwhmgl2wiv5c8qbidw7w8f";
     };
     buildInputs = [pkgconfig libX11 xproto libXxf86vm ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 xproto libXxf86vm ;};
 
   xgc = (mkDerivation "xgc" {
@@ -1925,6 +2115,7 @@ let
       sha256 = "0pigvjd3i9fchmj1inqy151aafz3dr0vq1h2zizdb2imvadqv0hl";
     };
     buildInputs = [pkgconfig libXaw libXt ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libXaw libXt ;};
 
   xhost = (mkDerivation "xhost" {
@@ -1935,6 +2126,7 @@ let
       sha256 = "16n26xw6l01zq31d4qvsaz50misvizhn7iihzdn5f7s72pp1krlk";
     };
     buildInputs = [pkgconfig libX11 libXau libXmu xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 libXau libXmu xproto ;};
 
   xineramaproto = (mkDerivation "xineramaproto" {
@@ -1945,6 +2137,7 @@ let
       sha256 = "0ns8abd27x7gbp4r44z3wc5k9zqxxj8zjnazqpcyr4n17nxp8xcp";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   xinit = (mkDerivation "xinit" {
@@ -1955,6 +2148,7 @@ let
       sha256 = "1cq2g469mb2cfgr8k57960yrn90bl33vfqri4pdh2zm0jxrqvn3m";
     };
     buildInputs = [pkgconfig libX11 xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 xproto ;};
 
   xinput = (mkDerivation "xinput" {
@@ -1965,6 +2159,7 @@ let
       sha256 = "1i75mviz9dyqyf7qigzmxq8vn31i86aybm662fzjz5c086dx551n";
     };
     buildInputs = [pkgconfig inputproto libX11 libXext libXi libXinerama libXrandr ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit inputproto libX11 libXext libXi libXinerama libXrandr ;};
 
   xkbcomp = (mkDerivation "xkbcomp" {
@@ -1975,6 +2170,7 @@ let
       sha256 = "0gcjy70ppmcl610z8gxc7sydsx93f8cm8pggm4qhihaa1ngdq103";
     };
     buildInputs = [pkgconfig libX11 libxkbfile xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 libxkbfile xproto ;};
 
   xkbevd = (mkDerivation "xkbevd" {
@@ -1985,6 +2181,7 @@ let
       sha256 = "0sprjx8i86ljk0l7ldzbz2xlk8916z5zh78cafjv8k1a63js4c14";
     };
     buildInputs = [pkgconfig libX11 libxkbfile ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 libxkbfile ;};
 
   xkbprint = (mkDerivation "xkbprint" {
@@ -1995,6 +2192,7 @@ let
       sha256 = "04iyv5z8aqhabv7wcpvbvq0ji0jrz1666vw6gvxkvl7szswalgqb";
     };
     buildInputs = [pkgconfig libX11 libxkbfile xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 libxkbfile xproto ;};
 
   xkbutils = (mkDerivation "xkbutils" {
@@ -2005,6 +2203,7 @@ let
       sha256 = "0c412isxl65wplhl7nsk12vxlri29lk48g3p52hbrs3m0awqm8fj";
     };
     buildInputs = [pkgconfig inputproto libX11 libXaw xproto libXt ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit inputproto libX11 libXaw xproto libXt ;};
 
   xkeyboardconfig = (mkDerivation "xkeyboardconfig" {
@@ -2015,6 +2214,7 @@ let
       sha256 = "1grqdy5a9f2dii3y24fn0p3kz4q5g9j2kh3jcj2402rgrbvkqi0f";
     };
     buildInputs = [pkgconfig libX11 xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 xproto ;};
 
   xkill = (mkDerivation "xkill" {
@@ -2025,6 +2225,7 @@ let
       sha256 = "0bl1ky8ps9jg842j4mnmf4zbx8nkvk0h77w7bqjlpwij9wq2mvw8";
     };
     buildInputs = [pkgconfig libX11 libXmu xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 libXmu xproto ;};
 
   xlsatoms = (mkDerivation "xlsatoms" {
@@ -2035,6 +2236,7 @@ let
       sha256 = "196yjik910xsr7dwy8daa0amr0r22ynfs360z0ndp9mx7mydrra7";
     };
     buildInputs = [pkgconfig libxcb ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libxcb ;};
 
   xlsclients = (mkDerivation "xlsclients" {
@@ -2045,6 +2247,7 @@ let
       sha256 = "0g9x7rrggs741x9xwvv1k9qayma980d88nhdqw7j3pn3qvy6d5jx";
     };
     buildInputs = [pkgconfig libxcb ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libxcb ;};
 
   xlsfonts = (mkDerivation "xlsfonts" {
@@ -2055,6 +2258,7 @@ let
       sha256 = "1yi774g6r1kafsbnxbkrwyndd3i60362ck1fps9ywz076pn5naa0";
     };
     buildInputs = [pkgconfig libX11 xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 xproto ;};
 
   xmag = (mkDerivation "xmag" {
@@ -2065,6 +2269,7 @@ let
       sha256 = "0qg12ifbbk9n8fh4jmyb625cknn8ssj86chd6zwdiqjin8ivr8l7";
     };
     buildInputs = [pkgconfig libX11 libXaw libXmu libXt ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 libXaw libXmu libXt ;};
 
   xmessage = (mkDerivation "xmessage" {
@@ -2075,6 +2280,7 @@ let
       sha256 = "0s5bjlpxnmh8sxx6nfg9m0nr32r1sr3irr71wsnv76s33i34ppxw";
     };
     buildInputs = [pkgconfig libXaw libXt ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libXaw libXt ;};
 
   xmodmap = (mkDerivation "xmodmap" {
@@ -2085,6 +2291,7 @@ let
       sha256 = "0y649an3jqfq9klkp9y5gj20xb78fw6g193f5mnzpl0hbz6fbc5p";
     };
     buildInputs = [pkgconfig libX11 xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 xproto ;};
 
   xorgcffiles = (mkDerivation "xorgcffiles" {
@@ -2095,6 +2302,7 @@ let
       sha256 = "1m3ypq0xcy46ghxc0svl1rbhpy3zvgmy0aa2mn7w7v7d8d8bh8zd";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   xorgdocs = (mkDerivation "xorgdocs" {
@@ -2105,6 +2313,7 @@ let
       sha256 = "0jrc4jmb4raqawx0j9jmhgasr0k6sxv0bm2hrxjh9hb26iy6gf14";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   xorgserver = (mkDerivation "xorgserver" {
@@ -2115,6 +2324,7 @@ let
       sha256 = "0mv4ilpqi5hpg182mzqn766frhi6rw48aba3xfbaj4m82v0lajqc";
     };
     buildInputs = [pkgconfig dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ;};
 
   xorgsgmldoctools = (mkDerivation "xorgsgmldoctools" {
@@ -2125,6 +2335,7 @@ let
       sha256 = "0k5pffyi5bx8dmfn033cyhgd3gf6viqj3x769fqixifwhbgy2777";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   xpr = (mkDerivation "xpr" {
@@ -2135,6 +2346,7 @@ let
       sha256 = "1dbcv26w2yand2qy7b3h5rbvw1mdmdd57jw88v53sgdr3vrqvngy";
     };
     buildInputs = [pkgconfig libX11 libXmu xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 libXmu xproto ;};
 
   xprop = (mkDerivation "xprop" {
@@ -2145,6 +2357,7 @@ let
       sha256 = "1ilvhqfjcg6f1hqahjkp8qaay9rhvmv2blvj3w9asraq0aqqivlv";
     };
     buildInputs = [pkgconfig libX11 xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 xproto ;};
 
   xproto = (mkDerivation "xproto" {
@@ -2155,6 +2368,7 @@ let
       sha256 = "1jpnvm33vi2dar5y5zgz7jjh0m8fpkcxm0f0lbwfx37ns5l5bs19";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   xrandr = (mkDerivation "xrandr" {
@@ -2165,6 +2379,7 @@ let
       sha256 = "06xy0kr6ih7ilrwl6b5g6ay75vm2j4lxnv1d5xlj6sdqhqsaqm3i";
     };
     buildInputs = [pkgconfig libX11 xproto libXrandr libXrender ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 xproto libXrandr libXrender ;};
 
   xrdb = (mkDerivation "xrdb" {
@@ -2175,6 +2390,7 @@ let
       sha256 = "0nsnr90wazcdd50nc5dqswy0bmq6qcj14nnrhyi7rln9pxmpp0kk";
     };
     buildInputs = [pkgconfig libX11 libXmu xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 libXmu xproto ;};
 
   xrefresh = (mkDerivation "xrefresh" {
@@ -2185,6 +2401,7 @@ let
       sha256 = "1mlinwgvql6s1rbf46yckbfr9j22d3c3z7jx3n6ix7ca18dnf4rj";
     };
     buildInputs = [pkgconfig libX11 xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 xproto ;};
 
   xset = (mkDerivation "xset" {
@@ -2195,6 +2412,7 @@ let
       sha256 = "0qw0iic27bz3yz2wynf1gxs70hhkcf9c4jrv7zhlg1mq57xz90j3";
     };
     buildInputs = [pkgconfig libX11 libXext libXmu xproto libXxf86misc ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 libXext libXmu xproto libXxf86misc ;};
 
   xsetroot = (mkDerivation "xsetroot" {
@@ -2205,6 +2423,7 @@ let
       sha256 = "1bazzsf9sy0q2bj4lxvh1kvyrhmpggzb7jg575i15sksksa3xwc8";
     };
     buildInputs = [pkgconfig libX11 xbitmaps libXcursor libXmu ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 xbitmaps libXcursor libXmu ;};
 
   xtrans = (mkDerivation "xtrans" {
@@ -2215,6 +2434,7 @@ let
       sha256 = "00c3ph17acnsch3gbdmx33b9ifjnl5w7vx8hrmic1r1cjcv3pgdd";
     };
     buildInputs = [pkgconfig ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit ;};
 
   xvinfo = (mkDerivation "xvinfo" {
@@ -2225,6 +2445,7 @@ let
       sha256 = "1sz5wqhxd1fqsfi1w5advdlwzkizf2fgl12hdpk66f7mv9l8pflz";
     };
     buildInputs = [pkgconfig libX11 xproto libXv ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 xproto libXv ;};
 
   xwd = (mkDerivation "xwd" {
@@ -2235,6 +2456,7 @@ let
       sha256 = "0ybx48agdvjp9lgwvcw79r1x6jbqbyl3fliy3i5xwy4d4si9dcrv";
     };
     buildInputs = [pkgconfig libX11 xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 xproto ;};
 
   xwininfo = (mkDerivation "xwininfo" {
@@ -2245,6 +2467,7 @@ let
       sha256 = "1y1zn8ijqslb5lfpbq4bb78kllhch8in98ps7n8fg3dxjpmb13i1";
     };
     buildInputs = [pkgconfig libX11 libxcb xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 libxcb xproto ;};
 
   xwud = (mkDerivation "xwud" {
@@ -2255,6 +2478,7 @@ let
       sha256 = "1ggql6maivah58kwsh3z9x1hvzxm1a8888xx4s78cl77ryfa1cyn";
     };
     buildInputs = [pkgconfig libX11 xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit libX11 xproto ;};
 
 }; in xorg
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 6665a3bc00a9..054e3f490e44 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -280,6 +280,7 @@ foreach my $pkg (sort (keys %pkgURLs)) {
       sha256 = "$pkgHashes{$pkg}";
     };
     buildInputs = [pkgconfig $inputs];$extraAttrs
+    meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit $inputs;};
 
 EOF

From 1ba2015450263396bf47a108caba6fd66b1d5e79 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 30 Dec 2015 12:53:36 +0100
Subject: [PATCH 046/884] install-grub: Make more robust against GC'ed system
 profile entries

Previously this barfed with:

  updating GRUB 2 menu...
  fileparse(): need a valid pathname at /nix/store/zldbbngl0f8g5iv4rslygxwp0dbg1624-install-grub.pl line 391.
  warning: error(s) occured while switching to the new configuration
---
 nixos/modules/system/boot/loader/grub/install-grub.pl | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index af39e50ff72d..b8ef02da4bc2 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -387,6 +387,10 @@ sub addProfile {
     my $curEntry = 0;
     foreach my $link (@links) {
         last if $curEntry++ >= $configurationLimit;
+        if (! -e "$link/nixos-version") {
+            warn "skipping corrupt system profile entry ‘$link’\n";
+            next;
+        }
         my $date = strftime("%F", localtime(lstat($link)->mtime));
         my $version =
             -e "$link/nixos-version"

From e78bad526286b392808b613e2435a9d4920d4b79 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 30 Dec 2015 15:13:43 +0100
Subject: [PATCH 047/884] etc: Use a friendlier name than "etc-file"

---
 nixos/modules/system/etc/etc.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/etc/etc.nix b/nixos/modules/system/etc/etc.nix
index 300ae0acda53..9d5b3db472c3 100644
--- a/nixos/modules/system/etc/etc.nix
+++ b/nixos/modules/system/etc/etc.nix
@@ -112,8 +112,9 @@ in
 
           config = {
             target = mkDefault name;
-            source = mkIf (config.text != null)
-              (mkDefault (pkgs.writeText "etc-file" config.text));
+            source = mkIf (config.text != null) (
+              let name' = "etc-" + baseNameOf name;
+              in mkDefault (pkgs.writeText name' config.text));
           };
 
         });

From 146c727924674f1bf59a216b01d8ed5f534c287a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 30 Dec 2015 12:40:29 +0100
Subject: [PATCH 048/884] waitForUnit: Fail if the unit reaches inactive state
 with no pending jobs

This prevents waitForUnit for looping for many minutes before giving
up.
---
 nixos/lib/test-driver/Machine.pm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm
index 41088ed75f7e..8ac0a31f2875 100644
--- a/nixos/lib/test-driver/Machine.pm
+++ b/nixos/lib/test-driver/Machine.pm
@@ -381,6 +381,11 @@ sub waitForUnit {
             my $info = $self->getUnitInfo($unit);
             my $state = $info->{ActiveState};
             die "unit ‘$unit’ reached state ‘$state’\n" if $state eq "failed";
+            if ($state eq "inactive") {
+                my ($status, $jobs) = $self->execute("systemctl list-jobs --full 2>&1");
+                die "unit ‘$unit’ is inactive and there are no pending jobs\n"
+                    if $jobs =~ /No jobs/; # FIXME: fragile
+            }
             return 1 if $state eq "active";
         };
     });

From 8565efc4da6d3868e7b73e1cff17b8937007780c Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Wed, 30 Dec 2015 10:36:15 -0500
Subject: [PATCH 049/884] remove manual derivation for popup-mode

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

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 17610ddb232b..fc2e60d7fd11 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -1493,21 +1493,6 @@ let
     };
   };
 
-  popup = melpaBuild rec {
-    pname   = "popup";
-    version = "0.5.2";
-    src = fetchFromGitHub {
-      owner  = "auto-complete";
-      repo   = "${pname}-el";
-      rev    = "v${version}";
-      sha256 = "0aazkczrzpp75793bpi0pz0cs7vinhdrpxfdlzi0cr39njird2yj";
-    };
-    meta = {
-      description = "Popup tooltips and popup menus for Emacs";
-      license = gpl3Plus;
-    };
-  };
-
   projectile = melpaBuild rec {
     pname   = "projectile";
     version = "0.13.0";

From 8c90a4421a1636a4af95a3dfb73c2650bd181cc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 30 Dec 2015 16:46:31 +0100
Subject: [PATCH 050/884] exiv2: update 0.24 -> 0.25

---
 pkgs/development/libraries/exiv2/default.nix | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix
index 0702d24a80b8..e1af46cc3ed0 100644
--- a/pkgs/development/libraries/exiv2/default.nix
+++ b/pkgs/development/libraries/exiv2/default.nix
@@ -1,28 +1,20 @@
-{stdenv, fetchurl, fetchpatch, zlib, expat}:
+{ stdenv, fetchurl, fetchpatch, zlib, expat, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "exiv2-0.24";
+  name = "exiv2-0.25";
 
   src = fetchurl {
     url = "http://www.exiv2.org/${name}.tar.gz";
-    sha256 = "13pgvz14kyapxl89pxjaq3274k56d5lzfckpg1g9z7gvqzk4797l";
+    sha256 = "197g6vgcpyf9p2cwn5p5hb1r714xsk1v4p96f5pv1z8mi9vzq2y8";
   };
+  postPatch = "patchShebangs ./src/svn_version.sh";
 
-  patches = [(fetchpatch {
-    name = "CVE-2014-9449.diff";
-    url = "http://dev.exiv2.org/projects/exiv2/repository/revisions/3264/diff?format=diff&rev_to=3263";
-    sha256 = "02w0fksl966d4v6bkg6rq3wmvv8xjpvfp47qr0nv1xq0bphxqzag";
-  })];
-
-  propagatedBuildInputs = [zlib expat];
-
-# configure script finds zlib&expat but it thinks that they're in /usr
-  configureFlags = "--with-zlib=${zlib} --with-expat=${expat}";
+  nativeBuildInputs = [ gettext ];
+  propagatedBuildInputs = [ zlib expat ];
 
   meta = {
     homepage = http://www.exiv2.org/;
     description = "A library and command-line utility to manage image metadata";
-    maintainers = [stdenv.lib.maintainers.urkud];
     platforms = stdenv.lib.platforms.all;
   };
 }

From c1ec39d47be64499956d51e5684dadf69bf4c352 Mon Sep 17 00:00:00 2001
From: Shell Turner <cam.turn@gmail.com>
Date: Tue, 29 Dec 2015 16:29:44 +0000
Subject: [PATCH 051/884] icestorm: init at 2015.12.29

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

diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix
new file mode 100644
index 000000000000..726b805fe91a
--- /dev/null
+++ b/pkgs/development/tools/icestorm/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, python3, libftdi }:
+
+stdenv.mkDerivation rec {
+  name = "icestorm-${version}";
+  version = "2015.12.29";
+
+  src = fetchFromGitHub {
+    owner = "cliffordwolf";
+    repo = "icestorm";
+    rev = "7852514c2cde208da87b62777b2c5e482092f50d";
+    sha256 = "1ya1nk5h28hjdmd8jdrlfiayr2434rnvi133gs1p0ay21qb3iwfz";
+  };
+
+  buildInputs = [ python3 libftdi ];
+  preBuild = ''
+    makeFlags="DESTDIR=$out $makeFlags"
+  '';
+
+  meta = {
+    description = "Documentation and tools for Lattice iCE40 FPGAs";
+    longDescription = ''
+      Project IceStorm aims at reverse engineering and
+      documenting the bitstream format of Lattice iCE40
+      FPGAs and providing simple tools for analyzing and
+      creating bitstream files.
+    '';
+    homepage = http://www.clifford.at/icestorm/;
+    license = stdenv.lib.licenses.isc;
+    maintainers = [ stdenv.lib.maintainers.shell ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6ec1aff8776c..fe73bf83c9a0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5755,6 +5755,8 @@ let
 
   hyenae = callPackage ../tools/networking/hyenae { };
 
+  icestorm = callPackage ../development/tools/icestorm { };
+
   icmake = callPackage ../development/tools/build-managers/icmake { };
 
   iconnamingutils = callPackage ../development/tools/misc/icon-naming-utils {

From f11ec866ada39234a32f1637c72ff5ad8e3ff973 Mon Sep 17 00:00:00 2001
From: Shell Turner <cam.turn@gmail.com>
Date: Tue, 29 Dec 2015 16:30:45 +0000
Subject: [PATCH 052/884] arachne-pnr: init at 2015.12.29

---
 .../compilers/arachne-pnr/default.nix         | 35 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/compilers/arachne-pnr/default.nix

diff --git a/pkgs/development/compilers/arachne-pnr/default.nix b/pkgs/development/compilers/arachne-pnr/default.nix
new file mode 100644
index 000000000000..7926bf273acb
--- /dev/null
+++ b/pkgs/development/compilers/arachne-pnr/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchFromGitHub, icestorm }:
+
+stdenv.mkDerivation rec {
+  name = "arachne-pnr-${version}";
+  version = "2015.12.29";
+
+  src = fetchFromGitHub {
+    owner = "cseed";
+    repo = "arachne-pnr";
+    rev = "1a4fdf96a7fd08806c032d41a2443c8e17c72c80";
+    sha256 = "1dj7ycffwkmlsh12117fbybkdfnlhxbbxkbfgwfyvcgmg3cacgl1";
+  };
+
+  preBuild = ''
+    makeFlags="DESTDIR=$out $makeFlags"
+  '';
+  makeFlags = "ICEBOX=${icestorm}/share/icebox";
+
+  meta = {
+    description = "Place and route tool for FPGAs";
+    longDescription = ''
+      Arachne-pnr implements the place and route step of
+      the hardware compilation process for FPGAs. It
+      accepts as input a technology-mapped netlist in BLIF
+      format, as output by the Yosys [0] synthesis suite
+      for example. It currently targets the Lattice
+      Semiconductor iCE40 family of FPGAs [1]. Its output
+      is a textual bitstream representation for assembly by
+      the IceStorm [2] icepack command.
+    '';
+    homepage = https://github.com/cseed/arachne-pnr;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.shell ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fe73bf83c9a0..6c8ea3194020 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3776,6 +3776,8 @@ let
 
   aliceml = callPackage ../development/compilers/aliceml { };
 
+  arachne-pnr = callPackage ../development/compilers/arachne-pnr { };
+
   aspectj = callPackage ../development/compilers/aspectj { };
 
   ats = callPackage ../development/compilers/ats { };

From c485543c7c1aca6d32e755d5736c035ba13f5c5a Mon Sep 17 00:00:00 2001
From: Shell Turner <cam.turn@gmail.com>
Date: Tue, 29 Dec 2015 16:31:18 +0000
Subject: [PATCH 053/884] yosys: init at 2015.12.29

---
 pkgs/development/compilers/yosys/default.nix | 50 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 +
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/development/compilers/yosys/default.nix

diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix
new file mode 100644
index 000000000000..cfaabb0a71a9
--- /dev/null
+++ b/pkgs/development/compilers/yosys/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, fetchFromGitHub, fetchFromBitbucket, pkgconfig, tcl, readline, libffi, python3, bison, flex }:
+
+stdenv.mkDerivation rec {
+  name = "yosys-${version}";
+  version = "2015.12.29";
+
+  srcs = [
+    (fetchFromGitHub {
+      owner = "cliffordwolf";
+      repo = "yosys";
+      rev = "1d62f8710f04fec405ef79b9e9a4a031afcf7d42";
+      sha256 = "0q1dk9in3gmrihb58pjckncx56lj7y4b6y34jgb68f0fh91fdvfx";
+      name = "yosys";
+    })
+    (fetchFromBitbucket {
+      owner = "alanmi";
+      repo = "abc";
+      rev = "c3698e053a7a";
+      sha256 = "05p0fvbr7xvb6w3d7j2r6gynr3ljb6r5q6jvn2zs3ysn2b003qwd";
+      name = "abc";
+    })
+  ];
+  sourceRoot = "yosys";
+
+  buildInputs = [ pkgconfig tcl readline libffi python3 bison flex ];
+  preBuild = ''
+    chmod -R u+w ../abc
+    ln -s ../abc abc
+    make config-gcc
+    echo 'ABCREV := default' >> Makefile.conf
+    makeFlags="PREFIX=$out $makeFlags"
+  '';
+
+  meta = {
+    description = "Framework for RTL synthesis tools";
+    longDescription = ''
+      Yosys is a framework for RTL synthesis tools. It currently has
+      extensive Verilog-2005 support and provides a basic set of
+      synthesis algorithms for various application domains.
+
+      Yosys can be adapted to perform any synthesis job by combining
+      the existing passes (algorithms) using synthesis scripts and
+      adding additional passes as needed by extending the yosys C++
+      code base.
+    '';
+    homepage = http://www.clifford.at/yosys/;
+    license = stdenv.lib.licenses.isc;
+    maintainers = [ stdenv.lib.maintainers.shell ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6c8ea3194020..d22600fd0eb3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5001,6 +5001,8 @@ let
 
   yasm = callPackage ../development/compilers/yasm { };
 
+  yosys = callPackage ../development/compilers/yosys { };
+
 
   ### DEVELOPMENT / INTERPRETERS
 

From 358885fd875671e572abeaf1c723a8fc49f87dfa Mon Sep 17 00:00:00 2001
From: Louis Taylor <louis@kragniz.eu>
Date: Wed, 30 Dec 2015 16:52:46 +0000
Subject: [PATCH 054/884] qmltermwidget: fix homepage url

---
 pkgs/development/libraries/qmltermwidget/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix
index 4d12f020d1e8..24e1d2c9b9c1 100644
--- a/pkgs/development/libraries/qmltermwidget/default.nix
+++ b/pkgs/development/libraries/qmltermwidget/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A QML port of qtermwidget";
-    homepage = "https://github.com/Swordifish90/qmltermwidget";
+    homepage = "https://github.com/Swordfish90/qmltermwidget";
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ skeidel ];

From f7ab821916103e215924e76456c26f2bd5abe3ae Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 30 Dec 2015 18:17:43 +0100
Subject: [PATCH 055/884] Julia: update libuv version

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

diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix
index 81781868b02a..0eddde15a58e 100644
--- a/pkgs/development/compilers/julia/default.nix
+++ b/pkgs/development/compilers/julia/default.nix
@@ -28,10 +28,10 @@ let
     sha256 = "03kaqbjbi6viz0n33dk5jlf6ayxqlsq4804n7kwkndiga9s4hd42";
   };
 
-  libuvVersion = "28f5f06b5ff6f010d666ec26552e0badaca5cdcd";
+  libuvVersion = "9ab431a88fe255dd21e19a11f7fa2dd95774abf4";
   libuv = fetchurl {
     url = "https://api.github.com/repos/JuliaLang/libuv/tarball/${libuvVersion}";
-    sha256 = "1ksns0aiayxmxffvq2kc96904mxlmbkfc30xxck69xnidr2jvr4a";
+    sha256 = "1bh973lbrzrjk7pcjbjnh4n92qldi81ql3aqsclywn2yg07a36h5";
   };
 
   rmathVersion = "0.1";

From 58cc890d2be3b35f403a73d766473760613a78a7 Mon Sep 17 00:00:00 2001
From: Anders Papitto <anderspapitto@gmail.com>
Date: Wed, 30 Dec 2015 10:10:39 -0800
Subject: [PATCH 056/884] sysctl: use literalExample in docs

---
 nixos/modules/config/sysctl.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/config/sysctl.nix b/nixos/modules/config/sysctl.nix
index e83562a8356e..61b02c5ffa6a 100644
--- a/nixos/modules/config/sysctl.nix
+++ b/nixos/modules/config/sysctl.nix
@@ -22,10 +22,9 @@ in
 
     boot.kernel.sysctl = mkOption {
       default = {};
-      example = {
-        "net.ipv4.tcp_syncookies" = false;
-        "vm.swappiness" = 60;
-      };
+      example = literalExample ''
+        { "net.ipv4.tcp_syncookies" = false; "vm.swappiness" = 60; }
+      '';
       type = types.attrsOf sysctlOption;
       description = ''
         Runtime parameters of the Linux kernel, as set by

From ac8e5edada14629bac7abd7a19b987fa13ec8950 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 29 Dec 2015 22:47:41 +0100
Subject: [PATCH 057/884] box2d: use stdenv

This replaces use of `builderDefsPackage`. Also change to download
tarball from GitHub as it is the new upstream home.
---
 pkgs/development/libraries/box2d/default.nix | 66 +++++++-------------
 1 file changed, 24 insertions(+), 42 deletions(-)

diff --git a/pkgs/development/libraries/box2d/default.nix b/pkgs/development/libraries/box2d/default.nix
index 10a7ca549521..25d291da3327 100644
--- a/pkgs/development/libraries/box2d/default.nix
+++ b/pkgs/development/libraries/box2d/default.nix
@@ -1,51 +1,33 @@
-x@{builderDefsPackage
-  , unzip, cmake, mesa, freeglut, libX11, xproto
-  , inputproto, libXi, fetchsvn, pkgconfig
-  , ...}:
-builderDefsPackage
-(a :
-let
-  helperArgNames = ["stdenv" "fetchsvn" "builderDefsPackage"] ++
-    [];
+{ stdenv, fetchurl, unzip, cmake, mesa, freeglut, libX11, xproto, inputproto
+, libXi, pkgconfig }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-in
-rec {
-  version = "2.3.0";
+stdenv.mkDerivation rec {
   name = "box2d-${version}";
-  srcDrv = a.fetchsvn {
-    url = "http://box2d.googlecode.com/svn/trunk";
-    rev = "277";
-    sha256 = "1xp93yw2zcqhmh999v7cwqaqxq1glgyg5r8kfm4yabc1ypba3in4";
+  version = "2.3.0";
+
+  src = fetchurl {
+    url = "https://github.com/erincatto/Box2D/archive/v${version}.tar.gz";
+    sha256 = "1dmbswh4x2n5l3c9h0k72m0z4rdpzfy1xl8m8p3rf5rwkvk3bkg2";
   };
-  src = srcDrv + "/";
 
-  inherit buildInputs;
+  sourceRoot = "Box2D-${version}/Box2D";
 
-  phaseNames = ["changeSettings" "doCmake" "doMakeInstall"];
+  buildInputs = [
+    unzip cmake mesa freeglut libX11 xproto inputproto libXi pkgconfig
+  ];
 
-  changeSettings = a.fullDepEntry ''
-    sed -i Box2D/Common/b2Settings.h -e 's@b2_maxPolygonVertices .*@b2_maxPolygonVertices 15@'
-  '' ["minInit" "addInputs" "doUnpack"];
-      
-  goSrcDir = ''cd Box2D'';
+  cmakeFlags = [ "-DBOX2D_INSTALL=ON" "-DBOX2D_BUILD_SHARED=ON" ];
 
-  doCmake = a.fullDepEntry ''
-    cd Build; 
-    cmake -DBOX2D_INSTALL=ON -DBOX2D_BUILD_SHARED=ON -DCMAKE_INSTALL_PREFIX=$out ..
-  '' ["minInit" "addInputs" "doUnpack"];
-      
-  meta = {
+  prePatch = ''
+    substituteInPlace Box2D/Common/b2Settings.h \
+      --replace 'b2_maxPolygonVertices	8' 'b2_maxPolygonVertices	15'
+  '';
+
+  meta = with stdenv.lib; {
     description = "2D physics engine";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = "bsd";
-    inherit version;
+    homepage = http://box2d.org/;
+    maintainers = [ maintainers.raskin ];
+    platforms = platforms.linux;
+    license = licenses.zlib;
   };
-}) x
-
+}

From bbd253b569bf0ada40e4b177c22568086a82165f Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 29 Dec 2015 23:33:13 +0100
Subject: [PATCH 058/884] allegro: use stdenv

This replaces use of `builderDefsPackage`. Also change to download
tarball from GNA as it is the new upstream home. Minor other fixes.
---
 .../development/libraries/allegro/default.nix | 75 ++++++-------------
 1 file changed, 23 insertions(+), 52 deletions(-)

diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix
index 6d31087968cc..deb3a6877e89 100644
--- a/pkgs/development/libraries/allegro/default.nix
+++ b/pkgs/development/libraries/allegro/default.nix
@@ -1,59 +1,30 @@
-x@{builderDefsPackage
-  , texinfo, libXext, xextproto, libX11, xproto, libXpm, libXt, libXcursor
-  , alsaLib, cmake, zlib, libpng, libvorbis, libXxf86dga, libXxf86misc
-  , xf86dgaproto, xf86miscproto, xf86vidmodeproto, libXxf86vm, openal, mesa
-  , ...}:
-builderDefsPackage
-(a :
-let
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
-    [];
+{ stdenv, fetchurl, texinfo, libXext, xextproto, libX11, xproto
+, libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis
+, libXxf86dga, libXxf86misc, xf86dgaproto, xf86miscproto
+, xf86vidmodeproto, libXxf86vm, openal, mesa }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="allegro";
-    version="4.4.2";
-    name="${baseName}-${version}";
-    project="alleg";
-    url="mirror://sourceforge/project/${project}/${baseName}/${version}/${name}.tar.gz";
-    hash="1p0ghkmpc4kwij1z9rzxfv7adnpy4ayi0ifahlns1bdzgmbyf88v";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+stdenv.mkDerivation rec {
+  name = "allegro-${version}";
+  version="4.4.2";
+
+  src = fetchurl {
+    url = "http://download.gna.org/allegro/allegro/${version}/${name}.tar.gz";
+    sha256 = "1p0ghkmpc4kwij1z9rzxfv7adnpy4ayi0ifahlns1bdzgmbyf88v";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doCmake" "doMakeInstall"];
-
-  doCmake = a.fullDepEntry (''
-    export NIX_LDFLAGS="$NIX_LDFLAGS -lXext -lX11 -lXpm -lXcursor -lXxf86vm"
-    cmake -D CMAKE_INSTALL_PREFIX=$out -D CMAKE_SKIP_RPATH=ON .
-  '') ["minInit" "doUnpack" "addInputs"];
-
-  makeFlags = [
+  buildInputs = [
+    texinfo libXext xextproto libX11 xproto libXpm libXt libXcursor
+    alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc
+    xf86dgaproto xf86miscproto xf86vidmodeproto libXxf86vm openal mesa
   ];
 
-  meta = {
-    branch = "4";
+  cmakeFlags = [ "-DCMAKE_SKIP_RPATH=ON" ];
+
+  meta = with stdenv.lib; {
     description = "A game programming library";
-    license = a.lib.licenses.free; # giftware
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
+    homepage = http://liballeg.org/;
+    license = licenses.free; # giftware
+    maintainers = [ maintainers.raskin ];
+    platforms = platforms.linux;
   };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://sourceforge.net/projects/alleg/files/";
-    };
-  };
-}) x
+}

From f37279aebc9a0fa6a60727cb410a9d2d7655a4ab Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 29 Dec 2015 23:34:19 +0100
Subject: [PATCH 059/884] allegro5: use stdenv

This replaces use of `builderDefsPackage`. Also change to download
tarball from GNA as it is the new upstream home. Minor other fixes.
---
 pkgs/development/libraries/allegro/5.nix      | 69 ++++++-------------
 pkgs/development/libraries/allegro/5.upstream |  7 --
 2 files changed, 22 insertions(+), 54 deletions(-)
 delete mode 100644 pkgs/development/libraries/allegro/5.upstream

diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix
index 793b57c676b5..6f05afa4f480 100644
--- a/pkgs/development/libraries/allegro/5.nix
+++ b/pkgs/development/libraries/allegro/5.nix
@@ -1,56 +1,31 @@
+{ stdenv, fetchurl, texinfo, libXext, xextproto, libX11, xproto
+, libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis
+, libXxf86dga, libXxf86misc, xf86dgaproto, xf86miscproto
+, xf86vidmodeproto, libXxf86vm, openal, mesa, kbproto, libjpeg, flac }:
 
-x@{builderDefsPackage
-  , texinfo, libXext, xextproto, libX11, xproto, libXpm, libXt, libXcursor
-  , alsaLib, cmake, zlib, libpng, libvorbis, libXxf86dga, libXxf86misc
-  , xf86dgaproto, xf86miscproto, xf86vidmodeproto, libXxf86vm, openal, mesa
-  , kbproto, libjpeg, flac
-  , ...}:
-builderDefsPackage
-(a :
-let
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
-    [];
+stdenv.mkDerivation rec {
+  name = "allegro-${version}";
+  version = "5.0.11";
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="allegro";
-    version = "5.0.11";
-    name="${baseName}-${version}";
-    project="alleg";
-    url="mirror://sourceforge/project/${project}/${baseName}/${version}/${name}.tar.gz";
-    hash="18fdppaqaf3g3rcqwhyvsmkzk3y14clz4l8cvmg4hvjgyf011f3i";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
+  src = fetchurl {
+    url = "http://download.gna.org/allegro/allegro/${version}/${name}.tar.gz";
     sha256 = "0cd51qrh97jrr0xdmnivqgwljpmizg8pixsgvc4blqqlaz4i9zj9";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doCmake" "doMakeInstall"];
-
-  doCmake = a.fullDepEntry (''
-    export NIX_LDFLAGS="$NIX_LDFLAGS -lXext -lX11 -lXpm -lXcursor -lXxf86vm"
-    cmake -D CMAKE_INSTALL_PREFIX=$out -D CMAKE_SKIP_RPATH=ON .
-  '') ["minInit" "doUnpack" "addInputs"];
-
-  makeFlags = [
+  buildInputs = [
+    texinfo libXext xextproto libX11 xproto libXpm libXt libXcursor
+    alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc
+    xf86dgaproto xf86miscproto xf86vidmodeproto libXxf86vm openal mesa
+    kbproto libjpeg flac
   ];
 
-  meta = {
+  cmakeFlags = [ "-DCMAKE_SKIP_RPATH=ON" ];
+
+  meta = with stdenv.lib; {
     description = "A game programming library";
-    license = a.lib.licenses.free; # giftware
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    inherit version;
+    homepage = http://liballeg.org/;
+    license = licenses.zlib;
+    maintainers = [ maintainers.raskin ];
+    platforms = platforms.linux;
   };
-}) x
+}
diff --git a/pkgs/development/libraries/allegro/5.upstream b/pkgs/development/libraries/allegro/5.upstream
deleted file mode 100644
index 9d139383fe3d..000000000000
--- a/pkgs/development/libraries/allegro/5.upstream
+++ /dev/null
@@ -1,7 +0,0 @@
-attribute_name allegro5
-url http://alleg.sourceforge.net/download.html
-version_link '[.]tar[.].*/download$'
-SF_redirect
-do_overwrite () {
-  do_overwrite_just_version
-}

From 9a47354a964fd0b746dd753f0dd1ebf24ff9ce69 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 29 Dec 2015 23:34:36 +0100
Subject: [PATCH 060/884] allegro5unstable: use stdenv

This replaces use of `builderDefsPackage`. Also change to download
tarball from GNA as it is the new upstream home. Minor other fixes.
---
 .../libraries/allegro/5-unstable.nix          | 79 +++++++------------
 .../libraries/allegro/5-unstable.upstream     |  7 --
 2 files changed, 27 insertions(+), 59 deletions(-)
 delete mode 100644 pkgs/development/libraries/allegro/5-unstable.upstream

diff --git a/pkgs/development/libraries/allegro/5-unstable.nix b/pkgs/development/libraries/allegro/5-unstable.nix
index dd0df768a689..e5a2c38ddab7 100644
--- a/pkgs/development/libraries/allegro/5-unstable.nix
+++ b/pkgs/development/libraries/allegro/5-unstable.nix
@@ -1,61 +1,36 @@
+{ stdenv, fetchurl, texinfo, libXext, xextproto, libX11, xproto
+, libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis
+, libXxf86dga, libXxf86misc, xf86dgaproto, xf86miscproto
+, xf86vidmodeproto, libXxf86vm, openal, mesa, kbproto, libjpeg, flac
+, inputproto, libXi, fixesproto, libXfixes }:
 
-x@{builderDefsPackage
-  , texinfo, libXext, xextproto, libX11, xproto, libXpm, libXt, libXcursor
-  , alsaLib, cmake, zlib, libpng, libvorbis, libXxf86dga, libXxf86misc
-  , xf86dgaproto, xf86miscproto, xf86vidmodeproto, libXxf86vm, openal, mesa
-  , kbproto, libjpeg, flac, inputproto, libXi, fixesproto, libXfixes
-  , ...}:
-builderDefsPackage
-(a :
-let
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
-    [];
+stdenv.mkDerivation rec {
+  name = "allegro-${version}";
+  version = "5.1.11";
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="allegro";
-    folderSuffix = "-unstable";
-    version = "5.1.11";
-    name="${baseName}-${version}";
-    project="alleg";
-    url="mirror://sourceforge/project/${project}/${baseName}${folderSuffix}/${version}/${name}.tar.gz";
-    hash="18fdppaqaf3g3rcqwhyvsmkzk3y14clz4l8cvmg4hvjgyf011f3i";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
+  src = fetchurl {
+    url = "http://download.gna.org/allegro/allegro-unstable/${version}/${name}.tar.gz";
     sha256 = "0zz07gdyc6xflpvkknwgzsyyyh9qiwd69j42rm9cw1ciwcsic1vs";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["patchIncludes" "doCmake" "doMakeInstall"];
-
-  patchIncludes = a.fullDepEntry ''
-    sed -e 's@/XInput2.h@/XI2.h@g' -i CMakeLists.txt src/*.c
-  '' ["minInit" "doUnpack"];
-
-  doCmake = a.fullDepEntry (''
-    export NIX_LDFLAGS="$NIX_LDFLAGS -lXext -lX11 -lXpm -lXcursor -lXxf86vm -lXi -lXfixes"
-    cmake -D CMAKE_INSTALL_PREFIX=$out -D CMAKE_SKIP_RPATH=ON .
-  '') ["minInit" "doUnpack" "addInputs"];
-
-  makeFlags = [
+  buildInputs = [
+    texinfo libXext xextproto libX11 xproto libXpm libXt libXcursor
+    alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc
+    xf86dgaproto xf86miscproto xf86vidmodeproto libXxf86vm openal mesa
+    kbproto libjpeg flac inputproto libXi fixesproto libXfixes
   ];
 
-  meta = {
+  patchPhase = ''
+    sed -e 's@/XInput2.h@/XI2.h@g' -i CMakeLists.txt "src/"*.c
+  '';
+
+  cmakeFlags = [ "-DCMAKE_SKIP_RPATH=ON" ];
+
+  meta = with stdenv.lib; {
     description = "A game programming library";
-    license = a.lib.licenses.free; # giftware
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    inherit version;
+    homepage = http://liballeg.org/;
+    license = licenses.zlib;
+    maintainers = [ maintainers.raskin ];
+    platforms = platforms.linux;
   };
-}) x
+}
diff --git a/pkgs/development/libraries/allegro/5-unstable.upstream b/pkgs/development/libraries/allegro/5-unstable.upstream
deleted file mode 100644
index e07829c08cc4..000000000000
--- a/pkgs/development/libraries/allegro/5-unstable.upstream
+++ /dev/null
@@ -1,7 +0,0 @@
-attribute_name allegro5
-url http://alleg.sourceforge.net/download.html
-version_link '/allegro-unstable/.*[.]tar[.].*/download$'
-SF_redirect
-do_overwrite () {
-  do_overwrite_just_version
-}

From abf836b06652a3545fb8b009aeb0bb6600fe3479 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 29 Dec 2015 23:52:11 +0100
Subject: [PATCH 061/884] ois: use stdenv

This replaces use of `builderDefsPackage`.
---
 pkgs/development/libraries/ois/default.nix | 81 +++++++++-------------
 1 file changed, 31 insertions(+), 50 deletions(-)

diff --git a/pkgs/development/libraries/ois/default.nix b/pkgs/development/libraries/ois/default.nix
index 67df3645eb90..25bb7a365f28 100644
--- a/pkgs/development/libraries/ois/default.nix
+++ b/pkgs/development/libraries/ois/default.nix
@@ -1,60 +1,41 @@
-x@{builderDefsPackage, fetchurl
-  , autoconf, automake, libtool, m4
-  , libX11, xproto, libXi, inputproto
-  , libXaw, libXmu, libXt
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
+{ stdenv, fetchurl, autoconf, automake, libtool, libX11, xproto
+, libXi, inputproto, libXaw, libXmu, libXt }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="ois";
-    majorVersion="1";
-    minorVersion="3";
-    version="${majorVersion}.${minorVersion}";
-    name="${baseName}-${version}";
-    url="mirror://sourceforge/project/wgois/Source%20Release/${version}/ois_v${majorVersion}-${minorVersion}.tar.gz";
-    hash="18gs6xxhbqb91x2gm95hh1pmakimqim1k9c65h7ah6g14zc7dyjh";
-  };
+let
+  majorVersion = "1";
+  minorVersion = "3";
 in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+
+stdenv.mkDerivation rec {
+  name = "ois-${version}";
+  version = "${majorVersion}.${minorVersion}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/project/wgois/Source%20Release/${version}/ois_v${majorVersion}-${minorVersion}.tar.gz";
+    sha256 = "18gs6xxhbqb91x2gm95hh1pmakimqim1k9c65h7ah6g14zc7dyjh";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+  patches = [
+    (fetchurl {
+      url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-games/ois/files/ois-1.3-gcc47.patch;
+      sha256 = "026jw06n42bcrmg0sbdhzc4cqxsnf7fw30a2z9cigd9x282zhii8";
+      name = "gcc47.patch";
+    })
+  ];
 
-  phaseNames = ["doPatch" "doConfigure" "doMakeInstall"];
-
-  patches = [(fetchurl {
-    url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-games/ois/files/ois-1.3-gcc47.patch;
-    sha256 = "026jw06n42bcrmg0sbdhzc4cqxsnf7fw30a2z9cigd9x282zhii8";
-    name = "gcc47.patch";
-  })];
   patchFlags = "-p0";
 
-  configureCommand = ''sh bootstrap; sh configure'';
+  buildInputs = [
+    autoconf automake libtool libX11 xproto libXi inputproto libXaw
+    libXmu libXt
+  ];
 
-  meta = {
+  preConfigure = "sh bootstrap";
+
+  meta = with stdenv.lib; {
     description = "Object-oriented C++ input system";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = a.lib.licenses.zlib;
+    maintainers = [ maintainers.raskin ];
+    platforms = platforms.linux;
+    license = licenses.zlib;
   };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://sourceforge.net/projects/wgois/files/Source Release/";
-    };
-  };
-}) x
-
+}

From 7ce3f6f976d4362009f41c69ba634c08a2775db1 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 30 Dec 2015 00:06:34 +0100
Subject: [PATCH 062/884] openscenegraph: use stdenv

This replaces use of `builderDefsPackage`. Also minor cleanups.
---
 .../libraries/openscenegraph/default.nix      | 78 +++++++------------
 1 file changed, 27 insertions(+), 51 deletions(-)

diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix
index ecb4d82c9658..578d0219c020 100644
--- a/pkgs/development/libraries/openscenegraph/default.nix
+++ b/pkgs/development/libraries/openscenegraph/default.nix
@@ -1,60 +1,36 @@
-x@{builderDefsPackage
-  , cmake, giflib, libjpeg, libtiff, lib3ds, freetype, libpng
-  , coin3d, jasper, gdal_1_11, xproto, libX11, libXmu, freeglut, mesa
-  , doxygen, ffmpeg, xineLib, unzip, zlib, openal, libxml2
-  , curl, a52dec, faad2, gdk_pixbuf, pkgconfig, kbproto, SDL
-  , qt4, poppler, librsvg, gtk
-  , ...}:
-builderDefsPackage
-(a :
-let
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
-    [];
+{ stdenv, fetchurl, cmake, giflib, libjpeg, libtiff, lib3ds, freetype
+, libpng, coin3d, jasper, gdal_1_11, xproto, libX11, libXmu
+, freeglut, mesa, doxygen, ffmpeg, xineLib, unzip, zlib, openal
+, libxml2, curl, a52dec, faad2, gdk_pixbuf, pkgconfig, kbproto, SDL
+, qt4, poppler, librsvg, gtk }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="OpenSceneGraph";
-    version="3.2.1";
-    name="${baseName}-${version}";
-    url="http://trac.openscenegraph.org/downloads/developer_releases/${name}.zip";
-    hash="0v9y1gxb16y0mj994jd0mhcz32flhv2r6kc01xdqb4817lk75bnr";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+stdenv.mkDerivation rec {
+  name = "openscenegraph-${version}";
+  version = "3.2.1";
+
+  src = fetchurl {
+    url = "http://trac.openscenegraph.org/downloads/developer_releases/${name}.zip";
+    sha256 = "0v9y1gxb16y0mj994jd0mhcz32flhv2r6kc01xdqb4817lk75bnr";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["setVars" "addInputs" "doUnpack" "doPatch" "doCmake" "doMakeInstall"];
-
-  cmakeFlags = [
-    "-D MATH_LIBRARY="
+  buildInputs = [
+    cmake giflib libjpeg libtiff lib3ds freetype libpng coin3d jasper
+    gdal_1_11 xproto libX11 libXmu freeglut mesa doxygen ffmpeg
+    xineLib unzip zlib openal libxml2 curl a52dec faad2 gdk_pixbuf
+    pkgconfig kbproto SDL qt4 poppler librsvg gtk
   ];
 
-  setVars = a.noDepEntry ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -D__STDC_CONSTANT_MACROS=1"
-  '';
+  cmakeFlags = [
+    "-DMATH_LIBRARY="
+    "-DCMAKE_C_FLAGS=-D__STDC_CONSTANT_MACROS=1"
+    "-DCMAKE_CXX_FLAGS=-D__STDC_CONSTANT_MACROS=1"
+  ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A 3D graphics toolkit";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
+    homepage = http://www.openscenegraph.org/;
+    maintainers = [ maintainers.raskin ];
+    platforms = platforms.linux;
     license = "OpenSceneGraph Public License - free LGPL-based license";
   };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://www.openscenegraph.org/projects/osg/wiki/Downloads";
-    };
-  };
-}) x
-
+}

From 6ca0480de6a6ad442455157d90605c4c2a4d2c3a Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 30 Dec 2015 11:58:06 +0100
Subject: [PATCH 063/884] cgui: use stdenv

This replaces use of `builderDefsPackage`.
---
 pkgs/development/libraries/cgui/default.nix | 65 ++++++---------------
 1 file changed, 17 insertions(+), 48 deletions(-)

diff --git a/pkgs/development/libraries/cgui/default.nix b/pkgs/development/libraries/cgui/default.nix
index 6bd3dd41de74..0f1178622360 100644
--- a/pkgs/development/libraries/cgui/default.nix
+++ b/pkgs/development/libraries/cgui/default.nix
@@ -1,57 +1,26 @@
-x@{builderDefsPackage
-  , texinfo, allegro, perl
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
+{ stdenv, fetchurl, texinfo, allegro, perl }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="cgui";
-    version="2.0.3";
-    name="${baseName}-${version}";
-    project="${baseName}";
-    url="mirror://sourceforge/project/${project}/${version}/${name}.tar.gz";
-    hash="00kk4xaw68m44awy8zq4g5plx372swwccvzshn68a0a8f3f2wi4x";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+stdenv.mkDerivation rec {
+  name = "cgui-${version}";
+  version="2.0.3";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/project/cgui/${version}/${name}.tar.gz";
+    sha256 = "00kk4xaw68m44awy8zq4g5plx372swwccvzshn68a0a8f3f2wi4x";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+  buildInputs = [ texinfo allegro perl ];
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["genMakefile" "doMakeInstall"];
-
-  genMakefile = a.fullDepEntry (''
+  configurePhase = ''
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC"
     sh fix.sh unix
-  '') ["minInit" "doUnpack" "addInputs"];
-      
-  makeFlags = [
-    "SYSTEM_DIR=$out"
-  ];
+  '';
 
-  meta = {
+  makeFlags = [ "SYSTEM_DIR=$(out)" ];
+
+  meta = with stdenv.lib; {
     description = "A multiplatform basic GUI library";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
+    maintainers = [ maintainers.raskin ];
+    platforms = platforms.linux;
   };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://sourceforge.net/projects/cgui/files/";
-    };
-  };
-}) x
-
+}

From ffd09ecc60d26863a33d2ece4a362bc9e585344e Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 30 Dec 2015 12:22:11 +0100
Subject: [PATCH 064/884] unicap: use stdenv

This replaces use of `builderDefsPackage`. Also fix build.
---
 pkgs/development/libraries/unicap/default.nix | 70 +++++++------------
 1 file changed, 24 insertions(+), 46 deletions(-)

diff --git a/pkgs/development/libraries/unicap/default.nix b/pkgs/development/libraries/unicap/default.nix
index daec5a785662..604a1b7012af 100644
--- a/pkgs/development/libraries/unicap/default.nix
+++ b/pkgs/development/libraries/unicap/default.nix
@@ -1,56 +1,34 @@
-x@{builderDefsPackage
-  , libusb, libraw1394, dcraw, intltool, perl
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
+{ stdenv, fetchurl, libusb, libraw1394, dcraw, intltool, perl, v4l_utils }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="libunicap";
-    version="0.9.12";
-    name="${baseName}-${version}";
-    url="http://www.unicap-imaging.org/downloads/${name}.tar.gz";
-    hash="05zcnnm4dfc6idihfi0fq5xka6x86zi89wip2ca19yz768sd33s9";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+stdenv.mkDerivation rec {
+  name = "libunicap-${version}";
+  version="0.9.12";
+
+  src = fetchurl {
+    url = "http://www.unicap-imaging.org/downloads/${name}.tar.gz";
+    sha256 = "05zcnnm4dfc6idihfi0fq5xka6x86zi89wip2ca19yz768sd33s9";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+  buildInputs = [ libusb libraw1394 dcraw intltool perl v4l_utils ];
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["fixIncludes" "fixMakefiles" "doConfigure" "doMakeInstall"];
+  patches = [
+    # Debian has a patch that fixes the build.
+    (fetchurl {
+      url = "https://sources.debian.net/data/main/u/unicap/0.9.12-2/debian/patches/1009_v4l1.patch";
+      sha256 = "1lgypmhdj681m7d1nmzgvh19cz8agj2f31wlnfib0ha8i3g5hg5w";
+    })
+  ];
 
-  fixIncludes = a.fullDepEntry (''
+  postPatch = ''
     find . -type f -exec sed -e '/linux\/types\.h/d' -i '{}' ';'
-  '') ["minInit" "doUnpack"];
-
-  fixMakefiles = a.fullDepEntry (''
     sed -e 's@/etc/udev@'"$out"'/&@' -i data/Makefile.*
-  '') ["minInit" "doUnpack"];
+  '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Universal video capture API";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    broken = true;
+    homepage = http://www.unicap-imaging.org/;
+    maintainers = [ maintainers.raskin ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
   };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://unicap-imaging.org/download.htm";
-    };
-  };
-}) x
-
+}

From 9f5b058041c954e5e8b2962acf0438bd1d5833bd Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 30 Dec 2015 12:41:40 +0100
Subject: [PATCH 065/884] regina: use stdenv

This replaces use of `builderDefsPackage`.
---
 .../interpreters/regina/default.nix           | 57 ++++++-------------
 1 file changed, 16 insertions(+), 41 deletions(-)

diff --git a/pkgs/development/interpreters/regina/default.nix b/pkgs/development/interpreters/regina/default.nix
index 596b748a4f61..1d67193a73cf 100644
--- a/pkgs/development/interpreters/regina/default.nix
+++ b/pkgs/development/interpreters/regina/default.nix
@@ -1,49 +1,24 @@
-x@{builderDefsPackage
-  , ncurses
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
+{ stdenv, fetchurl, ncurses }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="Regina-REXX";
-    pname="regina-rexx";
-    version = "3.9.1";
-    name="${baseName}-${version}";
-    url="mirror://sourceforge/${pname}/${pname}/${version}/${name}.tar.gz";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
+stdenv.mkDerivation rec {
+  name = "Regina-REXX-${version}";
+  version = "3.9.1";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/regina-rexx/regina-rexx/${version}/${name}.tar.gz";
     sha256 = "1vpksnjmg6y5zag9li6sxqxj2xapgalfz8krfxgg49vyk0kdy4sx";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "doMakeInstall"];
+  buildInputs = [ ncurses ];
 
   configureFlags = [
-    "--libdir=$out/lib"
+    "--libdir=$(out)/lib"
   ];
-      
-  meta = {
-    description = "REXX interpreter";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = a.lib.licenses.lgpl2;
-    downloadPage = "http://sourceforge.net/projects/regina-rexx/files/regina-rexx/";
-    inherit version;
-  };
-}) x
 
+  meta = with stdenv.lib; {
+    description = "REXX interpreter";
+    maintainers = [ maintainers.raskin ];
+    platforms = platforms.linux;
+    license = licenses.lgpl2;
+  };
+}

From 23675945754e9e394fc317e0483d10c6417a6f11 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 30 Dec 2015 14:04:45 +0100
Subject: [PATCH 066/884] hawknl: fix download URL

The upstream URL is broken, use an alternative download URL. Checksum is
the same as old download.
---
 pkgs/development/libraries/hawknl/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/hawknl/default.nix b/pkgs/development/libraries/hawknl/default.nix
index 290f411cbf49..372a8b8c1122 100644
--- a/pkgs/development/libraries/hawknl/default.nix
+++ b/pkgs/development/libraries/hawknl/default.nix
@@ -1,11 +1,12 @@
 {stdenv, fetchurl, unzip}:
 
 stdenv.mkDerivation {
-	name = "hawknl-1.34";
-	src = fetchurl {
-		url = http://hawksoft.com/download/files/HawkNL168src.zip;
-		sha256 = "11shn2fbxj3w0j77w0234pqyj1368x686kkgv09q5yqhi1cdp028";
-	};
+  name = "hawknl-1.68";
+
+  src = fetchurl {
+    url = http://urchlay.naptime.net/~urchlay/src/HawkNL168src.zip;
+    sha256 = "11shn2fbxj3w0j77w0234pqyj1368x686kkgv09q5yqhi1cdp028";
+  };
 
   buildInputs = [ unzip ];
 

From 73ede34fe55e81a48b122792d1ae814ab0990427 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 30 Dec 2015 15:41:17 +0100
Subject: [PATCH 067/884] vbetool: use stdenv

This replaces use of `builderDefsPackage`.
---
 pkgs/tools/system/vbetool/default.nix         | 43 ++++++++-----------
 pkgs/tools/system/vbetool/src-for-default.nix |  9 ----
 .../system/vbetool/src-info-for-default.nix   |  4 --
 pkgs/top-level/all-packages.nix               |  2 +-
 4 files changed, 20 insertions(+), 38 deletions(-)
 delete mode 100644 pkgs/tools/system/vbetool/src-for-default.nix
 delete mode 100644 pkgs/tools/system/vbetool/src-info-for-default.nix

diff --git a/pkgs/tools/system/vbetool/default.nix b/pkgs/tools/system/vbetool/default.nix
index 402f93ec8fba..a8c27a42b1dd 100644
--- a/pkgs/tools/system/vbetool/default.nix
+++ b/pkgs/tools/system/vbetool/default.nix
@@ -1,31 +1,26 @@
-a @ {pciutils, libx86, zlib, ...} :
-let
-  s = import ./src-for-default.nix;
-  buildInputs = with a; [
-    libx86 pciutils zlib
-  ];
-in
-rec {
-  src = a.fetchUrlFromSrcInfo s;
+{ stdenv, fetchurl, pciutils, libx86, zlib }:
 
-  inherit (s) name;
-  inherit buildInputs;
-  configureFlags = [];
+stdenv.mkDerivation rec {
+  name = "vbetool-${version}";
+  version = "1.1";
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["fixPCIref" "doConfigure" "doMakeInstall"];
+  src = fetchurl {
+    url = "http://www.codon.org.uk/~mjg59/vbetool/download/${name}.tar.gz";
+    sha256 = "0m7rc9v8nz6w9x4x96maza139kin6lg4hscy6i13fna4672ds9jd";
+  };
 
-  fixPCIref = a.fullDepEntry (''
-    sed -e 's@$(libdir)/libpci.a@${a.pciutils}/lib/libpci.so@' -i Makefile.in
-    export NIX_LDFLAGS="$NIX_LDFLAGS -lpci"
-  '') ["doUnpack" "minInit"];
+  buildInputs = [ pciutils libx86 zlib ];
 
-  meta = {
+  patchPhase = ''
+    substituteInPlace Makefile.in --replace '$(libdir)/libpci.a' ""
+  '';
+
+  configureFlags = [ "LDFLAGS=-lpci" ];
+
+  meta = with stdenv.lib; {
     description = "Video BIOS execution tool";
-    maintainers = [
-      a.lib.maintainers.raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
+    homepage = http://www.codon.org.uk/~mjg59/vbetool/;
+    maintainers = [ maintainers.raskin ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/system/vbetool/src-for-default.nix b/pkgs/tools/system/vbetool/src-for-default.nix
deleted file mode 100644
index 97621fd516b4..000000000000
--- a/pkgs/tools/system/vbetool/src-for-default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-rec {
-   version="1.1";
-   name="vbetool-1.1";
-   hash="0m7rc9v8nz6w9x4x96maza139kin6lg4hscy6i13fna4672ds9jd";
-   url="http://www.codon.org.uk/~mjg59/vbetool/download/vbetool-${version}.tar.gz";
-   advertisedUrl="http://www.codon.org.uk/~mjg59/vbetool/download/vbetool-1.1.tar.gz";
-  
-  
-}
diff --git a/pkgs/tools/system/vbetool/src-info-for-default.nix b/pkgs/tools/system/vbetool/src-info-for-default.nix
deleted file mode 100644
index 40c721bc4908..000000000000
--- a/pkgs/tools/system/vbetool/src-info-for-default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  downloadPage = "http://www.codon.org.uk/~mjg59/vbetool/download/?C=M;O=D";
-  baseName = "vbetool";
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6ec1aff8776c..d383d1652119 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3365,7 +3365,7 @@ let
 
   vidalia = callPackage ../tools/security/vidalia { };
 
-  vbetool = builderDefsPackage (callPackage ../tools/system/vbetool) { };
+  vbetool = callPackage ../tools/system/vbetool { };
 
   vde2 = callPackage ../tools/networking/vde2 { };
 

From 318a0c9f3fb76afd4855709eeba43b48e9bf038b Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 30 Dec 2015 18:56:06 +0100
Subject: [PATCH 068/884] flightgear: use fltk with XFT support

Without XFT the Flight Gear compilation fails with an undefined
reference to `XGetUtf8FontAndGlyph`.
---
 pkgs/top-level/all-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d383d1652119..3106eaded52c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14068,7 +14068,9 @@ let
 
   fish-fillets-ng = callPackage ../games/fish-fillets-ng {};
 
-  flightgear = qt5.callPackage ../games/flightgear { };
+  flightgear = qt5.callPackage ../games/flightgear {
+    fltk13 = fltk13.override { cfg.xftSupport = true; };
+  };
 
   freecell-solver = callPackage ../games/freecell-solver { };
 

From 8bec69e9c83b6b8973d5819670bce9ab2d4b1203 Mon Sep 17 00:00:00 2001
From: Luis Pedro Coelho <luis@luispedro.org>
Date: Mon, 14 Dec 2015 11:17:02 +0100
Subject: [PATCH 069/884] stockfish: init at 6

---
 pkgs/games/stockfish/default.nix | 32 ++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix  |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/games/stockfish/default.nix

diff --git a/pkgs/games/stockfish/default.nix b/pkgs/games/stockfish/default.nix
new file mode 100644
index 000000000000..f919b9683e6a
--- /dev/null
+++ b/pkgs/games/stockfish/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, unzip }:
+stdenv.mkDerivation rec {
+  version = "6";
+  name = "stockfish-${version}";
+  src = fetchurl {
+    url = https://stockfish.s3.amazonaws.com/stockfish-6-src.zip;
+    sha256 = "a69a371d3f84338cefde4575669bd930d186b046a10fa5ab0f8d1aed6cb204c3";
+  };
+  buildPhase = ''
+  cd src
+  make build ARCH=x86-64
+  '';
+  buildInputs = [
+        stdenv
+        unzip
+  ];
+  enableParallelBuilding = true;
+  installPhase = ''
+  mkdir -p $out/bin
+  cp -pr stockfish $out/bin
+  '';
+  meta = with stdenv.lib; {
+    homepage = https://stockfishchess.org/;
+    description = "Strong open source chess engine";
+    longDescription = ''
+      Stockfish is one of the strongest chess engines in the world. It is also
+      much stronger than the best human chess grandmasters.
+      '';
+    maintainers = with maintainers; [ luispedro ];
+    license = licenses.gpl2;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6ec1aff8776c..6fa5c4b7f4e0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14294,6 +14294,8 @@ let
 
   stardust = callPackage ../games/stardust {};
 
+  stockfish = callPackage ../games/stockfish { };
+
   steamPackages = callPackage ../games/steam { };
   steam = steamPackages.steam-chrootenv.override {
     # DEPRECATED

From c570bc50bc885ee6c87d90f77296b3619a5241c0 Mon Sep 17 00:00:00 2001
From: Luis Pedro Coelho <luis@luispedro.org>
Date: Mon, 14 Dec 2015 00:51:05 +0100
Subject: [PATCH 070/884] chessx: init at 1.3.2

Chessx is a chess database GUI. Using the stockfish engine, users can
also analyse games.
---
 pkgs/games/chessx/default.nix   | 34 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/games/chessx/default.nix

diff --git a/pkgs/games/chessx/default.nix b/pkgs/games/chessx/default.nix
new file mode 100644
index 000000000000..dd0fa16b707c
--- /dev/null
+++ b/pkgs/games/chessx/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, pkgconfig, zlib, qtbase, qtsvg, qttools, qtmultimedia, fetchurl }:
+stdenv.mkDerivation rec {
+  name = "chessx-${version}";
+  version = "1.3.2";
+  src = fetchurl {
+    url = "mirror://sourceforge/chessx/chessx-${version}.tgz";
+    sha256 = "b136cf56d37d34867cdb9538176e1703b14f61b3384885b6f100580d0af0a3ff";
+  };
+  preConfigure = ''
+    qmake -spec linux-g++ chessx.pro
+  '';
+  buildInputs = [
+   stdenv
+   pkgconfig
+   qtbase
+   qtsvg
+   qttools
+   qtmultimedia
+   zlib
+  ];
+
+  enableParallelBuilding = true;
+  installPhase = ''
+      mkdir -p "$out/bin"
+      cp -pr release/chessx "$out/bin"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://chessx.sourceforge.net/;
+    description = "ChessX allows you to browse and analyse chess games";
+    license = licenses.gpl2;
+    maintainers = [maintainers.luispedro];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6fa5c4b7f4e0..24a1a7d0af0f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13998,6 +13998,8 @@ let
 
   chessdb = callPackage ../games/chessdb { };
 
+  chessx = qt5.callPackage ../games/chessx { };
+
   chocolateDoom = callPackage ../games/chocolate-doom { };
 
   cockatrice = qt5.callPackage ../games/cockatrice {  };

From 51ebb5a9aafeaa65c0f3cedd202174f297863c09 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Wed, 30 Dec 2015 17:45:13 -0500
Subject: [PATCH 071/884] lz4: mark as working on all unixes

I've only tested on darwin, but it looks like a pretty vanilla package
---
 pkgs/tools/compression/lz4/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix
index e91fae778fdb..6c5d28d6bcc2 100644
--- a/pkgs/tools/compression/lz4/default.nix
+++ b/pkgs/tools/compression/lz4/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = https://code.google.com/p/lz4/;
     license = with licenses; [ bsd2 gpl2Plus ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = with maintainers; [ nckx ];
   };
 }

From d97ae517fb271a38dd71e93cb07a3fdc3ba11f29 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 30 Dec 2015 20:12:03 -0600
Subject: [PATCH 072/884] nixpkgs: plex 0.9.12.19.1537 -> 0.9.14.6.1620

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/servers/plex/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix
index 580d5c81ef97..2aeb9379e10f 100644
--- a/pkgs/servers/plex/default.nix
+++ b/pkgs/servers/plex/default.nix
@@ -4,12 +4,12 @@
 
 stdenv.mkDerivation rec {
   name = "plex-${version}";
-  version = "0.9.12.19.1537";
-  vsnHash = "f38ac80";
+  version = "0.9.14.6.1620";
+  vsnHash = "e0b7243";
 
   src = fetchurl {
-    url = "https://downloads.plex.tv/plex-media-server/${version}-${vsnHash}/plexmediaserver-${version}-${vsnHash}.x86_64.rpm";
-    sha256 = "0346l734f3sqjjrrjgsllmsm6nklmj60md4sw8681896m3yrk5kd";
+    url    = "https://downloads.plex.tv/plex-media-server/${version}-${vsnHash}/plexmediaserver-${version}-${vsnHash}.x86_64.rpm";
+    sha256 = "0br82yxnvjapvsrb0mbfd12mx7qqi9zh623jnivsjk2gxbfd3ki1";
   };
 
   buildInputs = [ rpmextract glibc ];
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
     homepage = http://plex.tv/;
     license = licenses.unfree;
     platforms = platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ forkk ];
+    maintainers = with stdenv.lib.maintainers; [ forkk thoughtpolice ];
     description = "Media / DLNA server";
     longDescription = ''
       Plex is a media server which allows you to store your media and play it

From 59acfd4f16eac1ac1919ae9952b3c5bc0d2184a7 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 30 Dec 2015 20:19:04 -0600
Subject: [PATCH 073/884] nixos/plex: Add 'package' option to module

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 nixos/modules/services/misc/plex.nix | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/misc/plex.nix b/nixos/modules/services/misc/plex.nix
index de8bc71a2712..b9a58c0c5d50 100644
--- a/nixos/modules/services/misc/plex.nix
+++ b/nixos/modules/services/misc/plex.nix
@@ -54,6 +54,15 @@ in
           false.
         '';
       };
+
+      package = mkOption {
+        type = types.package;
+        default = pkgs.plex;
+        description = ''
+          The Plex package to use. Plex subscribers may wish to use their own
+          package here, pointing to subscriber-only server versions.
+        '';
+      };
     };
   };
 
@@ -75,7 +84,7 @@ in
         # why this is done.
         test -d "${cfg.dataDir}/.skeleton" || mkdir "${cfg.dataDir}/.skeleton"
         for db in "com.plexapp.plugins.library.db"; do
-            cp "${plex}/usr/lib/plexmediaserver/Resources/base_$db" "${cfg.dataDir}/.skeleton/$db"
+            cp "${cfg.package}/usr/lib/plexmediaserver/Resources/base_$db" "${cfg.dataDir}/.skeleton/$db"
             chmod u+w "${cfg.dataDir}/.skeleton/$db"
             chown ${cfg.user}:${cfg.group} "${cfg.dataDir}/.skeleton/$db"
         done
@@ -117,14 +126,14 @@ in
         User = cfg.user;
         Group = cfg.group;
         PermissionsStartOnly = "true";
-        ExecStart = "/bin/sh -c '${plex}/usr/lib/plexmediaserver/Plex\\ Media\\ Server'";
+        ExecStart = "/bin/sh -c '${cfg.package}/usr/lib/plexmediaserver/Plex\\ Media\\ Server'";
       };
       environment = {
         PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR=cfg.dataDir;
-        PLEX_MEDIA_SERVER_HOME="${plex}/usr/lib/plexmediaserver";
+        PLEX_MEDIA_SERVER_HOME="${cfg.package}/usr/lib/plexmediaserver";
         PLEX_MEDIA_SERVER_MAX_PLUGIN_PROCS="6";
         PLEX_MEDIA_SERVER_TMPDIR="/tmp";
-        LD_LIBRARY_PATH="${plex}/usr/lib/plexmediaserver";
+        LD_LIBRARY_PATH="${cfg.package}/usr/lib/plexmediaserver";
         LC_ALL="en_US.UTF-8";
         LANG="en_US.UTF-8";
       };

From 624b3a34c04503a2fbd19e2b0a897bb2d28666a9 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 28 Dec 2015 01:26:27 +0100
Subject: [PATCH 074/884] wireless-regdb: change homepage to more accessible
 wiki

---
 pkgs/data/misc/wireless-regdb/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/data/misc/wireless-regdb/default.nix
index e8afb25b8b39..acc1ca5b55ec 100644
--- a/pkgs/data/misc/wireless-regdb/default.nix
+++ b/pkgs/data/misc/wireless-regdb/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     inherit version;
     description = "Wireless regulatory database for CRDA";
-    homepage = https://git.kernel.org/cgit/linux/kernel/git/sforshee/wireless-regdb.git/;
+    homepage = http://wireless.kernel.org/en/developers/Regulatory/;
     license = licenses.isc;
     platforms = platforms.all;
     maintainers = with maintainers; [ nckx ];

From d04e57ea6a39992cb90d59b212576b090328ae60 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 31 Dec 2015 04:36:54 +0100
Subject: [PATCH 075/884] zpaq{,d}: un-break compileFlags and stop using
 -march=native
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Running zpaq on an older but not ancient 64-bit Intel server aborts
with an ‘Illegal instruction’ error. Turns out the build expression
was using -march=native to generate distibution binaries...

Change this to more conservative, portable settings which should
cover ‘all’ CPUs. It may run slightly slower — but that at least
implies running.

As a nice side effect, all common compile flags are now back in
`compileFlags` whence they came, and actually used consistently.
---
 pkgs/tools/archivers/zpaq/default.nix | 15 ++++++++-------
 pkgs/tools/archivers/zpaq/zpaqd.nix   | 15 ++++++++-------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix
index c8f3a890487f..fddb3cbfb154 100644
--- a/pkgs/tools/archivers/zpaq/default.nix
+++ b/pkgs/tools/archivers/zpaq/default.nix
@@ -14,11 +14,12 @@ let
   ];
   isUnix = with stdenv; isLinux || isGNU || isDarwin || isFreeBSD || isOpenBSD;
   isx86 = stdenv.isi686 || stdenv.isx86_64;
-  compileFlags = ""
-    + (stdenv.lib.optionalString isUnix " -Dunix -pthread ")
-    + (stdenv.lib.optionalString (!isx86) " -DNOJIT ")
-    + " -DNDEBUG "
-    + " -fPIC "
+  compileFlags = with stdenv; ""
+    + (lib.optionalString (isUnix) " -Dunix -pthread")
+    + (lib.optionalString (isi686) " -march=i686")
+    + (lib.optionalString (isx86_64) " -march=nocona")
+    + (lib.optionalString (!isx86) " -DNOJIT")
+    + " -O3 -mtune=generic -DNDEBUG"
     ;
 in
 stdenv.mkDerivation {
@@ -29,8 +30,8 @@ stdenv.mkDerivation {
   };
   sourceRoot = ".";
   buildPhase = ''
-	  g++ -O3 -march=native -Dunix libzpaq.cpp -pthread --shared -o libzpaq.so -fPIC
-	  g++ -O3 -march=native -Dunix zpaq.cpp -lzpaq -L. -L"$out/lib" -pthread -o zpaq
+    g++ ${compileFlags} -fPIC --shared libzpaq.cpp -o libzpaq.so
+    g++ ${compileFlags} -L. -L"$out/lib" -lzpaq zpaq.cpp -o zpaq
   '';
   installPhase = ''
     mkdir -p "$out"/{bin,include,lib,share/doc/zpaq}
diff --git a/pkgs/tools/archivers/zpaq/zpaqd.nix b/pkgs/tools/archivers/zpaq/zpaqd.nix
index 65f40f68f550..5518a94ba21f 100644
--- a/pkgs/tools/archivers/zpaq/zpaqd.nix
+++ b/pkgs/tools/archivers/zpaq/zpaqd.nix
@@ -14,11 +14,12 @@ let
   ];
   isUnix = with stdenv; isLinux || isGNU || isDarwin || isFreeBSD || isOpenBSD;
   isx86 = stdenv.isi686 || stdenv.isx86_64;
-  compileFlags = ""
-    + (stdenv.lib.optionalString isUnix " -Dunix -pthread ")
-    + (stdenv.lib.optionalString (!isx86) " -DNOJIT ")
-    + " -DNDEBUG "
-    + " -fPIC "
+  compileFlags = with stdenv; ""
+    + (lib.optionalString (isUnix) " -Dunix -pthread")
+    + (lib.optionalString (isi686) " -march=i686")
+    + (lib.optionalString (isx86_64) " -march=nocona")
+    + (lib.optionalString (!isx86) " -DNOJIT")
+    + " -O3 -mtune=generic -DNDEBUG"
     ;
 in
 stdenv.mkDerivation {
@@ -29,8 +30,8 @@ stdenv.mkDerivation {
   };
   sourceRoot = ".";
   buildPhase = ''
-    g++ -shared -O3 libzpaq.cpp ${compileFlags} -o libzpaq.so
-    g++ -O3 -L. -L"$out/lib" -lzpaq zpaqd.cpp -o zpaqd
+    g++ ${compileFlags} -fPIC --shared libzpaq.cpp -o libzpaq.so
+    g++ ${compileFlags} -L. -L"$out/lib" -lzpaq zpaqd.cpp -o zpaqd
   '';
   installPhase = ''
     mkdir -p "$out"/{bin,include,lib,share/doc/zpaq}

From 4ae6598c0b4a4439939c47e20317150088c61bb6 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 31 Dec 2015 04:50:57 +0100
Subject: [PATCH 076/884] zpaq{,d}: clarify; improve description; maintain

---
 pkgs/tools/archivers/zpaq/default.nix | 21 ++++++++++++---------
 pkgs/tools/archivers/zpaq/zpaqd.nix   | 21 ++++++++++++---------
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix
index fddb3cbfb154..2b761df3863f 100644
--- a/pkgs/tools/archivers/zpaq/default.nix
+++ b/pkgs/tools/archivers/zpaq/default.nix
@@ -9,9 +9,6 @@ let
     url="http://mattmahoney.net/dc/zpaq705.zip";
     sha256="0d1knq4f6693nvbwjx4wznb45hm4zyn4k88xvhynyk0dcbiy7ayq";
   };
-  buildInputs = [
-    unzip
-  ];
   isUnix = with stdenv; isLinux || isGNU || isDarwin || isFreeBSD || isOpenBSD;
   isx86 = stdenv.isi686 || stdenv.isx86_64;
   compileFlags = with stdenv; ""
@@ -24,15 +21,20 @@ let
 in
 stdenv.mkDerivation {
   inherit (s) name version;
-  inherit buildInputs;
+
   src = fetchurl {
     inherit (s) url sha256;
   };
+
   sourceRoot = ".";
+
+  buildInputs = [ unzip ];
+
   buildPhase = ''
     g++ ${compileFlags} -fPIC --shared libzpaq.cpp -o libzpaq.so
     g++ ${compileFlags} -L. -L"$out/lib" -lzpaq zpaq.cpp -o zpaq
   '';
+
   installPhase = ''
     mkdir -p "$out"/{bin,include,lib,share/doc/zpaq}
     cp libzpaq.so "$out/lib"
@@ -40,12 +42,13 @@ stdenv.mkDerivation {
     cp libzpaq.h "$out/include"
     cp readme.txt "$out/share/doc/zpaq"
   '';
-  meta = {
+
+  meta = with stdenv.lib; {
     inherit (s) version;
-    description = ''An archiver with backward compatibility of versions for decompression'';
-    license = stdenv.lib.licenses.gpl3Plus ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    description = "Incremental journaling backup utility and archiver";
+    license = licenses.gpl3Plus ;
+    maintainers = with maintainers; [ raskin nckx ];
+    platforms = platforms.linux;
     homepage = "http://mattmahoney.net/dc/zpaq.html";
   };
 }
diff --git a/pkgs/tools/archivers/zpaq/zpaqd.nix b/pkgs/tools/archivers/zpaq/zpaqd.nix
index 5518a94ba21f..7adcd3cf6e2b 100644
--- a/pkgs/tools/archivers/zpaq/zpaqd.nix
+++ b/pkgs/tools/archivers/zpaq/zpaqd.nix
@@ -9,9 +9,6 @@ let
     url="http://mattmahoney.net/dc/zpaqd633.zip";
     sha256="00zgc4mcmsd3d4afgzmrp6ymcyy8gb9kap815d5a3f9zhhzkz4dx";
   };
-  buildInputs = [
-    unzip
-  ];
   isUnix = with stdenv; isLinux || isGNU || isDarwin || isFreeBSD || isOpenBSD;
   isx86 = stdenv.isi686 || stdenv.isx86_64;
   compileFlags = with stdenv; ""
@@ -24,15 +21,20 @@ let
 in
 stdenv.mkDerivation {
   inherit (s) name version;
-  inherit buildInputs;
+
   src = fetchurl {
     inherit (s) url sha256;
   };
+
   sourceRoot = ".";
+
+  buildInputs = [ unzip ];
+
   buildPhase = ''
     g++ ${compileFlags} -fPIC --shared libzpaq.cpp -o libzpaq.so
     g++ ${compileFlags} -L. -L"$out/lib" -lzpaq zpaqd.cpp -o zpaqd
   '';
+
   installPhase = ''
     mkdir -p "$out"/{bin,include,lib,share/doc/zpaq}
     cp libzpaq.so "$out/lib"
@@ -40,11 +42,12 @@ stdenv.mkDerivation {
     cp libzpaq.h "$out/include"
     cp readme_zpaqd.txt "$out/share/doc/zpaq"
   '';
-  meta = {
+
+  meta = with stdenv.lib; {
     inherit (s) version;
-    description = ''ZPAQ archiver decompressor and algorithm development tool'';
-    license = stdenv.lib.licenses.gpl3Plus ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    description = "ZPAQ archive decompressor and algorithm development tool";
+    license = licenses.gpl3Plus ;
+    maintainers = with maintainers; [ raskin nckx ];
+    platforms = platforms.linux;
   };
 }

From 3b065f0215615566c9ae4de91820892d191f9588 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 31 Dec 2015 05:09:13 +0100
Subject: [PATCH 077/884] zpaqd: fix typo...

---
 pkgs/tools/archivers/zpaq/zpaqd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/archivers/zpaq/zpaqd.nix b/pkgs/tools/archivers/zpaq/zpaqd.nix
index 7adcd3cf6e2b..6a7891d2ebe1 100644
--- a/pkgs/tools/archivers/zpaq/zpaqd.nix
+++ b/pkgs/tools/archivers/zpaq/zpaqd.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     inherit (s) version;
-    description = "ZPAQ archive decompressor and algorithm development tool";
+    description = "ZPAQ archive (de)compressor and algorithm development tool";
     license = licenses.gpl3Plus ;
     maintainers = with maintainers; [ raskin nckx ];
     platforms = platforms.linux;

From ff49b7f91e487cf61851372e0d41f7681322072f Mon Sep 17 00:00:00 2001
From: Hoang Xuan Phu <phuhimself@phunehehe.net>
Date: Thu, 31 Dec 2015 17:02:45 +0800
Subject: [PATCH 078/884] postfix: patch to stop hard coding SHELL

---
 pkgs/servers/mail/postfix/2.11.nix            |  5 ++++-
 pkgs/servers/mail/postfix/3.0.nix             |  2 ++
 pkgs/servers/mail/postfix/default.nix         |  7 ++++++-
 .../mail/postfix/postfix-script-shell.patch   | 21 +++++++++++++++++++
 4 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/servers/mail/postfix/postfix-script-shell.patch

diff --git a/pkgs/servers/mail/postfix/2.11.nix b/pkgs/servers/mail/postfix/2.11.nix
index bfd10fb591b2..7c936bf12446 100644
--- a/pkgs/servers/mail/postfix/2.11.nix
+++ b/pkgs/servers/mail/postfix/2.11.nix
@@ -13,7 +13,10 @@ stdenv.mkDerivation rec {
     sha256 = "11riz8ggaa09pi8d6xv2807qp7yjn918mrylfvkfwmvcdlgwck0a";
   };
 
-  patches = [ ./postfix-2.11.0.patch ];
+  patches = [
+    ./postfix-2.11.0.patch
+    ./postfix-script-shell.patch
+  ];
 
   buildInputs = [ makeWrapper gnused db openssl cyrus_sasl ];
 
diff --git a/pkgs/servers/mail/postfix/3.0.nix b/pkgs/servers/mail/postfix/3.0.nix
index 93f419bc7f68..8c625da2c9e2 100644
--- a/pkgs/servers/mail/postfix/3.0.nix
+++ b/pkgs/servers/mail/postfix/3.0.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ makeWrapper gnused db openssl cyrus_sasl icu ];
 
+  patches = [ ./postfix-script-shell.patch ];
+
   preBuild = ''
     sed -e '/^PATH=/d' -i postfix-install
 
diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix
index 7bd2d6209108..838ca7a8d8df 100644
--- a/pkgs/servers/mail/postfix/default.nix
+++ b/pkgs/servers/mail/postfix/default.nix
@@ -14,7 +14,12 @@ stdenv.mkDerivation rec {
 
   buildInputs = [db openssl cyrus_sasl bison perl];
 
-  patches = [ ./postfix-2.2.9-db.patch  ./postfix-2.2.9-lib.patch ./db-linux3.patch ];
+  patches = [
+    ./postfix-2.2.9-db.patch
+    ./postfix-2.2.9-lib.patch
+    ./db-linux3.patch
+    ./postfix-script-shell.patch
+  ];
 
   postPatch = ''
     sed -i -e s,/usr/bin,/var/run/current-system/sw/bin, \
diff --git a/pkgs/servers/mail/postfix/postfix-script-shell.patch b/pkgs/servers/mail/postfix/postfix-script-shell.patch
new file mode 100644
index 000000000000..4f5d2f611110
--- /dev/null
+++ b/pkgs/servers/mail/postfix/postfix-script-shell.patch
@@ -0,0 +1,21 @@
+diff --git a/conf/postfix-script b/conf/postfix-script
+index 19088a6..04fae23 100755
+--- a/conf/postfix-script
++++ b/conf/postfix-script
+@@ -43,7 +43,6 @@ FATAL="$LOGGER -p fatal"
+ PANIC="$LOGGER -p panic"
+ 
+ umask 022
+-SHELL=/bin/sh
+ 
+ #
+ # Can't do much without these in place.
+@@ -229,7 +228,7 @@ status)
+ check-fatal)
+ 	# This command is NOT part of the public interface.
+ 
+-	$SHELL $daemon_directory/post-install create-missing || {
++	$daemon_directory/post-install create-missing || {
+ 		$FATAL unable to create missing queue directories
+ 		exit 1
+ 	}

From 7a6debc7914f92dee4d3090b30ace20bc7e82a18 Mon Sep 17 00:00:00 2001
From: Luis Pedro Coelho <luis@luispedro.org>
Date: Thu, 31 Dec 2015 13:13:31 +0100
Subject: [PATCH 079/884] zotero: 4.0.26 -> 4.0.28.8

The previous version was too old for the current version of firefox and
syncing failed with an error: "req.sendAsBinary is not a function". This
new version solves this.

See https://forums.zotero.org/discussion/48500/bug-with-firefox-plugin/
---
 pkgs/applications/office/zotero/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix
index be1729b57c91..d74e1ac4b7c8 100644
--- a/pkgs/applications/office/zotero/default.nix
+++ b/pkgs/applications/office/zotero/default.nix
@@ -4,10 +4,10 @@ let
 
   xpi = fetchurl {
     url = "https://download.zotero.org/extension/zotero-${version}.xpi";
-    sha256 = "15wdbwnaxs748psjnxw40wld45npjjmvwx70c0jx2p63y6ks2gcx";
+    sha256 = "02h2ja08v8as4fawj683rh5rmxsjf5d0qmvqa77i176nm20y5s7s";
   };
 
-  version = "4.0.26";
+  version = "4.0.28";
 
 in
 stdenv.mkDerivation {
@@ -15,8 +15,8 @@ stdenv.mkDerivation {
   inherit version;
 
   src = fetchurl {
-    url = "https://github.com/zotero/zotero-standalone-build/archive/${version}.tar.gz";
-    sha256 = "11gbislxkhfycnii05v6d8h9qdp5rk5xag7kdnsih67gicnn467g";
+    url = "https://github.com/zotero/zotero-standalone-build/archive/4.0.28.8.tar.gz";
+    sha256 = "ab1fd5dde9bd2a6b6d31cc9a53183a04de3698f1273a943ef31ecc4c42808a68";
   };
 
   nativeBuildInputs = [ perl unzipNLS ];

From 6a903c1f87c5b2cc4f631670f03e4057a608496d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 31 Dec 2015 13:48:07 +0100
Subject: [PATCH 080/884] aws-mturk-clt: update sha256 hash

Stable tarballs are so 2015.
---
 pkgs/tools/misc/aws-mturk-clt/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/aws-mturk-clt/default.nix b/pkgs/tools/misc/aws-mturk-clt/default.nix
index 4db4f3b1672b..e02359eda803 100644
--- a/pkgs/tools/misc/aws-mturk-clt/default.nix
+++ b/pkgs/tools/misc/aws-mturk-clt/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://mturk.s3.amazonaws.com/CLTSource/${name}.tar.gz";
-    sha256 = "06p0cbb5afmqjjlibbw9gb08jp270c7j57lhnf9ld50sm1z021ln";
+    sha256 = "00yyc7k3iygg83cknv9i2dsaxwpwzdkc8a2l9j56lg999hw3mqm3";
   };
 
   installPhase =

From 28fd7afd0215b3d0f32ffee5f320e1a839f8f7d4 Mon Sep 17 00:00:00 2001
From: Reno Reckling <exi@wthack.de>
Date: Thu, 31 Dec 2015 13:56:50 +0100
Subject: [PATCH 081/884] wireshark-qt: make wireshark-qt build and run again

---
 .../networking/sniffers/wireshark/default.nix            | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index b49c309f5ba6..58be839d737a 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchurl, pkgconfig, perl, flex, bison, libpcap, libnl, c-ares
 , gnutls, libgcrypt, geoip, openssl, lua5, makeDesktopItem, python, libcap, glib
-, withGtk ? false, gtk ? null
+, zlib
+, withGtk ? false, gtk ? null, pango ? null, cairo ? null, gdk_pixbuf ? null
 , withQt ? false, qt4 ? null
 }:
 
@@ -24,9 +25,9 @@ stdenv.mkDerivation {
 
   buildInputs = [
     bison flex perl pkgconfig libpcap lua5 openssl libgcrypt gnutls
-    geoip libnl c-ares python libcap glib
+    geoip libnl c-ares python libcap glib zlib
   ] ++ optional withQt qt4
-    ++ optional withGtk gtk;
+    ++ (optionals withGtk [gtk pango cairo gdk_pixbuf]);
 
   patches = [ ./wireshark-lookup-dumpcap-in-path.patch ];
 
@@ -52,8 +53,6 @@ stdenv.mkDerivation {
     mkdir -p "$out"/share/icons/
     cp "$desktopItem/share/applications/"* "$out/share/applications/"
     cp image/wsicon.svg "$out"/share/icons/wireshark.svg
-  '' + optionalString withQt ''
-    mv "$out/bin/wireshark-qt" "$out/bin/wireshark"
   '';
 
   enableParallelBuilding = true;

From 2773dfbb5ea0810c62df34c0e8ea192ac48d18df Mon Sep 17 00:00:00 2001
From: Wido den Hollander <wido@widodh.nl>
Date: Thu, 31 Dec 2015 14:40:07 +0100
Subject: [PATCH 082/884] libvirt: Update from 1.2.19 to 1.3.0

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

diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 9e69bb8d56f6..54addb397b70 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   name = "libvirt-${version}";
-  version = "1.2.19";
+  version = "1.3.0";
 
   src = fetchurl {
     url = "http://libvirt.org/sources/${name}.tar.gz";
-    sha256 = "0vnxmqf04frrj18lrvq7wc70wh179d382py14006879k0cgi8b18";
+    sha256 = "ebcf5645fa565e3fe2fe94a86e841db9b768cf0e0a7e6cf395c6327f9a23bd64";
   };
 
   buildInputs = [

From 7dc2f1632ca083c0fa2322c5fffed8006a7170bc Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 31 Dec 2015 16:51:13 +0100
Subject: [PATCH 083/884] qpdfview: 0.4.15 -> 0.4.16

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

diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix
index 574b73f56726..1a3f1399fe76 100644
--- a/pkgs/applications/misc/qpdfview/default.nix
+++ b/pkgs/applications/misc/qpdfview/default.nix
@@ -5,10 +5,10 @@ let
   s = # Generated upstream information
   rec {
     baseName="qpdfview";
-    version = "0.4.15";
+    version = "0.4.16";
     name="${baseName}-${version}";
     url="https://launchpad.net/qpdfview/trunk/${version}/+download/qpdfview-${version}.tar.gz";
-    sha256 = "0wgj02zpbyq4m2ix8rljiz312l2xk81gpy030vy424icq4xsip52";
+    sha256 = "0zysjhr58nnmx7ba01q3zvgidkgcqxjdj4ld3gx5fc7wzvl1dm7s";
   };
   buildInputs = [
     qt4 poppler_qt4 pkgconfig djvulibre libspectre cups file ghostscript

From f50aca5157630ff3d943f6caaaf9941dbca7bae2 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 31 Dec 2015 16:52:05 +0100
Subject: [PATCH 084/884] cl-launch: 4.1.4 -> 4.1.4.1

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

diff --git a/pkgs/development/tools/misc/cl-launch/default.nix b/pkgs/development/tools/misc/cl-launch/default.nix
index 17b1f3382cca..ffd668dbdeef 100644
--- a/pkgs/development/tools/misc/cl-launch/default.nix
+++ b/pkgs/development/tools/misc/cl-launch/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="cl-launch";
-    version="4.1.4";
+    version="4.1.4.1";
     name="${baseName}-${version}";
-    hash="0j3lapjsqzdkc7ackqdk13li299lp706gdc9bh28kvs0diyamjiv";
-    url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.1.4.tar.gz";
-    sha256="0j3lapjsqzdkc7ackqdk13li299lp706gdc9bh28kvs0diyamjiv";
+    hash="09450yknzb0m3375lg4k8gdypmk3xwl8m1krv1kvhylmrm3995mz";
+    url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.1.4.1.tar.gz";
+    sha256="09450yknzb0m3375lg4k8gdypmk3xwl8m1krv1kvhylmrm3995mz";
   };
   buildInputs = [
   ];

From 0c7db6c696ecd771acafa2ac0ee5840b86a0056a Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Thu, 31 Dec 2015 16:55:33 +0100
Subject: [PATCH 085/884] jpegoptim: init at 1.4.3

---
 .../graphics/jpegoptim/default.nix            | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/applications/graphics/jpegoptim/default.nix

diff --git a/pkgs/applications/graphics/jpegoptim/default.nix b/pkgs/applications/graphics/jpegoptim/default.nix
new file mode 100644
index 000000000000..5bb577011e71
--- /dev/null
+++ b/pkgs/applications/graphics/jpegoptim/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, libjpeg }:
+
+stdenv.mkDerivation rec {
+  version = "1.4.3";
+  name = "jpegoptim-${version}";
+
+  src = fetchurl {
+    url = "http://www.kokkonen.net/tjko/src/${name}.tar.gz";
+    sha256 = "0k53q7dc8w5ashz8v261x2b5vvz7gdvg8w962rz9gjvkjbh4lg93";
+  };
+
+  # There are no checks, it seems.
+  doCheck = false;
+
+  buildInputs = [ libjpeg ];
+
+  meta = {
+    description = "Optimize JPEG files";
+    homepage = http://www.kokkonen.net/tjko/projects.html ;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.aristid ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a4a25a31d6f5..992719704608 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1992,6 +1992,8 @@ let
 
   jp2a = callPackage ../applications/misc/jp2a { };
 
+  jpegoptim = callPackage ../applications/graphics/jpegoptim { };
+
   jq = callPackage ../development/tools/jq {};
 
   jscoverage = callPackage ../development/tools/misc/jscoverage { };

From 10a87beb7ea8a3b64c689a44f060d15f5ce2ebc5 Mon Sep 17 00:00:00 2001
From: Reno Reckling <exi@wthack.de>
Date: Thu, 31 Dec 2015 20:01:41 +0100
Subject: [PATCH 086/884] murmur_git: fix failing build because of changed ice
 file paths

---
 pkgs/applications/networking/mumble/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index dac1a9ada3b4..a0eb459369df 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -95,7 +95,7 @@ let
     type = "murmur";
 
     postPatch = optional iceSupport ''
-      sed -i 's,/usr/share/Ice/,${zeroc_ice}/,g' src/murmur/murmur.pro
+      grep -Rl '/usr/share/Ice' . | xargs sed -i 's,/usr/share/Ice/,${zeroc_ice}/,g'
     '';
 
     configureFlags = [

From 63c8129bc622c297b1422a940d417129c6969cac Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 Dec 2015 13:23:36 +0100
Subject: [PATCH 087/884] hackage-packages.nix: update Haskell package set

This update was generated by hackage2nix v20151217-3-gd4ae18a using the following inputs:

  - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/579e6bb79700b1c69c7e3afbb351a2f259b4435b
  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/e1530f9f9a7c2ae7a710487d0ac66433e7f18bd7
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/d3e5ae70f97caffd4362b1511f3a2edfdc8a493d
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/db90cf927d67d362ead3be5a57b2ea84463ae83b
---
 .../haskell-modules/configuration-lts-0.0.nix |    6 +
 .../haskell-modules/configuration-lts-0.1.nix |    6 +
 .../haskell-modules/configuration-lts-0.2.nix |    6 +
 .../haskell-modules/configuration-lts-0.3.nix |    6 +
 .../haskell-modules/configuration-lts-0.4.nix |    6 +
 .../haskell-modules/configuration-lts-0.5.nix |    6 +
 .../haskell-modules/configuration-lts-0.6.nix |    7 +
 .../haskell-modules/configuration-lts-0.7.nix |    7 +
 .../haskell-modules/configuration-lts-1.0.nix |    7 +
 .../haskell-modules/configuration-lts-1.1.nix |    7 +
 .../configuration-lts-1.10.nix                |    7 +
 .../configuration-lts-1.11.nix                |    7 +
 .../configuration-lts-1.12.nix                |    7 +
 .../configuration-lts-1.13.nix                |    7 +
 .../configuration-lts-1.14.nix                |    7 +
 .../configuration-lts-1.15.nix                |    7 +
 .../haskell-modules/configuration-lts-1.2.nix |    7 +
 .../haskell-modules/configuration-lts-1.4.nix |    7 +
 .../haskell-modules/configuration-lts-1.5.nix |    7 +
 .../haskell-modules/configuration-lts-1.7.nix |    7 +
 .../haskell-modules/configuration-lts-1.8.nix |    7 +
 .../haskell-modules/configuration-lts-1.9.nix |    7 +
 .../haskell-modules/configuration-lts-2.0.nix |    7 +
 .../haskell-modules/configuration-lts-2.1.nix |    7 +
 .../configuration-lts-2.10.nix                |    8 +
 .../configuration-lts-2.11.nix                |    8 +
 .../configuration-lts-2.12.nix                |    8 +
 .../configuration-lts-2.13.nix                |    8 +
 .../configuration-lts-2.14.nix                |    8 +
 .../configuration-lts-2.15.nix                |    8 +
 .../configuration-lts-2.16.nix                |    9 +
 .../configuration-lts-2.17.nix                |    9 +
 .../configuration-lts-2.18.nix                |   10 +
 .../configuration-lts-2.19.nix                |   10 +
 .../haskell-modules/configuration-lts-2.2.nix |    7 +
 .../configuration-lts-2.20.nix                |   10 +
 .../configuration-lts-2.21.nix                |   10 +
 .../configuration-lts-2.22.nix                |   10 +
 .../haskell-modules/configuration-lts-2.3.nix |    8 +
 .../haskell-modules/configuration-lts-2.4.nix |    8 +
 .../haskell-modules/configuration-lts-2.5.nix |    8 +
 .../haskell-modules/configuration-lts-2.6.nix |    8 +
 .../haskell-modules/configuration-lts-2.7.nix |    8 +
 .../haskell-modules/configuration-lts-2.8.nix |    8 +
 .../haskell-modules/configuration-lts-2.9.nix |    8 +
 .../haskell-modules/configuration-lts-3.0.nix |   10 +
 .../haskell-modules/configuration-lts-3.1.nix |   10 +
 .../configuration-lts-3.10.nix                |   13 +
 .../configuration-lts-3.11.nix                |   13 +
 .../configuration-lts-3.12.nix                |   13 +
 .../configuration-lts-3.13.nix                |   13 +
 .../configuration-lts-3.14.nix                |   13 +
 .../configuration-lts-3.15.nix                |   14 +
 .../configuration-lts-3.16.nix                |   14 +
 .../configuration-lts-3.17.nix                |   17 +
 .../configuration-lts-3.18.nix                |   17 +
 .../configuration-lts-3.19.nix                |   18 +
 .../haskell-modules/configuration-lts-3.2.nix |   10 +
 .../configuration-lts-3.20.nix                |   18 +
 .../haskell-modules/configuration-lts-3.3.nix |   10 +
 .../haskell-modules/configuration-lts-3.4.nix |   10 +
 .../haskell-modules/configuration-lts-3.5.nix |   10 +
 .../haskell-modules/configuration-lts-3.6.nix |   10 +
 .../haskell-modules/configuration-lts-3.7.nix |   13 +
 .../haskell-modules/configuration-lts-3.8.nix |   13 +
 .../haskell-modules/configuration-lts-3.9.nix |   13 +
 .../haskell-modules/hackage-packages.nix      | 1261 +++++++++++++----
 67 files changed, 1631 insertions(+), 243 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
index accd86193052..b9645b56cd0a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
@@ -3068,6 +3068,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_7";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2";
@@ -4207,6 +4208,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5615,6 +5617,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7247,6 +7251,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -8953,6 +8958,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zlib-lens" = doDistribute super."zlib-lens_0_1";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
index 0b7f7deb05ba..d6623d248856 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
@@ -3068,6 +3068,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_7";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2";
@@ -4207,6 +4208,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5615,6 +5617,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7247,6 +7251,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -8953,6 +8958,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zlib-lens" = doDistribute super."zlib-lens_0_1";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
index 71c04aad38d2..a1aaa4e53517 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
@@ -3068,6 +3068,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_7";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2";
@@ -4207,6 +4208,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5615,6 +5617,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7247,6 +7251,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -8953,6 +8958,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zlib-lens" = doDistribute super."zlib-lens_0_1";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
index d9e9ce495cd7..ce34cb1bcd48 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
@@ -3068,6 +3068,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_7";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2";
@@ -4207,6 +4208,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5615,6 +5617,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7247,6 +7251,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -8953,6 +8958,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zlib-lens" = doDistribute super."zlib-lens_0_1";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
index cdfbcb1943a8..c173363b0527 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
@@ -3067,6 +3067,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_7";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2";
@@ -4204,6 +4205,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5612,6 +5614,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7243,6 +7247,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -8949,6 +8954,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zlib-lens" = doDistribute super."zlib-lens_0_1";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
index f03d3e17a398..0c7e2e0ac75c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
@@ -3067,6 +3067,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_7";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2";
@@ -4204,6 +4205,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5612,6 +5614,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7243,6 +7247,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -8949,6 +8954,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zlib-lens" = doDistribute super."zlib-lens_0_1";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
index de83b28d2fae..39bdc2e1efbc 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
@@ -3064,6 +3064,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_7";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2";
@@ -4200,6 +4201,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5608,6 +5610,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7237,6 +7241,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -8490,6 +8495,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_0_0_5";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8939,6 +8945,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zlib-lens" = doDistribute super."zlib-lens_0_1";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
index e01b0bc09a8c..144f844f38b6 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
@@ -3064,6 +3064,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_7";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2";
@@ -4200,6 +4201,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5608,6 +5610,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7237,6 +7241,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -8490,6 +8495,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_0_0_5";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8939,6 +8945,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zlib-lens" = doDistribute super."zlib-lens_0_1";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
index 42db9c816dac..9e295e4780ae 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
@@ -3054,6 +3054,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_7";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2";
@@ -4189,6 +4190,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5596,6 +5598,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7223,6 +7227,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -8474,6 +8479,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_0_0_5";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8923,6 +8929,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zlib-lens" = doDistribute super."zlib-lens_0_1";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
index fb68011ba872..728316c3a820 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
@@ -3050,6 +3050,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_7";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4184,6 +4185,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5589,6 +5591,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7214,6 +7218,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -8460,6 +8465,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_0_0_5";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8909,6 +8915,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zlib-lens" = doDistribute super."zlib-lens_0_1_1_1";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
index 9c20fbc79823..7fa73aef87f6 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
@@ -3043,6 +3043,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_8";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4172,6 +4173,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5569,6 +5571,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7189,6 +7193,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -8428,6 +8433,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_0_0_6";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8873,6 +8879,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zlib-lens" = doDistribute super."zlib-lens_0_1_1_1";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
index e1402193eb9a..bec2d4451cf0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
@@ -3043,6 +3043,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_8";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4171,6 +4172,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5565,6 +5567,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7185,6 +7189,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -8424,6 +8429,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_0_0_6";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8869,6 +8875,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zlib-lens" = doDistribute super."zlib-lens_0_1_1_2";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
index 4c5eaef68149..cec00a8f3664 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
@@ -3043,6 +3043,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_8";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4170,6 +4171,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5564,6 +5566,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7184,6 +7188,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -8421,6 +8426,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_0_0_6";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8866,6 +8872,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zlib-lens" = doDistribute super."zlib-lens_0_1_1_2";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
index 656be295da0e..befe47dcfb41 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
@@ -3043,6 +3043,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_8";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4169,6 +4170,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5563,6 +5565,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7183,6 +7187,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -8419,6 +8424,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_0_0_6";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8864,6 +8870,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zlib-lens" = doDistribute super."zlib-lens_0_1_1_2";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
index 341459f74056..cef0ee4bb890 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
@@ -3040,6 +3040,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_8";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4165,6 +4166,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5558,6 +5560,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7175,6 +7179,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -8411,6 +8416,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_0_0_6";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8856,6 +8862,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zlib-lens" = doDistribute super."zlib-lens_0_1_1_2";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
index 57889762d0cb..b7a4aea50cf6 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
@@ -3035,6 +3035,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_8";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4160,6 +4161,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5553,6 +5555,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7166,6 +7170,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -8400,6 +8405,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_0_0_6";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8844,6 +8850,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zlib-lens" = doDistribute super."zlib-lens_0_1_1_2";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
index 5f53f69d70c9..1b57d9ff9249 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
@@ -3048,6 +3048,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_8";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4181,6 +4182,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5586,6 +5588,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7208,6 +7212,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -8454,6 +8459,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_0_0_6";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8903,6 +8909,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zlib-lens" = doDistribute super."zlib-lens_0_1_1_1";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
index 6939da3619db..d4f0bb300dfe 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
@@ -3047,6 +3047,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_8";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4178,6 +4179,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5583,6 +5585,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7204,6 +7208,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -8449,6 +8454,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_0_0_6";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8897,6 +8903,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zlib-lens" = doDistribute super."zlib-lens_0_1_1_1";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
index a53cb354aba9..05ac5e89bf35 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
@@ -3046,6 +3046,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_8";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4177,6 +4178,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5581,6 +5583,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7202,6 +7206,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -8445,6 +8450,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_0_0_6";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8893,6 +8899,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zlib-lens" = doDistribute super."zlib-lens_0_1_1_1";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
index d4405a6ea7b3..bbbc05f20110 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
@@ -3046,6 +3046,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_8";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4177,6 +4178,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5575,6 +5577,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7196,6 +7200,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -8439,6 +8444,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_0_0_6";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8887,6 +8893,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zlib-lens" = doDistribute super."zlib-lens_0_1_1_1";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
index 6a0e8545c280..27fa6d9416b1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
@@ -3044,6 +3044,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_8";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4174,6 +4175,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5571,6 +5573,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7192,6 +7196,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -8434,6 +8439,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_0_0_6";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8881,6 +8887,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zlib-lens" = doDistribute super."zlib-lens_0_1_1_1";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
index 93ff9524400e..65cd4a24259b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
@@ -3044,6 +3044,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_8";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4173,6 +4174,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5570,6 +5572,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7191,6 +7195,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -8433,6 +8438,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_0_0_6";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8880,6 +8886,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zlib-lens" = doDistribute super."zlib-lens_0_1_1_1";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
index 6e14e24c7ac3..e07f079d116f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
@@ -3018,6 +3018,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_8";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4135,6 +4136,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5510,6 +5512,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7108,6 +7112,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -8334,6 +8339,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_0_0_6";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8773,6 +8779,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zlib-lens" = doDistribute super."zlib-lens_0_1_1_2";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
index 24a931f7d920..569843334925 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
@@ -3017,6 +3017,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_8";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4133,6 +4134,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5508,6 +5510,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7106,6 +7110,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -8331,6 +8336,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_0_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8770,6 +8776,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zlib-lens" = doDistribute super."zlib-lens_0_1_1_2";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
index 462a8aee2f1d..79d8476e8e63 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
@@ -2999,6 +2999,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_10";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4111,6 +4112,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5470,6 +5472,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7060,6 +7064,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -7181,6 +7186,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -8273,6 +8279,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_0_1_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8709,6 +8716,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
index 4353c8d898c7..a7655f5bea43 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
@@ -2998,6 +2998,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_10";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4108,6 +4109,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5465,6 +5467,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7052,6 +7056,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -7173,6 +7178,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -8263,6 +8269,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_0_1_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8699,6 +8706,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
index 4f4ce4b86e13..795818378783 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
@@ -2998,6 +2998,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_10";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4108,6 +4109,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5465,6 +5467,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7051,6 +7055,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -7172,6 +7177,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -8262,6 +8268,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_0_1_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8698,6 +8705,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
index c9464238e843..7d256156c8d9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
@@ -2998,6 +2998,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_10";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4107,6 +4108,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5463,6 +5465,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7048,6 +7052,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -7169,6 +7174,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -8259,6 +8265,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_0_1_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8695,6 +8702,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
index e2a9927cabfa..e65538bf9208 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
@@ -2997,6 +2997,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_11";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4105,6 +4106,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5460,6 +5462,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7044,6 +7048,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -7164,6 +7169,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -8254,6 +8260,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_0_1_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8687,6 +8694,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
index 53c0e3d69bda..9e373c8b8baa 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
@@ -2996,6 +2996,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_11";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4104,6 +4105,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5459,6 +5461,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7040,6 +7044,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -7160,6 +7165,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -8249,6 +8255,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_0_1_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8681,6 +8688,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
index 14116331de75..eebcd6863fb5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
@@ -2989,7 +2989,9 @@ self: super: {
   "fay-jquery" = doDistribute super."fay-jquery_0_6_0_3";
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_11";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4097,6 +4099,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5451,6 +5454,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7032,6 +7037,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -7152,6 +7158,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -8241,6 +8248,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_0_1_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8672,6 +8680,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
index e1a2bbbc968c..82d59bbc25da 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
@@ -2986,7 +2986,9 @@ self: super: {
   "fay-jquery" = doDistribute super."fay-jquery_0_6_0_3";
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_11";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4092,6 +4094,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5446,6 +5449,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7026,6 +7031,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -7146,6 +7152,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -8235,6 +8242,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_0_1_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8666,6 +8674,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
index 28058c94292e..21cefb587e98 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
@@ -2984,7 +2984,9 @@ self: super: {
   "fay-jquery" = doDistribute super."fay-jquery_0_6_0_3";
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_11";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4089,6 +4091,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5443,6 +5446,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7021,6 +7026,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -7141,6 +7147,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -8229,6 +8236,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_0_1_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8238,6 +8246,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -8658,6 +8667,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
index 26cb22600e13..6f165dfcc9a2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
@@ -2984,7 +2984,9 @@ self: super: {
   "fay-jquery" = doDistribute super."fay-jquery_0_6_0_3";
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_11";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4088,6 +4090,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5441,6 +5444,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7018,6 +7023,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -7138,6 +7144,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -8224,6 +8231,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_0_1_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8233,6 +8241,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -8652,6 +8661,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
index 86dc3b2988a4..cd3071219734 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
@@ -3014,6 +3014,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_8";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4130,6 +4131,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5505,6 +5507,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7103,6 +7107,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -8328,6 +8333,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_0_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8766,6 +8772,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zlib-lens" = doDistribute super."zlib-lens_0_1_1_2";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
index b931af0d41aa..c7d6ff49218b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
@@ -2983,7 +2983,9 @@ self: super: {
   "fay-jquery" = doDistribute super."fay-jquery_0_6_0_3";
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_11";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4086,6 +4088,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5439,6 +5442,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7015,6 +7020,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -7134,6 +7140,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -8220,6 +8227,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_0_1_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8229,6 +8237,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -8648,6 +8657,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
index d9d7c49b0a3c..90a69ad56441 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
@@ -2983,7 +2983,9 @@ self: super: {
   "fay-jquery" = doDistribute super."fay-jquery_0_6_0_3";
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_11";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4086,6 +4088,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5438,6 +5441,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7013,6 +7018,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -7132,6 +7138,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -8216,6 +8223,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_0_1_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8225,6 +8233,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -8643,6 +8652,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
index 032fc30dfae7..009959fe19e0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
@@ -2983,7 +2983,9 @@ self: super: {
   "fay-jquery" = doDistribute super."fay-jquery_0_6_0_3";
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_11";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4086,6 +4088,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5437,6 +5440,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7011,6 +7016,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -7130,6 +7136,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -8214,6 +8221,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_0_1_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8223,6 +8231,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -8641,6 +8650,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
index a73b8c61ac76..c546030ccf4a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
@@ -3013,6 +3013,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_9";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4129,6 +4130,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5503,6 +5505,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7101,6 +7105,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -7222,6 +7227,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -8325,6 +8331,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_0_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8763,6 +8770,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zlib-lens" = doDistribute super."zlib-lens_0_1_1_2";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
index 027b53e251f9..92a77fdf3e04 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
@@ -3012,6 +3012,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_9";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4128,6 +4129,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5501,6 +5503,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7096,6 +7100,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -7217,6 +7222,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -8320,6 +8326,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_0_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8758,6 +8765,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zlib-lens" = doDistribute super."zlib-lens_0_1_1_2";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
index d23b46cfd4b0..dd09a2b14827 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
@@ -3011,6 +3011,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_9";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4127,6 +4128,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5499,6 +5501,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7094,6 +7098,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -7215,6 +7220,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -8317,6 +8323,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_0_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8755,6 +8762,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zlib-lens" = doDistribute super."zlib-lens_0_1_1_2";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
index 079c34dca604..3467818cac8d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
@@ -3008,6 +3008,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_9";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4122,6 +4123,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5494,6 +5496,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7088,6 +7092,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -7209,6 +7214,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -8309,6 +8315,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_0_1_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8746,6 +8753,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zlib-lens" = doDistribute super."zlib-lens_0_1_1_2";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
index 992831b11e59..a6b18dd13999 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
@@ -3007,6 +3007,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_9";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4121,6 +4122,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5493,6 +5495,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7087,6 +7091,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -7208,6 +7213,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -8308,6 +8314,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_0_1_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8745,6 +8752,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zlib-lens" = doDistribute super."zlib-lens_0_1_1_2";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
index 0ba988c6a2d3..eae36c64f84d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
@@ -3006,6 +3006,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_9";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4119,6 +4120,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5489,6 +5491,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7082,6 +7086,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -7203,6 +7208,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -8300,6 +8306,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_0_1_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8737,6 +8744,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zlib-lens" = doDistribute super."zlib-lens_0_1_1_2";
   "zmcat" = dontDistribute super."zmcat";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
index 122ffd8e54b0..e20360ec9477 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
@@ -3001,6 +3001,7 @@ self: super: {
   "fb" = doDistribute super."fb_1_0_9";
   "fb-persistent" = doDistribute super."fb-persistent_0_3_4";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -4113,6 +4114,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = dontDistribute super."hid";
@@ -5479,6 +5481,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = dontDistribute super."microlens";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = dontDistribute super."microlens-ghc";
   "microlens-mtl" = dontDistribute super."microlens-mtl";
@@ -7071,6 +7075,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -7192,6 +7197,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -8285,6 +8291,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_0_1_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = dontDistribute super."wai-cors";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -8721,6 +8728,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
index 0ddbfe9d767a..e9b0d7e7f6cc 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
@@ -2886,7 +2886,9 @@ self: super: {
   "fay-jquery" = doDistribute super."fay-jquery_0_6_0_3";
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_11";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -3965,6 +3967,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = doDistribute super."hid_0_2_1";
@@ -5261,6 +5264,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = doDistribute super."microlens_0_2_0_0";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = doDistribute super."microlens-ghc_0_1_0_1";
   "microlens-mtl" = doDistribute super."microlens-mtl_0_1_3_1";
@@ -6790,6 +6795,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -6908,6 +6914,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -7959,6 +7966,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_1_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7968,6 +7976,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -8372,6 +8381,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
index 7ee9850aed0b..f56ea13f5422 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
@@ -2883,7 +2883,9 @@ self: super: {
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_11";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -3960,6 +3962,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = doDistribute super."hid_0_2_1";
@@ -5255,6 +5258,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = doDistribute super."microlens_0_2_0_0";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = doDistribute super."microlens-ghc_0_1_0_1";
   "microlens-mtl" = doDistribute super."microlens-mtl_0_1_4_0";
@@ -6781,6 +6786,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -6899,6 +6905,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -7949,6 +7956,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_1_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7958,6 +7966,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -8362,6 +8371,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
index fef41afa423e..db25ffbcf7e6 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
@@ -2838,7 +2838,10 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fb" = doDistribute super."fb_1_0_12";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
@@ -3901,6 +3904,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hidapi" = dontDistribute super."hidapi";
@@ -5097,6 +5101,7 @@ self: super: {
   "mancala" = dontDistribute super."mancala";
   "mandrill" = doDistribute super."mandrill_0_3_0_0";
   "mandulia" = dontDistribute super."mandulia";
+  "mangopay" = doDistribute super."mangopay_1_11_5";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
   "marionetta" = dontDistribute super."marionetta";
@@ -5178,6 +5183,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = doDistribute super."microlens_0_2_0_0";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = doDistribute super."microlens-ghc_0_1_0_1";
   "microlens-mtl" = doDistribute super."microlens-mtl_0_1_4_0";
@@ -6671,6 +6678,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -6787,6 +6795,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -7819,6 +7828,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_1_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7828,6 +7838,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -8135,6 +8146,7 @@ self: super: {
   "yesod-json" = dontDistribute super."yesod-json";
   "yesod-links" = dontDistribute super."yesod-links";
   "yesod-lucid" = dontDistribute super."yesod-lucid";
+  "yesod-mangopay" = doDistribute super."yesod-mangopay_1_11_5";
   "yesod-markdown" = dontDistribute super."yesod-markdown";
   "yesod-media-simple" = dontDistribute super."yesod-media-simple";
   "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_4_0_1";
@@ -8219,6 +8231,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
index bf8a60ac2a89..6a5f4f910484 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
@@ -2835,7 +2835,10 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fb" = doDistribute super."fb_1_0_12";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
@@ -3897,6 +3900,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hidapi" = dontDistribute super."hidapi";
@@ -5093,6 +5097,7 @@ self: super: {
   "mancala" = dontDistribute super."mancala";
   "mandrill" = doDistribute super."mandrill_0_3_0_0";
   "mandulia" = dontDistribute super."mandulia";
+  "mangopay" = doDistribute super."mangopay_1_11_5";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
   "marionetta" = dontDistribute super."marionetta";
@@ -5174,6 +5179,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = doDistribute super."microlens_0_2_0_0";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = doDistribute super."microlens-ghc_0_1_0_1";
   "microlens-mtl" = doDistribute super."microlens-mtl_0_1_4_0";
@@ -6665,6 +6672,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -6780,6 +6788,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -7811,6 +7820,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_1_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7820,6 +7830,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -8127,6 +8138,7 @@ self: super: {
   "yesod-json" = dontDistribute super."yesod-json";
   "yesod-links" = dontDistribute super."yesod-links";
   "yesod-lucid" = dontDistribute super."yesod-lucid";
+  "yesod-mangopay" = doDistribute super."yesod-mangopay_1_11_5";
   "yesod-markdown" = dontDistribute super."yesod-markdown";
   "yesod-media-simple" = dontDistribute super."yesod-media-simple";
   "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_4_0_1";
@@ -8211,6 +8223,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
index 1cb9c893f806..ee4f7152ee08 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
@@ -2830,7 +2830,10 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fb" = doDistribute super."fb_1_0_12";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
@@ -3891,6 +3894,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hidapi" = dontDistribute super."hidapi";
@@ -5087,6 +5091,7 @@ self: super: {
   "mancala" = dontDistribute super."mancala";
   "mandrill" = doDistribute super."mandrill_0_3_0_0";
   "mandulia" = dontDistribute super."mandulia";
+  "mangopay" = doDistribute super."mangopay_1_11_5";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
   "marionetta" = dontDistribute super."marionetta";
@@ -5168,6 +5173,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = doDistribute super."microlens_0_2_0_0";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = doDistribute super."microlens-ghc_0_1_0_1";
   "microlens-mtl" = doDistribute super."microlens-mtl_0_1_4_0";
@@ -6658,6 +6665,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -6773,6 +6781,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -7802,6 +7811,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_1_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7811,6 +7821,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -8118,6 +8129,7 @@ self: super: {
   "yesod-json" = dontDistribute super."yesod-json";
   "yesod-links" = dontDistribute super."yesod-links";
   "yesod-lucid" = dontDistribute super."yesod-lucid";
+  "yesod-mangopay" = doDistribute super."yesod-mangopay_1_11_5";
   "yesod-markdown" = dontDistribute super."yesod-markdown";
   "yesod-media-simple" = dontDistribute super."yesod-media-simple";
   "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_4_0_1";
@@ -8200,6 +8212,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
index 271da896c6eb..aabbcc11e745 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
@@ -2830,7 +2830,10 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fb" = doDistribute super."fb_1_0_12";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
@@ -3890,6 +3893,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hidapi" = dontDistribute super."hidapi";
@@ -5085,6 +5089,7 @@ self: super: {
   "mancala" = dontDistribute super."mancala";
   "mandrill" = doDistribute super."mandrill_0_3_0_0";
   "mandulia" = dontDistribute super."mandulia";
+  "mangopay" = doDistribute super."mangopay_1_11_5";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
   "marionetta" = dontDistribute super."marionetta";
@@ -5166,6 +5171,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = doDistribute super."microlens_0_2_0_0";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = doDistribute super."microlens-ghc_0_1_0_1";
   "microlens-mtl" = doDistribute super."microlens-mtl_0_1_4_0";
@@ -6654,6 +6661,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -6769,6 +6777,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -7797,6 +7806,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_1_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
   "wai-dispatch" = dontDistribute super."wai-dispatch";
@@ -7805,6 +7815,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -8112,6 +8123,7 @@ self: super: {
   "yesod-json" = dontDistribute super."yesod-json";
   "yesod-links" = dontDistribute super."yesod-links";
   "yesod-lucid" = dontDistribute super."yesod-lucid";
+  "yesod-mangopay" = doDistribute super."yesod-mangopay_1_11_5";
   "yesod-markdown" = dontDistribute super."yesod-markdown";
   "yesod-media-simple" = dontDistribute super."yesod-media-simple";
   "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_4_0_1";
@@ -8194,6 +8206,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.14.nix b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
index 99ac875508ef..55af508dd12b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
@@ -2822,7 +2822,10 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fb" = doDistribute super."fb_1_0_12";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
@@ -3882,6 +3885,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hidapi" = dontDistribute super."hidapi";
@@ -5075,6 +5079,7 @@ self: super: {
   "mancala" = dontDistribute super."mancala";
   "mandrill" = doDistribute super."mandrill_0_3_0_0";
   "mandulia" = dontDistribute super."mandulia";
+  "mangopay" = doDistribute super."mangopay_1_11_5";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
   "marionetta" = dontDistribute super."marionetta";
@@ -5156,6 +5161,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = doDistribute super."microlens_0_2_0_0";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = doDistribute super."microlens-ghc_0_1_0_1";
   "microlens-mtl" = doDistribute super."microlens-mtl_0_1_4_0";
@@ -6642,6 +6649,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -6757,6 +6765,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -7784,6 +7793,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_1_2";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
   "wai-dispatch" = dontDistribute super."wai-dispatch";
@@ -7792,6 +7802,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -8097,6 +8108,7 @@ self: super: {
   "yesod-json" = dontDistribute super."yesod-json";
   "yesod-links" = dontDistribute super."yesod-links";
   "yesod-lucid" = dontDistribute super."yesod-lucid";
+  "yesod-mangopay" = doDistribute super."yesod-mangopay_1_11_5";
   "yesod-markdown" = dontDistribute super."yesod-markdown";
   "yesod-media-simple" = dontDistribute super."yesod-media-simple";
   "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_4_0_1";
@@ -8179,6 +8191,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.15.nix b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
index 2096bbe0e0fc..7727c0f3d6d5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
@@ -2821,7 +2821,10 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fb" = doDistribute super."fb_1_0_12";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
@@ -3879,6 +3882,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hidapi" = dontDistribute super."hidapi";
@@ -5070,6 +5074,7 @@ self: super: {
   "mancala" = dontDistribute super."mancala";
   "mandrill" = doDistribute super."mandrill_0_3_0_0";
   "mandulia" = dontDistribute super."mandulia";
+  "mangopay" = doDistribute super."mangopay_1_11_5";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
   "marionetta" = dontDistribute super."marionetta";
@@ -5151,6 +5156,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = doDistribute super."microlens_0_2_0_0";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = doDistribute super."microlens-ghc_0_1_0_1";
   "microlens-mtl" = doDistribute super."microlens-mtl_0_1_4_0";
@@ -6634,6 +6641,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -6749,6 +6757,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -7775,13 +7784,16 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_1_3";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
   "wai-dispatch" = dontDistribute super."wai-dispatch";
+  "wai-extra" = doDistribute super."wai-extra_3_0_13";
   "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi";
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -8087,6 +8099,7 @@ self: super: {
   "yesod-json" = dontDistribute super."yesod-json";
   "yesod-links" = dontDistribute super."yesod-links";
   "yesod-lucid" = dontDistribute super."yesod-lucid";
+  "yesod-mangopay" = doDistribute super."yesod-mangopay_1_11_5";
   "yesod-markdown" = dontDistribute super."yesod-markdown";
   "yesod-media-simple" = dontDistribute super."yesod-media-simple";
   "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_4_0_1";
@@ -8169,6 +8182,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.16.nix b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
index 985b46e2af47..6a50af291be0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
@@ -2818,7 +2818,10 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fb" = doDistribute super."fb_1_0_12";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
@@ -3875,6 +3878,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hidapi" = dontDistribute super."hidapi";
@@ -5064,6 +5068,7 @@ self: super: {
   "mancala" = dontDistribute super."mancala";
   "mandrill" = doDistribute super."mandrill_0_3_0_0";
   "mandulia" = dontDistribute super."mandulia";
+  "mangopay" = doDistribute super."mangopay_1_11_5";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
   "marionetta" = dontDistribute super."marionetta";
@@ -5144,6 +5149,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = doDistribute super."microlens_0_2_0_0";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = doDistribute super."microlens-ghc_0_1_0_1";
   "microlens-mtl" = doDistribute super."microlens-mtl_0_1_4_0";
@@ -6622,6 +6629,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -6737,6 +6745,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -7759,13 +7768,16 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_1_3";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
   "wai-dispatch" = dontDistribute super."wai-dispatch";
+  "wai-extra" = doDistribute super."wai-extra_3_0_13";
   "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi";
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -8071,6 +8083,7 @@ self: super: {
   "yesod-json" = dontDistribute super."yesod-json";
   "yesod-links" = dontDistribute super."yesod-links";
   "yesod-lucid" = dontDistribute super."yesod-lucid";
+  "yesod-mangopay" = doDistribute super."yesod-mangopay_1_11_5";
   "yesod-markdown" = dontDistribute super."yesod-markdown";
   "yesod-media-simple" = dontDistribute super."yesod-media-simple";
   "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_4_0_1";
@@ -8153,6 +8166,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.17.nix b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
index 0793e3e1caea..a50419cb5062 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
@@ -2043,6 +2043,7 @@ self: super: {
   "conductive-clock" = dontDistribute super."conductive-clock";
   "conductive-hsc3" = dontDistribute super."conductive-hsc3";
   "conductive-song" = dontDistribute super."conductive-song";
+  "conduit" = doDistribute super."conduit_1_2_6";
   "conduit-audio" = dontDistribute super."conduit-audio";
   "conduit-audio-lame" = dontDistribute super."conduit-audio-lame";
   "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate";
@@ -2809,7 +2810,10 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fb" = doDistribute super."fb_1_0_12";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
@@ -3865,6 +3869,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hidapi" = dontDistribute super."hidapi";
@@ -5051,6 +5056,7 @@ self: super: {
   "mancala" = dontDistribute super."mancala";
   "mandrill" = doDistribute super."mandrill_0_3_0_0";
   "mandulia" = dontDistribute super."mandulia";
+  "mangopay" = doDistribute super."mangopay_1_11_5";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
   "marionetta" = dontDistribute super."marionetta";
@@ -5131,6 +5137,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = doDistribute super."microlens_0_2_0_0";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = doDistribute super."microlens-ghc_0_1_0_1";
   "microlens-mtl" = doDistribute super."microlens-mtl_0_1_4_0";
@@ -6605,6 +6613,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -6720,6 +6729,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -7741,13 +7751,16 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_1_3";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
   "wai-dispatch" = dontDistribute super."wai-dispatch";
+  "wai-extra" = doDistribute super."wai-extra_3_0_13";
   "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi";
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -7790,6 +7803,7 @@ self: super: {
   "wai-throttler" = dontDistribute super."wai-throttler";
   "wai-transformers" = dontDistribute super."wai-transformers";
   "wai-util" = dontDistribute super."wai-util";
+  "wai-websockets" = doDistribute super."wai-websockets_3_0_0_7";
   "wait-handle" = dontDistribute super."wait-handle";
   "waitfree" = dontDistribute super."waitfree";
   "warc" = dontDistribute super."warc";
@@ -8031,6 +8045,7 @@ self: super: {
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
   "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
+  "yesod-bin" = doDistribute super."yesod-bin_1_4_16_1";
   "yesod-bootstrap" = dontDistribute super."yesod-bootstrap";
   "yesod-comments" = dontDistribute super."yesod-comments";
   "yesod-content-pdf" = dontDistribute super."yesod-content-pdf";
@@ -8047,6 +8062,7 @@ self: super: {
   "yesod-json" = dontDistribute super."yesod-json";
   "yesod-links" = dontDistribute super."yesod-links";
   "yesod-lucid" = dontDistribute super."yesod-lucid";
+  "yesod-mangopay" = doDistribute super."yesod-mangopay_1_11_5";
   "yesod-markdown" = dontDistribute super."yesod-markdown";
   "yesod-media-simple" = dontDistribute super."yesod-media-simple";
   "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_4_0_1";
@@ -8129,6 +8145,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.18.nix b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
index de54f3f85ee9..5ee263af1bc1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
@@ -2043,6 +2043,7 @@ self: super: {
   "conductive-clock" = dontDistribute super."conductive-clock";
   "conductive-hsc3" = dontDistribute super."conductive-hsc3";
   "conductive-song" = dontDistribute super."conductive-song";
+  "conduit" = doDistribute super."conduit_1_2_6";
   "conduit-audio" = dontDistribute super."conduit-audio";
   "conduit-audio-lame" = dontDistribute super."conduit-audio-lame";
   "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate";
@@ -2809,7 +2810,10 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fb" = doDistribute super."fb_1_0_12";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
@@ -3860,6 +3864,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hidapi" = dontDistribute super."hidapi";
@@ -5042,6 +5047,7 @@ self: super: {
   "mancala" = dontDistribute super."mancala";
   "mandrill" = doDistribute super."mandrill_0_3_0_0";
   "mandulia" = dontDistribute super."mandulia";
+  "mangopay" = doDistribute super."mangopay_1_11_5";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
   "marionetta" = dontDistribute super."marionetta";
@@ -5122,6 +5128,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = doDistribute super."microlens_0_2_0_0";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = doDistribute super."microlens-ghc_0_1_0_1";
   "microlens-mtl" = doDistribute super."microlens-mtl_0_1_4_0";
@@ -6592,6 +6600,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -6706,6 +6715,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -7724,13 +7734,16 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_1_3";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
   "wai-dispatch" = dontDistribute super."wai-dispatch";
+  "wai-extra" = doDistribute super."wai-extra_3_0_13";
   "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi";
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -7772,6 +7785,7 @@ self: super: {
   "wai-throttler" = dontDistribute super."wai-throttler";
   "wai-transformers" = dontDistribute super."wai-transformers";
   "wai-util" = dontDistribute super."wai-util";
+  "wai-websockets" = doDistribute super."wai-websockets_3_0_0_7";
   "wait-handle" = dontDistribute super."wait-handle";
   "waitfree" = dontDistribute super."waitfree";
   "warc" = dontDistribute super."warc";
@@ -8013,6 +8027,7 @@ self: super: {
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
   "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
+  "yesod-bin" = doDistribute super."yesod-bin_1_4_16_1";
   "yesod-bootstrap" = dontDistribute super."yesod-bootstrap";
   "yesod-comments" = dontDistribute super."yesod-comments";
   "yesod-content-pdf" = dontDistribute super."yesod-content-pdf";
@@ -8029,6 +8044,7 @@ self: super: {
   "yesod-json" = dontDistribute super."yesod-json";
   "yesod-links" = dontDistribute super."yesod-links";
   "yesod-lucid" = dontDistribute super."yesod-lucid";
+  "yesod-mangopay" = doDistribute super."yesod-mangopay_1_11_5";
   "yesod-markdown" = dontDistribute super."yesod-markdown";
   "yesod-media-simple" = dontDistribute super."yesod-media-simple";
   "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_4_0_1";
@@ -8111,6 +8127,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.19.nix b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
index 9a3e399043ac..b2719512902c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
@@ -2035,6 +2035,7 @@ self: super: {
   "conductive-clock" = dontDistribute super."conductive-clock";
   "conductive-hsc3" = dontDistribute super."conductive-hsc3";
   "conductive-song" = dontDistribute super."conductive-song";
+  "conduit" = doDistribute super."conduit_1_2_6";
   "conduit-audio" = dontDistribute super."conduit-audio";
   "conduit-audio-lame" = dontDistribute super."conduit-audio-lame";
   "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate";
@@ -2801,7 +2802,10 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fb" = doDistribute super."fb_1_0_12";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
@@ -3851,6 +3855,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hidapi" = dontDistribute super."hidapi";
@@ -5028,6 +5033,7 @@ self: super: {
   "mancala" = dontDistribute super."mancala";
   "mandrill" = doDistribute super."mandrill_0_3_0_0";
   "mandulia" = dontDistribute super."mandulia";
+  "mangopay" = doDistribute super."mangopay_1_11_5";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
   "marionetta" = dontDistribute super."marionetta";
@@ -5108,6 +5114,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = doDistribute super."microlens_0_2_0_0";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = doDistribute super."microlens-ghc_0_1_0_1";
   "microlens-mtl" = doDistribute super."microlens-mtl_0_1_4_0";
@@ -6573,6 +6581,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -6687,6 +6696,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -7702,13 +7712,17 @@ self: super: {
   "waddle" = dontDistribute super."waddle";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-app-static" = doDistribute super."wai-app-static_3_1_4";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
   "wai-dispatch" = dontDistribute super."wai-dispatch";
+  "wai-extra" = doDistribute super."wai-extra_3_0_13";
   "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi";
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -7750,6 +7764,7 @@ self: super: {
   "wai-throttler" = dontDistribute super."wai-throttler";
   "wai-transformers" = dontDistribute super."wai-transformers";
   "wai-util" = dontDistribute super."wai-util";
+  "wai-websockets" = doDistribute super."wai-websockets_3_0_0_7";
   "wait-handle" = dontDistribute super."wait-handle";
   "waitfree" = dontDistribute super."waitfree";
   "warc" = dontDistribute super."warc";
@@ -7990,6 +8005,7 @@ self: super: {
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
   "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
+  "yesod-bin" = doDistribute super."yesod-bin_1_4_16_1";
   "yesod-bootstrap" = dontDistribute super."yesod-bootstrap";
   "yesod-comments" = dontDistribute super."yesod-comments";
   "yesod-content-pdf" = dontDistribute super."yesod-content-pdf";
@@ -8005,6 +8021,7 @@ self: super: {
   "yesod-json" = dontDistribute super."yesod-json";
   "yesod-links" = dontDistribute super."yesod-links";
   "yesod-lucid" = dontDistribute super."yesod-lucid";
+  "yesod-mangopay" = doDistribute super."yesod-mangopay_1_11_5";
   "yesod-markdown" = dontDistribute super."yesod-markdown";
   "yesod-media-simple" = dontDistribute super."yesod-media-simple";
   "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_4_0_1";
@@ -8087,6 +8104,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
index 4461c0812ff3..cd7a87951e34 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
@@ -2879,7 +2879,9 @@ self: super: {
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_11";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -3955,6 +3957,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = doDistribute super."hid_0_2_1";
@@ -5248,6 +5251,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = doDistribute super."microlens_0_2_0_0";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = doDistribute super."microlens-ghc_0_1_0_1";
   "microlens-mtl" = doDistribute super."microlens-mtl_0_1_4_0";
@@ -6770,6 +6775,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -6887,6 +6893,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -7935,6 +7942,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_1_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7944,6 +7952,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -8347,6 +8356,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.20.nix b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
index 407b9840cddd..04b5fdf0d4f5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
@@ -2030,6 +2030,7 @@ self: super: {
   "conductive-clock" = dontDistribute super."conductive-clock";
   "conductive-hsc3" = dontDistribute super."conductive-hsc3";
   "conductive-song" = dontDistribute super."conductive-song";
+  "conduit" = doDistribute super."conduit_1_2_6";
   "conduit-audio" = dontDistribute super."conduit-audio";
   "conduit-audio-lame" = dontDistribute super."conduit-audio-lame";
   "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate";
@@ -2796,7 +2797,10 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fb" = doDistribute super."fb_1_0_12";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
@@ -3846,6 +3850,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hidapi" = dontDistribute super."hidapi";
@@ -5021,6 +5026,7 @@ self: super: {
   "mancala" = dontDistribute super."mancala";
   "mandrill" = doDistribute super."mandrill_0_3_0_0";
   "mandulia" = dontDistribute super."mandulia";
+  "mangopay" = doDistribute super."mangopay_1_11_5";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
   "marionetta" = dontDistribute super."marionetta";
@@ -5101,6 +5107,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = doDistribute super."microlens_0_2_0_0";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = doDistribute super."microlens-ghc_0_1_0_1";
   "microlens-mtl" = doDistribute super."microlens-mtl_0_1_4_0";
@@ -6564,6 +6572,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -6678,6 +6687,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -7690,13 +7700,17 @@ self: super: {
   "waddle" = dontDistribute super."waddle";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-app-static" = doDistribute super."wai-app-static_3_1_4";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
   "wai-dispatch" = dontDistribute super."wai-dispatch";
+  "wai-extra" = doDistribute super."wai-extra_3_0_13";
   "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi";
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -7738,6 +7752,7 @@ self: super: {
   "wai-throttler" = dontDistribute super."wai-throttler";
   "wai-transformers" = dontDistribute super."wai-transformers";
   "wai-util" = dontDistribute super."wai-util";
+  "wai-websockets" = doDistribute super."wai-websockets_3_0_0_7";
   "wait-handle" = dontDistribute super."wait-handle";
   "waitfree" = dontDistribute super."waitfree";
   "warc" = dontDistribute super."warc";
@@ -7976,6 +7991,7 @@ self: super: {
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
   "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
+  "yesod-bin" = doDistribute super."yesod-bin_1_4_16_1";
   "yesod-bootstrap" = dontDistribute super."yesod-bootstrap";
   "yesod-comments" = dontDistribute super."yesod-comments";
   "yesod-content-pdf" = dontDistribute super."yesod-content-pdf";
@@ -7991,6 +8007,7 @@ self: super: {
   "yesod-json" = dontDistribute super."yesod-json";
   "yesod-links" = dontDistribute super."yesod-links";
   "yesod-lucid" = dontDistribute super."yesod-lucid";
+  "yesod-mangopay" = doDistribute super."yesod-mangopay_1_11_5";
   "yesod-markdown" = dontDistribute super."yesod-markdown";
   "yesod-media-simple" = dontDistribute super."yesod-media-simple";
   "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_4_0_1";
@@ -8073,6 +8090,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
index ebe29e181a89..14ca501a3071 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
@@ -2875,7 +2875,9 @@ self: super: {
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_11";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -3950,6 +3952,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = doDistribute super."hid_0_2_1";
@@ -5241,6 +5244,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = doDistribute super."microlens_0_2_0_0";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = doDistribute super."microlens-ghc_0_1_0_1";
   "microlens-mtl" = doDistribute super."microlens-mtl_0_1_4_0";
@@ -6762,6 +6767,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -6879,6 +6885,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -7924,6 +7931,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_1_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7933,6 +7941,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -8335,6 +8344,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
index 8a8faeb88291..91755dcdbc43 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
@@ -2874,7 +2874,9 @@ self: super: {
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_11";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels" = doDistribute super."fclabels_2_0_2_2";
@@ -3949,6 +3951,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hid" = doDistribute super."hid_0_2_1";
@@ -5240,6 +5243,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = doDistribute super."microlens_0_2_0_0";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = doDistribute super."microlens-ghc_0_1_0_1";
   "microlens-mtl" = doDistribute super."microlens-mtl_0_1_4_0";
@@ -6760,6 +6765,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -6877,6 +6883,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -7921,6 +7928,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_1_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7930,6 +7938,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -8331,6 +8340,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
index b4746be33104..0eb506044e48 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
@@ -2871,7 +2871,9 @@ self: super: {
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_11";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
@@ -3943,6 +3945,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hidapi" = dontDistribute super."hidapi";
@@ -5229,6 +5232,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = doDistribute super."microlens_0_2_0_0";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = doDistribute super."microlens-ghc_0_1_0_1";
   "microlens-mtl" = doDistribute super."microlens-mtl_0_1_4_0";
@@ -6743,6 +6748,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -6860,6 +6866,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -7901,6 +7908,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_1_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7910,6 +7918,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -8308,6 +8317,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
index 83635b005ae2..b7e7ce31b3a6 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
@@ -2867,7 +2867,9 @@ self: super: {
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
   "fb" = doDistribute super."fb_1_0_11";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
@@ -3936,6 +3938,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hidapi" = dontDistribute super."hidapi";
@@ -5218,6 +5221,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = doDistribute super."microlens_0_2_0_0";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = doDistribute super."microlens-ghc_0_1_0_1";
   "microlens-mtl" = doDistribute super."microlens-mtl_0_1_4_0";
@@ -6730,6 +6735,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -6847,6 +6853,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -7886,6 +7893,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_1_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7895,6 +7903,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -8292,6 +8301,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
index 706ac59c44b8..883096aa7f4c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
@@ -2861,7 +2861,10 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fb" = doDistribute super."fb_1_0_12";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
@@ -3927,6 +3930,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hidapi" = dontDistribute super."hidapi";
@@ -5125,6 +5129,7 @@ self: super: {
   "mancala" = dontDistribute super."mancala";
   "mandrill" = doDistribute super."mandrill_0_3_0_0";
   "mandulia" = dontDistribute super."mandulia";
+  "mangopay" = doDistribute super."mangopay_1_11_5";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
   "marionetta" = dontDistribute super."marionetta";
@@ -5206,6 +5211,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = doDistribute super."microlens_0_2_0_0";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = doDistribute super."microlens-ghc_0_1_0_1";
   "microlens-mtl" = doDistribute super."microlens-mtl_0_1_4_0";
@@ -6713,6 +6720,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -6830,6 +6838,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -7866,6 +7875,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_1_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7875,6 +7885,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -8185,6 +8196,7 @@ self: super: {
   "yesod-json" = dontDistribute super."yesod-json";
   "yesod-links" = dontDistribute super."yesod-links";
   "yesod-lucid" = dontDistribute super."yesod-lucid";
+  "yesod-mangopay" = doDistribute super."yesod-mangopay_1_11_5";
   "yesod-markdown" = dontDistribute super."yesod-markdown";
   "yesod-media-simple" = dontDistribute super."yesod-media-simple";
   "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_4_0_1";
@@ -8269,6 +8281,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
index 50f10a626208..9ea33f85d85c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
@@ -2852,7 +2852,10 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fb" = doDistribute super."fb_1_0_12";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
@@ -3918,6 +3921,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hidapi" = dontDistribute super."hidapi";
@@ -5115,6 +5119,7 @@ self: super: {
   "mancala" = dontDistribute super."mancala";
   "mandrill" = doDistribute super."mandrill_0_3_0_0";
   "mandulia" = dontDistribute super."mandulia";
+  "mangopay" = doDistribute super."mangopay_1_11_5";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
   "marionetta" = dontDistribute super."marionetta";
@@ -5196,6 +5201,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = doDistribute super."microlens_0_2_0_0";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = doDistribute super."microlens-ghc_0_1_0_1";
   "microlens-mtl" = doDistribute super."microlens-mtl_0_1_4_0";
@@ -6699,6 +6706,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -6816,6 +6824,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -7851,6 +7860,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_1_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7860,6 +7870,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -8170,6 +8181,7 @@ self: super: {
   "yesod-json" = dontDistribute super."yesod-json";
   "yesod-links" = dontDistribute super."yesod-links";
   "yesod-lucid" = dontDistribute super."yesod-lucid";
+  "yesod-mangopay" = doDistribute super."yesod-mangopay_1_11_5";
   "yesod-markdown" = dontDistribute super."yesod-markdown";
   "yesod-media-simple" = dontDistribute super."yesod-media-simple";
   "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_4_0_1";
@@ -8254,6 +8266,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
index a05341eb8b4f..3e21be78b0b0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
@@ -2845,7 +2845,10 @@ self: super: {
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
+  "fb" = doDistribute super."fb_1_0_12";
+  "fb-persistent" = doDistribute super."fb-persistent_0_3_5";
   "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
@@ -3910,6 +3913,7 @@ self: super: {
   "hgrib" = dontDistribute super."hgrib";
   "hharp" = dontDistribute super."hharp";
   "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
   "hiccup" = dontDistribute super."hiccup";
   "hichi" = dontDistribute super."hichi";
   "hidapi" = dontDistribute super."hidapi";
@@ -5107,6 +5111,7 @@ self: super: {
   "mancala" = dontDistribute super."mancala";
   "mandrill" = doDistribute super."mandrill_0_3_0_0";
   "mandulia" = dontDistribute super."mandulia";
+  "mangopay" = doDistribute super."mangopay_1_11_5";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
   "marionetta" = dontDistribute super."marionetta";
@@ -5188,6 +5193,8 @@ self: super: {
   "microformats2-parser" = dontDistribute super."microformats2-parser";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens" = doDistribute super."microlens_0_2_0_0";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
   "microlens-ghc" = doDistribute super."microlens-ghc_0_1_0_1";
   "microlens-mtl" = doDistribute super."microlens-mtl_0_1_4_0";
@@ -6690,6 +6697,7 @@ self: super: {
   "setters" = dontDistribute super."setters";
   "settings" = dontDistribute super."settings";
   "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
   "sexp-show" = dontDistribute super."sexp-show";
   "sexpr" = dontDistribute super."sexpr";
   "sext" = dontDistribute super."sext";
@@ -6807,6 +6815,7 @@ self: super: {
   "sized-vector" = dontDistribute super."sized-vector";
   "sizes" = dontDistribute super."sizes";
   "sjsp" = dontDistribute super."sjsp";
+  "skein" = doDistribute super."skein_1_0_9_3";
   "skeleton" = dontDistribute super."skeleton";
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
@@ -7842,6 +7851,7 @@ self: super: {
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_1_1";
+  "wai-conduit" = doDistribute super."wai-conduit_3_0_0_2";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7851,6 +7861,7 @@ self: super: {
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
   "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-launch" = doDistribute super."wai-handler-launch_3_0_0_4";
   "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
   "wai-handler-snap" = dontDistribute super."wai-handler-snap";
   "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
@@ -8161,6 +8172,7 @@ self: super: {
   "yesod-json" = dontDistribute super."yesod-json";
   "yesod-links" = dontDistribute super."yesod-links";
   "yesod-lucid" = dontDistribute super."yesod-lucid";
+  "yesod-mangopay" = doDistribute super."yesod-mangopay_1_11_5";
   "yesod-markdown" = dontDistribute super."yesod-markdown";
   "yesod-media-simple" = dontDistribute super."yesod-media-simple";
   "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_4_0_1";
@@ -8245,6 +8257,7 @@ self: super: {
   "zipper" = dontDistribute super."zipper";
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 26288e138846..fcb0354fd650 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -876,6 +876,7 @@ self: {
        homepage = "http://allureofthestars.com";
        description = "Near-future Sci-Fi roguelike and tactical squad game";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AndroidViewHierarchyImporter" = callPackage
@@ -4038,6 +4039,7 @@ self: {
        ];
        description = "Database Supported Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DSTM" = callPackage
@@ -5988,6 +5990,7 @@ self: {
        homepage = "https://github.com/TomSmeets/FractalArt";
        description = "Generates colorful wallpapers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.xorg) libX11;};
 
   "Fractaler" = callPackage
@@ -8305,21 +8308,42 @@ self: {
 
   "HPDF" = callPackage
     ({ mkDerivation, array, base, base64-bytestring, binary, bytestring
-     , containers, mtl, random, vector, zlib
+     , containers, errors, HTF, mtl, random, vector, zlib
      }:
      mkDerivation {
        pname = "HPDF";
-       version = "1.4.8";
-       sha256 = "717d05dda2a5bcdc482056afa6543774a6fcd0e180232f24bcd6240ddf489690";
+       version = "1.4.9";
+       sha256 = "fde0b80704ae10ba5ffc5a7817bfbfbecf48db3b556f14f0c4021d6297dbdc17";
        libraryHaskellDepends = [
-         array base base64-bytestring binary bytestring containers mtl
-         random vector zlib
+         array base base64-bytestring binary bytestring containers errors
+         mtl random vector zlib
        ];
+       testHaskellDepends = [ base HTF ];
+       doCheck = false;
        homepage = "http://www.alpheccar.org";
        description = "Generation of PDF documents";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "HPDF_1_4_10" = callPackage
+    ({ mkDerivation, array, base, base64-bytestring, binary, bytestring
+     , containers, errors, HTF, mtl, random, vector, zlib
+     }:
+     mkDerivation {
+       pname = "HPDF";
+       version = "1.4.10";
+       sha256 = "de2bfddd93eeef2129a2378e8dce486d086bec3c48ee2a1bf1a5fb01581607d4";
+       libraryHaskellDepends = [
+         array base base64-bytestring binary bytestring containers errors
+         mtl random vector zlib
+       ];
+       testHaskellDepends = [ base HTF ];
+       homepage = "http://www.alpheccar.org";
+       description = "Generation of PDF documents";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "HPath" = callPackage
     ({ mkDerivation, base, Cabal, containers, directory, filepath
      , haskell-src-exts, mtl, parsec, utf8-string
@@ -10593,12 +10617,11 @@ self: {
      }:
      mkDerivation {
        pname = "HueAPI";
-       version = "0.2.5";
-       sha256 = "91985ae679c725b2214c247c64be63906afc074b0eb724a1383b73cf9464e0fb";
+       version = "0.2.6";
+       sha256 = "19515ecd8501ae038f060a3b10d391c865d07391d240b1819a55a165340e35c2";
        libraryHaskellDepends = [
          aeson base containers lens lens-aeson mtl transformers wreq
        ];
-       jailbreak = true;
        homepage = "https://github.com/sjoerdvisscher/HueAPI";
        description = "API for controlling Philips Hue lights";
        license = stdenv.lib.licenses.bsd3;
@@ -11794,6 +11817,7 @@ self: {
        homepage = "http://github.com/LambdaHack/LambdaHack";
        description = "A game engine library for roguelike dungeon crawlers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gtk2 = pkgs.gnome2.gtk;};
 
   "LambdaINet" = callPackage
@@ -13078,8 +13102,8 @@ self: {
     ({ mkDerivation, base, MonadRandom, mtl, random }:
      mkDerivation {
        pname = "MonadRandomLazy";
-       version = "0.1";
-       sha256 = "525c531642d111efd8768758edf6cfd870a34dea7ac3b3ab5e444d5e0fd956db";
+       version = "0.1.1.1";
+       sha256 = "0289455d870512953d9e9f30e21d31f26469c0de4fca55abcce2f496cc1b1c7f";
        libraryHaskellDepends = [ base MonadRandom mtl random ];
        description = "Lazy monad for psuedo random-number generation";
        license = stdenv.lib.licenses.bsd3;
@@ -14974,8 +14998,8 @@ self: {
      }:
      mkDerivation {
        pname = "Plot-ho-matic";
-       version = "0.7.0.0";
-       sha256 = "8fb8ca89074e10f325c7c0107a405718455bf6120e74140623252b9347aa2c97";
+       version = "0.7.0.1";
+       sha256 = "ff670da50a981cc665d1c17a813b94850fd1080e5b8db5e1602a1bc0ae86be32";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -17301,6 +17325,7 @@ self: {
        jailbreak = true;
        description = "Static code analysis using graph-theoretic techniques";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Southpaw" = callPackage
@@ -21630,8 +21655,8 @@ self: {
      }:
      mkDerivation {
        pname = "adblock2privoxy";
-       version = "1.4.0";
-       sha256 = "2503df4fb073fd03d2f66467b5a14eb31cf5a6a315823cbef09dd96db7c7e1cb";
+       version = "1.4.1";
+       sha256 = "6b3242a5ddba181659f9b8eb4786dfa929751aaf48a62b070040043a3e8e0613";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -23227,6 +23252,7 @@ self: {
        ];
        description = "Relational Algebra and SQL Code Generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "algebraic" = callPackage
@@ -30245,8 +30271,8 @@ self: {
      }:
      mkDerivation {
        pname = "atp-haskell";
-       version = "1.8";
-       sha256 = "4bac41afc35571b2ad1a711d08e6f0cb223bb165615e511f2fc22ff9397fb467";
+       version = "1.9";
+       sha256 = "ef3c046d722fd5b8a2cd2662a0585fa2c2ea2131e58177f094e7a9b4d0909245";
        libraryHaskellDepends = [
          applicative-extras base containers HUnit mtl parsec pretty
          template-haskell time
@@ -31037,6 +31063,7 @@ self: {
        ];
        description = "empty";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "avl-static" = callPackage
@@ -32457,6 +32484,7 @@ self: {
        jailbreak = true;
        description = "Generate Code 128 barcodes as PDFs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "barecheck_0_2_0_6" = callPackage
@@ -33352,6 +33380,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bcrypt_0_0_8" = callPackage
+    ({ mkDerivation, base, bytestring, entropy, memory }:
+     mkDerivation {
+       pname = "bcrypt";
+       version = "0.0.8";
+       sha256 = "9cd100975d7349190a1d8ed6459d9e2677a74385ce86b35f2da3f5c582e11100";
+       libraryHaskellDepends = [ base bytestring entropy memory ];
+       description = "Haskell bindings to the bcrypt password hash";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "bdd" = callPackage
     ({ mkDerivation, base, directory, HUnit, mtl, process
      , test-framework, test-framework-hunit, transformers
@@ -33636,6 +33676,7 @@ self: {
        homepage = "https://github.com/Noeda/bet/";
        description = "Betfair API bindings. Bet on sports on betting exchanges.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "betacode" = callPackage
@@ -33743,8 +33784,8 @@ self: {
     ({ mkDerivation, base, latex, parsec, utility-ht }:
      mkDerivation {
        pname = "bibtex";
-       version = "0.1.0.4";
-       sha256 = "804514bdd2c801b7a0d858ea1df16811466eb53fd87a195411a205334471d278";
+       version = "0.1.0.5";
+       sha256 = "dd06fbd5d597a558f059775b258ae526baa41c656a92e7d8a45646c64c1bc74b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base latex parsec utility-ht ];
@@ -34070,6 +34111,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "binary_0_7_6_1" = callPackage
+    ({ mkDerivation, array, base, bytestring, Cabal, containers
+     , directory, filepath, HUnit, QuickCheck, random, test-framework
+     , test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "binary";
+       version = "0.7.6.1";
+       sha256 = "8f85cafc15be660757878a665d024ce595d4422fead174e20a501c9ec8f81067";
+       libraryHaskellDepends = [ array base bytestring containers ];
+       testHaskellDepends = [
+         array base bytestring Cabal containers directory filepath HUnit
+         QuickCheck random test-framework test-framework-quickcheck2
+       ];
+       homepage = "https://github.com/kolmodin/binary";
+       description = "Binary serialisation for Haskell values using lazy ByteStrings";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "binary_0_8_0_0" = callPackage
     ({ mkDerivation, array, base, bytestring, Cabal, containers
      , directory, filepath, HUnit, QuickCheck, random, test-framework
@@ -35006,6 +35067,7 @@ self: {
        libraryPkgconfigDepends = [ gsl ];
        description = "Low level bindings to GNU GSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gsl;};
 
   "bindings-gts" = callPackage
@@ -37411,6 +37473,7 @@ self: {
        homepage = "https://github.com/Microsoft/bond";
        description = "Bond schema compiler and code generator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bool-extras" = callPackage
@@ -38561,6 +38624,7 @@ self: {
        homepage = "http://www.freedesktop.org/wiki/Software/Bustle/";
        description = "Draw sequence diagrams of D-Bus traffic";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "butterflies" = callPackage
@@ -39361,8 +39425,8 @@ self: {
     ({ mkDerivation, base, ghc-prim }:
      mkDerivation {
        pname = "c-storable-deriving";
-       version = "0.1.2";
-       sha256 = "a127c61b4989de5ca808c0e5aa13d5538abeaeebf163c0bca2e55f8abc1bbe31";
+       version = "0.1.3";
+       sha256 = "68432da5e33d769c514402ad00bcd66c6a2742dd238825b4988476e5f4c9a67f";
        libraryHaskellDepends = [ base ghc-prim ];
        homepage = "https://github.com/maurer/c-storable-deriving";
        description = "Generate C-like storable instances from datatypes";
@@ -40173,24 +40237,24 @@ self: {
      }) {};
 
   "cabal-macosx" = callPackage
-    ({ mkDerivation, base, Cabal, directory, fgl, filepath, HUnit
-     , parsec, process, temporary, test-framework, test-framework-hunit
-     , text
+    ({ mkDerivation, base, Cabal, containers, directory, fgl, filepath
+     , HUnit, parsec, process, temporary, test-framework
+     , test-framework-hunit, text
      }:
      mkDerivation {
        pname = "cabal-macosx";
-       version = "0.2.3.2";
-       sha256 = "054f891068c9ce0161610e929716e8fa2022ef0bc093fb42bcb30733c38026b7";
+       version = "0.2.3.3";
+       sha256 = "0ff1241a0b0a8d9107bba400f0af7f5f35552f988db0096e28e574e771de73ea";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base Cabal directory fgl filepath parsec process text
+         base Cabal containers directory fgl filepath parsec process text
        ];
        executableHaskellDepends = [
-         base Cabal directory fgl filepath parsec process text
+         base Cabal containers directory fgl filepath parsec process text
        ];
        testHaskellDepends = [
-         base HUnit temporary test-framework test-framework-hunit
+         base Cabal HUnit temporary test-framework test-framework-hunit
        ];
        homepage = "http://github.com/danfran/cabal-macosx";
        description = "Cabal support for creating Mac OSX application bundles";
@@ -41680,8 +41744,8 @@ self: {
      }:
      mkDerivation {
        pname = "casadi-bindings";
-       version = "2.4.1.4";
-       sha256 = "f04064cf031d10675b5295252dace0ab4b4fc401f78c5d0a4802a2a6dbea6fab";
+       version = "2.4.1.5";
+       sha256 = "87150f2cf93c8e6aa049d1dc2820e09a52a8178e53539f750f77c40e2322219c";
        libraryHaskellDepends = [
          base binary casadi-bindings-core casadi-bindings-internal cereal
          containers linear vector vector-binary-instances
@@ -43493,6 +43557,7 @@ self: {
        homepage = "https://john-millikin.com/software/chell/";
        description = "HUnit support for the Chell testing library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chell-quickcheck_0_2_4" = callPackage
@@ -44315,8 +44380,8 @@ self: {
      }:
      mkDerivation {
        pname = "clarifai";
-       version = "0.1.1.0";
-       sha256 = "40ef0baf628d4569138192128dd5f6f07a38b2963ec54e4968646f5953caf718";
+       version = "0.2.0.0";
+       sha256 = "4a382f92c21d1571861ddb557f721edce63c9b356960ea74a779175e13c41d2d";
        libraryHaskellDepends = [
          aeson base bytestring containers easy-file HTTP http-client lens
          lens-aeson scientific text unordered-containers vector wreq
@@ -46303,6 +46368,7 @@ self: {
        homepage = "http://github.com/haskell-distributed/cloud-haskell";
        description = "The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cloudfront-signer" = callPackage
@@ -46493,6 +46559,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cmark_0_5_0" = callPackage
+    ({ mkDerivation, base, bytestring, HUnit, text }:
+     mkDerivation {
+       pname = "cmark";
+       version = "0.5.0";
+       sha256 = "a95dd6c5135159d0d1b797eb99bbad757a298f4a8fb580865323bff37cba2cb8";
+       libraryHaskellDepends = [ base bytestring text ];
+       testHaskellDepends = [ base HUnit text ];
+       homepage = "https://github.com/jgm/commonmark-hs";
+       description = "Fast, accurate CommonMark (Markdown) parser and renderer";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cmath" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -48034,6 +48114,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "composition_1_0_2_1" = callPackage
+    ({ mkDerivation }:
+     mkDerivation {
+       pname = "composition";
+       version = "1.0.2.1";
+       sha256 = "7123300f5eca5a7cec4eb731dc0e9c2c44aabe26b37e6579582a7267d9f7ad6a";
+       description = "Combinators for unorthodox function composition";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "composition-extra_1_1_0" = callPackage
     ({ mkDerivation, base, contravariant }:
      mkDerivation {
@@ -48791,7 +48882,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "conduit" = callPackage
+  "conduit_1_2_6" = callPackage
     ({ mkDerivation, base, containers, exceptions, hspec, lifted-base
      , mmorph, mtl, QuickCheck, resourcet, safe, transformers
      , transformers-base
@@ -48811,6 +48902,29 @@ self: {
        homepage = "http://github.com/snoyberg/conduit";
        description = "Streaming data processing library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "conduit" = callPackage
+    ({ mkDerivation, base, containers, exceptions, hspec, lifted-base
+     , mmorph, mtl, QuickCheck, resourcet, safe, transformers
+     , transformers-base
+     }:
+     mkDerivation {
+       pname = "conduit";
+       version = "1.2.6.1";
+       sha256 = "ae38875a01312070cc1f59aba6687b7b8619416f426299ab126e08023c22309c";
+       libraryHaskellDepends = [
+         base exceptions lifted-base mmorph mtl resourcet transformers
+         transformers-base
+       ];
+       testHaskellDepends = [
+         base containers exceptions hspec mtl QuickCheck resourcet safe
+         transformers
+       ];
+       homepage = "http://github.com/snoyberg/conduit";
+       description = "Streaming data processing library";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "conduit-audio" = callPackage
@@ -52436,6 +52550,7 @@ self: {
        homepage = "http://github.com/eval-so/cruncher-types";
        description = "Request and Response types for Eval.so's API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "crunghc" = callPackage
@@ -53532,14 +53647,13 @@ self: {
      }:
      mkDerivation {
        pname = "ctrie";
-       version = "0.1.0.2";
-       sha256 = "24808c8eae2fe71e92060f93479e5be1b97a7a90ffbdcf74bcb70470abe4d487";
+       version = "0.1.0.3";
+       sha256 = "39111bf907776cb33890ca5cba82e204d576aacd320df2f150fc090e34055b7c";
        libraryHaskellDepends = [ atomic-primops base hashable primitive ];
        testHaskellDepends = [
          base containers hashable QuickCheck test-framework
          test-framework-quickcheck2
        ];
-       jailbreak = true;
        homepage = "https://github.com/mcschroeder/ctrie";
        description = "Non-blocking concurrent map";
        license = stdenv.lib.licenses.mit;
@@ -56005,13 +56119,13 @@ self: {
   "dbmigrations" = callPackage
     ({ mkDerivation, base, bytestring, configurator, containers
      , directory, fgl, filepath, HDBC, HDBC-postgresql, HDBC-sqlite3
-     , HUnit, mtl, process, random, template-haskell, text, time
-     , yaml-light
+     , HUnit, MissingH, mtl, process, random, template-haskell, text
+     , time, yaml-light
      }:
      mkDerivation {
        pname = "dbmigrations";
-       version = "0.9.1";
-       sha256 = "02fa493a7743c453eca74396e6f359c3e73f1265a9ef40d8d7a0e99fb259dde4";
+       version = "1.0";
+       sha256 = "5dcd9d29eb4794070b8f41f1ec59e1937eebc68cc6de40c14219e815e56e16f6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -56021,9 +56135,9 @@ self: {
        ];
        executableHaskellDepends = [ base configurator ];
        testHaskellDepends = [
-         base bytestring containers directory fgl filepath HDBC
-         HDBC-postgresql HDBC-sqlite3 HUnit mtl process template-haskell
-         time yaml-light
+         base bytestring configurator containers directory fgl filepath HDBC
+         HDBC-postgresql HDBC-sqlite3 HUnit MissingH mtl process
+         template-haskell text time yaml-light
        ];
        doCheck = false;
        description = "An implementation of relational database \"migrations\"";
@@ -60573,6 +60687,8 @@ self: {
        pname = "directory";
        version = "1.2.5.0";
        sha256 = "ac9d7fdd402c3281fab7ffad004229671f0ecfb7ddd70fd58b90b0a48c1ddef7";
+       revision = "1";
+       editedCabalFile = "1ae6631d1a4234329263792b1809c156f9f85a05753379e69fd6b2e93c61c6a0";
        libraryHaskellDepends = [ base filepath time unix ];
        testHaskellDepends = [ base filepath time unix ];
        description = "Platform-agnostic library for filesystem operations";
@@ -60797,6 +60913,7 @@ self: {
        homepage = "https://github.com/tweag/distributed-closure";
        description = "Serializable closures for distributed programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process_0_5_2" = callPackage
@@ -61039,6 +61156,7 @@ self: {
        homepage = "http://github.com/haskell-distributed/distributed-process-client-server";
        description = "The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-execution_0_1_1" = callPackage
@@ -61109,6 +61227,7 @@ self: {
        homepage = "http://github.com/haskell-distributed/distributed-process-execution";
        description = "Execution Framework for The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-extras_0_2_0" = callPackage
@@ -61276,6 +61395,7 @@ self: {
        homepage = "http://github.com/haskell-distributed/distributed-process-registry";
        description = "Cloud Haskell Extended Process Registry";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-simplelocalnet_0_2_2_0" = callPackage
@@ -61408,6 +61528,7 @@ self: {
        homepage = "http://github.com/haskell-distributed/distributed-process-supervisor";
        description = "Supervisors for The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-task_0_1_1" = callPackage
@@ -61480,6 +61601,7 @@ self: {
        homepage = "http://github.com/haskell-distributed/distributed-process-task";
        description = "Task Framework for The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-tests" = callPackage
@@ -62928,6 +63050,7 @@ self: {
        ];
        description = "SQL backend for Database Supported Haskell (DSH)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dsmc" = callPackage
@@ -63402,6 +63525,7 @@ self: {
        homepage = "http://github.com/bennofs/dynamic-cabal/";
        description = "Access the functions from the Cabal library without depending on it";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dynamic-graph" = callPackage
@@ -65322,7 +65446,7 @@ self: {
        homepage = "https://github.com/cocreature/emacs-keys";
        description = "library to parse emacs style keybinding into the modifiers and the chars";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "email" = callPackage
@@ -69453,7 +69577,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "fb" = callPackage
+  "fb_1_0_12" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
      , base64-bytestring, bytestring, cereal, conduit, conduit-extra
      , containers, crypto-api, cryptohash, cryptohash-cryptoapi
@@ -69482,6 +69606,38 @@ self: {
        homepage = "https://github.com/prowdsponsor/fb";
        description = "Bindings to Facebook's API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "fb" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
+     , base64-bytestring, bytestring, cereal, conduit, conduit-extra
+     , containers, crypto-api, cryptohash, cryptohash-cryptoapi
+     , data-default, hspec, http-conduit, http-types, HUnit, lifted-base
+     , monad-control, monad-logger, old-locale, QuickCheck, resourcet
+     , text, time, transformers, transformers-base, unordered-containers
+     }:
+     mkDerivation {
+       pname = "fb";
+       version = "1.0.13";
+       sha256 = "52af3e05b5721b5d38fea9231e9fde68b0e1987c4cc979acaf6e2f940537935e";
+       libraryHaskellDepends = [
+         aeson attoparsec base base16-bytestring base64-bytestring
+         bytestring cereal conduit conduit-extra crypto-api cryptohash
+         cryptohash-cryptoapi data-default http-conduit http-types
+         lifted-base monad-control monad-logger old-locale resourcet text
+         time transformers transformers-base unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring conduit containers data-default hspec
+         http-conduit HUnit lifted-base monad-control QuickCheck resourcet
+         text time transformers
+       ];
+       jailbreak = true;
+       doCheck = false;
+       homepage = "https://github.com/prowdsponsor/fb";
+       description = "Bindings to Facebook's API";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "fb-persistent_0_3_4" = callPackage
@@ -69498,7 +69654,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "fb-persistent" = callPackage
+  "fb-persistent_0_3_5" = callPackage
     ({ mkDerivation, base, cereal, fb, persistent, text, time }:
      mkDerivation {
        pname = "fb-persistent";
@@ -69508,6 +69664,19 @@ self: {
        homepage = "https://github.com/prowdsponsor/fb-persistent";
        description = "Provides Persistent instances to Facebook types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "fb-persistent" = callPackage
+    ({ mkDerivation, base, cereal, fb, persistent, text, time }:
+     mkDerivation {
+       pname = "fb-persistent";
+       version = "0.3.6";
+       sha256 = "9a24e190b70fd3bcd5a70813e50872398217b24d39da76b175cbcbbd693580c6";
+       libraryHaskellDepends = [ base cereal fb persistent text time ];
+       homepage = "https://github.com/prowdsponsor/fb-persistent";
+       description = "Provides Persistent instances to Facebook types";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "fca" = callPackage
@@ -69527,6 +69696,23 @@ self: {
        license = stdenv.lib.licenses.agpl3;
      }) {};
 
+  "fcache" = callPackage
+    ({ mkDerivation, base, containers, hashable, hspec, mtl
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "fcache";
+       version = "0.1.0.0";
+       sha256 = "52340d228a564a7eb0fe84d386075af019540145fbe53b4e20925b746e3a0eae";
+       libraryHaskellDepends = [
+         base containers hashable mtl unordered-containers
+       ];
+       testHaskellDepends = [ base hspec mtl ];
+       homepage = "http://github.com/ylilarry/fcache#readme";
+       description = "Cache a function (a -> b)";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "fcd" = callPackage
     ({ mkDerivation, array, base, directory, process, tasty
      , tasty-hunit, text, unix, vty, vty-ui
@@ -70120,8 +70306,8 @@ self: {
      }:
      mkDerivation {
        pname = "ffmpeg-light";
-       version = "0.9.0";
-       sha256 = "309ce75c56dfef61ad0e08ef34324873b24cdeb32ae2ace406caf0e9ca788897";
+       version = "0.10.0";
+       sha256 = "4b8347300fbc1c687f9db5a00baa59dc654be11d9299258f5bd2256a61501395";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -70708,15 +70894,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "filepath_1_4_0_0" = callPackage
+  "filepath_1_4_1_0" = callPackage
     ({ mkDerivation, base, QuickCheck }:
      mkDerivation {
        pname = "filepath";
-       version = "1.4.0.0";
-       sha256 = "a43b3590476b1ca594ca108a4e8d4f8b0f0f5abb312666e6a42c24d8dd83b028";
+       version = "1.4.1.0";
+       sha256 = "bd6dbfd1ecba2322ef166b4805d4276cbde1e551bd5c61fbee396782b9923d00";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck ];
-       jailbreak = true;
        homepage = "https://github.com/haskell/filepath#readme";
        description = "Library for manipulating FilePaths in a cross platform way";
        license = stdenv.lib.licenses.bsd3;
@@ -71842,6 +72027,7 @@ self: {
        homepage = "https://github.com/brewtown/hs-flowdock";
        description = "Flowdock client library for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "flowdock-api" = callPackage
@@ -72339,8 +72525,8 @@ self: {
      }:
      mkDerivation {
        pname = "foldl-transduce";
-       version = "0.4.6.0";
-       sha256 = "91a3114417eccc322d7b151029c88582a8875151a452df487c9fb857d724b2b5";
+       version = "0.4.7.0";
+       sha256 = "8836b026467a5940be86015d34f2dfca7f0b1787fd608d1bad81a8bd25cbc8e9";
        libraryHaskellDepends = [
          base bifunctors bytestring comonad containers foldl free
          monoid-subclasses profunctors semigroupoids semigroups split text
@@ -73441,15 +73627,14 @@ self: {
      }:
      mkDerivation {
        pname = "free-functors";
-       version = "0.6.4.1";
-       sha256 = "f3cf80e02a6fe54737ff73cf7cc81e500a5b9d653d2dde8410144e2293f085d5";
+       version = "0.6.5";
+       sha256 = "be107f1140b11d043e93682e1ab988a4aa7fd00cb460417daca97c90d61f7ddf";
        libraryHaskellDepends = [
          algebraic-classes base comonad constraints template-haskell
          transformers void
        ];
-       jailbreak = true;
        homepage = "https://github.com/sjoerdvisscher/free-functors";
-       description = "Provides free functors that are adjoint to functors that forget class constraints";
+       description = "Free functors, adjoint to functors that forget class constraints";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -73484,8 +73669,8 @@ self: {
      }:
      mkDerivation {
        pname = "free-http";
-       version = "0.1.1.3";
-       sha256 = "d5a161832284329c59b5f96f8e06d3640ea24dfab13304d4a9abe60a6275aabe";
+       version = "0.2.0";
+       sha256 = "d873e7dcef909cf6ec38e00273531c2831cc9a5ab4f2b73de8ec39441a6454b7";
        libraryHaskellDepends = [
          base bytestring free http-client http-types mtl QuickCheck text
          time transformers
@@ -74266,6 +74451,7 @@ self: {
        homepage = "https://notabug.org/fr33domlover/funbot";
        description = "IRC bot for fun, learning, creativity and collaboration";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "funbot-client" = callPackage
@@ -79704,6 +79890,7 @@ self: {
        homepage = "http://github.com/swift-nav/gnss-converters";
        description = "GNSS Converters";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gnuidn_0_2_1" = callPackage
@@ -79867,6 +80054,7 @@ self: {
        ];
        description = "Mealy based simulation tools";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "goatee" = callPackage
@@ -82151,17 +82339,18 @@ self: {
 
   "gremlin-haskell" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, containers, hspec, lens
-     , lens-aeson, mtl, stm, text, unordered-containers, uuid
-     , websockets
+     , lens-aeson, mtl, stm, text, transformers, unordered-containers
+     , uuid, websockets
      }:
      mkDerivation {
        pname = "gremlin-haskell";
-       version = "0.1.0.1";
-       sha256 = "e73f628ffd27098147e51e301ab531ae01b964ddeaf4fa1104a508300cc15f8f";
+       version = "0.1.0.2";
+       sha256 = "3e33c59fb09c435d89c30fe7ae7dff88246f05d6ad43bd9fcf27c47bd68353aa";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson aeson-qq base containers lens mtl stm text uuid websockets
+         aeson aeson-qq base containers lens mtl stm text transformers uuid
+         websockets
        ];
        executableHaskellDepends = [
          aeson base lens lens-aeson mtl text unordered-containers
@@ -82170,6 +82359,7 @@ self: {
        homepage = "http://github.com/nakaji-dayo/gremlin-haskell";
        description = "Graph database client for TinkerPop3 Gremlin Server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "grid" = callPackage
@@ -85175,6 +85365,7 @@ self: {
        ];
        description = "Hackage and Portage integration tool";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hactor" = callPackage
@@ -86691,6 +86882,7 @@ self: {
        ];
        description = "Graphviz code generation with Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hapistrano" = callPackage
@@ -88771,6 +88963,7 @@ self: {
        homepage = "http://github.com/bennofs/haskell-generate/";
        description = "Typesafe generation of haskell source code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-gi" = callPackage
@@ -89005,6 +89198,7 @@ self: {
        homepage = "http://documentup.com/haskell-suite/haskell-names";
        description = "Name resolution library for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-neo4j-client_0_3_1_4" = callPackage
@@ -91018,8 +91212,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasql";
-       version = "0.15.0.2";
-       sha256 = "1264ebf39cd39977175f96f00c4330bbecd96882ac7463dd627b1e7cff3c9f52";
+       version = "0.15.1";
+       sha256 = "8eefdfca21975e215708126b805ee8ba1803e3e3ce32e5c29a1b3e5912ededf8";
        libraryHaskellDepends = [
          aeson attoparsec base base-prelude bytestring contravariant
          contravariant-extras data-default-class dlist either hashable
@@ -91038,37 +91232,6 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hasql_0_15_1" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring
-     , contravariant, contravariant-extras, data-default-class, dlist
-     , either, hashable, hashtables, loch-th, placeholders
-     , postgresql-binary, postgresql-libpq, profunctors, QuickCheck
-     , quickcheck-instances, scientific, tasty, tasty-hunit
-     , tasty-quickcheck, tasty-smallcheck, text, time, transformers
-     , uuid, vector
-     }:
-     mkDerivation {
-       pname = "hasql";
-       version = "0.15.1";
-       sha256 = "8eefdfca21975e215708126b805ee8ba1803e3e3ce32e5c29a1b3e5912ededf8";
-       libraryHaskellDepends = [
-         aeson attoparsec base base-prelude bytestring contravariant
-         contravariant-extras data-default-class dlist either hashable
-         hashtables loch-th placeholders postgresql-binary postgresql-libpq
-         profunctors scientific text time transformers uuid vector
-       ];
-       testHaskellDepends = [
-         base base-prelude bytestring contravariant contravariant-extras
-         data-default-class dlist either hashable profunctors QuickCheck
-         quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck
-         tasty-smallcheck text time transformers uuid vector
-       ];
-       homepage = "https://github.com/nikita-volkov/hasql";
-       description = "A very efficient PostgreSQL driver and a flexible mapping API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "hasql-backend_0_2_1" = callPackage
     ({ mkDerivation, base, base-prelude, bytestring, list-t, text
      , vector
@@ -91516,6 +91679,7 @@ self: {
        homepage = "https://github.com/nikita-volkov/hasql-postgres";
        description = "A \"PostgreSQL\" backend for the \"hasql\" library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hasql-postgres-options" = callPackage
@@ -91531,6 +91695,7 @@ self: {
        homepage = "https://github.com/nikita-volkov/hasql-postgres-options";
        description = "An \"optparse-applicative\" parser for \"hasql-postgres\"";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hasql-th" = callPackage
@@ -91782,6 +91947,7 @@ self: {
        homepage = "http://projects.haskell.org/hat/";
        description = "The Haskell tracer, generating and viewing Haskell execution traces";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hatex-guide" = callPackage
@@ -94746,6 +94912,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hi3status" = callPackage
+    ({ mkDerivation, aeson, base, binary, bytestring, dbus, dyre
+     , network, prefix-units, process, regex-pcre-builtin, text, time
+     , transformers, vector
+     }:
+     mkDerivation {
+       pname = "hi3status";
+       version = "0.1.1.0";
+       sha256 = "de4c03916349148592e2f3b92a26f5f0b315762b8af61cfe41b556f427a43366";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base binary bytestring dbus dyre network prefix-units process
+         regex-pcre-builtin text time transformers vector
+       ];
+       executableHaskellDepends = [ base dbus process ];
+       description = "Status line for i3bar";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hiccup" = callPackage
     ({ mkDerivation, base, bytestring, containers, haskell98, HUnit
      , mtl, parsec, random, readline, time
@@ -98601,6 +98787,7 @@ self: {
        homepage = "https://github.com/mgajda/homplexity";
        description = "Haskell code quality tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "honi" = callPackage
@@ -99475,8 +99662,8 @@ self: {
      }:
      mkDerivation {
        pname = "hops";
-       version = "0.4.0";
-       sha256 = "7683f48ef77af14236a5a4f65f5292504cd1db333f76df91aab84a18925287d6";
+       version = "0.4.1";
+       sha256 = "e28a457b5f75c3e375f17143244da60e7754c6948bb0f8826c6d5efcbcf07d49";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -99648,6 +99835,7 @@ self: {
        homepage = "http://github.com/luqui/hothasktags";
        description = "Generates ctags for Haskell, incorporating import lists and qualified imports";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hotswap" = callPackage
@@ -100837,6 +101025,7 @@ self: {
        ];
        description = "Utility to generate haskell-names interface files";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs-gizapp" = callPackage
@@ -101875,6 +102064,7 @@ self: {
        homepage = "https://github.com/bosu/hscope";
        description = "cscope like browser for Haskell code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hscrtmpl" = callPackage
@@ -104487,6 +104677,7 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit unix ];
        description = "Haskell bindings to libseccomp";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {seccomp = null;};
 
   "hsshellscript" = callPackage
@@ -104949,6 +105140,7 @@ self: {
          base base64-bytestring bytestring containers filepath hxt split
          zlib
        ];
+       jailbreak = true;
        description = "Import from the Tiled map editor";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -106493,8 +106685,8 @@ self: {
        pname = "http-conduit";
        version = "2.1.8";
        sha256 = "550d86ea9ee6dd90994a460c5c85ddc861fb5c0f007304dc4a2e2035f980ea3d";
-       revision = "1";
-       editedCabalFile = "281d76f2884547539aae5dbcd45997ae889d9f04f4bf55ff282937960ff256f1";
+       revision = "2";
+       editedCabalFile = "970d73310cb9628d120eaa029aac6b9dd8b79ce63e91959cce8ca26afa952c7f";
        libraryHaskellDepends = [
          base bytestring conduit http-client http-client-tls http-types
          lifted-base monad-control mtl resourcet transformers
@@ -106641,6 +106833,7 @@ self: {
        libraryHaskellDepends = [
          base bytestring HTTP iconv mime mtl parsec text utf8-string zlib
        ];
+       jailbreak = true;
        homepage = "http://github.com/achudnov/http-encodings";
        description = "A library for encoding and decoding bodies of HTTP messages";
        license = stdenv.lib.licenses.bsd3;
@@ -113909,6 +114102,7 @@ self: {
        homepage = "https://github.com/mtolly/jammittools";
        description = "Export sheet music and audio from Windows/Mac app Jammit";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jarfind" = callPackage
@@ -115571,6 +115765,7 @@ self: {
        homepage = "https://github.com/yuga/jsonschema-gen";
        description = "JSON Schema generator from Algebraic data type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jsonsql" = callPackage
@@ -116794,6 +116989,8 @@ self: {
        pname = "keter";
        version = "1.4.3.1";
        sha256 = "1111d0f97dc36e84c041f34176d652911a1e7b9c48943533835ac73ccf37582f";
+       revision = "1";
+       editedCabalFile = "197ee783d18b293bb5fbe286623ca588695ec2115a012c3547535702fafc571f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -117822,6 +118019,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Lambdabot is a development tool and advanced IRC bot";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-core" = callPackage
@@ -117848,6 +118046,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Lambdabot core functionality";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-haskell-plugins" = callPackage
@@ -117874,6 +118073,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Lambdabot Haskell plugins";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-irc-plugins" = callPackage
@@ -117892,6 +118092,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "IRC plugins for lambdabot";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-misc-plugins" = callPackage
@@ -117915,6 +118116,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Lambdabot miscellaneous plugins";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-novelty-plugins" = callPackage
@@ -117935,6 +118137,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Novelty plugins for Lambdabot";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-reference-plugins" = callPackage
@@ -117953,6 +118156,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Lambdabot reference plugins";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-social-plugins" = callPackage
@@ -117971,6 +118175,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Social plugins for Lambdabot";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-trusted" = callPackage
@@ -118315,13 +118520,17 @@ self: {
      }) {};
 
   "language-bash" = callPackage
-    ({ mkDerivation, base, parsec, pretty, transformers }:
+    ({ mkDerivation, base, parsec, pretty, process, QuickCheck, tasty
+     , tasty-quickcheck, transformers
+     }:
      mkDerivation {
        pname = "language-bash";
-       version = "0.6.0";
-       sha256 = "7a07f1713c7b5018e94b6b5e529feb8dd499f040a5ba4d7f00aee6471e4c0b1e";
+       version = "0.6.1";
+       sha256 = "7fb4fb293aec5f3c9b0e7ca2b99f895115d1bbe13f8dbfe02003560e3c063c8d";
        libraryHaskellDepends = [ base parsec pretty transformers ];
-       jailbreak = true;
+       testHaskellDepends = [
+         base parsec process QuickCheck tasty tasty-quickcheck
+       ];
        homepage = "http://github.com/knrafto/language-bash/";
        description = "Parsing and pretty-printing Bash shell scripts";
        license = stdenv.lib.licenses.bsd3;
@@ -124075,6 +124284,7 @@ self: {
        ];
        description = "Very simple poll lock";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lockfree-queue" = callPackage
@@ -125263,6 +125473,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lucid-svg_0_6_0_1" = callPackage
+    ({ mkDerivation, base, blaze-builder, lucid, text, transformers }:
+     mkDerivation {
+       pname = "lucid-svg";
+       version = "0.6.0.1";
+       sha256 = "a8cff758914de95defca5640a1f6c3ddf995078063fb8553da02249510db67cc";
+       libraryHaskellDepends = [
+         base blaze-builder lucid text transformers
+       ];
+       homepage = "http://github.com/jeffreyrosenbluth/lucid-svg.git";
+       description = "DSL for SVG using lucid for HTML";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lucienne" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-html, bson
      , bytestring, compact-string-fix, feed, happstack, happstack-server
@@ -125333,8 +125558,8 @@ self: {
      }:
      mkDerivation {
        pname = "luminance";
-       version = "0.9";
-       sha256 = "8bbee1483bca9a073a8ca7f4f1d3bec00f99c3d59bfa637702afda5a88eb2ada";
+       version = "0.9.1";
+       sha256 = "1b968fe815bf11c784474eead8f62ec1aefecfdc058fa99148867266669979dd";
        libraryHaskellDepends = [
          base containers contravariant dlist gl linear mtl resourcet
          semigroups transformers vector void
@@ -126928,7 +127153,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "mangopay" = callPackage
+  "mangopay_1_11_5" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, base16-bytestring
      , base64-bytestring, blaze-builder, bytestring, case-insensitive
      , conduit, conduit-extra, connection, country-codes, data-default
@@ -126966,6 +127191,47 @@ self: {
        homepage = "https://github.com/prowdsponsor/mangopay";
        description = "Bindings to the MangoPay API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "mangopay" = callPackage
+    ({ mkDerivation, aeson, async, attoparsec, base, base16-bytestring
+     , base64-bytestring, blaze-builder, bytestring, case-insensitive
+     , conduit, conduit-extra, connection, country-codes, data-default
+     , HTF, http-conduit, http-types, HUnit, lifted-base, monad-control
+     , monad-logger, resourcet, template-haskell, text, time, tls
+     , transformers, transformers-base, unordered-containers
+     , utf8-string, vector, wai, warp, x509-system
+     }:
+     mkDerivation {
+       pname = "mangopay";
+       version = "1.12";
+       sha256 = "859ea675506f505666857b1d694d57c0e34cc58cfd3b9da2c5216e78aff47f73";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson async attoparsec base base16-bytestring base64-bytestring
+         blaze-builder bytestring case-insensitive conduit conduit-extra
+         connection country-codes data-default http-conduit http-types HUnit
+         lifted-base monad-control monad-logger resourcet template-haskell
+         text time tls transformers transformers-base unordered-containers
+         utf8-string vector wai warp x509-system
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring http-conduit monad-logger text transformers
+       ];
+       testHaskellDepends = [
+         aeson async attoparsec base base16-bytestring base64-bytestring
+         blaze-builder bytestring case-insensitive conduit conduit-extra
+         connection country-codes data-default HTF http-conduit http-types
+         HUnit lifted-base monad-control monad-logger resourcet
+         template-haskell text time tls transformers transformers-base
+         unordered-containers utf8-string vector wai warp x509-system
+       ];
+       homepage = "https://github.com/prowdsponsor/mangopay";
+       description = "Bindings to the MangoPay API";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "manifold-random" = callPackage
@@ -128901,6 +129167,55 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "microlens_0_4_0_0" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "microlens";
+       version = "0.4.0.0";
+       sha256 = "6e01798e936ac52295b803c9bf3e9c7999f628c1f928e312b05ddf3787493d42";
+       libraryHaskellDepends = [ base ];
+       homepage = "http://github.com/aelve/microlens";
+       description = "A tiny part of the lens library with no dependencies";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "microlens-aeson" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, directory
+     , doctest, filepath, generic-deriving, microlens, scientific
+     , semigroups, simple-reflect, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "microlens-aeson";
+       version = "2.0.0";
+       sha256 = "2643285013e2709100e0e3ded10e3d1a1f4ab75faae604e36d37c2688d9c3743";
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring microlens scientific text
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         base directory doctest filepath generic-deriving semigroups
+         simple-reflect
+       ];
+       homepage = "http://github.com/fosskers/microlens-aeson/";
+       description = "Law-abiding lenses for Aeson, using microlens";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "microlens-contra" = callPackage
+    ({ mkDerivation, base, contravariant, microlens }:
+     mkDerivation {
+       pname = "microlens-contra";
+       version = "0.1.0.0";
+       sha256 = "27d58e82c94efa174507d30b3cd98cbb30591eed8f37fb772ba6915e66fd2567";
+       libraryHaskellDepends = [ base contravariant microlens ];
+       jailbreak = true;
+       homepage = "http://github.com/aelve/microlens";
+       description = "True folds and getters for microlens";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "microlens-each" = callPackage
     ({ mkDerivation, base, microlens }:
      mkDerivation {
@@ -128944,6 +129259,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "microlens-ghc_0_4_0_0" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, microlens }:
+     mkDerivation {
+       pname = "microlens-ghc";
+       version = "0.4.0.0";
+       sha256 = "d910ea55820f8a9175df750c2dec3ba09ce8f16005c970c396010350de66933c";
+       libraryHaskellDepends = [
+         array base bytestring containers microlens
+       ];
+       jailbreak = true;
+       homepage = "http://github.com/aelve/microlens";
+       description = "microlens + all features depending on packages coming with GHC (array, bytestring, containers)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "microlens-mtl_0_1_3_1" = callPackage
     ({ mkDerivation, base, microlens, mtl, transformers
      , transformers-compat
@@ -128995,6 +129326,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "microlens-mtl_0_1_6_1" = callPackage
+    ({ mkDerivation, base, microlens, mtl, transformers
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "microlens-mtl";
+       version = "0.1.6.1";
+       sha256 = "af2a9763a35ee85bb27a9ff14d7fe1f653407a96a35835f9d182cdfd532ef0c3";
+       libraryHaskellDepends = [
+         base microlens mtl transformers transformers-compat
+       ];
+       jailbreak = true;
+       homepage = "http://github.com/aelve/microlens";
+       description = "microlens support for Reader/Writer/State from mtl";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "microlens-platform" = callPackage
     ({ mkDerivation, base, hashable, microlens, microlens-ghc
      , microlens-mtl, microlens-th, text, unordered-containers, vector
@@ -129012,6 +129361,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "microlens-platform_0_2_0_0" = callPackage
+    ({ mkDerivation, base, hashable, microlens, microlens-ghc
+     , microlens-mtl, microlens-th, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "microlens-platform";
+       version = "0.2.0.0";
+       sha256 = "70554347be8b059376860a45f411c89fbd30c1e542a81cea763f0495ecc8823f";
+       libraryHaskellDepends = [
+         base hashable microlens microlens-ghc microlens-mtl microlens-th
+         text unordered-containers vector
+       ];
+       jailbreak = true;
+       homepage = "http://github.com/aelve/microlens";
+       description = "Feature-complete microlens";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "microlens-th_0_2_1_0" = callPackage
     ({ mkDerivation, base, containers, microlens, template-haskell }:
      mkDerivation {
@@ -129057,6 +129425,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "microlens-th_0_3_0_0" = callPackage
+    ({ mkDerivation, base, containers, microlens, template-haskell }:
+     mkDerivation {
+       pname = "microlens-th";
+       version = "0.3.0.0";
+       sha256 = "951eaf33daf3b648082f754a6c091a8401bad39f5d5f659bad22252fe214d866";
+       libraryHaskellDepends = [
+         base containers microlens template-haskell
+       ];
+       jailbreak = true;
+       homepage = "http://github.com/aelve/microlens";
+       description = "Automatic generation of record lenses for microlens";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "microtimer" = callPackage
     ({ mkDerivation, base, time }:
      mkDerivation {
@@ -129247,8 +129631,8 @@ self: {
      }:
      mkDerivation {
        pname = "mighttpd2";
-       version = "3.2.10";
-       sha256 = "b5d8b8a310598d952f3b4329808ef8211a6a0b224d66fcc18cef4f0a737d25f1";
+       version = "3.3.0";
+       sha256 = "cc39bcd4a08a4ea71c9bfb11f5ab70a7aee91e927885cc88f7e71104fdc71966";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -129263,6 +129647,7 @@ self: {
          transformers unix wai wai-app-file-cgi wai-logger warp
        ];
        testHaskellDepends = [ base hspec http-client ];
+       jailbreak = true;
        homepage = "http://www.mew.org/~kazu/proj/mighttpd/";
        description = "High performance web server on WAI/warp";
        license = stdenv.lib.licenses.bsd3;
@@ -133011,6 +133396,7 @@ self: {
        homepage = "http://www.cl.cam.ac.uk/~mbg28/";
        description = "Object-Oriented Programming in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "msi-kb-backlit" = callPackage
@@ -137481,12 +137867,16 @@ self: {
      }) {};
 
   "niagra" = callPackage
-    ({ mkDerivation, base, containers, mtl, text, transformers }:
+    ({ mkDerivation, base, containers, ghc-prim, mtl, text
+     , transformers
+     }:
      mkDerivation {
        pname = "niagra";
-       version = "0.1.0";
-       sha256 = "dd95efe3c72f07dc4e82ace01b13f26406dc0d40a476416dbbb0e6d77dcdcf7d";
-       libraryHaskellDepends = [ base containers mtl text transformers ];
+       version = "0.2.0";
+       sha256 = "ad2432ca574c5626a7340d09d37113670ae75e7db5e371469983db0676560d34";
+       libraryHaskellDepends = [
+         base containers ghc-prim mtl text transformers
+       ];
        homepage = "https://github.com/fhsjaagshs/niagra";
        description = "CSS EDSL for Haskell";
        license = stdenv.lib.licenses.mit;
@@ -139227,8 +139617,8 @@ self: {
     ({ mkDerivation, base, contravariant, ghc-prim, transformers }:
      mkDerivation {
        pname = "one-liner";
-       version = "0.5.1";
-       sha256 = "00ba698e3ac6ddec6b3b364bd13ddfac487380513dec5ab6017a5b817a646359";
+       version = "0.5.2";
+       sha256 = "9b2332118fd4e8ce127b11989b73af2a9812c98bbf1e2dfa762c718561b6df79";
        libraryHaskellDepends = [
          base contravariant ghc-prim transformers
        ];
@@ -140797,6 +141187,7 @@ self: {
        homepage = "http://github.com/nedervold/origami";
        description = "An un-SYB framework for transforming heterogenous data through folds";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "os-release" = callPackage
@@ -143540,7 +143931,7 @@ self: {
        homepage = "https://github.com/fanjam/paypal-adaptive-hoops";
        description = "Client for a limited part of PayPal's Adaptive Payments API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "paypal-api" = callPackage
@@ -146887,28 +147278,6 @@ self: {
      }) {};
 
   "pinch" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, deepseq
-     , hashable, hspec, hspec-discover, QuickCheck, text
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "pinch";
-       version = "0.1.0.2";
-       sha256 = "39add08af0cea1f818708fc69ecab07112b04aed575ab2724ced55e13ddf02ea";
-       libraryHaskellDepends = [
-         array base bytestring containers deepseq hashable text
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         base bytestring containers hspec hspec-discover QuickCheck text
-         unordered-containers vector
-       ];
-       homepage = "https://github.com/abhinav/pinch";
-       description = "An alternative implementation of Thrift for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pinch_0_2_0_0" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, deepseq
      , ghc-prim, hashable, hspec, hspec-discover, QuickCheck, text
      , unordered-containers, vector
@@ -146928,7 +147297,6 @@ self: {
        homepage = "https://github.com/abhinav/pinch";
        description = "An alternative implementation of Thrift for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pinchot" = callPackage
@@ -147928,6 +148296,7 @@ self: {
        ];
        description = "Interfacing pipes with foldl folds";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-vector" = callPackage
@@ -148287,6 +148656,7 @@ self: {
        ];
        description = "Remote monad for editing plists";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "plivo" = callPackage
@@ -149395,6 +149765,7 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs";
        description = "Binding to the Poppler";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gdk2 = null; inherit (pkgs) gdk_pixbuf; 
          inherit (pkgs.gnome) pango; inherit (pkgs) poppler;};
 
@@ -150188,58 +150559,48 @@ self: {
      }) {};
 
   "postgrest" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, base64-string, bcrypt
-     , bifunctors, blaze-builder, bytestring, case-insensitive, cassava
-     , containers, convertible, errors, hasql, hasql-backend
-     , hasql-postgres, heredoc, hlint, hspec, hspec-wai, hspec-wai-json
-     , HTTP, http-media, http-types, jwt, MissingH, mtl, network
-     , network-uri, optparse-applicative, packdeps, parsec, process
-     , QuickCheck, Ranged-sets, regex-base, regex-tdfa, resource-pool
-     , scientific, split, string-conversions, stringsearch, text, time
-     , transformers, unordered-containers, vector, wai, wai-cors
+    ({ mkDerivation, aeson, base, base64-string, bytestring
+     , case-insensitive, cassava, containers, errors, hasql
+     , hasql-backend, hasql-postgres, heredoc, hlint, hspec, hspec-wai
+     , hspec-wai-json, HTTP, http-types, jwt, MissingH
+     , optparse-applicative, packdeps, parsec, process, Ranged-sets
+     , regex-tdfa, safe, scientific, string-conversions, text, time
+     , transformers, unix, unordered-containers, vector, wai, wai-cors
      , wai-extra, wai-middleware-static, warp
      }:
      mkDerivation {
        pname = "postgrest";
-       version = "0.3.0.0";
-       sha256 = "be45f6e85d007ba52c389f12e8a68336008bdf5f16ff6e6d30606d6f27d3ccc6";
+       version = "0.3.0.2";
+       sha256 = "5ce3b9b85a51ca6cb3aecc9e1ba84047ab276915c1c0293d2bf91d252c4ee366";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base base64-string bcrypt bifunctors blaze-builder bytestring
-         case-insensitive cassava containers convertible errors hasql
-         hasql-backend hasql-postgres HTTP http-types jwt MissingH mtl
-         network network-uri optparse-applicative parsec Ranged-sets
-         regex-base regex-tdfa resource-pool scientific split
-         string-conversions stringsearch text time transformers
-         unordered-containers vector wai wai-cors wai-extra
-         wai-middleware-static warp
+         aeson base bytestring case-insensitive cassava containers errors
+         hasql hasql-backend hasql-postgres HTTP http-types jwt MissingH
+         optparse-applicative parsec Ranged-sets regex-tdfa safe scientific
+         string-conversions text time unordered-containers vector wai
+         wai-cors wai-extra wai-middleware-static
        ];
        executableHaskellDepends = [
-         aeson aeson-pretty base base64-string bcrypt bifunctors
-         blaze-builder bytestring case-insensitive cassava containers
-         convertible errors hasql hasql-backend hasql-postgres HTTP
-         http-types jwt MissingH mtl network network-uri
-         optparse-applicative parsec Ranged-sets regex-base regex-tdfa
-         resource-pool scientific split string-conversions stringsearch text
-         time transformers unordered-containers vector wai wai-cors
-         wai-extra wai-middleware-static warp
+         aeson base bytestring case-insensitive cassava containers errors
+         hasql hasql-backend hasql-postgres HTTP http-types jwt MissingH
+         optparse-applicative parsec Ranged-sets regex-tdfa safe scientific
+         string-conversions text time transformers unix unordered-containers
+         vector wai wai-cors wai-extra wai-middleware-static warp
        ];
        testHaskellDepends = [
-         aeson base base64-string bcrypt bifunctors blaze-builder bytestring
-         case-insensitive cassava containers convertible errors hasql
-         hasql-backend hasql-postgres heredoc hlint hspec hspec-wai
-         hspec-wai-json HTTP http-media http-types jwt MissingH mtl network
-         network-uri optparse-applicative packdeps parsec process QuickCheck
-         Ranged-sets regex-base regex-tdfa resource-pool scientific split
-         string-conversions stringsearch text time transformers
-         unordered-containers vector wai wai-cors wai-extra
-         wai-middleware-static warp
+         aeson base base64-string bytestring case-insensitive cassava
+         containers errors hasql hasql-backend hasql-postgres heredoc hlint
+         hspec hspec-wai hspec-wai-json HTTP http-types jwt MissingH
+         optparse-applicative packdeps parsec process Ranged-sets regex-tdfa
+         safe scientific string-conversions text time unordered-containers
+         vector wai wai-cors wai-extra wai-middleware-static
        ];
        jailbreak = true;
        homepage = "https://github.com/begriffs/postgrest";
        description = "REST API for any Postgres database";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postie" = callPackage
@@ -150533,6 +150894,7 @@ self: {
        ];
        description = "Predicative tries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "predicates" = callPackage
@@ -150912,6 +151274,7 @@ self: {
        jailbreak = true;
        description = "An HDBC connector for Presto";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prettify" = callPackage
@@ -153862,6 +154225,7 @@ self: {
        homepage = "https://github.com/ndmitchell/qed#readme";
        description = "Simple prover";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "qhull-simple" = callPackage
@@ -156274,6 +156638,7 @@ self: {
        homepage = "https://github.com/nikita-volkov/record-preprocessor";
        description = "Compiler preprocessor introducing a syntactic extension for anonymous records";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "record-syntax" = callPackage
@@ -156296,6 +156661,7 @@ self: {
        homepage = "https://github.com/nikita-volkov/record-syntax";
        description = "A library for parsing and processing the Haskell syntax sprinkled with anonymous records";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "records" = callPackage
@@ -156951,6 +157317,7 @@ self: {
        homepage = "https://github.com/ryantrinkle/reflex";
        description = "Higher-order Functional Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reflex-animation" = callPackage
@@ -156969,6 +157336,7 @@ self: {
        homepage = "https://github.com/saulzar/reflex-animation";
        description = "Continuous animations support for reflex";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reflex-dom" = callPackage
@@ -157033,6 +157401,7 @@ self: {
        homepage = "https://github.com/reflex-frp/reflex-gloss";
        description = "An reflex interface for gloss";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reflex-gloss-scene" = callPackage
@@ -157062,7 +157431,7 @@ self: {
        homepage = "https://github.com/saulzar/reflex-gloss-scene";
        description = "A simple scene-graph using reflex and gloss";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reflex-transformers" = callPackage
@@ -157080,6 +157449,7 @@ self: {
        homepage = "http://github.com/saulzar/reflex-transformers";
        description = "Collections and switchable Monad transformers for Reflex";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reform" = callPackage
@@ -157999,8 +158369,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-query";
-       version = "0.7.0.1";
-       sha256 = "eb186d8bc97fe48e1a4f8933a2a7a13f7e3269eaafa5c3eb6509cfb58cf53e8a";
+       version = "0.7.1.0";
+       sha256 = "04fbd9d0cfee03a299a9642d40470a8d6c89bc8163905ffa232dbd8499eb6c9d";
        libraryHaskellDepends = [
          array base bytestring containers dlist names-th persistable-record
          sql-words template-haskell text time time-locale-compat
@@ -160298,6 +160668,8 @@ self: {
        pname = "rest-wai";
        version = "0.2";
        sha256 = "92d7455c537d24c6d2ccadd9272cac385659ed2a828fbe20bca9249016897413";
+       revision = "1";
+       editedCabalFile = "66767f5908d25ffaeaf9f15ad093f57f88ed212638bbfb7ec23190ed77c133b4";
        libraryHaskellDepends = [
          base bytestring case-insensitive containers http-types mime-types
          mtl rest-core text unordered-containers wai
@@ -163882,6 +164254,7 @@ self: {
        homepage = "http://github.com/JPMoresmau/scion-class-browser";
        description = "Command-line interface for browsing and searching packages documentation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scons2dot" = callPackage
@@ -166783,18 +167156,23 @@ self: {
      }) {};
 
   "servant-swagger" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, hashable
-     , lens, servant, text, unordered-containers, uuid
+    ({ mkDerivation, aeson, aeson-qq, base, bytestring, hspec
+     , http-media, lens, servant, swagger2, text, time
+     , unordered-containers
      }:
      mkDerivation {
        pname = "servant-swagger";
-       version = "0.0.0.1";
-       sha256 = "7c9b93912cc6aa617b4d068624c3b927f58f8dfb3f153c8be51c7fc5c22c0b4e";
+       version = "0.1";
+       sha256 = "ee47a6f51afb029abe1add54a1f579340ec48e5b816b592d1b976d0bdfd8346e";
        libraryHaskellDepends = [
-         aeson base bytestring containers hashable lens servant text
-         unordered-containers uuid
+         aeson base bytestring http-media lens servant swagger2 text
+         unordered-containers
        ];
-       description = "Swagger";
+       testHaskellDepends = [
+         aeson aeson-qq base hspec lens servant swagger2 text time
+       ];
+       homepage = "https://github.com/dmjio/servant-swagger";
+       description = "Generate Swagger specification for your servant API";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -166885,6 +167263,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "serversession-backend-acid-state_1_0_3" = callPackage
+    ({ mkDerivation, acid-state, base, containers, hspec, mtl, safecopy
+     , serversession, unordered-containers
+     }:
+     mkDerivation {
+       pname = "serversession-backend-acid-state";
+       version = "1.0.3";
+       sha256 = "005317d6b31500738979d5affc858c5d2642dc86122b360c28a0737aac2a7ce6";
+       libraryHaskellDepends = [
+         acid-state base containers mtl safecopy serversession
+         unordered-containers
+       ];
+       testHaskellDepends = [
+         acid-state base containers hspec mtl safecopy serversession
+         unordered-containers
+       ];
+       homepage = "https://github.com/yesodweb/serversession";
+       description = "Storage backend for serversession using acid-state";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "serversession-backend-persistent" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal
      , hspec, monad-logger, path-pieces, persistent
@@ -166912,6 +167312,34 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "serversession-backend-persistent_1_0_2" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal
+     , hspec, monad-logger, path-pieces, persistent
+     , persistent-postgresql, persistent-sqlite, persistent-template
+     , QuickCheck, resource-pool, serversession, tagged, text, time
+     , transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "serversession-backend-persistent";
+       version = "1.0.2";
+       sha256 = "19dfb2c55d64168e3fa2ceb6476ac55c67e69a750e0a39b400d9b3b0fbd3be4b";
+       libraryHaskellDepends = [
+         aeson base base64-bytestring bytestring cereal path-pieces
+         persistent serversession tagged text time transformers
+         unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base base64-bytestring bytestring cereal hspec monad-logger
+         path-pieces persistent persistent-postgresql persistent-sqlite
+         persistent-template QuickCheck resource-pool serversession text
+         time transformers unordered-containers
+       ];
+       homepage = "https://github.com/yesodweb/serversession";
+       description = "Storage backend for serversession using persistent and an RDBMS";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "serversession-backend-redis" = callPackage
     ({ mkDerivation, base, bytestring, hedis, hspec, path-pieces
      , serversession, tagged, text, time, transformers
@@ -166935,6 +167363,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "serversession-backend-redis_1_0_1" = callPackage
+    ({ mkDerivation, base, bytestring, hedis, hspec, path-pieces
+     , serversession, tagged, text, time, transformers
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "serversession-backend-redis";
+       version = "1.0.1";
+       sha256 = "b4b30860fa2e431fd7101b3fb5541e7a687bce71886ca164564c35fbf104af4f";
+       libraryHaskellDepends = [
+         base bytestring hedis path-pieces serversession tagged text time
+         transformers unordered-containers
+       ];
+       testHaskellDepends = [
+         base bytestring hedis hspec path-pieces serversession text time
+         transformers unordered-containers
+       ];
+       homepage = "https://github.com/yesodweb/serversession";
+       description = "Storage backend for serversession using Redis";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "serversession-frontend-snap" = callPackage
     ({ mkDerivation, base, bytestring, nonce, path-pieces
      , serversession, snap, snap-core, text, time, transformers
@@ -166998,8 +167449,8 @@ self: {
        pname = "servius";
        version = "1.2.0.1";
        sha256 = "3839d725b5b01be2baf46bb93a5c3090494a43aefa09e2a300a7e96b826f9a01";
-       revision = "1";
-       editedCabalFile = "febebdf7c47660c5f61502b7537258d4fad717fd9ef6668c7e5d196450b2fba1";
+       revision = "2";
+       editedCabalFile = "9f2fe5d7ad9f90e4314675f47634a41ba37a14746c0b72d576323d672f1ca580";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -167283,6 +167734,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "sexp-grammar" = callPackage
+    ({ mkDerivation, array, base, containers, mtl, QuickCheck
+     , scientific, semigroups, split, stack-prism, tasty, tasty-hunit
+     , tasty-quickcheck, template-haskell, text, wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "sexp-grammar";
+       version = "1.0.0";
+       sha256 = "e90495a6fd7993cd4f943a5a9e2759304a9f055a8cea0c2bc2f94645bc150a1e";
+       libraryHaskellDepends = [
+         array base containers mtl scientific semigroups split stack-prism
+         template-haskell text wl-pprint-text
+       ];
+       testHaskellDepends = [
+         base QuickCheck scientific semigroups stack-prism tasty tasty-hunit
+         tasty-quickcheck
+       ];
+       homepage = "https://github.com/esmolanka/sexp-grammar";
+       description = "Invertible parsers for S-expressions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "sexp-show" = callPackage
     ({ mkDerivation, base, pretty-show }:
      mkDerivation {
@@ -170329,7 +170803,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "skein" = callPackage
+  "skein_1_0_9_3" = callPackage
     ({ mkDerivation, base, bytestring, cereal, crypto-api, filepath
      , hspec, tagged
      }:
@@ -170346,6 +170820,26 @@ self: {
        homepage = "https://github.com/meteficha/skein";
        description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "skein" = callPackage
+    ({ mkDerivation, base, bytestring, cereal, crypto-api, filepath
+     , hspec, tagged
+     }:
+     mkDerivation {
+       pname = "skein";
+       version = "1.0.9.4";
+       sha256 = "f882ca0cc5ed336ef898fb3c89579e392900259296b2320edf968b9fc16cb8c9";
+       libraryHaskellDepends = [
+         base bytestring cereal crypto-api tagged
+       ];
+       testHaskellDepends = [
+         base bytestring cereal crypto-api filepath hspec tagged
+       ];
+       homepage = "https://github.com/meteficha/skein";
+       description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well.";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "skeleton" = callPackage
@@ -172217,6 +172711,7 @@ self: {
        homepage = "https://github.com/mikeplus64/snaplet-hasql";
        description = "A Hasql snaplet";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-haxl" = callPackage
@@ -172697,6 +173192,7 @@ self: {
        homepage = "https://github.com/nurpax/snaplet-sqlite-simple";
        description = "sqlite-simple snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-stripe" = callPackage
@@ -173753,16 +174249,18 @@ self: {
 
   "spatial-math" = callPackage
     ({ mkDerivation, base, binary, cereal, doctest, ghc-prim, lens
-     , linear
+     , linear, QuickCheck, test-framework, test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "spatial-math";
-       version = "0.2.4.0";
-       sha256 = "7bcb1ca70702e6b66accab8a20eaa02e737989924214d3cc89f1f89c3262da2b";
+       version = "0.2.5.0";
+       sha256 = "3fbdac29649d0bba318766e271eab808732acd529667c4a9f064aab2858d3ef8";
        libraryHaskellDepends = [
          base binary cereal ghc-prim lens linear
        ];
-       testHaskellDepends = [ base doctest ];
+       testHaskellDepends = [
+         base doctest QuickCheck test-framework test-framework-quickcheck2
+       ];
        description = "3d math including quaternions/euler angles/dcms and utility functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -174634,6 +175132,7 @@ self: {
        homepage = "http://functionalley.eu/Squeeze/squeeze.html";
        description = "A file-packing application";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sr-extra" = callPackage
@@ -179723,8 +180222,8 @@ self: {
      }:
      mkDerivation {
        pname = "swagger2";
-       version = "1.0";
-       sha256 = "04ccac8d97cac4a4673151a751a813de7fd6f948b0f98f9b23f447016c19021d";
+       version = "1.1.1";
+       sha256 = "bb441e8c160db9fe91ff62cc14b36ecfce683cd033a61aef7700acf763a526aa";
        libraryHaskellDepends = [
          aeson base containers hashable http-media lens mtl network
          scientific text time unordered-containers
@@ -180141,6 +180640,7 @@ self: {
        homepage = "https://github.com/jetho/syncthing-hs";
        description = "Haskell bindings for the Syncthing REST API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "synt" = callPackage
@@ -185038,6 +185538,7 @@ self: {
        homepage = "https://github.com/seereason/th-context";
        description = "Test instance context";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-desugar_1_4_2" = callPackage
@@ -185543,8 +186044,8 @@ self: {
      }:
      mkDerivation {
        pname = "th-typegraph";
-       version = "0.31";
-       sha256 = "b78d39424245b1493e2b693971d960123b09aca45e0c389be588eb473672704a";
+       version = "0.32";
+       sha256 = "a01b758d99f95fa012c8266bb3c083a77c022a95fc86bdfcde493888e4bea3c5";
        libraryHaskellDepends = [
          base base-compat containers data-default haskell-src-exts lens mtl
          mtl-unleashed set-extra syb template-haskell th-desugar th-orphans
@@ -185585,6 +186086,7 @@ self: {
        homepage = "http://github.com/pjones/themoviedb";
        description = "Haskell API bindings for http://themoviedb.org";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "themplate" = callPackage
@@ -189671,6 +190173,7 @@ self: {
        homepage = "https://github.com/himura/twitter-conduit";
        description = "Twitter API package with conduit interface and Streaming API support";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twitter-enumerator" = callPackage
@@ -189781,6 +190284,7 @@ self: {
        homepage = "https://github.com/himura/twitter-types";
        description = "Twitter JSON parser and types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twitter-types-lens" = callPackage
@@ -189797,6 +190301,7 @@ self: {
        homepage = "https://github.com/himura/twitter-types-lens";
        description = "Twitter JSON types (lens powered)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tx" = callPackage
@@ -191206,8 +191711,8 @@ self: {
      }:
      mkDerivation {
        pname = "unbreak";
-       version = "0.3.0";
-       sha256 = "63de23dd0adf5183498b6ba37efe5bc867d935b5a56b839d4ae553d8918ec91c";
+       version = "0.3.1";
+       sha256 = "463b65c79e7d4edac74d23bf10d61956ee6f30ebe1c373624d1583dfcb841286";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -191215,7 +191720,8 @@ self: {
          cryptonite memory process text unix
        ];
        executableHaskellDepends = [ base bytestring cmdargs ];
-       description = "Secure editing of remote documents with unstable connection";
+       homepage = "https://e.xtendo.org/scs/unbreak";
+       description = "Secure and resilient remote file storage utility";
        license = stdenv.lib.licenses.agpl3;
      }) {};
 
@@ -191236,8 +191742,8 @@ self: {
      }:
      mkDerivation {
        pname = "unfoldable";
-       version = "0.8.2";
-       sha256 = "51e42a450f794ffcd28517bb4f5e519020a5975b316bfc3b388a8a28aa73d264";
+       version = "0.8.3";
+       sha256 = "62926d1f12db96468ca2c9c7e55cb63201c62d97c7486ef30a62a910893e2ddd";
        libraryHaskellDepends = [
          base ghc-prim QuickCheck random transformers
        ];
@@ -191848,6 +192354,8 @@ self: {
        pname = "unix";
        version = "2.7.1.0";
        sha256 = "6bd4e6013855541535a1317197aa6a11e7f24ba0e4dd64a8b7fcfd40b5a4e45c";
+       revision = "1";
+       editedCabalFile = "ee3232af128d50f0b51e8ee786cd928399371d13942581da1bc73232d8f6d802";
        libraryHaskellDepends = [ base bytestring time ];
        homepage = "https://github.com/haskell/unix";
        description = "POSIX functionality";
@@ -192253,14 +192761,13 @@ self: {
      }:
      mkDerivation {
        pname = "uom-plugin";
-       version = "0.1.1.0";
-       sha256 = "3d019d48c8172bf17acb5d5562a5394731c301df655a24f521f60e49ebab2554";
+       version = "0.2.0.0";
+       sha256 = "c9eb1b27d940f7ce7ff2850f5f9c5bc2a5b23d472c8bcfaca0aec6a8b1c72daf";
        libraryHaskellDepends = [
          base containers deepseq ghc ghc-tcplugins-extra template-haskell
          units-parser
        ];
        testHaskellDepends = [ base tasty tasty-hunit ];
-       jailbreak = true;
        homepage = "https://github.com/adamgundry/uom-plugin";
        description = "Units of measure as a GHC typechecker plugin";
        license = stdenv.lib.licenses.bsd3;
@@ -195128,6 +195635,7 @@ self: {
        homepage = "http://github.com/pjones/vimeta";
        description = "Frontend for video metadata tagging tools";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vimus" = callPackage
@@ -195289,8 +195797,8 @@ self: {
     ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "visibility";
-       version = "0.1.0.0";
-       sha256 = "bdac4ba5246e3a1e8759d3c0d886f0671e3baf962479e67b44888412a9dd7784";
+       version = "0.1.0.1";
+       sha256 = "5218ceb6f0e6e396a67721e88f00392f9348f59ade898f1a07bee08f920bc434";
        libraryHaskellDepends = [ base containers ];
        homepage = "https://github.com/LukaHorvat/visibility";
        description = "Simple computation of visibility polygons";
@@ -195537,6 +196045,7 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the VTE library";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.gnome) vte;};
 
   "vtegtk3" = callPackage
@@ -195819,6 +196328,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "wai_3_2_0" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring
+     , bytestring-builder, hspec, http-types, network, text
+     , transformers, vault
+     }:
+     mkDerivation {
+       pname = "wai";
+       version = "3.2.0";
+       sha256 = "7f8e6903de20d64251657fdaba77c798249b6ddbe358cdb5eb277c1193467c9a";
+       libraryHaskellDepends = [
+         base blaze-builder bytestring bytestring-builder http-types network
+         text transformers vault
+       ];
+       testHaskellDepends = [ base blaze-builder bytestring hspec ];
+       homepage = "https://github.com/yesodweb/wai";
+       description = "Web Application Interface";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wai-accept-language" = callPackage
     ({ mkDerivation, base, bytestring, file-embed, http-types, text
      , wai, wai-app-static, wai-extra, warp, word8
@@ -195851,8 +196380,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-app-file-cgi";
-       version = "3.0.9";
-       sha256 = "947a818500ef5b1f2c1868d15a6a1054a3abb9e83ddfcacfb0d66d4e78ea308d";
+       version = "3.1.0";
+       sha256 = "fef1e40473f5d2a3355f8160c88f1626c0c90ca04e0bc5d57a06747384ab5a92";
        libraryHaskellDepends = [
          array attoparsec attoparsec-conduit base blaze-builder blaze-html
          bytestring case-insensitive conduit conduit-extra containers
@@ -195865,6 +196394,7 @@ self: {
          base bytestring conduit conduit-extra directory doctest filepath
          hspec HTTP http-types unix wai warp
        ];
+       jailbreak = true;
        homepage = "http://www.mew.org/~kazu/proj/mighttpd/";
        description = "File/CGI/Rev Proxy App of WAI";
        license = stdenv.lib.licenses.bsd3;
@@ -196201,7 +196731,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "wai-app-static" = callPackage
+  "wai-app-static_3_1_4" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-builder, blaze-html
      , blaze-markup, byteable, bytestring, containers, cryptohash
      , cryptohash-conduit, directory, file-embed, filepath, hspec
@@ -196235,6 +196765,43 @@ self: {
        homepage = "http://www.yesodweb.com/book/web-application-interface";
        description = "WAI application for static serving";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "wai-app-static" = callPackage
+    ({ mkDerivation, base, base64-bytestring, blaze-builder, blaze-html
+     , blaze-markup, byteable, bytestring, containers, cryptohash
+     , cryptohash-conduit, directory, file-embed, filepath, hspec
+     , http-date, http-types, mime-types, network, old-locale
+     , optparse-applicative, template-haskell, temporary, text, time
+     , transformers, unix-compat, unordered-containers, wai, wai-extra
+     , warp, zlib
+     }:
+     mkDerivation {
+       pname = "wai-app-static";
+       version = "3.1.4.1";
+       sha256 = "7280e15192be2d80b2505da152ea828c448e1466401fc4a02e87052ce3515bd4";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base base64-bytestring blaze-builder blaze-html blaze-markup
+         byteable bytestring containers cryptohash cryptohash-conduit
+         directory file-embed filepath http-date http-types mime-types
+         old-locale optparse-applicative template-haskell text time
+         transformers unix-compat unordered-containers wai wai-extra warp
+         zlib
+       ];
+       executableHaskellDepends = [
+         base bytestring containers directory mime-types text
+       ];
+       testHaskellDepends = [
+         base bytestring filepath hspec http-date http-types mime-types
+         network old-locale temporary text time transformers unix-compat wai
+         wai-extra zlib
+       ];
+       homepage = "http://www.yesodweb.com/book/web-application-interface";
+       description = "WAI application for static serving";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "wai-conduit_3_0_0_1" = callPackage
@@ -196254,7 +196821,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "wai-conduit" = callPackage
+  "wai-conduit_3_0_0_2" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, conduit
      , http-types, transformers, wai
      }:
@@ -196268,6 +196835,23 @@ self: {
        homepage = "https://github.com/yesodweb/wai";
        description = "conduit wrappers for WAI";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "wai-conduit" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring, conduit
+     , http-types, transformers, wai
+     }:
+     mkDerivation {
+       pname = "wai-conduit";
+       version = "3.0.0.3";
+       sha256 = "e49720a7c7b58e78a56991e42fa550a722936af274dc27755a735781258f7aff";
+       libraryHaskellDepends = [
+         base blaze-builder bytestring conduit http-types transformers wai
+       ];
+       homepage = "https://github.com/yesodweb/wai";
+       description = "conduit wrappers for WAI";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "wai-cors_0_2_3" = callPackage
@@ -196852,7 +197436,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "wai-extra" = callPackage
+  "wai-extra_3_0_13" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
      , blaze-builder, bytestring, case-insensitive, containers, cookie
      , data-default-class, deepseq, directory, fast-logger, hspec
@@ -196879,6 +197463,36 @@ self: {
        homepage = "http://github.com/yesodweb/wai";
        description = "Provides some basic WAI handlers and middleware";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "wai-extra" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
+     , blaze-builder, bytestring, case-insensitive, containers, cookie
+     , data-default-class, deepseq, directory, fast-logger, hspec
+     , http-types, HUnit, iproute, lifted-base, network, old-locale
+     , resourcet, streaming-commons, stringsearch, text, time
+     , transformers, unix, unix-compat, vault, void, wai, wai-logger
+     , word8, zlib
+     }:
+     mkDerivation {
+       pname = "wai-extra";
+       version = "3.0.13.1";
+       sha256 = "37540b32387929716922be563238fe29c4db2c820356cc9b27d9ab1554300756";
+       libraryHaskellDepends = [
+         aeson ansi-terminal base base64-bytestring blaze-builder bytestring
+         case-insensitive containers cookie data-default-class deepseq
+         directory fast-logger http-types iproute lifted-base network
+         old-locale resourcet streaming-commons stringsearch text time
+         transformers unix unix-compat vault void wai wai-logger word8 zlib
+       ];
+       testHaskellDepends = [
+         base blaze-builder bytestring case-insensitive cookie fast-logger
+         hspec http-types HUnit resourcet text time transformers wai zlib
+       ];
+       homepage = "http://github.com/yesodweb/wai";
+       description = "Provides some basic WAI handlers and middleware";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "wai-frontend-monadcgi" = callPackage
@@ -196887,8 +197501,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-frontend-monadcgi";
-       version = "3.0.0.1";
-       sha256 = "526feb9b37c9f06a4c433f716c3b691a06ab90c726930768a33b45c7dc9c143c";
+       version = "3.0.0.2";
+       sha256 = "c3e01b29a1a1c2a0934adc7e0c208454be525b2da1303a8b86391aa70c8ddc91";
        libraryHaskellDepends = [
          base bytestring case-insensitive cgi containers http-types
          transformers wai
@@ -196938,8 +197552,8 @@ self: {
     ({ mkDerivation, base, bytestring, fcgi, wai, wai-extra }:
      mkDerivation {
        pname = "wai-handler-fastcgi";
-       version = "3.0.0.1";
-       sha256 = "3bf0b346b5facc626a8cd1c46abc1a10242575bc91f56943eb720401d74e9592";
+       version = "3.0.0.2";
+       sha256 = "b555badd0fcae6519eb6f52dc0579d6a6ec4964aadf8b725bab8501cf7f473df";
        libraryHaskellDepends = [ base bytestring wai wai-extra ];
        librarySystemDepends = [ fcgi ];
        homepage = "http://www.yesodweb.com/book/web-application-interface";
@@ -196965,7 +197579,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "wai-handler-launch" = callPackage
+  "wai-handler-launch_3_0_0_4" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, http-types
      , process, streaming-commons, transformers, wai, warp
      }:
@@ -196979,6 +197593,23 @@ self: {
        ];
        description = "Launch a web app in the default browser";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "wai-handler-launch" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring, http-types
+     , process, streaming-commons, transformers, wai, warp
+     }:
+     mkDerivation {
+       pname = "wai-handler-launch";
+       version = "3.0.0.5";
+       sha256 = "768eee5028d2ebf8684fb01ee064f8034c9c5c0f7b4e7a4a503d0b7f08df1227";
+       libraryHaskellDepends = [
+         base blaze-builder bytestring http-types process streaming-commons
+         transformers wai warp
+       ];
+       description = "Launch a web app in the default browser";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "wai-handler-scgi" = callPackage
@@ -197017,8 +197648,8 @@ self: {
     ({ mkDerivation, base, QtWebKit, wai, warp }:
      mkDerivation {
        pname = "wai-handler-webkit";
-       version = "3.0.0.2";
-       sha256 = "9afd5ac9b886b3c2640c57f2d01577785da7a77ba45314f16c24e66c6f89ed78";
+       version = "3.0.0.3";
+       sha256 = "08609d9bd78fafc130fc231b532a64b8292fb1700ab2ba3ee3cc96d45e4f5983";
        libraryHaskellDepends = [ base wai warp ];
        libraryPkgconfigDepends = [ QtWebKit ];
        homepage = "https://github.com/yesodweb/wai/tree/master/wai-handler-webkit";
@@ -197914,16 +198545,16 @@ self: {
      , case-insensitive, containers, cookie, data-default-class
      , filepath, hspec, hspec-wai, hspec-wai-json, http-types
      , mime-types, monad-loops, mtl, path-pieces, random
-     , template-haskell, text, wai, wai-app-static, wai-extra
+     , template-haskell, text, vault, wai, wai-app-static, wai-extra
      }:
      mkDerivation {
        pname = "wai-routes";
-       version = "0.9.3";
-       sha256 = "67e2db99c012e31210b50170e29041dfac3c6bb190d6a1bdfc1ed4c06b428915";
+       version = "0.9.4";
+       sha256 = "b8c28e1209efd4a45ec90c027cd50a3a415cb6431b3490ce68c79a3bcbde007c";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring case-insensitive containers
          cookie data-default-class filepath http-types mime-types
-         monad-loops mtl path-pieces random template-haskell text wai
+         monad-loops mtl path-pieces random template-haskell text vault wai
          wai-app-static wai-extra
        ];
        testHaskellDepends = [
@@ -198317,7 +198948,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "wai-websockets" = callPackage
+  "wai-websockets_3_0_0_7" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive
      , file-embed, http-types, network, text, transformers, wai
      , wai-app-static, warp, websockets
@@ -198340,6 +198971,32 @@ self: {
        homepage = "http://github.com/yesodweb/wai";
        description = "Provide a bridge between WAI and the websockets package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "wai-websockets" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive
+     , file-embed, http-types, network, text, transformers, wai
+     , wai-app-static, warp, websockets
+     }:
+     mkDerivation {
+       pname = "wai-websockets";
+       version = "3.0.0.8";
+       sha256 = "353c324bbc26920d8f3adddc415f0d2a7cb01b89230dc95707fb19a74bf8a842";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base blaze-builder bytestring case-insensitive http-types network
+         transformers wai websockets
+       ];
+       executableHaskellDepends = [
+         base blaze-builder bytestring case-insensitive file-embed
+         http-types network text transformers wai wai-app-static warp
+         websockets
+       ];
+       homepage = "http://github.com/yesodweb/wai";
+       description = "Provide a bridge between WAI and the websockets package";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "wait-handle" = callPackage
@@ -199129,6 +199786,39 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "warp_3_2_0" = callPackage
+    ({ mkDerivation, array, async, auto-update, base, blaze-builder
+     , bytestring, bytestring-builder, case-insensitive, containers
+     , directory, doctest, ghc-prim, hashable, hspec, HTTP, http-date
+     , http-types, http2, HUnit, iproute, lifted-base, network, process
+     , QuickCheck, simple-sendfile, stm, streaming-commons, text, time
+     , transformers, unix, unix-compat, vault, wai, word8
+     }:
+     mkDerivation {
+       pname = "warp";
+       version = "3.2.0";
+       sha256 = "a0e3d41261d6842e1e58371a2013f1e5ea942fea78b51fafd6cb14c62b874355";
+       libraryHaskellDepends = [
+         array auto-update base blaze-builder bytestring bytestring-builder
+         case-insensitive containers ghc-prim hashable http-date http-types
+         http2 iproute network simple-sendfile stm streaming-commons text
+         unix unix-compat vault wai word8
+       ];
+       testHaskellDepends = [
+         array async auto-update base blaze-builder bytestring
+         bytestring-builder case-insensitive containers directory doctest
+         ghc-prim hashable hspec HTTP http-date http-types http2 HUnit
+         iproute lifted-base network process QuickCheck simple-sendfile stm
+         streaming-commons text time transformers unix unix-compat vault wai
+         word8
+       ];
+       jailbreak = true;
+       homepage = "http://github.com/yesodweb/wai";
+       description = "A fast, light-weight web server for WAI applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "warp-dynamic" = callPackage
     ({ mkDerivation, base, data-default, dyre, http-types, wai, warp }:
      mkDerivation {
@@ -199468,6 +200158,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "warp-tls_3_2_0" = callPackage
+    ({ mkDerivation, base, bytestring, cprng-aes, data-default-class
+     , network, streaming-commons, tls, wai, warp
+     }:
+     mkDerivation {
+       pname = "warp-tls";
+       version = "3.2.0";
+       sha256 = "1751b8fc4e24c909ed94db39a2aa20048e694ddf6e68c4acbdfe8924773f3dd8";
+       libraryHaskellDepends = [
+         base bytestring cprng-aes data-default-class network
+         streaming-commons tls wai warp
+       ];
+       jailbreak = true;
+       homepage = "http://github.com/yesodweb/wai";
+       description = "HTTP over TLS support for Warp via the TLS package";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "warp-tls-uid" = callPackage
     ({ mkDerivation, base, bytestring, certificate, conduit
      , crypto-random, http-types, network, network-conduit, pem, tls
@@ -199932,7 +200641,7 @@ self: {
      }) {};
 
   "webapp" = callPackage
-    ({ mkDerivation, alex, attoparsec, base, base16-bytestring, bcrypt
+    ({ mkDerivation, alex, attoparsec, base, base16-bytestring
      , blaze-builder, bytestring, cryptohash, css-text, data-default
      , directory, filepath, fsnotify, happy, hashtables, hjsmin
      , http-types, mime-types, mtl, network, optparse-applicative
@@ -199941,12 +200650,10 @@ self: {
      }:
      mkDerivation {
        pname = "webapp";
-       version = "0.1.0";
-       sha256 = "e7c3f6ebbd9f254f8d9323e240a6029bafcbb0c2e86e4d7a8f45e42255704a3f";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.1.2";
+       sha256 = "90d46c20134075352f6626509d01bd51d6862ef6c4509e524f299205e1063d0c";
        libraryHaskellDepends = [
-         attoparsec base base16-bytestring bcrypt blaze-builder bytestring
+         attoparsec base base16-bytestring blaze-builder bytestring
          cryptohash css-text data-default directory filepath fsnotify
          hashtables hjsmin http-types mime-types mtl network
          optparse-applicative scotty stm streaming-commons text time
@@ -199954,10 +200661,6 @@ self: {
          zlib
        ];
        libraryToolDepends = [ alex happy ];
-       executableHaskellDepends = [
-         base bytestring http-types optparse-applicative scotty text
-         transformers
-       ];
        jailbreak = true;
        homepage = "https://github.com/fhsjaagshs/webapp";
        description = "Haskell web scaffolding using Scotty, WAI, and Warp";
@@ -201511,6 +202214,7 @@ self: {
        homepage = "https://github.com/swift-nav/wolf";
        description = "Amazon Simple Workflow Service Wrapper";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "woot" = callPackage
@@ -203126,7 +203830,7 @@ self: {
        testHaskellDepends = [ base unix ];
        description = "Haskell bindings for libxkbcommon";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libxkbcommon;};
 
   "xkcd" = callPackage
@@ -207844,7 +208548,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-bin" = callPackage
+  "yesod-bin_1_4_16_1" = callPackage
     ({ mkDerivation, async, attoparsec, base, base64-bytestring
      , blaze-builder, bytestring, Cabal, conduit, conduit-extra
      , containers, data-default-class, deepseq, directory, file-embed
@@ -207875,6 +208579,40 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "The yesod helper executable";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "yesod-bin" = callPackage
+    ({ mkDerivation, async, attoparsec, base, base64-bytestring
+     , blaze-builder, bytestring, Cabal, conduit, conduit-extra
+     , containers, data-default-class, deepseq, directory, file-embed
+     , filepath, fsnotify, ghc, ghc-paths, http-client, http-conduit
+     , http-reverse-proxy, http-types, lifted-base, network
+     , optparse-applicative, parsec, process, project-template
+     , resourcet, shakespeare, split, streaming-commons, tar
+     , template-haskell, text, time, transformers, transformers-compat
+     , unix-compat, unordered-containers, wai, wai-extra, warp, warp-tls
+     , yaml, zlib
+     }:
+     mkDerivation {
+       pname = "yesod-bin";
+       version = "1.4.17";
+       sha256 = "bc5721479fb3aaa40153c092b899ccd99b18449a48154eb3a1bc5d8b5518dbb7";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         async attoparsec base base64-bytestring blaze-builder bytestring
+         Cabal conduit conduit-extra containers data-default-class deepseq
+         directory file-embed filepath fsnotify ghc ghc-paths http-client
+         http-conduit http-reverse-proxy http-types lifted-base network
+         optparse-applicative parsec process project-template resourcet
+         shakespeare split streaming-commons tar template-haskell text time
+         transformers transformers-compat unix-compat unordered-containers
+         wai wai-extra warp warp-tls yaml zlib
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "The yesod helper executable";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "yesod-bootstrap" = callPackage
@@ -209341,7 +210079,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-mangopay" = callPackage
+  "yesod-mangopay_1_11_5" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, conduit-extra
      , containers, country-codes, data-default, directory, fast-logger
      , hamlet, hjsmin, http-conduit, http-types, lifted-base, mangopay
@@ -209374,6 +210112,42 @@ self: {
        homepage = "https://github.com/prowdsponsor/mangopay";
        description = "Yesod library for MangoPay API access";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "yesod-mangopay" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, conduit, conduit-extra
+     , containers, country-codes, data-default, directory, fast-logger
+     , hamlet, hjsmin, http-conduit, http-types, lifted-base, mangopay
+     , monad-control, monad-logger, persistent, persistent-postgresql
+     , persistent-template, resourcet, shakespeare, template-haskell
+     , text, time, wai, wai-extra, wai-logger, warp, yaml, yesod
+     , yesod-auth, yesod-core, yesod-form, yesod-persistent
+     , yesod-static
+     }:
+     mkDerivation {
+       pname = "yesod-mangopay";
+       version = "1.12";
+       sha256 = "a53c0d1e8e1654a4c251b1830264f581a1ed668fffb303c05993e10e20932754";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers http-conduit http-types lifted-base mangopay
+         persistent-template text time yesod yesod-core
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring conduit conduit-extra containers
+         country-codes data-default directory fast-logger hamlet hjsmin
+         http-conduit lifted-base mangopay monad-control monad-logger
+         persistent persistent-postgresql persistent-template resourcet
+         shakespeare template-haskell text time wai wai-extra wai-logger
+         warp yaml yesod yesod-auth yesod-core yesod-form yesod-persistent
+         yesod-static
+       ];
+       homepage = "https://github.com/prowdsponsor/mangopay";
+       description = "Yesod library for MangoPay API access";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-markdown" = callPackage
@@ -211764,7 +212538,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "zlib" = callPackage
+  "zlib_0_5_4_2" = callPackage
     ({ mkDerivation, base, bytestring, zlib }:
      mkDerivation {
        pname = "zlib";
@@ -211774,9 +212548,10 @@ self: {
        librarySystemDepends = [ zlib ];
        description = "Compression and decompression in the gzip and zlib formats";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) zlib;};
 
-  "zlib_0_6_1_1" = callPackage
+  "zlib" = callPackage
     ({ mkDerivation, base, bytestring, HUnit, QuickCheck, tasty
      , tasty-hunit, tasty-quickcheck, zlib
      }:
@@ -211784,17 +212559,17 @@ self: {
        pname = "zlib";
        version = "0.6.1.1";
        sha256 = "c5f5b4285473657a7997d74f7642f3e7bda40f92c3c5d49471a899e27a4ba735";
-       revision = "1";
-       editedCabalFile = "e94fcf5a5822e569221c7897bdc15d9ddb31c0d844df0448cd388472d644b212";
+       revision = "3";
+       editedCabalFile = "b5fff98d06289c9c16ab78d994f88f18345ccf7d0ef3e5334bb417d763b07046";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ zlib ];
        testHaskellDepends = [
          base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        jailbreak = true;
+       doCheck = false;
        description = "Compression and decompression in the gzip and zlib formats";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) zlib;};
 
   "zlib-bindings" = callPackage

From 9955602aa0c29d9ac7e02b64a2bef01528408b6f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 31 Dec 2015 13:16:41 +0100
Subject: [PATCH 088/884] configuration-hackage2nix.yaml: update list of broken
 packages

---
 .../configuration-hackage2nix.yaml            | 90 ++++++++++++++++++-
 1 file changed, 87 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 713f5531eb15..c75d0916b233 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -203,8 +203,10 @@ dont-distribute-packages:
   ajhc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   alea:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   algebraic:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  algebra-sql:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   al:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   AlignmentAlgorithms:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Allure:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   alms:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   alpha:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   alpino-tools:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -303,6 +305,7 @@ dont-distribute-packages:
   AutoForms:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   autoproc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   avahi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  avers:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   AvlTree:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   awesomium-glut:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   awesomium:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -333,6 +336,7 @@ dont-distribute-packages:
   bamboo-theme-mini-html5:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   bamse:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   barchart:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  barcodes-code128:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   barley:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Barracuda:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   barrie:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -351,6 +355,7 @@ dont-distribute-packages:
   berkeleydb:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   BerkeleyDBXML:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   berp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bet:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   bff:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   bgzf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   bidirectionalization-combined:                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -383,6 +388,7 @@ dont-distribute-packages:
   bindings-fluidsynth:                          [ x86_64-darwin ]
   bindings-friso:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-GLFW:                                [ x86_64-darwin ]
+  bindings-gsl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-gts:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-hdf5:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-K8055:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -454,6 +460,7 @@ dont-distribute-packages:
   BNFC:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   board-games:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   bogre-banana:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bond:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   boolean-normal-forms:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   boolsimplifier:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   boomslang:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -480,6 +487,7 @@ dont-distribute-packages:
   buster:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Buster:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   buster-network:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bustle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytable:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestring-arbitrary:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestring-class:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -571,6 +579,7 @@ dont-distribute-packages:
   chatter:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   checked:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   check-pvp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  chell-hunit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   chevalier-common:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   Chitra:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   chp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -612,6 +621,7 @@ dont-distribute-packages:
   clogparse:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   clone-all:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   cloudfront-signer:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cloud-haskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   cloudyfs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   clua:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   cluss:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -739,6 +749,7 @@ dont-distribute-packages:
   criterion-plus:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   crocodile:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   cron-compat:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cruncher-types:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   crunghc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   crypto-cipher-benchmarks:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   cryptsy-api:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -882,8 +893,14 @@ dont-distribute-packages:
   discount:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   disjoint-set:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   DisTract:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  distributed-closure:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-azure:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  distributed-process-client-server:            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  distributed-process-execution:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-platform:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  distributed-process-registry:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  distributed-process-supervisor:               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  distributed-process-task:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-zookeeper:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   distribution:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   distribution-plot:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -920,6 +937,8 @@ dont-distribute-packages:
   DrIFT:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   dropbox-sdk:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   dropsolve:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  DSH:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dsh-sql:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ds-kanren:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   dsmc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   dsmc-tools:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -936,6 +955,7 @@ dont-distribute-packages:
   Dust-tools-pcap:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   dvda:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   dvdread:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dynamic-cabal:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   dynamic-graph:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   dynamic-object:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   dynamic-plot:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -975,7 +995,7 @@ dont-distribute-packages:
   elerea-examples:                              [ x86_64-darwin ]
   elerea-sdl:                                   [ x86_64-darwin ]
   elm-init:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  emacs-keys:                                   [ x86_64-darwin ]
+  emacs-keys:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   email-header:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   email:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   email-postmark:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -1101,6 +1121,7 @@ dont-distribute-packages:
   floating-bits:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   flow2dot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   flowdock-api:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  flowdock:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   flowdock-rest:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   flower:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   flowlocks-framework:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -1135,6 +1156,7 @@ dont-distribute-packages:
   Foster:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   fpco-api:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   fpnla-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  FractalArt:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Fractaler:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   frag:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   franchise:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -1166,6 +1188,7 @@ dont-distribute-packages:
   full-sessions:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   fullstop:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   full-text-search:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  funbot:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   functional-arrow:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   function-combine:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   functorm:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -1280,7 +1303,9 @@ dont-distribute-packages:
   gnome-keyring:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   gnomevfs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   g-npm:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gnss-converters:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   goa:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  goal-simulation:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   gofer-prelude:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   GoogleDirections:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   google-html5-slide:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -1328,6 +1353,7 @@ dont-distribute-packages:
   greencard:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   greencard-lib:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   greg-client:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gremlin-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   Grempa:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gridland:                                     [ x86_64-darwin ]
   grm:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -1387,6 +1413,7 @@ dont-distribute-packages:
   hack-middleware-cleanpath:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hack-middleware-clientsession:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hack-middleware-jsonp:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hackport:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hactor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   haddock-leksah:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   haggis:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -1408,6 +1435,7 @@ dont-distribute-packages:
   hamusic:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   handsy:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hannahci:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haphviz:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   happindicator3:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   happindicator:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   happraise:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -1487,8 +1515,10 @@ dont-distribute-packages:
   haskelldb-wx:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-formatter:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-ftp:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-generate:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-in-space:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   HaskellLM:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-names:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   HaskellNN:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Haskelloids:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-openflow:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -1529,12 +1559,15 @@ dont-distribute-packages:
   haslo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasparql-client:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasql-pool:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hasql-postgres:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hasql-postgres-options:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasql-th:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasql-transaction:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   haste-perch:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   has-th:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hatex-guide:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   HaTeX-meta:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hat:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   haverer:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   HaVSA:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hawitter:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -1747,6 +1780,7 @@ dont-distribute-packages:
   Holumbus-Storage:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   homeomorphic:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hommage:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  homplexity:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   HongoDB:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   honi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   honk:                                         [ x86_64-darwin ]
@@ -1770,6 +1804,7 @@ dont-distribute-packages:
   hops:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoq:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hosts-server:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hothasktags:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hp2any-core:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hp2any-graph:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hp2any-manager:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -1824,6 +1859,7 @@ dont-distribute-packages:
   hscassandra:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs-cdb:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsclock:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hscope:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsdev:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsdip:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsdns-cache:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -1835,6 +1871,7 @@ dont-distribute-packages:
   hs-ffmpeg:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs-fltk:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs-gchart:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-gen-iface:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs-GeoIP:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HSGEP:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsgnutls:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -1883,6 +1920,7 @@ dont-distribute-packages:
   hsqml-demo-samples:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsqml-morris:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsqml:                                        [ x86_64-darwin ]
+  hsseccomp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsSqlite3:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   HsSVN:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hstats:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2057,6 +2095,7 @@ dont-distribute-packages:
   jacobi-roots:                                 [ i686-linux ]
   jacobi-roots:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   jalla:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jammittools:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   jarfind:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   java-bridge-extras:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   java-bridge:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2086,6 +2125,7 @@ dont-distribute-packages:
   json-qq:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsonresume:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-rpc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jsonschema-gen:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-stream:                                  [ i686-linux ]
   json-tools:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   jspath:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2141,6 +2181,14 @@ dont-distribute-packages:
   lagrangian:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   laika:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdaBase:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambdabot-core:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambdabot-haskell-plugins:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambdabot:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambdabot-irc-plugins:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambdabot-misc-plugins:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambdabot-novelty-plugins:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambdabot-reference-plugins:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambdabot-social-plugins:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdabot-utils:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambda-bridge:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   LambdaCalculator:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2153,6 +2201,7 @@ dont-distribute-packages:
   lambdacube-samples:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambda-devs:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdaFeed:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  LambdaHack:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   LambdaINet:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdaLit:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   LambdaNet:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2277,6 +2326,7 @@ dont-distribute-packages:
   lmdb:                                         [ x86_64-darwin ]
   local-search:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   loch:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  locked-poll:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   log2json:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   log-effect:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   logging-facade-journald:                      [ x86_64-darwin ]
@@ -2340,6 +2390,7 @@ dont-distribute-packages:
   manatee-terminal:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   manatee-welcome:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   mandulia:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mangopay:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   marionetta:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   markdown2svg:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   markdown-kate:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2386,6 +2437,7 @@ dont-distribute-packages:
   Mhailist:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   MHask:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Michelangelo:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  microlens-contra:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   midi-alsa:                                    [ x86_64-darwin ]
   midimory:                                     [ x86_64-darwin ]
   midisurface:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2470,6 +2522,7 @@ dont-distribute-packages:
   mps:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   mpvguihs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   msgpack-idl:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  msh:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   msi-kb-backlit:                               [ x86_64-darwin ]
   mtgoxapi:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   mtl-tf:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2645,6 +2698,7 @@ dont-distribute-packages:
   orchid:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   order-maintenance:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   orgmode-parse:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  origami:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   osm-download:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   OSM:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ot:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2683,6 +2737,7 @@ dont-distribute-packages:
   pathfindingcore:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   patterns:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   paypal-adaptive-hoops:                        [ i686-linux ]
+  paypal-adaptive-hoops:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   paypal-api:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pb:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   PCLT-DB:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2731,11 +2786,13 @@ dont-distribute-packages:
   pipes-files:                                  [ i686-linux ]
   pipes-network-tls:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-p2p-examples:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pipes-transduce:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   pisigma:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   pit:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   pkggraph:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   planar-graph:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   plat:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  plist-buddy:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   plivo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   PlslTools:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   plugins-auto:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2761,6 +2818,7 @@ dont-distribute-packages:
   pool-conduit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   pool:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   popenhs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  poppler:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   portaudio:                                    [ x86_64-darwin ]
   porte:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   porter:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2772,6 +2830,7 @@ dont-distribute-packages:
   PostgreSQL:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-simple-typed:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-typed:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  postgrest:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   postie:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   postmaster:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   powermate:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2781,12 +2840,14 @@ dont-distribute-packages:
   practice-room:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   precis:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   prednote-test:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pred-trie:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   prefork:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   pregame:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   prelude-generalize:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   prelude-plus:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   preprocess-haskell:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   press:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  presto-hdbc:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   primula-board:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   primula-bot:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   printf-mauke:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2847,6 +2908,7 @@ dont-distribute-packages:
   python-pickle:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   qd:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   qd-vec:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  qed:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   qhull-simple:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   QIO:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   qt:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2911,8 +2973,10 @@ dont-distribute-packages:
   reasonable-lens:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   record-aeson:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   record-gl:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  record-preprocessor:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   records:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   records-th:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  record-syntax:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   redHandlers:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Redmine:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   reedsolomon:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2921,9 +2985,13 @@ dont-distribute-packages:
   ref:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Ref:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   reflection-extras:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reflex-animation:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   reflex-dom-contrib:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   reflex-dom:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reflex-gloss-scene:                           [ x86_64-darwin ]
+  reflex-gloss:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reflex-gloss-scene:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reflex:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reflex-transformers:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-deriv:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-dfa:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-parsec:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3061,6 +3129,7 @@ dont-distribute-packages:
   scholdoc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   science-constants-dimensional:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   SciFlow:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  scion-browser:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   scion:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   scope-cairo:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   scope:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3121,6 +3190,7 @@ dont-distribute-packages:
   SessionLogger:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   sessions:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   set-with:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sexp-grammar:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   sexp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   sexpr:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   sfml-audio:                                   [ x86_64-darwin ]
@@ -3200,6 +3270,7 @@ dont-distribute-packages:
   snaplet-actionlog:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   snaplet-css-min:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   snaplet-environments:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snaplet-hasql:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   snaplet-haxl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   snaplet-hdbc:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   snaplet-i18n:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3211,6 +3282,7 @@ dont-distribute-packages:
   snaplet-redson:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   snaplet-rest:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   snaplet-sedna:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snaplet-sqlite-simple:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   snaplet-tasks:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   snaplet-typed-sessions:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   snaplet-wordpress:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3237,6 +3309,7 @@ dont-distribute-packages:
   sorted:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sound-collage:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   source-code-server:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  SourceGraph:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   sousit:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   soxlib:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   soyuz:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3271,6 +3344,7 @@ dont-distribute-packages:
   sql-simple-pool:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   sql-simple-postgresql:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   sql-simple-sqlite:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  squeeze:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   srcinst:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ssh:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   sssp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3333,6 +3407,7 @@ dont-distribute-packages:
   sylvia:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sym-plot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   sync:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  syncthing-hs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   syntactic:                                    [ i686-linux ]
   syntax-attoparsec:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   syntax-example:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3410,6 +3485,8 @@ dont-distribute-packages:
   text-xml-qq:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   tfp-th:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   tftp:                                         [ x86_64-darwin ]
+  th-context:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  themoviedb:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Theora:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   theoremquest-client:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   thih:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3496,8 +3573,11 @@ dont-distribute-packages:
   twine:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   twisty:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   twitch:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  twitter-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   twitter-enumerator:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   twitter:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  twitter-types:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  twitter-types-lens:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   tx:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   TYB:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   typalyze:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3602,6 +3682,7 @@ dont-distribute-packages:
   verilog:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   versions:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   vigilance:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vimeta:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   vintage-basic:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   vinyl-gl:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   vinyl-json:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3616,6 +3697,7 @@ dont-distribute-packages:
   vowpal-utils:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   voyeur:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   vtegtk3:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vte:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   vty-examples:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   vty-menu:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   vty-ui-extras:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3685,6 +3767,7 @@ dont-distribute-packages:
   WMSigner:                                     [ i686-linux ]
   wobsurv:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   woffex:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wolf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   word24:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   WordAlignment:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   Wordlint:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3727,7 +3810,7 @@ dont-distribute-packages:
   xhb-ewmh:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   xine:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   xing-api:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xkbcommon:                                    [ x86_64-darwin ]
+  xkbcommon:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   xkcd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   xlsx-templater:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml2json:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3796,6 +3879,7 @@ dont-distribute-packages:
   yesod-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-goodies:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-links:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-mangopay:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-paginate:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-pagination:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-pure:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]

From 5f47b751b3b8baa2aadd1dd54d855d1f79041451 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 31 Dec 2015 12:27:26 +0100
Subject: [PATCH 089/884] haskell-semigroups: fix build with GHC 7.8.x and
 7.6.x

---
 pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix | 3 +++
 pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
index 4716766226a9..f89ffc4c7c12 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
@@ -95,4 +95,7 @@ self: super: {
   # Needs void on pre 7.10.x compilers.
   conduit = addBuildDepend super.conduit self.void;
 
+  # Needs nats on pre 7.10.x compilers.
+  semigroups = addBuildDepend super.semigroups self.nats;
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
index 99bac5ae5a0c..a17e85d2343c 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@@ -137,4 +137,7 @@ self: super: {
   # Needs void on pre 7.10.x compilers.
   conduit = addBuildDepend super.conduit self.void;
 
+  # Needs nats on pre 7.10.x compilers.
+  semigroups = addBuildDepend super.semigroups self.nats;
+
 }

From d464c85fdf08c1c043904c46f884cb9c9d94257c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 31 Dec 2015 18:26:26 +0100
Subject: [PATCH 090/884] haskell-modules: remove obsolete re-build triggers

---
 .../development/haskell-modules/configuration-ghc-7.10.x.nix | 5 +----
 pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index 00e12b015645..0c2685eee838 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -77,7 +77,7 @@ self: super: {
 
   # haddock: No input file(s).
   nats = dontHaddock super.nats;
-  bytestring-builder = dontHaddock (triggerRebuild super.bytestring-builder 1);
+  bytestring-builder = dontHaddock super.bytestring-builder;
 
   # We have time 1.5
   aeson = disableCabalFlag super.aeson "old-locale";
@@ -208,7 +208,4 @@ self: super: {
   # https://github.com/DanielG/cabal-helper/issues/10
   cabal-helper = dontCheck super.cabal-helper;
 
-  # Re-build this package to fix broken binaries on Hydra.
-  math-functions = triggerRebuild super.math-functions 2;
-
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
index a17e85d2343c..81c060a4c3ec 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@@ -52,7 +52,7 @@ self: super: {
   haddock-api = super.haddock-api_2_15_0_2;
 
   # This is part of bytestring in our compiler.
-  bytestring-builder = triggerRebuild (dontHaddock super.bytestring-builder) 1;
+  bytestring-builder = dontHaddock super.bytestring-builder;
 
   # Won't compile against mtl 2.1.x.
   imports = super.imports.override { mtl = self.mtl_2_2_1; };

From 09956eab482e57face13e357fc8760fc82013fc0 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Mon, 28 Dec 2015 11:46:52 -0500
Subject: [PATCH 091/884] pointfree: now builds with haskell-src-exts-1.17.

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 642757e66da3..3e5b205893c4 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -941,8 +941,4 @@ self: super: {
 
   # https://github.com/mainland/language-c-quote/issues/57
   language-c-quote = super.language-c-quote.override { alex = self.alex_3_1_4; };
-
-  # The package doesn't yet compile with new HSE: https://github.com/bmillwood/pointfree/pull/13
-  pointfree = super.pointfree.override { haskell-src-exts = self.haskell-src-exts_1_16_0_1; };
-
 }

From 365ed9e37ff3e978ff872e781a5c8cda399bc361 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 30 Dec 2015 19:16:19 +0100
Subject: [PATCH 092/884] haskell-binary: prefer version 0.7.x over 0.8.x for
 GHC 7.0.x

---
 pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix    | 2 +-
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
index 3173189c430a..cc5d03f05f5b 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
@@ -35,7 +35,7 @@ self: super: {
   unix = null;
 
   # These packages are core libraries in GHC 7.10.x, but not here.
-  binary = self.binary_0_8_0_0;
+  binary = self.binary_0_7_6_1;
   deepseq = self.deepseq_1_3_0_1;
   haskeline = self.haskeline_0_7_2_1;
   hoopl = self.hoopl_3_10_2_0;
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index c75d0916b233..c024d705dff1 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -35,6 +35,7 @@ default-package-overrides:
 
 extra-packages:
   - aeson < 0.8                         # newer versions don't work with GHC 6.12.3
+  - binary > 0.7 && < 0.8               # binary 0.8.x is the latest, but it's largely unsupported so far
   - Cabal == 1.18.*                     # required for cabal-install et al on old GHC versions
   - Cabal == 1.20.*                     # required for cabal-install et al on old GHC versions
   - containers < 0.5                    # required to build alex with GHC 6.12.3

From 047e8b5e80cfa5897b7e54e1731cfaca67896925 Mon Sep 17 00:00:00 2001
From: jeaye <contact@jeaye.com>
Date: Fri, 1 Jan 2016 11:38:49 +0800
Subject: [PATCH 093/884] Add SSL support to slrn

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

diff --git a/pkgs/applications/networking/newsreaders/slrn/default.nix b/pkgs/applications/networking/newsreaders/slrn/default.nix
index 6aa1ec762532..dcfadbfa05f0 100644
--- a/pkgs/applications/networking/newsreaders/slrn/default.nix
+++ b/pkgs/applications/networking/newsreaders/slrn/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl
-, slang, ncurses }:
+, slang, ncurses, openssl }:
 
 let version = "1.0.2"; in
 
@@ -18,9 +18,9 @@ stdenv.mkDerivation {
       -e "s|/bin/rm|rm|"
   '';
 
-  configureFlags = "--with-slang=${slang}";
+  configureFlags = "--with-slang=${slang} --with-ssl=${openssl}";
 
-  buildInputs = [ slang ncurses ];
+  buildInputs = [ slang ncurses openssl ];
 
   meta = with stdenv.lib; {
     description = "The slrn (S-Lang read news) newsreader";

From 581e9f0b32d8aef9cc554c71900abda3b71d21e1 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Fri, 1 Jan 2016 03:57:55 +0000
Subject: [PATCH 094/884] tibia: 10.81 -> 10.90

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

diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix
index dc4a8ac36925..c1f533276d6e 100644
--- a/pkgs/games/tibia/default.nix
+++ b/pkgs/games/tibia/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 assert stdenv.isi686;
 stdenv.mkDerivation {
-  name = "tibia-10.81";
+  name = "tibia-10.90";
 
   src = fetchurl {
-    url = http://static.tibia.com/download/tibia1081.tgz;
-    sha256 = "19p102fg31slrwg09q8dzhvz48qp8yrkpq69djn0jb9hrs7k7fpr";
+    url = http://static.tibia.com/download/tibia1090.tgz;
+    sha256 = "11mkh2dynmbpay51yfaxm5dmcys3rnpk579s9ypfkhblsrchbkhx";
   };
 
   shell = stdenv.shell;

From 6c34b9c2adfc25c252444c221429fbb300e59131 Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Fri, 1 Jan 2016 15:39:03 +0800
Subject: [PATCH 095/884] facter: 3.0.2 -> 3.1.3

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

diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix
index 5a37262f8187..c0328636536c 100644
--- a/pkgs/tools/system/facter/default.nix
+++ b/pkgs/tools/system/facter/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "facter-${version}";
-  version = "3.0.2";
+  version = "3.1.3";
   src = fetchurl {
     url = "https://downloads.puppetlabs.com/facter/${name}.tar.gz";
-    sha256 = "1myf1r827bh3n0snkzwj2jnc0sax9bq6z1vv9gr90rqr73lixvig";
+    sha256 = "1ngp3xjdh6x1w7lsi4lji2xzqp0x950jngcdlq11lcr0wfnzwyxj";
   };
 
   libyamlcpp_ = libyamlcpp.override { makePIC = true; };

From 7d8ee80dab827843f9607e2b6073d0948f45d29d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 1 Jan 2016 10:01:36 +0100
Subject: [PATCH 096/884] avahi: don't install broken symlinks

/cc maintainer @lovek323 and @wkennington who added these links 4118e632e84.
---
 pkgs/development/libraries/avahi/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix
index 6c8fe6e112b7..199379ad401f 100644
--- a/pkgs/development/libraries/avahi/default.nix
+++ b/pkgs/development/libraries/avahi/default.nix
@@ -36,12 +36,15 @@ stdenv.mkDerivation rec {
     avahi-core/socket.c
   '';
 
-  postInstall = ''
+  postInstall =
     # Maintain compat for mdnsresponder and howl
-    ${if withLibdnssdCompat then "ln -s avahi-compat-libdns_sd/dns_sd.h $out/include/dns_sd.h" else ""}
+    stdenv.lib.optionalString withLibdnssdCompat ''
+      ln -s avahi-compat-libdns_sd/dns_sd.h "$out/include/dns_sd.h"
+    '';
+  /*  # these don't exist (anymore?)
     ln -s avahi-compat-howl $out/include/howl
     ln -s avahi-compat-howl.pc $out/lib/pkgconfig/howl.pc
-  '';
+  */
 
   meta = with stdenv.lib; {
     description = "mDNS/DNS-SD implementation";

From ab3277e68a2f256f29905d0851090e39909c590c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 04:08:00 +0300
Subject: [PATCH 097/884] nginxUnstable: 1.9.7 -> 1.9.9

---
 pkgs/servers/http/nginx/unstable.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/nginx/unstable.nix b/pkgs/servers/http/nginx/unstable.nix
index a80632cd1c9a..ae8245d57141 100644
--- a/pkgs/servers/http/nginx/unstable.nix
+++ b/pkgs/servers/http/nginx/unstable.nix
@@ -7,10 +7,10 @@
 with stdenv.lib;
 
 let
-  version = "1.9.7";
+  version = "1.9.9";
   mainSrc = fetchurl {
     url = "http://nginx.org/download/nginx-${version}.tar.gz";
-    sha256 = "1ma82wfg9akghx1cnzfmz4nplf0zjv1rk49x4v3f3z7xmwbx4jvr";
+    sha256 = "0wwd0q00pnkw4gjn3izjr63sndp7piyc5k5mbjm369f824mvnrny";
   };
 
 in

From 119de110a3c5db9d4a36eb00ac2f3395d15f68f0 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 04:12:18 +0300
Subject: [PATCH 098/884] glusterfs: 3.7.3 -> 3.7.6

---
 pkgs/tools/filesystems/glusterfs/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix
index 062f27e286f7..2563c4428a4c 100644
--- a/pkgs/tools/filesystems/glusterfs/default.nix
+++ b/pkgs/tools/filesystems/glusterfs/default.nix
@@ -6,11 +6,11 @@ let
   s = # Generated upstream information 
   rec {
     baseName="glusterfs";
-    version="3.7.3";
+    version="3.7.6";
     name="${baseName}-${version}";
-    hash="0xdzxprsi0gybv6jdp0ycfpsxzijwfrm3217fk3fnixcs92frshv";
-    url="http://download.gluster.org/pub/gluster/glusterfs/3.7/3.7.3/glusterfs-3.7.3.tar.gz";
-    sha256="0xdzxprsi0gybv6jdp0ycfpsxzijwfrm3217fk3fnixcs92frshv";
+    hash="01fg132k4gvvx5p0bi88956yzd77pcnw3iyi88vrsncmpnvg10xv";
+    url="http://download.gluster.org/pub/gluster/glusterfs/3.7/3.7.6/glusterfs-3.7.6.tar.gz";
+    sha256="01fg132k4gvvx5p0bi88956yzd77pcnw3iyi88vrsncmpnvg10xv";
   };
   buildInputs = [
     fuse bison flex_2_5_35 openssl python ncurses readline

From 247c419427f493efe3d58f9a61e9f9e020b168d9 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 04:14:13 +0300
Subject: [PATCH 099/884] ipmiutil: 2.9.6 -> 2.9.8

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

diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/tools/system/ipmiutil/default.nix
index 4fd3cb0f4a48..e0f5a5e68a8e 100644
--- a/pkgs/tools/system/ipmiutil/default.nix
+++ b/pkgs/tools/system/ipmiutil/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   baseName = "ipmiutil";
-  version = "2.9.6";
+  version = "2.9.8";
   name = "${baseName}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz";
-    sha256 = "068mfxaay91m5qqs0lb4jwvsbxb665n2hgcp0g1k62zvicyiyk48";
+    sha256 = "066xfmzkrjbazddik2kx8k5adppkd3hm3pna6x8vri18sg7421w6";
   };
 
   buildInputs = [ openssl ];

From 51f8932c8ec6bfc9bfd036ccffb94544f427a76d Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 02:15:04 +0100
Subject: [PATCH 100/884] pari (PARI/GP): 2.7.4 -> 2.7.5

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

diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix
index 5719ccb69097..be273bca0e2c 100644
--- a/pkgs/applications/science/math/pari/default.nix
+++ b/pkgs/applications/science/math/pari/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, gmp, readline }:
 
 stdenv.mkDerivation rec {
-  version = "2.7.4";
+  version = "2.7.5";
   name = "pari-${version}";
 
   src = fetchurl {
     url = "http://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz";
-    sha256 = "0k1qqagfl6zn7gvwmsqffj6g9yrzqvszwh2mblhmxpjlw1pigfh8";
+    sha256 = "0c8l83a0gjq73r9hndsrzkypwxvnnm4pxkkzbg6jm95m80nzwh11";
   };
 
   buildInputs = [gmp readline];

From a2ddd899327d945cfc1601c61be5fb5438de7397 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 02:19:41 +0100
Subject: [PATCH 101/884] baresip: 0.4.15 -> 0.4.16

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

diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix
index 2b60b3a7a463..a2f9ebc83173 100644
--- a/pkgs/applications/networking/instant-messengers/baresip/default.nix
+++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix
@@ -4,11 +4,11 @@
 , gsm, speex, portaudio, spandsp, libuuid
 }:
 stdenv.mkDerivation rec {
-  version = "0.4.15";
+  version = "0.4.16";
   name = "baresip-${version}";
   src=fetchurl {
     url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz";
-    sha256 = "13712li6y3ikwzl17j46w25xyv3z98yqj7zpr3jifyvbna9ls5r3";
+    sha256 = "04a9d7il39b1kfqh7al0g0q8v32hphgjx8gkixrlp5qsqlzvk876";
   };
   buildInputs = [zlib openssl libre librem pkgconfig
     cairo mpg123 gstreamer gst_ffmpeg gst_plugins_base gst_plugins_bad gst_plugins_good

From a102de361b7c9b8bc841898b5eee09f633a24b77 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 02:21:28 +0100
Subject: [PATCH 102/884] fpc: 2.6.4 -> 3.0.0

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

diff --git a/pkgs/development/compilers/fpc/default.nix b/pkgs/development/compilers/fpc/default.nix
index b34b5e8a4465..2f4cb10bd4db 100644
--- a/pkgs/development/compilers/fpc/default.nix
+++ b/pkgs/development/compilers/fpc/default.nix
@@ -3,12 +3,12 @@
 let startFPC = import ./binary.nix { inherit stdenv fetchurl; }; in
 
 stdenv.mkDerivation rec {
-  version = "2.6.4";
+  version = "3.0.0";
   name = "fpc-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/freepascal/fpcbuild-${version}.tar.gz";
-    sha256 = "1akdlp4n9ai1gnn4yq236i5rx03rs5sjfgk60myb7nb9lk7kp74d";
+    sha256 = "1v40bjp0kvsi8y0mndqvvhnsqjfssl2w6wpfww51j4rxblfkp4fm";
   };
 
   buildInputs = [ startFPC gawk ];

From a2f76a89bb1e961fce68897aac38be7d3cd5009c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 04:22:27 +0300
Subject: [PATCH 103/884] gajim: 0.16.4 -> 0.16.5

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

diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index b2325e87e0d5..7312b45828cb 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -20,11 +20,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "gajim-${version}";
-  version = "0.16.4";
+  version = "0.16.5";
 
   src = fetchurl {
     url = "http://www.gajim.org/downloads/0.16/gajim-${version}.tar.bz2";
-    sha256 = "0zyfs7q1qg8iqszr8l1gb18gqla6zrrfsgpmbxblpi9maqxas5i1";
+    sha256 = "14fhcqnkqygh91132dnf1idayj4r3iqbwb44sd3mxv20n6ribh55";
   };
 
   patches = [

From df9efd4f1bba67f690098ab5468994d64b653f68 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 02:27:04 +0100
Subject: [PATCH 104/884] sysdig: 0.5.1 -> 0.6.0

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

diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix
index 5c15ba1a9ce4..62e2a48adc96 100644
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -3,10 +3,10 @@ let
   inherit (stdenv.lib) optional optionalString;
   s = rec {
     baseName="sysdig";
-    version = "0.5.1";
+    version = "0.6.0";
     name="${baseName}-${version}";
     url="https://github.com/draios/sysdig/archive/${version}.tar.gz";
-    sha256 = "08wnk0593ljdq466hk0npsjc0gbm37nsjm1x2ilsf58n1xl8dmfs";
+    sha256 = "0729mjs9gpd7kb495q80zlp23zczm8ka3xcq4571c0sm732sa3g3";
   };
   buildInputs = [
     cmake zlib luajit ncurses perl jsoncpp libb64 openssl curl

From f1eeed7a29fef790f4ff53fb972779a3b3634c46 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 02:28:50 +0100
Subject: [PATCH 105/884] ised: 2.6.0 -> 2.7.0

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

diff --git a/pkgs/tools/misc/ised/default.nix b/pkgs/tools/misc/ised/default.nix
index 7d0963c2bb0f..64a71846c4bc 100644
--- a/pkgs/tools/misc/ised/default.nix
+++ b/pkgs/tools/misc/ised/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "ised-${version}";
-  version = "2.6.0";
+  version = "2.7.0";
   src = fetchurl {
     url = "mirror://sourceforge/project/ised/${name}.tar.bz2";
-    sha256 = "0rf9brqkrad8f3czpfc1bxq9ybv3nxci9276wdxas033c82cqkjs";
+    sha256 = "08wzgmyvlhfaxa0m2b6pw2mn03k1a87pzbzxm0x9z84gci9w2g4h";
   };
 
   meta = {

From 5db11e97e7f091535c1f2ed508fd84432b3d2517 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 02:30:16 +0100
Subject: [PATCH 106/884] conspy: 1.10 -> 1.13

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

diff --git a/pkgs/os-specific/linux/conspy/default.nix b/pkgs/os-specific/linux/conspy/default.nix
index 78d403a3afcf..3c209c6253dd 100644
--- a/pkgs/os-specific/linux/conspy/default.nix
+++ b/pkgs/os-specific/linux/conspy/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="conspy";
-    version="1.10";
+    version="1.13";
     name="${baseName}-${version}";
-    hash="1vnph4xa1qp4sr52jc9zldmbdpkr6z5j7hk2vgyhfn7m1vc5g0qw";
-    url="mirror://sourceforge/project/conspy/conspy-1.10-1/conspy-1.10.tar.gz";
-    sha256="1vnph4xa1qp4sr52jc9zldmbdpkr6z5j7hk2vgyhfn7m1vc5g0qw";
+    hash="059sag372n09y1ddb1i0sx013kzkbr8a9pjqk03kyijn8h1z5hl2";
+    url="mirror://sourceforge/project/conspy/conspy-1.13-1/conspy-1.13.tar.gz";
+    sha256="059sag372n09y1ddb1i0sx013kzkbr8a9pjqk03kyijn8h1z5hl2";
   };
   buildInputs = [
     autoconf automake ncurses

From 0f9a3610649c5cdb4136da6bdef9864459f015ec Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 02:31:07 +0100
Subject: [PATCH 107/884] firejail: 0.9.26 -> 0.9.36

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

diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix
index af08d404b826..4d0a066d2c38 100644
--- a/pkgs/os-specific/linux/firejail/default.nix
+++ b/pkgs/os-specific/linux/firejail/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="firejail";
-    version="0.9.26";
+    version="0.9.36";
     name="${baseName}-${version}";
-    hash="12n0kj95hfkzv4jir7j9x0mdpg20bq0fgifjsz1dbsmqi2cspdlq";
-    url="mirror://sourceforge/firejail/firejail/firejail-0.9.26-rc2.tar.bz2";
-    sha256="12n0kj95hfkzv4jir7j9x0mdpg20bq0fgifjsz1dbsmqi2cspdlq";
+    hash="1mxgkfn2hbacarcp51qwgi7jxxzv69wb4lz78m71zysy3kkqn23k";
+    url="mirror://sourceforge/project/firejail/firejail/firejail-0.9.36-rc1.tar.bz2";
+    sha256="1mxgkfn2hbacarcp51qwgi7jxxzv69wb4lz78m71zysy3kkqn23k";
   };
   buildInputs = [
   ];

From 9201598227d23aae66bb43789fe8a1596ad8e8bb Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 04:31:51 +0300
Subject: [PATCH 108/884] compiz: 0.9.12.1 -> 0.9.12.2

---
 pkgs/applications/window-managers/compiz/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/window-managers/compiz/default.nix b/pkgs/applications/window-managers/compiz/default.nix
index 977409d0ef1e..39eb0586f7b2 100644
--- a/pkgs/applications/window-managers/compiz/default.nix
+++ b/pkgs/applications/window-managers/compiz/default.nix
@@ -15,11 +15,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="compiz";
-    version="0.9.12.1";
+    version="0.9.12.2";
     name="${baseName}-${version}";
-    hash="0kl5im3zq0rjlxbgz5cyk38qzssahrljc67z1n16pjc1qmr6m7cb";
-    url="https://launchpad.net/compiz/0.9.12/0.9.12.1/+download/compiz-0.9.12.1.tar.bz2";
-    sha256="0kl5im3zq0rjlxbgz5cyk38qzssahrljc67z1n16pjc1qmr6m7cb";
+    hash="107cv8jm7nl0lbkj2y7878lmv1pd6blra68fg10cgb7xdngaq5w9";
+    url="https://launchpad.net/compiz/0.9.12/0.9.12.2/+download/compiz-0.9.12.2.tar.bz2";
+    sha256="107cv8jm7nl0lbkj2y7878lmv1pd6blra68fg10cgb7xdngaq5w9";
   };
   buildInputs = [cmake pkgconfig
     libXrender renderproto gtk libwnck pango cairo

From 5446554002d7c6fb4e5473357a714a2e8579037f Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 02:32:50 +0100
Subject: [PATCH 109/884] lazarus: 1.2.6 -> 1.4.4

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

diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix
index 06c4f6bbe2b1..c579ba5612a2 100644
--- a/pkgs/development/compilers/fpc/lazarus.nix
+++ b/pkgs/development/compilers/fpc/lazarus.nix
@@ -8,10 +8,10 @@ stdenv, fetchurl
 let
   s =
   rec {
-    version = "1.2.6";
+    version = "1.4.4";
     versionSuffix = "-0";
     url = "mirror://sourceforge/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${version}/lazarus-${version}${versionSuffix}.tar.gz";
-    sha256 = "1sjyc2l46hyd5ic5hr6vscy4qr9kazyhiyddy7bfs9vgf54fdiy0";
+    sha256 = "12w3xwqif96a65b0ygi4riqrp0122wsp0ykb1j7k8hjfyk91x91a";
     name = "lazarus-${version}";
   };
   buildInputs = [

From f638adb107ac82c048d400e23cc3b52b9bd0aac8 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 04:37:20 +0300
Subject: [PATCH 110/884] apache-jena: 3.0.0 -> 3.0.1

---
 pkgs/servers/nosql/apache-jena/binary.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/apache-jena/binary.nix b/pkgs/servers/nosql/apache-jena/binary.nix
index 9b4e19b32708..22c9fc06972c 100644
--- a/pkgs/servers/nosql/apache-jena/binary.nix
+++ b/pkgs/servers/nosql/apache-jena/binary.nix
@@ -3,10 +3,10 @@ let
   s = # Generated upstream information
   rec {
     baseName="apache-jena";
-    version = "3.0.0";
+    version = "3.0.1";
     name="${baseName}-${version}";
     url="http://archive.apache.org/dist/jena/binaries/apache-jena-${version}.tar.gz";
-    sha256 = "1pqg27m295v7v456pidb0fq5120blkc466pdzksqxqcjrwivq4kb";
+    sha256 = "0qim7jnq9gzwpfw6a41s3ngz2sjmxzlaiqjf0lrzycxy9mig2xc1";
   };
   buildInputs = [
     makeWrapper

From 8431b84d9a11afec5ae16fc87c16a8a56f73a68c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 02:38:46 +0100
Subject: [PATCH 111/884] tcpflow: 1.4.4 -> 1.4.5

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

diff --git a/pkgs/tools/networking/tcpflow/default.nix b/pkgs/tools/networking/tcpflow/default.nix
index 9c5f6f44ae05..935251ba0579 100644
--- a/pkgs/tools/networking/tcpflow/default.nix
+++ b/pkgs/tools/networking/tcpflow/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="tcpflow";
-    version="1.4.4";
+    version="1.4.5";
     name="${baseName}-${version}";
-    hash="0k2lxlvn1x8avkrijc22scrj4p2g5agfskbgfc2d0w9zgrg61xdn";
-    url="http://www.digitalcorpora.org/downloads/tcpflow/tcpflow-1.4.4.tar.gz";
-    sha256="0k2lxlvn1x8avkrijc22scrj4p2g5agfskbgfc2d0w9zgrg61xdn";
+    hash="0whcyykq710s84jyiaqp6rsr19prd0pr1g1pg74mif0ig51yv7zk";
+    url="http://www.digitalcorpora.org/downloads/tcpflow/tcpflow-1.4.5.tar.gz";
+    sha256="0whcyykq710s84jyiaqp6rsr19prd0pr1g1pg74mif0ig51yv7zk";
   };
   buildInputs = [
     openssl zlib libpcap boost cairo

From 761340140c8b4d41c746c32fea0ea50808f03f8e Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 02:40:39 +0100
Subject: [PATCH 112/884] luarocks: 2.2.2 -> 2.3.0

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

diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix
index 2296bc3a9890..017b5fdc08d1 100644
--- a/pkgs/development/tools/misc/luarocks/default.nix
+++ b/pkgs/development/tools/misc/luarocks/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="luarocks";
-    version="2.2.2";
+    version="2.3.0";
     name="${baseName}-${version}";
-    hash="08phl5syc7q6bh0rs9558s74g8xq05hgn7gbia4hvwvkd1q2f12g";
-    url="http://luarocks.org/releases/luarocks-2.2.2.tar.gz";
-    sha256="08phl5syc7q6bh0rs9558s74g8xq05hgn7gbia4hvwvkd1q2f12g";
+    hash="15zdchj3wkjdbypj68kwqswxhkhrfnw72nlks6df4lk0nvp8zqv8";
+    url="http://luarocks.org/releases/luarocks-2.3.0-rc2.tar.gz";
+    sha256="15zdchj3wkjdbypj68kwqswxhkhrfnw72nlks6df4lk0nvp8zqv8";
   };
   buildInputs = [
     lua curl makeWrapper which

From 94494640243042b221b6d1a4d589e9b0986d5879 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 04:42:46 +0300
Subject: [PATCH 113/884] libgphoto2: 2.5.8 -> 2.5.9

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

diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix
index 2fdf3d5e69bb..e25cdb61d86a 100644
--- a/pkgs/development/libraries/libgphoto2/default.nix
+++ b/pkgs/development/libraries/libgphoto2/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
-    sha256 = "1di7iv2r5ghzrylfbpvp694gpqbwjj3ngrmg4kvl7big6hp2c6h3";
+    sha256 = "0chz57rhzdz1cbdjw1q5rs439s879kk06jrci4jyn5rlm7iyic6d";
   };
 
   nativeBuildInputs = [ pkgconfig gettext ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
       MTP, and other vendor specific protocols for controlling and transferring data
       from digital cameras.
     '';
-    version = "2.5.8";
+    version = "2.5.9";
     # XXX: the homepage claims LGPL, but several src files are lgpl21Plus
     license = stdenv.lib.licenses.lgpl21Plus;
     platforms = with stdenv.lib.platforms; unix;

From 4251a1aacb9cf9e842aac9b3cfbc7400aebd26eb Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 04:43:17 +0300
Subject: [PATCH 114/884] asdf: 3.1.5 -> 3.1.6

---
 pkgs/development/lisp-modules/asdf/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/lisp-modules/asdf/default.nix b/pkgs/development/lisp-modules/asdf/default.nix
index 6b7b88469b1e..dbf429d8daf8 100644
--- a/pkgs/development/lisp-modules/asdf/default.nix
+++ b/pkgs/development/lisp-modules/asdf/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="asdf";
-    version="3.1.5";
+    version="3.1.6";
     name="${baseName}-${version}";
-    hash="1barrkj549d24pyh86gdc8v3vvsv4w7k0kkfg0zzrvhg8x8al19h";
-    url="http://common-lisp.net/project/asdf/archives/asdf-3.1.5.tar.gz";
-    sha256="1barrkj549d24pyh86gdc8v3vvsv4w7k0kkfg0zzrvhg8x8al19h";
+    hash="0535pf1828w5q6ydhmawf5f33xh6bc2czw76llgpikla0gdzh58w";
+    url="http://common-lisp.net/project/asdf/archives/asdf-3.1.6.tar.gz";
+    sha256="0535pf1828w5q6ydhmawf5f33xh6bc2czw76llgpikla0gdzh58w";
   };
   buildInputs = [
     texinfo texLive perl

From 1406e8e6936af1bde991e93289d88ca478f38bc2 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 02:46:05 +0100
Subject: [PATCH 115/884] angelscript: 2.30.1 -> 2.30.2

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

diff --git a/pkgs/development/interpreters/angelscript/default.nix b/pkgs/development/interpreters/angelscript/default.nix
index a6e6cce9a8e1..f5ff0315beef 100644
--- a/pkgs/development/interpreters/angelscript/default.nix
+++ b/pkgs/development/interpreters/angelscript/default.nix
@@ -3,10 +3,10 @@ let
   s = # Generated upstream information
   rec {
     baseName="angelscript";
-    version = "2.30.1";
+    version = "2.30.2";
     name="${baseName}-${version}";
     url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip";
-    sha256 = "10ym7185h26gzmw5v6wz8zlycw8gzygv0aw87dmgjcyy7qfk74m4";
+    sha256 = "1myp691m0nzv51pyfq6qmjyi0asbkx2v8slrnhj32s6aq55pf24c";
   };
   buildInputs = [
     unzip

From 81aa158838e2dc96b5773033c3ea06858b5519d4 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 02:48:48 +0100
Subject: [PATCH 116/884] botanUnstable: 1.11.19 -> 1.11.25

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

diff --git a/pkgs/development/libraries/botan/unstable.nix b/pkgs/development/libraries/botan/unstable.nix
index 5685d2618298..172c18480adb 100644
--- a/pkgs/development/libraries/botan/unstable.nix
+++ b/pkgs/development/libraries/botan/unstable.nix
@@ -2,7 +2,7 @@
 
 callPackage ./generic.nix (args // {
   baseVersion = "1.11";
-  revision = "19";
-  sha256 = "0a1hgd3w2pyn6yx89bal61bkxxazv0p8x8x4kri73p1b4vj3n3sb";
+  revision = "25";
+  sha256 = "1spjryza9yznbsa26i1kg3hz4ifjdi6cjhfd2h2lqg07xyf2a66c";
   openssl = null;
 })

From 1dba4b4e6af2c427d2e21986e253fff45df485ec Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 02:53:01 +0100
Subject: [PATCH 117/884] scons: 2.3.6 -> 2.4.1

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

diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix
index a2b79d77e22c..37035b8c44d3 100644
--- a/pkgs/development/tools/build-managers/scons/default.nix
+++ b/pkgs/development/tools/build-managers/scons/default.nix
@@ -2,7 +2,7 @@
 
 let
   name = "scons";
-  version = "2.3.6";
+  version = "2.4.1";
 in
 
 stdenv.mkDerivation {
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://sourceforge/scons/${name}-${version}.tar.gz";
-    sha256 = "1pq44h0ndclbrwvx901zih63jnzqsyyr865zlml40klg3lssmbcq";
+    sha256 = "19skywi4sb8riivvrylkjrjhnw1cdxj4ps8v7srwp6y650lz9i4g";
   };
 
   buildInputs = [python makeWrapper];

From 8d81c0ada284da64cc6d31bbd48957c9bf659ec9 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 02:54:26 +0100
Subject: [PATCH 118/884] =?UTF-8?q?cdk:=20a=20new=20release=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/libraries/cdk/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/cdk/default.nix b/pkgs/development/libraries/cdk/default.nix
index f998f4644579..94edc46fc4c5 100644
--- a/pkgs/development/libraries/cdk/default.nix
+++ b/pkgs/development/libraries/cdk/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   inherit buildInputs;
   src = fetchurl {
     url = "http://invisible-island.net/datafiles/release/cdk.tar.gz";
-    sha256 = "00s87kq5x10x22azr6q17b663syk169y3dk3kaj8z6dlk2b8vknp";
+    sha256 = "0j74l874y33i26y5kjg3pf1vswyjif8k93pqhi0iqykpbxfsg382";
   };
   meta = {
     description = ''Curses development kit'';

From b2ac241e958c767c4d817e65c37802014499d7a4 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 02:54:56 +0100
Subject: [PATCH 119/884] iptables: 1.4.21 -> 1.6.0

---
 pkgs/os-specific/linux/iptables/default.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix
index 2221250d57c0..8c815029661b 100644
--- a/pkgs/os-specific/linux/iptables/default.nix
+++ b/pkgs/os-specific/linux/iptables/default.nix
@@ -1,14 +1,22 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, bison, flex, libnetfilter_conntrack, libnftnl, libmnl}:
 
 stdenv.mkDerivation rec {
   name = "iptables-${version}";
-  version = "1.4.21";
+  version = "1.6.0";
 
   src = fetchurl {
     url = "http://www.netfilter.org/projects/iptables/files/${name}.tar.bz2";
-    sha256 = "1q6kg7sf0pgpq0qhab6sywl23cngxxfzc9zdzscsba8x09l4q02j";
+    sha256 = "0q0w1x4aijid8wj7dg1ny9fqwll483f1sqw7kvkskd8q1c52mdsb";
   };
 
+  nativeBuildInputs = [bison flex];
+
+  buildInputs = [libnetfilter_conntrack libnftnl libmnl];
+
+  preConfigure = ''
+    export NIX_LDFLAGS="$NIX_LDFLAGS -lmnl -lnftnl"
+  '';
+
   configureFlags = ''
     --enable-devel
     --enable-shared

From c8b975388235823322a0962f88f05594229435e3 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 04:55:28 +0300
Subject: [PATCH 120/884] eigen: 3.2.5 -> 3.3-alpha1

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

diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix
index 0e43b9fb6020..150b72cf2f55 100644
--- a/pkgs/development/libraries/eigen/default.nix
+++ b/pkgs/development/libraries/eigen/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, cmake}:
 
 let
-  version = "3.2.5";
+  version = "3.3-alpha1";
 in
 stdenv.mkDerivation {
   name = "eigen-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   src = fetchurl {
     url = "http://bitbucket.org/eigen/eigen/get/${version}.tar.gz";
     name = "eigen-${version}.tar.gz";
-    sha256 = "1vjixip19lwfia2bjpjwm09j7l20ry75493i6mjsk9djszj61agi";
+    sha256 = "00vmxz3da76ml3j7s8w8447sdpszx71i3xhnmwivxhpc4smpvz2q";
   };
   
   nativeBuildInputs = [ cmake ];

From e00cdaa6a2f43029ce5c43b64a127a7fa3554c12 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 12:25:53 +0300
Subject: [PATCH 121/884] librevenge: 0.0.2 -> 0.0.3

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

diff --git a/pkgs/development/libraries/librevenge/default.nix b/pkgs/development/libraries/librevenge/default.nix
index fa90c76b24af..dc7634c958cb 100644
--- a/pkgs/development/libraries/librevenge/default.nix
+++ b/pkgs/development/libraries/librevenge/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="librevenge";
-    version="0.0.2";
+    version="0.0.3";
     name="${baseName}-${version}";
-    hash="03ygxyb0vfjv8raif5q62sl33b54wkr5rzgadb8slijm6k281wpn";
-    url="mirror://sourceforge/project/libwpd/librevenge/librevenge-0.0.2/librevenge-0.0.2.tar.xz";
-    sha256="03ygxyb0vfjv8raif5q62sl33b54wkr5rzgadb8slijm6k281wpn";
+    hash="1r0n5q7rw32h5fhnxfl7f4pwvprn9agpf117nhn71jrjqx57irvw";
+    url="mirror://sourceforge/project/libwpd/librevenge/librevenge-0.0.3/librevenge-0.0.3.tar.xz";
+    sha256="1r0n5q7rw32h5fhnxfl7f4pwvprn9agpf117nhn71jrjqx57irvw";
   };
   buildInputs = [
     boost pkgconfig cppunit zlib

From 1a085b0c54305d12892522e548db03ea002548b0 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 12:26:14 +0300
Subject: [PATCH 122/884] libre: 0.4.13 -> 0.4.14

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

diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix
index f73ddfe340eb..17226ef17c48 100644
--- a/pkgs/development/libraries/libre/default.nix
+++ b/pkgs/development/libraries/libre/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, zlib, openssl}:
 stdenv.mkDerivation rec {
-  version = "0.4.13";
+  version = "0.4.14";
   name = "libre-${version}";
   src=fetchurl {
     url = "http://www.creytiv.com/pub/re-${version}.tar.gz";
-    sha256 = "0496nfi7vi6ivnyici5bqs147pwkdqn48w2rajhr5k8jd07pq5qp";
+    sha256 = "0ylv7v77jsny0a5wfc8i6dxsp8bjlmlz2gcyyv7x49c76pk0gdcy";
   };
   buildInputs = [zlib openssl];
   makeFlags = [

From b02d4c5d276452a10d687e40740d7ea10108c8aa Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 12:26:38 +0300
Subject: [PATCH 123/884] librem: 0.4.6 -> 0.4.7

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

diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix
index 817e1c79bc7c..730916bf9d3b 100644
--- a/pkgs/development/libraries/librem/default.nix
+++ b/pkgs/development/libraries/librem/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, zlib, openssl, libre}:
 stdenv.mkDerivation rec {
-  version = "0.4.6";
+  version = "0.4.7";
   name = "librem-${version}";
   src=fetchurl {
     url = "http://www.creytiv.com/pub/rem-${version}.tar.gz";
-    sha256 = "0rgqy9pqn730ijxvz1gk0virsf6jwjmq02s99jqqrfm3p0g6zs3w";
+    sha256 = "0klm6ls9w0cj66h1zxmx0ifsihlmq1bq75vbmf09d0vvw5g4y22x";
   };
   buildInputs = [zlib openssl libre];
   makeFlags = [

From 3279ab1de482c487ce3f15f1c1e66865700222d0 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 12:27:02 +0300
Subject: [PATCH 124/884] libodfgen: 0.1.4 -> 0.1.6

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

diff --git a/pkgs/development/libraries/libodfgen/default.nix b/pkgs/development/libraries/libodfgen/default.nix
index e8778ff413a0..341ef3723516 100644
--- a/pkgs/development/libraries/libodfgen/default.nix
+++ b/pkgs/development/libraries/libodfgen/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="libodfgen";
-    version="0.1.4";
+    version="0.1.6";
     name="${baseName}-${version}";
-    hash="1qgilnsd57ayv9mqh4sg9mkknifr98dv70a35gizxh5cw7c5x6r4";
-    url="mirror://sourceforge/project/libwpd/libodfgen/libodfgen-0.1.4/libodfgen-0.1.4.tar.xz";
-    sha256="1qgilnsd57ayv9mqh4sg9mkknifr98dv70a35gizxh5cw7c5x6r4";
+    hash="1sdr42f0bigip14zhs51m0zdwwzzl1mwmk882l4khpph8jmi1ch3";
+    url="mirror://sourceforge/project/libwpd/libodfgen/libodfgen-0.1.6/libodfgen-0.1.6.tar.xz";
+    sha256="1sdr42f0bigip14zhs51m0zdwwzzl1mwmk882l4khpph8jmi1ch3";
   };
   buildInputs = [
     boost pkgconfig cppunit zlib libwpg libwpd librevenge

From 8efa3745c7b4101b6981682d08e597b55ba0b6d5 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 12:27:26 +0300
Subject: [PATCH 125/884] libmwaw: 0.3.5 -> 0.3.7

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

diff --git a/pkgs/development/libraries/libmwaw/default.nix b/pkgs/development/libraries/libmwaw/default.nix
index 2ef10f41d9af..7354111e1314 100644
--- a/pkgs/development/libraries/libmwaw/default.nix
+++ b/pkgs/development/libraries/libmwaw/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="libmwaw";
-    version="0.3.5";
+    version="0.3.7";
     name="${baseName}-${version}";
-    hash="1vx9h419fcfcs0yj071hsg9d2qvkacgca6052m8hv3h743cdmzil";
-    url="mirror://sourceforge/project/libmwaw/libmwaw/libmwaw-0.3.5/libmwaw-0.3.5.tar.xz";
-    sha256="1vx9h419fcfcs0yj071hsg9d2qvkacgca6052m8hv3h743cdmzil";
+    hash="1yg8zvv71r6wsrj71as1ngavj07527d8vrzdrf7s4yf2f7l12xh5";
+    url="mirror://sourceforge/project/libmwaw/libmwaw/libmwaw-0.3.7/libmwaw-0.3.7.tar.xz";
+    sha256="1yg8zvv71r6wsrj71as1ngavj07527d8vrzdrf7s4yf2f7l12xh5";
   };
   buildInputs = [
     boost pkgconfig cppunit zlib libwpg libwpd librevenge

From ff853a98fbe8bc02fd13a3339e767b45015d9f70 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 12:29:21 +0300
Subject: [PATCH 126/884] =?UTF-8?q?libreoffice:=20readd=20and=20fix=20the?=
 =?UTF-8?q?=20script=20to=20generate=20fetch=20list=20for=20LibreOffice.?=
 =?UTF-8?q?=20Migrating=20all=20of=20these=20to=20system=20packages=20woul?=
 =?UTF-8?q?d=20not=20work=20without=20patching=20the=20build=20system,=20I?=
 =?UTF-8?q?=20am=20afraid=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../libreoffice/generate-libreoffice-srcs.sh  | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100755 pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh

diff --git a/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh b/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh
new file mode 100755
index 000000000000..d77b41a0480e
--- /dev/null
+++ b/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh
@@ -0,0 +1,54 @@
+#!/run/current-system/sw/bin/bash
+
+# Take the list of files from the main package, ooo.lst.in
+
+cat <<EOF
+[
+EOF
+
+write_entry(){
+  echo '{'
+  echo "  name = \"${name}\";"
+  echo "  md5 = \"${md5}\";"
+  echo "  brief = ${brief};"
+  echo '}'
+}
+
+while read line; do
+  case "$line" in
+    \#*)
+      echo Skipping comment: "$line" >&2;
+      ;;
+    *_MD5SUM\ :=*)
+      read tbline;
+      line=${line##* };
+      if [ "${tbline#*VERSION_MICRO}" != "$tbline" ]; then
+         verline=${tbline##* };
+         read tbline;
+         tbline=${tbline##* };
+         md5=$line
+         name=$tbline;
+         name="${name/\$([A-Z]*_VERSION_MICRO)/$verline}"
+      else
+         tbline=${tbline##* };
+         md5=$line
+         name=$tbline;
+      fi
+      brief=true;
+      write_entry;
+      ;;
+    *_TARBALL\ :=*)
+      line=${line##* };
+      line="${line#,}"
+      md5=${line:0:32};
+      name=${line:33};
+      brief=false;
+      write_entry;
+      ;;
+    *)
+      echo Skipping: "$line" >&2;
+      ;;
+  esac
+done
+
+echo ']'

From a413b8fde1f82474133491b84321897de1e44cae Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 12:30:06 +0300
Subject: [PATCH 127/884] libreoffice: 5.0.2.2 -> 5.0.4.2

---
 .../office/libreoffice/default.nix            |   8 +-
 .../office/libreoffice/libreoffice-srcs.nix   | 168 +++++++++++++++---
 2 files changed, 152 insertions(+), 24 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 55bdd8eceb06..da6749f2bf5b 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -20,7 +20,7 @@ let
   langsSpaces = stdenv.lib.concatStringsSep " " langs;
   major = "5";
   minor = "0";
-  patch = "2";
+  patch = "4";
   tweak = "2";
   subdir = "${major}.${minor}.${patch}";
   version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
@@ -47,14 +47,14 @@ let
 
     translations = fetchSrc {
       name = "translations";
-      sha256 = "06w1gz78136bs6fbwslxz5zsg538yqfarkq1am7zn8rzczz2qplh";
+      sha256 = "1kdrs49agqhb2b687hqh6sq7328z2sf04dmhb3xv5zy4rjvv5pha";
     };
 
     # TODO: dictionaries
 
     help = fetchSrc {
       name = "help";
-      sha256 = "157hypz093vhqbysygx5q4fbb81785m2b7slccfkp8x87dcsahj3";
+      sha256 = "005jwny8xmsnvvh0xkk9csnqv2jkaslr2n9xm82bqalcg81j0g2x";
     };
 
   };
@@ -63,7 +63,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
-    sha256 = "0xn1pg72vfdajmhak6chajvd51h74jqvq2565xv3j823143niw01";
+    sha256 = "1j3dmk5xifcgmd6dgqqifzh8wmc7daqfbkvk6cxa94611yvl0x34";
   };
 
   # Openoffice will open libcups dynamically, so we link it directly
diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
index 22cf1857ae48..0e7525782c6b 100644
--- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
+++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
@@ -1,15 +1,14 @@
-# DEPRECATED: these dependencies sould be system libraries
 [
+{
+  name = "libabw-0.1.1.tar.bz2";
+  md5 = "7a3815b506d064313ba309617b6f5a0b";
+  brief = true;
+}
 {
   name = "commons-codec-1.6-src.tar.gz";
   md5 = "2e482c7567908d334785ce7d69ddfff7";
   brief = false;
 }
-{
-  name = "commons-codec-1.9-src.zip";
-  md5 = "048751f3271906db5126ab76870444c4";
-  brief = false;
-}
 {
   name = "commons-httpclient-3.1-src.tar.gz";
   md5 = "2c9b0f83ed5890af02c0df1c1776f39b";
@@ -20,11 +19,6 @@
   md5 = "625ff5f2f968dd908bca43c9469d6e6b";
   brief = false;
 }
-{
-  name = "commons-lang3-3.3.1-src.tar.gz";
-  md5 = "8ab049135b2d15313da5d9f0656894a1";
-  brief = false;
-}
 {
   name = "commons-logging-1.2-src.tar.gz";
   md5 = "ce977548f1cbf46918e93cd38ac35163";
@@ -40,21 +34,61 @@
   md5 = "71a11d037240b292f824ba1eb537b4e3";
   brief = true;
 }
+{
+  name = "boost_1_55_0.tar.bz2";
+  md5 = "d6eef4b4cacb2183f2bf265a5a03a354";
+  brief = false;
+}
+{
+  name = "bsh-2.0b5-src.zip";
+  md5 = "ec1941a74d3ef513c4ce57a9092b74e1";
+  brief = false;
+}
+{
+  name = "cairo-1.10.2.tar.gz";
+  md5 = "f101a9e88b783337b20b2e26dfd26d5f";
+  brief = false;
+}
+{
+  name = "libcdr-0.1.1.tar.bz2";
+  md5 = "b33fd0be3befdd1b37777e08ce058bd9";
+  brief = true;
+}
 {
   name = "clucene-core-2.3.3.4.tar.gz";
   md5 = "48d647fbd8ef8889e5a7f422c1bfda94";
   brief = false;
 }
+{
+  name = "libcmis-0.5.0.tar.gz";
+  md5 = "5821b806a98e6c38370970e682ce76e8";
+  brief = false;
+}
+{
+  name = "CoinMP-1.7.6.tgz";
+  md5 = "1cce53bf4b40ae29790d2c5c9f8b1129";
+  brief = true;
+}
 {
   name = "collada2gltf-master-cb1d97788a.tar.bz2";
   md5 = "4b87018f7fff1d054939d19920b751a0";
   brief = false;
 }
 {
-  name = "ConvertTextToNumber-1.3.2.oxt";
-  md5 = "451ccf439a36a568653b024534669971";
+  name = "cppunit-1.13.2.tar.gz";
+  md5 = "d1c6bdd5a76c66d2c38331e2d287bc01";
+  brief = true;
+}
+{
+  name = "converttexttonumber-1-5-0.oxt";
+  md5 = "1f467e5bb703f12cbbb09d5cf67ecf4a";
   brief = false;
 }
+{
+  name = "curl-7.43.0.tar.bz2";
+  md5 = "11bddbb452a8b766b932f859aaeeed39";
+  brief = true;
+}
 {
   name = "libe-book-0.1.2.tar.bz2";
   md5 = "6b48eda57914e6343efebc9381027b78";
@@ -75,6 +109,16 @@
   md5 = "dd7dab7a5fea97d2a6a43f511449b7cd";
   brief = false;
 }
+{
+  name = "Firebird-2.5.2.26540-0.tar.bz2";
+  md5 = "21154d2004e025c8a3666625b0357bb5";
+  brief = true;
+}
+{
+  name = "fontconfig-2.8.0.tar.gz";
+  md5 = "77e15a92006ddc2adbb06f840d591c0e";
+  brief = false;
+}
 {
   name = "crosextrafonts-20130214.tar.gz";
   md5 = "368f114c078f94214a308a74c7e991bc";
@@ -140,6 +184,16 @@
   md5 = "dbf2caca1d3afd410a29217a9809d397";
   brief = false;
 }
+{
+  name = "glew-1.10.0.zip";
+  md5 = "594eb47b4b1210e25438d51825404d5a";
+  brief = false;
+}
+{
+  name = "glm-0.9.4.6-libreoffice.zip";
+  md5 = "bae83fa5dc7f081768daace6e199adc3";
+  brief = false;
+}
 {
   name = "graphite2-1.2.4.tgz";
   md5 = "2ef839348fe28e3b923bf8cced440227";
@@ -226,8 +280,18 @@
   brief = false;
 }
 {
-  name = "language-subtag-registry-2015-06-08.tar.bz2";
-  md5 = "d431bd8a70455be1fa8523fa633c005b";
+  name = "jpegsrc.v9a.tar.gz";
+  md5 = "3353992aecaee1805ef4109aadd433e7";
+  brief = true;
+}
+{
+  name = "libjpeg-turbo-1.3.1.tar.gz";
+  md5 = "2c3a68129dac443a72815ff5bb374b05";
+  brief = true;
+}
+{
+  name = "language-subtag-registry-2015-08-04.tar.bz2";
+  md5 = "bf5986dbfa1c9a0f26cf1b00ed369484";
   brief = true;
 }
 {
@@ -259,7 +323,6 @@
   name = "libgltf-0.0.2.tar.bz2";
   md5 = "d63a9f47ab048f5009d90693d6aa6424";
   brief = true;
-  subDir = "libgltf/";
 }
 {
   name = "liblangtag-0.5.1.tar.bz2";
@@ -271,11 +334,26 @@
   md5 = "1f24ab1d39f4a51faf22244c94a6203f";
   brief = false;
 }
+{
+  name = "libxml2-2.9.3.tar.gz";
+  md5 = "daece17e045f1c107610e137ab50c179";
+  brief = false;
+}
+{
+  name = "libxslt-1.1.28.tar.gz";
+  md5 = "9667bf6f9310b957254fdcf6596600b7";
+  brief = false;
+}
 {
   name = "lp_solve_5.5.tar.gz";
   md5 = "26b3e95ddf3d9c077c480ea45874b3b8";
   brief = false;
 }
+{
+  name = "mariadb_client-2.0.0-src.tar.gz";
+  md5 = "a233181e03d3c307668b4c722d881661";
+  brief = false;
+}
 {
   name = "mdds_0.12.1.tar.bz2";
   md5 = "ef2560ed5416652a7fe195305b14cebe";
@@ -307,8 +385,8 @@
   brief = false;
 }
 {
-  name = "nss-3.19.2-with-nspr-4.10.8.tar.gz";
-  md5 = "2100bc5a7ea9685928ff68cda2e60569";
+  name = "nss-3.19.4-with-nspr-4.10.10.tar.gz";
+  md5 = "478e0e90ebc4a90159549e77021021fd";
   brief = false;
 }
 {
@@ -321,6 +399,16 @@
   md5 = "4ca8a6ef0afeefc864e9ef21b9f14bd6";
   brief = true;
 }
+{
+  name = "openldap-2.4.31.tgz";
+  md5 = "804c6cb5698db30b75ad0ff1c25baefd";
+  brief = false;
+}
+{
+  name = "openssl-1.0.2a.tar.gz";
+  md5 = "a06c547dac9044161a477211049f60ef";
+  brief = true;
+}
 {
   name = "liborcus-0.7.0.tar.bz2";
   md5 = "7681383be6ce489d84c1c74f4e7f9643";
@@ -337,8 +425,8 @@
   brief = false;
 }
 {
-  name = "libpng-1.5.18.tar.gz";
-  md5 = "5266905cef49d1224437465ad4d67fd9";
+  name = "libpng-1.5.24.tar.gz";
+  md5 = "6652e428d1d3fc3c6cb1362159b1cf3b";
   brief = true;
 }
 {
@@ -346,6 +434,16 @@
   md5 = "35c0660065d023365e9854c13e289d12";
   brief = true;
 }
+{
+  name = "postgresql-9.2.1.tar.bz2";
+  md5 = "c0b4799ea9850eae3ead14f0a60e9418";
+  brief = false;
+}
+{
+  name = "Python-3.3.5.tgz";
+  md5 = "803a75927f8f241ca78633890c798021";
+  brief = true;
+}
 {
   name = "raptor2-2.0.9.tar.gz";
   md5 = "4ceb9316488b0ea01acf011023cf7fff";
@@ -386,9 +484,39 @@
   md5 = "0168229624cfac409e766913506961a8";
   brief = false;
 }
+{
+  name = "vigra1.6.0.tar.gz";
+  md5 = "d62650a6f908e85643e557a236ea989c";
+  brief = false;
+}
+{
+  name = "libvisio-0.1.1.tar.bz2";
+  md5 = "726c1f5be65eb7d649e0d48b63d920e7";
+  brief = true;
+}
+{
+  name = "libwpd-0.10.0.tar.bz2";
+  md5 = "0773d79a1f240ef9f4f20242b13c5bb7";
+  brief = true;
+}
+{
+  name = "libwpg-0.3.0.tar.bz2";
+  md5 = "17da9770cb8b317b7633f9807b32b71a";
+  brief = true;
+}
+{
+  name = "libwps-0.4.0.tar.bz2";
+  md5 = "e9162d2566421d9d71b3ad2377a68fd5";
+  brief = true;
+}
 {
   name = "xsltml_2.1.2.zip";
   md5 = "a7983f859eafb2677d7ff386a023bc40";
   brief = false;
 }
+{
+  name = "zlib-1.2.8.tar.gz";
+  md5 = "44d667c142d7cda120332623eab69f40";
+  brief = true;
+}
 ]

From 30ff95ea594795f13411d2c0e2ed623c13102903 Mon Sep 17 00:00:00 2001
From: Sven Keidel <svenkeidel@googlemail.com>
Date: Fri, 1 Jan 2016 12:00:11 +0100
Subject: [PATCH 128/884] cool-retro-term: add missing dependencies and fix
 qmltermwidget

---
 pkgs/applications/misc/cool-retro-term/default.nix   | 5 +++--
 pkgs/development/libraries/qmltermwidget/default.nix | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/cool-retro-term/default.nix b/pkgs/applications/misc/cool-retro-term/default.nix
index 890bc2c016b0..92328ab9846c 100644
--- a/pkgs/applications/misc/cool-retro-term/default.nix
+++ b/pkgs/applications/misc/cool-retro-term/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchgit, makeQtWrapper, qtbase, qtquick1, qmltermwidget }:
+{ stdenv, fetchgit, makeQtWrapper, qtbase, qtquick1, qmltermwidget,
+qtquickcontrols, qtgraphicaleffects }:
 
 stdenv.mkDerivation rec {
   version = "1.0.0";
@@ -15,7 +16,7 @@ stdenv.mkDerivation rec {
     sed -i -e '/qmltermwidget/d' cool-retro-term.pro
   '';
 
-  buildInputs = [ qtbase qtquick1 qmltermwidget ];
+  buildInputs = [ qtbase qtquick1 qmltermwidget qtquickcontrols qtgraphicaleffects ];
   nativeBuildInputs = [ makeQtWrapper ];
 
   configurePhase = "qmake PREFIX=$out";
diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix
index 24e1d2c9b9c1..64d8570460cb 100644
--- a/pkgs/development/libraries/qmltermwidget/default.nix
+++ b/pkgs/development/libraries/qmltermwidget/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   patchPhase = ''
     substituteInPlace qmltermwidget.pro \
-      --replace '$$[QT_INSTALL_QML]' "/lib/qml/"
+      --replace '$$[QT_INSTALL_QML]' "/lib/qt5/qml/"
   '';
 
   configurePhase = "qmake PREFIX=$out";

From 1ac4839968d0961205ebf314f8eb699d9fd758d1 Mon Sep 17 00:00:00 2001
From: Christian Theune <ct@flyingcircus.io>
Date: Fri, 1 Jan 2016 12:43:16 +0100
Subject: [PATCH 129/884] Fix "net" dependency for go1.4 packages.

This was broken when we updated to syncthing 0.12 but wasn't noticed for
some reason. Nox caught this now.
---
 pkgs/top-level/go-packages.nix | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 1256d8ae05e2..289098410d80 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -57,9 +57,9 @@ let
     goPackageAliases = [ "github.com/golang/image" ];
   };
 
-  net = buildFromGitHub {
+  net_go15 = buildFromGitHub {
     rev    = "62ac18b461605b4be188bbc7300e9aa2bc836cd4";
-    date   = "2015-08-29";
+    date   = "2015-11-04";
     owner  = "golang";
     repo   = "net";
     sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p";
@@ -72,6 +72,23 @@ let
     propagatedBuildInputs = [ text crypto ];
   };
 
+  net_go14 = buildFromGitHub {
+    rev    = "ea47fc708ee3e20177f3ca3716217c4ab75942cb";
+    date   = "2015-08-29";
+    owner  = "golang";
+    repo   = "net";
+    sha256 = "0x1pmg97n7l62vak9qnjdjrrfl98jydhv6j0w3jkk4dycdlzn30d";
+    goPackagePath = "golang.org/x/net";
+    goPackageAliases = [
+      "code.google.com/p/go.net"
+      "github.com/hashicorp/go.net"
+      "github.com/golang/net"
+    ];
+    propagatedBuildInputs = [ text ];
+  };
+
+  net = if isGo14 then net_go14 else net_go15;
+
   oauth2 = buildFromGitHub {
     rev = "397fe7649477ff2e8ced8fc0b2696f781e53745a";
     date = "2015-06-23";

From 94102eaa417d6eada115277e900ee280910a6f18 Mon Sep 17 00:00:00 2001
From: Christian Theune <ct@flyingcircus.io>
Date: Fri, 1 Jan 2016 13:10:44 +0100
Subject: [PATCH 130/884] Disable Go-version-specific net packages to avoid
 accidental builds and dependencies.

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

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 289098410d80..f480fb756e7f 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -70,6 +70,7 @@ let
       "github.com/golang/net"
     ];
     propagatedBuildInputs = [ text crypto ];
+    disabled = isGo14;
   };
 
   net_go14 = buildFromGitHub {
@@ -85,6 +86,7 @@ let
       "github.com/golang/net"
     ];
     propagatedBuildInputs = [ text ];
+    disabled = !isGo14;
   };
 
   net = if isGo14 then net_go14 else net_go15;

From 3bd03f31419f4f2fb02990df600db253173f1e3f Mon Sep 17 00:00:00 2001
From: leenaars <michiel.ml@nlnet.nl>
Date: Fri, 1 Jan 2016 14:16:32 +0100
Subject: [PATCH 131/884] xf86-input-wacom: 0.31.0 -> 0.32.0

---
 pkgs/os-specific/linux/xf86-input-wacom/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix
index fca9dab22619..3d3b52acf6fd 100644
--- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix
+++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix
@@ -3,11 +3,11 @@
 , ncurses, pkgconfig, randrproto, xorgserver, xproto, udev, libXinerama, pixman }:
 
 stdenv.mkDerivation rec {
-  name = "xf86-input-wacom-0.31.0";
+  name = "xf86-input-wacom-0.32.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/linuxwacom/${name}.tar.bz2";
-    sha256 = "0xiz5vpkp8zm5m2k909sbvm9v8rf6hwn3gvqr2msswc00hzp5sg7";
+    sha256 = "03c73vi5rrcr92442k82f4kbabp21yqcrqi6ak2afl41zjdar5wc";
   };
 
   buildInputs = [ inputproto libX11 libXext libXi libXrandr libXrender

From a60418a7705a4a835bebbd7e8d9e133ec245ef00 Mon Sep 17 00:00:00 2001
From: Reno Reckling <exi@wthack.de>
Date: Fri, 1 Jan 2016 14:57:28 +0100
Subject: [PATCH 132/884] bomi: fix missing build dependency

The build fails without specifying qtquickcontrols as a build input
---
 pkgs/applications/video/bomi/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/video/bomi/default.nix b/pkgs/applications/video/bomi/default.nix
index 36da9d320721..f1a999e5554e 100644
--- a/pkgs/applications/video/bomi/default.nix
+++ b/pkgs/applications/video/bomi/default.nix
@@ -56,6 +56,7 @@ stdenv.mkDerivation rec {
                   libvdpau
                   libva
                   libbluray
+                  qtquickcontrols
                 ]
                 ++ optional jackSupport jack
                 ++ optional portaudioSupport portaudio

From a1ade02cdc75a11013c49ad12c7bb4feeec0d080 Mon Sep 17 00:00:00 2001
From: janus <janus@xn--kn-1ia.guru>
Date: Tue, 24 Nov 2015 10:59:39 +0000
Subject: [PATCH 133/884] FreeBSD support

---
 pkgs/applications/altcoins/bitcoin.nix        |  5 +++--
 pkgs/development/compilers/sbcl/bootstrap.nix |  6 ++++-
 pkgs/development/libraries/db/clang-4.8.patch | 22 +++++++++++++++++++
 .../db/{osx.patch => clang-5.3.patch}         |  0
 pkgs/development/libraries/db/db-4.8.nix      |  1 +
 pkgs/development/libraries/db/db-5.3.nix      |  2 +-
 pkgs/development/libraries/glib/default.nix   |  2 +-
 .../libraries/libiconv/default.nix            |  3 ++-
 pkgs/tools/compression/bzip2/default.nix      |  5 +++--
 pkgs/tools/networking/miniupnpc/default.nix   |  2 +-
 10 files changed, 39 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/development/libraries/db/clang-4.8.patch
 rename pkgs/development/libraries/db/{osx.patch => clang-5.3.patch} (100%)

diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix
index bdd0335fe3b5..fb2827c4bd3e 100644
--- a/pkgs/applications/altcoins/bitcoin.nix
+++ b/pkgs/applications/altcoins/bitcoin.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost
-, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode
+, zlib, miniupnpc, qt4, protobuf, qrencode
 , withGui }:
 
 with stdenv.lib;
@@ -17,7 +17,8 @@ stdenv.mkDerivation rec{
   };
 
   buildInputs = [ pkgconfig autoreconfHook openssl db48 boost zlib
-                  miniupnpc utillinux protobuf ]
+                  miniupnpc protobuf ]
+                  ++ optionals stdenv.isLinux [ utillinux ]
                   ++ optionals withGui [ qt4 qrencode ];
 
   configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ]
diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix
index 0114f014a51e..4152bb8b2a3f 100644
--- a/pkgs/development/compilers/sbcl/bootstrap.nix
+++ b/pkgs/development/compilers/sbcl/bootstrap.nix
@@ -23,7 +23,11 @@ let
       sha256 = "0sp5445rbvms6qvzhld0kwwvydw51vq5iaf4kdqsf2d9jvaz3yx5";
     };
     armv6l-linux = armv7l-linux;
-    x86_64-solaris = x86_64-linux;
+    x86_64-freebsd = rec {
+      version = "1.2.7";
+      system = "x86-64-freebsd";
+      sha256 = "14k42xiqd2rrim4pd5k5pjcrpkac09qnpynha8j1v4jngrvmw7y6";
+    };
   };
   cfg = options.${stdenv.system};
 in
diff --git a/pkgs/development/libraries/db/clang-4.8.patch b/pkgs/development/libraries/db/clang-4.8.patch
new file mode 100644
index 000000000000..c53160a82970
--- /dev/null
+++ b/pkgs/development/libraries/db/clang-4.8.patch
@@ -0,0 +1,22 @@
+diff --git a/dbinc/atomic.h b/dbinc/atomic.h
+index 0034dcc..fa7ba93 100644
+--- a/dbinc/atomic.h
++++ b/dbinc/atomic.h
+@@ -144,7 +144,7 @@ typedef LONG volatile *interlocked_val;
+ #define	atomic_inc(env, p)	__atomic_inc(p)
+ #define	atomic_dec(env, p)	__atomic_dec(p)
+ #define	atomic_compare_exchange(env, p, o, n)	\
+-	__atomic_compare_exchange((p), (o), (n))
++	__db_atomic_compare_exchange((p), (o), (n))
+ static inline int __atomic_inc(db_atomic_t *p)
+ {
+ 	int	temp;
+@@ -176,7 +176,7 @@ static inline int __atomic_dec(db_atomic_t *p)
+  * http://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html
+  * which configure could be changed to use.
+  */
+-static inline int __atomic_compare_exchange(
++static inline int __db_atomic_compare_exchange(
+ 	db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval)
+ {
+ 	atomic_value_t was;
diff --git a/pkgs/development/libraries/db/osx.patch b/pkgs/development/libraries/db/clang-5.3.patch
similarity index 100%
rename from pkgs/development/libraries/db/osx.patch
rename to pkgs/development/libraries/db/clang-5.3.patch
diff --git a/pkgs/development/libraries/db/db-4.8.nix b/pkgs/development/libraries/db/db-4.8.nix
index 9b5e8cb39bda..6a161b0b72d8 100644
--- a/pkgs/development/libraries/db/db-4.8.nix
+++ b/pkgs/development/libraries/db/db-4.8.nix
@@ -2,6 +2,7 @@
 
 import ./generic.nix (args // rec {
   version = "4.8.30";
+  extraPatches = [ ./clang-4.8.patch ];
   sha256 = "0ampbl2f0hb1nix195kz1syrqqxpmvnvnfvphambj7xjrl3iljg0";
   branch = "4.8";
 })
diff --git a/pkgs/development/libraries/db/db-5.3.nix b/pkgs/development/libraries/db/db-5.3.nix
index b5e62ee686f0..98002c244612 100644
--- a/pkgs/development/libraries/db/db-5.3.nix
+++ b/pkgs/development/libraries/db/db-5.3.nix
@@ -3,6 +3,6 @@
 import ./generic.nix (args // rec {
   version = "5.3.28";
   sha256 = "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0";
-  extraPatches = [ ./osx.patch ];
+  extraPatches = [ ./clang-5.3.patch ];
   branch = "5.3";
 })
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index e53775464e03..07e1f1243ece 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -7,7 +7,7 @@
 
 with stdenv.lib;
 
-assert !stdenv.isDarwin -> stdenv.cc.isGNU;
+assert stdenv.isFreeBSD || stdenv.isDarwin || stdenv.cc.isGNU;
 
 # TODO:
 # * Add gio-module-fam
diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix
index 70b0574a7b46..24a0376f0f9f 100644
--- a/pkgs/development/libraries/libiconv/default.nix
+++ b/pkgs/development/libraries/libiconv/default.nix
@@ -19,7 +19,8 @@ stdenv.mkDerivation rec {
   # (Windows' linker would need to be used somehow to produce an actual
   # DLL.)  Thus, build the static library too, and this is what Gettext
   # will actually use.
-  configureFlags = if stdenv.isCygwin then [ "--enable-static" ] else null;
+  configureFlags = if stdenv.isCygwin then [ "--enable-static" ] else
+                   if stdenv.isFreeBSD then [ "--with-pic" ] else null;
 
   crossAttrs = {
     # Disable stripping to avoid "libiconv.a: Archive has no index" (MinGW).
diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix
index 3e835c30e3d7..bb04049d8a66 100644
--- a/pkgs/tools/compression/bzip2/default.nix
+++ b/pkgs/tools/compression/bzip2/default.nix
@@ -58,8 +58,9 @@ in stdenv.mkDerivation {
     ln -s bzip2 $out/bin/bzcat
   '';
 
-  patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
-    substituteInPlace Makefile --replace 'CC=gcc' 'CC=clang'
+  patchPhase = ''
+    substituteInPlace Makefile --replace CC=gcc CC=cc
+    substituteInPlace Makefile-libbz2_so --replace CC=gcc CC=cc
   '';
 
   preConfigure = ''
diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix
index a0ae90da4463..ba0f6c255212 100644
--- a/pkgs/tools/networking/miniupnpc/default.nix
+++ b/pkgs/tools/networking/miniupnpc/default.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
     inherit version;
     homepage = http://miniupnp.free.fr/;
     description = "A client that implements the UPnP Internet Gateway Device (IGD) specification";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.freebsd;
   };
 }

From 3cb831d2bcb6d534325178c6928bc893a14534f8 Mon Sep 17 00:00:00 2001
From: janus <janus@xn--kn-1ia.guru>
Date: Tue, 24 Nov 2015 11:37:39 +0000
Subject: [PATCH 134/884] FreeBSD patches for miniupnpc, boost, bitcoin

---
 pkgs/applications/altcoins/bitcoin.nix       |  2 +-
 pkgs/development/libraries/boost/generic.nix |  2 +-
 pkgs/tools/networking/miniupnpc/default.nix  | 13 +++++++------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix
index fb2827c4bd3e..91432f2f5a8a 100644
--- a/pkgs/applications/altcoins/bitcoin.nix
+++ b/pkgs/applications/altcoins/bitcoin.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost
-, zlib, miniupnpc, qt4, protobuf, qrencode
+, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode
 , withGui }:
 
 with stdenv.lib;
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index 2a83d7c4142d..5b497aa76b84 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -1,5 +1,5 @@
 { stdenv, icu, expat, zlib, bzip2, python, fixDarwinDylibNames
-, toolset ? if stdenv.isDarwin then "clang" else null
+, toolset ? if stdenv.isDarwin || stdenv.isFreeBSD then "clang" else null
 , enableRelease ? true
 , enableDebug ? false
 , enableSingleThreaded ? false
diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix
index ba0f6c255212..ac68b55ad17f 100644
--- a/pkgs/tools/networking/miniupnpc/default.nix
+++ b/pkgs/tools/networking/miniupnpc/default.nix
@@ -1,13 +1,14 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub }:
 
-let version = "1.9.20150430"; in
+let version = "24d54ba13af4e53aba19c23898a373feecb41bd0"; in
 stdenv.mkDerivation rec {
   name = "miniupnpc-${version}";
 
-  src = fetchurl {
-    url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
-    sha256 = "0ivnvzla0l2pzmy8s0j8ss0fnpsii7z9scvyl4a13g9k911hgmvn";
-    name = "${name}.tar.gz";
+  src = fetchFromGitHub {
+    owner = "miniupnp";
+    repo = "miniupnp";
+    sha256 = "0j78dvlfh1a3a27zhvv001cb1d7vcgyv33bd1zr36drg64b6hrgw";
+    rev = version;
   };
 
   doCheck = true;

From c01dbc4932955a8c1fa2f28a135aafaa4111ef81 Mon Sep 17 00:00:00 2001
From: janus <janus@xn--kn-1ia.guru>
Date: Tue, 24 Nov 2015 12:00:19 +0000
Subject: [PATCH 135/884] FreeBSD patches for GNU m4, stdenv, miniupnpc

---
 pkgs/development/tools/misc/gnum4/default.nix |  3 +-
 pkgs/stdenv/native/default.nix                | 94 +++++++++++++++++++
 pkgs/tools/networking/miniupnpc/default.nix   | 17 ++--
 pkgs/tools/networking/miniupnpc/freebsd.patch | 11 +++
 4 files changed, 116 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/tools/networking/miniupnpc/freebsd.patch

diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix
index 7174f4b41c3c..7216e1e169d0 100644
--- a/pkgs/development/tools/misc/gnum4/default.nix
+++ b/pkgs/development/tools/misc/gnum4/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
 
   doCheck = !stdenv.isDarwin
     && !stdenv.isCygwin                    # XXX: `test-dup2' fails on Cygwin
-    && !stdenv.isSunOS;                    # XXX: `test-setlocale2.sh' fails
+    && !stdenv.isSunOS                     # XXX: `test-setlocale2.sh' fails
+    && !stdenv.isFreeBSD;                  # XXX: test 084 fails
 
   configureFlags = "--with-syscmd-shell=${stdenv.shell}";
 
diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix
index bd90d580d3f5..93d1c7e971c2 100644
--- a/pkgs/stdenv/native/default.nix
+++ b/pkgs/stdenv/native/default.nix
@@ -24,6 +24,100 @@ rec {
     alias make=gmake
     alias tar=gtar
     alias sed=gsed
+
+    alias patch=gpatch # pcre relied on this for patching binary files
+
+    # we need GNU cp for --reflink, need to alias all of coreutils
+    alias basename=gbasename
+    alias cat=gcat
+    alias chgrp=gchgrp
+    alias chmod=gchmod
+    alias chown=gchown
+    alias chroot=gchroot
+    alias cksum=gcksum
+    alias comm=gcomm
+    alias cp=gcp
+    alias csplit=gcsplit
+    alias cut=gcut
+    alias date=gdate
+    alias dd=gdd
+    alias df=gdf
+    alias dir=gdir
+    alias dircolors=gdircolors
+    alias dirname=gdirname
+    alias du=gdu
+    alias echo=gecho
+    alias env=genv
+    alias expand=gexpand
+    alias expr=gexpr
+    alias factor=gfactor
+    alias false=gfalse
+    alias fmt=gfmt
+    alias fold=gfold
+    alias groups=ggroups
+    alias head=ghead
+    alias hostid=ghostid
+    alias hostname=ghostname
+    alias id=gid
+    alias install=ginstall
+    alias join=gjoin
+    alias kill=gkill
+    alias link=glink
+    alias ln=gln
+    alias logname=glogname
+    alias ls=gls
+    alias md5sum=gmd5sum
+    alias mkdir=gmkdir
+    alias mkfifo=gmkfifo
+    alias mknod=gmknod
+    alias mv=gmv
+    alias nice=gnice
+    alias nl=gnl
+    alias nohup=gnohup
+    alias od=god
+    alias paste=gpaste
+    alias pathchk=gpathchk
+    alias pinky=gpinky
+    alias pr=gpr
+    alias printenv=gprintenv
+    alias printf=gprintf
+    alias ptx=gptx
+    alias pwd=gpwd
+    alias readlink=greadlink
+    alias rm=grm
+    alias rmdir=grmdir
+    alias seq=gseq
+    alias sha1sum=gsha1sum
+    alias shred=gshred
+    alias sleep=gsleep
+    alias sort=gsort
+    alias split=gsplit
+    alias stat=gstat
+    alias stty=gstty
+    alias su=gsu
+    alias sum=gsum
+    alias sync=gsync
+    alias tac=gtac
+    #alias tail=gtail # this breaks xz XXX
+    alias tee=gtee
+    alias test=gtest
+    alias touch=gtouch
+    alias tr=gtr
+    alias true=gtrue
+    alias tsort=gtsort
+    alias tty=gtty
+    alias uname=guname
+    alias unexpand=gunexpand
+    alias uniq=guniq
+    alias unlink=gunlink
+    alias uptime=guptime
+    alias users=gusers
+    alias vdir=gvdir
+    alias wc=gwc
+    alias who=gwho
+    alias whoami=gwhoami
+    alias yes=gyes
+
     export MAKE=gmake
     shopt -s expand_aliases
   '';
diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix
index ac68b55ad17f..644045800d4e 100644
--- a/pkgs/tools/networking/miniupnpc/default.nix
+++ b/pkgs/tools/networking/miniupnpc/default.nix
@@ -1,17 +1,18 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchurl }:
 
-let version = "24d54ba13af4e53aba19c23898a373feecb41bd0"; in
+let version = "1.9.20150430"; in
 stdenv.mkDerivation rec {
   name = "miniupnpc-${version}";
 
-  src = fetchFromGitHub {
-    owner = "miniupnp";
-    repo = "miniupnp";
-    sha256 = "0j78dvlfh1a3a27zhvv001cb1d7vcgyv33bd1zr36drg64b6hrgw";
-    rev = version;
+  src = fetchurl {
+    url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
+    sha256 = "0ivnvzla0l2pzmy8s0j8ss0fnpsii7z9scvyl4a13g9k911hgmvn";
+    name = "${name}.tar.gz";
   };
 
-  doCheck = true;
+  patches = stdenv.lib.optional stdenv.isFreeBSD [ ./freebsd.patch ];
+
+  doCheck = !stdenv.isFreeBSD;
 
   installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)";
 
diff --git a/pkgs/tools/networking/miniupnpc/freebsd.patch b/pkgs/tools/networking/miniupnpc/freebsd.patch
new file mode 100644
index 000000000000..42ae85a8e6b1
--- /dev/null
+++ b/pkgs/tools/networking/miniupnpc/freebsd.patch
@@ -0,0 +1,11 @@
+diff --git a/minihttptestserver.c b/minihttptestserver.c
+index bbfdac3..a43999d 100644
+--- a/minihttptestserver.c
++++ b/minihttptestserver.c
+@@ -1,3 +1,6 @@
++#ifndef INADDR_LOOPBACK
++#define INADDR_LOOPBACK         0x7f000001
++#endif
+ /* $Id: minihttptestserver.c,v 1.17 2015/02/06 10:31:19 nanard Exp $ */
+  /* Project : miniUPnP
+    * Author : Thomas Bernard

From 2d00f27230764ed8be9ddff575d64e773ea84d62 Mon Sep 17 00:00:00 2001
From: janus <janus@xn--kn-1ia.guru>
Date: Tue, 24 Nov 2015 12:51:09 +0000
Subject: [PATCH 136/884] FreeBSD: use clang37

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

diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix
index 93d1c7e971c2..2a1acba41bb1 100644
--- a/pkgs/stdenv/native/default.nix
+++ b/pkgs/stdenv/native/default.nix
@@ -27,6 +27,8 @@ rec {
 
     alias patch=gpatch # pcre relied on this for patching binary files
 
+    alias cc=clang37
+
     # we need GNU cp for --reflink, need to alias all of coreutils
     alias basename=gbasename
     alias cat=gcat

From f351aaaf85c6b6323660db6ce638f057947a333f Mon Sep 17 00:00:00 2001
From: janus <janus@xn--kn-1ia.guru>
Date: Thu, 26 Nov 2015 02:35:12 +0000
Subject: [PATCH 137/884] FreeBSD: use own stdenv, do not run libtiff tests,
 use PIC for zlib

---
 .../compilers/llvm/3.7/libc++abi.nix          |   2 +-
 .../development/libraries/libtiff/default.nix |   2 +-
 pkgs/development/libraries/zlib/default.nix   |   2 +-
 pkgs/stdenv/default.nix                       |   3 +
 pkgs/stdenv/freebsd/default.nix               | 131 +++++++++++++
 pkgs/stdenv/freebsd/trivial-bootstrap.sh      | 183 ++++++++++++++++++
 pkgs/stdenv/native/default.nix                |   2 -
 7 files changed, 320 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/stdenv/freebsd/default.nix
 create mode 100644 pkgs/stdenv/freebsd/trivial-bootstrap.sh

diff --git a/pkgs/development/compilers/llvm/3.7/libc++abi.nix b/pkgs/development/compilers/llvm/3.7/libc++abi.nix
index 97f182a9af81..a495e1860ad2 100644
--- a/pkgs/development/compilers/llvm/3.7/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/3.7/libc++abi.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
 
   src = fetch "libcxxabi" "1swvnhrf9g67579c5picg0l869f8l2bwi4xqpbcb4n296gyp9c28";
 
-  buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin) libunwind;
+  buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
 
   postUnpack = ''
     unpackFile ${libcxx.src}
diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix
index 2c559d221abe..7e9c11d700a5 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  doCheck = true;
+  doCheck = !stdenv.isFreeBSD;
 
   meta = with stdenv.lib; {
     description = "Library and utilities for working with the TIFF image file format";
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index 93474d14344e..99be5162010d 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation (rec {
 
   # As zlib takes part in the stdenv building, we don't want references
   # to the bootstrap-tools libgcc (as uses to happen on arm/mips)
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.isDarwin) "-static-libgcc";
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.isDarwin) "-static-libgcc " + stdenv.lib.optionalString (stdenv.isFreeBSD) "-fPIC";
 
   crossAttrs = {
     dontStrip = static;
diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix
index da93229ce94c..37e90faf6d0e 100644
--- a/pkgs/stdenv/default.nix
+++ b/pkgs/stdenv/default.nix
@@ -33,6 +33,8 @@ rec {
     pkgs = stdenvNativePkgs;
   };
 
+  stdenvFreeBSD = (import ./freebsd { inherit system allPackages platform config; }).stdenvFreeBSD;
+
   # Linux standard environment.
   stdenvLinux = (import ./linux { inherit system allPackages platform config lib; }).stdenvLinux;
 
@@ -58,5 +60,6 @@ rec {
     if system == "x86_64-solaris" then stdenvNix else
     if system == "i686-cygwin" then stdenvNative else
     if system == "x86_64-cygwin" then stdenvNative else
+    if system == "x86_64-freebsd" then stdenvFreeBSD else
     stdenvNative;
 }
diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix
new file mode 100644
index 000000000000..de39e79102f9
--- /dev/null
+++ b/pkgs/stdenv/freebsd/default.nix
@@ -0,0 +1,131 @@
+{ system      ? builtins.currentSystem
+, allPackages ? import ../../top-level/all-packages.nix
+, platform    ? null
+, config      ? {}
+}:
+
+rec {
+  allPackages = import ../../top-level/all-packages.nix;
+
+  bootstrapTools = derivation {
+    inherit system;
+
+    name    = "trivial-bootstrap-tools";
+    builder = "/bin/sh";
+    args    = [ ./trivial-bootstrap.sh ];
+
+    mkdir   = "/bin/mkdir";
+    ln      = "/bin/ln";
+  };
+
+  stage0 = rec {
+    fetchurl = import ../../build-support/fetchurl {
+      inherit stdenv;
+      curl = bootstrapTools;
+    };
+
+    stdenv = import ../generic {
+      inherit system config;
+      name         = "stdenv-freebsd-boot-0";
+      shell        = "/usr/local/bin/bash";
+      initialPath  = [ bootstrapTools ];
+      fetchurlBoot = fetchurl;
+      cc           = null;
+    };
+  };
+
+  buildTools = { #import ../../os-specific/freebsd/command-line-tools
+    inherit (stage0) stdenv fetchurl;
+    xar  = bootstrapTools;
+    gzip = bootstrapTools;
+    cpio = bootstrapTools;
+  };
+
+  preHook = ''
+    export NIX_IGNORE_LD_THROUGH_GCC=1
+    export NIX_DONT_SET_RPATH=1
+    export NIX_NO_SELF_RPATH=1
+    dontFixLibtool=1
+    stripAllFlags=" " # the Darwin "strip" command doesn't know "-s"
+    xargsFlags=" "
+  '';
+
+  stage1 = rec {
+    nativePrefix = "/usr";
+
+    stdenv = import ../generic {
+      name = "stdenv-freebsd-boot-1";
+
+      inherit system config;
+      inherit (stage0.stdenv) shell fetchurlBoot;
+
+      initialPath = stage0.stdenv.initialPath ++ [ nativePrefix ];
+
+      preHook = preHook + "\n" + ''
+        export NIX_LDFLAGS_AFTER+=" -L/usr/lib"
+        export NIX_ENFORCE_PURITY=
+        export NIX_CFLAGS_COMPILE+=" -isystem ${nativePrefix}/include/c++/v1"
+        export NIX_CFLAGS_LINK+=" -Wl,-rpath,${nativePrefix}/lib"
+      '';
+
+      cc = import ../../build-support/cc-wrapper {
+        nativeTools  = true;
+        nativePrefix = nativePrefix;
+        nativeLibc   = true;
+        stdenv       = stage0.stdenv;
+        shell        = "/usr/local/bin/bash";
+        cc           = {
+          name    = "clang-9.9.9";
+          cc      = "/usr";
+          outPath = nativePrefix;
+        };
+        isClang      = true;
+      };
+    };
+    pkgs = allPackages {
+      inherit system platform;
+      bootStdenv = stdenv;
+    };
+  };
+
+  stage2 = rec {
+    stdenv = import ../generic {
+      name = "stdenv-freebsd-boot-2";
+
+      inherit system config;
+      inherit (stage1.stdenv) shell fetchurlBoot preHook cc;
+
+      initialPath = [ "/usr/local/bin" ] ++ stage1.stdenv.initialPath;
+    };
+    pkgs = allPackages {
+      inherit system platform;
+      bootStdenv = stdenv;
+    };
+  };
+
+  stage3 = with stage2; import ../generic {
+    name = "stdenv-freebsd-boot-3";
+
+    inherit system config;
+    inherit (stdenv) fetchurlBoot;
+
+    initialPath = [ bootstrapTools ];
+
+    preHook = preHook + "\n" + ''
+      export NIX_ENFORCE_PURITY=1
+    '';
+
+    cc = import ../../build-support/cc-wrapper {
+      inherit stdenv;
+      nativeTools   = true;
+      nativePrefix  = "/usr/local/bin";
+      nativeLibc    = true;
+      cc            = stage2.stdenv.cc; #pkgs.llvmPackages.clang-unwrapped; 
+      isClang       = true;
+    };
+
+    shell = "/usr/local/bin/bash";
+  };
+
+  stdenvFreeBSD = stage3;
+}
diff --git a/pkgs/stdenv/freebsd/trivial-bootstrap.sh b/pkgs/stdenv/freebsd/trivial-bootstrap.sh
new file mode 100644
index 000000000000..f0b861d1a180
--- /dev/null
+++ b/pkgs/stdenv/freebsd/trivial-bootstrap.sh
@@ -0,0 +1,183 @@
+
+# Building bootstrap tools
+echo Building the trivial bootstrap environment...
+
+# needed FreeBSD packages:
+# findutils gcpio gawk gnugrep coreutils bash gsed gtar gmake xar binutils gpatch lbzip2
+
+$mkdir -p $out/bin
+
+$ln -s $ln $out/bin/ln
+
+PATH=$out/bin/
+
+cd $out/bin
+
+ln -s $mkdir
+
+ln -s /usr/local/bin/bash
+ln -s /bin/sh
+
+ln -s /usr/local/bin/gmake make
+
+ln -s /usr/local/bin/lbzip2
+
+ln -s /usr/bin/bzip2
+ln -s /usr/bin/bunzip2
+ln -s /usr/bin/bzcat
+ln -s /usr/bin/bzip2recover
+
+ln -s /usr/bin/xz
+ln -s /usr/bin/unxz
+ln -s /usr/bin/xzcat
+ln -s /usr/bin/lzma
+ln -s /usr/bin/unlzma
+ln -s /usr/bin/lzcat
+
+ln -s /usr/local/bin/gcp cp
+ln -s /usr/local/bin/gdd dd
+ln -s /usr/local/bin/gmv mv
+ln -s /usr/local/bin/grm rm
+ln -s /usr/local/bin/gls ls
+ln -s /bin/ps ps
+ln -s /usr/local/bin/gcat cat
+ln -s /usr/local/bin/gecho echo
+ln -s /usr/local/bin/gexpr expr
+ln -s /usr/local/bin/gtest test
+ln -s /usr/local/bin/gdate date
+ln -s /usr/local/bin/gchmod chmod
+ln -s /usr/local/bin/grmdir rmdir
+ln -s /usr/local/bin/gsleep sleep
+ln -s /bin/hostname hostname
+
+ln -s /usr/local/bin/gid id
+ln -s /usr/local/bin/god od
+ln -s /usr/local/bin/gtr tr
+ln -s /usr/local/bin/gwc wc
+ln -s /usr/local/bin/gcut cut
+ln -s /usr/bin/cmp cmp
+ln -s /usr/local/bin/gsed sed
+ln -s /usr/local/bin/gtar tar
+ln -s /usr/local/bin/xar xar
+ln -s /usr/local/bin/gawk awk
+ln -s /usr/local/bin/genv env
+ln -s /usr/local/bin/gtee tee
+ln -s /usr/local/bin/gcomm comm
+ln -s /usr/local/bin/gcpio cpio
+ln -s /usr/local/bin/curl curl
+ln -s /usr/local/bin/gfind find
+ln -s /usr/local/bin/grep grep #other grep is in /usr/bin
+ln -s /usr/bin/gzip
+ln -s /usr/bin/gunzip
+ln -s /usr/bin/zcat
+ln -s /usr/local/bin/ghead head
+ln -s /usr/bin/tail tail
+ln -s /usr/local/bin/guniq uniq
+ln -s /usr/bin/less less
+ln -s /usr/local/bin/gtrue true
+ln -s /usr/bin/diff diff
+ln -s /usr/local/bin/egrep egrep
+ln -s /usr/local/bin/fgrep fgrep
+ln -s /usr/local/bin/gpatch patch
+ln -s /usr/local/bin/guname uname
+ln -s /usr/local/bin/gtouch touch
+ln -s /usr/local/bin/gsplit split
+ln -s /usr/local/bin/gxargs xargs
+ln -s /usr/bin/which which
+ln -s /usr/local/bin/ginstall install
+ln -s /usr/local/bin/gbasename basename
+ln -s /usr/local/bin/gdirname dirname
+ln -s /usr/local/bin/greadlink readlink
+
+ln -fs /usr/local/bin/gln ln
+ln -s /usr/local/bin/gyes yes
+ln -s /usr/local/bin/gwhoami whoami
+ln -s /usr/local/bin/gvdir vdir
+ln -s /usr/local/bin/gusers users
+ln -s /usr/local/bin/guptime uptime
+ln -s /usr/local/bin/gunlink unlink
+ln -s /usr/local/bin/gtty tty
+ln -s /usr/local/bin/gunexpand unexpand
+ln -s /usr/local/bin/gtsort tsort
+ln -s /usr/local/bin/gtruncate truncate
+ln -s /usr/local/bin/gtimeout timeout
+ln -s /usr/local/bin/gtac tac
+ln -s /usr/local/bin/gsync sync
+ln -s /usr/local/bin/gsum sum
+ln -s /usr/local/bin/gstty stty
+ln -s /usr/local/bin/gstdbuf stdbuf
+ln -s /usr/local/bin/gsort sort
+ln -s /usr/local/bin/gruncon runcon
+ln -s /usr/local/bin/gseq seq
+ln -s /usr/local/bin/gsha1sum sha1sum
+ln -s /usr/local/bin/gsha224sum sha224sum
+ln -s /usr/local/bin/gsha256sum sha256sum
+ln -s /usr/local/bin/gsha384sum sha384sum
+ln -s /usr/local/bin/gsha512sum sha512sum
+ln -s /usr/local/bin/gshred shred
+ln -s /usr/local/bin/gshuf shuf
+ln -s /usr/local/bin/grealpath realpath
+ln -s "/usr/local/bin/g[" "["
+ln -s /usr/local/bin/gbase64 base64
+ln -s /usr/local/bin/gchcon chcon
+ln -s /usr/local/bin/gchgrp chgrp
+ln -s /usr/local/bin/gchown chown
+ln -s /usr/local/bin/gchroot chroot
+ln -s /usr/local/bin/gcksum cksum
+ln -s /usr/local/bin/gcsplit csplit
+ln -s /usr/local/bin/gdf df
+ln -s /usr/local/bin/gdircolors dircolors
+ln -s /usr/local/bin/gdu du
+ln -s /usr/local/bin/gexpand expand
+ln -s /usr/local/bin/gfactor factor
+ln -s /usr/local/bin/gfalse false
+ln -s /usr/local/bin/gfmt fmt
+ln -s /usr/local/bin/gfold fold
+ln -s /usr/local/bin/ggroups groups
+ln -s /usr/local/bin/ghostid hostid
+ln -s /usr/local/bin/gjoin join
+ln -s /usr/local/bin/gkill kill
+ln -s /usr/local/bin/glink link
+ln -s /usr/local/bin/glogname logname
+ln -s /usr/local/bin/gmd5sum md5sum
+ln -s /usr/local/bin/gmkdir mkdir
+ln -s /usr/local/bin/gmkfifo mkfifo
+ln -s /usr/local/bin/gmknod mknod
+ln -s /usr/local/bin/gmktemp mktemp
+ln -s /usr/local/bin/gnice nice
+ln -s /usr/local/bin/gnl nl
+ln -s /usr/local/bin/gnohup nohup
+ln -s /usr/local/bin/gnproc nproc
+ln -s /usr/local/bin/gnumfmt numfmt
+ln -s /usr/local/bin/gnustat nustat
+ln -s /usr/local/bin/gpaste paste
+ln -s /usr/local/bin/gpathchk pathchk
+ln -s /usr/local/bin/gpinky pinky
+ln -s /usr/local/bin/gpr pr
+ln -s /usr/local/bin/gprintenv printenv
+ln -s /usr/local/bin/gprintf printf
+ln -s /usr/local/bin/gptx ptx
+ln -s /usr/local/bin/gpwd pwd
+
+# binutils
+# pkg info -l binutils | grep usr/local/bin
+ln -s /usr/local/bin/addr2line
+ln -s /usr/local/bin/ar
+ln -s /usr/local/bin/as
+ln -s /usr/local/bin/c++filt
+ln -s /usr/local/bin/dwp
+ln -s /usr/local/bin/elfedit
+ln -s /usr/local/bin/gprof
+ln -s /usr/local/bin/ld
+ln -s /usr/local/bin/ld.bfd
+ln -s /usr/local/bin/ld.gold
+ln -s /usr/local/bin/nm
+ln -s /usr/local/bin/objcopy
+ln -s /usr/local/bin/objdump
+ln -s /usr/local/bin/ranlib
+ln -s /usr/local/bin/readelf
+ln -s /usr/local/bin/size
+ln -s /usr/local/bin/strings
+ln -s /usr/local/bin/strip
+
+#pkg info -l llvm37 | grep usr/local/bin
diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix
index 2a1acba41bb1..93d1c7e971c2 100644
--- a/pkgs/stdenv/native/default.nix
+++ b/pkgs/stdenv/native/default.nix
@@ -27,8 +27,6 @@ rec {
 
     alias patch=gpatch # pcre relied on this for patching binary files
 
-    alias cc=clang37
-
     # we need GNU cp for --reflink, need to alias all of coreutils
     alias basename=gbasename
     alias cat=gcat

From 9897b356612c4bb06a9c9d688da52134dfe8fb95 Mon Sep 17 00:00:00 2001
From: janus <janus@xn--kn-1ia.guru>
Date: Thu, 26 Nov 2015 17:33:58 +0000
Subject: [PATCH 138/884] FreeBSD: patch expat, kerberos, libedit, ossp-uuid,
 lz4, sharutils, add libelf-freebsd

---
 pkgs/development/libraries/expat/default.nix  |  3 ++
 pkgs/development/libraries/kerberos/krb5.nix  | 10 ++--
 .../development/libraries/libedit/default.nix |  2 +-
 .../libraries/libedit/freebsd-wchar.patch     | 13 +++++
 .../libraries/libelf-freebsd/default.nix      | 28 ++++++++++
 .../libraries/libossp-uuid/default.nix        |  2 +
 pkgs/stdenv/freebsd/default.nix               |  4 +-
 pkgs/tools/archivers/sharutils/default.nix    |  2 +-
 pkgs/tools/compression/lz4/default.nix        |  2 +
 .../compression/lz4/install-on-freebsd.patch  | 54 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +-
 pkgs/top-level/perl-packages.nix              |  4 +-
 12 files changed, 117 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/development/libraries/libedit/freebsd-wchar.patch
 create mode 100644 pkgs/development/libraries/libelf-freebsd/default.nix
 create mode 100644 pkgs/tools/compression/lz4/install-on-freebsd.patch

diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix
index 05cfeaee4232..78e2da3ffdbb 100644
--- a/pkgs/development/libraries/expat/default.nix
+++ b/pkgs/development/libraries/expat/default.nix
@@ -10,6 +10,9 @@ stdenv.mkDerivation rec {
 
   patches = [ ./CVE-2015-1283.patch ];
 
+  configureFlags = stdenv.lib.optionalString stdenv.isFreeBSD "--with-pic";
+  # NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.isFreeBSD) "-fPIC";
+
   meta = with stdenv.lib; {
     homepage = http://www.libexpat.org/;
     description = "A stream-oriented XML parser library written in C";
diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index 2e5e48891b82..b263a4ef06ce 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -11,13 +11,15 @@ in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "${type}krb5-${version}";
-  version = "1.13.2";
+  version = "1.14";
 
   src = fetchurl {
-    url = "${meta.homepage}dist/krb5/1.13/krb5-${version}-signed.tar";
-    sha256 = "1qbdzyrws7d0q4filsibh28z54pd5l987jr0ygv43iq9085w6a75";
+    url = "${meta.homepage}dist/krb5/1.14/krb5-${version}.tar.gz";
+    sha256 = "1sgr61cnkgc5xazijaww6wpn5fnxl9vyj9ixk3r3y7ikv3x0gnyf";
   };
 
+  configureFlags = stdenv.lib.optionalString stdenv.isFreeBSD ''WARN_CFLAGS=""'';
+
   nativeBuildInputs = [ pkgconfig perl yacc ]
     # Provides the mig command used by the build scripts
     ++ stdenv.lib.optional stdenv.isDarwin bootstrap_cmds;
@@ -26,7 +28,7 @@ stdenv.mkDerivation rec {
 
   unpackPhase = ''
     tar -xf $src
-    tar -xzf krb5-${version}.tar.gz
+    #tar -xzf krb5-${version}.tar.gz
     cd krb5-${version}/src
   '';
 
diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix
index dc8ecf7e95d8..5234c16e1354 100644
--- a/pkgs/development/libraries/libedit/default.nix
+++ b/pkgs/development/libraries/libedit/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   patches = if stdenv.isCygwin then [
     ./01-cygwin.patch
-  ] else null;
+  ] else [ ] ++ [ ./freebsd-wchar.patch ];
 
   postInstall = ''
     find $out/lib -type f | grep '\.\(la\|pc\)''$' | xargs sed -i \
diff --git a/pkgs/development/libraries/libedit/freebsd-wchar.patch b/pkgs/development/libraries/libedit/freebsd-wchar.patch
new file mode 100644
index 000000000000..6bf7fb0ef69a
--- /dev/null
+++ b/pkgs/development/libraries/libedit/freebsd-wchar.patch
@@ -0,0 +1,13 @@
+diff --git a/src/chartype.h b/src/chartype.h
+index 0beee17..4ac86f3 100644
+--- a/src/chartype.h
++++ b/src/chartype.h
+@@ -44,7 +44,7 @@
+  * supports non-BMP code points without requiring UTF-16, but nothing
+  * seems to actually advertise this properly, despite Unicode 3.1 having
+  * been around since 2001... */
+-#if !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__)) && !defined(__OpenBSD__)
++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__)) && !defined(__OpenBSD__)
+ #ifndef __STDC_ISO_10646__
+ /* In many places it is assumed that the first 127 code points are ASCII
+  * compatible, so ensure wchar_t indeed does ISO 10646 and not some other
diff --git a/pkgs/development/libraries/libelf-freebsd/default.nix b/pkgs/development/libraries/libelf-freebsd/default.nix
new file mode 100644
index 000000000000..ee0b6d50408f
--- /dev/null
+++ b/pkgs/development/libraries/libelf-freebsd/default.nix
@@ -0,0 +1,28 @@
+{ fetchsvn, stdenv }:
+
+stdenv.mkDerivation (rec {
+  version = "3258";
+  name = "libelf-freebsd-${version}";
+
+  #src = fetchurl {
+  #  url = "http://sourceforge.net/code-snapshots/svn/e/el/elftoolchain/code/elftoolchain-code-${version}-trunk.zip";
+  #  sha256 = "0vf7s9dwk2xkmhb79aigqm0x0yfbw1j0b9ksm51207qwr179n6jr";
+  #};
+  src = fetchsvn {
+    url = svn://svn.code.sf.net/p/elftoolchain/code/trunk ;
+    rev = 3258;
+  };
+
+  doCheck = true;
+  
+  meta = {
+    description = "Essential compilation tools and libraries for building and analyzing ELF based program images";
+
+    homepage = https://sourceforge.net/p/elftoolchain/wiki/Home/;
+
+    license = stdenv.lib.licenses.bsd2;
+
+    platforms = stdenv.lib.platforms.freebsd;
+    maintainers = [ ];
+  };
+})
diff --git a/pkgs/development/libraries/libossp-uuid/default.nix b/pkgs/development/libraries/libossp-uuid/default.nix
index 119f41116668..ddfc2a5132c7 100644
--- a/pkgs/development/libraries/libossp-uuid/default.nix
+++ b/pkgs/development/libraries/libossp-uuid/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation {
     sha256= "11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0";
   };
 
+  configureFlags = stdenv.lib.optional stdenv.isFreeBSD "--with-pic";
+
   meta = with stdenv.lib; {
     homepage = http://www.ossp.org/pkg/lib/uuid/;
     description = "OSSP uuid ISO-C and C++ shared library";
diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix
index de39e79102f9..fcc3a14d4873 100644
--- a/pkgs/stdenv/freebsd/default.nix
+++ b/pkgs/stdenv/freebsd/default.nix
@@ -43,7 +43,7 @@ rec {
 
   preHook = ''
     export NIX_IGNORE_LD_THROUGH_GCC=1
-    export NIX_DONT_SET_RPATH=1
+    # export NIX_DONT_SET_RPATH=1
     export NIX_NO_SELF_RPATH=1
     dontFixLibtool=1
     stripAllFlags=" " # the Darwin "strip" command doesn't know "-s"
@@ -118,7 +118,7 @@ rec {
     cc = import ../../build-support/cc-wrapper {
       inherit stdenv;
       nativeTools   = true;
-      nativePrefix  = "/usr/local/bin";
+      nativePrefix  = "/usr/local";
       nativeLibc    = true;
       cc            = stage2.stdenv.cc; #pkgs.llvmPackages.clang-unwrapped; 
       isClang       = true;
diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/tools/archivers/sharutils/default.nix
index a7135346d2fc..e806a962eabb 100644
--- a/pkgs/tools/archivers/sharutils/default.nix
+++ b/pkgs/tools/archivers/sharutils/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   preConfigure = ''
      # Fix for building on Glibc 2.16.  Won't be needed once the
      # gnulib in sharutils is updated.
-     sed -i ${stdenv.lib.optionalString ((stdenv.isFreeBSD || stdenv.isOpenBSD) && stdenv.cc.nativeTools) "''"} '/gets is a security hole/d' lib/stdio.in.h
+     sed -i ${stdenv.lib.optionalString (stdenv.isOpenBSD && stdenv.cc.nativeTools) "''"} '/gets is a security hole/d' lib/stdio.in.h
   '';
 
   # GNU Gettext is needed on non-GNU platforms.
diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix
index 6c5d28d6bcc2..13236da5ab44 100644
--- a/pkgs/tools/compression/lz4/default.nix
+++ b/pkgs/tools/compression/lz4/default.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
   doCheck = false; # tests take a very long time
   checkTarget = "test";
 
+  patches = [ ./install-on-freebsd.patch ] ;
+
   meta = with stdenv.lib; {
     inherit version;
     description = "Extremely fast compression algorithm";
diff --git a/pkgs/tools/compression/lz4/install-on-freebsd.patch b/pkgs/tools/compression/lz4/install-on-freebsd.patch
new file mode 100644
index 000000000000..12a2bf72f4ed
--- /dev/null
+++ b/pkgs/tools/compression/lz4/install-on-freebsd.patch
@@ -0,0 +1,54 @@
+diff --git a/Makefile b/Makefile
+index d1b0d0c..f8d6a2d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -80,8 +80,6 @@ clean:
+ 
+ 
+ #------------------------------------------------------------------------
+-#make install is validated only for Linux, OSX, kFreeBSD and Hurd targets
+-ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU))
+ 
+ install:
+ 	@cd $(LZ4DIR); $(MAKE) -e install
+@@ -129,4 +127,3 @@ examples:
+ prg-travis:
+ 	@cd $(PRGDIR); $(MAKE) -e test-travis
+ 
+-endif
+diff --git a/lib/Makefile b/lib/Makefile
+index 02ddd3b..26ed18f 100644
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -80,8 +80,6 @@ clean:
+ 
+ 
+ #------------------------------------------------------------------------
+-#make install is validated only for Linux, OSX, kFreeBSD and Hurd targets
+-ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU))
+ 
+ liblz4.pc: liblz4.pc.in Makefile
+ 	@echo creating pkgconfig
+@@ -114,4 +112,3 @@ uninstall:
+ 	@[ -f $(DESTDIR)$(INCLUDEDIR)/lz4frame.h ] && rm -f $(DESTDIR)$(INCLUDEDIR)/lz4frame.h
+ 	@echo lz4 libraries successfully uninstalled
+ 
+-endif
+diff --git a/programs/Makefile b/programs/Makefile
+index f422902..6943363 100644
+--- a/programs/Makefile
++++ b/programs/Makefile
+@@ -113,8 +113,6 @@ clean:
+ 
+ 
+ #------------------------------------------------------------------------
+-#make install is validated only for Linux, OSX, kFreeBSD and Hurd targets
+-ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU))
+ 
+ install: lz4 lz4c
+ 	@echo Installing binaries
+@@ -307,4 +305,3 @@ test-mem: lz4 datagen fuzzer frametest fullbench
+ test-mem32: lz4c32 datagen
+ # unfortunately, valgrind doesn't seem to work with non-native binary. If someone knows how to do a valgrind-test on a 32-bits exe with a 64-bits system...
+ 
+-endif
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 992719704608..fe9d9eccaee0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7109,7 +7109,9 @@ let
 
   libedit = callPackage ../development/libraries/libedit { };
 
-  libelf = callPackage ../development/libraries/libelf { };
+  libelf = if stdenv.isFreeBSD
+  then callPackage ../development/libraries/libelf-freebsd { }
+  else callPackage ../development/libraries/libelf { };
 
   libetpan = callPackage ../development/libraries/libetpan { };
 
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 1d9211fae2f1..e03634c72030 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6338,8 +6338,8 @@ let self = _self // overrides; _self = with self; {
 
   LocaleGettext = buildPerlPackage {
     name = "LocaleGettext-1.05";
-    buildInputs = stdenv.lib.optional (stdenv.isDarwin || stdenv.isCygwin) pkgs.gettext;
-    NIX_CFLAGS_LINK = if (stdenv.isDarwin || stdenv.isCygwin) then "-lintl" else null;
+    buildInputs = stdenv.lib.optional (stdenv.isFreeBSD || stdenv.isDarwin || stdenv.isCygwin) pkgs.gettext;
+    NIX_CFLAGS_LINK = if (stdenv.isFreeBSD || stdenv.isDarwin || stdenv.isCygwin) then "-lintl" else null;
     src = fetchurl {
       url = mirror://cpan/authors/id/P/PV/PVANDRY/gettext-1.05.tar.gz;
       sha256 = "15262a00vx714szpx8p2z52wxkz46xp7acl72znwjydyq4ypydi7";

From a472d836f674fe388018aaee75983e3400a77db4 Mon Sep 17 00:00:00 2001
From: janus <janus@xn--kn-1ia.guru>
Date: Sat, 28 Nov 2015 00:46:00 +0000
Subject: [PATCH 139/884] FreeBSD: apr-util, cyrus-sasl, berkeley db, glib,
 gnutls, kerberos, libelf-freebsd, openldap, serf, guile, tet, shishi, gawk,
 gnugrep

---
 .../git-and-tools/git/default.nix             |  3 +-
 .../libraries/apr-util/default.nix            | 10 +++++--
 .../include-static-dependencies.patch         | 12 ++++++++
 .../libraries/cyrus-sasl/default.nix          | 15 +++++++---
 .../libraries/cyrus-sasl/missing-size_t.patch |  4 +--
 pkgs/development/libraries/db/generic.nix     |  1 +
 pkgs/development/libraries/glib/default.nix   |  4 +++
 pkgs/development/libraries/gnutls/generic.nix |  2 +-
 .../libraries/kerberos/heimdal.nix            |  9 +++---
 .../libraries/libelf-freebsd/default.nix      | 26 +++++++++++------
 .../libraries/openldap/default.nix            | 14 +++++++--
 pkgs/development/libraries/serf/default.nix   |  2 +-
 .../tools/guile/g-wrap/default.nix            |  2 +-
 pkgs/development/tools/misc/tet/default.nix   | 29 +++++++++++++++++++
 pkgs/servers/shishi/default.nix               |  2 +-
 pkgs/servers/shishi/freebsd-unistd.patch      | 12 ++++++++
 pkgs/stdenv/freebsd/trivial-bootstrap.sh      |  8 ++++-
 pkgs/tools/text/gawk/default.nix              |  1 +
 pkgs/tools/text/gnugrep/default.nix           |  3 +-
 pkgs/top-level/all-packages.nix               | 13 +++++++--
 pkgs/top-level/perl-packages.nix              |  2 +-
 21 files changed, 141 insertions(+), 33 deletions(-)
 create mode 100644 pkgs/development/libraries/apr-util/include-static-dependencies.patch
 create mode 100644 pkgs/development/tools/misc/tet/default.nix
 create mode 100644 pkgs/servers/shishi/freebsd-unistd.patch

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 84b033f981fc..089b605563f4 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -34,7 +34,8 @@ stdenv.mkDerivation {
     ++ stdenv.lib.optionals guiSupport [tcl tk];
 
   # required to support pthread_cancel()
-  NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
+  NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.cc.isClang) "-lgcc_s"
+              + stdenv.lib.optionalString (stdenv.isFreeBSD) "-lthr";
 
   # without this, git fails when trying to check for /etc/gitconfig existence
   propagatedSandboxProfile = stdenv.lib.sandbox.allowDirectoryList "/etc";
diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix
index c35520f22fd3..e0b2832f6e42 100644
--- a/pkgs/development/libraries/apr-util/default.nix
+++ b/pkgs/development/libraries/apr-util/default.nix
@@ -3,6 +3,7 @@
 , bdbSupport ? false, db
 , ldapSupport ? !stdenv.isCygwin, openldap
 , libiconv
+, cyrus_sasl, autoreconfHook
 }:
 
 assert sslSupport -> openssl != null;
@@ -19,19 +20,24 @@ stdenv.mkDerivation rec {
     sha256 = "0bn81pfscy9yjvbmyx442svf43s6dhrdfcsnkpxz43fai5qk5kx6";
   };
 
+  patches = stdenv.lib.optionals stdenv.isFreeBSD [ ./include-static-dependencies.patch ];
+
+  buildInputs = stdenv.lib.optionals stdenv.isFreeBSD [ autoreconfHook ];
+
   configureFlags = ''
     --with-apr=${apr} --with-expat=${expat}
     ${optionalString (!stdenv.isCygwin) "--with-crypto"}
     ${stdenv.lib.optionalString sslSupport "--with-openssl=${openssl}"}
     ${stdenv.lib.optionalString bdbSupport "--with-berkeley-db=${db}"}
-    ${stdenv.lib.optionalString ldapSupport "--with-ldap"}${
+    ${stdenv.lib.optionalString ldapSupport "--with-ldap=ldap"}${
       optionalString stdenv.isCygwin "--without-pgsql --without-sqlite2 --without-sqlite3 --without-freetds --without-berkeley-db --without-crypto"}
   '';
 
   propagatedBuildInputs = [ makeWrapper apr expat libiconv ]
     ++ optional sslSupport openssl
     ++ optional bdbSupport db
-    ++ optional ldapSupport openldap;
+    ++ optional ldapSupport openldap
+    ++ optional stdenv.isFreeBSD cyrus_sasl;
 
   # Give apr1 access to sed for runtime invocations
   postInstall = ''
diff --git a/pkgs/development/libraries/apr-util/include-static-dependencies.patch b/pkgs/development/libraries/apr-util/include-static-dependencies.patch
new file mode 100644
index 000000000000..1813c7217810
--- /dev/null
+++ b/pkgs/development/libraries/apr-util/include-static-dependencies.patch
@@ -0,0 +1,12 @@
+diff --git a/build/apu-conf.m4 b/build/apu-conf.m4
+index 8943f10..aa44305 100644
+--- a/build/apu-conf.m4
++++ b/build/apu-conf.m4
+@@ -279,6 +279,7 @@ AC_ARG_WITH(ldap,[  --with-ldap=library     ldap library to use],
+         APU_FIND_LDAPLIB("ldap", "-llber -lresolv -lsocket -lnsl")
+         APU_FIND_LDAPLIB("ldap", "-ldl -lpthread")
+       else
++        APU_FIND_LDAPLIB($LIBLDAP, "-llber -lcrypto -lssl -lsasl2")
+         APU_FIND_LDAPLIB($LIBLDAP)
+         APU_FIND_LDAPLIB($LIBLDAP, "-lresolv")
+         APU_FIND_LDAPLIB($LIBLDAP, "-lresolv -lsocket -lnsl")
diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix
index 2be98f3d5e87..71cfc626bac1 100644
--- a/pkgs/development/libraries/cyrus-sasl/default.nix
+++ b/pkgs/development/libraries/cyrus-sasl/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, openssl, kerberos, db, gettext, pam, fixDarwinDylibNames }:
+{ lib, stdenv, fetchurl, openssl, kerberos, db, gettext, pam, fixDarwinDylibNames, autoreconfHook }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -10,12 +10,19 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ openssl db gettext kerberos ]
+    [ openssl db gettext kerberos autoreconfHook ]
     ++ lib.optional stdenv.isLinux pam
     ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
-  patches = [ ./missing-size_t.patch ]; # https://bugzilla.redhat.com/show_bug.cgi?id=906519
-  patchFlags = "-p0";
+  patches = [
+    ./missing-size_t.patch # https://bugzilla.redhat.com/show_bug.cgi?id=906519
+    (
+      fetchurl {
+        url = "http://www.linuxfromscratch.org/patches/blfs/svn/cyrus-sasl-2.1.26-fixes-3.patch";
+        sha256 = "1vh4pc2rxxm6yvykx0b7kg09jbcwcxwv5rs6yq2ag3y8p6a9x86w";
+      }
+    )
+  ];
 
   configureFlags = [
     "--with-openssl=${openssl}"
diff --git a/pkgs/development/libraries/cyrus-sasl/missing-size_t.patch b/pkgs/development/libraries/cyrus-sasl/missing-size_t.patch
index 42f20fb8096b..da96818ca267 100644
--- a/pkgs/development/libraries/cyrus-sasl/missing-size_t.patch
+++ b/pkgs/development/libraries/cyrus-sasl/missing-size_t.patch
@@ -1,6 +1,6 @@
 Gentoo bug #458790
---- include/sasl.h	2012-10-12 17:05:48.000000000 +0300
-+++ include/sasl.h	2013-02-23 16:56:44.648786268 +0200
+--- a/include/sasl.h	2012-10-12 17:05:48.000000000 +0300
++++ b/include/sasl.h	2013-02-23 16:56:44.648786268 +0200
 @@ -121,6 +121,9 @@
  #ifndef SASL_H
  #define SASL_H 1
diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix
index 077bd4e03a32..f5ee4e440ff0 100644
--- a/pkgs/development/libraries/db/generic.nix
+++ b/pkgs/development/libraries/db/generic.nix
@@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
     (if cxxSupport then "--enable-cxx" else "--disable-cxx")
     (if compat185 then "--enable-compat185" else "--disable-compat185")
     "--enable-dbm"
+    (stdenv.lib.optionalString stdenv.isFreeBSD "--with-pic")
   ];
 
   preConfigure = ''
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 07e1f1243ece..538a40615f14 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -63,8 +63,12 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ pcre zlib libffi libiconv ]
     ++ libintlOrEmpty;
 
+  LIBELF_CFLAGS = optional stdenv.isFreeBSD "-I${libelf}";
+  LIBELF_LIBS = optional stdenv.isFreeBSD "-L${libelf} -lelf";
+
   configureFlags =
     optional stdenv.isDarwin "--disable-compile-warnings"
+    ++ optional stdenv.isFreeBSD "--with-libiconv=gnu"
     ++ optional stdenv.isSunOS ["--disable-modular-tests" "--with-libiconv"];
 
   NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl"
diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix
index f1eb62e0083e..ebaef47ca140 100644
--- a/pkgs/development/libraries/gnutls/generic.nix
+++ b/pkgs/development/libraries/gnutls/generic.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
   enableParallelBuilding = !guileBindings;
 
   buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp autogen ]
-    ++ lib.optional (stdenv.isDarwin) libiconv
+    ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv
     ++ lib.optional (tpmSupport && stdenv.isLinux) trousers
     ++ [ unbound ]
     ++ lib.optional guileBindings guile;
diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
index 0569c0bf5b31..3f8ed7c9de41 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook pkgconfig python perl yacc flex ]
     ++ (with perlPackages; [ JSON ])
     ++ optional (!libOnly) texinfo;
-  buildInputs = [ libcap_ng sqlite openssl db libedit ]
+  buildInputs = (if (!stdenv.isFreeBSD) then [ libcap_ng db ] else []) ++ [ sqlite openssl libedit ]
     ++ optionals (!libOnly) [ openldap pam ];
 
   ## ugly, X should be made an option
@@ -31,14 +31,15 @@ stdenv.mkDerivation rec {
     "--sysconfdir=/etc"
     "--localstatedir=/var"
     "--enable-hdb-openldap-module"
-    "--with-capng"
     "--with-sqlite3=${sqlite}"
-    "--with-berkeley-db=${db}"
     "--with-libedit=${libedit}"
     "--with-openssl=${openssl}"
     "--without-x"
   ] ++ optionals (!libOnly) [
     "--with-openldap=${openldap}"
+  ] ++ optionals (!stdenv.isFreeBSD) [
+    "--with-berkeley-db=${db}"
+    "--with-capng"
   ];
 
   buildPhase = optionalString libOnly ''
@@ -83,7 +84,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "An implementation of Kerberos 5 (and some more stuff)";
     license = licenses.bsd3;
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.freebsd;
     maintainers = with maintainers; [ wkennington ];
   };
 
diff --git a/pkgs/development/libraries/libelf-freebsd/default.nix b/pkgs/development/libraries/libelf-freebsd/default.nix
index ee0b6d50408f..3e09d4c6cd4e 100644
--- a/pkgs/development/libraries/libelf-freebsd/default.nix
+++ b/pkgs/development/libraries/libelf-freebsd/default.nix
@@ -1,20 +1,28 @@
-{ fetchsvn, stdenv }:
+{ fetchsvn, stdenv, gnum4, tet }:
 
 stdenv.mkDerivation (rec {
   version = "3258";
   name = "libelf-freebsd-${version}";
 
-  #src = fetchurl {
-  #  url = "http://sourceforge.net/code-snapshots/svn/e/el/elftoolchain/code/elftoolchain-code-${version}-trunk.zip";
-  #  sha256 = "0vf7s9dwk2xkmhb79aigqm0x0yfbw1j0b9ksm51207qwr179n6jr";
-  #};
   src = fetchsvn {
-    url = svn://svn.code.sf.net/p/elftoolchain/code/trunk ;
-    rev = 3258;
+    url = svn://svn.code.sf.net/p/elftoolchain/code/trunk;
+    rev = (stdenv.lib.strings.toInt version);
   };
 
-  doCheck = true;
-  
+  buildInputs = [ gnum4 tet ];
+
+  buildPhase = ''
+    PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:$PATH # use BSD install(1) instead of coreutils and make(1) instead of GNU Make
+    cp -vr ${tet} test/tet/tet3.8
+    chmod -R a+w test/tet/tet3.8
+    make libelf
+  '';
+
+  installPhase = ''
+    cp -vr libelf $out
+    cp -vr common/. $out/
+  '';
+
   meta = {
     description = "Essential compilation tools and libraries for building and analyzing ELF based program images";
 
diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix
index 253f74ecc6a8..7d836cd5a0df 100644
--- a/pkgs/development/libraries/openldap/default.nix
+++ b/pkgs/development/libraries/openldap/default.nix
@@ -9,7 +9,16 @@ stdenv.mkDerivation rec {
   };
 
   # Should be removed with >=2.4.43
-  patches = [ ./CVE-2015-6908.patch ];
+  patches = [
+    ./CVE-2015-6908.patch
+    (
+      fetchurl {
+        sha256 = "5bcb3f9fb7186b380efa0a1c2d31ad755e190134b5c4dac07c65bbf7c0b6b3b3";
+        url = "https://github.com/LMDB/lmdb/commit/3360cbad668f678fb23c064ca4efcc5c9ae95d10.patch";
+        name = "openldap-clang-compilation.patch";
+      }
+    )
+  ];
 
   outputs = [ "out" "man" ];
 
@@ -19,7 +28,8 @@ stdenv.mkDerivation rec {
     [ "--enable-overlays"
       "--disable-dependency-tracking"   # speeds up one-time build
     ] ++ stdenv.lib.optional (openssl == null) "--without-tls"
-      ++ stdenv.lib.optional (cyrus_sasl == null) "--without-cyrus-sasl";
+      ++ stdenv.lib.optional (cyrus_sasl == null) "--without-cyrus-sasl"
+      ++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic";
 
   dontPatchELF = 1; # !!!
 
diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix
index 580460d5fc09..20ce1dabf9a1 100644
--- a/pkgs/development/libraries/serf/default.nix
+++ b/pkgs/development/libraries/serf/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   buildPhase = ''
     scons PREFIX="$out" OPENSSL="${openssl}" ZLIB="${zlib}" APR="$(echo "${apr}"/bin/*-config)" \
         APU="$(echo "${aprutil}"/bin/*-config)" CC="${
-          if stdenv.isDarwin then "clang" else "${stdenv.cc}/bin/gcc"
+          if stdenv.cc.isClang then "clang" else "${stdenv.cc}/bin/gcc"
         }" ${
           if (stdenv.isDarwin || stdenv.isCygwin) then "" else "GSSAPI=\"${kerberos}\""
         }
diff --git a/pkgs/development/tools/guile/g-wrap/default.nix b/pkgs/development/tools/guile/g-wrap/default.nix
index ed492a0b82df..14777b95b85e 100644
--- a/pkgs/development/tools/guile/g-wrap/default.nix
+++ b/pkgs/development/tools/guile/g-wrap/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ libffi ];
 
-  doCheck = true;
+  doCheck = !stdenv.isFreeBSD; # XXX: 00-socket.test hangs
 
   meta = {
     description = "G-Wrap, a wrapper generator for Guile";
diff --git a/pkgs/development/tools/misc/tet/default.nix b/pkgs/development/tools/misc/tet/default.nix
new file mode 100644
index 000000000000..77b362c712c2
--- /dev/null
+++ b/pkgs/development/tools/misc/tet/default.nix
@@ -0,0 +1,29 @@
+{ fetchurl, stdenv }:
+
+stdenv.mkDerivation (rec {
+  version = "3.8";
+  name = "tet-${version}";
+
+  src = fetchurl {
+    url = http://tetworks.opengroup.org/downloads/38/software/Sources/3.8/tet3.8-src.tar.gz ;
+    sha256 = "1j57hv56df38w249l595b8rsgmsyvjkbysai03a9724gax5jl9av" ;
+  };
+
+  buildInputs = [ ];
+
+  patchPhase = ''chmod +x configure'';
+
+  configurePhase = ''./configure -t lite'';
+
+  buildPhase = ''cd src; make; cd -'';
+
+  installPhase = ''cd src; make install; cd -; cp -vr $PWD $out'';
+
+  meta = {
+    description = "The Test Environment Toolkit is used in test applications like The Open Group's UNIX Certification program and the Free Standards Group's LSB Certification program";
+    homepage = http://tetworks.opengroup.org/Products/tet.htm ;
+    license = stdenv.lib.licenses.artistic1;
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ ];
+  };
+})
diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix
index a97e6847a450..e26fd6ca749e 100644
--- a/pkgs/servers/shishi/default.nix
+++ b/pkgs/servers/shishi/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   };
 
   # Fixes support for gcrypt 1.6+
-  patches = [ ./gcrypt-fix.patch ];
+  patches = [ ./gcrypt-fix.patch ./freebsd-unistd.patch ];
 
   buildInputs = [ libgcrypt libgpgerror libtasn1 optPam optLibidn optGnutls ];
 
diff --git a/pkgs/servers/shishi/freebsd-unistd.patch b/pkgs/servers/shishi/freebsd-unistd.patch
new file mode 100644
index 000000000000..9399e20205b9
--- /dev/null
+++ b/pkgs/servers/shishi/freebsd-unistd.patch
@@ -0,0 +1,12 @@
+diff --git a/gl/unistd.in.h b/gl/unistd.in.h
+index 2ea9af4..ed58960 100644
+--- a/gl/unistd.in.h
++++ b/gl/unistd.in.h
+@@ -116,6 +116,7 @@
+ # include <getopt.h>
+ #endif
+ 
++#include "config.h"
+ _GL_INLINE_HEADER_BEGIN
+ #ifndef _GL_UNISTD_INLINE
+ # define _GL_UNISTD_INLINE _GL_INLINE
diff --git a/pkgs/stdenv/freebsd/trivial-bootstrap.sh b/pkgs/stdenv/freebsd/trivial-bootstrap.sh
index f0b861d1a180..1d7478e158ab 100644
--- a/pkgs/stdenv/freebsd/trivial-bootstrap.sh
+++ b/pkgs/stdenv/freebsd/trivial-bootstrap.sh
@@ -3,7 +3,7 @@
 echo Building the trivial bootstrap environment...
 
 # needed FreeBSD packages:
-# findutils gcpio gawk gnugrep coreutils bash gsed gtar gmake xar binutils gpatch lbzip2
+# findutils gcpio gawk gnugrep coreutils bash gsed gtar gmake xar binutils gpatch lbzip2 diffutils
 
 $mkdir -p $out/bin
 
@@ -22,6 +22,12 @@ ln -s /usr/local/bin/gmake make
 
 ln -s /usr/local/bin/lbzip2
 
+ln -s /usr/local/bin/gdiff diff
+
+ln -s /usr/bin/locale
+
+ln -s /usr/bin/more
+
 ln -s /usr/bin/bzip2
 ln -s /usr/bin/bunzip2
 ln -s /usr/bin/bzcat
diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix
index f865b69cfeda..e2856b7acaa4 100644
--- a/pkgs/tools/text/gawk/default.nix
+++ b/pkgs/tools/text/gawk/default.nix
@@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
        stdenv.isCygwin # XXX: `test-dup2' segfaults on Cygwin 6.1
     || stdenv.isDarwin # XXX: `locale' segfaults
     || stdenv.isSunOS  # XXX: `_backsmalls1' fails, locale stuff?
+    || stdenv.isFreeBSD
   );
 
   buildInputs = stdenv.lib.optional (stdenv.system != "x86_64-cygwin") libsigsegv
diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix
index 242ce36780d1..cad3ccefe1a5 100644
--- a/pkgs/tools/text/gnugrep/default.nix
+++ b/pkgs/tools/text/gnugrep/default.nix
@@ -15,7 +15,8 @@ stdenv.mkDerivation {
   buildInputs = [ pcre libiconv ];
 
   # cygwin: FAIL: multibyte-white-space
-  doCheck = !stdenv.isDarwin && !stdenv.isSunOS && !stdenv.isCygwin;
+  # freebsd: FAIL mb-non-UTF8-performance
+  doCheck = !stdenv.isDarwin && !stdenv.isSunOS && !stdenv.isCygwin && !stdenv.isFreeBSD;
 
   # On Mac OS X, force use of mkdir -p, since Grep's fallback
   # (./install-sh) is broken.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fe9d9eccaee0..e1b48ea8569d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6099,6 +6099,9 @@ let
 
   aprutil = callPackage ../development/libraries/apr-util {
     bdbSupport = true;
+    db = if stdenv.isFreeBSD then db44 else db;
+    # XXX: only the db_158 interface was available through
+    #      apr with db58 on freebsd (nov 2015), for unknown reasons
   };
 
   assimp = callPackage ../development/libraries/assimp { };
@@ -6277,7 +6280,9 @@ let
 
   cwiid = callPackage ../development/libraries/cwiid { };
 
-  cyrus_sasl = callPackage ../development/libraries/cyrus-sasl { };
+  cyrus_sasl = callPackage ../development/libraries/cyrus-sasl {
+    kerberos = if stdenv.isFreeBSD then libheimdal else kerberos;
+  };
 
   # Make bdb5 the default as it is the last release under the custom
   # bsd-like license
@@ -8526,6 +8531,8 @@ let
     python = python2;
   };
 
+  tet = callPackage ../development/tools/misc/tet { };
+
   thrift = callPackage ../development/libraries/thrift { };
 
   tidyp = callPackage ../development/libraries/tidyp { };
@@ -9552,7 +9559,9 @@ let
     ruby = ruby_2_1;
   };
 
-  shishi = callPackage ../servers/shishi { };
+  shishi = if stdenv.isFreeBSD
+  then callPackage ../servers/shishi { pam = null; }
+  else callPackage ../servers/shishi { };
 
   sipcmd = callPackage ../applications/networking/sipcmd { };
 
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index e03634c72030..41dcdcddcbf6 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6555,7 +6555,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       description = "The World-Wide Web library for Perl";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin ++ stdenv.lib.platforms.illumos;
+      platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin ++ stdenv.lib.platforms.illumos ++ stdenv.lib.platforms.freebsd;
     };
   };
 

From 55aa9163cca34107b3e3ce7ce8d7bb76fa5717a0 Mon Sep 17 00:00:00 2001
From: janus <janus@xn--kn-1ia.guru>
Date: Sat, 28 Nov 2015 15:06:15 +0000
Subject: [PATCH 140/884] FreeBSD: minor fixes, add notes and make stdenv more
 robust

---
 pkgs/development/libraries/boost/generic.nix  |   2 +-
 pkgs/development/libraries/expat/default.nix  |   1 -
 pkgs/development/libraries/icu/default.nix    |   2 +-
 .../libraries/kerberos/heimdal.nix            |   2 +-
 .../libraries/libelf-freebsd/default.nix      |   1 +
 .../libraries/libossp-uuid/default.nix        |   2 +-
 .../development/libraries/libtiff/default.nix |   2 +-
 .../libraries/qt-4.x/4.8/default.nix          |  11 +-
 pkgs/development/libraries/zlib/default.nix   |   3 +-
 pkgs/stdenv/freebsd/default.nix               | 122 ++-----
 pkgs/stdenv/freebsd/trivial-bootstrap.sh      | 340 +++++++++---------
 pkgs/top-level/all-packages.nix               |  14 +-
 12 files changed, 223 insertions(+), 279 deletions(-)

diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index 5b497aa76b84..90e60d59da0c 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -1,5 +1,5 @@
 { stdenv, icu, expat, zlib, bzip2, python, fixDarwinDylibNames
-, toolset ? if stdenv.isDarwin || stdenv.isFreeBSD then "clang" else null
+, toolset ? if stdenv.cc.isClang then "clang" else null
 , enableRelease ? true
 , enableDebug ? false
 , enableSingleThreaded ? false
diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix
index 78e2da3ffdbb..766ef6c11c5f 100644
--- a/pkgs/development/libraries/expat/default.nix
+++ b/pkgs/development/libraries/expat/default.nix
@@ -11,7 +11,6 @@ stdenv.mkDerivation rec {
   patches = [ ./CVE-2015-1283.patch ];
 
   configureFlags = stdenv.lib.optionalString stdenv.isFreeBSD "--with-pic";
-  # NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.isFreeBSD) "-fPIC";
 
   meta = with stdenv.lib; {
     homepage = http://www.libexpat.org/;
diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix
index a2196d26524e..148e4f02a94f 100644
--- a/pkgs/development/libraries/icu/default.nix
+++ b/pkgs/development/libraries/icu/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
   '';
 
   configureFlags = "--disable-debug" +
-    stdenv.lib.optionalString stdenv.isDarwin " --enable-rpath";
+    stdenv.lib.optionalString (stdenv.isFreeBSD || stdenv.isDarwin) " --enable-rpath";
 
   # remove dependency on bootstrap-tools in early stdenv build
   postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
index 3f8ed7c9de41..402087b2deda 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   ] ++ optionals (!libOnly) [
     "--with-openldap=${openldap}"
   ] ++ optionals (!stdenv.isFreeBSD) [
-    "--with-berkeley-db=${db}"
+    "--with-berkeley-db=${db}" # XXX: this should of course work, but does not, as of nov 2015 (db==db58)
     "--with-capng"
   ];
 
diff --git a/pkgs/development/libraries/libelf-freebsd/default.nix b/pkgs/development/libraries/libelf-freebsd/default.nix
index 3e09d4c6cd4e..26fe2d90963a 100644
--- a/pkgs/development/libraries/libelf-freebsd/default.nix
+++ b/pkgs/development/libraries/libelf-freebsd/default.nix
@@ -7,6 +7,7 @@ stdenv.mkDerivation (rec {
   src = fetchsvn {
     url = svn://svn.code.sf.net/p/elftoolchain/code/trunk;
     rev = (stdenv.lib.strings.toInt version);
+    name = "elftoolchain-${version}";
   };
 
   buildInputs = [ gnum4 tet ];
diff --git a/pkgs/development/libraries/libossp-uuid/default.nix b/pkgs/development/libraries/libossp-uuid/default.nix
index ddfc2a5132c7..72fa1a29992e 100644
--- a/pkgs/development/libraries/libossp-uuid/default.nix
+++ b/pkgs/development/libraries/libossp-uuid/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     sha256= "11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0";
   };
 
-  configureFlags = stdenv.lib.optional stdenv.isFreeBSD "--with-pic";
+  configureFlags = stdenv.lib.optionalString stdenv.isFreeBSD "--with-pic";
 
   meta = with stdenv.lib; {
     homepage = http://www.ossp.org/pkg/lib/uuid/;
diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix
index 7e9c11d700a5..2c559d221abe 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  doCheck = !stdenv.isFreeBSD;
+  doCheck = true;
 
   meta = with stdenv.lib; {
     description = "Library and utilities for working with the TIFF image file format";
diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index 25b547bf1cf6..17e0485b29fe 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
       -datadir $out/share/${name}
       -translationdir $out/share/${name}/translations
     "
-  '' + optionalString stdenv.isDarwin ''
+  '' + optionalString stdenv.cc.isClang ''
     sed -i 's/QMAKE_CC = gcc/QMAKE_CC = clang/' mkspecs/common/g++-base.conf
     sed -i 's/QMAKE_CXX = g++/QMAKE_CXX = clang++/' mkspecs/common/g++-base.conf
   '';
@@ -95,7 +95,7 @@ stdenv.mkDerivation rec {
     ''
       -v -no-separate-debug-info -release -no-fast -confirm-license -opensource
 
-      -opengl -xrender -xrandr -xinerama -xcursor -xinput -xfixes -fontconfig
+      -${if stdenv.isFreeBSD then "no-" else ""}opengl -xrender -xrandr -xinerama -xcursor -xinput -xfixes -fontconfig
       -qdbus -${if cups == null then "no-" else ""}cups -glib -dbus-linked -openssl-linked
 
       ${if mysql != null then "-plugin" else "-no"}-sql-mysql -system-sqlite
@@ -122,17 +122,18 @@ stdenv.mkDerivation rec {
   # The following libraries are only used in plugins
   buildInputs =
     [ cups # Qt dlopen's libcups instead of linking to it
-      mysql.lib postgresql sqlite libjpeg libmng libtiff icu ]
+      postgresql sqlite libjpeg libmng libtiff icu ]
+    ++ optionals (mysql != null) [ mysql.lib ]
     ++ optionals gtkStyle [ gtk gdk_pixbuf ];
 
   nativeBuildInputs = [ perl pkgconfig which ];
 
   enableParallelBuilding = false;
 
-  NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin
+  NIX_CFLAGS_COMPILE = optionalString (stdenv.isFreeBSD || stdenv.isDarwin)
     "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include";
 
-  NIX_LDFLAGS = optionalString stdenv.isDarwin
+  NIX_LDFLAGS = optionalString (stdenv.isFreeBSD || stdenv.isDarwin)
     "-lglib-2.0";
 
   preBuild = optionalString stdenv.isDarwin ''
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index 99be5162010d..7a6f480215c7 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -31,7 +31,8 @@ stdenv.mkDerivation (rec {
 
   # As zlib takes part in the stdenv building, we don't want references
   # to the bootstrap-tools libgcc (as uses to happen on arm/mips)
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.isDarwin) "-static-libgcc " + stdenv.lib.optionalString (stdenv.isFreeBSD) "-fPIC";
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.isDarwin) "-static-libgcc "
+                     + stdenv.lib.optionalString (stdenv.isFreeBSD) "-fPIC";
 
   crossAttrs = {
     dontStrip = static;
diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix
index fcc3a14d4873..5455c3d8fb95 100644
--- a/pkgs/stdenv/freebsd/default.nix
+++ b/pkgs/stdenv/freebsd/default.nix
@@ -18,114 +18,48 @@ rec {
     ln      = "/bin/ln";
   };
 
-  stage0 = rec {
-    fetchurl = import ../../build-support/fetchurl {
-      inherit stdenv;
-      curl = bootstrapTools;
-    };
-
-    stdenv = import ../generic {
-      inherit system config;
-      name         = "stdenv-freebsd-boot-0";
-      shell        = "/usr/local/bin/bash";
-      initialPath  = [ bootstrapTools ];
-      fetchurlBoot = fetchurl;
-      cc           = null;
-    };
-  };
-
-  buildTools = { #import ../../os-specific/freebsd/command-line-tools
-    inherit (stage0) stdenv fetchurl;
-    xar  = bootstrapTools;
-    gzip = bootstrapTools;
-    cpio = bootstrapTools;
-  };
-
-  preHook = ''
-    export NIX_IGNORE_LD_THROUGH_GCC=1
-    # export NIX_DONT_SET_RPATH=1
-    export NIX_NO_SELF_RPATH=1
-    dontFixLibtool=1
-    stripAllFlags=" " # the Darwin "strip" command doesn't know "-s"
-    xargsFlags=" "
-  '';
-
-  stage1 = rec {
-    nativePrefix = "/usr";
-
+  fetchurl = import ../../build-support/fetchurl {
     stdenv = import ../generic {
       name = "stdenv-freebsd-boot-1";
-
       inherit system config;
-      inherit (stage0.stdenv) shell fetchurlBoot;
 
-      initialPath = stage0.stdenv.initialPath ++ [ nativePrefix ];
-
-      preHook = preHook + "\n" + ''
-        export NIX_LDFLAGS_AFTER+=" -L/usr/lib"
-        export NIX_ENFORCE_PURITY=
-        export NIX_CFLAGS_COMPILE+=" -isystem ${nativePrefix}/include/c++/v1"
-        export NIX_CFLAGS_LINK+=" -Wl,-rpath,${nativePrefix}/lib"
-      '';
-
-      cc = import ../../build-support/cc-wrapper {
-        nativeTools  = true;
-        nativePrefix = nativePrefix;
-        nativeLibc   = true;
-        stdenv       = stage0.stdenv;
-        shell        = "/usr/local/bin/bash";
-        cc           = {
-          name    = "clang-9.9.9";
-          cc      = "/usr";
-          outPath = nativePrefix;
-        };
-        isClang      = true;
-      };
-    };
-    pkgs = allPackages {
-      inherit system platform;
-      bootStdenv = stdenv;
+      initialPath  = null;
+      shell        = "foo";
+      fetchurlBoot = null;
+      cc = null;
     };
+    curl = bootstrapTools;
   };
 
-  stage2 = rec {
-    stdenv = import ../generic {
-      name = "stdenv-freebsd-boot-2";
-
-      inherit system config;
-      inherit (stage1.stdenv) shell fetchurlBoot preHook cc;
-
-      initialPath = [ "/usr/local/bin" ] ++ stage1.stdenv.initialPath;
-    };
-    pkgs = allPackages {
-      inherit system platform;
-      bootStdenv = stdenv;
-    };
-  };
-
-  stage3 = with stage2; import ../generic {
+  stdenvFreeBSD = import ../generic {
     name = "stdenv-freebsd-boot-3";
 
     inherit system config;
-    inherit (stdenv) fetchurlBoot;
 
-    initialPath = [ bootstrapTools ];
-
-    preHook = preHook + "\n" + ''
-      export NIX_ENFORCE_PURITY=1
-    '';
+    initialPath  = [ bootstrapTools ];
+    shell        = "${bootstrapTools}/bin/bash";
+    fetchurlBoot = fetchurl;
 
     cc = import ../../build-support/cc-wrapper {
-      inherit stdenv;
-      nativeTools   = true;
-      nativePrefix  = "/usr/local";
-      nativeLibc    = true;
-      cc            = stage2.stdenv.cc; #pkgs.llvmPackages.clang-unwrapped; 
-      isClang       = true;
+      nativeTools  = true;
+      nativePrefix = "/usr";
+      nativeLibc   = true;
+      stdenv = import ../generic {
+        inherit system config;
+        name         = "stdenv-freebsd-boot-0";
+        initialPath  = [ bootstrapTools ];
+        shell = stdenvFreeBSD.shell;
+        fetchurlBoot = fetchurl;
+        cc           = null;
+      };
+      cc           = {
+        name    = "clang-9.9.9";
+        cc      = "/usr";
+        outPath = "/usr";
+      };
+      isClang      = true;
     };
 
-    shell = "/usr/local/bin/bash";
+    preHook = ''export NIX_NO_SELF_RPATH=1'';
   };
-
-  stdenvFreeBSD = stage3;
 }
diff --git a/pkgs/stdenv/freebsd/trivial-bootstrap.sh b/pkgs/stdenv/freebsd/trivial-bootstrap.sh
index 1d7478e158ab..1dc59ea7dbc7 100644
--- a/pkgs/stdenv/freebsd/trivial-bootstrap.sh
+++ b/pkgs/stdenv/freebsd/trivial-bootstrap.sh
@@ -1,189 +1,193 @@
-
-# Building bootstrap tools
 echo Building the trivial bootstrap environment...
-
-# needed FreeBSD packages:
-# findutils gcpio gawk gnugrep coreutils bash gsed gtar gmake xar binutils gpatch lbzip2 diffutils
+echo
+echo Needed FreeBSD packages:
+echo findutils gcpio gawk gnugrep coreutils bash gsed gtar gmake xar binutils gpatch lbzip2 diffutils
 
 $mkdir -p $out/bin
 
-$ln -s $ln $out/bin/ln
+ln () {
+  if test "x$2" != x -a -f "$out/bin/$2"; then
+    echo "$2 exists"
+    exit 1;
+  fi;
+  if test ! -f "$1"; then
+    echo Target "$2" does not exist
+    exit 1;
+  fi
+  $ln -s "$1" "$out/bin/$2"
+}
 
-PATH=$out/bin/
+ln /usr/local/bin/bash
+ln /bin/sh
 
-cd $out/bin
+ln /usr/local/bin/gmake make
 
-ln -s $mkdir
+ln /usr/local/bin/lbzip2
 
-ln -s /usr/local/bin/bash
-ln -s /bin/sh
+ln /usr/local/bin/gdiff diff
 
-ln -s /usr/local/bin/gmake make
+ln /usr/bin/locale
 
-ln -s /usr/local/bin/lbzip2
+ln /usr/bin/more
 
-ln -s /usr/local/bin/gdiff diff
+ln /usr/bin/hexdump # for bitcoin
 
-ln -s /usr/bin/locale
+ln /usr/bin/bzip2
+ln /usr/bin/bunzip2
+ln /usr/bin/bzcat
+ln /usr/bin/bzip2recover
 
-ln -s /usr/bin/more
+ln /usr/bin/xz
+ln /usr/bin/unxz
+ln /usr/bin/xzcat
+ln /usr/bin/lzma
+ln /usr/bin/unlzma
+ln /usr/bin/lzcat
 
-ln -s /usr/bin/bzip2
-ln -s /usr/bin/bunzip2
-ln -s /usr/bin/bzcat
-ln -s /usr/bin/bzip2recover
+ln /usr/local/bin/gcp cp
+ln /usr/local/bin/gdd dd
+ln /usr/local/bin/gmv mv
+ln /usr/local/bin/grm rm
+ln /usr/local/bin/gls ls
+ln /bin/ps ps
+ln /usr/local/bin/gcat cat
+ln /usr/local/bin/gecho echo
+ln /usr/local/bin/gexpr expr
+ln /usr/local/bin/gtest test
+ln /usr/local/bin/gdate date
+ln /usr/local/bin/gchmod chmod
+ln /usr/local/bin/grmdir rmdir
+ln /usr/local/bin/gsleep sleep
+ln /bin/hostname hostname
 
-ln -s /usr/bin/xz
-ln -s /usr/bin/unxz
-ln -s /usr/bin/xzcat
-ln -s /usr/bin/lzma
-ln -s /usr/bin/unlzma
-ln -s /usr/bin/lzcat
+ln /usr/local/bin/gid id
+ln /usr/local/bin/god od
+ln /usr/local/bin/gtr tr
+ln /usr/local/bin/gwc wc
+ln /usr/local/bin/gcut cut
+ln /usr/bin/cmp cmp
+ln /usr/local/bin/gsed sed
+ln /usr/local/bin/gtar tar
+ln /usr/local/bin/xar xar
+ln /usr/local/bin/gawk awk
+ln /usr/local/bin/genv env
+ln /usr/local/bin/gtee tee
+ln /usr/local/bin/gcomm comm
+ln /usr/local/bin/gcpio cpio
+ln /usr/local/bin/curl curl
+ln /usr/local/bin/gfind find
+ln /usr/local/bin/grep grep #other grep is in /usr/bin
+ln /usr/bin/gzip
+ln /usr/bin/gunzip
+ln /usr/bin/zcat
+ln /usr/local/bin/ghead head
+ln /usr/bin/tail tail
+ln /usr/local/bin/guniq uniq
+ln /usr/bin/less less
+ln /usr/local/bin/gtrue true
+# ln /usr/bin/diff diff
+ln /usr/local/bin/egrep egrep
+ln /usr/local/bin/fgrep fgrep
+ln /usr/local/bin/gpatch patch
+ln /usr/local/bin/guname uname
+ln /usr/local/bin/gtouch touch
+ln /usr/local/bin/gsplit split
+ln /usr/local/bin/gxargs xargs
+ln /usr/bin/which which
+ln /usr/local/bin/ginstall install
+ln /usr/local/bin/gbasename basename
+ln /usr/local/bin/gdirname dirname
+ln /usr/local/bin/greadlink readlink
 
-ln -s /usr/local/bin/gcp cp
-ln -s /usr/local/bin/gdd dd
-ln -s /usr/local/bin/gmv mv
-ln -s /usr/local/bin/grm rm
-ln -s /usr/local/bin/gls ls
-ln -s /bin/ps ps
-ln -s /usr/local/bin/gcat cat
-ln -s /usr/local/bin/gecho echo
-ln -s /usr/local/bin/gexpr expr
-ln -s /usr/local/bin/gtest test
-ln -s /usr/local/bin/gdate date
-ln -s /usr/local/bin/gchmod chmod
-ln -s /usr/local/bin/grmdir rmdir
-ln -s /usr/local/bin/gsleep sleep
-ln -s /bin/hostname hostname
-
-ln -s /usr/local/bin/gid id
-ln -s /usr/local/bin/god od
-ln -s /usr/local/bin/gtr tr
-ln -s /usr/local/bin/gwc wc
-ln -s /usr/local/bin/gcut cut
-ln -s /usr/bin/cmp cmp
-ln -s /usr/local/bin/gsed sed
-ln -s /usr/local/bin/gtar tar
-ln -s /usr/local/bin/xar xar
-ln -s /usr/local/bin/gawk awk
-ln -s /usr/local/bin/genv env
-ln -s /usr/local/bin/gtee tee
-ln -s /usr/local/bin/gcomm comm
-ln -s /usr/local/bin/gcpio cpio
-ln -s /usr/local/bin/curl curl
-ln -s /usr/local/bin/gfind find
-ln -s /usr/local/bin/grep grep #other grep is in /usr/bin
-ln -s /usr/bin/gzip
-ln -s /usr/bin/gunzip
-ln -s /usr/bin/zcat
-ln -s /usr/local/bin/ghead head
-ln -s /usr/bin/tail tail
-ln -s /usr/local/bin/guniq uniq
-ln -s /usr/bin/less less
-ln -s /usr/local/bin/gtrue true
-ln -s /usr/bin/diff diff
-ln -s /usr/local/bin/egrep egrep
-ln -s /usr/local/bin/fgrep fgrep
-ln -s /usr/local/bin/gpatch patch
-ln -s /usr/local/bin/guname uname
-ln -s /usr/local/bin/gtouch touch
-ln -s /usr/local/bin/gsplit split
-ln -s /usr/local/bin/gxargs xargs
-ln -s /usr/bin/which which
-ln -s /usr/local/bin/ginstall install
-ln -s /usr/local/bin/gbasename basename
-ln -s /usr/local/bin/gdirname dirname
-ln -s /usr/local/bin/greadlink readlink
-
-ln -fs /usr/local/bin/gln ln
-ln -s /usr/local/bin/gyes yes
-ln -s /usr/local/bin/gwhoami whoami
-ln -s /usr/local/bin/gvdir vdir
-ln -s /usr/local/bin/gusers users
-ln -s /usr/local/bin/guptime uptime
-ln -s /usr/local/bin/gunlink unlink
-ln -s /usr/local/bin/gtty tty
-ln -s /usr/local/bin/gunexpand unexpand
-ln -s /usr/local/bin/gtsort tsort
-ln -s /usr/local/bin/gtruncate truncate
-ln -s /usr/local/bin/gtimeout timeout
-ln -s /usr/local/bin/gtac tac
-ln -s /usr/local/bin/gsync sync
-ln -s /usr/local/bin/gsum sum
-ln -s /usr/local/bin/gstty stty
-ln -s /usr/local/bin/gstdbuf stdbuf
-ln -s /usr/local/bin/gsort sort
-ln -s /usr/local/bin/gruncon runcon
-ln -s /usr/local/bin/gseq seq
-ln -s /usr/local/bin/gsha1sum sha1sum
-ln -s /usr/local/bin/gsha224sum sha224sum
-ln -s /usr/local/bin/gsha256sum sha256sum
-ln -s /usr/local/bin/gsha384sum sha384sum
-ln -s /usr/local/bin/gsha512sum sha512sum
-ln -s /usr/local/bin/gshred shred
-ln -s /usr/local/bin/gshuf shuf
-ln -s /usr/local/bin/grealpath realpath
-ln -s "/usr/local/bin/g[" "["
-ln -s /usr/local/bin/gbase64 base64
-ln -s /usr/local/bin/gchcon chcon
-ln -s /usr/local/bin/gchgrp chgrp
-ln -s /usr/local/bin/gchown chown
-ln -s /usr/local/bin/gchroot chroot
-ln -s /usr/local/bin/gcksum cksum
-ln -s /usr/local/bin/gcsplit csplit
-ln -s /usr/local/bin/gdf df
-ln -s /usr/local/bin/gdircolors dircolors
-ln -s /usr/local/bin/gdu du
-ln -s /usr/local/bin/gexpand expand
-ln -s /usr/local/bin/gfactor factor
-ln -s /usr/local/bin/gfalse false
-ln -s /usr/local/bin/gfmt fmt
-ln -s /usr/local/bin/gfold fold
-ln -s /usr/local/bin/ggroups groups
-ln -s /usr/local/bin/ghostid hostid
-ln -s /usr/local/bin/gjoin join
-ln -s /usr/local/bin/gkill kill
-ln -s /usr/local/bin/glink link
-ln -s /usr/local/bin/glogname logname
-ln -s /usr/local/bin/gmd5sum md5sum
-ln -s /usr/local/bin/gmkdir mkdir
-ln -s /usr/local/bin/gmkfifo mkfifo
-ln -s /usr/local/bin/gmknod mknod
-ln -s /usr/local/bin/gmktemp mktemp
-ln -s /usr/local/bin/gnice nice
-ln -s /usr/local/bin/gnl nl
-ln -s /usr/local/bin/gnohup nohup
-ln -s /usr/local/bin/gnproc nproc
-ln -s /usr/local/bin/gnumfmt numfmt
-ln -s /usr/local/bin/gnustat nustat
-ln -s /usr/local/bin/gpaste paste
-ln -s /usr/local/bin/gpathchk pathchk
-ln -s /usr/local/bin/gpinky pinky
-ln -s /usr/local/bin/gpr pr
-ln -s /usr/local/bin/gprintenv printenv
-ln -s /usr/local/bin/gprintf printf
-ln -s /usr/local/bin/gptx ptx
-ln -s /usr/local/bin/gpwd pwd
+ln /usr/local/bin/gln ln
+ln /usr/local/bin/gyes yes
+ln /usr/local/bin/gwhoami whoami
+ln /usr/local/bin/gvdir vdir
+ln /usr/local/bin/gusers users
+ln /usr/local/bin/guptime uptime
+ln /usr/local/bin/gunlink unlink
+ln /usr/local/bin/gtty tty
+ln /usr/local/bin/gunexpand unexpand
+ln /usr/local/bin/gtsort tsort
+ln /usr/local/bin/gtruncate truncate
+ln /usr/local/bin/gtimeout timeout
+ln /usr/local/bin/gtac tac
+ln /usr/local/bin/gsync sync
+ln /usr/local/bin/gsum sum
+ln /usr/local/bin/gstty stty
+ln /usr/local/bin/gstdbuf stdbuf
+ln /usr/local/bin/gsort sort
+ln /usr/local/bin/gruncon runcon
+ln /usr/local/bin/gseq seq
+ln /usr/local/bin/gsha1sum sha1sum
+ln /usr/local/bin/gsha224sum sha224sum
+ln /usr/local/bin/gsha256sum sha256sum
+ln /usr/local/bin/gsha384sum sha384sum
+ln /usr/local/bin/gsha512sum sha512sum
+ln /usr/local/bin/gshred shred
+ln /usr/local/bin/gshuf shuf
+ln /usr/local/bin/grealpath realpath
+ln "/usr/local/bin/g[" "["
+ln /usr/local/bin/gbase64 base64
+ln /usr/local/bin/gchcon chcon
+ln /usr/local/bin/gchgrp chgrp
+ln /usr/local/bin/gchown chown
+ln /usr/local/bin/gchroot chroot
+ln /usr/local/bin/gcksum cksum
+ln /usr/local/bin/gcsplit csplit
+ln /usr/local/bin/gdf df
+ln /usr/local/bin/gdircolors dircolors
+ln /usr/local/bin/gdu du
+ln /usr/local/bin/gexpand expand
+ln /usr/local/bin/gfactor factor
+ln /usr/local/bin/gfalse false
+ln /usr/local/bin/gfmt fmt
+ln /usr/local/bin/gfold fold
+ln /usr/local/bin/ggroups groups
+ln /usr/local/bin/ghostid hostid
+ln /usr/local/bin/gjoin join
+ln /usr/local/bin/gkill kill
+ln /usr/local/bin/glink link
+ln /usr/local/bin/glogname logname
+ln /usr/local/bin/gmd5sum md5sum
+ln /usr/local/bin/gmkdir mkdir
+ln /usr/local/bin/gmkfifo mkfifo
+ln /usr/local/bin/gmknod mknod
+ln /usr/local/bin/gmktemp mktemp
+ln /usr/local/bin/gnice nice
+ln /usr/local/bin/gnl nl
+ln /usr/local/bin/gnohup nohup
+ln /usr/local/bin/gnproc nproc
+ln /usr/local/bin/gnumfmt numfmt
+ln /usr/local/bin/gnustat nustat
+ln /usr/local/bin/gpaste paste
+ln /usr/local/bin/gpathchk pathchk
+ln /usr/local/bin/gpinky pinky
+ln /usr/local/bin/gpr pr
+ln /usr/local/bin/gprintenv printenv
+ln /usr/local/bin/gprintf printf
+ln /usr/local/bin/gptx ptx
+ln /usr/local/bin/gpwd pwd
 
 # binutils
 # pkg info -l binutils | grep usr/local/bin
-ln -s /usr/local/bin/addr2line
-ln -s /usr/local/bin/ar
-ln -s /usr/local/bin/as
-ln -s /usr/local/bin/c++filt
-ln -s /usr/local/bin/dwp
-ln -s /usr/local/bin/elfedit
-ln -s /usr/local/bin/gprof
-ln -s /usr/local/bin/ld
-ln -s /usr/local/bin/ld.bfd
-ln -s /usr/local/bin/ld.gold
-ln -s /usr/local/bin/nm
-ln -s /usr/local/bin/objcopy
-ln -s /usr/local/bin/objdump
-ln -s /usr/local/bin/ranlib
-ln -s /usr/local/bin/readelf
-ln -s /usr/local/bin/size
-ln -s /usr/local/bin/strings
-ln -s /usr/local/bin/strip
+ln /usr/local/bin/addr2line
+ln /usr/local/bin/ar
+ln /usr/local/bin/as
+ln /usr/local/bin/c++filt
+ln /usr/local/bin/dwp
+ln /usr/local/bin/elfedit
+ln /usr/local/bin/gprof
+ln /usr/local/bin/ld
+ln /usr/local/bin/ld.bfd
+ln /usr/local/bin/ld.gold
+ln /usr/local/bin/nm
+ln /usr/local/bin/objcopy
+ln /usr/local/bin/objdump
+ln /usr/local/bin/ranlib
+ln /usr/local/bin/readelf
+ln /usr/local/bin/size
+ln /usr/local/bin/strings
+ln /usr/local/bin/strip
 
 #pkg info -l llvm37 | grep usr/local/bin
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e1b48ea8569d..0e8e030a18ae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6099,8 +6099,8 @@ let
 
   aprutil = callPackage ../development/libraries/apr-util {
     bdbSupport = true;
-    db = if stdenv.isFreeBSD then db44 else db;
-    # XXX: only the db_158 interface was available through
+    db = if stdenv.isFreeBSD then db47 else db;
+    # XXX: only the db_185 interface was available through
     #      apr with db58 on freebsd (nov 2015), for unknown reasons
   };
 
@@ -8163,6 +8163,9 @@ let
     mesa = mesa_noglu;
     inherit (pkgs.gnome) libgnomeui GConf gnome_vfs;
     cups = if stdenv.isLinux then cups else null;
+
+    # XXX: mariadb doesn't built on fbsd as of nov 2015
+    mysql = if (!stdenv.isFreeBSD) then mysql else null;
   };
 
   qt48Full = appendToName "full" (qt48.override {
@@ -9559,9 +9562,10 @@ let
     ruby = ruby_2_1;
   };
 
-  shishi = if stdenv.isFreeBSD
-  then callPackage ../servers/shishi { pam = null; }
-  else callPackage ../servers/shishi { };
+  shishi = callPackage ../servers/shishi {
+      pam = if stdenv.isLinux then pam else null;
+      # see also openssl, which has/had this same trick
+  };
 
   sipcmd = callPackage ../applications/networking/sipcmd { };
 

From cbcab5521b6247845a54ab36279fb1fee95b36d3 Mon Sep 17 00:00:00 2001
From: janus <janus@xn--kn-1ia.guru>
Date: Wed, 23 Dec 2015 13:51:11 +0000
Subject: [PATCH 141/884] FreeBSD: re-add heimdal

---
 pkgs/development/libraries/kerberos/heimdal.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
index 402087b2deda..e17d0c19e037 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -35,10 +35,10 @@ stdenv.mkDerivation rec {
     "--with-libedit=${libedit}"
     "--with-openssl=${openssl}"
     "--without-x"
+    "--with-berkeley-db=${db}"
   ] ++ optionals (!libOnly) [
     "--with-openldap=${openldap}"
   ] ++ optionals (!stdenv.isFreeBSD) [
-    "--with-berkeley-db=${db}" # XXX: this should of course work, but does not, as of nov 2015 (db==db58)
     "--with-capng"
   ];
 

From 3c8f0a92d35a4c9fffb4c6bfb1fcfe75dbefa0d1 Mon Sep 17 00:00:00 2001
From: janus <janus@xn--kn-1ia.guru>
Date: Thu, 24 Dec 2015 02:04:18 +0000
Subject: [PATCH 142/884] FreeBSD: improve bootstrapping, re-enable bdb for
 heimdal

---
 pkgs/stdenv/freebsd/default.nix          |  6 ++---
 pkgs/stdenv/freebsd/trivial-bootstrap.sh | 29 ++++++++++++++++--------
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix
index 5455c3d8fb95..3c4e2bb97661 100644
--- a/pkgs/stdenv/freebsd/default.nix
+++ b/pkgs/stdenv/freebsd/default.nix
@@ -11,7 +11,7 @@ rec {
     inherit system;
 
     name    = "trivial-bootstrap-tools";
-    builder = "/bin/sh";
+    builder = "/usr/local/bin/bash";
     args    = [ ./trivial-bootstrap.sh ];
 
     mkdir   = "/bin/mkdir";
@@ -23,8 +23,8 @@ rec {
       name = "stdenv-freebsd-boot-1";
       inherit system config;
 
-      initialPath  = null;
-      shell        = "foo";
+      initialPath  = [ "/" "/usr" ];
+      shell        = "${bootstrapTools}/bin/bash";
       fetchurlBoot = null;
       cc = null;
     };
diff --git a/pkgs/stdenv/freebsd/trivial-bootstrap.sh b/pkgs/stdenv/freebsd/trivial-bootstrap.sh
index 1dc59ea7dbc7..fbff4575e5a4 100644
--- a/pkgs/stdenv/freebsd/trivial-bootstrap.sh
+++ b/pkgs/stdenv/freebsd/trivial-bootstrap.sh
@@ -1,3 +1,7 @@
+set -e
+set -o nounset
+set -o pipefail
+
 echo Building the trivial bootstrap environment...
 echo
 echo Needed FreeBSD packages:
@@ -6,15 +10,22 @@ echo findutils gcpio gawk gnugrep coreutils bash gsed gtar gmake xar binutils gp
 $mkdir -p $out/bin
 
 ln () {
-  if test "x$2" != x -a -f "$out/bin/$2"; then
-    echo "$2 exists"
-    exit 1;
-  fi;
+  if [ ! -z "${2:-}" ]; then
+    if [ -f "$out/bin/$2" ]; then
+      echo "$2 exists"
+      exit 1
+    fi
+  fi
   if test ! -f "$1"; then
     echo Target "$2" does not exist
-    exit 1;
+    exit 1
+  fi
+  # TODO: check that destination directory exists
+  if [ ! -z "${2:-}" ]; then
+    $ln -s "$1" "$out/bin/$2"
+  else
+    $ln -s "$1" "$out/bin/"
   fi
-  $ln -s "$1" "$out/bin/$2"
 }
 
 ln /usr/local/bin/bash
@@ -76,16 +87,16 @@ ln /usr/local/bin/gcomm comm
 ln /usr/local/bin/gcpio cpio
 ln /usr/local/bin/curl curl
 ln /usr/local/bin/gfind find
-ln /usr/local/bin/grep grep #other grep is in /usr/bin
+ln /usr/local/bin/grep grep # other grep is in /usr/bin
 ln /usr/bin/gzip
 ln /usr/bin/gunzip
 ln /usr/bin/zcat
 ln /usr/local/bin/ghead head
-ln /usr/bin/tail tail
+ln /usr/bin/tail tail # note that we are not using gtail!!!
 ln /usr/local/bin/guniq uniq
 ln /usr/bin/less less
 ln /usr/local/bin/gtrue true
-# ln /usr/bin/diff diff
+# ln /usr/bin/diff diff # we are using gdiff (see above)
 ln /usr/local/bin/egrep egrep
 ln /usr/local/bin/fgrep fgrep
 ln /usr/local/bin/gpatch patch

From 072da541de9a00837fc4e21c2bf4a967b4d63713 Mon Sep 17 00:00:00 2001
From: janus <janus@xn--kn-1ia.guru>
Date: Fri, 1 Jan 2016 16:59:35 +0000
Subject: [PATCH 143/884] FreeBSD: undo removal of Solaris and remove changes
 to native stdenv now that FreeBSD has its own

---
 pkgs/development/compilers/sbcl/bootstrap.nix |  1 +
 pkgs/stdenv/native/default.nix                | 94 -------------------
 2 files changed, 1 insertion(+), 94 deletions(-)

diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix
index 4152bb8b2a3f..f8352f0a362e 100644
--- a/pkgs/development/compilers/sbcl/bootstrap.nix
+++ b/pkgs/development/compilers/sbcl/bootstrap.nix
@@ -23,6 +23,7 @@ let
       sha256 = "0sp5445rbvms6qvzhld0kwwvydw51vq5iaf4kdqsf2d9jvaz3yx5";
     };
     armv6l-linux = armv7l-linux;
+    x86_64-solaris = x86_64-linux;
     x86_64-freebsd = rec {
       version = "1.2.7";
       system = "x86-64-freebsd";
diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix
index 93d1c7e971c2..bd90d580d3f5 100644
--- a/pkgs/stdenv/native/default.nix
+++ b/pkgs/stdenv/native/default.nix
@@ -24,100 +24,6 @@ rec {
     alias make=gmake
     alias tar=gtar
     alias sed=gsed
-
-    alias patch=gpatch # pcre relied on this for patching binary files
-
-    # we need GNU cp for --reflink, need to alias all of coreutils
-    alias basename=gbasename
-    alias cat=gcat
-    alias chgrp=gchgrp
-    alias chmod=gchmod
-    alias chown=gchown
-    alias chroot=gchroot
-    alias cksum=gcksum
-    alias comm=gcomm
-    alias cp=gcp
-    alias csplit=gcsplit
-    alias cut=gcut
-    alias date=gdate
-    alias dd=gdd
-    alias df=gdf
-    alias dir=gdir
-    alias dircolors=gdircolors
-    alias dirname=gdirname
-    alias du=gdu
-    alias echo=gecho
-    alias env=genv
-    alias expand=gexpand
-    alias expr=gexpr
-    alias factor=gfactor
-    alias false=gfalse
-    alias fmt=gfmt
-    alias fold=gfold
-    alias groups=ggroups
-    alias head=ghead
-    alias hostid=ghostid
-    alias hostname=ghostname
-    alias id=gid
-    alias install=ginstall
-    alias join=gjoin
-    alias kill=gkill
-    alias link=glink
-    alias ln=gln
-    alias logname=glogname
-    alias ls=gls
-    alias md5sum=gmd5sum
-    alias mkdir=gmkdir
-    alias mkfifo=gmkfifo
-    alias mknod=gmknod
-    alias mv=gmv
-    alias nice=gnice
-    alias nl=gnl
-    alias nohup=gnohup
-    alias od=god
-    alias paste=gpaste
-    alias pathchk=gpathchk
-    alias pinky=gpinky
-    alias pr=gpr
-    alias printenv=gprintenv
-    alias printf=gprintf
-    alias ptx=gptx
-    alias pwd=gpwd
-    alias readlink=greadlink
-    alias rm=grm
-    alias rmdir=grmdir
-    alias seq=gseq
-    alias sha1sum=gsha1sum
-    alias shred=gshred
-    alias sleep=gsleep
-    alias sort=gsort
-    alias split=gsplit
-    alias stat=gstat
-    alias stty=gstty
-    alias su=gsu
-    alias sum=gsum
-    alias sync=gsync
-    alias tac=gtac
-    #alias tail=gtail # this breaks xz XXX
-    alias tee=gtee
-    alias test=gtest
-    alias touch=gtouch
-    alias tr=gtr
-    alias true=gtrue
-    alias tsort=gtsort
-    alias tty=gtty
-    alias uname=guname
-    alias unexpand=gunexpand
-    alias uniq=guniq
-    alias unlink=gunlink
-    alias uptime=guptime
-    alias users=gusers
-    alias vdir=gvdir
-    alias wc=gwc
-    alias who=gwho
-    alias whoami=gwhoami
-    alias yes=gyes
-
     export MAKE=gmake
     shopt -s expand_aliases
   '';

From ca0c46040649ab4a6d5d7bc838b393fdcbcae10c Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Thu, 26 Nov 2015 14:44:49 +0100
Subject: [PATCH 144/884] nixos-rebuild: Add option for building and/or
 deploying on a remote host

This commit adds the options --build-host and --target-host to nixos-rebuild.

--build-host instructs nixos-rebuild to perform all nix builds on the
specified host (via ssh). Build results are then copied back to the
local machine and used when activating the system.

--build-target instructs nixos-rebuild to activate the configuration
not on the local machine but on the specified remote host. Build
results are copied to the target machine and then activated there (via ssh).

It is possible to combine the usage of --build-host and --target-host,
in which case you can perform the build on one remote machine and deploy
the configuration to another remote machine. The only requirement is that
the build host has a working ssh connection to the target host (if the
target is not local), and that the local machine can connect to both
the target and the build host. Also, your user must be allowed to copy
nix closures between the local machine and the target and host machines.

At no point in time are the configuration sources (the nix files) copied
anywhere. Instead, nix evaluation always happens locally
(with nix-instantiate). The drv-file is then copied and realised remotely
(with nix-store).

As a convenience, if only --target-host is specified, --build-host is
implicitly set to that host too. So if you want to build locally and deploy
remotely you have to explicitly set "--build-host localhost".

To activate (test, boot or switch) you need to have root access to the
target host. You can specify this by "--target-host root@myhost".

I have tested the obvious scenarios and they are working. Some of the
combinations of --build-host and --target-host and the various actions might
not make much sense, and should maybe be forbidden (like setting a remote
target host when building a VM), and some combinations might not work at all.
---
 .../modules/installer/tools/nixos-rebuild.sh  | 187 +++++++++++++++---
 1 file changed, 160 insertions(+), 27 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh
index 6792690b4c3b..1071460097e8 100644
--- a/nixos/modules/installer/tools/nixos-rebuild.sh
+++ b/nixos/modules/installer/tools/nixos-rebuild.sh
@@ -19,6 +19,8 @@ rollback=
 upgrade=
 repair=
 profile=/nix/var/nix/profiles/system
+buildHost=
+targetHost=
 
 while [ "$#" -gt 0 ]; do
     i="$1"; shift 1
@@ -73,6 +75,14 @@ while [ "$#" -gt 0 ]; do
         fi
         shift 1
         ;;
+      --build-host|h)
+        buildHost="$1"
+        shift 1
+        ;;
+      --target-host|t)
+        targetHost="$1"
+        shift 1
+        ;;
       *)
         echo "$0: unknown option \`$i'"
         exit 1
@@ -80,6 +90,90 @@ while [ "$#" -gt 0 ]; do
     esac
 done
 
+
+if [ -z "$buildHost" -a -n "$targetHost" ]; then
+    buildHost="$targetHost"
+fi
+if [ "$targetHost" = localhost ]; then
+    targetHost=
+fi
+if [ "$buildHost" = localhost ]; then
+    buildHost=
+fi
+
+buildHostCmd() {
+    if [ -z "$buildHost" ]; then
+        "$@"
+    elif [ -n "$remoteNix" ]; then
+        ssh $SSHOPTS "$buildHost" PATH="$remoteNix:$PATH" "$@"
+    else
+        ssh $SSHOPTS "$buildHost" "$@"
+    fi
+}
+
+targetHostCmd() {
+    if [ -z "$targetHost" ]; then
+        "$@"
+    else
+        ssh $SSHOPTS "$targetHost" "$@"
+    fi
+}
+
+copyToTarget() {
+    if ! [ "$targetHost" = "$buildHost" ]; then
+        if [ -z "$targetHost" ]; then
+            NIX_SSHOPTS=$SSH_OPTS nix-copy-closure --from "$buildHost" "$1"
+        elif [ -z "$buildHost" ]; then
+            NIX_SSHOPTS=$SSH_OPTS nix-copy-closure --to "$targetHost" "$1"
+        else
+            buildHostCmd nix-copy-closure --to "$targetHost" "$1"
+        fi
+    fi
+}
+
+nixBuild() {
+    if [ -z "$buildHost" ]; then
+        nix-build "$@"
+    else
+        local instArgs=()
+        local buildArgs=()
+
+        while [ "$#" -gt 0 ]; do
+            local i="$1"; shift 1
+            case "$i" in
+              -o)
+                local out="$1"; shift 1
+                buildArgs+=("--add-root" "$out" "--indirect")
+                ;;
+              -A)
+                local j="$1"; shift 1
+                instArgs+=("$i" "$j")
+                ;;
+              -I)
+                # We don't want this in buildArgs
+                shift 1
+                ;;
+              "<"*) # nix paths
+                instArgs+=("$i")
+                ;;
+              *)
+                buildArgs+=("$i")
+                ;;
+            esac
+        done
+
+        local drv="$(nix-instantiate "${instArgs[@]}" "${extraBuildFlags[@]}")"
+        if [ -a "$drv" ]; then
+            NIX_SSHOPTS=$SSH_OPTS nix-copy-closure --to "$buildHost" "$drv"
+            buildHostCmd nix-store -r "$drv" "${buildArgs[@]}"
+        else
+            echo "nix-instantiate failed"
+            exit 1
+        fi
+  fi
+}
+
+
 if [ -z "$action" ]; then showSyntax; fi
 
 # Only run shell scripts from the Nixpkgs tree if the action is
@@ -128,7 +222,16 @@ fi
 
 
 tmpDir=$(mktemp -t -d nixos-rebuild.XXXXXX)
-trap 'rm -rf "$tmpDir"' EXIT
+SSHOPTS="$NIX_SSHOPTS -o ControlMaster=auto -o ControlPath=$tmpDir/ssh-%n -o ControlPersist=60"
+
+cleanup() {
+    for ctrl in "$tmpDir"/ssh-*; do
+        ssh -o ControlPath="$ctrl" -O exit dummyhost 2>/dev/null || true
+    done
+    rm -rf "$tmpDir"
+}
+trap cleanup EXIT
+
 
 
 # If the Nix daemon is running, then use it.  This allows us to use
@@ -150,30 +253,56 @@ if [ -n "$rollback" -o "$action" = dry-build ]; then
     buildNix=
 fi
 
+prebuiltNix() {
+    machine="$1"
+    if [ "$machine" = x86_64 ]; then
+        return /nix/store/xryr9g56h8yjddp89d6dw12anyb4ch7c-nix-1.10
+    elif [[ "$machine" =~ i.86 ]]; then
+        return /nix/store/2w92k5wlpspf0q2k9mnf2z42prx3bwmv-nix-1.10
+    else
+        echo "$0: unsupported platform"
+        exit 1
+    fi
+}
+
+remotePATH=
+
 if [ -n "$buildNix" ]; then
     echo "building Nix..." >&2
-    if ! nix-build '<nixpkgs/nixos>' -A config.nix.package -o $tmpDir/nix "${extraBuildFlags[@]}" > /dev/null; then
-        if ! nix-build '<nixpkgs/nixos>' -A nixFallback -o $tmpDir/nix "${extraBuildFlags[@]}" > /dev/null; then
-            if ! nix-build '<nixpkgs>' -A nix -o $tmpDir/nix "${extraBuildFlags[@]}" > /dev/null; then
-                machine="$(uname -m)"
-                if [ "$machine" = x86_64 ]; then
-                    nixStorePath=/nix/store/xryr9g56h8yjddp89d6dw12anyb4ch7c-nix-1.10
-                elif [[ "$machine" =~ i.86 ]]; then
-                    nixStorePath=/nix/store/2w92k5wlpspf0q2k9mnf2z42prx3bwmv-nix-1.10
-                else
-                    echo "$0: unsupported platform"
-                    exit 1
-                fi
+    nixDrv=
+    if ! nixDrv="$(nix-instantiate '<nixpkgs/nixos>' --add-root $tmpDir/nixdrv --indirect -A config.nix.package "${extraBuildFlags[@]}")"; then
+        if ! nixDrv="$(nix-instantiate '<nixpkgs/nixos>' --add-root $tmpDir/nixdrv --indirect -A nixFallback "${extraBuildFlags[@]}")"; then
+            if ! nixDrv="$(nix-instantiate '<nixpkgs>' --add-root $tmpDir/nixdrv --indirect -A nix "${extraBuildFlags[@]}")"; then
+                nixStorePath="$(prebuiltNix "$(uname -m)")"
                 if ! nix-store -r $nixStorePath --add-root $tmpDir/nix --indirect \
                     --option extra-binary-caches https://cache.nixos.org/; then
                     echo "warning: don't know how to get latest Nix" >&2
                 fi
                 # Older version of nix-store -r don't support --add-root.
                 [ -e $tmpDir/nix ] || ln -sf $nixStorePath $tmpDir/nix
+                if [ -n "$buildHost" ]; then
+                    remoteNixStorePath="$(prebuiltNix "$(buildHostCmd uname -m)")"
+                    remoteNix="$remoteNixStorePath/bin"
+                    if ! buildHostCmd nix-store -r $remoteNixStorePath \
+                      --option extra-binary-caches https://cache.nixos.org/ >/dev/null; then
+                        remoteNix=
+                        echo "warning: don't know how to get latest Nix" >&2
+                    fi
+                fi
             fi
         fi
     fi
-    PATH=$tmpDir/nix/bin:$PATH
+    if [ -a "$nixDrv" ]; then
+        nix-store -r "$nixDrv" --add-root $tmpDir/nix --indirect >/dev/null
+        if [ -n "$buildHost" ]; then
+            nix-copy-closure --to "$buildHost" "$nixDrv"
+            # The nix build produces multiple outputs, we add them all to the remote path
+            for p in $(buildHostCmd nix-store -r "$(readlink "$nixDrv")" "${buildArgs[@]}"); do
+                remoteNix="$remoteNix${remoteNix:+:}$p/bin"
+            done
+        fi
+    fi
+    PATH="$tmpDir/nix/bin:$PATH"
 fi
 
 
@@ -200,31 +329,35 @@ fi
 if [ -z "$rollback" ]; then
     echo "building the system configuration..." >&2
     if [ "$action" = switch -o "$action" = boot ]; then
-        nix-env "${extraBuildFlags[@]}" -p "$profile" -f '<nixpkgs/nixos>' --set -A system
-        pathToConfig="$profile"
+        pathToConfig="$(nixBuild '<nixpkgs/nixos>' -A system "${extraBuildFlags[@]}")"
+        copyToTarget "$pathToConfig"
+        targetHostCmd nix-env -p "$profile" --set "$pathToConfig"
     elif [ "$action" = test -o "$action" = build -o "$action" = dry-build -o "$action" = dry-activate ]; then
-        nix-build '<nixpkgs/nixos>' -A system -k "${extraBuildFlags[@]}" > /dev/null
-        pathToConfig=./result
+        pathToConfig="$(nixBuild '<nixpkgs/nixos>' -A system -k "${extraBuildFlags[@]}")"
     elif [ "$action" = build-vm ]; then
-        nix-build '<nixpkgs/nixos>' -A vm -k "${extraBuildFlags[@]}" > /dev/null
-        pathToConfig=./result
+        pathToConfig="$(nixBuild '<nixpkgs/nixos>' -A vm -k "${extraBuildFlags[@]}")"
     elif [ "$action" = build-vm-with-bootloader ]; then
-        nix-build '<nixpkgs/nixos>' -A vmWithBootLoader -k "${extraBuildFlags[@]}" > /dev/null
-        pathToConfig=./result
+        pathToConfig="$(nixBuild '<nixpkgs/nixos>' -A vmWithBootLoader -k "${extraBuildFlags[@]}")"
     else
         showSyntax
     fi
+    # Copy build to target host if we haven't already done it
+    if ! [ "$action" = switch -o "$action" = boot ]; then
+        copyToTarget "$pathToConfig"
+    fi
 else # [ -n "$rollback" ]
     if [ "$action" = switch -o "$action" = boot ]; then
-        nix-env --rollback -p "$profile"
+        targetHostCmd nix-env --rollback -p "$profile"
         pathToConfig="$profile"
     elif [ "$action" = test -o "$action" = build ]; then
         systemNumber=$(
-            nix-env -p "$profile" --list-generations |
+            targetHostCmd nix-env -p "$profile" --list-generations |
             sed -n '/current/ {g; p;}; s/ *\([0-9]*\).*/\1/; h'
         )
-        ln -sT "$profile"-${systemNumber}-link ./result
-        pathToConfig=./result
+        pathToConfig="$profile"-${systemNumber}-link
+        if [ -z "$targetHost" ]; then
+            ln -sT "$pathToConfig" ./result
+        fi
     else
         showSyntax
     fi
@@ -234,7 +367,7 @@ fi
 # If we're not just building, then make the new configuration the boot
 # default and/or activate it now.
 if [ "$action" = switch -o "$action" = boot -o "$action" = test -o "$action" = dry-activate ]; then
-    if ! $pathToConfig/bin/switch-to-configuration "$action"; then
+    if ! targetHostCmd $pathToConfig/bin/switch-to-configuration "$action"; then
         echo "warning: error(s) occurred while switching to the new configuration" >&2
         exit 1
     fi

From 448a2af041e940642d70271c17175edf6aea69a0 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Wed, 23 Dec 2015 12:22:16 +0100
Subject: [PATCH 145/884] nixos-rebuild: Document --build-host and
 --target-host options

---
 nixos/doc/manual/man-nixos-rebuild.xml | 52 ++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/nixos/doc/manual/man-nixos-rebuild.xml b/nixos/doc/manual/man-nixos-rebuild.xml
index c529737c3bf3..a8d20c0f6579 100644
--- a/nixos/doc/manual/man-nixos-rebuild.xml
+++ b/nixos/doc/manual/man-nixos-rebuild.xml
@@ -281,6 +281,51 @@ $ nixos-rebuild switch -p test -I nixos-config=./test.nix
     </listitem>
   </varlistentry>
 
+  <varlistentry>
+    <term><option>--build-host</option></term>
+    <listitem>
+      <para>Instead of building the new configuration locally, use the
+      specified host to perform the build. The host needs to be accessible
+      with ssh, and must be able to perform Nix builds. If the option
+      <option>--target-host</option> is not set, the build will be copied back
+      to the local machine when done.</para>
+
+      <para>Note that, if <option>--no-build-nix</option> is not specified,
+      Nix will be built both locally and remotely. This is because the
+      configuration will always be evaluated locally even though the building
+      might be performed remotely.</para>
+
+      <para>You can include a remote user name in
+      the host name (<replaceable>user@host</replaceable>). You can also set
+      ssh options by defining the <envar>NIX_SSHOPTS</envar> environment
+      variable.</para>
+    </listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><option>--target-host</option></term>
+    <listitem>
+      <para>Specifies the NixOS target host. By setting this to something other
+      than <replaceable>localhost</replaceable>, the system activation will
+      happen on the remote host instead of the local machine. The remote host
+      needs to be accessible over ssh, and for the commands
+      <option>switch</option>, <option>boot</option> and <option>test</option>
+      you need root access.</para>
+
+      <para>If <option>--build-host</option> is not explicitly
+      specified, <option>--build-host</option> will implicitly be set to the
+      same value as <option>--target-host</option>. So, if you only specify
+      <option>--target-host</option> both building and activation will take
+      place remotely (and no build artifacts will be copied to the local
+      machine).</para>
+
+      <para>You can include a remote user name in
+      the host name (<replaceable>user@host</replaceable>). You can also set
+      ssh options by defining the <envar>NIX_SSHOPTS</envar> environment
+      variable.</para>
+    </listitem>
+  </varlistentry>
+
 </variablelist>
 
 <para>In addition, <command>nixos-rebuild</command> accepts various
@@ -305,6 +350,13 @@ the Nix manual for details.</para>
     </listitem>
   </varlistentry>
 
+  <varlistentry><term><envar>NIX_SSHOPTS</envar></term>
+
+    <listitem><para>Additional options to be passed to
+    <command>ssh</command> on the command line.</para></listitem>
+
+  </varlistentry>
+
 </variablelist>
 
 </refsection>

From a1fdc48d7eb6026d8b8a585264ca512a7ee5195d Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Fri, 1 Jan 2016 19:01:05 +0100
Subject: [PATCH 146/884] ocaml-ssl: 0.4.7 -> 0.5.2

---
 pkgs/development/ocaml-modules/ssl/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ssl/default.nix b/pkgs/development/ocaml-modules/ssl/default.nix
index ef8ce098f3ce..f80675f88d24 100644
--- a/pkgs/development/ocaml-modules/ssl/default.nix
+++ b/pkgs/development/ocaml-modules/ssl/default.nix
@@ -2,15 +2,16 @@
 
 let
   ocaml_version = (builtins.parseDrvName ocaml.name).version;
-  version = "0.4.7";
+  version = "0.5.2";
 in
 
 stdenv.mkDerivation {
   name = "ocaml-ssl-${version}";
 
   src = fetchurl {
-    url = "mirror://debian/pool/main/o/ocaml-ssl/ocaml-ssl_${version}.orig.tar.gz";
-    sha256 = "0i0j89b10n3xmmawcq4qfwa42133pddw4x5nysmsnpd15srv5gp9";
+  url = "http://downloads.sourceforge.net/project/savonet/ocaml-ssl/0.5.2/ocaml-ssl-0.5.2.tar.gz";
+
+    sha256 = "0341rm8aqrckmhag1lrqfnl17v6n4ci8ibda62ahkkn5cxd58cpp";
   };
 
   buildInputs = [which ocaml findlib];
@@ -19,8 +20,6 @@ stdenv.mkDerivation {
 
   dontAddPrefix = true;
 
-  configureFlags = "--disable-ldconf";
-
   createFindlibDestdir = true;
 
   meta = {

From f4c6f769f411e59101a1301f0b45c89e4625da6d Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Fri, 1 Jan 2016 17:37:36 +0100
Subject: [PATCH 147/884] lwt: 2.4.6 -> 2.5.0

---
 pkgs/development/ocaml-modules/lwt/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix
index 0c73ff6521f2..a018194a2ace 100644
--- a/pkgs/development/ocaml-modules/lwt/default.nix
+++ b/pkgs/development/ocaml-modules/lwt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip, which, cryptopp, ocaml, findlib, ocaml_react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, ocaml_text, glib, camlp4, ppx_tools }:
 
 let
-  version = "2.4.6";
+  version = "2.5.0";
   inherit (stdenv.lib) optional getVersion versionAtLeast;
   ocaml_version = getVersion ocaml;
 in
@@ -13,16 +13,15 @@ stdenv.mkDerivation {
 
   src = fetchzip {
     url = "https://github.com/ocsigen/lwt/archive/${version}.tar.gz";
-    sha256 = "0idci0zadpb8hmblszsrvg6yf36w5a9y6rsdwjc3jww71dgrw5d9";
+    sha256 = "0jgg51aqbnia33l7bhgirnfpqybjwzpd85qzzd9znnc1a27gv8vr";
   };
 
   buildInputs = [ ocaml_oasis pkgconfig which cryptopp ocaml findlib glib ncurses camlp4 ppx_tools ];
 
   propagatedBuildInputs = [ ocaml_react ocaml_ssl ocaml_text libev ];
 
-  configureFlags = [ "--enable-react" "--enable-glib" "--enable-ssl" "--enable-text" ]
-  ++ [ (if versionAtLeast ocaml_version "4.02" then "--enable-ppx" else "--disable-ppx") ]
-  ++ optional (versionAtLeast ocaml_version "4.0" && ! versionAtLeast ocaml_version "4.02") "--enable-toplevel";
+  configureFlags = [ "--enable-glib" "--enable-ssl" "--enable-react" "--enable-camlp4"]
+  ++ [ (if versionAtLeast ocaml_version "4.02" then "--enable-ppx" else "--disable-ppx") ];
 
   createFindlibDestdir = true;
 

From 87f2c1dcc416f88b89e2e1500b0148efa4595b38 Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Fri, 1 Jan 2016 17:38:03 +0100
Subject: [PATCH 148/884] ocsigen-server: 2.5 -> 2.6

---
 pkgs/development/ocaml-modules/ocsigen-server/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
index a6361ce1237a..a1bd7d162342 100644
--- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
@@ -9,11 +9,11 @@ let mkpath = p: n:
 in
 
 stdenv.mkDerivation {
-  name = "ocsigenserver-2.5";
+  name = "ocsigenserver-2.6";
 
   src = fetchurl {
-    url = https://github.com/ocsigen/ocsigenserver/archive/2.5.tar.gz;
-    sha256 = "0ayzlzjwg199va4sclsldlcp0dnwdj45ahhg9ckb51m28c2pw46r";
+    url = https://github.com/ocsigen/ocsigenserver/archive/2.6.tar.gz;
+    sha256 = "0638xvlr0sssvjarmdwhgh7vbgdx8wiyjwq73w1bkjfwl7qm21zp";
   };
 
   buildInputs = [ocaml which findlib ocaml_react ocaml_ssl ocaml_lwt

From 44931d4293ba3f1d24430624086ee0c7b705fcc3 Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Fri, 1 Jan 2016 17:38:30 +0100
Subject: [PATCH 149/884] js_of_ocaml: 2.5 -> 2.6

---
 .../tools/ocaml/js_of_ocaml/Makefile.conf.diff        | 11 -----------
 pkgs/development/tools/ocaml/js_of_ocaml/default.nix  | 10 +++++-----
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff b/pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff
index 0e3f55df6d20..e6fc96038ff8 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/Makefile.conf.diff
@@ -8,14 +8,3 @@
  
  ####
  
---- old/Makefile	2014-09-30 16:40:37.000000000 +0200
-+++ new/Makefile	2015-10-14 10:28:41.366815864 +0200
-@@ -52,7 +52,7 @@
- install-bin:
- 	install -d -m 755 $(BINDIR)
- 	install $(BIN) $(BINDIR)
--	install $(TOOLS) $(BINDIR)
-+	install $(TOOLS) $(BINDIR) || true
- 
- uninstall: uninstall-lib uninstall-bin
- 
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
index eaabd50059d3..0c57ae47c2c8 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
@@ -1,15 +1,15 @@
 {stdenv, fetchurl, ocaml, findlib, ocaml_lwt, menhir, ocsigen_deriving, camlp4,
- cmdliner, tyxml, reactivedata}:
+ cmdliner, tyxml, reactivedata, cppo, which, base64}:
 
 stdenv.mkDerivation {
-  name = "js_of_ocaml-2.5";
+  name = "js_of_ocaml-2.6";
   src = fetchurl {
-    url = https://github.com/ocsigen/js_of_ocaml/archive/2.5.tar.gz;
-    sha256 = "1prm08nf8szmd3p13ysb0yx1cy6lr671bnwsp25iny8hfbs39sjv";
+    url = https://github.com/ocsigen/js_of_ocaml/archive/2.6.tar.gz;
+    sha256 = "0q34lrn70dvz41m78bwgriyq6dxk97g8gcyg80nvxii4jp86dw61";
     };
   
   buildInputs = [ocaml findlib menhir ocsigen_deriving
-                 cmdliner tyxml reactivedata];
+                 cmdliner tyxml reactivedata cppo which base64];
   propagatedBuildInputs = [ ocaml_lwt camlp4 ];
 
   patches = [ ./Makefile.conf.diff ];  

From e956922b92980e3cc404b6c56224b2a81a793ee9 Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Fri, 1 Jan 2016 17:38:50 +0100
Subject: [PATCH 150/884] eliom: 4.1.0 -> 4.2.0

---
 pkgs/development/ocaml-modules/eliom/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix
index 23959306d2d4..ef0a88fb2280 100644
--- a/pkgs/development/ocaml-modules/eliom/default.nix
+++ b/pkgs/development/ocaml-modules/eliom/default.nix
@@ -8,12 +8,12 @@ assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4";
 stdenv.mkDerivation rec
 {
   pname = "eliom";
-  version = "4.1.0";
+  version = "4.2.0";
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = https://github.com/ocsigen/eliom/archive/4.1.0.tar.gz;
-    sha256 = "10v7mrq3zsbxdlg8k8xif777mbvcdpabvnd1g7p2yqivr7f1qm24";
+    url = https://github.com/ocsigen/eliom/archive/4.2.tar.gz;
+    sha256 = "0gbqzgn6xgpq6irz2sfr92qj3hjcwl45wy0inc4ps5r15nvq1l9h";
   };
 
   patches = [ ./camlp4.patch ];

From 502c791611175c9a3cd660561668264783e7e689 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 1 Jan 2016 19:07:32 +0100
Subject: [PATCH 151/884] update-walker: add a minimal description

---
 .../upstream-updater/update-walker.txt        | 118 ++++++++++++++++++
 1 file changed, 118 insertions(+)
 create mode 100644 pkgs/build-support/upstream-updater/update-walker.txt

diff --git a/pkgs/build-support/upstream-updater/update-walker.txt b/pkgs/build-support/upstream-updater/update-walker.txt
new file mode 100644
index 000000000000..ae47e5590294
--- /dev/null
+++ b/pkgs/build-support/upstream-updater/update-walker.txt
@@ -0,0 +1,118 @@
+update-walker is an imperative semiautomated update helper.
+
+It runs the X.upstream file to find the freshest version of the package in
+the specified upstream source and updates the corresponding X.nix file.
+
+
+
+The simplest available commands:
+
+url: set the upstream source list URL equal to $1; the default is
+meta.downloadPage with meta.homepage fallback
+
+dl_url_re: set the regular expression used to select download links to $1; the
+default is meta.downloadURLRegexp or '[.]tar[.]([^./])+\$' if it is not set
+
+target: specify target expression; default is to replace .upstream extension
+with .nix extension
+
+name: specify the derivation name; default is the basename of the dirname
+of the .upstream file
+
+attribute_name: specify the attribute name to evaluate for getting the current
+version from meta.version; default is to use the derivation name
+
+minimize_overwrite: set config options that mean that only version= and
+sha256= have to be replaced; the default is to regenerate a full upstream
+description block with url, name, version, hash etc.
+
+
+
+A lot of packages can be updated in a pseudo-declarative style using only
+the commands from the previous paragraph.
+
+Some packages do not need any non-default settings, in these case just setting
+meta.updateWalker to true is enough, you can run update-walker directly on the
+.nix file afterwards. In this case minimize_overwrite it implied unless
+meta.fullRegenerate is set.
+
+
+
+The packages that require more fine-grained control than the described options
+allow, you need to take into account the default control flow of the tool.
+
+First, the definitions from update-walker script and additional definitions
+from update-walker-service-specific.sh are loaded. Then the config is executed
+as a shell script. Some of the commands it can use do remember whether they
+have been used. Afterwards the following steps happen: 
+
+attribute_name is set to name unless it has been already set
+
+meta.version is read from the NixPkgs package called attribute_name
+
+download URL regexp is set to default unless it has been already set in the
+updater script
+
+the download page URL gets set to default value unless it has been set
+previously
+
+if the action of getting the download page and choosing the freshest link by
+version has not yet been taken, it happens
+
+if the version has not yet been extracted from the URL, it gets extracted
+
+target nix expression to update gets set to the default value unless it has
+been set explicitly
+
+if the URL version is fresher than the packaged version, the new file gets
+downloaded and its hash is calculated
+
+do_overwrite function is called; the default calculates a big upstream data
+block and puts it after the '# Generated upstream information' marker (the
+marker can be changed by the command marker)
+
+
+
+If the update needs some special logic, it is put into the updater script and
+the corresponding steps are skipped because the needed action has already been
+performed. 
+
+For example: 
+
+minimize_overwrite is exactly the same as
+
+do_overwrite() { do_overwrite_just_version; }
+
+redefinition. You can do a more complex do_overwrite redifinition, if needed.
+It can probably use ensure_hash to download the source and calculate the hash
+and set_var_value.
+
+set_var_value alters the $3-th instance of assigning the $1 name in the
+expression to the value $2. $3 defaults to 1. It can modify $4 instead of the
+current target, it can put the value without quotes if $5 is 1.
+
+
+
+Typical steps include:
+
+ensure_choice: download current URL and find the freshest version link on the
+page, it is now the new URL
+
+ensure_hash: download current URL and calculate the source package hash
+
+ensure_version: extract version from the URL
+
+SF_redirect: replace the current URL with a SourceForge.net mirror:// URL
+
+SF_version_dir: assume SourceForge.net layout and choose the freshest
+version-named subdirectory in the file catalog; you can optionally specify $1
+as a directory name regexp (digits and periods will be required after it)
+
+SF_version_tarball: assume SourceForge.net layout and choose the freshest
+tarball download link
+
+version: apply replacement of $1 with $2 (extended regexp format) to extract
+the version from URL
+
+version_link: choose the freshest versioned link, $1 is the regexp of
+acceptable links

From aaeba728b35e0f8e6441051fbc623f1b3b1a9d7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Fri, 1 Jan 2016 19:11:42 +0100
Subject: [PATCH 152/884] a2ps: new package

---
 pkgs/tools/text/a2ps/default.nix | 31 +++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix  |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/tools/text/a2ps/default.nix

diff --git a/pkgs/tools/text/a2ps/default.nix b/pkgs/tools/text/a2ps/default.nix
new file mode 100644
index 000000000000..5580cb6e8314
--- /dev/null
+++ b/pkgs/tools/text/a2ps/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, libpaper, gperf, file }:
+
+stdenv.mkDerivation rec {
+  name = "a2ps-4.14";
+  src = fetchurl {
+    url = "mirror://gnu/a2ps/${name}.tar.gz";
+    sha256 = "195k78m1h03m961qn7jr120z815iyb93gwi159p1p9348lyqvbpk";
+  };
+
+  postPatch = ''
+    substituteInPlace afm/make_fonts_map.sh --replace "/bin/rm" "rm"
+    substituteInPlace tests/defs.in --replace "/bin/rm" "rm"
+  '';
+
+  buildInputs = [ libpaper gperf file ];
+
+  meta = with stdenv.lib; {
+    description = "An Anyithing to PostScript converter and pretty-printer";
+    longDescription = ''
+      GNU a2ps converts files into PostScript for printing or viewing. It uses a nice default format,
+      usually two pages on each physical page, borders surrounding pages, headers with useful information
+      (page number, printing date, file name or supplied header), line numbering, symbol substitution as
+      well as pretty printing for a wide range of programming languages.
+    '';
+    homepage = http://www.inf.enst.fr/~demaille/a2ps/index.html;
+    license = gpl3Plus;
+    maintainers = [ maintainers.bennofs ];
+    platforms = platforms.linux;
+
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 992719704608..cc67c8f0f23c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -474,6 +474,8 @@ let
     glibc = glibc.override { debugSymbols = true; };
   };
 
+  a2ps = callPackage ../tools/text/a2ps { };
+
   abduco = callPackage ../tools/misc/abduco { };
 
   acbuild = callPackage ../applications/misc/acbuild { };

From c140bd697bd2a46ab0e9748377d69c4d23ebb7d6 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Thu, 31 Dec 2015 14:09:54 -0500
Subject: [PATCH 153/884] flashplayer: 11.2.202.554 -> 11.2.202.559

---
 .../browsers/mozilla-plugins/flashplayer-11/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
index d60ae8ea1dbc..9521e1debd7c 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
@@ -57,11 +57,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "flashplayer-${version}";
-  version = "11.2.202.554";
+  version = "11.2.202.559";
 
   src = fetchurl {
     url = "https://fpdownload.macromedia.com/pub/flashplayer/installers/archive/fp_${version}_archive.zip";
-    sha256 = "0pjan07k419pk3lmfdl5vww0ipf5b76cxqhxwjrikb1fc4x993fi";
+    sha256 = "1vb01pd1jhhh86r01nwdzcf66d72jksiyiyp92hs4khy6n5qfsl3";
   };
 
   buildInputs = [ unzip ];

From 1b5873a7206c486be31a3228276564eb87ceab31 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Fri, 1 Jan 2016 14:01:42 -0500
Subject: [PATCH 154/884] shotwell: 0.20.2 -> 0.22.0

This release has actually been out for nine months, and the existing
release completely failed to be able to import photos in my setup.
---
 pkgs/applications/graphics/shotwell/default.nix | 8 ++++----
 pkgs/top-level/all-packages.nix                 | 4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix
index c3f43e4b94d8..da8bbad33cad 100644
--- a/pkgs/applications/graphics/shotwell/default.nix
+++ b/pkgs/applications/graphics/shotwell/default.nix
@@ -6,12 +6,12 @@
 # for dependencies see http://www.yorba.org/projects/shotwell/install/
 
 stdenv.mkDerivation rec {
-  version = "0.20.2";
+  version = "0.22.0";
   name = "shotwell-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/shotwell/0.20/${name}.tar.xz";
-    sha256 = "0h5pdczsrkplvlvq54zk3am4kjmfpd6pn2sz0ky8lfq1fngwiqip";
+    url = "mirror://gnome/sources/shotwell/0.22/${name}.tar.xz";
+    sha256 = "0cgqaaikrb10plhf6zxbgqy32zqpiwyi9dpx3g8yr261q72r5c81";
   };
 
   NIX_CFLAGS_COMPILE = "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include";
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Popular photo organizer for the GNOME desktop";
-    homepage = http://www.yorba.org/projects/shotwell/;
+    homepage = https://wiki.gnome.org/Apps/Shotwell;
     license = licenses.lgpl21Plus;
     maintainers = with maintainers; [iElectric];
     platforms = platforms.linux;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 992719704608..27b6e384448d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3032,7 +3032,9 @@ let
 
   sharutils = callPackage ../tools/archivers/sharutils { };
 
-  shotwell = callPackage ../applications/graphics/shotwell { };
+  shotwell = callPackage ../applications/graphics/shotwell {
+    vala = vala_0_28;
+  };
 
   shout = callPackage ../applications/networking/irc/shout { };
 

From fc45d98c3189beac7acf454117266b463df63bfb Mon Sep 17 00:00:00 2001
From: davidak <git@davidak.de>
Date: Fri, 1 Jan 2016 20:19:11 +0100
Subject: [PATCH 155/884] pass: update homepage url

---
 pkgs/tools/security/pass/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix
index 3315683967cc..03720d6abe1a 100644
--- a/pkgs/tools/security/pass/default.nix
+++ b/pkgs/tools/security/pass/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Stores, retrieves, generates, and synchronizes passwords securely";
-    homepage    = http://zx2c4.com/projects/password-store/;
+    homepage    = http://www.passwordstore.org/;
     license     = licenses.gpl2Plus;
     maintainers = with maintainers; [ lovek323 the-kenny ];
     platforms   = platforms.unix;

From ddb6e8e69c629db1a7cf68c9c7e257492e036b95 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 1 Jan 2016 15:39:05 +0100
Subject: [PATCH 156/884] man-pages: 4.03 -> 4.04

---
 pkgs/data/documentation/man-pages/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix
index ae7cac62bcbf..5800b429ae4d 100644
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/pkgs/data/documentation/man-pages/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
-let version = "4.03"; in
+let version = "4.04"; in
 stdenv.mkDerivation rec {
   name = "man-pages-${version}";
 
   src = fetchurl {
     url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
-    sha256 = "177w71rwsw3lsh9pjqy625s5iwz1ahdaj7prys1bpc4bqi78q5mh";
+    sha256 = "0v8zxq4scfixy3pjpw9ankvv5v8frv62khv4xm1jpkswyq6rbqcg";
   };
 
   makeFlags = [ "MANDIR=$(out)/share/man" ];

From 8b9a9fd9f51ed249ed88dc29c78cf17c27f6c264 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 1 Jan 2016 15:54:36 +0100
Subject: [PATCH 157/884] saneBackendsGit: 2015-12-27 -> 2016-01-01

---
 pkgs/applications/graphics/sane/backends/git.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/sane/backends/git.nix b/pkgs/applications/graphics/sane/backends/git.nix
index 6c6838daef17..ff59b59d4014 100644
--- a/pkgs/applications/graphics/sane/backends/git.nix
+++ b/pkgs/applications/graphics/sane/backends/git.nix
@@ -1,10 +1,10 @@
 { callPackage, fetchgit, ... } @ args:
 
 callPackage ./generic.nix (args // {
-  version = "2015-12-27";
+  version = "2016-01-01";
   src = fetchgit {
-    sha256 = "4bf6e8815d2edbbc75255928d0fb030639a9fea9a5aa953dcf1f00e167eff527";
-    rev = "cadb4b0fff00540159625320416e5601c4704627";
+    sha256 = "412c88b2b2b699b5a2ab28c7696c715e46b600398391ae038840c6b8674aea7c";
+    rev = "3f0c3df2fcde8d0cf30ab68c70cb5cad984dda6f";
     url = "git://alioth.debian.org/git/sane/sane-backends.git";
   };
 })

From 8924e770ca41e2333bf440f143e38664bab6ad42 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 1 Jan 2016 22:03:21 +0100
Subject: [PATCH 158/884] a2ps: fix evaluation

---
 pkgs/tools/text/a2ps/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/text/a2ps/default.nix b/pkgs/tools/text/a2ps/default.nix
index 5580cb6e8314..7de6a8dd5745 100644
--- a/pkgs/tools/text/a2ps/default.nix
+++ b/pkgs/tools/text/a2ps/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
       well as pretty printing for a wide range of programming languages.
     '';
     homepage = http://www.inf.enst.fr/~demaille/a2ps/index.html;
-    license = gpl3Plus;
+    license = licenses.gpl3Plus;
     maintainers = [ maintainers.bennofs ];
     platforms = platforms.linux;
 

From aa0cf50d2394b13a51c3c7c6bd3f4544c1508fb2 Mon Sep 17 00:00:00 2001
From: Reno Reckling <exi@wthack.de>
Date: Fri, 1 Jan 2016 22:09:30 +0100
Subject: [PATCH 159/884] kmymoney: 4.6.3 -> 4.7.2

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

diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix
index 87e3bfd53126..942b92c055e2 100644
--- a/pkgs/applications/office/kmymoney/default.nix
+++ b/pkgs/applications/office/kmymoney/default.nix
@@ -3,11 +3,11 @@
 , doxygen }:
 
 stdenv.mkDerivation rec {
-  name = "kmymoney-4.6.4";
+  name = "kmymoney-4.7.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/kmymoney2/${name}.tar.xz";
-    sha256 = "04n0lgi2yrx67bgjzbdbcm10pxs7l53srmp240znzw59njnjyll9";
+    sha256 = "0g9rakjx7zmw4bf7m5516rrx0n3bl2by3nn24iiz9209yfgw5cmz";
   };
 
   buildInputs = [ kdepimlibs perl boost gpgme gmpxx libalkimia libofx libical

From 73e5d2338717843c4032cb772ae8c9c66212fb68 Mon Sep 17 00:00:00 2001
From: Reno Reckling <exi@wthack.de>
Date: Fri, 1 Jan 2016 22:10:07 +0100
Subject: [PATCH 160/884] kmymoney: enable kbanking support

this will add hbci capabilities to kmymoney
---
 pkgs/applications/office/kmymoney/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix
index 942b92c055e2..8884c78e883d 100644
--- a/pkgs/applications/office/kmymoney/default.nix
+++ b/pkgs/applications/office/kmymoney/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, cmake, kdelibs, automoc4, kdepimlibs, gettext, pkgconfig
 , shared_mime_info, perl, boost, gpgme, gmpxx, libalkimia, libofx, libical
-, doxygen }:
+, doxygen, aqbanking, gwenhywfar }:
 
 stdenv.mkDerivation rec {
   name = "kmymoney-4.7.2";
@@ -10,8 +10,12 @@ stdenv.mkDerivation rec {
     sha256 = "0g9rakjx7zmw4bf7m5516rrx0n3bl2by3nn24iiz9209yfgw5cmz";
   };
 
+  cmakeFlags = [
+    "-DENABLE_KBANKING='true'"
+  ];
+
   buildInputs = [ kdepimlibs perl boost gpgme gmpxx libalkimia libofx libical
-                  doxygen ];
+                  doxygen aqbanking gwenhywfar ];
   nativeBuildInputs = [ cmake automoc4 gettext shared_mime_info pkgconfig ];
 
   KDEDIRS = libalkimia;

From 4ffe61e0d1e93c3064e7568afed45e58659a187c Mon Sep 17 00:00:00 2001
From: Reno Reckling <exi@wthack.de>
Date: Fri, 1 Jan 2016 22:47:08 +0100
Subject: [PATCH 161/884] boolstuff: 0.1.14 -> 0.1.15

The build was broken because the webserver served the wrong archive version.
This fixes it indirectly.
---
 pkgs/development/libraries/boolstuff/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/boolstuff/default.nix b/pkgs/development/libraries/boolstuff/default.nix
index c1bd8a4b3a2a..62d61e6cb5d5 100644
--- a/pkgs/development/libraries/boolstuff/default.nix
+++ b/pkgs/development/libraries/boolstuff/default.nix
@@ -3,16 +3,16 @@
 let baseurl = "http://perso.b2b2c.ca/sarrazip/dev"; in
 
 stdenv.mkDerivation rec {
-  name = "boolstuff-0.1.14";
+  name = "boolstuff-0.1.15";
 
   src = fetchurl {
     url = "${baseurl}/${name}.tar.gz";
-    sha256 = "1ccn9v3kxz44pv3mr8q0l2i9769jiigw1gfv47ia50mbspwb87r6";
+    sha256 = "1mzw4368hqw0b6xr01yqcbs9jk9ma3qq9hk3iqxmkiwqqxgirgln";
   };
 
   nativeBuildInputs = [ pkgconfig ];
 
-  meta = { 
+  meta = {
     description = "Library for operations on boolean expression binary trees";
     homepage = "${baseurl}/boolstuff.html";
     license = "GPL";

From 92a0140ff83d4622861b0cdbfafe0295ae1afcda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 1 Jan 2016 16:01:57 +0100
Subject: [PATCH 162/884] cups-pk-helper: init at 0.2.5

Adding this package to environment.systemPackages stops the
"Add new printer" button in gnome-control-center from being grayed out
and stops it from printing:

  (gnome-control-center:16664): printers-cc-panel-WARNING **: Your system does not have the cups-pk-helper's policy "org.opensuse.cupspkhelper.mechanism.all-edit" installed. Please check your installation

But completing the printer setup requires some additional packaging
work. This is what happens when trying to _add_ a printer:

  (gnome-control-center:18733): printers-cc-panel-WARNING **: GDBus.Error:org.freedesktop.DBus.Error.ServiceUnknown: The name org.fedoraproject.Config.Printing was not provided by any .service files
  (gnome-control-center:18733): printers-cc-panel-WARNING **: GDBus.Error:org.freedesktop.DBus.Error.ServiceUnknown: The name org.freedesktop.PackageKit was not provided by any .service files
---
 pkgs/misc/cups/cups-pk-helper.nix | 21 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/misc/cups/cups-pk-helper.nix

diff --git a/pkgs/misc/cups/cups-pk-helper.nix b/pkgs/misc/cups/cups-pk-helper.nix
new file mode 100644
index 000000000000..b3d289df551c
--- /dev/null
+++ b/pkgs/misc/cups/cups-pk-helper.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, intltool, pkgconfig, glib, polkit, cups }:
+
+stdenv.mkDerivation rec {
+  version = "0.2.5";
+  name = "cups-pk-helper-${version}";
+
+  src = fetchurl {
+    url = "http://www.freedesktop.org/software/cups-pk-helper/releases/cups-pk-helper-${version}.tar.xz";
+    sha256 = "0651ij5p5s0n3xxbaqsy72s22nx9hfkrjgvg766lkqd1cpniw8hr";
+  };
+
+  buildInputs = [ intltool pkgconfig glib polkit cups ];
+
+  meta = with stdenv.lib; {
+    description = "PolicyKit helper to configure cups with fine-grained privileges";
+    homepage = http://www.freedesktop.org/wiki/Software/cups-pk-helper/;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cc67c8f0f23c..c5f0e0590f3a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15310,6 +15310,8 @@ let
 
   cups_filters = callPackage ../misc/cups/filters.nix { };
 
+  cups-pk-helper = callPackage ../misc/cups/cups-pk-helper.nix { };
+
   crashplan = callPackage ../applications/backup/crashplan { };
 
   gutenprint = callPackage ../misc/drivers/gutenprint { };

From 74fc8dc0ced8368c7196e7778b2b1ab99adafad6 Mon Sep 17 00:00:00 2001
From: Reno Reckling <exi@wthack.de>
Date: Sat, 2 Jan 2016 03:58:07 +0100
Subject: [PATCH 163/884] fix ding desktop file path

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

diff --git a/pkgs/applications/misc/ding/default.nix b/pkgs/applications/misc/ding/default.nix
index a044eb1df920..46634e2698cf 100644
--- a/pkgs/applications/misc/ding/default.nix
+++ b/pkgs/applications/misc/ding/default.nix
@@ -34,6 +34,8 @@ stdenv.mkDerivation rec {
 
     sed -i "s@/usr/bin/fortune@fortune@g" ding
 
+    sed -i "s@/usr/bin/ding@$out/bin/ding@g" ding.desktop
+
     cp ding $out/bin/
     cp de-en.txt $out/share/dict/
     cp ding.1 $out/share/man/man1/

From b7658f3f8b0252e89f14b339805e641733226d06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 2 Jan 2016 08:56:22 +0100
Subject: [PATCH 164/884] connman: drop policykit dependency, refactor meta

PolicyKit is long obsoleted by PolKit and it didn't seem used here.
/cc maintainer @matejc.
---
 pkgs/tools/networking/connman/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix
index 75e4155c61d1..6142f53c0564 100644
--- a/pkgs/tools/networking/connman/default.nix
+++ b/pkgs/tools/networking/connman/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchgit, autoconf, automake, libtool, pkgconfig, openconnect, file,
-  openvpn, vpnc, glib, dbus, iptables, gnutls, policykit, polkit,
+  openvpn, vpnc, glib, dbus, iptables, gnutls, polkit,
   wpa_supplicant, readline6, pptp, ppp, tree }:
 
 stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ autoconf automake libtool pkgconfig openconnect polkit
-                  file openvpn vpnc glib dbus iptables gnutls policykit
+                  file openvpn vpnc glib dbus iptables gnutls
                   wpa_supplicant readline6 pptp ppp tree ];
 
   preConfigure = ''
@@ -49,12 +49,12 @@ stdenv.mkDerivation rec {
     cp ./client/connmanctl $out/sbin/connmanctl
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Provides a daemon for managing internet connections";
     homepage = "https://connman.net/";
-    maintainers = [ stdenv.lib.maintainers.matejc ];
+    maintainers = [ maintainers.matejc ];
     # tested only on linux, might work on others also
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.gpl2;
+    platforms = platforms.linux;
+    license = licenses.gpl2;
   };
 }

From 4f08cb0de95e34409845ebe3564aca796bc6ea66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 2 Jan 2016 09:00:31 +0100
Subject: [PATCH 165/884] policykit: remove the package obsoleted by polkit

Inspired by:
https://github.com/NixOS/nixpkgs/commit/6ce3b9a8068d#commitcomment-15226586
---
 .../libraries/policykit/default.nix           | 35 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 pkgs/top-level/release-small.nix              |  1 -
 3 files changed, 38 deletions(-)
 delete mode 100644 pkgs/development/libraries/policykit/default.nix

diff --git a/pkgs/development/libraries/policykit/default.nix b/pkgs/development/libraries/policykit/default.nix
deleted file mode 100644
index f494710be638..000000000000
--- a/pkgs/development/libraries/policykit/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, expat, pam
-, intltool, gettext, libxslt, docbook_xsl }:
-
-stdenv.mkDerivation rec {
-  name = "policykit-0.9";
-  
-  src = fetchurl {
-    url = http://hal.freedesktop.org/releases/PolicyKit-0.9.tar.gz;
-    sha256 = "1dw05s4xqj67i3c13knzl04l8jap0kywzpav6fidpmqrximpq37l";
-  };
-  
-  buildInputs =
-    [ pkgconfig glib dbus_glib pam intltool gettext libxslt ];
-
-  propagatedBuildInputs = [ expat dbus.libs ];
-
-  configureFlags = "--localstatedir=/var --sysconfdir=/etc";
-
-  installFlags = "localstatedir=$(TMPDIR)/var sysconfdir=$(out)/etc"; # keep `make install' happy
-
-  # Read policy files from /etc/PolicyKit/policy instead of
-  # /usr/share/PolicyKit/policy.  Using PACKAGE_DATA_DIR is hacky, but
-  # it works because it's only used in the C code for finding the
-  # policy directory.
-  NIX_CFLAGS_COMPILE = "-DPACKAGE_DATA_DIR=\"/etc\"";
-
-  # Needed to build the manpages.
-  XML_CATALOG_FILES = "${docbook_xsl}/xml/xsl/docbook/catalog.xml";
-  
-  meta = {
-    homepage = http://www.freedesktop.org/wiki/Software/PolicyKit;
-    description = "A toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes (obsolete)";
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c5f0e0590f3a..3b3c64b64460 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8091,8 +8091,6 @@ let
 
   polkit_qt4 = callPackage ../development/libraries/polkit-qt-1 { };
 
-  policykit = callPackage ../development/libraries/policykit { };
-
   poppler = callPackage ../development/libraries/poppler { lcms = lcms2; };
 
   poppler_min = poppler.override { # TODO: maybe reduce even more
diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index 60a3a8da76c2..fc428a73743b 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -130,7 +130,6 @@ with import ./release-lib.nix { inherit supportedSystems; };
   perl = all;
   pkgconfig = all;
   pmccabe = linux;
-  policykit = linux;
   portmap = linux;
   procps = linux;
   python = allBut cygwin;

From 31dcefeee6a3b7c7a5863d7841ef859ee41c0a2f Mon Sep 17 00:00:00 2001
From: Augustin Borsu <a.borsu@gmail.com>
Date: Sat, 2 Jan 2016 09:10:54 +0100
Subject: [PATCH 166/884] owncloud 7.0.11 -> 7.0.12

---
 pkgs/servers/owncloud/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/owncloud/default.nix b/pkgs/servers/owncloud/default.nix
index 0351df9718b4..092e9c3ff3e5 100644
--- a/pkgs/servers/owncloud/default.nix
+++ b/pkgs/servers/owncloud/default.nix
@@ -37,23 +37,23 @@ in {
   };
 
   owncloud70 = common {
-    versiona = "7.0.11";
-    sha256 = "21dd75de4ed832f16f577eb6763d04c663ef13251153ba2e8847e3f5799d2ad2";
+    versiona = "7.0.12";
+    sha256 = "d1a0f73f5094ec1149b50e2409b5fea0a9bebb16d663789d4b8f98fed341aa91";
   };
 
   owncloud80 = common {
-    versiona = "8.0.9";
-    sha256 = "0c1f915f4123dbe07d564cf0172930568690ab5257d2fca4fec4ec515858bef1";
+    versiona = "8.0.10";
+    sha256 = "3054b997f258178b57efc526e14384829ac8ab94757191f2d03c13fcb0a3cd93";
   };
 
   owncloud81 = common {
-    versiona = "8.1.4";
-    sha256 = "e0f4bf0c85821fc1b6e7f6268080ad3ca3e98c41baa68a9d616809d74a77312d";
+    versiona = "8.1.5";
+    sha256 = "6d8687e40af32c5ca5adfea3fee556ed987b77ad15a1ead5d40cc87a8b76f4b4";
   };
 
   owncloud82 = common {
-    versiona = "8.2.1";
-    sha256 = "5390b2172562a5bf97a46e9a621d1dd92f9b74efaccbb77978c39eb90d6988d4";
+    versiona = "8.2.2";
+    sha256 = "d5b935f904744b8b40b310f19679702387c852498d0dc7aaeda4555a3db9ad5b";
   };
 
 }

From d732a7f5c50f33443f63a03a6833ee2b31417a55 Mon Sep 17 00:00:00 2001
From: Barton Yadlowski <b@bmorphism.us>
Date: Sat, 2 Jan 2016 04:49:58 -0500
Subject: [PATCH 167/884] thinkfan levels option to control actuation points

---
 nixos/modules/services/hardware/thinkfan.nix | 24 ++++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/hardware/thinkfan.nix b/nixos/modules/services/hardware/thinkfan.nix
index 16c31aab2d50..018e82e58a3d 100644
--- a/nixos/modules/services/hardware/thinkfan.nix
+++ b/nixos/modules/services/hardware/thinkfan.nix
@@ -43,13 +43,7 @@ let
 
     sensor ${cfg.sensor} (0, 10, 15, 2, 10, 5, 0, 3, 0, 3)
     
-    (0,     0,      55)
-    (1,     48,     60)
-    (2,     50,     61)
-    (3,     52,     63)
-    (6,     56,     65)
-    (7,     60,     85)
-    (127,   80,     32767)
+    ${cfg.levels}
   '';
 
 in {
@@ -72,6 +66,22 @@ in {
         '';
       };
 
+      levels = mkOption {
+        default = ''
+          (0,     0,      55)
+          (1,     48,     60)
+          (2,     50,     61)
+          (3,     52,     63)
+          (6,     56,     65)
+          (7,     60,     85)
+          (127,   80,     32767)
+        '';
+        description =''
+          Sensor used by thinkfan
+        '';
+      };
+
+
     };
 
   };

From 1878ac9335e86631a92320ca0c3894f56b278a95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 30 Dec 2015 09:54:36 +0100
Subject: [PATCH 168/884] tree-wide: various cleanups

It's mainly refactoring and mass-rebuild simplifications without any
real impact (besides better readability).
---
 pkgs/development/libraries/expat/default.nix      |  2 +-
 pkgs/development/libraries/kerberos/heimdal.nix   |  3 ++-
 pkgs/development/libraries/kerberos/krb5.nix      |  4 ++--
 pkgs/development/libraries/libedit/default.nix    | 14 ++++++--------
 pkgs/development/libraries/libiconv/default.nix   | 15 ++++++++-------
 .../libraries/libossp-uuid/default.nix            |  2 +-
 pkgs/tools/networking/miniupnpc/default.nix       |  4 ++--
 pkgs/top-level/perl-packages.nix                  |  8 ++++----
 8 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix
index 766ef6c11c5f..96d46649d916 100644
--- a/pkgs/development/libraries/expat/default.nix
+++ b/pkgs/development/libraries/expat/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   patches = [ ./CVE-2015-1283.patch ];
 
-  configureFlags = stdenv.lib.optionalString stdenv.isFreeBSD "--with-pic";
+  configureFlags = stdenv.lib.optional stdenv.isFreeBSD "--with-pic";
 
   meta = with stdenv.lib; {
     homepage = http://www.libexpat.org/;
diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
index e17d0c19e037..175d0c7bc3b2 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -23,7 +23,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook pkgconfig python perl yacc flex ]
     ++ (with perlPackages; [ JSON ])
     ++ optional (!libOnly) texinfo;
-  buildInputs = (if (!stdenv.isFreeBSD) then [ libcap_ng db ] else []) ++ [ sqlite openssl libedit ]
+  buildInputs = optionals (!stdenv.isFreeBSD) [ libcap_ng db ]
+    ++ [ sqlite openssl libedit ]
     ++ optionals (!libOnly) [ openldap pam ];
 
   ## ugly, X should be made an option
diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index b263a4ef06ce..e735285231ea 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -18,11 +18,11 @@ stdenv.mkDerivation rec {
     sha256 = "1sgr61cnkgc5xazijaww6wpn5fnxl9vyj9ixk3r3y7ikv3x0gnyf";
   };
 
-  configureFlags = stdenv.lib.optionalString stdenv.isFreeBSD ''WARN_CFLAGS=""'';
+  configureFlags = optional stdenv.isFreeBSD ''WARN_CFLAGS=""'';
 
   nativeBuildInputs = [ pkgconfig perl yacc ]
     # Provides the mig command used by the build scripts
-    ++ stdenv.lib.optional stdenv.isDarwin bootstrap_cmds;
+    ++ optional stdenv.isDarwin bootstrap_cmds;
   buildInputs = [ openssl ]
     ++ optionals (!libOnly) [ openldap libedit ];
 
diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix
index 5234c16e1354..6e8d85cb88d9 100644
--- a/pkgs/development/libraries/libedit/default.nix
+++ b/pkgs/development/libraries/libedit/default.nix
@@ -11,23 +11,21 @@ stdenv.mkDerivation rec {
   # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
   NROFF = "${groff}/bin/nroff";
 
-  patches = if stdenv.isCygwin then [
-    ./01-cygwin.patch
-  ] else [ ] ++ [ ./freebsd-wchar.patch ];
+  patches = [ ./01-cygwin.patch ./freebsd-wchar.patch ];
+
+  propagatedBuildInputs = [ ncurses ];
+
+  configureFlags = [ "--enable-widec" ];
 
   postInstall = ''
     find $out/lib -type f | grep '\.\(la\|pc\)''$' | xargs sed -i \
       -e 's,-lncurses[a-z]*,-L${ncurses}/lib -lncursesw,g'
   '';
 
-  configureFlags = [ "--enable-widec" ];
-
-  propagatedBuildInputs = [ ncurses ];
-
   meta = with stdenv.lib; {
     homepage = "http://www.thrysoee.dk/editline/";
     description = "A port of the NetBSD Editline library (libedit)";
-    license = licenses.bsd3; 
+    license = licenses.bsd3;
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix
index 24a0376f0f9f..f5818c3bf4c9 100644
--- a/pkgs/development/libraries/libiconv/default.nix
+++ b/pkgs/development/libraries/libiconv/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv }:
+{ fetchurl, stdenv, lib }:
 
 assert (!stdenv.isLinux);
 
@@ -10,17 +10,18 @@ stdenv.mkDerivation rec {
     sha256 = "04q6lgl3kglmmhw59igq1n7v3rp1rpkypl366cy1k1yn2znlvckj";
   };
 
-  patches = if stdenv.isCygwin then [
+  patches = lib.optionals stdenv.isCygwin [
     ./libiconv-1.14-reloc.patch
     ./libiconv-1.14-wchar.patch
-  ] else null;
+  ];
 
+  configureFlags =
   # On Cygwin, Libtool produces a `.dll.a', which is not a "real" DLL
   # (Windows' linker would need to be used somehow to produce an actual
   # DLL.)  Thus, build the static library too, and this is what Gettext
   # will actually use.
-  configureFlags = if stdenv.isCygwin then [ "--enable-static" ] else
-                   if stdenv.isFreeBSD then [ "--with-pic" ] else null;
+    lib.optional stdenv.isCygwin "--enable-static"
+    ++ lib.optional stdenv.isFreeBSD "--with-pic";
 
   crossAttrs = {
     # Disable stripping to avoid "libiconv.a: Archive has no index" (MinGW).
@@ -42,11 +43,11 @@ stdenv.mkDerivation rec {
     '';
 
     homepage = http://www.gnu.org/software/libiconv/;
-    license = stdenv.lib.licenses.lgpl2Plus;
+    license = lib.licenses.lgpl2Plus;
 
     maintainers = [ ];
 
     # This library is not needed on GNU platforms.
-    hydraPlatforms = stdenv.lib.platforms.cygwin ++ stdenv.lib.platforms.darwin ++ stdenv.lib.platforms.freebsd;
+    hydraPlatforms = with lib.platforms; cygwin ++ darwin ++ freebsd;
   };
 }
diff --git a/pkgs/development/libraries/libossp-uuid/default.nix b/pkgs/development/libraries/libossp-uuid/default.nix
index 72fa1a29992e..ddfc2a5132c7 100644
--- a/pkgs/development/libraries/libossp-uuid/default.nix
+++ b/pkgs/development/libraries/libossp-uuid/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     sha256= "11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0";
   };
 
-  configureFlags = stdenv.lib.optionalString stdenv.isFreeBSD "--with-pic";
+  configureFlags = stdenv.lib.optional stdenv.isFreeBSD "--with-pic";
 
   meta = with stdenv.lib; {
     homepage = http://www.ossp.org/pkg/lib/uuid/;
diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix
index 644045800d4e..e5b6ea396fe4 100644
--- a/pkgs/tools/networking/miniupnpc/default.nix
+++ b/pkgs/tools/networking/miniupnpc/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     name = "${name}.tar.gz";
   };
 
-  patches = stdenv.lib.optional stdenv.isFreeBSD [ ./freebsd.patch ];
+  patches = stdenv.lib.optional stdenv.isFreeBSD ./freebsd.patch;
 
   doCheck = !stdenv.isFreeBSD;
 
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
     inherit version;
     homepage = http://miniupnp.free.fr/;
     description = "A client that implements the UPnP Internet Gateway Device (IGD) specification";
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.freebsd;
+    platforms = with stdenv.lib.platforms; linux ++ freebsd;
   };
 }
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 41dcdcddcbf6..97b2740f6c7e 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6339,7 +6339,7 @@ let self = _self // overrides; _self = with self; {
   LocaleGettext = buildPerlPackage {
     name = "LocaleGettext-1.05";
     buildInputs = stdenv.lib.optional (stdenv.isFreeBSD || stdenv.isDarwin || stdenv.isCygwin) pkgs.gettext;
-    NIX_CFLAGS_LINK = if (stdenv.isFreeBSD || stdenv.isDarwin || stdenv.isCygwin) then "-lintl" else null;
+    NIX_CFLAGS_LINK = stdenv.lib.optional (stdenv.isFreeBSD || stdenv.isDarwin || stdenv.isCygwin) "-lintl";
     src = fetchurl {
       url = mirror://cpan/authors/id/P/PV/PVANDRY/gettext-1.05.tar.gz;
       sha256 = "15262a00vx714szpx8p2z52wxkz46xp7acl72znwjydyq4ypydi7";
@@ -6552,10 +6552,10 @@ let self = _self // overrides; _self = with self; {
     };
     patches = [ ../development/perl-modules/lwp-test-with-localhost.patch ];
     propagatedBuildInputs = [ EncodeLocale FileListing HTMLParser HTTPCookies HTTPDaemon HTTPDate HTTPMessage HTTPNegotiate LWPMediaTypes NetHTTP URI WWWRobotRules ];
-    meta = {
+    meta = with stdenv.lib; {
       description = "The World-Wide Web library for Perl";
-      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin ++ stdenv.lib.platforms.illumos ++ stdenv.lib.platforms.freebsd;
+      license = with licenses; [ artistic1 gpl1Plus ];
+      platforms = platforms.unix;
     };
   };
 

From 212b83433d8fc5fd675cad97e2eb7b6e97154599 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <bstaffin@fitbit.com>
Date: Fri, 1 Jan 2016 15:31:22 -0800
Subject: [PATCH 169/884] go1.5: Fix Darwin build by disabling a broken test
 (close #12075)

TestNohup appears to work on Darwin if the test suite is running
attached to a terminal, but not when Nix runs it.
---
 pkgs/development/compilers/go/1.5.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/go/1.5.nix b/pkgs/development/compilers/go/1.5.nix
index 30967ae2c158..32ae3ad0adc4 100644
--- a/pkgs/development/compilers/go/1.5.nix
+++ b/pkgs/development/compilers/go/1.5.nix
@@ -77,6 +77,7 @@ stdenv.mkDerivation rec {
     sed -i '/TestCgoLookupIP/areturn' src/net/cgo_unix_test.go
     sed -i '/TestChdirAndGetwd/areturn' src/os/os_test.go
     sed -i '/TestRead0/areturn' src/os/os_test.go
+    sed -i '/TestNohup/areturn' src/os/signal/signal_test.go
     sed -i '/TestSystemRoots/areturn' src/crypto/x509/root_darwin_test.go
 
     sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/areturn' src/cmd/go/go_test.go

From 8781743edb2e9780b8ffeee3ab15b45118d535fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 2 Jan 2016 12:30:28 +0100
Subject: [PATCH 170/884] unrar: fix #12084: wrong license

---
 pkgs/tools/archivers/unrar/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix
index 404927e09397..8e9d1530cdf4 100644
--- a/pkgs/tools/archivers/unrar/default.nix
+++ b/pkgs/tools/archivers/unrar/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     description = "Utility for RAR archives";
     homepage = http://www.rarlab.com/;
-    license = licenses.gpl2;
+    license = licenses.unfreeRedistributable;
     maintainers = [ maintainers.ehmry ];
     platforms = platforms.all;
   };

From 84514ae8ccfcfcbd730ba3f3eb0d8eb03b760cd8 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 2 Jan 2016 13:33:34 +0100
Subject: [PATCH 171/884] fira-code: 1.101 -> 1.102

---
 pkgs/data/fonts/fira-code/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/fira-code/default.nix b/pkgs/data/fonts/fira-code/default.nix
index 92caf866eec3..ae25ff8ce23a 100644
--- a/pkgs/data/fonts/fira-code/default.nix
+++ b/pkgs/data/fonts/fira-code/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "fira-code-${version}";
-  version = "1.101";
+  version = "1.102";
 
   src = fetchurl {
     url = "https://github.com/tonsky/FiraCode/releases/download/${version}/FiraCode_${version}.zip";
-    sha256 = "0wbjk4cyibyjp7kjvwnm7as1ch312zwjbi469v26sl41svf53s5v";
+    sha256 = "0vcrzf7dmcy3n2ic05ihadmfgzmmmp0vz8grnqaxfi3y1jpw8ggy";
   };
 
   buildInputs = [ unzip ];

From 711e9e20de5e3b42e6416d047c2526e0336ce1c7 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sat, 2 Jan 2016 16:02:51 +0100
Subject: [PATCH 172/884] metis-prover: 2.3 -> 2.3.20160101

---
 pkgs/applications/science/logic/metis-prover/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/logic/metis-prover/default.nix b/pkgs/applications/science/logic/metis-prover/default.nix
index 0aa3d6e51c37..308ca79eab28 100644
--- a/pkgs/applications/science/logic/metis-prover/default.nix
+++ b/pkgs/applications/science/logic/metis-prover/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "metis-prover-${version}";
-  version = "2.3";
+  version = "2.3.20160101";
 
   src = fetchurl {
     url = "http://www.gilith.com/software/metis/metis.tar.gz";
-    sha256 = "07wqhic66i5ip2j194x6pswwrxyxrimpc4vg0haa5aqv9pfpmxad";
+    sha256 = "0wkh506ggwmfacwl19n84n1xi6ak4xhrc96d9pdkpk8zdwh5w58l";
   };
 
   nativeBuildInputs = [ perl ];
@@ -25,5 +25,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.gilith.com/research/metis/;
     license = licenses.mit;
     maintainers = with maintainers; [ gebner ];
+    platforms = platforms.unix;
   };
 }

From 517e64727bdd97f71e506d1474c363d08bebe15f Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Sat, 2 Jan 2016 17:16:42 +0200
Subject: [PATCH 173/884] Disabling tests for haskellPackages.docker

Tests in `docker` package require `docker` command and working docker
server on build machine..
---
 pkgs/development/haskell-modules/configuration-common.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 3e5b205893c4..f826b0a4b079 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -926,6 +926,10 @@ self: super: {
   # https://github.com/sol/hpack/issues/53
   hpack = dontCheck super.hpack;
 
+  # Tests require `docker` command in PATH
+  # Tests require running docker service :on localhost
+  docker = dontCheck super.docker;
+
   # https://github.com/deech/fltkhs/issues/16
   fltkhs = overrideCabal super.fltkhs (drv: {
     libraryToolDepends = (drv.libraryToolDepends or []) ++ [pkgs.autoconf];

From ed43a60bd5e1f0d08a3c322786c29d39ef0e44ac Mon Sep 17 00:00:00 2001
From: Louis Taylor <louis@kragniz.eu>
Date: Sat, 2 Jan 2016 16:31:47 +0000
Subject: [PATCH 174/884] Set issuestats badges to flat style

This makes them look consistent with the travis badge.
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 887ebd1c7a2f..9bd2e9b95c9f 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 [<img src="http://nixos.org/logo/nixos-hires.png" width="500px" alt="logo" />](https://nixos.org/nixos)
 
 [![Build Status](https://travis-ci.org/NixOS/nixpkgs.svg?branch=master)](https://travis-ci.org/NixOS/nixpkgs)
-[![Issue Stats](http://www.issuestats.com/github/nixos/nixpkgs/badge/pr)](http://www.issuestats.com/github/nixos/nixpkgs)
-[![Issue Stats](http://www.issuestats.com/github/nixos/nixpkgs/badge/issue)](http://www.issuestats.com/github/nixos/nixpkgs)
+[![Issue Stats](http://www.issuestats.com/github/nixos/nixpkgs/badge/pr?style=flat)](http://www.issuestats.com/github/nixos/nixpkgs)
+[![Issue Stats](http://www.issuestats.com/github/nixos/nixpkgs/badge/issue?style=flat)](http://www.issuestats.com/github/nixos/nixpkgs)
 
 Nixpkgs is a collection of packages for the [Nix](https://nixos.org/nix/) package
 manager. It is periodically built and tested by the [hydra](http://hydra.nixos.org/)

From 7ea34af4dd45ee223f63f1d8578c5e660ad01fa3 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 2 Jan 2016 17:56:03 +0100
Subject: [PATCH 175/884] linux-testing: 4.4.0-rc6 -> 4.4.0-rc7

Upstream changes can be found at:

https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/log/?id=v4.4-rc7

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 43070f3306db..524c8b4ff250 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.4-rc6";
-  modDirVersion = "4.4.0-rc6";
+  version = "4.4-rc7";
+  modDirVersion = "4.4.0-rc7";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz";
-    sha256 = "1brb1v6185pf8gnff753hvpdsbdmjr5nsbvj0s4ljlpcgljrn6cb";
+    sha256 = "11lk368wqsj76djh4c70447hidldr16h28yb839lpx05z6dpzshx";
   };
 
   features.iwlwifi = true;

From fc83959704cd781825af26a15d6388332399a356 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Sat, 2 Jan 2016 17:58:36 +0100
Subject: [PATCH 176/884] =?UTF-8?q?offlineimap:=206.6.0=20=E2=86=92=206.6.?=
 =?UTF-8?q?1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/tools/networking/offlineimap/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix
index e3e31e5408b2..ac7087607dad 100644
--- a/pkgs/tools/networking/offlineimap/default.nix
+++ b/pkgs/tools/networking/offlineimap/default.nix
@@ -1,13 +1,15 @@
-{ pkgs, fetchurl, buildPythonPackage, sqlite3 }:
+{ pkgs, fetchFromGitHub, buildPythonPackage, sqlite3 }:
 
 buildPythonPackage rec {
-  version = "6.6.0";
+  version = "6.6.1";
   name = "offlineimap-${version}";
   namePrefix = "";
 
-  src = fetchurl {
-    url = "https://github.com/OfflineIMAP/offlineimap/archive/v${version}.tar.gz";
-    sha256 = "1x33zxjm3y2p54lbcsgflrs6v2zq785y2k0xi6xia6akrvjmh4n4";
+  src = fetchFromGitHub {
+    owner = "OfflineIMAP";
+    repo = "offlineimap";
+    rev = "v${version}";
+    sha256 = "0nn1qkxqy84h0a2acd1yx861wslh2fjfznkcq15856npbd34yqy5";
   };
 
   doCheck = false;

From b1570d4f5731c50881812cd1e31c7e97604aeb42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 2 Jan 2016 18:15:48 +0100
Subject: [PATCH 177/884] offlineimap: don't depend on 'pkgs' attrset

It's considered bad style to depend on "everything". In this case, all
that was needed from 'pkgs' was 'stdenv'.
---
 pkgs/tools/networking/offlineimap/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix
index ac7087607dad..5331f71a96ac 100644
--- a/pkgs/tools/networking/offlineimap/default.nix
+++ b/pkgs/tools/networking/offlineimap/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, fetchFromGitHub, buildPythonPackage, sqlite3 }:
+{ stdenv, fetchFromGitHub, buildPythonPackage, sqlite3 }:
 
 buildPythonPackage rec {
   version = "6.6.1";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   meta = {
     description = "Synchronize emails between two repositories, so that you can read the same mailbox from multiple computers";
     homepage = "http://offlineimap.org";
-    license = pkgs.lib.licenses.gpl2Plus;
-    maintainers = [ pkgs.lib.maintainers.garbas ];
+    license = stdenv.lib.licenses.gpl2Plus;
+    maintainers = [ stdenv.lib.maintainers.garbas ];
   };
 }

From 4a69e5ae856e727ac9282f08f565e4466f3cc029 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <bstaffin@fitbit.com>
Date: Fri, 1 Jan 2016 16:16:39 -0800
Subject: [PATCH 178/884] omake: Fix broken download URL

All the download links on http://omake.metaprl.org/ seem to be dead.
---
 pkgs/development/tools/ocaml/omake/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/ocaml/omake/default.nix b/pkgs/development/tools/ocaml/omake/default.nix
index 300cbbc0a0c1..8be574a8a4c6 100644
--- a/pkgs/development/tools/ocaml/omake/default.nix
+++ b/pkgs/development/tools/ocaml/omake/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "${webpage}/downloads/${pname}-${version}.tar.gz";
+    url = "mirror://debian/pool/main/o/omake/omake_${version}.orig.tar.gz";
     sha256 = "1bfxbsimfivq0ar2g5fkzvr5ql97n5dg562pfyd29y4zyh4mwrsv";
   };
   patchFlags = "-p0";

From 28b3ecac07c7075263f397670f46d8465f00cbaf Mon Sep 17 00:00:00 2001
From: Fabian Schmitthenner <development@schmitthenner.eu>
Date: Fri, 1 Jan 2016 23:31:45 +0000
Subject: [PATCH 179/884] networkmanager: fix path /sbin/modprobe

---
 pkgs/tools/networking/network-manager/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index cf2821e96902..c86b59d48354 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -15,8 +15,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     substituteInPlace tools/glib-mkenums --replace /usr/bin/perl ${perl}/bin/perl
-    substituteInPlace src/ppp-manager/nm-ppp-manager.c --replace /sbin/modprobe /run/current-system/sw/sbin/modprobe
-    substituteInPlace src/devices/nm-device.c --replace /sbin/modprobe /run/current-system/sw/sbin/modprobe
+    substituteInPlace src/NetworkManagerUtils.c --replace /sbin/modprobe /run/current-system/sw/sbin/modprobe
     substituteInPlace data/85-nm-unmanaged.rules \
       --replace /bin/sh ${stdenv.shell} \
       --replace /usr/sbin/ethtool ${ethtool}/sbin/ethtool \

From 8a985d97a1ba3db53d51041dfc0b84542679c56e Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 27 Dec 2015 22:52:24 +0200
Subject: [PATCH 180/884] sudo: Compile with '--with-iologdir' to improve build
 purity

Otherwise it will try to guess the log directory, and the guess might
not be the same if chroot builds are enabled or not.

The gruesome details from m4/sudo.m4:

````
dnl
dnl Where the I/O log files go, use /var/log/sudo-io if
dnl /var/log exists, else /{var,usr}/adm/sudo-io
dnl
AC_DEFUN([SUDO_IO_LOGDIR], [
    AC_MSG_CHECKING(for I/O log dir location)
    if test "${with_iologdir-yes}" != "yes"; then
        iolog_dir="$with_iologdir"
    elif test -d "/var/log"; then
        iolog_dir="/var/log/sudo-io"
    elif test -d "/var/adm"; then
        iolog_dir="/var/adm/sudo-io"
    else
        iolog_dir="/usr/adm/sudo-io"
    fi
    if test "${with_iologdir}" != "no"; then
        SUDO_DEFINE_UNQUOTED(_PATH_SUDO_IO_LOGDIR, "$iolog_dir")
    fi
    AC_MSG_RESULT($iolog_dir)
])dnl
````
---
 pkgs/tools/security/sudo/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix
index 6720c7378662..df8024e040e3 100644
--- a/pkgs/tools/security/sudo/default.nix
+++ b/pkgs/tools/security/sudo/default.nix
@@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
     "--with-rundir=/run/sudo"
     "--with-vardir=/var/db/sudo"
     "--with-logpath=/var/log/sudo.log"
+    "--with-iologdir=/var/log/sudo-io"
     "--with-sendmail=${sendmailPath}"
   ] ++ stdenv.lib.optional withInsults [
     "--with-insults"

From bddcf7dfeda4fea5fba5268b100d2786f54130da Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sat, 2 Jan 2016 18:52:57 +0100
Subject: [PATCH 181/884] calibre: make unrar support optional

---
 pkgs/applications/misc/calibre/default.nix    |  9 ++--
 .../calibre/dont_build_unrar_plugin.patch     | 47 +++++++++++++++++++
 2 files changed, 52 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 6ab83e29cc14..7afda4e7b7bb 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, python, pyqt5, sip_4_16, poppler_utils, pkgconfig, libpng
 , imagemagick, libjpeg, fontconfig, podofo, qtbase, icu, sqlite
-, makeWrapper, unrar, chmlib, pythonPackages, xz, libusb1, libmtp
+, makeWrapper, unrarSupport ? false, chmlib, pythonPackages, xz, libusb1, libmtp
 , xdg_utils
 }:
 
@@ -15,7 +15,9 @@ stdenv.mkDerivation rec {
 
   inherit python;
 
-  patchPhase = ''
+  patches = stdenv.lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch;
+
+  prePatch = ''
     sed -i "/pyqt_sip_dir/ s:=.*:= '${pyqt5}/share/sip':"  \
       setup/build_environment.py
   '';
@@ -53,7 +55,6 @@ stdenv.mkDerivation rec {
 
     for a in $out/bin/*; do
       wrapProgram $a --prefix PYTHONPATH : $PYTHONPATH \
-                     --prefix LD_LIBRARY_PATH : ${unrar}/lib \
                      --prefix PATH : ${poppler_utils}/bin
     done
   '';
@@ -61,7 +62,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Comprehensive e-book software";
     homepage = http://calibre-ebook.com;
-    license = licenses.gpl3;
+    license = with licenses; if unrarSupport then unfreeRedistributable else gpl3;
     maintainers = with maintainers; [ viric iElectric pSub AndersonTorres ];
     platforms = platforms.linux;
     inherit version;
diff --git a/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch b/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch
new file mode 100644
index 000000000000..c910be89a5f1
--- /dev/null
+++ b/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch
@@ -0,0 +1,47 @@
+Author: Dmitry Shachnev <mitya57@gmail.com>
+Description: do not build unrar extension as we strip unrar from the tarball
+Forwarded: not-needed
+Last-Update: 2013-04-04
+
+Index: calibre/setup/extensions.py
+===================================================================
+--- calibre.orig/setup/extensions.py	2014-02-02 10:42:14.510954007 +0100
++++ calibre/setup/extensions.py	2014-02-02 10:42:14.502954007 +0100
+@@ -209,24 +209,6 @@
+                 sip_files=['calibre/ebooks/pdf/render/qt_hack.sip']
+                 ),
+ 
+-    Extension('unrar',
+-              ['unrar/%s.cpp'%(x.partition('.')[0]) for x in '''
+-               rar.o strlist.o strfn.o pathfn.o savepos.o smallfn.o global.o file.o
+-               filefn.o filcreat.o archive.o arcread.o unicode.o system.o
+-               isnt.o crypt.o crc.o rawread.o encname.o resource.o match.o
+-               timefn.o rdwrfn.o consio.o options.o ulinks.o errhnd.o rarvm.o
+-               secpassword.o rijndael.o getbits.o sha1.o extinfo.o extract.o
+-               volume.o list.o find.o unpack.o cmddata.o filestr.o scantree.o
+-               '''.split()] + ['calibre/utils/unrar.cpp'],
+-              inc_dirs=['unrar'],
+-              cflags=[('/' if iswindows else '-') + x for x in (
+-                  'DSILENT', 'DRARDLL', 'DUNRAR')] + (
+-                  [] if iswindows else ['-D_FILE_OFFSET_BITS=64',
+-                                        '-D_LARGEFILE_SOURCE']),
+-              optimize_level=2,
+-              libraries=['User32', 'Advapi32', 'kernel32', 'Shell32'] if iswindows else []
+-              ),
+-
+     ]
+ 
+ 
+Index: calibre/src/calibre/ebooks/metadata/archive.py
+===================================================================
+--- calibre.orig/src/calibre/ebooks/metadata/archive.py	2014-02-02 10:42:14.510954007 +0100
++++ calibre/src/calibre/ebooks/metadata/archive.py	2014-02-02 10:42:14.502954007 +0100
+@@ -42,7 +42,7 @@
+     description = _('Extract common e-book formats from archives '
+         '(zip/rar) files. Also try to autodetect if they are actually '
+         'cbz/cbr files.')
+-    file_types = set(['zip', 'rar'])
++    file_types = set(['zip'])
+     supported_platforms = ['windows', 'osx', 'linux']
+     on_import = True
+ 

From 6a911bf36a64f2917ce7166e40f37f7caa1443a7 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sat, 2 Jan 2016 18:58:15 +0100
Subject: [PATCH 182/884] calibre: 2.46.0 -> 2.48.0

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

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 7afda4e7b7bb..d86aee50bb90 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.46.0";
+  version = "2.48.0";
   name = "calibre-${version}";
 
   src = fetchurl {
     url = "http://download.calibre-ebook.com/${version}/${name}.tar.xz";
-    sha256 = "0ig1pb62w57l6nhwg391mkjhw9dyicix6xigpdyw0320jdw9nlkb";
+    sha256 = "0bjzw806czqxkhq9qqkhff8bhfc428pijkidb1h6gr47jqdp4hpg";
   };
 
   inherit python;

From 7ce9699a6ada84c32701ce0cec71bb9bc69c5d28 Mon Sep 17 00:00:00 2001
From: Jacob Mitchell <jmitchell@member.fsf.org>
Date: Sat, 2 Jan 2016 12:37:20 -0800
Subject: [PATCH 183/884] Fix package name typo

---
 nixos/modules/config/users-groups.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index 485926fb1dd0..e643b2d059b5 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -26,7 +26,7 @@ let
   '';
 
   hashedPasswordDescription = ''
-    To generate hashed password install <literal>mkpassword</literal>
+    To generate hashed password install <literal>mkpasswd</literal>
     package and run <literal>mkpasswd -m sha-512</literal>.
   '';
 

From 1979034956c44d4d71d38a9dedf10de27a6f2095 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 2 Jan 2016 17:54:49 +0100
Subject: [PATCH 184/884] system-config-printer: remove bad /usr/bin reference
 in dbus service file

---
 pkgs/tools/misc/system-config-printer/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix
index 51cb1d22a49e..a73d050baa97 100644
--- a/pkgs/tools/misc/system-config-printer/default.nix
+++ b/pkgs/tools/misc/system-config-printer/default.nix
@@ -36,6 +36,9 @@ stdenv.mkDerivation rec {
       ( cd $out/share/system-config-printer/troubleshoot
         mv .__init__.py-wrapped __init__.py
       )
+
+      # Upstream issue: https://github.com/twaugh/system-config-printer/issues/28
+      sed -i -e "s|/usr/bin|$out/bin|" "$out/share/dbus-1/services/org.fedoraproject.Config.Printing.service"
     '';
 
   meta = {

From d396f1e99b980d9278308940d6c4486a280512a2 Mon Sep 17 00:00:00 2001
From: Nathan Zadoks <nathan@nathan7.eu>
Date: Sun, 20 Dec 2015 14:15:49 +0100
Subject: [PATCH 185/884] kmscon service: add extraOptions option

---
 nixos/modules/services/ttys/kmscon.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/ttys/kmscon.nix b/nixos/modules/services/ttys/kmscon.nix
index 7783a1ada71d..ba25f9128445 100644
--- a/nixos/modules/services/ttys/kmscon.nix
+++ b/nixos/modules/services/ttys/kmscon.nix
@@ -32,6 +32,13 @@ in {
         default = "";
         example = "font-size=14";
       };
+
+      extraOptions = mkOption {
+        description = "Extra flags to pass to kmscon.";
+        type = types.separatedString " ";
+        default = "";
+        example = "--term xterm-256color";
+      };
     };
   };
 
@@ -53,7 +60,7 @@ in {
       ConditionPathExists=/dev/tty0
 
       [Service]
-      ExecStart=${pkgs.kmscon}/bin/kmscon "--vt=%I" --seats=seat0 --no-switchvt --configdir ${configDir} --login -- ${pkgs.shadow}/bin/login -p
+      ExecStart=${pkgs.kmscon}/bin/kmscon "--vt=%I" ${cfg.extraOptions} --seats=seat0 --no-switchvt --configdir ${configDir} --login -- ${pkgs.shadow}/bin/login -p
       UtmpIdentifier=%I
       TTYPath=/dev/%I
       TTYReset=yes

From fecea0b305940e92234218e27fede564518569c5 Mon Sep 17 00:00:00 2001
From: Simon Vandel Sillesen <simon.vandel@gmail.com>
Date: Fri, 1 Jan 2016 22:23:51 +0100
Subject: [PATCH 186/884] qbittorrent: 3.2.3 -> 3.3.1

* upstream has switched to qt5 as default, so also done here
* Adds a patch to use the qt lrelease tool correct
---
 .../networking/p2p/qbittorrent/default.nix          | 11 +++++++----
 .../networking/p2p/qbittorrent/fix-lrelease.patch   | 13 +++++++++++++
 2 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/applications/networking/p2p/qbittorrent/fix-lrelease.patch

diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix
index f8c025ba2418..bc5289f80935 100644
--- a/pkgs/applications/networking/p2p/qbittorrent/default.nix
+++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, which
-, boost, libtorrentRasterbar, qt4
+, boost, libtorrentRasterbar, qt5
 , debugSupport ? false # Debugging
 , guiSupport ? true, dbus_libs ? null # GUI (disable to run headless)
 , webuiSupport ? true # WebUI
@@ -10,16 +10,16 @@ assert guiSupport -> (dbus_libs != null);
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "qbittorrent-${version}";
-  version = "3.2.3";
+  version = "3.3.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/qbittorrent/${name}.tar.xz";
-    sha256 = "05590ak4nnqkah8dy71cxf7mqv6phw0ih1719dm761mxf8vrz9w6";
+    sha256 = "1li9law732n4vc7sn6i92pwxn8li7ypqaxcmfpm17kk978immlfs";
   };
 
   nativeBuildInputs = [ pkgconfig which ];
 
-  buildInputs = [ boost libtorrentRasterbar qt4 ]
+  buildInputs = [ boost libtorrentRasterbar qt5.qtbase qt5.qttools ]
     ++ optional guiSupport dbus_libs;
 
   configureFlags = [
@@ -29,6 +29,9 @@ stdenv.mkDerivation rec {
     (if webuiSupport then "" else "--disable-webui")
   ] ++ optional debugSupport "--enable-debug";
 
+  # The lrelease binary is named lrelease instead of lrelease-qt4
+  patches = [ ./fix-lrelease.patch];
+
   # https://github.com/qbittorrent/qBittorrent/issues/1992 
   enableParallelBuilding = false;
 
diff --git a/pkgs/applications/networking/p2p/qbittorrent/fix-lrelease.patch b/pkgs/applications/networking/p2p/qbittorrent/fix-lrelease.patch
new file mode 100644
index 000000000000..9e3e484667fe
--- /dev/null
+++ b/pkgs/applications/networking/p2p/qbittorrent/fix-lrelease.patch
@@ -0,0 +1,13 @@
+diff --git a/qm_gen.pri b/qm_gen.pri
+index ed29b76..2d5990c 100644
+--- a/qm_gen.pri
++++ b/qm_gen.pri
+@@ -5,7 +5,7 @@ isEmpty(QMAKE_LRELEASE) {
+     win32|os2:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe
+     else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
+     unix {
+-        !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease-qt4 }
++        !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease }
+     } else {
+         !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease }
+     }

From a596f7dcb9b5fab0d807599379022e916716caf8 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 2 Jan 2016 20:34:20 +0100
Subject: [PATCH 187/884] netcat: add meta data

---
 pkgs/tools/networking/netcat/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/netcat/default.nix b/pkgs/tools/networking/netcat/default.nix
index 5ad5540438c7..4e3463c95fbd 100644
--- a/pkgs/tools/networking/netcat/default.nix
+++ b/pkgs/tools/networking/netcat/default.nix
@@ -1,9 +1,16 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   name = "netcat-gnu-0.7.1";
+
   src = fetchurl {
     url = mirror://sourceforge/netcat/netcat-0.7.1.tar.bz2;
     sha256 = "1frjcdkhkpzk0f84hx6hmw5l0ynpmji8vcbaxg8h5k2svyxz0nmm";
   };
+
+  meta = with stdenv.lib; {
+    description = "Utility which reads and writes data across network connections";
+    homepage = http://netcat.sourceforge.net/;
+    license = licenses.gpl2Plus;
+  };
 }

From a1ddb32a450306fc7455804d15a3f7ea4b5f64ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 2 Jan 2016 23:14:31 +0100
Subject: [PATCH 188/884] cups-bjnp: add meta.description

---
 pkgs/misc/cups/drivers/cups-bjnp/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/misc/cups/drivers/cups-bjnp/default.nix b/pkgs/misc/cups/drivers/cups-bjnp/default.nix
index aa75012a8bc9..60d15ec1282a 100644
--- a/pkgs/misc/cups/drivers/cups-bjnp/default.nix
+++ b/pkgs/misc/cups/drivers/cups-bjnp/default.nix
@@ -14,6 +14,12 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = "-include stdio.h";
 
   meta = {
+    description = "CUPS back-end for Canon printers";
+    longDescription = ''
+      CUPS back-end for the canon printers using the proprietary USB over IP
+      BJNP protocol. This back-end allows Cups to print over the network to a
+      Canon printer. The design is based on reverse engineering of the protocol.
+    '';
     homepage = http://cups-bjnp.sourceforge.net;
   };
 }

From 0ec3f4d339ded0b8f1dc2eca58b6d4dc567b5ddb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 2 Jan 2016 23:26:12 +0100
Subject: [PATCH 189/884] cups-bjnp: align attrname with pkgname
 (s/cupsBjnp/cups-bjnp/)

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3b3c64b64460..d78fa9f5eeb4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15316,7 +15316,7 @@ let
 
   gutenprintBin = callPackage ../misc/drivers/gutenprint/bin.nix { };
 
-  cupsBjnp = callPackage ../misc/cups/drivers/cups-bjnp { };
+  cups-bjnp = callPackage ../misc/cups/drivers/cups-bjnp { };
 
   darcnes = callPackage ../misc/emulators/darcnes { };
 
@@ -15844,6 +15844,7 @@ aliases = with self; rec {
   cheetahTemplate = pythonPackages.cheetah; # 2015-06-15
   clangAnalyzer = clang-analyzer;  # added 2015-02-20
   cool-old-term = cool-retro-term; # added 2015-01-31
+  cupsBjnp = cups-bjnp; # added 2016-01-02
   cv = progress; # added 2015-09-06
   enblendenfuse = enblend-enfuse;	# 2015-09-30
   exfat-utils = exfat;                  # 2015-09-11

From fe8498f609d2053f1bd835859ebaad0c5363cdfe Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Tue, 8 Sep 2015 00:17:21 -0700
Subject: [PATCH 190/884] nixos/mathics: New service and test

---
 nixos/modules/misc/ids.nix              |  2 +
 nixos/modules/module-list.nix           |  1 +
 nixos/modules/services/misc/mathics.nix | 54 +++++++++++++++++++++++++
 nixos/release.nix                       |  1 +
 nixos/tests/mathics.nix                 | 20 +++++++++
 5 files changed, 78 insertions(+)
 create mode 100644 nixos/modules/services/misc/mathics.nix
 create mode 100644 nixos/tests/mathics.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 7a7ed2f4408c..1da3737b07cb 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -239,6 +239,7 @@
       bepasty = 215;
       pumpio = 216;
       nm-openvpn = 217;
+      mathics = 218;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -455,6 +456,7 @@
       bepasty = 215;
       pumpio = 216;
       nm-openvpn = 217;
+      mathics = 218;
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 7fc41b0e9ca7..e1ffb0b7edf8 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -209,6 +209,7 @@
   ./services/misc/gitolite.nix
   ./services/misc/gpsd.nix
   ./services/misc/ihaskell.nix
+  ./services/misc/mathics.nix
   ./services/misc/mbpfan.nix
   ./services/misc/mediatomb.nix
   ./services/misc/mesos-master.nix
diff --git a/nixos/modules/services/misc/mathics.nix b/nixos/modules/services/misc/mathics.nix
new file mode 100644
index 000000000000..50715858881a
--- /dev/null
+++ b/nixos/modules/services/misc/mathics.nix
@@ -0,0 +1,54 @@
+{ pkgs, lib, config, ... }:
+
+with lib;
+
+let
+  cfg = config.services.mathics;
+
+in {
+  options = {
+    services.mathics = {
+      enable = mkEnableOption "Mathics notebook service";
+
+      external = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Listen on all interfaces, rather than just localhost?";
+      };
+
+      port = mkOption {
+        type = types.int;
+        default = 8000;
+        description = "TCP port to listen on.";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+
+    users.extraUsers.mathics = {
+      group = config.users.extraGroups.mathics.name;
+      description = "Mathics user";
+      home = "/var/lib/mathics";
+      createHome = true;
+      uid = config.ids.uids.mathics;
+    };
+
+    users.extraGroups.mathics.gid = config.ids.gids.mathics;
+
+    systemd.services.mathics = {
+      description = "Mathics notebook server";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+      serviceConfig = {
+        User = config.users.extraUsers.mathics.name;
+        Group = config.users.extraGroups.mathics.name;
+        ExecStart = concatStringsSep " " [
+          "${pkgs.mathics}/bin/mathicsserver"
+          "--port" (toString cfg.port)
+          (if cfg.external then "--external" else "")
+        ];
+      };
+    };
+  };
+}
diff --git a/nixos/release.nix b/nixos/release.nix
index d7c736d66a95..8a502ae2baa1 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -252,6 +252,7 @@ in rec {
   #tests.lightdm = callTest tests/lightdm.nix {};
   tests.login = callTest tests/login.nix {};
   #tests.logstash = callTest tests/logstash.nix {};
+  tests.mathics = callTest tests/mathics.nix {};
   tests.misc = callTest tests/misc.nix {};
   tests.mumble = callTest tests/mumble.nix {};
   tests.munin = callTest tests/munin.nix {};
diff --git a/nixos/tests/mathics.nix b/nixos/tests/mathics.nix
new file mode 100644
index 000000000000..310b751b4d84
--- /dev/null
+++ b/nixos/tests/mathics.nix
@@ -0,0 +1,20 @@
+import ./make-test.nix ({ pkgs, ... }: {
+  name = "mathics";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ benley ];
+  };
+
+  nodes = {
+    machine = { config, pkgs, ... }: {
+      services.mathics.enable = true;
+      services.mathics.port = 8888;
+    };
+  };
+
+  testScript = ''
+    startAll;
+    $machine->waitForUnit("mathics.service");
+    $machine->waitForOpenPort(8888);
+    $machine->succeed("curl http://localhost:8888/");
+  '';
+})

From dd63386e6db2e6ac27e5349cf36992250412f104 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 1 Jan 2016 21:37:44 +0100
Subject: [PATCH 191/884] perlPackages.URI: 1.68 -> 1.69

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 1d9211fae2f1..35625c610d28 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -12401,10 +12401,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   URI = buildPerlPackage {
-    name = "URI-1.68";
+    name = "URI-1.69";
     src = fetchurl {
-      url = mirror://cpan/authors/id/E/ET/ETHER/URI-1.68.tar.gz;
-      sha256 = "c840d30f7657bfd4b2acbb311bd764232911cd3dc97e92415fbd0a242185c358";
+      url = mirror://cpan/authors/id/E/ET/ETHER/URI-1.69.tar.gz;
+      sha256 = "0bdlk1cn7ipy4kdylrn73yz9i2k39ikm1cqvh9hq0vvbcbm1cjxp";
     };
     meta = {
       description = "Uniform Resource Identifiers (absolute and relative)";

From 2ba8ae8d975d8bc614fbb0c214fb68fb66831d4e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 2 Jan 2016 14:52:08 +0100
Subject: [PATCH 192/884] zopfli: 1.0.0 -> 1.0.1 + bug fixes

Maintain & tidy up `meta` while we're here.
---
 pkgs/tools/compression/zopfli/default.nix | 44 +++++++++++++++--------
 1 file changed, 30 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/compression/zopfli/default.nix b/pkgs/tools/compression/zopfli/default.nix
index 354afb8d1787..b8458fa32659 100644
--- a/pkgs/tools/compression/zopfli/default.nix
+++ b/pkgs/tools/compression/zopfli/default.nix
@@ -1,33 +1,49 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub, fetchpatch }:
 
+let version = "1.0.1"; in
 stdenv.mkDerivation rec {
   name = "zopfli-${version}";
-  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "zopfli";
     rev = name;
     name = "${name}-src";
-    sha256 = "0r2k3md24y5laslzsph7kh4synm5az4ppv64idrvjk5yh2qwwb62";
+    sha256 = "1dclll3b5azy79jfb8vhb21drivi7vaay5iw0lzs4lrh6dgyvg6y";
   };
 
+  patches = [
+    (fetchpatch {
+      sha256 = "07z6df1ahx40hnsrcs5mx3fc58rqv8fm0pvyc7gb7kc5mwwghvvp";
+      name = "Fix-invalid-read-outside-allocated-memory.patch";
+      url = "https://github.com/google/zopfli/commit/9429e20de3885c0e0d9beac23f703fce58461021.patch";
+    })
+    (fetchpatch {
+      sha256 = "07m8q5kipr84cg8i1l4zd22ai9bmdrblpdrsc96llg7cm51vqdqy";
+      name = "zopfli-bug-and-typo-fixes.patch";
+      url = "https://github.com/google/zopfli/commit/7190e08ecac2446c7c9157cfbdb7157b18912a92.patch";
+    })
+  ];
+
+  enableParallelBuilding = true;
+
   installPhase = ''
     install -D zopfli $out/bin/zopfli
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/google/zopfli;
-    description = "A compression tool to perform very good, but slow, deflate or zlib compression";
-    longDescription =
-      ''Zopfli Compression Algorithm is a compression library programmed
-        in C to perform very good, but slow, deflate or zlib compression.
+    inherit version;
+    inherit (src.meta) homepage;
+    description = "Very good, but slow, deflate or zlib compression";
+    longDescription = ''
+      Zopfli Compression Algorithm is a compression library programmed
+      in C to perform very good, but slow, deflate or zlib compression.
 
-        This library can only compress, not decompress. Existing zlib or
-        deflate libraries can decompress the data.
-      '';
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.asl20;
-    maintainers = with maintainers; [ bobvanderlinden ];
+      This library can only compress, not decompress. Existing zlib or
+      deflate libraries can decompress the data.
+    '';
+    platforms = platforms.linux;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ bobvanderlinden nckx ];
   };
 }

From d030b608dd0b9d308aa769753dd30e68d71355d8 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 2 Jan 2016 14:54:23 +0100
Subject: [PATCH 193/884] zopfli: build & install zopflipng, shared libraries,
 READMEs

---
 pkgs/tools/compression/zopfli/default.nix | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/compression/zopfli/default.nix b/pkgs/tools/compression/zopfli/default.nix
index b8458fa32659..3c455ca5635f 100644
--- a/pkgs/tools/compression/zopfli/default.nix
+++ b/pkgs/tools/compression/zopfli/default.nix
@@ -26,9 +26,22 @@ stdenv.mkDerivation rec {
   ];
 
   enableParallelBuilding = true;
+  buildFlags = [
+    "zopfli"
+    "libzopfli"
+    "zopflipng"
+    "libzopflipng"
+  ];
 
   installPhase = ''
-    install -D zopfli $out/bin/zopfli
+    mkdir -p $out/bin
+    install -m755 zopfli{,png} $out/bin
+
+    mkdir -p $out/lib
+    install -m755 libzopfli{,png}.so* $out/lib
+
+    mkdir -p $out/share/doc/zopfli
+    install -m644 README* $out/share/doc/zopfli
   '';
 
   meta = with stdenv.lib; {

From d9f06f666590497715a4f0800d52c94c3a00df25 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 2 Jan 2016 18:59:09 +0100
Subject: [PATCH 194/884] libpsl: 0.11.0 -> 0.12.0

---
 pkgs/development/libraries/libpsl/default.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix
index 1412e1d59fad..b8ae3060a2ff 100644
--- a/pkgs/development/libraries/libpsl/default.nix
+++ b/pkgs/development/libraries/libpsl/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, autoreconfHook, docbook_xsl, gtk_doc, icu
-, libxslt, pkgconfig }:
+, libxslt, pkgconfig, python }:
 
 let
 
@@ -13,23 +13,24 @@ let
     owner = "publicsuffix";
   };
 
-  libVersion = "0.11.0";
+  libVersion = "0.12.0";
 
 in stdenv.mkDerivation {
   name = "libpsl-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "08k7prrr83lg6jmm5r5k4alpm2in4qlnx49ypb4bxv16lq8dcnmm";
+    sha256 = "13w3lc752az2swymg408f3w2lbqs0f2h5ri6d5jw1vv9z0ij9xlw";
     rev = "libpsl-${libVersion}";
     repo = "libpsl";
     owner = "rockdaboot";
   };
 
   buildInputs = [ icu libxslt ];
-  nativeBuildInputs = [ autoreconfHook docbook_xsl gtk_doc pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook docbook_xsl gtk_doc pkgconfig python ];
 
   postPatch = ''
     substituteInPlace src/psl.c --replace bits/stat.h sys/stat.h
+    patchShebangs src/make_dafsa.py
   '';
 
   preAutoreconf = ''
@@ -41,7 +42,12 @@ in stdenv.mkDerivation {
     # The libpsl check phase requires the list's test scripts (tests/) as well
     cp -Rv "${listSources}"/* list
   '';
-  configureFlags = [ "--disable-static" "--enable-gtk-doc" "--enable-man" ];
+  configureFlags = [
+    "--disable-builtin"
+    "--disable-static"
+    "--enable-gtk-doc"
+    "--enable-man"
+  ];
 
   enableParallelBuilding = true;
 

From 4943e4134732ddd68cfdef9b95e1317255f5c953 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 2 Jan 2016 19:02:51 +0100
Subject: [PATCH 195/884] wget: make libpsl attribute properly optional

---
 pkgs/tools/networking/wget/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix
index 5abc84bb1eab..a6d2913abf66 100644
--- a/pkgs/tools/networking/wget/default.nix
+++ b/pkgs/tools/networking/wget/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, gettext, libidn, pkgconfig
 , perl, perlPackages, LWP, python3
-, libiconv, libpsl, openssl ? null }:
+, libiconv, libpsl ? null, openssl ? null }:
 
 stdenv.mkDerivation rec {
   name = "wget-1.17.1";

From 4f1559a75190c8e702d8c0d88c4c3791e47fcd4b Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 2 Jan 2016 21:31:22 +0100
Subject: [PATCH 196/884] gnustep-make: fix installation path

Get rid of the nested /nix/store/.../nix/store/... directories.
---
 .../tools/build-managers/gnustep/make/default.nix          | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/build-managers/gnustep/make/default.nix b/pkgs/development/tools/build-managers/gnustep/make/default.nix
index 67fe60f2c0eb..f0217f15929b 100644
--- a/pkgs/development/tools/build-managers/gnustep/make/default.nix
+++ b/pkgs/development/tools/build-managers/gnustep/make/default.nix
@@ -11,16 +11,13 @@ stdenv.mkDerivation rec {
 
   patchPhase = ''
     substituteInPlace GNUmakefile.in \
-      --replace which type \
-      --replace 'tooldir = $(DESTDIR)' 'tooldir = ' \
-      --replace 'makedir = $(DESTDIR)' 'makedir = ' \
-      --replace 'mandir  = $(DESTDIR)' 'mandir  = '
+      --replace which type
 
     substituteInPlace FilesystemLayouts/apple \
       --replace /usr/local ""
   '';
 
-  installFlags = "DESTDIR=$(out)";
+  installFlags = [ "PREFIX=$(out)" ];
 
   postInstall = ''
     mkdir -p $out/nix-support

From ddd48258e8f81989ca35b7bf5bfab9774b6300f2 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 2 Jan 2016 21:32:47 +0100
Subject: [PATCH 197/884] gnustep-make: 2.6.6 -> 2.6.7

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

diff --git a/pkgs/development/tools/build-managers/gnustep/make/default.nix b/pkgs/development/tools/build-managers/gnustep/make/default.nix
index f0217f15929b..4b6455e31ccc 100644
--- a/pkgs/development/tools/build-managers/gnustep/make/default.nix
+++ b/pkgs/development/tools/build-managers/gnustep/make/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
+let version = "2.6.7"; in
 stdenv.mkDerivation rec {
   name = "gnustep-make-${version}";
-  version = "1.0";
 
   src = fetchurl {
-    url = "http://ftpmain.gnustep.org/pub/gnustep/core/gnustep-make-2.6.6.tar.gz";
-    sha256 = "07cqr8x17bia9w6clbmiv7ay6r9nplrjz2cyzinv4w7zfpc19vxw";
+    url = "http://ftpmain.gnustep.org/pub/gnustep/core/${name}.tar.gz";
+    sha256 = "1r2is23xdg4qirckb6bd4lynfwnnw5d9522wib3ndk1xgirmfaqi";
   };
 
   patchPhase = ''

From 4a4e9849e82392fa66576b2274f284a910309f9b Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 2 Jan 2016 23:40:10 +0100
Subject: [PATCH 198/884] sane: camelCase -> upstream-names

---
 pkgs/top-level/all-packages.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d78fa9f5eeb4..843aceebaefb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15571,19 +15571,19 @@ let
     };
   };
 
-  saneBackends = callPackage ../applications/graphics/sane/backends {
+  sane-backends = callPackage ../applications/graphics/sane/backends {
     gt68xxFirmware = config.sane.gt68xxFirmware or null;
     snapscanFirmware = config.sane.snapscanFirmware or null;
   };
 
-  saneBackendsGit = callPackage ../applications/graphics/sane/backends/git.nix {
+  sane-backends-git = callPackage ../applications/graphics/sane/backends/git.nix {
     gt68xxFirmware = config.sane.gt68xxFirmware or null;
     snapscanFirmware = config.sane.snapscanFirmware or null;
   };
 
   mkSaneConfig = callPackage ../applications/graphics/sane/config.nix { };
 
-  saneFrontends = callPackage ../applications/graphics/sane/frontends.nix { };
+  sane-frontends = callPackage ../applications/graphics/sane/frontends.nix { };
 
   sct = callPackage ../tools/X11/sct {};
 
@@ -15889,6 +15889,9 @@ aliases = with self; rec {
   manpages = man-pages; # added 2015-12-06
   mssys = ms-sys; # added 2015-12-13
   virtviewer = virt-viewer; # added 2015-12-24
+  saneBackends = sane-backends; # added 2016-01-02
+  saneBackendsGit = sane-backends-git; # added 2016-01-02
+  saneFrontends = sane-frontends; # added 2016-01-02
 };
 
 tweakAlias = _n: alias: with lib;

From 91fbdd3ee2aa9aed769520fefc8c5a2b8a1db60a Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 3 Jan 2016 01:05:05 +0100
Subject: [PATCH 199/884] redshift: 1.10 -> 1.11

Changes:
- Add option preserve for gamma adjustment methods (randr, vidmode,
  quartz, w32gdi) to apply redness on top of current gamma
  correction.
- Fix #158: Add redshift.desktop file to resolve an issue where
  Geoclue2 would not allow redshift to obtain the current location.
- Fix #263: Make sure that the child process is terminated when
  redshift-gtk exits.
- Fix #284: A sample configuation file has been added to the
  distribution tarball.
- Fix warning message in redshift-gtk that is some cases caused
  redshift-gtk to fail (#271)
- Fix #174: Use nanosleep() for sleeping to avoid high CPU load on
  platforms (NetBSD, ...) with limitations in usleep()
- Various updates to man page and translations.
---
 pkgs/applications/misc/redshift/default.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix
index ad2f5f74cce3..abe25afda5f7 100644
--- a/pkgs/applications/misc/redshift/default.nix
+++ b/pkgs/applications/misc/redshift/default.nix
@@ -7,18 +7,21 @@
 }:
 
 let
-  version = "1.10";
-  mkFlag = flag: name: if flag then "--enable-${name}" else "--disable-${name}";
+  version = "1.11";
+  mkFlag = flag: name: if flag
+    then "--enable-${name}"
+    else "--disable-${name}";
 in
 stdenv.mkDerivation {
   name = "redshift-${version}";
   src = fetchurl {
-    sha256 = "19pfk9il5x2g2ivqix4a555psz8mj3m0cvjwnjpjvx0llh5fghjv";
+    sha256 = "0ngkwj7rg8nfk806w0sg443w6wjr91xdc0zisqfm5h2i77wm1qqh";
     url = "https://github.com/jonls/redshift/releases/download/v${version}/redshift-${version}.tar.xz";
   };
 
   buildInputs = [ geoclue2 ]
-    ++ stdenv.lib.optionals guiSupport [ hicolor_icon_theme gtk3 python pygobject3 pyxdg ]
+    ++ stdenv.lib.optionals guiSupport [ hicolor_icon_theme gtk3 python
+      pygobject3 pyxdg ]
     ++ stdenv.lib.optionals drmSupport [ libdrm ]
     ++ stdenv.lib.optionals randrSupport [ libxcb ]
     ++ stdenv.lib.optionals vidModeSupport [ libX11 libXxf86vm ];
@@ -31,6 +34,8 @@ stdenv.mkDerivation {
     (mkFlag vidModeSupport "vidmode")
   ];
 
+  enableParallelBuilding = true;
+
   preInstall = stdenv.lib.optionalString guiSupport ''
     substituteInPlace src/redshift-gtk/redshift-gtk \
       --replace "/usr/bin/env python3" "${python}/bin/${python.executable}"
@@ -41,6 +46,8 @@ stdenv.mkDerivation {
       --prefix PYTHONPATH : "$PYTHONPATH" \
       --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
       --prefix XDG_DATA_DIRS : "$out/share:${hicolor_icon_theme}/share"
+
+    install -Dm644 {.,$out/share/doc/redshift}/redshift.conf.sample
   '';
 
   meta = with stdenv.lib; {

From 6a862c5a61a755d8faca31623aa4fd6a84f7a27f Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 3 Jan 2016 03:30:32 +0300
Subject: [PATCH 200/884] mumble: enable parallel building

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

diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index a0eb459369df..12c250ab28bb 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -54,6 +54,8 @@ let
       cp man/mum* $out/share/man/man1
     '' + (overrides.installPhase or "");
 
+    enableParallelBuilding = true;
+
     meta = {
       description = "Low-latency, high quality voice chat software";
       homepage = "http://mumble.sourceforge.net/";

From 99075fb402505d95359aadf3993b12c2d2661771 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 3 Jan 2016 03:31:38 +0100
Subject: [PATCH 201/884] saneBackends{,Git} -> sane-backends{,-git}

Fixes xsane evaluation.
---
 nixos/modules/services/hardware/sane.nix              | 4 +++-
 pkgs/applications/graphics/fbida/default.nix          | 4 ++--
 pkgs/applications/graphics/sane/frontends.nix         | 4 ++--
 pkgs/applications/graphics/sane/xsane.nix             | 4 ++--
 pkgs/applications/graphics/simple-scan/default.nix    | 4 ++--
 pkgs/applications/office/libreoffice/default.nix      | 4 ++--
 pkgs/desktops/kde-4.14/kdegraphics/libksane.nix       | 4 ++--
 pkgs/development/haskell-modules/hackage-packages.nix | 6 +++---
 pkgs/misc/drivers/hplip/3.15.9.nix                    | 4 ++--
 pkgs/misc/drivers/hplip/default.nix                   | 4 ++--
 pkgs/top-level/all-packages.nix                       | 1 -
 11 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/nixos/modules/services/hardware/sane.nix b/nixos/modules/services/hardware/sane.nix
index 0428602688dd..56504cd2361d 100644
--- a/nixos/modules/services/hardware/sane.nix
+++ b/nixos/modules/services/hardware/sane.nix
@@ -4,7 +4,9 @@ with lib;
 
 let
 
-  pkg = if config.hardware.sane.snapshot then pkgs.saneBackendsGit else pkgs.saneBackends;
+  pkg = if config.hardware.sane.snapshot
+    then pkgs.sane-backends-git
+    else pkgs.sane-backends;
   backends = [ pkg ] ++ config.hardware.sane.extraBackends;
   saneConfig = pkgs.mkSaneConfig { paths = backends; };
 
diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix
index bacfa500ede1..b0ad5be93717 100644
--- a/pkgs/applications/graphics/fbida/default.nix
+++ b/pkgs/applications/graphics/fbida/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, libjpeg, libexif, libungif, libtiff, libpng, libwebp
-, pkgconfig, freetype, fontconfig, which, imagemagick, curl, saneBackends
+, pkgconfig, freetype, fontconfig, which, imagemagick, curl, sane-backends
 }:
 
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig which ];
   buildInputs =
     [ libexif libjpeg libpng libungif freetype fontconfig libtiff libwebp
-      imagemagick curl saneBackends
+      imagemagick curl sane-backends
     ];
   
   makeFlags = [ "prefix=$(out)" "verbose=yes" ];
diff --git a/pkgs/applications/graphics/sane/frontends.nix b/pkgs/applications/graphics/sane/frontends.nix
index a0f6e5bac509..d7b066220559 100644
--- a/pkgs/applications/graphics/sane/frontends.nix
+++ b/pkgs/applications/graphics/sane/frontends.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, saneBackends, libX11, gtk, pkgconfig, libusb ? null}:
+{ stdenv, fetchurl, sane-backends, libX11, gtk, pkgconfig, libusb ? null}:
 
 stdenv.mkDerivation rec {
   name = "sane-frontends-1.0.14";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sed -e '/SANE_CAP_ALWAYS_SETTABLE/d' -i src/gtkglue.c
   '';
 
-  buildInputs = [saneBackends libX11 gtk pkgconfig] ++
+  buildInputs = [sane-backends libX11 gtk pkgconfig] ++
 	(if libusb != null then [libusb] else []);
 
   meta = {
diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix
index 9bca047a7cf1..85b23e3c2f2c 100644
--- a/pkgs/applications/graphics/sane/xsane.nix
+++ b/pkgs/applications/graphics/sane/xsane.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, saneBackends, saneFrontends, libX11, gtk, pkgconfig, libpng
+{ stdenv, fetchurl, sane-backends, saneFrontends, libX11, gtk, pkgconfig, libpng
 , libusb ? null
 , gimpSupport ? false, gimp_2_8 ? null
 }:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     chmod a+rX -R .
   '';
 
-  buildInputs = [libpng saneBackends saneFrontends libX11 gtk pkgconfig ]
+  buildInputs = [libpng sane-backends saneFrontends libX11 gtk pkgconfig ]
     ++ (if libusb != null then [libusb] else [])
     ++ stdenv.lib.optional gimpSupport gimp_2_8;
 
diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix
index c169d262fb63..3fe8c06ca630 100644
--- a/pkgs/applications/graphics/simple-scan/default.nix
+++ b/pkgs/applications/graphics/simple-scan/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool
-, libusb1, libxml2, pkgconfig, saneBackends, vala, wrapGAppsHook }:
+, libusb1, libxml2, pkgconfig, sane-backends, vala, wrapGAppsHook }:
 
 let version = "3.19.3"; in
 stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     url = "https://launchpad.net/simple-scan/3.19/${version}/+download/${name}.tar.xz";
   };
 
-  buildInputs = [ cairo colord glib gusb gtk3 libusb1 libxml2 saneBackends
+  buildInputs = [ cairo colord glib gusb gtk3 libusb1 libxml2 sane-backends
     vala ];
   nativeBuildInputs = [ intltool itstool pkgconfig wrapGAppsHook ];
 
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index da6749f2bf5b..8a2f8a37f068 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -7,7 +7,7 @@
 , librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw
 , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
 , libwpg, dbus_glib, glibc, qt4, kde4, clucene_core, libcdr, lcms, vigra
-, unixODBC, mdds, saneBackends, mythes, libexttextcat, libvisio
+, unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
 , fontsConf, pkgconfig, libzip, bluez5, libtool, maven
 , libatomic_ops, graphite2, harfbuzz, libodfgen
 , librevenge, libe-book, libmwaw, glm, glew, gst_all_1
@@ -220,7 +220,7 @@ in stdenv.mkDerivation rec {
       libXdmcp libpthreadstubs mesa mythes gst_all_1.gstreamer
       gst_all_1.gst-plugins-base
       neon nspr nss openldap openssl ORBit2 pam perl pkgconfigUpstream poppler
-      python3 sablotron saneBackends tcsh unzip vigra which zip zlib
+      python3 sablotron sane-backends tcsh unzip vigra which zip zlib
       mdds bluez5 glibc libcmis libwps libabw
       libxshmfence libatomic_ops graphite2 harfbuzz
       librevenge libe-book libmwaw glm glew
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/libksane.nix b/pkgs/desktops/kde-4.14/kdegraphics/libksane.nix
index 6c3543eef370..d55419f02c75 100644
--- a/pkgs/desktops/kde-4.14/kdegraphics/libksane.nix
+++ b/pkgs/desktops/kde-4.14/kdegraphics/libksane.nix
@@ -1,7 +1,7 @@
-{ stdenv, kde, kdelibs, saneBackends }:
+{ stdenv, kde, kdelibs, sane-backends }:
 
 kde {
-  buildInputs = [ kdelibs saneBackends ];
+  buildInputs = [ kdelibs sane-backends ];
 
   meta = {
     description = "An image scanning library that provides a QWidget that contains all the logic needed to interface a sacanner";
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index fcb0354fd650..f31b62481d8b 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -35389,18 +35389,18 @@ self: {
      }) {};
 
   "bindings-sane" = callPackage
-    ({ mkDerivation, base, bindings-DSL, saneBackends }:
+    ({ mkDerivation, base, bindings-DSL, sane-backends }:
      mkDerivation {
        pname = "bindings-sane";
        version = "0.0.1";
        sha256 = "a27eb00e69a804e65f39246611a747f3a833a87dab536c7f3cde60583a60b04b";
        libraryHaskellDepends = [ base bindings-DSL ];
-       libraryPkgconfigDepends = [ saneBackends ];
+       libraryPkgconfigDepends = [ sane-backends ];
        homepage = "http://floss.scru.org/bindings-sane";
        description = "FFI bindings to libsane";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
-     }) {inherit (pkgs) saneBackends;};
+     }) {inherit (pkgs) sane-backends;};
 
   "bindings-sc3" = callPackage
     ({ mkDerivation, base, bindings-DSL, scsynth }:
diff --git a/pkgs/misc/drivers/hplip/3.15.9.nix b/pkgs/misc/drivers/hplip/3.15.9.nix
index 04ebb7a55ee9..722615be46e7 100644
--- a/pkgs/misc/drivers/hplip/3.15.9.nix
+++ b/pkgs/misc/drivers/hplip/3.15.9.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, substituteAll
 , pkgconfig
-, cups, zlib, libjpeg, libusb1, pythonPackages, saneBackends, dbus, usbutils
+, cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends, dbus, usbutils
 , net_snmp, polkit
 , qtSupport ? true, qt4, pyqt4
 , withPlugin ? false
@@ -56,7 +56,7 @@ stdenv.mkDerivation {
     libusb1
     pythonPackages.python
     pythonPackages.wrapPython
-    saneBackends
+    sane-backends
     dbus
     net_snmp
   ] ++ stdenv.lib.optionals qtSupport [
diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index 8b3676663d34..071ffe8c1001 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, substituteAll
 , pkgconfig
-, cups, zlib, libjpeg, libusb1, pythonPackages, saneBackends, dbus, usbutils
+, cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends, dbus, usbutils
 , net_snmp, polkit
 , qtSupport ? true, qt4, pyqt4
 , withPlugin ? false
@@ -56,7 +56,7 @@ stdenv.mkDerivation {
     libusb1
     pythonPackages.python
     pythonPackages.wrapPython
-    saneBackends
+    sane-backends
     dbus
     net_snmp
   ] ++ stdenv.lib.optionals qtSupport [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 843aceebaefb..e50f2291041f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15753,7 +15753,6 @@ let
 
   xsane = callPackage ../applications/graphics/sane/xsane.nix {
     libpng = libpng12;
-    saneBackends = saneBackends;
   };
 
   xwiimote = callPackage ../misc/drivers/xwiimote {

From b574af31f4aa8721fdc6c750c850233a5d63be03 Mon Sep 17 00:00:00 2001
From: Philipp Hausmann <ph_git@314.ch>
Date: Sun, 27 Dec 2015 19:12:37 +0100
Subject: [PATCH 202/884] maintainers: Make attrname match my github account

---
 lib/maintainers.nix                        | 2 +-
 pkgs/development/compilers/uhc/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 9918ae61537a..7a9f1de0a84c 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -231,7 +231,7 @@
   palo = "Ingolf Wanger <palipalo9@googlemail.com>";
   pashev = "Igor Pashev <pashev.igor@gmail.com>";
   pesterhazy = "Paulus Esterhazy <pesterhazy@gmail.com>";
-  phausmann = "Philipp Hausmann <nix@314.ch>";
+  phile314 = "Philipp Hausmann <nix@314.ch>";
   philandstuff = "Philip Potter <philip.g.potter@gmail.com>";
   phreedom = "Evgeny Egorochkin <phreedom@yandex.ru>";
   phunehehe = "Hoang Xuan Phu <phunehehe@gmail.com>";
diff --git a/pkgs/development/compilers/uhc/default.nix b/pkgs/development/compilers/uhc/default.nix
index 1ed31422d531..eda5157bb757 100644
--- a/pkgs/development/compilers/uhc/default.nix
+++ b/pkgs/development/compilers/uhc/default.nix
@@ -41,7 +41,7 @@ in stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = "http://www.cs.uu.nl/wiki/UHC";
     description = "Utrecht Haskell Compiler";
-    maintainers = [ maintainers.phausmann ];
+    maintainers = [ maintainers.phile314 ];
 
     # UHC i686 support is broken, see
     # https://github.com/UU-ComputerScience/uhc/issues/52

From 14383f30798da170bfd3b73082166241640097ca Mon Sep 17 00:00:00 2001
From: Philipp Hausmann <ph_git@314.ch>
Date: Sun, 27 Dec 2015 19:07:52 +0100
Subject: [PATCH 203/884] simutrans: 120.0.1 -> 120.1.1 (close #11978)

---
 pkgs/games/simutrans/default.nix | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix
index 854f9595a7d2..d992382a3b1c 100644
--- a/pkgs/games/simutrans/default.nix
+++ b/pkgs/games/simutrans/default.nix
@@ -12,7 +12,7 @@ let
   );
 
   ver1 = "120";
-  ver2 = "0";
+  ver2 = "1";
   ver3 = "1";
   version =   "${ver1}.${ver2}.${ver3}";
   ver_dash =  "${ver1}-${ver2}-${ver3}";
@@ -20,7 +20,7 @@ let
 
   binary_src = fetchurl {
     url = "mirror://sourceforge/simutrans/simutrans/${ver_dash}/simutrans-src-${ver_dash}.zip";
-    sha256 = "10rn259nxq2hhfpar8zwgxi1p4djvyygcm2f6qhih7l9clvnw2h1";
+    sha256 = "00cyxbn17r9p1f08jvx1wrhydxknkrxj5wk6ld912yicfql998r0";
   };
 
 
@@ -29,21 +29,23 @@ let
     (pakName: attrs: mkPak (attrs // {inherit pakName;}))
   {
     pak64 = {
-      srcPath = "${ver2_dash}/simupak64-${ver_dash}";
+      # No release for 120.1 yet!
+      srcPath = "120-0/simupak64-120-0-1";
       sha256 = "0y5v1ncpjyhjkkznqmk13kg5d0slhjbbvg1y8q5jxhmhlkghk9q2";
     };
     "pak64.japan" = {
-      srcPath = "${ver2_dash}/simupak64.japan-${ver_dash}";
+      # No release for 120.1 yet!
+      srcPath = "120-0/simupak64.japan-120-0-1";
       sha256 = "14swy3h4ij74bgaw7scyvmivfb5fmp21nixmhlpk3mav3wr3167i";
     };
 
     pak128 = {
-      srcPath = "pak128%20for%20ST%20120%20%282.5.2%2B%20nightly%20r1560%2C%20bugfixes%29/pak128-r1560--ST120";
-      sha256 = "1wd51brc4aglqi3w7s8fxgxrw0k7f653w4wbnmk83k07fwfdyf24";
+      srcPath = "pak128%20for%20ST%20120%20%282.5.3%2C%20minor%20changes%29/pak128-2.5.3--ST120";
+      sha256 = "19c66wvfg6rn7s9awi99cfp83hs9d8dmsjlmgn8m91a19fp9isdh";
     };
     "pak128.britain" = {
-      srcPath = "pak128.Britain%20for%20${ver2_dash}/pak128.Britain.1.16-${ver2_dash}";
-      sha256 = "1rww9rnpk22l2z3s1d7y2gmd6iwhv72s7pff8krnh7z0q386waak";
+      srcPath = "pak128.Britain%20for%20${ver2_dash}/pak128.Britain.1.17-${ver2_dash}";
+      sha256 = "1nviwqizvch9n3n826nmmi7c707dxv0727m7lhc1n2zsrrxcxlr5";
     };
     "pak128.cs" = { # note: it needs pak128 to work
       url = "mirror://sourceforge/simutrans/Pak128.CS/pak128.cz_v.0.2.1.zip";
@@ -51,8 +53,8 @@ let
     };
     "pak128.german" = {
       url = "mirror://sourceforge/simutrans/PAK128.german/"
-        + "PAK128.german_0.7_${ver1}.x/PAK128.german_0.7.0.1_${ver1}.x.zip";
-      sha256 = "1575akms18raxaijy2kfyqm07wdx6y5q85n7wgvq2fqydrnx33w8";
+        + "PAK128.german_0.8_${ver1}.x/PAK128.german_0.8.0_${ver1}.x.zip";
+      sha256 = "1a8pc88vi59zlvff9i1f8nphdmisqmgg03qkdvrf5ks46aw8j6s5";
     };
 
     /* This release contains accented filenames that prevent unzipping.
@@ -159,7 +161,7 @@ let
 
       homepage = http://www.simutrans.com/;
       license = with licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ kkallio vcunat ];
+      maintainers = with maintainers; [ kkallio vcunat phile314 ];
       platforms = with platforms; linux ++ darwin;
     };
   };

From 3a468a95488bb87c7b195aefb6da487c2cbea9c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 3 Jan 2016 10:27:50 +0100
Subject: [PATCH 204/884] simutrans: preferLocalBuild = true; for data
 derivations

---
 pkgs/games/simutrans/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix
index d992382a3b1c..1288ff1a27f5 100644
--- a/pkgs/games/simutrans/default.nix
+++ b/pkgs/games/simutrans/default.nix
@@ -73,6 +73,7 @@ let
     stdenv.mkDerivation {
       name = "simutrans-${pakName}";
       unpackPhase = "true";
+      preferLocalBuild = true;
       installPhase = let src = fetchurl { inherit url sha256; };
       in ''
         mkdir -p "$out/share/simutrans/${pakName}"

From 12a6fc722fd395a38da0e7429114624ca58eea72 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sun, 3 Jan 2016 20:03:53 +0900
Subject: [PATCH 205/884] firefox-bin: 43.0.2 -> 43.0.3

---
 .../browsers/firefox-bin/sources.nix          | 358 +++++++++---------
 1 file changed, 179 insertions(+), 179 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
index 57f0550a793d..e1895e3bbe22 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
@@ -4,185 +4,185 @@
 # ruby generate_sources.rb > sources.nix
 
 {
-  version = "43.0.2";
+  version = "43.0.3";
   sources = [
-    { locale = "ach"; arch = "linux-i686"; sha256 = "da9307cb24c75665adc6a5e02d3045eac9babd33c6da778167644d13cc685de2"; }
-    { locale = "ach"; arch = "linux-x86_64"; sha256 = "1a8f13b44107e9689aa339f19c8247142ce82ef9a63bb4be077c212d4d4ad03c"; }
-    { locale = "af"; arch = "linux-i686"; sha256 = "b8dcbf287b350becd7a4e1d812a2251bf10861fe6fe3c85ea9b56e4aafa2a156"; }
-    { locale = "af"; arch = "linux-x86_64"; sha256 = "241a503d4cd2793c538a5cc1ad0990b2a5cd40a584504cf5dde77a28d2f47049"; }
-    { locale = "an"; arch = "linux-i686"; sha256 = "530f5e4743384e543e4cf829f00e5f37adccf64b4af5067aab1e316aba72c579"; }
-    { locale = "an"; arch = "linux-x86_64"; sha256 = "1bbde5a3c897ebed7c7820362257626835c1adfafb29a20e80bcc4b1c40407b4"; }
-    { locale = "ar"; arch = "linux-i686"; sha256 = "f254b2f7117b866e2c8611d5367fc1e2a8e20e1997746204234ae6869c01f6e9"; }
-    { locale = "ar"; arch = "linux-x86_64"; sha256 = "bec6a50c9ce11906edb09591ed1f37d94291fb67b2d4ab9a8f5f87b0e837c0be"; }
-    { locale = "as"; arch = "linux-i686"; sha256 = "b894da79ba753489a3f0509aa54abb9cf67c84e80a73bc00d0e7e7483e1c4ac9"; }
-    { locale = "as"; arch = "linux-x86_64"; sha256 = "ef435b67eac29cf4024ad8df1d4efd413ea58fd76c0e4ec2f2595e7c90743953"; }
-    { locale = "ast"; arch = "linux-i686"; sha256 = "96566e2de543bb4b3bba195b99efb8ec1c01f6ec969dc75293ed66033b52a92b"; }
-    { locale = "ast"; arch = "linux-x86_64"; sha256 = "29f9ccdfc93a72db314df43564fce754ddc678b89a55035f23582bf4a7c66135"; }
-    { locale = "az"; arch = "linux-i686"; sha256 = "cc58914388b53df51d5bd78f0e63286166bbf278e691b8589bc7db18257627c5"; }
-    { locale = "az"; arch = "linux-x86_64"; sha256 = "7f1db3428190e1bbc01506a029df8c81a0ea67b301f161a5bb297c47d5db41d8"; }
-    { locale = "be"; arch = "linux-i686"; sha256 = "c8bd88c4ffb98d8611d760b144f46ab3cef4f7808f2b1008cd5aa75eadaf02eb"; }
-    { locale = "be"; arch = "linux-x86_64"; sha256 = "1b063e4e4a33b9d29f01d7c98a942446d738b195877a617dd454c2697fd6a539"; }
-    { locale = "bg"; arch = "linux-i686"; sha256 = "1186851b6a27a2d23572c9fa0a9bfabcfca1925d36e7fa79e5918541892bcda9"; }
-    { locale = "bg"; arch = "linux-x86_64"; sha256 = "d185c5eb1640d13ee9fd049db41d267af728de56f833bc32a182f69c4921d1c0"; }
-    { locale = "bn-BD"; arch = "linux-i686"; sha256 = "fcc0a0c46e913cb7b4d44c502f62ece83ae8d22703419edafd15321b77758625"; }
-    { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "d1e066c2347e109fab28e525b5780edb9c5c063322745d971e4ad79a110568f6"; }
-    { locale = "bn-IN"; arch = "linux-i686"; sha256 = "3a85767878b840411c57d176af597666aaeaede9a290032f374629eac536eeca"; }
-    { locale = "bn-IN"; arch = "linux-x86_64"; sha256 = "a3314e2a9f74d9f2c85e592a74e1353b2f048349ba65bf4cfdf35c72b130cd61"; }
-    { locale = "br"; arch = "linux-i686"; sha256 = "a6cd3445e65ca3c818856d6a3b9069aa437ea638f11bb8be520db73604150090"; }
-    { locale = "br"; arch = "linux-x86_64"; sha256 = "9c9f5720b568d768933d7d55bfa7853bb7918bcc651b7c2e281ccf3d2a5e2218"; }
-    { locale = "bs"; arch = "linux-i686"; sha256 = "9c0844cc1dde7712219626148988df642ab10e81494d4794a51a61bb92ddd110"; }
-    { locale = "bs"; arch = "linux-x86_64"; sha256 = "44d91b25d18aa108adf49677069ebd75236f82c7016ee9d518e2ff3f6ad40ffb"; }
-    { locale = "ca"; arch = "linux-i686"; sha256 = "5669828dec411832064e790e65203dabd3703a86090e87a931c6bd495fd39bc7"; }
-    { locale = "ca"; arch = "linux-x86_64"; sha256 = "1e1cec512fb7038327488ce884e171ecda23ae26f98d39159ca96b8acea2029a"; }
-    { locale = "cs"; arch = "linux-i686"; sha256 = "a7bdf99153ae8351c3f4f98db5e65d2a0598457dc0774508fc6ebe26c40ff43e"; }
-    { locale = "cs"; arch = "linux-x86_64"; sha256 = "16fd46498fa33334a5bd1cf06351b410f7df41526c195de21959bf837ce5d488"; }
-    { locale = "cy"; arch = "linux-i686"; sha256 = "8a251c77bbdb6a44163285cacb3a78ffe85835cbe0b9156ad300e733c9ee3934"; }
-    { locale = "cy"; arch = "linux-x86_64"; sha256 = "61f2b6b13d9ce1066b6207b16865a038cb35c51f61a5bc05503cf948704320f7"; }
-    { locale = "da"; arch = "linux-i686"; sha256 = "d1e5d20f7b396bb8b823e7a15a6e220fb930601c2df6e9fc5ca588d3ffce1698"; }
-    { locale = "da"; arch = "linux-x86_64"; sha256 = "a5f20fb678a51a526ebd135b149c6769dda46827174259cabbc4912c6f0619d5"; }
-    { locale = "de"; arch = "linux-i686"; sha256 = "74e9e40b191fd56e99708910c8798d4a8588271a90eef6f7658e042a0765d0e5"; }
-    { locale = "de"; arch = "linux-x86_64"; sha256 = "470781e1debb2085fa538008cd3203c64b534b5a88c6a6ac01418a3ef344216b"; }
-    { locale = "dsb"; arch = "linux-i686"; sha256 = "459e0d6c55ad822bae10a47a7b14004153a3f3363026556568d7108411318104"; }
-    { locale = "dsb"; arch = "linux-x86_64"; sha256 = "97fd138bb33c80a3213b33d4796573b65d4659b888959730cc02e726bcc65388"; }
-    { locale = "el"; arch = "linux-i686"; sha256 = "41b684530ed9bd80c03cb0cd8b1e4de8b3af383f611884965e98215ade1dd8c7"; }
-    { locale = "el"; arch = "linux-x86_64"; sha256 = "b1a7f2a4de87510b9630c6cade94b7f628bbf04289119d3912ea0eb5260b55b2"; }
-    { locale = "en-GB"; arch = "linux-i686"; sha256 = "3c40217b451bd28dd5f1aebcb9a9f7aafdfa3c9c7fd635d69674912a9e73f77c"; }
-    { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "6aa6cd0945bbe97b30e431fdb09a4deb45a0aba6e1283f881a35732b7403e247"; }
-    { locale = "en-US"; arch = "linux-i686"; sha256 = "dd6c585c24e1e9212b65eabee8e52c5dbc9e4acce4fc51c32aacd82b3c6333e3"; }
-    { locale = "en-US"; arch = "linux-x86_64"; sha256 = "9c56ff8734eb860a6038f6bd00d98aeabe57037e230c66d551aac451a27efa79"; }
-    { locale = "en-ZA"; arch = "linux-i686"; sha256 = "0335775eb1a073d1889e8a43f913ea096bbd735a0b98687c75c7fde5eb636f44"; }
-    { locale = "en-ZA"; arch = "linux-x86_64"; sha256 = "5ab68e226bfc141167a477779181c48a84cabe80f250c874182ad0364d0c3dd5"; }
-    { locale = "eo"; arch = "linux-i686"; sha256 = "99a0cf562a067cd30d1047814c1984364b1702e93e638016a4fe8910868cfcdf"; }
-    { locale = "eo"; arch = "linux-x86_64"; sha256 = "ba0bc0093bf2b0ea82eb958fdf06683f4941bd9a44138c793175a0b9e5a86ad4"; }
-    { locale = "es-AR"; arch = "linux-i686"; sha256 = "3adaec2ccb2b1949492c27c466daa5809afc690bf0559418d2d60faae0b5456a"; }
-    { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "67f774442c64d653d624a270eea1202fad389f926c6b7dee56ef965e65311ef0"; }
-    { locale = "es-CL"; arch = "linux-i686"; sha256 = "ee56546d943795434a6759a55dec6e848f244691dc234f4c62746aa1f73cb85d"; }
-    { locale = "es-CL"; arch = "linux-x86_64"; sha256 = "cdbf12f21efb2e18d23ef9c6322c96469c72140200fa47c554067df3a9f89b8d"; }
-    { locale = "es-ES"; arch = "linux-i686"; sha256 = "d3518ffe26d3c21beb009c657b93cf2f01be416f697d89beac497c71044f134a"; }
-    { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "ae34d9f586b28b1063cfebb755edc2a11214085f3a185f31d757c2358493ed13"; }
-    { locale = "es-MX"; arch = "linux-i686"; sha256 = "09a03624363efba7e5d707c312f58e577019b8b7987d817fe1cf77bf2afa7dfc"; }
-    { locale = "es-MX"; arch = "linux-x86_64"; sha256 = "820c50a0991779f664be8013e10a6db2833caa4b1fed370a7d6a8eb71f5766f3"; }
-    { locale = "et"; arch = "linux-i686"; sha256 = "bb2d259606836c5d01d149f2735639cad7411efcd5e0e5deacdc3f1bbae8d80d"; }
-    { locale = "et"; arch = "linux-x86_64"; sha256 = "17265f828cb3232cca73b3bf5b806cf361769c77bfef0e6571a16eb73036cccb"; }
-    { locale = "eu"; arch = "linux-i686"; sha256 = "0bedcadc3b60ecb58af25d5950fe693063eb80f65d6d85e72ff0cdab3e7f2030"; }
-    { locale = "eu"; arch = "linux-x86_64"; sha256 = "371d5648c7ffaf325ef34030ad0a9971246bc1df354fc11dd66bc461dce303fc"; }
-    { locale = "fa"; arch = "linux-i686"; sha256 = "a7c55492f08e5f44d5cccb015d00abf8b8e74dec7da37e937f8d0f76a4c49338"; }
-    { locale = "fa"; arch = "linux-x86_64"; sha256 = "6fe831c56d96dbed1c4a6859ba58dc20bbdf43efbc2bb225a707df7966f8b9dc"; }
-    { locale = "ff"; arch = "linux-i686"; sha256 = "5cf4f3235db02c385ffc355e0fa1060b79afd5a8899ff31da1d0dad4d065e4cf"; }
-    { locale = "ff"; arch = "linux-x86_64"; sha256 = "0576772ddcbdbe3d26ae20dd47b4e635de709c34eb6a797afab7743ac68815bf"; }
-    { locale = "fi"; arch = "linux-i686"; sha256 = "8edd2e8058fc848456b2dc1bb54f669159b232b5423dcde6638e5d61294f1ffe"; }
-    { locale = "fi"; arch = "linux-x86_64"; sha256 = "94bd189308502abea3d6d762378220097d3d743cc42872e6c43cdcd86aa51b4f"; }
-    { locale = "fr"; arch = "linux-i686"; sha256 = "652f87501ba2a5baf1de865d7a607837a9ed623834c2d796baf4e3891fc78a6b"; }
-    { locale = "fr"; arch = "linux-x86_64"; sha256 = "94c3725ea6fc2a7833e9ee60fdcd0ae3a53c80ce7f13ca00634b5d99b12a4607"; }
-    { locale = "fy-NL"; arch = "linux-i686"; sha256 = "8d9ed839afa148da954acfdca139dbcf9f235c097fc7c562a8ab52f9ece68b4b"; }
-    { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "650c8a50b8473fd09dbcd1c818ca8c3ab0c6618696198124f32e0153307e2aa3"; }
-    { locale = "ga-IE"; arch = "linux-i686"; sha256 = "a70af727b36bc7d084211a880318f3a9f73977ff75f728b50cc4bfa9398c61d2"; }
-    { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "01d3635c38068facc135fcca979517d729999db52f4a00c0b2ee27cf830df870"; }
-    { locale = "gd"; arch = "linux-i686"; sha256 = "9763cbe0387cb86f91cdd6b1dfa6e257cc40c4525c753869ee091bfe49f172e8"; }
-    { locale = "gd"; arch = "linux-x86_64"; sha256 = "16d3452fdbabada41626d981dee0e48282d672d9d6073b363ede9e86c4ed56ce"; }
-    { locale = "gl"; arch = "linux-i686"; sha256 = "facde8f17e2f90e49a02b36d016535e1123c7f78ac44ee1110c80dc472e84133"; }
-    { locale = "gl"; arch = "linux-x86_64"; sha256 = "b0955c4381f7f0013e9e0b1dcf8d8c53a3bf694af6970638b2e88dc080771ed7"; }
-    { locale = "gu-IN"; arch = "linux-i686"; sha256 = "cb42e0750736bd14c81bbb76bb05e02c97e798b01d9f41bad091295f9bbb5655"; }
-    { locale = "gu-IN"; arch = "linux-x86_64"; sha256 = "c497650eda2e4fc0f99b9d9c1ef0df33b0ea7b6e32d2eb7d4ee109e5ae1f2add"; }
-    { locale = "he"; arch = "linux-i686"; sha256 = "d4cc561b6ce55f0820e6bd8479de9fd1ed53fd228e7cef28a890aebd687c26aa"; }
-    { locale = "he"; arch = "linux-x86_64"; sha256 = "9294083a0ce8b06cc565c9d643d3e45d50393a5abff230dde8fe42aa29d8b870"; }
-    { locale = "hi-IN"; arch = "linux-i686"; sha256 = "3493dda678fe94e13d34a62d194b612037f472546b96a94de2390706139636ef"; }
-    { locale = "hi-IN"; arch = "linux-x86_64"; sha256 = "db45625e758d3db82705373004cc16176f8376bf087ac11da06c7c22e613dc2a"; }
-    { locale = "hr"; arch = "linux-i686"; sha256 = "227399d033c4a7877387ac965d84ac265600bc16614de1b99618f39808b92894"; }
-    { locale = "hr"; arch = "linux-x86_64"; sha256 = "a4f061ed24c66f936da13f8d93eb311f8fda7cc468d7cc9f71a4c747bbd9af19"; }
-    { locale = "hsb"; arch = "linux-i686"; sha256 = "41bc010d4cca63bc77b8d637e6ca2731e3c5900b6783955335aae0ee3d2eedae"; }
-    { locale = "hsb"; arch = "linux-x86_64"; sha256 = "4618d03269cad3fe8ca3d618de581d37fef37b9276e72613d2c12b212bb2c894"; }
-    { locale = "hu"; arch = "linux-i686"; sha256 = "be456ef5df061985f7413fc7af45b4f0b86ac4a99a57d3574d8ad6dba727a8fe"; }
-    { locale = "hu"; arch = "linux-x86_64"; sha256 = "c229ca2c9fba2ac98e912e5c5f4500d423b1f2cbf768e539112e97c0f0fe410b"; }
-    { locale = "hy-AM"; arch = "linux-i686"; sha256 = "0a569d1b8c8d685c3eb5701471420aa47110c737504a105f660dca72a82490af"; }
-    { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "b15c86feb6d69005244f409290489d8f5ffaff0c85ec876ba931be38c7de07b0"; }
-    { locale = "id"; arch = "linux-i686"; sha256 = "dc8ca98414ccc67087c896c84a0a223026f12ed9fec499eba6203b8ec0b3e6e7"; }
-    { locale = "id"; arch = "linux-x86_64"; sha256 = "6a831ab4c2605fdbac15ac81853a19f5c8633756ad5136f93c3eb76637e2b997"; }
-    { locale = "is"; arch = "linux-i686"; sha256 = "02e9a2022c0da27e069689d25ba80c1d04dc29e6a045833fa1c5e503b5ca9f9a"; }
-    { locale = "is"; arch = "linux-x86_64"; sha256 = "0ffd2b8f1fdafd91ae4e089c075446f57adcc748bea4994d40207e5cba9a5655"; }
-    { locale = "it"; arch = "linux-i686"; sha256 = "f84d5304a37e33883322c9c508f4d342f99901c9339d293308ef78bb561a3c40"; }
-    { locale = "it"; arch = "linux-x86_64"; sha256 = "78c5cb912d6c24d5a7636fd400470d298e4f58493ca6fd3e5f6b88e4b8037e77"; }
-    { locale = "ja"; arch = "linux-i686"; sha256 = "a3d563846ef60176712574a9f66d24a785f749390afde21cbc4823e9d30cc3ba"; }
-    { locale = "ja"; arch = "linux-x86_64"; sha256 = "56bdf673d645dff09e96970fc4cb33b1810d57051e7c12f6fe1ba01fa971e293"; }
-    { locale = "kk"; arch = "linux-i686"; sha256 = "a5b10502bacf265e2157b7246457c33adcf037e4e28291e26a7fdd9f53f94638"; }
-    { locale = "kk"; arch = "linux-x86_64"; sha256 = "2a7c74168d040653cbc31d6d03846b9165f617cebb74388818d73d681056561d"; }
-    { locale = "km"; arch = "linux-i686"; sha256 = "26e696f0a03d7d6c3541563f89ba08d06a47039ca93f15d2f1909db7ca1b8d08"; }
-    { locale = "km"; arch = "linux-x86_64"; sha256 = "18676450680d18631a855dcf91fd4592f8e3e908b04122476ae62d619bfbdd4f"; }
-    { locale = "kn"; arch = "linux-i686"; sha256 = "cf6c95c0f06381f3aa4eb03c8854a530e63b0b5c6d971dc019a5c6cf81f80b0b"; }
-    { locale = "kn"; arch = "linux-x86_64"; sha256 = "fabd1b824a4593454f8c9d7c6c47f7244ec9d1800cbe397042fb3bc41a75d09b"; }
-    { locale = "ko"; arch = "linux-i686"; sha256 = "d3d9ff36de18ca424511df1ddbd4c49c84499491510a064a6f55f15599e1c172"; }
-    { locale = "ko"; arch = "linux-x86_64"; sha256 = "e8eef3e4c6201e1d1e936ee6ec53f875b6c2a0496d308b8fbe03b5cbdf229bec"; }
-    { locale = "lij"; arch = "linux-i686"; sha256 = "de6b35a675539d1bf0ff1c8f3837ba030da64b0e51c30e594515ac13578495f5"; }
-    { locale = "lij"; arch = "linux-x86_64"; sha256 = "9d2351a7bed09127b618cfd86f2d394fdefcbbf2801da3a60a697982b5bbb9f1"; }
-    { locale = "lt"; arch = "linux-i686"; sha256 = "5e5c3d5083b8d71a249f9e5009072132c9524063fa0cdb1f47ad0ff5260725c7"; }
-    { locale = "lt"; arch = "linux-x86_64"; sha256 = "c57df2ce20d09070514f783a12e179ff05a4ac14e7ec67b0081f284f70079468"; }
-    { locale = "lv"; arch = "linux-i686"; sha256 = "30267f85939965eab0ec50f4c869a0a42fa0d0775ae516088f9a3ff57f1bf3d2"; }
-    { locale = "lv"; arch = "linux-x86_64"; sha256 = "c1389231d627df347910d28172a823da18f2ebd5697093035faa499da24755eb"; }
-    { locale = "mai"; arch = "linux-i686"; sha256 = "6dec829e1ea28f8c4480d0517f72909d2d652fd827693dc919298906b62b47d2"; }
-    { locale = "mai"; arch = "linux-x86_64"; sha256 = "29ed57ad173243d7cc2460a534c3f63709e235db74810a0d6f12dc460c5f4a52"; }
-    { locale = "mk"; arch = "linux-i686"; sha256 = "98d4c529ca979e4ba03b3c1640feb0c93ca1ac2a92ac07403a39a07adce8df44"; }
-    { locale = "mk"; arch = "linux-x86_64"; sha256 = "53d6752d67e3277afe3ea239ceb1f890edc5a15fe078d41bc074246598376603"; }
-    { locale = "ml"; arch = "linux-i686"; sha256 = "321d682e8e1e42e8e4522d791e7e7ae13d1622d740038f3586813099f0275d96"; }
-    { locale = "ml"; arch = "linux-x86_64"; sha256 = "f0dfba4cd8fd961ef6c088ef9139b8ce5e33fcefa8cda142c9f51bfae663c092"; }
-    { locale = "mr"; arch = "linux-i686"; sha256 = "b40b8fbbe5ab56055d57f7b9a67ff00e84b7c7d19afc7bb07b4311ef3fb6c66b"; }
-    { locale = "mr"; arch = "linux-x86_64"; sha256 = "3bb64e13d59a1c65460282e4236655a0c2997d894e9b897a8dc3b20a4baca3c9"; }
-    { locale = "ms"; arch = "linux-i686"; sha256 = "15aeda467f0c0c893dd923ee56fcf2547242f0a4089709ce0cbdb27778c71b1b"; }
-    { locale = "ms"; arch = "linux-x86_64"; sha256 = "32cea21ff68efd7c384746c32c0138464fbae4d25065fe58d6d56e191ee5b082"; }
-    { locale = "nb-NO"; arch = "linux-i686"; sha256 = "371af3de1ae68ba242cc55cb7c080008ca305c61d5c8c4e687f53568bcb8f416"; }
-    { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "54e17787e0d31893dcba314e98cfb795fd6f85e335a0e84ce35a0f44a56b6e1d"; }
-    { locale = "nl"; arch = "linux-i686"; sha256 = "92df7a99107ccd938800161e759beb6269a6a30f69c892064e130280a3caa692"; }
-    { locale = "nl"; arch = "linux-x86_64"; sha256 = "41c1bfc828917d58cf8f334b8d2b333ddb50dd416faaae41a0c063bd8c23942c"; }
-    { locale = "nn-NO"; arch = "linux-i686"; sha256 = "ad96e3c670c244d366ce0d600d87a308d95e51309ab86becf1c8c69245dbed0f"; }
-    { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "eee10d92a2bcc32507936c3c2c5c2c220a4de955aa8b48d23f0d923c9b0faa48"; }
-    { locale = "or"; arch = "linux-i686"; sha256 = "1ddaa000c9b3d5a7dccdddaeb8fda53ba821935bf24ee5c2ca0053e3b2900bd7"; }
-    { locale = "or"; arch = "linux-x86_64"; sha256 = "0d62ab80bdd5853d8dfae01d9420929d9321d1f6b9f40d372c6241f1345de76a"; }
-    { locale = "pa-IN"; arch = "linux-i686"; sha256 = "accdde423ac5c518d14b435d00e1f536cd240f31108b58f0b5e1a925637faab4"; }
-    { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "89ae2f460c6fdab846d6b41dba84f63c94a7bfc1f61e3e79da5d643d4c1a1fca"; }
-    { locale = "pl"; arch = "linux-i686"; sha256 = "d8e043d8ba0c223f0232facef10b6d2e2ee13733bf8670a9101796bfddb3c2f1"; }
-    { locale = "pl"; arch = "linux-x86_64"; sha256 = "f6ada91433d48b699c02fddf22e2d8aa36e6b0cc365b73625bf6fb80ed3fb877"; }
-    { locale = "pt-BR"; arch = "linux-i686"; sha256 = "b2d294d7761cfc3c8a58ee072bb8a0b82cc79724f6b103073632e682fda32f60"; }
-    { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "642c56b5d510f5efc8a365be956789d7760bfe983aa397ae194eef5bd15f601b"; }
-    { locale = "pt-PT"; arch = "linux-i686"; sha256 = "6bc224414c39047c42040ebaaa7e7d61bb09939a9878ec4a2d7d7e8c31a7ecfc"; }
-    { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "cc00a2fb38fed6ffef5a6a6931b043c65948c18f3d502a0e3ae641a1847203b7"; }
-    { locale = "rm"; arch = "linux-i686"; sha256 = "2cebf2678e1a469447205a7495f17185259d73a72439f8fd400eee957e571bbc"; }
-    { locale = "rm"; arch = "linux-x86_64"; sha256 = "32fe2ef01b0d495476768eff7e4750c2c82196e60f50c2e824adbf611f275289"; }
-    { locale = "ro"; arch = "linux-i686"; sha256 = "289cef6b438a59bac459c203a6b1b2965b089f1487ea78ff524a6a68f5996862"; }
-    { locale = "ro"; arch = "linux-x86_64"; sha256 = "7df67b1a5a12297a214d1f794c84b58ca12a182ee780e2574116214dfc785388"; }
-    { locale = "ru"; arch = "linux-i686"; sha256 = "65fd6a9a90b4e5c8fc784850dd5bce41901b0d241dae9c37110bf99643d52d32"; }
-    { locale = "ru"; arch = "linux-x86_64"; sha256 = "585683dca4c427ecbcc17d42465b6e374a76d5266b908df1b47f4a1ad81e7794"; }
-    { locale = "si"; arch = "linux-i686"; sha256 = "6567d5ab15a1bd20426569a6480d6e44f2c1917145fa607357f0d3d0502c840a"; }
-    { locale = "si"; arch = "linux-x86_64"; sha256 = "f0aad93013b6070516851a13352d1aabd0d10bd7891eaea878d3632c1b295296"; }
-    { locale = "sk"; arch = "linux-i686"; sha256 = "c6da9d539302dca6ad8e3165ca595eb80438fb4caea11979c0e07ca215696929"; }
-    { locale = "sk"; arch = "linux-x86_64"; sha256 = "236dd9171f471849e8cddb2b8ff0166e41bdedcb0bb3c1662fdffa83c3e89374"; }
-    { locale = "sl"; arch = "linux-i686"; sha256 = "4b9160bfa7579fc893a40387f0185cb74d7db2cfb0eabd2aa032259ed53b7a97"; }
-    { locale = "sl"; arch = "linux-x86_64"; sha256 = "56bc853e4e5e21d08b2ccd04687388473c45ac4403d0b51ed41d8a6a3a26e396"; }
-    { locale = "son"; arch = "linux-i686"; sha256 = "b73fcee703ce937ec25993da5e09163541fef9eaa4e65ec7d5358f1dfa1b596f"; }
-    { locale = "son"; arch = "linux-x86_64"; sha256 = "95ef838ac58e82ec435ddf7e2ea0bbf8b8d1bdb34832aa664d1ad8f5abbd9a13"; }
-    { locale = "sq"; arch = "linux-i686"; sha256 = "370313d2cf543ab3aeaa5de11f748d69a168a82d6e29c27d4c398bb577fdb06d"; }
-    { locale = "sq"; arch = "linux-x86_64"; sha256 = "a86a6604169ab6d9bc2657a0d26db0a3f96b2927223c5a43128dcf49bad243f1"; }
-    { locale = "sr"; arch = "linux-i686"; sha256 = "a7ad2ec678944f37cfee69025871369b658013f77df9df0f1bbfd9cbc03666d2"; }
-    { locale = "sr"; arch = "linux-x86_64"; sha256 = "b081bc35064722b4de95f4e29c4ee203bca124ebe0c33bbf91f0e11f904928f7"; }
-    { locale = "sv-SE"; arch = "linux-i686"; sha256 = "5a6fe1f1c7e1d5bd91a0c82e47ce5b88e31611cf51d6452afde3ef06d2d1a695"; }
-    { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "9a09a020acabfaef4fa25d94723fa437c57761f0dbd9bda880b8ca3acb5248df"; }
-    { locale = "ta"; arch = "linux-i686"; sha256 = "0e0839d5a899576f3fd796079748dba8612526bd5f855e8718eccb3ed05944c0"; }
-    { locale = "ta"; arch = "linux-x86_64"; sha256 = "cdcd8e06216289df7cdb4f82f01207a7112fa4f52040bd70c2f497b3d701730a"; }
-    { locale = "te"; arch = "linux-i686"; sha256 = "e4609f803edb243ba8c8fbfb7ecea2e652a9e94adeec2f6c03af42c2e8bc5b74"; }
-    { locale = "te"; arch = "linux-x86_64"; sha256 = "b9151a27be6a8de94fa25b53dfb85e765cc2ff823c2de6a0d0583883fc30ea48"; }
-    { locale = "th"; arch = "linux-i686"; sha256 = "48349866a10948cc0b4f8b6bc2fecd5dcbd4d09ff4ba569f7fb3e569edadd976"; }
-    { locale = "th"; arch = "linux-x86_64"; sha256 = "ef38e6a99cc8cb9e32e95af0ae7f7c99b82310e28b082b6aa085aa80f180ef60"; }
-    { locale = "tr"; arch = "linux-i686"; sha256 = "fbad5fa2196dddb5061fec1f47fa7af85c0a824f520588b7446d2740928e34cd"; }
-    { locale = "tr"; arch = "linux-x86_64"; sha256 = "c644f251f1e43acc3baa550b540750fb7d11c2f440c7906e1955d34694a0d718"; }
-    { locale = "uk"; arch = "linux-i686"; sha256 = "9db7dc494734011ed61c5286fcb1f4b4dfb418528792ef92fbfc3734a9618129"; }
-    { locale = "uk"; arch = "linux-x86_64"; sha256 = "06cbcceb189bad7174cf46678535cd4bfb1062e5ac878fd313fc341315001106"; }
-    { locale = "uz"; arch = "linux-i686"; sha256 = "cfa94474277edc7739c11795b2907b894c87f5c573c43aaf5a951a2f13a9c8ef"; }
-    { locale = "uz"; arch = "linux-x86_64"; sha256 = "e3a581e965fbb3711e6ca6d6d5b378eded8e8ea9767f94993c50632b6f4a7aed"; }
-    { locale = "vi"; arch = "linux-i686"; sha256 = "ecd4a5b8fa66e78cdb93b04eb2b3a5ac354bd5e231d8f4bcbf2acfb94b5190b5"; }
-    { locale = "vi"; arch = "linux-x86_64"; sha256 = "1d52852d973d5d6bea8ef860b216aff4eea59dff576f13ae67aa9b96ef0c9878"; }
-    { locale = "xh"; arch = "linux-i686"; sha256 = "24befe5e2fe2001ab3827543f97b52ecd15f5cbad89d977584aa4dc08a0e9c11"; }
-    { locale = "xh"; arch = "linux-x86_64"; sha256 = "4cafc2a6028d8141e47b09a9d8d96404cb4b5806cfaab452566f9a7baff89f25"; }
-    { locale = "zh-CN"; arch = "linux-i686"; sha256 = "80ec43ed8918fa452271988d53875f184196460b15086fe793af4842458ab790"; }
-    { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "1d3fc933a5b3f4082fac9176f6a802e01f8a26d711c339116799e58629843f27"; }
-    { locale = "zh-TW"; arch = "linux-i686"; sha256 = "a255ce81f6ac1774ae6c8a5b9208169864a672f22f7037c93f01758c4eaa357b"; }
-    { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "27b048c3df2ff25fd6f7c33cc30016e8a657a2f30ef7b0da9a2f4097c1b5e494"; }
+    { locale = "ach"; arch = "linux-i686"; sha256 = "1274cb4148d115ab4d8bc5b5c6826e80863e2bf0f76f0165521beb5da2fb5d22"; }
+    { locale = "ach"; arch = "linux-x86_64"; sha256 = "2184a0a1b3bcb833369959cb1fb641ac9501dad40828d7260022dc3492f4444b"; }
+    { locale = "af"; arch = "linux-i686"; sha256 = "807efe3a2277494f04e957b60f033c31d58145b5dd1e13fac3c027e811849932"; }
+    { locale = "af"; arch = "linux-x86_64"; sha256 = "53f654dca168125a1c55842125c3480f41d3f66b5ea2b0978912f5602d7a317b"; }
+    { locale = "an"; arch = "linux-i686"; sha256 = "ad97be84a2c59570919939ad72542d140a7c46c45ae2747c24f5cbebbf201222"; }
+    { locale = "an"; arch = "linux-x86_64"; sha256 = "1608d249fb454be2d241f512d74662d0089f85a1d7ff8888d43aa3efcd6c2f73"; }
+    { locale = "ar"; arch = "linux-i686"; sha256 = "d464251e1734271cf5854d2b9dcc7bb391205f78f6f80263b5648e0e03e841b8"; }
+    { locale = "ar"; arch = "linux-x86_64"; sha256 = "0cfb84665d40bc40f3a2bf77f58fd499ec9a33aec3c82aa384edda9fb64756eb"; }
+    { locale = "as"; arch = "linux-i686"; sha256 = "d20fe776c5a036016a89754e30a773082ec018112d7f8848b532f56aa3f91bd6"; }
+    { locale = "as"; arch = "linux-x86_64"; sha256 = "4eec5f44fa188e84376cb87249410decd7662271782f347d7f9cda40a52b40ad"; }
+    { locale = "ast"; arch = "linux-i686"; sha256 = "2c75f6b6cc9202d090eb349f9fc4f5995724d6c5675149dfdfb0476475e964d6"; }
+    { locale = "ast"; arch = "linux-x86_64"; sha256 = "39b23638d5e2aea613ec0f32b7ad71b7084dd333146413c82d5f91c42d7bc099"; }
+    { locale = "az"; arch = "linux-i686"; sha256 = "b07d6481777a4b9bf1f06a00c820e4cad6e7ae414099afb1619bb1ae71fc8b5d"; }
+    { locale = "az"; arch = "linux-x86_64"; sha256 = "da5852870bda9c27ec1a16893d990180e08031565c54390828c0ae2d38cedc89"; }
+    { locale = "be"; arch = "linux-i686"; sha256 = "a04ee5c4521e46675919aa9cac9a56277cd741195248ffcf260eaf875e992afb"; }
+    { locale = "be"; arch = "linux-x86_64"; sha256 = "41d8a66b2f39575c7fd5164464c0c8430255e86a2c56eaaef1283107fe92832d"; }
+    { locale = "bg"; arch = "linux-i686"; sha256 = "edf94d80e1a9641569123f6a711699f840919398e5e7230fa4fde9d35b0ad09c"; }
+    { locale = "bg"; arch = "linux-x86_64"; sha256 = "8e1fc0d661c3b54ecc2848fb9309040c4250e0eb9be206e515474dc0cf893ed4"; }
+    { locale = "bn-BD"; arch = "linux-i686"; sha256 = "76237b91fd2efe99f07c11d6a0080e85dd7ea6c0414e917a74da6d1361297439"; }
+    { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "c6cc9b00423124879b4900918ff791531c7b3b3f11866ad16fb27630aba6a1a8"; }
+    { locale = "bn-IN"; arch = "linux-i686"; sha256 = "ea378725ca575e30f42dabff703acfc7246498fd765dcd3fc2922f0fbb0cda31"; }
+    { locale = "bn-IN"; arch = "linux-x86_64"; sha256 = "fbf01a2b84d8aa35a388baaf56b2034207a12f4a2a9b79faaccf772f8a23d705"; }
+    { locale = "br"; arch = "linux-i686"; sha256 = "adbbcfd6cff2e0dc5fbcaa91dd6b2dfc13d04a80be35ea365907d8aa2f17256a"; }
+    { locale = "br"; arch = "linux-x86_64"; sha256 = "7b557210b559f920dd3b9e69371d98f08ce2fe0d929e04a1b88fd56fcc793122"; }
+    { locale = "bs"; arch = "linux-i686"; sha256 = "32508d4c75f5e23e1082513ebc4a20f5f6d98277c5121abde475eaf48a762b81"; }
+    { locale = "bs"; arch = "linux-x86_64"; sha256 = "a2c6354582d8dd42b8e180a705c158d4b85ba3ff68d97863129dc71b05a83612"; }
+    { locale = "ca"; arch = "linux-i686"; sha256 = "e8155974306fd84d7fc3330ed7a8da5b234f1790dc6792c9e59648c93660866a"; }
+    { locale = "ca"; arch = "linux-x86_64"; sha256 = "46cd90407fe839356b63eecdee839dbde68651ebb631419273b6c4d7d31d84ce"; }
+    { locale = "cs"; arch = "linux-i686"; sha256 = "50cdc07a438ef44ff6a7585583c38c604a71081770f38add190079300afe3b54"; }
+    { locale = "cs"; arch = "linux-x86_64"; sha256 = "1e4bf0b42a263a99b16bf083d0152e667fdd534c0a2cdcd6557f6b85506aa0e4"; }
+    { locale = "cy"; arch = "linux-i686"; sha256 = "95c184685fa32bfa8999a953b1b1001d5d8a73ae82bd2b70d70e6feb990f5b77"; }
+    { locale = "cy"; arch = "linux-x86_64"; sha256 = "7117b1067f753c7d692b73c6aab610fa0eabf423e24444f7ac8893339264414f"; }
+    { locale = "da"; arch = "linux-i686"; sha256 = "46d179f893df3e7af77da5f3355d2418b0fcffd3060d0c9aebc62087075177b8"; }
+    { locale = "da"; arch = "linux-x86_64"; sha256 = "0514a6f88470681b93a9d8202f48159d031387e5e42d14923cfa1cea2113d753"; }
+    { locale = "de"; arch = "linux-i686"; sha256 = "4d30e8a59ba3ac04e387df7df6be1edf88b08ca37463fd9ccf301def3542cc35"; }
+    { locale = "de"; arch = "linux-x86_64"; sha256 = "ae6f94e6a782103efd18515a6596a5ee06943b2d1321f03127d54ae7ed147131"; }
+    { locale = "dsb"; arch = "linux-i686"; sha256 = "62880a87963abf9e36e820644a8165f980f7b48634b1a1f825f5aee0d2e19e74"; }
+    { locale = "dsb"; arch = "linux-x86_64"; sha256 = "ff2a596f46b02bea98fa36defa0afd96c064912a79ea8b4f98aae46901624f22"; }
+    { locale = "el"; arch = "linux-i686"; sha256 = "5fb00e56adfd520d114208ba72b9a3fb5306903e0b2b3669bb109549b0b4ef6e"; }
+    { locale = "el"; arch = "linux-x86_64"; sha256 = "df3fd6d2206918c324182ada0a3bce912726a48383537be69a695e678a0cbeb5"; }
+    { locale = "en-GB"; arch = "linux-i686"; sha256 = "d3e21c467cf25b5629cb9bfa5c18daba024e3665e5c69830f472dfc93b062e04"; }
+    { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "210d41c4e9861713dba228d34781b05850b9839606a975580b0dedca556e8e53"; }
+    { locale = "en-US"; arch = "linux-i686"; sha256 = "78b95a47e73d2ef7d436f59fb1e7f300c6075bae4ab41d3557b6b17520416d57"; }
+    { locale = "en-US"; arch = "linux-x86_64"; sha256 = "6f27b0499ee599b6dae1e7ef5a79e935fb186b6fdfb2f09274cdf40bcbf2006f"; }
+    { locale = "en-ZA"; arch = "linux-i686"; sha256 = "f16af1ead4c5ba73ec2b137764cac5e610574f107763c20667f9d565f10b4ca6"; }
+    { locale = "en-ZA"; arch = "linux-x86_64"; sha256 = "de561c70c19a8e921fe8035af4513a0b1c3fc184739f42e4d6e76051278a0e75"; }
+    { locale = "eo"; arch = "linux-i686"; sha256 = "78670d675bff447c654717763157e4726e0fe3612568e993c2eb7cfd9b893ef7"; }
+    { locale = "eo"; arch = "linux-x86_64"; sha256 = "fa8d9ddc8113a33c2c9776cee0eeeccf46b00aa2f099e9ebda3aef370104212c"; }
+    { locale = "es-AR"; arch = "linux-i686"; sha256 = "77366f398047143357cf250903cc0ccc99c58bbf882e8de7f106237632a5c944"; }
+    { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "453245f940832fd4f3e3d3509d83e0e6d900d0154623b779a830d3d990652027"; }
+    { locale = "es-CL"; arch = "linux-i686"; sha256 = "ff985d60ce0ae316c7b9452bd3f385d80a1ab5e1671119a859450e2a930edd65"; }
+    { locale = "es-CL"; arch = "linux-x86_64"; sha256 = "992ae0721558d042041d46da1f8ed3763a2c9dbd2c54063e3ce074ef7a49329a"; }
+    { locale = "es-ES"; arch = "linux-i686"; sha256 = "2195599d5d196903b21a27e3447524a31fc69845af2a02cd7e4e5ebc8d1695b2"; }
+    { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "9e7cafa1a4b9712c58812acaadd49f41c027dd41af569df326b9668d64fedfc3"; }
+    { locale = "es-MX"; arch = "linux-i686"; sha256 = "63ed5abc352b5eb16e0f91c7da69cb9121363607c312674c6d9c9d2c45211bda"; }
+    { locale = "es-MX"; arch = "linux-x86_64"; sha256 = "063c73c0285ec2761e7483d21f6e43769fc9cb7aeb7a93803e63fffb7c4245c4"; }
+    { locale = "et"; arch = "linux-i686"; sha256 = "b331149411d855616857bd4eca5911f570deb601b203ce21ddf11b854de363e5"; }
+    { locale = "et"; arch = "linux-x86_64"; sha256 = "a482ce4d21251a5757dafaf86d5afc708989db0a367357a34c3b5fba0a05f8ef"; }
+    { locale = "eu"; arch = "linux-i686"; sha256 = "3ec3222f06b468a3d94b68c2dccbc21d9b63de765be90fdcb594be4146885786"; }
+    { locale = "eu"; arch = "linux-x86_64"; sha256 = "411490db2e9acd6cc6170b8a6c90d7e2a9beb83f4437d087e755b0845aac8c4a"; }
+    { locale = "fa"; arch = "linux-i686"; sha256 = "b7804d3f0c8c43ef256b44b0bd9e32caa2aab5c7a7ef3b072cd14adfc5b24e0e"; }
+    { locale = "fa"; arch = "linux-x86_64"; sha256 = "91601b52dc9557e17eb80db60a0c9a023ea9ef5d06f8355b077b9e7ffd3800b3"; }
+    { locale = "ff"; arch = "linux-i686"; sha256 = "2143e1d2629b4b1aa6f35f4dfbfaaece09711b65a9da80d6a7303d70362ca8a2"; }
+    { locale = "ff"; arch = "linux-x86_64"; sha256 = "20fd859ea943e3d0a3bfd0427b07117233ac6c980aedf1c4461dc71f2f132ee4"; }
+    { locale = "fi"; arch = "linux-i686"; sha256 = "6bea2d99cd49e3ddadecec22d4832abfd037b7e4a7036b2638f8dd61ba33e227"; }
+    { locale = "fi"; arch = "linux-x86_64"; sha256 = "0eb961fd7512d0223dac43c4895a69404c1d533224d880e619ec91809ae476cc"; }
+    { locale = "fr"; arch = "linux-i686"; sha256 = "86f07727d64fa4122291d9de053b8654d190833f89d3b4d382786c697ee47bf0"; }
+    { locale = "fr"; arch = "linux-x86_64"; sha256 = "63b23116db3c464d6a7bd3e72f9fe82aa236c4e542994621194736fa76c16451"; }
+    { locale = "fy-NL"; arch = "linux-i686"; sha256 = "de6ba7ee545d59c4d60380bc21a68e00cf88f6ce598d326cc04c57b104267610"; }
+    { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "48a1e32a6f110119d729584cd0c5002bdbff2d67e3ed58e777e6eaf443449295"; }
+    { locale = "ga-IE"; arch = "linux-i686"; sha256 = "42d784a229b674016e51ddd71d634fc20a39c6f6c3c9b98f8f52c1be2146a447"; }
+    { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "7b8c257448701a7f252da43a6fd466bb80326405d81683525feefb1d1947856c"; }
+    { locale = "gd"; arch = "linux-i686"; sha256 = "f192ee509e71d58dc8cdca8cfdae4d103bb9542b6c9a807f2b8e9e1b81f0309b"; }
+    { locale = "gd"; arch = "linux-x86_64"; sha256 = "03135f6eb67046aee154040c1d089504ff307bc3fcbacc55c6266827e3675d6e"; }
+    { locale = "gl"; arch = "linux-i686"; sha256 = "73fb03a71ccf7d6bd1dcb0fa28c21745f3944c28e51e700b190f1b872b38c2a0"; }
+    { locale = "gl"; arch = "linux-x86_64"; sha256 = "33832cee5dabd5e9114b9848cebe505b59bbf9a0151f6ac9f3229edcf9462e6e"; }
+    { locale = "gu-IN"; arch = "linux-i686"; sha256 = "8f2a45c81547a2b89194bdbc9e52f22d7d1b3bd356960433c970d59b2ce3b4d4"; }
+    { locale = "gu-IN"; arch = "linux-x86_64"; sha256 = "4be14ca66c881c81f525d997cadc291632159722b5b9baabb430c9dfba6218e5"; }
+    { locale = "he"; arch = "linux-i686"; sha256 = "452a9742ac4fc7ed3daa436bebe16a7d9530fe9c1587591e2a2a5247adcd4ce4"; }
+    { locale = "he"; arch = "linux-x86_64"; sha256 = "57a347dccb36b7f53af06e850ea8170364fe4c50b2164fa6b51231eb834f777a"; }
+    { locale = "hi-IN"; arch = "linux-i686"; sha256 = "8a4b1d09f715742fd9465d2fdd525d271b94ed1d0face088b8d1ae10b5ee00c6"; }
+    { locale = "hi-IN"; arch = "linux-x86_64"; sha256 = "7a5f1dee1cd04118c366c315ed5d7228829e097e39405dd7115d85d0c4791517"; }
+    { locale = "hr"; arch = "linux-i686"; sha256 = "05e80b6d007cd3cdfe2f993c5194ce84b9d111b500378f8da675b7c478a6ab51"; }
+    { locale = "hr"; arch = "linux-x86_64"; sha256 = "570b5eb8072f39af37fa0f9bf3eb51ef538862c6488295ec8d193d84b8ed8206"; }
+    { locale = "hsb"; arch = "linux-i686"; sha256 = "2b6a3c03d2f4c8e59503c896bb3654452cb75115aeec24c3b10f4a528c4c0322"; }
+    { locale = "hsb"; arch = "linux-x86_64"; sha256 = "c94b2af1158abb85e0883c6cd8f6f361debfa99d2291f62c47fc7a2413c33758"; }
+    { locale = "hu"; arch = "linux-i686"; sha256 = "0082c743077a1e50575b96e6e4ce4bd65c4fe6830b112d87fc0157556aa4d38d"; }
+    { locale = "hu"; arch = "linux-x86_64"; sha256 = "3dba1ec3efed6f27429ddb7fb3cef5f5061783f6ca7ce3fc64de40e22159c1bd"; }
+    { locale = "hy-AM"; arch = "linux-i686"; sha256 = "4ccb6b342a9a914392fa3a242136b39cba32f0d6029c5f5c4cb9c5c2658a9813"; }
+    { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "632b713c29d84da3e3e800e7b520a84e3647b5717e08710fc32047270f037de5"; }
+    { locale = "id"; arch = "linux-i686"; sha256 = "6bf6556a9ea92d2dfa3e49bb8563e2de5cc53b264c2e43fed08183717babeee8"; }
+    { locale = "id"; arch = "linux-x86_64"; sha256 = "9d321c03c2392f590288c6f928838e2d5dffd27a7cd7b047199b8170a99619bc"; }
+    { locale = "is"; arch = "linux-i686"; sha256 = "cb6f3d253b4f3bc010a3ea5be449c68050f893d7af912a7b161ef09af881774d"; }
+    { locale = "is"; arch = "linux-x86_64"; sha256 = "edab26c92c2e5e3590775adfca72cddc876e0974cc4101ffe0554c79cec79f51"; }
+    { locale = "it"; arch = "linux-i686"; sha256 = "7e09f9e10f216659afc0e4395e5914c99914dc62742b47091ffe104c70c5158d"; }
+    { locale = "it"; arch = "linux-x86_64"; sha256 = "e1d362fea0f3abed1e9894d5c5ceb9648d4d29e908a99b0b31725d2fbd2f97d0"; }
+    { locale = "ja"; arch = "linux-i686"; sha256 = "db2f20165e5f9d940e409694f10e045855a8dcbdc08004f637827348cea8d760"; }
+    { locale = "ja"; arch = "linux-x86_64"; sha256 = "425784e5502ca41ec131fbb71a0f8390468d08a80848cbf8e8c27de752755646"; }
+    { locale = "kk"; arch = "linux-i686"; sha256 = "c7faf20960a5882f61173974c62ce4f57e6d65f210a608c4ad29c6135f3f9de2"; }
+    { locale = "kk"; arch = "linux-x86_64"; sha256 = "56849c7caa7b8058e65438a090e8d1c9465548afc8413ed9b62846147573649b"; }
+    { locale = "km"; arch = "linux-i686"; sha256 = "1df201969617dd64f9532128216305780130871c2bd7b52632e9d6759efa633f"; }
+    { locale = "km"; arch = "linux-x86_64"; sha256 = "5445cc000d95bf43a822d9f95581a75aee4ed267aa291a377c8bbd6e10d99bae"; }
+    { locale = "kn"; arch = "linux-i686"; sha256 = "d6388df75df201b0d876fd2da6d4865fe9803a81ad385e3ec51cd0f1e23ee581"; }
+    { locale = "kn"; arch = "linux-x86_64"; sha256 = "6fa81e2c9077ace3215de6583e860887209ef68d4cc15243a585771453a6e98f"; }
+    { locale = "ko"; arch = "linux-i686"; sha256 = "2c7d2fa3727b5befdf8e538b0f31ea43a9f1ce4cd164ead8cddd231525f6d523"; }
+    { locale = "ko"; arch = "linux-x86_64"; sha256 = "91f89a54979bd625ad5ff840bf876205a151e023b7fcfbd3a917fb2d9e586ce0"; }
+    { locale = "lij"; arch = "linux-i686"; sha256 = "3bab33ddca338da11b75b34f2db6c78ac89ceec4b0936c1a0e54f71b00926da6"; }
+    { locale = "lij"; arch = "linux-x86_64"; sha256 = "ad470c6c38adee3ba65098dd69a358176d8fc750b9e4062a4adffbd9d610a4cf"; }
+    { locale = "lt"; arch = "linux-i686"; sha256 = "a2e50a5330a18ea49edbcc45f7cd0c6daf8044bb8e4393569bf937a03ea44be7"; }
+    { locale = "lt"; arch = "linux-x86_64"; sha256 = "761ab112b43a21553bee96a845a0300b492f4189e49cf3952a5f2abb3ef3da98"; }
+    { locale = "lv"; arch = "linux-i686"; sha256 = "08ee4150abdf8f6a5e609e7c7a86ad0624b65b6750df7f7e89fdcaeb2af3ab58"; }
+    { locale = "lv"; arch = "linux-x86_64"; sha256 = "32e2ccb0b162c7b48a1b331547fb4449470833397662e37cad054885ddc22a1f"; }
+    { locale = "mai"; arch = "linux-i686"; sha256 = "33733010e364be12ce023ae890afe14a95426a904429c422875d5cd0fbbbdd05"; }
+    { locale = "mai"; arch = "linux-x86_64"; sha256 = "621886c515627faa305c3029b880d88f88671e2bf1dee55c07f29adeb7b3b07b"; }
+    { locale = "mk"; arch = "linux-i686"; sha256 = "64833dae9d93818289edae4b3964dd6abcfe7b1a35751e6b4836d635ed383262"; }
+    { locale = "mk"; arch = "linux-x86_64"; sha256 = "344f82fa85ba3ec1fc945aaf7e185b2fb7b6077ae9d178ba0bd31e381096b0da"; }
+    { locale = "ml"; arch = "linux-i686"; sha256 = "7f659b446ead282c12be202510f42b0b286cf4667399ce891f2e412b23b9c39c"; }
+    { locale = "ml"; arch = "linux-x86_64"; sha256 = "9277acf9c4836fbeef17482f87343cc14c81adaf0939b12dc943e28cdb42dbda"; }
+    { locale = "mr"; arch = "linux-i686"; sha256 = "ab8a5d5282c43ba3e7b3007f9c85a8bb90f981a9eaaaaa2825b4767791a98aaf"; }
+    { locale = "mr"; arch = "linux-x86_64"; sha256 = "032aa9462b189faee85aa41da633c44d91962ccf7e0f58ba332ef039d8c909f0"; }
+    { locale = "ms"; arch = "linux-i686"; sha256 = "05446c324dd379bddb4adf457c8b889512383f97f3402fff915a331977fbad19"; }
+    { locale = "ms"; arch = "linux-x86_64"; sha256 = "92f9ab50f8f6acc962408fccf2d04a431689a8b3ebfb7267b5354f3fd45f2ee1"; }
+    { locale = "nb-NO"; arch = "linux-i686"; sha256 = "5f17aa376b3b427be78149330f39d7551c0662c96e3748353aaff66a0678d76a"; }
+    { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "c80518adfb3297e9b86b6e756543af0c00b93b94a582ae0d2ea9ae09e492aa39"; }
+    { locale = "nl"; arch = "linux-i686"; sha256 = "3742c55f29df607949a022c58198047c85bca9cce92bcac2ad3edd1d59369d3e"; }
+    { locale = "nl"; arch = "linux-x86_64"; sha256 = "821242ff332f747a7e64e191821d5ef364ce60e81bc6469b578f418f6247138c"; }
+    { locale = "nn-NO"; arch = "linux-i686"; sha256 = "666fde211cb7bafbc16d225a06717f12f3bc00b4bb1a1c370ae36013037ce8df"; }
+    { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "0b552296bd154d78fb615f60feb63442ad9790c31101ede4bdb8dc101d163a26"; }
+    { locale = "or"; arch = "linux-i686"; sha256 = "28453ca9c48bc0c06bd5f57f110d4a9d4d8418dd7175b353664eea3547dd2f94"; }
+    { locale = "or"; arch = "linux-x86_64"; sha256 = "dc273e392c654be0160ee60c2db2ef90acff7771ed0aeade38dd96051df9ee29"; }
+    { locale = "pa-IN"; arch = "linux-i686"; sha256 = "e690cf215c693ef3e934a5d4a2b06c98e4da3b205bf44b3392b6fbfaee464167"; }
+    { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "b399037e89c83872238489ec82d6683f0383bd9efd559f497ca4c60f6b32d6b0"; }
+    { locale = "pl"; arch = "linux-i686"; sha256 = "f455c411b3c46155bb37086f16878e18cbf493d6845ff5c9731ce86bf8743f1b"; }
+    { locale = "pl"; arch = "linux-x86_64"; sha256 = "37561debefd6e7cc0790517bc0afa8e924b65abebee654390f1e175797b98eea"; }
+    { locale = "pt-BR"; arch = "linux-i686"; sha256 = "f98e9944ae43b739f44743392e5aedf8eb968a1cdee85ee9e458225c2e250305"; }
+    { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "b10a4c8ce4be229a384c48663fe1391b2a6ae276bacf0475660989fc795c9494"; }
+    { locale = "pt-PT"; arch = "linux-i686"; sha256 = "9bbe3af6bad4f052332621e2cd2fbeefed70bdb1726045c49db23b2e5ccd116a"; }
+    { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "b1b5df4587b7706e8f2ef95978cd1e8ff3d13e57f003a82918005a358175e87d"; }
+    { locale = "rm"; arch = "linux-i686"; sha256 = "0e36c1f71249c93c2d7ed4e950f05e6879a57e5c2bd95da53ce7ebb5ce7b0264"; }
+    { locale = "rm"; arch = "linux-x86_64"; sha256 = "91b165b2703605bf3fd53f610c1362b54ae4814eaeee4ee79e3dbca76c29f3f5"; }
+    { locale = "ro"; arch = "linux-i686"; sha256 = "ec74d573c28236eee3e0db9f4f618666816598becca2547e6532d2c9ba49af59"; }
+    { locale = "ro"; arch = "linux-x86_64"; sha256 = "da44dd696ecfa24ac80edd7b3270f960c35235e8be5c315a21a34305858fb14a"; }
+    { locale = "ru"; arch = "linux-i686"; sha256 = "4c6a0778715f18eeebe377cb097c8871c30e704674ec28c96a239f24d7104256"; }
+    { locale = "ru"; arch = "linux-x86_64"; sha256 = "be1f22e43c9bccc89dfe03bd5888fff08e7e15c9660d381435d86e0e9b55467c"; }
+    { locale = "si"; arch = "linux-i686"; sha256 = "d4f78ac52a4457a8e28d7b87d1c9a58224f4b30f3b70178b721eef4207014ae2"; }
+    { locale = "si"; arch = "linux-x86_64"; sha256 = "246c553262c646a5065c684b752f7e410973c3c7354b051ce404188efdd7393c"; }
+    { locale = "sk"; arch = "linux-i686"; sha256 = "629fff240304c8e45854ec3d9d9e66b67430663484f17e93eb109738cf5c7d8b"; }
+    { locale = "sk"; arch = "linux-x86_64"; sha256 = "804c9b3a7377ad0863e510e4a07166bcbe3fc89ba0704983e1b44122e0d1c6b4"; }
+    { locale = "sl"; arch = "linux-i686"; sha256 = "546882ca19cc9b764264df9565ae13f0a72c167b641bfde2c5f040f1a62445a3"; }
+    { locale = "sl"; arch = "linux-x86_64"; sha256 = "e6981343cdf05ac4e8f0b5f8477e3dbfaf852415089485e95dca74168a720489"; }
+    { locale = "son"; arch = "linux-i686"; sha256 = "77d7c08293b29e773fdcd5bf3e9adab80b6bc838cb7557436b43cfd5db3b4247"; }
+    { locale = "son"; arch = "linux-x86_64"; sha256 = "8853c8b5b650a1ec898c2819e3d185662fc2c1823a5c2c3db90154c023280a1d"; }
+    { locale = "sq"; arch = "linux-i686"; sha256 = "1a9c4879b63973a02d6f4b9d7d07f0cfbcd1da2da5af82f0dba167d651f22126"; }
+    { locale = "sq"; arch = "linux-x86_64"; sha256 = "6f713b8fdd256c0062bcd1f653a852cd2fb0d63c8bd5016d6bb72a70184b7fac"; }
+    { locale = "sr"; arch = "linux-i686"; sha256 = "79efab1a2d6597ffbeef32b969febe70cf589695e0142208df1f4fdc8018d791"; }
+    { locale = "sr"; arch = "linux-x86_64"; sha256 = "e2ae5c1b10e70c729c263f9950d3d20d1ecd011a76e3919c6b67cd410ac214b9"; }
+    { locale = "sv-SE"; arch = "linux-i686"; sha256 = "79e75bf8894b5102373c58c19fbcf3bcc3c2c59bfdf3cf76c97306bd6def34da"; }
+    { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "3dfbf13fefa507d6975de0e92ce5d32da1e0b7c1d6deb4fe7551b305cc818a51"; }
+    { locale = "ta"; arch = "linux-i686"; sha256 = "9f3b56250f344da8bbb3fb23dda1c7bd5bd6dcb8997df27af3b92a259d0102cd"; }
+    { locale = "ta"; arch = "linux-x86_64"; sha256 = "9ec347d26885049750c3a0d17c75557bcf67d3a28048920a6d7aafee5805e8f8"; }
+    { locale = "te"; arch = "linux-i686"; sha256 = "b25bab31e21ff3fbb0eea10d1b127837c73e8e4bada958385c21482dafc1a7e4"; }
+    { locale = "te"; arch = "linux-x86_64"; sha256 = "1c1e6b3dfa8ee24e40f05d41cf0da97c92108d7ca97645b4c4ce671c3fed641d"; }
+    { locale = "th"; arch = "linux-i686"; sha256 = "350caf486c89265b61bfd91cc9df4a20d7ff1071fdf995e7aa03b8c27d83c702"; }
+    { locale = "th"; arch = "linux-x86_64"; sha256 = "7a8784265237951140b62a219da144e2f5091cb1d75d8af3e5a4d3ebdc4a2d0e"; }
+    { locale = "tr"; arch = "linux-i686"; sha256 = "b623db840358f2275143f0748fb988c7088799ab55ce4570ce8e47fa891b2c98"; }
+    { locale = "tr"; arch = "linux-x86_64"; sha256 = "65f7883a2f03881949196c90ca2b3c13c374ccf51b749348a92040361671ace7"; }
+    { locale = "uk"; arch = "linux-i686"; sha256 = "8ce4cae2d1fd912b9fd4e440012fa4dad7a912f6c78d3349cfa2a4764f609a94"; }
+    { locale = "uk"; arch = "linux-x86_64"; sha256 = "53ac6bae5e8efbfc819df8f16eb9ebba2bce886db423743ac760c89dc48739a2"; }
+    { locale = "uz"; arch = "linux-i686"; sha256 = "22a5e05529c6a4fb6488bfcc1e0c2b2297e72e18a47464e8e8148f1dc94c639e"; }
+    { locale = "uz"; arch = "linux-x86_64"; sha256 = "8a3fa76e01715c602238bf0a5d31b8acb733d0efe9fbad390f6c2aa5d9e6ebb1"; }
+    { locale = "vi"; arch = "linux-i686"; sha256 = "453f93b065b5e4f66d549c8482ef31edbbef5d9a77fefb87b25808540d368dd0"; }
+    { locale = "vi"; arch = "linux-x86_64"; sha256 = "2965dbde06aa9207236b33636bec971dbd01f71f9b0d13681d991befec931242"; }
+    { locale = "xh"; arch = "linux-i686"; sha256 = "edfffe8ab6f446760f13d5351be2c8f4cb2db28e9f1d6b9bb80b1e8fca191b42"; }
+    { locale = "xh"; arch = "linux-x86_64"; sha256 = "ac3308380a60489a5965968215f7134fdb5e1f8586925fbb0c4d42cff940b794"; }
+    { locale = "zh-CN"; arch = "linux-i686"; sha256 = "8058ee0f3a6ab3d229ce1f34ed4c38cbdc53e05cf1bb1a06535b7c12e7d5570d"; }
+    { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "ea91bbd7af46d63996260a32737d55e191a2dce4827561ab1c60ade26ed4ca91"; }
+    { locale = "zh-TW"; arch = "linux-i686"; sha256 = "18e9090333dd6a174feb0bc98dc849e933dd806205ea62d7cf292d8a6b65a2ca"; }
+    { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "9dc786ddb1b87245c1fcc5e88e601a1b2680141c363336ae099d953405c2d6cb"; }
   ];
 }

From 0d5542bc8574eb48fb397880ac85db9a0b6c603c Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 3 Jan 2016 13:34:45 +0100
Subject: [PATCH 206/884] surf: 0.6 -> 0.7

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

diff --git a/pkgs/applications/misc/surf/default.nix b/pkgs/applications/misc/surf/default.nix
index 983fbde0c459..7bbe84847f25 100644
--- a/pkgs/applications/misc/surf/default.nix
+++ b/pkgs/applications/misc/surf/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "surf-${version}";
-  version="0.6";
+  version="0.7";
 
   src = fetchurl {
     url = "http://dl.suckless.org/surf/surf-${version}.tar.gz";
-    sha256 = "01b8hq8z2wd7ssym5bypx2b15mrs1lhgkrcgxf700kswxvxcrhgx";
+    sha256 = "0jj93izd8fizxfa6ln9w1h9bwki81sz5dhskh5x1rl34zd38aq4m";
   };
 
   buildInputs = [ gtk makeWrapper webkit gsettings_desktop_schemas pkgconfig glib libsoup ];
@@ -16,12 +16,10 @@ stdenv.mkDerivation rec {
 
   buildPhase = " make ";
 
-# `-lX11' to make sure libX11's store path is in the RPATH
+  # `-lX11' to make sure libX11's store path is in the RPATH
   NIX_LDFLAGS = "-lX11";
-  preConfigure = [ ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk'' ];
-  installPhase = ''
-    make PREFIX=/ DESTDIR=$out install
-  '';
+  preConfigure = ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk'';
+  installFlags = [ "PREFIX=/" "DESTDIR=$(out)" ];
 
   preFixup = ''
     wrapProgram "$out/bin/surf" \

From ee807863ee080ea2623dc5e2729940ccf5b43b4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 3 Jan 2016 15:17:21 +0100
Subject: [PATCH 207/884] system-config-printer: align attrname with pkgname

s/system_config_printer/system-config-printer/
---
 pkgs/desktops/kde-4.14/kdeutils/print-manager.nix | 4 ++--
 pkgs/top-level/all-packages.nix                   | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/kde-4.14/kdeutils/print-manager.nix b/pkgs/desktops/kde-4.14/kdeutils/print-manager.nix
index e786c8f70419..d12c261a728d 100644
--- a/pkgs/desktops/kde-4.14/kdeutils/print-manager.nix
+++ b/pkgs/desktops/kde-4.14/kdeutils/print-manager.nix
@@ -1,7 +1,7 @@
 { kde, kdelibs
-, pythonPackages, cups, pyqt4, pykde4, pycups, system_config_printer }:
+, pythonPackages, cups, pyqt4, pykde4, pycups, system-config-printer }:
 
-let s_c_p = system_config_printer.override { withGUI = false; }; in
+let s_c_p = system-config-printer.override { withGUI = false; }; in
 
 kde rec {
   buildInputs = [ kdelibs pythonPackages.python pythonPackages.wrapPython
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e50f2291041f..7d5de7b5697d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3192,7 +3192,7 @@ let
 
   sysbench = callPackage ../development/tools/misc/sysbench {};
 
-  system_config_printer = callPackage ../tools/misc/system-config-printer {
+  system-config-printer = callPackage ../tools/misc/system-config-printer {
     libxml2 = libxml2Python;
    };
 
@@ -15877,6 +15877,7 @@ aliases = with self; rec {
   signon = qt5.signon;  # added 2015-12-19
   speedtest_cli = speedtest-cli;  # added 2015-02-17
   sqliteInteractive = sqlite-interactive;  # added 2014-12-06
+  system_config_printer = system-config-printer;  # added 2016-01-03
   telepathy_qt5 = qt5.telepathy;  # added 2015-12-19
   x11 = xlibsWrapper; # added 2015-09
   xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09

From dc36c1b14c4ea4035a7f24c104d1c27d3f3c8dc7 Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Sat, 2 Jan 2016 05:17:06 +0800
Subject: [PATCH 208/884] xzgv: init at 0.9.1

---
 pkgs/applications/graphics/xzgv/default.nix   | 27 +++++++++++++++++++
 .../graphics/xzgv/fix-linker-paths.patch      | 25 +++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 54 insertions(+)
 create mode 100644 pkgs/applications/graphics/xzgv/default.nix
 create mode 100644 pkgs/applications/graphics/xzgv/fix-linker-paths.patch

diff --git a/pkgs/applications/graphics/xzgv/default.nix b/pkgs/applications/graphics/xzgv/default.nix
new file mode 100644
index 000000000000..053e1137e391
--- /dev/null
+++ b/pkgs/applications/graphics/xzgv/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, gtk, pkgconfig, texinfo }:
+
+stdenv.mkDerivation rec {
+  name = "xzgv-${version}";
+  version = "0.9.1";
+  src = fetchurl {
+    url = "mirror://sourceforge/xzgv/xzgv-${version}.tar.gz";
+    sha256 = "1rh432wnvzs434knzbda0fslhfx0gngryrrnqkfm6gwd2g5mxcph";
+  };
+  buildInputs = [ gtk pkgconfig texinfo ];
+  patches = [ ./fix-linker-paths.patch ];
+  postPatch = ''
+    substituteInPlace config.mk \
+      --replace /usr/local $out
+    substituteInPlace config.mk \
+      --replace "CFLAGS=-O2 -Wall" "CFLAGS=-Wall"
+    substituteInPlace Makefile \
+      --replace "all: src man" "all: src man info"
+  '';
+  meta = with stdenv.lib; {
+    homepage = http://sourceforge.net/projects/xzgv/;
+    description = "Picture viewer for X with a thumbnail-based selector";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.womfoo ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/graphics/xzgv/fix-linker-paths.patch b/pkgs/applications/graphics/xzgv/fix-linker-paths.patch
new file mode 100644
index 000000000000..c5b1ae0879b5
--- /dev/null
+++ b/pkgs/applications/graphics/xzgv/fix-linker-paths.patch
@@ -0,0 +1,25 @@
+taken from http://sourceforge.net/p/xzgv/code/53/tree//trunk/xzgv/src/Makefile?diff=514dada434309d2ec11f5eff:52
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -9,8 +9,10 @@
+ # This gets definitions for CC, CFLAGS, BINDIR etc.
+ include ../config.mk
+ 
+-CFLAGS+=`pkg-config --cflags gtk+-2.0` `pkg-config --cflags gdk-pixbuf-2.0`
+-LDFLAGS+=`pkg-config --libs gtk+-2.0` `pkg-config --libs gdk-pixbuf-2.0`
++CFLAGS+=`pkg-config --cflags gtk+-2.0` `pkg-config --cflags gdk-pixbuf-2.0` \
++	`pkg-config --cflags x11`
++LDFLAGS+=`pkg-config --libs gtk+-2.0` `pkg-config --libs gdk-pixbuf-2.0` \
++	`pkg-config --libs x11` -lm
+ 
+ all: xzgv
+ 
+@@ -23,7 +25,7 @@
+ 	backend.o
+ 
+ xzgv: $(OBJS)
+-	$(CC) $(LDFLAGS) -o xzgv $(OBJS)
++	$(CC) -o xzgv $(OBJS) $(LDFLAGS)
+ 
+ installdirs:
+ 	/bin/sh ../mkinstalldirs $(BINDIR)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7d5de7b5697d..02e0d1d2b0c3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13895,6 +13895,8 @@ let
     inherit (gnome) scrollkeeper libglade;
   };
 
+  xzgv = callPackage ../applications/graphics/xzgv { };
+
   yate = callPackage ../applications/misc/yate { };
 
   inherit (gnome3) yelp;

From f8da54d83d48c8974db8fe1220f953b74f1a5a8e Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 3 Jan 2016 14:19:23 +0100
Subject: [PATCH 209/884] surf: move to correct category

---
 .../applications/{misc => networking/browsers}/surf/default.nix | 0
 pkgs/top-level/all-packages.nix                                 | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/applications/{misc => networking/browsers}/surf/default.nix (100%)

diff --git a/pkgs/applications/misc/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix
similarity index 100%
rename from pkgs/applications/misc/surf/default.nix
rename to pkgs/applications/networking/browsers/surf/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7d5de7b5697d..c134d171abc3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13234,7 +13234,7 @@ let
 
   subunit = callPackage ../development/libraries/subunit { };
 
-  surf = callPackage ../applications/misc/surf {
+  surf = callPackage ../applications/networking/browsers/surf {
     webkit = webkitgtk2;
   };
 

From 13572ae8a376f87d8657348c9f307777ae8c5e3b Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 3 Jan 2016 15:27:08 +0100
Subject: [PATCH 210/884] parallel: 20151122 -> 20151222

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

diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index ca347cfe8425..7e8a8312f509 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, perl, makeWrapper, procps }:
 
 stdenv.mkDerivation rec {
-  name = "parallel-20151122";
+  name = "parallel-20151222";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "0phn9dlkqlq3cq468ypxbbn78bsjcin743pyvf8ip4qg6jz662jm";
+    sha256 = "03czpnsj77xxzqxzzr1b39ym9acn94hknzbilbh28v5q1wk7r4mf";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From d2508c859b60dbd4773104e1cc69f1951fc51f03 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 3 Jan 2016 15:39:52 +0100
Subject: [PATCH 211/884] viking: 1.6.1 -> 1.6.2

---
 pkgs/applications/misc/viking/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix
index 7616eddd16be..291f18d5965e 100644
--- a/pkgs/applications/misc/viking/default.nix
+++ b/pkgs/applications/misc/viking/default.nix
@@ -1,14 +1,14 @@
 { fetchurl, stdenv, makeWrapper, pkgconfig, intltool, gettext, gtk, expat, curl
 , gpsd, bc, file, gnome_doc_utils, libexif, libxml2, libxslt, scrollkeeper
-, docbook_xml_dtd_412, gexiv2, sqlite, gpsbabel }:
+, docbook_xml_dtd_412, gexiv2, sqlite, gpsbabel, expect }:
 
 stdenv.mkDerivation rec {
   name = "viking-${version}";
-  version = "1.6.1";
+  version = "1.6.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/viking/viking/viking-${version}.tar.bz2";
-    sha256 = "0ic445f85z1sdx1ifgcijn379m7amr5mcjpg10343972sam4rz1s";
+    sha256 = "09kq0sxs2czps0d6xzgkkp41746v44ip63m72qvfs7rsrnqj7qnz";
   };
 
   buildInputs = [ makeWrapper pkgconfig intltool gettext gtk expat curl gpsd bc file gnome_doc_utils
@@ -27,7 +27,8 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     wrapProgram $out/bin/viking \
-      --prefix PATH : "${gpsbabel}/bin"
+      --prefix PATH : "${gpsbabel}/bin" \
+      --prefix PATH : "${expect}/bin"
   '';
 
   meta = with stdenv.lib; {

From 42023e9a466bf68baefada544019eafd65772799 Mon Sep 17 00:00:00 2001
From: Matthew O'Gorman <mog@rldn.net>
Date: Sun, 3 Jan 2016 10:06:14 -0500
Subject: [PATCH 212/884] inspectrum: init at 20160103

---
 pkgs/applications/misc/inspectrum/default.nix | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/applications/misc/inspectrum/default.nix

diff --git a/pkgs/applications/misc/inspectrum/default.nix b/pkgs/applications/misc/inspectrum/default.nix
new file mode 100644
index 000000000000..1736581a30f1
--- /dev/null
+++ b/pkgs/applications/misc/inspectrum/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, pkgconfig, cmake, fftwFloat, qt5 }:
+
+stdenv.mkDerivation rec {
+  name = "inspectrum-${version}";
+  version = "20160103";
+
+  src = fetchFromGitHub {
+    owner = "miek";
+    repo = "inspectrum";
+    rev = "a60d711b46130d37b7c05074285558cd67a28820";
+    sha256 = "1q7izpyi7c9qszygiaq0zs3swihxlss3n52q7wx2jq97hdi2hmzy";
+  };
+
+  buildInputs = [ pkgconfig cmake qt5.qtbase fftwFloat ];
+  
+  meta = with stdenv.lib; {
+    description = "Tool for analysing captured signals from sdr receivers";
+    homepage = https://github.com/miek/inspectrum;
+    maintainers = with maintainers; [ mog ];
+    platforms = platforms.linux;
+    license = licenses.gpl3Plus;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 992719704608..1923973b9690 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12183,6 +12183,8 @@ let
     inherit (pythonPackages) lxml;
     lcms = lcms2;
   };
+  
+  inspectrum = callPackage ../applications/misc/inspectrum { };
 
   ion3 = callPackage ../applications/window-managers/ion-3 {
     lua = lua5;

From a40b413b04287e3556c5007a42cf80b3761ab556 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Sun, 3 Jan 2016 18:49:39 +0300
Subject: [PATCH 213/884] Revert "avidemux: 2.5.6 -> 2.6.9"

This reverts commit 170c8e08d321072eda4f892271085626d56a5493.
---
 pkgs/applications/video/avidemux/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix
index 89773be9adaf..485d8c54eb36 100644
--- a/pkgs/applications/video/avidemux/default.nix
+++ b/pkgs/applications/video/avidemux/default.nix
@@ -7,11 +7,11 @@ assert stdenv ? glibc;
 assert faacSupport -> faac != null;
 
 stdenv.mkDerivation {
-  name = "avidemux-2.6.9";
+  name = "avidemux-2.5.6";
 
   src = fetchurl {
-    url = mirror://sourceforge/avidemux/avidemux_2.6.9.tar.gz;
-    sha256 = "01jhgricd7m9hdhr22yrdjfrnl41zccm2yxw7gfb02mwcswvswy0";
+    url = mirror://sourceforge/avidemux/avidemux_2.5.6.tar.gz;
+    sha256 = "12wvxz0n2g85f079d8mdkkp2zm279d34m9v7qgcqndh48cn7znnn";
   };
 
   buildInputs = [ cmake pkgconfig libxml2 qt4 gtk gettext SDL libXv
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://fixounet.free.fr/avidemux/;
     description = "Free video editor designed for simple video editing tasks";
-    maintainers = with stdenv.lib.maintainers; [ viric jagajaga ];
+    maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; linux;
   };
 }

From 7ab894098a30b553588f5926ea5e84c1d6ed13bd Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 3 Jan 2016 17:26:11 +0100
Subject: [PATCH 214/884] mkcue: fetch source from debian

fixes #12102
---
 pkgs/tools/cd-dvd/mkcue/default.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/cd-dvd/mkcue/default.nix b/pkgs/tools/cd-dvd/mkcue/default.nix
index e1aa3cc18580..0a9d61e9da8e 100644
--- a/pkgs/tools/cd-dvd/mkcue/default.nix
+++ b/pkgs/tools/cd-dvd/mkcue/default.nix
@@ -1,13 +1,21 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "mkcue-1";
+  name = "mkcue-${version}";
+  version = "1";
 
   src = fetchurl {
-    url = "https://diplodocus.org/dist/audio/${name}.tar.bz2";
-    sha256 = "08md7si3frb8sjfqf3pm7qbrcvkbd10mzszlbydkxnyxdb530b04";
+    url = "http://http.debian.net/debian/pool/main/m/mkcue/mkcue_${version}.orig.tar.gz";
+    sha256 = "0rs897wp08z4hd904bjb5sl4lb8qxj82x5ayklr28bhg9pd5gbra";
   };
 
   preInstall = "mkdir -pv $out/bin";
   postInstall = "chmod -v +w $out/bin/mkcue";
+
+  meta = with stdenv.lib; {
+    description = "Generates CUE sheets from a CD TOC";
+    license = licenses.lgpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ pSub ];
+  };
 }

From a9b83b5643100dfe5d905c4f18aa8d4061e83e41 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 3 Jan 2016 19:34:37 +0200
Subject: [PATCH 215/884] i2c-tools: Fetch source from debian

lm-sensors.org has been down for a while now.
---
 pkgs/os-specific/linux/i2c-tools/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/i2c-tools/default.nix b/pkgs/os-specific/linux/i2c-tools/default.nix
index 5cac6069e727..7d2a5f795d91 100644
--- a/pkgs/os-specific/linux/i2c-tools/default.nix
+++ b/pkgs/os-specific/linux/i2c-tools/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "3.1.1";
 
   src = fetchurl {
-    url = "http://dl.lm-sensors.org/i2c-tools/releases/${name}.tar.bz2";
+    url = "http://http.debian.net/debian/pool/main/i/i2c-tools/i2c-tools_${version}.orig.tar.bz2";
     sha256 = "000pvg995qy1b15ks59gd0klri55hb33kqpg5czy84hw1pbdgm0l";
   };
 

From 642065e8d4a57ff8fbb6063ae7c092bef1c880bf Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 3 Jan 2016 17:41:52 +0100
Subject: [PATCH 216/884] checkstyle: 6.13 -> 6.14.1

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

diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix
index a9cf08c4c3e9..8341f1a5bd90 100644
--- a/pkgs/development/tools/analysis/checkstyle/default.nix
+++ b/pkgs/development/tools/analysis/checkstyle/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "6.13";
+  version = "6.14.1";
   name = "checkstyle-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/checkstyle/${name}-bin.tar.gz";
-    sha256 = "0k53kj0mx0shypagny134yrhkjgawzs5yixaxv87br52ablcqdvx";
+    sha256 = "1dcg7libqs797v6x5vdvvc44rqfvwcjh125wczy9v87nl8imc2l3";
   };
 
   installPhase = ''

From 18a53d6eda66d1619dcbc91b18cc74d97164a166 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 3 Jan 2016 19:41:37 +0100
Subject: [PATCH 217/884] disorderfs: 0.4.1 -> 0.4.2

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

diff --git a/pkgs/tools/filesystems/disorderfs/default.nix b/pkgs/tools/filesystems/disorderfs/default.nix
index 932f71233df0..d36187aef293 100644
--- a/pkgs/tools/filesystems/disorderfs/default.nix
+++ b/pkgs/tools/filesystems/disorderfs/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "disorderfs-${version}";
-  version = "0.4.1";
+  version = "0.4.2";
 
   src = fetchurl {
     url = "http://http.debian.net/debian/pool/main/d/disorderfs/disorderfs_${version}.orig.tar.gz";
-    sha256 = "1kiih49l3wi8nhybzrb0kn4aidhpy23s5h2grjwx8rwla5b4cja6";
+    sha256 = "1qr52lzynd5b5ancrn0g1ah95w7iikxgqsmixlacn2vlh8n9jym5";
   };
 
   nativeBuildInputs = [ pkgconfig asciidoc ];

From 340c8acfaf0f869184795c9a987a95f173e36cd1 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 3 Jan 2016 19:47:17 +0100
Subject: [PATCH 218/884] global: 6.5.1 -> 6.5.2

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

diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix
index 63b29fccd527..3b9eccb2ae65 100644
--- a/pkgs/development/tools/misc/global/default.nix
+++ b/pkgs/development/tools/misc/global/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "global-6.5.1";
+  name = "global-6.5.2";
 
   src = fetchurl {
     url = "mirror://gnu/global/${name}.tar.gz";
-    sha256 = "1y34nbazsw2p6r2jhv27z15qvm9mhy5xjchpz8pwps00shkm578f";
+    sha256 = "07qx3dbjwkbd1dn42qs7zgj77rxdj2psfrf7bx7yx9al38f87z60";
   };
 
   nativeBuildInputs = [ libtool makeWrapper ];

From fa51f981337840e55ec2ace88c10fb0bf0d040f3 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 3 Jan 2016 20:06:12 +0100
Subject: [PATCH 219/884] ceptre: 2015-11-20 -> 2016-01-01

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

diff --git a/pkgs/development/interpreters/ceptre/default.nix b/pkgs/development/interpreters/ceptre/default.nix
index 40ac4dc6ea32..4869859960ae 100644
--- a/pkgs/development/interpreters/ceptre/default.nix
+++ b/pkgs/development/interpreters/ceptre/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchgit, mlton }:
 
 stdenv.mkDerivation rec {
-  name = "ceptre-2015-11-20";
+  name = "ceptre-2016-01-01";
 
   src = fetchgit {
     url = https://github.com/chrisamaphone/interactive-lp;
-    rev = "adb59d980f903e49a63b668618241d1b8beb28be";
-    sha256 = "1pyl2imrvq2icr2rr4ys7djnizppbgqldgsv5525xsvzm78w3ac7";
+    rev = "b3d21489d4994f03d2982de273eea90bc7fba5d0";
+    sha256 = "01f72q435kmf3mkgnn47hlnv6k3i5kjb26pbjrwvysc6am33jlcb";
   };
 
   nativeBuildInputs = [ mlton ];

From 1799d134ba4e388d928ebb8b7c47661dd5eb6ca8 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 3 Jan 2016 20:32:59 +0100
Subject: [PATCH 220/884] fcitx-configtool: add icon theme, fixes #11895

---
 pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix
index 8bbd28f82a31..80abc5dd20cc 100644
--- a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix
+++ b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, cmake, fcitx, gtk3, isocodes }:
+{ stdenv, fetchurl, makeWrapper, pkgconfig, cmake, fcitx, gtk3, isocodes, gnome3 }:
 
 stdenv.mkDerivation rec {
   name = "fcitx-configtool-0.4.8";
@@ -15,6 +15,12 @@ stdenv.mkDerivation rec {
     sha256 = "1vaim0namw58bfafbvws1vgd4010p19zwqfbx6bd1zi5sgchdg0f";
   };
 
-  buildInputs = [ fcitx cmake isocodes pkgconfig gtk3 ];
+  buildInputs = [ makeWrapper fcitx cmake isocodes pkgconfig gtk3
+    gnome3.defaultIconTheme ];
+
+  preFixup = ''
+    wrapProgram $out/bin/fcitx-config-gtk3 \
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS";
+  '';
 }
 

From 82419575aa66135e83971f92896435d87f206b5a Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 3 Jan 2016 19:21:27 +0100
Subject: [PATCH 221/884] btrfsProgs -> canonical btrfs-progs

---
 nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix | 2 +-
 .../modules/installer/cd-dvd/system-tarball-sheevaplug.nix  | 2 +-
 nixos/modules/installer/tools/tools.nix                     | 2 +-
 nixos/modules/system/boot/loader/grub/grub.nix              | 2 +-
 nixos/modules/tasks/filesystems/btrfs.nix                   | 6 +++---
 nixos/modules/virtualisation/lxd.nix                        | 2 +-
 nixos/tests/partition.nix                                   | 2 +-
 pkgs/applications/virtualization/docker/default.nix         | 4 ++--
 .../filesystems/{btrfsprogs => btrfs-progs}/default.nix     | 0
 pkgs/tools/misc/snapper/default.nix                         | 4 ++--
 pkgs/top-level/all-packages.nix                             | 3 ++-
 pkgs/top-level/python-packages.nix                          | 2 +-
 12 files changed, 16 insertions(+), 15 deletions(-)
 rename pkgs/tools/filesystems/{btrfsprogs => btrfs-progs}/default.nix (100%)

diff --git a/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix b/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
index bbf0311c04d6..f0351d127183 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
@@ -74,7 +74,7 @@ in
 
       # Tools to create / manipulate filesystems.
       pkgs.ntfsprogs # for resizing NTFS partitions
-      pkgs.btrfsProgs
+      pkgs.btrfs-progs
       pkgs.jfsutils
 
       # Some compression/archiver tools.
diff --git a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
index 46dc1c705022..cdacc56f7ab9 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
@@ -67,7 +67,7 @@ in
       pkgs.dmraid
 
       # Tools to create / manipulate filesystems.
-      pkgs.btrfsProgs
+      pkgs.btrfs-progs
 
       # Some compression/archiver tools.
       pkgs.unzip
diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
index 04e4c1eb9459..9ac3b7a5b16f 100644
--- a/nixos/modules/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
@@ -38,7 +38,7 @@ let
   nixos-generate-config = makeProg {
     name = "nixos-generate-config";
     src = ./nixos-generate-config.pl;
-    path = [ pkgs.btrfsProgs ];
+    path = [ pkgs.btrfs-progs ];
     perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl";
     inherit (config.system) nixosRelease;
   };
diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index 47605e3685ca..c2bf5764804c 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -56,7 +56,7 @@ let
         extraEntriesBeforeNixOS extraPrepareConfig configurationLimit copyKernels timeout
         default fsIdentifier efiSupport gfxmodeEfi gfxmodeBios;
       path = (makeSearchPath "bin" ([
-        pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils pkgs.btrfsProgs
+        pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils pkgs.btrfs-progs
         pkgs.utillinux ] ++ (if cfg.efiSupport && (cfg.version == 2) then [pkgs.efibootmgr ] else [])
       )) + ":" + (makeSearchPath "sbin" [
         pkgs.mdadm pkgs.utillinux
diff --git a/nixos/modules/tasks/filesystems/btrfs.nix b/nixos/modules/tasks/filesystems/btrfs.nix
index 049f7708d739..2e5b34a3246e 100644
--- a/nixos/modules/tasks/filesystems/btrfs.nix
+++ b/nixos/modules/tasks/filesystems/btrfs.nix
@@ -11,13 +11,13 @@ in
 {
   config = mkIf (any (fs: fs == "btrfs") config.boot.supportedFilesystems) {
 
-    system.fsPackages = [ pkgs.btrfsProgs ];
+    system.fsPackages = [ pkgs.btrfs-progs ];
 
     boot.initrd.kernelModules = mkIf inInitrd [ "btrfs" "crc32c" ];
 
     boot.initrd.extraUtilsCommands = mkIf inInitrd
       ''
-        copy_bin_and_libs ${pkgs.btrfsProgs}/bin/btrfs
+        copy_bin_and_libs ${pkgs.btrfs-progs}/bin/btrfs
         ln -sv btrfs $out/bin/btrfsck
         ln -sv btrfsck $out/bin/fsck.btrfs
       '';
@@ -36,7 +36,7 @@ in
     # new devices are discovered.
     jobs.udev.postStart =
       ''
-        ${pkgs.btrfsProgs}/bin/btrfs device scan
+        ${pkgs.btrfs-progs}/bin/btrfs device scan
       '';
 
   };
diff --git a/nixos/modules/virtualisation/lxd.nix b/nixos/modules/virtualisation/lxd.nix
index 488153334bc1..845f14352f3d 100644
--- a/nixos/modules/virtualisation/lxd.nix
+++ b/nixos/modules/virtualisation/lxd.nix
@@ -45,7 +45,7 @@ in
         after = [ "systemd-udev-settle.service" ];
 
         # TODO(wkennington): Add lvm2 and thin-provisioning-tools
-        path = with pkgs; [ acl rsync gnutar xz btrfsProgs ];
+        path = with pkgs; [ acl rsync gnutar xz btrfs-progs ];
 
         serviceConfig.ExecStart = "@${pkgs.lxd}/bin/lxd lxd --syslog --group lxd";
         serviceConfig.Type = "simple";
diff --git a/nixos/tests/partition.nix b/nixos/tests/partition.nix
index 5e94b263d5b8..291d9b278d3b 100644
--- a/nixos/tests/partition.nix
+++ b/nixos/tests/partition.nix
@@ -68,7 +68,7 @@ in {
   machine = { config, pkgs, ... }: {
     environment.systemPackages = [
       pkgs.pythonPackages.nixpart0
-      pkgs.file pkgs.btrfsProgs pkgs.xfsprogs pkgs.lvm2
+      pkgs.file pkgs.btrfs-progs pkgs.xfsprogs pkgs.lvm2
     ];
     virtualisation.emptyDiskImages = [ 4096 4096 ];
   };
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 5a51749652d7..1d9b1737f652 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, makeWrapper
 , go, sqlite, iproute, bridge-utils, devicemapper
-, btrfsProgs, iptables, e2fsprogs, xz, utillinux
+, btrfs-progs, iptables, e2fsprogs, xz, utillinux
 , enableLxc ? false, lxc
 }:
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    makeWrapper go sqlite iproute bridge-utils devicemapper btrfsProgs
+    makeWrapper go sqlite iproute bridge-utils devicemapper btrfs-progs
     iptables e2fsprogs
   ];
 
diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix
similarity index 100%
rename from pkgs/tools/filesystems/btrfsprogs/default.nix
rename to pkgs/tools/filesystems/btrfs-progs/default.nix
diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix
index 0f28b15ea973..41a5a6797d14 100644
--- a/pkgs/tools/misc/snapper/default.nix
+++ b/pkgs/tools/misc/snapper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, autoconf, automake, boost, pkgconfig, libtool, acl, libxml2, btrfsProgs, dbus_libs, docbook_xsl, libxslt, docbook_xml_dtd_45,  diffutils, pam, utillinux, attr, gettext }:
+{ stdenv, fetchgit, autoconf, automake, boost, pkgconfig, libtool, acl, libxml2, btrfs-progs, dbus_libs, docbook_xsl, libxslt, docbook_xml_dtd_45,  diffutils, pam, utillinux, attr, gettext }:
 
 stdenv.mkDerivation rec {
   name = "snapper-0.2.4";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "ec4b829430bd7181995e66a26ac86e8ac71c27e77faf8eb06db71d645c6f859b";
   };
 
-  buildInputs = [ autoconf automake boost pkgconfig libtool acl libxml2 btrfsProgs dbus_libs docbook_xsl libxslt docbook_xml_dtd_45 diffutils pam utillinux attr gettext ];
+  buildInputs = [ autoconf automake boost pkgconfig libtool acl libxml2 btrfs-progs dbus_libs docbook_xsl libxslt docbook_xml_dtd_45 diffutils pam utillinux attr gettext ];
 
   patchPhase = ''
     # work around missing btrfs/version.h; otherwise, use "-DHAVE_BTRFS_VERSION_H"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a405d07b3270..731089c20b5c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -733,7 +733,7 @@ let
 
   bsod = callPackage ../misc/emulators/bsod { };
 
-  btrfsProgs = callPackage ../tools/filesystems/btrfsprogs { };
+  btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { };
 
   bwm_ng = callPackage ../tools/networking/bwm-ng { };
 
@@ -15894,6 +15894,7 @@ aliases = with self; rec {
   saneBackends = sane-backends; # added 2016-01-02
   saneBackendsGit = sane-backends-git; # added 2016-01-02
   saneFrontends = sane-frontends; # added 2016-01-02
+  btrfsProgs = btrfs-progs; # added 2016-01-03
 };
 
 tweakAlias = _n: alias: with lib;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 71980a33e2dc..f6da9a1d4f9d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1430,7 +1430,7 @@ in modules // {
       sha256 = "e61768fa19934bd176799f90bda3ea9f49a5def21fa2523a8e47df8a48e730e9";
     };
 
-    buildInputs = with self; [ pkgs.btrfsProgs ];
+    buildInputs = with self; [ pkgs.btrfs-progs ];
     propagatedBuildInputs = with self; [ contextlib2 pyxdg pycparser alembic ]
       ++ optionals (!isPyPy) [ cffi ];
 

From 6862e5c636a4626f2dcf380ad0a7593c437848d7 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 3 Jan 2016 20:35:12 +0100
Subject: [PATCH 222/884] dhcping: init at 1.2

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

diff --git a/pkgs/tools/networking/dhcping/default.nix b/pkgs/tools/networking/dhcping/default.nix
new file mode 100644
index 000000000000..53d87b2e3faf
--- /dev/null
+++ b/pkgs/tools/networking/dhcping/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl }:
+
+let version = "1.2"; in
+stdenv.mkDerivation {
+  name = "dhcping-${version}";
+
+  src = fetchurl {
+    sha256 = "0sk4sg3hn88n44dxikipf3ggfj3ixrp22asb7nry9p0bkfaqdvrj";
+    url = "http://www.mavetju.org/download/dhcping-${version}.tar.gz";
+  };
+
+  enableParallelBuilding = true;
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "Send DHCP request to find out if a DHCP server is running";
+    longDescription = ''
+      dhcping sends either a DHCPREQUEST or DHCPINFORM packet to the server
+      and waits for an answer. Then, if a DHCPREQUEST was send, it will send
+      a DHCPRELEASE back to the server.
+
+      This program should be installed setuid root or ran by root only, as it
+      requires the privileges to bind itself to port 68 (bootpc). Root
+      privileges are dropped as soon as the program has bound itself to that
+      port.
+    '';
+    homepage = http://www.mavetju.org/unix/general.php;
+    license = licenses.bsd2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+ }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 731089c20b5c..ffbcf390405e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1291,6 +1291,8 @@ let
 
   dhcpcd = callPackage ../tools/networking/dhcpcd { };
 
+  dhcping = callPackage ../tools/networking/dhcping { };
+
   di = callPackage ../tools/system/di { };
 
   diffoscope = callPackage ../tools/misc/diffoscope {

From 927f6f33e4c194158bab591101a1241195b30e92 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 3 Jan 2016 20:46:05 +0100
Subject: [PATCH 223/884] git-sweep: init at 0.1.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f6da9a1d4f9d..061f2683dc7e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8450,6 +8450,24 @@ in modules // {
     };
   };
 
+  git-sweep = buildPythonPackage rec {
+    name = "git-sweep-0.1.1";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/g/git-sweep/${name}.tar.gz";
+      sha256 = "1csp0zd049d643d409rfivbswwzrayb4i6gkypp5mc27fb1z2afd";
+    };
+
+    propagatedBuildInputs = with self; [ GitPython ];
+
+    meta = {
+      description = "A command-line tool that helps you clean up Git branches";
+      homepage = http://lab.arc90.com/2012/04/03/git-sweep/;
+      license = licenses.mit;
+      maintainers = with maintainers; [ pSub ];
+    };
+  };
+
   glances = buildPythonPackage rec {
     name = "glances-${version}";
     version = "2.4.2";

From 9cdf17e82239b230dbcafa3e4748221a0b677ff7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 3 Jan 2016 20:37:15 +0100
Subject: [PATCH 224/884] colord: fix use of /var

Currently the package is built with /var in $out/var. That fails when it
tries to create/write things at runtime (nix store is read-only).
Instead, tell it to use /var (global directory) and fixup the
installation phase so it doesn't touch /var (leave that for runtime).

This unbreaks the colord dbus service, which apparently is needed by
cups to create color profiles for printers.
---
 pkgs/tools/misc/colord/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix
index 40c9ddf8c946..3ba5a138e5a7 100644
--- a/pkgs/tools/misc/colord/default.nix
+++ b/pkgs/tools/misc/colord/default.nix
@@ -16,14 +16,20 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--with-udevrulesdir=$out/lib/udev/rules.d"
     "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
+    "--localstatedir=/var"
     "--disable-bash-completion"
   ];
 
+  # don't touch /var at install time, colord creates what it needs at runtime
+  postPatch = ''
+    sed -i -e "s|if test -w .*;|if false;|" src/Makefile.in
+    sed -i -e "s|if test -w .*;|if false;|" src/Makefile.am
+  '';
+
   buildInputs = [ glib polkit pkgconfig intltool gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection
                   bashCompletion argyllcms automake autoconf libgudev ];
 
   postInstall = ''
-    rm -fr $out/var/lib/colord
     mkdir -p $out/etc/bash_completion.d
     cp -v data/colormgr $out/etc/bash_completion.d
   '';

From 45f2447bd200b2334e0b4810e9e0478519d6a576 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 3 Jan 2016 12:18:48 +0100
Subject: [PATCH 225/884] skrooge: 1.10.0 -> 1.12.5

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

diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix
index 712725f52753..b0d7f1399376 100644
--- a/pkgs/applications/office/skrooge/default.nix
+++ b/pkgs/applications/office/skrooge/default.nix
@@ -2,11 +2,11 @@
 , libxslt, kdelibs, kdepimlibs, grantlee, qjson, qca2, libofx, sqlite, boost }:
 
 stdenv.mkDerivation rec {
-  name = "skrooge-1.10.0";
+  name = "skrooge-1.12.5";
 
   src = fetchurl {
-    url = "http://download.kde.org/stable/skrooge/${name}.tar.bz2";
-    sha256 = "0rsw2xdgws5bvnf3h4hg16liahigcxgaxls7f8hzr9wipxx5xqda";
+    url = "http://download.kde.org/stable/skrooge/${name}.tar.xz";
+    sha256 = "1mnkm0367knh0a65gifr20p42ql9zndw7d6kmbvfshvpfsmghl40";
   };
 
   buildInputs = [ libxslt kdelibs kdepimlibs grantlee qjson qca2 libofx sqlite boost ];

From 44f5980a43bf0e8a4d1c33c1f1a5c7bd4a07cab4 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Sun, 3 Jan 2016 20:28:03 +0000
Subject: [PATCH 226/884] orc: update from 0.4.23 to 0.4.24

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

diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix
index 3b8916c67e90..d60ad0d11ec9 100644
--- a/pkgs/development/compilers/orc/default.nix
+++ b/pkgs/development/compilers/orc/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "orc-0.4.23";
+  name = "orc-0.4.24";
 
   src = fetchurl {
     url = "http://gstreamer.freedesktop.org/src/orc/${name}.tar.xz";
-    sha256 = "1ryz1gfgrxcj806cakcblxf0bcwq8p2mw8k86fs3f5wlwayawzkn";
+    sha256 = "16ykgdrgxr6pfpy931p979cs68klvwmk3ii1k0a00wr4nn9x931k";
   };
 
   outputs = [ "out" "doc" ];

From 8a5421da5058e210b76ec73201176498d2f4d5bb Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Sun, 3 Jan 2016 20:28:27 +0000
Subject: [PATCH 227/884] babeld: update from 1.5.1 to 1.6.1

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

diff --git a/pkgs/tools/networking/babeld/default.nix b/pkgs/tools/networking/babeld/default.nix
index c10da6f145d3..7af9aa901a83 100644
--- a/pkgs/tools/networking/babeld/default.nix
+++ b/pkgs/tools/networking/babeld/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "babeld-1.5.1";
+  name = "babeld-1.6.1";
 
   src = fetchurl {
     url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/${name}.tar.gz";
-    sha256 = "1ch9nn2jmmpyq6c7106lzd3cfnxq4ychjx0pvwn960kssn2cgakk";
+    sha256 = "1d45f12mhlxsf8jlpgb1gig5bjg5izdkfk173rd9a1wi7s82pisl";
   };
 
   preBuild = ''

From f5184406afcc6976719db22eab292c3a7d3d22d1 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Sun, 3 Jan 2016 20:28:38 +0000
Subject: [PATCH 228/884] cantarell_fonts: update from 0.0.16 to 0.0.17

---
 pkgs/data/fonts/cantarell-fonts/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/fonts/cantarell-fonts/default.nix b/pkgs/data/fonts/cantarell-fonts/default.nix
index f6b62623c4a1..34434f601720 100644
--- a/pkgs/data/fonts/cantarell-fonts/default.nix
+++ b/pkgs/data/fonts/cantarell-fonts/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation {
-  name = "cantarell-fonts-0.0.16";
+  name = "cantarell-fonts-0.0.17";
 
   src = fetchurl {
-    url = mirror://gnome/sources/cantarell-fonts/0.0/cantarell-fonts-0.0.16.tar.xz;
-    sha256 = "071g2l89gdjgqhapw9dbm1ch6hnzydhf7b38pi86fm91adaqggqm";
+    url = mirror://gnome/sources/cantarell-fonts/0.0/cantarell-fonts-0.0.17.tar.xz;
+    sha256 = "0kx05fw1i11zcqx5yv9y9iprpl49k51sibz86bc58a50n1w6gcwn";
   };
 
   meta = {

From 257fad9732e59fc9049e7d221c3e5f343c63840e Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Sun, 3 Jan 2016 20:28:51 +0000
Subject: [PATCH 229/884] enet: update from 1.3.12 to 1.3.13

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

diff --git a/pkgs/development/libraries/enet/default.nix b/pkgs/development/libraries/enet/default.nix
index 5c029adbf841..0d5bd8347870 100644
--- a/pkgs/development/libraries/enet/default.nix
+++ b/pkgs/development/libraries/enet/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "enet-1.3.12";
+  name = "enet-1.3.13";
 
   src = fetchurl {
     url = "http://enet.bespin.org/download/${name}.tar.gz";
-    sha256 = "02qxgsn20m306hg3pklfa35mjlc2fqcsd1x4pi3xnbfy1nyir1d5";
+    sha256 = "0p53mnmjbm56wizwraznynx13fcibcxiqny110dp6a5a3w174q73";
   };
 
   meta = {

From 508c0f15a348bde4f4cf5beafc17d9956fa3e9aa Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Sun, 3 Jan 2016 20:29:04 +0000
Subject: [PATCH 230/884] ffms: update from 2.20 to 2.21

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

diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix
index 6f78c198f404..faf38ff4295d 100644
--- a/pkgs/development/libraries/ffms/default.nix
+++ b/pkgs/development/libraries/ffms/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, zlib, ffmpeg, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "ffms-2.20";
+  name = "ffms-2.21";
 
   src = fetchurl {
-    url = https://codeload.github.com/FFMS/ffms2/tar.gz/2.20;
+    url = https://codeload.github.com/FFMS/ffms2/tar.gz/2.21;
     name = "${name}.tar.gz";
-    sha256 = "183klnhl57zf0i8xlr7yvj89ih83pzd48c37qpr57hjn4wbq1n67";
+    sha256 = "00h2a5yhvr1qzbrzwbjv1ybxrx25lchgral6yxv36aaf4pi3rhn2";
   };
 
   NIX_CFLAGS_COMPILE = "-fPIC";

From 9f37e00617695cebbb0e42d390f7551afcf8e9e1 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Sun, 3 Jan 2016 20:29:16 +0000
Subject: [PATCH 231/884] flpsed: update from 0.7.2 to 0.7.3

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

diff --git a/pkgs/applications/editors/flpsed/default.nix b/pkgs/applications/editors/flpsed/default.nix
index 640b06d28071..eb1daa3ac3b2 100644
--- a/pkgs/applications/editors/flpsed/default.nix
+++ b/pkgs/applications/editors/flpsed/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, fltk13, ghostscript}:
 
 stdenv.mkDerivation {
-  name = "flpsed-0.7.2";
+  name = "flpsed-0.7.3";
 
   src = fetchurl {
-    url = "http://www.ecademix.com/JohannesHofmann/flpsed-0.7.2.tar.gz";
-    sha256 = "1132nlganr6x4f4lzcp9l0xihg2ky1l7xk8vq7r2l2qxs97vbif8";
+    url = "http://www.ecademix.com/JohannesHofmann/flpsed-0.7.3.tar.gz";
+    sha256 = "0vngqxanykicabhfdznisv82k5ypkxwg0s93ms9ribvhpm8vf2xp";
   };
 
   buildInputs = [ fltk13 ghostscript ];

From 8958cf6d846d889504f258e64702754168aaf5c5 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Sun, 3 Jan 2016 20:30:23 +0000
Subject: [PATCH 232/884] gloox: update from 1.0.13 to 1.0.14

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

diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/development/libraries/gloox/default.nix
index 9723bf90eb03..6d43ea9a3091 100644
--- a/pkgs/development/libraries/gloox/default.nix
+++ b/pkgs/development/libraries/gloox/default.nix
@@ -9,14 +9,14 @@ assert sslSupport -> openssl != null;
 assert idnSupport -> libidn != null;
 
 let
-  version = "1.0.13";
+  version = "1.0.14";
 in
 stdenv.mkDerivation rec {
   name = "gloox-${version}";
 
   src = fetchurl {
     url = "http://camaya.net/download/gloox-${version}.tar.bz2";
-    sha256 = "12payqyx1ly8nm3qn24bj0kyy9d08sixnjqxw7fn6rbwr7m1x7sd";
+    sha256 = "0h9r4382qv0vqc91x1qz1nivxw1r2l874s1kl0bskzm9dyk742sj";
   };
 
   buildInputs = [ ]

From 265f2b6e767a22831a536b21cec6d16eaa89df8d Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Sun, 3 Jan 2016 20:31:07 +0000
Subject: [PATCH 233/884] imapfilter: update from 2.5.7 to 2.6.3

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

diff --git a/pkgs/applications/networking/mailreaders/imapfilter.nix b/pkgs/applications/networking/mailreaders/imapfilter.nix
index d7aff753e237..1aa30ddcb67e 100644
--- a/pkgs/applications/networking/mailreaders/imapfilter.nix
+++ b/pkgs/applications/networking/mailreaders/imapfilter.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl, lua, pcre }:
 
 stdenv.mkDerivation rec {
-  name = "imapfilter-2.5.7";
+  name = "imapfilter-2.6.3";
 
   src = fetchurl {
-    url = "https://github.com/lefcha/imapfilter/archive/v2.5.7.tar.gz";
-    sha256 = "1l7sg7pyw1i8cxqnyb5xv983fakj8mxq6w44qd7w3kc7l6ixd4n7";
+    url = "https://github.com/lefcha/imapfilter/archive/v2.6.3.tar.gz";
+    sha256 = "0i6j9ilzh43b9gyqs3y3rv0d9yvbbg12gcbqbar9i92wdlnqcx0i";
   };
 
   makeFlagsArray = "PREFIX=$(out)";

From 1c837144f711414082383e9e1a82fc53f5cfadf8 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Sun, 3 Jan 2016 20:31:29 +0000
Subject: [PATCH 234/884] mkvtoolnix-cli: update from 8.3.0 to 8.4.0

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

diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index ed02850730c8..cda861497e12 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -18,11 +18,11 @@ assert legacyGUI -> wxGTK != null;
 
 stdenv.mkDerivation rec {
   name = "mkvtoolnix-${version}";
-  version = "8.3.0";
+  version = "8.4.0";
 
   src = fetchurl {
     url = "http://www.bunkus.org/videotools/mkvtoolnix/sources/${name}.tar.xz";
-    sha256 = "0dzwmwa76y4nhb5brp5a1kxgxjr71czd8vj218qmrlwm54i85gc7";
+    sha256 = "0y7qm8q9vpvjiw7b69k9140pw9nhvs6ggmk56yxnmcd02inm19gn";
   };
 
   patchPhase = ''

From 666c6a0d6a36da5b5134b43f81acccb5e308ddf8 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Sun, 3 Jan 2016 20:32:17 +0000
Subject: [PATCH 235/884] snd: update from 15.4 to 15.9

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

diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix
index 6048ff88c35a..8abf7cea6eb0 100644
--- a/pkgs/applications/audio/snd/default.nix
+++ b/pkgs/applications/audio/snd/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "snd-15.4";
+  name = "snd-15.9";
 
   src = fetchurl {
     url = "mirror://sourceforge/snd/${name}.tar.gz";
-    sha256 = "1dari02ind445h5hpb6dhi0kix1vmlk64lyxwv1zrqagw3ajmpwh";
+    sha256 = "0hs9ailgaphgyi3smnrpwksvdww85aa7szqgi6l6d2jwfx9g4bhd";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From ce662d1f6427a2e7702a1e818f0c27e4c8ba7925 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Sun, 3 Jan 2016 20:36:47 +0000
Subject: [PATCH 236/884] sxiv: update to v1.3.2

---
 pkgs/applications/graphics/sxiv/default.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix
index 45813bbdb204..fe8911273ded 100644
--- a/pkgs/applications/graphics/sxiv/default.nix
+++ b/pkgs/applications/graphics/sxiv/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchgit, libX11, imlib2, giflib, libexif }:
+{ stdenv, fetchFromGitHub, libX11, imlib2, giflib, libexif }:
 
-stdenv.mkDerivation {
-  name = "sxiv-2015.03.25";
-
-  src = fetchgit {
-    url = "https://github.com/muennich/sxiv.git";
-    rev = "01ed483b50f506fcba928af43e2ca017897e7c77";
-    sha256 = "18s64l3dvibqg9biznzy4mdkkn9qmmpqxpdx7ljx7c0832aqy94k";
+stdenv.mkDerivation rec {
+  name = "sxiv-${version}";
+  version = "v1.3.2";
+  #https://github.com/muennich/sxiv/archive/v1.3.2.zip
+  src = fetchFromGitHub {
+    owner = "muennich";
+    repo = "sxiv";
+    rev = version;
+    sha256 = "1f4gz1qjhb44bbb3q5fqk439zyipkwnr19zhg89yq2pgmzzzqr2h";
   };
 
   postUnpack = ''

From 268f3353e62040c5ee968695524c6f5079757be1 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Sun, 3 Jan 2016 20:38:24 +0000
Subject: [PATCH 237/884] mpd: 0.19.11 -> 0.19.12

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

diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index b672083340eb..cce893d17eed 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -29,13 +29,13 @@ let
   opt = stdenv.lib.optional;
   mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}";
   major = "0.19";
-  minor = "11";
+  minor = "12";
 
 in stdenv.mkDerivation rec {
   name = "mpd-${major}.${minor}";
   src = fetchurl {
     url    = "http://www.musicpd.org/download/mpd/${major}/${name}.tar.xz";
-    sha256 = "1iin50s8cnlsgjgjwkm1cbyxlwa0b79f6jfwydx5nyprbam6cp3s";
+    sha256 = "0xg8w5vn6xd0yfw55qj6wnav7v14nmr00s3d4w5gixbjrv3ycvvv";
   };
 
   buildInputs = [ pkgconfig glib boost ]

From 1e630749d8c17525015ab2f929edeebeaab3a611 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Sun, 3 Jan 2016 20:50:26 +0000
Subject: [PATCH 238/884] youtube-dl: 2015.11.24 -> 2016.01.01

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

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 6080f38a8019..cdd213b0eba5 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
 
   src = fetchurl {
     url = "http://yt-dl.org/downloads/${meta.version}/${name}.tar.gz";
-    sha256 = "cceeb606e723c0291de85eecb9a551ca887f3be4db786ad621011a9201a482b1";
+    sha256 = "0b0pk8h2iswdiyf65c0zcwcad9dm2hid67fnfafj7d3ikp4kfbvk";
   };
 
   buildInputs = [ makeWrapper zip pandoc ];
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     ''wrapProgram $out/bin/youtube-dl --prefix PATH : "${ffmpeg}/bin"'';
 
   meta = with stdenv.lib; {
-    version = "2015.11.24";
+    version = "2016.01.01";
     homepage = http://rg3.github.io/youtube-dl/;
     repositories.git = https://github.com/rg3/youtube-dl.git;
     description = "Command-line tool to download videos from YouTube.com and other sites";

From 95e823d4d48e135bf1c5d3482577f31095503c20 Mon Sep 17 00:00:00 2001
From: Alexey Shmalko <rasen.dubi@gmail.com>
Date: Sun, 3 Jan 2016 07:03:14 +0200
Subject: [PATCH 239/884] xxkb: Init at 1.11.1

---
 pkgs/applications/misc/xxkb/default.nix | 37 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/applications/misc/xxkb/default.nix

diff --git a/pkgs/applications/misc/xxkb/default.nix b/pkgs/applications/misc/xxkb/default.nix
new file mode 100644
index 000000000000..8d46738327ff
--- /dev/null
+++ b/pkgs/applications/misc/xxkb/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, libX11, libXt, libXext, libXpm, imake
+, svgSupport ? true, librsvg, glib, gdk_pixbuf, pkgconfig
+}:
+
+assert svgSupport ->
+  librsvg != null && glib != null && gdk_pixbuf != null && pkgconfig != null;
+
+stdenv.mkDerivation rec {
+  name = "xxkb-1.11.1";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/xxkb/${name}-src.tar.gz";
+    sha256 = "0hl1i38z9xnbgfjkaz04vv1n8xbgfg88g5z8fyzyb2hxv2z37anf";
+  };
+
+  buildInputs = [
+    imake
+    libX11 libXt libXext libXpm
+  ] ++ stdenv.lib.optional svgSupport [ librsvg glib gdk_pixbuf pkgconfig ];
+
+  configurePhase = ''
+    xmkmf ${stdenv.lib.optionalString svgSupport "-DWITH_SVG_SUPPORT"}
+  '';
+
+  preBuild = ''
+    makeFlagsArray=( BINDIR=$out/bin PIXMAPDIR=$out/share/xxkb XAPPLOADDIR=$out/etc/X11/app-defaults MANDIR=$out/man )
+  '';
+
+  installTargets = "install install.man";
+
+  meta = {
+    description = "A keyboard layout indicator and switcher";
+    homepage = "http://xxkb.sourceforge.net/";
+    license = stdenv.lib.licenses.artistic2;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3b3c64b64460..ba8497aa101b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3523,6 +3523,8 @@ let
 
   xcruiser = callPackage ../applications/misc/xcruiser { };
 
+  xxkb = callPackage ../applications/misc/xxkb { };
+
   unarj = callPackage ../tools/archivers/unarj { };
 
   unshield = callPackage ../tools/archivers/unshield { };

From 7526a1d54227308125d9079153b2ebfb1456494b Mon Sep 17 00:00:00 2001
From: devhell <^@regexmail.net>
Date: Sun, 3 Jan 2016 22:12:38 +0000
Subject: [PATCH 240/884] {lib}mediainfo{-gui}: 0.7.80 -> 0.7.81

Built and run locally.

From the Changelog:
```
Version 0.7.81, 2015-12-31

+ Acquisition Metadata: support of all SMPTE RDD18 elements
+ Matroska: cover presence and content of the cover, thanks to Max Pozdeev
+ #F446, Matroska: Handling of cropping values, thanks to Max Pozdeev
+ Improvement of Python binding: Mac Os X support, Python2 and Python3
  can use same MediaInfoDLL.py
+ #F484, AVI: OpenDML Interlaced / Progressive scan type detection
+ MP4: support of AtomicParsley imdb tag
x #B959, MPEG-TS: MPEG-1 Video appeared as MPEG-2 Video
x #B914, Matroska: Undefined number of chapters in some M4V with Timed
  Text, thanks to Max Pozdeev
x #B962, Matroska: negative timecodes were not correctly handled
x #B964, FLV: was hanging trying to open some FLV files
x JPEG in AVI or MOV: better handling of buggy APP0/AVI1, avoiding some
  false positives about interlacement
x DVCPRO HD: some containers consider DVCPRO HD as with width 1920
  despite the fact it is 1280 or 1440, using 1280 or 1440 in all cases
```
---
 pkgs/applications/misc/mediainfo-gui/default.nix    | 4 ++--
 pkgs/applications/misc/mediainfo/default.nix        | 4 ++--
 pkgs/development/libraries/libmediainfo/default.nix | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix
index 9bed20c0c736..687584de553d 100644
--- a/pkgs/applications/misc/mediainfo-gui/default.nix
+++ b/pkgs/applications/misc/mediainfo-gui/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, wxGTK, desktop_file_utils, libSM, imagemagick }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.80";
+  version = "0.7.81";
   name = "mediainfo-gui-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
-    sha256 = "12iwiw4vcmyi8l04j540kbqifmr1wnlfw5cway185iqia43s6c10";
+    sha256 = "1aah8y4kqhghqhcfm6ydgf3hj6q05dllfh0m1lbaij0y8yrrwz07";
   };
 
   buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo wxGTK desktop_file_utils libSM imagemagick ];
diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix
index 40531ea58a14..7c573ad5753f 100644
--- a/pkgs/applications/misc/mediainfo/default.nix
+++ b/pkgs/applications/misc/mediainfo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.80";
+  version = "0.7.81";
   name = "mediainfo-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
-    sha256 = "12iwiw4vcmyi8l04j540kbqifmr1wnlfw5cway185iqia43s6c10";
+    sha256 = "1aah8y4kqhghqhcfm6ydgf3hj6q05dllfh0m1lbaij0y8yrrwz07";
   };
 
   buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo zlib ];
diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix
index 5fbc6bb1dbf0..19d0b84f69e3 100644
--- a/pkgs/development/libraries/libmediainfo/default.nix
+++ b/pkgs/development/libraries/libmediainfo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.80";
+  version = "0.7.81";
   name = "libmediainfo-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
-    sha256 = "0v9px37qx0dkx67gqwi1rd9x4m7zm1ml8sdj5fx0isj6qymbd1z5";
+    sha256 = "0hzfrg7n7wlnwq28hmpxczis1k8x73wbwlsmfkshvqcwi7lva0cs";
   };
 
   buildInputs = [ automake autoconf libtool pkgconfig libzen zlib ];

From 2371acdeb27a5b67567027f47e4bc23b1fa3a793 Mon Sep 17 00:00:00 2001
From: Radvendii <taeer@necsi.edu>
Date: Sun, 3 Jan 2016 16:27:00 -0500
Subject: [PATCH 241/884] tldr: init at 1.0

added tldr to all-packages.nix

cleaned up style

added metadata

semicolons

didn't test on mac. removed platform

wrong types

fixed duplication of version
---
 lib/maintainers.nix              |  1 +
 pkgs/tools/misc/tldr/default.nix | 37 ++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix  |  2 ++
 3 files changed, 40 insertions(+)
 create mode 100644 pkgs/tools/misc/tldr/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 7a9f1de0a84c..9a8e1d685ddb 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -294,6 +294,7 @@
   steveej = "Stefan Junker <mail@stefanjunker.de>";
   szczyp = "Szczyp <qb@szczyp.com>";
   sztupi = "Attila Sztupak <attila.sztupak@gmail.com>";
+  taeer = "Taeer Bar-Yam <taeer@necsi.edu>";
   tailhook = "Paul Colomiets <paul@colomiets.name>";
   taktoa = "Remy Goldschmidt <taktoa@gmail.com>";
   telotortium = "Robert Irelan <rirelan@gmail.com>";
diff --git a/pkgs/tools/misc/tldr/default.nix b/pkgs/tools/misc/tldr/default.nix
new file mode 100644
index 000000000000..49c2736095e4
--- /dev/null
+++ b/pkgs/tools/misc/tldr/default.nix
@@ -0,0 +1,37 @@
+{stdenv, clang, fetchurl, curl}:
+
+with stdenv.lib;
+
+let version = "1.0"; in
+stdenv.mkDerivation {
+  name = "tldr-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/tldr-pages/tldr-cpp-client/archive/v${version}.tar.gz";
+    sha256 = "11k2pc4vfhx9q3cfd1145sdwhis9g0zhw4qnrv7s7mqnslzrrkgw";
+  };
+
+  meta = {
+    inherit version;
+    description = "Simplified and community-driven man pages";
+    longDescription = ''
+      tldr pages gives common use cases for commands, so you don't need to hunt through a man page for the correct flags.
+    '';
+    homepage = http://tldr-pages.github.io;
+    license = licenses.mit;
+    maintainers = [maintainers.taeer];
+    platforms = platforms.linux;
+
+  };
+
+  buildInputs = [curl clang];
+
+  preBuild = ''
+    cd src
+  '';
+
+  installPhase = ''
+    install -d $prefix/bin
+    install tldr $prefix/bin
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ffbcf390405e..25e65c43119e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3255,6 +3255,8 @@ let
 
   tlsdate = callPackage ../tools/networking/tlsdate { };
 
+  tldr = callPackage ../tools/misc/tldr { };
+
   tmate = callPackage ../tools/misc/tmate { };
 
   tmpwatch = callPackage ../tools/misc/tmpwatch  { };

From 9f3889a9a5a78bf373a09c8444ecc408745a71ea Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <bstaffin@fitbit.com>
Date: Sun, 3 Jan 2016 15:49:09 -0800
Subject: [PATCH 242/884] cdparanoia: fix Darwin build

Fixes #12116
---
 pkgs/applications/audio/cdparanoia/default.nix | 9 +++++++--
 pkgs/top-level/all-packages.nix                | 5 ++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix
index 25cc33d6cb8a..1658d9c7449b 100644
--- a/pkgs/applications/audio/cdparanoia/default.nix
+++ b/pkgs/applications/audio/cdparanoia/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, IOKit, Carbon }:
 
 stdenv.mkDerivation rec {
   name = "cdparanoia-III-10.2";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = "unset CC";
 
-  patches = stdenv.lib.optionals stdenv.isDarwin [ 
+  patches = stdenv.lib.optionals stdenv.isDarwin [
     (fetchurl {
       url = "https://trac.macports.org/export/70964/trunk/dports/audio/cdparanoia/files/osx_interface.patch";
       sha1 = "c86e573f51e6d58d5f349b22802a7a7eeece9fcd";
@@ -21,6 +21,11 @@ stdenv.mkDerivation rec {
     })
   ];
 
+  buildInputs = stdenv.lib.optional stdenv.isDarwin [
+    Carbon
+    IOKit
+  ];
+
   meta = {
     homepage = http://xiph.org/paranoia;
     description = "A tool and library for reading digital audio from CDs";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 25e65c43119e..abd23842879a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11222,7 +11222,10 @@ let
 
   cdparanoia = cdparanoiaIII;
 
-  cdparanoiaIII = callPackage ../applications/audio/cdparanoia { };
+  cdparanoiaIII = callPackage ../applications/audio/cdparanoia {
+    inherit (darwin) IOKit;
+    inherit (darwin.apple_sdk.frameworks) Carbon;
+  };
 
   cdrtools = callPackage ../applications/misc/cdrtools { };
 

From 2a469c4075bb56fedb755f1925cda752cd2f974a Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <bstaffin@fitbit.com>
Date: Sun, 3 Jan 2016 15:52:21 -0800
Subject: [PATCH 243/884] psutil: fix Darwin build

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 061f2683dc7e..447b9ef7a606 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14187,6 +14187,8 @@ in modules // {
     # failed tests: https://code.google.com/p/psutil/issues/detail?id=434
     doCheck = false;
 
+    buildInputs = optional stdenv.isDarwin pkgs.darwin.IOKit;
+
     meta = {
       description = "Process and system utilization information interface for python";
       homepage = http://code.google.com/p/psutil/;

From e81ae8e5a053a37bde64753bffa6b1a60984b7e3 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sun, 3 Jan 2016 20:28:34 -0500
Subject: [PATCH 244/884] native-darwin-cctools-wrapper: kill it

Nothing uses it anymore
---
 .../native-darwin-cctools-wrapper/builder.sh     | 16 ----------------
 .../native-darwin-cctools-wrapper/default.nix    | 15 ---------------
 2 files changed, 31 deletions(-)
 delete mode 100644 pkgs/build-support/native-darwin-cctools-wrapper/builder.sh
 delete mode 100644 pkgs/build-support/native-darwin-cctools-wrapper/default.nix

diff --git a/pkgs/build-support/native-darwin-cctools-wrapper/builder.sh b/pkgs/build-support/native-darwin-cctools-wrapper/builder.sh
deleted file mode 100644
index f412ee7caf09..000000000000
--- a/pkgs/build-support/native-darwin-cctools-wrapper/builder.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-source $stdenv/setup
-
-mkdir -p $out/bin
-for i in $binaries
-do 
-    ln -s "/usr/bin/$i" "$out/bin/"
-done
-
-# MIG assumes the standard Darwin core utilities (e.g., `rm -d'), so
-# let it see the impure directories.
-cat > "$out/bin/mig" <<EOF
-#!/bin/sh
-export PATH="/usr/bin:/bin:\$PATH"
-exec /usr/bin/mig "\$@"
-EOF
-chmod +x "$out/bin/mig"
diff --git a/pkgs/build-support/native-darwin-cctools-wrapper/default.nix b/pkgs/build-support/native-darwin-cctools-wrapper/default.nix
deleted file mode 100644
index 8fed8183ec56..000000000000
--- a/pkgs/build-support/native-darwin-cctools-wrapper/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{stdenv}:
-
-stdenv.mkDerivation {
-  name = "native-darwin-cctools-wrapper";
-
-  # Standard binaries normally found under /usr/bin (MIG is omitted here, and
-  # handled specially in ./builder.sh).
-  binaries =
-    [ "ar" "as" "c++filt" "gprof" "ld" "nm" "nmedit" "ranlib"
-      "size" "strings" "strip" "dsymutil" "libtool" "lipo"
-      "install_name_tool" "arch" "sw_vers"
-    ];
-
-  builder = ./builder.sh;
-}

From 01b0b3cec0139cc47acca8109fdb4bdbd1734c45 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sun, 3 Jan 2016 21:06:24 -0500
Subject: [PATCH 245/884] stdenv-darwin: kill old impure Darwin stdenv

I'll be moving the other one over it next commit (I split it into two to
improve git's rename detection)
---
 pkgs/stdenv/darwin/default.nix               | 149 ----------
 pkgs/stdenv/darwin/make-bootstrap-tools.nix  | 284 -------------------
 pkgs/stdenv/darwin/trivial-bootstrap.sh      |  67 -----
 pkgs/stdenv/darwin/unpack-bootstrap-tools.sh |  54 ----
 pkgs/stdenv/default.nix                      |   3 -
 5 files changed, 557 deletions(-)
 delete mode 100644 pkgs/stdenv/darwin/default.nix
 delete mode 100644 pkgs/stdenv/darwin/make-bootstrap-tools.nix
 delete mode 100644 pkgs/stdenv/darwin/trivial-bootstrap.sh
 delete mode 100644 pkgs/stdenv/darwin/unpack-bootstrap-tools.sh

diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
deleted file mode 100644
index c56349845329..000000000000
--- a/pkgs/stdenv/darwin/default.nix
+++ /dev/null
@@ -1,149 +0,0 @@
-{ system      ? builtins.currentSystem
-, allPackages ? import ../../top-level/all-packages.nix
-, platform    ? null
-, config      ? {}
-}:
-
-rec {
-  allPackages = import ../../top-level/all-packages.nix;
-
-  bootstrapTools = derivation {
-    inherit system;
-
-    name    = "trivial-bootstrap-tools";
-    builder = "/bin/sh";
-    args    = [ ./trivial-bootstrap.sh ];
-
-    mkdir   = "/bin/mkdir";
-    ln      = "/bin/ln";
-  };
-
-  # The simplest stdenv possible to run fetchadc and get the Apple command-line tools
-  stage0 = rec {
-    fetchurl = import ../../build-support/fetchurl {
-      inherit stdenv;
-      curl = bootstrapTools;
-    };
-
-    stdenv = import ../generic {
-      inherit system config;
-      name         = "stdenv-darwin-boot-0";
-      shell        = "/bin/bash";
-      initialPath  = [ bootstrapTools ];
-      fetchurlBoot = fetchurl;
-      cc           = null;
-    };
-  };
-
-  buildTools = import ../../os-specific/darwin/command-line-tools {
-    inherit (stage0) stdenv fetchurl;
-    xar  = bootstrapTools;
-    gzip = bootstrapTools;
-    cpio = bootstrapTools;
-  };
-
-  preHook = ''
-    export NIX_IGNORE_LD_THROUGH_GCC=1
-    export NIX_DONT_SET_RPATH=1
-    export NIX_NO_SELF_RPATH=1
-    dontFixLibtool=1
-    stripAllFlags=" " # the Darwin "strip" command doesn't know "-s"
-    xargsFlags=" "
-    export MACOSX_DEPLOYMENT_TARGET=10.7
-    # Use the 10.9 SDK if we're running on 10.9, and 10.10 if we're
-    # running on 10.10. We need to use the 10.10 headers for functions
-    # like readlinkat() that are dynamically detected by configure
-    # scripts. Very impure, obviously.
-    export SDKROOT=$(/usr/bin/xcrun --sdk macosx"$(/usr/bin/sw_vers -productVersion | /usr/bin/cut -d. -f1,2)" --show-sdk-path 2> /dev/null || echo /)
-    export NIX_CFLAGS_COMPILE+=" --sysroot=/var/empty -idirafter $SDKROOT/usr/include -F$SDKROOT/System/Library/Frameworks -Wno-multichar -Wno-deprecated-declarations"
-    export NIX_LDFLAGS_AFTER+=" -L$SDKROOT/usr/lib"
-    export CMAKE_OSX_ARCHITECTURES=x86_64
-    # Workaround for https://openradar.appspot.com/22671534 on 10.11.
-    export gl_cv_func_getcwd_abort_bug=no
-  '';
-
-  # A stdenv that wraps the Apple command-line tools and our other trivial symlinked bootstrap tools
-  stage1 = rec {
-    nativePrefix = "${buildTools.tools}/Library/Developer/CommandLineTools/usr";
-
-    stdenv = import ../generic {
-      name = "stdenv-darwin-boot-1";
-
-      inherit system config;
-      inherit (stage0.stdenv) shell fetchurlBoot;
-
-      initialPath = stage0.stdenv.initialPath ++ [ nativePrefix ];
-
-      preHook = preHook + "\n" + ''
-        export NIX_LDFLAGS_AFTER+=" -L/usr/lib"
-        export NIX_ENFORCE_PURITY=
-        export NIX_CFLAGS_COMPILE+=" -isystem ${nativePrefix}/include/c++/v1 -stdlib=libc++"
-        export NIX_CFLAGS_LINK+=" -stdlib=libc++ -Wl,-rpath,${nativePrefix}/lib"
-      '';
-
-      cc = import ../../build-support/cc-wrapper {
-        nativeTools  = true;
-        nativePrefix = nativePrefix;
-        nativeLibc   = true;
-        stdenv       = stage0.stdenv;
-        shell        = "/bin/bash";
-        cc           = {
-          name    = "clang-9.9.9";
-          cc      = "/usr";
-          outPath = nativePrefix;
-        };
-        isClang      = true;
-      };
-    };
-    pkgs = allPackages {
-      inherit system platform;
-      bootStdenv = stdenv;
-    };
-  };
-
-  stage2 = rec {
-    stdenv = import ../generic {
-      name = "stdenv-darwin-boot-2";
-
-      inherit system config;
-      inherit (stage1.stdenv) shell fetchurlBoot preHook cc;
-
-      initialPath = [ stage1.pkgs.xz stage1.pkgs.gnused ] ++ stage1.stdenv.initialPath;
-    };
-    pkgs = allPackages {
-      inherit system platform;
-      bootStdenv = stdenv;
-    };
-  };
-
-  # Use stage1 to build a whole set of actual tools so we don't have to rely on the Apple prebuilt ones or
-  # the ugly symlinked bootstrap tools anymore.
-  stage3 = with stage2; import ../generic {
-    name = "stdenv-darwin-boot-3";
-
-    inherit system config;
-    inherit (stdenv) fetchurlBoot;
-
-    initialPath = (import ../common-path.nix) { inherit pkgs; };
-
-    preHook = preHook + "\n" + ''
-      export NIX_ENFORCE_PURITY=1
-    '';
-
-    cc = import ../../build-support/cc-wrapper {
-      inherit stdenv;
-      nativeTools   = false;
-      nativeLibc    = true;
-      binutils      = pkgs.darwin.cctools;
-      cc            = pkgs.llvmPackages.clang-unwrapped;
-      coreutils     = pkgs.coreutils;
-      shell         = "${pkgs.bash}/bin/bash";
-      extraPackages = [ pkgs.libcxx ];
-      isClang       = true;
-    };
-
-    shell = "${pkgs.bash}/bin/bash";
-  };
-
-  stdenvDarwin = stage3;
-}
diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
deleted file mode 100644
index 636410fdd788..000000000000
--- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix
+++ /dev/null
@@ -1,284 +0,0 @@
-{system ? builtins.currentSystem}:
-
-with import ../../top-level/all-packages.nix {inherit system;};
-
-rec {
-  # We want coreutils without ACL support.
-  coreutils_ = coreutils.override (orig: {
-    aclSupport = false;
-  });
-
-  build = stdenv.mkDerivation {
-    name = "build";
-
-    buildInputs = [nukeReferences cpio];
-
-    buildCommand = ''
-      mkdir -p $out/bin $out/lib
-
-      # Our (fake) loader
-      cp -d ${darwin.dyld}/lib/dyld $out/lib/
-
-      # C standard library stuff
-      cp -d ${darwin.Libsystem}/lib/*.o $out/lib/
-      cp -d ${darwin.Libsystem}/lib/*.dylib $out/lib/
-      cp -d ${darwin.Libsystem}/lib/system/*.dylib $out/lib/
-
-      # Resolv is actually a link to another package, so let's copy it properly
-      rm $out/lib/libresolv.9.dylib
-      cp -L ${darwin.Libsystem}/lib/libresolv.9.dylib $out/lib
-
-      cp -rL ${darwin.Libsystem}/include $out
-      chmod -R u+w $out/include
-      cp -rL ${icu}/include*             $out/include
-      cp -rL ${libiconv}/include/*       $out/include
-      cp -rL ${gnugrep.pcre}/include/*   $out/include
-      mv $out/include $out/include-Libsystem
-
-      # Copy coreutils, bash, etc.
-      cp ${coreutils_}/bin/* $out/bin
-      (cd $out/bin && rm vdir dir sha*sum pinky factor pathchk runcon shuf who whoami shred users)
-
-      cp ${bash}/bin/bash $out/bin
-      cp ${findutils}/bin/find $out/bin
-      cp ${findutils}/bin/xargs $out/bin
-      cp -d ${diffutils}/bin/* $out/bin
-      cp -d ${gnused}/bin/* $out/bin
-      cp -d ${gnugrep}/bin/grep $out/bin
-      cp ${gawk}/bin/gawk $out/bin
-      cp -d ${gawk}/bin/awk $out/bin
-      cp ${gnutar}/bin/tar $out/bin
-      cp ${gzip}/bin/gzip $out/bin
-      cp ${bzip2}/bin/bzip2 $out/bin
-      cp -d ${gnumake}/bin/* $out/bin
-      cp -d ${patch}/bin/* $out/bin
-      cp -d ${xz}/bin/xz $out/bin
-
-      # This used to be in-nixpkgs, but now is in the bundle
-      # because I can't be bothered to make it partially static
-      cp ${curl}/bin/curl $out/bin
-      cp -d ${curl}/lib/libcurl*.dylib $out/lib
-      cp -d ${libssh2}/lib/libssh*.dylib $out/lib
-      cp -d ${openssl}/lib/*.dylib $out/lib
-
-      cp -d ${gnugrep.pcre}/lib/libpcre*.dylib $out/lib
-      cp -d ${libiconv}/lib/libiconv*.dylib $out/lib
-
-      # Copy what we need of clang
-      cp -d ${llvmPackages.clang}/bin/clang $out/bin
-      cp -d ${llvmPackages.clang}/bin/clang++ $out/bin
-      cp -d ${llvmPackages.clang}/bin/clang-3.5 $out/bin
-
-      cp -rL ${llvmPackages.clang}/lib/clang $out/lib
-
-      cp -d ${libcxx}/lib/libc++*.dylib $out/lib
-      cp -d ${libcxxabi}/lib/libc++abi*.dylib $out/lib
-
-      mkdir $out/include
-      cp -rd ${libcxx}/include/c++     $out/include
-
-      cp -d ${icu}/lib/libicu*.dylib $out/lib
-      cp -d ${zlib}/lib/libz.*       $out/lib
-      cp -d ${gmpxx}/lib/libgmp*.*   $out/lib
-      cp -d ${xz}/lib/liblzma*.*     $out/lib
-
-      # Copy binutils.
-      for i in as ld ar ranlib nm strip otool install_name_tool dsymutil; do
-        cp ${darwin.cctools}/bin/$i $out/bin
-      done
-
-      cp -rd ${pkgs.darwin.CF}/Library $out
-
-      chmod -R u+w $out
-
-      nuke-refs $out/bin/*
-
-      rpathify() {
-        local libs=$(${darwin.cctools}/bin/otool -L "$1" | tail -n +2 | grep -o "$NIX_STORE.*-\S*") || true
-        for lib in $libs; do
-          ${darwin.cctools}/bin/install_name_tool -change $lib "@rpath/$(basename $lib)" "$1"
-        done
-      }
-
-      fix_dyld() {
-        # This is clearly a hack. Once we have an install_name_tool-alike that can patch dyld, this will be nicer.
-        ${perl}/bin/perl -i -0777 -pe 's/\/nix\/store\/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-dyld-239\.4\/lib\/dyld/\/usr\/lib\/dyld\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00/sg' "$1"
-      }
-
-      # Strip executables even further
-      for i in $out/bin/*; do
-        if test -x $i -a ! -L $i; then
-          chmod +w $i
-
-          fix_dyld $i
-          strip $i || true
-        fi
-      done
-
-      for i in $out/bin/* $out/lib/*.dylib $out/lib/clang/3.5.0/lib/darwin/*.dylib $out/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation; do
-        if test -x $i -a ! -L $i; then
-          echo "Adding rpath to $i"
-          rpathify $i
-        fi
-      done
-
-      nuke-refs $out/lib/*
-      nuke-refs $out/lib/clang/3.5.0/lib/darwin/*
-      nuke-refs $out/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation
-
-      mkdir $out/.pack
-      mv $out/* $out/.pack
-      mv $out/.pack $out/pack
-
-      mkdir $out/on-server
-      (cd $out/pack && (find | cpio -o -H newc)) | bzip2 > $out/on-server/bootstrap-tools.cpio.bz2
-
-      mkdir $out/in-nixpkgs
-      cp ${stdenv.shell} $out/in-nixpkgs/sh
-      cp ${cpio}/bin/cpio $out/in-nixpkgs
-      cp ${coreutils_}/bin/mkdir $out/in-nixpkgs
-      cp ${bzip2}/bin/bzip2 $out/in-nixpkgs
-
-      chmod u+w $out/in-nixpkgs/*
-      strip $out/in-nixpkgs/*
-      nuke-refs $out/in-nixpkgs/*
-
-      for i in $out/in-nixpkgs/*; do
-        fix_dyld $i
-      done
-    '';
-
-    allowedReferences = [];
-  };
-
-  host = stdenv.mkDerivation {
-    name = "host";
-
-    buildCommand = ''
-      mkdir -p $out/nix-support
-
-      for i in "${build}/on-server/"*; do
-        echo "file binary-dist $i" >> $out/nix-support/hydra-build-products
-      done
-
-      echo "darwin-bootstrap-tools-$(date +%Y.%m.%d)" >> $out/nix-support/hydra-release-name
-    '';
-
-    allowedReferences = [ build ];
-  };
-
-  unpack = stdenv.mkDerivation {
-    name = "unpack";
-
-    # This is by necessity a near-duplicate of unpack-bootstrap-tools.sh. If we refer to it directly,
-    # we can't make any changes to it due to our testing stdenv depending on it. Think of this as the
-    # unpack-bootstrap-tools.sh for the next round of bootstrap tools.
-    # TODO: think through alternate designs, such as hosting this script as an output of the process.
-    buildCommand = ''
-      # Unpack the bootstrap tools tarball.
-      echo Unpacking the bootstrap tools...
-      $mkdir $out
-      $bzip2 -d < $tarball | (cd $out && $cpio -i)
-
-      # Set the ELF interpreter / RPATH in the bootstrap binaries.
-      echo Patching the tools...
-
-      export PATH=$out/bin
-
-      for i in $out/bin/*; do
-        if ! test -L $i; then
-          echo patching $i
-          install_name_tool -add_rpath $out/lib $i || true
-        fi
-      done
-
-      for i in $out/lib/*.dylib $out/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation; do
-        if ! test -L $i; then
-          echo patching $i
-
-          id=$(otool -D "$i" | tail -n 1)
-          install_name_tool -id "$(dirname $i)/$(basename $id)" $i
-
-          libs=$(otool -L "$i" | tail -n +2 | grep -v Libsystem | cat)
-          if [ -n "$libs" ]; then
-            install_name_tool -add_rpath $out/lib $i
-          fi
-        fi
-      done
-
-      ln -s bash $out/bin/sh
-      ln -s bzip2 $out/bin/bunzip2
-
-      cat >$out/bin/dsymutil << EOF
-      #!$out/bin/sh
-      EOF
-    '';
-
-    tarball = "${build}/on-server/bootstrap-tools.cpio.bz2";
-
-    mkdir = "${build}/in-nixpkgs/mkdir";
-    bzip2 = "${build}/in-nixpkgs/bzip2";
-    cpio  = "${build}/in-nixpkgs/cpio";
-
-    allowedReferences = [ "out" ];
-  };
-
-  test = stdenv.mkDerivation {
-    name = "test";
-
-    realBuilder = "${unpack}/bin/bash";
-
-    buildCommand = ''
-      export PATH=${unpack}/bin
-      ls -l
-      mkdir $out
-      mkdir $out/bin
-      sed --version
-      find --version
-      diff --version
-      patch --version
-      make --version
-      awk --version
-      grep --version
-      clang --version
-      xz --version
-
-      # The grep will return a nonzero exit code if there is no match, and we want to assert that we have
-      # an SSL-capable curl
-      curl --version | grep SSL
-
-      ${build}/in-nixpkgs/sh -c 'echo Hello World'
-
-      export flags="-idirafter ${unpack}/include-Libsystem --sysroot=${unpack} -L${unpack}/lib"
-
-      export CPP="clang -E $flags"
-      export CC="clang $flags -Wl,-rpath,${unpack}/lib -Wl,-v"
-      export CXX="clang++ $flags --stdlib=libc++ -lc++abi -isystem${unpack}/include/c++/v1 -Wl,-rpath,${unpack}/lib -Wl,-v"
-
-      echo '#include <stdio.h>' >> foo.c
-      echo '#include <float.h>' >> foo.c
-      echo '#include <limits.h>' >> foo.c
-      echo 'int main() { printf("Hello World\n"); return 0; }' >> foo.c
-      $CC -o $out/bin/foo foo.c
-      $out/bin/foo
-
-      echo '#include <CoreFoundation/CoreFoundation.h>' >> bar.c
-      echo 'int main() { CFShow(CFSTR("Hullo")); return 0; }' >> bar.c
-      $CC -F${unpack}/Library/Frameworks -framework CoreFoundation -o $out/bin/bar bar.c
-      $out/bin/bar
-
-      echo '#include <iostream>' >> bar.cc
-      echo 'int main() { std::cout << "Hello World\n"; }' >> bar.cc
-      $CXX -v -o $out/bin/bar bar.cc
-      $out/bin/bar
-
-      tar xvf ${hello.src}
-      cd hello-*
-      ./configure --prefix=$out
-      make
-      make install
-
-      $out/bin/hello
-    '';
-  };
-}
diff --git a/pkgs/stdenv/darwin/trivial-bootstrap.sh b/pkgs/stdenv/darwin/trivial-bootstrap.sh
deleted file mode 100644
index 487f14886587..000000000000
--- a/pkgs/stdenv/darwin/trivial-bootstrap.sh
+++ /dev/null
@@ -1,67 +0,0 @@
-
-# Building bootstrap tools
-echo Building the trivial bootstrap environment...
-$mkdir -p $out/bin
-
-$ln -s $ln $out/bin/ln
-
-PATH=$out/bin/
-
-cd $out/bin
-
-ln -s $mkdir
-ln -s /bin/sh
-ln -s /bin/cp
-ln -s /bin/dd
-ln -s /bin/mv
-ln -s /bin/rm
-ln -s /bin/ls
-ln -s /bin/ps
-ln -s /bin/cat
-ln -s /bin/bash
-ln -s /bin/echo
-ln -s /bin/expr
-ln -s /bin/test
-ln -s /bin/date
-ln -s /bin/chmod
-ln -s /bin/rmdir
-ln -s /bin/sleep
-ln -s /bin/hostname
-
-ln -s /usr/bin/id
-ln -s /usr/bin/od
-ln -s /usr/bin/tr
-ln -s /usr/bin/wc
-ln -s /usr/bin/cut
-ln -s /usr/bin/cmp
-ln -s /usr/bin/sed
-ln -s /usr/bin/tar
-ln -s /usr/bin/xar
-ln -s /usr/bin/awk
-ln -s /usr/bin/env
-ln -s /usr/bin/tee
-ln -s /usr/bin/comm
-ln -s /usr/bin/cpio
-ln -s /usr/bin/curl
-ln -s /usr/bin/find
-ln -s /usr/bin/grep
-ln -s /usr/bin/gzip
-ln -s /usr/bin/head
-ln -s /usr/bin/tail
-ln -s /usr/bin/sort
-ln -s /usr/bin/uniq
-ln -s /usr/bin/less
-ln -s /usr/bin/true
-ln -s /usr/bin/diff
-ln -s /usr/bin/egrep
-ln -s /usr/bin/fgrep
-ln -s /usr/bin/patch
-ln -s /usr/bin/uname
-ln -s /usr/bin/touch
-ln -s /usr/bin/split
-ln -s /usr/bin/xargs
-ln -s /usr/bin/which
-ln -s /usr/bin/install
-ln -s /usr/bin/basename
-ln -s /usr/bin/dirname
-ln -s /usr/bin/readlink
diff --git a/pkgs/stdenv/darwin/unpack-bootstrap-tools.sh b/pkgs/stdenv/darwin/unpack-bootstrap-tools.sh
deleted file mode 100644
index 8033c7004d93..000000000000
--- a/pkgs/stdenv/darwin/unpack-bootstrap-tools.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-set -e
-
-# Unpack the bootstrap tools tarball.
-echo Unpacking the bootstrap tools...
-$mkdir $out
-$bzip2 -d < $tarball | (cd $out && $cpio -i)
-
-# Set the ELF interpreter / RPATH in the bootstrap binaries.
-echo Patching the tools...
-
-export PATH=$out/bin
-
-for i in $out/bin/*; do
-  if ! test -L $i; then
-    echo patching $i
-    install_name_tool -add_rpath $out/lib $i || true
-  fi
-done
-
-for i in $out/lib/*.dylib $out/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation; do
-  if ! test -L $i; then
-    echo patching $i
-
-    id=$(otool -D "$i" | tail -n 1)
-    install_name_tool -id "$(dirname $i)/$(basename $id)" $i
-
-    libs=$(otool -L "$i" | tail -n +2 | grep -v libSystem | cat)
-    if [ -n "$libs" ]; then
-      install_name_tool -add_rpath $out/lib $i
-    fi
-  fi
-done
-
-ln -s bash $out/bin/sh
-ln -s bzip2 $out/bin/bunzip2
-
-# Provide a gunzip script.
-cat > $out/bin/gunzip <<EOF
-#!$out/bin/sh
-exec $out/bin/gzip -d "\$@"
-EOF
-chmod +x $out/bin/gunzip
-
-# Provide fgrep/egrep.
-echo "#! $out/bin/sh" > $out/bin/egrep
-echo "exec $out/bin/grep -E \"\$@\"" >> $out/bin/egrep
-echo "#! $out/bin/sh" > $out/bin/fgrep
-echo "exec $out/bin/grep -F \"\$@\"" >> $out/bin/fgrep
-
-cat >$out/bin/dsymutil << EOF
-#!$out/bin/sh
-EOF
-
-chmod +x $out/bin/egrep $out/bin/fgrep $out/bin/dsymutil
diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix
index da93229ce94c..71c50f751b18 100644
--- a/pkgs/stdenv/default.nix
+++ b/pkgs/stdenv/default.nix
@@ -36,9 +36,6 @@ rec {
   # Linux standard environment.
   stdenvLinux = (import ./linux { inherit system allPackages platform config lib; }).stdenvLinux;
 
-  # Darwin standard environment.
-  stdenvDarwin = (import ./darwin { inherit system allPackages platform config;}).stdenvDarwin;
-
   # Pure Darwin standard environment. Allows building with the sandbox enabled. To use,
   # you can add this to your nixpkgs config:
   #

From 88c41e1f958de502cadd63e7803c11e427f5d12c Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sun, 3 Jan 2016 21:08:40 -0500
Subject: [PATCH 246/884] stdenv-darwin: rename folder and associated attribute

No point in calling it pure-darwin anymore. It's the only stdenv we have
---
 .../{pure-darwin => darwin}/default.nix       |  0
 .../make-bootstrap-tools.nix                  |  0
 .../standard-sandbox.sb                       |  0
 .../unpack-bootstrap-tools.sh                 |  0
 pkgs/stdenv/default.nix                       |  8 +--
 pkgs/stdenv/pure-darwin/trivial-bootstrap.sh  | 66 -------------------
 6 files changed, 2 insertions(+), 72 deletions(-)
 rename pkgs/stdenv/{pure-darwin => darwin}/default.nix (100%)
 rename pkgs/stdenv/{pure-darwin => darwin}/make-bootstrap-tools.nix (100%)
 rename pkgs/stdenv/{pure-darwin => darwin}/standard-sandbox.sb (100%)
 rename pkgs/stdenv/{pure-darwin => darwin}/unpack-bootstrap-tools.sh (100%)
 delete mode 100644 pkgs/stdenv/pure-darwin/trivial-bootstrap.sh

diff --git a/pkgs/stdenv/pure-darwin/default.nix b/pkgs/stdenv/darwin/default.nix
similarity index 100%
rename from pkgs/stdenv/pure-darwin/default.nix
rename to pkgs/stdenv/darwin/default.nix
diff --git a/pkgs/stdenv/pure-darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
similarity index 100%
rename from pkgs/stdenv/pure-darwin/make-bootstrap-tools.nix
rename to pkgs/stdenv/darwin/make-bootstrap-tools.nix
diff --git a/pkgs/stdenv/pure-darwin/standard-sandbox.sb b/pkgs/stdenv/darwin/standard-sandbox.sb
similarity index 100%
rename from pkgs/stdenv/pure-darwin/standard-sandbox.sb
rename to pkgs/stdenv/darwin/standard-sandbox.sb
diff --git a/pkgs/stdenv/pure-darwin/unpack-bootstrap-tools.sh b/pkgs/stdenv/darwin/unpack-bootstrap-tools.sh
similarity index 100%
rename from pkgs/stdenv/pure-darwin/unpack-bootstrap-tools.sh
rename to pkgs/stdenv/darwin/unpack-bootstrap-tools.sh
diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix
index 71c50f751b18..44be0ac83f87 100644
--- a/pkgs/stdenv/default.nix
+++ b/pkgs/stdenv/default.nix
@@ -36,11 +36,7 @@ rec {
   # Linux standard environment.
   stdenvLinux = (import ./linux { inherit system allPackages platform config lib; }).stdenvLinux;
 
-  # Pure Darwin standard environment. Allows building with the sandbox enabled. To use,
-  # you can add this to your nixpkgs config:
-  #
-  #   replaceStdenv = {pkgs}: pkgs.allStdenvs.stdenvDarwinPure
-  stdenvDarwinPure = (import ./pure-darwin { inherit system allPackages platform config;}).stage5;
+  stdenvDarwin = (import ./darwin { inherit system allPackages platform config;}).stage5;
 
   # Select the appropriate stdenv for the platform `system'.
   stdenv =
@@ -51,7 +47,7 @@ rec {
     if system == "armv7l-linux" then stdenvLinux else
     if system == "mips64el-linux" then stdenvLinux else
     if system == "powerpc-linux" then /* stdenvLinux */ stdenvNative else
-    if system == "x86_64-darwin" then stdenvDarwinPure else
+    if system == "x86_64-darwin" then stdenvDarwin else
     if system == "x86_64-solaris" then stdenvNix else
     if system == "i686-cygwin" then stdenvNative else
     if system == "x86_64-cygwin" then stdenvNative else
diff --git a/pkgs/stdenv/pure-darwin/trivial-bootstrap.sh b/pkgs/stdenv/pure-darwin/trivial-bootstrap.sh
deleted file mode 100644
index 0915b378d4f0..000000000000
--- a/pkgs/stdenv/pure-darwin/trivial-bootstrap.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-
-# Building bootstrap tools
-echo Building the trivial bootstrap environment...
-$mkdir -p $out/bin
-
-$ln -s $ln $out/bin/ln
-
-PATH=$out/bin/
-
-cd $out/bin
-
-ln -s $mkdir
-ln -s /bin/sh
-ln -s /bin/cp
-ln -s /bin/mv
-ln -s /bin/rm
-ln -s /bin/ls
-ln -s /bin/ps
-ln -s /bin/cat
-ln -s /bin/bash
-ln -s /bin/echo
-ln -s /bin/expr
-ln -s /bin/test
-ln -s /bin/date
-ln -s /bin/chmod
-ln -s /bin/rmdir
-ln -s /bin/sleep
-ln -s /bin/hostname
-
-ln -s /usr/bin/id
-ln -s /usr/bin/od
-ln -s /usr/bin/tr
-ln -s /usr/bin/wc
-ln -s /usr/bin/cut
-ln -s /usr/bin/cmp
-ln -s /usr/bin/sed
-ln -s /usr/bin/tar
-ln -s /usr/bin/xar
-ln -s /usr/bin/awk
-ln -s /usr/bin/env
-ln -s /usr/bin/tee
-ln -s /usr/bin/comm
-ln -s /usr/bin/cpio
-ln -s /usr/bin/curl
-ln -s /usr/bin/find
-ln -s /usr/bin/grep
-ln -s /usr/bin/gzip
-ln -s /usr/bin/head
-ln -s /usr/bin/tail
-ln -s /usr/bin/sort
-ln -s /usr/bin/uniq
-ln -s /usr/bin/less
-ln -s /usr/bin/true
-ln -s /usr/bin/diff
-ln -s /usr/bin/egrep
-ln -s /usr/bin/fgrep
-ln -s /usr/bin/patch
-ln -s /usr/bin/uname
-ln -s /usr/bin/touch
-ln -s /usr/bin/split
-ln -s /usr/bin/xargs
-ln -s /usr/bin/which
-ln -s /usr/bin/install
-ln -s /usr/bin/basename
-ln -s /usr/bin/dirname
-ln -s /usr/bin/readlink
\ No newline at end of file

From 0313b2e09cd306902fcb9967c32f048fada1f484 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sun, 3 Jan 2016 21:47:09 -0500
Subject: [PATCH 247/884] stdenv-darwin: allow easier testing of bootstrap
 tools

This un-hardcodes the bootstrap tools passed into the Darwin stdenv and
thus allows us to quickly iterate on improving the design of the full
bootstrap process. We can easily change the contents of the bootstrap
tools and evaluate an entire bootstrap all the way up to real packages.
---
 pkgs/stdenv/darwin/default.nix              | 41 +++++++++++----------
 pkgs/stdenv/darwin/make-bootstrap-tools.nix | 30 ++++++++++-----
 pkgs/stdenv/default.nix                     |  2 +-
 3 files changed, 43 insertions(+), 30 deletions(-)

diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index bc3b433e9226..f2a482e3db2e 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -1,27 +1,26 @@
-{ system      ? builtins.currentSystem
-, allPackages ? import ../../top-level/all-packages.nix
-, platform    ? null
-, config      ? {}
+{ system         ? builtins.currentSystem
+, allPackages    ? import ../../top-level/all-packages.nix
+, platform       ? null
+, config         ? {}
+
+# Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools
+, bootstrapFiles ? let
+  fetch = { file, sha256, executable ? true }: import <nix/fetchurl.nix> {
+    url = "http://tarballs.nixos.org/stdenv-darwin/x86_64/4f07c88d467216d9692fefc951deb5cd3c4cc722/${file}";
+    inherit sha256 system executable;
+  }; in {
+    sh      = fetch { file = "sh";    sha256 = "1siix3wakzil31r2cydmh3v8a1nyq4605dwiabqc5lx73j4xzrzi"; };
+    bzip2   = fetch { file = "bzip2"; sha256 = "0zvqm977k11b5cl4ixxb5h0ds24g6z0f8m28z4pqxzpa353lqbla"; };
+    mkdir   = fetch { file = "mkdir"; sha256 = "13frk8lsfgzlb65p9l26cvxf06aag43yjk7vg9msn7ix3v8cmrg1"; };
+    cpio    = fetch { file = "cpio";  sha256 = "0ms5i9m1vdksj575sf1djwgm7zhnvfrrb44dxnfh9avr793rc2w4"; };
+    tarball = fetch { file = "bootstrap-tools.cpio.bz2"; sha256 = "1lz1b0grl4642h6n635xvi6imf0yyy1zyzdr9ing5aphzz0z5iic"; executable = false; };
+  }
 }:
 
 let
   libSystemProfile = ''
     (import "${./standard-sandbox.sb}")
   '';
-
-  fetch = { file, sha256, executable ? true }: import <nix/fetchurl.nix> {
-    url = "http://tarballs.nixos.org/stdenv-darwin/x86_64/4f07c88d467216d9692fefc951deb5cd3c4cc722/${file}";
-    inherit sha256 system executable;
-  };
-
-  bootstrapFiles = {
-    sh    = fetch { file = "sh";    sha256 = "1siix3wakzil31r2cydmh3v8a1nyq4605dwiabqc5lx73j4xzrzi"; };
-    bzip2 = fetch { file = "bzip2"; sha256 = "0zvqm977k11b5cl4ixxb5h0ds24g6z0f8m28z4pqxzpa353lqbla"; };
-    mkdir = fetch { file = "mkdir"; sha256 = "13frk8lsfgzlb65p9l26cvxf06aag43yjk7vg9msn7ix3v8cmrg1"; };
-    cpio  = fetch { file = "cpio";  sha256 = "0ms5i9m1vdksj575sf1djwgm7zhnvfrrb44dxnfh9avr793rc2w4"; };
-  };
-
-  tarball = fetch { file = "bootstrap-tools.cpio.bz2"; sha256 = "1lz1b0grl4642h6n635xvi6imf0yyy1zyzdr9ing5aphzz0z5iic"; executable = false; };
 in rec {
   allPackages = import ../../top-level/all-packages.nix;
 
@@ -42,13 +41,13 @@ in rec {
   '';
 
   bootstrapTools = derivation rec {
-    inherit system tarball;
+    inherit system;
 
     name    = "bootstrap-tools";
     builder = bootstrapFiles.sh; # Not a filename! Attribute 'sh' on bootstrapFiles
     args    = [ ./unpack-bootstrap-tools.sh ];
 
-    inherit (bootstrapFiles) mkdir bzip2 cpio;
+    inherit (bootstrapFiles) mkdir bzip2 cpio tarball;
 
     __sandboxProfile = binShClosure + libSystemProfile;
   };
@@ -306,4 +305,6 @@ in rec {
       inherit cc;
     };
   };
+
+  stdenvDarwin = stage5;
 }
diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
index 961adbeaaad3..d9d501ca0f51 100644
--- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
@@ -1,4 +1,6 @@
-with import ../../top-level/all-packages.nix { system = "x86_64-darwin"; };
+{ system ? builtins.currentSystem }:
+
+with import ../../top-level/all-packages.nix { inherit system; };
 
 rec {
   # We want coreutils without ACL support.
@@ -169,7 +171,15 @@ rec {
     '';
   };
 
-  unpack = stdenv.mkDerivation {
+  bootstrapFiles = {
+    sh      = "${build}/on-server/sh";
+    bzip2   = "${build}/on-server/bzip2";
+    mkdir   = "${build}/on-server/mkdir";
+    cpio    = "${build}/on-server/cpio";
+    tarball = "${build}/on-server/bootstrap-tools.cpio.bz2";
+  };
+
+  unpack = stdenv.mkDerivation (bootstrapFiles // {
     name = "unpack";
 
     # This is by necessity a near-duplicate of unpack-bootstrap-tools.sh. If we refer to it directly,
@@ -216,14 +226,8 @@ rec {
       EOF
     '';
 
-    tarball = "${build}/on-server/bootstrap-tools.cpio.bz2";
-
-    mkdir = "${build}/on-server/mkdir";
-    bzip2 = "${build}/on-server/bzip2";
-    cpio  = "${build}/on-server/cpio";
-
     allowedReferences = [ "out" ];
-  };
+  });
 
   test = stdenv.mkDerivation {
     name = "test";
@@ -283,4 +287,12 @@ rec {
       $out/bin/hello
     '';
   };
+
+  # The ultimate test: bootstrap a whole stdenv from the tools specified above and get a package set out of it
+  test-pkgs = let
+    stdenv = import ./. { inherit system bootstrapFiles; };
+  in import ../../top-level/all-packages.nix {
+    inherit system;
+    bootStdenv = stdenv.stdenvDarwin;
+  };
 }
diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix
index 44be0ac83f87..9ea69fe88e93 100644
--- a/pkgs/stdenv/default.nix
+++ b/pkgs/stdenv/default.nix
@@ -36,7 +36,7 @@ rec {
   # Linux standard environment.
   stdenvLinux = (import ./linux { inherit system allPackages platform config lib; }).stdenvLinux;
 
-  stdenvDarwin = (import ./darwin { inherit system allPackages platform config;}).stage5;
+  stdenvDarwin = (import ./darwin { inherit system allPackages platform config;}).stdenvDarwin;
 
   # Select the appropriate stdenv for the platform `system'.
   stdenv =

From 5606e8b043ccc976f0f159764a19b1cec2ee5eb6 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 4 Jan 2016 04:06:43 +0100
Subject: [PATCH 248/884] uksmtools: add 1-line comment to clarify `fetchgit`
 use...

---
 pkgs/os-specific/linux/uksmtools/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/uksmtools/default.nix b/pkgs/os-specific/linux/uksmtools/default.nix
index eeb5440f5104..3e8b37a2faff 100644
--- a/pkgs/os-specific/linux/uksmtools/default.nix
+++ b/pkgs/os-specific/linux/uksmtools/default.nix
@@ -4,6 +4,7 @@ let version = "2015-09-25"; in
 stdenv.mkDerivation {
   name = "uksmtools-${version}";
 
+  # This project uses git submodules, which fetchFromGitHub doesn't support:
   src = fetchgit {
     sha256 = "0ngdmici2vgi2z02brzc3f78j1g1y9myzfxn46zlm1skg94fp692";
     rev = "9f59a3a0b494b758aa91d7d8fa04e21b5e6463c0";

From b2612d4a98d9950c99eee469d4e1e8d6ce74fa71 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 4 Jan 2016 04:23:29 +0100
Subject: [PATCH 249/884] rawdog: 2.20 -> 2.21

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

diff --git a/pkgs/applications/networking/feedreaders/rawdog/default.nix b/pkgs/applications/networking/feedreaders/rawdog/default.nix
index 231b3195b5f0..c5b265e654f9 100644
--- a/pkgs/applications/networking/feedreaders/rawdog/default.nix
+++ b/pkgs/applications/networking/feedreaders/rawdog/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, pythonPackages }:
 
+let version = "2.21"; in
 pythonPackages.buildPythonPackage rec {
-  name = "rawdog-2.20";
+  name = "rawdog-${version}";
 
   src = fetchurl {
     url = "http://offog.org/files/${name}.tar.gz";
-    sha256 = "0a63b26cc111b0deca441f498177b49be0330760c5c0e24584cdb9ba1e7fd5a6";
+    sha256 = "0f5z7b70pyhjl6s28hgxninsr86s4dj5ycd50sv6bfz4hm1c2030";
   };
 
   propagatedBuildInputs = with pythonPackages; [ feedparser ];
@@ -13,6 +14,7 @@ pythonPackages.buildPythonPackage rec {
   namePrefix = "";
   
   meta = {
+    inherit version;
     homepage = "http://offog.org/code/rawdog/";
     description = "An RSS Aggregator Without Delusions Of Grandeur";
     license = stdenv.lib.licenses.gpl2;

From f300b2861de690ad9b1c5981020d33fa01a15349 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 4 Jan 2016 04:23:32 +0100
Subject: [PATCH 250/884] rawdog: add myself as a maintainer

---
 .../networking/feedreaders/rawdog/default.nix            | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/feedreaders/rawdog/default.nix b/pkgs/applications/networking/feedreaders/rawdog/default.nix
index c5b265e654f9..749e1864fda9 100644
--- a/pkgs/applications/networking/feedreaders/rawdog/default.nix
+++ b/pkgs/applications/networking/feedreaders/rawdog/default.nix
@@ -13,11 +13,12 @@ pythonPackages.buildPythonPackage rec {
 
   namePrefix = "";
   
-  meta = {
+  meta = with stdenv.lib; {
     inherit version;
     homepage = "http://offog.org/code/rawdog/";
-    description = "An RSS Aggregator Without Delusions Of Grandeur";
-    license = stdenv.lib.licenses.gpl2;
-    platform = stdenv.lib.platforms.unix;
+    description = "RSS Aggregator Without Delusions Of Grandeur";
+    license = licenses.gpl2;
+    platform = platforms.unix;
+    maintainers = with maintainers; [ nckx ];
   };
 }

From 89fbb184d18a5971171202c11c3f84281ff47193 Mon Sep 17 00:00:00 2001
From: Wei-Ming Yang <rick68@gmail.com>
Date: Sun, 3 Jan 2016 16:06:47 +0800
Subject: [PATCH 251/884] ostinato: add ostinato package in nixpkgs

---
 .../networking/ostinato/default.nix           |  59 ++++++++++++++++++
 .../networking/ostinato/drone_ini.patch       |  14 +++++
 .../networking/ostinato/ostinato.png          | Bin 0 -> 18467 bytes
 pkgs/top-level/all-packages.nix               |   2 +
 4 files changed, 75 insertions(+)
 create mode 100644 pkgs/applications/networking/ostinato/default.nix
 create mode 100644 pkgs/applications/networking/ostinato/drone_ini.patch
 create mode 100644 pkgs/applications/networking/ostinato/ostinato.png

diff --git a/pkgs/applications/networking/ostinato/default.nix b/pkgs/applications/networking/ostinato/default.nix
new file mode 100644
index 000000000000..28170b2563d4
--- /dev/null
+++ b/pkgs/applications/networking/ostinato/default.nix
@@ -0,0 +1,59 @@
+{ stdenv, fetchgit, fetchurl, writeText
+, qt4, protobuf, libpcap
+, wireshark, gzip, diffutils, gawk
+}:
+
+stdenv.mkDerivation {
+  name = "ostinato-2015-12-24";
+  src = fetchgit {
+    url = "https://github.com/pstavirs/ostinato.git";
+    rev = "414d89860de0987843295d149bcabeac7c6fd9e5";
+    sha256 = "0hb78bq51r93p0yr4l1z5xlf1i666v5pa3zkdj7jmpb879kj05dx";
+  };
+
+  buildInputs = [ qt4 protobuf libpcap ];
+
+  patches = [ ./drone_ini.patch ];
+
+  configurePhase = "qmake PREFIX=$out"
+    + stdenv.lib.optionalString stdenv.isDarwin " -spec macx-g++";
+
+  postInstall = ''
+    cat > $out/bin/ostinato.ini <<EOF
+    WiresharkPath=${wireshark}/bin/wireshark
+    TsharkPath=${wireshark}/bin/tshark
+    GzipPath=${gzip}/bin/gzip
+    DiffPath=${diffutils}/bin/diff
+    AwkPath=${gawk}/bin/awk
+    EOF
+
+    mkdir -p $out/share/pixmaps
+    install -D -m 644 ${./ostinato.png} $out/share/pixmaps/ostinato.png
+
+    # Create a desktop item.
+    mkdir -p $out/share/applications
+    cat > $out/share/applications/ostinato.desktop <<EOF
+    [Desktop Entry]
+    Type=Application
+    Encoding=UTF-8
+    Name=Ostinato
+    GenericName=Packet/Traffic Generator and Analyzer
+    GenericName[it]=Generatore ed Analizzatore di pacchetti di rete
+    Comment=Network packet and traffic generator and analyzer with a friendly GUI
+    Comment[it]=Generatore ed Analizzatore di pacchetti di rete con interfaccia amichevole
+    Icon=$out/share/pixmaps/ostinato.png
+    Exec=$out/bin/ostinato
+    Terminal=false
+    Categories=Network;
+    StartupNotify=true
+    EOF
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A packet traffic generator and analyzer";
+    homepage = http://ostinato.org;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ rick68 ];
+    platforms = platforms.linux;  # also OS X and cygwin
+  };
+}
diff --git a/pkgs/applications/networking/ostinato/drone_ini.patch b/pkgs/applications/networking/ostinato/drone_ini.patch
new file mode 100644
index 000000000000..5818f4e94c30
--- /dev/null
+++ b/pkgs/applications/networking/ostinato/drone_ini.patch
@@ -0,0 +1,14 @@
+diff -Nru ostinato-414d89860de0987843295d149bcabeac7c6fd9e5/server/drone_main.cpp ostinato-414d89860de0987843295d149bcabeac7c6fd9e5.new/server/drone_main.cpp
+--- ostinato-414d89860de0987843295d149bcabeac7c6fd9e5/server/drone_main.cpp	2015-12-24 16:46:35.000000000 +0800
++++ ostinato-414d89860de0987843295d149bcabeac7c6fd9e5.new/server/drone_main.cpp	2015-12-30 20:59:04.319199699 +0800
+@@ -62,8 +62,8 @@
+     /* (Portable Mode) If we have a .ini file in the same directory as the 
+        executable, we use that instead of the platform specific location
+        and format for the settings */
+-    QString portableIni = QCoreApplication::applicationDirPath() 
+-            + "/drone.ini";
++    QString portableIni = argc > 2 ? argv[2] :
++            QCoreApplication::applicationDirPath() + "/drone.ini";
+     if (QFile::exists(portableIni))
+         appSettings = new QSettings(portableIni, QSettings::IniFormat);
+     else
diff --git a/pkgs/applications/networking/ostinato/ostinato.png b/pkgs/applications/networking/ostinato/ostinato.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a03e6a7d5df5e244fec75af65a33f56736e4538
GIT binary patch
literal 18467
zcmX7w1yoyGw}pcTm*Vbj#VHoto#O896o=sME=5|L;%>#gKyjDi?yfKQe~b|lk^v{#
z`<x|nev2p-C23S7LL>kHfGR5^p$54hf!qdw@R08-*^YaVJ6Ja{Sq&iM%MWNC3Hce(
zSw_bV0Khf)?*=71sQm--B!Ro6w!6BMrMstzs|CQ*)05T4(az1x#My$?$<-?7T#yg|
zAP2}wh-!G{o_@Ch6Mvl#-*l_AqRpy>#Ukg+I;t>C28*in#mfP3a73Y&B|+xu5*U)O
zgK#RM*s2nuqKT5twUP8dSg2)`6FiE-jEX#2Y%y(U9okughqnNC<;<*eU7zoWqc;dM
z9w!?D>mJ9B2c6O~rb2Oa8zh@j1n1HqS?jP?3>UyUfD1fNt|?wfW*)D?7J2y*>Q`tM
zg1SGIFA`{++R>edRlflu?Ej_Hu(IKG7AKT?I0d*S09eL-?Lsw0E3BTnw>(I8Ct8}g
z(-`%EDNk`IRmiG!eSO@K^@9Ovg;WN@C7v|(NiN&p&%-Zv<zf8dO(a~lJ)V;dYi?Et
z<%${4S~g1>hk;lNDex>fvMeU-?S%SuoXEKoYk&O|eI@Rpt+Lkw^8%mhm|mM4R^O`Z
zeGM$Sf;4(jW*d=uaKNWRV+K0Ri5I1A_wy%<^b?TRLa9lclyG|C0AHj#*g{k;@lc67
z1GsERPf)1=<Ml(5ks=s;o#Cqn0Av6&<_J+}z^ByUNP8(~4)7>|hv`jgerYgJPS3ns
zgYoWL+(XT9#2x&0h)uR$v+8+)@$jXmOJ3w3s7tSdimx95?`c|^u<Mu!!@S`q=QNc0
zfGZb`Zpqi!M#+2GVzrvD-kUzq+D_!81HRi05=R0UwkPT1h#qkiuW#ecZ~9#hdg<I$
zVtz3_s({$U78Z$tN9`})&nsKr?mEXItJ%Xfz9RbxozkmI6ugK7<|G+@GU|UZ$=0(O
zc>)OIU8ipd-hFG+KcA3#u=sCPV##r16t#3kkVeeAU7?x5TbZd2BGaeBG(V=-$&Yye
zda$^(0U49abUYo(CrBr#=D-pgM}i>1@E&f!g{P#j)9Srm)ghkBiYaazo&-k$y=1K&
z6N;xn!NT{H2jWq4*PlEin;7QA15O=o3v_xm#DLl!7kje;e=UkUBznf|R(*-SYJ-KH
zejgZyUcY~|(5uh5So+zJ15WI%iN&;Y$A-n=v7YI7*(w939@9P<cVyb+&HQleD%BAg
zgieed5?1~<0X6uZH_HDKAC_V_UjGMp)tHZ-32;)F$kK~V|J<#meIT7!U0tmdjE8{j
ztGYrN5ev5i0IW8X(DS1VE+t1}EV(Bgoi6k_cG2k^pql&X4SSLw-ZO9%^n?tp$a*m5
zbfFLAzm8dt1ymhR`KEcSfRcrTT)<Y3X%sG3<MB6YmCqWebH{$z>pF~-eN&CK0vEEB
zKi7k%L&sWypa|t8{XmngPO0WB1zO&|o*oVQCd^SK=pCG|bU{}dry9jm0B+L1x)PdD
zhl?N)Z~&BM;q3=wa6obbOug@(2!`x<z2#DKS3y!>fBV1}JMubh<_hqeKQiL)-(FYS
zY4dXeU3SmAok^Q=spqPcLUV^f1qi{87(xJ^aC-0{JS?ENRh1GJ$S^Mf2<{caX0R*Q
zkQ`*Xz=A@<Ng_+W)vx(Aoa6BgkI7_c65)}g<^-BqhW}nOz{6g^Vl32iML@)yz6*vy
zK&%!9tlcl5CvpMsA`C8-5vEBRQ9to-?yFNG9QohHuKVmm_NvbtsXoj9GE+!KlQJ6T
zUU+Gva*y>dp1fJg%c`$#hzUaw?wSFR;Cb*XV$lgPqd|#KhJ#QbvoFUl`d3lmM#iXl
zI^-885<MU2ya3=XKx0c;PSw5#xW%p_=gjb>x30ceXysQ9yy=i5jaPwkk}qftxfcrX
zZFogMZf?wud>`cHMw{_+&~DFsQWQk3V24S_Hmwe$58DG}&fmKyrX!lPN2yQI!<Z~5
zvBEu#Ces1(1eu#rlwfAU8~Y)Dd19n!=}p_TeCGIA489-2KFJMIxHvy|jT`xa%X<Rt
z7uDkiEhv56_HEJsyjU{Eu%<~2Q?<nA9=``A5f6%^A&I0K0M!<ens4r!C7rXjkZJOr
zGqKf%ls-{U@9!J{`~sKz^P0qyRln2Orh!mScfp@pc;VOccv4`}b&9>yeT`p&2<T*u
zKN29oUH2Ri^!inNO4Y%^vt>*uY~aPO8W%A7gOA2eBc>zjlI_acJ)p0CQhv30GkjQg
z;tOYRWMuSRW@+T5Ac)7>`R*cei?@1&Et>_CkrL}9enL%6I}6Xd-($VyOYDf6R|JAc
z$|%18wa+gY`ey}@C3m|rHEFn}kw06t>H;E6)S&4q<Fy=y09WhrBGgkc)9Y6z=rXL5
zwn|XIC;S!;STWXdzU3OUcLCD43zj}7n6=8@bvKIESULZTF6xBmJf6h!^Yg16$|N`0
z0GLF0CAu~ZFq!B5!v|~ZFJ&s3``dx?SZ@HWrW;u=6-T^V|H#yi(3KA5GqDV~L-CF|
zXzNexj{c3Ic7CT7YSClKTsItsll9;L+3MOW!QClnUaT*6-Dq4-1bPUUFaFF!2=X?V
zez3v(Ro6lo_g=#x?r0W}`+cysUh1ispIiIOPU2SNFK7qDI0$$zb8u>=>p(o)QKAgr
zD$Vk+A5`^LZRMKPF<g~<89>1rlyKsQdTNTHOgFLQg8Hjrud@_|njp@<*Fo<MEAl6y
z_L(i{_hMadsDpa*+Z6l)5n(g>fa;FTZ@?xRBWK{~>t1=TKVg|C^rbz^nb%+0%du9Q
z4XijRy^7FH`i)QOzaRl=@+#@RlAN!o_p1OjX`*YclrY!V6iAFP{jGA-r`2Pi9)IIi
zR!=Fl#>ED>s?uG(DbTXx=UC10FY3MHNoxv#m8Hg7-&tKDa|m{M^>5N!3TTXj0jQPF
ztzx`(EW98pAR45*&o=wh!bSYV&z-0DN!?y6vhWXdNT$}UM5V@zI}Z;QK<_~y(q@6m
z%NXU)KR-F~{TXz(5cX}4h<meAqh!UGquKu_xC7>}s%aewpL#M*dIF(2`-_Jf%!vb`
zT~!b@WOXp^$iWjt+GmV~r}^J<FXEekosjbwvyd3t**mS}7*(tK*9r(gzQ;F3Zh8t3
z{aGqWHX%)^JYZUPgj(J5@0SNWhn}T0R*5%5FVpnn63VhygW|`=))yiv#*D74p2GR{
z!SQ4MO4-s`d0M6H#teXk6~i3`V)2t#AJ>DueOH`Cm2MHFVsctBk#L0i+sT&ZqxmJn
zx83G$QIsR=6!iO&IEaA4$@?=$wb=n2GH$23(<<c;)9FKQX#V<*cBw?Xkx>S^mlycO
zRg8sfOvo<(?(UC#C7R$u187u4oAa}js62||3|;+#q-g6<7XU!^`^4UFU~f}gnG?_f
zwniayUy_nzKX3T+Vxio?&nth1W0yt{hNwIDa*^&ZBq7I#)`V+Cg<%k{f9LeHcOPO%
z{<6b23~nt+y2DN4+!or;g<L0^ut8y#e>ysb6>nyXQ!O1>Y-%gq?W#fst}aEG{Y2>x
zN`24ta@u-9YB3{qQDx<b#It|L;9fk-M$R~`CfA(aU!P!5t2(5HZV9PPvKye<5PDj1
zc`D=lUT`N+oGWlKKX0qvbeDCSWnhl!(DYj`CooVlI%c<oSci8Wk*xFI+?a`4So~3{
zOHOa%1b6(!-YMAZuW^6r!6V$XJR9&aZBQNMi{zwJ%4_@z*_h(_yasBIqMti5fQdwl
zx6>bGZWG$tDX~5XjH=mAA1o5a>ZsmO-k4<phkC(+&CfnL5o+xUx*C!BMQ-<DH~SOg
z2~zn0<KAGni@#rAV9I!KOGFMyp(BQWPH#p<cDtLW5V*mc>MWoru0?=b5rP+?%Fc^&
zT6t5({a5K5*MU6;y~$a1+V+2bNorRcx+=FX^80E)0-%BsElsev>UX+JJ`gJvhO;o$
z@Sx%i-ra4D;ZSOjcDe=Oz#D+)hK0UWUcwRP^8K=j^Nf*LPK^x`kQpL<U*(vt<^P>H
zvi{f<!l0=YW8(kD{Qb7n{>2ak-4!0uzg+Ol9KDSzJm_rO7t5^y>LeVB4WdpNMUz~M
zH}0xvV|4~bI%%rD$x%Fz;o>sgZdOpEog5z{$-%5+(d#$((iqR~Y}iqpnFqrEAiN4U
zKn;O`MHk;X>~Bb!Uh0LsOHIh%W6$rF0iQw3O~k~WEE(x9L-kY_p3weI8QU`?eqL@x
z<#}WRboZ2^4!5)f3fmJYO77Nee>j&nHW_fWf4`zd_s0T%gtOFePmS?S5+nVN6|M6@
zr|;~mXKtuQTj<GTPc-McCjbQ}EB&6+q(5zdY=UR%wvNdO?Ui%$Vw?N!!Og)G8TsxM
zR7*mXji%v=FBGoCZg5@tku5!>bW{u;)^ZsamYsby9%`<^6-{ip9)fr2x6fLiY3NWD
zL117Y5k~JBe#??C{(Ij$_hasdO?uOJ%hobpXr|O}EsA&dnzxp54+EYU#s0I5b~FMO
z4a)^{<J`0J^Yi=xuaC02CyHqcDFAo+B;LbzdF1e`_8q=)84eR2UU};4Fb&40b{&5k
z?5MIkY2a`CirTI8Mh7w!fXnQ28=w?!%{gFYG*8`=PMo6xo|2N0l$#9pQZ?U{`Y|hZ
z=M@KlrFt^;FXZQLYGcY<lTlQWP1o+hro>j8{bbhH8nBzItt%snCmze1B-lU&TXqS%
z_dt*}y2HZ>%T=U+EG995?ayBQ-EC=>b~^Vo`94+ddtFIk^O!jY+f+7prNgpajfh;J
z6Ff_Bms<0iikZ*JR2iX+psl|$tjHx3)d0<ZSph)Z{s|HP96B^+Du6!4?H=U|NItWU
z69E6`#9L~`C79zMn%Ph+0THeyDlyVvLeLsqV)^_US+EwAApD4#``#qv9G~BMKA|+p
z&S&-(g{AEI$}s$n1^C0RSPAgP?HLkoVRmHNZE*<m8Y&}@5hUC+kPw0Wh<M9#AyQbf
z_{&CTqSGxtO~(-V74z~fz?C-y@?j>)4WW&F(kN=7!&knfjKWGS;*>g^XFw4zz`{wh
z0WYDTGahz-bqoc^zyqj%EX-pNll(XYV^dy1HkcA1BV~r5>J@WA65KJ<yl$;nb8RWr
z4~lkLod38|?*6mq9*2(lo1o>t%pp9}jQ=jn8{>&3GP!F%b!$r%m9q~8-8NAZ3-&A}
zE;U`yhO}G^Tlg5m2p0p~-#?<a9!8|AiT$>ukY~ACVnH*P>5>K^z<|X1vkUZh0n8@W
zh%Je3UwS?Uv(@gZ?$V9eF;>lh`Qrv?*Ay5HBZ4muBSdErRFJ^!MS^)ZYx|tylFJVu
zy*)!S-)yx>r&*W1AGqg?`~Y6%d^RQqTnb}tniXvgOf1#xT(xd$6qobG--v)%5!KTN
zK8yR;=!eY$I=4I%C?{K(D;bMNZEf0uAi1n8@<R!(_hhE+^s<Ne-?Yhb=~kz1qe<Aa
zog|HWK1ZT_%IK~X03%_zlt$siNu%?V8K+Ar#g^8<JTg}LSBp%?odOEHzK>3uMAFJ(
z-JirZtKYhr_y(p(!g@-guh*q+XJgWp>##~ZV8H!;(aeQ~C8+)*JL^{t1Al)zeFBgh
zCu|z`#p;?NLK3OXr8i0-8)Z!jA8OO!z^5K)G18Dro8mog)CWbHYbnv)2^s3^@RRl(
zD22}>46r3CX3_Nah{p1X9Sikac)cR-CXZ!njLGR9gi-kjxYUkv2d5@Oxm**oh*zuR
z1ngxkwhPsU@~Gz77H36K!~as&a<(!c_1pa4scp+sQz&KhicR@4e&%Uw_Y|I_45%!9
zJCd{)I6ZP+=;vv{CkfUJ--f(r)4HW*xf6e=WxSqvpvWg}#qBkP$!c39UAED@r2viR
zdW`TcpC&!8O_jD{HL2~V%TXt>%Z1n-uECSSV)$hCs=(f1Nr}kPnXbu6@fJ&~@lzS2
zIUU&U)CtMFQS2$E<L3~pbPwoAc;;7aj52{jXUUc3kLh1tapoLt1ju2^LDyk_w-<u#
z=#;YE^(*!FQc9li#CSqKytOdL79rbM6CQxgJE4rc>-h0<dw!&UZsg(72+hKoh*6$V
zo^~pDJ@*At4~F-31RvwEyp;Mh1noheFpwH9FiS}r!$l%D_2D!-bgMZ9RumRlf2ae<
zkW~GunfMBpy%nRWdS-Y5I`P}LuJYa2uzBNr-<Cb|BXt8Kwmu0z2xU$1cW^yR&LvCw
zK<bx*zn<E7TgP&&Bq%L>Q$;WKAG``OGPY{|s8Ew`q-#*(4&O(YMeLhg03h0oHjxxJ
z%QSQGkp0~T)a^P;0RXG-+ugd{fv7sh?g|<Re3o3IW4R^gmAy$D4G<VqY?!`osQQe7
zhOHDfB}xpoh{d-+i=^=$^M^U13z#2yj5Nj73K!<5Gyb&3d$yF1?3THtAj4s{%Bz$s
zXai4g1hdt$u{=he7x^$i^xgZ!;I_6U03K9;k`&GubLhA1Vi-JP@tYS*M3y$iBpzC9
z)*S}&C`WXQ=#4hmsATqthDwC(yFct1cGu4pDy_v?=>#PQ>~?yu-GZ7WZIg{o?<aTG
z7pCcRw95pdO|jJX2n!vPyXK1E{!&RqVD&Y#zF1E`llNKk-i-)!?aaYK87aMASGc3k
zj62M<_rogSm9+V5qy(b?Hqu*jh`fcf$4`TvPnM^Z6b8ER0xmbPd8GLY4L_wTT6o39
z&!Bsh)jZ5XT05qLXJ(o0=unKt@2r!E0I+fQIlJv{9kH*qhrW_VFrRvLI4%Dy)jn@%
zmXyP*x%XZgiDS5W&;&I=>Nv$9P#j}i@Kq(4<11!@)C078lgnQNIGi@SUlQc;kWztp
zd^gu$UZ<!t@_@>rWdf2mOrFiMUEfEhQq|Dlf__#}yh1bqs-CHTWI?Si0e8pYqd$4(
zL6o{^rqji%$XZ8YgD^$$GP`EL%N3l<Ja?ln2Fhd+$%jhR5_2p~G_Sk&-yKL6<C~Ep
z@Tk`{CWRHrjlx@u2c<XlpNID1tl1!4l7Y!;o5*)1wxES>l=l4KX!v@FC<BCk-FH^Q
zF}N!(hZn=aFrdxc!TAFlrwqTqb{(<eqp8G^wFV6L#RF%nhhYk`FPNowaSvljCRv}O
zC$!XpjpQ;dC)#Ad+^Z8UnyqulfGquUC}`2V1u_{WMNL8NqRQ9)PmvDW(_UE`YAjq6
zppvY8O>*H=t?=r0$j(tx2Ka8!Y`DA~%ok!}4*LC*0_Z(q>k%`ntLMVdF*E6Nt<xuc
z%k54Ips02=5hO%k6Z$1F6H7w3{f?Tp!@m%FPkHHSg#hZW;)^!-;k*F|?t0c>ttYA$
z*}#j*{iS?}njzDbn&E1ZbY7|La9BOBDR-layvsZQq($6fdDHNz^stftc>=mf{-WD|
zam9Dw;D5;gbg7}yWBT{so}aU01_8iXoL0?riYL5-oh+p48e<&@gSwl<`gVIBKmc%X
zu_dNQbkuytNSF~;@iPV_iHSmUOknZ)7$M~uLP0@sQ+!r*lgG?GT20>4V_UsXu^DbN
zfNuUJ-^et$nj$0=H!;0oOskaVSFe0uhKeke<J5RSK3YCnUYTCwmHF=W(V~T;S(EiG
z&9(NC%o6D#o8QfH(BZwjYr4C4Q@+&z56L6Ok!uiy?QPt%t>1x^=Y&yJmk@}oe;)l>
zHFS<jCB~2U4khHq(cESEKxeTk!dm_X{xjlOYsc~x(jB|gMrWr4B?7cFqXFLKp-ssV
z@0mm&mlda)mlXKB9}$(Key7(}EhkFh1E&gOU2lb_rhm~)T3fCjQ2*B_y1B}W)m#S6
z%iCiLHmz7lh)n{*aMcu1%vO2{3ZrgU7GxHx22@n8ti;1$WNK#hpoDZ5&#Q6IC(0EY
z{;a$gS7r004lj9KI@vgywnmW*y4os_?K{?H#wEGWV)x3XS@AuVH`){iu$xU=M=nS5
zqVhr(*fO%<$2_{4`&)JF<iP{lils$JiI(&FjsMCRvX^u5RwblXB*ffl0J!$XjcoV}
zDTz<n5-OIk-2{Roh$4(XB)Ho3ish@zD#eD^KN+cKEA??LDyYUVG#_;+)<i}-z(69Z
zFA!Wal>?e@(spVMq94nEiQYvx^g)ZG#M;H`^6Bw7$uk@@ts{YRO<eR4t5)Qn<TPBI
zJ-WrJGVfN=v4W$cWnltc*tqMQ?Xv+?__5SuIizQ2=9rfJyE^M{l1rY_JU<xRUggwl
zs}}!ROn=0uHK#<RKbs4ZUX=gNm&|4#+&*}%8TSu>5}$i_S*OlBJvpfq=<S+$jhfo?
zBXZyJmg33r7cE1Ru04U3(I;;CWxSZB`lF`i0u|HCOW&=f$O2UzV>&e&8rOt;7a>F`
zjQWE>rE}+O(dYr2fiAAVCO!B*s|0Ri4FpNZ?oiC#9M~Hdo(8b1&qnC4VlY{_G5)YU
z_BAJ=`b1J3K!94?sgW3CP7KE4z>m6wursSl9e(ypc`xgeWa4T|?J!O&I9ih)7RwTj
z*g%RcIB{3s8oT9<({8}yzA1M8=9kED!pOuRWXkCkP6mGlo?fjmssSQ848`>F6cmcN
z!_SbiybCx$CXVf({^Q_33B01b`zy0yrxy)9sa^+%-D6v1wH>zAs99m-knctd^We=3
zBb>~WG!~Zc+%fdr5`$)~?}$Lw#>PP>tJIc=4`Ad04=JcaI_R&!P*L`@8T}4Vt}}Fx
zbcp;I{Eu6qt8=gV6&_ttPp4Z(uUzHUinG~}kD4^3%$FA`@f0#d(tDO)Tl~SPj6kHO
zb-@ji8p@16e@loYw6wIW{+{DR4Zm?Ydh|TQ^mHcq9?h%i>idk{TK}7}E%*Gd9hdsO
z<3`~Z3oz!ye>NPi5AKB1RZ>k$!r@hwxXt#E=E*V8wh&G%WIkGa;wJ5)enSm?1m|be
z$wcC%9A=m3pmHX<I5;$5k`FLb=FL`a-+}KCR6lN!#-@hp%~tP&bx#aiz5c05z7d2*
zW`F95#t0;vTPBpZu6kEHaud5J%pUe@VkL&ziejv!>um^kY%FW$**t&-4c8aTTlpB~
zvi~E{5FYl%`*%nfNq%@sq%syrZ;{ARSn)heFMZhdA~w=>r<p&t_f92;CKmZ<2ffN+
z)Y>p@^5f3*VL73&o@n^-TmO>VC7Hj!f2C$em=NMCbgzK7H$WNW+#{n?swSucYS!Q5
zpU4&od<P(IV&g#jHKu#Wz$kmsI0v04lgSO4?zkJCUJ)fsq2hSS)20wb1+INbUHH&a
zM(^n8;5}of%qzW(j=MrrvS@gqVLrh~G%=OG2W@m2N}!Q4c_YZSyUf1kfX1K`LhIQs
z9edPmsQH92<5<9#o;Vd9;_3kn|BllVgg(ZYHa7ka^kX<V*#?)=DB9s6rH9n#?ykz2
z1TkIf^W;nvwyHejZhu;8+=V@9gRhoYhv#s+$s+o7uJ26`1`P{R1c+jpV!VxO9flJ4
zrtkX8{S&TgqWIwlyH~rtx3N)yHzjVv8|%MC63YFz&8N6V*onKy;U&J+f`n$k1BhRa
zNSYa$-3{;T`g5fQPtpS~Y%j^X&tG+vLDfapLd422XJYx|(w2@O&QY<fi(+j<S{Vb-
zOk3+whbjh34kbxxqU#j>7_E-&tG0IT@H@!e!^7j7)R+6PE#q(3>h#L$#PD#=zL@sP
z+sv3ayHdj4h7(kn%cH|OZ>pQT`l#miFGH<1@pvN_n3pG?_!vl=3`ckEH;K<#ey+FT
zJ&BR_L=M&|eBa>qzwR4E&Im7;lHwCn`cL(yO6rn5XG!cLw;kuEv9tOV3Ur^9gehmt
zZD)ju`mcqb-o#&A_|4XfIKM^|40e*)UtA9!!riDES!+M30S&oS%VpLnfrH+)DIY~=
zxbPtTok>!1Q?gv~hEnFjcv+&Yp7e7I0AmdFY{1)cmdfx+)7_mE_-~q>(ia;6ydX`B
ze1(bmxndL-*ET6nhPpk)^7M=9vn&t|vtW7%6Gdn783sVUA*zkdTHO(VKBIKMSP=MU
zG&=yq%J%&>0jlT+6}e=vxiNyvFhNp&6+Z8KU~%JWgX)2bDjm^qyV+L;%V)xoSOQKS
zh0MAeRcAabLFk{4!%=fi<lChe^65ve+{x~fzg1vON|YURPgb+5yzt?#E>kU>A-Neo
z$PB=x5MJttoltGbJMI>p*7!?E=9QrL$8;gaHXXJjU@RQNK6E?dRTP%4j#-RfTY|L0
zsx%@XFoq}FmK*?SVBJ2Yb7KxHzRHi8!?fD%?{j*7?=}ypZE;R1hzKgXq>}mBhG|Sl
zNd%J#G^UK40Q`}Vp~Ajox+)_`7&Mi(YFO3^8PnoQl;HX%2-_{S3|*xb;zdR7g8{2q
z<n}GA@$f%iCY{BgJq~xdyl8p1>IXd^1#X-Yq;%NFY});x4|DWk-Nm;#2Xe>^xhTct
z?5C5z?mb62JP+5jDoF@0GFv=icn#{Ja3*?r`VmEuvkQeG$dh|T_UNlLWB&D}Q+9S*
z`Bu&FqAg*nZia|2sJ=x6;2jZ`yLmEa{-yzO&ZcUNm$8{lvhmXH8{T56(0f?`4?oCj
z#kVm91R)iN-<V6@=+gZj0Q!?M(r&@~9@D#KjH_W_VE2U{TmDqb07%9*O5!&l^b!f<
zlq^B_fV*3ZbYj*lx;W-Paj?~Et{sH(kVOucL*dDWGvWXp@U?6+|Jy0cOtZhtP;(&D
zt*35idNe`>b=J{%k%mX<v!2RL9>k70*RswG8elo022Ea`P*R9^!U@@|3iF-up(BaY
z<RI4V^wutC-!tE$|52pI%86h$`sEK6hVR>pi~Niz&zPpGD1L@68tH-4&8h1`y<(Px
z)|(2E*5}Cc@OpJ9(8P_Pc1@u~Qb+fAl=+uK)Z*QA7&ClbtSO?=Wagzdk6Ob6`Y(Lo
zP=a0=Y_jv%p19$$PNMv^fn<XMtkA8VL!$v^UV?3Cekzi$ZgV(zit}XzuD;kvfp==1
zWf#L_5ZvJZS%9T*SAV~}qCL8$ECtIfReC=x2_qF9ifY>m=ngu#n(}p0>is^t6LrLl
ztx`^YD_e*%mgJgi^;QzoFX+dFTP7Hc($<~+#~?b9>A$83hYfo0l|=4{XiKQ7T}U~A
z{ETnU3NEz=>^~FupV=Ua?gMY(qrp)bI2aw>=Z5oAfGQGn5?ArLS*otK#;Fc;5wb=0
zEtlS3dK|7^vh!Qz5XD-2$>*(h<xnBdzjAOiFSpznG-`IX0#J{YNvbJ5TfpS0K*Wuw
z9mlEN+z`QjbDAX(;Q9SuxCyLaZs+$c7knG)fpWz0XM5)tkOb0ir_#PvCtfZ#6K%D&
zwV0w6^qynzj|(RJA(C{9u+=*|09Js2XJWld=r<emD%6GaDFlMZi%mnI6FClgn5@1K
zM}WaZE`P)KTOa|BAf-c6|7)`*H-SAl<?qkL^?q$NL6IZT5X))Lgjy?tpYssiOCDW<
z(xdWnUXC`yTZ4WW4ww2HJASUwPZ#=4cbkj8J#1p+kq2o*Oz{Yw#2^{!9#G>2&=g;a
z52o-Hvn*5C=ab7_e#978dD_LVS9;iW93=F}6Vep9V!us$N(!zdnN66{uSt<LL5cOm
z^z9A+j%x`YQ;D4t^5yr9jSY*-BvhP5k~B>7L=9G75=3Rx3JT(Mu89k-E^(kxupou5
zQ%2ocWs}%bIs?H9NKV%(fKA;9MyJiyVoQl0pyDD1*>405l=#(RHrqg_OR_PQTb17Z
z;=Hkw{&Bb((E>kI35Go<^6TnGC0eTw6sph|h9#HflbVl_miTRYZJh;pFg>>|)d=~r
z;ekEC6E=-%w^QzBPwJDi>3Q^41jIAw51EQ`SY-p?yFAiDQGzY1e3ZjraF4!!|6a)B
z6UqSvXm?xCAr*)!O}m~2C8_CTj>l<SpViFiZ-vl^eF&0yUvXm;Tf_w=Qls8U#(FKu
z<`TvX1}k|9;T?<lg#T+sO3wY;eJlgtVU9d{vJFwYve$k_!>j#ynM8+Z@@uA%jz@0E
zu+r_#Q`L^^y8<K+RaVBvJrDduq0C=aCim8Yp?}BL8?!AJ7)UBXMYA5H4ZygXV9lnM
zaQ99-L#Z<tBSBF`lJ1A+jhg$2KJ7=E?qDBzXA>ppZo+IakV};bbyYVd9~gOCgh|A{
zsoc|&M%j~x|Mq|c>V5_yO<4x))@vTtc~yqta{4?94JuUgPN-8=$=MC`w)?<^mDSaL
zQk-Aq2NtUVSj@_U1+YdZ=jWs~DmHdn&`MnLp^6e@T!UD}!TP#m+i`S`%|~RP)t*!M
z7zpFi+ft|%ZtO8(>C@a=G|w@fl9WncBrbJeFYFahF7)4XO59C*-e4J>UeK+JnM$ev
z0Ij;@6DjWJR>+|riDU{@fZW0K+=9fq^t`dm;>NQ)^UWR5+V3=n6|SKO2fs@`u*W^#
zP$i1|ka+%U{J>P4s1Eo+Un~w0T*jYy$W7L`hZw4aJdE`e$C~qv>ANYP#5l3;t*2kU
zKIir{1oZtY7T?7S51<`LT2;!z;*jXO(81h1piWK*B@~rG^R4r=pL_BIIK?qrfqfZ4
zW1DJNnLgguZYIPC{y)30uixp)+OP4{=}U}>cyLsM)e%Zb5IOG^5nDL9ydFk!eSXS8
zN(a0?Wl9_XXuDpUnWszjEIN`Rj}Rt^Py=kdR3>FSySFopV8esHampF|m|rSdg~kw2
z7%tR6bFhdfojw!1jFeapR|pUYo2pdl?HOabH5jRJU;lVASp306_zS`X5xcO0jA!2`
z)97dwZ`{F!$}3PH?EC5xKPH)nF9+o0>zRO0C=)q^+>(v$RR&OAMWG7`aO)y2Gewo`
zrq4`-r4fG$PWXc(tC?fk;fuwd4w7&TkJZl4D2%lvLT_aJd=BBDbB5Z@$e_3Q7m39#
zfmp`mF?ei-S?pCU|B{ruX0Yv0HQdO3GMR*WFJRRC=cwxZnQ?RSCM@wZ{hi>L$FofV
z`2|A~n9C}mL>TzW*P~F2Z@xxGMg?vpvWr|3{ZxZ^SqCs6V?D_>{2r~&u~12dHv%?g
zEIc4rqW8`I9;8<4H2u<y6?|?XpFxUV;F=xgc||M=yn>KYLHcsqzrQVb{d`qU=h-W_
zrF#am$5D7uApU)cAPIh;|Ivk7lzLF>d1z%w(F-leR<H?Egfig-cRQQ$p9lgmDSL`+
z-UrEFK(DH>8Gu*JC{9s7Me;>Y{3II0Sw9F*HHmVq@QwH&u;>dk)QUQE9x?AkZMU9e
zbm_=;vB4|Zu#2DcizrWC=Mgv6S6c4f(x`I@$}P<)%+Mcir~|8>_OKN*@?G`><e(fm
zfyofSI4q`wv#rcQt1%1|Z3NKm_H|pb@#8OZtB?d4DHHI1$?JNT3Cib-G8SKb_HJ5;
zyQgPDf^-$~b4JZ$4akwkd=r3f0h72cdHD%@?I0z+DZ=P2OMgEA^N}<h8Vq_@Ngpjo
zdR91)zf86)4izLKTKl(KJAnyB+v8k=iP^14G<BiiO+Qsro{zFe$a%ZvJ<%0h&rKYp
z_4O(|nm}B@z#??{4e>_mv!%PolN1U3+)nu;Y0O|V;NJ@<a*OQKvzGr_^I6OOL{0|X
zuCnmpDza2jh2Xy^Yxfp3s%!nvJbiZO=i}H|4|Iw*0s(BvjXSRxpu}&B62;zTEH<0%
z?d@MgbM=l0gK%O;n&#&gQyQuzr$719chLI$iJtmu6Sv(K@0xaP6cXxDJ?EnxDawo+
zgT+j=3>2;c7{7)hE{Z2IvVqO8rZYdzVVLN^#In8Yegevo2|+SC2PvcG(rfj<tGLtw
zuYx`Y?h2W;7b+7>k|flXZm$KEL1gRe>pLl`CwLfl?7?PK!R$bO5y$Mj;J?&Ony!4%
zGx1PM7D-1MBvE|7tIoIpIGcUY8!8MW-^twgTM8KHpz!z4m3mutR8NAF_BQ=)6p=T?
zC{IsMZ~X}(zMDp^3cJGm%Sn^+rMZrUmRl*Q{sJxeHiy}C)iP@RhciG|BU8{HjC-{n
zj-8Jg8q5uG^`!dh<1K&J7Bq&P;05?f(;g5Da)b+|jlUs~vQ8EMRyd55@U!rNP+C`z
zwIzl#lBSxK!N^z6F0s=8rfLli(y5a1V<L$07qoBq9|1Dp_Es!m`z7(ue*FiaNFf0P
zYen;C$=OPD@lF=8cQK?97`jpMCO%S%SGpK00g;9Urue>9T^QW-Tl#Q*;Fj}sG9uL|
zXVy7st~?h@BmGMPc6w;V+*x0=z$9T~;<Wtghj{Oj7+O@I;TEqP=6j?Ciungdf8pJI
zCkQVP9iKaD?QX}ogE=Q+>&3+)(!gvNzIbQ4rQ2rr1PsmA`sU&BRNQJ95|5ILnqVLS
zQ0}x}{VMwntvJ=VtZ!t*2|_tR#98KZ*LuH_OV)P*?Ljavd>$O8HW&VH6P*R@Di=IP
z<r7kcJy$j~->upB8+AZnwMr}MR@hb9Q_l!EIcX-@5NK}qaq=6vmI3lyFa~cybc9+c
z*=2kBs0AqvQ>#^X48@O{nBkrN1rf+O>x)~eL19K?YuZ_O<<SkDmFxc-D9G(3f9u}d
z^3n|iP%GYuV>=lbPj8eL^w(FgJ2Ok=)@D2s--JE==k8!!$usWSkuzykuQ4htHK$Hm
zB~Kr|pl*vMsGx%`nT!YKz(te0xm3Wb?4K7D)p_~s6HX|k&-mtL47e~-7+S9j<N!t)
z<8bS_#nm*a!Gf$piL}Z^1(xmU$8!jdVyhRa74dj5PgQP%FHPA~o-}YYYCU(;!3oh{
zp*{QLU87n#=X1K4Boh2}Afo0N@KGnB^=6{ns}$th{s*=bWYYTHeMcCn57C#URX@TX
zIG<F8T+X2x|9qD{wx4|GfX(n(>!ctT@wGdevG3ywEQ;w@&&=F8YTA!N?hO<SHln4)
ziW+kQ0w54810auo6$;$*&t+DS(k8nj^3eC65ULH=Z18T}3`8g_%-z<42jzrUv<B2N
z+vyYSp<OuJu}bG)Y6MzCuqM>rpv&0ttI0Mc_AL|%-$~qX-XIt`giOQWlNy|!euPpJ
z9J~zbtmZRy20qlhEMId*@&oIUm`gWR2)21NUB*Bu#X;yFxW<L9oVgz+JKoM_qFY0V
zB3Gc61d+mhJSW%C%m+bKxRByHy;<xX8@4kH&Xs`N69&kg?}Wn4tl!G6;vk$hz5yL{
zL1YL^R=)cepW+?V8^7@|`Y?0kUT`eOU1a}4(K^Jek>~g{ebM2eh-gLrp7RAJ+jZb?
zzX~GOS<Im6Y})=j;2YvHln4i)9YfP`jz|k^ha7x?B8M@!b7ixA%z=lAG&#1^T+?qf
zQ-4nvLiMDJj8{xD>~>2u29e)c7b81?AJb<|^NuD%1-|lqTvKS5t^qtLZr{qJ5W5Kf
zi;u%iO>fm|$)rx&fFdne0$X$PWD0jp3C;9+ltrqjXWSkbDaHp_LLdMF$w^nuLcL=&
z?LpgM!#byEUcV*1tEF2ga%r>vA@8{<dYAi>adRgYm$RQ=@luzKN~S2FB-12D?x;hD
z<kIFu(TfA=7AYLF5s-Fqz4-Nm;B3tn6`b}r=WknaqkS}9`Nc-oc#xr+e{6UbC6Zvw
zfZ!o8ogV$QI|iKzHg<=spHND}_`q4RdWt&1Xg*+sKkXa_K#_+P_NlX(=|89V4<4yF
zOAeGGsK=>@xHLIJeD9hPD?y43en8v|003c$VDx%!{R~m)ts_|d-JbovAl}F23Ac;M
z^@YWoy%Nf>kum?HPV0WR;!Em;rIF(5eU|qzeRMrTR}e3x1>;aKV8@L)%Ve+OkHsby
z*#SiNp|M_-Wh{v@runSmoFZ>E4c)a`x(gfM7*kU-fD(TeM{d1ben!K5El3-J0_c|S
zSy#F2QnW4?Y<xN6+q{!!F`NggeQSu6%iNa+62os}JU%LfnF9t37wlS2?i41MgNukR
zqNajp(7)#ViRg)r)XV%`TT^4&mpik1DjFKq<b)e64`J18Sz2iSEUg1XNc8KW2go2K
zX=e6$RY;M=cgY`r?urnZVRzAW|E;i>ql3Ssc%?V@kwRap2-<dOyPu#9>H!R~jG?07
z#B>T6*eviY8luXcxc+6a`Kxu7T3G=;u*5&$e+kc~0Y2&X^WpVerB#=b9MsJ~H_tS?
zFtyU{@HLfSfkA;8iORh%H0n>ny&^n$g5}$uGxjn8V>KOOf|9-AfFEW4be}W6*(+bb
zvJqy$fBE4UQQ40_f^0K<&jEl?12E7&hIDhKR=2lHDnq}rpAkXid3rgLbM|C$ZI*>l
zYnTL!F784C(hS4iJT^o77`M?!^y1(H%qU`P&Cs7o5<jOES0tX!68Gb-NPO9}Yqv-W
z4mma1k!VwizDkB<8KAISMkKD<9vSuT`)4VX;3bxdW3QJS;va<FdmP|~`QO;*gfea>
zieJSD%4hGhax1IaiX%Jo8*o#dEg_%@1Me`l#5hr)^0c1ryVT25^IJV<t<{frE`_9b
zQpCGc{==;&ZY}pMh!2`mcV2TTm)XyNw}*r>m?X5$vTOHHQwX&VYpoG6FYBZjtA~-3
zKjXDJ0q9;@WL_NW)*G_?_oG?A6?9rfo2V7sro85!tr(!x@bluZuYJQ5kJhjcKR74{
zXEzljP!dfj=|6Ht_ZW}8;HFhzRC{t&;AE8x_qSKY@{p{pngQGwjn=i>t3}l5xN<B3
zzu5m%WT}}?{)XBJLyy2v0`n=foR8#VaN!s#c;kL}ww~^2Ny%oZ?GQrPKH&{VjtjAo
zv!;?dyRx9pQ$98*AcYrshcc%k*@5J<asxert@!u&mF6t1`-7Xn8h6oy8-(5$a*c>w
zF&>ifdRpALzV@naw?QlnUijQV4JoryT6Z?CtGqk|fRSi|#gYExjRixhikeuHQVm#&
zb!M?g1g@1G0MIYn0cfB&;3Of)Jm%UtPw{9ut)QP0W41B)1qcFyjeO62)qfv0)O&NJ
zG<YUt?IWtKCFkO|D;il-v)EZtWJI0(X8A<h*=0LlG2)dJ#mbIJNhCgQPVXol=RmPE
z2@Z^O(Uu_G7S@n{IbH%UKI_+@{tt@*3X_;JWRLH<riICh{k`lbu(9iarU)g5eKqCC
z`sKHP5haM$!)8^04L194CZNUaoMEe)vR6kF&Q)*7W$ec)z&PASmogxHs5^NM5>xb<
zvP3W23-0?Uh!VZ@#SPsd0JPZ0am%VimnzsC(K~!VAIXX0N(gu_9TE!z0RFL0Z+61?
z&lXpKiFiy)a-}%smH?ae4+JK*cIFxMh7-v^VhgGogU_#6S!QhE1Jz;M$It=XBr}PD
z%<;Cc)Ez-ImKf+2-%fJD872Z1(cPU(ZxWm0bJEujd!85DA(!6(XJsf{*hYc$&(8uG
z2=?B*5q%Xw;vs0>O(ttbM{byyVtqxv=T4qC-8JPQG}*45%35!X`l4P_6mS7!RDi!<
z^^0((w-Ee~<p`ec-(I;aMqQUPD6}APVwpqqqH*WX*^+TzGjty62c{F37eVR{=C5E5
z##!c|2Pwt!o)5^ZNd}Waz0a>MxZ2>=p13<lF^JnLXX<F;syTI!g{5aezlNCaM+zVp
z-=L(t<VajpWf#V2Ok=qGjFIHq$vOd<kAYCIc;u!Ec$cTn<==A<g6N<~6G!>=irto(
zLY~D7j%W9LAc=zPGDaK<khth&pcYNx5%6?U@kO(|%7^JP*f>*F!Wdhr%)PLt#wiWZ
z0^fL@MIr0P`1Th@cl@Al_e)TIP$JHzxj2ND^=BAvBX?LO!#IA3*@^%_U)TYIv3p`t
zjSphYE^@!+t|F8sqbz;ZNKDVqW2%C={#;*>R?#~2Uy;N<r}=6I2~Z{B=cqqz;Oj?s
zM_b6XyAeZkcfIRbff$S_k*@ss3|h^fLEF9%dyh)gpS~E(Bcyi~Tk%T)B6WVYSUo5q
z@ofi_1#gMP{;^Oaa}vJ<_PB-mSgtge7Ly$O&j6=FMmn-1H>bDw6Amd;`Cy0E%Y3_X
z5veFQr6QLwk&a1)z$NxKxLLeThQg#x0eY@A_Yz=4$JJw}!r;npD=wt*(i6n5-yC7-
zAgbOC7Dc+t09H=8hMF~l72?YD(b;*yiMCM@@qrFtN;my(M-Iw>-UpT$?yppVA_)4L
zC)#Co9K;;5rHF+r@$U)v^xCICiRgQ2(RwbncsVYs{{3n(rf`oQ=s#-$RCV#;{#kn9
zuOfvXF{Z_n#l>KJj~QP=00dZvZ4wMD18cp+l$5BkMC2iua=5<|hsjX2xC`cKSewt&
z^-h8LvdY0H=qbpVrs8z=B)`w5oVg%yi3V-AFMj)NrA~bGezC9b_wPZ(+2aVU%m&+a
zpxW9(snZ%7n0MMyBesr>-UC-G)GlVrGtRZs-ZnAXVYLQ0cGDdPSr7Wd=w4y2;5%bP
z{v5*o+y#j~fz!0h6cXDbz2>CUf%jJ|%BEAN9ne2mWs(Z+FlY7RxgAN-D;2tfCqeO-
zA8<3T^wr4#Eq1|jwe*!4%}o&)#{jZ9XFN=bN)PcX)o)yV=F@~J3g5qYQ2GT}ty97r
z9UmV{e4bmxbC8iF>j<8{CkaJ1?O?Hw4rk|D2SK<;SXh(b4*|)BAEedvi19pBBHXus
z<DtaNa4uPE+*OofKFcF~@sn(o>}NZ3?Z;o-c;|*Kj|Y-6*rcISCCRuW<mLP-4>t61
z<epCE+rp@u3E5L>WUge^q)MCEz_T~!$P%wNV7OXzC5g&!@1*>8+0L_|in*u-r=~Ig
ztnu{|WVA|iV5D)~LZy;Svoq1tUy^pC3gGEeTw0x$jxRITOh$=ssb$hBs`;7>%O^7M
zHr-og;(-5^Ad+&dSq6bZ#qD<6dM8<U6s)by&%Q;Z`xltHQ2GfdM|UMbo5A45Qpaou
z4?7%gZ3#NmOk1QuVNp*mP_rVR^V5p2EUL)+mfN91@o53b1OLPbMxay5#rJ~eOic@$
z_k`KYijboYnJJ1h@Z)%h7Cb3EoCf~K(_=-=29IGfkLS@0YG`PY4;)ei8x{FLI@^=-
zoOA*ih(jrR)x!+LoYqQ3yI24vr*1U?Dd_sSmCC;5I9+WIGQn-r{A1W|_n;dlMumM1
zJ>ZVpN}cpbX4}_6{Hu~u${DY|KbaD#YlK8Fb{RcAjcFOK%FTjvtP3&k)iF#O4O@<l
ze%IUg=6U4iKs~p|0og@09MBs|uIGMGUZvHx@eCo2=H>B$TRjmG|7h!>Lx#W*M<Cu)
zRB8fgl!U2UxZ(~AUnOSUYnpX=(EsdujaE2;o`#*P$69@I>UEW$ky}N(bLPhM`!YPs
z_9?zW(WUDEb{juE>CCpv%plXpAzvb9E)Uqx1(Q;>8fVByY862y*lY4C6gTz+!GTu9
z!?SgDhPo_wk&O-?ZHLm>G7+uMEmR_ZzD#lhLatjp|I)*LUrJXU`*YloRWJoPT||>Y
zCkE?(xg?HZ=1B56i8?to>HRB&L|0W&V2xgH7S+0Ca{3)2AR^2<Tr5x5uG1S|*O44R
zzFQ6)snat329X#@pP^(G9de1ix-aD+P4A2C%Ra6&J^Ch7mMw-TB4`*^Zbt(kWVk39
z-2damF25V}cU#w4ex*6$2<AWeX;GAN&CW4{h_I_lAX)WuA|%Bji?+(JZCg>5%4co-
z=@!-h7x+_x{P@{+5w+PtfckZYhIlK(+>N<*ey%)4j-kA(Ot8uZLzeR!F*thqhqxEr
zcDsem{uj!m{7}Sj%385D?@fuyIAaYISO7H^KY}FU3_0zQ%)f=C4qflV3vz91pXWyz
zU+b`2(Z;?o*#A)+5R4Q3tDaLOy~GM@aDr03%B0;wBlQM}vMsxcNy>nyw9-{FghVI*
zjaxzz^g1AK)Rq*R9aN-Nz8H#iJ>H`PfstMZ|4zBKt>q+QAP4j!j#{5`&fiWnp9K^T
zvPJFliJh|{86>b^S)O*lzQUFnDLkxjk8eGGwp;kc6LokZ4vZGbIr9h~v{T@msG<*g
zI$2y}a~P6rx~u;pH30&Ur;WcOO3+WqLn$jsne{_EM0em}wSE%+N5;r6_IzKJ**e2H
zhucF7ex)+e`Q2w#1({><Z%f@B`4oKMi>Ng>t|!0wC>*@*+NkNetx}vsz-ehOGeZ2h
zOHaHKE9$R8ldx&YUI7mcm?7oo9;n6!fcrKf01tQDp^O?+E(-afigSY+VOs_J^_dZh
z3d<3!ixwrJK*dTsks=4-i(sf|%&LeL@j<v{qX-M`3$VutA??$aClv|S&D)z+SZrLW
z_0x8rK5Hte6BWJ(3}m9SvPliWy9j|)wshvXxv*`#Vfhppg>xQSSV!RjC-1*<+hX96
z?-hr5mAsP{!ni-hxbj9Ua|k4}PardNA_`Of6%*WxzL=}D+`f7o(!Egz2ILv?40)jF
zY11j(5JB_PD+o}w)?zZ0SDMVB!qT@FVhCat!j{ue=o$%d6}t~Lvq52q@#Wyr{G6_;
zJko<qi_Xdk#}}YNZ5y{ZY>6PwqO5e;;9q%lma-iSqKxqVqx&p#i-UdtkRntOG2@+f
zknS3l_IHT=?s>axr^AddHL!$an618%Ar=t^3JlRHQH@)>yiL1XZP4@@XH|v)Kti8k
z8`Z^xHB4m6oC#LgJ31)XHcorAk=#~`^{>xYIenVyrAm-aF=1eyjU2QX-GfwIyJ^g`
zC8e&5M@p!z;_TYa+cmVz1)0P#vYSNw84ujT(Q>wK;5dI))k12PQkOfr_rxMY)*=;A
zSiWxy`B2K<kI=qlLy8pKnVO0JgrCoztgU?7FL%Tb4*f1Cggi#G!*lw26OF_4MM#1u
zy_iH`?#Pca=}<~EU+!`svHakg^3iXs`2uBmvm(<ZTNCP<_;pq}BvHgX_cR+^YObuD
zJLU!3lTMNCl9nuFG-+wKuviuG*@7JOIV5ql`FWYW{$A1x!tS$@zG|)2D`9Q(it<9O
z37qkXR)kn!a~|V5N_~wE)n`<Bz!Ln?C#n3u9C~W+^ifMIOwlu}Y5>2Hi$$y^i&Tag
z8Ht&YjSh3UeoT9ri+jq!*TuBw9*8Z>Ay37~$N9aXpPz*%=(80BA87pbT~;u*wyl9-
zxD--AB78uc1tLtr({A|1CGMiKHFnF1?D_lsnZ-axV7wbpR0K{004TJlFBskKH~aAz
zUL~B8zE$11AbsG<&o(^XE-O(rPQmxNU}@Dk?hK)O=RZ*TIxIrGk{`>{(&zgW_v|8L
z<Yybmkt2uVgD-7E_2_JX@iMFT`9Y>?S?`lLAFvqiE8mlvM_9`>DoW<22I1QD<DMH{
zc%nOjlaQTa3yxV(n&Ijemr;2QW70*#U-O6_-XV&qJb=!_s-sFQwHYyl7}+}hT~!I6
z8)V32zhrc!Z>a+MnEzmph@j?WP8o3own3(_5DPm=he7|&b$0}3;@vu!GARaV@C~kP
zSrS(plS#52iKmzF#PAV-q$1YD5Pyn8RNo(6j8NJ|KHE2;*#-NBLrOYP6cXkR7@oru
zJ4h-S_-G+WGql|T@`qRtZV_Y-!L4m-p+O!CBH&}hIU#yc+A4q5XMq9K6r1Sp7Kd)g
zK$OM}%4bqoCI3wWJlw@p7*9&$Dvr?MVwU<TYZ@Gq(M(<pfQ;_KJGG+}z6CNEIxodF
z7a9EHCKvx%6#(^luao19&*K0Qf^q24S4{zS%eHvzO7ON6F{{{YEER@TN^};!wYRdO
zAms~*oS9ES!FT&Ukb?R~X%R^YT1@*&_t~;8ij~85JOKcN$p8K?0P0`Y1tiD?*=iFY
z7u{A3Q%na10#}yo|M|4<>R5QYBOD5D3I=49x=m^k*3m;$=>#cH+@v?qsgZIv6x7Dw
ztq=@v0Nfpjiep<-oRV;z^v5~e788ZUh!cm>Jrl@9eodv5Dl~hP99{9ysOjRSrnCOX
z#yd}P(-0(R<Hq?bAYMo~<69waDEITxLnvo?iJu*!bN;~WcVP7d-(+2!aH?GPJ_6!Z
z@{SR-Ga^_E_V_FA*DE8;?XQvV%8-G*Y8|w2QHUJAE_rK&>AXPEgL;(fMlCzUa>7ng
zEyYJ80q6{DIyqllT;yFy#;7uY#Bka174c7=5rXtE;E%s5`H(T3u0j4rU*E*VGLYlR
zQo+sT)6D^|g6mxUuc$jx?B?tl<RdiLP7PSs)j9p!zYus;CUbuo{Q7?ZTn3~02w}IU
ziF;jz&o;{qre4PEE|wQ5+kQx>KY@VkQ$u*axcbSYW$m2FW$qW?qX@`bLh!);<ty&!
z?(PmbQoZ*`_Qdv6!oMJR#Jx0~vk!JmCz3R+t5D2v9P;c&{wnQ}rum39g0;>-03e;q
z{Y${v2%jf?3du(jX6&4FF891!On)4d&;64fM&yB_bj`X&(loz9rEi1(6o~-ONZa<Q
zmSxQ}h<O2lS|e_jKaAU;^MF>xb=1mQH^mxCGMU_r`NB;AW{1Cvk7}ik>=+nWo{zNM
zh2ZVS{{cKG?KpL5NUaT1EX%US85+NZ;EMr8R}1B+bgz9&!Zg25;>QTR-oOATr=)Y)
z08N3h!CE<j43bKvUhB@8A16@7;h5~MG@l=cL_V?FE$oe8H~B3Ac_?mKL2eamHSu`7
z$DlkK!Z_a4T0WK+{Yb3G{5y%CBm81~kyi5IwZ%AqwcJ1eU@qqtGLC(E$q_KD&g{kl
zxqh6{c4eOWON3k&P`*uw%af+{hhmnb_ZA7$+*4flX@Eg8NjU}XW*FQw0=yuCk5|#m
zLx@DSuaw?kEVI@d$RHWVxj`%0)lZFNBm|FW6ZMP|-b%r-1bp}42^@=j;kmIW)=&%E
zPMI<xVOf^|@{bTM{P(~$_SPa_Cvis=F8=`J;!Mujdt{2ewSo7HfdD`@n|&UJ`XInR
zRdJh1Vy*!DC?y8~{`oSB2Y&KM!Za`4cFL5nTg_vRcr?EEigDxTgE$rb&p{rLZwlmg
z81BD7RO4;%3c-ETPWFt^2zF`&YxN@CkGN?bD8O&4d(&YhAeRU@g$R|C!Vx7Wq_Ww-
ze28OZk#1Sm#0YV5$iFWG$}b`MC_t*pkwWm+_Cn#rmliF0y~eJN3Er~?0sxj}O))6H
z2k0x}Tmc8*BY^CSFapZJ90i{9vg5qu)0a^-kYqC1p$7^lN-<Ah7$32JqA29OKdOsK
zc}pm#q;lEoYU$@#<2`L4gCwG{FGKXtL+UOK<z)byA)Jx8Ag*&2zHi&MGxFkS8OW?z
zv)bNz?Tup~`n%zxG+6*7i(;@=fMa6Wz4uF@?U>Y})S_DYIu=<c3<MaA=XNhd7=eNM
z7yx*MD{}ErLus{vlnmoA2+su&Yjpi1_%A4DWqR#Djb`*;GgxN~WRRlMqFhq#oVo@G
z@BxVYK_Zdc3x&e?Rv1Vu7TZxYjuP-t1bE*zfPR2Ko6z6?ld<N7+bGsK0|AP;@8YKU
zMGzMtoU%r}yh+F$0l!q?T3rSrB9iFo*%~7IvlxRiz4mTa(=cw<BHzkpv$>YEH%hFN
z1~SOZ&1Y_~dcuk`K%7!V+(M&yd)&$iU15TRM8q&nb2Eedpor`YU>6cQqO~#c50dKK
zOfK_i3)>tu)@cJ7WZNlICamb_JeI=K!sMoC5~~5c4qz#Or6AscNCe=f5KIO!8Nfu;
zqH<C{E(EvHRTpJ?Gof^p-z%&)kRgbO5jV|)K>20}w~KXwRfJp}p?h&F1*69j>kY(%
zL^Qe^l=?h04uGJ0wENRS2*IO5-lXy!H!WPeaOr4wXf#=GAOVPoBu#TiO&<9F?cKpj
zTR|Ab@&B1dEu;&P?j(>vLAtF<_k9EP4SWFKqiZ)Ve1T@wx6mwX>8@g1Q}F7>LKg+$
z)|t=61rf1L(q@ty`F{HgvpI0@%$@Urw#dI_Iu!=JAl`-R>+U2bH_ZwU$cU=D<zWkK
z19-`Fz6r*m1dcG?$3XX?!%gP_`7fPLXECI-3SkY|nyRyv_O#da5Q9@e&y2$m=+S6=
ztov=gI`Dvu*~;?D^E6+snrWSCPWYg?8RKHWr9mN7AS*DPDe=kX!{IFcYF-B(kc?im
zJ4X!e2fptIXb<>_St(geQdCkjr6?&WDJG>DER;sPh#?fsX7hZUEiA6$0m-B)j%)v7
z=nk)2#h3o+kfR@5Zjb81RNWZ-OW9j3I%!?S1CoiEB~{axMxsBrFS;r4fMk^pCi9HT
z#RHPjliv$(88jXD4#8*U=Jqo#$&JVZlF@N-d@0kgv)L2awx3PZiw7jLlkeZUV4M8C
z5BRIZo0ERuU$1J$w|OU|)oLw0Z8Ubwcn!P)E0I1J96Y<a+I_4y@@Cx)Ph}sx_Opkg
P00000NkvXXu0mjfKN1wh

literal 0
HcmV?d00001

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 25e65c43119e..3a5a4fd4e8d4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2596,6 +2596,8 @@ let
 
   ossec = callPackage ../tools/security/ossec {};
 
+  ostinato = callPackage ../applications/networking/ostinato { };
+
   ostree = callPackage ../tools/misc/ostree { };
 
   otpw = callPackage ../os-specific/linux/otpw { };

From bd035405f4f3f5b5866a1d2525cf9679247e1f92 Mon Sep 17 00:00:00 2001
From: Wei-Ming Yang <rick68@gmail.com>
Date: Sun, 3 Jan 2016 16:07:30 +0800
Subject: [PATCH 252/884] ostinato: add ostinato in NixOS services

---
 nixos/modules/module-list.nix                 |   1 +
 .../modules/services/networking/ostinato.nix  | 104 ++++++++++++++++++
 2 files changed, 105 insertions(+)
 create mode 100644 nixos/modules/services/networking/ostinato.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index e1ffb0b7edf8..d7018a82d876 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -331,6 +331,7 @@
   ./services/networking/openfire.nix
   ./services/networking/openntpd.nix
   ./services/networking/openvpn.nix
+  ./services/networking/ostinato.nix
   ./services/networking/polipo.nix
   ./services/networking/prayer.nix
   ./services/networking/privoxy.nix
diff --git a/nixos/modules/services/networking/ostinato.nix b/nixos/modules/services/networking/ostinato.nix
new file mode 100644
index 000000000000..13f784dc53c1
--- /dev/null
+++ b/nixos/modules/services/networking/ostinato.nix
@@ -0,0 +1,104 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  pkg = pkgs.ostinato;
+  cfg = config.services.ostinato;
+  configFile = pkgs.writeText "drone.ini" ''
+    [General]
+    RateAccuracy=${cfg.rateAccuracy}
+
+    [RpcServer]
+    Address=${cfg.rpcServer.address}
+
+    [PortList]
+    Include=${concatStringsSep "," cfg.portList.include}
+    Exclude=${concatStringsSep "," cfg.portList.exclude}
+  '';
+
+in
+{
+
+  ###### interface
+
+  options = {
+
+    services.ostinato = {
+
+      enable = mkEnableOption "Ostinato agent-controller (Drone)";
+
+      port = mkOption {
+        type = types.int;
+        default = 7878;
+        description = ''
+          Port to listen on.
+        '';
+      };
+
+      rateAccuracy = mkOption {
+        type = types.enum [ "High" "Low" ];
+        default = "High";
+        description = ''
+          To ensure that the actual transmit rate is as close as possible to
+          the configured transmit rate, Drone runs a busy-wait loop.
+          While this provides the maximum accuracy possible, the CPU
+          utilization is 100% while the transmit is on. You can however,
+          sacrifice the accuracy to reduce the CPU load.
+        '';
+      };
+
+      rpcServer = {
+        address = mkOption {
+          type = types.string;
+          default = "0.0.0.0";
+          description = ''
+            By default, the Drone RPC server will listen on all interfaces and
+            local IPv4 adresses for incoming connections from clients.  Specify
+            a single IPv4 or IPv6 address if you want to restrict that.
+            To listen on any IPv6 address, use ::
+          '';
+        };
+      };
+
+      portList = {
+        include = mkOption {
+          type = types.listOf types.string;
+          default = [];
+          example = ''[ "eth*" "lo*" ]'';
+          description = ''
+            For a port to pass the filter and appear on the port list managed
+            by drone, it be allowed by this include list.
+          '';
+        };
+        exclude = mkOption {
+          type = types.listOf types.str;
+          default = [];
+          example = ''[ "usbmon*" "eth0" ]'';
+          description = ''
+            A list of ports does not appear on the port list managed by drone.
+          '';
+        };
+      };
+
+    };
+
+  };
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    environment.systemPackages = [ pkg ];
+
+    systemd.services.drone = {
+      description = "Ostinato agent-controller";
+      wantedBy = [ "multi-user.target" ];
+      script = ''
+        ${pkg}/bin/drone ${toString cfg.port} ${configFile}
+      '';
+    };
+
+  };
+
+}

From 7ad018b786f24848575ab94fcc8b30380f8e9cb4 Mon Sep 17 00:00:00 2001
From: Wei-Ming Yang <rick68@gmail.com>
Date: Sun, 3 Jan 2016 18:17:13 +0800
Subject: [PATCH 253/884] ostinato: fix a incorrect section which ostinato be
 placed from TOOLS to APPLICATIONS in all-packages.nix

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3a5a4fd4e8d4..bc3a031127ad 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2596,8 +2596,6 @@ let
 
   ossec = callPackage ../tools/security/ossec {};
 
-  ostinato = callPackage ../applications/networking/ostinato { };
-
   ostree = callPackage ../tools/misc/ostree { };
 
   otpw = callPackage ../os-specific/linux/otpw { };
@@ -12611,6 +12609,8 @@ let
 
   oroborus = callPackage ../applications/window-managers/oroborus {};
 
+  ostinato = callPackage ../applications/networking/ostinato { };
+
   panamax_api = callPackage ../applications/networking/cluster/panamax/api {
     ruby = ruby_2_1;
   };

From 4c3d76d3c8d642695e62ea4b150b1d79be3a7611 Mon Sep 17 00:00:00 2001
From: Michel Kuhlmann <michel@kuhlmanns.info>
Date: Mon, 4 Jan 2016 09:19:24 +0100
Subject: [PATCH 254/884] r-modules: regenerate CRAN packages

---
 pkgs/development/r-modules/cran-packages.nix | 1316 ++++++++++--------
 1 file changed, 761 insertions(+), 555 deletions(-)

diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix
index bab649c8681e..81140f78e437 100644
--- a/pkgs/development/r-modules/cran-packages.nix
+++ b/pkgs/development/r-modules/cran-packages.nix
@@ -4,26 +4,28 @@
 # Rscript generate-r-packages.R cran >new && mv new cran-packages.nix
 
 { self, derive }:
-let derive2 = derive { snapshot = "2015-11-24"; };
+let derive2 = derive { snapshot = "2016-01-04"; };
 in with self; {
   A3 = derive2 { name="A3"; version="1.0.0"; sha256="017hq9pjsv1h9i7cqk5cfx27as54shlhdsdvr6jkhb8jfkpdb6cw"; depends=[pbapply xtable]; };
   ABCanalysis = derive2 { name="ABCanalysis"; version="1.1.0"; sha256="09s38xr6cig88v1nb8a192yc19rnhnqsfzazgfa257c7h84l0g9q"; depends=[Hmisc plotrix]; };
   ABCoptim = derive2 { name="ABCoptim"; version="0.13.11"; sha256="1j2pbfl5g9x71gq9f7vg6wznsds8sn8dj3q2h5fhjcv58di3gjhl"; depends=[]; };
   ACCLMA = derive2 { name="ACCLMA"; version="1.0"; sha256="1na27sp18fq12gp6vxgqw1ffsz2yi1d8xvrxbrzx5g1kqxrayy0v"; depends=[]; };
   ACD = derive2 { name="ACD"; version="1.5.3"; sha256="1a67bi3hklq8nlc50r0qnyr4k7m9kpvijy8sqqpm54by5hsysfd6"; depends=[]; };
-  ACDm = derive2 { name="ACDm"; version="1.0.2"; sha256="1xj706qm5lcq38pm287d78rvyg7pxd4avbbvm1h4086s4l2qikf9"; depends=[dplyr ggplot2 plyr Rsolnp zoo]; };
+  ACDm = derive2 { name="ACDm"; version="1.0.3"; sha256="1gqqm9lyc9pmqxj21a1mnf29jpq5aqsfny5wzlp2d8g49dc5hqri"; depends=[dplyr ggplot2 plyr Rsolnp zoo]; };
   ACNE = derive2 { name="ACNE"; version="0.8.1"; sha256="0kzapsalzw6jsi990qicp4glijh5ddnfimsg5pidgbwxg4i05grl"; depends=[aroma_affymetrix aroma_core MASS matrixStats R_filesets R_methodsS3 R_oo R_utils]; };
-  ACSNMineR = derive2 { name="ACSNMineR"; version="0.10.15"; sha256="178fg1skbgl9zh9d4d4zl08iz5fdf8hj7h0xbqf3rrnvccf2c2xg"; depends=[ggplot2 gridExtra]; };
+  ACSNMineR = derive2 { name="ACSNMineR"; version="0.15.11"; sha256="1dl4drhjyazwm9wxlm8yfppwvvj4h6jxwmz8kfw5bxpb3jdnsqvy"; depends=[ggplot2 gridExtra]; };
   ACSWR = derive2 { name="ACSWR"; version="1.0"; sha256="195vjrkang5cl7gwsna0aq4p0h4jym9xg9yh94bnf8vq6wf8j83n"; depends=[MASS]; };
   ACTCD = derive2 { name="ACTCD"; version="1.0-0"; sha256="0zn8f6l5vmn4w1lqjnpcxvfbr2fhwbhdjx4144h3bk71bk9raavl"; depends=[R_methodsS3]; };
   ADDT = derive2 { name="ADDT"; version="1.0"; sha256="1jx7rxi0yfn34pf3cf9zpf434rapgn5qn2mn5rkq5lysr3kwdw91"; depends=[]; };
   ADGofTest = derive2 { name="ADGofTest"; version="0.3"; sha256="0ik817qzqp6kfbckjp1z7srlma0w6z2zcwykh0jdiv7nahwk3ncw"; depends=[]; };
   ADM3 = derive2 { name="ADM3"; version="1.3"; sha256="1hg9wjdhckilqd13dr4cim4j6jsh2sdwm18i3pfmfdj8cyswm3h0"; depends=[]; };
-  ADPclust = derive2 { name="ADPclust"; version="0.6.3"; sha256="0lr4zkjhqr9azqxnxpxp9i0ppn8wi8ndb61ki7h2dzfgv27fingk"; depends=[cluster dplyr fields knitr]; };
+  ADMMnet = derive2 { name="ADMMnet"; version="0.1"; sha256="15f1zhgv7xai954qz2ahj4kpxyvr2svxpmybz7j43bhjpkq72dmq"; depends=[Matrix Rcpp RcppEigen]; };
+  ADPclust = derive2 { name="ADPclust"; version="0.6.5"; sha256="0ni8hkpn11cqrm56w2l4x7fwhw7lls3msf0g8bd62nkwzygqzzrn"; depends=[cluster dplyr fields knitr]; };
+  AEDForecasting = derive2 { name="AEDForecasting"; version="0.10.0"; sha256="080qg8s616nx1pj7bdpg3ify2qm3l0gni40nx1xdh81920vj8n7y"; depends=[changepoint forecast signal]; };
   AER = derive2 { name="AER"; version="1.2-4"; sha256="0cfhnh6ijwvbywk6falfq852jgx969v35j2l1q3cghwj9yggapbh"; depends=[car Formula lmtest sandwich survival zoo]; };
-  AF = derive2 { name="AF"; version="0.1"; sha256="1z1pn259zs6iw0wgksn5dgmkji5g9dpzlhd7i2q0yx2hns2gxvq0"; depends=[drgee survival]; };
+  AF = derive2 { name="AF"; version="0.1.1"; sha256="16776dv5rday6d7kh26lsgvmiy76qd1rmrd1rna14q400plqxm18"; depends=[drgee survival]; };
   AFLPsim = derive2 { name="AFLPsim"; version="0.4-2"; sha256="0bbbvv81nxqp5gc4hdhk0hyhb4n8f9w83kf21cgmqhy9cqnyr4s8"; depends=[adegenet introgress]; };
-  AFM = derive2 { name="AFM"; version="1.0.0"; sha256="0dj60zadkslq2zjh2g6y7wfwidi1f0k40awy77h53s5ydv63vgj6"; depends=[data_table fftwtools fractaldim geoR ggplot2 gridExtra gstat moments plyr png pracma rgl sp stringr]; };
+  AFM = derive2 { name="AFM"; version="1.1.0"; sha256="1b9qm1x1c3097w450lgaihglim4mzzc87b4iqlv1g6mgf9wz5l7k"; depends=[data_table fftwtools fractaldim geoR ggplot2 gridExtra gstat moments plyr png pracma rgl sp stringr]; };
   AGD = derive2 { name="AGD"; version="0.35"; sha256="1dk8m3zqvapwhz0677d3b2cbrin14p9adn5annzgjrxgw7ms4mg0"; depends=[gamlss gamlss_dist]; };
   AGSDest = derive2 { name="AGSDest"; version="2.3"; sha256="1g8z7ba70zs4i8cb48iwf4iy1q1l76cpiixiac8fixjf1c7a9hxz"; depends=[ldbounds]; };
   AHR = derive2 { name="AHR"; version="1.3"; sha256="0i1dqv1prb8iir1rykbhfsl99x05cl582z47wqr7mwkkqf826x9g"; depends=[etm MASS Rcpp RcppArmadillo survival]; };
@@ -71,17 +73,18 @@ in with self; {
   AlgebraicHaploPackage = derive2 { name="AlgebraicHaploPackage"; version="1.2"; sha256="1krm5cx609sv2p0g3xm5jaiqs9li06v717lw7ywjvx7myc9x4c07"; depends=[]; };
   AllPossibleSpellings = derive2 { name="AllPossibleSpellings"; version="1.1"; sha256="0ksfm2pfjka3yjgcd257v7sns1niaylsfxvhhh2jwdi016cpdw10"; depends=[]; };
   AlleleRetain = derive2 { name="AlleleRetain"; version="1.3.1"; sha256="1k2iwns1wk5n02cii6p9prgdb6asys3vwiq5dq2i26fk2xr6j4gq"; depends=[]; };
-  Amelia = derive2 { name="Amelia"; version="1.7.3"; sha256="07agkgg4jdjk4kxf87nck7dyihpf2l4pmpf20a7ld9c83is14ib1"; depends=[foreign Rcpp RcppArmadillo]; };
+  Amelia = derive2 { name="Amelia"; version="1.7.4"; sha256="0w6532s5xr7pw47zqhhymql7i68c4lralvw1gc26l9d4c7ib00fd"; depends=[foreign Rcpp RcppArmadillo]; };
   AmericanCallOpt = derive2 { name="AmericanCallOpt"; version="0.95"; sha256="1nhy44j5bmmjsp6g79nrn741rzzxikhdnxk4wwbdj9igcc1bs573"; depends=[]; };
   AmpliconDuo = derive2 { name="AmpliconDuo"; version="1.0"; sha256="0l6p5c2802a1f3b77cdrrk3wdf41926mh34630p462fb3wqipps0"; depends=[ggplot2 xtable]; };
   AnDE = derive2 { name="AnDE"; version="1.0"; sha256="1yil8ab50wvlqmdla9kmfba8vfgy5r694r6igb58s6vnmld78yf2"; depends=[discretization foreign functional stringr]; };
   AnalyzeFMRI = derive2 { name="AnalyzeFMRI"; version="1.1-16"; sha256="1mbjb682ns5230jd3vcvd6x4gnn9hpbmjd7r8120y4sp2g733b0f"; depends=[fastICA R_matlab]; };
+  AnalyzeTS = derive2 { name="AnalyzeTS"; version="1.7"; sha256="0ssh8y854s8v833n8fl93nz8arkbj2ac6ihk65ahm7b89phcpd0z"; depends=[MASS TSA tseries TTR]; };
   AncestryMapper = derive2 { name="AncestryMapper"; version="1.2"; sha256="0d47vkf59ysa58wnlqkshsvdzhcppb9xc1agwkxv37jv1asllb67"; depends=[]; };
   AnglerCreelSurveySimulation = derive2 { name="AnglerCreelSurveySimulation"; version="0.2.1"; sha256="100mbmdllk6c32j75jviz2k9kmwca3jvrqb95a555alfcpkfim8c"; depends=[]; };
   AnnotLists = derive2 { name="AnnotLists"; version="1.2"; sha256="1g2khb2ggniwg2zcjamsm3bxyrl2zabvk540b5vyy9am9k83m1g9"; depends=[]; };
   AntWeb = derive2 { name="AntWeb"; version="0.7"; sha256="1ykfg3zzjdvjppr2l4f26lx00cn5vaqhhz1j1b5yh113ggyl40qw"; depends=[assertthat httr leafletR plyr rjson]; };
   AnthropMMD = derive2 { name="AnthropMMD"; version="0.9.9"; sha256="10wn0fkcli5yz3fhngsz8sg1mfllqkvjrpjggd9qynay2zrpiw1n"; depends=[tcltk2]; };
-  Anthropometry = derive2 { name="Anthropometry"; version="1.5"; sha256="0g5i4xn6lbzf1p1rlnmvhpyf21bslh7wysb666a6r0w8ds2aa4p8"; depends=[archetypes biclust cluster depth FNN ICGE nnls rgl shapes]; };
+  Anthropometry = derive2 { name="Anthropometry"; version="1.7"; sha256="09bmd7gvkxm2jvcjzz0dqj5frr07fzb3r4qzih404zynrg859r9s"; depends=[archetypes biclust cluster depth FNN ICGE nnls rgl shapes]; };
   ApacheLogProcessor = derive2 { name="ApacheLogProcessor"; version="0.1.5"; sha256="1xnx6syn365s4w4pks7xq6rng7hk30xln8hvszxwhwfnkzr8qqn2"; depends=[doParallel foreach]; };
   AppliedPredictiveModeling = derive2 { name="AppliedPredictiveModeling"; version="1.1-6"; sha256="004d2k3mhl45inb7kx1ph8xc8h9bgm7f7l3prmvqrl5792400cn4"; depends=[CORElearn MASS plyr reshape2]; };
   AquaEnv = derive2 { name="AquaEnv"; version="1.0-3"; sha256="1hkygw09w70im9f6l6q5yxk86mdl5pkczqfqrwc4wl1yhz7z1gjb"; depends=[deSolve minpack_lm]; };
@@ -125,34 +128,36 @@ in with self; {
   BCEE = derive2 { name="BCEE"; version="1.1"; sha256="0pssqmjj13wjbkq8ls5r9zr08by24q0k9g4f1aysgxds2a4dawd1"; depends=[BMA]; };
   BCEs0 = derive2 { name="BCEs0"; version="1.1-1"; sha256="1ipg8xliqnpfa4ga9r0gqf5sfa9gass4hvrlgxazs5hb18fpsl91"; depends=[]; };
   BCRA = derive2 { name="BCRA"; version="1.0"; sha256="1bbxh1kf35h31c4k565kk6grdhp5pnn8vr3nr6vnp32dp4pc05zh"; depends=[]; };
-  BDgraph = derive2 { name="BDgraph"; version="2.25"; sha256="0b4b2bxsbnil1bhlhjiwhha9i8xmvlvri2ghv8swsixfabnxaa19"; depends=[igraph Matrix]; };
+  BDgraph = derive2 { name="BDgraph"; version="2.26"; sha256="0lbn7780pn55hm46ml7sgmcv3vvlwaa54hhks3z634hnyjk8f3b8"; depends=[igraph Matrix]; };
   BEANSP = derive2 { name="BEANSP"; version="1.0"; sha256="0xcb81pk3iidb3dz9l4hm6cwx8hrbg5qz0sfi59yx2f7nsazr4xk"; depends=[]; };
   BEDASSLE = derive2 { name="BEDASSLE"; version="1.5"; sha256="1bz3lr0waly9vj9adwhmgs3lq7zjdkcbvm3y9rnn72qlrwmv5fbn"; depends=[emdbook MASS matrixcalc]; };
-  BEDMatrix = derive2 { name="BEDMatrix"; version="1.0.1"; sha256="1y8dyq2sibhbs41bmsb53f4snik2y1mk2ssivfiriaxwrp176bqa"; depends=[Rcpp]; };
+  BEDMatrix = derive2 { name="BEDMatrix"; version="1.1.0"; sha256="1ir4mjqcgvsivqr5k7vccklk6kgxi3ydxlisdc7qn2nspxpsvj96"; depends=[BH Rcpp]; };
   BEQI2 = derive2 { name="BEQI2"; version="2.0-0"; sha256="19q29kkwww5hziffkm2yx7n4cpfcsyh0z4mljdcnjkwfp732sjig"; depends=[jsonlite knitr markdown plyr reshape2 xtable]; };
-  BEST = derive2 { name="BEST"; version="0.3.0"; sha256="0sl681ax77nv9a87dhr58yis4x4r7s0m3mywxid1z876zdglsxsp"; depends=[coda jagsUI]; };
+  BEST = derive2 { name="BEST"; version="0.4.0"; sha256="1clch2271x9r5frgpis31b13jjgp4sdxd75s44chcislyzlinrlp"; depends=[coda jagsUI]; };
   BGLR = derive2 { name="BGLR"; version="1.0.4"; sha256="1bvk8iifvrcvnb0f1k3v9xxajljsz79ck95191p8alnda64cz0zf"; depends=[]; };
   BGPhazard = derive2 { name="BGPhazard"; version="1.2.2"; sha256="1v89pjigrjkin9vsf6sa0qhwxvn1a3dy2gqwq3sd9v6y0hrld6ng"; depends=[survival]; };
   BGSIMD = derive2 { name="BGSIMD"; version="1.0"; sha256="0xkr56z8l72wps7faqi5pna1nzalc3qj09jvd3v9zy8s7zf5r7w4"; depends=[]; };
-  BH = derive2 { name="BH"; version="1.58.0-1"; sha256="17rnwyw9ib2pvm60iixzkbz7ff4fslpifp1nlx4czp42hy67kqpf"; depends=[]; };
+  BH = derive2 { name="BH"; version="1.60.0-1"; sha256="08gc3b0irgvpjl59irdxs8jhlbky4yp4fvs3zi4pq0wdwj43cfsk"; depends=[]; };
   BHH2 = derive2 { name="BHH2"; version="2015.06.25"; sha256="19c8qjfvg4f3zlrqvrsdmc776f81ghv8w0l3bnbpdbyz7fivc1qw"; depends=[]; };
   BIFIEsurvey = derive2 { name="BIFIEsurvey"; version="1.7-0"; sha256="09bj6znh159n3w603wp6m3l54dpmf3j9bv8xvn4sp511yin9p9b2"; depends=[miceadds mitools Rcpp RcppArmadillo TAM]; };
   BIGDAWG = derive2 { name="BIGDAWG"; version="1.2.1"; sha256="0n0bpdjbfdksnym3bd6dcsibyclf8w3ds85x2jvz5ba5ch3wq3va"; depends=[haplo_stats XML]; };
   BIOM_utils = derive2 { name="BIOM.utils"; version="0.9"; sha256="0xckhdvf15a62awfk9rjyqbi6rm7p4awxz7vg2m7bqiqzdll80p7"; depends=[]; };
+  BIOdry = derive2 { name="BIOdry"; version="0.2"; sha256="07h05qibzqqfk4d73pzrb48djmzby7ysl6cszf2irivp66cqnbkp"; depends=[ecodist nlme]; };
   BIPOD = derive2 { name="BIPOD"; version="0.2.1"; sha256="04r58gzk3hldbn115j9ik4bclzz5xb2i3x6b90m2w9sq7ymn3zg1"; depends=[Rcpp RcppArmadillo]; };
   BLCOP = derive2 { name="BLCOP"; version="0.3.1"; sha256="1qfkljw5b1k4b5jd08hw6dsmvgr7vg3kjyib5s13q0mkxvclasym"; depends=[fBasics fMultivar fPortfolio MASS quadprog RUnit timeSeries]; };
   BLR = derive2 { name="BLR"; version="1.4"; sha256="0wy3c8nnzkdhwb5s1ygdid47hpdx72ryim36mnicrydy0msjivja"; depends=[SuppDists]; };
   BMA = derive2 { name="BMA"; version="3.18.6"; sha256="1yx54miy5vn8rb5aynsjsfjxkblq0n1k86h1iyr14rf4q9sd3phi"; depends=[inline leaps robustbase rrcov survival]; };
   BMN = derive2 { name="BMN"; version="1.02"; sha256="12gyq01cn6a9ixqgki1ihx5jrp2gw6jdj7q210rb12xlvj3p6x7w"; depends=[]; };
-  BMS = derive2 { name="BMS"; version="0.3.3"; sha256="1yj9vi8jvhkwpcjkclf0zbah0dayridklpj65ay6r18fyf4crnd2"; depends=[]; };
+  BMRV = derive2 { name="BMRV"; version="1.31"; sha256="02y589figv152mx7a9jra3vhjp7sjiljvpf24fhavnh0da3irg4z"; depends=[BH]; };
+  BMS = derive2 { name="BMS"; version="0.3.4"; sha256="0z3mk1xd1fphf80kdbashkn04jwsr2bghms4d7nav3pw73q41wql"; depends=[]; };
   BMhyd = derive2 { name="BMhyd"; version="1.2-8"; sha256="14pv5f621zq5x9i408zjm8k80hcsabkjpdf86gk3ylgw5yqcivrx"; depends=[ape corpcor geiger mvtnorm numDeriv phylobase phytools TreeSim]; };
   BNDataGenerator = derive2 { name="BNDataGenerator"; version="1.0"; sha256="17zi83jhpn9ygavkpr9haffvd4622sca18jzzxxxmfq0ilrj201g"; depends=[]; };
   BNPTSclust = derive2 { name="BNPTSclust"; version="1.1"; sha256="1zmxwg6zn3nqqm1sw2n4pvq47mv7ygb4lf1c6yhn3xaf1rqmf26s"; depends=[MASS mvtnorm]; };
   BNPdensity = derive2 { name="BNPdensity"; version="2015.5"; sha256="0jgdc9dayc57y77bb2yjcn1pb5ahrvbrsmyjkhyl4365sn5njzl8"; depends=[]; };
-  BNSP = derive2 { name="BNSP"; version="1.0.5"; sha256="0iyrmrpnx32akcfvd43jh74457l56n5n4pnlyqi9v3cjp4n95fds"; depends=[]; };
+  BNSP = derive2 { name="BNSP"; version="1.1.0"; sha256="1l45x3h0jqszcp7zws6y4nbq2vzyv6aa60kwqfpkjw0kdbbcpw7m"; depends=[]; };
   BOG = derive2 { name="BOG"; version="2.0"; sha256="0lz5af813b67hfl4hzcydn58sjhgn5706n2h44g488bks928k940"; depends=[DIME hash]; };
   BOIN = derive2 { name="BOIN"; version="2.0"; sha256="1jyj41936nd6dianifa0bhh9fzpj72fb87g6hgq7m9zi04cnp69s"; depends=[Iso]; };
-  BRugs = derive2 { name="BRugs"; version="0.8-5"; sha256="13941d3x3l9jr4xdn7xyp3yixnlzmi5xmh42isni0fc1ji86p0jm"; depends=[coda]; };
+  BRugs = derive2 { name="BRugs"; version="0.8-6"; sha256="0nvp3lwliq72qibvz4bg6c7ixxmhgwl87hyl2qvkgiavix3nkxk7"; depends=[coda]; };
   BSDA = derive2 { name="BSDA"; version="1.01"; sha256="06mgmwwh56bj27wdya8ln9mr3v5gb6fcca7v9s256k64i19z12yi"; depends=[e1071 lattice]; };
   BSGS = derive2 { name="BSGS"; version="2.0"; sha256="08m8g4zbsp55msqbic4f17lcry07mdn0f5a61zdcy2msn2ihzzf9"; depends=[batchmeans MASS plyr pscl]; };
   BSGW = derive2 { name="BSGW"; version="0.9.1"; sha256="1zp8352mgqpmyn63b5xfmq67rsf3cdy7yy5k1qihdlkw9bi5r3vc"; depends=[doParallel foreach MfUSampler survival]; };
@@ -166,6 +171,7 @@ in with self; {
   BaBooN = derive2 { name="BaBooN"; version="0.2-0"; sha256="145q2kabjks2ql3m48sfjis5y35l8rcqnr5s176viv9yhfafn351"; depends=[coda Hmisc MASS nnet Rcpp RcppArmadillo]; };
   BaM = derive2 { name="BaM"; version="0.99"; sha256="1q04va2s876ydlmaalx63r520pfx1qzpjg6hbnl9pvn86b5grnf4"; depends=[bayesm coda foreign MASS mice nnet survival]; };
   BaSTA = derive2 { name="BaSTA"; version="1.9.4"; sha256="1j092gsdip7rpw0g74ha0kjsrqpp5swi7wd4sxlmx6zarcqnxlal"; depends=[snowfall]; };
+  BacArena = derive2 { name="BacArena"; version="1.0"; sha256="1ivsa1az8w30kb04yx2q7924bdijml83hn6p8jdaarlkpbslklmn"; depends=[deSolve Matrix Rcpp RcppArmadillo RcppEigen ReacTran sybil]; };
   Bagidis = derive2 { name="Bagidis"; version="1.0"; sha256="1prdbkc0qgzkkrkhp43pjyg35q9ivngk8wa4a7khlnfsj21jaraf"; depends=[abind]; };
   BalancedSampling = derive2 { name="BalancedSampling"; version="1.4"; sha256="0l8jxszd0j27kb58xrn7lvf52mhifqjd1w42cp4kdiax8c6s7421"; depends=[Rcpp]; };
   Barnard = derive2 { name="Barnard"; version="1.6"; sha256="1wk93yj4pl3mybyl2lvgbpq0chpm4akx3rqb29dk34fkfiwmvlhq"; depends=[]; };
@@ -212,7 +218,7 @@ in with self; {
   BiDimRegression = derive2 { name="BiDimRegression"; version="1.0.6"; sha256="1kgrk4xanvxqdq619ha08wwplmsn2xqygx4dziagx48iqfpp1lxj"; depends=[nlme]; };
   BiSEp = derive2 { name="BiSEp"; version="2.0.1"; sha256="15sn9kxs0mb98kclfpif90c808a1365gdj2j332sxi07f64pb87q"; depends=[AnnotationDbi GOSemSim mclust]; };
   BiTrinA = derive2 { name="BiTrinA"; version="1.1"; sha256="1isq7dffzchllynj2pifjaw2vjkhclqjk2xh6kbnh9cxca16s0kq"; depends=[diptest]; };
-  BiasedUrn = derive2 { name="BiasedUrn"; version="1.06.1"; sha256="1ra9fmymm97a2b8jsrsi98cjnnxc478zq51lx7a5pgafprcwcgkg"; depends=[]; };
+  BiasedUrn = derive2 { name="BiasedUrn"; version="1.07"; sha256="13i2lgfnjhlbbm2yxfc2l5hswqw6x03pwba5csjmirv8kpjw4xr3"; depends=[]; };
   BigTSP = derive2 { name="BigTSP"; version="1.0"; sha256="1jdpa8rcnrhzn0hilb422pdxprdljrzpgr4f26668c1vv0kd6k4v"; depends=[gbm glmnet randomForest tree]; };
   BinNonNor = derive2 { name="BinNonNor"; version="1.2"; sha256="15bzpi2q2428661v8z9izp942ihffgq8dgh4fsnzllvdrpqcyc41"; depends=[BB corpcor Matrix mvtnorm]; };
   BinNor = derive2 { name="BinNor"; version="2.0"; sha256="0c1qy93ccgzg8g25wm1j4ninsa0ck4y3jjh25za92w070cqhkd8m"; depends=[corpcor Matrix mvtnorm psych]; };
@@ -223,13 +229,13 @@ in with self; {
   BioMark = derive2 { name="BioMark"; version="0.4.5"; sha256="1ifc72bayy3azbilajqqzl0is6z7l1zaadchcg3n8lhmjrv5sk3m"; depends=[glmnet MASS pls st]; };
   BioPhysConnectoR = derive2 { name="BioPhysConnectoR"; version="1.6-10"; sha256="1cc22knlvbvwsrz2a7syk2ampm1ljc44ykv5wf0szhnh75pxg13l"; depends=[matrixcalc snow]; };
   BioStatR = derive2 { name="BioStatR"; version="2.0.0"; sha256="1k3z337lj8r06xgrqgi5h67hhkz2s5hggj6dhcciq26i1nzafsw6"; depends=[ggplot2]; };
-  Biocomb = derive2 { name="Biocomb"; version="0.1"; sha256="15yrva2248aq2s82jr8bwvd0n278j2w0i8bw8kxw3cczc321x615"; depends=[arules class discretization e1071 FSelector gtools MASS nnet pamr pROC randomForest Rcpp rgl ROCR rpart RWeka]; };
+  Biocomb = derive2 { name="Biocomb"; version="0.2"; sha256="1igav8l1s4byannhkdm5fznqrga6cv9ws1lxyam221h8cl3qz8aw"; depends=[arules class discretization e1071 FSelector gtools MASS nnet pamr pROC randomForest Rcpp rgl ROCR rpart RWeka]; };
   Biodem = derive2 { name="Biodem"; version="0.4"; sha256="0k0p4s21089wg3r3pvyy9cxsdf4ijdl598gmxynbzvwpr670qnsh"; depends=[]; };
   BiodiversityR = derive2 { name="BiodiversityR"; version="2.5-4"; sha256="0w5nn0wv7fknnmbzilxwsh5wfmb6vagxvsh1gy1mzm5fiknfzh9k"; depends=[Rcmdr vegan]; };
   BivarP = derive2 { name="BivarP"; version="1.0"; sha256="08f7sphylaj3kximy1avaf29hxj2n800adsnssh01p9bcxnzb2i4"; depends=[copula dfoptim survival]; };
   BlakerCI = derive2 { name="BlakerCI"; version="1.0-5"; sha256="16zj678qzwqih92q19dma7a602d0hif2dhii5hvxdgjymg7hg2bj"; depends=[]; };
-  BlandAltmanLeh = derive2 { name="BlandAltmanLeh"; version="0.1.0"; sha256="0y35zkxiallp4x09646qb8wj9bayh7mpnjg43qmzhxkm7l95b78r"; depends=[]; };
-  Blaunet = derive2 { name="Blaunet"; version="1.0.1"; sha256="1qcp5wag4081pcjg5paryxz3hk3rqql15v891ppqc1injni7rljz"; depends=[network]; };
+  BlandAltmanLeh = derive2 { name="BlandAltmanLeh"; version="0.3.1"; sha256="11p30zqb3f9ifk3v18dspg18sclz5zxjygy7hw8ccb4bcqhx68lm"; depends=[]; };
+  Blaunet = derive2 { name="Blaunet"; version="2.0.1"; sha256="0zpx4l5ig0xjnpsgw24b01nnf8w0aw6imjsg9715rm0qswa0jq5y"; depends=[network]; };
   BlockMessage = derive2 { name="BlockMessage"; version="1.0"; sha256="1jrcb9j1ikbpw098gqbcj29yhffa15xav90y6vpginmhbfpwlbf4"; depends=[]; };
   Blossom = derive2 { name="Blossom"; version="1.3"; sha256="1cpqzfpyaj00zkjrhj0xy43wy05hvlw5a50a3i1shyv0pd04h23z"; depends=[]; };
   Bmix = derive2 { name="Bmix"; version="0.5"; sha256="0cwp0z5841yqndpln8vc7wkbc8jgdwf0a772x4rgpihvg1g9qz5j"; depends=[mvtnorm]; };
@@ -263,8 +269,9 @@ in with self; {
   CAvariants = derive2 { name="CAvariants"; version="3.0"; sha256="1nds4ngda6qjm74bwwphd4a648q66xj25x0n9xvb3fdzfkqfvvrp"; depends=[]; };
   CBPS = derive2 { name="CBPS"; version="0.10"; sha256="0k3mb97d49r870dm7ac1nwhy4kvh0936jmka7ib03154jmzsfyn7"; depends=[MASS MatchIt nnet numDeriv]; };
   CCA = derive2 { name="CCA"; version="1.2"; sha256="00zy6bln22qshhlll0y0adnvb8wa1f7famqyws71b6pcnwxki5ha"; depends=[fda fields]; };
-  CCAGFA = derive2 { name="CCAGFA"; version="1.0.7"; sha256="1vb9bnn8zbg4kwp24rpxxv7in4xp5lp14yknw7x8csjj9l8awyid"; depends=[]; };
+  CCAGFA = derive2 { name="CCAGFA"; version="1.0.8"; sha256="1jxb6d1h5p97wnr45s1fsspksqn771nib415ihxi4vj5w8s94j8b"; depends=[]; };
   CCM = derive2 { name="CCM"; version="1.1"; sha256="0gya1109w61ia6cq3jg2z5gmvjkv9xg71l2rxhrrf6bx1c2nsrq6"; depends=[]; };
+  CCMnet = derive2 { name="CCMnet"; version="0.0-3"; sha256="0mbw3yhlgnmq7q4wnwiff7rlmciq83cch7kkav3wll6nqvxcdiax"; depends=[ergm network sna]; };
   CCP = derive2 { name="CCP"; version="1.1"; sha256="07jxh33pb8llk1gx4rc80ppi35z8y1gwsf19zrca9w91aahcs8cx"; depends=[]; };
   CCTpack = derive2 { name="CCTpack"; version="1.4"; sha256="09s2ysqsz158lrah44rwvs3nlhyqlvwcj6aar2p79flf4xxdwsvk"; depends=[MASS mvtnorm polycor psych R2jags rjags]; };
   CCpop = derive2 { name="CCpop"; version="1.0"; sha256="10kgw3b98r0kn74w89znq6skgk8b3ldil6yb0hn5rlcf6lazjzca"; depends=[nloptr]; };
@@ -276,7 +283,7 @@ in with self; {
   CEC = derive2 { name="CEC"; version="0.9.3"; sha256="05cgd281p0hxkni4nqb0d4l71aah3f3s6jxdnzgw8lqxaxz4194i"; depends=[]; };
   CEGO = derive2 { name="CEGO"; version="2.0.0"; sha256="1rsia7dnbc2hwrihdxdaspwm8xfvc7ryy3sgki801xv3la4nzk8p"; depends=[DEoptim MASS]; };
   CEoptim = derive2 { name="CEoptim"; version="1.1"; sha256="130x215lwm8lsygxnkykhiv80ry7srs9n77rcyjgxag9f1hn223x"; depends=[MASS msm sna]; };
-  CFC = derive2 { name="CFC"; version="0.7.0"; sha256="1sl0gsx4gcbcf7bc6xf84g3lx58zraj2h51riacch2iyxl1ygspq"; depends=[abind]; };
+  CFC = derive2 { name="CFC"; version="1.0.1"; sha256="0p4ijhks2jj9a417k9mp670q59d0wi3pfhqkx005cbsficynf0y2"; depends=[abind doParallel foreach Rcpp RcppArmadillo RcppProgress survival]; };
   CGP = derive2 { name="CGP"; version="2.0-2"; sha256="1mggv3c8525vbdfdc3yhpp4vm4zzdvbwyxim29zj0lzwjf9fkgqk"; depends=[]; };
   CHAT = derive2 { name="CHAT"; version="1.1"; sha256="1hl4xr4lkvb7r36gcbgax6ipqc3rsvn1r03w7fk9gf9bbyg7bkhg"; depends=[DNAcopy DPpackage]; };
   CHCN = derive2 { name="CHCN"; version="1.5"; sha256="18n8f002w0p0l1s5mrrsyjddn10kdbb6b7jx1v9h1m81ifdbv0xb"; depends=[bitops RCurl]; };
@@ -286,7 +293,7 @@ in with self; {
   CIFsmry = derive2 { name="CIFsmry"; version="1.0.1"; sha256="118vyiiy4iqn86n9xf84n5hrwrhzhr1mdsmyg9sm6qq6dm7zg6la"; depends=[]; };
   CINID = derive2 { name="CINID"; version="1.2"; sha256="0pkgzi2j0045p10kjvnq8f4j1agzrqfw0czvvfrzj9yjfpj8xc99"; depends=[]; };
   CINOEDV = derive2 { name="CINOEDV"; version="2.0"; sha256="0fjpxahc55zd972p3hlw9fk4dq8hpq715xff8p98kfh29dvw9mnz"; depends=[ggplot2 igraph R_matlab reshape2]; };
-  CITAN = derive2 { name="CITAN"; version="2014.12-1"; sha256="0hiccsg49zgcdm5iwj2vzyqhwyfw6h5fd2gasy6hlakjp102mvy2"; depends=[agop DBI hash RGtk2 RSQLite stringi]; };
+  CITAN = derive2 { name="CITAN"; version="2015.12-2"; sha256="08h91q7529q04izgqw3ahm4r0zjpwnwyc0vynykvv9fz2fkbk7wb"; depends=[agop DBI hash RGtk2 RSQLite stringi]; };
   CLME = derive2 { name="CLME"; version="2.0-4"; sha256="1ymaqvmq0ji82kb4c84a6fdz15ri797k9n218kawz21xvx8ilr7w"; depends=[isotone lme4 MASS nlme openxlsx prettyR shiny stringr]; };
   CLSOCP = derive2 { name="CLSOCP"; version="1.0"; sha256="0rkwq9rl2ph4h5zwb2i3yphjyzxmh6b6k23a8gcczycx6xdq4yhw"; depends=[Matrix]; };
   CMC = derive2 { name="CMC"; version="1.0"; sha256="1r9a5k79fyw01yiwxq02327hpn4l1v2lp0958jj9217wxmhn3pr5"; depends=[]; };
@@ -328,7 +335,7 @@ in with self; {
   CaDENCE = derive2 { name="CaDENCE"; version="1.2.3"; sha256="1810a785czaxwfvhjnmhzqg743mgcgrdp3j1irlfl9pbli0ppidx"; depends=[pso]; };
   Cairo = derive2 { name="Cairo"; version="1.5-9"; sha256="1x1q99r3r978rlkkm5gixkv03p0mcr6k7ydcqdmisrwnmrn7p1ia"; depends=[]; };
   Canopy = derive2 { name="Canopy"; version="1.0.0"; sha256="0bl9yjm8433nfx0k9vv2pyiv5zjnwsfi55q8pp10bv3b6v35g2vm"; depends=[ape fields]; };
-  CarletonStats = derive2 { name="CarletonStats"; version="1.1"; sha256="18pd1hi8bnbv0sdixw746xvdg9szvng422yj12mk0k50v60403xg"; depends=[]; };
+  CarletonStats = derive2 { name="CarletonStats"; version="1.2"; sha256="07jjdhrz0chcgx0ivd5b6ig2936fq2hdhrflqmifm2mqbc7cgqbh"; depends=[]; };
   CatDyn = derive2 { name="CatDyn"; version="1.1-0"; sha256="0bdixcf1iwbmjd2axi6csrzms25ghdj4r6223qhk2b54wlmbzaiz"; depends=[BB optimx]; };
   CateSelection = derive2 { name="CateSelection"; version="1.0"; sha256="194lk6anrb05gaarwdg8lj5wm6k61b4r702cja3nf3z91i8paqi7"; depends=[]; };
   CausalFX = derive2 { name="CausalFX"; version="1.0.1"; sha256="0v0diqq9fa1v9n3v5m5shvwlgmj91cbbb78243rwib1h3pyacihf"; depends=[igraph rcdd rje]; };
@@ -341,7 +348,7 @@ in with self; {
   CerioliOutlierDetection = derive2 { name="CerioliOutlierDetection"; version="1.0.8"; sha256="0n67y7ah496wck9hlrphya9k753gk44v7zgfz4s2a5ii49739zqi"; depends=[robustbase]; };
   CfEstimateQuantiles = derive2 { name="CfEstimateQuantiles"; version="1.0"; sha256="1qf85pnl81r0ym1mmsrhbshwi4h1iv19a2wjnghbylpjaslgxp6i"; depends=[]; };
   ChainLadder = derive2 { name="ChainLadder"; version="0.2.2"; sha256="1lxcy7q02lgsi575z1l1bxhxrgc3qcf2ln09pf4rb4diw7fs6ply"; depends=[actuar cplm ggplot2 lattice Matrix reshape2 statmod systemfit tweedie]; };
-  ChannelAttribution = derive2 { name="ChannelAttribution"; version="1.2"; sha256="1zv0zha81yx1y80nfdbi4b4476lc5wq6zgg1678wrf56rrwm2cv4"; depends=[Rcpp RcppArmadillo]; };
+  ChannelAttribution = derive2 { name="ChannelAttribution"; version="1.3"; sha256="1gj2chziyaq1f6ahgpnr62c2fy72kbvxcivmg42rh853r7xmmwvv"; depends=[Rcpp RcppArmadillo]; };
   ChargeTransport = derive2 { name="ChargeTransport"; version="1.0.2"; sha256="0mq06ckp3yyj5g1z2sla79fiqdk2nlbclm618frhqcgmq93h0vha"; depends=[]; };
   CheckDigit = derive2 { name="CheckDigit"; version="0.1-1"; sha256="0091q9f77a0n701n668zaghi6b2k3n2jlb1y91nghijkv32a7d0j"; depends=[]; };
   ChemoSpec = derive2 { name="ChemoSpec"; version="4.1.15"; sha256="147ynbj8w4hiwfac3637s2skyjyyyv19axwv5bxlg73kvp40zp0h"; depends=[plyr rgl]; };
@@ -368,6 +375,7 @@ in with self; {
   CoinMinD = derive2 { name="CoinMinD"; version="1.1"; sha256="0invnbj5589wbs0k2w5aq9qak7axc3s0g9nw85c48lnl0v95s91i"; depends=[MCMCpack]; };
   CollocInfer = derive2 { name="CollocInfer"; version="1.0.2"; sha256="0bs4ivnk394l7xjxyvg7fhlfi3vdscp1c27dpvilrlmfikbzpc33"; depends=[deSolve fda MASS Matrix spam]; };
   ColorPalette = derive2 { name="ColorPalette"; version="1.0-1"; sha256="1dsj5njikx3qm2lnamqqg4qgwwyr11fwx9s5sdi7dkfx3nmf6dac"; depends=[]; };
+  ComICS = derive2 { name="ComICS"; version="1.0.1"; sha256="04jniacphllzhv6rcdxjdx570rsbdrx3kiyslfmwyj51hx4bqjnv"; depends=[glmnet]; };
   CombMSC = derive2 { name="CombMSC"; version="1.4.2"; sha256="1wkawxisn9alpwrymja8dla8n25z2fhai3l2xhin0b914y2kai09"; depends=[]; };
   CombinS = derive2 { name="CombinS"; version="1.1"; sha256="18wanir5vqk5i65hd6gr2za1xd26yfa0c3c029dbxsrsczwmb9xi"; depends=[]; };
   Combine = derive2 { name="Combine"; version="1.0"; sha256="0n3jkxf4s778d6fzcanb2b09xhpv5sqzawpg17bbfngfhp0vfyrq"; depends=[]; };
@@ -394,16 +402,18 @@ in with self; {
   ConjointChecks = derive2 { name="ConjointChecks"; version="0.0.9"; sha256="097mhiz8zjmmkiiapr3zfx7v35xirg57nqp1swd72dixaa23nhr1"; depends=[]; };
   ConnMatTools = derive2 { name="ConnMatTools"; version="0.1.5"; sha256="02cv2rlfp9shwqc9nwb8278akmwv7yvviwl23jglzsyh721dpqkr"; depends=[]; };
   ConsRank = derive2 { name="ConsRank"; version="1.0.2"; sha256="11pdccndmiz4vm15kaidzwy92vi2aqi5klwxag4p2xk1xivnlm0n"; depends=[gtools MASS proxy rgl]; };
+  ContaminatedMixt = derive2 { name="ContaminatedMixt"; version="1.0"; sha256="13j4d5l0if9qrdqcx0mn529bygilym9gya3ih66p8bki6bmda72v"; depends=[mclust mixture mnormt]; };
   ConvCalendar = derive2 { name="ConvCalendar"; version="1.2"; sha256="0yq9a42gw3pxxwvpbj6zz5a5zl7g5vkswq3mjjv5r28zwa3v05vc"; depends=[]; };
   ConvergenceConcepts = derive2 { name="ConvergenceConcepts"; version="1.1"; sha256="0878fz33jxh5cf72lv0lga48wq2hqa4wz6m59111k59pzrsli344"; depends=[lattice tkrplot]; };
   Copula_Markov = derive2 { name="Copula.Markov"; version="1.0"; sha256="028rmpihyz9xr4r305lbcbb0y22jw1szmhw5iznv5zma507grbl3"; depends=[]; };
+  CopulaDTA = derive2 { name="CopulaDTA"; version="0.0.1"; sha256="1fv6d2njjk1cp5h90dmn5l35awvngwbp7n4cabqylci2w0pkilmn"; depends=[ggplot2 plyr reshape2 rstan]; };
   CopulaREMADA = derive2 { name="CopulaREMADA"; version="0.9"; sha256="0fhd4g8157rmkda5dygvnvb50f8dz31wlg1x432g9ra8fw7bdq01"; depends=[matlab statmod tensor]; };
   CopulaRegression = derive2 { name="CopulaRegression"; version="0.1-5"; sha256="0dd1n7b23yww36718khi6a5kgy8qjpkrh0k433c265653mf1siq8"; depends=[MASS VineCopula]; };
   CopyDetect = derive2 { name="CopyDetect"; version="1.1"; sha256="0h9bf7ay5yr6dwk7q28b6xxfzy6smljkq6qwjkzfscy5hnmwxkpa"; depends=[irtoys]; };
   CopyNumber450kCancer = derive2 { name="CopyNumber450kCancer"; version="1.0.4"; sha256="0csmrv5n4lxd19q8q94sxs374lkqilp5x2dj8nxzs0x1v8hn0knm"; depends=[]; };
-  CorReg = derive2 { name="CorReg"; version="1.0.5"; sha256="1b7l17i33bqvdzgqw5vc73fnpdgqbr01456qgmxls80ji8qjiv9x"; depends=[corrplot elasticnet lars MASS Matrix mclust mvtnorm Rcpp RcppEigen ridge Rmixmod rpart]; };
+  CorReg = derive2 { name="CorReg"; version="1.1.1"; sha256="1g12yrwx5j3db1j9q0j24z3q2j8a7m7ddkj9a4yznzzvjjdz2k0n"; depends=[corrplot elasticnet glmnet lars MASS Matrix mclust mvtnorm Rcpp RcppEigen Rmixmod rpart]; };
   CorrBin = derive2 { name="CorrBin"; version="1.5"; sha256="1kg8kms76z127j2vmf7v162n0sh2jqylw4i7c35x5sig4q22m9gy"; depends=[boot combinat dirmult geepack mvtnorm]; };
-  CorrMixed = derive2 { name="CorrMixed"; version="0.1-11"; sha256="18n70yx6yysvcn3wsf1zmnp4z2hs3783mr1n0pjp2ph5yd9xk4mg"; depends=[nlme psych]; };
+  CorrMixed = derive2 { name="CorrMixed"; version="0.1-12"; sha256="10wcg2rn4dcx87wv6h51rk31gdh7pc0bbgmdi1qvwd08nlqc3zsy"; depends=[nlme psych]; };
   Correlplot = derive2 { name="Correlplot"; version="1.0-2"; sha256="0prxnbi7ga5d23i0i4qpynfb3zrsgjxam47km6nsj1prakdkrq7w"; depends=[calibrate xtable]; };
   CosmoPhotoz = derive2 { name="CosmoPhotoz"; version="0.1"; sha256="04girid6wvgyrk8ha81mdqjx2mmzifz57l1hzcgrdnzmjmm3vlmp"; depends=[arm COUNT ggplot2 ggthemes gridExtra mvtnorm pcaPP shiny]; };
   CountsEPPM = derive2 { name="CountsEPPM"; version="2.0"; sha256="0bwd2jc8g62xpvnnq759cxhjvip94abbj63yk6n1awlh5hb4ni3b"; depends=[expm Formula numDeriv]; };
@@ -411,7 +421,7 @@ in with self; {
   CoxBoost = derive2 { name="CoxBoost"; version="1.4"; sha256="1bxkanc8zr4g3abn4ds5wqibv65flvm4y648fs9s0l4vc9vmyshg"; depends=[Matrix prodlim survival]; };
   CoxPlus = derive2 { name="CoxPlus"; version="1.1.1"; sha256="038wsz206bgc0pnzx403b5ihcwhxpkrpxmwvrvqcxf8333pb62l5"; depends=[Rcpp RcppArmadillo]; };
   CoxRidge = derive2 { name="CoxRidge"; version="0.9.2"; sha256="0p65mg4hzdgks03k1lj90yj6qbk50s94rwvcwzkb5xxxwrijd10r"; depends=[survival]; };
-  Coxnet = derive2 { name="Coxnet"; version="0.1-1"; sha256="07ivs47lj0l84mk4r7bvzncvddspq4yl19aibii5pvjmzfzdgymp"; depends=[Matrix Rcpp RcppEigen]; };
+  Coxnet = derive2 { name="Coxnet"; version="0.2"; sha256="023l1fcs0g5qqlslqfwb51nkmcqa0d5qp9bibhndd8gq7raz6ws6"; depends=[Matrix Rcpp RcppEigen]; };
   CpGFilter = derive2 { name="CpGFilter"; version="1.0"; sha256="07426xlmx0ya3pi1y5c24zr58wr024m38y036h9gz26pw7bpawy2"; depends=[]; };
   CpGassoc = derive2 { name="CpGassoc"; version="2.50"; sha256="052mzkcp7510dm12winmwpxz6dvy54aziff0mn3nzy0xbk5v1fw4"; depends=[nlme]; };
   Cprob = derive2 { name="Cprob"; version="1.2.4"; sha256="0zird0l0kx2amrp4qjvlagw55pk9jrx0536gq7bvajj8avyvyykr"; depends=[geepack lattice lgtdl prodlim tpr]; };
@@ -455,7 +465,7 @@ in with self; {
   DIFtree = derive2 { name="DIFtree"; version="1.1.0"; sha256="0pxqa1w4mppsj61nr3pw24zmrhkgqy1pbqi3cpi0ppxnrj4ibbbs"; depends=[penalized plotrix]; };
   DIME = derive2 { name="DIME"; version="1.2"; sha256="11l6mk6i3kqphrnq4iwk4b0ridbbpg2pr4pyqaqbsb06ng899xw0"; depends=[]; };
   DIRECT = derive2 { name="DIRECT"; version="1.0"; sha256="129bx45zmd6h7j6ilbzj2hjg4bcdc08dvm2igggi8ajndl1l5q9j"; depends=[]; };
-  DJL = derive2 { name="DJL"; version="1.7"; sha256="17pdpslrnsp19zb22k29k1dw0pm0i96hi3jhn16lhplnbii7h936"; depends=[lpSolveAPI]; };
+  DJL = derive2 { name="DJL"; version="1.8"; sha256="11kbl1r4g81pl9mpbdb2s4adqvdr3mfpyzplgxdrnl776xba6qsf"; depends=[car combinat lpSolveAPI]; };
   DLMtool = derive2 { name="DLMtool"; version="2.1.1"; sha256="0bvil9h1vg73ahlbi36ji74bp9r819yamy69jbvy4fgn98q0lhn6"; depends=[boot MASS snowfall]; };
   DMR = derive2 { name="DMR"; version="2.0"; sha256="1kal3bvhwqs00b6p6kl0ja35pcz9v9y569148qfhy94m319fcpzm"; depends=[magic]; };
   DMwR = derive2 { name="DMwR"; version="0.4.1"; sha256="1qrykl9zdvgm4c801iix5rxmhk9vbwnrq9cnc58ms5jf34hnmbcf"; depends=[abind class lattice quantmod ROCR rpart xts zoo]; };
@@ -477,18 +487,19 @@ in with self; {
   DTDA = derive2 { name="DTDA"; version="2.1-1"; sha256="0hi2qjcwd6zrzx87mdn1kns5f2h6jh7sz9jpgbi0p0i80xg8jnn3"; depends=[]; };
   DTK = derive2 { name="DTK"; version="3.5"; sha256="0nxcvx25by2nfi47samzpfrd65qpgvcgd5hnq9psx83gv502g55l"; depends=[]; };
   DTMCPack = derive2 { name="DTMCPack"; version="0.1-2"; sha256="0bibas5cf06qq834x9q2l2fyh6q9wrg07k8cn6almcyirzax6811"; depends=[]; };
-  DTR = derive2 { name="DTR"; version="1.6"; sha256="186qgrx9alzmj1vdy2yvfqs5xgidmwddm0zgg041s5q992cih36g"; depends=[aod ggplot2 gridExtra proto survival]; };
-  DTRlearn = derive2 { name="DTRlearn"; version="1.1"; sha256="1ds4agkhpi797fmrp6l3qh7h5bk4p77qbrazhs2f81102wzrnwng"; depends=[ggplot2 glmnet kernlab MASS]; };
-  DVHmetrics = derive2 { name="DVHmetrics"; version="0.3.3"; sha256="0xznyk22grn14jgsa61bhkx57bvr5s2k5bb5q55m3v2dk7wbjayc"; depends=[ggplot2 KernSmooth markdown reshape2 shiny]; };
+  DTR = derive2 { name="DTR"; version="1.7"; sha256="1lzvk9ar6xf3n2vvy8vb9mvrbx3nafzzhvz5g7vf79jd71yz54jd"; depends=[aod ggplot2 survival]; };
+  DTRlearn = derive2 { name="DTRlearn"; version="1.2"; sha256="1dakwlafs27nkjsiknnwxnb2hgc2xdpi5mb6dmzpjig7hg2f8d3f"; depends=[ggplot2 glmnet kernlab MASS]; };
+  DVHmetrics = derive2 { name="DVHmetrics"; version="0.3.4"; sha256="1yph19ychzlk1v18qyrsy6hd7ixwzxmcfcfy8i5l6ax7kwp3a0yb"; depends=[ggplot2 KernSmooth markdown reshape2 shiny]; };
+  DWreg = derive2 { name="DWreg"; version="1.0"; sha256="0nws1gr5w7rwl4agkmz98y5ljmbipwryg81kc8mn1y8ppnpx02m0"; depends=[DiscreteWeibull Ecdat maxLik]; };
   DYM = derive2 { name="DYM"; version="0.1.1"; sha256="0k6iqn1397by9pg31m3ypbnn85zv192ghsn4gpnsfhqfcp18q4d4"; depends=[]; };
   Daim = derive2 { name="Daim"; version="1.1.0"; sha256="19s0p3a4db89i169n2jz7lf8r7pdmrksw7m3cp9n275b5h8yjimx"; depends=[rms]; };
   DandEFA = derive2 { name="DandEFA"; version="1.5"; sha256="0d82rjkgqf4w7qg7irlqvzzav1f23i2gmygkbf8jycaa6xhli80d"; depends=[gplots polycor]; };
   Dark = derive2 { name="Dark"; version="0.9.4"; sha256="0paw34zhbi8k6pjgykxxqhpjgl8qr340dv091r9931q4mm215j2n"; depends=[]; };
   DatABEL = derive2 { name="DatABEL"; version="0.9-6"; sha256="1w0w3gwacqrbqjdcngdp44d2gb16pq9grq2f8j2bhbxc4nkx12n1"; depends=[]; };
-  DataCombine = derive2 { name="DataCombine"; version="0.2.9"; sha256="1yvpv28fwkifiiyzj121dhzwzp06fncms5jbwpvc3nkq1bpzm2mk"; depends=[data_table dplyr]; };
+  DataCombine = derive2 { name="DataCombine"; version="0.2.18"; sha256="1y3mh29ly63ji4i8r8lpawb0l2x9rphmklfc75i289j0q3l3ma38"; depends=[data_table dplyr]; };
   DataLoader = derive2 { name="DataLoader"; version="1.3"; sha256="18mih6mb95v5xjvmqwby2mma74fcxwyqdm5w8j3bhi4iwgfn6d7v"; depends=[plyr rChoiceDialogs readxl xlsx]; };
   Davies = derive2 { name="Davies"; version="1.1-8"; sha256="1wp7ifbs4vqfrn4vwh09lc53yiagpww91m5mxmcr62mjbw8q7zhr"; depends=[]; };
-  Deducer = derive2 { name="Deducer"; version="0.7-7"; sha256="1x97rz92v1hx30fdmgd1lnzydgygjp6zh20v082qymvh997l1zzd"; depends=[car e1071 effects foreign ggplot2 JGR MASS multcomp plyr rJava scales]; };
+  Deducer = derive2 { name="Deducer"; version="0.7-9"; sha256="14kakyf28i654pndlswjzp6h3h7szpznrg6xznqg150mmn0bs3s6"; depends=[car e1071 effects foreign ggplot2 JGR MASS multcomp plyr rJava scales]; };
   DeducerExtras = derive2 { name="DeducerExtras"; version="1.7"; sha256="0sngsq31469a74y7nhskl82fwy2i0ga68m9g6b1xyhxz1a8kgvlg"; depends=[Deducer irr rJava]; };
   DeducerPlugInExample = derive2 { name="DeducerPlugInExample"; version="0.2-0"; sha256="03aw7wr957xzw920ybyzxnck5kx0q2xpcrpq8jh2afyzszy6hzbi"; depends=[Deducer]; };
   DeducerPlugInScaling = derive2 { name="DeducerPlugInScaling"; version="0.1-0"; sha256="1qg11vi4szznchh54p9345jbmrfzfr9z5l3x5xz4m86myjkys1mb"; depends=[Deducer GPArotation irr klaR mvnormtest psych]; };
@@ -546,7 +557,8 @@ in with self; {
   EBEN = derive2 { name="EBEN"; version="4.6"; sha256="0gcf5b2viiq69vs8bd8nhk65g9sbzgg212w7zpnz4y6cv9jkk5zz"; depends=[]; };
   EBMAforecast = derive2 { name="EBMAforecast"; version="0.42"; sha256="161l6jxbzli2g5lcmlp74z320rsvsi80pxk1vc1ypa1hgwz3q80x"; depends=[abind ensembleBMA Hmisc plyr separationplot]; };
   EBS = derive2 { name="EBS"; version="3.0"; sha256="0nrqglbfr7wagd4xrk5jx0kficjgvk7wqwzqrbs589dkll24sn5b"; depends=[MASS]; };
-  EBglmnet = derive2 { name="EBglmnet"; version="3.6"; sha256="0qjwk5y9bghidha4i937nc0kl1jz4d8g2br6ij8651lf2byj9s1a"; depends=[]; };
+  EBglmnet = derive2 { name="EBglmnet"; version="4.0"; sha256="052383c8pw4dkzp3q229fv0sznp1ykpsp42y2rv59lswa4q7pwgr"; depends=[]; };
+  ECOSolveR = derive2 { name="ECOSolveR"; version="0.2"; sha256="1y9gl6gd8im7zhn5j4vhzk0ck620n4l9kwgxig2r27q6h652fqn9"; depends=[Matrix]; };
   EDFIR = derive2 { name="EDFIR"; version="1.0"; sha256="0nv1badyg1dri6z91fvs68a72g22vdg0rpi3fkpxw527r11fvrrv"; depends=[geometry lpSolve MASS vertexenum]; };
   EDISON = derive2 { name="EDISON"; version="1.1"; sha256="09xw4p4hwj8djq143wfdcqhr2mhwynj4ixj3ma7crhqidgal169p"; depends=[corpcor MASS]; };
   EDR = derive2 { name="EDR"; version="0.6-5.1"; sha256="10ldygd1ymc4s9gqhhnpipggsiv4rwbgajvdk4mykkg3zmz7cbpm"; depends=[]; };
@@ -557,6 +569,7 @@ in with self; {
   EIAdata = derive2 { name="EIAdata"; version="0.0.3"; sha256="12jgw3vi2fminwa4lszczdr4j4svn2k024462sgj1sn07a4a4z2s"; depends=[plyr XML xts zoo]; };
   EILA = derive2 { name="EILA"; version="0.1-2"; sha256="0wxl9k4fa0f7jadw3lvn97iwy7n2d02m8wvm9slnhr2n8r8sx3hb"; depends=[class quantreg]; };
   EL = derive2 { name="EL"; version="1.0"; sha256="13r7vjy2608h8jph8kwy69rnkg98b2v69117nrl728r3ayc46a18"; depends=[]; };
+  ELMR = derive2 { name="ELMR"; version="1.0"; sha256="0pd3drv485xbdyfwm28kjpd0nd0zv1khfwzki1gh5p1gz9ndwr2x"; depends=[]; };
   ELT = derive2 { name="ELT"; version="1.4"; sha256="080m00a63a4i2mz11nfna2yzj6wbn1nq4zmpf5a1xbfj518vc44a"; depends=[lattice latticeExtra locfit xlsx]; };
   ELYP = derive2 { name="ELYP"; version="0.7-3"; sha256="1d91r59m85k91kcjjlvhvbsa9855fyd702bwj7drvk36ssfr8qb9"; depends=[survival]; };
   EMA = derive2 { name="EMA"; version="1.4.4"; sha256="1hqkan9k6ps4qckjrhsgxzham106fm38m5rgayz8i2ji3spvbfca"; depends=[affy AnnotationDbi biomaRt cluster FactoMineR gcrma GSA heatmap_plus MASS multtest siggenes survival xtable]; };
@@ -578,7 +591,7 @@ in with self; {
   ENmisc = derive2 { name="ENmisc"; version="1.2-7"; sha256="07rix4nbwx3a4p2fif4wxbm0nh0qr7wbs7nfx2fblafxfzhh6jc7"; depends=[Hmisc RColorBrewer vcd]; };
   EPGLM = derive2 { name="EPGLM"; version="1.1"; sha256="0bgxrli2gxnq4jx43iimzsq1abg1az35fjlkx2i0qkmacqw9bhq6"; depends=[BH MASS Rcpp RcppArmadillo]; };
   EQL = derive2 { name="EQL"; version="1.0-0"; sha256="0lxfiizkvsfls1km1zr9v980191af6qjrxwcqsa2n6ygzcb17dp5"; depends=[lattice ttutils]; };
-  ERP = derive2 { name="ERP"; version="1.0.1"; sha256="0wy1p7pp9dvc3krylskb627rmfqaj11qvia97m88x05ydqx1fwmr"; depends=[fdrtool mnormt]; };
+  ERP = derive2 { name="ERP"; version="1.1"; sha256="00w9zz5rp1asvk13sj9gkd14n2akbclsyz26jp5a3r85fh6chdm0"; depends=[fdrtool mnormt]; };
   ES = derive2 { name="ES"; version="1.0"; sha256="1rapwf6kryr6allzbjk6wmxpj9idd3xlnh87rwbh6196xb7rp8lv"; depends=[]; };
   ESEA = derive2 { name="ESEA"; version="1.0"; sha256="06r5lki32mxkznj6yxvlz0ikqcxm3jbaralv4qp9xrw6dy6yyg27"; depends=[igraph parmigene XML]; };
   ESG = derive2 { name="ESG"; version="0.1"; sha256="1jw6239asv6lwxrz5v0r5pzg6v500bqxg8361sh4jj67rsrc7g9m"; depends=[]; };
@@ -623,7 +636,7 @@ in with self; {
   Epi = derive2 { name="Epi"; version="1.1.71"; sha256="082q5y4g05gw9w8iq1bjfhiazwb50safh43wkl884a9h0srckjv9"; depends=[cmprsk etm MASS survival]; };
   EpiBayes = derive2 { name="EpiBayes"; version="0.1.2"; sha256="1qfir0dl085c9ib1acsygmj7gihc4ar98k5niqdsgnmji88h17y2"; depends=[coda epiR scales shape]; };
   EpiContactTrace = derive2 { name="EpiContactTrace"; version="0.9.1"; sha256="10yd24xcydn03rq9kcqcxj5gn25v54ljsm9mgc206g9wf1xx0wjf"; depends=[]; };
-  EpiDynamics = derive2 { name="EpiDynamics"; version="0.2"; sha256="1hqbfysvw2ln8z3as6lfcjlhkzccksngwh2vm25zsgy93gxw3mcc"; depends=[deSolve ggplot2 reshape2]; };
+  EpiDynamics = derive2 { name="EpiDynamics"; version="0.3.0"; sha256="0hpysjl8wfgylbp4ddxmi5msvlp1w70c6pxggc2bwdgap3s127f3"; depends=[deSolve ggplot2 reshape2]; };
   EpiEstim = derive2 { name="EpiEstim"; version="1.1-2"; sha256="0r56iglhkrqvlsf3gbahd544h944fmbyn6jdc113rhjscf6dl605"; depends=[]; };
   EpiModel = derive2 { name="EpiModel"; version="1.2.2"; sha256="1dp0n31aydq556k76xmz07rbrcpqzpcppq7s7q87pwy4ywid04xb"; depends=[ape deSolve doParallel ergm foreach network networkDynamic RColorBrewer tergm]; };
   Eplot = derive2 { name="Eplot"; version="1.0"; sha256="1glmkjjj432z9g4gi56pgvfrm5w86iplirnd5hm4s99qci2hgc64"; depends=[]; };
@@ -660,7 +673,7 @@ in with self; {
   FBN = derive2 { name="FBN"; version="1.5.1"; sha256="0723krsddfi4cy2i3vd6pi483qjxniychnsi9r8nw7dm052nb4sf"; depends=[]; };
   FCGR = derive2 { name="FCGR"; version="1.0-0"; sha256="015nnnc9fasx0qjrc3lbxv14rqwyx36xzsw9076grwm5pqahrdsb"; depends=[kerdiest KernSmooth MASS mgcv nlme pspline sfsmisc]; };
   FCMapper = derive2 { name="FCMapper"; version="1.0"; sha256="1wp5byx68067fnc0sl5zwvw2wllaqdbcy4g2gbzmlqwli0jz2dsk"; depends=[igraph]; };
-  FCNN4R = derive2 { name="FCNN4R"; version="0.5.0"; sha256="0ddj3fb7fnrc7l7arpkizxp5smixhk3pxcmbwr7lhr60v1gcf7kg"; depends=[Rcpp]; };
+  FCNN4R = derive2 { name="FCNN4R"; version="0.6.0"; sha256="1ciqw5pfqq6gnf5k7s08a42gdn2c0z3x4glmm49j7qq4zwg2l7i6"; depends=[Rcpp]; };
   FD = derive2 { name="FD"; version="1.0-12"; sha256="0xdpciq14i8rh7v6mw174hip64r7mrzhx7gwri3vp9y7a1380sbi"; depends=[ade4 ape geometry vegan]; };
   FDGcopulas = derive2 { name="FDGcopulas"; version="1.0"; sha256="1i86ns4hq74y0gnxfschshjlc6if3js0disjb4bwfizaclwbw3as"; depends=[numDeriv randtoolbox Rcpp]; };
   FDRreg = derive2 { name="FDRreg"; version="0.1"; sha256="17hppvyncbmyqpi7sin9qsrgffrnx8xjcla2ra6y0sqzam1145y4"; depends=[fda mosaic Rcpp RcppArmadillo]; };
@@ -690,12 +703,12 @@ in with self; {
   FRCC = derive2 { name="FRCC"; version="1.0"; sha256="1g1rsdqsvwf7wc16dj16y6r0347j8jsv5l1pxvj1h0579zinaf2b"; depends=[calibrate CCP corpcor MASS]; };
   FREQ = derive2 { name="FREQ"; version="1.0"; sha256="01nra30pbnqdd63pa87lcws3hnhhzybcjvx2jqyxjghn6khz47j0"; depends=[]; };
   FRESA_CAD = derive2 { name="FRESA.CAD"; version="2.1.3"; sha256="1as5b19pri5ib88g8cxbgs70zdsz24nqw6979z744vcgvzqk8gvv"; depends=[Hmisc miscTools pROC Rcpp RcppArmadillo stringr]; };
-  FSA = derive2 { name="FSA"; version="0.8.3"; sha256="03msil0qs1yh1l827p5kn1yiy3shdh56q08j6n6bcwgzkpygc2wk"; depends=[plotrix plyr]; };
+  FSA = derive2 { name="FSA"; version="0.8.4"; sha256="1zj8d5543jf1hnm9bf7ns29l877plw5skfsl30268l1azrzsw1lb"; depends=[car dplyr gdata gplots Hmisc plotrix plyr sciplot]; };
   FSAdata = derive2 { name="FSAdata"; version="0.3.2"; sha256="1g682bj7xiaqcs6ax8jyg02lvx5c1qk0v6a6w0ma3f0qyk6ga7aq"; depends=[]; };
   FSInteract = derive2 { name="FSInteract"; version="0.1.1"; sha256="0hlmz0sc4l9vmb4b2y3j95gh39m1jqrp9bvqsjjqdr0ly1lb7mvm"; depends=[Matrix Rcpp]; };
   FSelector = derive2 { name="FSelector"; version="0.20"; sha256="0gbnm48x5myhxxw8gz7ck9sl41nj5rxq4gwifqk3l4kiqphywlpi"; depends=[digest entropy randomForest RWeka]; };
   FTICRMS = derive2 { name="FTICRMS"; version="0.8"; sha256="0kv02mdmwflhqdrkhzb55si5qnqqgdadgyabqc2hwr6iccn7aq8c"; depends=[lattice Matrix]; };
-  FWDselect = derive2 { name="FWDselect"; version="2.0.1"; sha256="0mbmgwhzg3nymsyvnvrrddvz8zvrlfcip8w0nm1yqbqanvy9mcm8"; depends=[cvTools mgcv]; };
+  FWDselect = derive2 { name="FWDselect"; version="2.1.0"; sha256="0w0hkmhcz7h1lixk7p3yffbbalgxwh2lv463vqz361k80sri6wz7"; depends=[cvTools mgcv]; };
   FacPad = derive2 { name="FacPad"; version="3.0"; sha256="0h7knzin0rfk25li127zwjsyz223w7nx959cs328p6b2azhgn59b"; depends=[MASS Rlab]; };
   FactMixtAnalysis = derive2 { name="FactMixtAnalysis"; version="1.0"; sha256="1l4wfp39b7g38vdk6jpd5zq08sjhsg0s71f662aca2rj6l3a2x3r"; depends=[MASS mvtnorm]; };
   FactoClass = derive2 { name="FactoClass"; version="1.1.2"; sha256="0wg8n2vn586dj5g6js6c7rshsjibciyvg2j53mxgnn0f63xdb3ip"; depends=[ade4 xtable]; };
@@ -715,12 +728,12 @@ in with self; {
   FatTailsR = derive2 { name="FatTailsR"; version="1.5-0"; sha256="188b0dwh96hgqk31kcbzljwm0br6ld2dqaaci85cqpihlc6vddl5"; depends=[minpack_lm timeSeries]; };
   FeaLect = derive2 { name="FeaLect"; version="1.10"; sha256="1r7rgcadrqjhxn2g2w16axygsck82fprxg7l14ai11bn4b7h4pmb"; depends=[lars rms]; };
   FeatureHashing = derive2 { name="FeatureHashing"; version="0.9.1.1"; sha256="1y46bk2yddq0n8p1kj6fwi9q23lsblsrlgf7b630vcbvv8mpz5x2"; depends=[BH digest magrittr Matrix Rcpp]; };
-  FedData = derive2 { name="FedData"; version="2.0.1"; sha256="0zp0vaziaxi57ps8v72spfy0yjiq41xykr7cgz97ci8f9c8mvxp5"; depends=[data_table devtools igraph raster RCurl rgdal soilDB sp]; };
+  FedData = derive2 { name="FedData"; version="2.0.2"; sha256="1b1kpm4zhh2rxjwgpms1cd9blmladgpjc1gfjdl1yra279j8l74l"; depends=[data_table devtools Hmisc igraph raster RCurl rgdal soilDB sp]; };
   FeedbackTS = derive2 { name="FeedbackTS"; version="1.3.1"; sha256="1zx64wbl5pzqn69bjhshd3nayxx4wlg7n1zwv7ilh68raxfxnbbx"; depends=[geoR mapdata maps proj4 sp]; };
   Fgmutils = derive2 { name="Fgmutils"; version="0.4"; sha256="0cg2vivshwcqyzlahsirh9jax4nr8alwz7gf4qxcdmxvzjaln6lq"; depends=[data_table devEMF plyr png sqldf stringr]; };
   FieldSim = derive2 { name="FieldSim"; version="3.2.1"; sha256="1snz2wja3lsgxys0mdlrjjvk5575cyd64mjipafibwcs97bva5x1"; depends=[RColorBrewer rgl]; };
   FinAsym = derive2 { name="FinAsym"; version="1.0"; sha256="0v15ydz4sq9djwcdcfp90mk8l951rry7h91d7asgg53mddbxjj6f"; depends=[]; };
-  FinCal = derive2 { name="FinCal"; version="0.6"; sha256="0slw5s7gilmv0j8iwhz27lss2gbrj2l8zqv7bqywr1yf0hw2nxn7"; depends=[ggplot2 RCurl reshape2 scales]; };
+  FinCal = derive2 { name="FinCal"; version="0.6.2"; sha256="0hfmbg4ha6vr80nl1772cahjzqicak038d6dg6784fs2rqvzjhw2"; depends=[ggplot2 RCurl reshape2]; };
   FinCovRegularization = derive2 { name="FinCovRegularization"; version="1.0.0"; sha256="0da7asm4mvbd4wvqll5gdvckb10ccfx7gy141xbxyaixdhgi6zl4"; depends=[quadprog]; };
   FinTS = derive2 { name="FinTS"; version="0.4-5"; sha256="16m57h6rk4344aalfwaz7hsyis30c1dirsyx8ih661ihgqn1ai1r"; depends=[zoo]; };
   FinancialInstrument = derive2 { name="FinancialInstrument"; version="1.2.0"; sha256="0lx8gqmnapyizlg0qdcjy8xrkpbhj0f7nc95l86a6xy82hz62dzb"; depends=[quantmod TTR xts zoo]; };
@@ -745,7 +758,7 @@ in with self; {
   FrF2_catlg128 = derive2 { name="FrF2.catlg128"; version="1.2-1"; sha256="0i4m5zb9dazpvmnp8wh3k51bm0vykh4gncnhdg71mfk4hzrfpdac"; depends=[FrF2]; };
   FractalParameterEstimation = derive2 { name="FractalParameterEstimation"; version="1.0"; sha256="12v72zn1san2kv82b9y1vd0gzd1fa800yscc63zlq8lfflz47xvz"; depends=[]; };
   Fragman = derive2 { name="Fragman"; version="1.0.2"; sha256="19yx8rbxy64m3jqbrjqkdd9jn6yfzx9a3n68727d8g29qan1mkxx"; depends=[]; };
-  Frames2 = derive2 { name="Frames2"; version="0.1.2"; sha256="1jkcpdg9iajxj328r8n2wxa99lyz61msm41hzfnkgsfb288n1xqx"; depends=[sampling]; };
+  Frames2 = derive2 { name="Frames2"; version="0.2.1"; sha256="0xbz19v5r1h15p8mf94vacw04h3kvmm88ayy4b1aqxrd925n63mw"; depends=[MASS nnet sampling]; };
   FreeSortR = derive2 { name="FreeSortR"; version="1.1"; sha256="03z5wmr88gr6raa2cg7w4j6y5vgxr3g8b8axzhbd7jipswr5x1jf"; depends=[ellipse smacof vegan]; };
   FunChisq = derive2 { name="FunChisq"; version="2.1.0"; sha256="0k5b0kl64yswl5d41yiav9xnqcsqx8n6qc5p2nz5vqjs6qb7mbvd"; depends=[BH Rcpp RcppClassic]; };
   FunCluster = derive2 { name="FunCluster"; version="1.09"; sha256="0i73asn1w4s6ydf2ddn5wpr0mwbbxzgmaly1pslarzkx71wk03fz"; depends=[cluster Hmisc]; };
@@ -758,7 +771,7 @@ in with self; {
   FuzzyStatProb = derive2 { name="FuzzyStatProb"; version="2.0.1"; sha256="0cj6dqb5iy4gw7kkip9jvk9djf6dx20078kmb42br8sim1065j8m"; depends=[DEoptim FuzzyNumbers MultinomialCI]; };
   FuzzyToolkitUoN = derive2 { name="FuzzyToolkitUoN"; version="1.0"; sha256="104s45mmlam67vwpshhpns2mgwvmhnbj8w1918jyk2r5mqibwz06"; depends=[]; };
   G1DBN = derive2 { name="G1DBN"; version="3.1.1"; sha256="015rw3bpz32a8254janddgg1ip947qgcvmiwx5r3v7g8n854bwxn"; depends=[igraph MASS]; };
-  G2Sd = derive2 { name="G2Sd"; version="2.1.4"; sha256="1436kv0hyanyqgx62f3n6hnaqxyjpx43wkz1bipdj18ph4is2r96"; depends=[ggplot2 reshape2 rJava shiny xlsx xlsxjars]; };
+  G2Sd = derive2 { name="G2Sd"; version="2.1.5"; sha256="165i6x2k56vwhk5p2p5m9vjmp9flblsapjdlz7nw9b719l6xz5zk"; depends=[ggplot2 reshape2 rJava shiny xlsx xlsxjars]; };
   GA = derive2 { name="GA"; version="2.2"; sha256="1pk80jwzvpmi61df0y331qvl8jkdizblg93s7gaspkbzy50wyfkp"; depends=[foreach iterators]; };
   GA4Stratification = derive2 { name="GA4Stratification"; version="1.0"; sha256="0li23mrxjx72fir16j3q06fa32cicck4pfc30n0dy2lysf81m9gs"; depends=[]; };
   GABi = derive2 { name="GABi"; version="0.1"; sha256="1zmiaqbd1jrpiz9hk16s8rggcpl3xyyhjkkdliymx2p42vy5b5mf"; depends=[hash]; };
@@ -779,16 +792,16 @@ in with self; {
   GENEAread = derive2 { name="GENEAread"; version="1.1.1"; sha256="0c3d76yl8dqclk8zhhgrd6bv6b599vkpbyg3hjspb6npdw6zs6k8"; depends=[bitops]; };
   GENLIB = derive2 { name="GENLIB"; version="1.0.4"; sha256="1gl8qsgm9iy57rlajgc47lfxah52jsg7lpj131a6813kj0c639l7"; depends=[bootstrap doParallel foreach kinship2 lattice Matrix quadprog Rcpp]; };
   GEOmap = derive2 { name="GEOmap"; version="2.3-8"; sha256="14nar0djn8jzcyv0aij79xr3iqbgllrpcnfazi865plfa5ah7k9v"; depends=[fields MBA RPMG splancs]; };
-  GERGM = derive2 { name="GERGM"; version="0.4.2"; sha256="1fysv1576064scjlg279wmqb45nvzim64sbfsaxvafb8fwmprbz8"; depends=[BH ggplot2 igraph Rcpp RcppArmadillo stringr]; };
+  GERGM = derive2 { name="GERGM"; version="0.6.2"; sha256="0svnx3bdacyy2hhyw8h40z7gskk5brh1mbbp5kxgjwcc6zz61fhy"; depends=[BH ggplot2 igraph plyr Rcpp RcppArmadillo stringr]; };
   GESTr = derive2 { name="GESTr"; version="0.1"; sha256="1q12l2vcq6bcyybnknrmfbm6rpzcmxgq2vyj33xwhkmm9g2ii9k6"; depends=[gtools mclust]; };
   GEVStableGarch = derive2 { name="GEVStableGarch"; version="1.1"; sha256="1iypv0k4cbvsdyglgvf7y52sqvl5qcin627pjqwq42kisqynm8d7"; depends=[fExtremes fGarch Rsolnp skewt stabledist timeDate timeSeries]; };
   GEVcdn = derive2 { name="GEVcdn"; version="1.1.4"; sha256="13p6wi72z6j7iyp5hv16ndvsq6jf6hdqgcmf1i8g713gn73l79kj"; depends=[VGAM]; };
   GExMap = derive2 { name="GExMap"; version="1.1.3"; sha256="1a6i2z9ndgia4v96nkr77cjqnbgxigqbqlibg82gwa0a6pl7r7nz"; depends=[Biobase multtest]; };
   GFD = derive2 { name="GFD"; version="0.1.2"; sha256="1m6ygwvxp74nn5wmpmwb0xszc7a9q62gqfgd9hkdfp6xnnm54x73"; depends=[magic MASS Matrix plotrix plyr RGtk2]; };
   GGEBiplotGUI = derive2 { name="GGEBiplotGUI"; version="1.0-8"; sha256="0bkagsm9mkcghc2q46cc86kjajzgjbq9588v0v2bp71qw8m97mbh"; depends=[rgl tkrplot]; };
-  GGIR = derive2 { name="GGIR"; version="1.2-0"; sha256="0gxin5nycrhz1lixiafymsjrxf6ng0kvyvxwafb251ziqh2zipk5"; depends=[]; };
+  GGIR = derive2 { name="GGIR"; version="1.2-1"; sha256="03mmx7rmz5qah0853xn4slzkz0jkaq62zj69ydrk9gif84z6lgli"; depends=[]; };
   GGMselect = derive2 { name="GGMselect"; version="0.1-10"; sha256="0ihxxih5fw470pnmnljsarahd4xim6ncx3w7fym5i5q86bqcyahb"; depends=[gtools lars mvtnorm]; };
-  GGally = derive2 { name="GGally"; version="0.5.0"; sha256="00ix8qafi71l7vhj6268f9srqbgr9iw1qk0202y59mhfrj6c6f5i"; depends=[ggplot2 gtable plyr reshape stringr]; };
+  GGally = derive2 { name="GGally"; version="1.0.0"; sha256="0vrfaanlxsnrdsx7rbsnq01m61qib2skmzbzhisb447snq3qjfi5"; depends=[ggplot2 gtable plyr reshape]; };
   GHQp = derive2 { name="GHQp"; version="1.0"; sha256="0qpcpwv7rz67qhz1p5k2im02jvs7l8z9sa6ypz13hig5fzm8j9bp"; depends=[statmod]; };
   GIGrvg = derive2 { name="GIGrvg"; version="0.4"; sha256="0sflklyzl2l5bcjhz7n75aww76ih93sq5mbgdc4v1p0vqhrbbg47"; depends=[]; };
   GISTools = derive2 { name="GISTools"; version="0.7-4"; sha256="06alb5d2k4qj344i9cpgm3lz9m68rkmjqfx5k2hzn7z458xjrlxs"; depends=[maptools MASS RColorBrewer rgeos sp]; };
@@ -797,7 +810,7 @@ in with self; {
   GLSME = derive2 { name="GLSME"; version="1.0.3"; sha256="0flja5gk25k4z9hwskvdw4c1f88scc47xvc1l3d2447fkfrb0bwc"; depends=[corpcor mvtnorm]; };
   GMCM = derive2 { name="GMCM"; version="1.2.2"; sha256="1zvhbxz1bli460c9nh2p3vx7v3a5w2jwyyyd7r8dqgxpf3xr1pzw"; depends=[Rcpp RcppArmadillo]; };
   GMD = derive2 { name="GMD"; version="0.3.3"; sha256="0hdya8ai210wxnkfra9bzyswk3gib5fm53fs61rh0nsmg3ysdga6"; depends=[gplots]; };
-  GMDH = derive2 { name="GMDH"; version="1.1"; sha256="053x0flh1jk61ak84d7y1r22fn1s52pj5xqwlbvkc70jmfmvs141"; depends=[MASS]; };
+  GMDH = derive2 { name="GMDH"; version="1.2"; sha256="0b2vidcv78c9bnqwassn8yhk4lpn0l0pcz4rvm1vlfablg0xig79"; depends=[MASS]; };
   GMMBoost = derive2 { name="GMMBoost"; version="1.1.2"; sha256="01q165vkdiv4qh96lha0g2g94jpnzdclbby6q43ghh9j1yrd4qzj"; depends=[magic minqa]; };
   GNE = derive2 { name="GNE"; version="0.99-1"; sha256="1avsl54xdlqq8pw16g84igcwms7if7lvdblqvfc2cn3sk8qi5xdv"; depends=[alabama BB nleqslv SQUAREM]; };
   GOGANPA = derive2 { name="GOGANPA"; version="1.0"; sha256="1xbir21zvr5hv2y6nndzpsrpmnr7glrc7y6xgcyb856wx46ajan9"; depends=[GANPA WGCNA]; };
@@ -815,7 +828,7 @@ in with self; {
   GRaF = derive2 { name="GRaF"; version="0.1-12"; sha256="1d7mr2z49v6ch4jbzh0dj2yjy2c5p51ws38xfz233sjz475snajr"; depends=[dismo]; };
   GSA = derive2 { name="GSA"; version="1.03"; sha256="1h1sbpn1rrdh44w4fx2avc7x24ba40mvpd8b2x5wfrc7a294zf6z"; depends=[]; };
   GSAgm = derive2 { name="GSAgm"; version="1.0"; sha256="18bhk67rpss6gg1ncaj0nrz0wbfxv7kvy1cxria083vi60z0vwbb"; depends=[edgeR survival]; };
-  GSE = derive2 { name="GSE"; version="3.2.2"; sha256="1sg1cpc3izykkzrbc8j0w96d174xb909d5i9vffmwzycxr4rf1pd"; depends=[ggplot2 MASS Rcpp RcppArmadillo rrcov]; };
+  GSE = derive2 { name="GSE"; version="3.2.3"; sha256="1pxclcjz118dxypfgz3faagk6yqsj619wzmxd7cfraza797vy8xy"; depends=[ggplot2 MASS Rcpp RcppArmadillo rrcov]; };
   GSIF = derive2 { name="GSIF"; version="0.4-7"; sha256="1c2lk6yzacwrxvs5v0al8hwvi7ncqdvn4f7ngicy6g8iyi4p7z08"; depends=[aqp dismo gstat plotKML plyr raster rgdal RSAGA sp]; };
   GSM = derive2 { name="GSM"; version="1.3.2"; sha256="04xjs9w4gaszwzxmsr7657ry2ywa9pvpwpczpvinxi8vpj347jbb"; depends=[gtools]; };
   GSSE = derive2 { name="GSSE"; version="0.1"; sha256="034mmxa6kjq5kgikhb5q75viagz5ck9irrjbxm26zq9099qxm13b"; depends=[Iso zoo]; };
@@ -859,9 +872,9 @@ in with self; {
   GeoLight = derive2 { name="GeoLight"; version="2.0.0"; sha256="1i49hyj3f5rcw0s6j2csnfwc6mnp5zn44vxjnk05wdkpw6dpvx5i"; depends=[changepoint fields maps MASS]; };
   GeoXp = derive2 { name="GeoXp"; version="1.6.2"; sha256="18wdmdwb79ipdjdii068dz9f55b5ldxn95g5q6jcxsqwp0wldvw8"; depends=[KernSmooth quantreg rgeos rgl robustbase spdep splancs]; };
   GetR = derive2 { name="GetR"; version="0.1"; sha256="1b2wirhz4nhvmf863czwb8z8b42ilsyjjrg9rc4nd9b7nz50bmjg"; depends=[party]; };
-  GetoptLong = derive2 { name="GetoptLong"; version="0.1.0"; sha256="1r86bffsj6s8d71wngspqvfv0gyrrpihf225b4v3c69c05n36qm1"; depends=[GlobalOptions rjson]; };
+  GetoptLong = derive2 { name="GetoptLong"; version="0.1.1"; sha256="05fwlzzjnl84rv6r2hlqkhhg1y0d4yxmk5w4fpxfc7lpz2zi3zcd"; depends=[GlobalOptions rjson]; };
   GhcnDaily = derive2 { name="GhcnDaily"; version="1.5"; sha256="1gln1giid5n5b9mxidh90l8ahvcgx968zak2lxr2f9c32pnrpmnp"; depends=[abind ncdf R_methodsS3 R_oo R_utils]; };
-  GiANT = derive2 { name="GiANT"; version="1.1"; sha256="1918fncz7qgdc9qka6fv841ml4wzkg7nx6fwlz920x2a0zi494zj"; depends=[]; };
+  GiANT = derive2 { name="GiANT"; version="1.2"; sha256="0h9jx2vpgpzlinf6v9mxj260r22nlqml8xnd2jknw36j5imim57w"; depends=[]; };
   GibbsACOV = derive2 { name="GibbsACOV"; version="1.1"; sha256="1ikcdsf72sn1zgk527zmxw3zjhx0yvkal6dv001cgkv202842kll"; depends=[MASS]; };
   GillespieSSA = derive2 { name="GillespieSSA"; version="0.5-4"; sha256="0bs16g8vm9yrv74g94lj8fdfmf1rjj0f04lcnaya7gyak3jhk36q"; depends=[]; };
   Giza = derive2 { name="Giza"; version="1.0"; sha256="13nkm8mk1v7s85kmp6psvnr1v97vi0gid8rsqyq3x6046pyl5z6v"; depends=[lattice reshape]; };
@@ -879,6 +892,7 @@ in with self; {
   Grid2Polygons = derive2 { name="Grid2Polygons"; version="0.1-5"; sha256="18hgyx8a75allldsc2ih5i1p7ajkwj2x020cfd2hp18zrc4qyp5n"; depends=[rgeos sp]; };
   GriegSmith = derive2 { name="GriegSmith"; version="1.0"; sha256="1a7gnaig1wvxpph7d8c37kx51dznzk0457fzf7alw95iwpyb4z7j"; depends=[spatstat]; };
   GroupSeq = derive2 { name="GroupSeq"; version="1.3.3"; sha256="0abb18w9jylb1nf6yc6xic6b01f8zfxsm8hsmxk4whivn17ckfp9"; depends=[]; };
+  GroupTest = derive2 { name="GroupTest"; version="1.0.1"; sha256="1v2230mw0irsr5y8n45g8sd362jp7f6dy2r532mhflfdqy6i2khs"; depends=[]; };
   GsymPoint = derive2 { name="GsymPoint"; version="1.0"; sha256="0wcscyrkxl1sxhzgm35x2zh94lmnhvj16x77k9vhscc7j8as5d90"; depends=[Rsolnp truncnorm]; };
   GuardianR = derive2 { name="GuardianR"; version="0.5"; sha256="0m5arxz4ih84zg8sf2wy2kg38adraa098gb52vwz93dzdm1dhslw"; depends=[RCurl RJSONIO]; };
   Guerry = derive2 { name="Guerry"; version="1.6-1"; sha256="1hpp49w2kd1npsd709cwg125pw6mrqxfv2nn3lcs1mg2r49ki2bl"; depends=[]; };
@@ -895,13 +909,13 @@ in with self; {
   HDtweedie = derive2 { name="HDtweedie"; version="1.1"; sha256="14awd7sws0464f68f5xwnv1xvr0xflvx2z2zzcfj1csvk3af0zzj"; depends=[]; };
   HEAT = derive2 { name="HEAT"; version="1.2"; sha256="1qifqd06ifl0f5l44mkxapnkwhpm0b82yq6dhfw4f8yhb27wd0z2"; depends=[]; };
   HGNChelper = derive2 { name="HGNChelper"; version="0.3.1"; sha256="0vidw7gdvr0i4l175ic5ya8q2x2jj0v2vc7fagzrp2mcy7fn1y6a"; depends=[]; };
-  HH = derive2 { name="HH"; version="3.1-23"; sha256="1i0qbs00qbvvd7rjk8r6hyr26xalshfgy3n8pqp4ri469dbic4bn"; depends=[abind colorspace gridExtra Hmisc lattice latticeExtra leaps multcomp RColorBrewer reshape2 Rmpfr shiny vcd]; };
+  HH = derive2 { name="HH"; version="3.1-24"; sha256="05z8bbyz7pgwd2vz2cc36j1r2v03m97ac6qc3hwg388mm0vy1xpr"; depends=[abind colorspace gridExtra Hmisc lattice latticeExtra leaps multcomp RColorBrewer reshape2 Rmpfr shiny vcd]; };
   HHG = derive2 { name="HHG"; version="1.5.1"; sha256="111b3lqkp8z7m3g4vgmd0dcplkm4szfwa620sxy70084qad1jv4d"; depends=[]; };
   HI = derive2 { name="HI"; version="0.4"; sha256="0i7y4zcdr6wcjy43lz9h8glzpdv0pz7livr95xb1j4p8zafykday"; depends=[]; };
   HIV_LifeTables = derive2 { name="HIV.LifeTables"; version="0.1"; sha256="0qa5n9w5d5l1kr4827a34581q380xmpyzmmhhl300z1jwr0j94df"; depends=[]; };
   HIest = derive2 { name="HIest"; version="2.0"; sha256="0ik55kxhzjyg6z6072iz9nfaj7x1nvf91l1kysgvkjccr6jf3y86"; depends=[nnet]; };
   HK80 = derive2 { name="HK80"; version="0.0.1"; sha256="1qhknrqpspxrdxzf5kakans94db58bbhgpblvpwcyw4jrjmm0ng7"; depends=[]; };
-  HLMdiag = derive2 { name="HLMdiag"; version="0.3.0"; sha256="01j50dwab59467xm2fz5yfp9rn6pxf0isphsczvwmxnyvqw45qxw"; depends=[ggplot2 MASS Matrix mgcv plyr Rcpp RcppArmadillo reshape2 RLRsim]; };
+  HLMdiag = derive2 { name="HLMdiag"; version="0.3.1"; sha256="02pgvfyj3xpy7laxryqivsws8jl3m79fwfzpqj8ad794a06gh87g"; depends=[ggplot2 MASS Matrix mgcv plyr Rcpp RcppArmadillo reshape2 RLRsim]; };
   HLSM = derive2 { name="HLSM"; version="0.5"; sha256="0j1jfnm5lydlcjdbb31jd514is5brvfzrx8h4ckw4p7xa4syg08s"; depends=[coda MASS]; };
   HMDHFDplus = derive2 { name="HMDHFDplus"; version="1.1.8"; sha256="15z0war5isw9xnln7py3di8f45pwvdw6x6wljl18fcxpmanmlfcf"; depends=[RCurl XML]; };
   HMM = derive2 { name="HMM"; version="1.0"; sha256="0z0hcqfixx1l2a6d3lpy5hmh0n4gjgs0jnck441akpp3vh37glzw"; depends=[]; };
@@ -912,6 +926,7 @@ in with self; {
   HMR = derive2 { name="HMR"; version="0.4.1"; sha256="1acaph5q6vgi4c7liv7xsc3crhp23nib5q44aszxhramky0gvaqr"; depends=[]; };
   HPbayes = derive2 { name="HPbayes"; version="0.1"; sha256="1kpqnv7ymf95sgb0ik7npc4qfkzc1zb483vwnjpba4f42jhf508y"; depends=[boot corpcor MASS mvtnorm numDeriv]; };
   HRM = derive2 { name="HRM"; version="0.1"; sha256="12pjsy9hx0sz42czfwvsla6pyp85as4pf2hhvbh0yp07wwfs2f3i"; depends=[MASS matrixcalc]; };
+  HSAR = derive2 { name="HSAR"; version="0.3.6"; sha256="1f4n65gbql1kaqf1izbh4ngqsv36ccypy7n40rlc5fi0hjxsff23"; depends=[Rcpp RcppArmadillo spdep]; };
   HSAUR = derive2 { name="HSAUR"; version="1.3-7"; sha256="16qmsyin8b7x9q3xdx74kw6db6zjinhxprp6pfnl6ddwxhz3jzzf"; depends=[]; };
   HSAUR2 = derive2 { name="HSAUR2"; version="1.1-14"; sha256="0psykccxyqigkfzrszy7x3qhdw02kppzgz0bqr21q8zh51jb2y3v"; depends=[]; };
   HSAUR3 = derive2 { name="HSAUR3"; version="1.0-5"; sha256="0hjlkmxp1yhwkfcbx16nda96ysqddjrcvl4z52w2ab84prqn6196"; depends=[]; };
@@ -932,7 +947,7 @@ in with self; {
   HardyWeinberg = derive2 { name="HardyWeinberg"; version="1.5.5"; sha256="1kz12301bi2880i9ds7wvc6yb5hvrs3fr5689fm1yygkqfq8zc56"; depends=[mice]; };
   HarmonicRegression = derive2 { name="HarmonicRegression"; version="1.0"; sha256="0inz3l610wl0ibqjyrhfbmwmcfzcmcfhixai4lpkbfsyx93z2i4d"; depends=[]; };
   Harvest_Tree = derive2 { name="Harvest.Tree"; version="1.1"; sha256="021zmppy7p2iakaxirfjdb5jzakg1ijma9d25ly2ni0nx0p1mh6z"; depends=[rpart]; };
-  HelpersMG = derive2 { name="HelpersMG"; version="1.2.3"; sha256="1kn8av2m1rkmbm8x0v1gc9as0da68s5c27i4cp6jxlliywbjp1di"; depends=[coda]; };
+  HelpersMG = derive2 { name="HelpersMG"; version="1.3.2"; sha256="0v6mlxd7lxbj4z5a7dr5jfrnm4qjwgkc7ipkby5lb6h26c0lmdpp"; depends=[coda]; };
   HiCfeat = derive2 { name="HiCfeat"; version="1.0"; sha256="0azr6n792dmkg12ynr3nybmb33z8rv046lv0hfwpyybz6p8dj3zq"; depends=[GenomeInfoDb GenomicRanges glmnet IRanges Matrix rtracklayer]; };
   HiClimR = derive2 { name="HiClimR"; version="1.2.3"; sha256="1yv01pyfmgq306f3yravwf6sm79m0m93gpya95k85rxqdjl3c2hx"; depends=[]; };
   HiCseg = derive2 { name="HiCseg"; version="1.1"; sha256="19581k3g71wrznyqrp4hmspqyzcbcfbc48xgjlq13zmqii45hcn6"; depends=[]; };
@@ -947,7 +962,7 @@ in with self; {
   HistData = derive2 { name="HistData"; version="0.7-6"; sha256="1wazqpgjzl5x2whn9v54yx83xw0pd0l03h6rqv6dp25xizxlxw0v"; depends=[]; };
   HistogramTools = derive2 { name="HistogramTools"; version="0.3.2"; sha256="1wkv6ypn006d8j6bpbhc1knw0bky4y8r7jp87482yd19q5ljsgv0"; depends=[ash Hmisc stringr]; };
   HiveR = derive2 { name="HiveR"; version="0.2.44"; sha256="1ckbgn4vmv35bssbjrgvqhsx7ihm40ibpnxqwwsw6bv7g6ppx3ch"; depends=[jpeg plyr png RColorBrewer]; };
-  Hmisc = derive2 { name="Hmisc"; version="3.17-0"; sha256="0n3my81ppjy1wvqmy8pyafh0vglsgy2kwqs4iadj1y8xr5mibrlw"; depends=[acepack cluster foreign Formula ggplot2 gridExtra gtable lattice latticeExtra nnet proto rpart scales survival]; };
+  Hmisc = derive2 { name="Hmisc"; version="3.17-1"; sha256="18y3bgdlv12qgqyjmayn9zxd0v6bpgq7bgdkfkmzjgm1phwry7g4"; depends=[acepack cluster foreign Formula ggplot2 gridExtra gtable lattice latticeExtra nnet rpart survival]; };
   Holidays = derive2 { name="Holidays"; version="1.0-6"; sha256="031vddjf7s3pirv041y2mw694db63gjajlbczmmya8b1zp2f3vzk"; depends=[TimeWarp]; };
   HomoPolymer = derive2 { name="HomoPolymer"; version="1.0"; sha256="1bxc33dx9y9rr9aii4vn9d1j9v5pd4c0xayfdldz8d9m2010xr4a"; depends=[deSolve MenuCollection RGtk2]; };
   HotDeckImputation = derive2 { name="HotDeckImputation"; version="1.1.0"; sha256="1mqfn6yw5846ynrcgzka0m6ikfppa5civjkhj42rhp2v2xk25li7"; depends=[Rglpk]; };
@@ -967,6 +982,7 @@ in with self; {
   IBrokers = derive2 { name="IBrokers"; version="0.9-12"; sha256="0mhh4kgwrncrcysvnvah6xc7fhx5ywjzn258cs9xj9kzns0jblk6"; depends=[xts zoo]; };
   IC2 = derive2 { name="IC2"; version="1.0-1"; sha256="03jjb62msxjxdg9l3zd1ns0d2w37hkxy5pnjgaywxw3vfk4zwfj9"; depends=[]; };
   ICAFF = derive2 { name="ICAFF"; version="1.0.1"; sha256="0zazx4nv81s75appg10aayks04mx6m5n9yf5hqrbxh3yj68vzxfy"; depends=[]; };
+  ICBayes = derive2 { name="ICBayes"; version="1.0"; sha256="0z0z74yslhfjbh7188hzyxhwb7kn9raa0xsrr6n592ridpkhaih4"; depends=[HI survival]; };
   ICC = derive2 { name="ICC"; version="2.3.0"; sha256="0y8zh9715cp9bglxpygqwgigrarq37sj845lk1xl0ydwinl0a6kk"; depends=[]; };
   ICC_Sample_Size = derive2 { name="ICC.Sample.Size"; version="1.0"; sha256="1w6v1jp8bfvf6c49ikswkc5527gdx5cyqnw95x00pgmm6riwlsp9"; depends=[]; };
   ICE = derive2 { name="ICE"; version="0.69"; sha256="04p8lakaha28mdh965w0ppyxfrz5ssi1n9xifvsbn3ihdra67rip"; depends=[KernSmooth]; };
@@ -982,6 +998,7 @@ in with self; {
   IFP = derive2 { name="IFP"; version="0.2.0"; sha256="02dm2qbnrs2yi6c64j90hdfimmdsld46k1wdkay8pfg62jy9rrwa"; depends=[coda haplo_stats]; };
   IM = derive2 { name="IM"; version="1.0"; sha256="1f1vr5zfqnanc5xmmlfkjkvxwbyyysi3mcvkg95p8r687a7zl0cx"; depends=[bmp jpeg png]; };
   IMIS = derive2 { name="IMIS"; version="0.1"; sha256="09zb48vdj0i3vf8vxrs07xwb9ji27vp2fyvmg6jfq631licsryc2"; depends=[mvtnorm]; };
+  IMP = derive2 { name="IMP"; version="0.1"; sha256="15mmy8fpcxsfjygirwkk9ifxdf25v9lklmnr999n98mx7h3gakkl"; depends=[dplyr ggplot2 shiny tidyr]; };
   INLABMA = derive2 { name="INLABMA"; version="0.1-6"; sha256="0rij3y89yyj25xz8r9n8cnq7rg9b7hf0n9nxxrrnm86w3n4r66in"; depends=[Matrix sp spdep]; };
   IPMpack = derive2 { name="IPMpack"; version="2.1"; sha256="08b79g5a9maxnxladvc2x2dgcmm427i8p6hhgda3mw2h5qmch2q3"; depends=[MASS Matrix nlme]; };
   IPSUR = derive2 { name="IPSUR"; version="1.5"; sha256="0brh3dx7m1rilvr1ig6vbi7p13bfbblgvs8fc114f08d90fczwnq"; depends=[]; };
@@ -1005,14 +1022,15 @@ in with self; {
   ImpactIV = derive2 { name="ImpactIV"; version="1.0"; sha256="1bb6gw1h15hscr71hy779k2x5ywzx63ylim3hby02d7fnnj46p58"; depends=[nnet]; };
   ImportExport = derive2 { name="ImportExport"; version="1.1"; sha256="12i9mwspk59zicn1mn21xrs90c8dqxm1q7alqbzscgkpf3xbjrnn"; depends=[chron gdata haven Hmisc RODBC xlsx]; };
   InPosition = derive2 { name="InPosition"; version="0.12.7"; sha256="1f7xb2kxikmja4cq7s1aiwhdq27zc6hghjbliqqpm8ci8860lb8p"; depends=[ExPosition prettyGraphs]; };
+  InSilicoVA = derive2 { name="InSilicoVA"; version="1.0"; sha256="0rvd78p2vmp2d72fsh8fv8n1yd6ia4zw5p1ny6mfm18xrmp5x3v1"; depends=[coda ggplot2 rJava]; };
   IndependenceTests = derive2 { name="IndependenceTests"; version="0.2"; sha256="04qfh2mg9xkfnvp6k7w1ip4rb663p3pzww9lyprcjvr3hcac7gqa"; depends=[xtable]; };
   InfDim = derive2 { name="InfDim"; version="1.0"; sha256="0rh3ch0m015xjkxy08vf9pc6q7azjc6sgicd2j6cwh611pqq39wq"; depends=[]; };
   InferenceSMR = derive2 { name="InferenceSMR"; version="1.0"; sha256="13d3v8kyk6br33659jgql6j1nqmnd8zszqrwfw2x3khkiqzgdmhk"; depends=[survival]; };
   Information = derive2 { name="Information"; version="0.0.7"; sha256="1gri1szvwj4c27s7niz5ss8lws16q3sxxgaz7p9grcbhd5ky5apg"; depends=[data_table doParallel foreach ggplot2 iterators plyr]; };
-  InformationValue = derive2 { name="InformationValue"; version="1.1.1"; sha256="08r2fnq1vzyhxnq06b2qmcmgyyfri0y2b5h2fngifx21l0cqcdd9"; depends=[ggplot2]; };
+  InformationValue = derive2 { name="InformationValue"; version="1.2.1"; sha256="0bbsix2w834jd64d1mgsjlbawrc73yykzd3zf5lwkfr5gka4k1ij"; depends=[ggplot2]; };
   IntLik = derive2 { name="IntLik"; version="1.0"; sha256="13ww5bsbf1vnpaip0w53rw99a8hxzziibj7j66cm31jmi8l6fznf"; depends=[maxLik]; };
-  IntegratedJM = derive2 { name="IntegratedJM"; version="1.2"; sha256="093415nj3dj7r9w6baydyb4zs4a1ysi0ab0l12njwwbjdy1smv3i"; depends=[Biobase ggplot2 nlme]; };
-  InterSIM = derive2 { name="InterSIM"; version="1.0"; sha256="0i0dxa8bxv50sp1r0hb4ydsgyx7s7rdc7lykhaxryldw14pqrcjm"; depends=[MASS NMF]; };
+  IntegratedJM = derive2 { name="IntegratedJM"; version="1.3"; sha256="0yd1kbw5sym4gnz0h7fw25ay1j39djdarxrwvy8v4ai3hf8dx0zr"; depends=[Biobase ggplot2 nlme]; };
+  InterSIM = derive2 { name="InterSIM"; version="2.0"; sha256="0vzhrm02m44ckxla0q868nwskkldd5p008xfi3mgp5mh5iqgqpxv"; depends=[MASS NMF]; };
   InterVA4 = derive2 { name="InterVA4"; version="1.6"; sha256="0gapabbqsh01iya27kjs1zxk7rxvciw1z478s9g6av35vv0b6z0z"; depends=[]; };
   Interact = derive2 { name="Interact"; version="1.1"; sha256="1g9zhafdpr7j410bi8p03d8x9f8m3n329x8v01yk15f65fp7pl1d"; depends=[]; };
   InteractiveIGraph = derive2 { name="InteractiveIGraph"; version="1.0.6.1"; sha256="0srxlp77xqq0vw2phfv7zcnqswi2i5nzkpqbpa5limqx00jd12zy"; depends=[igraph]; };
@@ -1040,8 +1058,8 @@ in with self; {
   JOP = derive2 { name="JOP"; version="3.6"; sha256="1kpb1dy2vm4jgzd3h0qgdw53nfp2qi74hgq5l5inxx4aayncclk7"; depends=[dglm Rsolnp]; };
   JPEN = derive2 { name="JPEN"; version="1.0"; sha256="12rvp5bmlkwyr1gg336k655hp09gym0d2wwry70c1rz30x1sf2zs"; depends=[mvtnorm]; };
   JPSurv = derive2 { name="JPSurv"; version="1.0.1"; sha256="11hfji0nyfmw1d7y2cijpp7ivlv5s9k8g771kmgwy14wflkyf7g2"; depends=[]; };
-  JRF = derive2 { name="JRF"; version="0.1-1"; sha256="1kq1fmsq20flsd3lh5l6mivdsiz5mz5c77avrddkc9mlv2wi5mvz"; depends=[]; };
-  JacobiEigen = derive2 { name="JacobiEigen"; version="0.1"; sha256="0q1kjxkr393vswy5ppkpfkqzvba7xxp7r8s23q3wgcc6aknf6f8x"; depends=[Rcpp]; };
+  JRF = derive2 { name="JRF"; version="0.1-2"; sha256="0gpsmkaqd1r0yr7qgvfvwbqknmfngjkg26ihyz0y17n5cfpbvv1z"; depends=[]; };
+  JacobiEigen = derive2 { name="JacobiEigen"; version="0.2-2"; sha256="1q6wqxlhslip14544px1aq446m77a8s0chvhpc19im014w4g930v"; depends=[Rcpp]; };
   JavaGD = derive2 { name="JavaGD"; version="0.6-1"; sha256="13n6xzbbjgd0bpwv2xgm3dlscg87wh32q6fcq50kk6byp6yv05sc"; depends=[]; };
   Jmisc = derive2 { name="Jmisc"; version="0.3.1"; sha256="1szn29dng54l2xmrm6pg3d5rmwdc1ks23vsnsmplnr5rx7yj002s"; depends=[]; };
   JoSAE = derive2 { name="JoSAE"; version="0.2.3"; sha256="0b1jwplds5b7z15v6bvqj1rbn7zxpgvh2ykhqplxzv4mlaw6i0li"; depends=[nlme]; };
@@ -1064,7 +1082,7 @@ in with self; {
   Kendall = derive2 { name="Kendall"; version="2.2"; sha256="0z2yr3x2nvdm81w2imb61hxwcbmg14kfb2bxgh3wmkmv3wfjwkwn"; depends=[boot]; };
   KernSmooth = derive2 { name="KernSmooth"; version="2.23-15"; sha256="1xhha8kw10jv8pv8b61hb5in9qiw3r2a9kdji3qlm991s4zd4wlb"; depends=[]; };
   KernSmoothIRT = derive2 { name="KernSmoothIRT"; version="6.1"; sha256="1hq4sykddh9sg24qrnccii89nqxmq7hnldhn8wl6y62aj0h1nrqm"; depends=[plotrix Rcpp rgl]; };
-  Kernelheaping = derive2 { name="Kernelheaping"; version="1.0"; sha256="0i255s5gwlcydxpn69kz7qyvzqbr3syppkzq1sq3sfn680i3hdyq"; depends=[evmix ks MASS plyr sparr]; };
+  Kernelheaping = derive2 { name="Kernelheaping"; version="1.2"; sha256="0pd6bqw290b24zp3qlx5pagrg027wm2ic6xkcjzz34n62f6dngrq"; depends=[evmix ks MASS sparr]; };
   Kmisc = derive2 { name="Kmisc"; version="0.5.0"; sha256="0pbj3gf0bxkzczl6k4vgnxdss2wmsffqvcf73zjwvzvr8ibi5d95"; depends=[data_table knitr lattice markdown Rcpp]; };
   KoNLP = derive2 { name="KoNLP"; version="0.76.9"; sha256="1q72irl4izb7f5bb99plpqnmpfdq4x4ymp4wm2bsyfjcxm649ya8"; depends=[hash rJava Sejong stringr tau]; };
   KoulMde = derive2 { name="KoulMde"; version="1.0"; sha256="0dz13j24kyvr8kxs5lyvbjxj8l4i8h4il16qjn7hdnmi39g4khr4"; depends=[]; };
@@ -1117,6 +1135,7 @@ in with self; {
   LTPDvar = derive2 { name="LTPDvar"; version="1.2"; sha256="0r9v5g5y9n85jdcvm7zpapm73ism48m3mmybpcmgcs028h2ndv7v"; depends=[]; };
   LTR = derive2 { name="LTR"; version="1.0.0"; sha256="15g5hbrwhab80sarbjgwzvsn6c4fl18h014kz5fpzf0n1rijybik"; depends=[]; };
   LVMMCOR = derive2 { name="LVMMCOR"; version="0.01.1"; sha256="1lq4hqcg0qkywdr4a22m1fr3m97749mm6n2jzdj9i7jrf0agc1fs"; depends=[MASS nlme]; };
+  LW1949 = derive2 { name="LW1949"; version="1.0.0"; sha256="0icfgsh93f4i73p7wpacb6dsg4cdfh71l7rwhqknnifvb5nvp8sv"; depends=[MASS mgcv plotrix]; };
   LaF = derive2 { name="LaF"; version="0.6.2"; sha256="180xsqilpkql8my0dimsxj1kpmb3jl19l6bz8li8m63zii4xmwmp"; depends=[Rcpp]; };
   Lahman = derive2 { name="Lahman"; version="4.0-1"; sha256="058rn595rnh2wl7qqrqd5smzzb486cn46lx2ifjc8nijm83lzhfx"; depends=[]; };
   LakeMetabolizer = derive2 { name="LakeMetabolizer"; version="1.3.3"; sha256="06mgn5dgdw0gaw1za20cabs4bx6q5bgv0x09imxhskik76kini01"; depends=[plyr rLakeAnalyzer]; };
@@ -1130,11 +1149,12 @@ in with self; {
   LeafAngle = derive2 { name="LeafAngle"; version="1.2-1"; sha256="0g3i5300f3rvjz7g7z8s5n8xdcsp41gf1vnr4g36m1likddfpxlx"; depends=[]; };
   LeafArea = derive2 { name="LeafArea"; version="0.1.1"; sha256="0k085idzs2ka8pqlmii5xcmbv7wm3syicy36gc183wycibv3ii9f"; depends=[]; };
   LearnBayes = derive2 { name="LearnBayes"; version="2.15"; sha256="0cz2rgqy1cmdz2h1qbdvfqxmmdzmg2z1scdlxr7k385anha13ja5"; depends=[]; };
+  LexisPlotR = derive2 { name="LexisPlotR"; version="0.2"; sha256="0l1cd32kl0690n07f27dmjp5975zgv57zi3km5g3xjiq3lnk8hqr"; depends=[ggplot2]; };
   LiblineaR = derive2 { name="LiblineaR"; version="1.94-2"; sha256="11q3xydd4navpfcy9yx0fld8ixb6nvnkc7qxwrhvackiy810q86i"; depends=[]; };
   Libra = derive2 { name="Libra"; version="1.4"; sha256="140nn6nn179iy7hz04gcjrxp7a1yiidc6pz7majwcq38bjfys33f"; depends=[nnls]; };
   LifeHist = derive2 { name="LifeHist"; version="1.0-1"; sha256="0q6l6rva5kxl8yzqa7ni4sdj6p4c61sdsjx8zhckzxb7xlwg2hh0"; depends=[BB Hmisc optimx]; };
   LifeTables = derive2 { name="LifeTables"; version="1.0"; sha256="1dyivvi5cjsnbhncj3arkrndadg7v81nzdf6p6mpgqwqvwn5li8x"; depends=[mclust]; };
-  LightningR = derive2 { name="LightningR"; version="1.0.1"; sha256="19rfgw1plhd7r4g18axffd3sj7mbszp7cpncindbgfbm6xn96w84"; depends=[httr R6 RCurl RJSONIO]; };
+  LightningR = derive2 { name="LightningR"; version="1.0.2"; sha256="1va673aw2hgir8ybbjad6dhbs8izs1z4jcikwa7qp3mkv0zqd0vq"; depends=[httr R6 RCurl RJSONIO]; };
   LinCal = derive2 { name="LinCal"; version="1.0"; sha256="1xr9jnna20hh78dh9wjg70jm8fhaxvdwql894kdp0y5h4pchkdph"; depends=[]; };
   LinRegInteractive = derive2 { name="LinRegInteractive"; version="0.3-1"; sha256="0w7s3i6i2wnydh88l8lnzrh6w5zqkcwvms91iizis0mwd9af2jdl"; depends=[rpanel xtable]; };
   LindenmayeR = derive2 { name="LindenmayeR"; version="0.1.6"; sha256="10a1m4yqr02gg5akxknwmhrlbqxnza78z8rm0ym36c4vlz8b0hyi"; depends=[stringr]; };
@@ -1145,6 +1165,7 @@ in with self; {
   LncMod = derive2 { name="LncMod"; version="1.1"; sha256="08001y7s93i3k3478jqfh9zsgpq6ym1xmdmldi7s76zbfr1nknvy"; depends=[pheatmap survival]; };
   LocFDRPois = derive2 { name="LocFDRPois"; version="1.0.0"; sha256="0zzdp9wgwr6wn3grimghpj4vq34x37c8bqg8acfzlzih8frqal3r"; depends=[dplyr ggplot2]; };
   Lock5Data = derive2 { name="Lock5Data"; version="2.6"; sha256="0ckaac00ck5vyv0gv25l1zhgkm3char6ks1p4fl3vdl5gdyrc1pp"; depends=[]; };
+  Lock5withR = derive2 { name="Lock5withR"; version="1.2.2"; sha256="10x3i11pb4cig4pgfmw9984na5zjbg7d41y6crakiimf53ihx0c2"; depends=[]; };
   LogConcDEAD = derive2 { name="LogConcDEAD"; version="1.5-9"; sha256="135vkp70q6gn75ds43aq08y13vrsgsgykssmnhrh6545i86vmhhi"; depends=[MASS mvtnorm]; };
   LogicForest = derive2 { name="LogicForest"; version="2.1.0"; sha256="0zdyyi6wka0568414f1kw91rx04y76n1k11wxd4r8svb5wybjhp5"; depends=[CircStats gtools LogicReg plotrix]; };
   LogicReg = derive2 { name="LogicReg"; version="1.5.8"; sha256="0hjh4wk7dh1ryc75kipdgmkvhz15h46gr9qc5pk49286h11fbnsi"; depends=[survival]; };
@@ -1154,7 +1175,7 @@ in with self; {
   LoopAnalyst = derive2 { name="LoopAnalyst"; version="1.2-4"; sha256="02p46agsdbvw6dpgzahq9hfmy184jrkwa1hhnrcbrsmm54n3m2bx"; depends=[nlme]; };
   LotkasLaw = derive2 { name="LotkasLaw"; version="0.0.1.0"; sha256="11kq52yavicimp7ll7ljrs69a5fxf68ydb9md7v6b02iw5mwbmz7"; depends=[]; };
   LowRankQP = derive2 { name="LowRankQP"; version="1.0.2"; sha256="0is7v4cy4w1g3wn4wa32iqv4awd1nwvfcb71b3yk5wj59lpm8gs3"; depends=[]; };
-  Luminescence = derive2 { name="Luminescence"; version="0.4.6"; sha256="1ilgvzgk2r1jkjgqz5dnwxzv103j86asbajqy3ibqwh31aif9x8q"; depends=[assertive bbmle data_table digest matrixStats minpack_lm raster Rcpp rgl shape XML]; };
+  Luminescence = derive2 { name="Luminescence"; version="0.5.1"; sha256="0jxx2ldcm814qbdqzgqc7gbf4ymaqyvzykbxzp2cfqhvg20rkh7s"; depends=[bbmle data_table digest httr matrixStats minpack_lm raster Rcpp RcppArmadillo readxl shape XML zoo]; };
   M3 = derive2 { name="M3"; version="0.3"; sha256="1l40alk166lshckqp72k5zmsgm7s5mgyzxlp11l64mgncjwkw2r3"; depends=[mapdata maps ncdf4 rgdal]; };
   MAINT_Data = derive2 { name="MAINT.Data"; version="0.5.1"; sha256="12vxy2l7mjp4dalg59zp0rd8cy3548vdqpzdkiq2rhvf9fvymxzr"; depends=[MASS miscTools]; };
   MALDIquant = derive2 { name="MALDIquant"; version="1.14"; sha256="1f6g1ra2hvihdxqgydbh06azddx5m4rcvx2dzq9rh2fjnk1a0kpa"; depends=[]; };
@@ -1214,8 +1235,8 @@ in with self; {
   MGRASTer = derive2 { name="MGRASTer"; version="0.9"; sha256="0jmf2900r56v60981sabflkhid3yrqd9xd7crb56vgfl1qkva9zp"; depends=[]; };
   MGSDA = derive2 { name="MGSDA"; version="1.2"; sha256="0a465kali82x9c0hld8f1m285d7zw0cf93lps87amlj3ck0nhh8z"; depends=[MASS]; };
   MHadaptive = derive2 { name="MHadaptive"; version="1.1-8"; sha256="1w3bm82v8ahxrf0vqn0pznv7dqn212drinkz8y5kr1flx423l9ws"; depends=[MASS]; };
-  MIICD = derive2 { name="MIICD"; version="2.1"; sha256="1lh3pbpxn7lbs68741ydw264qn9rap7kmcw49vnjvvzdp7hf24in"; depends=[MASS mstate survival]; };
-  MIIVsem = derive2 { name="MIIVsem"; version="0.4.3"; sha256="0i00fbrxww0wghj1akc67cd4f55kr6zyp2j6xhqbd6if4arb3zg2"; depends=[lavaan Matrix]; };
+  MIICD = derive2 { name="MIICD"; version="2.2"; sha256="16r3ry27iki32f2y4ic6w15fgr21wrs0qbiiyx23nqivvw8x4017"; depends=[MASS mstate survival]; };
+  MIIVsem = derive2 { name="MIIVsem"; version="0.4.4"; sha256="0j4xa9nbkkdxszbdfc3cyh1jf1d3j1swzxr3y50szcjsd6bd0b6v"; depends=[lavaan Matrix]; };
   MILC = derive2 { name="MILC"; version="1.0"; sha256="14xsiw5al6kixwvf3ph0dlm8s13gsbqvzb92da6ng3x4iiyb1g0w"; depends=[]; };
   MIPHENO = derive2 { name="MIPHENO"; version="1.2"; sha256="0hcaq66biv4izszdhqkgxgz91mgkjk1yrwq27fx07a2zmzj44sfv"; depends=[doBy gdata]; };
   MIXFIM = derive2 { name="MIXFIM"; version="1.0"; sha256="0m4fnmdd8lsdxq629f87lzz1cdc1q0j3q9hqna85ncpflyfwlvg9"; depends=[ggplot2 mvtnorm rstan]; };
@@ -1234,8 +1255,10 @@ in with self; {
   MM2Sdata = derive2 { name="MM2Sdata"; version="1.0.1"; sha256="1prx0gm9shizj45382qhja417y18jp6spk2hmgrzb7sbniyqs5pd"; depends=[Biobase]; };
   MMMS = derive2 { name="MMMS"; version="0.1"; sha256="1a71vs3k16j14zgqfd4v92dq9swrb44n9zww8na6di82nla8afck"; depends=[glmnet survival]; };
   MMS = derive2 { name="MMS"; version="3.00"; sha256="06909912v2hr52s8k0a0830lbmdh05dcd7k47vydhbwq3rzf3ahg"; depends=[glmnet Matrix mht]; };
+  MMWRweek = derive2 { name="MMWRweek"; version="0.1.1"; sha256="16dwmpj13rzxmd2x7xaakw2zq2aly7ajjbfnc39qvdzk6n2x37wn"; depends=[]; };
   MNM = derive2 { name="MNM"; version="1.0-1"; sha256="0fy43jfd7wak2rfdv5hdq7zc0zsxnbz9p69g6sla0zliibafg0q6"; depends=[ellipse ICS ICSNP SpatialNP]; };
   MNP = derive2 { name="MNP"; version="2.6-4"; sha256="068lssg565dw673dm8f5k6dbxl2vblnszg8wibzy3ijf96hp03cw"; depends=[MASS]; };
+  MNS = derive2 { name="MNS"; version="1.0"; sha256="0if46a6rw0f2d72wnykkaa5z5b1p2c0r43il6cbwbcnnb3zd8acb"; depends=[doParallel glmnet igraph MASS mvtnorm]; };
   MOCCA = derive2 { name="MOCCA"; version="1.2"; sha256="04smpzn9x64w1vpw4szqa7dwnaak1ls6gpg7fgajs68mv5zivffa"; depends=[cclust clv]; };
   MODISTools = derive2 { name="MODISTools"; version="0.94.6"; sha256="0jzs2dvhq48zjzb2rj6yxws8i2h7w2k00vg7xg5riad4v9j9jk0c"; depends=[RCurl XML]; };
   MOJOV = derive2 { name="MOJOV"; version="1.0.1"; sha256="11mcqxw83z4xx29s34v4rsbb3zvyhlb2lmvf97b77n455gsy5hab"; depends=[aod lattice saws survey]; };
@@ -1244,15 +1267,17 @@ in with self; {
   MPCI = derive2 { name="MPCI"; version="1.0.7"; sha256="1l55q09lliv0y4q1hc0jgzls47wkmsfag6b4iq5y6wrllr5wq7sa"; depends=[]; };
   MPDiR = derive2 { name="MPDiR"; version="0.1-16"; sha256="10g4dnysjnzf106qibqqcrxz3xw2nfh4ck1n1dlciwahr0f80j13"; depends=[]; };
   MPINet = derive2 { name="MPINet"; version="1.0"; sha256="1zw3piqhhpagg5qahc2xahxxfdwdk8w94aass1virlpl0f52ik8s"; depends=[BiasedUrn mgcv]; };
-  MPSEM = derive2 { name="MPSEM"; version="0.2-6"; sha256="1vmdjnhxl8v7xw71kd1m66vhgaa1q0vvifd67v8fmii0i0i5i35y"; depends=[ape MASS]; };
+  MPLikelihoodWB = derive2 { name="MPLikelihoodWB"; version="1.0"; sha256="0ga9v057vrb2vjrxr55kqk9hyfq94r9nfqhsxvwf60hxyn929qpd"; depends=[MASS survival]; };
+  MPSEM = derive2 { name="MPSEM"; version="0.3-1"; sha256="1c4788qvvn02hnihlz56h2nsj7qfdaw3x2i7jmkd9ll2jsszav3v"; depends=[ape MASS]; };
   MPTinR = derive2 { name="MPTinR"; version="1.10.3"; sha256="0281w5dhg8wmi1rz80xribq437shp4m890c504kggsacr28mbhkw"; depends=[Brobdingnag numDeriv Rcpp RcppEigen]; };
   MPV = derive2 { name="MPV"; version="1.38"; sha256="1w3b0lszqmsz0yqvaz56x08xmy1m5ngl9m6p2pg9pjv13k8dv190"; depends=[]; };
   MRCE = derive2 { name="MRCE"; version="2.0"; sha256="0fnd7ykcxi04pv1af5zbmavsp577vkw6pcrh011na5pzy2xrc49z"; depends=[QUIC]; };
   MRCV = derive2 { name="MRCV"; version="0.3-3"; sha256="0m29mpsd3kackwrawvahi22j0aghfb12x9j18xk4x1w4bkpiscmf"; depends=[tables]; };
   MRH = derive2 { name="MRH"; version="2.1"; sha256="06pabl8262fbq13y7vb3hsqy98zh4zm301qjxry148ljx6sgp6xx"; depends=[coda KMsurv survival]; };
-  MRIaggr = derive2 { name="MRIaggr"; version="1.1.4"; sha256="00ds3am94rxm8s30xkds64rcylw1l481hvd29nw4kl17pn2347nb"; depends=[Matrix oro_dicom oro_nifti RANN Rcpp RcppArmadillo RcppProgress ROCR spam]; };
+  MRIaggr = derive2 { name="MRIaggr"; version="1.1.5"; sha256="0c0whxdwamli1m9xnhv9kdv7zcb0sprlhdxw3c7800s311xg0iq4"; depends=[Matrix oro_dicom oro_nifti RANN Rcpp RcppArmadillo RcppProgress ROCR spam]; };
   MRMR = derive2 { name="MRMR"; version="0.1.3"; sha256="1b3a4bkpcncl4sh7d81nk6b2dzhzqn9zhqdxv31jgippsqm2s3k2"; depends=[ggplot2 lmtest lubridate plyr reshape2]; };
   MRQoL = derive2 { name="MRQoL"; version="1.0"; sha256="0isn4g3jpz7wm99ymrshl6zgkb7iancdzdxl2w98n8fbxsh5z6sw"; depends=[]; };
+  MRS = derive2 { name="MRS"; version="1.0"; sha256="1l3q9ialfndrgi8ry3vqh5zkyfxy7717lhll07fs9arrs1ym6p3n"; depends=[igraph optimx Rcpp RcppArmadillo]; };
   MRSP = derive2 { name="MRSP"; version="0.4.3"; sha256="0zv22xiq3qh9x3r2ckkvq1vv0vkcirh8y87053bqvw1m20j7q1by"; depends=[Formula matrixcalc]; };
   MRsurv = derive2 { name="MRsurv"; version="0.2"; sha256="148myzk6r8whkpv1yv59dmdlr2n8vdwmaww165aw696xfjxwq550"; depends=[mvtnorm survival]; };
   MRwarping = derive2 { name="MRwarping"; version="1.0"; sha256="13bcs7rlm4irx7yzdnib558w9014a4chh9xwc010m6pxvxv36qnv"; depends=[boa SemiPar]; };
@@ -1260,13 +1285,14 @@ in with self; {
   MSG = derive2 { name="MSG"; version="0.2.2"; sha256="18siw81pa02yg0zs40pavwm88yz7kfi60fislmjpwnl2207a6fhf"; depends=[RColorBrewer]; };
   MSIseq = derive2 { name="MSIseq"; version="1.0.0"; sha256="1v2why1k6pjsc04044nr74571p7541nciq7xkzmya3jq6dw878j3"; depends=[IRanges R_utils rJava RWeka]; };
   MSQC = derive2 { name="MSQC"; version="1.0.1"; sha256="1vs9kygjg9f4sr1m80hdn03gdhbdqfjamqxhbs9zha8smjrsgisw"; depends=[rgl]; };
-  MST = derive2 { name="MST"; version="1.1"; sha256="1wfl5naz3wlm5lj2nrb74cw7na9rpf9v9mgyi1clp7b67d0hhhx0"; depends=[MASS survival]; };
-  MScombine = derive2 { name="MScombine"; version="1.0"; sha256="18d2rw1g0zm6xrf54v178gzb891pd1iljcr1dgkzby34aqrhvcdn"; depends=[plyr]; };
+  MST = derive2 { name="MST"; version="1.2"; sha256="1zx5gs6c8qa5b56c4z8zc96kggy5qc3fff9q7ki58zg36rbhi0wm"; depends=[MASS survival]; };
+  MScombine = derive2 { name="MScombine"; version="1.1"; sha256="0kgz1l4jlhcada3fp02dscf4zx6a22cjxj251838lfz65f512hrn"; depends=[plyr]; };
   MSeasy = derive2 { name="MSeasy"; version="5.3.3"; sha256="191mvg1imxfjlnd808ypn4lsjx7n6ydf16flax79hv01z7rcjylh"; depends=[amap cluster clValid fpc mzR xcms]; };
   MSeasyTkGUI = derive2 { name="MSeasyTkGUI"; version="5.3.3"; sha256="0ihz8vr2wbgy88bzssilgvlhkbr13jznfjvnqy73wpchqgwy0wy6"; depends=[MSeasy]; };
   MSwM = derive2 { name="MSwM"; version="1.2"; sha256="01l23ia20y3nchykha4vz6sa757zmbvgx2315cacxfcqk9rgs08c"; depends=[nlme]; };
   MTS = derive2 { name="MTS"; version="0.33"; sha256="0i7kpgsw56vvgrdgddn83i9lzjlb72z4llffqai29qq0m1i7hm65"; depends=[fGarch mvtnorm Rcpp]; };
   MTurkR = derive2 { name="MTurkR"; version="0.6.17"; sha256="13rdynz7awyq2sf9qx739w1d5ybv5h353bgff4vdsk6waws7rw4s"; depends=[base64enc curl digest XML]; };
+  MTurkRGUI = derive2 { name="MTurkRGUI"; version="0.1.5"; sha256="1rlgz80na0v1nx70cda1fzyswlb1lg5kcx64zl9dcqy6accsrpmp"; depends=[curl MTurkR XML]; };
   MUCflights = derive2 { name="MUCflights"; version="0.0-3"; sha256="03ksvv5nyzlqiml1nz405r3yqb2cl35kpm1h61zcv2nqq8cxqshs"; depends=[geosphere NightDay RSQLite sp XML]; };
   MVA = derive2 { name="MVA"; version="1.0-6"; sha256="09j9frr6jshs6mapqk28bd5jkxnr1ghmmbv6f4zz0lrg81zjizl3"; depends=[HSAUR2]; };
   MVB = derive2 { name="MVB"; version="1.1"; sha256="0an8b594rknlcz6zxjva6br8f34sgwdi2jil3xh1xzb5fa55dw0f"; depends=[Rcpp RcppArmadillo]; };
@@ -1286,9 +1312,10 @@ in with self; {
   MasterBayes = derive2 { name="MasterBayes"; version="2.52"; sha256="12ka2l4x6psij7wzbb98lwx5shgwzn5v44qfpiw1i6g236yp0mhm"; depends=[coda genetics gtools kinship2]; };
   MatchIt = derive2 { name="MatchIt"; version="2.4-21"; sha256="02kii2143i8zywxlf049l841b1y4hqjwkr1cnyv6b8b7y7lz2m5v"; depends=[MASS]; };
   MatchLinReg = derive2 { name="MatchLinReg"; version="0.7.0"; sha256="015s3xdaj56prq8lsdry3ibjkrb6gg0fwgzjh496gdx5axvpbk8g"; depends=[Hmisc Matching]; };
-  Matching = derive2 { name="Matching"; version="4.8-3.4"; sha256="04m647342j4yi74ds7ddwnyrf58qdy7k3mc067k3p779qavq2ka1"; depends=[MASS]; };
+  Matching = derive2 { name="Matching"; version="4.9-2"; sha256="0lv5b41l797c4bl2rzmdqzjnn47zpvvcv3md3xwxvvz5knxky5x4"; depends=[MASS]; };
   MatchingFrontier = derive2 { name="MatchingFrontier"; version="1.0.0"; sha256="1djlkx7ph8p60n2m191xq9i01c2by4vpmjj25mbxy5izxm5123aa"; depends=[igraph MASS segmented]; };
-  Matrix = derive2 { name="Matrix"; version="1.2-2"; sha256="0f0a8rl8lx1f0f50fxfq4q37d52hd70a611vvgq3rsb39911j935"; depends=[lattice]; };
+  Matrix = derive2 { name="Matrix"; version="1.2-3"; sha256="11zi02hj083jh20lnxsiimnx4brksavbv7dmkp659w33cfzsnnwg"; depends=[lattice]; };
+  Matrix_utils = derive2 { name="Matrix.utils"; version="0.5"; sha256="04ss99wbpcm7ad5kkznppyf5fa869fgghk4rhv0nds1fdp17hrzl"; depends=[Matrix]; };
   MatrixEQTL = derive2 { name="MatrixEQTL"; version="2.1.1"; sha256="1bvfhzhvm1psgq51kpjcpp7bidaxcrxdigmv6abfi3jk5kyzn5ik"; depends=[]; };
   MatrixModels = derive2 { name="MatrixModels"; version="0.4-1"; sha256="0cyfvhci2p1vr2x52ymkyqqs63x1qchn856dh2j94yb93r08x1zy"; depends=[Matrix]; };
   MaxPro = derive2 { name="MaxPro"; version="3.1-2"; sha256="1y2g8a8yvzb24dj0z82nzfr6ylplb9sbi2dmj7f3pb4s3yr5zm8y"; depends=[nloptr]; };
@@ -1297,6 +1324,7 @@ in with self; {
   McSpatial = derive2 { name="McSpatial"; version="2.0"; sha256="18nmdzhszqcb5z9g8r9whxgsa0w3g7fk7852sgbahzyw750k95n4"; depends=[lattice locfit maptools quantreg RANN SparseM]; };
   Mcomp = derive2 { name="Mcomp"; version="2.05"; sha256="0wggj0h0qxjwym1vz1gk9iwnwia4lpjlk6n46l6hinsdax3g221y"; depends=[forecast tseries]; };
   MedOr = derive2 { name="MedOr"; version="0.1"; sha256="1rwc14s16lnzgb78ac2017hv9pss7zw7nw3y7vrvq1qx4fgiw6f8"; depends=[]; };
+  MediaK = derive2 { name="MediaK"; version="1.0"; sha256="19cmxl2wksw9kvjsfn1m4nkr5gpcx6bk0sqrabj1n0dla1l32v2a"; depends=[Rcpp RcppEigen]; };
   Mediana = derive2 { name="Mediana"; version="1.0.2"; sha256="1q3i5j319gb8h3qvz2m1mds2a1042dzs8x5xln0v6fzc0k4nzyjr"; depends=[doParallel doRNG foreach MASS mvtnorm ReporteRs survival]; };
   MenuCollection = derive2 { name="MenuCollection"; version="1.2"; sha256="0v3flicfnln9qld150yk3rfldvsr4dllhq80l02n1lq6px38nf2s"; depends=[gplots RGtk2 RGtk2Extras]; };
   MergeGUI = derive2 { name="MergeGUI"; version="0.2-1"; sha256="1hx03qv5jyjjmqdvylc3kz5dl5qsdqwlirjbrnxrw7grkgkhygap"; depends=[cairoDevice ggplot2 gWidgetsRGtk2 rpart]; };
@@ -1305,6 +1333,7 @@ in with self; {
   MetNorm = derive2 { name="MetNorm"; version="0.1"; sha256="0vfi3k0yp2dz47gwj1n1avs3ji0a2nlrrljz5d0l66zfh4474jb4"; depends=[]; };
   MetSizeR = derive2 { name="MetSizeR"; version="1.1"; sha256="11hdmpvnszr6pn9ihb3zjy9miksz1fs4piry153z4dic8pjydkax"; depends=[cairoDevice gWidgets gWidgetsRGtk2 MetabolAnalyze mvtnorm]; };
   MetStaT = derive2 { name="MetStaT"; version="1.0"; sha256="0400gx6i8xlkm51da98ap91c3hgrkgfgxswn0plaxfry3625khkp"; depends=[abind MASS pls]; };
+  MetaCycle = derive2 { name="MetaCycle"; version="1.1.0"; sha256="1kzdk21xpbvwibs8501zwdb9lzj7g5nv2zqaskg9x0szshhg8vpp"; depends=[gnm]; };
   MetaDE = derive2 { name="MetaDE"; version="1.0.5"; sha256="1ijg64bri5jn2d3d13q1gvvfyqmbh6gn0lk6dkihixf0jwvjdyqi"; depends=[Biobase combinat impute survival]; };
   MetaLandSim = derive2 { name="MetaLandSim"; version="0.4.1"; sha256="1n13l0p45afa92pa4vlq8kmy775z16l9mnli7b6l04hk09z02nnw"; depends=[Biobase e1071 fgui googleVis maptools raster rgeos rgrass7 sp spatstat]; };
   MetaPCA = derive2 { name="MetaPCA"; version="0.1.4"; sha256="14g4v3hyxnds4l2q36mpz282yqg8ahgdw3b0qmj0xg17krrf5l2s"; depends=[foreach]; };
@@ -1322,13 +1351,13 @@ in with self; {
   MiRSEA = derive2 { name="MiRSEA"; version="1.1"; sha256="0jpl6ws5yx1qjzdnip9a37nmvx81az4cbsjm57x613qjpwmg6by3"; depends=[]; };
   MiST = derive2 { name="MiST"; version="1.0"; sha256="0gqln792gixqfh201xciaygmxbafa0wyv5gpbg9w5zkbbv44wrfk"; depends=[CompQuadForm]; };
   MicSim = derive2 { name="MicSim"; version="1.0.10"; sha256="0fwp8gf82p41lxj6263q3wdkflqxi1lc6sw7nj6y47xjhdycjm07"; depends=[chron rlecuyer snowfall]; };
-  MicroDatosEs = derive2 { name="MicroDatosEs"; version="0.6.3.1"; sha256="17ka9bdic8vdr0aabmgm216zm9a8jppxll042b5ric4vzplah17d"; depends=[Hmisc memisc]; };
+  MicroDatosEs = derive2 { name="MicroDatosEs"; version="0.7.1"; sha256="0avgp99krlcaava7m32gj7ffz2rrj8g1zvaipk7bgsadnnpljmsk"; depends=[Hmisc memisc]; };
   MicroStrategyR = derive2 { name="MicroStrategyR"; version="1.0-1"; sha256="0a6bk0wnwx8zy9081n7wb12lidgckrhn350r0q5m6aa82l6l8ihi"; depends=[gWidgetsRGtk2]; };
   MigClim = derive2 { name="MigClim"; version="1.6"; sha256="171pnalidyw0v2fcjdc3kyrq5kg035kwj5xl8zwgn3hlanpaljvp"; depends=[raster SDMTools]; };
   MindOnStats = derive2 { name="MindOnStats"; version="0.11"; sha256="13995v4n0hfb53w02jk81pl7nazkvqwwv87y1sr99jr9ppzc08mz"; depends=[]; };
   Miney = derive2 { name="Miney"; version="0.1"; sha256="0sgln0653rgglinr8rns5s2az0lgyp9slmynyhhhs265grkhrfj0"; depends=[]; };
   MissMech = derive2 { name="MissMech"; version="1.0.2"; sha256="1b7i1balfl1cqr3l4l4wxlahk2gmawzv9rhyibwzf0yp60cb1sv9"; depends=[]; };
-  MissingDataGUI = derive2 { name="MissingDataGUI"; version="0.2-2"; sha256="07a3y8l0r7a0f7zmp5pg2aqkf7hyk8cf562x3m8b38w96vir4vr0"; depends=[cairoDevice GGally ggplot2 gWidgetsRGtk2 reshape]; };
+  MissingDataGUI = derive2 { name="MissingDataGUI"; version="0.2-4"; sha256="0ixlybm57r1pdsnibg429hzbwh70brl8j8gjfzx952c69znkkjwh"; depends=[cairoDevice GGally ggplot2 gWidgetsRGtk2 reshape]; };
   MitISEM = derive2 { name="MitISEM"; version="1.0"; sha256="03305ds3rgr29z4idaxzsm83igiygna2sqd5vpixklngsrp8w341"; depends=[mvtnorm]; };
   MixAll = derive2 { name="MixAll"; version="1.1.1"; sha256="02vbxpgyh2lw2xw04k0pfjs682xzha2wpr6w7qdg42mg335l12h3"; depends=[Rcpp rtkpp]; };
   MixGHD = derive2 { name="MixGHD"; version="1.8"; sha256="0m115ws1gh5mbjaql38piwjg7463mx32ridpbics3406g7p3ba6w"; depends=[Bessel cluster e1071 ghyp MASS mixture mvtnorm numDeriv]; };
@@ -1343,10 +1372,10 @@ in with self; {
   ModelGood = derive2 { name="ModelGood"; version="1.0.9"; sha256="1y99a7bgwx167pncxj00lbw3cdjj23fhhzl8r24hwnhxr984kvzl"; depends=[prodlim]; };
   ModelMap = derive2 { name="ModelMap"; version="3.0.15"; sha256="1d7qn1p4fv94bdlr6if64vxl9yknavix4gzmpg3kxwlrxaz2g8a2"; depends=[fields gbm HandTill2001 PresenceAbsence randomForest raster rgdal]; };
   Momocs = derive2 { name="Momocs"; version="0.2-6"; sha256="187w6xyswlg5nac6lbprcwvj63gka832n33vlj2ix810vqyxd0fk"; depends=[ade4 ape jpeg shapes sp spdep]; };
-  MonetDB_R = derive2 { name="MonetDB.R"; version="0.9.7"; sha256="0b5agr3dl0ps7fnqw2fsgzb2ysqzvg2ymhxz3xyn08djgz6w7vkm"; depends=[DBI digest]; };
+  MonetDB_R = derive2 { name="MonetDB.R"; version="1.0.0"; sha256="00v0k0p91d5g92j3zlzs0d8mnrhg4fm5sh5y1ks5ckyhbhw6msmz"; depends=[codetools DBI digest]; };
   MonoPhy = derive2 { name="MonoPhy"; version="1.0"; sha256="068m8s86k3gdv0cj2gsrmra4lgl0xwbqa4kcv415gnzcmsyrpc42"; depends=[ape phangorn phytools RColorBrewer taxize]; };
   MonoPoly = derive2 { name="MonoPoly"; version="0.2-10"; sha256="03gzn7gq1dryjhkzs9z5i7bc8k8i7ilri26ifw772w8688pya05k"; depends=[quadprog]; };
-  Morpho = derive2 { name="Morpho"; version="2.3.0"; sha256="0k3qclk1sxlrq7y618wwfwq7v4g1hnikggm4vwacx1v7017kp05y"; depends=[colorRamps doParallel foreach Matrix Rcpp RcppArmadillo rgl Rvcg yaImpute]; };
+  Morpho = derive2 { name="Morpho"; version="2.3.1"; sha256="10w25dycw3gag7sq730c40nnd39zlcbp07chvz4v94zq14vq2gyj"; depends=[colorRamps doParallel foreach Matrix Rcpp RcppArmadillo rgl Rvcg yaImpute]; };
   MorseGen = derive2 { name="MorseGen"; version="1.2"; sha256="1kq35n00ky70zmxb20g4mwx0hn8c5g1hw3csmd5n6892mbrri8s9"; depends=[]; };
   MortalitySmooth = derive2 { name="MortalitySmooth"; version="2.3.4"; sha256="1clx8gb8jqvxcmfgv0b8jyvh39yrmcmwr472j9g3ymm95m4hr8fq"; depends=[lattice svcm]; };
   MotilityLab = derive2 { name="MotilityLab"; version="0.2-4"; sha256="0fgv3w1231r85jv7v59vvfz9bcb4yrdvx89pk9g6zcspxixmc0c8"; depends=[ellipse]; };
@@ -1354,6 +1383,7 @@ in with self; {
   Mposterior = derive2 { name="Mposterior"; version="0.1.2"; sha256="16a7wvg41ld2bhbss480js5h12r41nl7jmc3y4jsbv1lr5py4ymy"; depends=[Rcpp RcppArmadillo]; };
   MuFiCokriging = derive2 { name="MuFiCokriging"; version="1.2"; sha256="09p8wdmlsf21ibqyjigwdipcin3ij0naxcd035hqgfj76v20wiyv"; depends=[DiceKriging]; };
   MuMIn = derive2 { name="MuMIn"; version="1.15.1"; sha256="04fl6m60z7h1a4mik58f8r8s3crx53n4jhg0lg9alnzipaij1qi5"; depends=[Matrix]; };
+  MultAlloc = derive2 { name="MultAlloc"; version="1.2"; sha256="0c3sqfaa08s8mk4yz77kh6q6v9ic5xp52g9prfw1k2kv4nw1k2qd"; depends=[Rglpk]; };
   MultEq = derive2 { name="MultEq"; version="2.3"; sha256="0fshv7i97q8j7vzkxrv6f20kpqr1kp9v6pbw50g86h37l0jghj7r"; depends=[]; };
   MultNonParam = derive2 { name="MultNonParam"; version="1.2.1"; sha256="0fakycqvc8kqavdxmwsfww21f6ndlr0zwwwgh6asjffpdji798bb"; depends=[]; };
   MultiCNVDetect = derive2 { name="MultiCNVDetect"; version="0.1-1"; sha256="0mfisblw3skm4y8phfg4wa0rdchl01wccarsq79hv63y78pfhh13"; depends=[]; };
@@ -1377,12 +1407,13 @@ in with self; {
   NCA = derive2 { name="NCA"; version="1.1"; sha256="11sx5y9i0y0c8r9z6lwjk4p9l4gmwj58i76z809l40mlld59igcz"; depends=[Benchmarking gplots quantreg sfa]; };
   NCmisc = derive2 { name="NCmisc"; version="1.1.4"; sha256="0hbrad72lzp0vi0j9lvpmvdih7vijqghqng1f0hjd8fg8hjvcflg"; depends=[dplyr proftools]; };
   NEff = derive2 { name="NEff"; version="1.1"; sha256="16ys1fi28kbzg3am9vz1c5pc9x0ac47pl6za04h63lspk99yplzk"; depends=[bit msm]; };
+  NEpiC = derive2 { name="NEpiC"; version="1.0"; sha256="1pz6n8frf8ggivrsb6z5x7aq3k13l4ksdbkzk5ndm09whdn5fzn5"; depends=[igraph]; };
   NHANES = derive2 { name="NHANES"; version="2.1.0"; sha256="0aphv3rakfcfrv2km1xyxpj1bxiazy6gwrvs7lyhxmq468fk4c9a"; depends=[]; };
   NHEMOtree = derive2 { name="NHEMOtree"; version="1.0"; sha256="0ycprj2rz2fy6a7ps0bsr27iphmbfxi9pbvl8rcr6p8yagfb84mb"; depends=[emoa partykit rpart sets]; };
   NHMM = derive2 { name="NHMM"; version="3.5"; sha256="03il5y6vz5zyadydhk3qg6sd6fmsw7md9if1igyy9643mxxm1g0f"; depends=[BayesLogit MASS MCMCpack msm Rcpp]; };
   NHMSAR = derive2 { name="NHMSAR"; version="1.1"; sha256="1qbgxb684qwcb29x95a48r6bndqwdi1drwzimkhkb2ldm98yga3z"; depends=[caTools glasso lars SIS ucminf]; };
   NHPoisson = derive2 { name="NHPoisson"; version="3.1"; sha256="1gr682kxgw227yqw9w0iw9lrijsz5iszhnfk0mdhi6m1w9s28kcn"; depends=[car]; };
-  NIPTeR = derive2 { name="NIPTeR"; version="1.0.0"; sha256="14z7bdxh181bnks1w6751qyq4pjfgpfp3n426g70sdmydln4ycql"; depends=[Rsamtools S4Vectors sets]; };
+  NIPTeR = derive2 { name="NIPTeR"; version="1.0.1"; sha256="0yv7zjx6993y9iis4hi27nilyfvqlxwbdmg2gw41wbq3cmyqmx5n"; depends=[Rsamtools S4Vectors sets]; };
   NISTnls = derive2 { name="NISTnls"; version="0.9-13"; sha256="03a1c8a5dr5l5x4wbclnsh3vmx3dy7migfdzdx7d7p3s7hj3ibif"; depends=[]; };
   NISTunits = derive2 { name="NISTunits"; version="1.0.0"; sha256="156rk3wams52lw3inf55s9v7mi5x29mmb41p8kvryimnzgi904ca"; depends=[]; };
   NLP = derive2 { name="NLP"; version="0.1-8"; sha256="0vzb4rlr30ncqk2whl2apryab8nladm14p9awwg7mp5r4safs2ys"; depends=[]; };
@@ -1391,6 +1422,7 @@ in with self; {
   NMF = derive2 { name="NMF"; version="0.20.6"; sha256="0mmh9bz0zjwd8h9jplz4rq3g94npaqj8s4px51vcv47csssd9k6z"; depends=[cluster colorspace digest doParallel foreach ggplot2 gridBase pkgmaker RColorBrewer registry reshape2 rngtools stringr]; };
   NMFN = derive2 { name="NMFN"; version="2.0"; sha256="0n5fxqwyvy4c1lr0glilcz1nmwqdc9krkqgqh3nlyv23djby9np5"; depends=[]; };
   NMOF = derive2 { name="NMOF"; version="0.36-2"; sha256="0s3zd6wj249b2ppznw84cv4rzsgfl5lzdrmps47hzq3iv83q3d33"; depends=[]; };
+  NNLM = derive2 { name="NNLM"; version="0.4.1"; sha256="1wi2rbj56v49hsnhwdyyjwfk4hb84sagfq6mpjis4ccq65hxkvfv"; depends=[Rcpp RcppArmadillo RcppProgress]; };
   NNTbiomarker = derive2 { name="NNTbiomarker"; version="0.29.11"; sha256="0sqlf7vzhpmq2g98c2qlrcqn3ba4ycfxbczgcjiqqhqsvgkpacc1"; depends=[magrittr mvbutils shiny stringr xtable]; };
   NORMT3 = derive2 { name="NORMT3"; version="1.0-3"; sha256="041s0qwmksy3c7j45n4hhqhq3rv2hncm2fi5srjpwf9fcj5wxypg"; depends=[]; };
   NORRRM = derive2 { name="NORRRM"; version="1.0.0"; sha256="06bdd5m46c8bbgmr1xkqfw72mm38pafxsvwi9p8y7znzyd0i6ag3"; depends=[ggplot2 SDMTools]; };
@@ -1417,13 +1449,14 @@ in with self; {
   NetComp = derive2 { name="NetComp"; version="1.6"; sha256="11rxpdihn575diqfvc7yvxhlr2c19fig4v4a5c6jhqyfdsd60fsv"; depends=[gdata]; };
   NetData = derive2 { name="NetData"; version="0.3"; sha256="1jf05zwy0c6gmm7kvxlwvai61bz4wpsw7cl0h4i21ipzn1rqxmqj"; depends=[]; };
   NetIndices = derive2 { name="NetIndices"; version="1.4.4"; sha256="0ydivbri8l8zkxi18ghj9h66915scyhca8i9mcyq4b06mjfigss8"; depends=[MASS]; };
+  NetPreProc = derive2 { name="NetPreProc"; version="1.1"; sha256="0r51dqymf2nqm86py4zwdlf7qf120j0bg9r6a9c0gsyyijh4z40p"; depends=[graph]; };
   NetSim = derive2 { name="NetSim"; version="0.9"; sha256="07h4qwz64k8zj8c2mx23cbnhg4rqrb4nfh20xw98kspz7cisdg6d"; depends=[Rcpp]; };
   NetSwan = derive2 { name="NetSwan"; version="0.1"; sha256="1mwdy3ahagiifj2bd1ajrafvnxzi74a1x1d3i2laf1hqpz3fbgld"; depends=[igraph]; };
-  NeuralNetTools = derive2 { name="NeuralNetTools"; version="1.3.1"; sha256="0nk2rs1rfv1lp99kfmqfcwgli92pljzrf4dgxp5q3icgpyf88kqv"; depends=[ggplot2 neuralnet nnet reshape2 RSNNS scales]; };
+  NeuralNetTools = derive2 { name="NeuralNetTools"; version="1.4.0"; sha256="1lz8jdn8qrfhdp6sgfzy0bk7csz1v3sjwgbni235x2dz9p60p6n4"; depends=[ggplot2 nnet reshape2 scales tidyr]; };
   Newdistns = derive2 { name="Newdistns"; version="2.0"; sha256="1jgv9jl6pvsjgjsbjvmjg8qwjx4gsmp4kd27pbqxldp0qp0q9mjf"; depends=[AdequacyModel]; };
   NightDay = derive2 { name="NightDay"; version="1.0.1"; sha256="0vkpr2jwhgghiiiaiglaj1b9pz25fcsl628c9nsp9zyl67982wz1"; depends=[maps]; };
-  Nippon = derive2 { name="Nippon"; version="0.6.1"; sha256="0fby543cxlzyd0vpv4xjiqi1hxrrcdxm2rafq3w3crkfid4qm95g"; depends=[maptools sp]; };
-  NlcOptim = derive2 { name="NlcOptim"; version="0.2"; sha256="0g0yfq749yc9cccfflgjwdm4nqzvg65gvf2n09anqi1xzni2zm22"; depends=[MASS]; };
+  Nippon = derive2 { name="Nippon"; version="0.6.3"; sha256="1r13n65nzz3fm46q3ddy9gn5vbdym2x1h8cr12ajp40qrmjf41zv"; depends=[maptools sp]; };
+  NlcOptim = derive2 { name="NlcOptim"; version="0.3"; sha256="1ywj8sb1k5nrhvrqjjvwackrhkxd43szccvbzss788n8rql46l79"; depends=[MASS]; };
   NlsyLinks = derive2 { name="NlsyLinks"; version="2.0.1"; sha256="08w0wkmj9s3sgrwq0icfmp7a1i29hq4594hjmlxqagc843p592r4"; depends=[lavaan]; };
   NominalLogisticBiplot = derive2 { name="NominalLogisticBiplot"; version="0.2"; sha256="0m9442d9i78x57gdwyl3ckwp1m6j27cam774zkb358dw5nmwxbmz"; depends=[gmodels MASS mirt]; };
   NonpModelCheck = derive2 { name="NonpModelCheck"; version="2.0"; sha256="0i87v666i0fc1c4rwxl6zmal7dp4ph7l7ki5vck9wykm28qr6q5y"; depends=[dr]; };
@@ -1432,11 +1465,12 @@ in with self; {
   NormalLaplace = derive2 { name="NormalLaplace"; version="0.2-0"; sha256="11z568zhb7jw9ghp6wlyf26ijm25crc5pqhzw71qgvva42nsmmwn"; depends=[DistributionUtils GeneralizedHyperbolic]; };
   NostalgiR = derive2 { name="NostalgiR"; version="1.0.2"; sha256="0rpvwi815sdhaxqpji1y6g0vy8mkn5k6wci0a4jf54pkywwkwrwp"; depends=[txtplot]; };
   Nozzle_R1 = derive2 { name="Nozzle.R1"; version="1.1-1"; sha256="05sjip4sz12mwd3jcbvk342p83kdmrd4l2jrh17p18w4l7w4nn0z"; depends=[]; };
-  OAIHarvester = derive2 { name="OAIHarvester"; version="0.1-7"; sha256="0wcl71y8i4s4fxpb90xg71sj6819kgl3d4gff66dan8i6y8sxmyk"; depends=[RCurl XML]; };
+  OAIHarvester = derive2 { name="OAIHarvester"; version="0.2-0"; sha256="1zpnf56kji14lrz6jm7saiw55yg7n62dk3r5qb21wx9qwzjggycp"; depends=[curl XML]; };
   OBsMD = derive2 { name="OBsMD"; version="0.1-0.4"; sha256="00hakq94lkkx9iscxm3sv4hslyqsnjcxs74l6v89bm8p5ds8dlzl"; depends=[]; };
   ODB = derive2 { name="ODB"; version="1.1.1"; sha256="1hha4rkbc2zh3karkqa0vn4v0nmcd7sljcymy1nh28bx1gx2ffgs"; depends=[DBI RJDBC]; };
   ODMconverter = derive2 { name="ODMconverter"; version="2.1"; sha256="03m15vck01s6jqcpm5fl7mipki4grgywlb9mksr0l8wygmn8zkxs"; depends=[xlsx XML]; };
-  OECD = derive2 { name="OECD"; version="0.1"; sha256="1g7wlrhq01szv5ch573lq1scv93q0dk3rv7snll3pqkkllvrw8bc"; depends=[dplyr httr rsdmx XML]; };
+  OData = derive2 { name="OData"; version="0.3"; sha256="0wd9z8k27vxblh1v95p3bx15i15yacqqfpwr15bnd0xnaw9sr0z7"; depends=[RJSONIO XML]; };
+  OECD = derive2 { name="OECD"; version="0.2.0"; sha256="068j332g2ncyjld3w16c46drwjy7y8hq38p57bql3rwgly9xfy2j"; depends=[httr rsdmx xml2]; };
   OIdata = derive2 { name="OIdata"; version="1.0"; sha256="078khxrszwnrww2h0ag153bf59fnyhirxy4m56ssgr2gmfahaymf"; depends=[maps RCurl]; };
   OIsurv = derive2 { name="OIsurv"; version="0.2"; sha256="148mpjj5navc1vrl72y87krn4lf3awnd32z3g4qqaia404w5w7p7"; depends=[KMsurv survival]; };
   OLScurve = derive2 { name="OLScurve"; version="0.2.0"; sha256="1zqapfwgwy9rxnbhmlgplkphw1bdia4cyi9q6iwcppw3rjw75f1n"; depends=[lattice]; };
@@ -1459,7 +1493,7 @@ in with self; {
   OligoSpecificitySystem = derive2 { name="OligoSpecificitySystem"; version="1.3"; sha256="17mspf1ph2ybv046zckykfdcbrsiz40hrs6ib5mpwkfnrvsp1w7l"; depends=[tkrplot]; };
   OmicKriging = derive2 { name="OmicKriging"; version="1.3"; sha256="1fj131684faj75jdipmsvb8s684x72is6zz79hwb5wszklk00ind"; depends=[doParallel irlba ROCR]; };
   Oncotree = derive2 { name="Oncotree"; version="0.3.3"; sha256="147rc9ci66lxbb91ys2ig40sgmldi15p604yysrd4ccbxpbk2zwf"; depends=[boot]; };
-  OneArmPhaseTwoStudy = derive2 { name="OneArmPhaseTwoStudy"; version="0.1.3"; sha256="1jhvd5k99yg2n0g1m09wvbjmjynzxg3aafzsp0r00yf7bra3c6q7"; depends=[Rcpp]; };
+  OneArmPhaseTwoStudy = derive2 { name="OneArmPhaseTwoStudy"; version="0.1.4"; sha256="1g3yrrnrk4375wxzfdndsm963ma112k5njv18adh43vfzyzg5l2m"; depends=[Rcpp]; };
   OneTwoSamples = derive2 { name="OneTwoSamples"; version="1.0-3"; sha256="0019rc2f4jmbm6sinkvalvjqwi822x78aiin88kg8qbbb5ml8l89"; depends=[]; };
   OpasnetUtils = derive2 { name="OpasnetUtils"; version="1.2.0"; sha256="1ckagq14w9923a4x7pk9mfzqcfayi00apwd2kvqzgd0s6355r1q7"; depends=[digest ggplot2 httpRequest plyr RCurl reshape2 rgdal rjson sp triangle xtable]; };
   OpenCL = derive2 { name="OpenCL"; version="0.1-3"; sha256="0f7vis0jcp0nh808xbzc73vj7kdcjb0qqzzsh3gvgamzbjfslch8"; depends=[]; };
@@ -1476,25 +1510,27 @@ in with self; {
   OrdFacReg = derive2 { name="OrdFacReg"; version="1.0.6"; sha256="16mavsmp6d8rfmimmp5ynwyzir0gycpg8rhd8cwanlrndyclqlpv"; depends=[eha MASS survival]; };
   OrdLogReg = derive2 { name="OrdLogReg"; version="1.1"; sha256="18s75pmz1g3yac2rfl41kj8sfflq298qkijnvqlybgxpq98ickxx"; depends=[LogicReg]; };
   OrdMonReg = derive2 { name="OrdMonReg"; version="1.0.3"; sha256="1xca8pvvq79j484l2rmn4nva8ncx8z51g5diljikck231y8qjqaz"; depends=[]; };
-  OrdNor = derive2 { name="OrdNor"; version="1.0"; sha256="1n6c0d4r1w3n016lzk2i5yyvawk9pgmsbzymbbyq7gx8a80iv32h"; depends=[corpcor GenOrd Matrix mvtnorm]; };
+  OrdNor = derive2 { name="OrdNor"; version="2.0"; sha256="1zr8zzigrbf6r0zz4f0za6my6d67wxqzvmabl36pjxc3sq7jh83j"; depends=[corpcor GenOrd Matrix mvtnorm]; };
   OrdinalLogisticBiplot = derive2 { name="OrdinalLogisticBiplot"; version="0.4"; sha256="1axn03yrw30r2j9ss5ig9sq857y37vhrr4a7px68jc2az8mng41j"; depends=[MASS mirt NominalLogisticBiplot]; };
   OrgMassSpecR = derive2 { name="OrgMassSpecR"; version="0.4-4"; sha256="046lr0piiy5w5lxjvyw7iqqclkghmc6zqymfypkw374gk73yrm76"; depends=[]; };
   OriGen = derive2 { name="OriGen"; version="1.3.1"; sha256="1xgh2085qy1vsjpwpf59qlpyxlb68lvhy9d1b37q6m48lp8cl299"; depends=[ggplot2 maps]; };
   OrthoPanels = derive2 { name="OrthoPanels"; version="0.9-1"; sha256="1p8q0b9zm7dd84qh3mrz67lcd1r11z5rj0bp93nsl23q1m2998sc"; depends=[MASS]; };
-  OutbreakTools = derive2 { name="OutbreakTools"; version="0.1-13"; sha256="0wwb43n0vv3ihpyr1g48nf81ml7vigvlsq316nzav528i1f7jh22"; depends=[ape ggmap ggplot2 knitr network networkDynamic plyr RColorBrewer RCurl reshape2 rjson scales sna]; };
+  OutbreakTools = derive2 { name="OutbreakTools"; version="0.1-14"; sha256="03bdb7w5nsrjxz5kd5zvgwybgmv2mzsxyzdc7v3kpwi20yfb9ax8"; depends=[ape ggmap ggplot2 knitr network networkDynamic plyr RColorBrewer RCurl reshape2 rjson scales sna]; };
   OutlierDC = derive2 { name="OutlierDC"; version="0.3-0"; sha256="1vm3zx4qmj9l0ddfqbksm1qyqzzqrxf93gh4kj52h68zlsfxwv41"; depends=[Formula quantreg survival]; };
   OutlierDM = derive2 { name="OutlierDM"; version="1.1.1"; sha256="0n8iq464ryc3v4wms7cdka39870w5pg29z9v8gmdsp4d9cfsx9v4"; depends=[MatrixModels outliers pcaPP quantreg]; };
   OutrankingTools = derive2 { name="OutrankingTools"; version="1.0"; sha256="0z7pslkkinn7flc4xwjg0bsfswf8ad4jv9rmglaj3fmjcx9b6wgj"; depends=[igraph]; };
+  OxyBS = derive2 { name="OxyBS"; version="1.0"; sha256="1h8jxiya6lz9ib53dm5wmhqg2y20p41mk6dqjx6k8zgjglqk8p9w"; depends=[]; };
   P2C2M = derive2 { name="P2C2M"; version="0.7.6"; sha256="07ycl22v03b2xdaw4v0l6layqhab431ma38qywzm96hkl3ywvl49"; depends=[ape ggplot2 rPython stringr]; };
   PAFit = derive2 { name="PAFit"; version="0.7.5"; sha256="1rczpgy1qrzc1p02nssx5gyi8m71w5jl97scqaddqyzg1c0zfvrp"; depends=[Rcpp]; };
   PAGI = derive2 { name="PAGI"; version="1.0"; sha256="01j1dz5ihqslpwp9yidmhw86l112l7rfkswmf03vss872mpvyp3f"; depends=[igraph]; };
-  PAGWAS = derive2 { name="PAGWAS"; version="1.0"; sha256="1zwq4b0bgsskzvlapffh30ys9y4wlcfwpjqw8m2i9zabib5knx9i"; depends=[doMC lars mnormt]; };
+  PAGWAS = derive2 { name="PAGWAS"; version="2.0"; sha256="0bz47ivd32kx1amgqllqbxyyvj773q7wasgk924hmibabiixa8nx"; depends=[foreach lars mnormt]; };
   PANDA = derive2 { name="PANDA"; version="0.9.9"; sha256="1sf3c49v4mb3mz2imqlqdbh1iab7bc2pxpi8bmgj2jld133555ip"; depends=[cluster]; };
   PANICr = derive2 { name="PANICr"; version="0.0.0.5"; sha256="049ga5iiymqczvy51y52yk7yvv9xy0ibr64ly8ciqig84d5f4jjr"; depends=[MCMCpack]; };
   PAS = derive2 { name="PAS"; version="1.2"; sha256="0q5g9j8xb9fl7r8f1w5gk5h83ll5w1r6m2gq9ilw8w8s96pm4xd8"; depends=[glmnet]; };
   PASWR = derive2 { name="PASWR"; version="1.1"; sha256="1rxymnqvflypc6m62f5vw65l8x1m2yah7r11hhpmzdq2l2sg8fci"; depends=[e1071 lattice MASS]; };
   PASWR2 = derive2 { name="PASWR2"; version="1.0"; sha256="1bxczrfxj7nlx4r0b23a7sisinb4d5nd3pj68vigbgrhqyggk87x"; depends=[e1071 ggplot2 lattice]; };
   PAWL = derive2 { name="PAWL"; version="0.5"; sha256="1sx4g4qycba2j1fm0bvhz3hk6ghhdc37rz5zi1njqxrpmbnkqg04"; depends=[foreach ggplot2 mvtnorm reshape]; };
+  PAactivPAL = derive2 { name="PAactivPAL"; version="1.0"; sha256="10whjaqfz50llv9ij4l4vadkxba038l31vpp27wgjli9kvl39a2k"; depends=[]; };
   PBD = derive2 { name="PBD"; version="1.1"; sha256="15kwzprc71h14fimz5czh5qy8lf64b0fkzcyf00xz0q83clz5fnq"; depends=[ade4 ape DDD deSolve phytools]; };
   PBImisc = derive2 { name="PBImisc"; version="0.999"; sha256="0igwl78wj8w6jzmk5m8y9rf4j72qrcjyhb83kz44is72ddzsyss6"; depends=[lme4 MASS Matrix]; };
   PBSadmb = derive2 { name="PBSadmb"; version="0.68.104"; sha256="01akimdsp0bkvz3a5d75yyy3ph0mff85n8qsnr59fla5b5cm4qlj"; depends=[PBSmodelling]; };
@@ -1520,8 +1556,9 @@ in with self; {
   PGRdup = derive2 { name="PGRdup"; version="0.2.1"; sha256="1hkkpylfchs06a42q19sv9ixc3bd7ilk9jc4qmiqg42j0gsizilm"; depends=[data_table igraph stringdist stringi]; };
   PHENIX = derive2 { name="PHENIX"; version="1.2"; sha256="0fnrx2xf6q9ng9pwfxbbbzvcf6kqj12byd81x0q0vfl85h1xddws"; depends=[ppcor SuppDists]; };
   PHYLOGR = derive2 { name="PHYLOGR"; version="1.0.8"; sha256="17lmjfbwf8j68zzzhdvppyjacdsmy4zmcfj0pcjsw5j6m361hvh6"; depends=[]; };
-  PHeval = derive2 { name="PHeval"; version="0.5.2"; sha256="1q0cyq7b8d42jgiw7ra9vjdjw1zcxpyg6wgb3zgygkmd744ifggp"; depends=[survival]; };
+  PHeval = derive2 { name="PHeval"; version="0.5.3"; sha256="1zq4ks6w5vrhy1f170fv16zgrgi1lfxmkpfkg75sjin7asw4i7a9"; depends=[survival]; };
   PIGE = derive2 { name="PIGE"; version="0.9"; sha256="1x8ml25mm69dvlszm9p2ycph92nxcsgd52ydj7ha0dwrrpcv2law"; depends=[ARTP snowfall survival xtable]; };
+  PIGShift = derive2 { name="PIGShift"; version="1.0.1"; sha256="115dnsh4b1rxx1d2kc8x3vl5366h5f0i6gg8l1w3v0f8309qigis"; depends=[ape mvtnorm]; };
   PIPS = derive2 { name="PIPS"; version="1.0.1"; sha256="1c5v3s6xys9p1q32k6mpsffhi9gwsq951rh12hs76dmak862yspc"; depends=[]; };
   PK = derive2 { name="PK"; version="1.3-2"; sha256="0162ri9wlm9inryljal48av8yxb326na94kckkigsrklfxb3wkp2"; depends=[]; };
   PKI = derive2 { name="PKI"; version="0.1-3"; sha256="1xhc84k4iszvfawwwzrwclfs41nvb8bmyygapxmsxjky725s7k1g"; depends=[base64enc]; };
@@ -1534,7 +1571,7 @@ in with self; {
   PLSbiplot1 = derive2 { name="PLSbiplot1"; version="0.1"; sha256="1l8d1k913ic0qwxvrrd447p5ni3mzc6v9lv45b7vqrpzkxdci6gy"; depends=[]; };
   PLordprob = derive2 { name="PLordprob"; version="1.0"; sha256="156lvz6vfm68hm32l5nlhq15hfacdla627d6lf8l4g34lwzdh8k8"; depends=[mnormt]; };
   PMA = derive2 { name="PMA"; version="1.0.9"; sha256="11qwgw4sgzl3xhrm468bsza83h3mfn89157nfwnrassl7qr42xkq"; depends=[impute plyr]; };
-  PMCMR = derive2 { name="PMCMR"; version="2.0"; sha256="1sriihba0av139qs4ya4fljd60ls4byyl5ccnzp3nki4xqni2h92"; depends=[]; };
+  PMCMR = derive2 { name="PMCMR"; version="4.0"; sha256="1mxahv2q9kg10w72mchpi1zyf2vkd2vsvhhb94ql6hpjk3mfag3m"; depends=[]; };
   PP = derive2 { name="PP"; version="0.5.3"; sha256="17y1v2536n7ap0kvllwkmndmdjf4wgwl171c053ph45krv37mscf"; depends=[Rcpp]; };
   PPtree = derive2 { name="PPtree"; version="2.3.0"; sha256="002qjdx52r2h90wzrf2r3kz8fv3nwx08qbp909whn6r4pbdl532v"; depends=[MASS penalizedLDA]; };
   PPtreeViz = derive2 { name="PPtreeViz"; version="1.3.0"; sha256="1v5538mwmdfgwyqi6a72b4hkhwl0b8xz3ai81cv4q8cbvgwgq8fj"; depends=[ggplot2 gridExtra Rcpp RcppArmadillo]; };
@@ -1562,7 +1599,7 @@ in with self; {
   Paneldata = derive2 { name="Paneldata"; version="1.0"; sha256="00hk340x5d4mnpl3k0hy1nypgj55as2j7y2pgzfk3fpn3zls5zib"; depends=[]; };
   ParDNAcopy = derive2 { name="ParDNAcopy"; version="2.0"; sha256="017xwznhfibi8kp0ifww02c0qcq0vxs06rjww4kcp2bvdmld8kc4"; depends=[DNAcopy]; };
   ParallelForest = derive2 { name="ParallelForest"; version="1.1.0"; sha256="1xa9lfgrvzv7bvv1aaabcfk4372p8x5gxgj463h5ggf9x177lj5j"; depends=[]; };
-  ParallelPC = derive2 { name="ParallelPC"; version="1.1"; sha256="0g2x0y2r2qffypjsp1cr6hgj5k25r0lh15sc6465prnkdmc016vv"; depends=[]; };
+  ParallelPC = derive2 { name="ParallelPC"; version="1.2"; sha256="07y7xb16865khxkvwsk1yglzyy7ja4aj2wpkipaz48i77c3x8bi2"; depends=[]; };
   ParamHelpers = derive2 { name="ParamHelpers"; version="1.6"; sha256="07lzqww0grkra14b1pviv1r39nsp0zj438zcqnw0q1lyvdflih23"; depends=[BBmisc checkmate]; };
   ParentOffspring = derive2 { name="ParentOffspring"; version="1.0"; sha256="117g8h0k65f2cjffigl8n4x37y41rr2kz33qn2awyi876nd3mh93"; depends=[]; };
   ParetoPosStable = derive2 { name="ParetoPosStable"; version="1.1"; sha256="1fwji5wrhbxr089dll812csamvb5q2pxn1607rpirarifgfbj28m"; depends=[ADGofTest doParallel foreach lmom]; };
@@ -1573,7 +1610,7 @@ in with self; {
   PearsonICA = derive2 { name="PearsonICA"; version="1.2-4"; sha256="0jkbqha1nb9pf72ffki47wymsdmd50smkdhvpzvanv4y2rmqfhvg"; depends=[]; };
   PedCNV = derive2 { name="PedCNV"; version="0.1"; sha256="09qxcjzwdgzdkbj28rzmfv7k3q2qsiapnvx3m45a835r57h5gynp"; depends=[ggplot2 Rcpp RcppArmadillo]; };
   PepPrep = derive2 { name="PepPrep"; version="1.1.0"; sha256="1s2xn05xry50l9kf1mj6yd1dpc7yp6g3d00960hswvhznb0a4l84"; depends=[biomaRt stringr]; };
-  Peptides = derive2 { name="Peptides"; version="1.1.0"; sha256="0nfldckrb9cvxnzqkhqr06d8a5nna5b900439x49r8njcwr4xpcg"; depends=[]; };
+  Peptides = derive2 { name="Peptides"; version="1.1.1"; sha256="0a6806n7lpdyvmsbvrm0fd124dxd4q8ka0dxb22ri26n60vcyybr"; depends=[]; };
   PerFit = derive2 { name="PerFit"; version="1.4"; sha256="1pjyns9qsqr7c3m5n8a12z3i2b0y98alq0fs84r909m4m5lb22k3"; depends=[fda Hmisc irtoys ltm MASS Matrix mirt]; };
   PerMallows = derive2 { name="PerMallows"; version="1.10"; sha256="1h3r4cpyc0fsxz4vr75jyah9gjwj6f7sbmm9yk7p8kk1wagp4a44"; depends=[Rcpp]; };
   Perc = derive2 { name="Perc"; version="0.1.0"; sha256="16wd83w41j6lrhhl8g16pxcjj1l9h8kvk9425d6njr81gwxwvngw"; depends=[]; };
@@ -1586,6 +1623,7 @@ in with self; {
   PhaseType = derive2 { name="PhaseType"; version="0.1.3"; sha256="092dqyqfaxj8qpwxcjb5cayhnq597rfjz1xb93ps4nrczycqs0l6"; depends=[coda ggplot2 reshape]; };
   Phxnlme = derive2 { name="Phxnlme"; version="1.0.0"; sha256="0h9mi8p95rp1s8xsdv38j9fpy2cy9zvjnldjmnj0n469kimp2782"; depends=[ggplot2 gridExtra lattice manipulate testthat]; };
   PhyActBedRest = derive2 { name="PhyActBedRest"; version="1.0"; sha256="0fpg17fwap12da7xka8pnd1wk6rbmw3zl099588g2r05wq3425sx"; depends=[]; };
+  PhySortR = derive2 { name="PhySortR"; version="1.0.3"; sha256="1qvyilcym9wcmfgrfbsf5aqy9i103wmavydry6nnd8ps2s07jvqv"; depends=[ape phytools]; };
   PhyloMeasures = derive2 { name="PhyloMeasures"; version="1.1"; sha256="1wxm9yiplasxhqxs3qxys46k1i7n459frxxh275abczafq46l8if"; depends=[ape]; };
   PhysicalActivity = derive2 { name="PhysicalActivity"; version="0.1-1"; sha256="1aqyip7psf3pdrxkpidfldkk9naihvnc7s3n6w6vvr9h1l5mpmvc"; depends=[]; };
   PivotalR = derive2 { name="PivotalR"; version="0.1.17.45"; sha256="13rw7y2n2hnyj2lslkb78qhj05765k9snkgdhh4dfnlgnyb19kkw"; depends=[Matrix]; };
@@ -1604,29 +1642,30 @@ in with self; {
   PolyPatEx = derive2 { name="PolyPatEx"; version="0.9.1"; sha256="1j7pxkwjrhmgffrqpkykvsdvflqn93z6in2ysn1gs6qvk5vlrnbi"; depends=[gtools]; };
   PolynomF = derive2 { name="PolynomF"; version="0.94"; sha256="006ds50ivq91v2jyhgpm5rfaipxbzsnljrki6fjplcw07g0frz71"; depends=[]; };
   Pomic = derive2 { name="Pomic"; version="1.0.2"; sha256="1i3zsz7gc4n4vid3yi3srrv04qk1678wqyyw303pfibiyfd4m80q"; depends=[]; };
-  PopED = derive2 { name="PopED"; version="0.2.0"; sha256="00qbwabzjb4ns9y9a4gg73zxpx02xcycbm19bdk9z1mv06fkg9dj"; depends=[codetools dplyr ggplot2 MASS mvtnorm nlme]; };
+  PopED = derive2 { name="PopED"; version="0.3.0"; sha256="1ahgnrzjldiqj0a561x8phad62qb5ldrck1az3qcrqvm7n6h6icb"; depends=[codetools dplyr ggplot2 MASS mvtnorm nlme]; };
   PopGenKit = derive2 { name="PopGenKit"; version="1.0"; sha256="0l4mbm0cyppgvcw2cbimrv29aiciyj00k8wfwcj5zr8sh7fgfhs4"; depends=[]; };
   PopGenReport = derive2 { name="PopGenReport"; version="2.2"; sha256="0chpfgxpjbp0ci1h2q60gsbwdbqw14wa3pd7y6la3bz7pmsdbnwf"; depends=[ade4 adegenet calibrate data_table dismo gap gdistance genetics GGally ggplot2 knitr lattice mmod pegas plyr R_utils raster reshape rgdal RgoogleMaps sp vegan xtable]; };
   PopGenome = derive2 { name="PopGenome"; version="2.1.6"; sha256="1wk5k5f80l7k6haiaikhgaqn67q5n7gm632i3yz3frj1ph7bwjb7"; depends=[ff]; };
   PopVar = derive2 { name="PopVar"; version="1.2.1"; sha256="09az5wa0zai6axhvrljqdjn74nb7jikqwjqy8f570qxb6jbgfgay"; depends=[BGLR qtl rrBLUP]; };
   PortRisk = derive2 { name="PortRisk"; version="1.1.0"; sha256="05yxqcv0cijy3s9zx68f9xy59jv55kmj3v0pz5pgl17j23kb9rlc"; depends=[copula MASS MCMCpack tseries zoo]; };
   PortfolioAnalytics = derive2 { name="PortfolioAnalytics"; version="1.0.3636"; sha256="0xva3ff8lz05f1jvx8hgn8rpgr658fjhf3xyh9ga1r7dii13ld50"; depends=[foreach PerformanceAnalytics xts zoo]; };
-  PortfolioEffectEstim = derive2 { name="PortfolioEffectEstim"; version="1.0"; sha256="1ll79zpxz3kaxzj58gr3cmzvsm20xrbc790cs9hgmk6j95gacp6m"; depends=[PortfolioEffectHFT rJava]; };
-  PortfolioEffectHFT = derive2 { name="PortfolioEffectHFT"; version="1.3"; sha256="1l1c6qzbm76s7s7n2cb0si385fl9ir6sck3jn0sjv9bsfsqgvz3b"; depends=[ggplot2 rJava]; };
+  PortfolioEffectEstim = derive2 { name="PortfolioEffectEstim"; version="1.1"; sha256="0hicilawyjx8yihyrwkrppbxlmr9qjrbmy7fw3fq3h2lyw5fmv91"; depends=[PortfolioEffectHFT rJava]; };
+  PortfolioEffectHFT = derive2 { name="PortfolioEffectHFT"; version="1.4"; sha256="1dn7xjh9hlp8qrrbsrix6f7q769xzdgnjflzl2w5sxzqhb5xsnm4"; depends=[ggplot2 rJava]; };
   PottsUtils = derive2 { name="PottsUtils"; version="0.3-2"; sha256="05ds0a7jq63zxr3jh66a0df0idzhis76qv6inydsjk2majadj3zv"; depends=[miscF]; };
   PoweR = derive2 { name="PoweR"; version="1.0.4"; sha256="00y0dvrsbvz8mr8mdw7fk17s5dfgm0f641qg96039y6g3hk2rn77"; depends=[Rcpp RcppArmadillo]; };
-  Power2Stage = derive2 { name="Power2Stage"; version="0.4-2"; sha256="0h1zy5ppqb90x1225k3iqk2cvb2ld0pv6baj6vqz5690rr4g936y"; depends=[PowerTOST]; };
-  PowerTOST = derive2 { name="PowerTOST"; version="1.3-01"; sha256="1g68mn37i3dag0zvx8l5cm4jcqkridiam1ab46w0l26bq9zcaaa6"; depends=[mvtnorm]; };
+  Power2Stage = derive2 { name="Power2Stage"; version="0.4-3"; sha256="1bad2r9kdpg5i9pqz6754xywwm1c1mbl16dxdnb92pjy2pkq1q7x"; depends=[mvtnorm PowerTOST]; };
+  PowerTOST = derive2 { name="PowerTOST"; version="1.3-02"; sha256="1w3g81s55f06z4zcrf9hf3003l7jfvh95wx21lzxn11crjzwfh4y"; depends=[mvtnorm]; };
   PracTools = derive2 { name="PracTools"; version="0.3"; sha256="1n9h28nzxy0fs27w1gwyrbaijr437xqiprmkal0i4dz6da7w4928"; depends=[]; };
   PredictABEL = derive2 { name="PredictABEL"; version="1.2-2"; sha256="08c7j2in1wlas6nmy44s08cq86h5fizqbhsnq312dllqdzmb2h9s"; depends=[epitools Hmisc PBSmodelling ROCR]; };
   PredictiveRegression = derive2 { name="PredictiveRegression"; version="0.1-4"; sha256="15vkisj3q4hinc3d537s8inhj3wk62q67qhy050xmp9j563ainmd"; depends=[]; };
   PresenceAbsence = derive2 { name="PresenceAbsence"; version="1.1.9"; sha256="17qn4ggkr5aqml45nkihj1j35y479ywkm1xcfkb2g8ky66jb0c0s"; depends=[]; };
-  PrevMap = derive2 { name="PrevMap"; version="1.3"; sha256="0wzg5c04zdzmdmbj2zsp22gzs4a5vkaqlw7ci0a0lyvvr2hl33ij"; depends=[geoR maxLik pdist raster splancs truncnorm]; };
+  PrevMap = derive2 { name="PrevMap"; version="1.3.2"; sha256="0dy14cyzlnf33rw3f2imfiskblg833cp3fflpw28zr52m36crrd2"; depends=[geoR maxLik pdist raster splancs truncnorm]; };
   PrivateLR = derive2 { name="PrivateLR"; version="1.2-21"; sha256="1jwq8f0dnngj8sfbmcmxy34nkkq6yjw0mq3w1f8rasz67v3bwzp3"; depends=[]; };
   ProDenICA = derive2 { name="ProDenICA"; version="1.0"; sha256="04gnsnd0xzw3bfbssdp06bar0lk305ry2c97pmwxgiz3ay88dfsj"; depends=[gam]; };
   ProNet = derive2 { name="ProNet"; version="1.0.0"; sha256="10r0gcxv0djrw99nd6a1jrnwvqmidw10ll645gvkp8l39li0107n"; depends=[igraph linkcomm MCL Rcpp]; };
   ProTrackR = derive2 { name="ProTrackR"; version="0.2.3"; sha256="0zdysy58s2prla07qfhlhsycmnnf7ydjz5dlhhng5da3bc1nlrq2"; depends=[audio lattice signal tuneR]; };
   ProbForecastGOP = derive2 { name="ProbForecastGOP"; version="1.3.2"; sha256="0fnw3g19lx4vs8vmn4qdirvybkiy2cxkhwkn9qa3phz45iixnvx4"; depends=[fields RandomFields]; };
+  ProbYX = derive2 { name="ProbYX"; version="1.1-0"; sha256="0dphf6jr72l235v3yjhwi8bqmv6ac7yrbyfwhx4qjrrcdnsb7qhl"; depends=[rootSolve]; };
   ProfessR = derive2 { name="ProfessR"; version="2.3"; sha256="1y88as4xjvdm2v2ms5l7c6ziq7sll6qkrpgzdd4xnbcjx7c0g9w8"; depends=[RPMG]; };
   ProfileLikelihood = derive2 { name="ProfileLikelihood"; version="1.1"; sha256="16cdp1nimhg1sd2x0qbffm7clgk54p0838y688z8lnsrjaggmb0x"; depends=[MASS nlme]; };
   ProgGUIinR = derive2 { name="ProgGUIinR"; version="0.0-4"; sha256="0srhk42ssx4i096sbs4jacqjsc1ffqjxjgvpplzshlqaby1h3795"; depends=[ggplot2 MASS svMisc]; };
@@ -1642,12 +1681,13 @@ in with self; {
   PurBayes = derive2 { name="PurBayes"; version="1.3"; sha256="0nbm4cyrwfbwwbjbjkylr86cshaqbvbif6dkp4fag8kbcgyyx5qh"; depends=[rjags]; };
   PwrGSD = derive2 { name="PwrGSD"; version="2.000"; sha256="0qxvws9mfrnqw5s24qhqk6cbffjm13z7awyxdmnilazghpiq1p7s"; depends=[survival]; };
   PythonInR = derive2 { name="PythonInR"; version="0.1-3"; sha256="0p4h30wqsz8czz6r4xjg5q79190hq242x9fsaw7v5433px1gmr44"; depends=[pack R6]; };
-  QCA = derive2 { name="QCA"; version="1.1-4"; sha256="0wg2yfg61bmcxmkxvm9zjrnz4766f176y4gyqvfp5hsp9pp0h2lm"; depends=[lpSolve]; };
+  QCA = derive2 { name="QCA"; version="2.0"; sha256="0x8pyp1rj0kgs84q5i1f5qs8zx99sd3mj106s8h57mwad0y8xq4a"; depends=[lpSolve QCAGUI shiny]; };
   QCA3 = derive2 { name="QCA3"; version="0.0-7"; sha256="0i9i2i633sjnzsywq51r2l7fkbd4ip217hp0vnkj78sfl7zf1270"; depends=[lpSolveAPI]; };
-  QCAGUI = derive2 { name="QCAGUI"; version="1.9-6"; sha256="020ngni02j2w2ylhyidimm51d426pym2g1hg7gnpb7aplxx67n6x"; depends=[abind QCA]; };
+  QCAGUI = derive2 { name="QCAGUI"; version="2.0"; sha256="16hkn12j697aschj8h1zsznss7pfhy3h3xj5im0183ni4slibp4a"; depends=[lpSolve shiny]; };
   QCAfalsePositive = derive2 { name="QCAfalsePositive"; version="1.1.1"; sha256="03qzb6vdnbri52gfx3laz14988p2swdv9m8i5z7gpsv3f3bjrxbp"; depends=[]; };
   QCAtools = derive2 { name="QCAtools"; version="0.1"; sha256="1fcssxpyw0kfm6xgihkv4qxqmg628ahfr1bk36b9di9d29w6vgn9"; depends=[directlabels ggplot2 QCA stringr]; };
   QCGWAS = derive2 { name="QCGWAS"; version="1.0-8"; sha256="1wn1kddgfmqv326pihnavbgsbd2yxrlq5s2xgi6kbprssxvj8bk1"; depends=[]; };
+  QCSIS = derive2 { name="QCSIS"; version="0.1"; sha256="0ibh3060jxf426svdfxiryvfhr8pwk991xs653d50ip4f9290y3a"; depends=[]; };
   QFRM = derive2 { name="QFRM"; version="1.0.1"; sha256="1k79sq9il4326q7ivwdwlzw7drjv4pwqra3fr8kyyqcpmxh9296h"; depends=[]; };
   QPot = derive2 { name="QPot"; version="1.0"; sha256="1dw2hzl6hif9g5kn37zyvd1gglqg67ki6ii42rl4vr5p3ar4f8pb"; depends=[MASS]; };
   QRM = derive2 { name="QRM"; version="0.4-10"; sha256="1fkxjqyb9yqki4qwk393ra66wg5dnbr5b5sgypm8wk973crbhcj0"; depends=[gsl Matrix mgcv mvtnorm numDeriv Rcpp timeSeries]; };
@@ -1665,14 +1705,14 @@ in with self; {
   QuasiSeq = derive2 { name="QuasiSeq"; version="1.0-8"; sha256="113pxmvwwn331g5dcv2zwsvvi5jgc1v41f38sw9gms06i8x3a7q6"; depends=[edgeR mgcv pracma]; };
   Quor = derive2 { name="Quor"; version="0.1"; sha256="1ncl4pj472m881fqndcm6jzn4jkwbnzpc639c9vy5mxa4z569i1g"; depends=[combinat]; };
   R_cache = derive2 { name="R.cache"; version="0.12.0"; sha256="006x52w9r8phw5hgqmyp0bz8z42vn8p5yibibnzi1sfa1xlw8iyx"; depends=[digest R_methodsS3 R_oo R_utils]; };
-  R_devices = derive2 { name="R.devices"; version="2.13.1"; sha256="1lz46irm66v5r8wg439n4d6waivnfchgwq0w565crd6ri6rhf16h"; depends=[base64enc R_methodsS3 R_oo R_utils]; };
+  R_devices = derive2 { name="R.devices"; version="2.13.2"; sha256="1zvb3j2gj2anrryhhzy41yh7kmfan1q9x15757b1hiycdfvdfjzd"; depends=[base64enc R_methodsS3 R_oo R_utils]; };
   R_filesets = derive2 { name="R.filesets"; version="2.9.0"; sha256="0rb9l2p35z0nnl5qlirn22dcnrk6jaa5ip7qaqyq40m8jnvhj9n6"; depends=[digest future listenv R_cache R_methodsS3 R_oo R_utils]; };
   R_huge = derive2 { name="R.huge"; version="0.9.0"; sha256="13p558qalv60pgr24nsm6mi92ryj65rsbqa6pgdwy0snjqx12bgi"; depends=[R_methodsS3 R_oo R_utils]; };
   R_matlab = derive2 { name="R.matlab"; version="3.3.0"; sha256="1hg43lvdivj1x4s54vaj13z5dp92sndnpminhnqbk27kzmdczy84"; depends=[R_methodsS3 R_oo R_utils]; };
   R_methodsS3 = derive2 { name="R.methodsS3"; version="1.7.0"; sha256="1dg4bbrwr8jcsqisjrrwxs942mrjq72zw8yvl2br4djdm0md8zz5"; depends=[]; };
   R_oo = derive2 { name="R.oo"; version="1.19.0"; sha256="15rm1qb9a212bqazhcpk7m48hcp7jq8rh4yhd9c6zfyvdqszfmsb"; depends=[R_methodsS3]; };
-  R_rsp = derive2 { name="R.rsp"; version="0.20.0"; sha256="06vq9qq5hdz3hqc99q82622mab6ix7jwap20h4za6ap6gnwqs0fv"; depends=[R_cache R_methodsS3 R_oo R_utils]; };
-  R_utils = derive2 { name="R.utils"; version="2.1.0"; sha256="03pi6pkcsq65fv7cn4x74cj050dc8x5d4xyg930p6f7flk788xaz"; depends=[R_methodsS3 R_oo]; };
+  R_rsp = derive2 { name="R.rsp"; version="0.21.0"; sha256="0snc6ps75s3ci6sy8mil1wg2i9xmlr1ygh9n244y1brdvp43dfsw"; depends=[R_cache R_methodsS3 R_oo R_utils]; };
+  R_utils = derive2 { name="R.utils"; version="2.2.0"; sha256="1340g3agi4w5ab0kkc85rnfy6q03f13x3i9c58vn2jaaq5lmvy90"; depends=[R_methodsS3 R_oo]; };
   R0 = derive2 { name="R0"; version="1.2-6"; sha256="1yvcgchxlj7hkgqkw6g8pxnracxkld1grgykkcr6wbhminbylqv8"; depends=[MASS]; };
   R1magic = derive2 { name="R1magic"; version="0.3.2"; sha256="1xfldr5y7pfdi6qljjvckknsv2wi9rnzwmqxkpgnyc96md2fvwjr"; depends=[]; };
   R2BayesX = derive2 { name="R2BayesX"; version="1.0-0"; sha256="1p60n14gaqciskzah5haskflpms1g5lh4n57653yysa7fvmfgdhw"; depends=[BayesXsrc colorspace mgcv]; };
@@ -1695,9 +1735,10 @@ in with self; {
   RAD = derive2 { name="RAD"; version="0.3"; sha256="0nmgsaykxavq2bskq5x0jvsxzsf4w2gqc0z80a59376li4vs9lpj"; depends=[MASS mvtnorm]; };
   RADami = derive2 { name="RADami"; version="1.0-3"; sha256="0rg07dsh2rlldajcj0gq5sgsl1i3qa28bsrmq88xcljg5hnr4iqn"; depends=[ape Biostrings geiger phangorn]; };
   RAHRS = derive2 { name="RAHRS"; version="1.0.2"; sha256="0s7vkmyc3yh62m2xbsvajgvi9xdw5x4irnp7rcllhqa7z9nj50c9"; depends=[pracma RSpincalc]; };
-  RAM = derive2 { name="RAM"; version="1.2.1"; sha256="11ymhx0nk113cy068s52hjj38y8glv8nh24yljqqvr1fd9fmy64g"; depends=[ade4 ape data_table FD ggmap ggplot2 gplots gridExtra Hmisc labdsv lattice MASS permute phangorn phytools plyr RColorBrewer reshape reshape2 RgoogleMaps scales vegan VennDiagram]; };
+  RAM = derive2 { name="RAM"; version="1.2.1.3"; sha256="1p6rqqbp5q3pqy9m6npml52nkfh8pd4kc245kb22qjslbvl3rrkn"; depends=[ade4 ape data_table FD ggmap ggplot2 gplots gridExtra labdsv lattice MASS permute phangorn phytools plyr RColorBrewer reshape reshape2 RgoogleMaps scales vegan VennDiagram]; };
   RAMP = derive2 { name="RAMP"; version="1.0"; sha256="18cz8gvb49j1hic71dzfcl17hz5gjdcabqvq84yr1h7iqkrq95cq"; depends=[]; };
   RAMpath = derive2 { name="RAMpath"; version="0.3.8"; sha256="1p1l6iirb314n5246kyyz0r3ja4v05xb5a6aq9k26wsb5m42x85k"; depends=[ellipse lavaan]; };
+  RANKS = derive2 { name="RANKS"; version="1.0"; sha256="1lvaya9jlqrr9klqznw4fz5h5x0sw191ci74hpymb4gzhhxcbp27"; depends=[graph limma NetPreProc PerfMeas RBGL]; };
   RANN = derive2 { name="RANN"; version="2.5"; sha256="007cgqg9bybg2zlljbv5m6cmlm3r6i251018rpgjcn0xnm9sjsj7"; depends=[]; };
   RANN_L1 = derive2 { name="RANN.L1"; version="2.5"; sha256="0sjf92hdw9jczvq1wl5syckhvik7wv0k9vrrgw4nnnsabc25v9pf"; depends=[]; };
   RAP = derive2 { name="RAP"; version="1.1"; sha256="18dclijs72p6gxawpg8hk7n512ah4by5jfg2jnrp8mz79ajmdgir"; depends=[]; };
@@ -1714,7 +1755,7 @@ in with self; {
   RCMIP5 = derive2 { name="RCMIP5"; version="1.1"; sha256="1aqcwxh2p4z7wn4p224xdiaharbr51rj51aa760rirs5s1ra7f6q"; depends=[abind digest dplyr reshape2]; };
   RCPmod = derive2 { name="RCPmod"; version="1.4"; sha256="1psn1w8ws0n96jqvd98l0wl0l46w0691c5vm9aarql2pqnc73lw9"; depends=[gtools numDeriv]; };
   RCassandra = derive2 { name="RCassandra"; version="0.1-3"; sha256="0xa241s81cyw6lfjb522f2mlyrd0gav9yz3z5jab9hpdpgg9ri38"; depends=[]; };
-  RCircos = derive2 { name="RCircos"; version="1.1.2"; sha256="0j7ww2djnhpra13vjr6y772sg64ikdmw1z68lpp9i7d0shlc3qx9"; depends=[]; };
+  RCircos = derive2 { name="RCircos"; version="1.1.3"; sha256="1kskjli7q4cmppm7cm5w2d8ad7h3crcpay1iayas5wkc03fga4gw"; depends=[]; };
   RClimMAWGEN = derive2 { name="RClimMAWGEN"; version="1.1"; sha256="0icy560llfd10mxlq0xmc6lbg6a030za9sygw1rpz8sk5j0lvb84"; depends=[climdex_pcic RMAWGEN]; };
   RClone = derive2 { name="RClone"; version="1.0"; sha256="0rbnac1xdpj6g8sq0dd6ja6mi5gl3nxjz3arnzmdwwh3qaqdx91i"; depends=[]; };
   RColorBrewer = derive2 { name="RColorBrewer"; version="1.1-2"; sha256="1pfcl8z1pnsssfaaz9dvdckyfnnc6rcq56dhislbf571hhg7isgk"; depends=[]; };
@@ -1724,7 +1765,7 @@ in with self; {
   RCurl = derive2 { name="RCurl"; version="1.95-4.7"; sha256="1qsxffqcb3lg3zkq6l1l78bm52szlk4d2y2bnmxn4lg0i4yxfx48"; depends=[bitops]; };
   RDIDQ = derive2 { name="RDIDQ"; version="1.0"; sha256="09gincmxv20srh4h82ld1ifwncaibic9b30i56zhy0w35353pxm2"; depends=[]; };
   RDML = derive2 { name="RDML"; version="0.9-1"; sha256="0ir8qp3k326gxy5f0hy144zi8xcgsk6svahz7lr5pjfj05czmxxm"; depends=[assertthat dplyr plyr R6 rlist tidyr XML]; };
-  RDS = derive2 { name="RDS"; version="0.7-3"; sha256="06zvk6hy4lq1rxfx3fl9wn3w3r7g3d6vr0ddpf5c26i790j5dg8n"; depends=[ggplot2 gridExtra igraph reshape2 scales]; };
+  RDS = derive2 { name="RDS"; version="0.7-4"; sha256="0vgpka1d05k2cymxwp3m3rlshn7lxgffd6j3xjjwxywnc7aq82qs"; depends=[ggplot2 gridExtra igraph reshape2 scales]; };
   RDSTK = derive2 { name="RDSTK"; version="1.1"; sha256="07vfhsyah8vpvgfxfnmp5py1pxf4vvfzy8jk7zp1x2gl6dz2g7hq"; depends=[plyr RCurl rjson]; };
   RDataCanvas = derive2 { name="RDataCanvas"; version="0.1"; sha256="1aw19lmdphxwva5cs3f4fb8hllirzfkk48nqdgrarz32l11y5z5j"; depends=[jsonlite]; };
   RDieHarder = derive2 { name="RDieHarder"; version="0.1.3"; sha256="0wls7b0qfbi6hsq9xdywi4mdhim5b6mrzhvyrm9dxp9z1k7imz6m"; depends=[]; };
@@ -1734,11 +1775,12 @@ in with self; {
   REDCapR = derive2 { name="REDCapR"; version="0.9.3"; sha256="0il1b1sc05kigl8937s853a73k54xdr16sr4g8c11qyv54iy8d9a"; depends=[httr plyr]; };
   REEMtree = derive2 { name="REEMtree"; version="0.90.3"; sha256="01sp36p12ky8vgsz6aik80w4abs70idr9sn4627lf94r92wwwsbc"; depends=[nlme rpart]; };
   REGENT = derive2 { name="REGENT"; version="1.0.6"; sha256="1f2sjqkhw3rbmwbcmx7l7imj696kblisi8y3fz77xygbcbxa6rmq"; depends=[]; };
-  REPPlab = derive2 { name="REPPlab"; version="0.9.2"; sha256="022mmrp1nwmkgqki18m3pzahafcmnzyj0h0bdpbd6p9q8k013ipa"; depends=[lattice LDRTools rJava]; };
+  REPPlab = derive2 { name="REPPlab"; version="0.9.3"; sha256="1ildcmqpjxbmrjjvgq0wyg8gj9a8fl54fyxbsbkfxfg6lyfknm2g"; depends=[lattice LDRTools rJava]; };
   REQS = derive2 { name="REQS"; version="0.8-12"; sha256="049glqhc8h8gf425kmj92jv70917dsigpm37diby0c6hb4jrg8ka"; depends=[gtools]; };
   RESS = derive2 { name="RESS"; version="1.3"; sha256="1vddmifp47ia0sk35rnjpvw6gr9ygygafqczq268h17i1qs6ar22"; depends=[]; };
   REST = derive2 { name="REST"; version="1.0.1"; sha256="16v89z7p9qkg7bsypf9vkrnbmb2n7gw3fqnfzbyxwj496wzxdv1x"; depends=[Rcmdr]; };
   REdaS = derive2 { name="REdaS"; version="0.9.3"; sha256="09mmcvzgsxvrcq7sq3pw81pxgb1493p8lx8p5hhz8i42vshza6pn"; depends=[]; };
+  REndo = derive2 { name="REndo"; version="1.0"; sha256="0mla336jj1c17b2jvi4a10pgk5zpdhiif5f1c70pdhzvisiagmng"; depends=[AER e1071 mvtnorm optimx]; };
   RFGLS = derive2 { name="RFGLS"; version="1.1"; sha256="13ggxj74h5b2hfhjyc50ndxznkvlg18j80m78hkzwh25d3948fsk"; depends=[bdsmatrix Matrix]; };
   RFLPtools = derive2 { name="RFLPtools"; version="1.6"; sha256="1hl2crg7jl266zac41xvx151h7kl52346wnlvd8hba64s4s4apay"; depends=[RColorBrewer]; };
   RFOC = derive2 { name="RFOC"; version="3.3-3"; sha256="101d7nf4zjni5kdk54w3afdaqnjzl7y90zygybkqpd0vi82q602b"; depends=[GEOmap MASS RPMG RSEIS splancs]; };
@@ -1748,7 +1790,7 @@ in with self; {
   RForcecom = derive2 { name="RForcecom"; version="0.8"; sha256="1w3m6rdmycrjhigs4h9bqy5xqsjwkz2cb1idch397iwxrjzsx1ph"; depends=[httr plyr RCurl XML]; };
   RFormatter = derive2 { name="RFormatter"; version="0.1.0"; sha256="01izxfnwhpy4wgp8ry0xasjjd63071gk1962dl2wzjycgcsig5p5"; depends=[formatR]; };
   RFreak = derive2 { name="RFreak"; version="0.3-0"; sha256="1dmllxb6yjkfkn34f07j2g7w5m63b5d10lh9xsmxyfk23b8l3x0x"; depends=[rJava]; };
-  RGA = derive2 { name="RGA"; version="0.3"; sha256="11hc24gwp1fdxl5b51qajczkijg8p0837vkharjlagaix958s6pb"; depends=[httr jsonlite]; };
+  RGA = derive2 { name="RGA"; version="0.3.2"; sha256="17yki9vfqmrb9pgnyzw1x81f6jzv53lq3z69324c04wd6507ykv0"; depends=[httr jsonlite lubridate plyr]; };
   RGCCA = derive2 { name="RGCCA"; version="2.0"; sha256="0mcp51z5jkn7yxmspp5cvmmvq0cwh7hj66g7wjmxsi74dwxcinvg"; depends=[MASS]; };
   RGENERATE = derive2 { name="RGENERATE"; version="1.3"; sha256="16gkdwbigdsdvnplqhzs11kk4dhb2rlnf7vj6kbzxw9fb1b7818q"; depends=[RMAWGEN]; };
   RGENERATEPREC = derive2 { name="RGENERATEPREC"; version="1.0"; sha256="1f6y3i8r6a9cajbj127s0cd13ihbi8scgrsgizza1fjb7fg2g450"; depends=[blockmatrix copula Matrix RGENERATE RMAWGEN stringr]; };
@@ -1767,12 +1809,13 @@ in with self; {
   RIGHT = derive2 { name="RIGHT"; version="0.2.0"; sha256="1mwm7l5l2hj67j03d895rx1181hax31a0nn3nq7rjcgpbljd2gjx"; depends=[ggplot2 plyr rjson shiny]; };
   RISmed = derive2 { name="RISmed"; version="2.1.5"; sha256="03c2b6iqq147kwrpx6wh440y1p2sy5c4i3v2yph99326pzxbyw7q"; depends=[]; };
   RImageJROI = derive2 { name="RImageJROI"; version="0.1.1"; sha256="0a4sa60klbpl31qxxvjjbksdhvs3vwm9na1v7014v93fzxy6bjas"; depends=[spatstat]; };
+  RImagePalette = derive2 { name="RImagePalette"; version="0.1.0"; sha256="1fzk5ias9sjlrmhgd29lmz6v3cqgcrwxynnm1znq2gx2hvnpllz2"; depends=[ggplot2]; };
   RImpala = derive2 { name="RImpala"; version="0.1.6"; sha256="03f4cq4bcrydpy78ypir7smj7abrcfynz0zzlgwgc60vh7vl79lz"; depends=[rJava]; };
   RInSp = derive2 { name="RInSp"; version="1.2"; sha256="0zg46qw44wx17ydcz592gl4k9qq08dycmsshxxqkjf92r3g3l6wm"; depends=[]; };
   RInside = derive2 { name="RInside"; version="0.2.13"; sha256="0cfhljdai9kkw5m01mjaya0s02g4g1cy1g4i0qpjkhgqyihsh7dy"; depends=[Rcpp]; };
   RItools = derive2 { name="RItools"; version="0.1-12"; sha256="0zdwj5y355d8jnwmjic3djwn6zy7h1iyl58j9hmnmc3m369cir0s"; depends=[abind lattice SparseM svd xtable]; };
   RJDBC = derive2 { name="RJDBC"; version="0.2-5"; sha256="0cdqil9g4w5mfpwq85pdq4vpd662nmw4hr7qkq6510gk4l375ab2"; depends=[DBI rJava]; };
-  RJSDMX = derive2 { name="RJSDMX"; version="1.4"; sha256="1g14nrjkspv3wyg9kc5bnn9zb37dw1z8y7mc4sxhacd1n2nxzb97"; depends=[rJava zoo]; };
+  RJSDMX = derive2 { name="RJSDMX"; version="1.5"; sha256="1dps81ni257j27dsfwpjz20r2q3q60myf29cdjphsmf7zwkrzpiz"; depends=[rJava zoo]; };
   RJSONIO = derive2 { name="RJSONIO"; version="1.3-0"; sha256="1dwgyiy19sixhy6yclqcaaxswbmpq7digyjjxhy1qv0wfsvk94qi"; depends=[]; };
   RJaCGH = derive2 { name="RJaCGH"; version="2.0.4"; sha256="1a8nd0w73dvxpamzi2addwr6q3rxhnnpa1girnlwbd1j1dll0bz6"; depends=[]; };
   RJafroc = derive2 { name="RJafroc"; version="0.1.1"; sha256="1630f8nmpid5pax8gqxych8bqf8a1avgrk7yqisk3lf1yx3h68rq"; depends=[ggplot2 shiny stringr xlsx]; };
@@ -1790,15 +1833,16 @@ in with self; {
   RMRAINGEN = derive2 { name="RMRAINGEN"; version="1.0"; sha256="175kd803a44yblq2jw5mrn2qv4piiy249577lf684bmmajf4ird4"; depends=[blockmatrix copula Matrix RGENERATE RMAWGEN]; };
   RMTstat = derive2 { name="RMTstat"; version="0.3"; sha256="1nn25q4kmh9kj975sxkrpa97vh5irqrlqhwsfinbck6h6ia4rsw1"; depends=[]; };
   RMallow = derive2 { name="RMallow"; version="1.0"; sha256="0prd5fc98mlxnwjhscmghw62jhq9rj5jk8qf4fnaa2a718yxf9b5"; depends=[combinat]; };
-  RMark = derive2 { name="RMark"; version="2.1.13"; sha256="04wrl4i3d6kwy4masqc17qab24jv8p3kbfcx2z5l11wyf84xaqgx"; depends=[coda matrixcalc msm snowfall]; };
+  RMark = derive2 { name="RMark"; version="2.1.14"; sha256="15j50i05y8zpdawpk0x7ndhxwfcmxk3xajhh6lxzf81q1zg92hvd"; depends=[coda matrixcalc msm snowfall]; };
+  RMixpanel = derive2 { name="RMixpanel"; version="0.1-2"; sha256="0c1hq2p6az04w49ysa2f61mjb32f3mg7082jm8dzqg204hf78id7"; depends=[digest jsonlite]; };
   RMongo = derive2 { name="RMongo"; version="0.0.25"; sha256="1anybw64bcipwsjc880ywzj0mxkgcj6q0aszdad6zd4zlbm444pc"; depends=[rJava]; };
   RMySQL = derive2 { name="RMySQL"; version="0.10.7"; sha256="0hxk9dh5xvki9cqnjmans65xxhms77xn6ckjh2hl5ls80swn2l1f"; depends=[DBI]; };
   RNCBIEUtilsLibs = derive2 { name="RNCBIEUtilsLibs"; version="0.9"; sha256="1h1ywx8wxy6n2rbpmjbqw4c0djz29pbncisd0mlbshj1fw226jba"; depends=[rJava]; };
   RNCEP = derive2 { name="RNCEP"; version="1.0.7"; sha256="0yvddsdpdrsg2dafmba081q4a34q15d7g2z5zr4qnzqb8wjwh6q2"; depends=[abind fields fossil maps RColorBrewer sp tgp]; };
   RND = derive2 { name="RND"; version="1.1"; sha256="1rbnjkfrsvm68xp90l4awixbvpid9nxnhg6i6fndpdmqwly2fwdp"; depends=[]; };
   RNaviCell = derive2 { name="RNaviCell"; version="0.2"; sha256="15k8hkagn5520fy7x672fy329s2v7l0x44s44f6v7ql9mmg4b635"; depends=[RCurl RJSONIO]; };
-  RNeXML = derive2 { name="RNeXML"; version="2.0.4"; sha256="14z0clf3kn31m7ivn71da9zgcyg5z5d54qzixi57z4ffy62c039r"; depends=[ape httr plyr reshape2 taxize uuid XML]; };
-  RNeo4j = derive2 { name="RNeo4j"; version="1.6.0"; sha256="1j4aijspilwr3gc8n4chygfn0v1rll4wjf7x4cdsmh9vvkzdvdi3"; depends=[httr RJSONIO rstudioapi]; };
+  RNeXML = derive2 { name="RNeXML"; version="2.0.5"; sha256="1zdj9a7zm5ck5s66c0lismzhff6lafglfz9li2mf76pgr41s4k1g"; depends=[ape dplyr httr lazyeval plyr reshape2 stringr taxize tidyr uuid XML]; };
+  RNeo4j = derive2 { name="RNeo4j"; version="1.6.1"; sha256="0ga4qq7gqwikhjg208dgql0ryh084jngbz3f6164g7ggmzc8m4if"; depends=[httr RJSONIO rstudioapi]; };
   RNetCDF = derive2 { name="RNetCDF"; version="1.7-3"; sha256="1blpwkmdi7scm876mvk9m23k4kfx83rc6hcy342236rbmxdzahhg"; depends=[]; };
   RNetLogo = derive2 { name="RNetLogo"; version="1.0-1"; sha256="051yx7l8qbnvb4gn67m00wnl6v0jrmavmp7n7zygjn7p1xi3w22c"; depends=[igraph rJava]; };
   RNiftyReg = derive2 { name="RNiftyReg"; version="2.1.0"; sha256="18zp2yjfmm06ph3ai65ng6q5j1c8g3r1q7s9m3fflzkq54qgs3gy"; depends=[ore Rcpp RcppEigen]; };
@@ -1809,6 +1853,7 @@ in with self; {
   ROCt = derive2 { name="ROCt"; version="0.8"; sha256="1k0571gq7igg56qxwf9ibk28v763ji0w9183gs6qp95lpbyp5zwr"; depends=[date relsurv survival]; };
   ROCwoGS = derive2 { name="ROCwoGS"; version="1.0"; sha256="029nramxwhzqim315g1vkg1zsszzkic28w6ahwg9n7bk9d08adzk"; depends=[]; };
   RODBC = derive2 { name="RODBC"; version="1.3-12"; sha256="042m7bwjhlzpq2hgzsq0zy4ri3s8ngw3w4qrqh1ag7fprpn55flj"; depends=[]; };
+  RODBCDBI = derive2 { name="RODBCDBI"; version="0.1"; sha256="008845kab70jvcp8mpkns8h24vhpkm0l6dxmip8cywh93qbygs23"; depends=[DBI RODBC]; };
   RODBCext = derive2 { name="RODBCext"; version="0.2.5"; sha256="18a0ajqrq3rcfcsyz0c9mwq6bi03prpg83z9jasbbc866gqs6fvq"; depends=[RODBC]; };
   RODM = derive2 { name="RODM"; version="1.1"; sha256="0cyi2y3lsw77gqxmawla5jlm4vnhsagh3ykdgb6izxslc4j2fszx"; depends=[RODBC]; };
   ROI = derive2 { name="ROI"; version="0.1-0"; sha256="01za8cxjf721m2lxnw352k8g32pglmllk50l7b8yhjwc49k8rl66"; depends=[registry slam]; };
@@ -1832,21 +1877,21 @@ in with self; {
   RPPanalyzer = derive2 { name="RPPanalyzer"; version="1.4.1"; sha256="1i9fcypi33qi7lz6rs1i5mvnbfma15jw6n5is03zdd1cjgrnss8r"; depends=[Biobase gam ggplot2 gplots Hmisc lattice limma quantreg]; };
   RPostgreSQL = derive2 { name="RPostgreSQL"; version="0.4"; sha256="0gpmbpiaiqvjzyl84l2l8v2jnz3h41v8jl99sp1qvvyrjrickra2"; depends=[DBI]; };
   RProtoBuf = derive2 { name="RProtoBuf"; version="0.4.3"; sha256="00sik2ri64bvvhrdpb91myrhzwwk3y67m214mi21q3b8710mmcaf"; depends=[Rcpp RCurl]; };
-  RPublica = derive2 { name="RPublica"; version="0.1.2"; sha256="1fawjkwfxx3z370132vsjjs3ls316gzxzlxp8b4vzrshx1p7vp3q"; depends=[httr jsonlite RCurl]; };
+  RPublica = derive2 { name="RPublica"; version="0.1.3"; sha256="1w2pn1g44a00ls8kkzj53a739pq6vzp38px2k0yh10rlzimmb21l"; depends=[curl httr jsonlite]; };
   RPushbullet = derive2 { name="RPushbullet"; version="0.2.0"; sha256="1h9yvw9kw7df0ijwhfc2bi29y61fl9zg3mp4xygx3fyr9mycjm7a"; depends=[RJSONIO]; };
   RQDA = derive2 { name="RQDA"; version="0.2-7"; sha256="05h2f5sk0a14bhzqng5xp87li24b6n11p5lcxf9xpy7sbmh5ig6g"; depends=[DBI gWidgets gWidgetsRGtk2 igraph RGtk2 RSQLite]; };
-  RQuantLib = derive2 { name="RQuantLib"; version="0.4.1"; sha256="0lpiadv4hppswb9npnf3si1pl3bhcp3qz8wxbqf8202p3hp5dsyz"; depends=[Rcpp]; };
+  RQuantLib = derive2 { name="RQuantLib"; version="0.4.2"; sha256="1sj77iw712jp3rcpmyw3b4x1sfsw7qmb56dbl13vwcxnh5jqs1is"; depends=[Rcpp]; };
   RRF = derive2 { name="RRF"; version="1.6"; sha256="1gp224mracrz53vnxwfvd7bln18v8x7w130wslhfgcdl0n4f2d28"; depends=[]; };
   RRNA = derive2 { name="RRNA"; version="1.0"; sha256="14rcqh95ygybci8hb8ays8ikb22g3850s9f3sgx3r4f0ky52dcba"; depends=[]; };
   RRTCS = derive2 { name="RRTCS"; version="0.0.3"; sha256="1riz1gjx3c0pf17xwybizb94nm5zgmfsnv6np3afvw831mb1x3l9"; depends=[sampling samplingVarEst]; };
-  RRreg = derive2 { name="RRreg"; version="0.5.0"; sha256="1ximzmajcz09k2xjnicklrvxs1ip15lvbdsfhamjb48p1p8rlmik"; depends=[doParallel foreach lme4]; };
+  RRreg = derive2 { name="RRreg"; version="0.6.0"; sha256="0wn6cgzf8q232svslhlndwk0i35hc4ghrm0niv85kagymnixipqj"; depends=[doParallel foreach lme4]; };
   RSA = derive2 { name="RSA"; version="0.9.8"; sha256="1pqblhimhj79ss8js0nf8w24ga2kdmgw64rh496iib36g27asn8n"; depends=[aplpack ggplot2 lattice lavaan plyr RColorBrewer tkrplot]; };
   RSADBE = derive2 { name="RSADBE"; version="1.0"; sha256="1nzpm88rrzavk0n8iflsx8r3s1xcry15n80zqdw6jijjycz10w1q"; depends=[]; };
   RSAGA = derive2 { name="RSAGA"; version="0.94-4"; sha256="10pcjnhsy635ify3dnwfzaigdpx48l06ba77maagjbvwzylrh3k6"; depends=[gstat plyr shapefiles]; };
   RSAP = derive2 { name="RSAP"; version="0.9"; sha256="1sxirfabhpmfm0yiiazc9h1db70hqwva2is1dql6sjfanpl8qanl"; depends=[reshape yaml]; };
   RSDA = derive2 { name="RSDA"; version="1.3"; sha256="0f2f6bn11p43sv8zmvqpf5w1rdisf7b2dvllhiy3pg9f6r1mc85k"; depends=[abind FactoMineR ggplot2 glmnet princurve RJSONIO scales scatterplot3d sqldf XML]; };
   RSEIS = derive2 { name="RSEIS"; version="3.5-2"; sha256="1mm4l6yymd564ahc189iaanw8j51jxdfpiif47zf4603irl1bglp"; depends=[RPMG Rwave]; };
-  RSGHB = derive2 { name="RSGHB"; version="1.1.1"; sha256="0mfxn59p1sd7id1jqw7xk040k6fa8awshfqxdhvka8b93qvwb8f1"; depends=[]; };
+  RSGHB = derive2 { name="RSGHB"; version="1.1.2"; sha256="0b2v17p3a3sy8jc4vy0nq65sdkxyf0b8sf5f78yvdcn5knydah6c"; depends=[]; };
   RSKC = derive2 { name="RSKC"; version="2.4.1"; sha256="1dvzxf001a9dg71l4bh8z3aia7mymqy800268qf7qzy9n6552g59"; depends=[flexclust]; };
   RSNNS = derive2 { name="RSNNS"; version="0.4-7"; sha256="15293a6lrihk407spv2ndpcf0r9xm5l8ggc1sagf5r2mvbfiv57c"; depends=[Rcpp]; };
   RSNPset = derive2 { name="RSNPset"; version="0.5"; sha256="0jkibpimh61n869r260qilkacq64awcjgpz46wvqadxw330a3p8c"; depends=[doRNG fastmatch foreach qvalue Rcpp RcppEigen]; };
@@ -1863,7 +1908,8 @@ in with self; {
   RSofia = derive2 { name="RSofia"; version="1.1"; sha256="0q931y9rcf6slb0s2lsxhgqrzy4yqwh8hb1124nxg0bjbxvjbihn"; depends=[Rcpp]; };
   RSpincalc = derive2 { name="RSpincalc"; version="1.0.2"; sha256="09fjwfz1bzpbca1bpzxj18ki8wh9mrr5h6k75sc97cyhlixqd37s"; depends=[]; };
   RStars = derive2 { name="RStars"; version="1.0"; sha256="1siwqm8sp8wqbb56961drkwcnkv3w1xiy81hxy0zcr2z7rscv7mh"; depends=[RCurl RJSONIO]; };
-  RStoolbox = derive2 { name="RStoolbox"; version="0.1.2"; sha256="0d7slihdvi02f8dfagvgd4flq6hy1578k8aq81v2s3qmzap90ap9"; depends=[caret codetools doParallel foreach geosphere ggplot2 plyr raster Rcpp RcppArmadillo reshape2 rgeos sp XML]; };
+  RStata = derive2 { name="RStata"; version="1.0.0"; sha256="07y9c1yk2kh37adsdn3vx2k8hqggffiipn5gl1qf6ai5ls5xmfg5"; depends=[foreign]; };
+  RStoolbox = derive2 { name="RStoolbox"; version="0.1.3"; sha256="0axvz3vby0mvrbzmmbvfb8a79sszaskmzxlfkpsb0sjpajby8vkn"; depends=[caret codetools doParallel foreach geosphere ggplot2 plyr raster Rcpp RcppArmadillo reshape2 rgeos sp XML]; };
   RStorm = derive2 { name="RStorm"; version="0.902"; sha256="1apk358jwzg5hkrcq8h39rax1prgz9bhkz9z51glmci88qrw1frv"; depends=[plyr]; };
   RSurveillance = derive2 { name="RSurveillance"; version="0.1.0"; sha256="1y17bfv0glzzb5rfniia0z4px810kgv2gns0igizw7w427zshnm0"; depends=[epiR epitools]; };
   RSurvey = derive2 { name="RSurvey"; version="0.8-3"; sha256="0dqrajd3m2v5cd3afl9lni9amfqfv4vhz7kakg3a5180j5rcag12"; depends=[MBA rgeos sp]; };
@@ -1889,7 +1935,7 @@ in with self; {
   RWekajars = derive2 { name="RWekajars"; version="3.7.12-1"; sha256="0a3a33l4rglyj95v6m3lqdz0c1fzriprdlp1p8cx2v06n50ymvrz"; depends=[rJava]; };
   RWiener = derive2 { name="RWiener"; version="1.2-0"; sha256="1ssh4xcyr4whgyd91p6bjsm9mq1ajqjqva0yyk13dnf5jfpsr0gs"; depends=[]; };
   RXKCD = derive2 { name="RXKCD"; version="1.7-5"; sha256="0dsds1bv2vfq61gfppar2ai23dryh09ric5i6zaccms6q64z23md"; depends=[jpeg plyr png RJSONIO]; };
-  RXMCDA = derive2 { name="RXMCDA"; version="1.5.3"; sha256="1pc52kvihxzq12p95r4srmnawxcsvd4r7252dajby338p56d1lw8"; depends=[kappalab XML]; };
+  RXMCDA = derive2 { name="RXMCDA"; version="1.5.5"; sha256="1ci73q8xf3xxqw8b7sk83v5vz2cqgcb4lkx7qi3hd1ff4xkz1fpa"; depends=[kappalab XML]; };
   RXshrink = derive2 { name="RXshrink"; version="1.0-8"; sha256="0l4aknr1vxrkxqsgkjcffs0731jskyzvl055a01vd8h4a0826n5s"; depends=[lars]; };
   RYoudaoTranslate = derive2 { name="RYoudaoTranslate"; version="1.0"; sha256="1i3iyqh97vpn02bm66kkmw52ni29js30v18n2aw8pvr88jpdgxm4"; depends=[RCurl rjson]; };
   RadOnc = derive2 { name="RadOnc"; version="1.1.0"; sha256="0gjrs78aaqbizzlcyjshc785ams3nclr503p4s2xsmd6sxj4khwi"; depends=[geometry oro_dicom ptinpoly rgl]; };
@@ -1898,8 +1944,8 @@ in with self; {
   Rambo = derive2 { name="Rambo"; version="1.1"; sha256="1yc04xsfkc54y19g5iwambgnlc49ixjjvfrafsgis2zh5w6rjwv8"; depends=[sna]; };
   Ramd = derive2 { name="Ramd"; version="0.2"; sha256="0a64rp4dwhfr6vxsmya16x7wy7rxj4n98sdhhyy0ll850rdzlxd8"; depends=[]; };
   RandVar = derive2 { name="RandVar"; version="0.9.2"; sha256="04hw4v2d9aa8z9f8wvwbzhbfy8zjl5q8mpl9b91q86fhh1yq5cz4"; depends=[distr distrEx]; };
-  RandomFields = derive2 { name="RandomFields"; version="3.1.3"; sha256="1dy9gb33kh2h9f56kfdfwpm2fnafd1qb6vvgxxg2kgvs5d996kny"; depends=[RandomFieldsUtils sp]; };
-  RandomFieldsUtils = derive2 { name="RandomFieldsUtils"; version="0.0.12"; sha256="0aka6np8far8vlxih5swdqz2vgxmfpf3swgnfbxbc9y3ampjflcx"; depends=[]; };
+  RandomFields = derive2 { name="RandomFields"; version="3.1.4"; sha256="0f7zidw1s7qd1zpan67l1hki1g094vkq2cxzanczl8dybfjv9g7g"; depends=[RandomFieldsUtils sp]; };
+  RandomFieldsUtils = derive2 { name="RandomFieldsUtils"; version="0.0.14"; sha256="1phnzmj9cbdaxp1v47irxk0c41fyh5qqs7m9y1gxvkpy2l8xkfr2"; depends=[]; };
   RankAggreg = derive2 { name="RankAggreg"; version="0.5"; sha256="1c5ckk2pfkdxs3l24wgai2xg817wv218fzp7w1r3rcshxf0dcz2i"; depends=[gtools]; };
   RankResponse = derive2 { name="RankResponse"; version="3.1.1"; sha256="04s588zbxcjgvpmbb2x46bbf5l15xm7pwiaxjgc1kn1pn6g1080c"; depends=[]; };
   Rankcluster = derive2 { name="Rankcluster"; version="0.92.9"; sha256="172jjsyc6a5y32s2fb8z6lgcq6rcwjbk3xnc5vvkhj64amlyxla6"; depends=[Rcpp RcppEigen]; };
@@ -1909,7 +1955,7 @@ in with self; {
   RateDistortion = derive2 { name="RateDistortion"; version="1.01"; sha256="1micjlbir1v5ar51g1x7bgkqw9m8217qi82ii6ysgjkhwdvpm075"; depends=[]; };
   RbioRXN = derive2 { name="RbioRXN"; version="1.5.1"; sha256="0lc43wm986y3xbdh1xihn7w583cql9kvj6rb018pn06ghz153i0d"; depends=[ChemmineR data_table fmcsR gdata KEGGREST plyr RCurl stringr]; };
   Rbitcoin = derive2 { name="Rbitcoin"; version="0.9.2"; sha256="0ndq4kg1jq6h0jxwhpdp8sw1n5shg53lwa1x0bi7rifmy0gnh66f"; depends=[data_table digest RCurl RJSONIO]; };
-  Rblpapi = derive2 { name="Rblpapi"; version="0.3.1"; sha256="06yd7la91j63izs1z9wskz3jm4ymfkqw5jh6ifscn7mvmw5mqj1b"; depends=[BH Rcpp]; };
+  Rblpapi = derive2 { name="Rblpapi"; version="0.3.2"; sha256="1a1w1mfs3nkjx3a0n1705w1znx88k0r8vv6dpg867zgd4mppdxfc"; depends=[BH Rcpp]; };
   Rborist = derive2 { name="Rborist"; version="0.1-0"; sha256="1irb9scl68m7skqdwny9kvnzg7f1r0q1c0whzqyhhj9l4lw16hmr"; depends=[Rcpp RcppArmadillo]; };
   Rcapture = derive2 { name="Rcapture"; version="1.4-2"; sha256="1nsxy5vpfv7fj03i6l5pgzjm0cldwqxxycnvqkfkshbryjcyl0ps"; depends=[]; };
   Rcell = derive2 { name="Rcell"; version="1.3-2"; sha256="1gfbwarbnv70sawaxv71har1m099icc2347wdvrz3hwmfgw6qm8n"; depends=[digest ggplot2 plyr proto reshape]; };
@@ -1924,13 +1970,13 @@ in with self; {
   RcmdrPlugin_DoE = derive2 { name="RcmdrPlugin.DoE"; version="0.12-3"; sha256="1iifn71kjjgcp7dfz2pjq57mgbv4rrznrl3b3k9gdc2dva1z9zvc"; depends=[DoE_base DoE_wrapper FrF2 Rcmdr RcmdrMisc relimp]; };
   RcmdrPlugin_EACSPIR = derive2 { name="RcmdrPlugin.EACSPIR"; version="0.2-2"; sha256="10r6rb0fwlilcnqxa38zh7yxc54x1a0by5x4f6gzdn9zs7aj5l1r"; depends=[abind ez nortest R2HTML Rcmdr RcmdrMisc reshape]; };
   RcmdrPlugin_EBM = derive2 { name="RcmdrPlugin.EBM"; version="1.0-10"; sha256="02zips1jbfn7cshjlrm1gr632px2zxlys8i0f1nrf1gifl44v1qw"; depends=[abind epiR Rcmdr]; };
-  RcmdrPlugin_EZR = derive2 { name="RcmdrPlugin.EZR"; version="1.30"; sha256="0af3cx0y4695ibrbz2yrgvy4zkdhqr4qv74smzin31gg2w2jav28"; depends=[Rcmdr]; };
+  RcmdrPlugin_EZR = derive2 { name="RcmdrPlugin.EZR"; version="1.31"; sha256="1czppk8wxf7hqm6f73zk4v9dyj3p2ch7ghdpkw4z7d727v240szq"; depends=[Rcmdr]; };
   RcmdrPlugin_EcoVirtual = derive2 { name="RcmdrPlugin.EcoVirtual"; version="0.1"; sha256="00yk09c1d1frwpfq12zvhg4gnc3p63r61abnil623jpr6wh4b2x8"; depends=[EcoVirtual Rcmdr]; };
   RcmdrPlugin_Export = derive2 { name="RcmdrPlugin.Export"; version="0.3-1"; sha256="17fn3si6b6h20c52k1k6fv9mslw3f9v0x1kxixzcvq54scdx0sk0"; depends=[Hmisc Rcmdr xtable]; };
   RcmdrPlugin_FactoMineR = derive2 { name="RcmdrPlugin.FactoMineR"; version="1.5-0"; sha256="1hfnn12l3jljqpczpxz4m9ywbmw5rc1c8dpfl4cabrxnh6ymnk1a"; depends=[FactoMineR Rcmdr]; };
   RcmdrPlugin_HH = derive2 { name="RcmdrPlugin.HH"; version="1.1-43"; sha256="0bn94wcrzvcrzhixh8kyg5gkax762mskhm2wvdfz1sm3n6fc7281"; depends=[HH lattice mgcv Rcmdr]; };
   RcmdrPlugin_IPSUR = derive2 { name="RcmdrPlugin.IPSUR"; version="0.2-1"; sha256="1lk7divj5va74prsnchq8yx9fbyym7xcsyqzkf72w448fgvvvwlv"; depends=[Rcmdr]; };
-  RcmdrPlugin_KMggplot2 = derive2 { name="RcmdrPlugin.KMggplot2"; version="0.2-0"; sha256="1w4n7r3sp6h87wxhrzg500w90p8dzr43j28p8p1r2y0v0i0v6mk5"; depends=[ggplot2 ggthemes gtable plyr Rcmdr RColorBrewer scales survival tcltk2]; };
+  RcmdrPlugin_KMggplot2 = derive2 { name="RcmdrPlugin.KMggplot2"; version="0.2-3"; sha256="1nkpj36mxqlfnxk7q023vbcm202kcjhba5jjccqkpikmggbqx9jz"; depends=[ggplot2 ggthemes plyr Rcmdr RColorBrewer scales survival tcltk2]; };
   RcmdrPlugin_MA = derive2 { name="RcmdrPlugin.MA"; version="0.0-2"; sha256="1zivlc0r2mkxpx23ba76njmb2wnnjijysvza4f24dg4l47d0sr2p"; depends=[MAd metafor Rcmdr]; };
   RcmdrPlugin_MPAStats = derive2 { name="RcmdrPlugin.MPAStats"; version="1.1.5"; sha256="0km6yglhn0128kk1xm2mnrkr2lkv3r9zndhlv7h1dkd16aph3vm3"; depends=[ordinal Rcmdr]; };
   RcmdrPlugin_NMBU = derive2 { name="RcmdrPlugin.NMBU"; version="1.8.3"; sha256="0iyy3kzczifz1ipp8sscaycxd2b2bs86sdmgz9w3gsxxqlrhkqh6"; depends=[MASS mixlm pls Rcmdr xtable]; };
@@ -1963,8 +2009,9 @@ in with self; {
   Rcpp11 = derive2 { name="Rcpp11"; version="3.1.2.0"; sha256="1x6n1z7kizagr5ymvbwqb7nyn3lca4d4m0ks33zhcn9gay6g0fac"; depends=[]; };
   RcppAPT = derive2 { name="RcppAPT"; version="0.0.1"; sha256="0fyya80bd3w22qbsbznj9y21dwlj30a16d8a8kww4x8bpvmyil5z"; depends=[Rcpp]; };
   RcppAnnoy = derive2 { name="RcppAnnoy"; version="0.0.7"; sha256="0lhpnlrgdki8ljswi4yr2pfsm5lqx7ckfb09zlsjdw0lkz0vdb49"; depends=[Rcpp]; };
-  RcppArmadillo = derive2 { name="RcppArmadillo"; version="0.6.200.2.0"; sha256="137wqqga776yj6synx5awhrzgkz7mmqnvgmggh9l4k6d99vwp9gj"; depends=[Rcpp]; };
+  RcppArmadillo = derive2 { name="RcppArmadillo"; version="0.6.400.2.2"; sha256="166qaz2a85l0jixzcp8j9h7h8rw76qmrnb04v82xr35agfi9cq9x"; depends=[Rcpp]; };
   RcppBDT = derive2 { name="RcppBDT"; version="0.2.3"; sha256="0gnj4gz754l80df7w3d5qn7a57z9kq494n00wp6f7vr8aqgq8wi1"; depends=[BH Rcpp]; };
+  RcppCCTZ = derive2 { name="RcppCCTZ"; version="0.0.2"; sha256="1rslxzkqq5a67b2aajk2zvklf44db06q8hflw2y7flp1xilw9kpq"; depends=[Rcpp]; };
   RcppCNPy = derive2 { name="RcppCNPy"; version="0.2.4"; sha256="1cawaxghbliy7hgvqz3y69asl43bl9mxf46nwpbxc0vx3cq15fnk"; depends=[Rcpp]; };
   RcppClassic = derive2 { name="RcppClassic"; version="0.9.6"; sha256="1xhjama6f1iy7nagnx1y1pkqffrq8iyplllcar24vxr0zirgi1xi"; depends=[Rcpp]; };
   RcppClassicExamples = derive2 { name="RcppClassicExamples"; version="0.1.1"; sha256="0shs12y3gj5p7gharjik48dqk0fy4k2jx7h22ppvgbs8z85qjrb8"; depends=[Rcpp RcppClassic]; };
@@ -1983,7 +2030,7 @@ in with self; {
   RcppSMC = derive2 { name="RcppSMC"; version="0.1.4"; sha256="1gcqffb6rkw029cpzv7bzsxaq0a5b032zjvriw6yjzyrpi944ip7"; depends=[Rcpp]; };
   RcppShark = derive2 { name="RcppShark"; version="0.1"; sha256="04l70d51ww247q0irk6jyhy3csybb8bhrw9cidinb0b18dcqmbyq"; depends=[BH checkmate Rcpp]; };
   RcppStreams = derive2 { name="RcppStreams"; version="0.1.0"; sha256="0pb9ri2jajfh7643wx730bkmpvjvvmip682ynm2yn6x6brjll6jf"; depends=[BH Rcpp]; };
-  RcppTOML = derive2 { name="RcppTOML"; version="0.0.4"; sha256="0ipfbcp55ghmh8i80vyq0w2js07360wiq3z11qpkb816ln1gqb89"; depends=[Rcpp]; };
+  RcppTOML = derive2 { name="RcppTOML"; version="0.0.5"; sha256="0c4595ps1wawdx5f1ipsa4rg307rp4f0fivpl4qa1qhps6hn9h0f"; depends=[Rcpp]; };
   RcppXts = derive2 { name="RcppXts"; version="0.0.4"; sha256="143rhz97qh8sbr6p2fqzxz4cgigwprbqrizxpkjxyhq8347g8p4i"; depends=[Rcpp xts]; };
   RcppZiggurat = derive2 { name="RcppZiggurat"; version="0.1.3"; sha256="0s82haf96krr356lcf978f229np6w0aihm2qxcnlm0w3i02gzh3x"; depends=[Rcpp RcppGSL]; };
   Rcsdp = derive2 { name="Rcsdp"; version="0.1.53"; sha256="0x91hyx6z9f4zd7djxlq7dnznmr9skyzwbbcbjyid9hxbcfyvhcp"; depends=[]; };
@@ -1997,9 +2044,9 @@ in with self; {
   RealVAMS = derive2 { name="RealVAMS"; version="0.3-2"; sha256="0rmqy3csgfvq5c3sawvd3v37is8v5nnnrhifschqfsycmadf1gdp"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; };
   RecordLinkage = derive2 { name="RecordLinkage"; version="0.4-8"; sha256="0wjjrgmz7m11hhsw7dcg3745255xckdgrqp3xlqkyh2kzbyr9rp4"; depends=[ada data_table DBI e1071 evd ff ffbase ipred nnet rpart RSQLite xtable]; };
   Records = derive2 { name="Records"; version="1.0"; sha256="08y1g2m6bdrvv4rpkhd5v2lh7vprxy9bcx9ahp1f7p062bn2lwji"; depends=[]; };
-  RedditExtractoR = derive2 { name="RedditExtractoR"; version="2.0.1"; sha256="0a3hzj13jvwb8wy8mxbcg4q8fviv6d1jb8b0ky8xqbms3nfnirj1"; depends=[igraph RJSONIO]; };
+  RedditExtractoR = derive2 { name="RedditExtractoR"; version="2.0.2"; sha256="1113dm41rhyimn7jc3pkrdqz3biqg5m174vz24jchhmn9n38zsss"; depends=[igraph RJSONIO]; };
   RefFreeEWAS = derive2 { name="RefFreeEWAS"; version="1.3"; sha256="1cb1q2nki0d18ia4cmi1sp7qih9hv7g1jk1kyp7vya5gp572z3cd"; depends=[isva]; };
-  RefManageR = derive2 { name="RefManageR"; version="0.8.63"; sha256="17gmdyaqg8swfhpa1n8h1rj7aamrgdcprf56vx643ivhih8kgdj4"; depends=[bibtex lubridate plyr RCurl RJSONIO stringr XML]; };
+  RefManageR = derive2 { name="RefManageR"; version="0.10.5"; sha256="135545w8bzjw1ja0qx4dglra1p974frqcriqilby2hmix64bxwvy"; depends=[bibtex lubridate plyr RCurl RJSONIO stringr XML]; };
   RegClust = derive2 { name="RegClust"; version="1.0"; sha256="1d9w74phw4fgafglc18j7dpmln96fvxnf1kdc9zddgj90p8yfx63"; depends=[]; };
   RegressionFactory = derive2 { name="RegressionFactory"; version="0.7.1"; sha256="1zx885x49ncp2cl1v8hxzc3r2njka9cjsadjykbvqp9pdbm4ga5l"; depends=[]; };
   RelValAnalysis = derive2 { name="RelValAnalysis"; version="1.0"; sha256="1jl1gfj44gfkmc1yp6g5wwn4miydwpvxwrg76rnkv9454zrc5pvp"; depends=[zoo]; };
@@ -2010,6 +2057,7 @@ in with self; {
   RenextGUI = derive2 { name="RenextGUI"; version="1.3-0"; sha256="0ydq57k5va1l10dxyh4hvk3r6d0wncqx9ncj5bkc5691lamqjmj4"; depends=[gWidgets gWidgetstcltk Renext]; };
   Reol = derive2 { name="Reol"; version="1.55"; sha256="0147x3fvafc47zd2chgv3b40k480pcjpji8vm1d741i1p6ml448p"; depends=[ape RCurl XML]; };
   ReorderCluster = derive2 { name="ReorderCluster"; version="1.0"; sha256="0ss750frzvj0bm1w7zblmcsjpszhnbffwlkaw31sm003lbx9hy58"; depends=[gplots Rcpp]; };
+  RepeatABEL = derive2 { name="RepeatABEL"; version="1.0"; sha256="0qd6ijqfm32h87hncndv2n47rmn16gnbnkr0dg89h96xc3miyn2p"; depends=[GenABEL hglm]; };
   RepeatedHighDim = derive2 { name="RepeatedHighDim"; version="2.0.0"; sha256="1n9w4jb25pm0mmsahlfhkp9jmhgp5b21l1g85gm2wbxqkjsg7g0g"; depends=[MASS nlme]; };
   ReporteRs = derive2 { name="ReporteRs"; version="0.8.2"; sha256="1widvbfwqvzcjyk746ybz921yifnn1q3ybi3ijy31mixqgm9m9ka"; depends=[ReporteRsjars rJava]; };
   ReporteRsjars = derive2 { name="ReporteRsjars"; version="0.0.2"; sha256="1abvgzxipg0cgiy26z14i99qydzqva6j2v7pnrxapysg7ml5cnjc"; depends=[rJava]; };
@@ -2030,8 +2078,9 @@ in with self; {
   Ritc = derive2 { name="Ritc"; version="1.0.1"; sha256="1h41s4jihzj0yj8xyan0zhhyyiq8m5567vw4gvmmr81p1qfzvva8"; depends=[minpack_lm]; };
   Rivivc = derive2 { name="Rivivc"; version="0.9"; sha256="0gl3040pp9nqm4g2ympnx80z64zfnn1hfsxka8ynd2cqhjn3b5i1"; depends=[signal]; };
   Rjpstatdb = derive2 { name="Rjpstatdb"; version="0.1"; sha256="0iwgsp3mblp7bsx88wfpqn09y1xrkingfkm3z9jsi2bwrnrjc2iv"; depends=[RCurl XML]; };
+  Rknots = derive2 { name="Rknots"; version="1.3.1"; sha256="0yv8k85jzviz3gafbwggn1y4vlcjnfdiyf93gi6yvygdnsnrq310"; depends=[bio3d rgl rSymPy]; };
   Rlab = derive2 { name="Rlab"; version="2.15.1"; sha256="1pb0pj84i1s4ckdmcglqxa8brhjha4y4rfm9x0na15n7d9lzi9ag"; depends=[]; };
-  Rlabkey = derive2 { name="Rlabkey"; version="2.1.128"; sha256="1gs1xsz7w9acgjcr29wi04k1izm0ncr28i693rcbnbvncif3afmc"; depends=[RCurl rjson]; };
+  Rlabkey = derive2 { name="Rlabkey"; version="2.1.129"; sha256="188h3j9hlx6ls0rs0f5n05l8d8l556dp49b93c77nw6bp7n4745l"; depends=[RCurl rjson]; };
   Rlibeemd = derive2 { name="Rlibeemd"; version="1.3.6"; sha256="1ryjy9cxc6jw3xf5r1y8sa6b7yvc8mqpy0rw1zn00fmlf1m3ak34"; depends=[Rcpp]; };
   Rlinkedin = derive2 { name="Rlinkedin"; version="0.1"; sha256="0w30zv4a842vckk4yqsh8hhkdz2gy650a0x29aacp77p9y79g9yn"; depends=[httpuv httr XML]; };
   Rlof = derive2 { name="Rlof"; version="1.1.1"; sha256="1px6ax2mr2agbhv41akccrjdrvp8a9lmhymp0cn8fjrib0ig8vql"; depends=[doParallel foreach]; };
@@ -2041,7 +2090,7 @@ in with self; {
   RmixmodCombi = derive2 { name="RmixmodCombi"; version="1.0"; sha256="0cwcyclq143938wby0aj265xyib6gbca1br3x09ijliaj3pjgdqi"; depends=[Rcpp Rmixmod]; };
   Rmonkey = derive2 { name="Rmonkey"; version="0.2.11"; sha256="0dfn38ni06k0q7a10ilb3169ffc71mizf25jfiqmbmqw08az8bhf"; depends=[httr jsonlite plyr RCurl]; };
   Rmosek = derive2 { name="Rmosek"; version="1.2.5.1"; sha256="0zggv699s93i9g98qjs4ci2nprgfkzq45lpzgrbhldsxiflf27gz"; depends=[Matrix]; };
-  Rmpfr = derive2 { name="Rmpfr"; version="0.5-7"; sha256="0bqjs65wlnpq95smnnwpqjrqgwda412z2qbyafa8jw6972lmsyq9"; depends=[gmp]; };
+  Rmpfr = derive2 { name="Rmpfr"; version="0.6-0"; sha256="06i5jzsddvync284ql16vlk439jp7la6n6yfgyxpck818hidz8a3"; depends=[gmp]; };
   Rmpi = derive2 { name="Rmpi"; version="0.6-5"; sha256="0i9z3c45jyxy86yh3f2nja5miv5dbnipm7fpm751i7qh630acykc"; depends=[]; };
   RnavGraph = derive2 { name="RnavGraph"; version="0.1.8"; sha256="1fwzfy41gdr1aw1wg6dw04mxwwpp5s9x2inxyq3bc9s8bm1rlxih"; depends=[graph rgl scagnostics]; };
   RnavGraphImageData = derive2 { name="RnavGraphImageData"; version="0.0.3"; sha256="1mrh0p2ckczw4xr1kfmcf0ri2h2fhp7fmf8sn2h1capmm12i1q8f"; depends=[]; };
@@ -2051,7 +2100,7 @@ in with self; {
   RobPer = derive2 { name="RobPer"; version="1.2.1"; sha256="1impcp2yfxxh439a70s2gqwfng6cgi123y20fd01b84jkp9gx3hi"; depends=[BB quantreg rgenoud robustbase]; };
   RobRSVD = derive2 { name="RobRSVD"; version="1.0"; sha256="07z5fw8j5lq7nyxgkvb9i4iwb5inddz2ib4m2bjx6q4c1ricpqz9"; depends=[]; };
   RobRex = derive2 { name="RobRex"; version="0.9"; sha256="0ii539mjq462n1lbnyv3whl8b1agvhvlz31wwyz911gb40isl639"; depends=[ROptRegTS]; };
-  RobustAFT = derive2 { name="RobustAFT"; version="1.3"; sha256="0cxyvq75bwhjh3qzfj6ynmy8mby6yjy4r851sx80b8ls6rv4cf3z"; depends=[robustbase survival]; };
+  RobustAFT = derive2 { name="RobustAFT"; version="1.4-1"; sha256="180gmlinrpnk4ghl1xickbjkdqr7vb6qzmy6701xpji5k8g9il60"; depends=[robustbase survival]; };
   RobustEM = derive2 { name="RobustEM"; version="1.0"; sha256="1li9r3bk7zhpxljgqvr2zila8nb05nasvlzqlswwgi9443i740zi"; depends=[doParallel e1071 ellipse foreach ggplot2 mvtnorm]; };
   RobustRankAggreg = derive2 { name="RobustRankAggreg"; version="1.1"; sha256="1pslqyr1lji1zvcrwyax4zg2s81p1jnhfldz8mdfhsp5y7v8iar3"; depends=[]; };
   RockFab = derive2 { name="RockFab"; version="1.2"; sha256="1b5mhfll5vmqwl4pblmclyx9604vn07jyza02rm0jcsx915ms8sc"; depends=[EBImage rgl]; };
@@ -2070,8 +2119,8 @@ in with self; {
   Rsampletrees = derive2 { name="Rsampletrees"; version="0.1"; sha256="02wh99nxlhyrivr655825nqcl3w0mvppnmvc9yrkdbkjw0l1zsjd"; depends=[ape haplo_stats]; };
   Rserve = derive2 { name="Rserve"; version="1.7-3"; sha256="09rha4p86vak7ss721mwp5bm5ig09xam8zlqv63n9wf36v3kdmpn"; depends=[]; };
   RsimMosaic = derive2 { name="RsimMosaic"; version="1.0.2"; sha256="0d5z5dffi2prz0r31x08c8gw83448bhkma5mzcmrdlg6kx5y7dp8"; depends=[fields jpeg RANN]; };
-  Rsolnp = derive2 { name="Rsolnp"; version="1.15"; sha256="10w9gd1l62r638sh00fbgcpinsyyanfrqjdskrpk7z70fnyvwqm2"; depends=[truncnorm]; };
-  Rsomoclu = derive2 { name="Rsomoclu"; version="1.5"; sha256="1hv877nm1xin9llykl2di7hrv1nlzi87qmh69mqsnd3vidq57xdv"; depends=[Rcpp]; };
+  Rsolnp = derive2 { name="Rsolnp"; version="1.16"; sha256="0w7nkj6igr0gi7r7jg950lsx7dj6aipgxi6vbjsf5f5yc9h7fhii"; depends=[truncnorm]; };
+  Rsomoclu = derive2 { name="Rsomoclu"; version="1.5.0.1"; sha256="0py7r837qww60c5ndh72nsj61xdq75mxbh5g3cabyqymvb596y2n"; depends=[Rcpp]; };
   Rssa = derive2 { name="Rssa"; version="0.13-1"; sha256="1v2gvk7pnzf2s2z0y7shjf0mz558lb6ian7vljkjcag06pyygmvi"; depends=[forecast lattice svd]; };
   Rsundials = derive2 { name="Rsundials"; version="1.6"; sha256="0vrvxsznbclgls4jljc59lyli6cw9k1a3wapfrs6xbkqi8865iif"; depends=[]; };
   Rsurrogate = derive2 { name="Rsurrogate"; version="1.0"; sha256="0s7f86cf2b3mwzwpfpl8cd1g41c8g5hzkykj9qigy1grnf37crvf"; depends=[]; };
@@ -2084,7 +2133,7 @@ in with self; {
   Runiversal = derive2 { name="Runiversal"; version="1.0.2"; sha256="0667mspsjydmxi848c6wsf14gz72bmdj9b3lilma92b7fhqnv7ai"; depends=[]; };
   Runuran = derive2 { name="Runuran"; version="0.23.0"; sha256="1qkml3n0h1z59085spla0ry1wl42c1ljg9nh2sxv6mnhxygm6aq1"; depends=[]; };
   RunuranGUI = derive2 { name="RunuranGUI"; version="0.1"; sha256="0wm91mzgd01qjinj94fr53m0gkxjvx7yjhmwbkrxsjn6mjklq72l"; depends=[cairoDevice gWidgets gWidgetsRGtk2 Runuran rvgtest]; };
-  Rvcg = derive2 { name="Rvcg"; version="0.12.2"; sha256="15lj2ba9fwzbqzwwl7wpzij1n983qxmql2fwxjcapkl76hl68kp9"; depends=[Rcpp RcppEigen]; };
+  Rvcg = derive2 { name="Rvcg"; version="0.13.1.1"; sha256="08a78w9pvnypz9g63jz3d12z4fbdzjfr3xyis3fq31xn4jfdxa1g"; depends=[Rcpp RcppEigen]; };
   Rvmmin = derive2 { name="Rvmmin"; version="2013-11.12"; sha256="1ljzydvizbbv0jv5lbfinypkixfy7zsvplisb866f8w45amd152a"; depends=[optextras]; };
   Rwave = derive2 { name="Rwave"; version="2.4"; sha256="1ynj6higx0j6iv033lx8h3i9hlg5b53nl2gv6fwjny4ygm8b1mjm"; depends=[]; };
   Rwinsteps = derive2 { name="Rwinsteps"; version="1.0-1"; sha256="0kzngkan9vydibnr3xm4pyz4v6kz0r4h19f0ngqpri07fkhdsxzd"; depends=[]; };
@@ -2093,11 +2142,11 @@ in with self; {
   RxnSim = derive2 { name="RxnSim"; version="1.0.1"; sha256="17agz3kw7pj4mpl25y1n8l9lqfj63wn70rqpdkcpnx7j6s6933vx"; depends=[data_table fingerprint rcdk rJava]; };
   Ryacas = derive2 { name="Ryacas"; version="0.2-12.1"; sha256="18dpnr6kj0a8f2jcbj9f6ahd0mg7bm1qm8dcs1wh8kmjl3klr1y8"; depends=[XML]; };
   Rz = derive2 { name="Rz"; version="0.9-1"; sha256="1cpsmfxijrfx06ydpjzbaak7gkad4jjk1ph9453l9zly1cwzgspj"; depends=[foreign formatR ggplot2 memisc psych RGtk2]; };
-  SACCR = derive2 { name="SACCR"; version="1.0"; sha256="0shhg4ivrr1lfq8dp0yivhnr1x0syrnqiiqmd7zcxrlb78nb38sa"; depends=[]; };
+  SACCR = derive2 { name="SACCR"; version="1.1"; sha256="0ynsspnx7i0n23bmqx207mxia1mwpwvl8zklqjdbmhvv5dg2jwzv"; depends=[]; };
   SACOBRA = derive2 { name="SACOBRA"; version="0.7"; sha256="12aj4ghs3i3ks749z0l95ipv8gi33xgggkyjf21zvnzmb1dgphys"; depends=[testit]; };
   SAENET = derive2 { name="SAENET"; version="1.1"; sha256="13mfmmjqbkdr6j48smdlqvb83dkb34kx3i16gx0gmmafk3avdaxx"; depends=[autoencoder neuralnet]; };
-  SAFD = derive2 { name="SAFD"; version="1.0"; sha256="1mq9ncvgw4lpr2ixram9ds9pjcvmg6vbm31cscyqzky9q8bpyv9f"; depends=[]; };
-  SAGA = derive2 { name="SAGA"; version="1.0"; sha256="1yd7q48mbj6mxr7vf79xlss9jv0qhgxkys9ffvfcqqaxzmsb7b0q"; depends=[plotrix]; };
+  SAFD = derive2 { name="SAFD"; version="1.0-1"; sha256="1h9hw66irq2c1ciz502r5h8h9hx32jwhrp9dwl91qlknlj6s1bxr"; depends=[]; };
+  SAGA = derive2 { name="SAGA"; version="2.0.0"; sha256="022q8hagc38mfakh02cyvf49as2rps1my9iy2xcg8qhrr2czzmy8"; depends=[plotrix viridis]; };
   SALTSampler = derive2 { name="SALTSampler"; version="0.1"; sha256="1ys88fgsx92b50x5y8xb0gp03spj0d29nqgw91yl95qwkg0d6bsg"; depends=[lattice]; };
   SAM = derive2 { name="SAM"; version="1.0.5"; sha256="1fki43bp6kan6ls2rd6vrp1mcwvz92wzcr7x6sjirbmr03smcypr"; depends=[]; };
   SAMUR = derive2 { name="SAMUR"; version="0.6"; sha256="0iyv7ljjrgakgdmpylcxk3m3xbm2xwc6lbjvl7sk1pmxvpx3hhhc"; depends=[Matching]; };
@@ -2130,14 +2179,14 @@ in with self; {
   SEERaBomb = derive2 { name="SEERaBomb"; version="2015.2"; sha256="1pm49icslhwd6j4xn6y9m7y7prjyn64bfvl5c12r2jkvq05sd6v8"; depends=[DBI dplyr ggplot2 LaF mgcv plyr Rcpp reshape2 rgl RSQLite scales XLConnect]; };
   SEHmodel = derive2 { name="SEHmodel"; version="0.0.10"; sha256="0g6yzg1b4j5wy3fg4hhcrbcsrw86qaayalhxjv7m2jx6141f8cny"; depends=[deldir fftwtools fields MASS mvtnorm pracma raster rgdal rgeos sp]; };
   SEL = derive2 { name="SEL"; version="1.0-2"; sha256="1nrk0fx6ff330abq8askvp0790xnfv00m3sraqcr32hciw6ks421"; depends=[lattice quadprog]; };
-  SEMID = derive2 { name="SEMID"; version="0.1"; sha256="1bxdjdyqlvxz339jdgw90qi6kvfhjdmga38vhfl3ldlxfv2s9gfk"; depends=[igraph]; };
+  SEMID = derive2 { name="SEMID"; version="0.2"; sha256="1897yjshcbidnrhr575sicsmhzyhjbagv0dp9g3nsv78syb6dr2p"; depends=[igraph]; };
   SEMModComp = derive2 { name="SEMModComp"; version="1.0"; sha256="1za67470f13z8jsy3z588c7iiiz993d3vjqrb8v9fann2r6sf1md"; depends=[mvtnorm]; };
   SETPath = derive2 { name="SETPath"; version="1.0"; sha256="1dpgmki0dhph13h1fd3mbf308746wccgfz5g5gdm7bwbjnmjzd98"; depends=[]; };
   SEchart = derive2 { name="SEchart"; version="0.1"; sha256="19gqcd6xzwg37nzc67p88ip4i0v2f59ds85xfw9qq8lybvdm76k2"; depends=[JM]; };
   SGCS = derive2 { name="SGCS"; version="2.3"; sha256="1c917g03s50mp96lqhkjagsd2cq9rjbprlwf3h409dj59g6k2zx6"; depends=[spatstat]; };
   SGL = derive2 { name="SGL"; version="1.1"; sha256="1wc430jqn3li102zpfmyyavfbab7x7ww9p89clxsndyigrrbjdr7"; depends=[]; };
   SGP = derive2 { name="SGP"; version="1.2-0.0"; sha256="0v4ljhvfrvl6izprcrw8w36474fjz0v1kpcsg0sx32359amd3zxz"; depends=[Cairo colorspace data_table doParallel foreach gridBase iterators jsonlite plyr quantreg reshape2 RSQLite sn]; };
-  SGPdata = derive2 { name="SGPdata"; version="8.0-0.0"; sha256="0g25s2wcj47394fm16maygafnynizma3mgb3r65b5p9c27swk4v8"; depends=[]; };
+  SGPdata = derive2 { name="SGPdata"; version="12.0-0.0"; sha256="10d5ci3icc07lj1shgs72z8amgyx0d8g67bx73nbb7g0pfx2wqdn"; depends=[]; };
   SHELF = derive2 { name="SHELF"; version="1.0.1"; sha256="0nk63nrj0x1nlbwy885wmsipjcvhs8vqldlc33j4j8k49bkih7sz"; depends=[shiny]; };
   SHIP = derive2 { name="SHIP"; version="1.0.2"; sha256="0b83cclibdz1r7sz968nmca4najwgps9wrdlsh4gxrl7fq40k4ln"; depends=[]; };
   SIBER = derive2 { name="SIBER"; version="2.0"; sha256="0k0hcl7nh0csdw33azz23xa57chif39z4snz8s46lkc0cvykvqww"; depends=[hdrcde mnormt rjags]; };
@@ -2187,7 +2236,7 @@ in with self; {
   SPREDA = derive2 { name="SPREDA"; version="1.0"; sha256="1dyqsra899fd1nbk1b7vkw8gs455c6pbcvzw84q9iri77186xqhv"; depends=[nlme survival]; };
   SPRT = derive2 { name="SPRT"; version="1.0"; sha256="1r4pfqh8k5avi8qgpk5x1cy8lmkn341yvjvd2r7wqwb3mr242r0v"; depends=[]; };
   SPSL = derive2 { name="SPSL"; version="0.1-8"; sha256="1jg1nfhz8qml1wwqa4d0w7vkdmbgdy5xlfqx0h2pdw2z8iij3xxc"; depends=[]; };
-  SPmlficmcm = derive2 { name="SPmlficmcm"; version="1.3"; sha256="0igybzc6fx6yd8xq06909vml4zwwzm4sl5xpds1292lgv3y3zdgb"; depends=[nleqslv]; };
+  SPmlficmcm = derive2 { name="SPmlficmcm"; version="1.4"; sha256="1acs3560a7h6xx286m40abr9b7i5qihn6wni8flj0biahmsszzx6"; depends=[nleqslv]; };
   SQDA = derive2 { name="SQDA"; version="1.0"; sha256="0nfimk625wb64010r5r7hzr64jfwgc6rbn13wvrpn0jgayji87h6"; depends=[limma mvtnorm PDSCE]; };
   SQN = derive2 { name="SQN"; version="1.0.5"; sha256="0kb8kf6g482zqdp4avwvhs3pqghfny757dbzfl1abaigmvwvx4qj"; depends=[mclust nor1mix]; };
   SQUAREM = derive2 { name="SQUAREM"; version="2014.8-1"; sha256="17fn37da4zslbfq5h4f3dfwyw1dxj5y2rgly3vjl2c4k5bnwxxqw"; depends=[]; };
@@ -2217,7 +2266,7 @@ in with self; {
   SamplerCompare = derive2 { name="SamplerCompare"; version="1.2.7"; sha256="149ipraps9dngmvpy5w5q9a1zgnwqblhawrk6184g52ij33jv4ji"; depends=[mvtnorm]; };
   SamplingStrata = derive2 { name="SamplingStrata"; version="1.0-4"; sha256="007vrl8j0g8qy4qds29rzm5v5rgz076kkrwajpz5zxqy137c71jq"; depends=[]; };
   Scale = derive2 { name="Scale"; version="1.0.4"; sha256="1fa3840kji34qpbw6mxfavk8wq0vq0vx2w6ya71idbkxnvwc3y06"; depends=[Hmisc MASS psych]; };
-  SchemaOnRead = derive2 { name="SchemaOnRead"; version="1.0.1"; sha256="1n6ygwfmss0bwqbi41mzkvgwzzfw45ql64hbkbnqdn9nfb3nk4ys"; depends=[caTools foreign ncdf network readbitmap readODS readstata13 tiff XLConnect XLConnectJars XML]; };
+  SchemaOnRead = derive2 { name="SchemaOnRead"; version="1.0.2"; sha256="0xa53mqmv31gid6n82bnfmds6p8nkjlmkj15hyycxhja2j752knm"; depends=[caTools foreign haven ncdf4 network readbitmap readODS readxl tiff xml2]; };
   SciViews = derive2 { name="SciViews"; version="0.9-5"; sha256="199waafpn0ndg7szwfhw2jlgcx1f0pv7j0vix2vzz60knwm698xb"; depends=[ellipse MASS]; };
   SciencesPo = derive2 { name="SciencesPo"; version="1.3.8"; sha256="1g9mvkg2080hnv7im2zvq1p7995zhyan6ql6c6fg47y5v9z8q4ds"; depends=[coda data_table ggplot2 gridExtra magrittr RSQLite scales stringr zoo]; };
   ScoreGGUM = derive2 { name="ScoreGGUM"; version="1.0"; sha256="0f7sjfr3a8b8y1n9lrwyiyyljls3rbz84d9s93psi2fnmjj0kvgw"; depends=[]; };
@@ -2230,11 +2279,11 @@ in with self; {
   Sejong = derive2 { name="Sejong"; version="0.01"; sha256="1d9gw42dbs74w7xi8r9bs6dhl23y16yxqzyhqqayvcm98q3l77nf"; depends=[]; };
   SeleMix = derive2 { name="SeleMix"; version="0.9.1"; sha256="04gxgja35qs4k66iil014dzgl5bkx0qhr9w4v7qpmwv2bb07jwz3"; depends=[Ecdat mvtnorm xtable]; };
   SelvarMix = derive2 { name="SelvarMix"; version="1.1"; sha256="0rn6ahqg3yriaf32rn07mdd5aqyqb35xv7v4ydc7q1ym1wmc9zla"; depends=[glasso Rcpp RcppArmadillo Rmixmod]; };
-  SemiCompRisks = derive2 { name="SemiCompRisks"; version="2.2"; sha256="03k5vs3p8x28s5nv3hnf7ba5cxg01z81wklafsh3i2g9c8qrfla4"; depends=[MASS survival]; };
+  SemiCompRisks = derive2 { name="SemiCompRisks"; version="2.3"; sha256="0w4d7vk9lwjrcchz8bx1hx550px7vxipw5kd0db2dsppiri13xmf"; depends=[MASS survival]; };
   SemiMarkov = derive2 { name="SemiMarkov"; version="1.4.2"; sha256="0xfa3arn98pfnhbcq3p880v177dhczcjm5bc1m84kygbhiaifsjg"; depends=[MASS numDeriv Rsolnp]; };
   SemiPar = derive2 { name="SemiPar"; version="1.0-4.1"; sha256="05gnk4s0d6276rmnyyv6gy1wpkji3sw563n8l7hmi9qqa19ij22w"; depends=[cluster MASS nlme]; };
-  SemiParBIVProbit = derive2 { name="SemiParBIVProbit"; version="3.6"; sha256="1fvipf6yl0fhz46xqd22y0wsmarr29fhnpjra1hf0wnbm5hyrf0z"; depends=[ggplot2 magic mgcv survey trust VGAM VineCopula]; };
-  SemiParSampleSel = derive2 { name="SemiParSampleSel"; version="1.2"; sha256="1k9xmby8hy4k0qn7pjj0rypxj4iqb206ixv92bz7ga0q8zd0nxbr"; depends=[copula gamlss_dist magic Matrix mgcv mvtnorm trust VGAM]; };
+  SemiParBIVProbit = derive2 { name="SemiParBIVProbit"; version="3.6-1"; sha256="16k7zbdwfxv517ac75f2b2wzqla2lqf7jr89n4cbz59wslznxymh"; depends=[ggplot2 magic mgcv survey trust VGAM VineCopula]; };
+  SemiParSampleSel = derive2 { name="SemiParSampleSel"; version="1.3"; sha256="14m3ahhp8xfnm01a0knd7qw2lrd1z3kxfazw8kin8g4dhcvhxwj7"; depends=[copula gamlss_dist magic Matrix mgcv mvtnorm trust VGAM]; };
   SenSrivastava = derive2 { name="SenSrivastava"; version="2015.6.25"; sha256="0r4p6wafnfww07kq19lfcs96ncfi0qrl8n9ncp441ri9ajwj54qk"; depends=[]; };
   SensMixed = derive2 { name="SensMixed"; version="2.0-8"; sha256="0ii6vkhrasqmk672wwm6zpy0v0hrllvh9bpxz47x11sx6bg96v63"; depends=[doBy ggplot2 Hmisc lme4 lmerTest plyr reshape2 shiny shinyBS xtable]; };
   SensitivityCaseControl = derive2 { name="SensitivityCaseControl"; version="2.1"; sha256="00jqzqx7g0av9lw13is723gph486gb8ga0wgcmmzpmb24s5nya9z"; depends=[]; };
@@ -2244,18 +2293,19 @@ in with self; {
   SeqGrapheR = derive2 { name="SeqGrapheR"; version="0.4.8.5"; sha256="041hlf64zbndz76r076pmym4dw4xl3fahryvpvjspw0sdlhmfm8c"; depends=[Biostrings cairoDevice gWidgets gWidgetsRGtk2 igraph rggobi]; };
   Sequential = derive2 { name="Sequential"; version="2.0.2"; sha256="1ljrhzr08ynng54szym03gggkw9f6pni54fbkqwgcqja23597f80"; depends=[]; };
   SetMethods = derive2 { name="SetMethods"; version="1.0"; sha256="0zizvrzyk01w4ncazvifmjm4h5zrpsf6n68n11sc8f5kzny9ia48"; depends=[betareg lattice]; };
+  SetRank = derive2 { name="SetRank"; version="1.0.1"; sha256="0zh5j6ksaggz46d9j37xpajyxlx7r83bv64yn9gdc6z20slrbch7"; depends=[data_table igraph XML]; };
   ShapeChange = derive2 { name="ShapeChange"; version="1.1"; sha256="1q1q7zv54c4lzcl8bhddbjkjszziijcc6khzg39bsjkcnbq3cpc7"; depends=[coneproj quadprog]; };
-  ShapeSelectForest = derive2 { name="ShapeSelectForest"; version="1.1"; sha256="1zk0lyyvf8bv4181kianixxx0s7wz8bvyq4ksm28qmqkwcqsv9cb"; depends=[coneproj raster rgdal]; };
+  ShapeSelectForest = derive2 { name="ShapeSelectForest"; version="1.2"; sha256="0z2drcpnfq78wdcd4zbg4pi0jbfs8jkqqjcmm53bzy7mlm0xm2qj"; depends=[coneproj raster rgdal]; };
   SharpeR = derive2 { name="SharpeR"; version="1.0.0"; sha256="107nk8ipqx4mzfhlv5b6k6vx60zi9rmvzk8qaxqic170p4ppcl2z"; depends=[matrixcalc sadists]; };
   ShrinkCovMat = derive2 { name="ShrinkCovMat"; version="1.1.1"; sha256="1vzsl6y57fri8q4455pbmiidfj91986mv67nr4ikck7f1z82mq38"; depends=[]; };
   Shrinkage = derive2 { name="Shrinkage"; version="1.0"; sha256="1n338zj4a063c8b9wajccp156kwxzirb70j8rppnklkq497plfc5"; depends=[limma multtest PsiHat]; };
   SiZer = derive2 { name="SiZer"; version="0.1-4"; sha256="0kiwvxrfa2b49r2iab5v2aysc2yzk5ck3h41f2hr0vq5pdnz0qy5"; depends=[boot]; };
   SigTree = derive2 { name="SigTree"; version="1.10.2"; sha256="0d91s2x809mhirkmcdn8zvnivimssqhnydgfwchfrckk6p4jfm40"; depends=[ape phyext2 phylobase phyloseq RColorBrewer]; };
   SightabilityModel = derive2 { name="SightabilityModel"; version="1.3"; sha256="0rgv5735y07yyv5y9c3flzha97ykn34ysmzy6as1z94hqfr4w746"; depends=[]; };
-  Sim_DiffProc = derive2 { name="Sim.DiffProc"; version="3.0"; sha256="1xzh7vdygx3vk9fanvhg65dy9prddrkj012ihv36w8wbqrk284gv"; depends=[rgl scatterplot3d]; };
+  Sim_DiffProc = derive2 { name="Sim.DiffProc"; version="3.1"; sha256="1q7h3mfgs19jav8xp8xgzzk075fcmvz2lfbp64mzgpiin2rwx2q0"; depends=[rgl scatterplot3d]; };
   SimComp = derive2 { name="SimComp"; version="2.2"; sha256="07gmlbwvv07kq3z7gq2jxlank011c0cqh8zwwp4pzf061d3gjdm6"; depends=[mratios multcomp mvtnorm]; };
-  SimCorMultRes = derive2 { name="SimCorMultRes"; version="1.3.1"; sha256="18lf3m0bzrrfhxl5nd00by4svqaqr1z9npq1cgrpbpb9h6zss7b7"; depends=[evd]; };
-  SimDesign = derive2 { name="SimDesign"; version="0.4.1"; sha256="1v3gfixh4qfih8rq5bbj7w5wbi373r2hz5j3yshq2ksj145q3x6d"; depends=[foreach plyr]; };
+  SimCorMultRes = derive2 { name="SimCorMultRes"; version="1.4.0"; sha256="0hrkwim582cb22ipy5vv1gp9bszjsqyzyzrwqwgy4247brag26fm"; depends=[evd]; };
+  SimDesign = derive2 { name="SimDesign"; version="0.5"; sha256="0hz6vwibz2jr518dhxzj9iild7xxd18sa23fgxxv4h99wvfn1m89"; depends=[foreach plyr]; };
   SimHaz = derive2 { name="SimHaz"; version="0.1"; sha256="04q4xyc1ki1zr3grm3khfg0kbykjy3j9qpg332l7pxp4j3wa3aw3"; depends=[survival]; };
   SimRAD = derive2 { name="SimRAD"; version="0.95"; sha256="1l4y39d05h5f2q609i73p07h093r9yca11dqw5iq1d7skwxcvf01"; depends=[Biostrings ShortRead]; };
   SimReg = derive2 { name="SimReg"; version="1.2"; sha256="1iwackg95slxmpj5lla00bar096a845ziygh6g6hj4vwpkciv6fb"; depends=[dplyr ggplot2 gridExtra hpoPlot plotrix Rcpp reshape2]; };
@@ -2277,7 +2327,7 @@ in with self; {
   SmoothHazard = derive2 { name="SmoothHazard"; version="1.2.3"; sha256="0p6hnq782d5qwmq6ak2rmbzx84lrsy02lr303gg3y0vln5i2myyn"; depends=[lava mvtnorm prodlim]; };
   SnowballC = derive2 { name="SnowballC"; version="0.5.1"; sha256="0kbg33hy6m2hv9jspyx6naqmk2q6h2zmvvczjmkwqvlhzlj0c5s4"; depends=[]; };
   SoDA = derive2 { name="SoDA"; version="1.0-6"; sha256="0sh2dan4ga2k14rirnkvgzsvbksx1k4ika5gkf5cy247rjkqnpj0"; depends=[]; };
-  SocialMediaLab = derive2 { name="SocialMediaLab"; version="0.18.0"; sha256="1nwb1f3iqv9daq2f0090a6ly4pimrca1ajwnmxcllq55lypyh6q8"; depends=[bitops data_table Hmisc httpuv httr igraph instaR plyr RCurl Rfacebook rjson stringr tm twitteR]; };
+  SocialMediaLab = derive2 { name="SocialMediaLab"; version="0.19.0"; sha256="1zskfncg3dqg7bcw7ck33xqz5w05sz0xi4ajfalzzsmr1sbmh6wj"; depends=[bitops data_table Hmisc httpuv httr igraph instaR plyr RCurl Rfacebook rjson stringr tm twitteR]; };
   SocialMediaMineR = derive2 { name="SocialMediaMineR"; version="0.1"; sha256="113nyjncl5yi61hz8i7k60b3f0f9a5vyrd3s72nbmc44cnvr8fci"; depends=[httr jsonlite RCurl]; };
   SocialNetworks = derive2 { name="SocialNetworks"; version="1.1"; sha256="0d868xka6d35i17r28cvm0ya971xk6y1kycsfff0279w27cjd9x0"; depends=[Rcpp]; };
   SocialPosition = derive2 { name="SocialPosition"; version="1.0.1"; sha256="1rrrjlq6czzhzipvkisbq024ca22v2vzx7wa4ddr9j7hnyyzzpic"; depends=[]; };
@@ -2298,9 +2348,9 @@ in with self; {
   SpatialExtremes = derive2 { name="SpatialExtremes"; version="2.0-2"; sha256="0ywybk9gziy2hzb1ks88q4rzs3lzzy6y3fzhja2s39ngg195hi6l"; depends=[fields maps]; };
   SpatialNP = derive2 { name="SpatialNP"; version="1.1-1"; sha256="108gxk0gbbjck9bgxvqb9h216ww21lmh2by0hrhzwx5r63hhcbmd"; depends=[]; };
   SpatialPack = derive2 { name="SpatialPack"; version="0.2-3"; sha256="1gs0x3wj3hj663m6kszwhy3ibcx0lrslr127miy1rhz8683ij71c"; depends=[]; };
-  SpatialPosition = derive2 { name="SpatialPosition"; version="0.9"; sha256="0w09yrn32pis4w3hkbghkgwpyy7mnnzzkhhp289xl738lymv207a"; depends=[raster sp]; };
-  SpatialTools = derive2 { name="SpatialTools"; version="1.0.0"; sha256="169qmvj0yz9cvkr35nz9ahnkb93bh5v1gvp97bry788dws4cwf4m"; depends=[Rcpp RcppArmadillo spBayes]; };
-  SpatialVx = derive2 { name="SpatialVx"; version="0.2-4"; sha256="0nm3mripq1fiqn7ydl854azwpl1sdh2ls8gj1k432xsvi02m05y3"; depends=[boot CircStats distillery fastcluster fields maps smatr smoothie spatstat turboEM waveslim]; };
+  SpatialPosition = derive2 { name="SpatialPosition"; version="1.0"; sha256="1b5f65n8fdszl7wb4431xnmcw204yqaib8918m3m59sgh6anwhra"; depends=[raster sp]; };
+  SpatialTools = derive2 { name="SpatialTools"; version="1.0.2"; sha256="0n8l4k0dm9gwirhxwrajv5gx502px9qzlqi6skzx0k32hmymnazh"; depends=[Rcpp RcppArmadillo spBayes]; };
+  SpatialVx = derive2 { name="SpatialVx"; version="0.3"; sha256="199pfj1a6zmny87g27p6qvwhg1vpnwaiv8vsz51d5pj2bpd384gc"; depends=[boot CircStats distillery fastcluster fields maps smatr smoothie spatstat turboEM waveslim]; };
   SpatioTemporal = derive2 { name="SpatioTemporal"; version="1.1.7"; sha256="0rc5zf8cnjw59azgqmslfz2dl5i17dfmb7ls5c849qybp2gn2zdv"; depends=[MASS Matrix]; };
   SpecHelpers = derive2 { name="SpecHelpers"; version="0.1.19"; sha256="1y6mcxz5d0d48awzkp73v8h43bkn8yjhr7whrs5lxv8ykygzfic5"; depends=[gsubfn]; };
   SpeciesMix = derive2 { name="SpeciesMix"; version="0.3.1"; sha256="0wl15k00d7n9pmnp1kr28p05z4vrziprcdndw77kwkcgv51cvllk"; depends=[MASS numDeriv]; };
@@ -2314,7 +2364,7 @@ in with self; {
   StMoSim = derive2 { name="StMoSim"; version="3.0"; sha256="18mdgpn0x6338zzvc7nwccz6ypqmlpv7pzcy5fwx5y2wfkmdp4rm"; depends=[Rcpp RcppParallel]; };
   StableEstim = derive2 { name="StableEstim"; version="2.0"; sha256="080khfix88j4656hmdy9l0xpbk9zzw7z7d7f6yvwsbalk3ag18i5"; depends=[fBasics MASS Matrix numDeriv stabledist testthat xtable]; };
   Stack = derive2 { name="Stack"; version="2.0-1"; sha256="09fgfhw9grxnpl5yg05p9gvlz38iw4prns1jn14nj3qx01k5rnxb"; depends=[bit ff ffbase plyr stringr]; };
-  StanHeaders = derive2 { name="StanHeaders"; version="2.8.0"; sha256="1km2929qd3whb5x6nvjwwlw9yb6dbg20w56b24rsgsij7jw8rpdl"; depends=[]; };
+  StanHeaders = derive2 { name="StanHeaders"; version="2.9.0"; sha256="0hpshkf688qgrrclvpy23waa8ijlxzr51frpzhbj0igwykqjpwji"; depends=[]; };
   StandardizeText = derive2 { name="StandardizeText"; version="1.0"; sha256="0s267k2b109pcdiyd26gm4ag5afikrnnb55d3cs6g2fvzp744hfp"; depends=[]; };
   Stat2Data = derive2 { name="Stat2Data"; version="1.6"; sha256="0pk68ffc6ffpddfpf9wi8ch39h6k3r80kldld3z5pnql18rc8nvx"; depends=[]; };
   StatDA = derive2 { name="StatDA"; version="1.6.9"; sha256="01bjygis14b3yfsfkjbvy0zlhjxysjf46cfcw8p4a4lwik3qp03b"; depends=[cluster e1071 geoR MASS MBA mgcv rgl robustbase sgeostat xtable]; };
@@ -2355,7 +2405,7 @@ in with self; {
   SynchWave = derive2 { name="SynchWave"; version="1.1.1"; sha256="127hllvig8kcs9gr2q14crswzhacv6v2s4zrgj50qdyprj14is18"; depends=[fields]; };
   SynergizeR = derive2 { name="SynergizeR"; version="0.2"; sha256="0z32ylrjjvp8kr6lghhg57yq1laf9r0h8l3adysvis8bbpz2q2sj"; depends=[RCurl RJSONIO]; };
   Synth = derive2 { name="Synth"; version="1.1-5"; sha256="1cfvh91nz6skjk8jv04fhwv3ga9kcsfgq3mdy8lx75jkx16zr0pk"; depends=[kernlab optimx]; };
-  TAM = derive2 { name="TAM"; version="1.14-0"; sha256="17x7rr8r8i2y5iciz5q3a4747imlr8d8inmqddknpkjlvy0m90l0"; depends=[CDM GPArotation lattice lavaan MASS msm mvtnorm plyr psych Rcpp RcppArmadillo sfsmisc tensor WrightMap]; };
+  TAM = derive2 { name="TAM"; version="1.15-0"; sha256="0ybm9msic1pai11dxkpc3pskbakjs4rjm4ic87in2c512gp5669m"; depends=[CDM GPArotation lattice lavaan MASS msm mvtnorm plyr psych Rcpp RcppArmadillo sfsmisc tensor WrightMap]; };
   TANOVA = derive2 { name="TANOVA"; version="1.0.0"; sha256="0c2mrahchwagisrkjl5l1s0mv0ny80kngq8dz0fjj9lwxwqwvwa5"; depends=[MASS]; };
   TAQMNGR = derive2 { name="TAQMNGR"; version="2015.2-1"; sha256="0j7qb15xy4g4ff0cmyjyz4lsalaxxf6zdwbq49j3y80ld0pvwhbk"; depends=[Rcpp]; };
   TBEST = derive2 { name="TBEST"; version="5.0"; sha256="15piy507vv8x59xgga17splxszy0vm87qjbfgxycvba633jishsa"; depends=[fdrtool signal]; };
@@ -2374,16 +2424,17 @@ in with self; {
   TESS = derive2 { name="TESS"; version="2.1.0"; sha256="05xsz2v847pwj4ja7hmg3zfbfqrwwzpf0ri0gjzb8snm2a7xm23y"; depends=[ape coda deSolve Rcpp]; };
   TExPosition = derive2 { name="TExPosition"; version="2.6.10"; sha256="12rgijlclaipwjjiyng7nwilzixdy6lsvncigcg0vjydhgk97jn1"; depends=[ExPosition prettyGraphs]; };
   TFDEA = derive2 { name="TFDEA"; version="0.9.8.3"; sha256="0qg4nhlqqj7hc8lg732zz8klbbp3yksnq8q8n4ml3jz8gadrpyj7"; depends=[lpSolveAPI]; };
-  TFMPvalue = derive2 { name="TFMPvalue"; version="0.0.5"; sha256="13bfcwfiyl61cv2ma23fcmv2cvbsyzdbg2pl6l6zg39l6scxf9na"; depends=[Rcpp]; };
+  TFMPvalue = derive2 { name="TFMPvalue"; version="0.0.6"; sha256="1892jmgqywm0jp5l5k88brp4h8szkbi9bxi0v1jni1929qnsmqyf"; depends=[Rcpp]; };
   TFX = derive2 { name="TFX"; version="0.1.0"; sha256="0xrjdbvg0ng4i0s8ql1pfyma10x4n045spilkb05750677r5j44p"; depends=[XML]; };
   TH_data = derive2 { name="TH.data"; version="1.0-6"; sha256="1kx6z8lj1l2vxi7vhx47sly65grjkm3wvrbr3nl52q1vdmy1xsgm"; depends=[]; };
   TIMP = derive2 { name="TIMP"; version="1.13.0"; sha256="0b6g2afwjz2m7bnfhx1pjmq6x1ghjxgrwi6hz1l867qa4i2yx5hx"; depends=[colorspace deSolve fields gclus gplots minpack_lm nnls]; };
+  TITAN2 = derive2 { name="TITAN2"; version="2.1"; sha256="0cxcgkf776411ln5wbfdyjxa42jw473vcq1kns6k6p8dpm1y91c2"; depends=[]; };
   TInPosition = derive2 { name="TInPosition"; version="0.13.6"; sha256="1cxxrfpbiyknaivv6gyp79lz0rxwhrndcd054smksxq8zcfz0v7c"; depends=[ExPosition InPosition prettyGraphs TExPosition]; };
   TKF = derive2 { name="TKF"; version="0.0.8"; sha256="1db87lwx26ayv1x2k8qd9dfr6j3jkvdl9ykisaxr42l6akqy21nr"; depends=[ape expm numDeriv phangorn phytools]; };
   TLBC = derive2 { name="TLBC"; version="1.0"; sha256="08w187akbhfbz6nrrf7avf02lrhgj7bbrjmim9gkh4wlbjhzvw67"; depends=[caret HMM randomForest signal stringr]; };
-  TMB = derive2 { name="TMB"; version="1.6.2"; sha256="0csfagrz1dv0lkxlvpak8w9b4rcbvcxw1b0mhy37a7ndssa3pz7k"; depends=[Matrix RcppEigen]; };
+  TMB = derive2 { name="TMB"; version="1.6.5"; sha256="0m3hh1rwxq86hrykdv233rzmc5nm73rr1bg72d2qg4giipmv8l5d"; depends=[Matrix RcppEigen]; };
   TMDb = derive2 { name="TMDb"; version="1.0"; sha256="0bbcmsv7b3vvskhdjww03gbcgql44vsvyjz2fajy9w2vgkr6ga90"; depends=[httr jsonlite]; };
-  TOC = derive2 { name="TOC"; version="0.0-3"; sha256="0zgggkxsn7mqa5bh9rpb29ag019bwpy4yf3nd3nrcz5yk22bh7bn"; depends=[bit raster rgdal]; };
+  TOC = derive2 { name="TOC"; version="0.0-4"; sha256="1c16d4wrzir6v3c323sck6r9yz6mv1a70xamlj5ha1ydmfixcza9"; depends=[bit raster rgdal]; };
   TP_idm = derive2 { name="TP.idm"; version="1.0"; sha256="1dgcalzhkhj4cn1yjf23q6cm527fgf083n7nw7201824g78566n5"; depends=[]; };
   TPmsm = derive2 { name="TPmsm"; version="1.2.1"; sha256="1vynzb6qpp8785rdjyarhvwbkasviamhljjlnp4i0dds96wwdgx1"; depends=[KernSmooth]; };
   TR8 = derive2 { name="TR8"; version="0.9.13"; sha256="07wrqwa5gf1l1y3b07mganr5xkzxdzrh6lrv7gf01m9b7bsz564m"; depends=[gdata gWidgets gWidgetstcltk plyr rappdirs RCurl taxize XML]; };
@@ -2406,14 +2457,14 @@ in with self; {
   TSclust = derive2 { name="TSclust"; version="1.2.3"; sha256="0m04svw4z2rhvzyckn8l4pg4rmwfn8xlzd9k839c47ldbzgb4z6l"; depends=[cluster dtw KernSmooth locpol longitudinalData pdc wmtsa]; };
   TScompare = derive2 { name="TScompare"; version="2015.4-1"; sha256="0jmxnrbsdg368f29bp70rc9i88si5zjblbcn8rcjyn2k9vpd3q2f"; depends=[DBI tfplot tframe TSdbi]; };
   TSdata = derive2 { name="TSdata"; version="2015.4-2"; sha256="1c0ly1gs6p3fspwvk1f6c2xgzvc7p7pkzakm44lisbyjklacnilp"; depends=[]; };
-  TSdbi = derive2 { name="TSdbi"; version="2015.1-1"; sha256="1bqxpd4g0ppm1261srgwjzghfwwl53vybkihz99azckky0539m1s"; depends=[DBI tframe]; };
+  TSdbi = derive2 { name="TSdbi"; version="2015.7-1"; sha256="00dasnkkxw9rg1wyx1i2sqjr0ys1ahp9z6rdr08f8wl7zw5r8x6w"; depends=[DBI tframe]; };
   TSdist = derive2 { name="TSdist"; version="3.1"; sha256="0kwj1l45qv2iwf14rad71381ajnq2ikz7kkgal25y3d528q4nd6y"; depends=[cluster dtw KernSmooth locpol longitudinalData pdc proxy TSclust xts zoo]; };
   TSfame = derive2 { name="TSfame"; version="2015.4-1"; sha256="197v123mkxr7qlksnb5iadms5zbc8xqbpgr2cspb8x1krz6phssz"; depends=[DBI fame tframe tframePlus tis TSdbi]; };
   TSmisc = derive2 { name="TSmisc"; version="2015.1-3"; sha256="1hv1q9p7vp7pxx9s4s9w3vkif1w1xr4y656x3zaf48ijxf6c6a90"; depends=[DBI gdata its quantmod tframe tframePlus TSdbi tseries xts zoo]; };
   TSodbc = derive2 { name="TSodbc"; version="2015.4-1"; sha256="0m6r97gs483jg6jlmfkbzxg3jvf6q140kvpidjccj224zb1sqlcq"; depends=[DBI RODBC tframe tframePlus TSdbi TSsql]; };
-  TSsdmx = derive2 { name="TSsdmx"; version="2015.2-2"; sha256="1xwriyg0raqd6812r6vf34dljs0cjhxls9gpal4w0bjmvmc67khb"; depends=[DBI rJava RJSDMX tframe tframePlus TSdbi]; };
+  TSsdmx = derive2 { name="TSsdmx"; version="2015.12-1"; sha256="0vl2p1n6jmq4q17fdni1w5vrqyyf71b3g06nzgj03sbxiia20cz2"; depends=[DBI rJava RJSDMX tframe tframePlus TSdbi]; };
   TSsql = derive2 { name="TSsql"; version="2015.1-2"; sha256="1hpi2cssnkzqgnaj91wrvb94fs8zpfg8hi4m1zwswzyl3az0l9sc"; depends=[DBI tframe tframePlus TSdbi zoo]; };
-  TTAinterfaceTrendAnalysis = derive2 { name="TTAinterfaceTrendAnalysis"; version="1.5.1"; sha256="1i9p5s7xj3py8465yjjaqs2m7krjxzzqd86lkpbgzxnxjdnxcx5i"; depends=[e1071 fBasics Hmisc lubridate multcomp nlme pastecs relimp reshape tcltk2 timeSeries wq]; };
+  TTAinterfaceTrendAnalysis = derive2 { name="TTAinterfaceTrendAnalysis"; version="1.5.2"; sha256="00lzzarnpvb5dl4wzch1ll42wzcd2hc3xdi6fkgyiznx0nljapmg"; depends=[e1071 lubridate multcomp mvtnorm nlme pastecs relimp reshape tcltk2 wq]; };
   TTR = derive2 { name="TTR"; version="0.23-0"; sha256="1p648hdjdnda6c2vcrp6rf9x2gx8nks3ni8pjlkm2cm7fnbfrcj1"; depends=[xts zoo]; };
   TTS = derive2 { name="TTS"; version="1.0"; sha256="0dhxj474dqjxqg0fc2dcx8p5hrjn9xfkn0rjn2vz3js92fa9ik9h"; depends=[mgcv sfsmisc]; };
   TTmoment = derive2 { name="TTmoment"; version="1.0"; sha256="0a4rdb4fk1mqnvvz0r15kni0g5vcj4xkkcwwv7c2gxc94xh5i5ih"; depends=[mvtnorm]; };
@@ -2426,21 +2477,24 @@ in with self; {
   TauP_R = derive2 { name="TauP.R"; version="1.1"; sha256="10sjvcv70fjrsl5nnk9gm4sy7nhwm6aaq57gr37cb10v079ykmk1"; depends=[]; };
   TauStar = derive2 { name="TauStar"; version="1.0.0"; sha256="0k8vb9c0w643ssywlkw8dglvzb1p86hf4vgsfasrksxx6yxq5ahv"; depends=[Rcpp RcppArmadillo]; };
   Taxonstand = derive2 { name="Taxonstand"; version="1.7"; sha256="0xs2kdsd6sa5vpxajw1rkraiy27km6q4mqsdsq1yfdl1wxv7m0sl"; depends=[]; };
-  TcGSA = derive2 { name="TcGSA"; version="0.9.8"; sha256="19gp3pj4p2svrfyviccvv13q82qj7584nck8zbba90hzv9g4xy86"; depends=[cluster ggplot2 gplots GSA gtools lme4 multtest reshape2 stringr]; };
+  TcGSA = derive2 { name="TcGSA"; version="0.10.1"; sha256="05cghnxn5r0ldr8cw371bz0iqx2b73b2qa77xj78xj7a950yvxhw"; depends=[cluster ggplot2 gplots GSA gtools lme4 multtest reshape2 stringr]; };
   TeachNet = derive2 { name="TeachNet"; version="0.7"; sha256="1p39bsf846r7zwz4lrrv2bpyx9yrkqzrnacajwrz3jjqj6qpp6cn"; depends=[]; };
   TeachingDemos = derive2 { name="TeachingDemos"; version="2.9"; sha256="160xch4812darv77qk2xjblm6nfnna5x2rxy335bwdsdjzcx4x9m"; depends=[]; };
   TeachingSampling = derive2 { name="TeachingSampling"; version="3.2.2"; sha256="07c1wx7hl246kvj9ah55kdjpag8a9zbzh3jy0680w5nnv8vzsxxs"; depends=[]; };
   TestScorer = derive2 { name="TestScorer"; version="1.7.1"; sha256="0zfabkgpwgrr41x033j065hdf1vc2sg4bj9yqfdc6g1pq9kxdmd4"; depends=[]; };
   TestSurvRec = derive2 { name="TestSurvRec"; version="1.2.1"; sha256="05f5gc8hvz09hx015jzis6ikki9c1brdq7l7a9bxm9bqbcc9f2f9"; depends=[boot survrec]; };
   TestingSimilarity = derive2 { name="TestingSimilarity"; version="1.0"; sha256="1fagy9168cz09p460pa0qyn8m79zg4i2b9j5vg8gm1ssqi2znsl9"; depends=[alabama DoseFinding lattice]; };
+  TextoMineR = derive2 { name="TextoMineR"; version="1.1"; sha256="0pdf3zd1glbwqm1lwvv6mcn1pd9phrg5vdwxr2lhh22xsmggswjp"; depends=[FactoMineR gdata MASS stringr tm]; };
   Thermimage = derive2 { name="Thermimage"; version="1.0.1"; sha256="16wpmwqfqjghhp4g5wpmgzf0ii2aa0gawcq74rfn4frfizzdy0ad"; depends=[]; };
   Thinknum = derive2 { name="Thinknum"; version="1.3.0"; sha256="0j48vgr4wsc2chm95aprq0xm0dk720xk5zmiijxasg92sfp0va6n"; depends=[RCurl RJSONIO]; };
   ThreeArmedTrials = derive2 { name="ThreeArmedTrials"; version="0.1-0"; sha256="1pafm8k90yv0hrk5a9adfv37087l2in0psslhkxha6mkmdh6a5f6"; depends=[MASS]; };
   ThreeGroups = derive2 { name="ThreeGroups"; version="0.21"; sha256="0hipxa45v9ysb2qbk33kjycnvqar7bff1ajxd6fzhpc3jc9hflw4"; depends=[]; };
   ThreeWay = derive2 { name="ThreeWay"; version="1.1.3"; sha256="17yl8zq029wiy3c0f4ssljx85dnm9n862wj2d24w7p0lxlvarmz6"; depends=[]; };
-  ThresholdROC = derive2 { name="ThresholdROC"; version="2.2"; sha256="1bvsnbfpbag67f23dpq2k5gql20yqmx691lcrcg73z5xd4a6jmxx"; depends=[MASS numDeriv pROC]; };
+  ThresholdROC = derive2 { name="ThresholdROC"; version="2.3"; sha256="08bmjsbwndb5i902plsy1wa5c1i5f96r3s6fdy0a16w9n6rvll1k"; depends=[MASS numDeriv pROC]; };
   TickExec = derive2 { name="TickExec"; version="1.1"; sha256="0v0m0wi49yw0ply19vnirl2zwnk61sxalx24l8cadvkssgs13509"; depends=[]; };
   TiddlyWikiR = derive2 { name="TiddlyWikiR"; version="1.0.1"; sha256="0vwwjdmfc8c0y2gfa8gls1mzvp29y39c9sxryrgpk253jj9px1kr"; depends=[]; };
+  TideHarmonics = derive2 { name="TideHarmonics"; version="0.1-0"; sha256="0inqwa2y4pqs1g9d5m5y6w9j1kgc9qil6gmcilhkjrk886whf622"; depends=[]; };
+  TideTables = derive2 { name="TideTables"; version="0.0.1"; sha256="08c1fbwxc2kc3vicjdw8qg452y8jrsgyi6b4qbnpb8j6nj91qcx3"; depends=[chron data_table]; };
   Tides = derive2 { name="Tides"; version="1.1"; sha256="0w2xjnw2zv4s49kvzbnfvy30mfkn8hqdz6p155xm1kfqwvyb28qq"; depends=[]; };
   TilePlot = derive2 { name="TilePlot"; version="1.3.1"; sha256="0yfzjyzc743rv5piw9mb7y0rr558hkxszgz49lya2w3i1mqvxbzy"; depends=[]; };
   TimeMachine = derive2 { name="TimeMachine"; version="1.2"; sha256="1dz0j777wmd8mpkm2ryiahpcw6w88w429zjcw6m67pi20r1992cb"; depends=[]; };
@@ -2450,16 +2504,17 @@ in with self; {
   TipDatingBeast = derive2 { name="TipDatingBeast"; version="0.1-6"; sha256="0yfm99j2b3k9har87qb675jxgfp5vq3aizqvxc1njnfyh5yjg89k"; depends=[mclust]; };
   Tmisc = derive2 { name="Tmisc"; version="0.1.2"; sha256="1av53zzkspc58riqi4kilq526wp6hwig2bv6gp2z5mgiqvfnhdfj"; depends=[dplyr]; };
   TopKLists = derive2 { name="TopKLists"; version="1.0.6"; sha256="1hmm9g68scq8sqdb9axqn51p00mx6p6lw0fdgjljfi2q72xcqhq3"; depends=[gplots Hmisc]; };
-  TraMineR = derive2 { name="TraMineR"; version="1.8-10"; sha256="05x23argga7xh7ggv08b659j9ljnygbfwfh3pqiadhw9dipgyqqp"; depends=[boot RColorBrewer]; };
+  TraMineR = derive2 { name="TraMineR"; version="1.8-11"; sha256="1a7q6x173wk5v5wqdrz08gbwv6rlcw8wx92m7jwi5h3haza6gbqz"; depends=[boot Hmisc RColorBrewer]; };
   TraMineRextras = derive2 { name="TraMineRextras"; version="0.2.4"; sha256="144s25ivq27f81dgh9x9h1fph1hdk86w9yac1hy6358kc8jnmi3q"; depends=[cluster combinat RColorBrewer survival TraMineR]; };
   TrackReconstruction = derive2 { name="TrackReconstruction"; version="1.1"; sha256="1f2l3nshb6qrhyczw5rxqqzmsjxf0rvv3y78j8d9lv1nnd9kxzq5"; depends=[fields RColorBrewer]; };
   Traitspace = derive2 { name="Traitspace"; version="1.1"; sha256="1wlrpnzb39vgkqy0ynbwlgrkkqgklrk6pw7f8p7p2i132qk2c291"; depends=[mclust permute]; };
   TransModel = derive2 { name="TransModel"; version="1.0"; sha256="1cxvfmf304x8riwcnx6gp5fb5gkqa552zby2n6yxc0ic0m0w77kb"; depends=[survival]; };
+  TransferEntropy = derive2 { name="TransferEntropy"; version="1.2"; sha256="11hwfbf53y88cpm693742hfzzpfwldwxag5860bv0h5r538aqini"; depends=[BH Rcpp]; };
   TreatmentSelection = derive2 { name="TreatmentSelection"; version="1.1.2"; sha256="1mvrb72yz51gmwqlfg5gsjbi65lqk5j24agddw1br53ymdvjgzq4"; depends=[ggplot2]; };
   TreePar = derive2 { name="TreePar"; version="3.3"; sha256="1sm518b1b4b1p0n5979qzvi2nacxpp3znbg9n75pf2a8z8wy6p4l"; depends=[ape deSolve Matrix subplex TreeSim]; };
   TreeSim = derive2 { name="TreeSim"; version="2.2"; sha256="1c61afb49kjlfb6iy69vk2bgl20g8bhsbwnai2d2shmv1nimi5jf"; depends=[ape geiger laser]; };
   TreeSimGM = derive2 { name="TreeSimGM"; version="1.2"; sha256="0y6hadwx3apw11jy5d4al3dav3his8b4xvkv7s5d5rd92l7yrw0r"; depends=[TreeSim]; };
-  TriMatch = derive2 { name="TriMatch"; version="0.9.4"; sha256="008mi58sv82ykvwzil229z3zq3addyn3bik0xzfajcx4h7sdmsfg"; depends=[ez ggplot2 gridExtra PSAgraphics psych reshape2 scales]; };
+  TriMatch = derive2 { name="TriMatch"; version="0.9.6"; sha256="09i1h5q8irlkgnhhljh4i1l13mikjidn2asz5gkqqzhr69nylj2z"; depends=[ez ggplot2 gridExtra PSAgraphics psych reshape2 scales]; };
   TrialSize = derive2 { name="TrialSize"; version="1.3"; sha256="1hikhw2l7d3c7cg4p7zzrgdwhy9g4rv06znpw5mc6kwinyakp75q"; depends=[]; };
   TripleR = derive2 { name="TripleR"; version="1.4.1"; sha256="028xvy3l72n1jhhfzv1fx1a51ya9bx008icz81ixjdwghzqr0wmi"; depends=[ggplot2 plyr reshape2]; };
   TruncatedNormal = derive2 { name="TruncatedNormal"; version="1.0"; sha256="1qj18xcq58xah1niwxgqqzscl7dfgxh2s8fdbzk1vigwwm5xfvij"; depends=[randtoolbox]; };
@@ -2468,7 +2523,7 @@ in with self; {
   TunePareto = derive2 { name="TunePareto"; version="2.4"; sha256="0pljl3q5s9yqc4ph70y66ff9ci9w8gwj8jsy8srxqkgqvahc8arf"; depends=[]; };
   TurtleGraphics = derive2 { name="TurtleGraphics"; version="1.0-5"; sha256="18azwbvs3cv3arp6zhh5bklf7n04p13jpfjh44nxv5159jry7arr"; depends=[]; };
   TwoCop = derive2 { name="TwoCop"; version="1.0"; sha256="1ycxq8vbp68z82r2dfg2wkc9zk3bn33d94xay20g2p55lnzl2ifd"; depends=[]; };
-  TwoStepCLogit = derive2 { name="TwoStepCLogit"; version="1.2.3"; sha256="0arqpfflflsydsgcrpq364vqf4sn019m03ygmpq810wa78v4r9s0"; depends=[survival]; };
+  TwoStepCLogit = derive2 { name="TwoStepCLogit"; version="1.2.4"; sha256="0i62gyailjq9by6hmgvvhpwxsj6q8z3v313wgvi5q2zsicb87fzk"; depends=[survival]; };
   UBCRM = derive2 { name="UBCRM"; version="1.0.1"; sha256="1h9f8wlxdgb67qqqnfhd9gfs4l2cq84vajhcb0psva0gwdd1yf6i"; depends=[]; };
   UNF = derive2 { name="UNF"; version="2.0.1"; sha256="1gnzj7lxfp0x5f2ws9aclzaq75gbmsqhjqi02llmihf05gq0kp23"; depends=[base64enc digest]; };
   UPMASK = derive2 { name="UPMASK"; version="1.0"; sha256="19krsqkz2g5b6svqp29s6i92bhlk7liv8lf7d03za848w7y2jkhq"; depends=[DBI MASS RSQLite]; };
@@ -2478,14 +2533,17 @@ in with self; {
   UScensus2000tract = derive2 { name="UScensus2000tract"; version="0.03"; sha256="11ppw75k8zghj7xphx5xyl3azsdsyd142avp0la2g941w6f8l2n1"; depends=[foreign maptools sp]; };
   UScensus2010 = derive2 { name="UScensus2010"; version="0.11"; sha256="1q06spkh8f4ijvfg557rl3176ki4i8a1y39cyqm3v7mnzwckyj3l"; depends=[foreign maptools sp]; };
   UWHAM = derive2 { name="UWHAM"; version="1.0"; sha256="1qaj8anaxqnx4nc6vvzda9hhhzqk9qp8q7bxm26qgia4hgascnrv"; depends=[trust]; };
+  Ultimixt = derive2 { name="Ultimixt"; version="2.0"; sha256="18xg1z41nccwzn9mdzpap41ffp4cmfww8bwk10m1v96acf9kq2i5"; depends=[coda gtools]; };
+  UncerIn2 = derive2 { name="UncerIn2"; version="2.0"; sha256="08cg7armz9xwwn1222aws98cwrvmw0s73pxpnszmrmrli1qs92k1"; depends=[automap fields geoR gstat RandomFields Rcpp sp]; };
   Unicode = derive2 { name="Unicode"; version="0.1-5"; sha256="088f38qy3vympxj6n4vyvvqd4gldcfli9l8rmzgmm1rm3v195mvn"; depends=[]; };
-  UpSetR = derive2 { name="UpSetR"; version="1.0.0"; sha256="04dinshrlw9niy2zr1wkkvpbmqnwz1rsi3vhwb81hk0nb9vh4cfq"; depends=[ggplot2 gridExtra plyr]; };
+  UpSetR = derive2 { name="UpSetR"; version="1.0.2"; sha256="17gdx0f3szb16c0yhii53wi9gzp5c7f5fvr7mya2xwvd6zmsyd03"; depends=[ggplot2 gridExtra plyr]; };
   UsingR = derive2 { name="UsingR"; version="2.0-5"; sha256="1w1swcb5srb2b76agbh3mipz8b3vbhpnhxfhg7k546y38j3crafq"; depends=[HistData Hmisc MASS]; };
   V8 = derive2 { name="V8"; version="0.9"; sha256="0pfxp4ib44fhndcpy7h7v58d60yb46nqfpwil39g4xybxrp4k4wn"; depends=[curl jsonlite Rcpp]; };
   VAR_etp = derive2 { name="VAR.etp"; version="0.7"; sha256="0py5my3ilhcmz44m15hh0d219l9cz7rda4a9gbmf8wh9cgvvj1s3"; depends=[]; };
-  VBLPCM = derive2 { name="VBLPCM"; version="2.4.3"; sha256="0aibjkqlc8l3f17m52ifb25s639gkydvgdj2gkijk5mk0g681qdj"; depends=[ergm mclust sna]; };
+  VARsignR = derive2 { name="VARsignR"; version="0.1.3"; sha256="09mnf9hvsi4wx1c81yq97mzggwk6s7nka7awrws63icjybqjmra9"; depends=[HI minqa mvnfast]; };
+  VBLPCM = derive2 { name="VBLPCM"; version="2.4.4"; sha256="09b80313w2dljl009xzcfhdcl6flc8nqzw9pzgfbciwi61666ppb"; depends=[ergm mclust network sna]; };
   VBmix = derive2 { name="VBmix"; version="0.3.1"; sha256="0gicp470w6xy2z4r54ywjd4c9cck2yhhw7ismdp4jm9zsvc7nv1y"; depends=[lattice mnormt pixmap]; };
-  VCA = derive2 { name="VCA"; version="1.2"; sha256="0hifg22nz9pg56nc0097jp33pa3j0vc3gm7rh5x95jn4kf68zdis"; depends=[Matrix numDeriv]; };
+  VCA = derive2 { name="VCA"; version="1.2.1"; sha256="0jwqwrjl7wl4358yrz5ab9a5hp9vd9apsxi5is6rlkswlam33hls"; depends=[Matrix numDeriv]; };
   VDA = derive2 { name="VDA"; version="1.3"; sha256="063mpwbyykx4f46wzfvrgnlq73ar7i06gxr4mjzbhqcfrsybi72b"; depends=[rgl]; };
   VGAM = derive2 { name="VGAM"; version="1.0-0"; sha256="1q82zb8p8vygldnlxa54dhmagsqc2s9ybbvhb1b7r66097dxgkba"; depends=[]; };
   VGAMdata = derive2 { name="VGAMdata"; version="1.0-0"; sha256="1ywqmfn469hpw9h07raxxrw2wc736i3wbxq2vq31qll4shqnc4q3"; depends=[]; };
@@ -2504,6 +2562,7 @@ in with self; {
   VaRES = derive2 { name="VaRES"; version="1.0"; sha256="0gw05jiqgirhz3c8skbb07y4h44r6vi68gnd5y7ql455v0c2raza"; depends=[]; };
   VarSelLCM = derive2 { name="VarSelLCM"; version="1.2"; sha256="1pzcadzg1snv2nkdrbhgi6scrd70cawprncm8hs82gcl3r9dscic"; depends=[Rcpp RcppArmadillo]; };
   VarSwapPrice = derive2 { name="VarSwapPrice"; version="1.0"; sha256="12q2wp2cqi9q47mzbb7sc250zkjqkhs9z0h93ik0h63dv339abgj"; depends=[]; };
+  VarfromPDB = derive2 { name="VarfromPDB"; version="1.1.0"; sha256="0j2f9ymzrcbrjvbqppr2bfyn37yhmjrz17vficnpkgawj2g6jnyj"; depends=[RCurl stringr XML XML2R]; };
   VariABEL = derive2 { name="VariABEL"; version="0.9-2"; sha256="0vlr6zxl75i49p35jxrc5fwfrb55n91hqdan2ikcix3r2k4qs5k0"; depends=[]; };
   VarianceGamma = derive2 { name="VarianceGamma"; version="0.3-1"; sha256="0h424hdphbgi9i84bgzdwmsq05w61q8300x8f9y4szbxa5k2dnar"; depends=[DistributionUtils GeneralizedHyperbolic RUnit]; };
   VdgRsm = derive2 { name="VdgRsm"; version="1.5"; sha256="13mbv3ih6p2915wdzq4zjx7m4k37w1xddkxx6dzk1jiak2br9slj"; depends=[AlgDesign permute]; };
@@ -2517,12 +2576,12 @@ in with self; {
   Voss = derive2 { name="Voss"; version="0.1-4"; sha256="056izh1j26vqjhjh01fr7nwiz1l6vwr5z4fll87w99nc5wc4a467"; depends=[fields]; };
   VoxR = derive2 { name="VoxR"; version="0.5.1"; sha256="07lsp6lrkq0gv55m84dl9w7gz5246d9avypqnkz96n3rbbgd0w5z"; depends=[]; };
   W2CWM2C = derive2 { name="W2CWM2C"; version="2.0"; sha256="139rbbhshiap3iq4s4n84sip3cwwjn2x7lm7kmzwj5glhl5dc6ga"; depends=[colorspace wavemulcor waveslim]; };
-  W3CMarkupValidator = derive2 { name="W3CMarkupValidator"; version="0.1-4"; sha256="08697va5n59d7yyv882ya3s2qw94n7c53d8wyavpvhqq9d3n8nwi"; depends=[RCurl XML]; };
+  W3CMarkupValidator = derive2 { name="W3CMarkupValidator"; version="0.1-5"; sha256="1d4qpz6a984jv3p0l1w4xdhfx5iz9njz3dxlp0llyfzqg1szbqzj"; depends=[curl xml2]; };
   WARN = derive2 { name="WARN"; version="1.1"; sha256="0rnzsc8vbm116g4cwdivmxqv1zyg4givjrrlahvbf4xl5pbryg6d"; depends=[MASS]; };
   WCE = derive2 { name="WCE"; version="1.0"; sha256="1kb1z67ymnz8cgwxq6m5fpqgxmmrfiwh2q3x4rhanac2sinagyn4"; depends=[plyr survival]; };
   WCQ = derive2 { name="WCQ"; version="0.2"; sha256="1yhkr2iazd7lh9r68xz1lh32z6r1sdnmqrjshcrm4rbwai0j3lkr"; depends=[]; };
   WDI = derive2 { name="WDI"; version="2.4"; sha256="0ih6d9znq6b2prb4nvq5ypyjv1kpi1vylm3zvmkdjvx95z1qsinf"; depends=[RJSONIO]; };
-  WGCNA = derive2 { name="WGCNA"; version="1.48"; sha256="18yl2v3s279saq318vd5hlwnqfm89rxmjjji778d2d26vviaf6bn"; depends=[AnnotationDbi doParallel dynamicTreeCut fastcluster foreach Hmisc impute matrixStats preprocessCore survival]; };
+  WGCNA = derive2 { name="WGCNA"; version="1.49"; sha256="1jv6mx3pwl352kmq1wkd0gbyl405gky7h37d30ic8gk7i4cjda9r"; depends=[AnnotationDbi doParallel dynamicTreeCut fastcluster foreach Hmisc impute matrixStats preprocessCore survival]; };
   WMCapacity = derive2 { name="WMCapacity"; version="0.9.6.7"; sha256="167wx759xi7rv74n6sdsdkjnfpxdsiybk4ik70psdgfwdqqcga1y"; depends=[cairoDevice coda gtools gWidgets gWidgetsRGtk2 RGtk2 XML]; };
   WMDB = derive2 { name="WMDB"; version="1.0"; sha256="10wdjy3g2qg975yf1dhy09w9b8rs3w6iszhbzqx9igfqvi8isrr1"; depends=[]; };
   WRS2 = derive2 { name="WRS2"; version="0.4-0"; sha256="11yfq8jkr2f28zmshkvjv0ajslh0137mprn9clgala8y4xrpqv94"; depends=[MASS plyr reshape]; };
@@ -2542,7 +2601,7 @@ in with self; {
   WilcoxCV = derive2 { name="WilcoxCV"; version="1.0-2"; sha256="1kbb7ikgnlxybmvqrbn4cd8xnqrkwipk4xd6yja1xsi39a109xzl"; depends=[]; };
   WordPools = derive2 { name="WordPools"; version="1.0-2"; sha256="1izs4cymf2xy1lax85rvsgsgi05ygf0ibi9gzxc96sbgvy4m78kf"; depends=[]; };
   WrightMap = derive2 { name="WrightMap"; version="1.1"; sha256="0dmximp549gr37ps56vz8mnlii7753dc5v0wl3s78cymjmnmyr0z"; depends=[]; };
-  WriteXLS = derive2 { name="WriteXLS"; version="3.6.1"; sha256="19rifwxfnmb65lf3a8nshyjnq3bn0lpkqfcwslfgjp6y8l7jx7gv"; depends=[]; };
+  WriteXLS = derive2 { name="WriteXLS"; version="4.0.0"; sha256="0nwxi36w3rkzw9j0qil64gakhb101rxg1wydjkwlpg0nbsj1sm50"; depends=[]; };
   WufooR = derive2 { name="WufooR"; version="0.5.7"; sha256="07w2g5igffvymzax85v3xqmfdqx74yslbkvrp5x3c0nl6d185i36"; depends=[dplyr httr jsonlite]; };
   XBRL = derive2 { name="XBRL"; version="0.99.16"; sha256="1wrcm8srn185qrba7rig3fvwjz1n2ab296i0jr71vhyp9417h40q"; depends=[Rcpp]; };
   XHWE = derive2 { name="XHWE"; version="1.0"; sha256="1ca8y9q3623d0vn91g62nrqf3pkbcbkpclmddw5byd37sdrgsi5l"; depends=[]; };
@@ -2551,8 +2610,8 @@ in with self; {
   XML = derive2 { name="XML"; version="3.98-1.3"; sha256="0j9ayp8a35g0227a4zd8nbmvnbfnj5w687jal6qvj4lbhi3va7sy"; depends=[]; };
   XML2R = derive2 { name="XML2R"; version="0.0.6"; sha256="0azfh950r2b7ck3n1vzk3mdll7zy844nx3mbk676jxnj8gg7nxk5"; depends=[plyr RCurl XML]; };
   XMRF = derive2 { name="XMRF"; version="1.0"; sha256="0jnyy9pcksfadznidqsbwh8nlqv3k0yppj76q8a2g0aidbdmg2cc"; depends=[glmnet igraph MASS Matrix snowfall]; };
-  XNomial = derive2 { name="XNomial"; version="1.0.1"; sha256="134bwglqhgah7v3w6ir65dch2dwp5h4vldw521ba74l5v9b2j2h4"; depends=[]; };
-  XiMpLe = derive2 { name="XiMpLe"; version="0.03-21"; sha256="1j387jzxh0z9dmhvc0kpjjjzf781sgrw57nwzdqwx6bn09bw509d"; depends=[]; };
+  XNomial = derive2 { name="XNomial"; version="1.0.4"; sha256="1mwx302576rmsjllbq2clfxilm3hkyp5bw0wmwqbn0kgv5wpy8z6"; depends=[]; };
+  XiMpLe = derive2 { name="XiMpLe"; version="0.03-23"; sha256="13vsf9l3s0scqvxwxj109n6vb7rx3a2hv5lbrnjk6rxjwl8iqrly"; depends=[]; };
   Xmisc = derive2 { name="Xmisc"; version="0.2.1"; sha256="11gwlcyxhz1p50m68cnqrxmisdk99v8vrsbvyr7k67f0kvsznzs1"; depends=[]; };
   YPmodel = derive2 { name="YPmodel"; version="1.3"; sha256="1vll33nm7xynnbq15wksk9c38jhjfd6l1bbzijn5skqc5yik1r5x"; depends=[]; };
   YaleToolkit = derive2 { name="YaleToolkit"; version="4.2.2"; sha256="12wggdyz0wgnmxnqhp8bypyy1x1p50g49fwdzl2l43il44cdyv0g"; depends=[foreach iterators]; };
@@ -2562,16 +2621,16 @@ in with self; {
   ZIM = derive2 { name="ZIM"; version="1.0.2"; sha256="1n4dc0as011gzaac153zq1dfbg1axvmf9znlmhl7xjj4dz4966qm"; depends=[MASS]; };
   ZRA = derive2 { name="ZRA"; version="0.2"; sha256="1sx1q5yf68hhlb5j1hicpj594rmgajqr25llg7ax416j0m2rnagi"; depends=[dygraphs forecast]; };
   ZeBook = derive2 { name="ZeBook"; version="0.5"; sha256="1djwda6hzx6kpf4dbmw0fkfq39fqh80aa3q9c6p41qxzcpim27dw"; depends=[deSolve triangle]; };
-  Zelig = derive2 { name="Zelig"; version="5.0-8"; sha256="0nxjhzqzbih5vrc1ps4mkkgqgapvm9325d5q9zgjvxh6pq8v038m"; depends=[AER Amelia dplyr geepack jsonlite MASS MatchIt maxLik MCMCpack plyr quantreg sandwich survival VGAM]; };
-  ZeligChoice = derive2 { name="ZeligChoice"; version="0.8-1"; sha256="1ql9yq83ipf0vpv63fpckylwq4jrcbfjgjm77f5ndkd83gqjzrmg"; depends=[VGAM Zelig]; };
+  Zelig = derive2 { name="Zelig"; version="5.0-9"; sha256="12x3505pm3gwkwb79yxsz6qmryicnrjwc8bxc0p52m6r8hc7dmdc"; depends=[AER Amelia dplyr geepack jsonlite MASS MatchIt maxLik MCMCpack plyr quantreg sandwich survival VGAM]; };
+  ZeligChoice = derive2 { name="ZeligChoice"; version="0.9-0"; sha256="0mp59mkfbvayml3118kaxsvdqzh7mycnd27fy9dahapvb9qj408l"; depends=[dplyr jsonlite MASS VGAM Zelig]; };
   ZeligMultilevel = derive2 { name="ZeligMultilevel"; version="0.7-1"; sha256="00zlambykds4z1c5kx3rpla1kllyp96cxwvbc5lalwdb9i48pp3s"; depends=[lme4 Zelig]; };
   aCRM = derive2 { name="aCRM"; version="0.1.1"; sha256="0kzp568hd9c9a9qgniia5s5gv0q5f89xfvvwpzb197gqhs3x092v"; depends=[ada dummies kernelFactory randomForest]; };
   aLFQ = derive2 { name="aLFQ"; version="1.3.2"; sha256="1963np2b2x7gbpgwcx0rqxd2psfdfmh72ap1y4p7f37ibjm8g45m"; depends=[caret data_table lattice plyr protiq randomForest reshape2 ROCR seqinr]; };
   aRpsDCA = derive2 { name="aRpsDCA"; version="1.0.1"; sha256="1hxf3lpdcx8h9gndclppsxr8rs048mi3nysjj1z3fgbpmkqnlxgs"; depends=[]; };
   aRxiv = derive2 { name="aRxiv"; version="0.5.10"; sha256="1q8nblb0kfdidcj1nwxn0fap87wpkg49z0bgmwayskwv1p860wrh"; depends=[httr XML]; };
-  aSPU = derive2 { name="aSPU"; version="1.38"; sha256="1i8dg9fw028mj8hyaybmz2p66g4kgvmiqr0ikfqqvv6h8cs6mvy2"; depends=[gee MASS]; };
+  aSPU = derive2 { name="aSPU"; version="1.39"; sha256="1jkgjmaawncs8vr9pwrf2y4hf7jnhmr2d2lhw420c8gwxfaszxyk"; depends=[gee MASS matrixStats mvtnorm Rcpp RcppArmadillo]; };
   aTSA = derive2 { name="aTSA"; version="3.1.2"; sha256="1p3spas0sxj08hkb8p6k2fy64w86prlw1hbnrqnrklr0hnkg2g54"; depends=[]; };
-  abbyyR = derive2 { name="abbyyR"; version="0.2.2"; sha256="1imvq39pjizjjl5h6l5b8fhjbsrwwif4wbzi4b3sxrlnf2p29pbx"; depends=[curl httr readr RecordLinkage XML]; };
+  abbyyR = derive2 { name="abbyyR"; version="0.2.3"; sha256="11qscym5wv8c4c8akapkhbl8xndxfx5c97mzw0l3zzgf4vdns71p"; depends=[curl httr readr RecordLinkage XML]; };
   abc = derive2 { name="abc"; version="2.1"; sha256="0ngzaaz2y2s03fhngvwipmy4kq38xrmyddaz6a6l858rxvadrlhb"; depends=[abc_data locfit MASS nnet quantreg]; };
   abc_data = derive2 { name="abc.data"; version="1.0"; sha256="1bv1n68ah714ws58cf285n2s2v5vn7382lfjca4jxph57lyg8hmj"; depends=[]; };
   abcdeFBA = derive2 { name="abcdeFBA"; version="0.4"; sha256="1rxjripy8v6bxi25vdfjnbk24zkmf752qbl73cin6nvnqflwxkx4"; depends=[corrplot lattice rgl Rglpk]; };
@@ -2580,10 +2639,10 @@ in with self; {
   abd = derive2 { name="abd"; version="0.2-8"; sha256="191gspqzdv573vaw624ri0f5cm6v4j524bjs74d4a1hn3kn6r9b7"; depends=[lattice mosaic nlme]; };
   abf2 = derive2 { name="abf2"; version="0.7-1"; sha256="0d65mc1w4pbiv7xaqzdlw1bfsxf25587rv597hh41vs0j0zlfpxx"; depends=[]; };
   abind = derive2 { name="abind"; version="1.4-3"; sha256="1km61qygl4g3f91ar15r55b13gl8dra387vhmq0igf0sij3mbhmn"; depends=[]; };
-  abn = derive2 { name="abn"; version="0.85"; sha256="1ml4l4fiqscc1ikv0wsi73rymb9599mpnhmzlfnvv4zp3fkfm6qm"; depends=[Cairo]; };
+  abn = derive2 { name="abn"; version="0.86"; sha256="1sqfkm471qxdk7q6i9yw54n357i1frsf8bdh0dgr29ma5nl6yjq4"; depends=[Cairo]; };
   abodOutlier = derive2 { name="abodOutlier"; version="0.1"; sha256="1pvhgxmh23br84r0fbmv7g53z2427birdja96a67vqgz18r3fdvj"; depends=[cluster]; };
   abundant = derive2 { name="abundant"; version="1.0"; sha256="0n2yvq057vq5idi7mynnp15cbsijyyipgbl4p7rqfbbgpk5hy3qb"; depends=[QUIC]; };
-  acc = derive2 { name="acc"; version="1.1.7"; sha256="0b3p46y0d8z43x70yw8haidyk23m9jwsb2sml291p8dl79g8yl8h"; depends=[mhsmm PhysicalActivity zoo]; };
+  acc = derive2 { name="acc"; version="1.2.4"; sha256="17211jrpkn65p07x1547l650y33k3l8cmjj1jgk485kbr4kdzk99"; depends=[mhsmm nleqslv PhysicalActivity plyr zoo]; };
   accelerometry = derive2 { name="accelerometry"; version="2.2.5"; sha256="00mn09j7y39sc7h5srnnfk2l73vhh6zq7rzc0vckfvs72lncmwv5"; depends=[Rcpp]; };
   accrual = derive2 { name="accrual"; version="1.1"; sha256="12zlv34pgmhcvisqk3x09hjpmfj91pn56pkjyj483mcf634m9ha4"; depends=[fgui SMPracticals]; };
   accrued = derive2 { name="accrued"; version="1.3.5"; sha256="10j8vrjgb43bggkf2gn518ccfard2f071mj6nwsxrzkm00pbx32v"; depends=[]; };
@@ -2593,7 +2652,7 @@ in with self; {
   acmeR = derive2 { name="acmeR"; version="1.1.0"; sha256="000b2hqlhj93958nddw0fqb15ahigs08najv2miivym046x04mf7"; depends=[foreign]; };
   acnr = derive2 { name="acnr"; version="0.2.4"; sha256="1nry927zqhb34h9lcixr344n3sxvq1142zwgj8hadlw69dv8m59y"; depends=[R_utils xtable]; };
   acopula = derive2 { name="acopula"; version="0.9.2"; sha256="1z8bs4abbfsdxfpbczdrf1ma84bmh7akwx2ki9070zavrhbf00cf"; depends=[]; };
-  acp = derive2 { name="acp"; version="2.0"; sha256="11ij2xhnkhy7lnzj8fld7habidb9av8a2bk22ycf62f556pqf533"; depends=[quantmod tseries]; };
+  acp = derive2 { name="acp"; version="2.1"; sha256="0lcwbjcyyr32m6qjmjqh25qjwrbyqj1n092xhgbhxzd8fslppnmn"; depends=[quantmod tseries]; };
   acs = derive2 { name="acs"; version="1.2"; sha256="1vw4ghqcz53m3qy7hy2j7nrdinbbqjpwvr1hsvglq31fq7wss3bd"; depends=[plyr stringr XML]; };
   acss = derive2 { name="acss"; version="0.2-5"; sha256="0cqa60544f58l5qd7h6xmsir40b9hqnq6pqgd5hfx2j2l5n7qhmk"; depends=[acss_data zoo]; };
   acss_data = derive2 { name="acss.data"; version="1.0"; sha256="09kl4179ipr8bq19g89xcdi1xxs397zcx5cvgp6viy8gn687ilgv"; depends=[]; };
@@ -2601,7 +2660,7 @@ in with self; {
   actuar = derive2 { name="actuar"; version="1.1-10"; sha256="1bm61inq8vxics33mj9ix36ibc9qp92q1m3ckha42kw8x521m6l4"; depends=[]; };
   ada = derive2 { name="ada"; version="2.0-3"; sha256="1c0nj9k628bcl4r8j0rmyp5f1igdjq6qhjxyif6575fvn2gdzmbw"; depends=[rpart]; };
   adabag = derive2 { name="adabag"; version="4.1"; sha256="0a6hwcr0fg0a99y91i3wxrk6k0f7ldwvz9jr3akmiprc28v8r4zz"; depends=[caret mlbench rpart]; };
-  adagio = derive2 { name="adagio"; version="0.6.1"; sha256="0slch2i3a102621b4fs356gd0apip0h2my9jmkcmwxy9x974755w"; depends=[]; };
+  adagio = derive2 { name="adagio"; version="0.6.3"; sha256="0f5sn25qx0zmwqphd06qppf9j7annqhqxax3jssg37yqjakbbln2"; depends=[quadprog]; };
   adaptDA = derive2 { name="adaptDA"; version="1.0"; sha256="0nk7n628d30jz03a2rmpgzrwwd79rlpqvr6lwhilmkg1gblvz7r1"; depends=[MASS]; };
   adaptMCMC = derive2 { name="adaptMCMC"; version="1.1"; sha256="1y1qxn3qm59nyy9ld5x30p452yam7b2fyl236b14xvpm8g3xx1fa"; depends=[coda Matrix]; };
   adaptTest = derive2 { name="adaptTest"; version="1.0"; sha256="08d7a5dlzhaj236jvaw3c91008l66vf5i4k5anhcs32a3j8yh2iv"; depends=[lattice]; };
@@ -2632,7 +2691,7 @@ in with self; {
   agop = derive2 { name="agop"; version="0.1-4"; sha256="1jwyl02z053rsdw9hryv1nyj9wlq310l51fghp1p0j51c159mlpx"; depends=[igraph Matrix]; };
   agricolae = derive2 { name="agricolae"; version="1.2-3"; sha256="0lly0dpdmc2kk843mdpj7gawffysf2yc31shsyhqlnf0sibblmik"; depends=[AlgDesign cluster klaR MASS nlme spdep]; };
   agridat = derive2 { name="agridat"; version="1.12"; sha256="1b3dgrp6mkfpfaywqdm22sakadhnl1vlyj1n3rq6bc2f0gf8kcrw"; depends=[lattice reshape2]; };
-  agrmt = derive2 { name="agrmt"; version="1.39"; sha256="0qkl8wikvg635mr8v3n9svdicnb8sl4brrh7px1n5jy71h7cswd7"; depends=[]; };
+  agrmt = derive2 { name="agrmt"; version="1.39.3"; sha256="0cnhaja75am0cpjapkl2b6y14q6s4dg7s8p2hqn0610axf58yxp9"; depends=[]; };
   agsemisc = derive2 { name="agsemisc"; version="1.3-1"; sha256="1905q35jgjhghlawql43yh296kbpysp927x3hj750yshz5zayzyr"; depends=[lattice MASS]; };
   ahaz = derive2 { name="ahaz"; version="1.14"; sha256="1z7w5rxd5cya7kxhgxqvn72k87y33ginxra9g7j9wrfs5jgx6kvx"; depends=[Matrix survival]; };
   aidar = derive2 { name="aidar"; version="1.0.0"; sha256="01vs14bz4k504q5lx65b60kyi7hgvjdmib8igiipjmg4snwh8hdk"; depends=[XML]; };
@@ -2641,7 +2700,7 @@ in with self; {
   alabama = derive2 { name="alabama"; version="2015.3-1"; sha256="0mlgk929gdismikwx4k2ndqq57nnqj7mlgvd3479b214hksgq036"; depends=[numDeriv]; };
   ald = derive2 { name="ald"; version="1.0"; sha256="1vphmqhx6wlzsz3s94jsa4mk6wpacp93wfgpj0vp9ljfb3aplhik"; depends=[]; };
   algstat = derive2 { name="algstat"; version="0.0.2"; sha256="1ssdrrwnxrhx3syndqxqcaldlbnjamk3x2yiq7jgxy0qsiadmqsi"; depends=[mpoly Rcpp reshape2 stringr]; };
-  alineR = derive2 { name="alineR"; version="1.1.1"; sha256="0zzj72gwm5z5n679z6jl7vkzs23fmgjnfd2cmfnnlhs0q1l6qbsf"; depends=[]; };
+  alineR = derive2 { name="alineR"; version="1.1.2"; sha256="11ddg93iaq4xpg5rfw8qi82qhnmw6qnbzzsahr80xc0qn3p94i7d"; depends=[]; };
   allan = derive2 { name="allan"; version="1.01"; sha256="02bv9d5ywbq67achfjifb3i7iiaaxa8r9x3qvpri2jl1cxnlf27m"; depends=[biglm]; };
   allanvar = derive2 { name="allanvar"; version="1.1"; sha256="142wy1mf4jbp4hy756rz95w24f4j1dgf14f1n5sd09dg4w98j7xg"; depends=[gplots]; };
   alleHap = derive2 { name="alleHap"; version="0.9.2"; sha256="1hi764kczvza6kkqdnw8rk30r8rf1zfj1lbjiq9xc2lnfminxwiv"; depends=[abind]; };
@@ -2685,8 +2744,8 @@ in with self; {
   apaStyle = derive2 { name="apaStyle"; version="0.2"; sha256="1vkbjlqn36f51yn7vmrcm74airi3mc5i70h2848gcb87f7zcwbh9"; depends=[ReporteRs]; };
   apaTables = derive2 { name="apaTables"; version="1.0.4"; sha256="1ncs79n0jvr6m9gmaazi5d9g2c6c6hf8alrb45z8fy8sj9bj51hn"; depends=[car MBESS rockchalk]; };
   apc = derive2 { name="apc"; version="1.1"; sha256="0gnjniy7gm5fh4wn7vwml3z5bw6ydd1xxq5npvqljbzy4vhh8k5a"; depends=[]; };
-  apcluster = derive2 { name="apcluster"; version="1.4.1"; sha256="1s7wsgimpln5kiy1ai8clq2r0i6vh8mr5v4xjha9phdbm8l8yfbg"; depends=[Matrix Rcpp]; };
-  ape = derive2 { name="ape"; version="3.3"; sha256="1zdgszyi5kwfj3kccx35q8z57p53zdp819hjqdw5z8y6q7b49j1c"; depends=[lattice nlme]; };
+  apcluster = derive2 { name="apcluster"; version="1.4.2"; sha256="1rjqjy7wc6cip9pnbz6sfwr0df0nipy02d48ngkwndph6ywf45y2"; depends=[Matrix Rcpp]; };
+  ape = derive2 { name="ape"; version="3.4"; sha256="11cfw02gm5i21p4k7c8sfg9xmzg57bn9n6zr2j1wryily31gifsz"; depends=[lattice nlme]; };
   apex = derive2 { name="apex"; version="1.0.1"; sha256="188hczb39dqi6xq2hbwhgas9jj9y7bbcsdz0kczimkbqwd9rz7cp"; depends=[adegenet ape phangorn]; };
   aplore3 = derive2 { name="aplore3"; version="0.7"; sha256="1xj3k13wjpsydcrai474b94kyj298islzfpfwn8n51k67h8r4l08"; depends=[]; };
   aplpack = derive2 { name="aplpack"; version="1.3.0"; sha256="0i6jy6aygkqk5gagngdw9h9l579lf0qkiy5v8scq5c015w000aaq"; depends=[]; };
@@ -2696,19 +2755,20 @@ in with self; {
   appnn = derive2 { name="appnn"; version="1.0-0"; sha256="0wkpr6lcd68wlzk6n622ab7sd99l837073czn4k56hw8bw9v68j3"; depends=[]; };
   approximator = derive2 { name="approximator"; version="1.2-6"; sha256="165qvx5946wkv1qsgbmjhmwvik7m23r1vbpnp7claylflgj1ycnm"; depends=[emulator]; };
   aprean3 = derive2 { name="aprean3"; version="1.0.1"; sha256="17rnq02sncl6rzwyln10200s43b8z1s2j0kdi9kgcb6qr51v12rv"; depends=[]; };
+  apricom = derive2 { name="apricom"; version="1.0.0"; sha256="1gyd1yln14cn0iswj7sjs4hav6j6d4f3ncps4gqbci5fwha5blcr"; depends=[logistf penalized rms shrink]; };
   aprof = derive2 { name="aprof"; version="0.3.1"; sha256="1zlpx72lhrc0jwfr4qydh64gvmwy52krfym1slz51r51w31q84x9"; depends=[]; };
   apsimr = derive2 { name="apsimr"; version="1.2"; sha256="14vhsm6am2c2q2sgabnhxr0lgldifss0anjpisrhjqk04njllviy"; depends=[ggplot2 lubridate MASS mgcv reshape2 XML]; };
   apsrtable = derive2 { name="apsrtable"; version="0.8-8"; sha256="1qmm89npjgqij0bh6p393wywl837lfsshp2mv9b5izh1sg2qfwvw"; depends=[]; };
   apt = derive2 { name="apt"; version="2.4"; sha256="1rmzc900c97bgcm6mh0lykqj14h8wgwbs4hszf2ar1pzwxkb7q26"; depends=[car copula erer gWidgets urca]; };
   aqfig = derive2 { name="aqfig"; version="0.8"; sha256="0ha0jb5ag3zx6v7c63lsm81snslzb8y8g565mxjmf7vxpcmzzqsi"; depends=[geoR]; };
-  aqp = derive2 { name="aqp"; version="1.8-6"; sha256="03gwvb5sm9l4vyl0jh9rzjs3ka2qmw4qqh40ywahq3dchpbxmlzd"; depends=[cluster digest Hmisc lattice MASS plotrix plyr RColorBrewer reshape scales sp stringr]; };
+  aqp = derive2 { name="aqp"; version="1.9.3"; sha256="0805d05dvid7s67anlrw61bsdz21hii2c41ar9q8377rzvb4cfsd"; depends=[cluster digest Hmisc lattice MASS plotrix plyr RColorBrewer reshape scales sp stringr]; };
   aqr = derive2 { name="aqr"; version="0.4"; sha256="04frgil3nbxsww66r9x0c6f308pzqr1970prp20bdv9qm3ym5axw"; depends=[RCurl xts]; };
   archdata = derive2 { name="archdata"; version="1.0"; sha256="1hs2pgdaixifqjnwcbrjxlrzng0r2vmv6pdzghsyvzlg28rnq2rk"; depends=[]; };
   archetypes = derive2 { name="archetypes"; version="2.2-0"; sha256="1djzlnl1pjb0ndgpfj905kf9kpgf9yizrcvh4i1p6f043qiy0axf"; depends=[modeltools nnls]; };
-  archiDART = derive2 { name="archiDART"; version="1.1"; sha256="1md8y3nq575y9v4gj963y92as54h6bzaysnmjirk634rravps9ja"; depends=[XML]; };
-  archivist = derive2 { name="archivist"; version="1.7"; sha256="0xx3mk7wdzi3vv4fpsz28hs5asxva9i666vyv6nf2pkjn3aigp67"; depends=[DBI digest httr lubridate RCurl RSQLite]; };
+  archiDART = derive2 { name="archiDART"; version="1.2"; sha256="0kshyad4bhmiry5avkvmnlv5nhpyb1pbb0s9yviazcvj2yx8phwd"; depends=[XML]; };
+  archivist = derive2 { name="archivist"; version="1.8"; sha256="0xafdsada1d5gq4k004s851q9gd8xl96qfxgmm2ss0i53a7a31jw"; depends=[DBI digest git2r httr jsonlite knitr lubridate magrittr RCurl RSQLite]; };
   arf3DS4 = derive2 { name="arf3DS4"; version="2.5-10"; sha256="12cbrk57c9m7fj1x7nfmcj1vp28wj0wymsjdz8ylxhm3jblbgmxc"; depends=[corpcor]; };
-  arfima = derive2 { name="arfima"; version="1.2-7"; sha256="00mc50hssnv7qj6dn1l3jgx8ca4vjkqirc38rv538xwjgw9mm1ms"; depends=[ltsa]; };
+  arfima = derive2 { name="arfima"; version="1.3-4"; sha256="0348zkr8h5la1vh66fifl1fn21hp03k34zv5ga29crmwvvsvk8pi"; depends=[ltsa]; };
   argosfilter = derive2 { name="argosfilter"; version="0.63"; sha256="0rrc2f28hla0azw90a5gk3zj72vxhm1b6yy8ani7r78yyfhgm9ig"; depends=[]; };
   argparse = derive2 { name="argparse"; version="1.0.1"; sha256="03p8dpwc26xz01lfbnmckcx6wzky43dyq71085b0anzsavgx0786"; depends=[findpython getopt proto rjson]; };
   argparser = derive2 { name="argparser"; version="0.3"; sha256="1lwlkrh8hq4p02jmb76nss9qjrgyf5fqqzifv9z8ff1lk7szgmy4"; depends=[]; };
@@ -2722,10 +2782,10 @@ in with self; {
   arrayhelpers = derive2 { name="arrayhelpers"; version="0.76-20120816"; sha256="1q80dykcbqbcigv2f9xg1brfm3835i0zvs0810q6kh682a3hpqbi"; depends=[]; };
   ars = derive2 { name="ars"; version="0.5"; sha256="0m63ljb6b97kmsnmh2z5phmh24d60iddgz46i6ic4rirshq7cpaz"; depends=[]; };
   artfima = derive2 { name="artfima"; version="1.1"; sha256="1qilb86lbmpm8jrlvv6gf06gsrn2ayvmr3c8y3a82hh2h4skzjs6"; depends=[gsl ltsa]; };
-  arules = derive2 { name="arules"; version="1.3-0"; sha256="0r1b1vdw1kjlcg8srs69vi1is90f18mbvv4rarx38qv7zacl9ajq"; depends=[Matrix]; };
+  arules = derive2 { name="arules"; version="1.3-1"; sha256="11js2zghyh3iryaqnx21jmnf4mnfg58nv74lbh21wsx42rb0ah68"; depends=[Matrix]; };
   arulesNBMiner = derive2 { name="arulesNBMiner"; version="0.1-5"; sha256="1q4sx6c9637kc927d0ylmrh29cmn4mv5jxxpl09yaclzfihjlk9a"; depends=[arules rJava]; };
-  arulesSequences = derive2 { name="arulesSequences"; version="0.2-11"; sha256="1zq841hlhy47xrjrslyf0fx6wdn3yq8p6fjaxdhcjvwzg0qlyr3q"; depends=[arules]; };
-  arulesViz = derive2 { name="arulesViz"; version="1.0-4"; sha256="04lfg3bdf2wawpggwlhqrk242qq416lfciy9xgzmn919q7p6fhns"; depends=[arules igraph scatterplot3d seriation vcd]; };
+  arulesSequences = derive2 { name="arulesSequences"; version="0.2-12"; sha256="0bwaqh9p3wjxx3gr84bvd24s1q7vxqplafl0fp17g190fd2x511b"; depends=[arules]; };
+  arulesViz = derive2 { name="arulesViz"; version="1.1-0"; sha256="0kapvhrbxsn8pw6gfabnswzzgwgs621riq54xrlswicn5p2ywgxy"; depends=[arules colorspace igraph scatterplot3d seriation vcd]; };
   asVPC = derive2 { name="asVPC"; version="1.0.2"; sha256="07nfwr0lsfpwgfdgzcdn1svw8dnjfni5ga9q77yjd1bj0wf76ci2"; depends=[ggplot2 plyr]; };
   asbio = derive2 { name="asbio"; version="1.2-5"; sha256="05bk84qvqk6mk5xpzbhri60qhpsvza01yk5rni1qj7rxm7lxnmk8"; depends=[deSolve lattice multcompView mvtnorm pixmap plotrix scatterplot3d]; };
   ascii = derive2 { name="ascii"; version="2.1"; sha256="19dfbp7k4bjxjn8wdzhbmz7g3za6gn8vcnd5qkm4dz7gg1fg7b8p"; depends=[]; };
@@ -2759,7 +2819,7 @@ in with self; {
   aster2 = derive2 { name="aster2"; version="0.2-1"; sha256="1gr9hx0mhyan0jy7wsl4ccsx9ahlvhfiq0j1xnffa4m3hzazisn5"; depends=[]; };
   astro = derive2 { name="astro"; version="1.2"; sha256="1c7zrycgj2n8gz50m94ys1dspilds91s1b2pwaq6df1va17pznby"; depends=[MASS plotrix]; };
   astroFns = derive2 { name="astroFns"; version="4.1-0"; sha256="0g5q0y067xf1ah91b4lg8mr9imj0d6lgig7gbj3b69fn335k363g"; depends=[]; };
-  astrochron = derive2 { name="astrochron"; version="0.4.3"; sha256="09c0mhf7an5i0c7v94w2jav13ljbc9d1czn8qwcjmhqgnz54cniz"; depends=[fields IDPmisc multitaper]; };
+  astrochron = derive2 { name="astrochron"; version="0.5"; sha256="16zgjc5x5dzscvb1cki65p23c3kp1rad2x82bjcr4i0hg8xqs4ig"; depends=[fields IDPmisc multitaper]; };
   astrodatR = derive2 { name="astrodatR"; version="0.1"; sha256="00689px4znwmlp6qbj6z2a51b7ylx1yrrjpv6zjkvrwpv6lyj9fw"; depends=[]; };
   astrolibR = derive2 { name="astrolibR"; version="0.1"; sha256="0gkgry5aiz29grp9vdq9zgg6ss47ql08nwcmz1pfvd0g0h9h75l8"; depends=[]; };
   astsa = derive2 { name="astsa"; version="1.3"; sha256="01bslr6hww029097244r5l4bz4v7z46gpihw39har8h0xicl6ywk"; depends=[]; };
@@ -2768,6 +2828,8 @@ in with self; {
   atmcmc = derive2 { name="atmcmc"; version="1.0"; sha256="05k69b5wlysz3kh0yiqvshgvr0nyz34zkvn6bjs30cwz7s9j21pn"; depends=[]; };
   atsd = derive2 { name="atsd"; version="1.0.8441"; sha256="1jz2bdgvk1wamrm8r9ygprhyf0z3mdk9c1pwlb4bfmwvbnqd0yqa"; depends=[httr RCurl]; };
   attribrisk = derive2 { name="attribrisk"; version="0.1"; sha256="1zqx53mxz2hh9jyanf3jkadgpj44jbqrk4p13fas91zvhpw9pn5s"; depends=[boot survival]; };
+  auRoc = derive2 { name="auRoc"; version="0.1-0"; sha256="1ijk127p6g5mzc7b4b9lnjnfzvklz3g8w6bckrdahlw7djd9mgz1"; depends=[coda MBESS ProbYX rjags]; };
+  aucm = derive2 { name="aucm"; version="2016.1-2"; sha256="1nyxxyivs6inq8r18x7fl3zkpn75sczwnbzsv672nzdlqj5d2b5f"; depends=[kyotil]; };
   audio = derive2 { name="audio"; version="0.1-5"; sha256="1hv4052n2r6jkzkilhkfsk4dj1xhbgk4bhba2ca9nf8ag92jkqml"; depends=[]; };
   audiolyzR = derive2 { name="audiolyzR"; version="0.4-9"; sha256="09jsrjy15vcn6da0kgk06ghayyrf3s853gqv8qdawg745ky2hbgi"; depends=[hexbin plotrix RJSONIO]; };
   audit = derive2 { name="audit"; version="0.1-1"; sha256="0hrcdcwda5c0snskrychiyfjcbnymkcl2x43bapb6inw9y8989qv"; depends=[]; };
@@ -2777,6 +2839,7 @@ in with self; {
   autovarCore = derive2 { name="autovarCore"; version="1.0-0"; sha256="08h51bh1m3d47nprd5z7v3k3lkrixbxwinr73zd5442wskf4x82v"; depends=[Amelia jsonlite Rcpp urca vars]; };
   averisk = derive2 { name="averisk"; version="1.0"; sha256="0lgkkgj3hcjhx36nsq7aa3psdb26shiskpmwwglqs6zabw3apxj6"; depends=[MASS]; };
   aws = derive2 { name="aws"; version="1.9-4"; sha256="11vbsg4yhnl4995m8gq5gykrlk61y3a618g2zxkc9wdf5z4xqdny"; depends=[awsMethods gsl]; };
+  aws_signature = derive2 { name="aws.signature"; version="0.2.0"; sha256="0g2cxhvf27h1in9iwb74y85rg3w4w4py608f2ybdjgix3lxk60ag"; depends=[digest]; };
   awsMethods = derive2 { name="awsMethods"; version="1.0-3"; sha256="1r6rbrlc5wbljp2x9aqhhnjblnb3gjm217x0cbmrw1pa0cf7q5jq"; depends=[]; };
   aylmer = derive2 { name="aylmer"; version="1.0-11"; sha256="1b6dryvfz9yp00nj8lv8j1isnshcgwn9fx41knah9pw7dn4pxkk2"; depends=[Brobdingnag]; };
   b6e6rl = derive2 { name="b6e6rl"; version="1.1"; sha256="17scdskn677vaxx1h2jypqaffvjgczryplg17nr3wigi1x0cxg7a"; depends=[]; };
@@ -2794,7 +2857,7 @@ in with self; {
   bagRboostR = derive2 { name="bagRboostR"; version="0.0.2"; sha256="1k9w98p3ad3myzyqhcrc4rsn7196qvhnmk5ddx3fpd1rdvy2dnby"; depends=[randomForest]; };
   bamdit = derive2 { name="bamdit"; version="2.0.1"; sha256="105y4cayymqhd3f7dk297syv966pba9cjg6dx9jabcximicdw4l9"; depends=[ggplot2 gridExtra R2jags rjags]; };
   bandit = derive2 { name="bandit"; version="0.5.0"; sha256="03mv4vbn9g4mqikd9map33gmw2fl9xvb62p7gpxs1240w5r4w3fp"; depends=[boot gam]; };
-  bapred = derive2 { name="bapred"; version="0.1"; sha256="04p9pzqsisdc21w90qfbjckwl7mqnyhgkyq1qlc58jrxsxnarcxa"; depends=[FNN fuzzyRankTests glmnet lme4 MASS mnormt sva]; };
+  bapred = derive2 { name="bapred"; version="0.2"; sha256="18vm5ipnajq7d7sbddj88an66ibgl2crq04cj6m7mg37j00mm412"; depends=[FNN fuzzyRankTests glmnet lme4 MASS mnormt sva]; };
   barcode = derive2 { name="barcode"; version="1.1"; sha256="14zh714cwgq80zspvhw88cs5b82gvz4b6yfbshj9b7x0y2961nxd"; depends=[lattice]; };
   bartMachine = derive2 { name="bartMachine"; version="1.2.0"; sha256="0hcz39397v2y8qgdy67i97j0z5g2qidkkf5p9ydcqp9fp5msshq7"; depends=[car missForest randomForest rJava]; };
   base64 = derive2 { name="base64"; version="1.1"; sha256="1wn3zj1qlgybzid4nr6hvlyqg1rp2dwfh88vxrfby2fy2ba1nl5x"; depends=[]; };
@@ -2805,19 +2868,20 @@ in with self; {
   batch = derive2 { name="batch"; version="1.1-4"; sha256="03v8a1hsjs6nfgmhdsv6fhy3af2vahc67wsk71wrvdxwslmn669q"; depends=[]; };
   batchmeans = derive2 { name="batchmeans"; version="1.0-2"; sha256="126q7gyb1namhb56pi0rv9hchlghjr95pflmmpwhblqfq27djss2"; depends=[]; };
   batman = derive2 { name="batman"; version="0.1.0"; sha256="0ccgx506p4iri23k2ikb8jmh04dp08w66785bv52iy8kd359h43f"; depends=[Rcpp]; };
-  batteryreduction = derive2 { name="batteryreduction"; version="0.1.0"; sha256="0h0630vk30svnwnim29mqf46d8mnlcc56az1k1b98l30h1gg78av"; depends=[pracma]; };
+  batteryreduction = derive2 { name="batteryreduction"; version="0.1.1"; sha256="0j838q7063bplkzd50kmnxji80cgysfsq7m1qifv8z7a2zsh8c8g"; depends=[pracma]; };
   bayesDccGarch = derive2 { name="bayesDccGarch"; version="1.2"; sha256="15skkm4vmqj1r0vic1wgr58x8c7p6igvlmafbv0c46yl224qgryv"; depends=[coda numDeriv]; };
   bayesDem = derive2 { name="bayesDem"; version="2.4-1"; sha256="0s2dhy8c90smvaxcng6ixhjm7kvwwz2c4lgplynrggrm8rfb19ay"; depends=[bayesLife bayesPop bayesTFR gWidgets gWidgetsRGtk2 RGtk2 wpp2012]; };
-  bayesGARCH = derive2 { name="bayesGARCH"; version="2.0.1"; sha256="1gz18wjikkg3yf71b1g21cx918dyz89f5m295iv8ah807cdx7vjk"; depends=[coda mvtnorm]; };
+  bayesGARCH = derive2 { name="bayesGARCH"; version="2.0.2"; sha256="1fl1sdila3b7a6ikmay1bxyx6am2mqa9nvf29b9r38002dj5ylz2"; depends=[coda mvtnorm]; };
   bayesGDS = derive2 { name="bayesGDS"; version="0.6.1"; sha256="0134x5knwp9pmkjyzgi1k7hjj92sym1p0zq98sizlbs0mff2p2s4"; depends=[Matrix]; };
-  bayesLife = derive2 { name="bayesLife"; version="2.2-0"; sha256="09r915azz60ca5b4w0kkd8x8mb0cxz36lapakdmgrgxd4qax17nv"; depends=[bayesTFR car coda hett wpp2012]; };
+  bayesLife = derive2 { name="bayesLife"; version="3.0-0"; sha256="0ssmg5yrwyx53lj8iicpnrngpn8gjdxd47xvndb110k7cqzkfyf0"; depends=[bayesTFR car coda hett wpp2015]; };
   bayesMCClust = derive2 { name="bayesMCClust"; version="1.0"; sha256="14cyvcyx3nmkbvsy7n4xjp7zvcgdhy013dv9d72y8j5dvlv82pb4"; depends=[bayesm boa e1071 gplots gtools MASS mnormt xtable]; };
   bayesPop = derive2 { name="bayesPop"; version="5.4-0"; sha256="0v3k9dp1f8g41zng9w94phpd094y9g7qsnkyx9xw1jslz2f1s048"; depends=[abind bayesLife bayesTFR fields googleVis plyr rworldmap wpp2012]; };
   bayesQR = derive2 { name="bayesQR"; version="2.2"; sha256="0w5fg7hdwpgs2dg4vzcdsm60wkxgjxhcssw9jzig5qgdjdkm07nm"; depends=[]; };
   bayesSurv = derive2 { name="bayesSurv"; version="2.6"; sha256="0lam6w0niy30wgzbc3zrwbfz291whig20prjzdpcpv91syrnw687"; depends=[coda smoothSurv survival]; };
-  bayesTFR = derive2 { name="bayesTFR"; version="4.2-0"; sha256="0c94498ncjzzv8xmi08kw87bqjarg1gg7ls5q4qcz6bhbhsmg2dr"; depends=[coda MASS mvtnorm wpp2012]; };
+  bayesTFR = derive2 { name="bayesTFR"; version="5.0-0"; sha256="0mg27lcx1ydakakn07sxadfxk2dyk29n222fhpfd5fgbhg72kixc"; depends=[coda MASS mvtnorm wpp2015]; };
   bayescount = derive2 { name="bayescount"; version="0.9.99-5"; sha256="0c2b54768wn72mk297va3k244256xlsis9cd6zn6q5n1l7ispj6j"; depends=[coda rjags runjags]; };
   bayesm = derive2 { name="bayesm"; version="3.0-2"; sha256="014l14k8fraxjqfch2s6ydgp1mcljvj4cgrznjyz2l35fwj3rcf3"; depends=[Rcpp RcppArmadillo]; };
+  bayesmeta = derive2 { name="bayesmeta"; version="1.1"; sha256="15f81n8pnrq1s49gw0bzkc8gawn7m2rj5d24bbxak64jkxclgkd9"; depends=[]; };
   bayesmix = derive2 { name="bayesmix"; version="0.7-4"; sha256="1qms1nnk2nq3gqr8zf2b9ri4wv8jrxv5i8s087k1rwdvya3k5r9a"; depends=[coda rjags]; };
   bayespref = derive2 { name="bayespref"; version="1.0"; sha256="0gwlzs7qkgmf90np7xv85d27jjqggyhfj00vpya664a2znyjb3jm"; depends=[coda lattice MASS MCMCpack RColorBrewer]; };
   bayess = derive2 { name="bayess"; version="1.4"; sha256="0axipk5hn2hw3g4dfh7y3xa0dxqmi8kqpbr77nl14y7ydpija6xm"; depends=[combinat gplots MASS mnormt]; };
@@ -2826,7 +2890,7 @@ in with self; {
   bbemkr = derive2 { name="bbemkr"; version="2.0"; sha256="015c57s8mpimm82nddnh382wlkisxgdmc2hvp7k38pcnqxc5gb5q"; depends=[MASS]; };
   bbmle = derive2 { name="bbmle"; version="1.0.17"; sha256="1j3x2glnn0i0fc0mmafwkkqh1js90g8q7gix2vrhif0pmwinsrak"; depends=[lattice MASS numDeriv]; };
   bbo = derive2 { name="bbo"; version="0.2"; sha256="19xrbla3bb3csg3gjjrpkgyr379zfwyh293bcrcd6j8rnm6g4i01"; depends=[]; };
-  bc3net = derive2 { name="bc3net"; version="1.0.2"; sha256="0iakqf4apscxb4mb5klj9qklbi25dmdd77la3ads2y882gm2nj0z"; depends=[c3net igraph infotheo lattice Matrix]; };
+  bc3net = derive2 { name="bc3net"; version="1.0.3"; sha256="0plzi5ncm3izw4k97rlyrvbnhc5zcd8mv2ldp3wy9zav0x168jda"; depends=[c3net igraph infotheo lattice Matrix]; };
   bcRep = derive2 { name="bcRep"; version="1.2.2"; sha256="0mr0i23gis65lq65k71jqd35n93vfcx5bz0rbqwl1g2dhn64z68z"; depends=[doParallel foreach gplots ineq vegan]; };
   bclust = derive2 { name="bclust"; version="1.5"; sha256="01kx02azj26b6swly53zhf3sny6c6jglkxnzylsc0pvri89x7yj2"; depends=[]; };
   bcp = derive2 { name="bcp"; version="4.0.0"; sha256="1bkd7812jacyk955l71b2szpc9550p0hpv3x337qgl09zck4vdgm"; depends=[Rcpp RcppArmadillo]; };
@@ -2857,7 +2921,7 @@ in with self; {
   berryFunctions = derive2 { name="berryFunctions"; version="1.9.0"; sha256="0j3nfby1c54y3p66zwb7826z98x2b0isndabfm1ma90y9nbl2p1m"; depends=[]; };
   bestglm = derive2 { name="bestglm"; version="0.34"; sha256="0b6lj91v0vww0fy50sqdn99izkxqbhv83y3zkyrrpvdzwia4dg9w"; depends=[leaps]; };
   betafam = derive2 { name="betafam"; version="1.0"; sha256="1nf5509alqnr5qpva36f1wb7rdnc084p170h91jv89xvzsidqxca"; depends=[]; };
-  betalink = derive2 { name="betalink"; version="2.1.0"; sha256="1mhszdgj6wr48380gm3isgnsrdvdw1q1x3k4213sfmqaqrpsgmaq"; depends=[igraph plyr stringr]; };
+  betalink = derive2 { name="betalink"; version="2.2.0"; sha256="0gqkrrak44ipnl2k4bb6a52c65csgnh4jha00yrh8cclbfsv75wf"; depends=[igraph plyr stringr]; };
   betapart = derive2 { name="betapart"; version="1.3"; sha256="0h2y2c3q6njzh2rlxh8izgkrq9y7abkbb0b13f2iyj9pnalvdv52"; depends=[ape geometry picante rcdd]; };
   betaper = derive2 { name="betaper"; version="1.1-0"; sha256="1gr533iw71n2sq8gga9kzlah7k28cnlwxb2yh562gw6mh1axmidm"; depends=[ellipse vegan]; };
   betareg = derive2 { name="betareg"; version="3.0-5"; sha256="1zpj1x5jvkn7d8jln16vr4xziahng0f54vb4gc4vs03z7c853i4a"; depends=[flexmix Formula lmtest modeltools sandwich]; };
@@ -2894,6 +2958,7 @@ in with self; {
   bimixt = derive2 { name="bimixt"; version="1.0"; sha256="0nhszpzjqy8z3vngl5jdzqxzshnn92wgi0ci5n3n5kzi24xkfrzc"; depends=[pROC]; };
   binGroup = derive2 { name="binGroup"; version="1.1-0"; sha256="1sf7prg2x1ryynf1kz7jr50svmga7kjgd5pi9qm3g2hyimz8mvs4"; depends=[]; };
   binMto = derive2 { name="binMto"; version="0.0-6"; sha256="1h9s42wk848x15f4glhsh2iikpra64miwlia6xz5dqlzbs4vw86k"; depends=[mvtnorm]; };
+  binaryLogic = derive2 { name="binaryLogic"; version="0.2.6"; sha256="0p6qa50rm2rwn43n1n5kgh58l7186994f6n6zfbsmy4dnn98x3zm"; depends=[]; };
   binda = derive2 { name="binda"; version="1.0.3"; sha256="15rhxnlif7agblzd09gyllkqkf5d8cc75b4vmp7grx8a6y7w47g0"; depends=[entropy]; };
   bindata = derive2 { name="bindata"; version="0.9-19"; sha256="15ya21fz1kvq4qsppkn9ypiqvaq8q4vszdcgcymampa7zc07z2ld"; depends=[e1071 mvtnorm]; };
   binequality = derive2 { name="binequality"; version="0.6.1"; sha256="18pcz5b65zk6fwh597pcbpyy0j7gkxp5swwadxvsa3cainvyd07n"; depends=[gamlss gamlss_cens gamlss_dist ineq survival]; };
@@ -2902,15 +2967,17 @@ in with self; {
   binom = derive2 { name="binom"; version="1.1-1"; sha256="0mjj92dqf5q69jxzqya4izb1mly3mkydbnmlm4wb3zqqg82a324c"; depends=[]; };
   binomSamSize = derive2 { name="binomSamSize"; version="0.1-3"; sha256="0hryaf0y3yjxp84c0k80mhxj8zzlad697bv2yrvcjvllkzdvzbm7"; depends=[binom]; };
   binomTools = derive2 { name="binomTools"; version="1.0-1"; sha256="14594i7iapd6hy4j36yb88xmrbmczg8zgbs0b6k0adnmqf83bn4v"; depends=[]; };
+  binomen = derive2 { name="binomen"; version="0.1.0"; sha256="0r89xcbp0jjirr36j3i4xmdjn2wh142c0jv1whzpzjdmcsh806g6"; depends=[dplyr jsonlite lazyeval]; };
   binomialcftp = derive2 { name="binomialcftp"; version="1.0"; sha256="00c7ymlxk1xnx3x1814x7bcyir7q5sy4rb82dcpzf2bdly4xa1qr"; depends=[]; };
   binomlogit = derive2 { name="binomlogit"; version="1.2"; sha256="1njz1g9sciwa8q6h0zd8iw45vg3i1fwcvicj5y8srpk8wqw3qp7k"; depends=[]; };
   binr = derive2 { name="binr"; version="1.1"; sha256="0kgk91zy7bdrhpkh9c5bi206y9hjwjwzb508i8qqmznqyxmza70r"; depends=[]; };
   binseqtest = derive2 { name="binseqtest"; version="1.0.1"; sha256="0snlrwmmmwrl3fj8652rllgays737m020qc3fqv4sfp1vn6aayng"; depends=[clinfun]; };
   bio_infer = derive2 { name="bio.infer"; version="1.3-3"; sha256="14pdv6yk0sk6v8g9p6bazbp7mr3wmxgfi6p6dj9n77lhqlvjcgm9"; depends=[]; };
-  bio3d = derive2 { name="bio3d"; version="2.2-3"; sha256="10aih6a8j83bl42vq0aah2mr37qmjgpkny9i52v5a8rcd3wxgbsq"; depends=[]; };
+  bio3d = derive2 { name="bio3d"; version="2.2-4"; sha256="0kzbg4rzpbs3qicbg9cfqggm9fzy81waw6b0n1kn2yc9azlqwgvz"; depends=[]; };
   bioPN = derive2 { name="bioPN"; version="1.2.0"; sha256="0mvqgsfc7d4h6npgg728chyp5jcsf49xhnq8cgjxfzmdayr1fwr8"; depends=[]; };
   biogas = derive2 { name="biogas"; version="1.2.1"; sha256="0prp9s60d133s94n78m2rvlaph98j1xpsw2ykwkp33mq4sgjqbkq"; depends=[]; };
   biogram = derive2 { name="biogram"; version="1.2"; sha256="1kklidp1nm9jb0nvlhlhxklh4fp86plfsslp4ajnv8i4rc6h0v19"; depends=[bit entropy slam]; };
+  bioinactivation = derive2 { name="bioinactivation"; version="1.0.1"; sha256="16k28ylddsn3d3hr1dkd5zqghglyxbdr0vaxcj08qb1vfp9dfnhf"; depends=[deSolve dplyr FME lazyeval]; };
   biom = derive2 { name="biom"; version="0.3.12"; sha256="18fmzp2zqjk7wm39yjlln7mpw5vw01m5kmivjb26sd6725w7zlaa"; depends=[Matrix plyr RJSONIO]; };
   biomartr = derive2 { name="biomartr"; version="0.0.2"; sha256="1a2a5jjb132a8ms21cdn9k0csbdypi9jww8j3vkgcr549n55lw0j"; depends=[biomaRt Biostrings data_table downloader dplyr httr RCurl stringr XML]; };
   biomod2 = derive2 { name="biomod2"; version="3.1-64"; sha256="0ymqscsdp5plhnzyl256ws9namqdcdxq3w5g79ymfpymfav10h3a"; depends=[abind gbm ggplot2 MASS mda nnet pROC randomForest raster rasterVis reshape rpart sp]; };
@@ -2940,7 +3007,7 @@ in with self; {
   blme = derive2 { name="blme"; version="1.0-4"; sha256="1ca2b0248k0fj3lczn9shfjplz1sl4ay4v6djldizp2ch2vwdgy2"; depends=[lme4]; };
   blmeco = derive2 { name="blmeco"; version="1.1"; sha256="1hzg5dimzj1khygm9dv0y30mx1nf9vdhgicqdg1rvj7nf426h2ki"; depends=[arm lme4 MASS MuMIn]; };
   blockTools = derive2 { name="blockTools"; version="0.6-2"; sha256="0h04179ybklwbs69rg73p5h09fi3vzagh845r00ivw4iv18anq40"; depends=[MASS]; };
-  blockcluster = derive2 { name="blockcluster"; version="3.0.2"; sha256="1qd92lj3ckrj7cvl9zs85igb0974wy5s4zwdnvfyvrsi2bqi3qp8"; depends=[Rcpp RcppEigen]; };
+  blockcluster = derive2 { name="blockcluster"; version="4.0.2"; sha256="0pvsi56v2dm9mz9a2h401z5h07ln5hfrgch2r6jmgnyg26kxa72r"; depends=[Rcpp rtkore]; };
   blockmatrix = derive2 { name="blockmatrix"; version="1.0"; sha256="14k69ly4i8pb8z59005kaf5rpv611kk1mk96q6piyn1gz1s6sk6r"; depends=[]; };
   blockmodeling = derive2 { name="blockmodeling"; version="0.1.8"; sha256="0x71w1kysj9x6v6vsirq0nndsf6f3wzkf8pbsq3x68sf4cdji1xl"; depends=[]; };
   blockmodels = derive2 { name="blockmodels"; version="1.1.1"; sha256="088629i4g63m8rnqmrv50dgpqbnxd1a4zl5wr3ga0pdpqhmd53wp"; depends=[digest Rcpp RcppArmadillo]; };
@@ -2956,11 +3023,12 @@ in with self; {
   bmp = derive2 { name="bmp"; version="0.2"; sha256="059ps1sy02b22xs138ba99fkxq92vzgfbyf2z5pyxwzszahgy869"; depends=[]; };
   bmrm = derive2 { name="bmrm"; version="3.0"; sha256="0ix5hfsvs2vnca0l1aflynddw6z85cqdyxn0y7xynkkapk182g4p"; depends=[LowRankQP lpSolve]; };
   bnclassify = derive2 { name="bnclassify"; version="0.3.2"; sha256="0nbbna2qr57xvc7paqxaahff0r6gk92hz3gyk8v5kdb3hpcw8ph6"; depends=[assertthat entropy graph matrixStats RBGL rpart]; };
-  bnlearn = derive2 { name="bnlearn"; version="3.8.1"; sha256="07lh67nw7wpjimim44zpw8h1rq4yqa2sdjcwj95bmyc25hlzv1s1"; depends=[]; };
+  bnlearn = derive2 { name="bnlearn"; version="3.9"; sha256="19c3qda4lkzasgrjra0y3w8bg3jf9cp4lgaal7p43nlfani8y2xw"; depends=[]; };
   bnormnlr = derive2 { name="bnormnlr"; version="1.0"; sha256="0l2r7vqikak47nr6spdzgjzhvmkr9dc61lfnxybmajvcyy6ymqs9"; depends=[mvtnorm numDeriv]; };
   bnpmr = derive2 { name="bnpmr"; version="1.1"; sha256="0hvwkdbs2p2l0iw0425nca614qy3gsqfq4mifipy98yxxvgh8qgc"; depends=[]; };
   bnstruct = derive2 { name="bnstruct"; version="1.0"; sha256="1bc4q5gk56xmmsiglg8434hpl3lvbyg9hgv5xx5b8law6hn5znz4"; depends=[bitops igraph Matrix]; };
   boa = derive2 { name="boa"; version="1.1.8-1"; sha256="15nkr24hgv1286h9b6sdhlpljnm98fi5mmpsygl76h24dayy3854"; depends=[]; };
+  bodenmiller = derive2 { name="bodenmiller"; version="0.1"; sha256="0gqrjscgq4qgk7yl32w0965yscc1py9klr49s8q8hkzyihlwzim2"; depends=[]; };
   boilerpipeR = derive2 { name="boilerpipeR"; version="1.3"; sha256="0467bjqhdmi3p02fp0r7rgm00x9ry464f2hniav990qzsw8i16q6"; depends=[rJava]; };
   bold = derive2 { name="bold"; version="0.3.0"; sha256="11b5zqyhvg3cc47mk8r7h219abj12paxcdb23gxqgkyrhlykkbks"; depends=[assertthat httr jsonlite plyr reshape stringr XML]; };
   boolean3 = derive2 { name="boolean3"; version="3.1.6"; sha256="00s6ljhqy8gpwa3kxfnm500r528iml53q364bjcl4dli2x85wa9p"; depends=[lattice mvtnorm numDeriv optimx rgenoud rlecuyer]; };
@@ -2987,6 +3055,7 @@ in with self; {
   bpcp = derive2 { name="bpcp"; version="1.2.6"; sha256="0yn1d2sjl53b1c4g6b91v8j8d0rymcn25547zi4c7rafz4ips1gl"; depends=[]; };
   bpkde = derive2 { name="bpkde"; version="1.0-7"; sha256="1ls6rwmbgb2vzsjn34r87ab8rnz3ls61g6f4x3jpglbk0j91f0h8"; depends=[]; };
   bqtl = derive2 { name="bqtl"; version="1.0-30"; sha256="1v1p3wvqm5hmwpnjqaz8vlpzm036gpzpxsvy7m0v4x7nc5vrq7g6"; depends=[]; };
+  brainGraph = derive2 { name="brainGraph"; version="0.55.0"; sha256="11swjhpnnb6a2bq0xa0ai9jgzv0c481hc92rq1vpg1wzrlzz12rc"; depends=[abind ade4 boot cairoDevice data_table foreach ggplot2 Hmisc igraph oro_nifti plyr RGtk2 scales]; };
   brainR = derive2 { name="brainR"; version="1.2"; sha256="1515v6kk73p4s3vrnkpkilfxfyqrf7b762sq6j364ygsyfybvh2z"; depends=[misc3d oro_nifti rgl]; };
   brainwaver = derive2 { name="brainwaver"; version="1.6"; sha256="0r79dpd9bbbn34rm29512srzj3m29qgvbryvrp1mwv8mmcsh6ij6"; depends=[waveslim]; };
   breakage = derive2 { name="breakage"; version="1.1-1"; sha256="0zjazyz92criiimpz4wyd4hd8ccspvh3hhqpd4qkfdzdf9wp3kns"; depends=[Imap]; };
@@ -2999,36 +3068,37 @@ in with self; {
   brms = derive2 { name="brms"; version="0.6.0"; sha256="14w85nk4ksi06mn69cn1rkzicpk1kzl1z75mkrwgbmp8gb4s9c10"; depends=[abind ggplot2 gridExtra loo rstan shinystan statmod]; };
   brnn = derive2 { name="brnn"; version="0.5"; sha256="0kf2fdgshk8i3jlxjfgpdfq08kzlz3k9s7rdp4bg4lg3khmah9d1"; depends=[Formula]; };
   broman = derive2 { name="broman"; version="0.59-5"; sha256="0sl7ppdy0d3mnnp7vz98ingv9irv58xjazf3rx473qw811ybcjdn"; depends=[assertthat ggplot2 jsonlite RPushbullet]; };
-  broom = derive2 { name="broom"; version="0.3.7"; sha256="00z4kwxdqp6g35g4x6js9rc96z8i40hzgvhf5frj9dwfpxclk145"; depends=[dplyr plyr psych stringr tidyr]; };
-  brotli = derive2 { name="brotli"; version="0.3"; sha256="1jp70rpkkar9bkf0rva41knm2a4d5schijhkfn0021sgl9bsx9ya"; depends=[]; };
+  broom = derive2 { name="broom"; version="0.4.0"; sha256="0k9sbb4c4ncgnrsdr9bcl8nr57xdygjhh19mm8c7ymnsr56xcvxp"; depends=[dplyr nlme plyr psych reshape2 stringr tidyr]; };
+  brotli = derive2 { name="brotli"; version="0.4"; sha256="1d23r0dy9v9qgigixri7dkmr3jwx4cqhnwb8f1nrc7kmlvag8aw3"; depends=[]; };
   brr = derive2 { name="brr"; version="1.0.0"; sha256="050ivnqcaxiyypd1sxfpy6ianhzzmvs6c77ga40g3440cvfigkgw"; depends=[gsl hypergeo pander stringr SuppDists TeachingDemos]; };
   brranching = derive2 { name="brranching"; version="0.1.0"; sha256="17n11i2wq16jzs1lk3wwyzfgacbm692g99vlakdqnr2a1c1vpfah"; depends=[ape httr taxize]; };
   bshazard = derive2 { name="bshazard"; version="1.0"; sha256="151c63pyapddc4z77bgkhmd7rsa1jl47x8s2n2s8yc6alwmj6dvs"; depends=[Epi survival]; };
   bspec = derive2 { name="bspec"; version="1.5"; sha256="0jynvir7z4q1vrvhdn6wijdrjfrkk4544nlawabw2fnfxss91a91"; depends=[]; };
   bspmma = derive2 { name="bspmma"; version="0.1-1"; sha256="0bd6221rrbxjvabf1lqr9nl9s0qwav47gc56sxdw32pd99j9x5a9"; depends=[]; };
   bssn = derive2 { name="bssn"; version="0.6"; sha256="0ngxczmi5d83zi18s8qk67w5jhlly9jvgxy2xk0d306qda6pgqds"; depends=[sn]; };
-  bst = derive2 { name="bst"; version="0.3-4"; sha256="1s7qv2q9mcgg1c5mhblqg3nk9hary4pq6z0xgi3a6rs1929mgdyf"; depends=[gbm rpart]; };
+  bst = derive2 { name="bst"; version="0.3-11"; sha256="1wzpymg92f4ymz6hdqsnrgrzypa3kvy7h1y0iym2ckyswpcv65xq"; depends=[doParallel foreach gbm rpart]; };
   bsts = derive2 { name="bsts"; version="0.6.2"; sha256="0m18yl9c12p19psx3iz7swlblgbkmyyvfls5g74gm8qbbhbxmdsk"; depends=[BH Boom BoomSpikeSlab xts zoo]; };
-  btergm = derive2 { name="btergm"; version="1.5.9"; sha256="032rdgik4gsd8wh50s9q6j88p50n76q8fhgs67x2j67rv7bli61b"; depends=[boot coda ergm Matrix network ROCR sna speedglm statnet statnet_common texreg xergm_common]; };
+  btergm = derive2 { name="btergm"; version="1.6"; sha256="13wd137c33i5acj4k1fvwnnawkk2bdrnz1gr9083ipx25shxc4kk"; depends=[boot coda ergm igraph Matrix network ROCR sna speedglm statnet statnet_common texreg xergm_common]; };
   btf = derive2 { name="btf"; version="1.1"; sha256="0n1h4hmjpvj97mpvannh3s5l08m4zfv0w64hrgdv4s5808miwfzc"; depends=[coda Matrix Rcpp RcppEigen]; };
-  bujar = derive2 { name="bujar"; version="0.1-5"; sha256="1fx41cc4dn4wnjr1048gqrr2rkilc4vshli35x2806x7sx7akxzv"; depends=[earth elasticnet gbm mboost mda ncvreg rms]; };
+  bujar = derive2 { name="bujar"; version="0.2-1"; sha256="0g6mj1x9zbxkn3kxwbs2ncjfsicicvyr92krz8yqrms042gbk9ji"; depends=[bst earth elasticnet gbm mboost mda modeltools mpath rms]; };
   bursts = derive2 { name="bursts"; version="1.0-1"; sha256="172g09d1vmwl83xs6gr4gfblqmx3apvblpzdr5d7fcw1ybsx0kj6"; depends=[]; };
-  bvarsv = derive2 { name="bvarsv"; version="1.0"; sha256="0ak4nsrcvhkg0145ax5ib9ljb5yc63zzfxlgvdbrdr4mlri4gsid"; depends=[Rcpp RcppArmadillo]; };
+  bvarsv = derive2 { name="bvarsv"; version="1.1"; sha256="1bv4fbbi8bn7sqqpjlf8w5jpgydjr15wv5v9940wc42yk792yjrx"; depends=[Rcpp RcppArmadillo]; };
   bvenn = derive2 { name="bvenn"; version="0.1"; sha256="1xrya49w5bd2b7plfxpqla60b2828rkm0rjmc4qnqzvrahsbal0y"; depends=[]; };
   bvls = derive2 { name="bvls"; version="1.4"; sha256="18aaf7kk5mks3a59wwqhm1ckpn6s704l9m5nzy0x5iw0s98ijbm2"; depends=[]; };
   bvpSolve = derive2 { name="bvpSolve"; version="1.3.2"; sha256="1y6axzpbk7vnm2hsvihhci3cbbl61rlfc4kmfr335l77l6q2sd55"; depends=[deSolve rootSolve]; };
   c060 = derive2 { name="c060"; version="0.2-4"; sha256="1yzy0p6041rygqfwzb8dpyc7jq12javmhlvdcmmc7p59bbk7wv3j"; depends=[glmnet lattice mlegp penalizedSVM peperr survival tgp]; };
   c3net = derive2 { name="c3net"; version="1.1.1"; sha256="0m4nvrs41kmlakc6m203zlncqwgj94wns8kzcb31xngjcacmcq42"; depends=[igraph]; };
   cAIC4 = derive2 { name="cAIC4"; version="0.2"; sha256="13sp3wywv82wgi1vsbxwn68v9xigy0fi3mcwyxjmmgmnsxns2fza"; depends=[lme4 Matrix]; };
+  cIRT = derive2 { name="cIRT"; version="1.1.0"; sha256="0gp3mmw1s57wg6rvh78261l4nwqg0zpr98q27v389fz2scab637d"; depends=[Rcpp RcppArmadillo]; };
   cOde = derive2 { name="cOde"; version="0.2"; sha256="0741ghg0cqxvgwgvrvsgi75qlkirnm8cjc6bw6xbmkg97scrs5ck"; depends=[]; };
   cSFM = derive2 { name="cSFM"; version="1.1"; sha256="1znxsqa8xdifmryg7jiqbpzm837n4n862kg5x1aki52crc4zyk3k"; depends=[MASS mgcv mnormt moments sn]; };
   ca = derive2 { name="ca"; version="0.58"; sha256="10dp261sq56ixrrr8qq4filxpzszcinz5qv50g40dan0k75n7isb"; depends=[]; };
-  caRpools = derive2 { name="caRpools"; version="0.82.5"; sha256="1a3h0ldm24a2hz659w7gfdzfyh92dczzi3b39gjaajq6c1zc0328"; depends=[biomaRt DESeq2 rmarkdown scatterplot3d seqinr sm VennDiagram xlsx]; };
+  caRpools = derive2 { name="caRpools"; version="0.83"; sha256="10m7fw1zfr9i6v2qg235diwf3fmfr88incxnqpvnhmqcn082mxrp"; depends=[biomaRt DESeq2 rmarkdown scatterplot3d seqinr sm VennDiagram xlsx]; };
   caTools = derive2 { name="caTools"; version="1.17.1"; sha256="1x4szsn2qmbzpyjfdaiz2q7jwhap2gky9wq0riah74q0pzz76ank"; depends=[bitops]; };
   cabootcrs = derive2 { name="cabootcrs"; version="1.0"; sha256="0a6y04jq837k1pk8b9nhgz7rima7s8jid6vdjyfvrqshgaiabg1q"; depends=[]; };
   cacIRT = derive2 { name="cacIRT"; version="1.4"; sha256="145j6isqa8yj2nvlqkxagd076zs10ng3n44khi5p4jj77fjc8gh6"; depends=[]; };
-  cairoDevice = derive2 { name="cairoDevice"; version="2.22"; sha256="0j1fsfjzaz0mz6v33v8n2dcbskpafm3mhi5v85phpk3x4s2y84al"; depends=[]; };
-  calACS = derive2 { name="calACS"; version="0.2"; sha256="136gm9igdxjfjihzjk7cp4k5d6vi57af3rfyic3d76dsnqjpbqgx"; depends=[]; };
+  cairoDevice = derive2 { name="cairoDevice"; version="2.23"; sha256="0l83ssravr0jx6clvm8ppyh1hvyf8zkkl509hafphzfp29nkiamh"; depends=[]; };
+  calACS = derive2 { name="calACS"; version="1.2"; sha256="0h3jjs1gvh54c5lrkgmsiq7jnhhyw6hprs4jr5h4b41azr1fyj1d"; depends=[]; };
   calibrate = derive2 { name="calibrate"; version="1.7.2"; sha256="010nb1nb9y7zhw2k6d2i2drwy5brp7b83mjj2w7i3wjp9xb6l1kq"; depends=[MASS]; };
   calibrator = derive2 { name="calibrator"; version="1.2-6"; sha256="1arprrqmczbhc1gl85fh37cwpcky8vvqdh6zfza3hy21pn21i4kh"; depends=[cubature emulator]; };
   calmate = derive2 { name="calmate"; version="0.12.1"; sha256="07sjbq7bcrhal52pdzsb5pfmk6a8a44wg8xn79sv4y5v74c5xaqz"; depends=[aroma_core MASS matrixStats R_filesets R_methodsS3 R_oo R_utils]; };
@@ -3038,13 +3108,13 @@ in with self; {
   candisc = derive2 { name="candisc"; version="0.6-7"; sha256="1g2vypcniy94h462kylmzraa6q3ys9m0r1cn21dm8rzzjxid9g3g"; depends=[car heplots]; };
   cape = derive2 { name="cape"; version="1.3"; sha256="1qvjbnxydc16mflg1rmgp2kgljcna8vi88w34cs6k12wpgxmvz1f"; depends=[corpcor evd fdrtool igraph Matrix qpcR shape]; };
   caper = derive2 { name="caper"; version="0.5.2"; sha256="1l773sxmh1nyxlrjz8brnwhwraff826scwixrqmgdciqk7046d35"; depends=[ape MASS mvtnorm]; };
-  capm = derive2 { name="capm"; version="0.8.0"; sha256="1vz17x0v5cjs5kdqkbay08f91kclsx4rcli5vgh9yxlk4ih9w4dd"; depends=[deSolve FME ggplot2 maptools reshape2 rgdal shiny sp survey]; };
+  capm = derive2 { name="capm"; version="0.9.0"; sha256="1mhqq4wid00n6bw8795x69g561d3a3sqw6g8pkmgrxmyrb1z30yr"; depends=[deSolve FME ggplot2 maptools reshape2 rgdal shiny sp survey]; };
   captioner = derive2 { name="captioner"; version="2.2.3"; sha256="0xg72pmgm84f0v45phfwxpsslhf12nhn1swmrj1yifj7g9sjvybj"; depends=[]; };
-  captr = derive2 { name="captr"; version="0.1.2"; sha256="08l9i5brlqf49kxrl7q9y4vjm2s4qma0mg84gailpmdy1jpzrx8z"; depends=[curl jsonlite]; };
+  captr = derive2 { name="captr"; version="0.1.3"; sha256="1i0szfqzh2yrdf9kh9fcpr9cr5zfs5khs8sklg7650dm0jf8w383"; depends=[curl jsonlite]; };
   capushe = derive2 { name="capushe"; version="1.1"; sha256="00rbsir00ibxa9r6b17sa1jryjxjjygzsan08pl9wa65r0gxzrkm"; depends=[MASS]; };
   capwire = derive2 { name="capwire"; version="1.1.4"; sha256="18a3dnbgr55yjdk6pd7agmb48lsiqjpd7fm64dr1si6rpgpl4i9c"; depends=[]; };
-  car = derive2 { name="car"; version="2.1-0"; sha256="0756fq8y6pp61hqlddnp0995cw3az7p978g59yljfdsj0c5qrydj"; depends=[MASS mgcv nnet pbkrtest quantreg]; };
-  carcass = derive2 { name="carcass"; version="1.4"; sha256="16apmiackw194p5n0fivkgd2ymca9bfajasypl82xqyfk6amh088"; depends=[arm expm lme4 MASS survival]; };
+  car = derive2 { name="car"; version="2.1-1"; sha256="1wzgy2pcylhvgrlly8v3gi29gc3gimrhmjvhrr93b1cy0wwjj0wx"; depends=[MASS mgcv nnet pbkrtest quantreg]; };
+  carcass = derive2 { name="carcass"; version="1.5"; sha256="0qlvm8vrv7zq76y9fbgx6dcc2ni033jrdv38lywpqfzhz1m1b3v8"; depends=[arm expm lme4 MASS survival]; };
   cardidates = derive2 { name="cardidates"; version="0.4.7"; sha256="0dxb2941w56s479laf315hqh9iv3k2l1ds7k8hdl9akcacagjgs2"; depends=[boot lattice pastecs]; };
   cardioModel = derive2 { name="cardioModel"; version="1.2"; sha256="1fn56js9d1px9g0lvgcr5xlyzwiavj030dw90m8p02v4mb6f47a0"; depends=[nlme plyr]; };
   care = derive2 { name="care"; version="1.1.9"; sha256="0fx5cbi1fx3hpyzghn1788rkh91i10z1ngryqc1v3iqqn3akbk4j"; depends=[corpcor]; };
@@ -3057,14 +3127,14 @@ in with self; {
   caseMatch = derive2 { name="caseMatch"; version="1.0.1"; sha256="0r8z0dfhaqc5wmcrd1mgq1bn71h41fhk5q3ihffg0s9qsix4pk7j"; depends=[]; };
   cat = derive2 { name="cat"; version="0.0-6.5"; sha256="1gv7chqp6kccipkrxjwhsa7yizizsmk4pj8672rgjmpfcc64pqfm"; depends=[]; };
   catIrt = derive2 { name="catIrt"; version="0.5-0"; sha256="09010z1q96nbnpys6mybspaqy57lvgd2cvwgnfijzgx3kl87pwnl"; depends=[numDeriv]; };
-  catR = derive2 { name="catR"; version="3.5"; sha256="1anq0ampcjalbhckk5fh1nmf660cgqh5dhg279871vbbyjhg62n1"; depends=[]; };
+  catR = derive2 { name="catR"; version="3.6"; sha256="1a5wfi944x0a8bgknlgrdxqj5h2zz15lq8k0iavd1k8bifir3pdi"; depends=[]; };
   catdata = derive2 { name="catdata"; version="1.2.1"; sha256="0fjylb55iw8w9sd3hbg895pzasliy68wcq95mgrh7af116ss637w"; depends=[MASS]; };
   cate = derive2 { name="cate"; version="1.0.4"; sha256="0qck6675xm5xbw440m1b6n38wjwk7izx3s0zpxbmhc9wh12c5prk"; depends=[corpcor esaBcv leapp MASS ruv sva]; };
   catenary = derive2 { name="catenary"; version="1.1.1"; sha256="0gd46zvd51xvra0d7k7qdcmfl71vcfk750lcafkhmr4cg0vkqcz7"; depends=[boot ggplot2]; };
   cati = derive2 { name="cati"; version="0.99"; sha256="1xghdqmqfwi0wnzvrd896z4snyjqqs9kw3whmkd3cph8zf0jl931"; depends=[ade4 ape e1071 FD geometry hypervolume mice nlme rasterVis vegan]; };
   catnet = derive2 { name="catnet"; version="1.14.8"; sha256="03y7ddjyra3cjq7savdgickmw82ncx4k01rn752sks6rpl6bjslc"; depends=[]; };
   catspec = derive2 { name="catspec"; version="0.97"; sha256="1crry0vg2ijahkq9msbkqknljx6vnx2m88bmy34p9vb170g9dbs1"; depends=[]; };
-  causaldrf = derive2 { name="causaldrf"; version="0.2"; sha256="1wjmnbwfqky620bfcddi668fxs8f17kpm1myqb61nknvgnfawyv0"; depends=[mgcv survey]; };
+  causaldrf = derive2 { name="causaldrf"; version="0.3"; sha256="16gqx8b8alwm8a4lm69qamnqr3bg2qbz0d6q4lyqyrwsk12grid6"; depends=[mgcv survey]; };
   causaleffect = derive2 { name="causaleffect"; version="1.2.0"; sha256="0dw2660g958ni086jhqr084hxfsf7rnv30qyx56vi8l5qbapsxaw"; depends=[ggm igraph XML]; };
   causalsens = derive2 { name="causalsens"; version="0.1.1"; sha256="1z92ckqa07ajm451wrldxx9y43nawlvj2bsz0afxc9mrhjwjg5dh"; depends=[]; };
   cba = derive2 { name="cba"; version="0.2-15"; sha256="1qw1r5drxip4y1a59hwz92iw50nj3vkxynsisv28srnwr58imnaj"; depends=[proxy]; };
@@ -3081,6 +3151,7 @@ in with self; {
   cdb = derive2 { name="cdb"; version="0.0.1"; sha256="1rdb4lacjcw67apdyiv7cl1xvv9d1mrzck1qk605n6794k7wf2ys"; depends=[bitops]; };
   cdcfluview = derive2 { name="cdcfluview"; version="0.4.0"; sha256="1b0l6vqhks9mqpx3c94qip3dd8031rl4jjqjnmdpcvmfhg335yjf"; depends=[dplyr httr pbapply xml2]; };
   cdcsis = derive2 { name="cdcsis"; version="1.0"; sha256="1fxdsaqpjhpffn2fxddfcrx8wxwyvfws6rxkpp57g25980xiyzkd"; depends=[ks]; };
+  cdfquantreg = derive2 { name="cdfquantreg"; version="1.0.0"; sha256="099gz81s7cdmvlvvgwbmmqq5nynh24azm754cvb81ap6d9si34pa"; depends=[Formula MASS pracma]; };
   cds = derive2 { name="cds"; version="1.0.2"; sha256="03ypqdqja5jqfzxgqafaxbnznazjaw5jv87yd6sw915djbffna45"; depends=[clue colorspace copula limSolve MASS]; };
   cec2005benchmark = derive2 { name="cec2005benchmark"; version="1.0.4"; sha256="0bwv63l31hiy63372nvnyfkpqp61cqjag0gczd2v2iwsy3hyivpd"; depends=[]; };
   cec2013 = derive2 { name="cec2013"; version="0.1-5"; sha256="07i2vp1x3qaw5di5vr5z70d47hh9174pjckjlhgv0f2w97slwc1i"; depends=[]; };
@@ -3091,9 +3162,11 @@ in with self; {
   cems = derive2 { name="cems"; version="0.4"; sha256="0mk02m702xfr1gh0l3973z1hdpncgjl2vfd1k1iss5s64k56gs4q"; depends=[plotrix rgl vegan]; };
   censNID = derive2 { name="censNID"; version="0-0-1"; sha256="1ij5ci6nkqf0rq51vyh4jw5sr3y46yndfkjmwl78ppdj66axxir5"; depends=[]; };
   censReg = derive2 { name="censReg"; version="0.5-20"; sha256="15k7iq4275dyah3r47vgxsx6g6mr7ma53lkv6d1n89bczzys72kx"; depends=[glmmML maxLik miscTools sandwich]; };
+  censusr = derive2 { name="censusr"; version="0.0.2"; sha256="1x2s0q0d30hsb5sqdgvlz8anv5vcsm0ld9p96jzsin6lfsgbb1dm"; depends=[dplyr httr]; };
   cents = derive2 { name="cents"; version="0.1-41"; sha256="03ycbd0c8b7danbblaixg6sm7msr9ixkanqswczqa8n2frhjfgj0"; depends=[]; };
   cepp = derive2 { name="cepp"; version="1.0"; sha256="0lw3qr0vp0qbg2b62abhi1ady1dwig68m4nzqnjnk3lqxzp0fs8f"; depends=[randtoolbox trust]; };
   cernn = derive2 { name="cernn"; version="0.1"; sha256="0gz2x20pgsiq85hwkkpg4s1cdlw9plygx0446djc7qsymp469p2w"; depends=[]; };
+  cffdrs = derive2 { name="cffdrs"; version="1.7"; sha256="11s6cxihrvj9ajvsk1wka8ivlq9faazgwry2f3sngx33d8fb8zna"; depends=[data_table doParallel foreach raster rgdal spatial_tools]; };
   cg = derive2 { name="cg"; version="1.0-2"; sha256="1rgbk4kvjaw4mbqa19hbnhlinqd4bw4fn2znlxr8wfhzj6648cl3"; depends=[Hmisc lattice MASS multcomp nlme survival VGAM]; };
   cgAUC = derive2 { name="cgAUC"; version="1.2.1"; sha256="172f9rkfhv4xzwpw8izsnsdbcw9p3hvxhh0fd8hzlkil7vskr3k8"; depends=[Rcpp]; };
   cgam = derive2 { name="cgam"; version="1.3"; sha256="0lyhgiwskvcbbzd6y9ryndk4m3hjcwhd2ysnlhx7vkazp8936y87"; depends=[coneproj]; };
@@ -3101,7 +3174,7 @@ in with self; {
   cggd = derive2 { name="cggd"; version="0.8"; sha256="06z0mrxxc02parn9vkjv89qq4yqmsccsy319fi6c5iarssyvin1r"; depends=[]; };
   cgh = derive2 { name="cgh"; version="1.0-7.1"; sha256="1fgjz43bgnswlyvrm669x697lybq3jyzz4l8ppgxqwxp4p4d2yqn"; depends=[]; };
   cghFLasso = derive2 { name="cghFLasso"; version="0.2-1"; sha256="0b1hnjf9g0v47hbz0dy9m6jhcl1ky20yyhhmm8myng2sndcpjsbf"; depends=[]; };
-  cghseg = derive2 { name="cghseg"; version="1.0.2"; sha256="1x7j62aq5c1xj8ss3pys5160y6vny4pa1wvf6xh59ak2zr4xjm9h"; depends=[]; };
+  cghseg = derive2 { name="cghseg"; version="1.0.2-1"; sha256="0q9ks19r21b6p0gfd7mnsgp7pbihz3yzmbzijlrx178f1z9yjx5q"; depends=[]; };
   cgwtools = derive2 { name="cgwtools"; version="3.0"; sha256="01888n056x4c8g0676jnbh6d89hamzxrh33aw6r28mzlnmfy5lmw"; depends=[]; };
   changepoint = derive2 { name="changepoint"; version="2.2"; sha256="16552y79dll9ckp630v8a0cpa26hx42mh3zhi242ssdsiflp8xnr"; depends=[zoo]; };
   cheb = derive2 { name="cheb"; version="0.3"; sha256="0vqkdx7i40w493vr7xywjypr398rjzdk5g410m1yi95cy1nk4mc7"; depends=[]; };
@@ -3119,17 +3192,17 @@ in with self; {
   chngpt = derive2 { name="chngpt"; version="2015.9-5"; sha256="0yqapf9fq0arh1hgwd5lklp6fklia926n0h1980731hqxd362bpq"; depends=[kyotil MASS survival]; };
   choiceDes = derive2 { name="choiceDes"; version="0.9-1"; sha256="07nnqqczi9p3cffdijzx14sxhqv1imdakj7y94brlr5mbf5i4fl4"; depends=[AlgDesign]; };
   choplump = derive2 { name="choplump"; version="1.0-0.4"; sha256="0fn6m3n81jb7wjdji4v04m53gakjfsj3ksm546xxz5zm7prk237s"; depends=[]; };
-  chopthin = derive2 { name="chopthin"; version="0.1"; sha256="1xnyd5mvgqksk7c0mf4irrnshkjgih2h19b55yi4finxh6wrn8l4"; depends=[Rcpp]; };
+  chopthin = derive2 { name="chopthin"; version="0.2"; sha256="0jdflkd6g30gn9x9jbap47l7rh5mmvfswwb8hiivnsb1yl07xhzl"; depends=[Rcpp]; };
   chords = derive2 { name="chords"; version="0.90"; sha256="0wz5glm15615xb3cicc0m34zg78qzng3lpmysswbrfhc8x4kkchh"; depends=[MASS]; };
-  choroplethr = derive2 { name="choroplethr"; version="3.3.0"; sha256="1r5h7vb721z9y73vf74p678mzhq5rb985b0zgn4ryh8mib4xdcl3"; depends=[acs dplyr ggmap ggplot2 Hmisc R6 RgoogleMaps scales stringr WDI]; };
-  choroplethrAdmin1 = derive2 { name="choroplethrAdmin1"; version="1.0.0"; sha256="1pnj5155h809sh9mp703y72348mi7mxnwid07kp1s489512ysfwr"; depends=[ggplot2]; };
+  choroplethr = derive2 { name="choroplethr"; version="3.4.0"; sha256="0dx696a14806if3pyk028vsip8ivwczj0s5gya2s114hmyz7i989"; depends=[acs dplyr ggmap ggplot2 Hmisc R6 RgoogleMaps scales stringr WDI]; };
+  choroplethrAdmin1 = derive2 { name="choroplethrAdmin1"; version="1.1.0"; sha256="0xfqw7spjali13sdq0jp3p62fgzvfm2ixbbcay8iwjm5plh5p5sw"; depends=[ggplot2]; };
   choroplethrMaps = derive2 { name="choroplethrMaps"; version="1.0"; sha256="00dgwikfxm1p1dqz1ybsxj1j8jcmrwa08m2d3zsww2invd55pk7g"; depends=[]; };
   chromer = derive2 { name="chromer"; version="0.1"; sha256="0fzl2ahvzyylrh4247w9yjmwib42q96iyhdlldchj97sld66c817"; depends=[data_table dplyr httr]; };
   chromoR = derive2 { name="chromoR"; version="1.0"; sha256="1x11byr6i89sdk405h6jd2rbvgwrcvqvb112bndv2rh9jnrvcw4z"; depends=[gdata haarfisz]; };
   chron = derive2 { name="chron"; version="2.3-47"; sha256="1xj50kk8b8mbjpszp8i0wbripb5a4b36jcscwlbyap8n4487g34s"; depends=[]; };
   chunked = derive2 { name="chunked"; version="0.1.1"; sha256="021i06bhmn2b4s5d349bg3jpyb560cvlpg8g3mgpixv8841rf7lf"; depends=[dplyr LaF lazyeval]; };
   cin = derive2 { name="cin"; version="0.1"; sha256="1pwvy5nh5nrnysfqrzllb9fcrpddqg02c7iw3w9fij2h8s2v6kq5"; depends=[]; };
-  circlize = derive2 { name="circlize"; version="0.3.2"; sha256="0p3inn6pk4z48p20bamrsrs5dnb21nr5w6z84c5cwa8p3gmd0ac8"; depends=[colorspace GlobalOptions shape]; };
+  circlize = derive2 { name="circlize"; version="0.3.4"; sha256="02d2di0v6cqmp5rszrmynrnyg00p6wd7d000ghbwsjw2679ysr13"; depends=[colorspace GlobalOptions shape]; };
   circular = derive2 { name="circular"; version="0.4-7"; sha256="1kgis2515c931ir76kpxnjx0cscw4n09a5qz1rbrhf34gv81pzqw"; depends=[boot]; };
   cit = derive2 { name="cit"; version="1.7"; sha256="1yklcrznv0mf3v5f0gf6nw1i8rx4wzvj0h4m8xahcrslf4nm2p7s"; depends=[]; };
   citbcmst = derive2 { name="citbcmst"; version="1.0.4"; sha256="1zkd117h9nahwbg5z6byw2grg5n3l0kyvv2ifrkww7ar30a2yikl"; depends=[]; };
@@ -3138,7 +3211,7 @@ in with self; {
   ckanr = derive2 { name="ckanr"; version="0.1.0"; sha256="1cvn0cih763f0ppl1y90vnwj3cgqyb7az89sn12nyn2qb6igiqyl"; depends=[httr jsonlite magrittr]; };
   clValid = derive2 { name="clValid"; version="0.6-6"; sha256="1l9q7684vv75jnbymaa10md13qri2wjjg7chr1z1m0rai8iq3xxw"; depends=[class cluster]; };
   cladoRcpp = derive2 { name="cladoRcpp"; version="0.14.4"; sha256="0d4vl7xrrwbhhx56ymw52rb5svw9nskxdya4dl04lw1qxc45p4jy"; depends=[Rcpp RcppArmadillo]; };
-  clarifai = derive2 { name="clarifai"; version="0.1"; sha256="1cml68pjzh93l26a67rx2xkii3kppz1m3jry6mdxkrcnrnc4s9pn"; depends=[curl jsonlite]; };
+  clarifai = derive2 { name="clarifai"; version="0.2"; sha256="10mbgdg5hpdx6v84zn1j2gfl7rj2cl0dizxplf764qrc6rfhvsxm"; depends=[curl jsonlite]; };
   class = derive2 { name="class"; version="7.3-14"; sha256="173b8a16lh1i0zjmr784l0xr0azp9v8bgslh12hfdswbq7dpdf0q"; depends=[MASS]; };
   classGraph = derive2 { name="classGraph"; version="0.7-5"; sha256="19jb9jr1gfg4karymrbilh0zjrlsczhy2q03x5b0jxnh4ykhxfj8"; depends=[graph Rgraphviz]; };
   classInt = derive2 { name="classInt"; version="0.1-23"; sha256="07anmwmchri4ppl01y041zh3xdqsdwzv4n5jpr3crmpk39qwwhzq"; depends=[class e1071]; };
@@ -3147,7 +3220,7 @@ in with self; {
   classyfire = derive2 { name="classyfire"; version="0.1-2"; sha256="0rar3mi2m1wf14lmahjbpdh1jlnisvgsbx86xbqlb8c0f8zfzxq3"; depends=[boot e1071 ggplot2 neldermead optimbase snowfall]; };
   cleangeo = derive2 { name="cleangeo"; version="0.1-1"; sha256="1bahj4lf7fvf8qlbl7g2jh9a4vqr62llg43yklm380fky23n04r1"; depends=[maptools rgeos sp]; };
   clere = derive2 { name="clere"; version="1.1.2"; sha256="1my9fw369dlnxk59lhdiafyihkdrm6f5gi301vjsgw1kwyxf11xk"; depends=[Rcpp RcppEigen]; };
-  clhs = derive2 { name="clhs"; version="0.5-4"; sha256="0535mpl1dbm9ij1dvj8dsmv4fickdg47by1mvf71lgfk5mjxy5nc"; depends=[ggplot2 plyr raster reshape2 scales sp]; };
+  clhs = derive2 { name="clhs"; version="0.5-5"; sha256="0p1w5sb27qk609azywzz17c4f2cgdkrl88gckgrd3lg1cfa9vl7d"; depends=[ggplot2 plyr raster reshape2 scales sp]; };
   clickstream = derive2 { name="clickstream"; version="1.1.5"; sha256="010bf7rxicv43z33zrbmc1j0d0wz52kk7z4czxmljqs3qs6syfn2"; depends=[arules data_table igraph linprog plyr Rsolnp]; };
   clifro = derive2 { name="clifro"; version="2.4-0"; sha256="1bjsfk4m7hgq8k1mw07zx34ibgmpxjw8sig9jjzsr5mp3v13kwp8"; depends=[ggplot2 lubridate RColorBrewer RCurl reshape2 scales selectr XML]; };
   climdex_pcic = derive2 { name="climdex.pcic"; version="1.1-6"; sha256="0dyhqxrma8g4ny4afv6drr885m88q2b8g1n19yy3yjbrbddyz8yl"; depends=[caTools PCICt Rcpp]; };
@@ -3160,11 +3233,13 @@ in with self; {
   clipr = derive2 { name="clipr"; version="0.2.0"; sha256="0y27k2s562cpva3a19yv5b9p99iympdx3084v59i3478ih9qw23r"; depends=[]; };
   clisymbols = derive2 { name="clisymbols"; version="1.0.0"; sha256="1g68kh1js6nssyzw4lpxp4d2h4rhlayhahaykxw4a4bd67fkw20p"; depends=[]; };
   clogitL1 = derive2 { name="clogitL1"; version="1.4"; sha256="0m9yrg9mzzfv5qkdf6w55xyrjdghyrf27kk7b4x2gyvwvi5b7dkm"; depends=[Rcpp]; };
+  clogitboost = derive2 { name="clogitboost"; version="1.1"; sha256="19wcb7229amlxn6xahxj6pf9rwfm02s7qkxz2yvyhnq95y0clxkm"; depends=[Rcpp]; };
   cloudUtil = derive2 { name="cloudUtil"; version="0.1.10"; sha256="1j86vpd4ngrdpfjk44wb1mp0l88dxia64pjd2idfcd276giplh6s"; depends=[]; };
   clpAPI = derive2 { name="clpAPI"; version="1.2.6"; sha256="1kgzmzf87b0j43ch21anmm2d73bj2d16slmyavpbkdwg72dg1sjb"; depends=[]; };
-  clttools = derive2 { name="clttools"; version="1.1"; sha256="0av5h3835rqwfz7xcdg6vb6qbnr74ygsikhb0wppmpc0zdp0vwdc"; depends=[]; };
+  clttools = derive2 { name="clttools"; version="1.2"; sha256="0zhflnd98y1mf9kc3mbmkl5bxcg0hlmqsmrrr8spq6c0qn7zivdl"; depends=[]; };
   clue = derive2 { name="clue"; version="0.3-50"; sha256="0r3lb625a6vhxr7im2slz279zav9i74s0b9srkarqmz1bhaf6ly2"; depends=[cluster]; };
   clues = derive2 { name="clues"; version="0.5.6"; sha256="1g0pjj4as5wfc7qr3nwkzgxxxp3mrdq7djn8p8qjba6kcdjxak1i"; depends=[]; };
+  clusrank = derive2 { name="clusrank"; version="0.1-1"; sha256="0p14lflhg3kjrdsyva2gnx5frs0fpnsn3fnda49paf29ynm3x7w4"; depends=[]; };
   clustMD = derive2 { name="clustMD"; version="1.1"; sha256="192li0nx2hwhh5y21xs70vrnzw3wxbzr95f06makaxcrwf4xlp16"; depends=[MASS mclust msm mvtnorm tmvtnorm truncnorm]; };
   cluster = derive2 { name="cluster"; version="2.0.3"; sha256="03jfczb3dwg57f164pya0b762xgyswyb9a7s33lw9i0s5dq72ri8"; depends=[]; };
   cluster_datasets = derive2 { name="cluster.datasets"; version="1.0-1"; sha256="0i68s9305q08fhynpq24qnlw03gg4hbk4184z3q3ycbi8njpr4il"; depends=[]; };
@@ -3188,11 +3263,11 @@ in with self; {
   cmprsk = derive2 { name="cmprsk"; version="2.2-7"; sha256="1imr3wpnj4g57n2x4ryahl4lk8lvq9y2r7319zv3k82mznha8bcm"; depends=[survival]; };
   cmrutils = derive2 { name="cmrutils"; version="1.3"; sha256="0zjc0bwp2p03hmnj3zjw7800pcdw8b8161y68npyp3hya0s4i9x0"; depends=[chron]; };
   cmsaf = derive2 { name="cmsaf"; version="1.5"; sha256="06gmdxiss71qn3gaw4cs3wp0mizyny1ln3ymjlnp6kh3v9vzkjkw"; depends=[fields ncdf4 raster sp]; };
-  cmvnorm = derive2 { name="cmvnorm"; version="1.0-1"; sha256="00cm7zfxbc5md3p6sakan64a6rzz7nbq0bqq9ys2iyxpilxalj3m"; depends=[elliptic emulator]; };
+  cmvnorm = derive2 { name="cmvnorm"; version="1.0-3"; sha256="0810kzg78yaxzniq59a4swvdk9qxp37ja52f5n1zssgn0cwz1vk9"; depends=[elliptic emulator]; };
   cna = derive2 { name="cna"; version="1.0-3"; sha256="1iy0ispazhib30kh5wp3jziiyf0992nrdklrq80n0w3zhjyi21rh"; depends=[]; };
   cncaGUI = derive2 { name="cncaGUI"; version="1.0"; sha256="1v55kvrc05bsm1qdyfw3r3h64wlv3s6clxbr8k512lfk99ry42kn"; depends=[MASS plotrix rgl shapes tcltk2 tkrplot]; };
   cnmlcd = derive2 { name="cnmlcd"; version="1.0-0"; sha256="0kbq01qrmpn133v18rjphhznpnj8g6dcn1lrbsjykhxkqz086s36"; depends=[lsei]; };
-  coala = derive2 { name="coala"; version="0.2.1"; sha256="0vwaxgz75jzv91msxf8an3a12bmnw450442b8sy1y3lpmd7lllbk"; depends=[assertthat R6 Rcpp RcppArmadillo rehh scrm]; };
+  coala = derive2 { name="coala"; version="0.3.0"; sha256="1dg0ycaw81v52p0skm4nx5n5la8icic4pbf70i9c0azvj40x60h8"; depends=[assertthat R6 Rcpp RcppArmadillo rehh scrm]; };
   coalescentMCMC = derive2 { name="coalescentMCMC"; version="0.4-1"; sha256="0xxv1sw5byf84wdypg5sfazrmj75h4xpv7wh4x5cr9k0vgf80b3s"; depends=[ape coda lattice Matrix phangorn]; };
   coarseDataTools = derive2 { name="coarseDataTools"; version="0.6-2"; sha256="1nnh61kfw294cxawz9i8yf37ddzsn5s532vvkaz0ychk0390wmi5"; depends=[MCMCpack]; };
   cobs = derive2 { name="cobs"; version="1.3-1"; sha256="18dfc767zfipp4h4q7lgk5yp1c63lb9myc6bg3jkzr1v1xwbhwqk"; depends=[quantreg SparseM]; };
@@ -3208,6 +3283,7 @@ in with self; {
   coefplot = derive2 { name="coefplot"; version="1.2.0"; sha256="1v6c3fk2wrjgs3b31vajmig6dvmp5acfm72wh0iffpg0qgvf5hh7"; depends=[ggplot2 plyr proto reshape2 scales useful]; };
   coenocliner = derive2 { name="coenocliner"; version="0.2-0"; sha256="1ndz7nhkzb8y0akyf1ja39m60c1afk4sb8qk7m4xd3srd71wb35z"; depends=[]; };
   coexist = derive2 { name="coexist"; version="1.0"; sha256="15ydhrx996i6caa0360c2bgn2zvgwfg5wdhsqq1gvrggs15w7nml"; depends=[]; };
+  cofeatureR = derive2 { name="cofeatureR"; version="1.0.0"; sha256="0z9xg8mv1a6vb2b3v4kqlvb3ax2vn28qdmnz5wbraclavhvijdj6"; depends=[dplyr ggplot2 lazyeval]; };
   coin = derive2 { name="coin"; version="1.1-2"; sha256="0wwkw0sslfp8ass83rh2d9qhzz2p69gv0c6wi778nanjvaj533x5"; depends=[modeltools multcomp mvtnorm survival]; };
   cold = derive2 { name="cold"; version="1.0-4"; sha256="00rl2h4pirzvgwi28pr94kkn233wvm2z8yyfsz6andbkjsihp6jw"; depends=[]; };
   coloc = derive2 { name="coloc"; version="2.3-1"; sha256="1j3m9afpkm0bzib38yqvk85b6s6l56s6j2ni96gii4a06r87ig60"; depends=[BMA colorspace MASS]; };
@@ -3218,14 +3294,14 @@ in with self; {
   colorscience = derive2 { name="colorscience"; version="1.0.1"; sha256="0085cxdknfm70i0x57jb9fpaqhpgcvl150n2mcaw8wgw1lf59f06"; depends=[Hmisc munsellinterpol pracma sp]; };
   colorspace = derive2 { name="colorspace"; version="1.2-6"; sha256="0y8n4ljwhbdvkysdwgqzcnpv107pb3px1jip3k6svv86p72nacds"; depends=[]; };
   colortools = derive2 { name="colortools"; version="0.1.5"; sha256="0z9sx0xzfyb5ii6bzhpii10vmmd2vy9vk4wr7cj9a3mkadlyjl63"; depends=[]; };
-  colourlovers = derive2 { name="colourlovers"; version="0.1.4"; sha256="1c5g9z7cknn4z1jqb0l1w8v5zj0qbk4msaf1pqfcx9a70pw8s0m5"; depends=[png RJSONIO XML]; };
+  colourlovers = derive2 { name="colourlovers"; version="0.2.0"; sha256="17macf5nby286n80pfsha54r3q3idpfhkm2w1c8hbsh2rxfh6r1d"; depends=[jsonlite png XML]; };
   comato = derive2 { name="comato"; version="1.0"; sha256="03jnvv0sczy13r81aljhj9kv09sl5hrs0n5bn3pdi7ba64zgbjiw"; depends=[cluster clusterSim gdata igraph lattice Matrix XML]; };
   combinat = derive2 { name="combinat"; version="0.0-8"; sha256="1h9hr88gigihc4na7lb5i7rn4az1xa7sb34zvnznaj6pdrmwy4qm"; depends=[]; };
   comclim = derive2 { name="comclim"; version="0.9.4"; sha256="0m6ynccscsrrq70p0drwrwxp4skc630kv1l5smh48pi8kagahj1g"; depends=[]; };
   cometExactTest = derive2 { name="cometExactTest"; version="0.1.3"; sha256="08ck1cv5apzn379j6mm2gmhm4qj18418crmqbbp46d80waf0ghxq"; depends=[dplyr]; };
   commandr = derive2 { name="commandr"; version="1.0.1"; sha256="1d6cha5wc1nx6jm8jscl7kgvn33xv0yxwjf6h3ar3dfbvi4pp5fk"; depends=[]; };
   commentr = derive2 { name="commentr"; version="1.0.1"; sha256="00p2v2kn3j6m34rr8ff7bb54ixz6zghv8h5c0yw5idi9x16rsj04"; depends=[stringr]; };
-  commonmark = derive2 { name="commonmark"; version="0.5"; sha256="1mjqb88z7rzr2f0mlhzfrg24x6jhrj36qw2licmm5b8gsb70gzcr"; depends=[]; };
+  commonmark = derive2 { name="commonmark"; version="0.6"; sha256="0hdcfiq1w24rljj3lxykmc41anymv5iwrb8xfand76kpyjwkqqnc"; depends=[]; };
   compHclust = derive2 { name="compHclust"; version="1.0-2"; sha256="1h39krvz516xwsvn5987i1zbzan8vx2411qz6dad112hpss0vyk9"; depends=[]; };
   compactr = derive2 { name="compactr"; version="0.1"; sha256="0f2yds6inmx0lixj08ibqyd2i61l2cbg1ckgpb8dl2q7kcyyd6mx"; depends=[]; };
   compare = derive2 { name="compare"; version="0.2-6"; sha256="0k9zms930b5dz9gy8414li21wy0zg9x9vp7301v5cvyfi0g7xzgw"; depends=[]; };
@@ -3250,10 +3326,11 @@ in with self; {
   conf_design = derive2 { name="conf.design"; version="2.0.0"; sha256="06vdxljkjq1x56xkg041l271an1xv9wq79swxvzzk64dqqnmay51"; depends=[]; };
   confidence = derive2 { name="confidence"; version="1.1-0"; sha256="11y2mjh9ykmsgf6km6f2w5rql1vqwick4jzmxg5gkfkiisvsq1cp"; depends=[ggplot2 knitr markdown plyr xtable]; };
   conformal = derive2 { name="conformal"; version="0.1"; sha256="0syb1p35r6fir7qimp2k51hpvl3xw45ma2hi7qz2xzw8cwhlii3a"; depends=[caret e1071 ggplot2 randomForest]; };
-  confreq = derive2 { name="confreq"; version="1.3-1"; sha256="1d4ianimksnfwkld7cg9mkhbpwiaqy5bcilwfy45dwby5bai6cjx"; depends=[gmp]; };
+  confreq = derive2 { name="confreq"; version="1.4"; sha256="0cbhisw3yhg71081a2f40jgbdjcvx36xrrnbhwcyhxd43qn2dp0q"; depends=[gmp]; };
   conicfit = derive2 { name="conicfit"; version="1.0.4"; sha256="1d704xgiyqmbwfxnsmhqg885x10q8yqxmrk4khqpg3lh696bw97d"; depends=[geigen pracma]; };
   conics = derive2 { name="conics"; version="0.3"; sha256="06p6dj5dkkcy7hg1aa7spi9py45296dk0m6n8s2n3bzh3aal5nzq"; depends=[]; };
   conjoint = derive2 { name="conjoint"; version="1.39"; sha256="0f8fwf419js9c292i3ac89rlrwxs2idhwxml1qd8xd2ggwfh6w5m"; depends=[AlgDesign clusterSim]; };
+  connect3 = derive2 { name="connect3"; version="0.1.0"; sha256="07ih875ynrxzynj989d0h469ilq6c634z2z3igvxpkx40wr451d5"; depends=[]; };
   conover_test = derive2 { name="conover.test"; version="1.1.0"; sha256="0jg8bcqf3zbzabj5dr76js8hwkgp80428sx2rm8bxapgkcwaqz1k"; depends=[]; };
   constrainedKriging = derive2 { name="constrainedKriging"; version="0.2.4"; sha256="1a91s0b7yka37fb5pm172fmlqrhm6da370cqb9knvkg5n8vi4hys"; depends=[RandomFields rgeos sp spatialCovariance]; };
   contfrac = derive2 { name="contfrac"; version="1.1-9"; sha256="16yl96bmr16a18qfz6y5zf7p02ky1jy2iimcb1wp50g7imlcq840"; depends=[]; };
@@ -3299,7 +3376,7 @@ in with self; {
   covmat = derive2 { name="covmat"; version="1.0"; sha256="00y966897x83v471yarfikpr794b7adhgn5c9hgh0j1j4yfdc3b8"; depends=[DEoptim doParallel fGarch foreach ggplot2 gridExtra lhs Matrix mvtnorm optimx reshape2 RMTstat robust robustbase scales VIM xts zoo]; };
   covr = derive2 { name="covr"; version="1.2.0"; sha256="1gavcqqbg211sv52sicrh87vif71dl6n9xfcb6b3giqw897w7vrc"; depends=[crayon devtools htmltools httr jsonlite rex]; };
   covreg = derive2 { name="covreg"; version="1.0"; sha256="0v19yhknklmgl58zhvg4szznb374cdh65i7s8pcj2nwrarycwzaq"; depends=[]; };
-  cowplot = derive2 { name="cowplot"; version="0.5.0"; sha256="1syldi47xl2fbdn3dbclc2xyp2la8xs3hp45qmg9565g4m3ixm14"; depends=[ggplot2 gtable plyr]; };
+  cowplot = derive2 { name="cowplot"; version="0.6.0"; sha256="1d3a6qbwiqwbnd6qhcxmryckhz33c40qnjl5mp5w065ba3p5gj4k"; depends=[ggplot2 gtable plyr]; };
   cowsay = derive2 { name="cowsay"; version="0.4.0"; sha256="0lbamjvngj1s0jv8ybbfddx52yqf3h7zkjixl9qr0ha8xkidg7r3"; depends=[fortunes]; };
   coxinterval = derive2 { name="coxinterval"; version="1.2"; sha256="0vb7vmzbb2dsihx04jbp2yvzcr033g435mywmwimqhfqdrmjx3fi"; depends=[Matrix survival timereg]; };
   coxme = derive2 { name="coxme"; version="2.2-5"; sha256="0lpdwpvsgjgmbf55qqhflw4q40xmqm422inkssgn3ladcp68gb1s"; depends=[bdsmatrix Matrix nlme survival]; };
@@ -3312,7 +3389,7 @@ in with self; {
   cpca = derive2 { name="cpca"; version="0.1.2"; sha256="1pccsjahb1qynnxa0akhfpcmhfmdg4rd1s6pfqrdl7bwbcmq4lqf"; depends=[]; };
   cpgen = derive2 { name="cpgen"; version="0.1"; sha256="1cp3d6riy65lc1mfrxh92lc6f1qal7amhjilfzz0r529j5fipd2v"; depends=[Matrix pedigreemm Rcpp RcppEigen RcppProgress]; };
   cpk = derive2 { name="cpk"; version="1.3-1"; sha256="1njmk2w6zbp6j373v5nd1b6b8ni4slgzpf9qxn5wnqlws8801n73"; depends=[]; };
-  cplexAPI = derive2 { name="cplexAPI"; version="1.2.11"; sha256="1rfvq2a561dz3szvrs9s5gsizwwp0b5rn4059v9divzw23clr2a9"; depends=[]; };
+  cplexAPI = derive2 { name="cplexAPI"; version="1.3.1"; sha256="0idh2fjc6lkpk24d476rsgn2w7nskiclbbfy1pwh8m49wj70h4ix"; depends=[]; };
   cplm = derive2 { name="cplm"; version="0.7-4"; sha256="156w3yiazx79133rmxmgz9v4im8g7h37fj4gq5ymy5255ws07m8m"; depends=[biglm coda ggplot2 Matrix minqa nlme reshape2 statmod tweedie]; };
   cpm = derive2 { name="cpm"; version="2.2"; sha256="1n1iqhalp99mbh8jha0pv759fb97sqxdiiq9bxy3wm6aqmssvdb1"; depends=[]; };
   cqrReg = derive2 { name="cqrReg"; version="1.2"; sha256="1sn8pkbqb058lbysdf2y1s734351a91kwbanplyzv3makbbdm4ca"; depends=[quantreg Rcpp RcppArmadillo]; };
@@ -3320,7 +3397,7 @@ in with self; {
   crackR = derive2 { name="crackR"; version="0.3-9"; sha256="18fr3d6ywcvmdbisqbrbqsr92v33paigxfbslcxf7pk26nzn2lly"; depends=[evd Hmisc]; };
   cramer = derive2 { name="cramer"; version="0.9-1"; sha256="1dlapmqizff911v3jv8064ddg8viw28nq05hs77y5p4pi36gpyw4"; depends=[boot]; };
   crank = derive2 { name="crank"; version="1.1"; sha256="117sgq7zm5wxmd97sfc927qq70snra6vd090mhpcsdhipw1py6zc"; depends=[]; };
-  cranlogs = derive2 { name="cranlogs"; version="2.0.0"; sha256="13c8sa3s1xvb5naj4cy7d5azcbf716l0gp4x086sqd5dg1hqdy8b"; depends=[httr jsonlite]; };
+  cranlogs = derive2 { name="cranlogs"; version="2.1.0"; sha256="1w1nbifjb9l106fk97zy0w73x73bw5azq89l3c1b8r2fz8aljkkc"; depends=[httr jsonlite]; };
   crantastic = derive2 { name="crantastic"; version="0.1"; sha256="0y2w9g100llnyw2qwjrib17k2r2q9yws77mf6999c93r8ygzn4f5"; depends=[]; };
   crawl = derive2 { name="crawl"; version="1.5"; sha256="19iqikq5japqpzy82lmswivfi7swap5g5rdpl9ixw7kbgjaxh535"; depends=[mvtnorm raster sp]; };
   crayon = derive2 { name="crayon"; version="1.3.1"; sha256="0d38fm06h272a8iqlc0d45m2rh36giwqw7mwq4z8hkp4vs975fmm"; depends=[memoise]; };
@@ -3328,9 +3405,10 @@ in with self; {
   crch = derive2 { name="crch"; version="0.9-1"; sha256="0lzarmz8f2rw5q28kfsbdzg037iskgxayyhgq9dnrpbyz1726clp"; depends=[Formula ordinal]; };
   creditr = derive2 { name="creditr"; version="0.6.1"; sha256="1dhjl99gjc97bdsdg29mq6xifivjn9kr0y7m2jzvrzb26x856z97"; depends=[devtools quantmod Rcpp RCurl XML xts zoo]; };
   credule = derive2 { name="credule"; version="0.1.3"; sha256="1vciqkxkf93z067plipvhbks9k9sfqink5rhifzbnwc2c5gxp5mx"; depends=[]; };
+  cricketr = derive2 { name="cricketr"; version="0.0.12"; sha256="0v6g3kkf9a8qvmfis1xdhja5j1impmi6mm5dmlq04s8qj4khnnqi"; depends=[dplyr forecast ggplot2 lubridate plotrix scatterplot3d XML]; };
   crimCV = derive2 { name="crimCV"; version="0.9.3"; sha256="1p2cma78fb9a2ckmwdvpb6fc0818xw2mvq565dgiimgkdmmr0iid"; depends=[]; };
   crimelinkage = derive2 { name="crimelinkage"; version="0.0.4"; sha256="1zzk50kyccvnp51vzp28c9yi23hsp25arrgdn88lwfwa0m43rlar"; depends=[geosphere igraph]; };
-  crmPack = derive2 { name="crmPack"; version="0.1.5"; sha256="0yrmdnvkhvy067djkfcyxp9m56a2m603rkz6zpvzsxsi12inl874"; depends=[BayesLogit GenSA ggplot2 gridExtra MASS mvtnorm rjags]; };
+  crmPack = derive2 { name="crmPack"; version="0.1.6"; sha256="0li26q1sknvjy6an863pas5lrxjq8zmlf83mvasyiwz6v2g0r044"; depends=[BayesLogit GenSA ggplot2 gridExtra MASS mvtnorm rjags]; };
   crmn = derive2 { name="crmn"; version="0.0.20"; sha256="1kl1k1s2gm63f9768cg8w4j6y1gq4hws3i7hdfhj7k9015s0a25p"; depends=[Biobase pcaMethods]; };
   crn = derive2 { name="crn"; version="1.1"; sha256="1fw0cwx478bs6hxidisykz444jj5g136zld1i8cv859lf44fvx2d"; depends=[chron RCurl]; };
   crop = derive2 { name="crop"; version="0.0-2"; sha256="1yjpk7584wrz9hjqs21irjnrlnahjg8lajra9yfdp6r927iimg1l"; depends=[]; };
@@ -3345,7 +3423,7 @@ in with self; {
   crrstep = derive2 { name="crrstep"; version="2015-2.1"; sha256="03vd97prws9gxc7iv3jfzffvlrzhjh0g6kyvclrf87gdnwifyn1z"; depends=[cmprsk]; };
   crs = derive2 { name="crs"; version="0.15-24"; sha256="08k8vim4n85ll16zpkwbf3riz641kafn699qsg0h746zqzi1kfn7"; depends=[boot np quantreg rgl]; };
   crskdiag = derive2 { name="crskdiag"; version="1.0"; sha256="18qx8i069c7xck7rfgfkrnw409ikv1jx375vlq7vqp61qx91lqic"; depends=[cmprsk]; };
-  crunch = derive2 { name="crunch"; version="1.6.1"; sha256="0xvcla3axgvb6q7nkb9vnha6dnjhcchxvs9wqjx44v9avs0sd9qm"; depends=[curl httr jsonlite]; };
+  crunch = derive2 { name="crunch"; version="1.7.3"; sha256="1pasbah54a97944ih1229rw28q4sdd92g9ccrzi0fxpmgzy8i9xa"; depends=[curl httr jsonlite]; };
   cruts = derive2 { name="cruts"; version="0.1"; sha256="0p2iiccjf1414g5xp6rcww58vimh2ahj0ghak1mrjyvgb4q6zgh3"; depends=[lubridate ncdf raster sp stringr]; };
   csSAM = derive2 { name="csSAM"; version="1.2.4"; sha256="1ms8w4v5m9cxs9amqyljc2hr1178cz6pbhmv7iiq9yj1ijnl4r1x"; depends=[]; };
   csampling = derive2 { name="csampling"; version="1.2-2"; sha256="0gj85cgc3lgv7isqbkng4wgzg8gqcic89768q2p23k4jhhn6xm2w"; depends=[marg statmod survival]; };
@@ -3356,9 +3434,9 @@ in with self; {
   cstar = derive2 { name="cstar"; version="1.0"; sha256="1zws4cq5d37hqdxdk86g85p2wwihbqnkdsg48vx66sgffsf1fgxd"; depends=[]; };
   csvread = derive2 { name="csvread"; version="1.2"; sha256="1zx43g4f4kr7jcmiplzjqk2nw1g5kmmfap85wk88phf6fp0w8l5p"; depends=[]; };
   ctmcmove = derive2 { name="ctmcmove"; version="1.0"; sha256="01f0awlz1irb68laf11zr463aja1afdnn20fl8xrwda7qxmqqxam"; depends=[crawl Matrix raster]; };
-  ctmm = derive2 { name="ctmm"; version="0.2.9"; sha256="0sk4scz29i6ialhacz5bg5gpva5f0hrj58kbbz3395ida2g6p24j"; depends=[expm manipulate MASS Matrix numDeriv pbivnorm raster rgdal shape sp]; };
+  ctmm = derive2 { name="ctmm"; version="0.3.0"; sha256="0233s6m0173x1gcqhkwr7n1ylj07rj4y6ccj48iyhsy90vd49pps"; depends=[expm manipulate MASS Matrix numDeriv pbivnorm raster rgdal sp]; };
   cts = derive2 { name="cts"; version="1.0-20"; sha256="0bsf52b98fji85j01qv0krc7yzr8mqhvn7w1zsy2rbanjmlwmnca"; depends=[]; };
-  ctsem = derive2 { name="ctsem"; version="1.1.3"; sha256="0gjnxpmzvzx2m0696c5r68yc20xxyqqn7r0c7qz0if0dh7v826j4"; depends=[MASS Matrix OpenMx]; };
+  ctsem = derive2 { name="ctsem"; version="1.1.5"; sha256="0h2m234azxhfycksp8v32i725ii83zpzwmanra4ndh0jfncvs8z2"; depends=[MASS Matrix OpenMx]; };
   ctv = derive2 { name="ctv"; version="0.8-1"; sha256="1fmjhh4vr4vcvqg76dzp1avqappsap5piki1ixahikwbwirxcwvw"; depends=[]; };
   cubature = derive2 { name="cubature"; version="1.1-2"; sha256="1vgyvygg37b6yhy8nkly4w6p01jsqg2kyam4cn0vvml5vjdlc18a"; depends=[]; };
   cubfits = derive2 { name="cubfits"; version="0.1-0"; sha256="0iylwxzz2aa70q1xqk8r1rkfiiscj3blwq7dshkwshh91l2fgzfw"; depends=[]; };
@@ -3383,7 +3461,7 @@ in with self; {
   cwhmisc = derive2 { name="cwhmisc"; version="6.0"; sha256="13lgpxl957lbf333m1a17ad8iy3kjfrzav0sxx7w3vnsj98aqa43"; depends=[lattice]; };
   cwm = derive2 { name="cwm"; version="0.0.3"; sha256="1ln2l12whjhc2gx38hkf3xx26w5vz7m377kv67irh6rrywqqsyxn"; depends=[MASS matlab permute]; };
   cxxfunplus = derive2 { name="cxxfunplus"; version="1.0"; sha256="0kyy5shgkn7wikjdqrxlbpfl3zkkv4v1p8a1vv0xkncwarjs4n8d"; depends=[inline]; };
-  cycleRtools = derive2 { name="cycleRtools"; version="1.0.3"; sha256="0sg3ysscbh1d5igr4zbqxrb0vyx651q5hzarirqs3abksjyrwpsm"; depends=[Rcpp]; };
+  cycleRtools = derive2 { name="cycleRtools"; version="1.0.4"; sha256="0nkmsf2800m8w5d2cpyh2wfdz98n93l6chmp062gisdn884jd7j9"; depends=[Rcpp]; };
   cycloids = derive2 { name="cycloids"; version="1.0"; sha256="00pdxny11mhfi8hf76bfyhd1d53557wcbl2bqwjzlpw5x3vdnsan"; depends=[]; };
   cymruservices = derive2 { name="cymruservices"; version="0.1.1"; sha256="1pqqqmsgicp87r9axv96qj61mmxrn50d8xnhfhjf7sklxkh57482"; depends=[stringr]; };
   cyphid = derive2 { name="cyphid"; version="1.1"; sha256="0ya9w8aw27n0mvvjvni4hxsr4xc8dd08pjxx7zkfl1ynfn5b08am"; depends=[fda]; };
@@ -3399,7 +3477,7 @@ in with self; {
   dagR = derive2 { name="dagR"; version="1.1.3"; sha256="13jyhwjvvrjjja18rqzfdcw9ck90qm5yjwd25nygxgdf1894y03b"; depends=[]; };
   dagbag = derive2 { name="dagbag"; version="1.1"; sha256="1hpg7fs1yhnycziahscymkr0s3a2lyasfpj0cg677va73nrpdz12"; depends=[]; };
   dams = derive2 { name="dams"; version="0.1"; sha256="0h0chh9ahsfvqhv1a0dfw88q7gdl1d0w11qcw0w4qmc2ipsl52i6"; depends=[RCurl]; };
-  darch = derive2 { name="darch"; version="0.9.1"; sha256="0syrzmmz43msd51whkb4xy5n0kgcl50yw4w3i9sdd9k20glvwpsx"; depends=[ff futile_logger]; };
+  darch = derive2 { name="darch"; version="0.10.0"; sha256="0hs7w4p4azmbiif5b3fi4pngl33v16afwm2lnv8yhykh94y6y96q"; depends=[ff futile_logger]; };
   darts = derive2 { name="darts"; version="1.0"; sha256="07i5349s335jaags352mdx8chf47ay41q7b0mh2xjwn2h9kzgqib"; depends=[]; };
   dashboard = derive2 { name="dashboard"; version="0.1.0"; sha256="1znqwvz49r47lp6q48qaas0s63wclgybav82a247qvcavzns3kip"; depends=[Rook]; };
   data_table = derive2 { name="data.table"; version="1.9.6"; sha256="0vi3zplpxqbg78z9ifjfs1kl2i8qhkqxr7l9ysp2663kq54w6x3g"; depends=[chron]; };
@@ -3423,17 +3501,17 @@ in with self; {
   dbEmpLikeNorm = derive2 { name="dbEmpLikeNorm"; version="1.0.0"; sha256="0h5r2mqgallxf9hin64771qqn9ilgk1kpsjsdj2dqfl3m8zg967l"; depends=[dbEmpLikeGOF]; };
   dbarts = derive2 { name="dbarts"; version="0.8-5"; sha256="1w170mdfl5qz7dv1p2kqx0wnkmbz2gxh2a4p7vak1nckhz2sgpgn"; depends=[]; };
   dblcens = derive2 { name="dblcens"; version="1.1.7"; sha256="02639vyaqg7jpxih8cljc8snijb78bb084f4j3ns6byd09xbdwcw"; depends=[]; };
-  dbmss = derive2 { name="dbmss"; version="2.2.3"; sha256="0jb9lzg7giwnsy3zxlja3af3hfakq1bhayw9k6l4vm1z8x9gwrmc"; depends=[cubature Rcpp spatstat]; };
-  dbscan = derive2 { name="dbscan"; version="0.9-5"; sha256="07v286zv9djhf341369lcj4y3ailp4lmxy14ak1w0yq6r8a68vk6"; depends=[Rcpp]; };
+  dbmss = derive2 { name="dbmss"; version="2.2-4"; sha256="13dvdylra6ladpvgm3imad6wqqb1gaqhbb3s5l2lywx58kxrpnl8"; depends=[cubature Rcpp RcppParallel spatstat]; };
+  dbscan = derive2 { name="dbscan"; version="0.9-6"; sha256="1a7x190lsz53p5n54zcmv02940ikpnc3jw8irybcal79yf0nqmb9"; depends=[Rcpp]; };
   dbstats = derive2 { name="dbstats"; version="1.0.4"; sha256="1miba5h5hkpb79kv9v9hqb5p66sinxpqvrw9hy9l5z4li6849yy1"; depends=[cluster pls]; };
-  dc3net = derive2 { name="dc3net"; version="1.0"; sha256="1mnk02ajy7yxg02im9xp84km1rcbz32cwcparp054yxisbv2lvw9"; depends=[c3net igraph RedeR]; };
+  dc3net = derive2 { name="dc3net"; version="1.0.1"; sha256="1pg29h391js55mqvx8867iwswjinbhygq3cccnxdk97jmv06vb4b"; depends=[c3net igraph RedeR]; };
   dcGOR = derive2 { name="dcGOR"; version="1.0.6"; sha256="0rvwa25r23yayx1i6xhkfaw2z85d2iyfx3slg3aq1m0fa7kj380p"; depends=[dnet igraph Matrix]; };
   dcemriS4 = derive2 { name="dcemriS4"; version="0.55"; sha256="15x4hjc5fwpn80h90q5x9a3p84pp3mxsmcx4hq5l0j52l9dy9nv3"; depends=[oro_nifti]; };
   dclone = derive2 { name="dclone"; version="2.0-0"; sha256="1j8g955rvdgcmc9vnz3xizlkq8w1bslav5h72igvzzffcvqbj9hq"; depends=[coda]; };
   dcmle = derive2 { name="dcmle"; version="0.2-4"; sha256="0ddb0x0lwk8jgx05k747sa33d2rrj4g2p4aj0m5bw1c9d5gril0m"; depends=[coda dclone lattice rjags]; };
   dcmr = derive2 { name="dcmr"; version="1.0"; sha256="1a89wr1n8sykjbwa316zlmcffaysksrqnbd89anxqj8sgw9xv6jq"; depends=[ggplot2 KFAS plyr reshape2 tableplot]; };
   dcv = derive2 { name="dcv"; version="0.1.1"; sha256="12c716x8dnxnqksibpmyysqp2axggvy9dpd55s9bhnsvqvi6dshj"; depends=[lmtest]; };
-  ddR = derive2 { name="ddR"; version="0.1.1"; sha256="1r0b474pwh3hwj0wd5i7czr3yz6b7l9klv8vr8lc7ii82zqbacf5"; depends=[Rcpp]; };
+  ddR = derive2 { name="ddR"; version="0.1.2"; sha256="00mb9xq69dvl50v5429nw0mjazgjwh2sp98w8n2cwhhamjgp42k9"; depends=[Rcpp]; };
   ddalpha = derive2 { name="ddalpha"; version="1.1.3.1"; sha256="0vi7crw30mfpllmspicilz1vwhbsmlzx2mfs53kv2hs8vj7r1in8"; depends=[BH class MASS Rcpp robustbase]; };
   ddeploy = derive2 { name="ddeploy"; version="1.0.4"; sha256="06s4mn93sl33gldda9qab8l3nqig8zq0fh1s2f98igsysmn31br5"; depends=[httr jsonlite]; };
   ddst = derive2 { name="ddst"; version="1.03"; sha256="0zbqw4qmrh80jjgn8jzbnq3kykj1v5bsg6k751vircc0x9vnig3j"; depends=[evd orthopolynom]; };
@@ -3462,7 +3540,7 @@ in with self; {
   dendextend = derive2 { name="dendextend"; version="1.1.2"; sha256="1sscpb02dilr5pnvy7a4d6x8g4har3vrn455g8xkc9i68zi3v06f"; depends=[magrittr whisker]; };
   dendextendRcpp = derive2 { name="dendextendRcpp"; version="0.6.1"; sha256="125kjlfcj7y282j5g62c6j5hflvwngrm70waxym0lzr7xldwx7bk"; depends=[dendextend Rcpp]; };
   dendroextras = derive2 { name="dendroextras"; version="0.2.1"; sha256="0k1w374r4fvfcbzhrgcvklccjggyz755z7wc2vqfi3c5hvdb9ns4"; depends=[]; };
-  dendsort = derive2 { name="dendsort"; version="0.3.2"; sha256="0qj65jraj6ksmsfsrc4f3y8m7x5lqg9bqc9yb5s3bav2r8qjyhv6"; depends=[]; };
+  dendsort = derive2 { name="dendsort"; version="0.3.3"; sha256="1m4qh79ppfvipmbi8m8vwq0hqmwwipbg5izihz5j6x8a4g5i6iym"; depends=[]; };
   denovolyzeR = derive2 { name="denovolyzeR"; version="0.1.0"; sha256="0ys8pi3wp2cvywsnh07wldv6vcb8sn7f1divpaw8f6gnw7mnhimd"; depends=[dplyr reshape]; };
   denpro = derive2 { name="denpro"; version="0.9.2"; sha256="19hrpfd44jaavq81dbyj3frris4aflfc8lig0471whv0pc6jci2k"; depends=[]; };
   densityClust = derive2 { name="densityClust"; version="0.1-1"; sha256="1apv9n871dshln5ccg8x3pwqi8yfx73ijfqsvzcljqnv36qpqpqd"; depends=[]; };
@@ -3471,6 +3549,7 @@ in with self; {
   depmix = derive2 { name="depmix"; version="0.9.13"; sha256="1dkwc1bjq19hjzichh78b41qslklgwib8mglbn23q9dsys8a3ccz"; depends=[MASS]; };
   depmixS4 = derive2 { name="depmixS4"; version="1.3-2"; sha256="18xmn5fv9wszh86ph91yypfnyrxy7j2gqrzzgkb84986fjp2sxlq"; depends=[MASS nnet Rsolnp]; };
   depth = derive2 { name="depth"; version="2.0-0"; sha256="1aj4cch3iwb6vz0bzj4w5r6jp2qs39g8lxi2nmpbi3m7a6qrgr2q"; depends=[abind circular rgl]; };
+  depth_plot = derive2 { name="depth.plot"; version="0.1"; sha256="0zjg9iyqmcnkvwc9w2j7lmk3k9nsg6n8m6vq5x44d1bp4g2gr6jv"; depends=[mvtnorm]; };
   depthTools = derive2 { name="depthTools"; version="0.4"; sha256="1699r0h1ksgrlz9xafw2jnqfsc7xs0yaw97fc6dv3r11x6gxk00y"; depends=[]; };
   dequer = derive2 { name="dequer"; version="1.0"; sha256="1xf2kl6ppgsplqwhxxyak39575bjijh81snq534yndf31pdqqhd7"; depends=[]; };
   descomponer = derive2 { name="descomponer"; version="1.2"; sha256="08hc3p4l8dy1h2z8ijifwlgidmac9b29g1k725yzwzbdr5jzvnzl"; depends=[taRifx]; };
@@ -3481,6 +3560,7 @@ in with self; {
   designGG = derive2 { name="designGG"; version="1.1"; sha256="1x043j36llwd7kd4skbpl2smz2ybsxjqf5yd1xwqmardq60gdv2w"; depends=[]; };
   desirability = derive2 { name="desirability"; version="1.9"; sha256="1p3w4xk4is22gqgy2gyxj80vib8s40lgllqc2fnz66kb2cln10n6"; depends=[]; };
   desire = derive2 { name="desire"; version="1.0.7"; sha256="0jmj644nj6ck0gsk7c30af9wbg3asf0pqv1fny98irndqv508kf6"; depends=[loglognorm]; };
+  desplot = derive2 { name="desplot"; version="1.0"; sha256="1x8x0nqmirmx4l8cdl5fqy01j5ljlnldjh5yz06qwjv4ykqd41dc"; depends=[lattice reshape2]; };
   detect = derive2 { name="detect"; version="0.3-2"; sha256="1mjc8h3xb2zbj4dxala8yqbdl94knf9q0qvkc37ag1b2w4y2d2b0"; depends=[Formula]; };
   detector = derive2 { name="detector"; version="0.1.0"; sha256="010i063b94hzx7qac8gpl67gmk7hzgqm9i1c7pbbw4la3wcd9lz7"; depends=[stringr]; };
   detrendeR = derive2 { name="detrendeR"; version="1.0.4"; sha256="1z10gf6mgqybb9ml6z3drq65n7g28h2pqpilc2h84l6y76sy909c"; depends=[dplR]; };
@@ -3510,7 +3590,7 @@ in with self; {
   diffEq = derive2 { name="diffEq"; version="1.0-1"; sha256="1xmb19hs0x913g45szmm26xx5xp85v182wqf0lnl4raxaf47yhkm"; depends=[bvpSolve deSolve deTestSet ReacTran rootSolve shape]; };
   diffIRT = derive2 { name="diffIRT"; version="1.5"; sha256="0kip6wz9l9q80qsqwf32pwz7d9vqin6dgfwf0nxlrlzf8xjsxgim"; depends=[statmod]; };
   diffdepprop = derive2 { name="diffdepprop"; version="0.1-9"; sha256="0mgrm1isr26v2mcm6fkzc7443ji00vpnqmw4zngx81n7442b3cl2"; depends=[gee PropCIs rootSolve]; };
-  diffeR = derive2 { name="diffeR"; version="0.0-3"; sha256="0r1f39jh0jmlfvvzfvwr84g7xh9d6nkgqaq3kxdf66cggsxwnag4"; depends=[ggplot2 raster rgdal]; };
+  diffeR = derive2 { name="diffeR"; version="0.0-4"; sha256="08g21h3yq8rm2i6ah364nfadg7hnghc21jnpi5aqwzqyd2v93b67"; depends=[ggplot2 raster rgdal]; };
   diffr = derive2 { name="diffr"; version="0.0.1"; sha256="0lhk9vm9gp0pwzsniy49dgq9vd4c1bxf8c8w8ib4b4fg5jq3hfwj"; depends=[htmlwidgets]; };
   diffractometry = derive2 { name="diffractometry"; version="0.1-8"; sha256="1m6cyf1kxm9xf1z4mn4iz0ggiy9wcyi8ysbgcsk7l78y7nqh1h99"; depends=[]; };
   diffusionMap = derive2 { name="diffusionMap"; version="1.1-0"; sha256="1l985q2hfc8ss5afajik4p25dx628yikvhdimz5s0pql800q2yv3"; depends=[igraph Matrix scatterplot3d]; };
@@ -3521,7 +3601,7 @@ in with self; {
   dinamic = derive2 { name="dinamic"; version="1.0"; sha256="0mx72q83bbwm10ayr3f1dzwr5wgz7gclw7rh39yyh95slg237nzr"; depends=[]; };
   diptest = derive2 { name="diptest"; version="0.75-7"; sha256="0rcgycgp0bf8vhga1wwgfcz3pqs5l26hgzsgf2f97dwfna40i1p1"; depends=[]; };
   directPA = derive2 { name="directPA"; version="1.2"; sha256="0wzmlahqcrb5f3hrlym5gs5wizmgvhndky7zvc98324bq645b56m"; depends=[calibrate rgl]; };
-  directlabels = derive2 { name="directlabels"; version="2013.6.15"; sha256="083cwahz320r4w4jbh62pxmzn1i1hixp398zm8f2fpzh4qp5y44g"; depends=[quadprog]; };
+  directlabels = derive2 { name="directlabels"; version="2015.12.16"; sha256="0vi9zbc2sa8fpi2n2ax1ni9f8s9w1hc0f6gahk8fcrmnagj4g089"; depends=[quadprog]; };
   dirmult = derive2 { name="dirmult"; version="0.1.3-4"; sha256="1r9bhw1z0c1cgfv7jc0pvdx3fpnwplkxwz8j8jjvw14zyx803rnz"; depends=[]; };
   discSurv = derive2 { name="discSurv"; version="1.1.2"; sha256="02jk2qz029i3rxikbfq66g9246gangmbzhq1cl8hxib0891j535b"; depends=[functional mgcv mvtnorm]; };
   disclap = derive2 { name="disclap"; version="1.5"; sha256="0piv9gxhxcd4pbh5qjn9c3199f32y3qiw5vy8cr77ki70dnmr66n"; depends=[]; };
@@ -3556,7 +3636,7 @@ in with self; {
   diveMove = derive2 { name="diveMove"; version="1.4.0"; sha256="1m16i9hchr7zcigz93n6q94lrc6xnm0skyscf92cp58cagz1c72w"; depends=[caTools geosphere KernSmooth quantreg]; };
   diveRsity = derive2 { name="diveRsity"; version="1.9.89"; sha256="0f75dak14x9x9xs6ql9686n6w1f0w5g6h5ya983mg547f1zzbw9m"; depends=[ggplot2 qgraph Rcpp shiny]; };
   diverse = derive2 { name="diverse"; version="0.1.1"; sha256="1k4fxaizasv47cnlijm8dhdb5lagqrmhn6g0nk6mhca21n3qdjsd"; depends=[foreign proxy reshape2]; };
-  diversitree = derive2 { name="diversitree"; version="0.9-7"; sha256="0hr3hzrrbmfqbzcwn18lnqmychs9f21j1x214zry0jmw9pnai0s0"; depends=[ape deSolve Rcpp subplex]; };
+  diversitree = derive2 { name="diversitree"; version="0.9-8"; sha256="02cr8wrahm3kljj7gpmfwadjlca04a8gvm0i65436yj2lh4vxqa8"; depends=[ape deSolve Rcpp subplex]; };
   divo = derive2 { name="divo"; version="0.1.1"; sha256="10kymbvp46rzdd6a6p2fri9424sdxj2bhhv0fld7ikk71xgpfdrp"; depends=[cluster RcppCNPy]; };
   dixon = derive2 { name="dixon"; version="0.0-5"; sha256="0x7x0l7p8kmkfqqqah8hck2r96b3w8padd41skd3q35vq8kmnsqc"; depends=[spatstat splancs]; };
   dkDNA = derive2 { name="dkDNA"; version="0.1.1"; sha256="0ycyzn5bmhjl5idp0lndffkninpm9n23wrkrzi59ac8z8ghsnhf4"; depends=[]; };
@@ -3570,7 +3650,7 @@ in with self; {
   dmt = derive2 { name="dmt"; version="0.8.20"; sha256="0rwc8l9k2y46hslsb3y8a1g2yjxalcvp1l3v7jix0c5kz2q7917w"; depends=[MASS Matrix mvtnorm]; };
   dna = derive2 { name="dna"; version="1.1-1"; sha256="0gw70h1j67h401hdvd38d6jz71x1a6xlz6ziba6961zy6m3k5xbm"; depends=[]; };
   dnet = derive2 { name="dnet"; version="1.0.7"; sha256="0aa64y7mm1xan34h1pimajm7hvlm7z3r9rikysc2dw5dskkhli40"; depends=[Biobase graph igraph Matrix Rgraphviz supraHex]; };
-  doBy = derive2 { name="doBy"; version="4.5-13"; sha256="07ppghcf381wc9s9igsi3viy6p86b5bmpfm1s8iwq7ca4j89qw42"; depends=[MASS Matrix survival]; };
+  doBy = derive2 { name="doBy"; version="4.5-14"; sha256="01dhigi6qj0lmhas2d06ysm7ph71rfk5kj5sbivxi8a2dx8f73yl"; depends=[MASS Matrix survival]; };
   doMC = derive2 { name="doMC"; version="1.3.4"; sha256="0y47jl6g4f83r14pj8bafdzq1phj7bxy5dwyz3k43d2rr8phk8bn"; depends=[foreach iterators]; };
   doMPI = derive2 { name="doMPI"; version="0.2.1"; sha256="1d2pkxsap656l7h88q37ymy1jw0zd4n9h892511a1a230dxwc0xh"; depends=[foreach iterators Rmpi]; };
   doParallel = derive2 { name="doParallel"; version="1.0.10"; sha256="1mddx25l25pw9d0csnx2q203dbg5hbrhkr1f08kw0p02a1lln0kh"; depends=[foreach iterators]; };
@@ -3585,18 +3665,18 @@ in with self; {
   dosresmeta = derive2 { name="dosresmeta"; version="1.3.2"; sha256="1v0hf8x0qjzhxwa60ri2vhjv05z9iaf90dvhpmjjjrgskb7qpcd9"; depends=[aod Matrix mvmeta]; };
   dostats = derive2 { name="dostats"; version="1.3.2"; sha256="15j9sik9j5pic5wrp0w26xkrhi337xkbikw0k7sa4yfimw6f84w5"; depends=[]; };
   dotenv = derive2 { name="dotenv"; version="1.0"; sha256="1lxwvrhqcwj9q24x30xzrw8qqhxgyr88ja3fajm5hf3pwbw85yls"; depends=[falsy magrittr]; };
-  dotwhisker = derive2 { name="dotwhisker"; version="0.2.0.1"; sha256="1d4s53h2ra0wmgbq5ma4j0k5j3a94psg5fabi3vbgwfrbds5xsnp"; depends=[broom dplyr ggplot2 gridExtra gtable plyr stringr]; };
+  dotwhisker = derive2 { name="dotwhisker"; version="0.2.0.2"; sha256="1y4cx3fll6n30qgwdjdlrhlxqm256rpddlj4qjd8aa0z0s38rajg"; depends=[broom dplyr ggplot2 gridExtra gtable plyr stringr]; };
   downloader = derive2 { name="downloader"; version="0.4"; sha256="1axggnsc27zzgr7snf41j3zd1vp3nfpmq4zj4d01axc709dyg40q"; depends=[digest]; };
   downscale = derive2 { name="downscale"; version="0.1-0"; sha256="13bh5h4hmkic2sknj712545gkxgswcsxlyq61s7llddl7v3pcdym"; depends=[cubature minpack_lm raster Rmpfr sp]; };
   dpa = derive2 { name="dpa"; version="1.0-3"; sha256="0dmwi68riddi1q4b10c12wx6n7pqfmv30ix5x72zpdbgm72v343h"; depends=[igraph sem]; };
-  dpcR = derive2 { name="dpcR"; version="0.1.4.0"; sha256="0fv17vzlsjb5cy1f0ll5gi5y8npavp2y7frzc595na5g15xphmxc"; depends=[binom chipPCR dgof e1071 multcomp pracma qpcR rateratio_test shiny signal spatstat]; };
+  dpcR = derive2 { name="dpcR"; version="0.2"; sha256="0ww1mhwi2mh1565vy0s7zwis0c5qfx533yg94sdcjl5ly4f65hj1"; depends=[binom chipPCR dgof e1071 multcomp pracma qpcR rateratio_test readxl shiny signal spatstat]; };
   dpglasso = derive2 { name="dpglasso"; version="1.0"; sha256="1mx28xbm2z2bxyp33wv2v6vgn1yfsdsa0bzjjdxasgd6lvr51myf"; depends=[]; };
   dplR = derive2 { name="dplR"; version="1.6.3"; sha256="0w94rdkpw5pbl9ywfvgpmzkwc88m5d5dwii5kw312nfhkb549q4x"; depends=[digest gmp lattice Matrix matrixStats png R_utils stringi stringr XML]; };
   dplRCon = derive2 { name="dplRCon"; version="1.0"; sha256="10xnawgnhxp5y949fxs1vvadc1qz2ldy0s9w9w7kf6iqh59d35sw"; depends=[]; };
   dplyr = derive2 { name="dplyr"; version="0.4.3"; sha256="1p8rbn4p4yrx2840dapwiahf9iqa8gnvd35nyc200wfhmrxlqdlc"; depends=[assertthat BH DBI lazyeval magrittr R6 Rcpp]; };
   dpmixsim = derive2 { name="dpmixsim"; version="0.0-8"; sha256="0paa2hmpd6bqf0m7p9j7l2h3j18lm64ya6ya8zvp55wm8pf7xgqg"; depends=[cluster oro_nifti]; };
   dpmr = derive2 { name="dpmr"; version="0.1.7-1"; sha256="0nh45hg9za9w4w4syrrg54s1fpn6iikv431qkdjyinv8y1a3klga"; depends=[digest httr jsonlite magrittr rio]; };
-  dprep = derive2 { name="dprep"; version="3.0"; sha256="1jzda16cz57rhgcg0mj9nj3q3zy6wkaw8byacjaqmp1lydfh8v2l"; depends=[class e1071 FNN MASS nnet rgl rpart StatMatch]; };
+  dprep = derive2 { name="dprep"; version="3.0.2"; sha256="0iw1pqpqlv436wpwh1w832aqvy91zvxmbk2jdw7aczrb29wys2bj"; depends=[class e1071 FNN MASS nnet rgl rpart StatMatch]; };
   dr = derive2 { name="dr"; version="3.0.10"; sha256="0dmz4h7biwrn480i66f6jm3c6p4pjvfv24pw1aixvab2vcdkqlnf"; depends=[MASS]; };
   drLumi = derive2 { name="drLumi"; version="0.1.2"; sha256="09ps8rcqrm6a1y8yif2x82l0k4jywq60pkndh9nzfpbsw4ak2lby"; depends=[chron gdata ggplot2 Hmisc irr minpack_lm msm plyr reshape rootSolve stringr]; };
   drat = derive2 { name="drat"; version="0.1.0"; sha256="0pcmgzgvkdlfh8nriqy2nvs3wqv3p072y9152g1k5xl71drbrdg6"; depends=[]; };
@@ -3609,8 +3689,8 @@ in with self; {
   dropR = derive2 { name="dropR"; version="0.1"; sha256="0sw5lqlfdn64dbykxdhk1pz18f83if871vkapa2nxgcfiy79b0vs"; depends=[plyr shiny]; };
   drsmooth = derive2 { name="drsmooth"; version="1.9.0"; sha256="1wgi961bvbsnq4bygxbpy4sy5fy34lrrkaaj0r2rxcahwa1sc38n"; depends=[boot car DTK lubridate mgcv multcomp pgirmess segmented]; };
   ds = derive2 { name="ds"; version="3.0"; sha256="10xp575l0wh85wg32k3as02kgqm9ax9nx9i5kd5bkimfwg4qv745"; depends=[]; };
-  dsample = derive2 { name="dsample"; version="0.91.1.5"; sha256="02ksm4d9ybz4w7j3c9rjqh262k6rqs1bdhj3p7w5rcaskpc6qz9s"; depends=[]; };
-  dse = derive2 { name="dse"; version="2014.11-1"; sha256="0fl1av8zd0csbsk6fplcxgqsb50qr1baasw2jrqv6h83j2xwph2l"; depends=[setRNG tfplot tframe]; };
+  dsample = derive2 { name="dsample"; version="0.91.2.2"; sha256="18c0zxaqwgbn9kmkwlnicwd74ljy2sxj0b9ksif13pdlj3zn57h1"; depends=[MASS]; };
+  dse = derive2 { name="dse"; version="2015.12-1"; sha256="1976h57zallhzq43nshg77bsykcvkfwnasha1w59c44fjpl1gs9w"; depends=[setRNG tfplot tframe]; };
   dslice = derive2 { name="dslice"; version="1.1.5"; sha256="0qwz9rlgpgx0k28hca2m40ab0qad9rfp1gxswygchv7rcnl4f6ml"; depends=[ggplot2 Rcpp scales]; };
   dsm = derive2 { name="dsm"; version="2.2.9"; sha256="147c94bk73ss7bcliz4a65zx0lhf3gap9ygcc82yvf7sibpasnqd"; depends=[ggplot2 mgcv mrds nlme statmod]; };
   dst = derive2 { name="dst"; version="0.3"; sha256="1gdf4sjk2svywx2m6z22d383xppsm6dm108w93pcwfs8fpcdwxb9"; depends=[]; };
@@ -3618,7 +3698,7 @@ in with self; {
   dtt = derive2 { name="dtt"; version="0.1-2"; sha256="0n8gj5iylfagdbaqirpykb01a9difsy4zl6qq55f0ghvazxqdvmn"; depends=[]; };
   dtw = derive2 { name="dtw"; version="1.18-1"; sha256="1b91vahba09cqlb8b1ry4dlv4rbldb4s2p6w52gmyw31vxdv5nnr"; depends=[proxy]; };
   dtwSat = derive2 { name="dtwSat"; version="0.1.0"; sha256="1897ns6f8hg6s8k710yvx48f5m0zai0ifnsan6iva749c0nmrvv3"; depends=[dtw ggplot2 proxy reshape2 scales waveslim zoo]; };
-  dtwclust = derive2 { name="dtwclust"; version="1.2.0"; sha256="0b6cld8imxfknx07l5nprjm77ffvnrx66j6zvcr4sql77m909w17"; depends=[caTools dtw flexclust ggplot2 modeltools proxy reshape2]; };
+  dtwclust = derive2 { name="dtwclust"; version="2.0.0"; sha256="04gwi5nd7b4jq63h7d76qvn7p6ll2kk0864lfwhjh71a78gszh8z"; depends=[caTools doRNG dtw flexclust foreach ggplot2 proxy reshape2]; };
   dualScale = derive2 { name="dualScale"; version="0.9.1"; sha256="11hqxprai0s5id6wk4n2q174r1sqx9fzw3fscvqd2cgw8cjn1iwl"; depends=[ff lattice Matrix matrixcalc vcd]; };
   dummies = derive2 { name="dummies"; version="1.5.6"; sha256="01f84crqx17xd6xy55qxlvsj3knm8lhw7jl26p2rh2w3y0nvqlbm"; depends=[]; };
   dummy = derive2 { name="dummy"; version="0.1.3"; sha256="081a5h33gw6ym4isy91h6mcf247c2vsdygv9ll07a3mgjcjnk79p"; depends=[]; };
@@ -3626,11 +3706,11 @@ in with self; {
   dupiR = derive2 { name="dupiR"; version="1.2"; sha256="0p649yw7iz6hnp7rqa2gk3dqkjbqx1f6fzpf1xh9088nbf3bhhz3"; depends=[plotrix]; };
   dvfBm = derive2 { name="dvfBm"; version="1.0"; sha256="0gx11dxkbnh759ysd1lxdarlddgr3l5gwd5b0klwvwsgck6jv529"; depends=[wmtsa]; };
   dvn = derive2 { name="dvn"; version="0.3.3"; sha256="14ncna67qgknh20xdvxqddjhagj61niwpvz4ava9k0z68rgzmk5h"; depends=[RCurl XML]; };
-  dygraphs = derive2 { name="dygraphs"; version="0.5"; sha256="0msx9j8im20ff8sfq83qq3dhj77vw11mkh9m1hsgqflrhflwzlip"; depends=[htmlwidgets magrittr xts zoo]; };
+  dygraphs = derive2 { name="dygraphs"; version="0.6"; sha256="0hyh9axkyizvdmzvy3pqdm2cfpww998vyrqjzqiyz426djp84j8q"; depends=[htmlwidgets magrittr xts zoo]; };
   dyn = derive2 { name="dyn"; version="0.2-9"; sha256="16zd32567aj0gqv9chbcdgi6sj78pnnfy5k8si15v5pnfvkkwslp"; depends=[zoo]; };
   dynBiplotGUI = derive2 { name="dynBiplotGUI"; version="1.1.3"; sha256="1wgxxn0nlmza7npvjbkfq6nmp30n719yqrav6jzxcp00dk3ymg6g"; depends=[tcltk2 tkrplot]; };
   dynCorr = derive2 { name="dynCorr"; version="0.1-2"; sha256="0qzhhfhkwpq6mwg7y6sxpqvcj8klvivnfv69g7x3ycha1kw2xk3w"; depends=[lpridge]; };
-  dynRB = derive2 { name="dynRB"; version="0.4"; sha256="0h7rh7wcfrflav1a5lh6zpijqnl1j0s66j611hpagdw3cda9ccmr"; depends=[caTools corrplot]; };
+  dynRB = derive2 { name="dynRB"; version="0.5"; sha256="1rw89h3d7hb2jsl7q07pdv0kg7i06qqcngwyplfjcc2m2cvmx1wj"; depends=[caTools corrplot]; };
   dynaTree = derive2 { name="dynaTree"; version="1.2-7"; sha256="06pw78j6wwx7yc175bns1m2p5kg5400vg8x14v4hbrz3ydagx4dn"; depends=[]; };
   dynamicGraph = derive2 { name="dynamicGraph"; version="0.2.2.6"; sha256="1xnsp8mr3is4yyn0pyrvqhl893gdx2y1zv8d2d55aah2xbfk0fjj"; depends=[ggm]; };
   dynamicTreeCut = derive2 { name="dynamicTreeCut"; version="1.62"; sha256="1y11gg6k32wpsyb10kdv176ivczx2jlizs1xsrjrs6iwbncwzrkp"; depends=[]; };
@@ -3638,7 +3718,7 @@ in with self; {
   dynia = derive2 { name="dynia"; version="0.2"; sha256="1swip4kqjln3wsa9xl0g92zklqafarva923nw7s44g4pjdy73d5l"; depends=[]; };
   dynlm = derive2 { name="dynlm"; version="0.3-3"; sha256="0ym23gv2vkvvnxvzk5kh6xy4gb5wbnpdbgkb5s6zx24lh81whvcs"; depends=[car lmtest zoo]; };
   dynpred = derive2 { name="dynpred"; version="0.1.2"; sha256="111ykasaiznn3431msj4flfhmjvzq7dd1mnzn1wklc5ndix1pvf9"; depends=[survival]; };
-  dynsim = derive2 { name="dynsim"; version="1.2"; sha256="0vd08mdv7yklhy5rqmhji0ff9284n2z15a3ij4ylw7a0hzlyp2m3"; depends=[ggplot2 gridExtra MASS]; };
+  dynsim = derive2 { name="dynsim"; version="1.2.1"; sha256="0nkxn9v4f353fhcn1vsdrh29mrms10zid63b84flg3c6hvc0x4qr"; depends=[ggplot2 gridExtra MASS]; };
   dynsurv = derive2 { name="dynsurv"; version="0.2-2"; sha256="0418r7adki48pg3h7i1mgv3xpbryi520va3jpd03dx15zrq8zaqg"; depends=[BH ggplot2 nleqslv plyr reshape survival]; };
   e1071 = derive2 { name="e1071"; version="1.6-7"; sha256="1069qwj9gsjq6par2cgfah8nn5x2w38830761x1f7mqpmk0gnj3h"; depends=[class]; };
   eHOF = derive2 { name="eHOF"; version="1.6"; sha256="0zcm541h7gz0wa1v4c69xxnp44j4aaf93gwsrlha2wr2ywl4pbz7"; depends=[lattice mgcv]; };
@@ -3656,6 +3736,8 @@ in with self; {
   eba = derive2 { name="eba"; version="1.7-1"; sha256="0kxdhl7bc4f570m9rbxxzg748zvq0q7a0slvfr4w1f45vfzhyh17"; depends=[nlme]; };
   ebal = derive2 { name="ebal"; version="0.1-6"; sha256="1cpinmbrgxxv0fzi9qi2inv4hw2lz7iq4b0ggp316rdqqb5bj9r0"; depends=[]; };
   ebdbNet = derive2 { name="ebdbNet"; version="1.2.3"; sha256="123iqp8rnm3pac5fvpzq5sqbf8nyfpf05g23nawanid6yv23ba9a"; depends=[igraph]; };
+  ecb = derive2 { name="ecb"; version="0.1"; sha256="192zi7p7jby1apy7bb1wikham27z5q3p1vg5cw9bhxfsjq94xf03"; depends=[curl httr rsdmx xml2]; };
+  ecd = derive2 { name="ecd"; version="0.6.4"; sha256="16jlgwyb6rmxsas6p1dgxpmfdinm422v4y1f62kh7ai0sjcf8hjm"; depends=[moments optimx polynom Rmpfr RSQLite xts yaml zoo]; };
   ecespa = derive2 { name="ecespa"; version="1.1-8"; sha256="0rdjr0ss7a1n66dmvykbs3x944r88l08md2rfkg9w7bxm361ib8p"; depends=[spatstat splancs]; };
   ecipex = derive2 { name="ecipex"; version="1.0"; sha256="0pzmrpnis52hvy80p3k60mg9xldq6fx8g9n3nnqi3z56wxmqpdv7"; depends=[CHNOSZ]; };
   eco = derive2 { name="eco"; version="3.1-7"; sha256="0qrl1mq0nc42j4dzqhayzzb56gmkk479wgpxikzgzpj9wv78yd5s"; depends=[MASS]; };
@@ -3683,9 +3765,9 @@ in with self; {
   eegkit = derive2 { name="eegkit"; version="1.0-2"; sha256="10dksmc5lrl0ypifvmmv96xnndl2zx191sl79qif0gfs3wq3w4s0"; depends=[bigsplines eegkitdata ica rgl]; };
   eegkitdata = derive2 { name="eegkitdata"; version="1.0"; sha256="1krsadhamv1m8im8sa1yfl7injvrc4vv3p88ps1mpn8hibk5g51m"; depends=[]; };
   eel = derive2 { name="eel"; version="1.1"; sha256="0cv6dhw57yy140g73z94g9x1s42fpyfliv9cm2z1alm7xwap1l0x"; depends=[emplik rootSolve]; };
-  eemR = derive2 { name="eemR"; version="0.1.0"; sha256="0ilydikbb2bx0q7q0jmp9irw0aks0yl0ngifd48phdxl2b383zj5"; depends=[dplyr fields ggplot2 pracma R_matlab Rcpp readr stringr tidyr]; };
+  eemR = derive2 { name="eemR"; version="0.1.1"; sha256="15dmcxw96wndl3xa967lgrvw71agxnx1infvpf6ybwzn1bkdqa7w"; depends=[dplyr fields ggplot2 pracma R_matlab Rcpp readr stringr tidyr]; };
   eeptools = derive2 { name="eeptools"; version="0.9.1"; sha256="0rgal6a5jjl572dqzc4zwmcqjsa12x8mv99c63bfmczp11f5hjmn"; depends=[arm data_table ggplot2 maptools memisc vcd]; };
-  effects = derive2 { name="effects"; version="3.0-4"; sha256="0ypw49gighmg2azc2872y8r9rx9v3x0r2gsidgkwqlaqg95vfcd7"; depends=[colorspace lattice lme4 nnet]; };
+  effects = derive2 { name="effects"; version="3.0-5"; sha256="1wdj403m221w8d92r22x730bz029sbp2b24jk3v8h7ncfp9d55nc"; depends=[colorspace lattice lme4 nnet]; };
   efflog = derive2 { name="efflog"; version="1.0"; sha256="1sfmq7xrr6psa6hwi05m44prjcpixnrl7la03k33n0bksj8r1w6b"; depends=[]; };
   effsize = derive2 { name="effsize"; version="0.5.4"; sha256="1dc90avbnb83nrm70wh0h45g3c6dcg8zh2ynklc2x86cqk7b264b"; depends=[]; };
   ega = derive2 { name="ega"; version="1.0.1"; sha256="02mbadv505jz6nk1yp9xl12c9l9wnwpl5bajfbhgs837pdca438g"; depends=[ggplot2]; };
@@ -3730,15 +3812,16 @@ in with self; {
   energy = derive2 { name="energy"; version="1.6.2"; sha256="008yf4r6546mzk9q515zliqxyjx6w0z19g5wlarg7f4lrzsmqiaw"; depends=[boot]; };
   english = derive2 { name="english"; version="1.0-1"; sha256="1413axjp2icj9wwnkz3vl4gvrwlgmjpc2djzv5bllbnc4a4dgj24"; depends=[]; };
   enigma = derive2 { name="enigma"; version="0.2.0"; sha256="0a45fp9lmxrdwpa7y3sfbgcijw5ss2fz7j2r7qnc0ask1x4yfqr4"; depends=[httr jsonlite plyr]; };
-  enpls = derive2 { name="enpls"; version="1.0"; sha256="1grnabrb0kzjvjvwp9rx1xqfljla0jd5xrkcbwfzmy2ymmbvh6ma"; depends=[doParallel foreach pls]; };
+  enpls = derive2 { name="enpls"; version="1.1"; sha256="0vwl714w441c6wv9jnmyfzjd055ydia6qvwv6vrmnfasv3q5ny7z"; depends=[doParallel foreach pls]; };
   enrichvs = derive2 { name="enrichvs"; version="0.0.5"; sha256="0x91s03hz1yprddm6mqi75bm45ki3yapfrxmap7d4qc0hi06h22k"; depends=[]; };
   ensembleBMA = derive2 { name="ensembleBMA"; version="5.1.2"; sha256="0cfasrs1paz60na8by9zk0c5jc48l9djvn6c64ygjl1rapz389d4"; depends=[chron]; };
   ensembleMOS = derive2 { name="ensembleMOS"; version="0.7"; sha256="0g5qzdic5jvgn6wv7zh0jnz8malfgfxn26l7lg30y96vcmi4hk54"; depends=[chron ensembleBMA]; };
   ensurer = derive2 { name="ensurer"; version="1.1"; sha256="1gbbni73ayzcmzhxb88pz6xx418lqjbp37sdkggbrxcyhsxpdkid"; depends=[]; };
-  entropart = derive2 { name="entropart"; version="1.4.1"; sha256="0i56sbsm5gkmlfndyjj9gs2ma29v0air6dy2whn25zgw34w1v91w"; depends=[ade4 ape geiger vegan]; };
+  entropart = derive2 { name="entropart"; version="1.4-3"; sha256="12ishzw0bxm4q1c3s0sjcsmfia2lw2z6shjilv142sm1qykhq1sw"; depends=[ade4 ape geiger vegan]; };
   entropy = derive2 { name="entropy"; version="1.2.1"; sha256="10vg4818q5g54pv2nn9x5i7pvky5nsv96syy47pz2mgqp1273cpd"; depends=[]; };
   enviPat = derive2 { name="enviPat"; version="2.0"; sha256="10fzzwlcmrfcppsj06pma8jkp5pfrb2ys70ggb9q4frc5irg5lha"; depends=[]; };
   enviPick = derive2 { name="enviPick"; version="1.3"; sha256="01wkijvhr8wqjzrhgkvxbnnmb9qsnq0lhkgw93s8nrf8yr3z3awj"; depends=[readMzXmlData shiny]; };
+  envlpaster = derive2 { name="envlpaster"; version="0.1-1"; sha256="1n52jc35dffxawc0k9h8vhkbv3dc8787zq0slsikrgj7zlfqkixl"; depends=[aster aster2 caTools MASS]; };
   epade = derive2 { name="epade"; version="0.3.8"; sha256="1alvsifc6i71ilm1xxs1d7sqlapb48bqd6z2n4wi6pqcjvwp7bif"; depends=[plotrix]; };
   epandist = derive2 { name="epandist"; version="1.0.2"; sha256="0c2sfn3bc7f1rbasvymxaazw9ghq6kxswbcslvmlbnzhmmws8a6h"; depends=[]; };
   epanetReader = derive2 { name="epanetReader"; version="0.2.2"; sha256="0sp1z99cn74am5ms287g5437sjciqam3p7lv8qz4rs7va9hbyz9z"; depends=[]; };
@@ -3755,7 +3838,7 @@ in with self; {
   eqs2lavaan = derive2 { name="eqs2lavaan"; version="3.0"; sha256="1lj6jwkfd84h9ldb6l74lrx2pnsl1c0d7mnrcrjkska87djb2nzd"; depends=[lavaan stringr]; };
   eqtl = derive2 { name="eqtl"; version="1.1-7"; sha256="0xfr8344irhzyxs9flnqn4avk3iv1scqhzac5c2ppmzqhb398azr"; depends=[qtl]; };
   equate = derive2 { name="equate"; version="2.0-3"; sha256="0y37nxily7zjx00z7h4vmpn8cs7bl3aravhjkjz9l6y0fv0rc5vv"; depends=[]; };
-  equateIRT = derive2 { name="equateIRT"; version="1.2"; sha256="07qh5awa12d1bcm504k0rpgyxyzhymg92131cl676kdlfp49aqk1"; depends=[statmod]; };
+  equateIRT = derive2 { name="equateIRT"; version="1.2-2"; sha256="1kvxhirsxgcqs079m7z852bdk3jpsaj8pvbfj96r8sy3hdsb1blj"; depends=[statmod]; };
   equivalence = derive2 { name="equivalence"; version="0.7.0"; sha256="0x9840kyyhdlj13r2rhijc6p0chvzyqp6lkxxf561pnprhkzzqdj"; depends=[boot lattice PairedData]; };
   erboost = derive2 { name="erboost"; version="1.3"; sha256="09hlpn6mqsmxfrrf7j3iy8ibb2lc4aw7rxy21g3pgqdmd9sbprim"; depends=[lattice]; };
   erer = derive2 { name="erer"; version="2.4"; sha256="0dvmsjphgv4n54j9f6lsl3wxmy410vcgqzl2sgzm513h5jp19ymq"; depends=[ggplot2 lmtest systemfit tseries urca]; };
@@ -3774,9 +3857,11 @@ in with self; {
   etm = derive2 { name="etm"; version="0.6-2"; sha256="0sdsm6h502bkrxc9admshkrkqjczivh3av55sha7542pr6nhl085"; depends=[lattice survival]; };
   etma = derive2 { name="etma"; version="1.0-6"; sha256="10jvhycv8zg79mxg8y84bvl128m8ix9p7ybx5bmz4v02kmnhkcjs"; depends=[]; };
   eulerian = derive2 { name="eulerian"; version="1.0"; sha256="0yhpnx9vnfly14vn1c2z009m7yipv0j59j3s826vgpczax6b48m0"; depends=[graph]; };
+  euroMix = derive2 { name="euroMix"; version="1.1.1"; sha256="13ia6j0iwxhcfv17b5dsq1pk7v1kxaq6njxilxq0hvd57hv0b2a8"; depends=[Familias forensim paramlink]; };
   eurostat = derive2 { name="eurostat"; version="1.0.16"; sha256="017ri3vvlp60r9h5b0y4j2adggkrkjbapkjynpl0vg92islspqkz"; depends=[plyr tidyr]; };
+  eva = derive2 { name="eva"; version="0.1.2"; sha256="0bh06v7zs5460ya1yp6y9fkiwy6bnkkaiwqcdq143l3naca6j05r"; depends=[]; };
   evaluate = derive2 { name="evaluate"; version="0.8"; sha256="137gc35jlizhqnx19mxim3llrkm403abj8ghb2b7v5ls9rvd40pq"; depends=[stringr]; };
-  evd = derive2 { name="evd"; version="2.3-0"; sha256="1h3dkssgw2x7pblvknfr0l8k7q25nikxyl7kl9x95ganjpi2452v"; depends=[]; };
+  evd = derive2 { name="evd"; version="2.3-2"; sha256="0n81plbw2p83c10y6a6hvqkxcbfqjdc41p02zyklbcafga1m4gdy"; depends=[]; };
   evdbayes = derive2 { name="evdbayes"; version="1.1-1"; sha256="0lfjfkvswnw3mqcjsamxnl8hpvz08rba05xcg0r47h5vkgpw5lgd"; depends=[]; };
   eventInterval = derive2 { name="eventInterval"; version="1.3"; sha256="0nybzy2mpmazcvz06mkv7l9741mjm3i2q2sindq0777vb2k4504v"; depends=[MASS]; };
   events = derive2 { name="events"; version="0.5"; sha256="1zka4ygymifs8snd7cabl11b5lg3f8g8370dkm9ybl40bn8vvqq2"; depends=[]; };
@@ -3784,7 +3869,7 @@ in with self; {
   evir = derive2 { name="evir"; version="1.7-3"; sha256="1kn139vvzdrx5r9jayjb4b0803b0bbppxk68z00gdb50mxgvi593"; depends=[]; };
   evmix = derive2 { name="evmix"; version="2.6"; sha256="1rc52mqmzl05n5n1lr990czqgpq9h2x8shnv6s7hvr8896kjasjm"; depends=[gsl MASS SparseM]; };
   evobiR = derive2 { name="evobiR"; version="1.1"; sha256="0502xj1gv2g943vfqyllz4sr5z4mixf5vqlqi2v96mymnv9iwsr8"; depends=[ape geiger phytools seqinr shiny]; };
-  evolqg = derive2 { name="evolqg"; version="0.2-1"; sha256="0pc1q776a3hmmnpw24hbjhr69aryp8xi8z8czn0363clr8ncxk4z"; depends=[ape depth ggplot2 magrittr Matrix mvtnorm phytools plyr Rcpp reshape2 tidyr vegan]; };
+  evolqg = derive2 { name="evolqg"; version="0.2-2"; sha256="1s2zifbzk1mxydbhfw0b4bwhaqqryxdkgnhygd9nyr82physrn8h"; depends=[ape coda depth ggplot2 magrittr Matrix mvtnorm phytools plyr Rcpp reshape2 tidyr vegan]; };
   evolvability = derive2 { name="evolvability"; version="1.1.0"; sha256="0lbyidb86yzvcfw86jfwnzbpijn64jr8fasycqq4h3r9c0x2by3j"; depends=[coda]; };
   evt0 = derive2 { name="evt0"; version="1.1-3"; sha256="08sbyvx49kp3jsyki60gbbnci26d6yk0yj2zcl4bhfac8c3mm6ya"; depends=[evd]; };
   evtree = derive2 { name="evtree"; version="1.0-0"; sha256="0i37lkdfzvgby98888ndd5wzxs7y11sxf9mh6pqpqgwif05p4z3i"; depends=[partykit]; };
@@ -3794,12 +3879,14 @@ in with self; {
   exactRankTests = derive2 { name="exactRankTests"; version="0.8-28"; sha256="1n6rr0wax265y9w341x7m2pqwx3cv8iqx1k5qla29z8lqn4ng1nd"; depends=[]; };
   exactci = derive2 { name="exactci"; version="1.3-1"; sha256="1mhigk1nzd24qhzgd1j96zlf38dr96c1y5jbmy6lz2sw7g4mmvgm"; depends=[ssanv]; };
   exactmeta = derive2 { name="exactmeta"; version="1.0-2"; sha256="1v807ns799qajffky4k18iah0s3qh2ava6sz5i85hwx9dhkz19h4"; depends=[]; };
-  exams = derive2 { name="exams"; version="2.0-2"; sha256="1cv01wa3zs31zdc1qk6rsnimbs6m31r0j56syg6yjicfxiwxxm0v"; depends=[]; };
+  exams = derive2 { name="exams"; version="2.1-0"; sha256="13ca4r151424fprc1km58dxbhssvnjn6y6pa2m7wl95v796k20z9"; depends=[]; };
   excursions = derive2 { name="excursions"; version="2.0.16"; sha256="10z0mix7fx4pb9jpix5d00ch4i6jlvj2337s6ja916q6cczj21qr"; depends=[Matrix sp spam]; };
-  expands = derive2 { name="expands"; version="1.6"; sha256="06rwkydbv2x6gb847g0a52j64zs6jq1m6jc36blgfai9f1xcdgix"; depends=[ape flexmix matlab mclust moments permute rJava]; };
+  exif = derive2 { name="exif"; version="0.1.0"; sha256="12phqn5x1x0xs2xczl3064q983dalm261vqpyafhdcndm1y3gwbc"; depends=[Rcpp]; };
+  expands = derive2 { name="expands"; version="1.6.1"; sha256="0hx7ggfxlb96dglm1290nn95hhrjjnjc8w39g0s9wq4lrdwfz8a7"; depends=[ape flexmix matlab mclust moments permute rJava]; };
   expectreg = derive2 { name="expectreg"; version="0.39"; sha256="1mxhv6phc3lgp0zz20wszx4nr3by9p6492wcb0x8wn8p8p1sy1b3"; depends=[BayesX mboost quadprog]; };
   experiment = derive2 { name="experiment"; version="1.1-1"; sha256="07yaf5k5fpymz2yvr52zbbi60g0v84qryvqqjq3sjq2mb1fjfz1p"; depends=[boot MASS]; };
   expert = derive2 { name="expert"; version="1.0-0"; sha256="0y9vcigvzhymalpv31b9nvmr86z1dz7x29yj838vks0dsv23rgrf"; depends=[]; };
+  explor = derive2 { name="explor"; version="0.1"; sha256="0yrm7qfmrpf8426c9chi936msvqpgvph0i0nygwiax89h6ds3294"; depends=[dplyr DT ggplot2 scatterD3 shiny tidyr]; };
   expm = derive2 { name="expm"; version="0.999-0"; sha256="1mlkp5d0hbm9nw0lmm7fbwl4b00633bpsg0yshwv0w3fw6dh75xb"; depends=[Matrix]; };
   expoRkit = derive2 { name="expoRkit"; version="0.9"; sha256="0raf0m2nfbdbd1pc4lincyp8y8lgn3bfi4hn0p04plc5p40l1gvc"; depends=[Matrix SparseM]; };
   expoTree = derive2 { name="expoTree"; version="1.0.1"; sha256="0hj1x4niqp0ghqik3mz733nc3zpnhyknrdpzpj6y2rfia2ysdiz8"; depends=[ape deSolve]; };
@@ -3808,7 +3895,7 @@ in with self; {
   exptest = derive2 { name="exptest"; version="1.2"; sha256="0wgjg62rjhnr206hkg5h2923q8dq151wyv54pi369hzy3lp8qrvq"; depends=[]; };
   exreport = derive2 { name="exreport"; version="0.4.0"; sha256="0lm7zn1h86c64ar95ng1qi691ypk3p8ikqhj07vz2h7rnwkp3zjl"; depends=[ggplot2 reshape2]; };
   exsic = derive2 { name="exsic"; version="1.1.1"; sha256="1k6nqs9i4iivxnk4nkimp6zvdly274wibkmx9n0wz01gnzxqil0p"; depends=[markdown stringr]; };
-  extRemes = derive2 { name="extRemes"; version="2.0-6"; sha256="05c5fwf55gfm3k4fc35yd27bml18z566q5ays7f5cp5gh27s1vvr"; depends=[car distillery Lmoments]; };
+  extRemes = derive2 { name="extRemes"; version="2.0-7"; sha256="1dghhmwph65vhq2pnn461cxs1qrfm3kq8dqsilpfkm30jvblv8dv"; depends=[car distillery Lmoments]; };
   extWeibQuant = derive2 { name="extWeibQuant"; version="1.1"; sha256="08dzw5xfgqx0c7ac632c5mg5jmjjw7wwpcr4c9lvz5rv72ykh2rh"; depends=[]; };
   extfunnel = derive2 { name="extfunnel"; version="1.3"; sha256="162w5b2wjs3yqy8jisamsapav6swa8sskf1b6x5hglnrv3i4qyyy"; depends=[rmeta]; };
   extlasso = derive2 { name="extlasso"; version="0.2"; sha256="05774y0i01lrbyws6zx5ymhcglllv1wc7gzrnyx8i5d1lxdinsyd"; depends=[]; };
@@ -3822,7 +3909,9 @@ in with self; {
   eyetracking = derive2 { name="eyetracking"; version="1.1"; sha256="0ajas96s25hjp3yrg42hp78qjhl1aih04mjirkskx32qsyq5hfpv"; depends=[]; };
   eyetrackingR = derive2 { name="eyetrackingR"; version="0.1.1"; sha256="1m8ffrx1bkzpcl171d1crgbdrd1s6597snzl1c3d7glxb0wr7zhb"; depends=[broom dplyr ggplot2 lazyeval zoo]; };
   ez = derive2 { name="ez"; version="4.3"; sha256="1ypdp52fy382p14hri7my98wpjpl13lp9mdfk5lndiafmd20zl3j"; depends=[car ggplot2 lme4 MASS Matrix mgcv plyr reshape2 scales stringr]; };
+  ezec = derive2 { name="ezec"; version="0.1.0"; sha256="157gnwikr1w5zfh2nbnvnhw7wq62b56yjhx5i63y8ds86vzhngvy"; depends=[dplyr drc]; };
   ezglm = derive2 { name="ezglm"; version="1.0"; sha256="0x7ffk3ipzbdr9ddqzv0skmpj5zwazkabibhs74faxnld7pcxhps"; depends=[]; };
+  ezknitr = derive2 { name="ezknitr"; version="0.3.0"; sha256="1z1y6wl0x1jgfzsdra471zifc57jwkw3c1lqdacybnsxfqp51dj1"; depends=[knitr markdown R_utils]; };
   ezsim = derive2 { name="ezsim"; version="0.5.5"; sha256="03x75vmf75qsmk4zb09j7xrb11w31rpfwd3dvv12nwjgndh9bnld"; depends=[digest foreach ggplot2 Jmisc plyr reshape]; };
   ezsummary = derive2 { name="ezsummary"; version="0.1.9"; sha256="0fqg0slxg760km2gfd534xkl3g19p8imi7a8k2nmzac6lp92irj7"; depends=[dplyr reshape2 tidyr]; };
   fANCOVA = derive2 { name="fANCOVA"; version="0.5-1"; sha256="034m2mmm6wmsjd41sg82m9ppqjf4b1kgw5vl2w7kzqfx0lypaiwv"; depends=[]; };
@@ -3868,7 +3957,7 @@ in with self; {
   fastHICA = derive2 { name="fastHICA"; version="1.0.2"; sha256="1h794ybbii0k7v3x0r1499zxdqa1i1dpi3i7idzqdrffnb5kmwlv"; depends=[energy fastICA]; };
   fastICA = derive2 { name="fastICA"; version="1.2-0"; sha256="0ykk78fsk5da2g16i4wji85bvji7nayjvkfp07hyaxq9d15jmf0r"; depends=[]; };
   fastM = derive2 { name="fastM"; version="0.0-2"; sha256="0q5dz47sqj6d4r3k6l6q34l5ajb8fjbf7xam75scp0mg3czswnfn"; depends=[Rcpp RcppArmadillo]; };
-  fastR = derive2 { name="fastR"; version="0.10"; sha256="0bd164lij12yfqjykxj1m4rma7x2y4kpv4fspjlp1vpwqn3h4lb9"; depends=[lattice mosaic mosaicData]; };
+  fastR = derive2 { name="fastR"; version="0.10.2"; sha256="0xh3pfcln8xp42zvq3kv03xf9kc5gqafnhdnq6r4rx7xhl9n5dw0"; depends=[lattice mosaic mosaicData]; };
   fastSOM = derive2 { name="fastSOM"; version="0.9"; sha256="03501d5289lrlr4qcgxciz160hqc6nhqb9ab266fr132fkbiv4id"; depends=[]; };
   fastclime = derive2 { name="fastclime"; version="1.2.5"; sha256="12k7bkq4gkkyh8lr2whmi73mzcy7wmfzwgi20kli7r4g39n3a1kv"; depends=[igraph lattice MASS Matrix]; };
   fastcluster = derive2 { name="fastcluster"; version="1.1.16"; sha256="0x2prrsnqi5iqx23ki6y2agndjq8058ph6s703i4avrqi1q1w1q8"; depends=[]; };
@@ -3886,7 +3975,7 @@ in with self; {
   fclust = derive2 { name="fclust"; version="1.1.2"; sha256="08gi7w74215r44qbysg233s5n8r905b66gsi4i66xf5r7zgaqsm0"; depends=[]; };
   fcros = derive2 { name="fcros"; version="1.4.1"; sha256="1q0mra1rkksbvavbrh4fp6knmmzwxgkwq9pikafp2m95ll9n4xii"; depends=[]; };
   fda = derive2 { name="fda"; version="2.4.4"; sha256="05rvrp29ip1wrk2wly06wdry2a2riynkx677nx5lg240lz12d6yw"; depends=[Matrix]; };
-  fda_usc = derive2 { name="fda.usc"; version="1.2.1"; sha256="1w0dw06vgviia4yy2v5mrq0jvnfvdp7y8f2x246v3xliqgjmg7as"; depends=[fda MASS mgcv rpart]; };
+  fda_usc = derive2 { name="fda.usc"; version="1.2.2"; sha256="0xmfx40ibpb29rq7w4wrwhk5v16dj690qh7lv0gjigvnah1x8ih8"; depends=[fda MASS mgcv rpart]; };
   fdaMixed = derive2 { name="fdaMixed"; version="0.4"; sha256="15m13v71kqxd9gqiymgfkq0dvcpzp05576m8zkg08m0k067ga9bd"; depends=[Formula Rcpp RcppArmadillo]; };
   fdakma = derive2 { name="fdakma"; version="1.2.1"; sha256="0j9qgblrl7v4586dd6v0hjicli6jh8pkk5lzn8afpl75xfs24six"; depends=[]; };
   fdasrvf = derive2 { name="fdasrvf"; version="1.5.1"; sha256="172yrx3nvjii4whqsnpjvw3m5pd9jhfcjfqs21lqjk01jnna8m71"; depends=[doParallel foreach matrixcalc mvtnorm numDeriv Rcpp]; };
@@ -3897,9 +3986,9 @@ in with self; {
   fds = derive2 { name="fds"; version="1.7"; sha256="164f2cbywph7kyn712lfq4d86v22j4y3fg5i9zyz956hipqv0qvw"; depends=[rainbow RCurl]; };
   fdth = derive2 { name="fdth"; version="1.2-1"; sha256="0rr9p2rns5ws111iqcicrlpcv47fkbxf161yxkkzfs2l3f1kgw14"; depends=[]; };
   feature = derive2 { name="feature"; version="1.2.13"; sha256="07hkw0bv38naj2hdsx4xxrm2dngi6w3rbvgr7s50bjic8hlgy1ra"; depends=[ks misc3d rgl]; };
-  features = derive2 { name="features"; version="2011.8-2"; sha256="0yshwqv2mzl5jj323jwxscpz2ygb4ywxh6q0zwphb24bhv7h9lwd"; depends=[lokern]; };
+  features = derive2 { name="features"; version="2015.12-1"; sha256="0rd8r1dxzddb6718hcm8ck7531c9wdrjfy8n67875bbxgzcvds61"; depends=[lokern]; };
   fechner = derive2 { name="fechner"; version="1.0-2"; sha256="0yhiqr0wlka3wq0nhwy9n02ax3x5b0y803iadbsr3xb54pxbfbqd"; depends=[]; };
-  federalregister = derive2 { name="federalregister"; version="0.1.2"; sha256="0f73jhzhqi3a97iyfx5c5i09vxwnyypgw6668z7nch8lvq337s8x"; depends=[RCurl RJSONIO]; };
+  federalregister = derive2 { name="federalregister"; version="0.2.0"; sha256="0qr8nd3ylnwcv1wxspw5i7ray5sh30zr648spg0lpqq8dp2b8p7b"; depends=[curl httr jsonlite]; };
   fermicatsR = derive2 { name="fermicatsR"; version="1.3"; sha256="0vv3i1f01rjsd17a8z2wcf3iv6xlwg7fki99z3p5h8m4g6jwljfk"; depends=[]; };
   ff = derive2 { name="ff"; version="2.2-13"; sha256="1nvd6kx46xzyc99a44mgynd94pvd2h495m5a7b1g67k5w2phiywb"; depends=[bit]; };
   ffbase = derive2 { name="ffbase"; version="0.12.1"; sha256="1qgmk1cn8s89amfmzzr2zhg6w4wwn4k79i92ib15j02i4csvykjj"; depends=[bit fastmatch ff]; };
@@ -3910,7 +3999,7 @@ in with self; {
   fgof = derive2 { name="fgof"; version="0.2-1"; sha256="0bclkb3as0fl2gyggqxczndfyj9pfnni5pa3inpn5msrnjg4g2j2"; depends=[mvtnorm numDeriv]; };
   fgpt = derive2 { name="fgpt"; version="2.3"; sha256="1d0qzsn4b68jhk07k97iv765jpmzzh1gwqpid0r76vg4cwqfs3n7"; depends=[]; };
   fgui = derive2 { name="fgui"; version="1.0-5"; sha256="0gzwxzvf2y9p5rlfk862d7l1dm2sdwjhjpcb8p494cj4g1xshazg"; depends=[]; };
-  fheatmap = derive2 { name="fheatmap"; version="1.0.0"; sha256="0braywpc0zghv1lnwb0c83p8ls2w7b8d2gbvv0p4123rhax5limw"; depends=[gdata ggplot2 gplots RColorBrewer reshape2]; };
+  fheatmap = derive2 { name="fheatmap"; version="1.0.1"; sha256="1ir666zwlrw00c8pzm7np91n8qajc4w38pkmn2r12zpmcivqhvpk"; depends=[gdata ggplot2 gplots RColorBrewer reshape2]; };
   fields = derive2 { name="fields"; version="8.3-5"; sha256="1s3488qn6jyc0596111x8m0vp4jcqxjjyyklc7z3mbmx0gy9nx49"; depends=[maps spam]; };
   fifer = derive2 { name="fifer"; version="1.0"; sha256="0vbkks6y6pacgpiixm10fbfa34lmk5r9kwd30lfjf0g7r51fhvv9"; depends=[MASS xtable]; };
   filehash = derive2 { name="filehash"; version="2.3"; sha256="1nvf7qbnn6vjz68303xdm190iq0nwmmghyydcb4amx1ckbgric33"; depends=[]; };
@@ -3930,8 +4019,8 @@ in with self; {
   fitDRC = derive2 { name="fitDRC"; version="1.1"; sha256="1f6avw8ia9ks17zdagpmh6yvcmi53h5cvm0wwv9hsb92x5zfhxn9"; depends=[]; };
   fitTetra = derive2 { name="fitTetra"; version="1.0"; sha256="0ia6wk4gicpmn6kclsd28p7v1npwfv2blagiz0cxzwfw3njv103g"; depends=[]; };
   fitbitScraper = derive2 { name="fitbitScraper"; version="0.1.4"; sha256="0shbi5mmr9fw3cc2hn1yzd1ma9kid53ria9pbfkz1pk81n75krj1"; depends=[httr RJSONIO stringr]; };
-  fitdistrplus = derive2 { name="fitdistrplus"; version="1.0-5"; sha256="0hx26y0j1qh124nzd5rnxiri90kv935ni26nxi5n3cxzn45rlkp8"; depends=[MASS survival]; };
-  flacco = derive2 { name="flacco"; version="1.0"; sha256="0c1w9hdqjdhsh6dsam3ih6c0z4r6axq7hf6f9dkgvypan2vmdwvf"; depends=[BBmisc checkmate]; };
+  fitdistrplus = derive2 { name="fitdistrplus"; version="1.0-6"; sha256="17ip3qh07jgcklacv89r1g8a27cp7xpk4f61ps5v9affsn1vjmcg"; depends=[MASS survival]; };
+  flacco = derive2 { name="flacco"; version="1.1"; sha256="12adbqkbz9cxb007g8yl31qzs32rwl4krx7wqx3wnabqshbqi2kw"; depends=[BBmisc checkmate]; };
   flam = derive2 { name="flam"; version="3.0"; sha256="0c3j382sa7szqrpd0j8vcg19p6yn18jphd55cbvl0g6z0z76y53p"; depends=[MASS Rcpp]; };
   flare = derive2 { name="flare"; version="1.5.0"; sha256="03bq40lwwq49vvbarf37y7c3smm29mxqfxsc66gkg8l5pak4l38i"; depends=[igraph lattice MASS Matrix]; };
   flashClust = derive2 { name="flashClust"; version="1.01-2"; sha256="0l4lpz451ll7f7lfxmb7ds24ppzhfg1c3ypvydglcc35p2dq99s8"; depends=[]; };
@@ -3945,7 +4034,7 @@ in with self; {
   flowDiv = derive2 { name="flowDiv"; version="1.0"; sha256="1xgg73gbhysss82faqxn25l494sjbi3j0ls0dj6znzll8bhlrkb1"; depends=[flowCore flowWorkspace vegan]; };
   flower = derive2 { name="flower"; version="1.0"; sha256="1h2fvpjrvpbyrqb8hd51sslr1ibpwa7h9fiqy9anvf2yim5j11yq"; depends=[]; };
   flowfield = derive2 { name="flowfield"; version="1.0"; sha256="1cx3i0w3xq781mmms4x20fshlf1i9bwxw9bxx562crix3fq3m50j"; depends=[]; };
-  flowr = derive2 { name="flowr"; version="0.9.8.2"; sha256="1hjs9lc5l03h94619iy30q838z45i9ypy2ddmvdal8xg936lw6gy"; depends=[diagram params whisker]; };
+  flowr = derive2 { name="flowr"; version="0.9.9.5"; sha256="02ilcx5kswk7c1f1sd2g5av0m0amzl3g9yhqrl0khpiighsybciy"; depends=[diagram params whisker]; };
   flows = derive2 { name="flows"; version="1.1"; sha256="05h4s0g9vcjwli96zlajkpi61bvdxcnzy7lcskn8z7qss3kl8wi8"; depends=[igraph reshape2 sp]; };
   flsa = derive2 { name="flsa"; version="1.05"; sha256="07z2b1pnpnimgbzkjgjl2b074pl9mml7nac2p8qvdgv7aj070cmh"; depends=[]; };
   flux = derive2 { name="flux"; version="0.3-0"; sha256="0pc9cab2pwrfl0fnz29wp7a398r49hvbi50jp8i2fk2rfvck21a7"; depends=[caTools]; };
@@ -3960,17 +4049,20 @@ in with self; {
   foreach = derive2 { name="foreach"; version="1.4.3"; sha256="10aqsd3rxz03s1qdb6gsb1cj89mj4vmh491zfpin4skj1xvkzw0y"; depends=[codetools iterators]; };
   forecTheta = derive2 { name="forecTheta"; version="1.1"; sha256="0cp582mwi9jf8nnb4p4hvzy86w8q12js3i8rp0gaq2xhm36w6v02"; depends=[forecast]; };
   forecast = derive2 { name="forecast"; version="6.2"; sha256="0j4agcw11dzlwy90qqr2is0rhws73hphqsjfb4glw0min5vsw00v"; depends=[colorspace fracdiff nnet Rcpp RcppArmadillo timeDate tseries zoo]; };
+  forega = derive2 { name="forega"; version="1.0"; sha256="0xf9almfikfkxq8mm09lzrvav2v5cg0avpz99i6h5i9qliix1q6r"; depends=[forecast Rcpp robfilter]; };
   foreign = derive2 { name="foreign"; version="0.8-66"; sha256="19278jm85728zb20800w6hq9q8jy8ywdn81mgmlnxkmrr9giwh6p"; depends=[]; };
   forensic = derive2 { name="forensic"; version="0.2"; sha256="0kn8wn6p3fm67w88fbarg467vfnb42pc2cdgibs0vlgzw8l2dmig"; depends=[combinat genetics]; };
   forensim = derive2 { name="forensim"; version="4.3"; sha256="1jhlv9jv832qxxw39zsfgsf4gbkpyvywg11djldlr9vav7dlh3iw"; depends=[tcltk2 tkrplot]; };
-  forestFloor = derive2 { name="forestFloor"; version="1.8.8"; sha256="0vpjrdjrhb5jypbla78987awy409bag3mw27n75p2rqv6prazq1f"; depends=[ggplot2 gridExtra kknn Rcpp rgl]; };
+  forestFloor = derive2 { name="forestFloor"; version="1.9.1"; sha256="1kg7w75a1l9sfp1bq1srlc11dp19znb1nk2lw64yab7hwna5zknr"; depends=[kknn Rcpp rgl]; };
+  forestmodel = derive2 { name="forestmodel"; version="0.4.0"; sha256="1csw85zmj39zk3qr0238xjxj9qvp4fda62cqiliy5qm3a68kgpk3"; depends=[broom dplyr ggplot2 lazyeval]; };
   forestplot = derive2 { name="forestplot"; version="1.3"; sha256="1ia6xfagfp9l9wrmcjlqnvrwv61f5bk9x58ikf7asz5xdz8y3236"; depends=[]; };
   formatR = derive2 { name="formatR"; version="1.2.1"; sha256="0f4cv2zv5wayyqx99ybfyl0p83kgjvnsv8dhcwa4s49kw6jsx1lr"; depends=[]; };
+  formattable = derive2 { name="formattable"; version="0.1.5"; sha256="0kh3npzj42d0b21bbv9jidlkn9a8wldhg36ql5mgiiqyhva76qab"; depends=[htmltools htmlwidgets knitr markdown shiny]; };
   formula_tools = derive2 { name="formula.tools"; version="1.5.4"; sha256="1qs7ls757qvh5gdkx32zslgpx1a4zk2vf8bbgjdax02jmlyp2qrp"; depends=[operator_tools]; };
   fortunes = derive2 { name="fortunes"; version="1.5-2"; sha256="1wv1x055v388ay4gnd1l8y6dgvamyfvmsd0ik9fziygwsaljb049"; depends=[]; };
   forward = derive2 { name="forward"; version="1.0.3"; sha256="0swn5ysp3f660kl9jpmkck9324j1g3yhj2hl238rfrcr5wihxifc"; depends=[MASS]; };
   fossil = derive2 { name="fossil"; version="0.3.7"; sha256="188hyb3r1dnxkmqf2czh1kdzmk4mjc0v1kn1zml2yvxaxk7adsrz"; depends=[maps shapefiles sp]; };
-  fourPNO = derive2 { name="fourPNO"; version="1.0.2"; sha256="1h90zlsynxz4nhyk831hxx79nbvj58qlax913n2h79iljgply2nz"; depends=[Rcpp RcppArmadillo]; };
+  fourPNO = derive2 { name="fourPNO"; version="1.0.3"; sha256="1354rlrq7a748430v9kp7m896z1xz43fggy0nzsh9wq5r9kc9az2"; depends=[Rcpp RcppArmadillo]; };
   fpCompare = derive2 { name="fpCompare"; version="0.2.1"; sha256="0vva60xixlx6l8623qvj2sdn5w3gjscrv5g8hqmgir4f211lzg38"; depends=[]; };
   fpc = derive2 { name="fpc"; version="2.1-10"; sha256="15m0p9l9w2v7sl0cnzyg81i2fmx3hrhvr3371544mwn3fpsca5sx"; depends=[class cluster diptest flexmix kernlab MASS mclust mvtnorm prabclus robustbase trimcluster]; };
   fpca = derive2 { name="fpca"; version="0.2-1"; sha256="13b102026xlfb7c2rb3xsqsymm7xpmaxppaafjkb5dx0b1lz0jrc"; depends=[sm]; };
@@ -3984,7 +4076,7 @@ in with self; {
   fractalrock = derive2 { name="fractalrock"; version="1.1.0"; sha256="15f4w8hq3d8khgq269669ri16qxhar9646w40cw7wzh79r9gpf00"; depends=[futile_any futile_logger quantmod timeDate]; };
   frailtyHL = derive2 { name="frailtyHL"; version="1.1"; sha256="1xjdph0ixanf9w4b6hx6igfhkcp8h93sclrg0pgqgmbvm41lhb1x"; depends=[Matrix numDeriv survival]; };
   frailtySurv = derive2 { name="frailtySurv"; version="1.2.2"; sha256="00zi4lslcwgf5b8piaig6vh4gb8cnr4xcl425x0bw9hj9b1zsmq1"; depends=[ggplot2 nleqslv numDeriv Rcpp reshape2 survival]; };
-  frailtypack = derive2 { name="frailtypack"; version="2.8.1"; sha256="06wqhbc59wrwxjr243lmzg12x7vpzhsjkqr18k1anck0vvm0n1q8"; depends=[boot MASS nlme survC1 survival]; };
+  frailtypack = derive2 { name="frailtypack"; version="2.8.2"; sha256="0m78j9qzpvcs8p31m38h704yfwhivb3fpcqxh93vs14sysjlxxpj"; depends=[boot MASS nlme survC1 survival]; };
   frair = derive2 { name="frair"; version="0.4"; sha256="1g52ykj1m9znpp0pvry7dnmhg4m73nbkw0bp31zl6pcsdgmxxqjr"; depends=[bbmle boot emdbook]; };
   franc = derive2 { name="franc"; version="1.1.1"; sha256="0agrzdrgfw4a3jn6a2867rf99a87ngv6wi73ys2l7gr7mkpq54v5"; depends=[jsonlite]; };
   frbs = derive2 { name="frbs"; version="3.1-0"; sha256="0ngvi7lg6aviwic8f4ya03khyzh3ksglpmsnrdjjznwj874y2wim"; depends=[]; };
@@ -4007,7 +4099,7 @@ in with self; {
   fso = derive2 { name="fso"; version="2.0-1"; sha256="02dr12bssiwn8s1aa1941hfpa4007gd65f3l4s74gs2vgjzdxf8s"; depends=[labdsv rgl]; };
   ftnonpar = derive2 { name="ftnonpar"; version="0.1-88"; sha256="0df9zxwjpfc939ccnm1iipwhpf76b34v0x74nsi1mm1g927dfl0i"; depends=[]; };
   fts = derive2 { name="fts"; version="0.9.9"; sha256="1qgp8xdwr5pp2b7nd8r717a6p8b6izwqrindx2d1d0lhhnqlcwhv"; depends=[BH zoo]; };
-  ftsa = derive2 { name="ftsa"; version="4.5"; sha256="1sdhcwc0jir82p9h75kiymgzdc91kwaqiwdrd74cgp2sj0piy629"; depends=[colorspace fda forecast MASS pcaPP rainbow sde]; };
+  ftsa = derive2 { name="ftsa"; version="4.6"; sha256="1y261q8j8z8icpj56irpa657mlzhdidy8byvlfjxyz6dchpynbns"; depends=[colorspace fda forecast MASS pcaPP rainbow sde]; };
   ftsspec = derive2 { name="ftsspec"; version="1.0.0"; sha256="12f9yws1r26i240ijq0xqprl3pgbw50wv68jsm75ycplbs2jsyhs"; depends=[sna]; };
   fueleconomy = derive2 { name="fueleconomy"; version="0.1"; sha256="1svy5naqfwdvmz98l80j38v06563vknajisnk596yq5rwapl71vj"; depends=[]; };
   fugeR = derive2 { name="fugeR"; version="0.1.2"; sha256="0kd90s91vzv0g3v9ii733h10d8y6i05lk21p5npb3csizqbdx94l"; depends=[Rcpp snowfall]; };
@@ -4018,8 +4110,8 @@ in with self; {
   functional = derive2 { name="functional"; version="0.6"; sha256="120qq9apg6bf39n9vnp68db5rdhwvnj2vi12a8j8243vq8kqxdqr"; depends=[]; };
   functools = derive2 { name="functools"; version="0.2.0"; sha256="0g62jdia3n09vq8mx1m2r4nl3jfcadzpym0wkldzzzjcfs90vl6b"; depends=[]; };
   funcy = derive2 { name="funcy"; version="0.8.3"; sha256="05ih0g9pj41dk8wxgjs04q95jb968q5qdnzw4h29rp95rjg6j8pz"; depends=[calibrate car caTools cluster fda fields flexclust kernlab MASS Matrix plyr sm wavethresh]; };
-  fungible = derive2 { name="fungible"; version="1.1"; sha256="08hphh9lihsvl6xzpxv3v8bds30x3ysv9dv8p6x65kx025wqsdkj"; depends=[e1071 lattice MASS mvtnorm R2Cuba stringr]; };
-  funr = derive2 { name="funr"; version="0.1.1"; sha256="02v3xq2qlzlqh3x5a1ak2c63bkhvmi4ynh3bswxik2v9yhsqxl2w"; depends=[]; };
+  fungible = derive2 { name="fungible"; version="1.2"; sha256="16r615cjqg9np25cyn5hcr57h12vk0l4mcrkw1nzm3d9r6zmq5qw"; depends=[e1071 lattice MASS mvtnorm nleqslv R2Cuba stringr]; };
+  funr = derive2 { name="funr"; version="0.2.0"; sha256="0fmqrjvzpc7jbs85fznw723k9xmpxvbj65nkfc9qrvskgmja4mjn"; depends=[]; };
   funreg = derive2 { name="funreg"; version="1.1"; sha256="1sxr4mylcpbya197d55yi6d7g5pfspaf59xxbwjgmwgjw06rl76r"; depends=[MASS mgcv mvtnorm]; };
   funtimes = derive2 { name="funtimes"; version="2.0"; sha256="1dwb0jqgdhc4nrp4kadybbg4dd08crsijm8f6wz1wfzw2xp2sfqr"; depends=[Jmisc]; };
   futile_any = derive2 { name="futile.any"; version="1.3.2"; sha256="09z12dlj7cnkfwnmgsjknsghirv1cry83w4a9k4d0w5a1jnlr5jg"; depends=[lambda_r]; };
@@ -4027,7 +4119,7 @@ in with self; {
   futile_matrix = derive2 { name="futile.matrix"; version="1.2.2"; sha256="1cb975n93ck5fma0gvvbzainp7hv3nr8fc6b3qi8gnxy0d2i029m"; depends=[futile_logger lambda_r lambda_tools RMTstat]; };
   futile_options = derive2 { name="futile.options"; version="1.0.0"; sha256="1hp82h6xqq5cck67h7lpf22n3j7mg3v1mla5y5ivnzrrb7iyr17f"; depends=[]; };
   futile_paradigm = derive2 { name="futile.paradigm"; version="2.0.4"; sha256="14xsp1mgwhsawwmswqq81bv6jfz2z6ilr6pmnkx8cblyrl2nwh0v"; depends=[futile_options RUnit]; };
-  future = derive2 { name="future"; version="0.8.2"; sha256="02qvvkd9fw1fif6748sshlkw8fgd3r4dd7wkybr724py5yd0cm77"; depends=[globals listenv]; };
+  future = derive2 { name="future"; version="0.10.0"; sha256="1r8b8059g7b8rfc86xisc9llq9lhg9mnqpavhg4l1nmm6i4439g3"; depends=[globals listenv]; };
   fuzzyFDR = derive2 { name="fuzzyFDR"; version="1.0"; sha256="0zd8i9did0d9gp42xjmwrccm32glabvvy08kl8phhwb1yaq53h7w"; depends=[]; };
   fuzzyRankTests = derive2 { name="fuzzyRankTests"; version="0.3-7"; sha256="0mhml0zzya58yn4wrafxk62agfrck6rryn5klprr416pj83pzcgk"; depends=[]; };
   fwdmsa = derive2 { name="fwdmsa"; version="0.2"; sha256="0p0kh8am6gajfaixkvq61f12hfbm6chl9372yzn1yilhiyvqdxgp"; depends=[]; };
@@ -4042,12 +4134,13 @@ in with self; {
   gPCA = derive2 { name="gPCA"; version="1.0"; sha256="1ylb1d24dxnzpws9bbanwhyizjr3ljky2bhrph4c5yaq0zwwbrkw"; depends=[]; };
   gPdtest = derive2 { name="gPdtest"; version="0.4"; sha256="00dlhnklfg2yp4hp7yjgr2nfswv22c007xq1mxdbkll62zgd94mq"; depends=[]; };
   gProfileR = derive2 { name="gProfileR"; version="0.5.3"; sha256="0kv01b1ihwggzjd9plznz3il3b97pja11nqki3378zvpgfy5wzdn"; depends=[plyr RCurl]; };
-  gRain = derive2 { name="gRain"; version="1.2-4"; sha256="088n9y9r9f24fg1jjwc2y4dpavg86hlf4zwqavmirfjbcfvkjv66"; depends=[graph gRbase igraph Rcpp RcppArmadillo RcppEigen]; };
+  gRain = derive2 { name="gRain"; version="1.2-5"; sha256="1rzg8w36qhpar1kn1dvjw54j1i0anpqr9iv51i9gf4dm6s3afylq"; depends=[graph gRbase igraph Rcpp RcppArmadillo RcppEigen]; };
   gRapHD = derive2 { name="gRapHD"; version="0.2.4"; sha256="0fxd04s6zh23chks4k6nwb5w408xjy89b44pa42kv6qnqj86ylvm"; depends=[graph]; };
   gRapfa = derive2 { name="gRapfa"; version="1.0"; sha256="07yzwzna9pdyzndxk6wwyl6v3gkfc7dvy1ixmdl3d38mcl1ahwyq"; depends=[igraph]; };
   gRbase = derive2 { name="gRbase"; version="1.7-2"; sha256="1026jp3j2dyrqrqips4agl4cvjxzkk6jbxga33d49lzbxfqjpman"; depends=[graph igraph Matrix RBGL Rcpp RcppArmadillo RcppEigen]; };
   gRc = derive2 { name="gRc"; version="0.4-1"; sha256="1a6q24yj7js1sk0lfqbm7kdv605cby6i711w4dlygsxdvwxbrsdr"; depends=[graph gRbase Rgraphviz]; };
   gRim = derive2 { name="gRim"; version="0.1-17"; sha256="0vn031r318kp78cx00n43fc42bv6sjyb8dm6q0l08s0g9n2w17dp"; depends=[gRain gRbase igraph Rcpp RcppArmadillo]; };
+  gSEM = derive2 { name="gSEM"; version="0.4.3.3"; sha256="0lxz8g1wksdcppj2cia1z9wi590qjy2dvd4hfdkb7h3hi8397xb1"; depends=[DiagrammeR htmlwidgets knitr MASS]; };
   gSeg = derive2 { name="gSeg"; version="0.2"; sha256="1pwi8dn1nvi2zln6qs6j88brp42hgmgz8ffvg1f9s0rlbgj78jvn"; depends=[]; };
   gWidgets = derive2 { name="gWidgets"; version="0.0-54"; sha256="13lbbbnmkvb559klgsnz0q27qlyv102xakb6yccxsxjw249hm8c2"; depends=[]; };
   gWidgets2 = derive2 { name="gWidgets2"; version="1.0-6"; sha256="0xh1f9j1y3zifz8xrvyp41c8zdgqx8lx0cg1sdqhxv8j3mxibcsg"; depends=[digest]; };
@@ -4081,10 +4174,10 @@ in with self; {
   gamsel = derive2 { name="gamsel"; version="1.7-3"; sha256="02j94va7srdb2wzj4f1b63qx9mlck0harsq140ndjgf9d9c44h01"; depends=[foreach mda]; };
   gaoptim = derive2 { name="gaoptim"; version="1.1"; sha256="04igpn73k6f6652y496igwypfxmz4igg4jgxx6swqyi37182rqhm"; depends=[]; };
   gap = derive2 { name="gap"; version="1.1-16"; sha256="0xyln7ffapm31cvx4n86ncyg3cdz5d2149qb5h5xx3kf0a8r7gpz"; depends=[]; };
-  gapmap = derive2 { name="gapmap"; version="0.0.3"; sha256="0xwli4qzh7lvy7pgr8h398ax5lykrxxgl4zvyfghd4p5339h7rny"; depends=[ggplot2 reshape2]; };
-  gapminder = derive2 { name="gapminder"; version="0.1.0"; sha256="06hi4m9i86nkdyz7w9wa4qkpbsl2178qskzzy8168wlzayx820ad"; depends=[]; };
+  gapmap = derive2 { name="gapmap"; version="0.0.4"; sha256="0xz19n0vvdzbfg6afp3y0qfbs3f2nfxib1cyya3cax5wqqfbzw3i"; depends=[ggplot2 reshape2]; };
+  gapminder = derive2 { name="gapminder"; version="0.2.0"; sha256="1fxjz8lr3bsj3vml4yvm8pm72wpmw7c97bgp7acjf0q7l9x0d4vq"; depends=[]; };
   gaselect = derive2 { name="gaselect"; version="1.0.5"; sha256="0xzx00n46x6x7w1xbx8nvabkkrna45pv1i70787m8h05q1yrjjij"; depends=[Rcpp RcppArmadillo]; };
-  gaston = derive2 { name="gaston"; version="1.2"; sha256="1swf83wjpj8ngqlfaqi12p5c53rgaw44i305b6lpsxj5vx1p963j"; depends=[LDheatmap Rcpp RcppEigen RcppParallel WhopGenome]; };
+  gaston = derive2 { name="gaston"; version="1.3.1"; sha256="0jl7ga9pjzfgwv5wgg1qd1y1ycrrqipbw5sggkf3hdhd5197qw19"; depends=[LDheatmap Rcpp RcppEigen RcppParallel WhopGenome]; };
   gaussDiff = derive2 { name="gaussDiff"; version="1.1"; sha256="0fqjdxp2ibbami75ba16d02dz4rz5sk8mni45di9anydx44g9d45"; depends=[]; };
   gaussquad = derive2 { name="gaussquad"; version="1.0-2"; sha256="0bcvkssmwwngcd4cnv924n9h3c8z1w3x9c9bkwn5jbz9zyv1lfms"; depends=[orthopolynom polynom]; };
   gazepath = derive2 { name="gazepath"; version="1.0"; sha256="00k6617wra9pcvyr94mr48c21l7z6grlpgf9g02lh23p6900fjxq"; depends=[]; };
@@ -4102,8 +4195,9 @@ in with self; {
   gdata = derive2 { name="gdata"; version="2.17.0"; sha256="0kiy3jbcszlpmarg311spdsfi5pn89wgy742dxsbzxk8907fr5w0"; depends=[gtools]; };
   gdimap = derive2 { name="gdimap"; version="0.1-9"; sha256="0ksbpcy739bvsiwis0pzd03zb4cvbd8d5wdf8whfn9k6mkj4x9rs"; depends=[abind colorspace geometry gridExtra gsl movMF oro_nifti rgl]; };
   gdistance = derive2 { name="gdistance"; version="1.1-9"; sha256="174ngm0xg993gkmf70yaln98d2rpjvdx5ngf2aga1jzph6xxdj6d"; depends=[igraph Matrix raster sp]; };
-  gdm = derive2 { name="gdm"; version="1.1.4"; sha256="1nwcqnx94x54f5s7y1d6b9r5v22ghn6p8najkzqbv2xziinziwfh"; depends=[plyr raster Rcpp reshape2 vegan]; };
-  gdtools = derive2 { name="gdtools"; version="0.0.5"; sha256="1v7yaw11vvg1drm05qzfvyygkv81wv9dwaaanjwx328jg6j328rg"; depends=[Rcpp]; };
+  gdm = derive2 { name="gdm"; version="1.1.5"; sha256="143nm65lfpsa1vzl5pddbry3bhk50xx8vw82k649j5n2hk1v00bi"; depends=[plyr raster Rcpp reshape2 vegan]; };
+  gdtools = derive2 { name="gdtools"; version="0.0.6"; sha256="08qqricnbgl75y8w9iyv81hsd76za65vc40bb81m0731l7i846bg"; depends=[Rcpp]; };
+  gear = derive2 { name="gear"; version="0.1.1"; sha256="1sqj9pz15j1v6fm4q2dp0zhdmy9zmmhmgxjwria5ihrp3b5hvwry"; depends=[lattice optimx sp]; };
   gee = derive2 { name="gee"; version="4.13-19"; sha256="14n2fa2jmibw5j8n4qgbl8xbxhapmx4z3zrmkbcci39k9dsyplzb"; depends=[]; };
   geeM = derive2 { name="geeM"; version="0.8.0"; sha256="1glnzv06wsrxb1rp4p38w1hmnk4jvd78wymvffhkklwsrmg8jgw5"; depends=[Matrix]; };
   geepack = derive2 { name="geepack"; version="1.2-0"; sha256="1pxh9nsyj9a40znm4zza4nbi3dkhb96s3azi43p9ivvfj3l21m74"; depends=[]; };
@@ -4139,58 +4233,62 @@ in with self; {
   geoR = derive2 { name="geoR"; version="1.7-5.1"; sha256="10rxlvlsg2avrf63p03a22lnq4ysyc4zq06mxidkjpviwk1kvzqy"; depends=[MASS RandomFields sp splancs]; };
   geoRglm = derive2 { name="geoRglm"; version="0.9-8"; sha256="1zncqsw62m0p4a1wchhb8xsf0152z2xxk3c4xqdr5wbzxf32jhvh"; depends=[geoR sp]; };
   geocodeHERE = derive2 { name="geocodeHERE"; version="0.1.3"; sha256="10b1fgclv3199cglnip5xy0kgi3gi41q9npv7w3kajkrdknnxms4"; depends=[httr]; };
+  geoelectrics = derive2 { name="geoelectrics"; version="0.1.5"; sha256="0zy9m5k4b359mn29cd62cnwjm4fc19hy3l8p587yrrhsi20nbyna"; depends=[fields lattice rgl]; };
   geofd = derive2 { name="geofd"; version="1.0"; sha256="16312g9mgw52mpsfky1j20zcqkkv91ihl0xhvv1bl80diffzf0zi"; depends=[fda geoR]; };
   geojsonio = derive2 { name="geojsonio"; version="0.1.4"; sha256="0m2n5ivlaz4lalwpl1f0pwpgb61ym8nvw8hnm5id4jihirhcn4rb"; depends=[httr jsonlite magrittr maptools rgdal rgeos sp V8]; };
   geoknife = derive2 { name="geoknife"; version="1.0.0"; sha256="0snvrmpivaq0yqcbxhar8z5n2gh87ygil4zd076i6imbiml1p6mg"; depends=[httr sp XML]; };
   geomapdata = derive2 { name="geomapdata"; version="1.0-4"; sha256="1g89msnav87kim32xxbayqcx1v4439x4fsmc8xhlvq4jwlhd5xxw"; depends=[]; };
   geometry = derive2 { name="geometry"; version="0.3-6"; sha256="0s09vi0rr0smys3an83mz6fk41bplxyz4myrbiinf4qpk6n33qib"; depends=[magic]; };
+  geomnet = derive2 { name="geomnet"; version="0.0.1"; sha256="0yrlyhvqaab7y9ifrwmg93vq4fxp1lc87xxqhnkhp7qj9mhrpr7p"; depends=[ggplot2 network sna]; };
   geomorph = derive2 { name="geomorph"; version="2.1.7-1"; sha256="071ykglgb7fz9hxkrk82r9rhf6rfpyahjw2kz881z5y3h1nsx01a"; depends=[ape geiger jpeg Matrix phytools rgl]; };
   geonames = derive2 { name="geonames"; version="0.998"; sha256="1p0x260i383ddr2fwv54pxpqz9vy6vdr0lrn1xj7178vxic1dwyy"; depends=[rjson]; };
   geophys = derive2 { name="geophys"; version="1.3-8"; sha256="0nw4m30r46892cf1n575jkfjgdjc14wic9xzmzcnskbk8cd50hp2"; depends=[cluster GEOmap RFOC RPMG RSEIS]; };
-  georob = derive2 { name="georob"; version="0.2-1"; sha256="1frv407nqpq7qp4ygahjvg1hvdgfix5biyq9dbys536gn1r0653c"; depends=[constrainedKriging lmtest nleqslv nlme quantreg RandomFields robustbase snowfall sp]; };
+  georob = derive2 { name="georob"; version="0.2-2"; sha256="1v2441gvna7kmyi6j2f85y8igrijmpgxj1jlckrcd0ichq2w1kvi"; depends=[constrainedKriging lmtest nleqslv nlme quantreg RandomFields robustbase snowfall sp]; };
   geoscale = derive2 { name="geoscale"; version="2.0"; sha256="0gisds0in32xhw54fxfyxvwxgrfjs871wmqf6l915nr896rlx0bm"; depends=[]; };
   geospacom = derive2 { name="geospacom"; version="0.5-8"; sha256="14qyjbq0n43c2zr9gp11gdqgarvmicx3gpq2ql2vjfzrmirxwjgg"; depends=[classInt geosphere maptools rgeos sp]; };
-  geosphere = derive2 { name="geosphere"; version="1.4-3"; sha256="15l5qqazh55l1w9il53j85i5h42sjvkcv0vladgi1axhzyyd41c7"; depends=[sp]; };
+  geosphere = derive2 { name="geosphere"; version="1.5-1"; sha256="06qwpaahpj2czs7rwv0rwnwlqjb4xanxyi00ci13b4imwb3w51q8"; depends=[sp]; };
   geospt = derive2 { name="geospt"; version="1.0-2"; sha256="1814nn0naxvbn0bqfndpmizjbqcs6rm87g2s378axkn6qpii4bh8"; depends=[fields genalg gsl gstat limSolve MASS minqa plyr sgeostat sp TeachingDemos]; };
   geosptdb = derive2 { name="geosptdb"; version="0.5-0"; sha256="0m0dlazhq2za71mi3q8mz2zvz7yrmda7lha02kh9n820bx89v33z"; depends=[FD fields geospt gsl limSolve minqa sp StatMatch]; };
   geostatsp = derive2 { name="geostatsp"; version="1.3.10"; sha256="1gfnw7nky8pvhsd8zgzd9lcyhw80wr86in51h1kwybj0hf5412x2"; depends=[abind Matrix numDeriv raster sp]; };
   geotools = derive2 { name="geotools"; version="0.1"; sha256="0d0vf9dvrrv68ivssp58qzaj8vra26ms33my097jmzmgagwy1spd"; depends=[]; };
   geotopbricks = derive2 { name="geotopbricks"; version="1.3.7.2"; sha256="15z4969vgh0jwksqrjsd5m598xbz2ppf1ymvf80id4h0grzh08l5"; depends=[raster rgdal stringr zoo]; };
   geozoo = derive2 { name="geozoo"; version="0.4.3"; sha256="0nmmmyk0ih5aqpsn7ip4dhgfm7jhcnca8pigyr9794b110icq1rv"; depends=[bitops]; };
+  gesis = derive2 { name="gesis"; version="0.1"; sha256="0kvmlkq2cgxrjdq2dyjqs1pv875hdbapsygxrp0i8ab0fqirbrip"; depends=[RSelenium]; };
   getMet = derive2 { name="getMet"; version="0.2.1"; sha256="1i7vk1sypby16834ipkz3ma7yarsyp74y6y3r25aamx3ri5jz0jh"; depends=[EcoHydRology]; };
   getopt = derive2 { name="getopt"; version="1.20.0"; sha256="00f57vgnzmg7cz80rjmjz1556xqcmx8nhrlbbhaq4w7gl2ibl87r"; depends=[]; };
-  gets = derive2 { name="gets"; version="0.2"; sha256="0vdg8g588asyzkld9v3rmscx3k727ncxnjzi8qxinlr2zhw9nbcq"; depends=[zoo]; };
+  gets = derive2 { name="gets"; version="0.4"; sha256="192w4rj6bz1fbhb9j35kzqada6qmhicd7gjjm8p1sk6i38j0iiy2"; depends=[zoo]; };
   gettingtothebottom = derive2 { name="gettingtothebottom"; version="3.2"; sha256="1cz2vidh7k346qc38wszs2dg6lvya249hvcsn6zdpbx0c0qs3y72"; depends=[ggplot2 Matrix]; };
   gfcanalysis = derive2 { name="gfcanalysis"; version="1.4"; sha256="1hjgbiakf01mmaa2jhlnymcsjsj1zssay44p4sdxxxzpx4szs3vv"; depends=[animation geosphere ggplot2 plyr raster rasterVis RCurl rgdal rgeos sp stringr]; };
   ggExtra = derive2 { name="ggExtra"; version="0.3.1"; sha256="11hs67xxfm09sg7sd5l7hw4nhpx40k0r9vyj5yzarjbw2gj9vvrv"; depends=[ggplot2 gridExtra]; };
   ggROC = derive2 { name="ggROC"; version="1.0"; sha256="0p9gdy7ia59d5m84z9flz5b03ri7nbigb3fav2v2wrml300d24vn"; depends=[ggplot2]; };
-  ggRandomForests = derive2 { name="ggRandomForests"; version="1.2.0"; sha256="10hc0j14pbwylyvbkbqif68ah8wp77q7y392vz0b4jsddrgvzprn"; depends=[ggplot2 randomForestSRC survival tidyr]; };
+  ggRandomForests = derive2 { name="ggRandomForests"; version="1.2.1"; sha256="023badp3frvdmdq5acny4k6vq5xl78hsvr429060g9a8alrz51qy"; depends=[ggplot2 randomForestSRC survival tidyr]; };
   ggdendro = derive2 { name="ggdendro"; version="0.1-17"; sha256="1yl56w9b3yiadf29kdbi3rpsc20jl5r2jggsyi1g6wvq2nlksqx8"; depends=[ggplot2 MASS]; };
+  gge = derive2 { name="gge"; version="1.0"; sha256="06a9czn3r76rg85z84177j3pd4mhsrskim1bxj3phc866chwj1wb"; depends=[reshape2]; };
   ggenealogy = derive2 { name="ggenealogy"; version="0.1.0"; sha256="0shy6ylrx49yccyydhahqk1nnljqgf1cm11fl4cmb44la5zd3wjn"; depends=[ggplot2 igraph plyr reshape2]; };
-  ggfortify = derive2 { name="ggfortify"; version="0.0.4"; sha256="025wxh1ayn9dpkbkqysy081g7x9d0jvj0r6n8r9m7k79f9vbir3p"; depends=[dplyr ggplot2 gridExtra proto scales tidyr]; };
+  ggfortify = derive2 { name="ggfortify"; version="0.1.0"; sha256="0q4crp4syk2b48m2q38pc852y2bdy97spqrcjnl2q7yb3il1r90z"; depends=[dplyr ggplot2 gridExtra proto scales tidyr]; };
   gglasso = derive2 { name="gglasso"; version="1.3"; sha256="0qqp5zak4xsakhydn9cfhpb19n6yidgqj183il1v7yi90qjfyn66"; depends=[]; };
   ggm = derive2 { name="ggm"; version="2.3"; sha256="1n4y459x2i0jil8chjjqqjs28a8pzfxrws2fcjkg3il7zy0zwbw3"; depends=[igraph]; };
-  ggmap = derive2 { name="ggmap"; version="2.5.2"; sha256="00mm12zzs2r8i7983bv6qicbgxv0iv0x9wlfi965fr58d44s0xqx"; depends=[digest geosphere ggplot2 jpeg mapproj plyr png proto reshape2 RgoogleMaps rjson scales]; };
+  ggmap = derive2 { name="ggmap"; version="2.6"; sha256="17bjhhd8lm5dns9h8y2mw4r21m87aa34nxkl3hl5sr754n6pnw73"; depends=[digest geosphere ggplot2 jpeg mapproj plyr png proto reshape2 RgoogleMaps rjson scales]; };
   ggmcmc = derive2 { name="ggmcmc"; version="0.7.2"; sha256="1qphizdx5pb6qzvdhrlvar6n8g7xrcm2zxi8c98ibgcws7jgj58b"; depends=[dplyr GGally ggplot2 tidyr]; };
   ggparallel = derive2 { name="ggparallel"; version="0.1.2"; sha256="05l58qr5mxkkmwl444n0v27r527z64hxkh106am3aj7ml916z0qc"; depends=[ggplot2 plyr reshape2]; };
-  ggplot2 = derive2 { name="ggplot2"; version="1.0.1"; sha256="0794kjqi3lrxb33lr1mykd58959hlgkhdn259vj8fxrh65mqw920"; depends=[digest gtable MASS plyr proto reshape2 scales]; };
+  ggplot2 = derive2 { name="ggplot2"; version="2.0.0"; sha256="07r5zw0ccv4sf1mdxcz9wa86p2c6j61cnnq18qdjrh3zhhcbmdp2"; depends=[digest gtable MASS plyr reshape2 scales]; };
   ggplot2movies = derive2 { name="ggplot2movies"; version="0.0.1"; sha256="067ld6djxcpbliv70r2c1pp4z50rvwmn1xbvxfcqdi9s3k9a2v8q"; depends=[]; };
   ggsn = derive2 { name="ggsn"; version="0.2.0"; sha256="0wkzvcqasndkdp1vzip2xcml0pdvhm4pr5jzdxsy2k51k20d5m1g"; depends=[ggplot2 maptools png]; };
   ggsubplot = derive2 { name="ggsubplot"; version="0.3.2"; sha256="1rrq47rf95hnwz8c33sbnpvc37sb6v2w37863hyjl6gc0bhyrvzb"; depends=[ggplot2 plyr proto scales stringr]; };
-  ggswissmaps = derive2 { name="ggswissmaps"; version="0.0.2"; sha256="1cl8m9j3d2kf8dbpq09q36v7nwkgz7khqds431l0kmkzq02qhddf"; depends=[ggplot2]; };
+  ggswissmaps = derive2 { name="ggswissmaps"; version="0.0.6"; sha256="18fljaj5sbwnaxr5c3r43jrgfal0i542sz4187n3v7j0p1afy51p"; depends=[ggplot2]; };
   ggtern = derive2 { name="ggtern"; version="1.0.6.1"; sha256="1hvh9688x2mzbyc0nndghsds0gn2sfg3kv94fzdl7vdn7sl7ag29"; depends=[ggplot2 gtable MASS plyr polyclip proto reshape2 scales sp]; };
-  ggthemes = derive2 { name="ggthemes"; version="2.2.1"; sha256="0d6h3ymxwxcii95wggxmyvihnwsl85nlqja2ac34dsfwlv75cc16"; depends=[colorspace ggplot2 proto scales]; };
+  ggthemes = derive2 { name="ggthemes"; version="3.0.0"; sha256="1pj5cxsfm9g64abwya42kygpnzx95h111n028fqvad8magvn5l5g"; depends=[assertthat colorspace ggplot2 scales]; };
   ggvis = derive2 { name="ggvis"; version="0.4.2"; sha256="07arzhczvh2sgqv9h30n32s6l2a3rc98rid2fpz6kp7vlin2pk1g"; depends=[assertthat dplyr htmltools jsonlite lazyeval magrittr shiny]; };
   ghyp = derive2 { name="ghyp"; version="1.5.6"; sha256="0y3915jxb2rf01f7r6111p88ijhmzyz4qsmy7vfijlilkz0ynn20"; depends=[gplots numDeriv]; };
   giRaph = derive2 { name="giRaph"; version="0.1.2"; sha256="137c39fz4vz37lpws3nqhrsf4qsyf2l0mr1ml3rq49zz4146i0rz"; depends=[]; };
   gibbs_met = derive2 { name="gibbs.met"; version="1.1-3"; sha256="1yb5n8rkphsnxqn8rv8i54pgycv9p7x1xhinx4l5wzrds3xhf2dc"; depends=[]; };
   gimme = derive2 { name="gimme"; version="0.1-6"; sha256="164ayfhf532iv0ja87z5aigrbfngxs8naxdnh041lw431mchvrp6"; depends=[doParallel doSNOW foreach gWidgets2 igraph lavaan MASS qgraph snow]; };
-  gimms = derive2 { name="gimms"; version="0.3.0"; sha256="13sypwc8vls5gdzdqfhim6lpli8l1pdmc9rx493nxgmnlnwiv127"; depends=[Kendall raster zyp]; };
-  gistr = derive2 { name="gistr"; version="0.3.4"; sha256="0wy549dwwgqbwppxnagg75vr1z0q243yaap6bblmifnlqi2xphvj"; depends=[assertthat dplyr httr jsonlite knitr magrittr rmarkdown]; };
-  git2r = derive2 { name="git2r"; version="0.11.0"; sha256="1h5ag8sm512jsn2sp4yhiqspc7hjq5y8z0kqz24sdznxa3b7rpn9"; depends=[]; };
+  gimms = derive2 { name="gimms"; version="0.4.0"; sha256="1kg2xpzv51p18s0dzpfvcdygw8cx713npwhcyh959c2bya6f46pb"; depends=[doParallel foreach Kendall raster zyp]; };
+  gistr = derive2 { name="gistr"; version="0.3.6"; sha256="1rajdfb8zkx444v89iapzrdad8y81rhd9q9nwcxw03jig4xm48mb"; depends=[assertthat dplyr httr jsonlite knitr magrittr rmarkdown]; };
+  git2r = derive2 { name="git2r"; version="0.13.1"; sha256="09alsn0nwvljc7qsq8jk257qzj63b2glwgfiw6rcqic5zj7xhmxd"; depends=[]; };
   gitlabr = derive2 { name="gitlabr"; version="0.5.1"; sha256="1k0jjxmnaga6v3867gkmpsa9knpsv6ysfg9xmd5c5avwl7d4xlbs"; depends=[base64enc dplyr functional httr magrittr stringr]; };
   gitter = derive2 { name="gitter"; version="1.1.1"; sha256="10m4rs6mhg7xn8dfd41ai0bnn5bnxn6cgqip22hrrpj0i2lzky6l"; depends=[EBImage ggplot2 jpeg logging PET tiff]; };
-  gkmSVM = derive2 { name="gkmSVM"; version="0.55"; sha256="1ih4nwsbx0b8d7dsf55ki6hx9kqhanyw2g8na81s7f109dckg2hx"; depends=[kernlab Rcpp seqinr]; };
+  gkmSVM = derive2 { name="gkmSVM"; version="0.65"; sha256="0k51mpcrddvxbvisn8aiwyh3iy1kwy7h0x1zl46wldy7s33d3576"; depends=[kernlab Rcpp ROCR seqinr]; };
   glamlasso = derive2 { name="glamlasso"; version="1.0"; sha256="050xa2s60zm59p7ydxm3gkm2k6lhkdqkby212f5f1dd89q53gdxp"; depends=[Rcpp RcppArmadillo]; };
   glarma = derive2 { name="glarma"; version="1.4-0"; sha256="1fwygp3baj4a5kfla0phaama81ry5s3i4vdx9hfj4y9m5wzg87dv"; depends=[MASS]; };
   glasso = derive2 { name="glasso"; version="1.8"; sha256="0gcapw7kyxb19wvdyxq1vsmc5j7yyd0rvqxs2i71k31q352sg6zw"; depends=[]; };
@@ -4221,14 +4319,14 @@ in with self; {
   globalGSA = derive2 { name="globalGSA"; version="1.0"; sha256="1f3xv03m6g2p725ff0xjhvn2xcfm7r7flyrba080i4ldy6fd8jg8"; depends=[]; };
   globalOptTests = derive2 { name="globalOptTests"; version="1.1"; sha256="0yf4p82dpjh36ddpfrby7m3fnj2blf5s76lncflch917sq251h4f"; depends=[]; };
   globalboosttest = derive2 { name="globalboosttest"; version="1.1-0"; sha256="1k7kgnday27sn6s1agzlj94asww81655d2zprx6qg7liv677bxvf"; depends=[mboost survival]; };
-  globals = derive2 { name="globals"; version="0.5.0"; sha256="1lzv27p06av0ly2zf4gjc5nn79kvq7bg1svnq4pdk272i6armj0n"; depends=[codetools]; };
+  globals = derive2 { name="globals"; version="0.6.0"; sha256="0z9b630v75knsw8x6ln2nr1w3xpnaj7x0pjwsn9x4m9ps9bm9afh"; depends=[codetools]; };
   glogis = derive2 { name="glogis"; version="1.0-0"; sha256="19h0d3x5lcjipkdvx4ppq5lyj2xzizayidx0gjg9ggb1qljpyw9m"; depends=[sandwich zoo]; };
   glpkAPI = derive2 { name="glpkAPI"; version="1.3.0"; sha256="0173wljx13jali2jxz4k5za89hc64n2j9djz5bcryrqhq4rmkp87"; depends=[]; };
   glrt = derive2 { name="glrt"; version="2.0"; sha256="0p2b0digndvnn396ynv56cdg436n3ll7pxkb81rs3dhwbyqyc948"; depends=[survival]; };
   glycanr = derive2 { name="glycanr"; version="0.2.0"; sha256="09v4xs1fxl9iiqcw66wz09ap3nbmr76f8mihjy06byrqxqjy07j9"; depends=[coin dplyr ggplot2 tidyr]; };
   gmailr = derive2 { name="gmailr"; version="0.6.0"; sha256="1l0lnlq5vrxrab8d9b5hwm8krg8zgx8f8m0kfnryyyrqkjrksky5"; depends=[base64enc httr jsonlite magrittr mime]; };
   gmapsdistance = derive2 { name="gmapsdistance"; version="1.0"; sha256="14hwwnzx5jd8r2v34066pa59ngvxbmzhni0nc9hg7i3p0gzbfw4b"; depends=[RCurl XML]; };
-  gmatrix = derive2 { name="gmatrix"; version="0.2"; sha256="1w83m6q8xflifqqgkkg2my4fkjfjyv0qq4ly8yqk12k77lb03hxq"; depends=[]; };
+  gmatrix = derive2 { name="gmatrix"; version="0.3"; sha256="0ni5scx48m99jg9a5l93qvfkz6v5m7d5c0fwhp14mgiw32ff1s1r"; depends=[]; };
   gmm = derive2 { name="gmm"; version="1.5-2"; sha256="1phd8mmfyhjb72a45gavckb3g8qi927hdq0i8c7iw1d28f04lc70"; depends=[sandwich]; };
   gmnl = derive2 { name="gmnl"; version="1.1-1"; sha256="0pdbky9gm8s3dvyg6z7pvn7wzqlbvdg7y0py9kcwfxxjvwcp1qwh"; depends=[Formula maxLik mlogit msm plotrix truncnorm]; };
   gmodels = derive2 { name="gmodels"; version="2.16.2"; sha256="0zf4krlvdywny5p5hnkr0r0hync6dvzc9yy4dfywaxmkpna8h0db"; depends=[gdata MASS]; };
@@ -4251,6 +4349,7 @@ in with self; {
   googlesheets = derive2 { name="googlesheets"; version="0.1.0"; sha256="0c3a521i2nw5v6ydz0ci7vbxlzfv3bh39yi7njah25zfbxjgm751"; depends=[cellranger dplyr ggplot2 httr plyr stringr tidyr XML xml2]; };
   goric = derive2 { name="goric"; version="0.0-8"; sha256="0ayac0yfkxrl13ckc2pwfqnmsrhmbg5bi6iwzx0fmh81vrlp0zrm"; depends=[MASS Matrix mvtnorm nlme quadprog]; };
   govStatJPN = derive2 { name="govStatJPN"; version="0.1"; sha256="03sywa7rl5rblvv370mfszz5ngp850qf32yydy1fdx10lv5amrfl"; depends=[]; };
+  gpDDE = derive2 { name="gpDDE"; version="0.8.2"; sha256="100g2f8zlpbwxb46h62pgvidll8aflz1zl4inyh8dml6vhm9pilp"; depends=[CollocInfer deSolve fda forecast lars limSolve MASS nnls penalized trustOptim TSA]; };
   gpairs = derive2 { name="gpairs"; version="1.2"; sha256="09mkdbs9hklxnmqcsnf65s3dfsfcr7kppp6zxj08v5hxym1gpz3l"; depends=[barcode colorspace lattice MASS vcd]; };
   gpclib = derive2 { name="gpclib"; version="1.5-5"; sha256="08j81b8wymsgin20n54gvm6m54rmdic51p6qzs9cz4pmgl7dkkjv"; depends=[]; };
   gpk = derive2 { name="gpk"; version="1.0"; sha256="1zfhkqyypb24mhbj2zi9qy3gw0kqxvlp8j5ni3zm7k5rz1bnrygg"; depends=[]; };
@@ -4266,7 +4365,7 @@ in with self; {
   grade = derive2 { name="grade"; version="0.2-1"; sha256="085hfvqn880yk19axdjv3z9jr33kls212vs172a8mzhnkallph1r"; depends=[]; };
   gramEvol = derive2 { name="gramEvol"; version="2.1-2"; sha256="18i97pj58scqpxhphn1cnb0n9a94ki0i6fgi1f99mrk17w2jwmi8"; depends=[]; };
   granova = derive2 { name="granova"; version="2.1"; sha256="161fznqlnwmw53abmg2n62lhxxda7400ljnadvcdvsm8f6kcjf80"; depends=[car]; };
-  granovaGG = derive2 { name="granovaGG"; version="1.3"; sha256="1bsxad2h7rmbkmmg5zx6wbpws62dmp7n905gnp17n8cl8c6w2jp9"; depends=[ggplot2 gridExtra plyr RColorBrewer reshape2]; };
+  granovaGG = derive2 { name="granovaGG"; version="1.4.0"; sha256="0khqlqc6jg9cpdq06g6jlpfjcw3m6rj40ipljfai8g1630ril6q4"; depends=[ggplot2 gridExtra plyr RColorBrewer reshape2]; };
   graphicalVAR = derive2 { name="graphicalVAR"; version="0.1.3"; sha256="0awbcx8qb77r4qb90xinp49glwbkvyfb5f5y2qrjk8rr2jd62j0s"; depends=[glasso glmnet Matrix mvtnorm qgraph Rcpp RcppArmadillo]; };
   graphicsQC = derive2 { name="graphicsQC"; version="1.0-6"; sha256="07kzz0r8rh4m7qqxnlab0d4prr56jz5kspx782byspkcm5l4xrsl"; depends=[XML]; };
   graphscan = derive2 { name="graphscan"; version="1.1"; sha256="1v56g1gzlls78mdad9wllyq7zywmjzamrcxw0pk655nwjbqfiyw5"; depends=[ape rgl snowfall sp]; };
@@ -4276,7 +4375,7 @@ in with self; {
   gridBase = derive2 { name="gridBase"; version="0.4-7"; sha256="09jzw4rzwf2y5lcz7b16mb68pn0fqigv34ff7lr6w3yi9k91i1xy"; depends=[]; };
   gridDebug = derive2 { name="gridDebug"; version="0.5-0"; sha256="12zrl7p8p7071w5viymdipycja7a2arvy0aahgahd5nlx1k1gha0"; depends=[graph gridGraphviz gridSVG]; };
   gridExtra = derive2 { name="gridExtra"; version="2.0.0"; sha256="19yyrfd37c5hxlavb9lca9l26wjhc80rlqhgmfj9k3xhbvvpdp17"; depends=[gtable]; };
-  gridGraphics = derive2 { name="gridGraphics"; version="0.1-3"; sha256="09ml9vy4lz0q235xy2m5l8qd3rb3r73gf3bwz35dgn7qcxps8jjp"; depends=[]; };
+  gridGraphics = derive2 { name="gridGraphics"; version="0.1-5"; sha256="1fsw699xk56iiwscrf98a1b0m2xpmvfqqsb7aja49fhv8qam6szf"; depends=[]; };
   gridGraphviz = derive2 { name="gridGraphviz"; version="0.3"; sha256="1jz0d6kc8ci55ffm6dns8bhak9xnaq7mg5mpv3fk53lircn7mwl5"; depends=[graph Rgraphviz]; };
   gridSVG = derive2 { name="gridSVG"; version="1.5-0"; sha256="15d35066213hwsxsvmnqxqm4wim850645jwajw4pa190v8sapl89"; depends=[RJSONIO XML]; };
   grnn = derive2 { name="grnn"; version="0.1.0"; sha256="1dxcmar42g9hz4zlyszlmmnnsnja0gxfggav5jxv0gkp32rkd0wh"; depends=[]; };
@@ -4294,6 +4393,7 @@ in with self; {
   grppenalty = derive2 { name="grppenalty"; version="2.1-0"; sha256="12hbghmg96dwlscjy6nspgkmqqj4vwq2qcwcz1gp50a08qbmdcrk"; depends=[]; };
   grpreg = derive2 { name="grpreg"; version="2.8-1"; sha256="0n6j4mx2f0khdqz7c7yhmsh6gcxha2ypknqa421qir1nvp0x57c9"; depends=[Matrix]; };
   grpregOverlap = derive2 { name="grpregOverlap"; version="1.0-1"; sha256="09s3gp59z703zqhpnqzqhkd454b5rlq1cgdhcvql2ad4csxxs03x"; depends=[grpreg Matrix]; };
+  grpss = derive2 { name="grpss"; version="3.0.1"; sha256="01bjjhv3vkvn5h363g5a9dlm7kzq10q7ixmrc0kkq5hsbs31vl3x"; depends=[doParallel foreach grpreg MASS]; };
   grt = derive2 { name="grt"; version="0.2"; sha256="0cqjk7yqk2ryx1pgvjd3x8l25hqv92p8rvdr7xw4jkzillllwmhz"; depends=[MASS misc3d rgl]; };
   gsDesign = derive2 { name="gsDesign"; version="2.9-3"; sha256="0dd96hciiksf436lpm1q35in06b82p4h09spklf28n0p5hgc9225"; depends=[ggplot2 plyr RUnit stringr xtable]; };
   gsalib = derive2 { name="gsalib"; version="2.1"; sha256="1k3zjdydzb0dfh1ihih08d4cw6rdamgb97cdqna9mf0qdjc3pcp1"; depends=[]; };
@@ -4303,7 +4403,7 @@ in with self; {
   gsg = derive2 { name="gsg"; version="2.0"; sha256="17fjl7aw1s814krnszxd4y1d4210bnkrf4kb2fwsycqwcwms5pm7"; depends=[boot mgcv mvtnorm numDeriv]; };
   gsheet = derive2 { name="gsheet"; version="0.1.0"; sha256="02mclvkq9lpp57ii8k3wj8cqjii9zsg4nl4i7zsa8b88r2bjmf9r"; depends=[dplyr rvest stringr]; };
   gskat = derive2 { name="gskat"; version="1.0"; sha256="19mbif7wr88vk5wlc7m2l4xghjmfj2qd3s8yvjlkawbnjk8x6ib0"; depends=[CompQuadForm e1071 gee geepack Matrix]; };
-  gsl = derive2 { name="gsl"; version="1.9-10"; sha256="06n21p0k2ki6nb725a6sxwlb4p7xc5jhg11nq9c3z3dj39r0qgbd"; depends=[]; };
+  gsl = derive2 { name="gsl"; version="1.9-10.1"; sha256="0pbxzn5zkaskaqn308bj8s78v65fngmqkzxms3ji5x6azgcgfzvp"; depends=[]; };
   gsmoothr = derive2 { name="gsmoothr"; version="0.1.7"; sha256="00z9852vn5pj04dhl3w36yk0xjawniay6iifw1i7fd8g98mgspxp"; depends=[]; };
   gss = derive2 { name="gss"; version="2.1-5"; sha256="19bysbh6n04psv0mgvlhkpkc463f6zfiwbdsvd28fakbzcwwm8h2"; depends=[]; };
   gsscopu = derive2 { name="gsscopu"; version="0.9-3"; sha256="0bvhhs5wn4y1dcff2g87f80jdn3i4mdbvdbydsbx80ng38rfxhhg"; depends=[gss]; };
@@ -4315,6 +4415,7 @@ in with self; {
   gte = derive2 { name="gte"; version="1.2-2"; sha256="1x528iakyjhh4j92cgm6fr49a3rdi4cqy28qhsfr2dwvxzxchl6h"; depends=[survival]; };
   gtools = derive2 { name="gtools"; version="3.5.0"; sha256="1xknwk9xlsj027pg0nwiizigcrsc84hdrig0jn0cgcyxj8dabdl6"; depends=[]; };
   gtop = derive2 { name="gtop"; version="0.2.0"; sha256="1nvvbf181x0miw3q0r2g0nklz29ljdsd07cazaajfls7pmhi0xw9"; depends=[hts lassoshooting quadprog]; };
+  gtrendsR = derive2 { name="gtrendsR"; version="1.3.1"; sha256="0gi39h6f8ylir40bgjgi5v5l8lhg5668jbqz7gdxnscq9zv1innd"; depends=[ggplot2 googleVis RColorBrewer RCurl zoo]; };
   gtx = derive2 { name="gtx"; version="0.0.8"; sha256="0x71jji2yldi9wpx8d3nldbjfj4930j7zcasayzbylf9094gmg26"; depends=[survival]; };
   gumbel = derive2 { name="gumbel"; version="1.10-1"; sha256="12rkri8bvgjn0ylf1i4k9vpb8mvbasidvx2479kmis2rc1p07qq7"; depends=[]; };
   gvc = derive2 { name="gvc"; version="0.5.2"; sha256="0cfvli6ap5kw3agv94d7g7rhmlxd66yyngc7c9pl4fsxf7sm6nx4"; depends=[decompr diagonals]; };
@@ -4323,10 +4424,11 @@ in with self; {
   gwerAM = derive2 { name="gwerAM"; version="1.0"; sha256="1c3rzd1jf52a4dn63hh43m9s9xnjvqn67amlm9z1ndrnn6fwfg1b"; depends=[MASS Matrix]; };
   gwrr = derive2 { name="gwrr"; version="0.2-1"; sha256="1fjk217pimnmxsimqp9sn02nr1mwy3hw3vsr95skbfsd6vdda14d"; depends=[fields lars]; };
   gyriq = derive2 { name="gyriq"; version="1.0.1"; sha256="0dnln074nhnh5bp6c57phsykm6l69x78ig6rlyyvsgsrlf5nbkbm"; depends=[CompQuadForm irlba mvtnorm survival]; };
-  h2o = derive2 { name="h2o"; version="3.2.0.3"; sha256="0xy35xfl8zinh2blq2gns0hldjzx6rqbpdn45jv9fls6v6kbvk9h"; depends=[jsonlite RCurl statmod]; };
+  h2o = derive2 { name="h2o"; version="3.6.0.8"; sha256="1d51ffmsrsy5vyg16v78ld8f7hbdjgnlxp6fhxmmg8zcayg9ja91"; depends=[jsonlite RCurl statmod]; };
   h5 = derive2 { name="h5"; version="0.9.4"; sha256="0khmp3lsqpqbg0959wl46zkg9b8j59m4i7vrh5m8q2lmil8pak3r"; depends=[Rcpp]; };
   hSDM = derive2 { name="hSDM"; version="1.4"; sha256="1jq6hdnyv446ng62srip0b48kccf0qw3xqym3fprg74mjdy3inqr"; depends=[coda]; };
   haarfisz = derive2 { name="haarfisz"; version="4.5"; sha256="1qmh4glwzqwqx3pvxc71rlcimp1l0plgdf380v9hk0b4gj7g3pkf"; depends=[wavethresh]; };
+  hail = derive2 { name="hail"; version="0.1.0"; sha256="1i76hjfiad0l8vpjslnglp1irdzs419ad7q6clnbs3gganbszipy"; depends=[]; };
   hamlet = derive2 { name="hamlet"; version="0.9.4-2"; sha256="01zy6afiy7n28bbx5cwdy6hs82l1rakbwx2gn04kk6famqgmklwp"; depends=[]; };
   hapassoc = derive2 { name="hapassoc"; version="1.2-8"; sha256="0qs5jl0snzfchgpp6pabncwywxcmi743g91jvjiyyzw0lw85yv4s"; depends=[]; };
   haplo_ccs = derive2 { name="haplo.ccs"; version="1.3.1"; sha256="0cs90zxxbvglz1af0lh37dw1gxa04k0kawzxamz2was3dbh19lbz"; depends=[haplo_stats survival]; };
@@ -4355,12 +4457,15 @@ in with self; {
   hdi = derive2 { name="hdi"; version="0.1-2"; sha256="19lc2h34jlj198gchnhbfbb8igwlan2b977a47j8p3q6haj5bcv1"; depends=[glmnet linprog MASS scalreg]; };
   hdlm = derive2 { name="hdlm"; version="1.2"; sha256="0s4lzg3s2k7f7byygb11s7f78l3rkkb0zn03kh3d7h8250wg9fax"; depends=[foreach glmnet iterators MASS]; };
   hdnom = derive2 { name="hdnom"; version="2.1"; sha256="1p09249587bdhcvlz4mj46akrb41swl7z3hnnqw46ypl0r0vvvqx"; depends=[foreach glmnet ncvreg penalized rms survAUC survival]; };
+  hdr = derive2 { name="hdr"; version="0.1"; sha256="0dgp4442mfvri8vhicp02nrv55z13r6664x2nlcq6vh6xz9pqyl0"; depends=[httr]; };
   hdrcde = derive2 { name="hdrcde"; version="3.1"; sha256="027nxpzk1g0yx8rns7npdz30afs5hwpdqjiamc7yjrsi0rzm71lw"; depends=[ash KernSmooth ks locfit mvtnorm]; };
   heatex = derive2 { name="heatex"; version="1.0"; sha256="0c7bxblq24m80yi24gmrqqlcw8jh0lb749adsh51yr6nzpap6i9n"; depends=[]; };
   heatmap_plus = derive2 { name="heatmap.plus"; version="1.3"; sha256="0rzffm15a51b7l55k0krk6w7v8czy3vpwz1qmbybr7av0pln7wn3"; depends=[]; };
   heatmap3 = derive2 { name="heatmap3"; version="1.1.1"; sha256="14zkij0gr9awzic71k2j7pniamkywfvwrifdk7jbds70zsi30ph5"; depends=[fastcluster]; };
   heatmapFit = derive2 { name="heatmapFit"; version="2.0.2"; sha256="00p39y6x13yxrxfqx6gzmb80fk1hsyi8wa6brx40hj37pyyfis0p"; depends=[]; };
   heavy = derive2 { name="heavy"; version="0.2-35"; sha256="04aw0r2hgnxf9nsd18q2b5d130vj578nyv5wacivikgfifyy0y39"; depends=[]; };
+  heemod = derive2 { name="heemod"; version="0.1.0"; sha256="1c59dyjrqwcwic122g7r2plhvwsj317njmn24n7qzwhbjzwznwn6"; depends=[dplyr lazyeval purrr]; };
+  hellno = derive2 { name="hellno"; version="0.0.1"; sha256="1j787rw9hh75bvkckmlz5xkgwc22gd7si3mgjd7v60dd6lykfa88"; depends=[]; };
   helloJavaWorld = derive2 { name="helloJavaWorld"; version="0.0-9"; sha256="1a8yxja54iqdy2k8bicrcx1y3rkgslas03is4v78yhbz42c9fi8s"; depends=[rJava]; };
   helsinki = derive2 { name="helsinki"; version="0.9.27"; sha256="1vhzlxjkk2hgzjlin9ksvjk3bi2ly5nm4361777m49lb84ncs7dr"; depends=[maptools RCurl rjson sp]; };
   heplots = derive2 { name="heplots"; version="1.0-16"; sha256="00aj3x864zlzyj52yya7wajjnpwmpgicqvgyx71gnxdkqmv64x40"; depends=[car MASS]; };
@@ -4385,7 +4490,7 @@ in with self; {
   hierNet = derive2 { name="hierNet"; version="1.6"; sha256="08lifk92caa4l9nfb89rl6vby8sd1ba3ay7z29ffirsg7cx07qiw"; depends=[]; };
   hierarchicalDS = derive2 { name="hierarchicalDS"; version="2.9"; sha256="0ckxy4pww5iik4m4kqs714f00g7lfzsarjdbpd0bcalvq4lmaal2"; depends=[coda ggplot2 Matrix mc2d mvtnorm rgeos truncnorm xtable]; };
   hierband = derive2 { name="hierband"; version="1.0"; sha256="0d95hrgkd8b5sww3wsgs6v9zg9pm71ick8x8kj8d6vyib350h6yn"; depends=[]; };
-  hierfstat = derive2 { name="hierfstat"; version="0.04-14"; sha256="0zbl5cq0cidv0glgi1g2q0azfw393lnb7hp8m69sxwdjn3y3912c"; depends=[ade4 gtools]; };
+  hierfstat = derive2 { name="hierfstat"; version="0.04-22"; sha256="1fav2v2996v5kb1ffa6v5wxfm921syxg6as034vd3j4jfhdibyfx"; depends=[ade4 adegenet gtools]; };
   hiertest = derive2 { name="hiertest"; version="1.1"; sha256="17maf1w4vkqknxff3f00fzv136j3dbbigyzl4vq4sln9j27w10r3"; depends=[]; };
   highD2pop = derive2 { name="highD2pop"; version="1.0"; sha256="1s4v6m2d3vzvxsgmjzczv1zj3kv3ygvv6gbkkbjwsdhkvc1rdmf0"; depends=[fastclime]; };
   highTtest = derive2 { name="highTtest"; version="1.1"; sha256="18hgxlr0y8y1d4ldqmfcg4536lhyn5p6w88sq1vj74qr5wzydga1"; depends=[]; };
@@ -4402,7 +4507,7 @@ in with self; {
   histmdl = derive2 { name="histmdl"; version="0.4-1"; sha256="0kiz95hdi658j5s7aqlf8n9k35s30pshc5nymif88gjik9gvrxd0"; depends=[]; };
   histogram = derive2 { name="histogram"; version="0.0-23"; sha256="0hrhk423wdybqbvgsjn7dxgb95bkvmbh573q1696634hvzfdm68c"; depends=[]; };
   historydata = derive2 { name="historydata"; version="0.1"; sha256="1h69x3iig542d43p9zm8x83p4dq48iwsw606j4fndnqhx99vzkw6"; depends=[]; };
-  hit = derive2 { name="hit"; version="0.1-0"; sha256="12mb5r89h7q01sy11iph05s569jr2kidlj2p6n17ii3dm2n0n7ql"; depends=[glmnet Rcpp]; };
+  hit = derive2 { name="hit"; version="0.2-0"; sha256="1kx2hmjx9ga0q0sl3jqh9zvkwynzx903n291nvgspsxv4p88x6dd"; depends=[glmnet Matrix Rcpp speedglm]; };
   hitandrun = derive2 { name="hitandrun"; version="0.5-2"; sha256="0451rdnp3b4fcdv4wwdxv3wplkxqmidxh4v5n1jjxinnzvl5dv9a"; depends=[rcdd]; };
   hive = derive2 { name="hive"; version="0.2-0"; sha256="0ywakjphy67c4hwbh6prs4pgq5ifd8x8inxjkigjiqz6jx3z852v"; depends=[rJava XML]; };
   hmeasure = derive2 { name="hmeasure"; version="1.0"; sha256="0wr0xq956glmhvy4yis3qq7cfqv9x82ci9fzx3wjvaykd16h0sx9"; depends=[]; };
@@ -4422,7 +4527,7 @@ in with self; {
   hotspots = derive2 { name="hotspots"; version="1.0.2"; sha256="1cwcwin86y7afjhs8jwlz1m63hh70dcjag0msds4ngksvjh9gj2q"; depends=[ineq lattice]; };
   howmany = derive2 { name="howmany"; version="0.3-1"; sha256="045ck8qahfg2swbgyf7dpl32ryq1m4sbalhr7m5qdgpm62vz8h7f"; depends=[]; };
   hpcwld = derive2 { name="hpcwld"; version="0.5"; sha256="17k4mw41gygwgvh7h78m0jgzh1bivrvrsr8lgxxw3sbkw88lwb40"; depends=[multicool partitions]; };
-  hpoPlot = derive2 { name="hpoPlot"; version="2.2"; sha256="193ssc7csfkkbv08xqw2skla1f19pwwrypmm4bh5xm804zpi918c"; depends=[functional magrittr Rgraphviz]; };
+  hpoPlot = derive2 { name="hpoPlot"; version="2.4"; sha256="176bf93gjwbi2z7nz81w4aycwax6f7jxvs3236zrmf0f0f4m7bkc"; depends=[functional magrittr Rgraphviz]; };
   hqmisc = derive2 { name="hqmisc"; version="0.1-1"; sha256="0jcy2hb3dmzf9j4n92aq7247mx9w7n30wpsx0dkchqnjwlqwwncw"; depends=[]; };
   hqreg = derive2 { name="hqreg"; version="1.0"; sha256="08f6yijsmd0f3b5yxgdzfv6hqxhc8hbbpn2bmgivmpfssh84mcnn"; depends=[]; };
   hrr = derive2 { name="hrr"; version="1.1.1"; sha256="17jzsgh2784y7jdwpa50v7qz99dw6k2n25sisnam6h1a39b96byn"; depends=[]; };
@@ -4432,18 +4537,19 @@ in with self; {
   hsphase = derive2 { name="hsphase"; version="2.0.1"; sha256="1z7yxbknldxn780dxw9xz984b3i8pj5hmdnbynvxc5k0ss8g7isy"; depends=[Rcpp RcppArmadillo snowfall]; };
   htmlTable = derive2 { name="htmlTable"; version="1.3"; sha256="00zcismapanyb68657gng5l6g3hsmpls84naracshj4gfk2l1cfs"; depends=[knitr magrittr stringr]; };
   htmltab = derive2 { name="htmltab"; version="0.6.0"; sha256="00171fsdgv3rks6j4i5w8rbk2kar2rbmqqpqrr2xdxkjqxsf6k4b"; depends=[httr XML]; };
-  htmltools = derive2 { name="htmltools"; version="0.2.6"; sha256="1gp6f6388xy3cvnb08q08vraidjp740gfxlafdd19m2s04v5hncz"; depends=[digest]; };
+  htmltools = derive2 { name="htmltools"; version="0.3"; sha256="1aa9w97rgw7zl63qswbd4cbf1wszcfikaf09m1fs50r5h25qdg35"; depends=[digest]; };
   htmlwidgets = derive2 { name="htmlwidgets"; version="0.5"; sha256="1d583kk7g29r4sq0y1scri7fs48z6q17c051nyjywcvnpy4lvi8j"; depends=[htmltools jsonlite yaml]; };
   hts = derive2 { name="hts"; version="4.5"; sha256="1bjribmfczkx139z73b0cl3lzlw5n2byyyc5inqv9qgayz0dc6cp"; depends=[forecast Matrix Rcpp RcppEigen SparseM]; };
   httk = derive2 { name="httk"; version="1.3"; sha256="18vnl0dj6xhdy0bsayfhd2jq51b3ncqxms8r5y263q0ivqyxp2gd"; depends=[deSolve msm]; };
   httpRequest = derive2 { name="httpRequest"; version="0.0.10"; sha256="0f6mksy38p9nklsr44ki7a79df1f28jwn2jfyb6f9kbjzh98746j"; depends=[]; };
   httpcode = derive2 { name="httpcode"; version="0.1.0"; sha256="08x3jnvra833kp625bys04b5np9rrlhqf5gp127df80c289vabwx"; depends=[]; };
+  httping = derive2 { name="httping"; version="0.1.0"; sha256="1bhy5mh0hz83rjmvh7wl211nqkz58gxsgkwlkmjrdfzc2cparxjz"; depends=[httpcode httr jsonlite magrittr pryr]; };
   httpuv = derive2 { name="httpuv"; version="1.3.3"; sha256="0aibs0hf38n8f6xxx4g2i2lzd6l5h92m5pscx2z834sdvhnladxv"; depends=[Rcpp]; };
   httr = derive2 { name="httr"; version="1.0.0"; sha256="1yprw8p4g8026jhravgg1hdwj1g51cpdgycyr5a58jwm4i5f79cq"; depends=[curl digest jsonlite mime R6 stringr]; };
   huge = derive2 { name="huge"; version="1.2.7"; sha256="134d951x42vy9dcmf155fbvik2934nh6qm2w5jlx3x2c6cf7faq4"; depends=[igraph lattice MASS Matrix]; };
   humanFormat = derive2 { name="humanFormat"; version="1.0"; sha256="0zwjbl8s5dx5d57sfmq6myc6snximc56zl88h8y1s1jqphyn9sir"; depends=[testthat]; };
   humaniformat = derive2 { name="humaniformat"; version="0.5.0"; sha256="18094zlvhd44vg2rg4731f84imrjp69gzay3gnm5yp1scbiqbd82"; depends=[Rcpp]; };
-  hwde = derive2 { name="hwde"; version="0.66"; sha256="0wq5bkfqhbf8h9x5ik3wzqrxs4i5ip523cvrsh15xclmrkhjis6g"; depends=[]; };
+  hwde = derive2 { name="hwde"; version="0.67"; sha256="0wb2f9i5qi7w77ygh8bvydfpr7j5x8dyvnnhdkajaz0wdcpkyaqy"; depends=[]; };
   hwriter = derive2 { name="hwriter"; version="1.3.2"; sha256="0arjsz854rfkfqhgvpqbm9lfni97dcjs66isdsfvwfd2wz932dbb"; depends=[]; };
   hwriterPlus = derive2 { name="hwriterPlus"; version="1.0-3"; sha256="1sk95qgpyxwk1cfkkp91qvn1iklad9glrnljdpidj20lnmpwyikx"; depends=[hwriter TeachingDemos]; };
   hwwntest = derive2 { name="hwwntest"; version="1.3"; sha256="1b5wfbiwc542vlmn0l2aka75ss1673z8bcszfrlibg9wwqjxlwk5"; depends=[polynom wavethresh]; };
@@ -4455,6 +4561,7 @@ in with self; {
   hydroTSM = derive2 { name="hydroTSM"; version="0.4-2-1"; sha256="0z5xw25w2fn67x2dw61msfdnp2dr2s2yi525fcjxn77339x9ksfr"; depends=[automap e1071 gstat sp xts zoo]; };
   hydrogeo = derive2 { name="hydrogeo"; version="0.2-3"; sha256="1kvzpdjrzbxy4rbfhjqmxdipaamd2rjdyxjv6vfxv1ixs1bm8cwm"; depends=[]; };
   hydrostats = derive2 { name="hydrostats"; version="0.2.4"; sha256="16h9gchfrppn5n77bld8b5lhwk45dncfwxxibrmb6m6iclqiadgy"; depends=[]; };
+  hyfo = derive2 { name="hyfo"; version="1.3.4"; sha256="1p949rr3ihrzz7l88vzaqsllx1rmjxdksdnsgv494zd5ym1jkyhb"; depends=[ggplot2 lmom maps maptools MASS moments ncdf plyr reshape2 rgdal rgeos zoo]; };
   hyperSpec = derive2 { name="hyperSpec"; version="0.98-20150304"; sha256="0fjww2h6vlm53dsnaxb3i11cmary1w8l0jr9c5dy16y7n9cc3hqb"; depends=[ggplot2 lattice latticeExtra mvtnorm svUnit]; };
   hyperdirichlet = derive2 { name="hyperdirichlet"; version="1.4-9"; sha256="03c2xgfhfbpn1za84ajhvm0i5cpmfnz1makidrr2222addgyp9zx"; depends=[abind aylmer cubature mvtnorm]; };
   hypergea = derive2 { name="hypergea"; version="1.2.3"; sha256="13a8r7f2qq7wi0h7jrg29mn573njzi1rwna0ch9sj8sdy8w26r6w"; depends=[]; };
@@ -4467,6 +4574,7 @@ in with self; {
   iBUGS = derive2 { name="iBUGS"; version="0.1.4"; sha256="0vsxy8pnbix0rg7ksgywx7kypqb5ngkxhldh3cisjkvdv638ybps"; depends=[gWidgetsRGtk2 R2WinBUGS]; };
   iC10 = derive2 { name="iC10"; version="1.1.3"; sha256="19dlrwj47zmdgmvzjfs5qa9fqq8g9ywhgy5mqbp99n7d9hg4ybxh"; depends=[iC10TrainingData pamr]; };
   iC10TrainingData = derive2 { name="iC10TrainingData"; version="1.0.1"; sha256="1x1kgxiib9l7whm2kmbv1s912hgpl7rdpqpn67nlkiswnr27hqn4"; depends=[]; };
+  iClick = derive2 { name="iClick"; version="1.1"; sha256="0xyc2v7qx887g3x08sk5kyd5zsg89hgqn4srr68w9d0fpgmwxzx6"; depends=[fBasics forecast rugarch timeSeries]; };
   iCluster = derive2 { name="iCluster"; version="2.1.0"; sha256="09j36xv87d382m5ijkhmp2mxaajc4k97cf9k1hb11ksk7fxdqz6r"; depends=[caTools gdata gplots gtools lattice]; };
   iDynoR = derive2 { name="iDynoR"; version="1.0"; sha256="01702vl10191mbq2wby1m0y6h8i6y6ic4pa83d27cg3yccsrhziz"; depends=[vegan XML]; };
   iFad = derive2 { name="iFad"; version="3.0"; sha256="0jrl9bayihp3wb4k5w9kc71qlsdxk7vl83ydfibx2bg79c4hf3cs"; depends=[coda MASS Rlab ROCR]; };
@@ -4482,7 +4590,7 @@ in with self; {
   ibdreg = derive2 { name="ibdreg"; version="0.2.5"; sha256="1kaa5q1byi30wzr0mw4w2cv1ssxprzcwf91wrpqwkgcsdy7dkh2g"; depends=[]; };
   ibeemd = derive2 { name="ibeemd"; version="1.0.1"; sha256="115z13q02gzixziknix2l53mi12zzg30ra9h35pv6qzrr11ra1ic"; depends=[deldir fields rgeos sp spdep]; };
   ibelief = derive2 { name="ibelief"; version="1.2"; sha256="1zh6bpg0gaybslr1p05qd5p2y5kxbgyhgha4j4v5d69d78jwgah9"; depends=[]; };
-  ibmdbR = derive2 { name="ibmdbR"; version="1.42.2"; sha256="09q9awmrixmvlkkcwg5hkgi4swgjydm1cnlbcwi5ankf0vbngqp5"; depends=[arules MASS Matrix RODBC]; };
+  ibmdbR = derive2 { name="ibmdbR"; version="1.47.1"; sha256="0xxhx0dbz9y4lhnwb0ic14dny0md59izicn12nbsv8040v56kwky"; depends=[arules ggplot2 MASS Matrix RODBC rpart rpart_plot]; };
   ibr = derive2 { name="ibr"; version="2.0-0"; sha256="033mc4w8vfqdjfs2qml1qhysqzhfsnkr4q66dii33611py1caq7y"; depends=[mgcv]; };
   ic_infer = derive2 { name="ic.infer"; version="1.1-5"; sha256="0nmx7ijczzvrv1j4321g5g5nawzll8srf302grc39npvv1q17jyz"; depends=[boot kappalab mvtnorm quadprog]; };
   ic50 = derive2 { name="ic50"; version="1.4.2"; sha256="1a5ddmbdfr3ls132fvalbkh4yaawv9k58rgpy54s5qddrm6aas2s"; depends=[]; };
@@ -4492,18 +4600,19 @@ in with self; {
   icapca = derive2 { name="icapca"; version="1.1"; sha256="131gdrk8vsbac0krmsryvsp21bn9hzxqxq847zn16cxjf6y5i3xb"; depends=[]; };
   iccbeta = derive2 { name="iccbeta"; version="1.0"; sha256="0zsf2b5nrv39pssi5walf82892fr8p1f802c96hjjknh78q7gh0h"; depends=[lme4 Rcpp RcppArmadillo]; };
   icd9 = derive2 { name="icd9"; version="1.3"; sha256="1k34s7zys2c6v6i7843yh8i5bh3j7axdv9xdlampdfx5pn5g29as"; depends=[checkmate fastmatch Rcpp]; };
-  icenReg = derive2 { name="icenReg"; version="1.2.8"; sha256="1askg1bc25jlwi61j56333iv7hgswslpq084y3psncphlfgg7z1k"; depends=[foreach MLEcens survival]; };
-  icensmis = derive2 { name="icensmis"; version="1.3.0"; sha256="0f8zb6zdmdb303x0882915vacgc8d9378lqq58788838i6qjzyw4"; depends=[Rcpp]; };
+  icenReg = derive2 { name="icenReg"; version="1.3.1"; sha256="0r7rzfkjrhbkpz463id91mvk0y2vsxjnypm7pl14xs4mjxkpp434"; depends=[foreach MLEcens survival]; };
+  icensmis = derive2 { name="icensmis"; version="1.3.1"; sha256="1c0j43wffb5h99chlj8j45lpan7dpn2i0r4rr6b2kq16p1zabfjw"; depends=[Rcpp]; };
   icsw = derive2 { name="icsw"; version="0.9"; sha256="0lmq9l9sy0fz3yjj2sj8f19iy26913caibf7d9zb9w9n6cqskvlx"; depends=[]; };
   idbg = derive2 { name="idbg"; version="1.0"; sha256="1rxmj04hswxybrg7dfib3mjy8v8mdiv13zwbscp2q55z55hhf1m5"; depends=[]; };
   idendr0 = derive2 { name="idendr0"; version="1.5.2"; sha256="18fblymbdl1i0sxfv911ls090hkhmwlk0q1dx4fhi54h16qqzjhf"; depends=[tkrplot]; };
+  identifyr = derive2 { name="identifyr"; version="0.1"; sha256="011i6s7w7ss6vlyhwdj67hw4pwyvnn3vga89d3ykd3j3h1k615zp"; depends=[magrittr stringr]; };
   identity = derive2 { name="identity"; version="0.2-1"; sha256="1j5wb5cj5j49in2g6r1shdm4ri4cfzj22hpqazvcmq4dm291sdi9"; depends=[]; };
   idm = derive2 { name="idm"; version="1.2"; sha256="0f9w1556yfn3vsza6g5lmcpaydj20k0zdlc9shciskkiqhm9gjlc"; depends=[animation ca corpcor dummies ggplot2]; };
   idr = derive2 { name="idr"; version="1.2"; sha256="05nvgw1xdg670bsjjrxkgd1mrdkciccpw4krn0zcgdf2r21dzgwb"; depends=[]; };
   ieeeround = derive2 { name="ieeeround"; version="0.2-0"; sha256="0xaxrlalyn8w0w4fva8fd86306nvw3iyz44r0hvay3gsrmgn3fjh"; depends=[]; };
   ifa = derive2 { name="ifa"; version="7.0"; sha256="1cxafd7iwvyidzy27lyk1b9m27vk785ipj9ydkyx9z1v0zna2wnl"; depends=[mvtnorm]; };
   ifaTools = derive2 { name="ifaTools"; version="0.8"; sha256="1nmim5dw42wkzjw85g5raz899xa2whlyvz36jcpli69cx0zq3kqq"; depends=[ggplot2 OpenMx reshape2 rpf shiny]; };
-  ifctools = derive2 { name="ifctools"; version="0.3.1"; sha256="0lr1d4z2gzninqchfzmmmymd0ngywrjpbh7bvd6qgxkzabf9yxxx"; depends=[]; };
+  ifctools = derive2 { name="ifctools"; version="0.3.2"; sha256="18g0l0vh9z4nvl6jil32983c4z1dvawrivi4kz4g562q3habm279"; depends=[]; };
   ifs = derive2 { name="ifs"; version="0.1.5"; sha256="03g9cgs0zp89b1d7rpcn5clkvmg0spnariwrifd8hha476ldvfcy"; depends=[]; };
   ifultools = derive2 { name="ifultools"; version="2.0-1"; sha256="16lrmajyfa15akgjq71w9xlfsr4y9aqfw7y0jf6gydaz4y6jq9b9"; depends=[MASS splus2R]; };
   ig_vancouver_2014_topcolour = derive2 { name="ig.vancouver.2014.topcolour"; version="0.1.2.0"; sha256="0yclvm6xppf4w1qf25nf82hg1pliah68z7h3f683svv0j62q748h"; depends=[]; };
@@ -4513,7 +4622,7 @@ in with self; {
   ihs = derive2 { name="ihs"; version="1.0"; sha256="1c5c9l6kdalympb19nlgz1r9zq17575ivp3zrayb9p6w3fn2i06h"; depends=[maxLik]; };
   iki_dataclim = derive2 { name="iki.dataclim"; version="1.0"; sha256="1yhvgr8d3j2r8y9c02rzcg80bz4cx58kzybm4rch78m0207wqs7p"; depends=[climdex_pcic lubridate PCICt zoo]; };
   ilc = derive2 { name="ilc"; version="1.0"; sha256="0hs0nxv7cd300mfxscgvcjag9f2igispcskfknb7sn7p8qvwr5ki"; depends=[date demography forecast rainbow survival]; };
-  imPois = derive2 { name="imPois"; version="0.0.6.4"; sha256="0xbv6fppl0s9mm3i1x8bsn9czhwx7gbp88v1h41lw90hf35s73s5"; depends=[geometry]; };
+  imPois = derive2 { name="imPois"; version="0.0.7.5"; sha256="15l2air707xnzxvgvzsv90m5pl8vvr9inywvmx7f7irn4syy0g3a"; depends=[geometry rgl]; };
   imager = derive2 { name="imager"; version="0.14"; sha256="1zfy5iz5l2f6yjzhi5wgb2xsngnlxslc186iacvspmw0zydzwyvw"; depends=[jpeg magrittr plyr png Rcpp stringr]; };
   imguR = derive2 { name="imguR"; version="1.0.0"; sha256="0yhlir0qxi6hjmqlmmklwd4vkymc5bzv9id9dlis1fr1f8a64vwp"; depends=[httr jpeg png RCurl]; };
   immer = derive2 { name="immer"; version="0.2-0"; sha256="15a3qr4lgp8gykr72jj3gpvlf0npcp7071a7d8q3ns13lfk5m9r3"; depends=[CDM coda psychotools Rcpp RcppArmadillo sirt]; };
@@ -4523,12 +4632,12 @@ in with self; {
   imputeMDR = derive2 { name="imputeMDR"; version="1.1.2"; sha256="0ds5a4wav9vb9z5nji8hv5l76310rd970xf702fd0ckx1sh6rgd7"; depends=[]; };
   imputeMissings = derive2 { name="imputeMissings"; version="0.0.1"; sha256="1xcgv725xs1vqg5b6psbmsgh7xikb8iasd9n7f8dxrlq3d1p5khv"; depends=[randomForest]; };
   imputeR = derive2 { name="imputeR"; version="1.0.0"; sha256="18rx70w7xb33m84ifxl3p599js78pa748c9lmlkic6yqrgsabcip"; depends=[caret Cubist gbm glmnet mboost pls rda reshape2 ridge rpart]; };
-  imputeTS = derive2 { name="imputeTS"; version="0.3"; sha256="12y882j6ypjs1mnzkdjkfxhvn728ydbb471js26kbbizsvsmc1ir"; depends=[]; };
+  imputeTS = derive2 { name="imputeTS"; version="0.4"; sha256="0prd7wcbikyzzfphqmrhxwgrpvpd129m3hvr217xmclr4gqrknsb"; depends=[stinepack]; };
   imputeYn = derive2 { name="imputeYn"; version="1.3"; sha256="1b21w1aa5f7yiq8k0wa86wvbg4ij7f6ldwn6asfqwb0b90rvsgvs"; depends=[boot emplik mvtnorm quadprog survival]; };
   in2extRemes = derive2 { name="in2extRemes"; version="1.0-2"; sha256="10ngxv4zsh78gm3xwb22m681nhl2qbnzi4fkqwgjj2iz46ychzvy"; depends=[extRemes]; };
   inTrees = derive2 { name="inTrees"; version="1.1"; sha256="1b88zy4rarcx1qxzv3089gzdz1smga6ssj8cxxccyyzci6px85j1"; depends=[arules gbm RRF xtable]; };
   inarmix = derive2 { name="inarmix"; version="0.4"; sha256="11a1vaxq22d5lab07jp5pw0znkaqj6bmkn6vsx62y6m4mmqk04yr"; depends=[Matrix Rcpp]; };
-  inbreedR = derive2 { name="inbreedR"; version="0.2.0"; sha256="1vmf3zbj7a5whrhgfsnvn8a591bahsabrgs8r1sv8wk1pjm3yi5h"; depends=[data_table]; };
+  inbreedR = derive2 { name="inbreedR"; version="0.3.0"; sha256="02a8fflpx3149p9d7dsf1k9zbxghrg36zr8yr4d2hvxzpd93m2dj"; depends=[data_table Hmisc scales]; };
   indicspecies = derive2 { name="indicspecies"; version="1.7.5"; sha256="16m4pnfnmaskin4aaalm2cmv3vwzg94045max8nhkgw02kpskz1r"; depends=[permute]; };
   inegiR = derive2 { name="inegiR"; version="1.0.2"; sha256="1j7fpz96rn89lr5gckprcbzdi8jdvpjhs4xbyj3ipiv1rdj0lyda"; depends=[jsonlite plyr XML zoo]; };
   ineq = derive2 { name="ineq"; version="0.2-13"; sha256="09fsxyrh0j7mwmb5hkhmrzgcy7kf85jxkh7zlwpgqgcsyl1n91z0"; depends=[]; };
@@ -4544,7 +4653,7 @@ in with self; {
   infra = derive2 { name="infra"; version="0.1.2"; sha256="0jycnnmrrjq37lv67xbvh6p63d6l4vbgf3i1z9y7r75d6asspzn1"; depends=[]; };
   infuser = derive2 { name="infuser"; version="0.2.1"; sha256="02h3b07zf2x93yyrspb47kjb0jn0i5c79xjvrhm7yj5zzjhzqxh0"; depends=[]; };
   infutil = derive2 { name="infutil"; version="1.0"; sha256="02d0hfbkdqjj0lm1fzwwxy60831kbcjn2m4rfblpib0krkbpz72n"; depends=[ltm]; };
-  injectoR = derive2 { name="injectoR"; version="0.2.3"; sha256="0v88mpd44h93k1zw9d0z357gi7mrxam80dq1dbfifn9airc8f0l8"; depends=[]; };
+  injectoR = derive2 { name="injectoR"; version="0.2.4"; sha256="0sa32cspp6y3m04yfmd02kxx55mk7l9jxf4r9pk1a6k3sqnj6fl8"; depends=[]; };
   inline = derive2 { name="inline"; version="0.3.14"; sha256="0cf9vya9h4znwgp6s1nayqqmh6mwyw7jl0isk1nx4j2ijszxcd7x"; depends=[]; };
   inlinedocs = derive2 { name="inlinedocs"; version="2013.9.3"; sha256="13vk6v9723wlfv1z5fxmvxfqhaj68h0x3s2qq9j6ickr4wakb4ar"; depends=[]; };
   insideRODE = derive2 { name="insideRODE"; version="2.0"; sha256="1ffndk8761cpkririb3g1qsq9nwmh82lcrpql9i5fksdprvdjzcw"; depends=[deSolve lattice nlme]; };
@@ -4562,14 +4671,14 @@ in with self; {
   interferenceCI = derive2 { name="interferenceCI"; version="1.1"; sha256="19ky10nn6ygma6yy5h1krxx61aikh3yx5y39p68a944mz8f72vsn"; depends=[gtools]; };
   intergraph = derive2 { name="intergraph"; version="2.0-2"; sha256="1ipxdrfxhcxhcbqvrzqh3impwk4xryqlqlgjl7f2mwrf365zs6ph"; depends=[igraph network]; };
   internetarchive = derive2 { name="internetarchive"; version="0.1.4"; sha256="0889y0w3avh2c2imcxhvjli8619g7pqd6nakwxdgqlsdg6mxlif2"; depends=[dplyr httr jsonlite]; };
-  interplot = derive2 { name="interplot"; version="0.1.0.2"; sha256="031zpni88akhdjwrava9xf3k9x7vsldsi3dxjaj5x6q48a6gh19x"; depends=[abind arm ggplot2]; };
+  interplot = derive2 { name="interplot"; version="0.1.1.0"; sha256="1japwjwv45dcbi3g8fs00bzj1gqdpcpdg7mld5af1pz33xdxfxbd"; depends=[abind arm ggplot2]; };
   interpretR = derive2 { name="interpretR"; version="0.2.3"; sha256="1y2j91dm0p6yy9qwkllmlmk8n2b9ics4d40cmq8b0fk3rk61vh59"; depends=[AUC randomForest]; };
   interval = derive2 { name="interval"; version="1.1-0.1"; sha256="1lln9jkli28i4wivwzqrsxvv2n15560f7msjy5gssrm45vxrxms8"; depends=[Icens MLEcens perm survival]; };
   intervals = derive2 { name="intervals"; version="0.15.1"; sha256="1r2akz8dpix1rgvdply4r3m2zc08r0n96w9c97hma80g61a3i2ws"; depends=[]; };
   interventionalDBN = derive2 { name="interventionalDBN"; version="1.2.2"; sha256="0wpp4bfi22ncvl0vdivniwwvcqgnpifpgxb4g5jbyvr0z735cd9w"; depends=[]; };
   intpoint = derive2 { name="intpoint"; version="1.0"; sha256="0zcv64a0clgf1k3ylh97q1w5ddrv227846gy9a68h6sgwc0ps88b"; depends=[]; };
   introgress = derive2 { name="introgress"; version="1.2.3"; sha256="1j527gf7pmfy5365p2j2jbxq0fb0xh2992hj4d7dxapn4psgmvsk"; depends=[genetics nnet RColorBrewer]; };
-  intsvy = derive2 { name="intsvy"; version="1.7"; sha256="1q3z8wk809ixnqmhfy4l075km0flsdp3x1m8xqg5ccgwnvdi9igf"; depends=[foreign ggplot2 Hmisc memisc plyr reshape]; };
+  intsvy = derive2 { name="intsvy"; version="1.8"; sha256="0w8xyrmj35664pl9f9nmc2mqcds9l8g4y7nbjkmbqpx3nlfx5vxm"; depends=[foreign ggplot2 Hmisc memisc plyr reshape]; };
   invGauss = derive2 { name="invGauss"; version="1.1"; sha256="0l93pk2sh74dd6a6f3970nval5p29sz47ynzqnphx0wl3yfmmg9c"; depends=[optimx survival]; };
   invLT = derive2 { name="invLT"; version="0.2.1"; sha256="0dcr2cclgzkvsw1lysmjrkwgahas96rjc328yc7a1a56pf62kw2v"; depends=[]; };
   investr = derive2 { name="investr"; version="1.3.0"; sha256="057wq6c5r7hrg1nz7460alsjsk83cvac2d1d4mjjx160q3m0zcvj"; depends=[nlme]; };
@@ -4580,6 +4689,7 @@ in with self; {
   iotools = derive2 { name="iotools"; version="0.1-12"; sha256="1b2crnhx84h1gp10sy2mkhi9vylp9z97ld16jijddzlf4v23bmlx"; depends=[]; };
   ipdmeta = derive2 { name="ipdmeta"; version="2.4"; sha256="0k9wqpmrvqdh73brmdzv86a2dbyddjyyyqzqgp1vqb3k48k009s2"; depends=[nlme]; };
   ipdw = derive2 { name="ipdw"; version="0.2-3"; sha256="1l1wgxdfk9mw58i6h7b4dgi4aw2z9n5gzhb0yhzmrxgz2xb3rn7x"; depends=[gdistance raster sp]; };
+  ipflasso = derive2 { name="ipflasso"; version="0.1"; sha256="12cyn7wpkrjqrjccb26mi375ijqplps4216ldj7w3az9g8pzihv3"; depends=[glmnet survival]; };
   ipfp = derive2 { name="ipfp"; version="1.0"; sha256="1hpfbgygnpnl3fpx7zl728jyw00y3kbbc5f0d407phm56sfqmqwi"; depends=[]; };
   iplots = derive2 { name="iplots"; version="1.1-7"; sha256="052n8jdhj8gy72xlr23dwd5gqycqnph7s1djg1cdx2f05iy693y6"; depends=[png rJava]; };
   ipred = derive2 { name="ipred"; version="0.9-5"; sha256="193bdx5y4xlb5as5h59lkakrsp9m0xs5faqgrp3c85wfh0bn8iis"; depends=[class MASS nnet prodlim rpart survival]; };
@@ -4600,7 +4710,7 @@ in with self; {
   isocir = derive2 { name="isocir"; version="1.1-3"; sha256="1bx68n9wyfs2dcgph66rsy0jw8hjkl5kw212l0563kz3m1nik9sr"; depends=[circular combinat]; };
   isopam = derive2 { name="isopam"; version="0.9-13"; sha256="0y1yy0922kq5jxyc40gz8sk9vlzwfkfg5swmc6lk4007g9mgc8fm"; depends=[cluster vegan]; };
   isopat = derive2 { name="isopat"; version="1.0"; sha256="0fznvgycyd35dh7pbq1xhp667gsficlmycn5pcrqcbs89069xr1s"; depends=[]; };
-  isoph = derive2 { name="isoph"; version="0.4"; sha256="17f8pzjlk0n0br5qkkr0za139w8pm3bza6mdsgbd2q0g3g9s07yi"; depends=[Iso survival]; };
+  isoph = derive2 { name="isoph"; version="0.5"; sha256="1a3brp8w3xs3l25x1nn5213jj5mrzzfl4fm34l7ry97g4s9d8sh3"; depends=[Iso Rcpp survival]; };
   isotone = derive2 { name="isotone"; version="1.1-0"; sha256="0alk0cma5h3yn4w2nqcahprijsm89b0gby9najbngzi5vnxr6nvn"; depends=[nnls]; };
   isotonic_pen = derive2 { name="isotonic.pen"; version="1.0"; sha256="1lgw15df08f4dhrjjfr0jqkcvxwad92kflj2px526pcxwkj7cj3i"; depends=[coneproj Matrix]; };
   isva = derive2 { name="isva"; version="1.8"; sha256="09mrvvk09j460dzi45z8hwdpmibfshsii5dcp38g13czr40d48na"; depends=[fastICA qvalue]; };
@@ -4622,25 +4732,26 @@ in with self; {
   ivpanel = derive2 { name="ivpanel"; version="1.0"; sha256="0irjmkw3nnd8ssidvj23lr0hihlhd9acsbaznh88lknx53ijc2qv"; depends=[Formula]; };
   ivprobit = derive2 { name="ivprobit"; version="1.0"; sha256="1kijq7k6iv2ybaxb08kqzm2s2k6wp2z50r01kxcq023pmyfjczwy"; depends=[]; };
   jSonarR = derive2 { name="jSonarR"; version="1.1.1"; sha256="054q3ly471xa64yyz2as6vkr440ip1y8n5wl6s3zbhqy3bqkdqif"; depends=[jsonlite RCurl]; };
-  jaatha = derive2 { name="jaatha"; version="2.7.0"; sha256="1ibk84x38j03hbdrf9pi0bi025fxlk2ysqxmfrqiqr4zq2rzhbvp"; depends=[phyclust Rcpp reshape2]; };
+  jaatha = derive2 { name="jaatha"; version="3.0.0"; sha256="0l6amkcg8j7vpf7cv4rvp50163879rbqanp512yz80c0gyzcdm88"; depends=[assertthat R6]; };
   jackknifeKME = derive2 { name="jackknifeKME"; version="1.2"; sha256="0c5shl6s46kz7a623gccqk2plrrf2g29nwr6vbny6009pq3jvzam"; depends=[imputeYn]; };
-  jackstraw = derive2 { name="jackstraw"; version="1.0"; sha256="1irfzivy7c9fb2pr98flx05s5hkk6sid1hkd5b3k9m9mgs6ixbfy"; depends=[corpcor]; };
+  jackstraw = derive2 { name="jackstraw"; version="1.1"; sha256="0p79b8vgjspi3hjqqrhrfvf0k9rzg7ycn7azax3pk28j2cvi30j2"; depends=[corpcor lfa]; };
   jagsUI = derive2 { name="jagsUI"; version="1.3.7"; sha256="1zdrqxzjip4lgf99b4z76gvlhbmh0gcbkpghrlrj3j25wqzgn5y0"; depends=[coda lattice rjags]; };
   james_analysis = derive2 { name="james.analysis"; version="1.0.1"; sha256="1b2n4ds4ivfk564z87s2rxjl9j0y4drd3cmyv8jqpccmdvx1137d"; depends=[naturalsort rjson]; };
   jetset = derive2 { name="jetset"; version="3.1.3"; sha256="1m19p99ghh3rb0kgbwnyg0aaq011xcsrcf0llnbs9j5l2ziwvg4x"; depends=[AnnotationDbi]; };
-  jiebaR = derive2 { name="jiebaR"; version="0.6"; sha256="15synb7mxr9r7cf80jc4gflqxlg04dr81m5jplvrp9spsc45x5b1"; depends=[jiebaRD Rcpp]; };
+  jiebaR = derive2 { name="jiebaR"; version="0.7"; sha256="1pia3dv20fcw83rxmfr194h7nbnvrjsvxvcln3gr7ds2kzp97xjl"; depends=[jiebaRD Rcpp]; };
   jiebaRD = derive2 { name="jiebaRD"; version="0.1"; sha256="1wadpcdca4pm56r8q22y4axmqdbb2dazsh2vlhjy73rpymqfcph4"; depends=[]; };
+  jmcm = derive2 { name="jmcm"; version="0.1.1.0"; sha256="1mijj7c5n48jkka162rd2297gq8lijhrwg6r5wd1b7dq5r1ahgby"; depends=[Formula Rcpp RcppArmadillo]; };
   jmetrik = derive2 { name="jmetrik"; version="1.0"; sha256="0xnbvby03fqbxgg0i0qxrrzjv98783n6d7c1fywj81x487qlj77j"; depends=[]; };
-  jmotif = derive2 { name="jmotif"; version="1.0.1"; sha256="1wl8kvwayj91w4yymav41gcz839j98zhvml0qnm2zzvnzlzkshk1"; depends=[Rcpp]; };
+  jmotif = derive2 { name="jmotif"; version="1.0.2"; sha256="0m3zz0xr2f6y8igwcg8a3rbyl3a6m8viyp0pcjbdwyj2400dbf3m"; depends=[Rcpp RcppArmadillo]; };
   joineR = derive2 { name="joineR"; version="1.0-3"; sha256="0q98nswbxk5dz8sazzd66jhlg7hv5x7wyzcvjc6zkr6ffvrl8xj7"; depends=[boot gdata lattice MASS nlme statmod survival]; };
   joint_Cox = derive2 { name="joint.Cox"; version="2.3"; sha256="0rsnngfik3h7s3q431rbhz5r5md0sp5786626117nxqjm32jz7by"; depends=[]; };
   jointDiag = derive2 { name="jointDiag"; version="0.2"; sha256="0y1gzrc79vahfhn4jrj5xys8pmkzxj4by7361730gi347f0frs0a"; depends=[]; };
   jointPm = derive2 { name="jointPm"; version="2.3.1"; sha256="1c2cn9sqwfyv9ksd63w8rrz0kh18jm2wv2sfdkgncjb7vfs4hbv9"; depends=[]; };
-  jomo = derive2 { name="jomo"; version="1.2-3"; sha256="0y4wlkbcgmwyfssdsmzmwp72fx5x0qvgp8c8ws7094bnh39ydy51"; depends=[]; };
+  jomo = derive2 { name="jomo"; version="1.3-0"; sha256="00pxgyq9mhnl9rlb1y35d707va26vs1clv0s89z07bhm0ll4na3l"; depends=[]; };
   jpeg = derive2 { name="jpeg"; version="0.1-8"; sha256="05hawv5qcb82ljc1l2nchx1wah8mq2k2kfkhpzyww554ngzbwcnh"; depends=[]; };
   jrvFinance = derive2 { name="jrvFinance"; version="1.03"; sha256="16mki26ns593xn1p1la2ihkddlwvzwdvjr3h2vz71bq5db11iffq"; depends=[]; };
   js = derive2 { name="js"; version="0.2"; sha256="1dxyyrmwwq07l6pdqsvxscpciy4h1021h9ymx8hi2vqvv0mdrz76"; depends=[V8]; };
-  jsonlite = derive2 { name="jsonlite"; version="0.9.17"; sha256="07s11m8z43dh5pyci5rpjqj5js69q8prjar42qhhxbvdmcrjk4z7"; depends=[]; };
+  jsonlite = derive2 { name="jsonlite"; version="0.9.19"; sha256="1hbdraj3xv2l2gs9f205j8z054ycy0bfdvwdhvpa9qlji588sz7g"; depends=[]; };
   jtrans = derive2 { name="jtrans"; version="0.2.1"; sha256="18zggqdjzjhjwmsmdhl6kf35w9rdajpc2nffag4rs6134gn81i3m"; depends=[]; };
   jug = derive2 { name="jug"; version="0.1.1"; sha256="0dv6v8nxrbvlyhchzjq0m4x5v88ayrrw5xgrphx865ywsxllrb85"; depends=[base64enc httpuv infuser jsonlite magrittr mime R6 stringi]; };
   jvnVaR = derive2 { name="jvnVaR"; version="1.0"; sha256="0zh0dc6wqlrxn5r2yv9vkpyfb8xsbdidkjv9g6qr94fyxlbs4yci"; depends=[]; };
@@ -4649,13 +4760,14 @@ in with self; {
   kappalab = derive2 { name="kappalab"; version="0.4-7"; sha256="16bwbwwqmq2w7vy8p3wg0y80wfgc8q5l1ly1mqh51xi240z1qmq0"; depends=[kernlab lpSolve quadprog]; };
   kaps = derive2 { name="kaps"; version="1.0.2"; sha256="0jg4smbq51v88i3815icb284j97iam09pc52rv3izxa57nv9a0gz"; depends=[coin Formula survival]; };
   kcirt = derive2 { name="kcirt"; version="0.6.0"; sha256="1gm3c89i5dq7lj8khc12v30j1c0l1gwb4kv24cyy1yw6wg40sjig"; depends=[corpcor mvtnorm snowfall]; };
-  kdecopula = derive2 { name="kdecopula"; version="0.4.0"; sha256="1x2arqw7vyr2802zmfv8y59rzdqm0l886idc6drjqwsn815q6kjj"; depends=[cubature lattice locfit qrng Rcpp RcppArmadillo VineCopula]; };
+  kdecopula = derive2 { name="kdecopula"; version="0.4.1"; sha256="0ajbpgnfh8pf599vk05gnkfs0jbgqfkasrslf9cydcd8spb0zc7b"; depends=[cubature lattice locfit qrng Rcpp RcppArmadillo VineCopula]; };
   kdetrees = derive2 { name="kdetrees"; version="0.1.5"; sha256="1plf2yp2vl3r5znp5j92l6hx1kgj0pzs7ffqgvz2nap5nf1c6rdg"; depends=[ape distory ggplot2]; };
   kedd = derive2 { name="kedd"; version="1.0.3"; sha256="17rwz3yia95xccbxwn43wr6c9b3062094yfahnnnk3wfijyhlxiq"; depends=[]; };
+  keep = derive2 { name="keep"; version="1.0"; sha256="12803hhrs9v94rv6qaihk1f1ls7lx4cy2pa30v4p1r2z9afx9bjf"; depends=[]; };
   kelvin = derive2 { name="kelvin"; version="2.0-0"; sha256="04xdgpmysksm79m3vqmb4zra3pq09nv99w4fbdla1lmy7z8pkdrk"; depends=[Bessel]; };
-  kequate = derive2 { name="kequate"; version="1.4.0"; sha256="0vr45y4f6x3080pf3k53nifavf8mfhikz54nis66c53fs9rp0jwf"; depends=[equateIRT ltm]; };
+  kequate = derive2 { name="kequate"; version="1.5.0"; sha256="0yalh3j5kcz3zxk1afny7v22n7y5xzbifqifrr1sjm8czi8hdi01"; depends=[equateIRT ltm mirt]; };
   kerdiest = derive2 { name="kerdiest"; version="1.2"; sha256="16xj2br520ls8vw5qksxq9hqlpxlwmxccfk5balwgk5n2yhjs6r3"; depends=[chron date evir]; };
-  kergp = derive2 { name="kergp"; version="0.1.0"; sha256="00p3iziz6kjm1v7rpqa2lls1xgp2w3q754mj1x6bj24kx69xpc7g"; depends=[MASS numDeriv Rcpp testthat]; };
+  kergp = derive2 { name="kergp"; version="0.2.0"; sha256="1xamj19v84m1f9ls8ac8xbm6airyjf96i1l48yy4l2rvjdmx6m9l"; depends=[doParallel MASS numDeriv Rcpp testthat]; };
   kernDeepStackNet = derive2 { name="kernDeepStackNet"; version="1.0.0"; sha256="11nhjzr8n6ym98wfyn4l0pq71q1ylg4i93whd8pzbzniqgnjm2df"; depends=[DiceKriging glmnet globalOptTests lhs mvtnorm Rcpp RcppEigen]; };
   kerndwd = derive2 { name="kerndwd"; version="1.1.2"; sha256="1d55qrayay3d5p7lxj50mv1yj3l1xh10i3j937lmjn83ffhdq40a"; depends=[]; };
   kernelFactory = derive2 { name="kernelFactory"; version="0.3.0"; sha256="001kw9k3ivd4drd4mwqapkkk3f4jgljiaprhg2630hmll064s89j"; depends=[AUC genalg kernlab randomForest]; };
@@ -4687,17 +4799,18 @@ in with self; {
   knitLatex = derive2 { name="knitLatex"; version="0.9.0"; sha256="1igacc2sx8897wmnhh8kngd0fq6zqbi30chy5c8jw60zc38mi3wi"; depends=[knitr]; };
   knitcitations = derive2 { name="knitcitations"; version="1.0.7"; sha256="0sx7sxrmm9x01sh3bcp9qqpvljfss9f1hr6h4dcfns8x6f60s5v6"; depends=[digest httr RefManageR]; };
   knitr = derive2 { name="knitr"; version="1.11"; sha256="1ikjla0hnpjfkdbydqhhqypc0aiizbi4nyn8c694sdk9ca4jasdd"; depends=[digest evaluate formatR highr markdown stringr yaml]; };
-  knitrBootstrap = derive2 { name="knitrBootstrap"; version="0.9.0"; sha256="1cw5dvhjiypk6847qypxphfl9an54qjvd6qv029znhwijsg56mmg"; depends=[knitr markdown]; };
+  knitrBootstrap = derive2 { name="knitrBootstrap"; version="1.0.0"; sha256="0pshn2slzqwpryklslsxwh1dmqcnwv6bwi7yfm6m342wjybpk0wl"; depends=[knitr markdown rmarkdown]; };
   knnGarden = derive2 { name="knnGarden"; version="1.0.1"; sha256="1gmhgr42l6pvc6pzlq5khrlh080795b0v1l5xf956g2ckgk5r8m1"; depends=[cluster]; };
   knnIndep = derive2 { name="knnIndep"; version="2.0"; sha256="1fwkldgs2994svf3sj90pwsfx6r22cwwa22b30hdmd24l8v9kzn7"; depends=[]; };
   knncat = derive2 { name="knncat"; version="1.2.2"; sha256="1d392910y3yy46j8my1a7m0xkij2rc6vwq5fg22qk00vqli8drz2"; depends=[]; };
   knockoff = derive2 { name="knockoff"; version="0.2.1"; sha256="197icnyxxmi6f0v0p2zm4910grbgkfjkd3xql79ny04ik047v0kp"; depends=[glmnet RJSONIO]; };
   koRpus = derive2 { name="koRpus"; version="0.05-6"; sha256="00mvdk9akicvy61bx83iyfzaamwpsjk0w7xg6yg26581dbc7wif1"; depends=[]; };
   kobe = derive2 { name="kobe"; version="1.3.2"; sha256="1z64jwrq6ddpm22cvk2swmxl1j7qyz0ddk3880c7zfq6gk7f9bxl"; depends=[coda emdbook ggplot2 MASS plyr reshape]; };
-  kofnGA = derive2 { name="kofnGA"; version="1.1"; sha256="1ykk3rmyrv8c556rl3wp0i1d522dghaq4qk5acg06hhk9j9962fg"; depends=[]; };
+  kofnGA = derive2 { name="kofnGA"; version="1.2"; sha256="1j4gx6pkmasgbgcdlg6i5nzfrmim61c2hw34k5zfmwfbkrsgb575"; depends=[]; };
   kohonen = derive2 { name="kohonen"; version="2.0.19"; sha256="0fi94m2gpknzk31q3mjkplrq9qwac8bjc8hdlb3zxvz6rabbhxrr"; depends=[class MASS]; };
   kolmim = derive2 { name="kolmim"; version="1.0"; sha256="0g1i0cazi4nhfwdd3ywqrar1sn7bw77w38qjii045w5vqg05srkp"; depends=[]; };
   kpodclustr = derive2 { name="kpodclustr"; version="1.0"; sha256="1fywgdj4q3kg8y9lwnj6vxg9cwgs5ccwj6m3knfgg92f8ghnsbsw"; depends=[clues]; };
+  kriens = derive2 { name="kriens"; version="0.1"; sha256="1qi65k9fsbbkbw0w40rv60p5ygrvr10rmlyxdaqa5bdpcmrbly5z"; depends=[]; };
   kriging = derive2 { name="kriging"; version="1.1"; sha256="04bxr34grf2nlrwvgrlh84pz7yi0r8y7dc2wk0v5h5z6yf5a085w"; depends=[]; };
   krm = derive2 { name="krm"; version="2015.3-4"; sha256="0zm2d3naprvv10ac28k4h2r6f1ygi8wic0gwbm6mvgwpb530gga1"; depends=[kyotil]; };
   ks = derive2 { name="ks"; version="1.10.0"; sha256="0gxcpcmmraag19z3czb4rhan561hmmmpj9lg3nda1w88wkb5pzn0"; depends=[KernSmooth misc3d multicool mvtnorm rgl]; };
@@ -4725,7 +4838,7 @@ in with self; {
   laercio = derive2 { name="laercio"; version="1.0-1"; sha256="0la6fxv5k9zq4pyn8dxjiayx3vs9ksm9c6qg4mnyr9vs12z53imm"; depends=[]; };
   lakemorpho = derive2 { name="lakemorpho"; version="1.0"; sha256="0kxd493cccs24qqyw58110d2v5w8560qfnbm6qz7aki0xa7kaqrg"; depends=[geosphere maptools raster rgdal rgeos sp]; };
   laketemps = derive2 { name="laketemps"; version="0.5.1"; sha256="04742r379bzgbfr4243wwkb26cvfmnw50jzgygq7vblq00grzska"; depends=[dplyr reshape2]; };
-  lamW = derive2 { name="lamW"; version="0.1-2"; sha256="0q72xnv22w9maar4k21fy9km8yqqpf6z65rhjj21qb7r3mxgfcc5"; depends=[Rcpp]; };
+  lamW = derive2 { name="lamW"; version="1.0.0"; sha256="1lxh5pjq6g6msrw2r6c97g4fh1gkyakijnxqmr6nwq9rjbf3d21w"; depends=[Rcpp]; };
   lambda_r = derive2 { name="lambda.r"; version="1.1.7"; sha256="1lxzrwyminc3dfb07pbn1rmj45kplxgsb17b06pzflj728knbqwa"; depends=[]; };
   lambda_tools = derive2 { name="lambda.tools"; version="1.0.7"; sha256="1hskmsd51lvfc634r6bb23vfz1vdkpbs9zac3a022cgqvhvnbmxb"; depends=[lambda_r]; };
   landest = derive2 { name="landest"; version="1.0"; sha256="1lp5sfqk0n7i23fmwjgzsabml1fsji1h9xq5khxzaz1bzqv1s08g"; depends=[survival]; };
@@ -4742,7 +4855,7 @@ in with self; {
   lasvmR = derive2 { name="lasvmR"; version="0.1.2"; sha256="1yzyfacr47wkpv9bblm7hvx1hgnzbhy1421bpnh95xfxxlzahy5n"; depends=[checkmate Rcpp]; };
   latdiag = derive2 { name="latdiag"; version="0.2-1"; sha256="1xjy6as3wjrl2y1lc5fgrbhqqcvrhdan89mpgvk9cpx71wxv95vc"; depends=[]; };
   latentnet = derive2 { name="latentnet"; version="2.7.1"; sha256="0bjac9cid11pmhmi2gb4h3p4h9m57ngxx7p73a07afmfjk9p7h5m"; depends=[abind coda ergm mvtnorm network sna statnet_common]; };
-  latex2exp = derive2 { name="latex2exp"; version="0.3.3"; sha256="1r69c6057i7lq4zrqdz1bwaay77dmzhf5zfvhxmzd1plbjg78297"; depends=[magrittr stringr]; };
+  latex2exp = derive2 { name="latex2exp"; version="0.4.0"; sha256="12nbcgfmv13k6sc6m326ras9bcvy380b7rxcxphn06r3cfkby0zw"; depends=[magrittr stringr]; };
   lattice = derive2 { name="lattice"; version="0.20-33"; sha256="0car12x5vl9k180i9pc86lq3cvwqakdpqn3lgdf98k9n2h52cilg"; depends=[]; };
   latticeDensity = derive2 { name="latticeDensity"; version="1.0.7"; sha256="1y33p8hfmpzn8zl4a6zxg1q3zx912nhqlilca6kl5q156zi0sv3d"; depends=[spam spatstat spdep splancs]; };
   latticeExtra = derive2 { name="latticeExtra"; version="0.6-26"; sha256="16x00sg76mga8p5q5ybaxs34q0ibml8wq91822faj5fmg7r1050d"; depends=[lattice RColorBrewer]; };
@@ -4762,9 +4875,9 @@ in with self; {
   lbiassurv = derive2 { name="lbiassurv"; version="1.1"; sha256="1i6l3y4rasqpqka7j39qjx22wjbilgc9pkp05an52aysfvfxy193"; depends=[actuar]; };
   lcd = derive2 { name="lcd"; version="0.7-3"; sha256="1jnnw15d4s8yb5z5jnzvmlrxv5x6n3h7wcdiz2nw4vfiqncnpwx4"; depends=[ggm igraph MASS]; };
   lcda = derive2 { name="lcda"; version="0.3"; sha256="1ximsyn6qw2gfn7b1hdpbjs6h6nk7hrignlii0np1lbf0k8l4xxl"; depends=[poLCA]; };
-  lcmm = derive2 { name="lcmm"; version="1.7.3.0"; sha256="1i4hqfhrdjkia7s0jmzv9zkmwwacbj73cryzyvdav1vd2g7fbb1d"; depends=[survival]; };
+  lcmm = derive2 { name="lcmm"; version="1.7.4"; sha256="0cy2kmkyi85vkl20x1qssadpgixhfrsawqkhhfjfyxzcx7ja4wic"; depends=[survival]; };
   lcopula = derive2 { name="lcopula"; version="0.205"; sha256="0ni8q5cdzrkcjxjj1z6kyzd0sp592vnrh3yxnwh2vl9wc41v59i9"; depends=[copula pcaPP Rcpp]; };
-  lctools = derive2 { name="lctools"; version="0.2-3"; sha256="167905fimgslx9rkvwqfr905cm5w88pzii847g9j0bwfgkm2m4rp"; depends=[reshape weights]; };
+  lctools = derive2 { name="lctools"; version="0.2-4"; sha256="0sfb26j0mgnnzql2ylj2d3cll67j7axyr1n20sv3zgx7nblkzkjj"; depends=[MASS pscl reshape weights]; };
   lda = derive2 { name="lda"; version="1.4.2"; sha256="03r4h5kgr8mfy44p66mfj5bp4k00g8zh4a1mhn46jw14pkhs21jn"; depends=[]; };
   ldamatch = derive2 { name="ldamatch"; version="0.6.3"; sha256="0pq62rsbvhn506n1qz8nvyl0lfkqyl80k6jq2g5c4iqf8vpcjasz"; depends=[data_table entropy foreach iterators iterpc kSamples MASS RUnit]; };
   ldatuning = derive2 { name="ldatuning"; version="0.1.0"; sha256="04313zyz5mk652hb7vqklg8ibdgf41bcr85whc2rfcxfwq0jpwpi"; depends=[ggplot2 reshape2 Rmpfr scales slam topicmodels]; };
@@ -4781,9 +4894,9 @@ in with self; {
   learnstats = derive2 { name="learnstats"; version="0.1.1"; sha256="1sa064cr7ykl4s1ssdfmb3v1sjrnkbwdh04hmwwd9b3x0llsi9vv"; depends=[ggplot2 Rcmdr shiny]; };
   lefse = derive2 { name="lefse"; version="0.1"; sha256="1zdmjxr5xa5p3miw79mhsswsh289hgzfmn3mpj1lyzal1qgw1h5m"; depends=[ape fBasics geiger picante SDMTools vegan]; };
   leiv = derive2 { name="leiv"; version="2.0-7"; sha256="15ay50886xx9k298npyksfpva8pck7fhqa40h9n3d7fzvqm5h1jp"; depends=[]; };
-  lessR = derive2 { name="lessR"; version="3.3.6"; sha256="0ly1y99mdj6l4zrakqxd4shpyy2ylh83r5jzscy4wxir2z2ymswd"; depends=[foreign gdata leaps MBESS sas7bdat triangle]; };
+  lessR = derive2 { name="lessR"; version="3.4"; sha256="0r7zjnhy95cb9dwqy0zldny8sra1gbmwmskbkdjkcvlvxdxk5c4w"; depends=[ellipse foreign leaps MBESS readxl sas7bdat triangle]; };
   lestat = derive2 { name="lestat"; version="1.8"; sha256="12w3s5yr9lsnjkr3nsay5sm4p241y4xz0s3ir56kxjqw23g6m80v"; depends=[MASS]; };
-  letsR = derive2 { name="letsR"; version="2.3"; sha256="0aykl3lmfkcsjhlax2xm1i79jkwcnjs2a50yhcrg5vfvivi90w6n"; depends=[fields geosphere maps maptools raster rgdal rgeos sp XML]; };
+  letsR = derive2 { name="letsR"; version="2.4"; sha256="12jazq54rn1mxh7ff7hd88mqwn0n85dn0mhdbli81sr4kdnd37sl"; depends=[fields geosphere maps maptools raster rgdal rgeos sp XML]; };
   lfactors = derive2 { name="lfactors"; version="0.5.3"; sha256="0bj67rk7z4is84qd08h1x3b7mna3n5l9qbgpi6gzpppqxc3jd64a"; depends=[]; };
   lfda = derive2 { name="lfda"; version="1.1.0"; sha256="09a4ccrdcfiv390qkwllkj192lbziv4sb437v2lbh39yn10fi48z"; depends=[plyr rARPACK rgl]; };
   lfe = derive2 { name="lfe"; version="2.4-1788"; sha256="1f4b8s7n40j23hab4jn6crrwagwj68vb7c31k68i748zwwnf0xjc"; depends=[Formula Matrix sandwich xtable]; };
@@ -4794,14 +4907,14 @@ in with self; {
   lgcp = derive2 { name="lgcp"; version="1.3-13"; sha256="0f3vjad9hh7gzvcrps2jvfrj96xj2dw3cx9yvp9ynifpqhy7cy4v"; depends=[fields iterators maptools Matrix ncdf RandomFields raster rgeos rpanel sp spatstat]; };
   lgtdl = derive2 { name="lgtdl"; version="1.1.3"; sha256="00lffc60aq1qjyy66nygaypdky9rypy607mr8brwimjn8k1f0gx4"; depends=[]; };
   lhs = derive2 { name="lhs"; version="0.10"; sha256="1hc23g04b6nsg8xffkscwsq2mr725r6s296iqll887b3mnm3xaqz"; depends=[]; };
-  libamtrack = derive2 { name="libamtrack"; version="0.6.2"; sha256="1wmy3baqbmmzc4w1b3w2z3qvsi61khl6a6rlc22i58gnprmgzrph"; depends=[]; };
+  libamtrack = derive2 { name="libamtrack"; version="0.6.3"; sha256="0pdwrz19q1yls0rgr4579f31j86awizx3j31h7vdh6y70ngpmb82"; depends=[]; };
   lifecontingencies = derive2 { name="lifecontingencies"; version="1.1.10"; sha256="1j1m5s8bsxl21rjy3jy12babd69kkd1c4awpi14wh09w45d3pvfr"; depends=[markovchain Rcpp]; };
   lift = derive2 { name="lift"; version="0.0.2"; sha256="0ynsyl6lw7z7bvwzk2idgxzzqji5ffnnc3bll9h4gwdw666g7fln"; depends=[]; };
   liftr = derive2 { name="liftr"; version="0.3"; sha256="0piy10syyli14xd71ynlxxsdfhs7i531kymvw2psz0ridv7ang1j"; depends=[knitr rmarkdown stringr yaml]; };
-  likeLTD = derive2 { name="likeLTD"; version="5.5.0"; sha256="111wdszkk2bdi9sz6gfih32kib0ig9bp4xlq6wl5r5zx3nrlj5zb"; depends=[DEoptim gdata ggplot2 gtools rtf]; };
+  likeLTD = derive2 { name="likeLTD"; version="6.0.1"; sha256="019p69gy4nxqcpvr7z1ffk9dpjmqfpmfc58slbcwp58qwd89yvh5"; depends=[DEoptim gdata ggplot2 gtools rtf]; };
   likelihood = derive2 { name="likelihood"; version="1.7"; sha256="0q8lvwzlniijyzsznb3ys4mv1cqy7ibj9nc3wgyb4rf8676k4f8v"; depends=[nlme]; };
   likelihoodAsy = derive2 { name="likelihoodAsy"; version="0.40"; sha256="1zgqs9pcsb45s414kqbhvsb9cxag0imla682981lqvrbli13p2kg"; depends=[alabama cond nleqslv pracma Rsolnp]; };
-  likert = derive2 { name="likert"; version="1.3.1"; sha256="15mhvkr424rzrjs1q8wnr8hbczkyrjhm26p625kmy1g0yahfcykj"; depends=[ggplot2 gridExtra psych reshape reshape2 xtable]; };
+  likert = derive2 { name="likert"; version="1.3.3"; sha256="0vdm0ggki9lyxm7b477v1ja23d73p7iys3as98vjwymgkakrbb8b"; depends=[ggplot2 gridExtra plyr psych reshape2 xtable]; };
   limSolve = derive2 { name="limSolve"; version="1.5.5.1"; sha256="0anrbhw07mird9fj96x1p0gynjnjcj07gpwlq0ffjlqq2qmkzgqs"; depends=[lpSolve MASS quadprog]; };
   limitplot = derive2 { name="limitplot"; version="1.2"; sha256="0wj1xalm80fa5pvjwh2zf5hpvxa3r1hnkh2z9z285wkbrcl0qfl2"; depends=[]; };
   linLIR = derive2 { name="linLIR"; version="1.1"; sha256="1v5bwki5j567x2kndfd5nli5i093a33in31025h9hsvkbal1dxgp"; depends=[]; };
@@ -4819,9 +4932,9 @@ in with self; {
   lisrelToR = derive2 { name="lisrelToR"; version="0.1.4"; sha256="0zicq0z3hhixan1p1apybnf3v5s6v6ysll4pcz8ivygwr2swv3p5"; depends=[]; };
   list = derive2 { name="list"; version="8.0"; sha256="09qpcsygs2clbgd42v6klgh1vjhv64s56ixxqlcpg9v7xqnms56j"; depends=[coda corpcor gamlss_dist magic MASS mvtnorm quadprog sandwich VGAM]; };
   listWithDefaults = derive2 { name="listWithDefaults"; version="1.0.0"; sha256="1l7q5v7nf2z1six66lvqflnc77q0f7n1acdbmla695myv246aj6d"; depends=[assertthat]; };
-  listenv = derive2 { name="listenv"; version="0.5.0"; sha256="05bfcn1084gb607613vb450dk9bn7vfxyfvyqxpxbwrzf9w9v4bz"; depends=[]; };
+  listenv = derive2 { name="listenv"; version="0.6.0"; sha256="0kyq90mf7wv9qgw3s81iv0b8ah0ncc5kv15r7fv6ggdq4f0z0dx7"; depends=[]; };
   littler = derive2 { name="littler"; version="0.3.0"; sha256="1n3kmfl4kazab0yxwgdri24179w6pbkx96pgn8j3alj6ixrn5wdy"; depends=[]; };
-  llama = derive2 { name="llama"; version="0.9"; sha256="09wi6arhwrsprx4qjfjqkm8pnd3ly6xdkbi21yfaq8g4ap3nr6yv"; depends=[BBmisc checkmate ggplot2 mlr parallelMap plyr rJava]; };
+  llama = derive2 { name="llama"; version="0.9.1"; sha256="1cvm58kivjw77a2fy1jwsajzl1d0i3i123p6glpwdlqn6rlharck"; depends=[BBmisc checkmate ggplot2 mlr parallelMap plyr rJava]; };
   lle = derive2 { name="lle"; version="1.1"; sha256="09wq7mzw48czp5k0b4ij399cflc1jz876fqv0mfvlrydc9igmjhk"; depends=[MASS scatterplot3d snowfall]; };
   lllcrc = derive2 { name="lllcrc"; version="1.2"; sha256="06n1fcd3g3z5rl2cyx8jhyscq9fb52mmh0cxg81cnbmai3sliccb"; depends=[combinat data_table plyr VGAM]; };
   lm_beta = derive2 { name="lm.beta"; version="1.5-1"; sha256="0p224y9pm72brbcq8y1agkcwc82j7clsnszqzl1qsc0gw0bx9id3"; depends=[]; };
@@ -4854,7 +4967,7 @@ in with self; {
   locfit = derive2 { name="locfit"; version="1.5-9.1"; sha256="0lafrmq1q7x026m92h01hc9cjjiximqqi3v1g2hw7ai9vf7i897m"; depends=[lattice]; };
   locits = derive2 { name="locits"; version="1.4"; sha256="1q9vsf5h4n7r4gy1dwdhfyq3n0rn33akb3nx6yzinncj4w4cqq0h"; depends=[igraph wavethresh]; };
   locpol = derive2 { name="locpol"; version="0.6-0"; sha256="1zpdh3g7yx3rcn3rhlc3dm19c4b9kx2k8wy8vkwh744a1kysvdga"; depends=[]; };
-  lodGWAS = derive2 { name="lodGWAS"; version="1.0-6"; sha256="0m13m41f7dgjd94lmdxcj7lllv9p2ld73akd9ngjqcipgywx4796"; depends=[rms survival]; };
+  lodGWAS = derive2 { name="lodGWAS"; version="1.0-7"; sha256="0g5b44d3wb5hnx5l2n76myb1pc9ml3a052n1a4gvgqapa5as35s2"; depends=[rms survival]; };
   log4r = derive2 { name="log4r"; version="0.2"; sha256="07q8m7z2sxm6n25a62invf76qakxdsijfh3272spc8xrmdmyw6rj"; depends=[]; };
   logbin = derive2 { name="logbin"; version="1.2"; sha256="1jfkg5rx51hm2skwwafqiw6ajdijdm0cniral3j5flidinsbsbcm"; depends=[glm2]; };
   logconPH = derive2 { name="logconPH"; version="1.5"; sha256="05fkibgh5nzs8c4f39kzg4zyh2dfhg1k69hlx7l8p442snajsg92"; depends=[]; };
@@ -4879,7 +4992,7 @@ in with self; {
   longmemo = derive2 { name="longmemo"; version="1.0-0"; sha256="1jnck5nfwxywj74awl4s9i9jn431655mmi85g0nfbg4y71aprzdc"; depends=[]; };
   longpower = derive2 { name="longpower"; version="1.0-11"; sha256="1l1icy653d67wlvigcya8glhqh2746cr1vh1khx36qjhfjz6wgyf"; depends=[lme4 Matrix nlme]; };
   longurl = derive2 { name="longurl"; version="0.1.1"; sha256="06xyxn641nsw3zl2mllsvm1r4g82ddnc3vvscp6bdw8l7a13w4a5"; depends=[dplyr httr pbapply]; };
-  loo = derive2 { name="loo"; version="0.1.3"; sha256="0dgxzzy8m3jfb8jz3vqbmz8701nqsmhc40aqzcfpv5zndjhz6ya5"; depends=[matrixStats]; };
+  loo = derive2 { name="loo"; version="0.1.4"; sha256="1gjn2l5wyz92r7rsa63fh6xw55vs64l1lpjwsg1rhg4cq10mqrwn"; depends=[matrixStats]; };
   lookupTable = derive2 { name="lookupTable"; version="0.1"; sha256="0ipy0glrad2gfr75kd8p3999xnfw4pgpbg6p064qa8ljqg0n1s49"; depends=[data_table dplyr]; };
   loop = derive2 { name="loop"; version="1.1"; sha256="1gr257fm92rfh1sdhsb4hy0fzwjkwvwm3v85302gzn02f86qr5dm"; depends=[MASS]; };
   loopr = derive2 { name="loopr"; version="1.0.1"; sha256="1qzfjv15ymk8mnvb556g2bfk64jpl0qcvh4bm3wihplr1whrwq6y"; depends=[dplyr lazyeval magrittr plyr R6]; };
@@ -4895,7 +5008,7 @@ in with self; {
   lpridge = derive2 { name="lpridge"; version="1.0-7"; sha256="0nkl70fwzra308bzlhjfpkxr8hpd8v1xdnah7nscxa10qlisgr2k"; depends=[]; };
   lqa = derive2 { name="lqa"; version="1.0-3"; sha256="141r2cd9kybi6n9jbdsvhza8jdxxqch4z3qizvpazjy8qifng29q"; depends=[]; };
   lqmm = derive2 { name="lqmm"; version="1.5.2"; sha256="155nqxbc78kls5y5f1890v30djsm2agb2k5i6znn6a61z6a5mn07"; depends=[nlme SparseGrid]; };
-  lqr = derive2 { name="lqr"; version="1.0"; sha256="06dp38x46jkmij3i80bkk2gz207j1x7fpq0jnh12f7513mm06s2w"; depends=[ghyp spatstat]; };
+  lqr = derive2 { name="lqr"; version="1.1"; sha256="1ljxvq6vbqzb8p6krv0k2d4fjv7y0l7m5dvbzw6rg82zfa66mlhk"; depends=[ghyp spatstat]; };
   lrgs = derive2 { name="lrgs"; version="0.4.2"; sha256="04blq49sxc0shny0yfv19az66k8xb8bwdqznqajzr3cbsnpvh5bk"; depends=[mvtnorm]; };
   lrmest = derive2 { name="lrmest"; version="1.0"; sha256="1gdj8pmmzvs1li05pwhad63blhibq45xd1acajxsx06k7k21ajs7"; depends=[MASS]; };
   lsa = derive2 { name="lsa"; version="0.73.1"; sha256="1af8s32hkri1hpngl9skd6s5x6vb8nqzgnkv0s38yvgsja4xm1g5"; depends=[SnowballC]; };
@@ -4904,22 +5017,23 @@ in with self; {
   lsei = derive2 { name="lsei"; version="1.1-1"; sha256="1akvkccf2cq331agcsi24x3cw73cc8vdl7kw3zjyg8q6lmvq78am"; depends=[]; };
   lsgl = derive2 { name="lsgl"; version="1.2.0"; sha256="18dmm6slf0ilikz9hr3j8p554h5w9jaypfdmva7d2s0mhlv6nx5y"; depends=[BH Matrix Rcpp RcppArmadillo RcppProgress sglOptim]; };
   lshorth = derive2 { name="lshorth"; version="0.1-6"; sha256="0nbjakx0zx4fg09fv26pr9dlrbvb7ybi6swg84m2kwjky8399vvx"; depends=[]; };
-  lsl = derive2 { name="lsl"; version="0.5.0"; sha256="1656bv7j1312m2yq9q7dvxqh4z9i9j50pl07spfa6z5waiy3xda6"; depends=[ggplot2 reshape2]; };
-  lsmeans = derive2 { name="lsmeans"; version="2.20-23"; sha256="0wp394gfp366y3qkp5gpw7vibhq9br3h6jz47g8vc5ii95shky03"; depends=[coda estimability multcomp mvtnorm nlme plyr]; };
+  lsl = derive2 { name="lsl"; version="0.5.1"; sha256="0y6lqmjiah33j66hxwxx9b6qx42sv0bqqgic39nkil1zppkk3b4h"; depends=[ggplot2 reshape2]; };
+  lsmeans = derive2 { name="lsmeans"; version="2.21-1"; sha256="0g6ypk2krg2hia6wsdk6ixz7cknb3fdric7ssqdrb2dlv9lv5ivq"; depends=[coda estimability multcomp mvtnorm nlme plyr]; };
   lspls = derive2 { name="lspls"; version="0.2-1"; sha256="1g27fqhnx9db0zrxbhqr76agvxy8a5fx1bfy58j2ni76pki1y4rl"; depends=[pls]; };
   lsr = derive2 { name="lsr"; version="0.5"; sha256="0q385a3q19i8462lm9fx2bw779n4n8azra5ydrzw59zilprhn03f"; depends=[]; };
   lss = derive2 { name="lss"; version="0.52"; sha256="1fvs8p9rhx81xfn450smnd0i1ym06ar6nwwcpl74a66pfi9a5sbp"; depends=[quantreg]; };
   ltbayes = derive2 { name="ltbayes"; version="0.3"; sha256="1b35bwli08yzgv3idg86wz8fzpx7r5sx0ryr950rdh0n2jdml09q"; depends=[mcmc MHadaptive numDeriv]; };
   ltm = derive2 { name="ltm"; version="1.0-0"; sha256="1igkgb0jy3mzlnp9s6avhcpplwijz5g3x26a3lavyy3d9fjpmfpa"; depends=[MASS msm polycor]; };
   ltmle = derive2 { name="ltmle"; version="0.9-6"; sha256="0q65ha7j3q9myhsafcmjwyxjf486xw4c3d17gpdnsvq4zqgfsy16"; depends=[Matrix]; };
-  ltsa = derive2 { name="ltsa"; version="1.4.5"; sha256="1kdc7xs0y3r61fhc2yzx4kkijcbf9f5jhnf9grlmlhbiqnhrlzdb"; depends=[]; };
+  ltsa = derive2 { name="ltsa"; version="1.4.6"; sha256="10wmw9r00400ng2zlysd8jqgypjclshxj83x32002j2a9cz4f186"; depends=[]; };
   ltsbase = derive2 { name="ltsbase"; version="1.0.1"; sha256="16p5ln9ak3h7h0icv5jfi0a3fbw5wdqs3si69sjbn8f5qs2hz7yp"; depends=[MASS robustbase]; };
   ltsk = derive2 { name="ltsk"; version="1.0.4"; sha256="1p026ryq31iw7d8mbi4m2q43g5frj47387w8g46j50bcv11hh2zm"; depends=[fields gstat sp]; };
-  lubridate = derive2 { name="lubridate"; version="1.3.3"; sha256="1f07z3f90vbghsarwjzn2nj6qz8qyfkqalszx8cb5kliijdkwy8z"; depends=[memoise plyr stringr]; };
+  lubridate = derive2 { name="lubridate"; version="1.5.0"; sha256="12x286z8m4rqwvsf0gkbkyzw2znj560xsxbczfz9qxz7k26jp640"; depends=[stringr]; };
   luca = derive2 { name="luca"; version="1.0-5"; sha256="1jiqwibkrgga4ahz0qgpfkvrsxjqc55i2nwnm60xddb8hpb6a6qx"; depends=[genetics survival]; };
   lucid = derive2 { name="lucid"; version="1.3"; sha256="018vp4xibxr7aanffcvhmppsh7vjsjrqqc41iavyasjbamj3hyck"; depends=[nlme]; };
   lucr = derive2 { name="lucr"; version="0.1.1"; sha256="0igh1wfdl67yincqj284h6kkpp1d9vmv1a4ljkd98vlshwfyi74f"; depends=[httr Rcpp]; };
   lulcc = derive2 { name="lulcc"; version="1.0.1"; sha256="1xq4rjsds9vwj4prkjxfcp9sv53ha9pj65ns0frpbh8grvrjwimv"; depends=[lattice raster rasterVis ROCR]; };
+  lumendb = derive2 { name="lumendb"; version="0.2.0"; sha256="0j0bcg0nrp6ckd2vr81jqx9k8q6fsnfpi3n1c5nyjasspb746q2i"; depends=[httr]; };
   lunar = derive2 { name="lunar"; version="0.1-04"; sha256="0nkzy6sf40hxkvsnkzmqxk4sfb3nk7ay4rjdnwf2zym30qax74kk"; depends=[]; };
   luzlogr = derive2 { name="luzlogr"; version="0.1.1"; sha256="14fk5d3fwyzg1ba0k24cmbcmdg13qf6m0rghpsgrzy7478pn3jjr"; depends=[assertthat]; };
   lvm4net = derive2 { name="lvm4net"; version="0.2"; sha256="0al0answp3rngq69bl3ch6ylil22wdp1c047yi5gbga853p7db0c"; depends=[ellipse ergm igraph MASS network]; };
@@ -4927,6 +5041,7 @@ in with self; {
   lymphclon = derive2 { name="lymphclon"; version="1.3.0"; sha256="1jns41sk2rx1j3mg06dzy434k30gpfhbkn6s47fmyv1y8701vfl0"; depends=[corpcor expm MASS]; };
   m4fe = derive2 { name="m4fe"; version="0.1"; sha256="06lh45591z2lc6lw91vyn066x0m1zwxxfp6nbirp1rz901v843ph"; depends=[]; };
   mAr = derive2 { name="mAr"; version="1.1-2"; sha256="0i9zp8n8i3fxldgvwj045scss533zsv8p476lsla294gp174njr7"; depends=[MASS]; };
+  mBvs = derive2 { name="mBvs"; version="1.0"; sha256="0qq6yaqvpg3akwbbaamv1a5rsrwdsq5z161w0prvq8qcbyfwclni"; depends=[]; };
   mFilter = derive2 { name="mFilter"; version="0.1-3"; sha256="1cz9d8447iiy7sq47civ1lcjafqdqs40lzxm2a4alw4wy57hc2h6"; depends=[]; };
   mGSZ = derive2 { name="mGSZ"; version="1.0"; sha256="08l98i75h2h8kx9ksvzp5qr8jhf0l6n4j7rg8fcn7hk8chn8v5zh"; depends=[Biobase GSA ismev limma MASS]; };
   mHG = derive2 { name="mHG"; version="1.0"; sha256="18hj9chp9dy6nmi5w0808nivqbyni117darvdpf03kzq5ym8dlm6"; depends=[]; };
@@ -4938,6 +5053,8 @@ in with self; {
   maSAE = derive2 { name="maSAE"; version="0.1-3"; sha256="1im837kdmpgk1073iqgqz194b1i005i88w7wl50hdgw07hizlk18"; depends=[]; };
   maboost = derive2 { name="maboost"; version="1.0-0"; sha256="18d36cgvn8p75nidfr6al458jbzwc1i7x77y1ks50y9phrz3wf65"; depends=[C50 rpart]; };
   mada = derive2 { name="mada"; version="0.5.7"; sha256="0a2m1rb4d143v9732392xzvbg6x1k3l0g3zscgbx64m21kxshmgb"; depends=[ellipse mvmeta mvtnorm]; };
+  maddison = derive2 { name="maddison"; version="0.1"; sha256="1ji51wnj0ybjd30b4bwn5npyswrmcfrbxcmdlngwzvca1knh8g1c"; depends=[]; };
+  madness = derive2 { name="madness"; version="0.1.0"; sha256="1pdh5wz61w2vb0cbxjhzs3nqhnyfz78ni8cz5hnabx27nx11dwbq"; depends=[expm matrixcalc]; };
   mads = derive2 { name="mads"; version="0.1.3"; sha256="1nq17r9k2wg9v5nis0c0z4qf5pcmw93smxf7lra7vsiqgzgzhaad"; depends=[mrds]; };
   madsim = derive2 { name="madsim"; version="1.1"; sha256="1d9mv769zia43krdfl43hp22cp5mdi3ycwj3kxyfcjrg23bjnyc0"; depends=[]; };
   magclass = derive2 { name="magclass"; version="3.74"; sha256="0ikhh50k4i9d4h36yq0ccps4smqr0igrgxzfy23rg57dwcfzz3yz"; depends=[abind maptools ncdf4 reshape2 sp]; };
@@ -4949,29 +5066,31 @@ in with self; {
   makeProject = derive2 { name="makeProject"; version="1.0"; sha256="09q8xa5j4s5spgzzr3y06l3xis93lqxlx0q66s2nczrhd8nrz3ca"; depends=[]; };
   mallet = derive2 { name="mallet"; version="1.0"; sha256="06rksf5nvxp4sizgya7h4sb6fgw3yz212a01dqmc9p5a5wqi76x0"; depends=[rJava]; };
   managelocalrepo = derive2 { name="managelocalrepo"; version="0.1.5"; sha256="180b7ikas1kb7phm4l2z1d8wi45wi0qyz2c8rl8ml3f71b4mlzgc"; depends=[assertthat stringr]; };
+  mangoTraining = derive2 { name="mangoTraining"; version="1.0-6"; sha256="1g5qwc09whrsxlp2wvgx79p5mrjw5jj0q0k1bv08pq31djr7c3r3"; depends=[]; };
   manifestoR = derive2 { name="manifestoR"; version="1.1-1"; sha256="1g5p7zimj64hfcfkqxap4xhqicz8k5jg9x5ag4inq30qz3cqypf8"; depends=[dplyr functional httr jsonlite NLP psych tm zoo]; };
   manipulate = derive2 { name="manipulate"; version="1.0.1"; sha256="1klknqdfppi5lf6zbda3r2aqzsghabcsaxmvd3vw3cy3aa984zky"; depends=[]; };
   mapDK = derive2 { name="mapDK"; version="0.3.0"; sha256="03ksg47caxx3y97p3nsflwpc7i788jw874cixr9gjz756avwkmwp"; depends=[ggplot2 stringi]; };
   mapStats = derive2 { name="mapStats"; version="2.4"; sha256="18pp1sb9p4p300ffvmzjrg5bv1i7f78mhpggq83myc26c3a593na"; depends=[classInt colorspace Hmisc lattice maptools RColorBrewer reshape2 sp survey]; };
   mapdata = derive2 { name="mapdata"; version="2.2-5"; sha256="0pl4k7lxmyg96h2i8mwdqgwq5ff1v08g54dig5zmqn9wi71y6nl9"; depends=[maps]; };
   mapfit = derive2 { name="mapfit"; version="0.9.7"; sha256="16a318bz3my27qj0xzf40g0q4bh9alg2bm6c8jbwgswf1paq1xmx"; depends=[Matrix]; };
-  mapmisc = derive2 { name="mapmisc"; version="1.4.0"; sha256="1lk1zzz00aaxxdgz6k4zci9raaa264z13bs4sdsq42fg91d8j86y"; depends=[raster sp]; };
+  mapmisc = derive2 { name="mapmisc"; version="1.4.6"; sha256="00v7jwjvw942xr1bd05n8i3abbzbcnbjzpm3mxb2sh32s4w1hifj"; depends=[raster sp]; };
   mapplots = derive2 { name="mapplots"; version="1.5"; sha256="09sk78a0p8hlwhk3w2dwvpb0a6p7fqdxyskvz32p1lcav7y3jfrb"; depends=[]; };
   mapproj = derive2 { name="mapproj"; version="1.2-4"; sha256="1sywwzdikpnkzygb2jx9c67sgrykgbkm39dkf45clz3yylsib2ng"; depends=[maps]; };
-  maps = derive2 { name="maps"; version="3.0.0-2"; sha256="1r8q49hyc6z4vga23nlizd40nnxp1qybqzaj2yccz0282af5536g"; depends=[]; };
+  maps = derive2 { name="maps"; version="3.0.1"; sha256="0i0w209zqfk7vppdz5m96ypl9drg1irg96w2vqg5snnqb48682p0"; depends=[]; };
   maptools = derive2 { name="maptools"; version="0.8-37"; sha256="08vhd4af5955p44x1g0csnz090nhmac8sajyjcwqink0x05fbg1f"; depends=[foreign lattice sp]; };
   maptpx = derive2 { name="maptpx"; version="1.9-2"; sha256="1i5djmjg0lsi7xlkbvn90njq1lbyi74zwc2nldisay4xsbgqg7fj"; depends=[slam]; };
   maptree = derive2 { name="maptree"; version="1.4-7"; sha256="1k7v84wvy6wz6g0dyiwvd3lvf78rlfidk60ll4fz7chvr2nrqdp4"; depends=[cluster rpart]; };
+  mapview = derive2 { name="mapview"; version="1.0.0"; sha256="1kk3slizi78qjnfwnv8jjhwb6x89w7ly11l7fxk4fny3zjzj1spa"; depends=[brew data_table gdalUtils htmltools htmlwidgets lattice latticeExtra leaflet OpenStreetMap png raster rasterVis Rcpp rgdal satellite scales sp]; };
   mar1s = derive2 { name="mar1s"; version="2.1"; sha256="0psjva7nsgar5sj03adjx44pw0sdqnsd96m4g6k8d76pv30m1g7l"; depends=[cmrutils fda zoo]; };
   marelac = derive2 { name="marelac"; version="2.1.5"; sha256="1lzgcl6y4dmy3radzr49smy0cwdbd930dvah9rs50x637yqc7p14"; depends=[seacarb shape]; };
   marg = derive2 { name="marg"; version="1.2-2"; sha256="0j08zzcrj8nqsargi6xi50gy9pl4smmsp4b7ywlga7r1ga38g82r"; depends=[statmod survival]; };
   markdown = derive2 { name="markdown"; version="0.7.7"; sha256="00j1hlib3il50azs2vlcyhi0bjpx1r50mxr9w9dl5g1bwjjc71hb"; depends=[mime]; };
   marked = derive2 { name="marked"; version="1.1.10"; sha256="0a5b3nx7fwk0lavjpdlr9c1hm0zl215b2f2mi6kx00irys6h9nyh"; depends=[coda expm ggplot2 lme4 Matrix numDeriv optimx R2admb Rcpp truncnorm]; };
-  marketeR = derive2 { name="marketeR"; version="0.1.1"; sha256="1k5f9ihn7ca0c80hxsbhc3f9rdzc4qb30pz4977a3w0wjklshrgh"; depends=[dplyr forecast ggplot2 ggthemes knitr plyr Rfacebook RGoogleAnalytics rmarkdown scales shiny xlsx zoo]; };
-  markophylo = derive2 { name="markophylo"; version="1.0.3"; sha256="17rcjrn8a1vgwl3yrd0k9hw1ig8a0lwm9mi5z6ip567773xci76p"; depends=[ape numDeriv phangorn Rcpp RcppArmadillo]; };
-  markovchain = derive2 { name="markovchain"; version="0.4.2"; sha256="08afjyz5zmp5hkw0678jp7dj536vza74nv8np6qrjw3zmi95k6n9"; depends=[expm igraph matlab Matrix Rcpp RcppArmadillo RcppParallel]; };
+  markmyassignment = derive2 { name="markmyassignment"; version="0.3.0"; sha256="1s35hkvmc4l4fm96jm0m2vzd7lbkiqb75gb6zwck58v1k6qckw2v"; depends=[codetools httr testthat yaml]; };
+  markophylo = derive2 { name="markophylo"; version="1.0.4"; sha256="12np5rg59wjyh1mfhhfh115ziciba973fjvbrhn4qzdnry1mwbdb"; depends=[ape numDeriv phangorn Rcpp RcppArmadillo]; };
+  markovchain = derive2 { name="markovchain"; version="0.4.3"; sha256="0xzadlpznkclx7s0y8hpd9yf3ck578w913yljfg6fh7m9avzgvmw"; depends=[expm igraph matlab Matrix Rcpp RcppArmadillo RcppParallel]; };
   marl = derive2 { name="marl"; version="1.0"; sha256="0rndnf3rbcibv3gsrw1kfp5zhg37cw9wwlz0b7dbwprd0m71l3pm"; depends=[]; };
-  marmap = derive2 { name="marmap"; version="0.9.3"; sha256="0i288q92kizgiw5nvvmb7zf4j8v4crg3vfy66ydahgxcyahb15z8"; depends=[adehabitatMA DBI gdistance geosphere ggplot2 ncdf plotrix raster reshape2 RSQLite shape sp]; };
+  marmap = derive2 { name="marmap"; version="0.9.5"; sha256="0avdi55b43nrkryygs7g3l62g48m1b2zhjf7xcwx7q166k7lb7ax"; depends=[adehabitatMA DBI gdistance geosphere ggplot2 ncdf4 plotrix raster reshape2 RSQLite shape sp]; };
   marqLevAlg = derive2 { name="marqLevAlg"; version="1.1"; sha256="1wmqi68g0flrlmj87vwgvyxap0miss0n42qiiw7ypyj4jw9kwm8j"; depends=[]; };
   matR = derive2 { name="matR"; version="0.9"; sha256="0lih3g2z6rxykprl3s529xcf466bpzpsv4l20dkgx1fgfslfcl2p"; depends=[BIOM_utils MGRASTer]; };
   matchingMarkets = derive2 { name="matchingMarkets"; version="0.1-7"; sha256="01mr22ybrrmq7xcx6612lqwkf60wc3sfygxshpm2gnd8nrlgqjbv"; depends=[lpSolve partitions Rcpp RcppArmadillo RcppProgress]; };
@@ -4980,11 +5099,11 @@ in with self; {
   matie = derive2 { name="matie"; version="1.2"; sha256="1ymx49cyvz63imqw5n48grilphiqvvdirwsrv82p7jgxdyav2xv0"; depends=[cba dfoptim gplots igraph mvtnorm seriation]; };
   matlab = derive2 { name="matlab"; version="1.0.2"; sha256="0m21k2vzbc5d3c93p2hk4208xyd2av2slg55q5j1ibjidiryqgd2"; depends=[]; };
   matlabr = derive2 { name="matlabr"; version="1.1"; sha256="0h9h805569dxnrrzgmxmhvmx7l8kg53lq1nksdrr7p9f8jglha6s"; depends=[stringr]; };
-  matlib = derive2 { name="matlib"; version="0.5.2"; sha256="13w18hfs8h1rv196kdz8j3mrp5n1957vvi2dmfgzqajzd4p9issg"; depends=[rgl]; };
+  matlib = derive2 { name="matlib"; version="0.6.0"; sha256="08gcnyk988bncikr58j75v0a6gaag0ld1q5ykysi9zxa61gzfha9"; depends=[rgl]; };
   matpow = derive2 { name="matpow"; version="0.1.1"; sha256="1a6q21ba16qfdpykmjwgmrb1kkvvyx48qg8cbgpdmch0vhibcgcp"; depends=[]; };
-  matrixStats = derive2 { name="matrixStats"; version="0.15.0"; sha256="1068k85s6rlwfzlszw790c2rndydvrsw7rpck6k6z17896m8drfa"; depends=[]; };
+  matrixStats = derive2 { name="matrixStats"; version="0.50.1"; sha256="08l32abp7dfnsc49ca4hzznh934y60n5z01x5ga2ixky5961s57c"; depends=[]; };
   matrixcalc = derive2 { name="matrixcalc"; version="1.0-3"; sha256="1c4w9dhi5w98qj1wwh9bbpnfk39rhiwjbanalr8bi5nmxkpcmrhp"; depends=[]; };
-  matrixpls = derive2 { name="matrixpls"; version="0.5.0"; sha256="0r1qpfbvaq24d30ck5c5zwsss4rqhl12g3hhmij3cn55hmv26azq"; depends=[assertive lavaan MASS matrixcalc psych]; };
+  matrixpls = derive2 { name="matrixpls"; version="0.6.0"; sha256="0ym9c6r66v3pswji8p2dbsq4dzbdv8xfrg6j9p8zbq5pd0kn8kqg"; depends=[assertive lavaan MASS matrixcalc psych]; };
   maxLik = derive2 { name="maxLik"; version="1.3-4"; sha256="0jjb5kc7dvx940ybg7b7z9di79v75zm2xlb0kj2y7rmi45vvh6hq"; depends=[miscTools sandwich]; };
   maxent = derive2 { name="maxent"; version="1.3.3.1"; sha256="1skc7d0p6kg0gi1bpgaqn2dmxjzbvcphx5x3idpscxfbplm5v96p"; depends=[Rcpp SparseM tm]; };
   maxlike = derive2 { name="maxlike"; version="0.1-5"; sha256="0h544wr7qsyb70vmbk648hfyb6arrsb41gw39svcin412rhw9k9j"; depends=[raster]; };
@@ -5000,7 +5119,7 @@ in with self; {
   mcbiopi = derive2 { name="mcbiopi"; version="1.1.2"; sha256="12h4bv3hx1m6bsqdxj5n3b5gh98ms508am8pigz7ckmv0xkyhx85"; depends=[]; };
   mcc = derive2 { name="mcc"; version="1.0"; sha256="0p661a870bvh3xhcahqqq85azn9rjl3vacjy96jsdn86irj4s0vi"; depends=[]; };
   mcclust = derive2 { name="mcclust"; version="1.0"; sha256="00qprmsjwbn2d0jl7p9mz8pv7k8ld3mzk862pr1grigk0lqwhx06"; depends=[lpSolve]; };
-  mcemGLM = derive2 { name="mcemGLM"; version="1.0"; sha256="0w2qhl6f33gkh59pldigs0caa0jzcakalaw00wl5f5wir78c8km2"; depends=[Rcpp RcppArmadillo trust]; };
+  mcemGLM = derive2 { name="mcemGLM"; version="1.1"; sha256="07ky3bvcns24qia9pyvf5lp7764h8gn2g8zr304iz4x9bq6jvsi0"; depends=[Rcpp RcppArmadillo trust]; };
   mcga = derive2 { name="mcga"; version="2.0.9"; sha256="197yldx03c634f3x0mpxxvqrys93n7z7n3x0alvqa42z3vdkrz7b"; depends=[]; };
   mcgibbsit = derive2 { name="mcgibbsit"; version="1.1.0"; sha256="09ydcbjz3abmh46966v01dh26fy79dfklk3zjf262zp3c62ld9yf"; depends=[coda]; };
   mcheatmaps = derive2 { name="mcheatmaps"; version="1.0.0"; sha256="1gglm32xpmim38m7fziczgqfbpcq2899lxardsrzg6j1vhmf765y"; depends=[gridBase]; };
@@ -5011,11 +5130,12 @@ in with self; {
   mcmcplots = derive2 { name="mcmcplots"; version="0.4.2"; sha256="0ws2la6ln016l98c1rzf137jzhzx82l4c49p19yihrmrpfrhr26l"; depends=[coda colorspace denstrip sfsmisc]; };
   mcmcse = derive2 { name="mcmcse"; version="1.1-2"; sha256="1nvq1phv9ldp928yh7n97lsak26ycj717sic1cc1s46wv2rhjx0h"; depends=[ellipse Rcpp RcppArmadillo]; };
   mco = derive2 { name="mco"; version="1.0-15.1"; sha256="14y10zprpiflqsv5c979fsc2brgxay69kcwm7y7s3gziq74fn4rw"; depends=[]; };
+  mcparallelDo = derive2 { name="mcparallelDo"; version="1.0.0"; sha256="17k284siffaslgijldl0j0civjhgnfzpxrahlvj22p8rf2vspdhs"; depends=[ArgumentCheck R_utils R6]; };
   mcprofile = derive2 { name="mcprofile"; version="0.2-1"; sha256="0q1d236mcmgp5p5gl474myp1zz8cbxffd0kvsd8338jijalj05p0"; depends=[ggplot2 mvtnorm quadprog]; };
   mcr = derive2 { name="mcr"; version="1.2.1"; sha256="0237w41xichd418ax9xviq4wxbcc6c0cgr5gvzkca67nnqgc4jaz"; depends=[]; };
   mcsm = derive2 { name="mcsm"; version="1.0"; sha256="13sx7s3ywis5n4a70ld2szld9fb8jkfsc82dy6iskhy17vy8pml0"; depends=[coda MASS]; };
-  mda = derive2 { name="mda"; version="0.4-7"; sha256="1hjmjrdr6zfccsd4xln1jvkkvk25igppvnl6mqznfc7qsmk459cy"; depends=[class]; };
-  mdatools = derive2 { name="mdatools"; version="0.6.0"; sha256="13pfzr3lvqifln9lzdd0dpnygdibxp9ka7zwfisxjrw21m8mhmm3"; depends=[]; };
+  mda = derive2 { name="mda"; version="0.4-8"; sha256="1vb98zi0narqh2bwnjm33jnfzvgnaf1chh263xkgkpjb3ph0lvpd"; depends=[class]; };
+  mdatools = derive2 { name="mdatools"; version="0.7.0"; sha256="0b010nmldafb5ibm0wzn4hxsyhwkx5f0g79mbcfh8lsq9zprq9am"; depends=[]; };
   mded = derive2 { name="mded"; version="0.1-2"; sha256="1j8fcz5yc70p9qd9l010xj1b625scdps8z1pqh75b45p2hiqbhlc"; depends=[]; };
   mdscore = derive2 { name="mdscore"; version="0.1-2"; sha256="1g473rwffkb2x6y6wcm98i6xr5dhz11ypnbrvhb2klbvi81jj511"; depends=[MASS]; };
   mdsdt = derive2 { name="mdsdt"; version="1.1"; sha256="1c0fsj5hg1l1yh8a1fhvmmlfnhbxwmpqx19qr1mk80r52hz9dnlq"; depends=[ellipse mnormt polycor]; };
@@ -5038,7 +5158,7 @@ in with self; {
   merTools = derive2 { name="merTools"; version="0.1.0"; sha256="0dxvbmgjirc29qmn4c305idacm09pim88j7aajh14535wpd7by6c"; depends=[abind arm DT ggplot2 lme4 mvtnorm plyr shiny]; };
   merror = derive2 { name="merror"; version="2.0.2"; sha256="13d9r5r83zai8jnzxaz1ak40876aw20zbpr244gs55rvj5j7f87q"; depends=[]; };
   metRology = derive2 { name="metRology"; version="0.9-17"; sha256="1g4gv3mpii71i6imfwqg9d5iwfx03bq4lizzhx7dy39b2mj7jd4q"; depends=[MASS numDeriv]; };
-  meta = derive2 { name="meta"; version="4.3-1"; sha256="14qwkky76yzx7ab0an41agr6qac7bhha3f0kglf3mslbijy2dgbc"; depends=[]; };
+  meta = derive2 { name="meta"; version="4.3-2"; sha256="0970snzclh83rz446m1r2bkfiylxx444z6bp7ah6lka488wmyck6"; depends=[]; };
   meta4diag = derive2 { name="meta4diag"; version="1.0.20"; sha256="1x0s5jz1wnk7h9skxnyha8p0b77mfffn2y4i9sl7nr6rmkn7caj9"; depends=[cairoDevice RGtk2]; };
   metaLik = derive2 { name="metaLik"; version="0.42.0"; sha256="1rk5mwgmgnqq2hrzbh936hzw3aa815l12r1a1qywap5ggmmyhszl"; depends=[]; };
   metaMA = derive2 { name="metaMA"; version="3.1.2"; sha256="1mjyz06q1kc8lhfixpym4ndpnisi1r849fj3da6riwfd6ab1v181"; depends=[limma SMVar]; };
@@ -5053,22 +5173,24 @@ in with self; {
   metafuse = derive2 { name="metafuse"; version="1.0-1"; sha256="0r64s0nqc75knk378ffhgk1y3i0j3k4ff0scya2p925ra18vfn9p"; depends=[glmnet MASS Matrix]; };
   metagear = derive2 { name="metagear"; version="0.2"; sha256="02h7bzhijb9glzayin1wby4pkskfdav4m3grvrkz8iq9srnxskc5"; depends=[EBImage gWidgets gWidgetsRGtk2 MASS Matrix metafor stringr]; };
   metagen = derive2 { name="metagen"; version="1.0"; sha256="0jvbm22976aqvmfnjzs51n2w099yj5hpx6hd0pgvbia80jk7b9vk"; depends=[BatchExperiments BatchJobs BBmisc ggplot2 lhs MASS metafor ParamHelpers plyr]; };
+  metaheur = derive2 { name="metaheur"; version="0.1.0"; sha256="0bdvfa6y6w8ybdnr0h414bzikkrdp4g5mrcsprzhxwim96j8imh6"; depends=[ggplot2 preprocomb reshape2]; };
   metamisc = derive2 { name="metamisc"; version="0.1.1"; sha256="1cvlsix3b857xdw6anqhqsrfwxpnf4rbzg4ybf6aw7vcdc05zgwd"; depends=[bbmle coda ellipse mvtnorm rjags]; };
   metansue = derive2 { name="metansue"; version="1.0"; sha256="1vcyvvysfz9frdy35g3p2hvndcdd4dk7kccwsgwzl7sl6ag73596"; depends=[]; };
   metap = derive2 { name="metap"; version="0.6"; sha256="1iy5cmwrlsr70z0qnqn30n15knsfclg383815a2a8yqpg5gs4953"; depends=[]; };
   metaplus = derive2 { name="metaplus"; version="0.7-5"; sha256="1a9603p2inxm46zhdldak0634x9g40fr7faanlfj5g888y1i3xh7"; depends=[bbmle boot lme4 MASS metafor numDeriv]; };
   metasens = derive2 { name="metasens"; version="0.2-0"; sha256="13mncikxzg8cnpbw78ird1xkrjlivmjibhrk700vdx1hygzwi6x0"; depends=[meta]; };
   metatest = derive2 { name="metatest"; version="1.0-4"; sha256="0bz6gg2n4ffkr144jxk27y24xpqhp8awr09wkaijmv8902qx6qah"; depends=[]; };
+  meteR = derive2 { name="meteR"; version="1.0"; sha256="1xmp7p47xsn1y41ij6yzywmwpp6inj9dzzhhlr2i1p6fra1bcy90"; depends=[distr nleqslv]; };
   meteo = derive2 { name="meteo"; version="0.1-5"; sha256="0n37plka9vsxwd03lca3h6m8dcz3f1bi46jn3bz7vyilnkq9hcdk"; depends=[gstat plyr raster rgdal snowfall sp spacetime]; };
-  meteoForecast = derive2 { name="meteoForecast"; version="0.48"; sha256="1yb5hfa02qnzchz7iqs1lspm5hh1q05mfgaqv391zkcvpkgrg5zr"; depends=[ncdf raster sp XML zoo]; };
+  meteoForecast = derive2 { name="meteoForecast"; version="0.49"; sha256="0h3qb7srfmv4bl207arz6x3q64bh5pb0pc49lgrnplcjwwxk78bs"; depends=[raster sp XML zoo]; };
   meteogRam = derive2 { name="meteogRam"; version="1.0"; sha256="167gyxjnl4dyfqs3znv8sdpkvpqdxzdqi1g730s30gycrm9snap9"; depends=[ggplot2 RadioSonde]; };
-  metricsgraphics = derive2 { name="metricsgraphics"; version="0.8.5"; sha256="05rjx19qzf2r2hxf8y490xd29n3qy40rp38s2ni989m1p0bzc6c9"; depends=[htmltools htmlwidgets magrittr]; };
+  metricsgraphics = derive2 { name="metricsgraphics"; version="0.9.0"; sha256="1zbx82b34y0rr4w7rzvyc1nzk95w6cdkg0j1kkshbmkvplq6v9i4"; depends=[htmltools htmlwidgets magrittr]; };
   mets = derive2 { name="mets"; version="1.1.1"; sha256="1myqcds9glsy3fwzr7v711xzk7gmvy2cb4x3qgj1kxa90d1d50hz"; depends=[lava numDeriv Rcpp RcppArmadillo survival timereg]; };
   mev = derive2 { name="mev"; version="1.3"; sha256="02f0fi3iaykcrh1k2hwnqk9aqrlvyddjjkkyq62b1fxp1agzrfxi"; depends=[Rcpp RcppArmadillo]; };
   mewAvg = derive2 { name="mewAvg"; version="0.3.0"; sha256="16gc78ccjffp9qgc7rs622jql54ij83ygvph3hz19wpk22m96glm"; depends=[]; };
   mfp = derive2 { name="mfp"; version="1.5.2"; sha256="1i90ggbyk2p1ym7xvbf4rhyl51kmfp6ibc1dnmphgw15wy56y97a"; depends=[survival]; };
   mfx = derive2 { name="mfx"; version="1.1"; sha256="1zhpk38k7vdq0pyqi1s858ns19qycs3nznpa00yv8sz9n798wnn5"; depends=[betareg lmtest MASS sandwich]; };
-  mgcv = derive2 { name="mgcv"; version="1.8-9"; sha256="0jl93zbh1yhqm3zcvpj3qfkhvn59r27yvjmxf7sl3szgkjaiar6l"; depends=[Matrix nlme]; };
+  mgcv = derive2 { name="mgcv"; version="1.8-10"; sha256="10spvqjp95czrdd5skp9isgrad56nxgmigyly7nsmwzvhrgbs2x1"; depends=[Matrix nlme]; };
   mglmn = derive2 { name="mglmn"; version="0.0.2"; sha256="1ijkmr85s4yya0hfwcyqqskbprnkcbq8sc9c889i0gy0543fgqz4"; depends=[mvabund snowfall]; };
   mgm = derive2 { name="mgm"; version="1.1-2"; sha256="1hwni8g37n3jp2cvkg9a49n7rkhjsm8wb89xkzzjj93m6sa643nf"; depends=[glmnet matrixcalc Rcpp]; };
   mgpd = derive2 { name="mgpd"; version="1.99"; sha256="0cxpgza9i0hjm5w1i5crzlgh740v143120zwjn95cav8pk8n2wyb"; depends=[corpcor evd fields numDeriv]; };
@@ -5086,7 +5208,7 @@ in with self; {
   micEconSNQP = derive2 { name="micEconSNQP"; version="0.6-6"; sha256="1n3pxapc90iz1w3plaqflayd0b1jqd65yw5nbbm9xz0ih132dby9"; depends=[MASS miscTools systemfit]; };
   mice = derive2 { name="mice"; version="2.25"; sha256="1c6xjvqy3w5lqbs4k22vb3x3an4ss22zpp2zigwhnm1y9mphg06x"; depends=[lattice MASS nnet Rcpp rpart survival]; };
   miceadds = derive2 { name="miceadds"; version="1.5-0"; sha256="1jxmcs3g4pdqvdjys3zl7fnpkx5hnhjg6y6yhd6i5hkhkmysqvgm"; depends=[bayesm car foreign grouped inline lme4 MASS MBESS mice mitools multiwayvcov mvtnorm pls Rcpp RcppArmadillo sirt sjmisc TAM]; };
-  microbenchmark = derive2 { name="microbenchmark"; version="1.4-2"; sha256="05yxvdnkxr2ll94h6f2m5sn3gg7vrlm9nbdxgmj2g8cp8gfxpfkg"; depends=[ggplot2]; };
+  microbenchmark = derive2 { name="microbenchmark"; version="1.4-2.1"; sha256="0qn5r1a6qidghcisc2hpbdmj62pnixc3zz6p4ipk8mvakf0hdsvg"; depends=[ggplot2]; };
   micromap = derive2 { name="micromap"; version="1.9.2"; sha256="1x4v0ibbpfz471dp46agib27i4svs8wyy93ldriryvhpa2w5948y"; depends=[ggplot2 maptools RColorBrewer rgdal sp]; };
   micromapST = derive2 { name="micromapST"; version="1.0.5"; sha256="1n9mzyl5dj21165j0j99brkqq7c54j3cg6r21ifdzffj2dx29wh0"; depends=[RColorBrewer]; };
   micropan = derive2 { name="micropan"; version="1.0"; sha256="0qnxm6z2pk1wibchj6rhn3hld77dzl5qgvzl4v9n16ywlgdv09ai"; depends=[igraph]; };
@@ -5102,7 +5224,7 @@ in with self; {
   miniGUI = derive2 { name="miniGUI"; version="0.8.0"; sha256="1iq52x7wbcin7ya207jj3k9vym7mavm5z61vggyabdmr768pci39"; depends=[]; };
   minimax = derive2 { name="minimax"; version="1.0"; sha256="1g0d9q5h1avbb0yg7ajw5330820i3n5cgkpsif754l4j3ikya8p3"; depends=[]; };
   minimist = derive2 { name="minimist"; version="0.1"; sha256="007y829d766b1v6wkrhk7pkg99r38bvmhc8bwvs8rs13dr7444ln"; depends=[V8]; };
-  minpack_lm = derive2 { name="minpack.lm"; version="1.1-9"; sha256="19s3zj0jd8yh4acqnpb0xk2qwwpv4kch9yfzv3hvqzknbx89yl5v"; depends=[]; };
+  minpack_lm = derive2 { name="minpack.lm"; version="1.2-0"; sha256="0h8grkwkm2w0jl9fl5kma3b6p1n76gm42qbsyrnhr7pwsxx4qwgr"; depends=[]; };
   minqa = derive2 { name="minqa"; version="1.2.4"; sha256="036drja6xz7awja9iwb76x91415p26fb0jmg7y7v0p65m6j978fg"; depends=[Rcpp]; };
   minque = derive2 { name="minque"; version="1.1"; sha256="1hx4j38213hs8lssf9kj5s423imk7dzv60mdbzrpbp7la7jk2n57"; depends=[klaR Matrix]; };
   minxent = derive2 { name="minxent"; version="0.01"; sha256="1a0kak4ff1mnpvc9arr3sihp4adialnxxyaacdgmwpw61wgcir7h"; depends=[]; };
@@ -5116,7 +5238,7 @@ in with self; {
   miscset = derive2 { name="miscset"; version="0.4"; sha256="04cl8a2chcynfn5rljqw2ll4ry0wqaslqgjh9ny8ax3hcvyvmmwl"; depends=[data_table gridExtra Rcpp xtable]; };
   missDeaths = derive2 { name="missDeaths"; version="1.2"; sha256="0lamxws1qqafz1mqdrzmq6jjn490z8zd63w4mzyb5nwwlxbmy6v8"; depends=[cmprsk mitools Rcpp relsurv rms survival]; };
   missForest = derive2 { name="missForest"; version="1.4"; sha256="0y02dhrbcx10hfkakg5ysr3kpyrsh2d9i5b0qzhj9x5x0d5q11gp"; depends=[foreach itertools randomForest]; };
-  missMDA = derive2 { name="missMDA"; version="1.8.2"; sha256="0rb48psaffvlp3i2d1xv9fk949gpnck85v4ysfzw203r2r4rdhmm"; depends=[FactoMineR]; };
+  missMDA = derive2 { name="missMDA"; version="1.9"; sha256="1g8b37cjaya1g5hkqwjgamnh4jfsqw90453yxh3jnvdw7irl4vsm"; depends=[FactoMineR mice mvtnorm]; };
   mistat = derive2 { name="mistat"; version="1.0-3"; sha256="12fykqkcqfxn8m8wwpw69f7h2f24c5yhg4fw50jsifhcj40kk29q"; depends=[]; };
   mistral = derive2 { name="mistral"; version="1.1-1"; sha256="19zkc5ddjzw17y70x3l6maljsfvg0295xyzx7kavmjrws74jx4rc"; depends=[DiceKriging e1071 kernlab Matrix mvtnorm rgenoud]; };
   mitml = derive2 { name="mitml"; version="0.2-4"; sha256="17nhzyw0pnc9xadn7zlxpccfigixaz015fybm79f0mnzkxfif8zf"; depends=[haven pan]; };
@@ -5133,12 +5255,13 @@ in with self; {
   mixexp = derive2 { name="mixexp"; version="1.2.3"; sha256="1cywqqiap4czni2jlcfyh6l6sn6v6wb2bzkfavbg2h6f5xc3ljnn"; depends=[daewr gdata lattice]; };
   mixlm = derive2 { name="mixlm"; version="1.1.0"; sha256="16b1zfzcvs1hxcp31gldwi6535srjprfxzzv0qbgvvpvzxjfrsa2"; depends=[car leaps lme4 multcomp pls pracma]; };
   mixor = derive2 { name="mixor"; version="1.0.3"; sha256="1qnrfd0hggad81rn8ryfm9l0cpd59ifj9sxc1bav35bma535azdv"; depends=[]; };
+  mixpack = derive2 { name="mixpack"; version="0.3.4"; sha256="0d28yxxm8rcb8l9nzpaviz4gxm690f88d3z21sc3qg02qdh3xqk0"; depends=[mvtnorm Rcpp RcppArmadillo]; };
   mixreg = derive2 { name="mixreg"; version="0.0-5"; sha256="0wsb1z98ymhshw9nhsvlszsanflxv3alwpdsw8lr3v62bkwka8zr"; depends=[]; };
   mixsep = derive2 { name="mixsep"; version="0.2.1-2"; sha256="1ywwag02wbx3pkd7h0j9aab44bdmwsaaz0p2pcqn1fs3cpw35wa2"; depends=[MASS RODBC tcltk2]; };
   mixsmsn = derive2 { name="mixsmsn"; version="1.1-1"; sha256="0n2iib0kpnsgz2k761myjqy2zsw0yrygpamxgm90cvngvxvkmkhc"; depends=[mvtnorm]; };
   mixtNB = derive2 { name="mixtNB"; version="1.0"; sha256="0lqbm1yl54zfs0xcmf3f2vcg78rsqyzlgvpydhmhg7x6dkissb22"; depends=[]; };
   mixtools = derive2 { name="mixtools"; version="1.0.3"; sha256="01ix019cvplqz09q55pz9w7cc281k37khh1i3xf1k6l9f2cj519z"; depends=[boot MASS segmented]; };
-  mixtox = derive2 { name="mixtox"; version="1.1"; sha256="07r72ahl8qk1x76hgbisjmvf37y3l8s0vnr7r0s266r4mmdrkjk3"; depends=[nls2]; };
+  mixtox = derive2 { name="mixtox"; version="1.2"; sha256="0yw3zvgxmrwcnps9zws87z9p4jk8gblr0giwh9298ngpcv4dd3rs"; depends=[nls2]; };
   mixture = derive2 { name="mixture"; version="1.4"; sha256="0k9pzcgfjyp0rmcma26kr2n8rcwmijznmdpvqidgl3jay20c87ca"; depends=[]; };
   mizer = derive2 { name="mizer"; version="0.2"; sha256="0cpal9lrjbvc923h499hbv4pqw3yjd4jvvhgayxgkak2lz2jzmcz"; depends=[ggplot2 plyr reshape2]; };
   mkde = derive2 { name="mkde"; version="0.1"; sha256="04v84arpnmjrkk88ffphnhkz32x7y0dypk75jfmbbgcgv59xlglv"; depends=[raster Rcpp sp]; };
@@ -5148,7 +5271,8 @@ in with self; {
   mlPhaser = derive2 { name="mlPhaser"; version="0.01"; sha256="1s2mqlnbcjdkx0ghvr2sw9rzggqa4jy2vzi9vbyqkh6795lgck6n"; depends=[]; };
   mlVAR = derive2 { name="mlVAR"; version="0.1.0"; sha256="0xychak3xdqnsl9z1ifi0niqsrdc10f6frl6zg162mzpil33wp3g"; depends=[arm lme4 plyr qgraph]; };
   mlbench = derive2 { name="mlbench"; version="2.1-1"; sha256="1rp035qxfgh5ail92zjh9jh57dj0b8babw3wsg29v8ricpal30bl"; depends=[]; };
-  mldr = derive2 { name="mldr"; version="0.2.82"; sha256="03plin3li4nl5kkq9fck85gygi4jxpglprllajjs2rj6x06kqqh5"; depends=[circlize shiny XML]; };
+  mldr = derive2 { name="mldr"; version="0.3.18"; sha256="1023ym182mz830qj5wz5l85pqm1r0y7783ma3n8i74fzf964zqrc"; depends=[circlize shiny XML]; };
+  mldr_datasets = derive2 { name="mldr.datasets"; version="0.3.1"; sha256="09ydpsl84g03m6jc4f3pivmdi7hycvp47j77lyg317zj527lx09m"; depends=[]; };
   mlearning = derive2 { name="mlearning"; version="1.0-0"; sha256="0r8xfaxw83s2r27b8x5qd0k4r5ayxpkafzn9b1a0jvsr87i6520r"; depends=[class e1071 ipred MASS nnet randomForest]; };
   mlegp = derive2 { name="mlegp"; version="3.1.4"; sha256="1932544irhzhf6a8rjyh66j57h9awlhwd6xam603bamfg106cmg2"; depends=[]; };
   mleur = derive2 { name="mleur"; version="1.0-6"; sha256="0mddphq3b6y2jaafaa9y41842kcaqdl3dh7j4pva55q2vcjcclj7"; depends=[fGarch lattice stabledist urca]; };
@@ -5159,10 +5283,10 @@ in with self; {
   mlmmm = derive2 { name="mlmmm"; version="0.3-1.2"; sha256="1m5ziiqs3ll1xjm1yf7x4sdc910jypn3kjnbadf95xxkvqmfrsqq"; depends=[]; };
   mlogit = derive2 { name="mlogit"; version="0.2-4"; sha256="15ndly7i56k8blgvpn15ixxnqx9yvbci7n3mb3hm9mnrxwh5v7sx"; depends=[Formula lmtest MASS maxLik statmod zoo]; };
   mlogitBMA = derive2 { name="mlogitBMA"; version="0.1-6"; sha256="1wl8ljh6rr1wx7dxmd1rq5wjbpz3426z8dpg7pkf1x9wr94a2q25"; depends=[abind BMA maxLik]; };
-  mlr = derive2 { name="mlr"; version="2.5"; sha256="10n9zm1mvl0swn4ywin7l249gp0nnkaqsl7ph1amf90kydaccm2r"; depends=[BBmisc checkmate ggplot2 ggvis parallelMap ParamHelpers plyr reshape2 shiny survival]; };
+  mlr = derive2 { name="mlr"; version="2.7"; sha256="0ik016cgk1kk79pifva64j78gj8vwx3qy4b5kr6vxv44nmc89nfc"; depends=[BBmisc checkmate ggplot2 ggvis parallelMap ParamHelpers plyr reshape2 shiny survival]; };
   mlsjunkgen = derive2 { name="mlsjunkgen"; version="0.1.1"; sha256="109ag52x4y3rzx8yccilrnl24mz4ximzx6v4lrbak7dpiclqrw7a"; depends=[]; };
   mlxR = derive2 { name="mlxR"; version="2.2.0"; sha256="1ca0vfky45gvr2rqbgli79v1mqhi0d8mpd220xxs1p6xlwbyvn0m"; depends=[ggplot2 Rcpp XML]; };
-  mma = derive2 { name="mma"; version="2.0-0"; sha256="0fdb2lbg08l47wnrsjf3rarf2n0qsw0qrx9b9aa08ablwpip4k69"; depends=[gbm]; };
+  mma = derive2 { name="mma"; version="2.0-1"; sha256="0j387l0413gf6rxkggmph1ms44f629m853n6vshv2x76p3dly3kc"; depends=[gbm]; };
   mmand = derive2 { name="mmand"; version="1.2.0"; sha256="19d35ji8l5gz7q51qq1kg73zyqzk1g3f9czfisj1gbadcgjzs4ys"; depends=[Rcpp RcppArmadillo reportr]; };
   mmap = derive2 { name="mmap"; version="0.6-12"; sha256="12ql03wzwj23h8lwd07rln6id44mfrgf9wcxn58y09wn3ky1rm6a"; depends=[]; };
   mmc = derive2 { name="mmc"; version="0.0.3"; sha256="03nhfhiiadga8mcp33kj20g33v9n5i62fdqgi20h5p80g849k719"; depends=[MASS survival]; };
@@ -5189,15 +5313,16 @@ in with self; {
   modeltools = derive2 { name="modeltools"; version="0.2-21"; sha256="0ynds453xprxv0jqqzi3blnv5w6vrdww9pvd1sq4lrr5ar3k3cq7"; depends=[]; };
   modiscloud = derive2 { name="modiscloud"; version="0.14"; sha256="0vwhfp50yb21xkanvzk983vk0laflv60kj1ybx3fydfljwqx0rwj"; depends=[date raster rgdal sfsmisc sp]; };
   moduleColor = derive2 { name="moduleColor"; version="1.08-3"; sha256="183l968l49b7jbmvsjjnmk1xd36cpjkp777c00gw1f73h6nb2na8"; depends=[dynamicTreeCut impute]; };
+  modules = derive2 { name="modules"; version="0.1.0"; sha256="0hlyc90zzpc2zk05h3gjpaxv903n0gvbbcm7iqna5r1a760p98j1"; depends=[aoos]; };
   mogavs = derive2 { name="mogavs"; version="1.0.1"; sha256="1bzjrcisbg0fb8kj8x9ngd9i1nrhif1rdacz6nrny6xrmw0m3ckp"; depends=[cvTools]; };
   mokken = derive2 { name="mokken"; version="2.7.7"; sha256="1v0khh1bb2h7j2x54mdw8vqlimhw25r2ps89hw4l88qfaz05ir77"; depends=[poLCA]; };
-  molaR = derive2 { name="molaR"; version="0.1"; sha256="0jcpj9njfp0m4ylr6i8pirl2bf4zcaqpnfcrz9461z04hdv7asi6"; depends=[alphahull geomorph psych rgl]; };
+  molaR = derive2 { name="molaR"; version="0.2"; sha256="0i3rvhc4wzg23kyq804cr3qy2qqf1k901b5ci4jr9xyq0sj2lvjl"; depends=[alphahull geomorph psych rgl]; };
   mombf = derive2 { name="mombf"; version="1.6.1"; sha256="16agh7lclkx3709cll3mgnm4bby8m5sscizblw1m5hjmld4d4mjm"; depends=[actuar mgcv mvtnorm ncvreg survival]; };
   momentchi2 = derive2 { name="momentchi2"; version="0.1.0"; sha256="02k4hzhqmqh7sx7dzb6w84fc1f5523md3284y4gvdbaw9y34ayk8"; depends=[]; };
   moments = derive2 { name="moments"; version="0.14"; sha256="0f9y58w1hxcz4bqivirx25ywlmc80gbi6dfx5cnhkpdg1pk82fra"; depends=[]; };
   momr = derive2 { name="momr"; version="1.1"; sha256="091vzaw8dm29q89lg2iys25rbg2aslgdn9sk06x038nngxdrn95r"; depends=[gplots Hmisc nortest]; };
   mondate = derive2 { name="mondate"; version="0.10.01.02"; sha256="18v15y7fkll47q6kg7xzmj5777bz0yw4c7qfiw2bjp0f3b11qrd2"; depends=[]; };
-  mongolite = derive2 { name="mongolite"; version="0.6"; sha256="1h343xar7dz1hl1jm3f5qn87imbcmii001r8a9rrdr5pw9cl9h4c"; depends=[jsonlite]; };
+  mongolite = derive2 { name="mongolite"; version="0.7"; sha256="1j9w90h9ci0k3x270vl4vxq4h8sgfh79rl17v7nxz8zwa9rsf8ld"; depends=[jsonlite]; };
   monitoR = derive2 { name="monitoR"; version="1.0.4"; sha256="1ai99lim84nc14ls2jlfflvqm67bgaqb373k9wah83gpq35wdksc"; depends=[tuneR]; };
   monmlp = derive2 { name="monmlp"; version="1.1.3"; sha256="1f42d8j6jxz8x3yy02ppimbza3b3dn8402373qhj4yizrfk9wkz9"; depends=[]; };
   monogeneaGM = derive2 { name="monogeneaGM"; version="1.0"; sha256="10rnc3ipnf8j85kfgfssmdd9578mnx74694r5jsrj2yvbvzm67vq"; depends=[ape circular cluster geomorph gplots phytools rgl]; };
@@ -5208,15 +5333,15 @@ in with self; {
   moonsun = derive2 { name="moonsun"; version="0.1.3"; sha256="1y8mwxmcy4iz444c2fayyi4i0jk1k561dp6cbjg2b3lmdml0whmi"; depends=[]; };
   mopsocd = derive2 { name="mopsocd"; version="0.5.1"; sha256="10hssnm1afqmxa9kw6ifqnz3p3yyjrmxgi98zlj31a5g4nis8wb1"; depends=[]; };
   morgenstemning = derive2 { name="morgenstemning"; version="1.0"; sha256="17y90cf8ajmkfwla0hm4jgkbkd1mxnym63ph2468sfxkhn0r3v88"; depends=[]; };
-  morse = derive2 { name="morse"; version="2.0.0"; sha256="12vyx9d9mixw4pakm62a95527wjjn95va0hhiiyrfsww8xyvbk6s"; depends=[coda dplyr ggplot2 gridExtra rjags stringr]; };
-  mosaic = derive2 { name="mosaic"; version="0.12"; sha256="1lgyy0vhk4xrv168nzhlycqppgvpclz4f3rl997li8vvqwy65hxy"; depends=[car dplyr ggdendro ggplot2 gridExtra lattice latticeExtra lazyeval MASS mosaicData readr reshape2]; };
-  mosaicData = derive2 { name="mosaicData"; version="0.9.1"; sha256="0gxnw3x806pm97x1043qq3qf1cwn1z1771cayp3xlh5khn5bijk7"; depends=[]; };
+  morse = derive2 { name="morse"; version="2.1.1"; sha256="1l2rgkjvpdsz8cqqppgd5565mz4dgl7w5wcdgrkm1hy493989069"; depends=[coda dplyr ggplot2 gridExtra rjags stringr]; };
+  mosaic = derive2 { name="mosaic"; version="0.13.0"; sha256="0rf88124rcc191rr9y3kawakh0b9f94203nllxyr3a4mb4lkk4vk"; depends=[car dplyr ggdendro ggplot2 gridExtra lattice latticeExtra lazyeval MASS mosaicData readr reshape2]; };
+  mosaicData = derive2 { name="mosaicData"; version="0.13.0"; sha256="19f35674accaqs6yqqyn9y8ggj1qhz5w3na0815768mlb91gy2j8"; depends=[]; };
   moult = derive2 { name="moult"; version="1.4"; sha256="0nglf7wijp2v66fpyh88glbn1glp8vvkbvpc1g6136bg6ahbbkkl"; depends=[Formula Matrix]; };
   mountainplot = derive2 { name="mountainplot"; version="1.1"; sha256="1l3m7jgq70g83mmfhlwzj5gkdnwgl14g9ljpk6j7z7qxapzva3bb"; depends=[lattice]; };
   mousetrack = derive2 { name="mousetrack"; version="1.0.0"; sha256="0lf0xh0c3xl27nh5w8wwyrm2jfzfajm2f73xjdgf746dp365qc8n"; depends=[pracma]; };
   movMF = derive2 { name="movMF"; version="0.2-0"; sha256="1p9ay7w93gyx4janw23iwg2j0wkvnvzalaa20n1rlahhmh327g7i"; depends=[clue skmeans slam]; };
   move = derive2 { name="move"; version="1.5.514"; sha256="18rf9d0xxs48l0bk9vvr2sxnm7rcr38cgar0y5xgmh8fdf6dsl65"; depends=[geosphere raster rgdal sp]; };
-  moveHMM = derive2 { name="moveHMM"; version="1.0"; sha256="0r8j3w8lc9lvs13wrdxyb5k4z4rwhqis81k8r9izmx7409sydvdq"; depends=[boot CircStats MASS Rcpp RcppArmadillo sp]; };
+  moveHMM = derive2 { name="moveHMM"; version="1.1"; sha256="05za2lb7s0kvvzm8a85qm3wf0qi3wvs9x5mwir8k5bhj1kav2imp"; depends=[boot CircStats MASS Rcpp RcppArmadillo sp]; };
   mp = derive2 { name="mp"; version="0.3.1"; sha256="0hwn0dg0k7nhl0jv680q5z9v46mfknndp5xswyl5chkw4ppmnyf2"; depends=[Rcpp RcppArmadillo]; };
   mpMap = derive2 { name="mpMap"; version="1.14"; sha256="0gmhg5ps8yli8699a5aw26skfbjxx4zpp0paqxxdc0zl28l0pdff"; depends=[gdata qtl seriation wgaim]; };
   mpa = derive2 { name="mpa"; version="0.7.3"; sha256="0mhnsbgr77fkn957zfiw8skyvgd084rja1y4wk5zf08q5xjs2zvn"; depends=[network]; };
@@ -5227,7 +5352,7 @@ in with self; {
   mpm = derive2 { name="mpm"; version="1.0-22"; sha256="0wijw8v0wmbfrda5564cmnp788qmlkk21yn5cp5qk8aprm9l1fnk"; depends=[KernSmooth MASS]; };
   mpmcorrelogram = derive2 { name="mpmcorrelogram"; version="0.1-3"; sha256="0qgzsh744002whh3v1hrxs1i0xnk9zgfgkdgx2f0ffj00vvnwr97"; depends=[vegan]; };
   mpmi = derive2 { name="mpmi"; version="0.41"; sha256="1iwdhvdglsamzq18f0r5mh0anrd4ffrddafdlbw16kr8jy0c8fdn"; depends=[KernSmooth]; };
-  mpoly = derive2 { name="mpoly"; version="0.1.0"; sha256="0q0ypaj1r12yc72b6qb22rvgrzc703v4n7ns2yg1n9ff20y5m4z0"; depends=[partitions plyr rJava rjson rJython rSymPy stringr]; };
+  mpoly = derive2 { name="mpoly"; version="1.0.0"; sha256="1y8hx97hxhfsik4sikdlmrp2p05xywjqw1fx77rb1s6j97k3kbnk"; depends=[ggplot2 orthopolynom partitions plyr polynom reshape2 rJava rjson rJython rSymPy stringr]; };
   mppa = derive2 { name="mppa"; version="1.0"; sha256="06v6vq2nfh4b407x2gyvcp5wbdrcnk3m8y58akapi66lj8xplcx4"; depends=[]; };
   mpt = derive2 { name="mpt"; version="0.5-2"; sha256="16rrcy8hy9fw603pbi9wybnql11w0bxlxi1kxx482khg9fj7lwn0"; depends=[]; };
   mra = derive2 { name="mra"; version="2.16.4"; sha256="134fw4bv34bycgia58z238acj7kb8jkw51pjfa2cwprrgsjdpf5g"; depends=[]; };
@@ -5248,10 +5373,11 @@ in with self; {
   msgps = derive2 { name="msgps"; version="1.3"; sha256="0nvxy9a41z5d111gqr1gh521imm795l1li70g1mzrag1gpg810c5"; depends=[]; };
   msir = derive2 { name="msir"; version="1.3"; sha256="0d7zxjmhr1ri3qz3fdkf56fi5dz2p9lb2vyqccrpn7js2ibkqhpl"; depends=[mclust]; };
   msm = derive2 { name="msm"; version="1.6"; sha256="0nmvjjngy25k3861ys65fax7iahbhzdmrkp6928kps2s0wv6nggn"; depends=[expm mvtnorm survival]; };
+  msma = derive2 { name="msma"; version="0.7"; sha256="0rrxxva71j8gk25hi6hycnyrhrdc0skcaj1bnmh029cqhjl3qma5"; depends=[mvtnorm]; };
   msme = derive2 { name="msme"; version="0.5.1"; sha256="1bkj10pgmv9q61384fwd2pxccclclc3knc5x212p42w4w49hnm1q"; depends=[lattice MASS]; };
   msos = derive2 { name="msos"; version="1.0.1"; sha256="0fbxi8x83sj8a6bahc7q28vql00pxqdia2vxb6ilsc459xaph6vc"; depends=[mclust tree]; };
   msr = derive2 { name="msr"; version="0.4.4"; sha256="1r7kzicyi380xylw4vl88918gqmvs875f3rssx57yg28swb93sv0"; depends=[colorspace e1071 glmnet RColorBrewer rgl]; };
-  mstate = derive2 { name="mstate"; version="0.2.7"; sha256="0rys25cwr814k8z65206s12yv18dala66b3nlfq882dw5cfpaybl"; depends=[RColorBrewer survival]; };
+  mstate = derive2 { name="mstate"; version="0.2.8"; sha256="0minydz24wfx5vkjnf55pw06dr0s06nwwx1qxll1jh8ima224syj"; depends=[RColorBrewer survival]; };
   mtk = derive2 { name="mtk"; version="1.0"; sha256="0vq2xlxf86l92fl91qm8m4yfjyz1h8szmwxiics7sc9f0as0dkmy"; depends=[lhs rgl sensitivity stringr XML]; };
   mtsdi = derive2 { name="mtsdi"; version="0.3.3"; sha256="1hx4m1jnfhkycxizxaklnd9illajqvv1nml8ajfn3kjmrb5z7qlp"; depends=[gam]; };
   muRL = derive2 { name="muRL"; version="0.1-10"; sha256="0411vqijsida63jq63qwflr6lvv0rr777z0xba6pn0gpi6khjqqz"; depends=[maps]; };
@@ -5269,9 +5395,10 @@ in with self; {
   multic = derive2 { name="multic"; version="0.4.3"; sha256="1824pnwgsvf08hwwkl3b9vmfzky16imbjakgsb7jkhnzqv6d5x9g"; depends=[]; };
   multicon = derive2 { name="multicon"; version="1.6"; sha256="16glkgnm4vlpxkhf1xw1gl1q10yavx9479i21v29lldag35z8pqx"; depends=[abind foreach mvtnorm psych sciplot]; };
   multicool = derive2 { name="multicool"; version="0.1-9"; sha256="0afk95ymvz21klxgf51iw6g0k0w65flralqm5nalkdpirrqjbydx"; depends=[Rcpp]; };
+  multifwf = derive2 { name="multifwf"; version="0.2.2"; sha256="1l6z3pzz6g6w1spp1f918jh6w0jm93qyc882rj8jhn1198d2s8nd"; depends=[]; };
   multigroup = derive2 { name="multigroup"; version="0.4.4"; sha256="1r79zapziz3jkd654bwsc5g0rphrk9hkp1fpik8jvjsa1cix40mq"; depends=[MASS]; };
   multilevel = derive2 { name="multilevel"; version="2.5"; sha256="0pzv5xc8p6cpzzv9iq3a3ib1dcan445mm12whf3d6qkz2k4778g6"; depends=[MASS nlme]; };
-  multilevelPSA = derive2 { name="multilevelPSA"; version="1.2.3"; sha256="194v1a0fi5mi44q3xkja1p5hwdr5byakc71zj3jiildcqj3bdw3f"; depends=[ggplot2 MASS party plyr proto PSAgraphics psych reshape xtable]; };
+  multilevelPSA = derive2 { name="multilevelPSA"; version="1.2.4"; sha256="0v4mhdpagmkjsc8x4wlqxa88yl3v0y91a1bbq1lh3rhqfmp9yra5"; depends=[ggplot2 MASS party plyr PSAgraphics psych reshape xtable]; };
   multimark = derive2 { name="multimark"; version="1.3.1"; sha256="0v8iks2wf5rwmy74fvgbig6hx4qhl8ns4g7c0n4xr6izq3q98lhw"; depends=[Brobdingnag coda Matrix mvtnorm RMark statmod]; };
   multinbmod = derive2 { name="multinbmod"; version="1.0"; sha256="1c4jyzlcjkqdafj9b6hrqp6zs33q6qnp3wb3d7ldlij7ns9fhg71"; depends=[]; };
   multinomRob = derive2 { name="multinomRob"; version="1.8-6.1"; sha256="1fdjfk77a79fy7jczhpd2jlbyj6dyscl1w95g64jwxiq4hsix9s6"; depends=[MASS mvtnorm rgenoud]; };
@@ -5280,6 +5407,7 @@ in with self; {
   multipol = derive2 { name="multipol"; version="1.0-6"; sha256="1yjz0p4mcgzs98s61i8315wyhh986jxp8b0lq66375ckpr2ddcss"; depends=[abind]; };
   multirich = derive2 { name="multirich"; version="2.1.1"; sha256="04jr5jvds70j2psyxz12d2my61jcj5hvdyv10pvar2rpqaw0yxyh"; depends=[]; };
   multisensi = derive2 { name="multisensi"; version="1.0-8"; sha256="168g6hym5chz69wa3vfprg1m1c935wh7bi3gfz5calxiqf89mncz"; depends=[]; };
+  multisom = derive2 { name="multisom"; version="1.0"; sha256="057gvajkdiiavngg8a140mx97n11czvx7776wbb3ba1bqx3kr887"; depends=[class kohonen]; };
   multispatialCCM = derive2 { name="multispatialCCM"; version="1.0"; sha256="1fzd91w10iln8qb81z240lq3fi4gq22l4rh9npkav6fiq6g6rlp8"; depends=[]; };
   multitable = derive2 { name="multitable"; version="1.6"; sha256="067bgl793wwvb1rhan70ih0ga3dxja2c6zx7fwzml5rqi6p728pr"; depends=[]; };
   multitaper = derive2 { name="multitaper"; version="1.0-11"; sha256="1s0lmjzpyd7zmc2p1ywv5fm7qkq357p70b76gw9wjlms6d81j1n4"; depends=[]; };
@@ -5300,7 +5428,7 @@ in with self; {
   mvQuad = derive2 { name="mvQuad"; version="1.0-4"; sha256="0iprcx69mppcaa9gz1iklr5gwjbbjr58dj80aa5y175mbb76fbcw"; depends=[data_table rgl]; };
   mvSLOUCH = derive2 { name="mvSLOUCH"; version="1.2.1"; sha256="1356i74x7gbkjrs1qrk756dbq8flc8khw265yylb3gakhmi6rkpq"; depends=[ape corpcor mvtnorm numDeriv ouch]; };
   mvShapiroTest = derive2 { name="mvShapiroTest"; version="1.0"; sha256="0zcv5l28gwipkmymk12l4wcj9v047pr8k8q5avljdrs2a37f74v1"; depends=[]; };
-  mvabund = derive2 { name="mvabund"; version="3.11.4"; sha256="183g74frjy4y6ggannijw91kwmbyljd33ylpml7ivypgy5fp045m"; depends=[MASS Rcpp RcppGSL statmod tweedie]; };
+  mvabund = derive2 { name="mvabund"; version="3.11.5"; sha256="1l7icsivywjqmwndqhq0d28wbim68y4y8dkb17pw308n9kn5p7d4"; depends=[MASS Rcpp RcppGSL statmod tweedie]; };
   mvbutils = derive2 { name="mvbutils"; version="2.7.4.1"; sha256="1vs97yia78xh35sdfv5pj3ddqmy83qgamvyyh9gjg0vdznqhffzg"; depends=[]; };
   mvc = derive2 { name="mvc"; version="1.3"; sha256="0kmh6vp7c2y9jf71f4a29b0fxcl0h7m4p8wig4dk3fi7alhjf7ym"; depends=[rattle]; };
   mvctm = derive2 { name="mvctm"; version="1.0"; sha256="1naxjh2k3vv4wlpzzx0y2zwvbn4kdqyls8a8qx6bz609ynzay5r9"; depends=[Formula MNM nlme quantreg Rfit]; };
@@ -5335,31 +5463,32 @@ in with self; {
   nCal = derive2 { name="nCal"; version="2015.3-3"; sha256="0vj6l8w29ymj1v18mb4qyw6w1xpmwx5bvil4kjb82gccsb95ir10"; depends=[drc gdata gWidgets kyotil]; };
   nFCA = derive2 { name="nFCA"; version="0.3"; sha256="1jyyzagmppm3i7vh3ia4ic0zql1w04f66z81v0zpdihd4cbl5ra7"; depends=[]; };
   nFactors = derive2 { name="nFactors"; version="2.3.3"; sha256="016d76yfxz7gx7zz5dgwjmj2c5m6kxdmqj0lln5w6d70r9g1kxg7"; depends=[boot lattice MASS psych]; };
-  nLTT = derive2 { name="nLTT"; version="1.1"; sha256="0hrrwil7vcym7zjbnzviw13p60y14w660vndvc2lm5lmhbb8nhcn"; depends=[ape coda deSolve]; };
+  nLTT = derive2 { name="nLTT"; version="1.1.1"; sha256="0z3d61s6dfkvjv60qyx2mv5f0w1jg0qh5kb3vch3m2am5rbg9fq3"; depends=[ape coda deSolve]; };
   nabor = derive2 { name="nabor"; version="0.4.6"; sha256="0kd0h8n5yrn16vrfdchdiqzws05q0fm8z577p20dm18gdcs2vbxv"; depends=[BH Rcpp RcppEigen]; };
   nadiv = derive2 { name="nadiv"; version="2.14.1"; sha256="1k94shkcdylaqm2j7yp23nx0c7c6n0a9im3afmfkws2ax6bf2yjf"; depends=[Matrix]; };
   namespace = derive2 { name="namespace"; version="0.9.1"; sha256="1bsx5q19l7m3q2qys87izvq06zgb22b7hqblx0spkvzgiiwlq236"; depends=[]; };
   nanop = derive2 { name="nanop"; version="2.0-6"; sha256="007gdc93pk0vpfmsw7zgfma2k1045n2cxwwsyy276smy0ys9fdhp"; depends=[distrEx rgl]; };
   nasaweather = derive2 { name="nasaweather"; version="0.1"; sha256="05pqrsf2vmkzc7l4jvvqbi8wf9f46854y73q2gilag62s85vm9xb"; depends=[]; };
-  nat = derive2 { name="nat"; version="1.7.0"; sha256="1bdkndj4klvm8i19sw60gpqhbdbsmxn3rrk0iyhd097k96qipkj6"; depends=[digest filehash igraph nabor nat_utils plyr rgl yaml]; };
+  nat = derive2 { name="nat"; version="1.8.1"; sha256="0w6gsq4vcn8xh05yxb4ipgn69n8lba9ia56ahx2q7dw8mj9mpk9v"; depends=[digest filehash igraph nabor nat_utils plyr rgl yaml]; };
   nat_nblast = derive2 { name="nat.nblast"; version="1.5"; sha256="1slpk126fwgn90j3aazlf3pw2ij050dghc1yqadv6mjcj82qpm5i"; depends=[dendroextras nabor nat plyr rgl spam]; };
-  nat_templatebrains = derive2 { name="nat.templatebrains"; version="0.6.1"; sha256="154ja5dyf5msd91x6wszszmpgcnwj9dpdlhg5ncvl9gsp2h8sj43"; depends=[digest igraph nat rappdirs rgl]; };
+  nat_templatebrains = derive2 { name="nat.templatebrains"; version="0.6.2"; sha256="1yc0k5nsg6nmxf3wmhr5prbz2l820z62xjayi83mz3jpzwilz4by"; depends=[digest igraph nat rappdirs rgl]; };
   nat_utils = derive2 { name="nat.utils"; version="0.5.1"; sha256="12g87ar795xfbz7wljksb24x9hqvcirjr50y4mbpx1427r0l7clv"; depends=[]; };
   naturalsort = derive2 { name="naturalsort"; version="0.1.2"; sha256="0m8a8z0n5zmmgpmpn5w87j2jfsz1igz3x133z3q25h8jlyaxy750"; depends=[]; };
   nbconvertR = derive2 { name="nbconvertR"; version="1.0.2"; sha256="1dc9jxfibvb27qwiykj93322nb1ahwrg69zqcc0p9xp0rpsim02w"; depends=[]; };
   nbpMatching = derive2 { name="nbpMatching"; version="1.4.5"; sha256="1bglrzhap9rar6c8c2c5009l1ljq44mys66jpafw4xyw2pq7djqg"; depends=[Hmisc MASS]; };
-  ncappc = derive2 { name="ncappc"; version="0.2"; sha256="0s1yx1bnahq5a5lryf23rzd8cyvk1q1psqkl9x5nr71by0j9jbs6"; depends=[ggplot2 gridExtra gtable knitr reshape2 scales testthat xtable]; };
+  ncappc = derive2 { name="ncappc"; version="0.2.1.0"; sha256="1mfq655micjlicff10a3a0d3wi0gqkj4d92g1wbmqfsz511p5qgx"; depends=[dplyr ggplot2 gridExtra gtable knitr lazyeval readr reshape2 scales testthat xtable]; };
   ncbit = derive2 { name="ncbit"; version="2013.03.29"; sha256="0f07h8v68119rjvgm84b75j0j7dvcrl6dq62vp41adlm2hgjg024"; depends=[]; };
-  ncdf = derive2 { name="ncdf"; version="1.6.8"; sha256="1vrbrrqij7p712wfrki09749yryzr9lg4p95yqvb0zzggqpw2snm"; depends=[]; };
+  ncdf = derive2 { name="ncdf"; version="1.6.9"; sha256="1l0a1q2qym19070d4j31f95ak2xz8wg0mw5kxyzg93rsvhmjbnsq"; depends=[]; };
   ncdf_tools = derive2 { name="ncdf.tools"; version="0.7.1.295"; sha256="1jgxivmg2gzvkn09n13i5xr1v0xcyp5ckhwxz6g5kdh9z2dkjhc2"; depends=[abind chron JBTools plotrix raster RColorBrewer RNetCDF]; };
-  ncdf4 = derive2 { name="ncdf4"; version="1.14"; sha256="1yahvvd170qvd0js0r9hy9w1qb92brpgrgdrzqd187jfqc64ch5w"; depends=[]; };
+  ncdf4 = derive2 { name="ncdf4"; version="1.15"; sha256="0kad69py4nhlsl4xmsfdisx0kzcjch91c0m786h80v3w67s9i0nm"; depends=[]; };
   ncdf4_helpers = derive2 { name="ncdf4.helpers"; version="0.3-3"; sha256="051akd7r6zx805a0xwcs95q5sd8alag0f1gzqjk3n188q8r3ji5j"; depends=[abind ncdf4 PCICt]; };
-  ncf = derive2 { name="ncf"; version="1.1-5"; sha256="03nbmg9swxhpwrmfjsanp6fj5l2nw160sys70mj10a0ljlaf904z"; depends=[]; };
+  ncf = derive2 { name="ncf"; version="1.1-6"; sha256="1c0ia6lv36lvqsl16s0a450adkab366k28bcdhff3g31i04xh8mk"; depends=[]; };
   ncg = derive2 { name="ncg"; version="0.1.1"; sha256="1jzkzp61cc5jxmdnl867lcrjjm7y2iw9imzprbd098p1j3w8fvj7"; depends=[]; };
   ncvreg = derive2 { name="ncvreg"; version="3.5-0"; sha256="0r5k4ny72vd59kfz5dlqcznpir03fbzjly7ikqid9zpmw1vkhz9v"; depends=[]; };
   ndl = derive2 { name="ndl"; version="0.2.17"; sha256="08h01rw7gsa31zp91q2rsw1ba9yf0fyhz3w8s9xq5788qwc80280"; depends=[Hmisc MASS Rcpp]; };
-  ndtv = derive2 { name="ndtv"; version="0.7.0"; sha256="1647zicnfzflnk843226hv132f7j61f86mz6j4dqng6x68spgq66"; depends=[animation base64 jsonlite MASS network networkDynamic sna statnet_common]; };
+  ndtv = derive2 { name="ndtv"; version="0.8.0"; sha256="04z9nnhygadhszrlmkbnqr7ql7nkqlawn19qgq0y605ipq7ngr67"; depends=[animation base64 jsonlite MASS network networkDynamic sna statnet_common]; };
   neariso = derive2 { name="neariso"; version="1.0"; sha256="1npfd5g5xqjpsm5hvhwy7y84sj5lqw9yzbnxk6aqi80gfxhfml4c"; depends=[]; };
+  needs = derive2 { name="needs"; version="0.0.2"; sha256="1w24jxkm456by9fm5wmdxv8gspd78p95jar9b22x1r9jry4nfmhk"; depends=[]; };
   needy = derive2 { name="needy"; version="0.2"; sha256="1ixgpnwrg6ph1n5vy91qhl1mqirli9586nzkmfvzjrhdvrm0j5l0"; depends=[]; };
   negenes = derive2 { name="negenes"; version="1.0-3"; sha256="19xlw3l90gwan0p40r0s2xy0yv8id32h1i56496spgi02vh3pnsl"; depends=[]; };
   neldermead = derive2 { name="neldermead"; version="1.0-10"; sha256="1snavf90yb12sydic7br749njbnfr0k7kk20fy677mg648sf73di"; depends=[optimbase optimsimplex]; };
@@ -5367,13 +5496,14 @@ in with self; {
   nephro = derive2 { name="nephro"; version="1.1"; sha256="06lxkk67n5whgc78vrr7gxvnrz38pxlsj4plj02zv9fwlzbb9h6p"; depends=[]; };
   nestedRanksTest = derive2 { name="nestedRanksTest"; version="0.2"; sha256="0r08jp8036cz2dl1mjf4qvv5qdcvsrad3cwj88x31xx35c4dnjgj"; depends=[]; };
   netClass = derive2 { name="netClass"; version="1.2.1"; sha256="04yrj71l5p83rpwd0iaxdkhm49z9qp3h6b7rp9cgav244q060m9y"; depends=[AnnotationDbi graph igraph kernlab Matrix ROCR samr]; };
-  netassoc = derive2 { name="netassoc"; version="0.6.0"; sha256="1lc51aqiliqmvklxilzd4wlnrzv1q6aik3cj5rz33ca17mvdvblz"; depends=[corpcor huge igraph rags2ridges vegan]; };
+  netassoc = derive2 { name="netassoc"; version="0.6.2"; sha256="01h0nnyrgv08bxyl01lqsqnj69bhkwci692h77vfa7cf8rsm67kg"; depends=[corpcor huge igraph infotheo rags2ridges vegan]; };
+  netgen = derive2 { name="netgen"; version="1.2"; sha256="18rr2wx0yjfayf6vjyhc73byxvx65wrkyjczj2alzkvysax7xrck"; depends=[BBmisc checkmate ggplot2 igraph lhs lpSolve mvtnorm stringr]; };
   netgsa = derive2 { name="netgsa"; version="2.0"; sha256="04id2wcrmi0lqvn4a8qhqkc3z076b8xd7jhw9hsmaz21g9cxdfx8"; depends=[corpcor cvTools glasso glmnet igraph]; };
   netmeta = derive2 { name="netmeta"; version="0.8-0"; sha256="0qadg3h9aa3qx51hvqikzb5s087r5ihmp6ffxg5x1bmw86yfi2bq"; depends=[magic meta]; };
   nets = derive2 { name="nets"; version="0.1"; sha256="0zshiavdi1z8mq6q93vsyb5wx5nq37qln9gcyvamvi2pgy5xg4k2"; depends=[igraph]; };
   nettools = derive2 { name="nettools"; version="1.0.1"; sha256="13fw316r31g9cjlbyy9qfccsyagxb6pyvn5k32f166b7vj92mk1q"; depends=[combinat dtw igraph Matrix minerva minet rootSolve WGCNA]; };
   network = derive2 { name="network"; version="1.13.0"; sha256="11sg330xb7gcnl3f6lwhhjdabz6mk43828i2np635pqw4s4yl13s"; depends=[]; };
-  networkD3 = derive2 { name="networkD3"; version="0.2.6"; sha256="04lvkzg0g4v979qrjnk0jdw17q1rl59x5iqdg8r0h9iwlmrgsy0d"; depends=[htmlwidgets]; };
+  networkD3 = derive2 { name="networkD3"; version="0.2.8"; sha256="0w3wax4sfi67k9qjfkz5xfkqzr7ssmkm912snvfbxyynclkzbdrj"; depends=[htmlwidgets]; };
   networkDynamic = derive2 { name="networkDynamic"; version="0.8.1"; sha256="1ypxamgbmlswx24nrsahzjj86a44d2flkn37hlj8apxpfpi4b2bq"; depends=[network statnet_common]; };
   networkDynamicData = derive2 { name="networkDynamicData"; version="0.1.0"; sha256="1vln4n8jldqi1a6qb9j9aaxyjb8pfgwd8brnsqr8hp9lm3axd24b"; depends=[network networkDynamic]; };
   networkTomography = derive2 { name="networkTomography"; version="0.3"; sha256="1hd7av231zz0d2f9ql5p6c95k7dj62hp0shdfshmyfjh8900amw7"; depends=[coda igraph KFAS limSolve plyr Rglpk]; };
@@ -5387,13 +5517,13 @@ in with self; {
   ngram = derive2 { name="ngram"; version="1.1"; sha256="0p5wm55anch1i0y3478f5d4sivs7q8j3kwlg89nk3337win06499"; depends=[]; };
   ngramrr = derive2 { name="ngramrr"; version="0.1.1"; sha256="1h12nm0dg2mkq5b2zn12cij24nl8inqn04m4jxdi1lr6r81y1wsq"; depends=[tau]; };
   ngspatial = derive2 { name="ngspatial"; version="1.0-5"; sha256="0dd7gm6irq08054ndj2gykz4nnfqfq3wbivg6fmlkdnn18kbckkk"; depends=[batchmeans Rcpp RcppArmadillo]; };
-  nhanesA = derive2 { name="nhanesA"; version="0.6.1"; sha256="0nfwym2b7qhkv77drklg9rzi6xybc62kcaqqh2wg20vn8rd50x8d"; depends=[Hmisc magrittr plyr rvest stringr xml2]; };
+  nhanesA = derive2 { name="nhanesA"; version="0.6.2.1"; sha256="1fsrbgs11vycpm37skpnf9shzvqsy32rbprnymdfa0vdh9qkm464"; depends=[Hmisc magrittr plyr rvest stringr xml2]; };
   nhlscrapr = derive2 { name="nhlscrapr"; version="1.8"; sha256="0y2shw3g84flh88a15czdsb62xwdqxhvzkn4kpbn0k9ddyfzxc48"; depends=[biglm bitops RCurl rjson]; };
   nice = derive2 { name="nice"; version="0.4"; sha256="1alq8n8pchn9v0fvwrifdisazkh519x109bqgnpgnwf79wblmnhy"; depends=[]; };
   nicheROVER = derive2 { name="nicheROVER"; version="1.0"; sha256="0sa7wfpzkin78vz48vwa5iac82v5l1s3zczdxz8sc2kyg22fj0aw"; depends=[mvtnorm]; };
   nivm = derive2 { name="nivm"; version="0.3"; sha256="111jkgirgsl1j36xgwi81wzwxial3vdw8mqzi1faldxxd9a2cixm"; depends=[bpcp ssanv]; };
   nlWaldTest = derive2 { name="nlWaldTest"; version="1.0.1"; sha256="1rwpkkddivpcamhsp22nmy5gz2006y9kbdzj8lhh20s1vsyhn2b3"; depends=[numDeriv stringr]; };
-  nleqslv = derive2 { name="nleqslv"; version="2.9"; sha256="06x3qcscsf9cfhppw3ha1g3br3p7fy4z7ijhmg087m119laag9cx"; depends=[]; };
+  nleqslv = derive2 { name="nleqslv"; version="2.9.1"; sha256="0f8wc4mc398hi0knis4qal9icczgk4rnwsyqbxj39zil1sgyy6qx"; depends=[]; };
   nlme = derive2 { name="nlme"; version="3.1-122"; sha256="08kcfd5ayrznd8sabhh1wi1psx2l8jai5cgj1axcjvaa5l1r7i1n"; depends=[lattice]; };
   nlmeODE = derive2 { name="nlmeODE"; version="1.1"; sha256="1zp1p98mzbfxidl87yrj2i9m21zlfp622dfnmyg8f2pyijhhn0y2"; depends=[deSolve lattice nlme]; };
   nlmeU = derive2 { name="nlmeU"; version="0.70-3"; sha256="05kxymgybziiijpb17bhcd9aq4awmp5km67l2py9ypakivi0hc6l"; depends=[nlme]; };
@@ -5411,6 +5541,7 @@ in with self; {
   nlts = derive2 { name="nlts"; version="0.2-0"; sha256="14kvzc1p4anj9f7pg005pcbmc4k0917r49pvqys9a0a51ira67vb"; depends=[acepack locfit]; };
   nmcdr = derive2 { name="nmcdr"; version="0.3.0"; sha256="1557pdv7mqdjwpm6d9zw3zfbm1s8ai3rasd66nigscmlq102w745"; depends=[CDFt]; };
   nnet = derive2 { name="nnet"; version="7.3-11"; sha256="0kg5br2m6pn82hki1hsr7q6cjvzi92y4338qfq7c3iwy9zxd57lp"; depends=[]; };
+  nnetpredint = derive2 { name="nnetpredint"; version="1.2"; sha256="1c6s9wm6vhylwv4xhp2hkllw18zj8hdr17ls9vlxm9qs3wx1v48w"; depends=[RSNNS]; };
   nnlasso = derive2 { name="nnlasso"; version="0.2"; sha256="1q1psc6s5xw2nsz09q20n5rksq07gx21q9ap22dr7haln5jrvpzr"; depends=[]; };
   nnls = derive2 { name="nnls"; version="1.4"; sha256="07vcrrxvswrvfiha6f3ikn640yg0m2b4yd9lkmim1g0jmsmpfp8f"; depends=[]; };
   nodeHarvest = derive2 { name="nodeHarvest"; version="0.7-3"; sha256="0nh3g50rk9qzrarpf29kijwkz9v60682i0ag77j2ipyvhhbpwpkc"; depends=[quadprog randomForest]; };
@@ -5437,7 +5568,7 @@ in with self; {
   novelist = derive2 { name="novelist"; version="1.0"; sha256="0wzx0vkqvl9sfhbbrzylsxhm3qmjj5w8sy5w6gvd104fn84d49yk"; depends=[]; };
   noweb = derive2 { name="noweb"; version="1.0-4"; sha256="17s65m1m8bj286l9m2h54a8j799xaqadwfrml11732f8vyrzb191"; depends=[]; };
   np = derive2 { name="np"; version="0.60-2"; sha256="0zs1d4mmgns7s26qcplf9mlz9rkp6f9mv7abb0b9b2an23y6gmi5"; depends=[boot cubature]; };
-  npIntFactRep = derive2 { name="npIntFactRep"; version="1.4"; sha256="0bsal3f3jhr32jz8gjfp5f2nb11wyx6p4s9zn0nz3a3792mgb789"; depends=[ez plyr]; };
+  npIntFactRep = derive2 { name="npIntFactRep"; version="1.5"; sha256="14ms66ppzb4jjsa3fparic6gdn913f6wv2ccjyb02j1ahs4iaa4g"; depends=[ez plyr]; };
   nparACT = derive2 { name="nparACT"; version="0.1"; sha256="1sbajmn1fkvk4ay0daspnmd04qgpq34hvhc1cz4k94zx4nkh8lwx"; depends=[ggplot2 stringr zoo]; };
   nparLD = derive2 { name="nparLD"; version="2.1"; sha256="1asq00lv1rz3rkz1gqpi7f83p5vhzfib3m7ka1ywpf2wfbfng27n"; depends=[MASS]; };
   nparcomp = derive2 { name="nparcomp"; version="2.6"; sha256="111ypwyc885lvn64a5sb2k552j6wr3iihmhgx5y475axdiva5pzf"; depends=[multcomp mvtnorm]; };
@@ -5469,8 +5600,11 @@ in with self; {
   nutshell_bbdb = derive2 { name="nutshell.bbdb"; version="1.0"; sha256="19c4047rjahyh6wa6kcf82pj09smskskvhka9lnpchj13br8rizw"; depends=[]; };
   nws = derive2 { name="nws"; version="1.7.0.1"; sha256="1fn92n6brjhh8hpvhax7211cphx2cn0rl99kjqksig6z7242c316"; depends=[]; };
   nycflights13 = derive2 { name="nycflights13"; version="0.1"; sha256="15bqaphxwqpdzr4bkn6qgbjb3knja5hk34qxjd6xhpjzkgfs5c0b"; depends=[]; };
+  oaColors = derive2 { name="oaColors"; version="0.0.4"; sha256="040sdqrk9dciylnnrrshlj06s9qhvngii9shx1p8412ip7mk8r1m"; depends=[MASS RColorBrewer]; };
+  oaPlots = derive2 { name="oaPlots"; version="0.0.25"; sha256="0c5ig1ar02vg38pjjmp3gd53ij1j7pzajs0zrlfajz141qkv2ysr"; depends=[ggplot2 oaColors]; };
   oai = derive2 { name="oai"; version="0.1.0"; sha256="1cd1z51z343bh0kbw5j77zgldqhfvfmd9n0dnkzp7hfpq4py3nwp"; depends=[httr xml2]; };
   oapackage = derive2 { name="oapackage"; version="2.0.23"; sha256="1kkwxwgb23i4m8dlh1ybskardwf8ql0m18cv9c5zi1qd2vkk5dx0"; depends=[RcppEigen]; };
+  oasis = derive2 { name="oasis"; version="0.99.5"; sha256="03jcy766bj3z9km2jlf2wpjkfvkryffkjlvchpyh5hgfkm4vs2cv"; depends=[fslr oro_nifti]; };
   oaxaca = derive2 { name="oaxaca"; version="0.1.2"; sha256="1ghdrpjp2p4nlwskvs8n8d8ixzf3cdq9k9q49zvq8ag0dhwyswzd"; depends=[Formula ggplot2 reshape2]; };
   objectProperties = derive2 { name="objectProperties"; version="0.6.5"; sha256="0wn19byb1ia5gsfmdi6cj05pnlxbr3zcrjabjg3g1d7b58nz7wlh"; depends=[objectSignals]; };
   objectSignals = derive2 { name="objectSignals"; version="0.10.2"; sha256="1rcgfq1i3nz2q93vv4l069f3mli1c6fd5dhhhw1p7cc4sy81008w"; depends=[]; };
@@ -5485,7 +5619,7 @@ in with self; {
   ocean = derive2 { name="ocean"; version="0.2-4"; sha256="1554iixfbw3k6w9xh3hgbiygszqvj5ci431cfmnx48jm27h2alqg"; depends=[ncdf4 proj4]; };
   ocedata = derive2 { name="ocedata"; version="0.1.3"; sha256="0lzsyaz8zb6kiw86fnaav2g2wfdhyicxvm81ly5a9z4mjch3qj02"; depends=[]; };
   ocomposition = derive2 { name="ocomposition"; version="1.1"; sha256="0fk8ia95yjlvyvmjw7qg72piqa40kcqq9wlb3flc6a81pys1ycb5"; depends=[bayesm coda]; };
-  odds_converter = derive2 { name="odds.converter"; version="1.2"; sha256="1vbbi8w0yayi22lmg1wfzpf2bmdsx0h0w3h1msm2c1h16qyyrxr8"; depends=[]; };
+  odds_converter = derive2 { name="odds.converter"; version="1.3"; sha256="0pa0figal4p42iy83lfj9fmnlakac7blfbmcic67qd19bdn88jz2"; depends=[]; };
   odeintr = derive2 { name="odeintr"; version="1.3"; sha256="12y5hr6f7bj3aqj4gd0hlj495c5163jn0liksspk5jpqcmpsgdg3"; depends=[BH Rcpp]; };
   odfWeave = derive2 { name="odfWeave"; version="0.8.4"; sha256="1rp9j3snkkp0fqmkr6h6pxqd4cxkdfajgh4vlhpz56gr2l9j48q5"; depends=[lattice XML]; };
   odfWeave_survey = derive2 { name="odfWeave.survey"; version="1.0"; sha256="0cz7dxh1x4aflvfrdzhi5j64ma5s19ma8fk9q2m086j11a1dw3jn"; depends=[odfWeave survey]; };
@@ -5494,19 +5628,20 @@ in with self; {
   okmesonet = derive2 { name="okmesonet"; version="0.1.5"; sha256="1kzyzmg702ayzphn9jsk64m51mlnz37ylxiwq5gsr23vaiida680"; depends=[plyr]; };
   olctools = derive2 { name="olctools"; version="0.2.1"; sha256="0hnsv5b283lscj3b3pygjzyghc0glpavpijl7drv59ka9914ixl6"; depends=[Rcpp]; };
   omd = derive2 { name="omd"; version="1.0"; sha256="0s1wcgivqapbkzjammga8m12gqgw113729kzfzgn02nsfzmsxspv"; depends=[]; };
+  omics = derive2 { name="omics"; version="0.1-1"; sha256="16xvj8hs2iiaqjaipvj9ras5l3vwhvgyikdml08wpl53rx5falhi"; depends=[lme4 pheatmap]; };
   oncomodel = derive2 { name="oncomodel"; version="1.0"; sha256="1jyyq9znffiv7rg26mjldbwc5yi2f4f8npsd2ykhxyacb3g96fp1"; depends=[ade4]; };
   onemap = derive2 { name="onemap"; version="2.0-4"; sha256="00xmhm5qy0ycw0mnlyl20vfw0wxmpb36f07k0jj92c4zbpwjiygx"; depends=[tkrplot]; };
-  onewaytests = derive2 { name="onewaytests"; version="1.0"; sha256="0k249cdy1j7gc9c7bajgv29jshv5c4yqm1145w9rfvq2rs40vx7r"; depends=[]; };
+  onewaytests = derive2 { name="onewaytests"; version="1.1"; sha256="13d2jcj8sb3gvv0k73bcaplsf2i2hf8fswcnvykpnps9lb6kvn0v"; depends=[]; };
   onion = derive2 { name="onion"; version="1.2-4"; sha256="0x3n9mwknxjwhpdg8an0ilix5cb8dyy5fqnb6nxx7ww885k0381a"; depends=[]; };
   onlinePCA = derive2 { name="onlinePCA"; version="1.3"; sha256="11dp1fxb26rzv2743wgwyrc35bslm57yi3a57r7wjixkp9vf9kkb"; depends=[rARPACK Rcpp RcppArmadillo]; };
   onls = derive2 { name="onls"; version="0.1-1"; sha256="0m7pnlzkqwzi6jncjzxzfvznipd4wg03zd9fc0ymwm9jvhm4p14g"; depends=[minpack_lm]; };
   opefimor = derive2 { name="opefimor"; version="1.2"; sha256="06j5diwp42x7yrhclwyiimfwmx66y23dkwlnkd2lj2zcsgam9s8w"; depends=[]; };
   openNLP = derive2 { name="openNLP"; version="0.2-5"; sha256="0jc4ii6zsj0pf6nlx3l0db18p6whp047gzvc7q0dbwpa8q4il2mb"; depends=[NLP openNLPdata rJava]; };
   openNLPdata = derive2 { name="openNLPdata"; version="1.5.3-2"; sha256="1472gg651cdd5d9xjxrzl3k7np77liqnh6ysv1kjrf4sfx13pp9q"; depends=[rJava]; };
-  openair = derive2 { name="openair"; version="1.6.5"; sha256="1y9xglhs9hgfqp2cxai0y8q043w9d8xjsm7h2hbkbidvn8z6h668"; depends=[cluster dplyr hexbin lattice latticeExtra lazyeval mapdata mapproj maps mgcv plyr RColorBrewer Rcpp reshape2 RgoogleMaps]; };
+  openair = derive2 { name="openair"; version="1.6.7"; sha256="08bvcf0vsb3wz2mc3kdlwb5j1yw060qz0g6yrxpbwvpriyyprpal"; depends=[cluster dplyr hexbin lattice latticeExtra lazyeval mapdata mapproj maps mgcv plyr RColorBrewer Rcpp reshape2 RgoogleMaps]; };
   opencpu = derive2 { name="opencpu"; version="1.5.1"; sha256="09lbxwnjzrdgiq3hi2ak3ary4nqfv1368rrbxrf32ki5qh9is8la"; depends=[brew devtools evaluate httpuv httr jsonlite knitr openssl]; };
   openintro = derive2 { name="openintro"; version="1.4"; sha256="1k6pzlsrqikbri795vic9h191nf2j7v7hjybjfkrx6847c1r4iam"; depends=[]; };
-  openssl = derive2 { name="openssl"; version="0.6"; sha256="1j26pna2p6bb5i3274fp21ww42izaiyk1n2vpwa4bw8d6068x6qr"; depends=[]; };
+  openssl = derive2 { name="openssl"; version="0.8"; sha256="1l56bap1gmr1mq90i6465ihihgq1vwy8qspskjm558pyimrxiv58"; depends=[]; };
   opentraj = derive2 { name="opentraj"; version="1.0"; sha256="13nqal96199l8vkgmkvl542ksnappkscb6rbdmdapxyi977qrgxk"; depends=[doParallel foreach maptools openair plyr raster reshape rgdal sp]; };
   openxlsx = derive2 { name="openxlsx"; version="3.0.0"; sha256="1vx5qmhlyrlwrswbhd95jjcsldcdpdp7gs341dmham26sdzdx658"; depends=[Rcpp]; };
   operator_tools = derive2 { name="operator.tools"; version="1.4.4"; sha256="1ridxi3pbylb4flfgn371n1v9796rnd1ndxhh6ijyzpysqqmwi08"; depends=[]; };
@@ -5517,7 +5652,7 @@ in with self; {
   optCluster = derive2 { name="optCluster"; version="1.0.1"; sha256="13vph76wmhr7rg036fvn7i9nfanhxg3y5rnycrniybz3ny1q5paf"; depends=[cluster clValid gplots kohonen MBCluster_Seq mclust RankAggreg]; };
   optR = derive2 { name="optR"; version="1.1.1"; sha256="1lr5n0g21jayb27b2j8zh16f1k28avzg7k2mwyc7rjhhxv8k9w1j"; depends=[]; };
   optextras = derive2 { name="optextras"; version="2013-10.28"; sha256="1sm025xwrpm5c63l4kiqfndxb7rwq2bcmidy4k2b24g5a8x7cpfv"; depends=[numDeriv]; };
-  optiRum = derive2 { name="optiRum"; version="0.37.1"; sha256="1r6sasra9jbz31jpwwi3bfkinq5kdx4amddsfgb7i5bzdw76g26l"; depends=[AUC data_table ggplot2 knitr plyr scales stringr XML]; };
+  optiRum = derive2 { name="optiRum"; version="0.37.3"; sha256="1g3kgfwa7ckh45v14qdi3gq9vy0zfpjaffcgpfapyylrsrnspy3f"; depends=[AUC data_table ggplot2 knitr plyr scales stringr XML]; };
   optifunset = derive2 { name="optifunset"; version="1.0"; sha256="18pvdl04ln1i0w30ljdb3k86j27zg2nvrn3ws54c1g6zg9haqhbg"; depends=[]; };
   optigrab = derive2 { name="optigrab"; version="0.7.3"; sha256="1vd4b6mh4a137nvsbpx71jibfd67va1m8iya1gasqiflm6qzszcx"; depends=[magrittr stringi]; };
   optimbase = derive2 { name="optimbase"; version="1.0-9"; sha256="0ivz24kf3yacgq5bl3s3az1pcyhsz0cza5f8vdksy5gchwqplm8n"; depends=[Matrix]; };
@@ -5539,9 +5674,10 @@ in with self; {
   orddom = derive2 { name="orddom"; version="3.1"; sha256="165axs15fvwhrp89xd87l81q3h2qjll1vrwcsap645cwvb85nwsh"; depends=[psych]; };
   orderbook = derive2 { name="orderbook"; version="1.03"; sha256="0dlvjrzdhhh8js4g1lvxs46q7fdxfxavxnb4nj6xlwca75i51675"; depends=[hash lattice]; };
   orderedLasso = derive2 { name="orderedLasso"; version="1.7"; sha256="0vrh89nrmpi8xscvambcb1y70gqqi5819a2gxh02h4pnyjn8axql"; depends=[ggplot2 Iso Matrix quadprog reshape2]; };
+  ordiBreadth = derive2 { name="ordiBreadth"; version="1.0"; sha256="04faqhas1p9lxhghd4xq07yq1nxv7ns18avhvkql7sy5a9g7bfs1"; depends=[vegan]; };
   ordinal = derive2 { name="ordinal"; version="2015.6-28"; sha256="0lckjzjq2k8rlibrjf5s0ccf17vcvns5pgzvjjnl3wibr2ff4czs"; depends=[MASS Matrix ucminf]; };
   ordinalCont = derive2 { name="ordinalCont"; version="0.4"; sha256="1inms74l4zx6r526xd0v79v18bcqa76xwsgfvap0fizyv2dvgpim"; depends=[boot fastGHQuad ucminf]; };
-  ordinalNet = derive2 { name="ordinalNet"; version="1.1"; sha256="14pbi8w0xzanipj93qh7w65dn8rk562m2rh10w9l0g2zqammb4w3"; depends=[]; };
+  ordinalNet = derive2 { name="ordinalNet"; version="1.4"; sha256="06sbb7x46f9cp1dhvf0x3kzpy05766yi15kw7cpzpmfz1pvk9ixs"; depends=[]; };
   ordinalgmifs = derive2 { name="ordinalgmifs"; version="1.0.2"; sha256="1rbn2mb516hdr0chny1849m1aq0vb0vmr636b4fp914l5zh75vgi"; depends=[]; };
   ore = derive2 { name="ore"; version="1.2.1"; sha256="0bbliizfhfbpd75hyjvn9qq9k572vrlqvgp3bm4s48zf8zdsddid"; depends=[]; };
   orgR = derive2 { name="orgR"; version="0.9.0"; sha256="1q4qbwnbhmja8rqiph7g7m4wxhzhk9mh91x1jgbnky8bs4ljdgrx"; depends=[data_table ggplot2 ggthemes lubridate stringr]; };
@@ -5551,6 +5687,7 @@ in with self; {
   oro_dicom = derive2 { name="oro.dicom"; version="0.5.0"; sha256="05dmhfglp76apyilwicf3n2ylyjhp1gq6b9bnzsiiblpjnfpia43"; depends=[oro_nifti]; };
   oro_nifti = derive2 { name="oro.nifti"; version="0.5.2"; sha256="0zf5lb51b81602lwg118x3j2myrbrm6wjaflbpxxzqigz4q60rkg"; depends=[abind bitops]; };
   oro_pet = derive2 { name="oro.pet"; version="0.2.3"; sha256="06agl6rvd01h6mnilj0vl52dxw6b7b41vl6vmbvaq5qy1wmiaiz7"; depends=[oro_dicom oro_nifti]; };
+  orsifronts = derive2 { name="orsifronts"; version="0.1.1"; sha256="1js4q2s1mn263x8szl5q47ajfxv9lsjd5zyphwyhbkqrnd8ijd3w"; depends=[sp]; };
   orsk = derive2 { name="orsk"; version="1.0-2"; sha256="0h0h1z8ddn2nkc7c6c4s39sxwvav562p0lcwy13441rrlibywbhq"; depends=[BB BHH2]; };
   orthogonalsplinebasis = derive2 { name="orthogonalsplinebasis"; version="0.1.6"; sha256="07rbd0fhs2gsk7wj41y2h7wf6pfg324vzv2al753d8kqyx5ns2dj"; depends=[]; };
   orthopolynom = derive2 { name="orthopolynom"; version="1.0-5"; sha256="1gvhqx6jlh06hjmkmbsl83gri0gncrm3rkliyzyzmj75m8vz993d"; depends=[polynom]; };
@@ -5558,7 +5695,7 @@ in with self; {
   osmar = derive2 { name="osmar"; version="1.1-7"; sha256="0q6d8nw7d580bnx66mjc282dx45zw9srczz90b520hjcli4w3i3r"; depends=[geosphere RCurl XML]; };
   osrm = derive2 { name="osrm"; version="1.1"; sha256="0ib80fw4kj75gy750d1pp8ja9nb152nmwrm1gxqvrrc1kczwickj"; depends=[jsonlite RCurl reshape2 sp XML]; };
   ouch = derive2 { name="ouch"; version="2.9-2"; sha256="05c3bdxpjcgmimk0zl9744f0gmchhpm7myzjrx5fhpbp5h6jayaf"; depends=[subplex]; };
-  outbreaker = derive2 { name="outbreaker"; version="1.1-6"; sha256="0sk4qq2pgkl0iy3761xnxzadl4iqcf2ak872gqi5cgwq32a622cc"; depends=[adegenet ape igraph]; };
+  outbreaker = derive2 { name="outbreaker"; version="1.1-7"; sha256="0bq8an4hcs88279nkbn92x5s36i3sb64xqdlcrxy8fdk05w0cmg4"; depends=[adegenet ape igraph]; };
   outliers = derive2 { name="outliers"; version="0.14"; sha256="0vcqfqmmv4yblyp3s6bd25r49pxb7hjzipiic5a82924nqfqzkmn"; depends=[]; };
   overlap = derive2 { name="overlap"; version="0.2.4"; sha256="1pp3fggkbhif52i5lpihy7syhq2qp56mjvsxgbgwlcfbzy27ph1c"; depends=[]; };
   oz = derive2 { name="oz"; version="1.0-20"; sha256="1d420606ldyw2rhl8dh5hpscvjx6vanbq0hrg81m7b6v0q5rkfri"; depends=[]; };
@@ -5584,37 +5721,39 @@ in with self; {
   pacman = derive2 { name="pacman"; version="0.3.0"; sha256="10fjkr4zjcx7cyfmnpdnb96swxizhdqhvzgb5crymrafxqvg00c7"; depends=[devtools]; };
   paco = derive2 { name="paco"; version="0.2.3"; sha256="1qdaqy3m105wrafxjld6qhrvwcyrjb7ryrh782zpvy9m8yhy0p4j"; depends=[plyr vegan]; };
   paf = derive2 { name="paf"; version="1.0"; sha256="0wrqn67jfrjjxwcrkka6dljgi3mdk00vfjkzzcv2v7c97gx1zvwn"; depends=[survival]; };
-  pageviews = derive2 { name="pageviews"; version="0.1.0"; sha256="0r7h2pizrlij69cc9nh08x1s8pg4m2j8041p3sg005m4d3bp1zsg"; depends=[httr jsonlite]; };
+  pagenum = derive2 { name="pagenum"; version="1.0"; sha256="0iqx6lgbzcz5girw8cl934jcah7l32zdrbs70cxx8gs2x5rbfwkz"; depends=[]; };
+  pageviews = derive2 { name="pageviews"; version="0.1.1"; sha256="0va88ppxswrhmy6p6dks6mr25pw1shy10chmrhjwhb3vffyip7xk"; depends=[httr jsonlite]; };
   pairedCI = derive2 { name="pairedCI"; version="0.5-4"; sha256="03wf526n3bbr2ai44zwrdhbfx99pxq1nbng9wsbndrdg2ji4dar2"; depends=[]; };
   pairheatmap = derive2 { name="pairheatmap"; version="1.0.1"; sha256="1awmqr5n9gbqxadkblpxwcjl9hm73019bwwfwy1f006jpn050d6l"; depends=[]; };
   pairsD3 = derive2 { name="pairsD3"; version="0.1.0"; sha256="0ql6pqijf24pfyid52hmf5fmh4w1ca3sm47z9vknqpnjbn47v8q2"; depends=[htmlwidgets shiny]; };
-  pairwise = derive2 { name="pairwise"; version="0.2.5"; sha256="0r08v95f6f2safi6c0x84v5gib5qnkv46dmi97rdb9l2xzly249b"; depends=[]; };
+  pairwise = derive2 { name="pairwise"; version="0.3.1"; sha256="1p6cclq9dm8zqs6m1r1mlq80cgasrmrv5sjnqj6yw5wwn4rxry6w"; depends=[]; };
   pairwiseCI = derive2 { name="pairwiseCI"; version="0.1-25"; sha256="0wpv22db63xkgjw0nwa39clgrr2finxvl0a510hkc54ijqjx9ksh"; depends=[binMto boot coin MASS MCPAN mcprofile mratios]; };
   palaeoSig = derive2 { name="palaeoSig"; version="1.1-3"; sha256="1zm8xr7fpnnh6l4421vjavi6bg44iars3mna4r5fw3spmbswyv7b"; depends=[MASS mgcv rioja TeachingDemos vegan]; };
   paleoMAS = derive2 { name="paleoMAS"; version="2.0-1"; sha256="1hhb5wbj4m3ch8wnvd1zkl5bk6wa9nl6jl1dhm4z6yqkh29yn9z6"; depends=[lattice MASS vegan]; };
-  paleoTS = derive2 { name="paleoTS"; version="0.4-4"; sha256="19acfq5z42blk6ya7sj3sprddlgvhrzb9zqpvpy4q8siqkxxrjah"; depends=[mvtnorm]; };
+  paleoTS = derive2 { name="paleoTS"; version="0.5-1"; sha256="18f5lkgzvndc8s7w7d7dfdlqf37adrmzabpwkavjw1zkpb1dga8c"; depends=[doParallel foreach iterators mnormt]; };
   paleobioDB = derive2 { name="paleobioDB"; version="0.3"; sha256="1vcfssi6w0m2wd2smyjxp1zf0y48y95386kkb8qdndqw99g089w8"; depends=[gtools maps plyr raster RCurl rjson scales]; };
-  paleofire = derive2 { name="paleofire"; version="1.1.7"; sha256="16jh8dwwbd47nvn21f6rq5p4g29v2fd86vkizp2195c88dmgki54"; depends=[GCD ggplot2 lattice locfit plyr raster rgdal]; };
-  paleotree = derive2 { name="paleotree"; version="2.5"; sha256="1jn6yw8zk94j77kspd80nb28j1m0i1lpvlmwi72rfdwb5r51gdxy"; depends=[ape phangorn phytools]; };
+  paleofire = derive2 { name="paleofire"; version="1.1.8"; sha256="1g3m1chdqbivq5s7p1n53cfzq1cm5v0wkj4f4s0dih6pcid44si7"; depends=[GCD ggplot2 lattice locfit plyr raster rgdal]; };
+  paleotree = derive2 { name="paleotree"; version="2.6"; sha256="08861pvr86dbynx687vbxziq3v08ii6hx0g8h5zcskz87x32q2lc"; depends=[ape phangorn phytools]; };
   palettetown = derive2 { name="palettetown"; version="0.1.0"; sha256="0zpqbd9g50vyidd0chhk2xqlzx7mnzyilr4c84lci1xw3r3avxp0"; depends=[]; };
   palinsol = derive2 { name="palinsol"; version="0.92"; sha256="1jxy3qx8w1r8jwgdavf37gqjjqpizdqk218xcc7b77xi8w52vxpg"; depends=[gsl]; };
   palr = derive2 { name="palr"; version="0.0-4"; sha256="0rcb01lpi8zapnml1spx4ixxwbq9qh42sisqzrg7gxrkcjrbqxgl"; depends=[]; };
   pamctdp = derive2 { name="pamctdp"; version="0.3.1"; sha256="1fnadgfd2ikis49j9zl2ijj8gim8lpbygwxjj6ri9jyrc1qmj9jb"; depends=[ade4 FactoClass xtable]; };
-  pamm = derive2 { name="pamm"; version="0.7"; sha256="02py4zcymmwnlpsvha5cgc4ik8fp0gbsg86s5q7z5fl3ma3g669j"; depends=[gmodels lme4 mvtnorm]; };
+  pamm = derive2 { name="pamm"; version="0.9"; sha256="01dv70ca3zif2b2fkx4xjl24x9p9kc63wf0dj5agdjp5qgbkp1p5"; depends=[gmodels lattice lme4 lmerTest mvtnorm]; };
   pampe = derive2 { name="pampe"; version="1.1.2"; sha256="092n04nrp886kd163v32f5vhp9r7gnayxzqb6pj57ilm5w1yrcsk"; depends=[leaps]; };
   pamr = derive2 { name="pamr"; version="1.55"; sha256="1hy3khb0gikdr3vpjz0s245m5zang1vq8k93g7n9fq3sjfa034gd"; depends=[cluster survival]; };
   pan = derive2 { name="pan"; version="1.3"; sha256="08g0arwwkj9smkzyh6aicfrqvknag3n2xl55f7q7ghj09fhwg1br"; depends=[]; };
   pander = derive2 { name="pander"; version="0.6.0"; sha256="0jgylffc4ymvppaqsflxaj1l18c4x49jbz0b86jjsa00xqdyk4cn"; depends=[digest Rcpp]; };
   panelAR = derive2 { name="panelAR"; version="0.1"; sha256="1ka2rbl9gs65xh2y2m4aqwh5qj4szibjy101hqfmza9wmdh25gpq"; depends=[car]; };
   panelaggregation = derive2 { name="panelaggregation"; version="0.1"; sha256="19426hab4rvgn8k2c7x327k4ymihas59jbys0nmrfgg074x0xdnm"; depends=[data_table]; };
-  papeR = derive2 { name="papeR"; version="0.6-1"; sha256="1h3mfapn31qphaly01j5pw2ci65g4z0wh4m1wf5r808cspn0mya0"; depends=[car gmodels]; };
+  pangaear = derive2 { name="pangaear"; version="0.1.0"; sha256="0g5wgm1g3hbxwmlpra70zir9sl0zhd4xm6rj9bv98bszpzl3x6l6"; depends=[httr oai XML]; };
+  papeR = derive2 { name="papeR"; version="1.0-0"; sha256="0c8zljbw0pzaqx7j76245wpmk2104n0cvvddm6rf7v6cfvw72jws"; depends=[car gmodels xtable]; };
   parallelMCMCcombine = derive2 { name="parallelMCMCcombine"; version="1.0"; sha256="05krkd643awqhfrylq9lxr2cmgvnm1msn2x8p1l1483n2gzyklz7"; depends=[mvtnorm]; };
   parallelML = derive2 { name="parallelML"; version="1.2"; sha256="05j0rb81i8342m8drwgmgi1w30q96yf501d83cdq4zhjbchphbl1"; depends=[doParallel foreach]; };
   parallelMap = derive2 { name="parallelMap"; version="1.3"; sha256="026d018fr2a43cbh8bi2dklzr9fxjzdw5qyq84g2i18v5ibr6bd5"; depends=[BBmisc checkmate]; };
   parallelSVM = derive2 { name="parallelSVM"; version="0.1-9"; sha256="0nhxkllpjc3775gpivj8c5a9ssl42zgvswwaw1sdhwg3cxcib99h"; depends=[doParallel e1071 foreach]; };
   parallelize_dynamic = derive2 { name="parallelize.dynamic"; version="0.9-1"; sha256="03zypcvk1iwkgy6dmd5bxg3h2bqvjikxrbzw676804zi6y49mhln"; depends=[]; };
   paramlink = derive2 { name="paramlink"; version="0.9-7"; sha256="02h7znac93v8ibra3ni2psxc9lpfhiiw4q8asfyrx400345ifk5b"; depends=[kinship2 maxLik]; };
-  params = derive2 { name="params"; version="0.3.0"; sha256="19rqbsz3qjqcz5z7dlx5xamsg4vxv26ghlpbi39h7fgn1z0qd68j"; depends=[whisker]; };
+  params = derive2 { name="params"; version="0.4"; sha256="1axs59zald4vngi9g5r66q7pgzm7mpl3yxv39fbnvcd0bdin0a76"; depends=[whisker]; };
   paran = derive2 { name="paran"; version="1.5.1"; sha256="0nvgk01z2vypk5bawkd6pp0pnbgb54ljy0p8sc47c8ibk242ljqk"; depends=[MASS]; };
   parboost = derive2 { name="parboost"; version="0.1.4"; sha256="087b4as0w8bckwqpisq9mllvm523vlxmld3irrms13la23z6rjvf"; depends=[caret doParallel glmnet iterators mboost party plyr]; };
   parcor = derive2 { name="parcor"; version="0.2-6"; sha256="10bhw50g8c4ln5gapa7wghhb050a3jmd1sw1d1k8yljibwcbbx36"; depends=[Epi GeneNet glmnet MASS ppls]; };
@@ -5649,18 +5788,18 @@ in with self; {
   pauwels2014 = derive2 { name="pauwels2014"; version="1.0"; sha256="1b7whn13lgydc69kg1fhnwkxirw0nqq75cfvii0yg0j4p8r1lw42"; depends=[deSolve ggplot2]; };
   pavo = derive2 { name="pavo"; version="0.5-2"; sha256="13iy9dmg19v0gqg12224ci0zq8fa0ap2i0is8v0rkfp19wzy0ryg"; depends=[geometry mapproj rcdd rgl]; };
   pawacc = derive2 { name="pawacc"; version="1.2.1"; sha256="1l2wn69ynr5mza04a5mmzwzigqac8k9xkiaw7sdqv5hn9y7x3sj9"; depends=[SparseM]; };
-  pbapply = derive2 { name="pbapply"; version="1.1-2"; sha256="1i9g1dr21zpvr6k9b2v39hvakvigxjfvds8a29cc3lp1ykvhm75i"; depends=[]; };
+  pbapply = derive2 { name="pbapply"; version="1.1-3"; sha256="0gchlhmhl8jjv2wngy0c0kjhgbvkhr7sj6lcm9w7wjya89nnhawf"; depends=[]; };
   pbatR = derive2 { name="pbatR"; version="2.2-9"; sha256="1p8rj0lzm4pp1svgy7xia2sclkngzfjbgbikq94s6v92d582wncw"; depends=[rootSolve survival]; };
   pbdBASE = derive2 { name="pbdBASE"; version="0.2-3"; sha256="1zfz45fnjmp8yz4nlac9q1d49gpczkl2b0rz2s33jbv5i32z3yvs"; depends=[pbdMPI pbdSLAP rlecuyer]; };
   pbdDEMO = derive2 { name="pbdDEMO"; version="0.2-0"; sha256="0vilri4d25mb339zsgh1zypyqxv1vzfdc8b8ivqi5yz1nrzm05gz"; depends=[pbdBASE pbdDMAT pbdMPI pbdSLAP rlecuyer]; };
   pbdDMAT = derive2 { name="pbdDMAT"; version="0.2-3"; sha256="18x607r0gx1nnw9p305ci5sfcxbi5zdr2b6yf9y6vqjsckicnw62"; depends=[pbdBASE pbdMPI pbdSLAP rlecuyer]; };
-  pbdMPI = derive2 { name="pbdMPI"; version="0.2-5"; sha256="0g21zyl8dck5mxjsg4iif62ngrigj58hr8mzdvr47r1b081abzb4"; depends=[rlecuyer]; };
+  pbdMPI = derive2 { name="pbdMPI"; version="0.3-0"; sha256="1l3b9i8w48y713is2lcgjyx9xlc3ha2fnvq9pjr93g7wzxa3dnd6"; depends=[rlecuyer]; };
   pbdNCDF4 = derive2 { name="pbdNCDF4"; version="0.1-4"; sha256="0fd29mnbns30ck09kkh53dgj24ddrqzks4xrrk2hh1wiy7ap1h95"; depends=[]; };
   pbdPROF = derive2 { name="pbdPROF"; version="0.2-3"; sha256="0vk29vgsv7fhw240sagz0szg0wb649sqc05j1aj027zvz931vfl8"; depends=[ggplot2 gridExtra reshape2]; };
   pbdSLAP = derive2 { name="pbdSLAP"; version="0.2-0"; sha256="06q9k8y7k604wa2zfspjg2v3fybn5my1vyr7zsg6j66n9g4z6039"; depends=[pbdMPI rlecuyer]; };
-  pbdZMQ = derive2 { name="pbdZMQ"; version="0.1-1"; sha256="1b4bqdbnvvr7c1zp9k7vkd1ga3j17f6naab7lw47lcmj9y3ga0qm"; depends=[]; };
+  pbdZMQ = derive2 { name="pbdZMQ"; version="0.2-0"; sha256="13v3xp6mwb0i93vsx9wyg636gqk1q3mk6sgi90a5q8caa16ax2ag"; depends=[R6]; };
   pbivnorm = derive2 { name="pbivnorm"; version="0.6.0"; sha256="05jzrjqxzbcf6z245hlk7sjxiszv9paadaaimvcx5y5qgi87vhq7"; depends=[]; };
-  pbkrtest = derive2 { name="pbkrtest"; version="0.4-2"; sha256="1yppp24a8rl36x6sn1jjhhgs41irbf0z5nrv454g9qwhbvfgiay5"; depends=[lme4 MASS Matrix]; };
+  pbkrtest = derive2 { name="pbkrtest"; version="0.4-4"; sha256="0cdx79slxrhm8py5jcw2zacb48mwlsxwjv2g4p1dv87wycp3k1d6"; depends=[lme4 MASS Matrix]; };
   pbo = derive2 { name="pbo"; version="1.3.4"; sha256="0v522z36q48k4mx5gym564kgvhmf08fsadp8qs6amzbgkdx40yc4"; depends=[lattice]; };
   pbs = derive2 { name="pbs"; version="1.1"; sha256="0cpgs6k5h8y2cia01zs1p4ri8r7ljg2z4x8xcbx73s680dvnxa2w"; depends=[]; };
   pcIRT = derive2 { name="pcIRT"; version="0.2"; sha256="18rqyhkzjaqjvsyh3vr3dv9jwqvsa28d0vhnnzj72na6h6rx31w4"; depends=[combinat Rcpp]; };
@@ -5668,9 +5807,11 @@ in with self; {
   pcaBootPlot = derive2 { name="pcaBootPlot"; version="0.2.0"; sha256="1320d969znk9xvm1ylhc3a31nynhzyjpbg1fsryq72nhf8jxijaa"; depends=[FactoMineR RColorBrewer]; };
   pcaL1 = derive2 { name="pcaL1"; version="1.3"; sha256="026cgi812kvbkmaryd3lyqnb1m78i3ql2phlvsd2r691y1j8w532"; depends=[]; };
   pcaPP = derive2 { name="pcaPP"; version="1.9-60"; sha256="1rqq4zgik7cgnnnm8il1rxamp6q9isznac8fhryfsfdcawclfjws"; depends=[mvtnorm]; };
-  pcadapt = derive2 { name="pcadapt"; version="2.0.1"; sha256="08zn4qhcvglk6wxpl07pyhqlycyzrp3mygk00y8s5qylw4wy26m0"; depends=[MASS robust]; };
+  pcadapt = derive2 { name="pcadapt"; version="2.1"; sha256="1lf5l512pwxnxv9bd5qkxvdfx8wflcs56n8byp3i8f1bmgnn0ipd"; depends=[MASS robust]; };
   pcalg = derive2 { name="pcalg"; version="2.2-4"; sha256="0qx0impxh6pzbgdhpkbl13qfql4zpsa3xiy4hc640d15zxprv6zw"; depends=[abind bdsmatrix BH clue corpcor fastICA ggm gmp graph igraph RBGL Rcpp RcppArmadillo robustbase sfsmisc vcd]; };
+  pcev = derive2 { name="pcev"; version="1.1.1"; sha256="0vhn5514dnmhv98bchvsfd6pfjmvbc7hhb9zabgf8syk9rh8y9h8"; depends=[RMTstat]; };
   pcg = derive2 { name="pcg"; version="1.1"; sha256="194j72hcp7ywq1q3dd493pwkn1fmdg647gmhxcd1jm6xgijhvv87"; depends=[]; };
+  pch = derive2 { name="pch"; version="1.0"; sha256="0q9pmkxxff7dw9bai7a71ja7xc581gmvn7cjilk1h4rhl9dbr5b8"; depends=[survival]; };
   pcnetmeta = derive2 { name="pcnetmeta"; version="2.3"; sha256="1qcz18cac59i1c6limwknzwsl7svplls9i45jvvfqz91p8q68cgl"; depends=[coda rjags]; };
   pco = derive2 { name="pco"; version="1.0.1"; sha256="0k1m450wfmlym976g7p9g8arqrvnsxgdpcazk5kh3m3jsrvrcchf"; depends=[]; };
   pcse = derive2 { name="pcse"; version="1.9"; sha256="04vprsvcmv1ivxqrrvd1f8ifg493byncqvmr84fmc0jw5m9jrk3j"; depends=[]; };
@@ -5681,6 +5822,7 @@ in with self; {
   pdist = derive2 { name="pdist"; version="1.2"; sha256="18nd3mgad11f2zmwcp0w3sxlch4a9y6wp8dfdyzvjn7y4b4bq0dd"; depends=[]; };
   pdmod = derive2 { name="pdmod"; version="1.0"; sha256="1czpaghp2lcad4j6wxswdfw0n9m0phngy966zr4fr3ciqpx3q129"; depends=[mco]; };
   peacots = derive2 { name="peacots"; version="1.2"; sha256="1qrg6rzdnj0ba6igj4k9m1kc2q7gbwg8kwnmzhkjfza8jl8fqkf2"; depends=[]; };
+  peakPick = derive2 { name="peakPick"; version="0.11"; sha256="1zf7ff9arm4hkdxrfhb0p8p7npd51icy773g2raaqsfys825xwhm"; depends=[matrixStats]; };
   pear = derive2 { name="pear"; version="1.2"; sha256="1ixmyzm72s18qrfv2m8xzh5503k1q90lhddq4sp46m0q7qyxb192"; depends=[]; };
   pearson7 = derive2 { name="pearson7"; version="1.0-1"; sha256="0li32my02gv5yaf4q1w48pjbmij2njkpd15135n9mzjc5ibvf5kh"; depends=[]; };
   pec = derive2 { name="pec"; version="2.4.7"; sha256="1ra8gp46f99z291cbdaln0b5k9w124vi45ncwcvaf5lgxv7c8c74"; depends=[foreach prodlim rms survival]; };
@@ -5688,7 +5830,7 @@ in with self; {
   pedgene = derive2 { name="pedgene"; version="2.9"; sha256="1200d6blz7n3krnvhw0i9mz6219vwk0vlj17yzr3fqzyn5cyf91z"; depends=[CompQuadForm kinship2 Matrix survey]; };
   pedigree = derive2 { name="pedigree"; version="1.4"; sha256="1dqfvzcl6f15n4d4anjkd0h8vwsbxjg1lmlj33px8rpp3y8xzdgw"; depends=[HaploSim Matrix reshape]; };
   pedigreemm = derive2 { name="pedigreemm"; version="0.3-3"; sha256="1bpkba9nxbaxnivrjarf1p2p9dcz6smf9k2djawis1wq9dhylvsb"; depends=[lme4 Matrix]; };
-  pedometrics = derive2 { name="pedometrics"; version="0.6-3"; sha256="00jv9v3hrvh9jfl5vzkjh7frym9m6d9di4zv5ybwww2ba9rq2xaf"; depends=[lattice latticeExtra Rcpp]; };
+  pedometrics = derive2 { name="pedometrics"; version="0.6-6"; sha256="1w9wa73wva6z0d56g221l8qmc5igfypwsa2xq4sn4r501bdy8qpq"; depends=[lattice latticeExtra Rcpp]; };
   pegas = derive2 { name="pegas"; version="0.8-2"; sha256="1sci4m7vvxi8p8lwqkqng04pajrby0c4l91sav3ahvfgj6xldp9q"; depends=[adegenet ape]; };
   penDvine = derive2 { name="penDvine"; version="0.2.4"; sha256="0znpvsr7zy2wgy7znha1qiajcrz1z6mypi3f5hpims33z7npa7dl"; depends=[doParallel fda foreach lattice latticeExtra Matrix quadprog TSP]; };
   penMSM = derive2 { name="penMSM"; version="0.99"; sha256="1xdcxnagvjdpgnfa5914gb41v5y4lsvh63lbz1d2l8bl9mpff3lm"; depends=[Rcpp]; };
@@ -5717,14 +5859,15 @@ in with self; {
   pgirmess = derive2 { name="pgirmess"; version="1.6.3"; sha256="0rn6xhfm2cl2l4p0hdcgz34njq2wwbkb0qdyix84lb8wsly27mxx"; depends=[boot maptools rgdal rgeos sp spdep splancs]; };
   pglm = derive2 { name="pglm"; version="0.1-2"; sha256="1arn2gf0bkg0s59a96hyhrm7adw66d33qs2al2s0ghln6fyk8674"; depends=[maxLik plm statmod]; };
   pgmm = derive2 { name="pgmm"; version="1.2"; sha256="0f0wdcirjyxzg2139c055i035qzmhm01yvf97nrhp69h4hpynb2n"; depends=[]; };
+  pgnorm = derive2 { name="pgnorm"; version="2.0"; sha256="1k9z7pvmranr8m62v7amc0pj6lwzh3wqi79gg3mflifn1mr6c057"; depends=[]; };
   pgs = derive2 { name="pgs"; version="0.4-0"; sha256="1zf5sjn662sds3h06zk5p4g71qnpwp5yhw1dkjzs1rs48pxmagrx"; depends=[gsl R2Cuba]; };
   phalen = derive2 { name="phalen"; version="1.0"; sha256="0awj9a48dy0azkhqkkzf82q75hrsb2yw6dgbsvlsb0a71g4wyhlr"; depends=[sqldf]; };
-  phangorn = derive2 { name="phangorn"; version="1.99.14"; sha256="03llgrpmb443gxp73xj744g1zf9lklzfj01j4ifc5q5p8vq4q3a1"; depends=[ape igraph Matrix nnls quadprog]; };
+  phangorn = derive2 { name="phangorn"; version="2.0.1"; sha256="1g9ikxdmkchv0faayf6z2jgwr8jis7khpq8q0avkwqqnsdn5sair"; depends=[ape Biostrings igraph Matrix nnls quadprog]; };
   phaseR = derive2 { name="phaseR"; version="1.3"; sha256="1hwclb7lys00vc260y3z9428b5dgm7zq474i8yg0w07rxqriaq2h"; depends=[deSolve]; };
   phcfM = derive2 { name="phcfM"; version="1.2"; sha256="0i1vr8rmq5zs34syz2vvy8c9603ifzr9s5v2izh1fh8xhzg7655x"; depends=[coda]; };
-  pheatmap = derive2 { name="pheatmap"; version="1.0.7"; sha256="0dvflwkwvnlh36w5z3ai1q2rgclrgs1qzh01nxgz9kd23imqp0q8"; depends=[gtable RColorBrewer scales]; };
+  pheatmap = derive2 { name="pheatmap"; version="1.0.8"; sha256="1ik0k69kb4n7xl3bkx4p09kw08ri93855zcsxq1c668171jqfiji"; depends=[gtable RColorBrewer scales]; };
   phenability = derive2 { name="phenability"; version="2.0"; sha256="0can8qgdpfr4h6jfg23cnwh7hhmwv6538wg2jla9w138la7rhpd1"; depends=[calibrate]; };
-  phenex = derive2 { name="phenex"; version="1.0-7"; sha256="0q563cv9lskikf3ls0idp56lirw9gxn71rgxp9xn8an05gwdg0xr"; depends=[]; };
+  phenex = derive2 { name="phenex"; version="1.1-9"; sha256="14g81s4mh4ixxyv7w3wkcn0984c4kknar3mgl43vh5cjxj6v9gk2"; depends=[foreach]; };
   phenmod = derive2 { name="phenmod"; version="1.2-3"; sha256="0dxwx8c7zka29fq7svrvn8bghj8jh8grbrgsw4pvavx2439cldak"; depends=[gstat lattice pheno RColorBrewer]; };
   pheno = derive2 { name="pheno"; version="1.6"; sha256="0xdya1g1ap7h12c6zn3apbkxr725rjhcp4gbdchkvcnwz4y9vw8c"; depends=[nlme quantreg SparseM]; };
   pheno2geno = derive2 { name="pheno2geno"; version="1.3.1"; sha256="1k1hw5qxrwxy502zkcfcz0nxjqmvdk1fgghjc512vq7x5znblz3v"; depends=[mixtools qtl VGAM]; };
@@ -5734,9 +5877,10 @@ in with self; {
   phonR = derive2 { name="phonR"; version="1.0-3"; sha256="09wzsq92jkxy6cd89czshpj1hsp56v9jbgqr5a06rm6bv3spa31i"; depends=[deldir plotrix splancs]; };
   phonTools = derive2 { name="phonTools"; version="0.2-2.1"; sha256="01i481mhswsys3gpasw9gn6nxkfmi7bz46g5c84m13pg0cv8hxc7"; depends=[]; };
   phonenumber = derive2 { name="phonenumber"; version="0.2.2"; sha256="1m5idp538lvynmfp8m7l89js6hk5lpp26k419bdvj3hd3ap0n9lg"; depends=[]; };
+  phonics = derive2 { name="phonics"; version="0.5.4"; sha256="1qwh43az9dm3mnyjzki0lvxrpi3gb383gx5m34xr5rlqnxv0wfai"; depends=[BH Rcpp]; };
   phreeqc = derive2 { name="phreeqc"; version="3.3.1"; sha256="0jzzzmijlmrwmpv9xfj9lq9kppxgk6hmfbp90wj2bpnhyyhkchqi"; depends=[]; };
   phtt = derive2 { name="phtt"; version="3.1.2"; sha256="1fvvx5jilq5dlgh3qlfsjxr8jizy4k34a1g3lknfkmvn713ycp7v"; depends=[pspline]; };
-  phyclust = derive2 { name="phyclust"; version="0.1-15"; sha256="1j643k0mjmswsvp9jyiawkjf2qhfrw6xf4s2viqv987zxif2kd7z"; depends=[ape]; };
+  phyclust = derive2 { name="phyclust"; version="0.1-16"; sha256="19i5cpiss2k94zg03m00j9yc7zr0xsx3c8v8b7hkgv0kf9p40vjn"; depends=[ape]; };
   phyext2 = derive2 { name="phyext2"; version="0.0.4"; sha256="0j871kgqm9fll0vdgh071z77ib51y8pxxm0ssjszljvvpx1mb8rb"; depends=[ape phylobase]; };
   phylin = derive2 { name="phylin"; version="1.1.1"; sha256="1hxmh5jgcz41bhmi8kvimw0b6m4p3yq85bh79hl7xbx2kshxmvzq"; depends=[]; };
   phylobase = derive2 { name="phylobase"; version="0.8.0"; sha256="1zpypg6qrc39nl96k02qishw61sq4b62qw0mq3inmkrwf7w031m6"; depends=[ade4 ape Rcpp rncl RNeXML]; };
@@ -5750,18 +5894,18 @@ in with self; {
   phyndr = derive2 { name="phyndr"; version="0.1.0"; sha256="03y3j4ik6flrksqm2dwh2cihn12hzfdik0fsak4zbxjdzaqn5gim"; depends=[ape]; };
   phyreg = derive2 { name="phyreg"; version="0.7"; sha256="0saynhq4yvd4x2xaljcsfmqk7da2jq3jqk26fm9qivg900z4kf35"; depends=[]; };
   physiology = derive2 { name="physiology"; version="0.2.2"; sha256="0z394smbnmlrnp9ms5vjczc3avrcn5nxm8np5y58k86x470w6npz"; depends=[]; };
-  phytools = derive2 { name="phytools"; version="0.5-00"; sha256="10gnnbif3yhl7xxjxwp1h7hajal46kf6jg2nqrymxwp5q5z0kpmc"; depends=[animation ape clusterGeneration maps mnormt msm numDeriv phangorn plotrix scatterplot3d]; };
+  phytools = derive2 { name="phytools"; version="0.5-10"; sha256="1423p9qb44jgw89z5iaqx8zaydr6558fpmygxhkppaid9w13b0il"; depends=[animation ape clusterGeneration maps mnormt msm numDeriv phangorn plotrix scatterplot3d]; };
   phytotools = derive2 { name="phytotools"; version="1.0"; sha256="049znviv2vvzv23biy1l28axm7bc7biwmq4bnn0cnjqgkk48ysz3"; depends=[FME insol]; };
   pi0 = derive2 { name="pi0"; version="1.4-0"; sha256="0qwyfan21k23q4dilnl7hqjghzm8n2qfw21wbvnidr6n9hf2fjjs"; depends=[Iso kernlab limSolve LowRankQP Matrix numDeriv quadprog qvalue rgl scatterplot3d]; };
   picante = derive2 { name="picante"; version="1.6-2"; sha256="1zxpd8kh3ay6f3gdqkij1a6vnkr98dc1jib2r6br2kjyzshabcsd"; depends=[ape nlme vegan]; };
-  picasso = derive2 { name="picasso"; version="0.4.7"; sha256="1djsw0ahghzlqsw3wrxsvqf27vcb0a8knydfrsv4nfh2rffhckj9"; depends=[igraph lattice MASS Matrix]; };
+  picasso = derive2 { name="picasso"; version="0.5.0"; sha256="1m9fjpg6nx0c8fnh0m5g29gfrnprhzgzx5162r9sjf8i1xspawn4"; depends=[igraph lattice MASS Matrix]; };
   pid = derive2 { name="pid"; version="0.36"; sha256="1w6h09ddq8rv7k5xl4v6nhlkm0vnmim57mg0dzk2dv9dc4v8i141"; depends=[DoE_base FrF2 ggplot2 png]; };
   piecewiseSEM = derive2 { name="piecewiseSEM"; version="1.0.0"; sha256="0ax414alawzhh8n7wbvkv97r8lv5l9jjcsp8ki4v7bfp6bq9aspd"; depends=[ggm lavaan lme4 lmerTest nlme]; };
   pingr = derive2 { name="pingr"; version="1.1.0"; sha256="0j03qcsyckv3zh2v4m8wz8kyfl0k8qi71rm20rc0spy1s9ng7fcb"; depends=[]; };
-  pinnacle_API = derive2 { name="pinnacle.API"; version="1.89"; sha256="10c9vgi8wi7qamzpzrl92s7y2rb9277z090n7r6xj0vsp590n8nj"; depends=[dplyr httr jsonlite RCurl rjson uuid XML]; };
+  pinnacle_API = derive2 { name="pinnacle.API"; version="1.90"; sha256="10fpb7zsl22y61dsgxh2yphf5yn5b2dv42xd441q53xbpxsdhw7f"; depends=[dplyr httr jsonlite RCurl rjson uuid XML]; };
   pipe_design = derive2 { name="pipe.design"; version="0.3"; sha256="1idgy7s6fnydcda51yj1rjil2pd1r2y6g0m5dmn8sw7wmaq2n3h6"; depends=[ggplot2 gtools]; };
   pipeR = derive2 { name="pipeR"; version="0.6.0.6"; sha256="1d7vmccvh5ir26cv26mk0ay69rqmwmp0mgwjal9avfn9vrxq1fq3"; depends=[]; };
-  pitchRx = derive2 { name="pitchRx"; version="1.8.1"; sha256="0nn2f0sspjq2fslslv9klhdbb5ixyv78mqngprl3r3b1wmz1ij99"; depends=[ggplot2 hexbin MASS mgcv plyr XML2R]; };
+  pitchRx = derive2 { name="pitchRx"; version="1.8.2"; sha256="0lg0xab40r8wzrww986l5q9jkg1m83g4bhsbh0kr7f2rv90av662"; depends=[ggplot2 hexbin MASS mgcv plyr XML2R]; };
   pixiedust = derive2 { name="pixiedust"; version="0.5.0"; sha256="155kxckfpxags8iy33qkp8b9yn46qjzz7a510ja48290wqzjgs8s"; depends=[ArgumentCheck broom dplyr Hmisc htmltools knitr lazyWeave magrittr stringr tidyr]; };
   pixmap = derive2 { name="pixmap"; version="0.4-11"; sha256="04klxp6jndw1bp6z40v20fbmdmdpfca2g0czmmmgbkark9s1183g"; depends=[]; };
   pkgKitten = derive2 { name="pkgKitten"; version="0.1.3"; sha256="1f7jkriib1f19mc5mdrymg5xzdcyclfvh1220agy4lpyprxgza0f"; depends=[]; };
@@ -5777,9 +5921,9 @@ in with self; {
   plaqr = derive2 { name="plaqr"; version="1.0"; sha256="1vv15zqnmir5hi9ivyifzrc1rkn1sn5qj61by66iczmlmhqh17h8"; depends=[quantreg]; };
   playwith = derive2 { name="playwith"; version="0.9-54"; sha256="1zmm8sskchim3ba3l0zqfvxnrqfmiv94a8l6slcf3if3cf9kkzal"; depends=[cairoDevice gridBase gWidgets gWidgetsRGtk2 lattice RGtk2]; };
   plfMA = derive2 { name="plfMA"; version="1.0.1"; sha256="1lgcx8jdi4y3gnf4050cjb5krrbg99m7097r1hibv8kc3kcbjx46"; depends=[cairoDevice gWidgets gWidgetsRGtk2 limma]; };
-  plfm = derive2 { name="plfm"; version="1.1.2"; sha256="1dl2pv2v7kp39hlbk5kb33kzhg9dzxjxhafdjv9dqpqb9b77akm8"; depends=[abind sfsmisc]; };
+  plfm = derive2 { name="plfm"; version="2.1"; sha256="19l5n7syp6xcj4d5qxccsard70d5q8ph1f87prj2zgpq5spyp7an"; depends=[abind sfsmisc]; };
   plgp = derive2 { name="plgp"; version="1.1-7"; sha256="02g6saabrsd8pra0szbwcbilf6w5ywg2gxqb5zdvbxds2vw36hn0"; depends=[mvtnorm tgp]; };
-  plm = derive2 { name="plm"; version="1.4-0"; sha256="13y9s7gyrgqmnzafhn4c1zkz6gdawc8nr5nbrx0pn2mbw3fqfrjh"; depends=[bdsmatrix Formula MASS nlme sandwich zoo]; };
+  plm = derive2 { name="plm"; version="1.5-12"; sha256="0zsdm0d6vvyliz7k3l2b8xzp1qp8yahibczzhnrmm9py6sp8m7jz"; depends=[bdsmatrix car Formula lattice lmtest MASS nlme sandwich zoo]; };
   plmDE = derive2 { name="plmDE"; version="1.0"; sha256="19xxi0zzpxcrsdrbs0hiwqgnv2aaw1q3mi586wv27zz6lfqcr9lr"; depends=[limma MASS R_oo]; };
   plmm = derive2 { name="plmm"; version="0.1-1"; sha256="1dfxd1mqqjy2mf7qc6mh4wx5ya9q8fkqgrf01apisb66xxx5zya7"; depends=[Formula nlme sm]; };
   pln = derive2 { name="pln"; version="0.2-1"; sha256="09zg7zwmmqpjr1j59lqsjf4blrkya9wfwddgzfm9rr5jxrzvqcv8"; depends=[]; };
@@ -5787,14 +5931,14 @@ in with self; {
   plot3D = derive2 { name="plot3D"; version="1.0-2"; sha256="0qsrd1na4xw2bm1rzwj3asgkh7xqpyja0dxdmz41f3x58ip9wnz1"; depends=[misc3d]; };
   plot3Drgl = derive2 { name="plot3Drgl"; version="1.0"; sha256="109vsivif4hmw2hk3hi4y703d3snzxbr9pzhn1846imdclkl12yg"; depends=[plot3D rgl]; };
   plotGoogleMaps = derive2 { name="plotGoogleMaps"; version="2.2"; sha256="0qv57k46ncg0wrgma0sbr3xf0j9j8cii3ppk3gs65ardghs3bf6b"; depends=[lattice maptools raster rgdal sp spacetime]; };
-  plotKML = derive2 { name="plotKML"; version="0.5-3"; sha256="1s33a3lq8zi11hzqcvkcb3g9a91jkskxpyg8fyw7d0cwjmflfpfi"; depends=[aqp classInt colorRamps colorspace dismo gstat pixmap plotrix plyr raster RColorBrewer rgdal RSAGA scales sp spacetime stringr XML zoo]; };
+  plotKML = derive2 { name="plotKML"; version="0.5-4"; sha256="12sxs7bzbcgcrp7jph9ad6gnvvwafhygjkcid84cmzbaqvh0d26s"; depends=[aqp classInt colorRamps colorspace dismo gstat pixmap plotrix plyr raster RColorBrewer rgdal RSAGA scales sp spacetime stringr XML zoo]; };
   plotMCMC = derive2 { name="plotMCMC"; version="2.0-0"; sha256="0i4kcx6cpqjd6i16w3i8s34siw44qigca2jbk98b9ligbi65qnqb"; depends=[coda gplots lattice]; };
-  plotROC = derive2 { name="plotROC"; version="1.3.3"; sha256="090fpj3b5vp0r2zrn38yxiy205mk9kx1fpwp0g8rl4bsa88v4c9y"; depends=[ggplot2 gridSVG shiny]; };
+  plotROC = derive2 { name="plotROC"; version="2.0.0"; sha256="1g3q13prqj90xz8s0xpk76mx0xi26akiph2qnz9qv60pcc103p68"; depends=[ggplot2 gridSVG plyr shiny]; };
   plotSEMM = derive2 { name="plotSEMM"; version="2.1"; sha256="0xpq8h7xm9p25wcfp9av0vwz4hdm4ibrwy68pff8fdf7bb1fy49w"; depends=[MplusAutomation plotrix plyr Rcpp shiny]; };
-  plotly = derive2 { name="plotly"; version="2.0.2"; sha256="12hhhrrd24zq1jhfcm1hbiwi57p6pyivm5dlrajpziknsqrjs3f7"; depends=[base64enc digest ggplot2 htmlwidgets httr jsonlite magrittr plyr scales viridis]; };
+  plotly = derive2 { name="plotly"; version="2.0.16"; sha256="1kibc4d7hc7qn6qxsqmbzn7p8a4w3nnd79wrjzb594ab2jafq06s"; depends=[base64enc digest ggplot2 htmlwidgets httr jsonlite magrittr plyr scales viridis]; };
   plotmo = derive2 { name="plotmo"; version="3.1.4"; sha256="0b12w6sg317vgmhyn4gh9jcnyps1pyqnh5ai15y1dfajsf2zjhca"; depends=[plotrix TeachingDemos]; };
   plotpc = derive2 { name="plotpc"; version="1.0.4"; sha256="1sf7n7mfyaijldm24bc8r8pfm8pp9cyaja7am14z2wpj2j9f9vyq"; depends=[]; };
-  plotrix = derive2 { name="plotrix"; version="3.6"; sha256="0zn6k8azh40v0lg7q9yd4sy30a26bcc0fjvndn4z7k36avlw4i25"; depends=[]; };
+  plotrix = derive2 { name="plotrix"; version="3.6-1"; sha256="1y8xnlpy4zba70af9lwj2sshvfdfcmfdh92wamyzj8z9gciailfr"; depends=[]; };
   pls = derive2 { name="pls"; version="2.5-0"; sha256="135pqb6frjldv86fs00p2mgrc9vjna3jvns3slj5a300drajja1w"; depends=[]; };
   plsRbeta = derive2 { name="plsRbeta"; version="0.2.0"; sha256="1b8yldz5nzw3gilv9wk79bxcqb0hrgsxi2cn6qlby5nf9b4zmzv8"; depends=[betareg boot Formula MASS mvtnorm plsdof plsRglm]; };
   plsRcox = derive2 { name="plsRcox"; version="1.7.2"; sha256="1c3ll13m27ndwlc9r79ilzl0i6cyp870x66swlbg6387whf7wn2r"; depends=[kernlab lars mixOmics pls plsRglm risksetROC rms survAUC survcomp survival]; };
@@ -5803,6 +5947,7 @@ in with self; {
   plsdof = derive2 { name="plsdof"; version="0.2-7"; sha256="1z8z9m0nsnyy1fipzvm1srpxn3q6wjrlivmmki1f8plwkixkyc5y"; depends=[MASS]; };
   plsgenomics = derive2 { name="plsgenomics"; version="1.3-1"; sha256="0vddhzqfix8q692mdls227m2l6zjzbjwp1ia5j9shy71ycg2fzn9"; depends=[boot MASS]; };
   plspm = derive2 { name="plspm"; version="0.4.7"; sha256="0iy4qw4zjgqxg93a827qjcm32yipmnrl4gzn4hmskjd4khm9ngwd"; depends=[amap diagram shape tester turner]; };
+  plspm_formula = derive2 { name="plspm.formula"; version="1.0.1"; sha256="1i2d1q8pz21js1ci8afnqzcky430hh1iwf5f6jr3j9yr9gs365k5"; depends=[plspm]; };
   plugdensity = derive2 { name="plugdensity"; version="0.8-3"; sha256="1jdmq4kbs8yzgkf9f5dc7c8c52ia68fgavw7nsnc2hnz5ylw1qy9"; depends=[]; };
   plumbr = derive2 { name="plumbr"; version="0.6.9"; sha256="1avbclblqfy57pd72ximvj3zq92q1w8vszvyf6fw75j5rfwdaibk"; depends=[objectSignals]; };
   plus = derive2 { name="plus"; version="1.0"; sha256="1l7lvnq7vahj8m7knmr4q3wj00ar7iq89j45a2dqn2bh0qyj68ls"; depends=[]; };
@@ -5816,7 +5961,7 @@ in with self; {
   pmml = derive2 { name="pmml"; version="1.5.0"; sha256="192jffh9xb7zfvx4crpynrbdrx1fpiq303c2xz1wjqnq7wjmb3qw"; depends=[survival XML]; };
   pmmlTransformations = derive2 { name="pmmlTransformations"; version="1.3.0"; sha256="17dhgpldwadsvm25p8xwqsamcn1ypsqdijy2jia048qqmsy4ky86"; depends=[]; };
   pmr = derive2 { name="pmr"; version="1.2.5"; sha256="0dq97dfjmgxlhr3a2n20vyyzfmamcicw878hdxpw31lw02xs6yls"; depends=[]; };
-  pnea = derive2 { name="pnea"; version="1.2.0"; sha256="1z163b26pvig03fyfpc46g3f6hqgaqs7g2q9rmm8frhzhfzj9jp4"; depends=[]; };
+  pnea = derive2 { name="pnea"; version="1.2.3"; sha256="0zpa0gjqlyzvmc9c9rv4fvm8jd5b7naygwmjg90vlbc87sff0xp4"; depends=[]; };
   pnf = derive2 { name="pnf"; version="0.1.1"; sha256="0kasq27dnjwqzlzybc8m3wv9jwyag6z38ayv88msa7lxcnibr34i"; depends=[]; };
   png = derive2 { name="png"; version="0.1-7"; sha256="0g2mcp55lvvpx4kd3mn225mpbxqcq73wy5qx8b4lyf04iybgysg2"; depends=[]; };
   pnmtrem = derive2 { name="pnmtrem"; version="1.3"; sha256="0053gg368sdpcw2qzydpq0c5v2cxdlwgf5k68cbw0yx41csjgvz0"; depends=[MASS]; };
@@ -5858,9 +6003,10 @@ in with self; {
   popgen = derive2 { name="popgen"; version="1.0-3"; sha256="00rgfwmmiharfxqlpy21n3jbxwr5whzdg8psqylkjf83ls2myqzm"; depends=[cluster]; };
   popgraph = derive2 { name="popgraph"; version="1.4"; sha256="1z6w6vj3vl2w10hvzwmkw4d475bqcd6ys92xnn445ag6vpq0cvxq"; depends=[ggplot2 igraph MASS Matrix sampling sp]; };
   poplite = derive2 { name="poplite"; version="0.99.16"; sha256="0yp1hfda2k6c5x0gbcfxj9h6igzx3ra05xs7g88wjz76yxp3wb6w"; depends=[DBI dplyr igraph lazyeval RSQLite]; };
-  poppr = derive2 { name="poppr"; version="2.0.2"; sha256="1ccxjmnqixv59600gn1jknhs00yaq2mfdas6s9rwzywz1m515ff5"; depends=[ade4 adegenet ape boot dplyr ggplot2 igraph pegas phangorn reshape2 shiny vegan]; };
-  popprxl = derive2 { name="popprxl"; version="0.1"; sha256="08gfbwlacbpnkb4q99rbxxbg17qg4alzhjn3blpfls8rnasryca4"; depends=[poppr readxl]; };
+  poppr = derive2 { name="poppr"; version="2.1.0"; sha256="1l3wcy1505h01i7hzk3qy0lbkslqrxpqds8rzbin70iwvj2mj96c"; depends=[ade4 adegenet ape boot dplyr ggplot2 igraph pegas phangorn reshape2 shiny vegan]; };
+  popprxl = derive2 { name="popprxl"; version="0.1.1"; sha256="0zcl4kbb9yrrkkky9qx30g42qphibi7mq1bwkncw2dn5gjkx4zf8"; depends=[poppr readxl]; };
   popsom = derive2 { name="popsom"; version="3.0.1"; sha256="0qj4l5cdzrhiaq1q6q7wv75jnbfvw1rrms2v6ffw34wz4fs1w6is"; depends=[fields som]; };
+  population = derive2 { name="population"; version="0.1"; sha256="1xcm38hipasf6x5grsn7dqayy2g5mwppx2dvi5lwax5a6dqjk792"; depends=[abind]; };
   portes = derive2 { name="portes"; version="2.1-3"; sha256="0nqh6aync5igmvg7nr5inkv2cwgzd0zi6ky0vvrc3abchqsjm2ck"; depends=[]; };
   portfolio = derive2 { name="portfolio"; version="0.4-7"; sha256="0gs1a4qh68xsvl7yi6mz67lamwlqyqjbljpyax795piv46kkm06p"; depends=[lattice nlme]; };
   portfolioSim = derive2 { name="portfolioSim"; version="0.2-7"; sha256="1vf46882ys06ia6gfiibxx1b1g81xrg0zzman9hvsj4iky3pwbar"; depends=[lattice portfolio]; };
@@ -5872,7 +6018,7 @@ in with self; {
   powerMediation = derive2 { name="powerMediation"; version="0.2.4"; sha256="1b4hzai52fb0kk04az3rdbfk2vldfkhsa4gx7g98lbsvw4gh9imb"; depends=[]; };
   powerSurvEpi = derive2 { name="powerSurvEpi"; version="0.0.9"; sha256="0f8i867zc1yjdp66rjb1cp92fcfrlq167z3d0c4iv355wv4s35az"; depends=[survival]; };
   powerpkg = derive2 { name="powerpkg"; version="1.5"; sha256="0mbk2fda2fvyp1h5lk5b1fg398xybbjv0z6kdx7w7xj345misf7l"; depends=[]; };
-  ppcor = derive2 { name="ppcor"; version="1.0"; sha256="18l5adjysack86ws61xh89z5xfr83v932a0pn6ad8i8py3nd85fj"; depends=[]; };
+  ppcor = derive2 { name="ppcor"; version="1.1"; sha256="1x9b2kb8s0bp92b17gby0jwzzr3i4cf3ap9c4nq7m8fav72g0y3a"; depends=[MASS]; };
   ppiPre = derive2 { name="ppiPre"; version="1.9"; sha256="07k2mriyz1wmxb5gka0637q4pmvnmd1j16mnkkdrsx252klgjsdw"; depends=[AnnotationDbi e1071 GOSemSim igraph]; };
   ppls = derive2 { name="ppls"; version="1.6-1"; sha256="1r3h4pf79bkzpqdvyg33nwjabsqfv7r8a4ziq2zwx5vvm7mdy7pd"; depends=[MASS]; };
   ppmlasso = derive2 { name="ppmlasso"; version="1.1"; sha256="1w13p1wjl1csds1xfc79m44rlym9id9gwnp3q0bzw05f35zbfryg"; depends=[spatstat]; };
@@ -5880,7 +6026,7 @@ in with self; {
   pqantimalarials = derive2 { name="pqantimalarials"; version="0.2"; sha256="0azxkf1rvk9cyzr4gbp4y2vcxrxw3d4f002d5gjkvv1f4kx8faw1"; depends=[plyr RColorBrewer reshape2 shiny]; };
   prLogistic = derive2 { name="prLogistic"; version="1.2"; sha256="1abwz7nqkz2qbyqyr603kl9a3rkad3f4vxhck6a9kl80xrmfrj9s"; depends=[boot Hmisc lme4]; };
   prabclus = derive2 { name="prabclus"; version="2.2-6"; sha256="0qjsxrx6yv338bxm4ki0w9h8hind1l98abdrz828588bwj02jya1"; depends=[MASS mclust]; };
-  pracma = derive2 { name="pracma"; version="1.8.6"; sha256="0gwdg6hz186sxanxssinz392l07p4zkyrj1p46agm130hql9a2c8"; depends=[]; };
+  pracma = derive2 { name="pracma"; version="1.8.8"; sha256="0ans9l5rrb7a38gyi4qx4258sd5r5668vyrk02yzjpg9k3h8l165"; depends=[]; };
   pragma = derive2 { name="pragma"; version="0.1.3"; sha256="1n30a346pph4d8cj4p4qx2l6fnwhkxa8yxdisx47pix376ljpjfx"; depends=[]; };
   prais = derive2 { name="prais"; version="0.1.1"; sha256="0vv6h12gsbipi0gnq0w6xh6qvnvc0ydn341g1gnn3zc2n7cx8zcn"; depends=[]; };
   praise = derive2 { name="praise"; version="1.0.0"; sha256="1gfyypnvmih97p2r0php9qa39grzqpsdbq5g0fdsbpq5zms5w0sw"; depends=[]; };
@@ -5888,16 +6034,17 @@ in with self; {
   prc = derive2 { name="prc"; version="2015.6-24"; sha256="0sf664zqcq6xylhd7rvm2l2xj3f4j6llaj7j4b4847wfxnas2j02"; depends=[kyotil nlme]; };
   prclust = derive2 { name="prclust"; version="1.1"; sha256="0dm7qjvwyrym3sff24k5zz87835dhldrm3qiyyx6xq92p0wn89jz"; depends=[Rcpp]; };
   precintcon = derive2 { name="precintcon"; version="2.1"; sha256="0cadia7d2pzhnfw00m4k6qgnajv61hj879pafqnnfs6synbp3px6"; depends=[ggplot2 scales]; };
+  precrec = derive2 { name="precrec"; version="0.2.0"; sha256="1942fl986bkrjhqx94xvhfl85y6iqwj35x8p3jqvlciw5zn8zclc"; depends=[assertthat ggplot2 gridExtra Rcpp]; };
   predictmeans = derive2 { name="predictmeans"; version="0.99"; sha256="1qfqh21d3m0k2491hv5rl5k4v49j5089xsdk3bxicp30l512rax0"; depends=[ggplot2 lattice lme4 nlme pbkrtest plyr]; };
   predmixcor = derive2 { name="predmixcor"; version="1.1-1"; sha256="0v99as0dzn0lqnbbzycq9j885rgsa1cy4qgbya37bbjd01b3pykd"; depends=[]; };
   prefmod = derive2 { name="prefmod"; version="0.8-33"; sha256="0wklp3djy3z8lq0vrjrzqha6r8z00jwdm6d9ffyq5vhimmbirzj8"; depends=[colorspace gnm]; };
-  prepdat = derive2 { name="prepdat"; version="1.0.4"; sha256="177rf14sxqfad4a96phan6fvrhx8xfrnrinypr0aa4jin8ap5pkp"; depends=[dplyr psych reshape2]; };
-  preprocomb = derive2 { name="preprocomb"; version="0.1.0"; sha256="14knw4hwrx7np9d2q5xzgs7c1cqb4ybqb4q3fp6hwmfcy2ygrdyy"; depends=[caret caretEnsemble clustertend DMwR e1071 randomForest]; };
+  prepdat = derive2 { name="prepdat"; version="1.0.5"; sha256="0c8lg6kap275gnfh53rai2kyy3my3w598wjh84da481rwrd3vlz9"; depends=[dplyr psych reshape2]; };
+  preprocomb = derive2 { name="preprocomb"; version="0.2.0"; sha256="0kfmdz926ianvy016hb6ba20qkh9pbgnzi1dali4bc4h8qhnjz5y"; depends=[arules caret clustertend DMwR e1071 randomForest zoo]; };
   presens = derive2 { name="presens"; version="1.0.0"; sha256="0hwciahpfp7h7dchn6k64cwjwxzm6cx28b66kv6flz4yzwvqd3pb"; depends=[birk marelac]; };
   preseqR = derive2 { name="preseqR"; version="1.2.1"; sha256="1izfykccybnr2pnw043g680wg78hbds6hcfqirqhy1sfn6sf8lz1"; depends=[]; };
   prettyGraphs = derive2 { name="prettyGraphs"; version="2.1.5"; sha256="19jag5cymancxy5lvkj5mkhdbxr37pciqj4vdvmxr82mvw3d75m4"; depends=[]; };
   prettyR = derive2 { name="prettyR"; version="2.2"; sha256="026cgbrqs799lg06qlwx1r9ramil790qxrb1cyl4w7mzf8sfpgn9"; depends=[]; };
-  prettymapr = derive2 { name="prettymapr"; version="0.1.1"; sha256="1q0gvl0sx9v5yyb6xzvqccnacnbdgagvnwa7ad81r7n3irccj9l1"; depends=[digest rgdal rjson sp]; };
+  prettymapr = derive2 { name="prettymapr"; version="0.1.3"; sha256="126m1r7iv20wnkfvnvgj8d2axh3vlgvcfniy1d1c9685b55lcyj2"; depends=[digest rgdal rjson sp]; };
   prettyunits = derive2 { name="prettyunits"; version="1.0.2"; sha256="0p3z42hnk53x7ky4d1dr2brf7p8gv3agxr71i99m01n2hq2ri91m"; depends=[assertthat magrittr]; };
   prevR = derive2 { name="prevR"; version="3.1"; sha256="1x8ssz1k8vdq3zx1qhfhyq371i8s3bam2rd6bm3biha5i8icglh6"; depends=[directlabels fields foreign GenKern ggplot2 gstat maptools rgdal sp]; };
   prevalence = derive2 { name="prevalence"; version="0.4.0"; sha256="0vnmglxj1p66sgkw4ffc4wgn0w4s281fk2yifx5cn4svwijv30q0"; depends=[coda rjags]; };
@@ -5913,20 +6060,22 @@ in with self; {
   probFDA = derive2 { name="probFDA"; version="1.0.1"; sha256="093k50kyady54rkrz0n9x9z98z5ws36phlj42j25yip7pzhfd6sv"; depends=[MASS]; };
   probemod = derive2 { name="probemod"; version="0.2.1"; sha256="1cgjr03amssc9rng8ky4w3abhhijj0d2byzm118dfdjzrgmnrf9g"; depends=[]; };
   probsvm = derive2 { name="probsvm"; version="1.00"; sha256="1k0zysym7ncmjy9h7whwi49qsfkpxfk7chfdjrydl6hn6pscis37"; depends=[kernlab]; };
-  prodlim = derive2 { name="prodlim"; version="1.5.5"; sha256="0m745gcmc3j13zn9agyavj9hpw5d7k50b1hlj2wyb9djs6sbfbnl"; depends=[KernSmooth lava Rcpp survival]; };
+  prodlim = derive2 { name="prodlim"; version="1.5.7"; sha256="11dhzfw3daanmpnwyynx2q2mwkn8fihi4rsikl1f7rmzadis4ixd"; depends=[KernSmooth lava Rcpp survival]; };
   profdpm = derive2 { name="profdpm"; version="3.3"; sha256="07lhjavrx4fa5950w928mfpddmmnmvdapl5n6mv49m8h3bxs4nmy"; depends=[]; };
   profileModel = derive2 { name="profileModel"; version="0.5-9"; sha256="1p9b9jr5842im195d60ja82pp7vbk85vs8b0r3fnf62j4b92aky9"; depends=[]; };
-  profileR = derive2 { name="profileR"; version="0.3-1"; sha256="1sr9a39zn29hs6kw4rplrrbgcpcxxw1y63q493wv4hk7y0lbw98n"; depends=[ggplot2 lavaan MASS RColorBrewer reshape]; };
+  profileR = derive2 { name="profileR"; version="0.3-2"; sha256="0mr8gzw8055bmqla3kz8g996mnwdki1m3dlxhyrig8h2fy1gmx5a"; depends=[ggplot2 lavaan RColorBrewer reshape]; };
   profilr = derive2 { name="profilr"; version="0.1.0"; sha256="0rw5cjvvrgsdmhgrsaw4skfdk8h488b6mkmibgjj3dd3x0j3caq6"; depends=[]; };
   profr = derive2 { name="profr"; version="0.3.1"; sha256="1w06mm89apggy6wc273b2nsp95smajr8sf3dwshykivv7mhkxs5d"; depends=[plyr stringr]; };
   proftools = derive2 { name="proftools"; version="0.1-0"; sha256="1wzkrz7zr2pjw5id2sp6jdqm5pgrrh35zfwjrkr6mac22lniq4bv"; depends=[]; };
-  progenyClust = derive2 { name="progenyClust"; version="1.0"; sha256="00p56mpgvkbdfwshjsjacdszr9x432213ip0158yim7m54471zfy"; depends=[Hmisc]; };
+  progenyClust = derive2 { name="progenyClust"; version="1.1"; sha256="0d3p38mb0vg7ymzi751wkdcpkfqzf45li6zsvm8rvma41ky06w63"; depends=[Hmisc]; };
   prognosticROC = derive2 { name="prognosticROC"; version="0.7"; sha256="0lscsyll41hpfzihdavygdzqw9xxjp48dmy4i17qsx5h01jl1h4i"; depends=[survival]; };
   progress = derive2 { name="progress"; version="1.0.2"; sha256="1dpcfvdg1rf0fd4whcn7k09x70s7jhz8p7nqkm9p13b4nhil76sj"; depends=[prettyunits R6]; };
   proj4 = derive2 { name="proj4"; version="1.0-8"; sha256="06r3lavgixrsa52d1v31laqcbw6fb9xn23akv39hvaib78diglv9"; depends=[]; };
   prop_comb_RR = derive2 { name="prop.comb.RR"; version="1.1"; sha256="0zrz0rywhmb4n3my9ihf070rpmd3xni59rr4dsl1ahq9lkd97h20"; depends=[rootSolve]; };
   propOverlap = derive2 { name="propOverlap"; version="1.0"; sha256="0q72z9vbkpll4i3wy3fq06rz97in2cm3jjnvl6p9w8qc44zjlcyl"; depends=[Biobase]; };
   propagate = derive2 { name="propagate"; version="1.0-4"; sha256="18vyh4i4zlsmggfyd4w0zrznk75m84k08p1qa9crind04n5581j1"; depends=[ff MASS minpack_lm Rcpp tmvtnorm]; };
+  properties = derive2 { name="properties"; version="0.0-8"; sha256="1x7zln1indckl090p9kv40snamkac3b8q45387jdqxajmsallxmb"; depends=[]; };
+  proportion = derive2 { name="proportion"; version="1.1.0"; sha256="1ahcgp485a5gal8hlsnd18kadb22q0r7p81xxh73rwghbv3y49va"; depends=[ggplot2 TeachingDemos]; };
   prospectr = derive2 { name="prospectr"; version="0.1.3"; sha256="18lh03xg6bgzsdsl56bjd63xdp16sqgr3s326sgifkkak8ffbv7q"; depends=[foreach iterators Rcpp RcppArmadillo]; };
   protViz = derive2 { name="protViz"; version="0.2.9"; sha256="0kn2dd3za8mmb6476v3wqnymhihyavw2qsh98i4q3xdiz1g77vql"; depends=[Rcpp]; };
   proteomicdesign = derive2 { name="proteomicdesign"; version="2.0"; sha256="01s47pgwxy4xx10f3qmbfv59gbaj0qw017kpkpsn33s8w7ad63r0"; depends=[MASS]; };
@@ -5935,8 +6084,9 @@ in with self; {
   proto = derive2 { name="proto"; version="0.3-10"; sha256="03mvzi529y6kjcp9bkpk7zlgpcakb3iz73hca6rpjy14pyzl3nfh"; depends=[]; };
   protoclass = derive2 { name="protoclass"; version="1.0"; sha256="17d2m6r1shgb47v8mwdg1a7f5h29m5l7f5m0nsmv0xc90s9cpvk8"; depends=[class]; };
   protoclust = derive2 { name="protoclust"; version="1.5"; sha256="03qhqfqdz45s8c1p8c6sqs10i6c2ilx4fz8wkpwas3j78lgylskg"; depends=[]; };
-  protr = derive2 { name="protr"; version="0.5-1"; sha256="1ji0vpy9rrrvbsfwi4823ywi5zbwl57zw1glxllxgwyv9l6v4bpb"; depends=[]; };
-  provenance = derive2 { name="provenance"; version="0.6"; sha256="0nf11f5m302r2kkhcyhjca96prxshnkcmrqk1as6f5vvypzsg2yi"; depends=[MASS shapes smacof]; };
+  proton = derive2 { name="proton"; version="1.0"; sha256="1mgaw54is8l6ac1rf8s70rj7kv9xgsfdrlvjz01ggfwg7c6pyr3s"; depends=[digest]; };
+  protr = derive2 { name="protr"; version="1.1-1"; sha256="09iwyfvscz0ajgadfd69hhsnhkaqwpjnly9g6jjrdcqnaj4lw77l"; depends=[]; };
+  provenance = derive2 { name="provenance"; version="1.1"; sha256="1dd4wcxgkm7skv6jw2bg94la3vzdyjfvcr3047rzmzj1bfb68q5m"; depends=[MASS smacof]; };
   proxy = derive2 { name="proxy"; version="0.4-15"; sha256="17qnrihxyyyj0lx6hka4mwkgy764ha4jx00a822xjnnbygk81iqv"; depends=[]; };
   prozor = derive2 { name="prozor"; version="0.1.1"; sha256="0yv9yzp8ldn888v2sg62qaq0vjg5xwjq9274x68idrlywzgplfgv"; depends=[doParallel foreach Matrix seqinr]; };
   pryr = derive2 { name="pryr"; version="0.1.2"; sha256="1in350a8hxwf580afavasvn3jc7x2p1b7nlwmj1scakfz74vghk5"; depends=[codetools Rcpp stringr]; };
@@ -5947,6 +6097,7 @@ in with self; {
   psd = derive2 { name="psd"; version="1.0-1"; sha256="1ssda4g98m0bk6gkrb7c6ylfsd2a84fq4yhp472n4k8wd73mkdn6"; depends=[RColorBrewer Rcpp RcppArmadillo signal zoo]; };
   pse = derive2 { name="pse"; version="0.4.3"; sha256="01rl7f1mmqizbl6gkq39ll490224cq4h96xvb3qzpikxb2p1d9gp"; depends=[boot Hmisc]; };
   pseudo = derive2 { name="pseudo"; version="1.1"; sha256="0dcx6b892cic47rwzazsbnsicpgyrbdcndr3q5s6z0j1b41lzknd"; depends=[geepack KMsurv]; };
+  pseval = derive2 { name="pseval"; version="1.0.0"; sha256="17w98qda2h6as2g02fqv6vvrw8m90zsdcfa0i5ss8c546fzchzxl"; depends=[survival]; };
   psgp = derive2 { name="psgp"; version="0.3-6"; sha256="0h9gyadfy0djj32pgwhg8vy2gfn7i7yj5nnsm6pvfypc3k71s2wf"; depends=[automap gstat intamap Rcpp RcppArmadillo]; };
   psidR = derive2 { name="psidR"; version="1.3"; sha256="1jdxbjvc309b1bs81v57kc1g7lgfdz84bfakh9qwh8wgjqbjr06i"; depends=[data_table foreign RCurl SAScii]; };
   pso = derive2 { name="pso"; version="1.0.3"; sha256="0alar695c6kc1rsvwipsrvlxc93f3sy9l0yhp0mggyqgxkkvy406"; depends=[]; };
@@ -5995,13 +6146,13 @@ in with self; {
   qcr = derive2 { name="qcr"; version="0.1-18"; sha256="16dfda3rwivsdhp7j5izzbk2rzwfabfmxgpq4kjc4h7r90n2vly2"; depends=[qcc]; };
   qdap = derive2 { name="qdap"; version="2.2.4"; sha256="193jzm87qb4ivs325xg6wnrm19izdl06hlmkcp3m2bxp9wnmdqs1"; depends=[chron dplyr gdata gender ggplot2 gridExtra igraph NLP openNLP plotrix qdapDictionaries qdapRegex qdapTools RColorBrewer RCurl reports reshape2 scales stringdist tidyr tm venneuler wordcloud xlsx XML]; };
   qdapDictionaries = derive2 { name="qdapDictionaries"; version="1.0.6"; sha256="1icivvsi33494ycd7vfqm9zx2g2rc1m3dygs3bi0ndi798z1cvx2"; depends=[]; };
-  qdapRegex = derive2 { name="qdapRegex"; version="0.5.1"; sha256="0ps8snnr6kv4lfs5y5h3pawxr6hyc3zh7y2vx5abz0m1hd06w2lf"; depends=[stringi]; };
+  qdapRegex = derive2 { name="qdapRegex"; version="0.6.0"; sha256="0k6n3zr07ccr9xlmkyg6m0pp7plh91066b61zrn7jphgs0d31c0a"; depends=[stringi]; };
   qdapTools = derive2 { name="qdapTools"; version="1.3.1"; sha256="0sfzqmds888r599mwm7j0qjsqfv6z59p4apmmg36hsyaxmw51233"; depends=[chron data_table RCurl XML]; };
   qdm = derive2 { name="qdm"; version="0.1-0"; sha256="0cfxyy8s5zfb7867f9xv9scq9blq2qnw68x66m7y7nqlrrff5xdr"; depends=[]; };
   qgraph = derive2 { name="qgraph"; version="1.3.1"; sha256="1wmpsgmzl9qg4vjjjlbxqav3ck7p26gidsqv3qryx56jx54164wg"; depends=[colorspace corpcor d3Network ellipse fdrtool ggm ggplot2 glasso gtools Hmisc huge igraph jpeg lavaan Matrix plyr png psych reshape2 sem sna]; };
   qgtools = derive2 { name="qgtools"; version="1.0"; sha256="0irqfaj2qqx7n1jfc0kmfpgzqrhwwlj0qizsmya94zk9d27bcpn5"; depends=[MASS Matrix]; };
-  qicharts = derive2 { name="qicharts"; version="0.4.2"; sha256="0xl4nyym3kmlzr8l2c53knavs6l11184qsbzmd6rjgyvi5i35901"; depends=[ggplot2 lattice latticeExtra scales]; };
-  qiimer = derive2 { name="qiimer"; version="0.9.2"; sha256="08625hz2n7yk9zk1k9sa46n2ggbw5qs0mlqkmzyjjh3qlnb1354a"; depends=[pheatmap]; };
+  qicharts = derive2 { name="qicharts"; version="0.4.3"; sha256="04c833ggqsmblkys3sxszyr0f41bm52lyakadxfc8mf9mdwqac9p"; depends=[ggplot2 lattice latticeExtra scales]; };
+  qiimer = derive2 { name="qiimer"; version="0.9.4"; sha256="0argspi9pin2gjsg0qkl28hj3bw8svfab1cy410zlq76qdnmg7df"; depends=[pheatmap]; };
   qlcData = derive2 { name="qlcData"; version="0.1.0"; sha256="00xfr7dywvadyhs2z32za06fzdzmm20sn31grin0b3xw5qndai0f"; depends=[stringi yaml]; };
   qlcMatrix = derive2 { name="qlcMatrix"; version="0.9.5"; sha256="0fm49iydbjp264h9mkk8qfblbvg4l3bfcnphxyhcv3n27m0w44sf"; depends=[Matrix slam]; };
   qlcVisualize = derive2 { name="qlcVisualize"; version="0.1.0"; sha256="13rc4z7rz7vngrkxq09flhszvcbg6i7drdkdp8kmvgcxf0im6lv0"; depends=[alphahull fields mapdata mapplots maps maptools MASS qlcMatrix raster seriation sp spatstat]; };
@@ -6014,6 +6165,7 @@ in with self; {
   qrLMM = derive2 { name="qrLMM"; version="1.1"; sha256="1yg9ph6jy0sn4d82vn4v7yy3mqczbnzsq8qqp9dw38vh2456rmf2"; depends=[ghyp matrixcalc mvtnorm nlme psych quantreg]; };
   qrNLMM = derive2 { name="qrNLMM"; version="1.0"; sha256="0vlinc3bggapff29dyz14vn122gy6aq3rp38v2bpnxfkbpj10lvy"; depends=[ald ghyp matrixcalc mvtnorm psych quantreg]; };
   qrage = derive2 { name="qrage"; version="1.0"; sha256="00j74bnkcpp0h8v44jwzj67q9aaw47ajc2fvgr6dckj9rymydinl"; depends=[htmlwidgets]; };
+  qrcm = derive2 { name="qrcm"; version="1.0"; sha256="0xjxb2z1h63azbs7gqvqf4a2sk9syzjqkfrvfdcmliv2bv7zf70l"; depends=[pch survival]; };
   qrcode = derive2 { name="qrcode"; version="0.1.1"; sha256="12j0db8vidlgkp0dcjyrw5mhhvazl7v7gpn9wsf2m0qnz1rm4igq"; depends=[R_utils stringr]; };
   qrfactor = derive2 { name="qrfactor"; version="1.4"; sha256="0f02lh8zrc36slwqy11x03yzfdy94p1lk5jar9h5cwa1dvi5k8gm"; depends=[cluster maptools mgraph mvoutlier pvclust]; };
   qrjoint = derive2 { name="qrjoint"; version="0.1-1"; sha256="0q39n4y7cdmim88na3pw05w15n95bpqnxknvh6fzz9mpbbjkxqx5"; depends=[coda kernlab Matrix quantreg]; };
@@ -6022,7 +6174,7 @@ in with self; {
   qrnn = derive2 { name="qrnn"; version="1.1.3"; sha256="0phbazi47pzhvg7k3az958rk5dv7nk2wvbxqsanppxsvyxl0ykwf"; depends=[]; };
   qtbase = derive2 { name="qtbase"; version="1.0.11"; sha256="01fx8yabvk2rsb0mdx9f59a9qf981sl88s56iy58w5dd6r2ag6gc"; depends=[]; };
   qte = derive2 { name="qte"; version="1.0.1"; sha256="15y6n0c9jinfz7hmm107palgy8fl15bc71gw0bcd3bawpydkrq2w"; depends=[]; };
-  qtl = derive2 { name="qtl"; version="1.37-11"; sha256="0h20d36mww7ljp51pfs66xq33yq4b4fwq9nsh02dpmfhlaxgx1xi"; depends=[]; };
+  qtl = derive2 { name="qtl"; version="1.38-4"; sha256="0rv9xhp8lyldpgwxqirhyjqvg07dr5x4x1x2jpyj37dada9ccyx3"; depends=[]; };
   qtlDesign = derive2 { name="qtlDesign"; version="0.941"; sha256="138yi85i5xiaqrns4v2hw46b731bdgnb301wg2h4cfrxvrw4l0d5"; depends=[]; };
   qtlbook = derive2 { name="qtlbook"; version="0.18-3"; sha256="0b0kv5nipdavify4vslwhq9p7nmhwk71q3xmnkj66b780605mvr6"; depends=[qtl]; };
   qtlcharts = derive2 { name="qtlcharts"; version="0.5-25"; sha256="132v2cqi23m1pb7yz7859snsxjj7dmv6gpv5p9lzb5dpa2n8aha6"; depends=[htmlwidgets jsonlite qtl]; };
@@ -6039,7 +6191,7 @@ in with self; {
   qualvar = derive2 { name="qualvar"; version="0.1.0"; sha256="07vpq5nyh40y1sq1fsg97z7bbardqakq6bx635v42pv00480h9sh"; depends=[]; };
   quantable = derive2 { name="quantable"; version="0.1"; sha256="0q1m971fk9i2qdyps745g89x34anw0g2hxqf5p8ggfvvr32k635r"; depends=[gplots RColorBrewer scales]; };
   quantchem = derive2 { name="quantchem"; version="0.13"; sha256="1ga5xa7lsk04flfp1syjzpnvj3i2ypzh1m49vq1xkdwpm6axdy8n"; depends=[MASS outliers]; };
-  quanteda = derive2 { name="quanteda"; version="0.8.6-0"; sha256="191l9yni99727k5sx5xk3jvmima62rhh6rhsaxmiwaas9zpyvfwd"; depends=[ca data_table Matrix proxy Rcpp RcppArmadillo SnowballC stringi wordcloud]; };
+  quanteda = derive2 { name="quanteda"; version="0.9.0-1"; sha256="14x2bbrklzwgvqkwp1cmi5akrhdg7fjxvx4vh291y52ds4ml18m4"; depends=[ca data_table Matrix proxy Rcpp RcppArmadillo SnowballC stringi wordcloud]; };
   quantification = derive2 { name="quantification"; version="0.1.0"; sha256="0987389rr21fl3khgd3a1yq5821hljwm0xlyxgjy1km5hj81diap"; depends=[car]; };
   quantileDA = derive2 { name="quantileDA"; version="1.0"; sha256="1xskjh107s4v5bg6yzjg52r52zy4rw0hadn643q4n6l8sr7879ws"; depends=[]; };
   quantmod = derive2 { name="quantmod"; version="0.4-5"; sha256="14y8xra36cg5zam2cmxzvkb8n2jafdpc8hhjv9xnwa91basrx267"; depends=[TTR xts zoo]; };
@@ -6050,22 +6202,25 @@ in with self; {
   questionr = derive2 { name="questionr"; version="0.4.3"; sha256="13mmmjxg9vkn53dp9hng330bkilzdf2zqisgs21ng08b6p9dv7n4"; depends=[classInt highr htmltools shiny]; };
   queueing = derive2 { name="queueing"; version="0.2.6"; sha256="0w6fnjql9ap5vlhiv6syphrkhnp4qp7f4clw2jn155vqqmj5ii6a"; depends=[]; };
   quickmapr = derive2 { name="quickmapr"; version="0.1.1"; sha256="0wqkn8svpi6m9f04kl0vivg2j9ydhq488a9m36s7br7n4zyvc5vm"; depends=[httr raster rgdal rgeos sp]; };
+  quickpsy = derive2 { name="quickpsy"; version="0.1.2"; sha256="0nvx7zcmfpfsr94k0wdmpcyyqjwilx8ciy12l8s22y9psz5ripsz"; depends=[boot DEoptim dplyr ggplot2 MPDiR tidyr]; };
   quint = derive2 { name="quint"; version="1.0"; sha256="19dxrssy4dw7v3s4hhhy6yilbc7zb6pvcnh3mm1z6vv5a1wfr245"; depends=[Formula partykit rpart]; };
   quipu = derive2 { name="quipu"; version="1.9.0"; sha256="1py1qpbwp2smr5di8b3zmzxxhchfmr5qfhqkdiqig28mcnqcmp5n"; depends=[agricolae pixmap shiny stringr xtable]; };
   qut = derive2 { name="qut"; version="1.0.1"; sha256="174zwwznfrpzzqfigzlr39y5gq6xsb8n3h8w6idx52y6psnag22z"; depends=[glmnet lars Matrix]; };
   qvcalc = derive2 { name="qvcalc"; version="0.8-9"; sha256="1ysbsm65n05vypvvpsbdfbrb60gij50vsmybzi4405g5z2ds1j72"; depends=[]; };
   qwraps2 = derive2 { name="qwraps2"; version="0.1.2"; sha256="1xr3bcigaxb72bk90xv0spd6l4d3l8wlpzvf3gnj2r9rqmr867zv"; depends=[dplyr ggplot2 knitr]; };
+  r_jive = derive2 { name="r.jive"; version="1.2"; sha256="16g0r527c90j4xcyj8fjb8nq2n2bxkjl56wb57mkhvvcgy15r55f"; depends=[gplots SpatioTemporal]; };
   r2d2 = derive2 { name="r2d2"; version="1.0-0"; sha256="1zl0b36kx49ymfks8rm33hh0z460y3cz6189zqaf0kblg3a32nsi"; depends=[KernSmooth MASS sp]; };
   r2dRue = derive2 { name="r2dRue"; version="1.0.4"; sha256="1apdq7zj5fhs349wm9g6y06nn33x24pg3gdp4z1frd18qlacf8z5"; depends=[matrixStats rgdal sp]; };
   r2lh = derive2 { name="r2lh"; version="0.7"; sha256="1kkyjv9x2klrjnaaw4a16sxdfqmpp9s5mlclzlczlqjypbf2aa6d"; depends=[]; };
   r2stl = derive2 { name="r2stl"; version="1.0.0"; sha256="18lvnxr40cm450s8qh09c3cnkl1hg83jhmv1gzsv6nkjrq4mj5wh"; depends=[]; };
-  r4ss = derive2 { name="r4ss"; version="1.22.1"; sha256="1rjnglwa3i8rlzyqqr5h8yh7vglrh8zpd3829qcc1vfi4swcwwqw"; depends=[coda corpcor gplots gtools maps pso RCurl]; };
+  r4ss = derive2 { name="r4ss"; version="1.24.0"; sha256="1kifzfg2zx6lq2c8qqbhb096z1wgdayhg5qzx5hnkwpn05w5cma3"; depends=[coda corpcor gplots gtools maps pso truncnorm]; };
   rARPACK = derive2 { name="rARPACK"; version="0.9-0"; sha256="0i57db2dls72xfrvn1m0fwsfqa7cq839diviisn8686wx6dp2i8l"; depends=[Matrix Rcpp RcppEigen]; };
   rAltmetric = derive2 { name="rAltmetric"; version="0.6"; sha256="0ym8p9rq64ig3vlaimk38rmc2h1315bphx7v1rd6g4gypgx4ym15"; depends=[ggplot2 plyr png RCurl reshape2 RJSONIO]; };
   rAmCharts = derive2 { name="rAmCharts"; version="1.1.2"; sha256="1c9mrzi0bd2fpv2jvhabb243k2z36k6cxffgcykxi8f62rpvhmq9"; depends=[data_table htmltools htmlwidgets rlist]; };
   rAverage = derive2 { name="rAverage"; version="0.4-13"; sha256="0yfy81p99a3cb31cagxdvby7l2hcc60g3mnfizd9nvgamdmw08sy"; depends=[]; };
   rAvis = derive2 { name="rAvis"; version="0.1.4"; sha256="0svplnrn8rrr59v04nr1pz7d5r4dr1kdl0bd3kg8c3azxv47mxbp"; depends=[gdata maptools raster RCurl rgdal scales scrapeR sp stringr XML]; };
   rBeta2009 = derive2 { name="rBeta2009"; version="1.0"; sha256="0ljzxlndn9ba36lh7s3k4biim2qkh2mw9c0kj22a507qbzw1vgnq"; depends=[]; };
+  rCBA = derive2 { name="rCBA"; version="0.0.1"; sha256="0mfd4jn5bcn4kqnfmycm5x7kcvll60dp1nma3l1bfj0v2hybxm5d"; depends=[arules rJava]; };
   rCMA = derive2 { name="rCMA"; version="1.1"; sha256="0dswshg80hbgcib5x9w791sh71q5s4435q8sm9dh170v4ngbax0w"; depends=[]; };
   rCUR = derive2 { name="rCUR"; version="1.3"; sha256="1f38xbc5n91k2y88cg0sv1z2p4g5vl7v2k1024f42f7526g2p2lx"; depends=[lattice MASS Matrix]; };
   rCarto = derive2 { name="rCarto"; version="0.8"; sha256="08813l4xfahjyn0jv48q8f6sy402n78dqsg01192pxl2dfc2i9ry"; depends=[classInt maptools RColorBrewer]; };
@@ -6076,7 +6231,7 @@ in with self; {
   rDVR = derive2 { name="rDVR"; version="0.1.1"; sha256="19a4f9k65bd49vkn3sxkjdmcpwyawk7gwmvancvqr745gfgs0wzg"; depends=[RCurl]; };
   rEMM = derive2 { name="rEMM"; version="1.0-11"; sha256="0ynjn10gcmxs8qnh6idb34ppmki91l8sl720x70xkzcqpahy0nic"; depends=[cluster clusterGeneration igraph MASS proxy]; };
   rFDSN = derive2 { name="rFDSN"; version="0.0.0"; sha256="1ffiqpdzy4ipy2aci22zkih4373ifkjkpvsrza8awhyf9fwqwdsl"; depends=[XML]; };
-  rFerns = derive2 { name="rFerns"; version="1.1.0"; sha256="00ddb9zwf4hqkx9qmrndz182mg69mb5fyg0v0v4b32sy4sixnps5"; depends=[]; };
+  rFerns = derive2 { name="rFerns"; version="2.0.0"; sha256="0mfwlypakk409p17cmj8q9g99aq8z8gzg54dhpw351ixblvnil98"; depends=[]; };
   rGammaGamma = derive2 { name="rGammaGamma"; version="1.0.12"; sha256="1051ah6q11qkxj1my4xybbzc8xcqkxfmps8mv2his5cyfllwidbs"; depends=[gsl]; };
   rGroovy = derive2 { name="rGroovy"; version="1.0"; sha256="03kyw1hv1xmv580cf47gb3fzvjp27j0a93604h5hap981pzibdpy"; depends=[rJava]; };
   rHealthDataGov = derive2 { name="rHealthDataGov"; version="1.0.1"; sha256="0lkjprss15yl6n9wgh79r4clip3jndly2ab1lv4iijzxnxay099d"; depends=[bit64 httr jsonlite]; };
@@ -6091,24 +6246,25 @@ in with self; {
   rNMF = derive2 { name="rNMF"; version="0.5.0"; sha256="1nz6h0j5ywdh48m0swmhp34hbkycd7n13rclrxaw85qi9wc42597"; depends=[knitr nnls]; };
   rNOMADS = derive2 { name="rNOMADS"; version="2.1.6"; sha256="05czi6cv80afc2rlmqksdln6xvhaf4f7z8d8jp8npd5livrys2d7"; depends=[fields GEOmap MBA RCurl rvest scrapeR stringr XML xml2]; };
   rPlant = derive2 { name="rPlant"; version="2.12"; sha256="12aclndwijnaw14iqb2q7m5c2zh2bgdpfzmf11sgiwv5680qhdmh"; depends=[RCurl rjson seqinr]; };
+  rPowerSampleSize = derive2 { name="rPowerSampleSize"; version="1.0"; sha256="0vg60gjl1r1pxlmj435z61aizwdvi9gn2x94927858l3ca8r9afy"; depends=[mvtnorm ssanv]; };
   rPref = derive2 { name="rPref"; version="0.7"; sha256="005qphrcwnkfi2wmm7ba0swykq17q9ab7c7khqyixb0y9gyrwing"; depends=[dplyr igraph Rcpp RcppParallel]; };
   rPython = derive2 { name="rPython"; version="0.0-6"; sha256="1aw9jn45mw891cskr51yil60i55xv5x6akjvfdsbb9nwgdwwrqdp"; depends=[RJSONIO]; };
   rSCA = derive2 { name="rSCA"; version="2.1"; sha256="1lpix8xsjzyhgksmigvqxpv2bvaka0b1q2kcvdyfrfcw713n19rw"; depends=[]; };
   rSFA = derive2 { name="rSFA"; version="1.04"; sha256="0gd6ji1ynbb04rfv8jfdmp7dqnyz8pxcl5636fypd9a81fggl0gs"; depends=[MASS]; };
   rSPACE = derive2 { name="rSPACE"; version="1.2.0"; sha256="1nmv8niqc34mipzhny1mlwc9v4kck02ixmm1i25cqdfhsng03dma"; depends=[ggplot2 plyr raster RMark sp tcltk2]; };
   rSymPy = derive2 { name="rSymPy"; version="0.2-1.1"; sha256="1mrfpyalrq8b6yicy28jsj0xy7hlawa72imsfhabwd3hrx6ld150"; depends=[rJython]; };
-  rTableICC = derive2 { name="rTableICC"; version="1.0.2"; sha256="11mjlgvmghppy2m35w799z93b4f8wn307dl3c9dyk2sib9nxcpyv"; depends=[aster partitions]; };
-  rTensor = derive2 { name="rTensor"; version="1.2"; sha256="1qikicdi8d5yhw43660m8v587f5xzs2k2lpmbhfw037n0liivay2"; depends=[]; };
+  rTableICC = derive2 { name="rTableICC"; version="1.0.3"; sha256="1q7xac9vfnakjp54ccqli42wi8idfb9g9crgbqyg5s726b7z50n7"; depends=[aster partitions]; };
+  rTensor = derive2 { name="rTensor"; version="1.3"; sha256="0ra34sn4g92r6asrn4la2wbsi2y0hnyx163wwi4v0j6f57bslhdw"; depends=[]; };
   rUnemploymentData = derive2 { name="rUnemploymentData"; version="1.0.0"; sha256="1gbmr3kcv3wv4lmr7171sd76p95nhsa104955yi7y6wd5h0hk1ba"; depends=[choroplethr rvest stringr]; };
   rWBclimate = derive2 { name="rWBclimate"; version="0.1.3"; sha256="0vs56hx7a85pw4jx8nb8bdlr9dbkl4zdhzhqsm0505xc3qz18vxh"; depends=[ggplot2 httr jsonlite plyr reshape2 rgdal sp]; };
   rYoutheria = derive2 { name="rYoutheria"; version="1.0.0"; sha256="1yj66ars5a8mbv2axl6l5g7wflwz3j4mhwk3iz5w33rfhixixm9l"; depends=[plyr RCurl reshape2 RJSONIO]; };
   race = derive2 { name="race"; version="0.1.59"; sha256="13jprlnngribgvyr7fbg9d36i8qf3cax85n71dl71iv0y24al1cy"; depends=[]; };
   radar = derive2 { name="radar"; version="1.0.0"; sha256="1wh5j3cfbj01jx2kbm9ca5cqhbb0vw7ifjn426bllm4lbbd8l273"; depends=[]; };
-  radiomics = derive2 { name="radiomics"; version="0.1.0"; sha256="1g8683zgrwgp92rx2wf2dbngaq2lmawryy01kps7miqghh0xlhqz"; depends=[reshape2 spatstat]; };
+  radiomics = derive2 { name="radiomics"; version="0.1.1"; sha256="0rw1xvp7nq8h5g4yqqcwrv706zssa0kvkhm6ncdb9y7gmpidhyj5"; depends=[reshape2 spatstat]; };
   radir = derive2 { name="radir"; version="1.0.1"; sha256="1i37ynxl85yzh5pyxykjn64p5qph1w9b1gappmlhql9z04095ryk"; depends=[hermite]; };
   rafalib = derive2 { name="rafalib"; version="1.0.0"; sha256="1dmxjl66bfdgrybhwyaa8d4i460liqcdw8b29a6w7shgksh29m0k"; depends=[RColorBrewer]; };
   rags2ridges = derive2 { name="rags2ridges"; version="2.0"; sha256="0qc93a1bf63iwgmpz9bz62j20p4v77bvbjmy4rqchj7z6h573njd"; depends=[expm fdrtool ggplot2 Hmisc igraph Rcpp RcppArmadillo reshape sfsmisc snowfall]; };
-  rainbow = derive2 { name="rainbow"; version="3.3"; sha256="0xiqljshkdhhkdgcvz5n9qgbxgxskpxbq14vbpil9nqw2syj9xvj"; depends=[cluster colorspace hdrcde ks MASS pcaPP]; };
+  rainbow = derive2 { name="rainbow"; version="3.4"; sha256="09vxdb4j099grnlx10995b74r3h9g1vs8div3nywgnslaj8x7pay"; depends=[cluster colorspace hdrcde ks MASS pcaPP]; };
   raincpc = derive2 { name="raincpc"; version="0.4"; sha256="0yzpyidvf24frf82pj7rarjh0ncm5dhm0mmpsf2ycqlvp0qld10i"; depends=[SDMTools]; };
   rainfreq = derive2 { name="rainfreq"; version="0.3"; sha256="0985ck2bglg22gfj7m0hc7kpk0apljsbssf1ci99mgk47yi8fk9v"; depends=[RCurl SDMTools]; };
   ramify = derive2 { name="ramify"; version="0.3.2"; sha256="0fqspa1nlf0969g3lvvwg65zimwfdj5c2bahxvafggn832sb54k9"; depends=[]; };
@@ -6119,9 +6275,9 @@ in with self; {
   random_polychor_pa = derive2 { name="random.polychor.pa"; version="1.1.4-1"; sha256="1051v7krrawdqnhz9q01rsknp2i7iv82d370q7m9i9d9i8wfnpk5"; depends=[boot MASS mvtnorm nFactors psych sfsmisc]; };
   randomForest = derive2 { name="randomForest"; version="4.6-12"; sha256="1i43idaihhl6nwqw42v9dqpl6f8z3ykcn2in32lh2755i27jylbf"; depends=[]; };
   randomForest_ddR = derive2 { name="randomForest.ddR"; version="0.1.1"; sha256="0q4xjh7qqmd4slxwd1z5mnpn4y3vx1vbn6v060zbd0afibpcw92b"; depends=[ddR Matrix randomForest]; };
-  randomForestSRC = derive2 { name="randomForestSRC"; version="1.6.1"; sha256="174ky1wwdpq6wkn8hanfpfgy55jf6v1hlm6k688gjs0515y5490r"; depends=[]; };
+  randomForestSRC = derive2 { name="randomForestSRC"; version="2.0.5"; sha256="0b06whh8jdpcm79b952nl8f997xrz1sf7h2vk19sg8fzh8qvq2xx"; depends=[]; };
   randomGLM = derive2 { name="randomGLM"; version="1.02-1"; sha256="031338zxy6vqak8ibl2as0l37pa6qndln0g3i9gi4s6cvbdw3xrv"; depends=[doParallel foreach MASS]; };
-  randomLCA = derive2 { name="randomLCA"; version="1.0-5"; sha256="1dybssp4y4s4j5x9gy85b5kf02j6ph15s91babpagj2432rzrs2x"; depends=[boot fastGHQuad lattice Matrix]; };
+  randomLCA = derive2 { name="randomLCA"; version="1.0-6"; sha256="1l343p9a6z2ld3z2kqwldmn3wxf8yvjqr4nfhyjwp4y5d2ic9r11"; depends=[boot fastGHQuad lattice Matrix SciencesPo]; };
   randomNames = derive2 { name="randomNames"; version="0.1-0"; sha256="0v92w0z0dsdp6hhyyq764nlky8vmbs6vcnrna5ls47fj80f9cqa4"; depends=[data_table]; };
   randomUniformForest = derive2 { name="randomUniformForest"; version="1.1.5"; sha256="1amr3m7h5xcb8gahrr58233chsnx1naf9x5vpjy9p5ivh71xcxf7"; depends=[cluster doParallel foreach ggplot2 gtools iterators MASS pROC Rcpp]; };
   randomizationInference = derive2 { name="randomizationInference"; version="1.0.3"; sha256="0x36r9bjmpx90fz47cha4hbas4b31mpnbd8ziw2wld4580jkd6mk"; depends=[matrixStats permute]; };
@@ -6130,7 +6286,8 @@ in with self; {
   randomizr = derive2 { name="randomizr"; version="0.3.0"; sha256="1zi8rldmgjcjnnx3qcpr555c4g713nh6wrdh5gr77z2qagbljb1i"; depends=[]; };
   randtests = derive2 { name="randtests"; version="1.0"; sha256="03z3kxl4x0l91dsv65ld9kgc58z82ld1f4lk18i18dpvwcgkqk82"; depends=[]; };
   randtoolbox = derive2 { name="randtoolbox"; version="1.17"; sha256="107kckva43xpqncak8ll4h0mjm8lcks4jpf7dffgw5ggcc77ycrb"; depends=[rngWELL]; };
-  rangeMapper = derive2 { name="rangeMapper"; version="0.2-8"; sha256="0bxb37gy98smypjj27r3dbd0vfyvaqw2p25qv07j3isykcn2pxpn"; depends=[classInt lattice maptools raster RColorBrewer rgdal rgeos RSQLite sp]; };
+  rangeMapper = derive2 { name="rangeMapper"; version="0.3-0"; sha256="0r8nf2y4drdfldfr1rv1ll4176w3hzd9qf36glzjdsm0g1fcixba"; depends=[classInt data_table foreach ggplot2 gridExtra lattice magrittr maptools raster RColorBrewer rgdal rgeos RSQLite sp]; };
+  rangemodelR = derive2 { name="rangemodelR"; version="0.1"; sha256="00fhdcsf77x4hw059lg1x1qhgjjwrraxin1g5h0knxwsv33j56z8"; depends=[]; };
   ranger = derive2 { name="ranger"; version="0.3.0"; sha256="1vi0wkks5rzn6mc6k2lh0rdbb5awvcfww68kk0wndng45mk7hrq2"; depends=[Rcpp]; };
   rankdist = derive2 { name="rankdist"; version="1.1.2"; sha256="1nr9nr5nfziia6jykk598hm5ngkfr6yx5mypq34iyfm24877gd3q"; depends=[hash optimx permute Rcpp]; };
   rankhazard = derive2 { name="rankhazard"; version="1.0-2"; sha256="1gx30ak5vjgbgnx920789d38y16rl8w7hbxfk9yb8xjl1azgfaqx"; depends=[survival]; };
@@ -6141,12 +6298,12 @@ in with self; {
   rareNMtests = derive2 { name="rareNMtests"; version="1.1"; sha256="13r2hipqsf8z9k48ha5bh53n3plw1whb7crpy8zqqkcac8444b2z"; depends=[vegan]; };
   rasclass = derive2 { name="rasclass"; version="0.2.1"; sha256="04g2sirxrf16xjmyn4zcci757k7sgvsjbg0qjfr5phbr1rssy9qf"; depends=[car e1071 nnet randomForest RSNNS]; };
   rase = derive2 { name="rase"; version="0.2-21"; sha256="16zcdfsj2lkwq1madv1k01s7n7njs5lb7bj4dg0dr0jgpjarhkgq"; depends=[ape mvtnorm phytools polyCub rgl sm spatstat]; };
-  raster = derive2 { name="raster"; version="2.4-20"; sha256="0mz5lznjrci0g9wiw35mj5fr2gnr65ipgpx68km99zaszphg5kls"; depends=[Rcpp sp]; };
+  raster = derive2 { name="raster"; version="2.5-2"; sha256="0x6rmd4mcvivkisxpjlp7myf8crz58md2ngz6qsz37i8aw1hn3jb"; depends=[Rcpp sp]; };
   rasterVis = derive2 { name="rasterVis"; version="0.37"; sha256="1pfpjrjgcy5d4jzkf7sm427y0b6v0ipxr9p8z9sr6djhzcs3gfn0"; depends=[hexbin lattice latticeExtra raster RColorBrewer sp zoo]; };
   rateratio_test = derive2 { name="rateratio.test"; version="1.0-2"; sha256="1a2v12z2dr893ha80fhada1820z5ih53w4pnsss9r9xw3hi0m6k5"; depends=[]; };
   raters = derive2 { name="raters"; version="2.0.1"; sha256="16jnx6vv39k4niqkdlj4yhqx8qbrdi99bwzxjahsxr12ab5npbp1"; depends=[]; };
   rationalfun = derive2 { name="rationalfun"; version="0.1-0"; sha256="15949vs9pdjz7426zhgqn7y87xzn79ikrpa2vyjnsid1igpyh0mp"; depends=[polynom]; };
-  rattle = derive2 { name="rattle"; version="4.0.0"; sha256="01sqwi0mbgwa2q6cwsbk8dpz3afqphdnjykk95jhs9pqbwy2713s"; depends=[magrittr RGtk2 stringi]; };
+  rattle = derive2 { name="rattle"; version="4.0.5"; sha256="0l505mg4s34r8xjdw2f8vz6mbhzfbsh1ag6p6lzxi6ay14kl50kq"; depends=[magrittr RGtk2 stringi]; };
   rbamtools = derive2 { name="rbamtools"; version="2.12.3"; sha256="0vh6kal5r5v708d3a4lsmgbssjb0b9l1iypibkd9v97j00cbk6rr"; depends=[]; };
   rbefdata = derive2 { name="rbefdata"; version="0.3.5"; sha256="12mcqz0pqgwfw5fmma0gwddj4zk0hpwmrsb74dvzqvgcvpfjnv98"; depends=[RColorBrewer RCurl rjson rtematres wordcloud XML]; };
   rbenchmark = derive2 { name="rbenchmark"; version="1.0.0"; sha256="010fn3qwnk2k411cbqyvra1d12c3bhhl3spzm8kxffmirj4p2al9"; depends=[]; };
@@ -6158,12 +6315,13 @@ in with self; {
   rbounds = derive2 { name="rbounds"; version="2.1"; sha256="1h334bc37r1vbwz1b08jazsdrf6qgzpzkil9axnq5q04jf4rixs3"; depends=[Matching]; };
   rbugs = derive2 { name="rbugs"; version="0.5-9"; sha256="1kvn7x931gjpxymrz0bv50k69s1x1x9mv34vkz54sdkmi08rgb3y"; depends=[]; };
   rbundler = derive2 { name="rbundler"; version="0.3.7"; sha256="0wmahn59h9vqm6bq1gwnf6mvfkyhqh6xvdc5hraszn1419asy26f"; depends=[devtools]; };
+  rbvs = derive2 { name="rbvs"; version="1.0.2"; sha256="1wzxz2ca8f1phhbqr9p7c8sk09cyrdq5jc45g4ddrqvi2q29k28y"; depends=[]; };
   rcanvec = derive2 { name="rcanvec"; version="0.1.3"; sha256="1bsaprla9ypbmq7mv4sdba8szp2ij4mzsnfdwa58kw77w7r0fynh"; depends=[rgdal sp]; };
-  rcbalance = derive2 { name="rcbalance"; version="1.7.5"; sha256="1fxl86ckawpm9wk2dzha7lg17ch8y0bz2gpga6wpq6lbcg6w10ql"; depends=[MASS plyr]; };
+  rcbalance = derive2 { name="rcbalance"; version="1.8.0"; sha256="0j330ddax78bxfiv31l4796allbqq81l0dfj1q1w5ail1y8k62zz"; depends=[MASS plyr]; };
   rcdd = derive2 { name="rcdd"; version="1.1-9"; sha256="1mwg9prf7196b7r262ggdqsfq1i7czm1a0apk4j5014cxzyb6j5s"; depends=[]; };
   rcdk = derive2 { name="rcdk"; version="3.3.2"; sha256="02rlg3w8dbmag8b4z4wayh7xn61xc9g3647kxg91r0mvfhmrxl2h"; depends=[fingerprint iterators png rcdklibs rJava]; };
   rcdklibs = derive2 { name="rcdklibs"; version="1.5.8.4"; sha256="0mzkr23f4d639vhxfdbg44hzxapmpqkhc084ikcj93gjwvdz903k"; depends=[rJava]; };
-  rchallenge = derive2 { name="rchallenge"; version="1.1"; sha256="1qad0mcadr3zw5r37rgwnqf4ic9brlw3zl5n4jcxyaj324fj4pa3"; depends=[knitr rmarkdown]; };
+  rchallenge = derive2 { name="rchallenge"; version="1.1.1"; sha256="0ksbqsz6q7ri3xknzh6sl39lq9wqrqqv5bmirybglf48q0prszf5"; depends=[knitr rmarkdown]; };
   rchess = derive2 { name="rchess"; version="0.1"; sha256="0qnvvvwcl02rmqra9m7qnhy40cbavswbq6i0jm47x6njmr1gpfhy"; depends=[assertthat dplyr ggplot2 htmlwidgets plyr R6 V8]; };
   rcicr = derive2 { name="rcicr"; version="0.3.2"; sha256="153d6wl0grnfc842hpc5zd9m5xkybkmy1mpkw8wba4xy0mgppgjd"; depends=[aspace dplyr jpeg matlab]; };
   rclinicaltrials = derive2 { name="rclinicaltrials"; version="1.4.1"; sha256="1x8mj4gzfpgvdj3glwanr76g5x8pks8fm806bvnfls35g967z4p4"; depends=[httr plyr XML]; };
@@ -6176,9 +6334,10 @@ in with self; {
   rdd = derive2 { name="rdd"; version="0.56"; sha256="1x61ik606mwn46x3qzgq8wk2f6d5qqr95h30bz6hfbjlpcxw3700"; depends=[AER Formula lmtest sandwich]; };
   rddtools = derive2 { name="rddtools"; version="0.4.0"; sha256="1z9sl9fwsq8zs1ygmnjnh3p6h9hjkikbm4z7cdkxw66y0hxgn96s"; depends=[AER Formula ggplot2 KernSmooth lmtest locpol np rdd sandwich]; };
   rdetools = derive2 { name="rdetools"; version="1.0"; sha256="0pkl990viv7ifr7ihgdcsww93sk2wlzp2cg931wywagfp8dijd02"; depends=[]; };
+  rdian = derive2 { name="rdian"; version="0.1.0"; sha256="1lxhl1gjnmfbg5dzc2vw52hm2rk5m5nvx219nyh7w9ak88ih4wfd"; depends=[curl httr]; };
   rdrobust = derive2 { name="rdrobust"; version="0.80"; sha256="02adafhbjp259hbbbk32yllgn35xxim2mwn6yixv4wh5dgr974v6"; depends=[]; };
   rdrop2 = derive2 { name="rdrop2"; version="0.7.0"; sha256="03r3iqi796y7s8bnyca6nya2ys7s1rdxm00sy9c7l7sh0z6npcq4"; depends=[assertthat data_table dplyr httr jsonlite magrittr]; };
-  rdryad = derive2 { name="rdryad"; version="0.1.1"; sha256="0mqpkmwkznyxj0nn1v389p741dlc66dixcvljsn2rvg0q6p75fkj"; depends=[ape gdata OAIHarvester plyr RCurl RJSONIO stringr XML]; };
+  rdryad = derive2 { name="rdryad"; version="0.2.0"; sha256="16wbf0hpb4pgjcq84s7ac0y1cm5i33l8n6li5z8ynivdj9w9fb46"; depends=[httr oai solr xml2]; };
   reGenotyper = derive2 { name="reGenotyper"; version="1.2.0"; sha256="13g4fhj25kdk6wbl1hcabcaxcpv0dj0hj2l502wl1aywk1fvmy8m"; depends=[gplots MatrixEQTL zoo]; };
   reReg = derive2 { name="reReg"; version="1.0-0"; sha256="0xd78frrzykdrdwj39vv5m11s5v3xg9fym200gz7sffw8vjv3z96"; depends=[aftgee BB MASS SQUAREM survival]; };
   readBrukerFlexData = derive2 { name="readBrukerFlexData"; version="1.8.2"; sha256="1cagv6l29h3p87h7c2bgba23v2wxrs2kg4zg1dk046m2x11mwx3c"; depends=[]; };
@@ -6194,15 +6353,19 @@ in with self; {
   reams = derive2 { name="reams"; version="0.1"; sha256="07hqi0y59kv5lg0nl75xy8n48zw03y5m71zx58aiig94bf3yl95c"; depends=[leaps mgcv]; };
   rebird = derive2 { name="rebird"; version="0.2"; sha256="11x8db6gq9qkv9skslda4j6zgzmkmiap78rlwnlvkjvk1gzz13bf"; depends=[dplyr httr jsonlite]; };
   rebmix = derive2 { name="rebmix"; version="2.7.2"; sha256="1m71kvd7yska5iwgn0vzrhcbz8qmiwqrda201xqjxvvs8faqj66j"; depends=[]; };
-  rebus = derive2 { name="rebus"; version="0.0-5"; sha256="06rl6knnk93k537hhjx4r55hq6hssij7xc426ilki329vwfi5kyf"; depends=[]; };
-  recalls = derive2 { name="recalls"; version="0.1.0"; sha256="121r2lf32x4yq8zxx6pbnphs7ygn382ns85qxws6jnqzy52q41vh"; depends=[RCurl RJSONIO]; };
+  rebus = derive2 { name="rebus"; version="0.1-0"; sha256="00s11bskcmrqfb378nh9irc1x6kp9vq578jlj6pz6cvfw8hgc5lk"; depends=[rebus_base rebus_datetimes rebus_numbers rebus_unicode]; };
+  rebus_base = derive2 { name="rebus.base"; version="0.0-1"; sha256="13z8zdr09kc14zhf1yf0r8m5h5zr5bjr8jagv9mam335b7ddgbjq"; depends=[]; };
+  rebus_datetimes = derive2 { name="rebus.datetimes"; version="0.0-1"; sha256="09lv41mywm13avxb0xp8x1a2xz50zxazh3lpg27m16d4cgijmhm5"; depends=[rebus_base]; };
+  rebus_numbers = derive2 { name="rebus.numbers"; version="0.0-1"; sha256="0drgszz0824j49c6jk9ry0cfjky7g843ldlxrx3g2vjp0v7hznj3"; depends=[rebus_base]; };
+  rebus_unicode = derive2 { name="rebus.unicode"; version="0.0-1"; sha256="0xkb5lp6798220cqy571rxj98cy673wn8kp0im3mcnpjx6p1q3n2"; depends=[rebus_base]; };
   recluster = derive2 { name="recluster"; version="2.8"; sha256="05g8k10813zbkgja6gvgscdsjd99q124jx31whncc4awdsgk69s4"; depends=[ape cluster phangorn phytools picante vegan]; };
   recoder = derive2 { name="recoder"; version="0.1"; sha256="0wh0lqp7hfd4lx2xnmszv1m932ax87k810aqxdb6liwbmvwqnfgd"; depends=[stringr]; };
-  recommenderlab = derive2 { name="recommenderlab"; version="0.1-7"; sha256="1qysw4522wmgrzwdmbmfa2ll689kllrwjrxialpwggq8raccrsqd"; depends=[arules Matrix proxy registry]; };
+  recommenderlab = derive2 { name="recommenderlab"; version="0.1-8"; sha256="17bab1irh7q9kznf1qz6jh81b4c98wcx323hq666dk23rc2kg7zx"; depends=[arules bcv Matrix proxy registry]; };
   recommenderlabBX = derive2 { name="recommenderlabBX"; version="0.1-1"; sha256="042yh0h8qxj7n9hysrfdxnpb3g0zb6s5b683s7hn5mjc55q7nn4g"; depends=[recommenderlab]; };
   recommenderlabJester = derive2 { name="recommenderlabJester"; version="0.1-1"; sha256="1ygdq7wd970yi7298i62r22fg657bswwkmqjabph7if6b13fjyfb"; depends=[recommenderlab]; };
   reconstructr = derive2 { name="reconstructr"; version="1.1.0"; sha256="1kswvpmhk3zzwm4nv6pjb80ww95n9bd4q9j7bhk9kql8v5mnfg5m"; depends=[Rcpp]; };
   recosystem = derive2 { name="recosystem"; version="0.3"; sha256="064rnnz4m85mwq3084m0ldj8sb5z6jwzqzkh22fagsq2xyqri15l"; depends=[Rcpp]; };
+  reda = derive2 { name="reda"; version="0.2.1"; sha256="0c96vs8h0g551gb5vxrlw2q1yzca4nwg579nwysxm7z16zn7p05k"; depends=[ggplot2 plyr]; };
   redcapAPI = derive2 { name="redcapAPI"; version="1.3"; sha256="08js2lvrdl9ig0pq1wf7cwkmvaah6xs65bgfysdhsyayx0lz5rii"; depends=[chron DBI Hmisc httr stringr]; };
   redist = derive2 { name="redist"; version="1.2"; sha256="1169dh4v8mq1ag1crqmn9apyd0280qf2l0df6xwy7263gvmnqdmy"; depends=[coda Rcpp RcppArmadillo sp spdep]; };
   ref = derive2 { name="ref"; version="0.99"; sha256="0f0yz08pqpg57mcm7rh4g0rbvlcvs5fbpjkfrq7fmj850z1ixvw0"; depends=[]; };
@@ -6221,6 +6384,7 @@ in with self; {
   regsubseq = derive2 { name="regsubseq"; version="0.12"; sha256="0879r4r8kpr8jd6a3fa9cifm7cv0sqzz8z1alkm1b2fr1625md3g"; depends=[]; };
   regtest = derive2 { name="regtest"; version="0.05"; sha256="1wrrpp2hvkas0yc512gya3pvd0v97pn4v51k5jxkwyd1pp68zd1q"; depends=[]; };
   rehh = derive2 { name="rehh"; version="1.13"; sha256="0hi9bfclai1b948yq9fp1q7rxb8nwvdm368l09la8ghlgxi5lnm8"; depends=[gplots]; };
+  relMix = derive2 { name="relMix"; version="1.0"; sha256="1p6zpbilfyfsaa39a54xm4yvqapamlxydzzcr0g6m60abrsdwhg5"; depends=[Familias paramlink]; };
   relSim = derive2 { name="relSim"; version="0.2-0"; sha256="0cqcp7r263sk874l17wz84mzm4b1dxbfbsk74937rcz1wfc623k5"; depends=[Rcpp]; };
   rela = derive2 { name="rela"; version="4.1"; sha256="00ksm7zh1mpd2d5c5d823id3sxj0h3x0ccg6a40fadibvr1ay3ny"; depends=[]; };
   relaimpo = derive2 { name="relaimpo"; version="2.2-2"; sha256="1rxjg2yw2gyshaij98w83cshxwscnq3ql7bg13n7v4nbjsi1l6zh"; depends=[boot corpcor MASS mitools survey]; };
@@ -6234,6 +6398,7 @@ in with self; {
   reliaR = derive2 { name="reliaR"; version="0.01"; sha256="000nafjp386nzd0n57hshmjzippiha6s6c4nfrcwl059dzmi088i"; depends=[]; };
   relimp = derive2 { name="relimp"; version="1.0-4"; sha256="1i9j218b6lh6ag4a8x4vwhmqqclbzx46mpwd36s8hdqayzs6lmad"; depends=[]; };
   relsurv = derive2 { name="relsurv"; version="2.0-6"; sha256="1wn3s4faipyxyllyy221vzf8il2q00z53jjr315rlkgd577908sf"; depends=[date survival]; };
+  rem = derive2 { name="rem"; version="1.1.1"; sha256="1hs8gi10d39x4qfmlccdwcw5r66l331xh4x3pqmimhj5a2hyqdy3"; depends=[flexsurv Rcpp survival]; };
   remMap = derive2 { name="remMap"; version="0.2-0"; sha256="1k2niiaq2lr4inrx443clff9cqqvyiiwd45k7yqjd8ixnbaa3mrk"; depends=[]; };
   remix = derive2 { name="remix"; version="2.1"; sha256="0s1gaf7vj08xd4m7lc9qpwvk0mpamabbxk71970mfazx6hk24dr0"; depends=[ascii Hmisc plyr survival]; };
   remote = derive2 { name="remote"; version="1.0.0"; sha256="09840z50x5i8bsi49s3asqhcz84z16pyq9w50yay4h8x82w3hfh3"; depends=[foreach raster Rcpp]; };
@@ -6244,13 +6409,14 @@ in with self; {
   replicationInterval = derive2 { name="replicationInterval"; version="1.0.0"; sha256="1ll6gyibd41kasc3sn6hvydc6xaacx6h5q5nhj09ha36x4lgr0gb"; depends=[MBESS]; };
   repmis = derive2 { name="repmis"; version="0.4.4"; sha256="12sw9l2nifkvri5kvgf0br7yqqmjlq5rj58g6yik8gh7wwy5157z"; depends=[data_table digest httr plyr R_cache]; };
   repo = derive2 { name="repo"; version="1.0"; sha256="103bjd880hd76qpipryl17l9972hwj5c3dxicjq0dcbdfmdk7q7h"; depends=[digest]; };
-  repolr = derive2 { name="repolr"; version="2.0"; sha256="10wg07sfxcxzswf3zh5sx2cm9dxjx11zymy82a4q9awnacb5gp9b"; depends=[gee]; };
+  repolr = derive2 { name="repolr"; version="3.2"; sha256="0jcl8wssrcbs0phkpfpincndkgx1gcws24wc5q34wd9jhd3idndz"; depends=[Matrix Rcpp RcppArmadillo]; };
   reportRx = derive2 { name="reportRx"; version="1.0"; sha256="0npiflql0lq8sqp6xgydxbw7xdr0zdxj1s2h4bnpmn4clc05r7m4"; depends=[aod cmprsk geoR reshape stringr survival xtable]; };
   reportr = derive2 { name="reportr"; version="1.2.0"; sha256="00nbkv6s7lydxq1gd532gkfl96dbrdq4p6bmqxnbjhrwx8c3kx6h"; depends=[ore]; };
   reports = derive2 { name="reports"; version="0.1.4"; sha256="0r74fjmdqax2x5fhbkdxb8gsvzi6v794fh81x4la9davz6w1fnxh"; depends=[]; };
   reporttools = derive2 { name="reporttools"; version="1.1.2"; sha256="1i87xmp7zchcb8w8g7nypid06l2439qyrvpwsjz6qny954w6fa2b"; depends=[xtable]; };
   represent = derive2 { name="represent"; version="1.0"; sha256="0jvb40i6r1bh9ysfqwsj7s1g933d7z5fq9d618yjrqr6hbbqsvac"; depends=[]; };
   reproducer = derive2 { name="reproducer"; version="0.1.3"; sha256="1pz2l123xc16m1pqi95khg9r267s25igcyjgr7hn9gy623cqgzah"; depends=[ggplot2 gridExtra metafor openxlsx RColorBrewer tm wordcloud xtable]; };
+  request = derive2 { name="request"; version="0.1.0"; sha256="1q7zd6q00gdqmgq7s7nq1ixmns8zn2amr5zah9rwnsn8dkllj9yh"; depends=[curl httr jsonlite lazyeval magrittr R6 whisker]; };
   rerddap = derive2 { name="rerddap"; version="0.3.0"; sha256="1aqcksry1ccdwc2y3n5mqp4fvq7phn2jcimlywkwrvd5fg2i60jx"; depends=[data_table digest dplyr httr jsonlite ncdf xml2]; };
   resample = derive2 { name="resample"; version="0.4"; sha256="1rckzm2p0rkf42isc47x72j17xqrg8b7jpc440kn24mqw4szgmgh"; depends=[]; };
   resemble = derive2 { name="resemble"; version="1.1.1"; sha256="0mz5mxm6p1drfx2s9dx35m2bnvirr8lkjjh5b4vdk9p2cdv1qkkv"; depends=[foreach iterators pls Rcpp RcppArmadillo]; };
@@ -6262,6 +6428,7 @@ in with self; {
   restlos = derive2 { name="restlos"; version="0.2-2"; sha256="083w1ldax8bnf3w4119damma2nz75c3ki187b0275i1mqxqrixp7"; depends=[geometry igraph limSolve rgl som]; };
   restorepoint = derive2 { name="restorepoint"; version="0.1.7"; sha256="101lh84jsz84q0ch0j5adsjgza4ggv9xvwbq0d5wik7z5wa39pa6"; depends=[]; };
   resumer = derive2 { name="resumer"; version="0.0.1"; sha256="1xl1jl6bvjlx2djfm8k0za1wcrimsfc77qk6zybbxls0srayh7c4"; depends=[dplyr rmarkdown useful]; };
+  rethinker = derive2 { name="rethinker"; version="1.0.0"; sha256="0a28r0rkg4m6jsrvczkkpdqrca3q5l5pgb4wyz6pvy5scjlvmpls"; depends=[rjson]; };
   retimes = derive2 { name="retimes"; version="0.1-2"; sha256="019sllyfahlqnqry2gqw4w5cy4cavrqnwpwrbb25cgjpdb19raja"; depends=[]; };
   retistruct = derive2 { name="retistruct"; version="0.5.10"; sha256="1wg2a906y09hcqba42hh9r2x59w35dms2aa5mw44avigc1nwm0s2"; depends=[foreign geometry png R_matlab rgl RImageJROI RTriangle sp ttutils]; };
   retrosheet = derive2 { name="retrosheet"; version="1.0.2"; sha256="079rfc55sy315i7zhv1a8r6drgpiglbf3b4gwyria2mfbn94a5qb"; depends=[data_table RCurl stringi XML]; };
@@ -6281,22 +6448,22 @@ in with self; {
   rforensicbatwing = derive2 { name="rforensicbatwing"; version="1.3"; sha256="0ff4v7px4wm5rd4f4z8s4arh48hgayqjfpnni2997c92wlsq3d12"; depends=[Rcpp]; };
   rgabriel = derive2 { name="rgabriel"; version="0.7"; sha256="1c6awfppm1gqg7rm3551k6wyhqvjpyidqikjisg2p2kkhmyfkyzx"; depends=[]; };
   rgam = derive2 { name="rgam"; version="0.6.3"; sha256="0mbyyhhyr7ijv2sq9n7g0vaxivngwf4nbb5398xpsh7fxvgw5zdw"; depends=[Rcpp RcppArmadillo]; };
-  rgbif = derive2 { name="rgbif"; version="0.8.9"; sha256="0fzv7jw9qvlmfllaj8qvq87c0rynwnmphyml1s0bx6b7zm10wcgq"; depends=[data_table ggplot2 httr jsonlite magrittr V8 whisker XML]; };
+  rgbif = derive2 { name="rgbif"; version="0.9.0"; sha256="1vz7bkbnp56fxnzlnq6fczmhj9xrc9gldab64pbnszaly90yhv3v"; depends=[data_table ggplot2 httr jsonlite magrittr oai V8 whisker XML]; };
   rgcvpack = derive2 { name="rgcvpack"; version="0.1-4"; sha256="1vlvw9slrra18qaizqk2xglzky0i6z3bsan85x908wrg8drss4h5"; depends=[]; };
-  rgdal = derive2 { name="rgdal"; version="1.1-1"; sha256="03hbkdmskf9n53n8czwxm6ixw6px6kzwcsd3634spwwzvqr4n5i8"; depends=[sp]; };
+  rgdal = derive2 { name="rgdal"; version="1.1-3"; sha256="0ah2qsrz050pbkyijasqc22xvfgsyh0djb8ma3ixfsyrfrflnbpa"; depends=[sp]; };
   rgenoud = derive2 { name="rgenoud"; version="5.7-12.4"; sha256="19y0297fsxggjrdjv8n3a5klbqf8y3mq4mmdz6xx28cz3k65dk4n"; depends=[]; };
   rgeolocate = derive2 { name="rgeolocate"; version="0.5.0"; sha256="0n680a9wnw2xvql0584kqrs22ymj9rr1lbr670j55y6far9pwa0m"; depends=[httr Rcpp]; };
   rgeos = derive2 { name="rgeos"; version="0.3-15"; sha256="1f6nsqpcgbvwjcni9wj8jf4pag79801wiw4ks9gh5kxrc59a165y"; depends=[sp]; };
   rgexf = derive2 { name="rgexf"; version="0.15.3"; sha256="0iw1vk32ad623aasf6f8hl0qkj59f1dsc2riwqc775zvs5w7k2if"; depends=[igraph Rook XML]; };
   rggobi = derive2 { name="rggobi"; version="2.1.20"; sha256="1a7l68h3m9cq14k7y96ijgh0iz3d6j4j2anxg50pykz20lnykr9g"; depends=[RGtk2]; };
-  rgl = derive2 { name="rgl"; version="0.95.1367"; sha256="18p04p5i2dbkcszwdakvps7hasv7dw7dxvbwwd56rh1i1zkf2pk9"; depends=[]; };
+  rgl = derive2 { name="rgl"; version="0.95.1435"; sha256="1wmyb7317z4cz5lvv1m53l24dk0p2f0mvmrqhc6q1m811rzzlj54"; depends=[]; };
   rglobi = derive2 { name="rglobi"; version="0.2.8"; sha256="1033cmwairf4nm9r6nvi1ddgq0j9mzchlzvj1hph0vlcbb53ybqh"; depends=[RCurl rjson]; };
-  rglwidget = derive2 { name="rglwidget"; version="0.1.1402"; sha256="0yx7840nlyxvmw2n8dqp11r9ggvpkh9m53alxj9rlf21y6h4gvnr"; depends=[htmltools htmlwidgets jsonlite knitr rgl shiny]; };
+  rglwidget = derive2 { name="rglwidget"; version="0.1.1434"; sha256="1483l8gfxnmdps22aiqxnxginc383sj0105bj8d620q9y041625z"; depends=[htmltools htmlwidgets jsonlite knitr magrittr rgl shiny]; };
   rgp = derive2 { name="rgp"; version="0.4-1"; sha256="1p5qa46v0sli7ccyp39iysn04yvq80dy2w1hk4c80pfwrxc6n03g"; depends=[emoa]; };
   rgpui = derive2 { name="rgpui"; version="0.1-2"; sha256="0sh5wj4f2wj6g3r7xaq95q89n0qjavchi5kfi6sj1j34ykybbs3g"; depends=[emoa rgp shiny]; };
   rgr = derive2 { name="rgr"; version="1.1.11"; sha256="01hlj3nqzfsffr4k7d3iyp4mfqs1sy94d0scy64wh9kkplrzkh4i"; depends=[fastICA MASS]; };
   rgrass7 = derive2 { name="rgrass7"; version="0.1-3"; sha256="0fqxa5rqpsbpkqgqbq1vnpw1gspwdqjbya5n63anamjyahwnsv5f"; depends=[sp XML]; };
-  rhandsontable = derive2 { name="rhandsontable"; version="0.2.1"; sha256="00wyh9i20a9f5dbibwvgip6d9m6i4kr0yxrwp5d5qgh6bdcqgpj4"; depends=[htmlwidgets jsonlite magrittr]; };
+  rhandsontable = derive2 { name="rhandsontable"; version="0.2.3"; sha256="1iij9zw2yicdv981rw6cwv35ih58p54zhnybpfi115fkzfh1x78r"; depends=[htmlwidgets jsonlite magrittr]; };
   rhosp = derive2 { name="rhosp"; version="1.07"; sha256="09wq96micv9wpr3sx8ir7frkanpy3zi3mwn6rbixw2kxvn5wkkfn"; depends=[]; };
   ri = derive2 { name="ri"; version="0.9"; sha256="00y01n9cx95bjhdpnh7vi0xd5p6al3sxbjszbyxafn7m9mygmnhv"; depends=[]; };
   riceware = derive2 { name="riceware"; version="0.4"; sha256="0pky0bwf10qcdgg9fgysafr35xbmnr9q0jbh56fawj99nbyj3m70"; depends=[random]; };
@@ -6308,7 +6475,7 @@ in with self; {
   rio = derive2 { name="rio"; version="0.2"; sha256="0v64zkxcs2bajdh9hqlhacc6msy7l3h31cvcxpj6in5hb3m1wfv3"; depends=[curl data_table foreign haven jsonlite openxlsx readODS readxl XML]; };
   rioja = derive2 { name="rioja"; version="0.9-5"; sha256="0bi80d8ffn1kgs0b45ia8rj057id8l3mnph16y5wc5nr8fndxrm4"; depends=[gdata lattice mgcv vegan]; };
   ripa = derive2 { name="ripa"; version="2.0-2"; sha256="0n1gaga0d4bb9qdlm7gksa1nwi4y28kbgwr3icwqgihf1bfb9m81"; depends=[Rcpp]; };
-  riskR = derive2 { name="riskR"; version="1.0"; sha256="1sdjdid2z4cycz013hs50r9f3v3ny9gsvcxlx6rx86z3zr6d2vjf"; depends=[]; };
+  riskR = derive2 { name="riskR"; version="1.1"; sha256="1qadfyb07idfw0bs006kb3917rzda83di6jmsr22941gv78z1wyv"; depends=[]; };
   riskRegression = derive2 { name="riskRegression"; version="1.1.7"; sha256="1db331s67w9i84dji05fjh8ml938w2y694gkyq00h14fkmwr9g4g"; depends=[cmprsk pec prodlim randomForestSRC rms survival]; };
   riskSimul = derive2 { name="riskSimul"; version="0.1"; sha256="0s2a1mn6g11m96gqscb916caj2aykcs3rkacpqcdnlyzryk1gsnb"; depends=[Runuran]; };
   risksetROC = derive2 { name="risksetROC"; version="1.0.4"; sha256="1fh0jf8v536qzf1v3awx3f73wykzicli4r54yg1z926ccqb4h80l"; depends=[MASS survival]; };
@@ -6333,17 +6500,19 @@ in with self; {
   rlist = derive2 { name="rlist"; version="0.4.5.1"; sha256="015iiy989r6www7la2flnqw1967j1m4rip5sn33v1zp1immh40m2"; depends=[data_table jsonlite XML yaml]; };
   rlm = derive2 { name="rlm"; version="1.1"; sha256="147hn780hjbp8ly3mc5q05g36b080ndq0z0r0vq75c2qfkhybvdc"; depends=[]; };
   rmaf = derive2 { name="rmaf"; version="3.0.1"; sha256="0w247mamwgibr5576p5c2lzaiz2lv2c25n7gw9q99s7rc4bps7j7"; depends=[]; };
-  rmarkdown = derive2 { name="rmarkdown"; version="0.8.1"; sha256="07q5g9dvac5j3vnf4sjc60mnkij1k6y7vnzjz6anf499rwdwbxza"; depends=[caTools htmltools knitr yaml]; };
+  rmarkdown = derive2 { name="rmarkdown"; version="0.9.2"; sha256="1bp7g2z991acczidbf214zp5mk5a98mv79gd07hq2mx0145lvydi"; depends=[caTools htmltools knitr yaml]; };
   rmatio = derive2 { name="rmatio"; version="0.11.0"; sha256="0cmlh16nf3r94gpczq0j46g4dgjy9q1c647rqd9i14hvfrpxzcfa"; depends=[lattice Matrix]; };
+  rmdformats = derive2 { name="rmdformats"; version="0.1.1"; sha256="0y0ax3lap4j5sknxjcm31y72c9baynl8y7vfa7k7rj11p2vp0cil"; depends=[htmltools knitr questionr rmarkdown]; };
   rmeta = derive2 { name="rmeta"; version="2.16"; sha256="1s3n185kk0ddv8v6c7mbc7cpj6yg532r7is6pjf9vda7317rxywy"; depends=[]; };
   rmetasim = derive2 { name="rmetasim"; version="2.0.4"; sha256="1a3bhiybzdvgqnnyh3d31d6vdsp4mi33sv8ks9b9xd9r369npk86"; depends=[ade4 ape gtools]; };
-  rmgarch = derive2 { name="rmgarch"; version="1.2-9"; sha256="0nwhjypcfzaamg5kdmlx2lp5pr2xpjxdx15j5vs5ki8kvy65hzqj"; depends=[Bessel ff MASS Matrix pcaPP Rcpp RcppArmadillo Rsolnp rugarch shape spd xts zoo]; };
+  rmgarch = derive2 { name="rmgarch"; version="1.3-0"; sha256="0brqjhplvzl0bgsi6x057rb2cg5x372i746dhddr013p1mx0rlcx"; depends=[Bessel ff MASS Matrix pcaPP Rcpp RcppArmadillo Rsolnp rugarch shape spd xts zoo]; };
   rminer = derive2 { name="rminer"; version="1.4.1"; sha256="1rbs5k3jxjbxr3pdlg03591h8yy9nrg8zjq1kcnvmzgza2a25613"; depends=[adabag Cubist e1071 kernlab kknn lattice MASS mda nnet party plotrix pls randomForest rpart]; };
   rmngb = derive2 { name="rmngb"; version="0.6-1"; sha256="1wyq8jvzqpy1s6w0j77ngh5x2q7mpj0ib01m8mla20w6yr6xbqjk"; depends=[Hmisc]; };
   rmongodb = derive2 { name="rmongodb"; version="1.8.0"; sha256="035a76ak6wi21hdvgzzbggz0qnb53rrr2wfx97ngc8ijwhw8hjh7"; depends=[jsonlite plyr]; };
   rmp = derive2 { name="rmp"; version="1.0"; sha256="1g0785fwjbwbj82sir3n7sg3idsjzdhrpxc7z88339cv9g4rl7ry"; depends=[]; };
-  rms = derive2 { name="rms"; version="4.4-0"; sha256="1czibh0py82nwq7i6h2slgry3zz4x368wgcxydjb0mf81yxyg936"; depends=[ggplot2 Hmisc lattice multcomp nlme polspline quantreg rpart SparseM survival]; };
+  rms = derive2 { name="rms"; version="4.4-1"; sha256="1b16zw791advrqgpjjw1m291d0lrdf2a4mkp3anh7pjmdaq14n2g"; depends=[ggplot2 Hmisc lattice multcomp nlme polspline quantreg rpart SparseM survival]; };
   rms_gof = derive2 { name="rms.gof"; version="1.0"; sha256="1n0h3nrp11f2x70mfjxpk2f3g4vwjaf4476pjjwy49smxxlxwz82"; depends=[]; };
+  rmumps = derive2 { name="rmumps"; version="5.0.1.4"; sha256="0fcfkycp98f264mrd5cdhiqi0vqj3b6d7zmaffhzkhxa6c675hwn"; depends=[Rcpp]; };
   rnaseqWrapper = derive2 { name="rnaseqWrapper"; version="1.0-1"; sha256="1fa3hmwrpccf09dlpginl31lcxpj5ypxspa0mlraynlfl5jrivch"; depends=[ecodist gplots gtools]; };
   rnbn = derive2 { name="rnbn"; version="1.0.3"; sha256="05amrx12b7p4pca1wbysn1n2rxbg5r54mpmga4i3xlpijx9baj80"; depends=[httr]; };
   rncl = derive2 { name="rncl"; version="0.6.0"; sha256="067x05xg7bs271zjhylz3dcd9zan1ycmsh771gn06k9905rr2y71"; depends=[Rcpp]; };
@@ -6353,12 +6522,14 @@ in with self; {
   rngWELL = derive2 { name="rngWELL"; version="0.10-4"; sha256="0ayrkd2yllsgl7iqqbhiyrnyyqk13f4wh1np23iz0zj650yjqdq8"; depends=[]; };
   rngtools = derive2 { name="rngtools"; version="1.2.4"; sha256="1fcgfqrrb48z37xgy8sffx91p9irp39yqzxv7nqp1x2hnwsrh097"; depends=[digest pkgmaker stringr]; };
   rngwell19937 = derive2 { name="rngwell19937"; version="0.6-0"; sha256="0m6icqf7nckdxxvmqvwfkrpjs10hc7l8xisc65q8iqpnpwl5p2f6"; depends=[]; };
-  rnoaa = derive2 { name="rnoaa"; version="0.4.2"; sha256="14fd1mp7ydpqj0wqr3nyysks36dj7bmcyirpsbrn6pjjdasn6a0s"; depends=[dplyr ggplot2 httr jsonlite lubridate rgdal scales tidyr XML]; };
+  rnn = derive2 { name="rnn"; version="0.2.0"; sha256="1c8yx4604fdp9w1l3mcscig2206rwgbp43a1h753jpr8cqwdl75l"; depends=[]; };
+  rnoaa = derive2 { name="rnoaa"; version="0.5.0"; sha256="0y0cf4k09xgivb0mrbil0h5b4n4p106m04b7gjwvbjanxaliwdhl"; depends=[dplyr ggplot2 httr jsonlite lubridate rgdal scales tidyr XML]; };
   rnrfa = derive2 { name="rnrfa"; version="0.3.0"; sha256="0wlkja6nwlwm4lqxj2sf3cfr28w1c3h2hwbmlibgcxff9ij3kd99"; depends=[RCurl rgdal rjson sp stringr XML2R zoo]; };
   robCompositions = derive2 { name="robCompositions"; version="1.9.1"; sha256="1n8mbm62ywp1wnccv85ydm91bzp05i4fjvyriid8751pcb4zndn9"; depends=[GGally MASS pls robustbase rrcov sROC]; };
   robcor = derive2 { name="robcor"; version="0.1-6"; sha256="1hw8simv93jq8a5y79hblhqz157wr8q9dzgm0xhvvv5nkzyqkpzf"; depends=[]; };
   robeth = derive2 { name="robeth"; version="2.7"; sha256="03pnwd3xjb9yv8jfav0s4l9k5pgpampp15ak7z0yvkjs20rvfq3d"; depends=[]; };
   robfilter = derive2 { name="robfilter"; version="4.1"; sha256="161rsqyy2gq1n6ysz0l4d4gqvxhs72hznc2d5hljxdaz3sbdzzig"; depends=[lattice MASS robustbase]; };
+  robreg3S = derive2 { name="robreg3S"; version="0.3"; sha256="0rv8qh98wws1f40d1kmysyy9qin0ngsvwq63cnxbwi290wsnrvls"; depends=[GSE MASS robustbase]; };
   robumeta = derive2 { name="robumeta"; version="1.6"; sha256="13hwbl4pym3pkxxfbffhv22nn3f4spc6lb4gz1wxi9iha1s9ywi5"; depends=[]; };
   robust = derive2 { name="robust"; version="0.4-16"; sha256="0psai9d6w7yi0wfm57cc7b2jd5i7wbk2xagrhnvhxknw0dwzf2jh"; depends=[fit_models lattice MASS robustbase rrcov]; };
   robustDA = derive2 { name="robustDA"; version="1.1"; sha256="1yys6adkyms5r4sw887y78gnh97qqr7sbi5lxv5l9bnc4ggcfiz6"; depends=[MASS mclust Rsolnp]; };
@@ -6367,7 +6538,7 @@ in with self; {
   robustbase = derive2 { name="robustbase"; version="0.92-5"; sha256="0wsdgqbkr0amid71q52cij9wnyss2sh1fm75g8cp4d6dndh327rl"; depends=[DEoptimR]; };
   robustfa = derive2 { name="robustfa"; version="1.0-5"; sha256="04nk5ipml54snsmiqf5sbhx490i46gnhs7yibf4wscrsj1bh2mqy"; depends=[rrcov]; };
   robustgam = derive2 { name="robustgam"; version="0.1.7"; sha256="0s1z7jylj757g91najbyi1aiqnssd207jfm9yhias746540qp3kw"; depends=[mgcv Rcpp RcppArmadillo robustbase]; };
-  robustlmm = derive2 { name="robustlmm"; version="1.7-6"; sha256="0b2qlwkc5in85ll2x7pbk8915x0dn473i5xf6z3g2swsbg0ykvaz"; depends=[ggplot2 lattice lme4 Matrix nlme robustbase xtable]; };
+  robustlmm = derive2 { name="robustlmm"; version="1.8"; sha256="0i6h5kndj53p0hcwyx0bp2h6d2hiajf2ycyvq00ajx5jspi8kv48"; depends=[ggplot2 lattice lme4 Matrix nlme robustbase xtable]; };
   robustloggamma = derive2 { name="robustloggamma"; version="0.4-31"; sha256="19ycdvpzns46gjnkddwznnszs0941blpss7l0cqligv91cz7bkjc"; depends=[robustbase]; };
   robustreg = derive2 { name="robustreg"; version="0.1-9"; sha256="1jjydpiz7wwyvivq7vbyrlyf6y9pd036p2xls0kkq7w1d3vpzjwk"; depends=[Matrix Rcpp RcppArmadillo]; };
   robustvarComp = derive2 { name="robustvarComp"; version="0.1-2"; sha256="187mcpih509hx15wjjr7z2h6h76mz2v0d8xgsxjd8wz7l3dnlp2f"; depends=[GSE numDeriv plyr robust robustbase]; };
@@ -6379,8 +6550,9 @@ in with self; {
   rootSolve = derive2 { name="rootSolve"; version="1.6.6"; sha256="0mn7nxdw1klfay7z12vl3k0ffq3i9p930fyiksjjgy4yz6hljxqx"; depends=[]; };
   ropensecretsapi = derive2 { name="ropensecretsapi"; version="1.0.1"; sha256="0d4yl0h4am3blskdnzk119hk374c3vx0cg99r20w07yh8jfafrw7"; depends=[RCurl RJSONIO]; };
   ror = derive2 { name="ror"; version="1.2"; sha256="0n8mk35rm3rp0c7a3i961kij21a177znh9hkq4snqqlw9vf50hdg"; depends=[igraph rJava ROI ROI_plugin_glpk]; };
+  rorcid = derive2 { name="rorcid"; version="0.2.0"; sha256="1nymnas4s7nwajii0iwyv5azwkp5sfx95m60is161zqm6zxyniaw"; depends=[httr jsonlite]; };
   rorutadis = derive2 { name="rorutadis"; version="0.3.1"; sha256="06s2cnfhs4hffd2bzqp6542fqw37ha63d5sc25j9ch3ih42ja3cg"; depends=[ggplot2 gridExtra hitandrun Rglpk]; };
-  rosm = derive2 { name="rosm"; version="0.1.2"; sha256="0v7s1d7rlm01zi3wigidrg5dvrpnvwr68gh23m2s0mbc8wlzg0ax"; depends=[abind digest jpeg png rgdal rjson sp]; };
+  rosm = derive2 { name="rosm"; version="0.1.3"; sha256="0a9shin62zlpc752jhyg72cshc7wwz6cp4br64ra4h86xdlwi3c4"; depends=[abind digest jpeg png rgdal rjson sp]; };
   rotationForest = derive2 { name="rotationForest"; version="0.1"; sha256="07my0i84jvmjxvg2ifvsrbc0r5z4s32xi0vfdwrkhhdzdn87h527"; depends=[rpart]; };
   rotations = derive2 { name="rotations"; version="1.4"; sha256="0snnzjbp5sxd8ijv9ams4jyhsd8s47kdbkkf34iv3ppibjdzrri5"; depends=[ggplot2 Rcpp RcppArmadillo rgl sphereplot]; };
   rotl = derive2 { name="rotl"; version="0.4.1"; sha256="1f5x2adlv7fbz0w4bwc7q69wq20rlx5scyzl1immkxgs27was4l1"; depends=[ape httr jsonlite rncl]; };
@@ -6396,7 +6568,7 @@ in with self; {
   rpartitions = derive2 { name="rpartitions"; version="0.1"; sha256="1gklsi4pqhk16xp9s49n1lr9ldm1vx61pvphjqsqkzrlxwcpx3j8"; depends=[hash]; };
   rpca = derive2 { name="rpca"; version="0.2.3"; sha256="135q3g8jmn9rwamrc9ss45cnbfyw8kxcbrf0kinw8asz70fihj9z"; depends=[]; };
   rpdo = derive2 { name="rpdo"; version="0.1.0"; sha256="032wnq520njhd80v1dhhv44f0c0hdpi5dsra9yisvvgbsfi9vnd7"; depends=[]; };
-  rpf = derive2 { name="rpf"; version="0.49"; sha256="19dx074ryvxxgcl3j37s7nk39vn6hqazj9zba95ij8pbz791wxms"; depends=[mvtnorm RcppEigen]; };
+  rpf = derive2 { name="rpf"; version="0.51"; sha256="0hsghv26jbv3alvyrh9bkgx97mjbvd21zjv9n1q63d6d3drxc6rc"; depends=[mvtnorm RcppEigen]; };
   rpg = derive2 { name="rpg"; version="1.4"; sha256="0sisn5l1qxlqg6jq4lzr7w3axkaw5jlpz8vl9gp2hs0spxsjhcyn"; depends=[RApiSerialize Rcpp uuid]; };
   rphast = derive2 { name="rphast"; version="1.6"; sha256="0ni8969bj3pv0wl8l0v352pqw2d5mlshsdw1rb6wlxk7qzfi5cl2"; depends=[]; };
   rpivotTable = derive2 { name="rpivotTable"; version="0.1.5.7"; sha256="1qqx417bgf5dcbvssp7y8b5zz66ipwdpv18pgndj92rx53h81g18"; depends=[htmlwidgets]; };
@@ -6417,12 +6589,12 @@ in with self; {
   rrcovHD = derive2 { name="rrcovHD"; version="0.2-3"; sha256="18k5c590wbi0kmx4nl1mkv7h6339as0s4jcr9am8v9v3w4pn0xni"; depends=[pcaPP pls robustbase rrcov spls]; };
   rrcovNA = derive2 { name="rrcovNA"; version="0.4-7"; sha256="1b3ffcs1szwswsayz8q3w87wndd7xbcg5rqamhjr2damgialx3bq"; depends=[cluster lattice norm robustbase rrcov]; };
   rredis = derive2 { name="rredis"; version="1.7.0"; sha256="0wzamwpmx20did8xj8x9dllri2ps83viyqjic18ari7i4h1bpixv"; depends=[]; };
-  rrepast = derive2 { name="rrepast"; version="0.1"; sha256="07n05fnk59pq06dg7gpwh52saqbqzl1mr5ylbk75pcy6d4cimnqp"; depends=[digest rJava xlsx]; };
+  rrepast = derive2 { name="rrepast"; version="0.3"; sha256="133ip1fxj8z76v0ny02mw7wbqjsmqsxbha6zsi4db4cxnilq8hai"; depends=[digest lhs rJava xlsx]; };
   rriskDistributions = derive2 { name="rriskDistributions"; version="2.1"; sha256="1sc0bj5sivclbq0grif99vclnlhg1k9dz4xdvng6vv392xkwbmfd"; depends=[eha mc2d msm tkrplot]; };
   rrlda = derive2 { name="rrlda"; version="1.1"; sha256="06n9jah190cz25n93jlb5zb0xrx91bjvxgswwdx9hdf0fmwrpkvz"; depends=[glasso matrixcalc mvoutlier pcaPP]; };
   rsae = derive2 { name="rsae"; version="0.1-5"; sha256="1f3ry3jwa6vg2vq2npx2pzzvfwadz8m48hjrqjk860nfjrymwgx5"; depends=[]; };
   rsatscan = derive2 { name="rsatscan"; version="0.3.9200"; sha256="00vgby24jknq8nl7rnqcwg7gawcxhwq8b7m98vjx2hkqx39n4g21"; depends=[foreign]; };
-  rscala = derive2 { name="rscala"; version="1.0.6"; sha256="065ll2xza09hi05w4hq35jl6y1nvwrv93ld983nxaji81z9pfgzx"; depends=[]; };
+  rscala = derive2 { name="rscala"; version="1.0.8"; sha256="106gwgfxsvs6npcmzl5yjx1kq6cpqjp7prcx15cx6sq3hj057h1i"; depends=[]; };
   rscopus = derive2 { name="rscopus"; version="0.1.2"; sha256="178ymgywq7fmv8gicrkhcqw40f6wxiqq6zhlc1zilcr0rf6lvx6x"; depends=[httr]; };
   rscproxy = derive2 { name="rscproxy"; version="2.0-5"; sha256="1bjdv7drlnffcnyc0j8r22j7v60k1xj58bw8nk9l8wvnmngrjz86"; depends=[]; };
   rsdepth = derive2 { name="rsdepth"; version="0.1-5"; sha256="064jbb6gnx0sm41w3sbi6mvsbzsfkjqfici6frk8sfm9ybvm591j"; depends=[]; };
@@ -6437,13 +6609,14 @@ in with self; {
   rsnps = derive2 { name="rsnps"; version="0.1.6"; sha256="1pqdmg1cwpm0cvr5ma7gzni88iq5kqv1w40v8iil3xvcmns8msjk"; depends=[httr jsonlite plyr RCurl stringr XML]; };
   rspa = derive2 { name="rspa"; version="0.1.8"; sha256="1zgk1v1yk9c51wbsl3skqfrznqj84146dzfwg7q3jy2hpdgf1cg6"; depends=[editrules]; };
   rstackdeque = derive2 { name="rstackdeque"; version="1.1.1"; sha256="0i1qqbfj0yrqbkad8bqc1qlxmyxpn7zycbnq83cdmfbilcmi87ql"; depends=[]; };
-  rstan = derive2 { name="rstan"; version="2.8.1"; sha256="0bkbj6giigcj2dwgz1n22mr1l5w3xn6k4fnd4vww4p9y843yqmac"; depends=[BH ggplot2 gridExtra inline Rcpp RcppEigen StanHeaders]; };
+  rstan = derive2 { name="rstan"; version="2.8.2"; sha256="1x1si0jfzay67yh1pygxzfz0pcb8xd2m5xbg5slb3syzi8xf7908"; depends=[BH ggplot2 gridExtra inline Rcpp RcppEigen StanHeaders]; };
+  rstatscn = derive2 { name="rstatscn"; version="1.0"; sha256="12anzir788j6nf2za1bkwxksnhb0khc8cml5bxdracgfd35nv77q"; depends=[httr jsonlite]; };
   rstiefel = derive2 { name="rstiefel"; version="0.10"; sha256="0b2sdgpb3hzal34gd9ldd7aihlhl3wndg4i4b3wy6rrrjkficrl1"; depends=[]; };
   rstpm2 = derive2 { name="rstpm2"; version="1.2.2"; sha256="0mmawy16b8yvzm8d5rx3dbchs7ybr2s5v6clqg88jkrff7141i7m"; depends=[bbmle mgcv numDeriv Rcpp RcppArmadillo survival]; };
   rstream = derive2 { name="rstream"; version="1.3.4"; sha256="1sgwk9mh3v3vv8gm537hfng6p2sqafd9ykraiw00s0z60fa80jnx"; depends=[]; };
-  rstudioapi = derive2 { name="rstudioapi"; version="0.3.1"; sha256="0q7671d924nzqsqhs8d9p7l907bcam56wjwm7vvz44xgj0saj8bs"; depends=[]; };
+  rstudioapi = derive2 { name="rstudioapi"; version="0.4.0"; sha256="0r229x6hj01xzgi64rgnlrl2h6q3vrj7cfhx4sbj76ig2k5gzhpi"; depends=[]; };
   rsubgroup = derive2 { name="rsubgroup"; version="0.6"; sha256="1hz8rnbsl97ch6sjwxdicn2sjyn6cajg2zwmfp03idzpb3ixlk7l"; depends=[foreign rJava]; };
-  rsunlight = derive2 { name="rsunlight"; version="0.4.0"; sha256="0hmpmf0ma0bycb65bq18q4y78187y9rq0vsj2d8hdmkksvyqjviy"; depends=[httr jsonlite plyr stringr]; };
+  rsunlight = derive2 { name="rsunlight"; version="0.4.2"; sha256="1m4ya960zjqxbjcjj42gjmdy40ac7m471fkfsd0r6w675qbiiw87"; depends=[httr jsonlite plyr stringr]; };
   rsvd = derive2 { name="rsvd"; version="0.3"; sha256="0439s19fn01iihsapzzbmq72v4brsmqypxgdhxswhj9qq3y8ikhc"; depends=[]; };
   rtable = derive2 { name="rtable"; version="0.1.5"; sha256="1a9x0qcbp96wg86nbvx25yh5viwvf5sqb41z3cvr5i7br2ji8n5i"; depends=[knitr ReporteRs shiny tidyr xtable]; };
   rtape = derive2 { name="rtape"; version="2.2"; sha256="0q7rs7pc1k1kayr734lvh367j5qig2nnq5mgak1wbpimhl7z3wm7"; depends=[]; };
@@ -6453,9 +6626,11 @@ in with self; {
   rtfbs = derive2 { name="rtfbs"; version="0.3.4"; sha256="1z5rhxgi44xdv07g3l18ricxdmp1p59jl8fxawrh5jr83qpcxsks"; depends=[rphast]; };
   rtiff = derive2 { name="rtiff"; version="1.4.5"; sha256="0wpjp8qwfiv1yyirf2zj0696zb7m7fpzn953ii8vbmgzhakgr8kw"; depends=[pixmap]; };
   rtimes = derive2 { name="rtimes"; version="0.3.0"; sha256="141i8zjsdzk7jdjf9wf3pa6d9ixjg1m4chk44iznmjpig4gbq2n9"; depends=[dplyr httr jsonlite]; };
+  rtkore = derive2 { name="rtkore"; version="1.0.1"; sha256="0wk3v7xzmkmmag09dc08812g75a129ycn1107hvzqcpqlwma3n2n"; depends=[Rcpp]; };
   rtkpp = derive2 { name="rtkpp"; version="0.9.2"; sha256="09x98mgbz3a9vn59qarzsfml5qaw9mz2hg36sn8z1pgpjq7a75sp"; depends=[Rcpp]; };
   rtop = derive2 { name="rtop"; version="0.5-5"; sha256="05yygg85f981x2amf9y8nr4ymya3pkwlig8i1rf9b49jx11h5w8j"; depends=[gstat sp]; };
   rts = derive2 { name="rts"; version="1.0-10"; sha256="0fvs82n8lxbm4n8w22ahx7j38xhaafwvr3sqr3lrfni2cs346pzs"; depends=[raster sp xts zoo]; };
+  rtson = derive2 { name="rtson"; version="1.1"; sha256="158dzs9wzb12k3hpkpz7jjhjdbr23j05rfyav1zn18hg43i5wbv3"; depends=[R6]; };
   rtype = derive2 { name="rtype"; version="0.1-1"; sha256="0wjf359w7gb1nrhbxknzg7qdys0hdn6alv07rd9wm6zynnn1vwxy"; depends=[]; };
   rucm = derive2 { name="rucm"; version="0.6"; sha256="1n6axmxss08f2jf5impvyamyhpbha13lvrk7pplxl0mrrrl5g0n8"; depends=[KFAS]; };
   rugarch = derive2 { name="rugarch"; version="1.3-6"; sha256="0ysycv0qldp4dnj8yh22v860d40ycp2c0la87zblgl86r7g4f03b"; depends=[chron expm ks nloptr numDeriv Rcpp RcppArmadillo Rsolnp SkewHyperbolic spd xts zoo]; };
@@ -6466,17 +6641,18 @@ in with self; {
   rv = derive2 { name="rv"; version="2.3.1"; sha256="0bjqwk7djl625fws3jlzr1naanwmrfb37hzkyy5szai52nqr2xij"; depends=[]; };
   rvHPDT = derive2 { name="rvHPDT"; version="3.0"; sha256="05nrfnyvb8ar7k2bmn227rn20w1yzkp1smwi4sysc00hyjrlyg8s"; depends=[gtools]; };
   rvTDT = derive2 { name="rvTDT"; version="1.0"; sha256="09c2fbqnlwkhaxfmgpsdprl0bb447ajk9xl7qdlda201fvxkdc8v"; depends=[CompQuadForm]; };
-  rvalues = derive2 { name="rvalues"; version="0.3"; sha256="0fkf0gngrx1rfa67blzf3xxjwhlp2m2jplxw3z3j9vgl6ray0nqs"; depends=[]; };
+  rvalues = derive2 { name="rvalues"; version="0.6"; sha256="075lfbqjzi103wh87i78x914iyrvrmmdz8z9f6391rbpip6bjpr3"; depends=[]; };
   rversions = derive2 { name="rversions"; version="1.0.2"; sha256="0xmi461g1rf5ngb7r1sri798jn6icld1xq25wj9jii2ca8j8xv68"; depends=[curl xml2]; };
-  rvertnet = derive2 { name="rvertnet"; version="0.3.4"; sha256="1a5hzp91n7bzappz099gq5zjsjmzazj8kxfjb21bgdcb141mb82a"; depends=[dplyr ggplot2 httr jsonlite maps plyr]; };
+  rvertnet = derive2 { name="rvertnet"; version="0.4.1"; sha256="1x24l83m00rd10hcy2mnzpwlkpk92zfw3gcxiwghpijy04azkiy9"; depends=[dplyr ggplot2 httr jsonlite maps plyr]; };
   rvest = derive2 { name="rvest"; version="0.3.1"; sha256="12mh9jbfy6ykx89kb475gk99i0jaxja6jk7pd6d9iz0kbfywnm7f"; depends=[httr magrittr selectr xml2]; };
   rvgtest = derive2 { name="rvgtest"; version="0.7.4"; sha256="1lhha5nh8fk42pckg4ziha8sa6g20m0l4p078pjj51kz0k8929ng"; depends=[]; };
+  rwfec = derive2 { name="rwfec"; version="0.2"; sha256="0wmalfms59zi8jdn2s2qbcdckfkifl9vg19hzx4389mm5gk6qsbh"; depends=[Rcpp]; };
   rwirelesscom = derive2 { name="rwirelesscom"; version="1.4.3"; sha256="1q4s9m9k6i7x2vq5dwq7950sbq03i8ff6qk8l30x77689kpflqcb"; depends=[ggplot2 Rcpp]; };
   rworldmap = derive2 { name="rworldmap"; version="1.3-1"; sha256="0wrg6ap39bq88sv5axxd90yyqafn77amk5429pxd9v5a2hdm3g8w"; depends=[fields maptools sp]; };
   rworldxtra = derive2 { name="rworldxtra"; version="1.01"; sha256="183z01h316wf1r4vjvjhbj7cg4xarn4b8qbmnn5y7nrrdndzi163"; depends=[sp]; };
   rwt = derive2 { name="rwt"; version="1.0.0"; sha256="112wp682z4gkxsd3bqnlkdrh42bfzwnnhzyangxi2dh0qw63bgcr"; depends=[matlab]; };
   rwunderground = derive2 { name="rwunderground"; version="0.1.0"; sha256="10m0wgym6rdrgvmhh79q4jf0lh8wlrg04mvq0yvgnqfgcxn4rmir"; depends=[countrycode dplyr httr]; };
-  ryouready = derive2 { name="ryouready"; version="0.3"; sha256="0nms3zfkis2fsxkyj3dr95vz3kk6pkm7l5ga7iz8pxy1ywrawj2i"; depends=[car stringr]; };
+  ryouready = derive2 { name="ryouready"; version="0.4"; sha256="1d9z3paxcrkwsgn5g83x57jwz2iqarks30x0bwg48i5ispw6xbr3"; depends=[car ggplot2 stringr]; };
   rysgran = derive2 { name="rysgran"; version="2.1.0"; sha256="1l2mx297iyipap8cw2wcw5gm7jq4076bf4gvgvij4q35vp62m85z"; depends=[lattice soiltexture]; };
   rzmq = derive2 { name="rzmq"; version="0.7.7"; sha256="0gf8gpwidfn4756jqbpdbqsl8l4ahi3jgavrrvbbdi841rxggfmx"; depends=[]; };
   s20x = derive2 { name="s20x"; version="3.1-16"; sha256="10z19q28wv3jnrs8lhban4a6hxqxgivcalq633p3hpa4zhw7nsj7"; depends=[]; };
@@ -6487,7 +6663,7 @@ in with self; {
   sGPCA = derive2 { name="sGPCA"; version="1.0"; sha256="16aa5jgvkabrlxaf1p7ngrls79mksarh6di3vp26kb3d3wx087dx"; depends=[fields Matrix]; };
   sROC = derive2 { name="sROC"; version="0.1-2"; sha256="0cp6frhk9ndffb454dqp8fzjrla76dbz0mn4y8zz1nbq1jzmz0d3"; depends=[]; };
   sSDR = derive2 { name="sSDR"; version="1.0.0"; sha256="0s7r7brvdxscz5gnkhari26m5k2z0i0azw4gc6ani25bp4cy5m83"; depends=[MASS Matrix]; };
-  sValues = derive2 { name="sValues"; version="0.1.2"; sha256="0wqgh8zsw48hv4rz7hdg6414yj1yzna1ylls5dm7ldhbnr6kvv83"; depends=[caTools ggplot2 reshape2]; };
+  sValues = derive2 { name="sValues"; version="0.1.4"; sha256="0y2cv3wls2y3zpbm2d098xj5n098yjl32yi7mwha6mhfwfa4y99l"; depends=[caTools ggplot2 reshape2]; };
   sac = derive2 { name="sac"; version="1.0.1"; sha256="1rl5ayhg5y84fw9w3zf43dijjlw9x0g0w2z4haw5xmxfni72ms8w"; depends=[]; };
   saccades = derive2 { name="saccades"; version="0.1-1"; sha256="138a6g3hjmcyvflpxx1lhgxnb8svrynplrjnvzij7c4bzkp8zip6"; depends=[zoom]; };
   sadists = derive2 { name="sadists"; version="0.2.1"; sha256="0m3rlbhgzl0xvx8bcaswbi9nsrgfhdmkywx7ynayl6q0lmslhk6a"; depends=[hypergeo orthopolynom PDQutils]; };
@@ -6505,12 +6681,13 @@ in with self; {
   samplesize4surveys = derive2 { name="samplesize4surveys"; version="2.4.0.900"; sha256="199g2gsbv1w1acn7nnlv2wbrhq7lc1mx8vvs1w9a9a8dkxdmml0g"; depends=[TeachingSampling]; };
   sampling = derive2 { name="sampling"; version="2.7"; sha256="0xp0djpgns2lbgshrpxcmqa7c180ds3ymqa5asyxxl74yiric7xi"; depends=[lpSolve MASS]; };
   samplingEstimates = derive2 { name="samplingEstimates"; version="0.1-3"; sha256="1srdchlpxksfdqhf5qdvl7nz0qsxkxww7hzqj0q71asbzlq3am3p"; depends=[samplingVarEst]; };
-  samplingVarEst = derive2 { name="samplingVarEst"; version="0.9-9"; sha256="04wgsq3sh69iy8p07ch210p22n5mds7cxp5s6zggzamqpf0hpnw7"; depends=[]; };
+  samplingVarEst = derive2 { name="samplingVarEst"; version="1.0-1"; sha256="049a964g6720p14fndvr68s7lypc0pac2bfdkm6fp278j8l34x7i"; depends=[]; };
   samplingbook = derive2 { name="samplingbook"; version="1.2.0"; sha256="1vynz6hsnz5d0vg66f8k67h24rb809k9chb4waymk6vwnp8lksz9"; depends=[pps sampling survey]; };
   samr = derive2 { name="samr"; version="2.0"; sha256="0rsfca07pvmhfn7b49yk2ycw00wsq6dmrpv9haxz8q0xv7n5n2q9"; depends=[impute matrixStats]; };
   sand = derive2 { name="sand"; version="1.0.2"; sha256="1y371ds86gcq2id996vp56h5dax2wm0mlk1ks2mp1k81n63l7wmf"; depends=[igraph igraphdata]; };
   sandwich = derive2 { name="sandwich"; version="2.3-4"; sha256="0kbdfkqc8h3jpnlkil0c89z1192q207lii92yirc61css7izfli0"; depends=[zoo]; };
   sanitizers = derive2 { name="sanitizers"; version="0.1.0"; sha256="1c1831fnv1nzpq8nw9krgf9fm8v54w0gvcn4443b6jghnnbhn2n6"; depends=[]; };
+  sankey = derive2 { name="sankey"; version="1.0.0"; sha256="0wm10f514sg3gfrz291k720kznnyssznyvr49c15i26bhb82m0q0"; depends=[simplegraph]; };
   sanon = derive2 { name="sanon"; version="1.5"; sha256="1iikm7ivlz87kbq0ax9r1dz29zdq1kmhxd2imzc4hkvr1rwgciv6"; depends=[]; };
   sapa = derive2 { name="sapa"; version="2.0-1"; sha256="11xgd2ijfz5yn0zyl5gfy97h2cxi1vyxkrijy2s9b78wm7fzpnkv"; depends=[ifultools splus2R]; };
   sas7bdat = derive2 { name="sas7bdat"; version="0.5"; sha256="0qxlapb6wdhzpwlmzlhscy3av7va3h6gkzsppn4sx5q960310an3"; depends=[]; };
@@ -6529,7 +6706,7 @@ in with self; {
   scam = derive2 { name="scam"; version="1.1-9"; sha256="1hx8y324bgwvv888d34wq0nnmqalfh5f26b5n36saaizm4a12wyf"; depends=[Matrix mgcv]; };
   scape = derive2 { name="scape"; version="2.2-0"; sha256="0dgbh65fg6i5x4lpfkshn382zcc4jk1wp62pwd2l2f59pyfb92a3"; depends=[coda Hmisc lattice]; };
   scar = derive2 { name="scar"; version="0.2-1"; sha256="04x42414qxrz8c7xrnmpr00r46png2jy5giwicdx6gx8jwrkzhzs"; depends=[]; };
-  scatterD3 = derive2 { name="scatterD3"; version="0.4"; sha256="1hb0fcakdak5jrg9sm90l7jds3zplyp27h35hyh22k19bf5lzbrc"; depends=[digest htmlwidgets]; };
+  scatterD3 = derive2 { name="scatterD3"; version="0.5.1"; sha256="0fm54xblxgn4758488kg5sd7rg3bxfngrzhpfa4f0j6vh2qn5xpq"; depends=[digest htmlwidgets]; };
   scatterplot3d = derive2 { name="scatterplot3d"; version="0.3-36"; sha256="0bdxfdw23921h3rbpq0y4aixplzpkk95wgm2932kh0x7a4bnhswh"; depends=[]; };
   schoRsch = derive2 { name="schoRsch"; version="1.2"; sha256="1dz4mws227a5h3kkmpnz06liy9n3k01ihvcxxwnj8283w3b23bci"; depends=[]; };
   scholar = derive2 { name="scholar"; version="0.1.4"; sha256="088clkpllpjv9rjb45v46dga4ig11ifvfyclgfgcgqvxy5cn92jr"; depends=[dplyr httr R_cache rvest stringr xml2]; };
@@ -6539,7 +6716,7 @@ in with self; {
   scidb = derive2 { name="scidb"; version="1.2-0"; sha256="17y1bml8kb896l3hsw356qdj25sfbdvm10dyxhaafdgcbp5ywcrn"; depends=[digest iterators Matrix RCurl zoo]; };
   scio = derive2 { name="scio"; version="0.6.1"; sha256="0h15sscv7k3j7qyr70h00n58i5f44k96qg263mxcdjk9mwqr0y65"; depends=[]; };
   sciplot = derive2 { name="sciplot"; version="1.1-0"; sha256="0na4qkslg3lns439q1124y4fl68dgqjck60a7yvgxc76p355spl4"; depends=[]; };
-  scmamp = derive2 { name="scmamp"; version="0.2.3"; sha256="1ndkq3fnq5i1pq97qqxqa6l20ccz5x0411l96xiinv64vclgv78n"; depends=[ggplot2 graph reshape2 Rgraphviz]; };
+  scmamp = derive2 { name="scmamp"; version="0.2.5"; sha256="1i0fkmpkdjbjwvh1y4synplafvcx9bjyf8i856sm5i3kjyh6vx46"; depends=[ggplot2 graph reshape2 Rgraphviz]; };
   score = derive2 { name="score"; version="1.0.2"; sha256="1p289k1vmc7qg70rv15x05dyb92r7s6315whr1ibi40sqln62a5s"; depends=[msm]; };
   scorer = derive2 { name="scorer"; version="0.1.0"; sha256="1qbcbhymagaqpcbysj33ncjz1kxg9ig0anrv7pl8s8m2kpqn4vmb"; depends=[]; };
   scoring = derive2 { name="scoring"; version="0.5-1"; sha256="0vxjcbp43h2ipc428qc0gx7nh6my7202hixwhnmspl4f3kai3wkp"; depends=[]; };
@@ -6554,12 +6731,12 @@ in with self; {
   sda = derive2 { name="sda"; version="1.3.7"; sha256="1v0kp6pnjhazr8brz1k9lypchz8k8gdaby8sqpqzjsj8klghlcjp"; depends=[corpcor entropy fdrtool]; };
   sdcMicro = derive2 { name="sdcMicro"; version="4.6.0"; sha256="0j6adz04smp8pbg62w7hyqp2wl1cqazmxf4vnvb4jxcqw69qxd74"; depends=[car cluster data_table e1071 ggplot2 knitr MASS Rcpp rmarkdown robustbase sets xtable]; };
   sdcMicroGUI = derive2 { name="sdcMicroGUI"; version="1.2.0"; sha256="0bhrpric17y1ljm18a00i6bkxfq1cpljfkib8qbb4jyj5s50f3ps"; depends=[cairoDevice foreign gWidgets gWidgetsRGtk2 Hmisc sdcMicro vcd]; };
-  sdcTable = derive2 { name="sdcTable"; version="0.19.6"; sha256="0b2p6dhcqci4hs4bmy2vmv2fgsh1ji2gw2xwq2ljq40n7r55ly5r"; depends=[data_table lpSolveAPI Rcpp Rglpk stringr]; };
+  sdcTable = derive2 { name="sdcTable"; version="0.20.1"; sha256="05hkqd65fn6inf506kcjjxdjapvjbgidqcgsad1d7a6zv8lfh4fp"; depends=[data_table lpSolveAPI Rcpp Rglpk stringr]; };
   sdcTarget = derive2 { name="sdcTarget"; version="0.9-11"; sha256="18cf276mh1sv16xn0dn8par4zg8k7y8710byxiih6db4i616fjpi"; depends=[doParallel foreach magic tuple]; };
   sddpack = derive2 { name="sddpack"; version="0.9"; sha256="1963l8jbfwrqhqcpif73di9i5mb996r4f8smjyil6l7sdir7cg9l"; depends=[]; };
   sde = derive2 { name="sde"; version="2.0.14"; sha256="1j4lvbc4f78dkz7fkwb07498a0xnnz0xrszgmhz80s2fvc1c5djs"; depends=[fda MASS zoo]; };
   sdef = derive2 { name="sdef"; version="1.6"; sha256="1y1l5fl7lh636kyvc2hwssdnifl055nrz3riplj4qqw88lkm1mk8"; depends=[]; };
-  sdmvspecies = derive2 { name="sdmvspecies"; version="0.3.1"; sha256="1rpbj55598862vb4bwrvcbskm10xibsvx58fpvkn58zbm6ab2534"; depends=[ggplot2 GPArotation psych raster]; };
+  sdmvspecies = derive2 { name="sdmvspecies"; version="0.3.2"; sha256="19avkag13ij1k65vqhmvcy8j50j8vrgw4mjc49x8i63w3d4z1wxh"; depends=[psych raster]; };
   sdnet = derive2 { name="sdnet"; version="2.03.3"; sha256="1884pil3brm7llczacxda6gki501ddyc5m8ggqjix64kbvw37slv"; depends=[]; };
   sdprisk = derive2 { name="sdprisk"; version="1.1-3"; sha256="1rwzi112fjckzxmhagpg60qm9a35fqx8g8xaypxsmnml6q00ysiq"; depends=[numDeriv PolynomF rootSolve]; };
   sdtoolkit = derive2 { name="sdtoolkit"; version="2.33-1"; sha256="0pirgzcn8b87hjb35bmg082qp14idc5pfvm6dikpgkswag23hwh8"; depends=[]; };
@@ -6572,7 +6749,7 @@ in with self; {
   season = derive2 { name="season"; version="0.3-5"; sha256="08f382kq51r5g9p5hsnjf17dwivhx1vfgmmwp1vzmbqx1drlqkzx"; depends=[coda ggplot2 MASS mgcv survival]; };
   seasonal = derive2 { name="seasonal"; version="1.1.0"; sha256="13fsf3n6qk59c55320c9qhac8p02xiyn8j38bpiamdrnzax7v9d5"; depends=[]; };
   seawaveQ = derive2 { name="seawaveQ"; version="1.0.0"; sha256="19vm1f0qkmkkbnfy1hkqnfz6x2a7g9902ka76bhpcscynl69iy56"; depends=[lubridate NADA survival]; };
-  secr = derive2 { name="secr"; version="2.9.5"; sha256="0qm3blx9m8frxzb5dqxw98ijq5f5gaxn194kcrbiz3wxfqswhn3f"; depends=[abind MASS mgcv nlme raster sp]; };
+  secr = derive2 { name="secr"; version="2.10.0"; sha256="0vzdpp9i3hvaklz4k201i0s7cw9cgspr3g5pf1jnb2d3ld3dq5rs"; depends=[abind MASS mgcv nlme raster sp]; };
   secrdesign = derive2 { name="secrdesign"; version="2.3.0"; sha256="1f5swggkky721z0js2jr1gb3mrx9h6qlld70bjd86x9f73s9cm0n"; depends=[abind secr]; };
   secrlinear = derive2 { name="secrlinear"; version="1.0.5"; sha256="084d0spshf3lh1m50kyb0r8x9lz4yrfj6b7snywffxhqyjw147hf"; depends=[igraph maptools MASS secr sp]; };
   seeclickfixr = derive2 { name="seeclickfixr"; version="1.0.0"; sha256="15dgq7bc71y5jykvpzpwbjxcw3jjh9vf12pwyaizhkb5fkyrjjmf"; depends=[jsonlite RCurl]; };
@@ -6588,7 +6765,7 @@ in with self; {
   sejmRP = derive2 { name="sejmRP"; version="1.2"; sha256="00dmrjvdimzvj11f4v3lw2sips1x5pxxkdnv9khm1qki8pqc9jw9"; depends=[DBI dplyr RPostgreSQL rvest stringi XML xml2]; };
   selectMeta = derive2 { name="selectMeta"; version="1.0.8"; sha256="0i0wzx5ggd60y26lnn4qk4n8h27ahll9732026ppks1djx14cdy0"; depends=[DEoptim]; };
   selectiongain = derive2 { name="selectiongain"; version="2.0.40"; sha256="1xzvz747242wfv789dl3gqvgbc8l1c4i2r3p95766ypcjw51j55d"; depends=[mvtnorm]; };
-  selectiveInference = derive2 { name="selectiveInference"; version="1.1.1"; sha256="1vww8qmdb2jssas5vfa5srldakd7afcb4bnhsk63zvxvx0wn0v7p"; depends=[glmnet intervals]; };
+  selectiveInference = derive2 { name="selectiveInference"; version="1.1.2"; sha256="0c6h0di1vazrrhxb6syz5rcnz8wz4cy9b7aylqxph07r4jm7x5hh"; depends=[glmnet intervals]; };
   selectr = derive2 { name="selectr"; version="0.2-3"; sha256="1ppm1f6mwfwbq92iwacyjn46k1d8148j4zykmjvw8as6c8blgap1"; depends=[stringr XML]; };
   selectspm = derive2 { name="selectspm"; version="0.2"; sha256="0wvhlzhl0janhms107xczmilpmr4y26jgk0ag3g34iqba7fbnfqd"; depends=[ecespa spatstat]; };
   selfea = derive2 { name="selfea"; version="1.0.1"; sha256="0zyxbd5vg8nhigill3ndcvavzbb9sbh5bz6yrdsvzy8i5gzpspvx"; depends=[ggplot2 MASS plyr pwr]; };
@@ -6604,8 +6781,9 @@ in with self; {
   semsfa = derive2 { name="semsfa"; version="1.0"; sha256="1x227rigjk9glq5x9lp6xxcf3y9i73rv3mrj7lkr2ycnsx8zz57h"; depends=[doParallel foreach iterators mgcv moments np]; };
   sendmailR = derive2 { name="sendmailR"; version="1.2-1"; sha256="0z7ipywnzgkhfvl4zb2fjwl1xq7b5wib296vn9c9qgbndj6b1zh4"; depends=[base64enc]; };
   sendplot = derive2 { name="sendplot"; version="4.0.0"; sha256="0ia2xck94nwirwxi38nv0viz5wb8291yiak6f0wgwh84irsrfp1h"; depends=[rtiff]; };
-  sensR = derive2 { name="sensR"; version="1.4-5"; sha256="1vp06ghmk852wkc4vmp4k68z6v623hsay69c8nm3m8xvf2vrqfgb"; depends=[MASS multcomp numDeriv]; };
+  sensR = derive2 { name="sensR"; version="1.4-6"; sha256="1nw8kkk70nrw8i95v52ncg4zrmkq84w94d5d1c474ap0pfg8rfpj"; depends=[MASS multcomp numDeriv]; };
   sensitivity = derive2 { name="sensitivity"; version="1.11.1"; sha256="1v4lzy687r66jmxgm0fy81wgj70ak58hd13h1jn60wb5j3p91qki"; depends=[boot]; };
+  sensitivity2x2xk = derive2 { name="sensitivity2x2xk"; version="1.01"; sha256="1r829k939zzmi0j4chdaniajchcflmmjrl3a9hwnkg0wkfnjbvdl"; depends=[BiasedUrn mvtnorm]; };
   sensitivityPStrat = derive2 { name="sensitivityPStrat"; version="1.0-6"; sha256="0rfzvkpz7dll3173gll6np65dyb40zms63fkvaiwn0lk4aryinlh"; depends=[survival]; };
   sensitivitymv = derive2 { name="sensitivitymv"; version="1.3"; sha256="1bxf85q91smnsl2lsig43vk0c63c805d8ry1xh3w6q675djj14ad"; depends=[]; };
   sensitivitymw = derive2 { name="sensitivitymw"; version="1.1"; sha256="1bknnfkkqgmchabcjdfikm37sn5k41ar8lpnjw58i8qh7yzq237i"; depends=[]; };
@@ -6613,6 +6791,7 @@ in with self; {
   separationplot = derive2 { name="separationplot"; version="1.1"; sha256="0qfkrk8n6jj8l7ywngwsaikfwmd9hbrpr43x0l9wkjjp1asgs5l6"; depends=[]; };
   seqCBS = derive2 { name="seqCBS"; version="1.2"; sha256="1kywi3kvvl9y6nm7cwf6fj8gz9gzznp5va336g1akzgy77k82d8v"; depends=[clue]; };
   seqDesign = derive2 { name="seqDesign"; version="1.1"; sha256="1694swd8ik9fbiflmnw4xpq82kq18rqzkw0dv5pvq30c47xjgamv"; depends=[survival xtable]; };
+  seqHMM = derive2 { name="seqHMM"; version="1.0.3-1"; sha256="008yq4gin9znqm0rf9rvlk7xldjb62n5xkwvr6qcbz3k1bxb4gsm"; depends=[gridBase igraph Matrix nloptr numDeriv Rcpp RcppArmadillo TraMineR]; };
   seqMeta = derive2 { name="seqMeta"; version="1.6.0"; sha256="1ha6vsaapac6p18r5df2z39vzsb9qr6kyb9g6h53km588zk280zl"; depends=[CompQuadForm coxme Matrix survival]; };
   seqPERM = derive2 { name="seqPERM"; version="1.0"; sha256="1i8ai4gxybh08wxjh96m6xlqxhh7ch0xihjs879snmy4zqfi0pap"; depends=[]; };
   seqRFLP = derive2 { name="seqRFLP"; version="1.0.1"; sha256="1i98hm8wgwr8b6hd237y2i9i0xgn35w4n2rxy4lqc5zq71gkwkvk"; depends=[]; };
@@ -6621,8 +6800,8 @@ in with self; {
   seqmon = derive2 { name="seqmon"; version="0.2"; sha256="075hc6vgl1w3nisrihf5w6mkkg9q601jsqxm9hk9yagyvvd7d78w"; depends=[]; };
   sequences = derive2 { name="sequences"; version="0.5.9"; sha256="17571m525b6a3k4f0m936wfq401181gx1fpb7x4v0fhaldzdmk3a"; depends=[Rcpp]; };
   sequenza = derive2 { name="sequenza"; version="2.1.2"; sha256="0f3aj96qvbr1wqimlv6rxg0v34zlrgc6pbdy7sfkwfzs1n44q1xf"; depends=[copynumber squash]; };
-  seriation = derive2 { name="seriation"; version="1.1-2"; sha256="1nrbnkhrf8x83ssssgi9jn60172afkldh1vwfjrhyh6c9nka6pa5"; depends=[cluster colorspace gclus gplots MASS registry TSP]; };
-  seroincidence = derive2 { name="seroincidence"; version="1.0.4"; sha256="0m3hlbv3277qyhqi3liwbna7czd6kdc7gqaxc7xn5x8d2hsc45hk"; depends=[]; };
+  seriation = derive2 { name="seriation"; version="1.1-3"; sha256="0gz10qzxvzp9ah86qq09wpa77qgp3qi7yjm7fx19p3n6pzikkgql"; depends=[cluster colorspace gclus gplots MASS qap registry TSP]; };
+  seroincidence = derive2 { name="seroincidence"; version="1.0.5"; sha256="07lphrp7r3i87633q8g6svk2mxbsvq4blrf8gnm0p99hkmz8wgg9"; depends=[]; };
   servr = derive2 { name="servr"; version="0.2"; sha256="0gah99snaj8lk5zfzbxi3jwvpnlff9diz9gqv4qalfxpmb7fp6lc"; depends=[httpuv jsonlite mime]; };
   sesem = derive2 { name="sesem"; version="1.0.1"; sha256="0s4xkv6bc5nxhj09mk9agnj11b9h7swccs9jrn4lg3fy12vqhf5a"; depends=[gplots lavaan mgcv]; };
   session = derive2 { name="session"; version="1.0.3"; sha256="04mcy1ac75fd33bg70c47nxqxrmqh665m9r8b1zsz5jij1sbl8q5"; depends=[]; };
@@ -6634,12 +6813,12 @@ in with self; {
   sfa = derive2 { name="sfa"; version="1.0-1"; sha256="1acqxgydf8j5csdkx0yf169x3yaa31r0ccdrqarh6vj1hacm89ad"; depends=[]; };
   sfsmisc = derive2 { name="sfsmisc"; version="1.0-28"; sha256="0fa4blrlgwdnj8wgv1h7c143r3g9rnnsnnrlgxa8inmajb1ck07b"; depends=[]; };
   sft = derive2 { name="sft"; version="2.0-7"; sha256="1fq1b32f08i4k9bv4hh7rhk1jj7kgans6dwh1bmawaqkchyab3jr"; depends=[fda]; };
-  sgPLS = derive2 { name="sgPLS"; version="1.3"; sha256="06mac5sxsd7fpy3lwn4x8bm2l2x0fnq246dxg6770w8ydipy7q8k"; depends=[mixOmics]; };
+  sgPLS = derive2 { name="sgPLS"; version="1.4"; sha256="0yx3vg9rfm6jvrgfaky2dlbrbksa5475gx3g11x6i35nd2nb2p5z"; depends=[mixOmics]; };
   sgRSEA = derive2 { name="sgRSEA"; version="0.1"; sha256="0vyypnq81l36x0j44q2l9wbf3x4krz4fzypi7vyqhaq97mkzaw5j"; depends=[]; };
   sgd = derive2 { name="sgd"; version="1.0"; sha256="1ljv7rr65h81n8z35vdcbqp0dfbqlginc6xn9jmpidn20gkxlj1w"; depends=[BH bigmemory ggplot2 MASS Rcpp RcppArmadillo]; };
   sgeostat = derive2 { name="sgeostat"; version="1.0-26"; sha256="0srsly6a3rraczshqqfmpwqz3459yxbsr70d4lz8b0kvflhds7p3"; depends=[]; };
   sglOptim = derive2 { name="sglOptim"; version="1.2.0"; sha256="06a70q7i93pyyadqngg1qd0kz52m73fpqlji6jxsiyixajcqn2q5"; depends=[BH Matrix Rcpp RcppArmadillo RcppProgress]; };
-  sglasso = derive2 { name="sglasso"; version="1.2.1"; sha256="18dag7wvz0l959igg4g77psi8idvqyikg676yy9ga3k69kl11hdk"; depends=[igraph Matrix]; };
+  sglasso = derive2 { name="sglasso"; version="1.2.2"; sha256="1yk9wvg98a2l9kdaksy75av9z9iz27v5d2zpsqhabqwkwfh6wkad"; depends=[igraph Matrix]; };
   sglr = derive2 { name="sglr"; version="0.7"; sha256="11gjbvq51xq7xbmpziyzwqfzf4avyxj2wpiz0kp4vfdj3v7p4fp9"; depends=[ggplot2 shiny]; };
   sgof = derive2 { name="sgof"; version="2.2"; sha256="087f4nbx9ppzi5za3f4w4msq2gd3r08v16fihppa30nqydg3ssbj"; depends=[poibin]; };
   sgr = derive2 { name="sgr"; version="1.3"; sha256="0zxmrbv3fyb686hcgfy2w1w2jffxf41ab8yc90dsgf931s9c55wn"; depends=[MASS]; };
@@ -6648,7 +6827,7 @@ in with self; {
   shapeR = derive2 { name="shapeR"; version="0.1-5"; sha256="17fq4gsdvyniq7n4x1xdvb5kk50184i7why3pdf1djjhknym087j"; depends=[gplots jpeg MASS pixmap vegan wavethresh]; };
   shapefiles = derive2 { name="shapefiles"; version="0.7"; sha256="08ghndihs45kylbzd9wnxffn8ixvxjhjnjldjyd526ai2sj8xcgf"; depends=[foreign]; };
   shapes = derive2 { name="shapes"; version="1.1-11"; sha256="1zxckrl4pc6ppdbhp5h5ib4yp7iw7z3kciqibrijvbvjpkl1fl35"; depends=[MASS rgl scatterplot3d]; };
-  sharpshootR = derive2 { name="sharpshootR"; version="0.7-2"; sha256="04plsgmyil6znmcqx2j78n2vjj4y4mprb3wqbhwagapdhvp9rcis"; depends=[ape aqp circular cluster Hmisc igraph lattice latticeExtra plyr RColorBrewer reshape2 scales soilDB sp vegan]; };
+  sharpshootR = derive2 { name="sharpshootR"; version="0.9.1"; sha256="01qczwyh6gpw26qg77r5f9nrmfjd1glcbdxwvx0bdfa5j6m31iq4"; depends=[ape aqp circular cluster digest Hmisc igraph lattice latticeExtra plyr RColorBrewer reshape2 scales soilDB sp vegan]; };
   sharx = derive2 { name="sharx"; version="1.0-4"; sha256="1flcflx6w93s8bk4lcwcscwx8vacdl8900ikwkz358jbgywskd5n"; depends=[dclone dcmle Formula]; };
   shiny = derive2 { name="shiny"; version="0.12.2"; sha256="0hdgvqsg0s7va55z2pf76898fslcnghpcjvwsqlfw2q441h7dkh9"; depends=[digest htmltools httpuv jsonlite mime R6 xtable]; };
   shinyAce = derive2 { name="shinyAce"; version="0.1.0"; sha256="1031hzh647ys0d5hkw7cqxj0wgry3rxgq95fgs7slbm0rgx9g6f7"; depends=[shiny]; };
@@ -6658,9 +6837,10 @@ in with self; {
   shinyTree = derive2 { name="shinyTree"; version="0.2.2"; sha256="08n2s6pppbxn23ijp6vms609p4qwlmfh9g0k5hdfqsqxjrz1nndi"; depends=[shiny]; };
   shinybootstrap2 = derive2 { name="shinybootstrap2"; version="0.2.1"; sha256="17634l3swlvgj1sv56nvrpgd6rqv7y7qjq0gygljbrgpwmfj198c"; depends=[htmltools jsonlite shiny]; };
   shinydashboard = derive2 { name="shinydashboard"; version="0.5.1"; sha256="1p417ngxw9bk90kgz6n8f23w360knjdg6kkvrbarf7s91wfc8wcb"; depends=[htmltools shiny]; };
-  shinyjs = derive2 { name="shinyjs"; version="0.2.3"; sha256="12bvjd83sakvlnxn9p25cf96xsgvf34s2kbak399byiach47jb4f"; depends=[digest htmltools shiny]; };
+  shinyjs = derive2 { name="shinyjs"; version="0.3.0"; sha256="1vgavalwp6brs9664p7zpg4bjg5rqgv5zixmwgymz2y780ghc959"; depends=[digest htmltools shiny]; };
   shinystan = derive2 { name="shinystan"; version="2.0.1"; sha256="0rjqawyv2gpwdz75nnwzxi93fjx2vfvxv14ihhmhz8zly3pjaadc"; depends=[DT dygraphs ggplot2 gridExtra gtools markdown reshape2 shiny shinyjs shinythemes threejs xtable xts]; };
   shinythemes = derive2 { name="shinythemes"; version="1.0.1"; sha256="0wv579cxjlnd7wkfqzy2x3qk7d1abql1nhw10rx1c4c808vsylkw"; depends=[shiny]; };
+  shock = derive2 { name="shock"; version="1.0"; sha256="11m52al591xjznl62q1waxsg5m1a1afmd0yqcc5zsjlrplykg4lp"; depends=[capushe GGMselect glasso igraph mvtnorm]; };
   shopifyr = derive2 { name="shopifyr"; version="0.28"; sha256="1ypqgiqimdwj9fjy9ykk42rnkipb4cvdxy5m9z9jklvk5a7cgrml"; depends=[R6 RCurl RJSONIO]; };
   shotGroups = derive2 { name="shotGroups"; version="0.6.2"; sha256="1hk511lbf5w3k0sjkb75q1fvryyn9a1j69jzv75fvwjsjvmykd14"; depends=[boot coin CompQuadForm energy KernSmooth mvoutlier robustbase]; };
   showtext = derive2 { name="showtext"; version="0.4-4"; sha256="14xvbvch354dwbhr36ih4av9b7f3z2zw2bsbnn5fxxh15lm26wz3"; depends=[showtextdb sysfonts]; };
@@ -6681,7 +6861,7 @@ in with self; {
   signmedian_test = derive2 { name="signmedian.test"; version="1.5.1"; sha256="05n7a4h2bibv2r64cqschzhjnm204m2lm1yrwxvx17cwdp847hkm"; depends=[]; };
   simFrame = derive2 { name="simFrame"; version="0.5.3"; sha256="154d4k6x074ib813dp42l5l8v81x9bq2c8q0p5mwm63pj0rgf5f3"; depends=[lattice Rcpp]; };
   simMSM = derive2 { name="simMSM"; version="1.1.41"; sha256="04icijrdc269b4hwbdl3qz2lyxcxx6z63y2wbak1884spn6bzbs8"; depends=[mvna survival]; };
-  simPH = derive2 { name="simPH"; version="1.3.4"; sha256="18hqvbqmckr83xa2qvgwbjszwfahqpirdlwskg1gcq5l8x2v6dax"; depends=[data_table dplyr ggplot2 gridExtra lazyeval MASS mgcv quadprog stringr survival]; };
+  simPH = derive2 { name="simPH"; version="1.3.5"; sha256="1k2gs8lls287g3zy94h231sf9nljygmb82m4yjc05xglsi8ab0dr"; depends=[data_table dplyr ggplot2 gridExtra lazyeval MASS mgcv quadprog stringr survival]; };
   simPop = derive2 { name="simPop"; version="0.2.15"; sha256="1dx7xjd7zqp7gv84vl5mm8wiv0mg1wlsx68gmz68j39a4g45yr0q"; depends=[colorspace data_table doParallel e1071 foreach laeken lattice MASS nnet Rcpp vcd VIM]; };
   simSummary = derive2 { name="simSummary"; version="0.1.0"; sha256="1ay2aq6ajf1rf6d0ag3qghxpwj0f8b3fhpr2k0imzmpbyag1i3gj"; depends=[abind gdata svUnit]; };
   simTool = derive2 { name="simTool"; version="1.0.3"; sha256="1x018p5mssrhz2ghs3ly9wss12503h93gl7zk0mqh1bcrzximh0k"; depends=[plyr reshape]; };
@@ -6693,20 +6873,21 @@ in with self; {
   simest = derive2 { name="simest"; version="0.2"; sha256="15cgm8nk41fnva2camq26dwb1xy8qyk68v4918xszkj25lxb01m3"; depends=[nnls]; };
   simex = derive2 { name="simex"; version="1.5"; sha256="01706vbmfgcg13w1kq8v5rnk5xggbd1n7fv50c6bvhdyc1dly313"; depends=[]; };
   simexaft = derive2 { name="simexaft"; version="1.0.7"; sha256="13w9m35qrrp8kkz4gqp7fg9jv8fs99y19n21bdxsd3f5mlkbvqgl"; depends=[mvtnorm survival]; };
-  simmer = derive2 { name="simmer"; version="3.0.1"; sha256="1bad0c1hbs8l7sizka6jfbx6r7wk2d34gf2bgcknzvmmyklhrs5s"; depends=[magrittr R6 Rcpp]; };
+  simmer = derive2 { name="simmer"; version="3.1.1"; sha256="08j9lvbqf8vnvp84blzxhjn5hrx2kahji6nnnrqz22lxn223lrpm"; depends=[BH magrittr R6 Rcpp]; };
   simmr = derive2 { name="simmr"; version="0.2"; sha256="0g83icm98aavdvvi5fcxnka4lbs9c39sqm32n2w5405ywpv9w8nl"; depends=[boot coda compositions ggplot2 MASS reshape2 rjags]; };
   simone = derive2 { name="simone"; version="1.0-2"; sha256="071krim64s7fjwvwq7bjr0pw33mw9am9wpyypcy4gs7g1hj8wcir"; depends=[mixer]; };
   simpleNeural = derive2 { name="simpleNeural"; version="0.1.1"; sha256="0rm6kvz1mppvgcvwsgg3nz6ci37l95ins64g0jh4rw6lfmy0grjc"; depends=[]; };
   simpleboot = derive2 { name="simpleboot"; version="1.1-3"; sha256="1qprjisfflhzg8ll12p3q1zcfdiyc45glic2j9cw9nhx5rb065fk"; depends=[boot]; };
+  simplegraph = derive2 { name="simplegraph"; version="1.0.0"; sha256="1gcpbljp1fgaprxnmq23izf1h2x3p5dnxlylwqsnlcj50bvm46gq"; depends=[]; };
   simplexreg = derive2 { name="simplexreg"; version="1.1"; sha256="0iyrkynhrkdix27r105wv0yn5yc8cgrf6hlv4byi9mz6y05f9i7p"; depends=[Formula plotrix]; };
   simplr = derive2 { name="simplr"; version="0.1-1"; sha256="14gv2cwygjjfc9yjdrcn68scgyh469kypmf4mqy5p18gsxfj3h1c"; depends=[]; };
   simr = derive2 { name="simr"; version="1.0.0"; sha256="14afhchh01aavxy629qmlnqd50phfm1x5mksskigsrhanjxxpaln"; depends=[binom iterators lme4 pbkrtest plotrix plyr RLRsim stringr]; };
   simrel = derive2 { name="simrel"; version="1.0-1"; sha256="0905rjqh8c08vyg090h0i7sx89vdryignslldzfz2r5yrszl4ga8"; depends=[FrF2 sfsmisc]; };
-  simsalapar = derive2 { name="simsalapar"; version="1.0-5"; sha256="1z3dwylfrl08pq2k5ppfma3ijh356qc7wwdvgyp3wmw1bcq1amyf"; depends=[colorspace gridBase sfsmisc]; };
+  simsalapar = derive2 { name="simsalapar"; version="1.0-8"; sha256="015xqgbzkbhklazkxsdwi4qd4i93a9hzwv4ibikmgg4nlcm163zf"; depends=[colorspace gridBase sfsmisc]; };
   simsem = derive2 { name="simsem"; version="0.5-11"; sha256="0k93wck82wpxrckf7g8x7iik0134wmz5n8y2d086lb24ic2231zz"; depends=[lavaan]; };
   sinaplot = derive2 { name="sinaplot"; version="0.1.3"; sha256="007f7zqyg48n8v2lwa6ff8cwbvi332cg40fmzlvr3jjms0gsrzbr"; depends=[ggplot2]; };
   siplab = derive2 { name="siplab"; version="1.1"; sha256="1b5drhla4p7n1y1cp7kqwqzw0b286kgij9j6wsks5vjgy5qfal1x"; depends=[spatstat]; };
-  sirad = derive2 { name="sirad"; version="2.3-0"; sha256="00yfw94v71mnr3xqm41yi2ip1slhyaia8xy966w8y9nj7lkv5nwi"; depends=[ncdf raster zoo]; };
+  sirad = derive2 { name="sirad"; version="2.3-1"; sha256="12gnlfbnis5972p4v5ad16srfsfrr0kji40y8jbygcd43f8ka70r"; depends=[raster zoo]; };
   sirt = derive2 { name="sirt"; version="1.9-0"; sha256="1cmnar2ssn4l5yy002fwd3ckwqd9l017aakdavm8xy0s62aqxhzb"; depends=[CDM coda combinat gtools ic_infer igraph lavaan lavaan_survey MASS Matrix mirt mvtnorm pbivnorm psych Rcpp RcppArmadillo sfsmisc sm survey TAM]; };
   sisVIVE = derive2 { name="sisVIVE"; version="1.2"; sha256="03lnk0p97nf4a8rw8ypy3xfzj4idwm00a0gfrkiwb7xq606sl0vb"; depends=[lars]; };
   sisal = derive2 { name="sisal"; version="0.46"; sha256="00szc3l69i0cksxmd0lyrs4p6plf05sl4vxs3nl4gkbja5y4lvpc"; depends=[boot digest lattice mgcv R_matlab R_methodsS3]; };
@@ -6726,6 +6907,7 @@ in with self; {
   slackr = derive2 { name="slackr"; version="1.2"; sha256="1ymj3x52wyp0mp41xnnycg0vhdmv8whimwk1hzfsqr30pccnvn9j"; depends=[data_table ggplot2 httr jsonlite]; };
   slam = derive2 { name="slam"; version="0.1-32"; sha256="000636dwj4kmj5w1w5s6bqixh78m7262y3fgizj7rfhcnc2gz7ad"; depends=[]; };
   sld = derive2 { name="sld"; version="0.3"; sha256="18xj57v9gg78d894cr1h6wp10i05hrnmwhmq6yh6211kdyj9ljp1"; depends=[lmom]; };
+  sleekts = derive2 { name="sleekts"; version="1.0.2"; sha256="0syk244xrsv8hz5sxm7wizk0kyn1nc6z4c63c8xn57fz130zj75k"; depends=[]; };
   slfm = derive2 { name="slfm"; version="0.2.2"; sha256="01n9y6kyl7z1ynckp2hkrv2yl9jf30zcbbi3sx9jrcha557fg1cf"; depends=[coda lattice Rcpp RcppArmadillo]; };
   slp = derive2 { name="slp"; version="1.0-3"; sha256="09jyrp6y3rigy043d8s5i7nh89pgpvn3cv51mr729c9ccr6jdjb1"; depends=[mgcv]; };
   sm = derive2 { name="sm"; version="2.2-5.4"; sha256="0hnq5s2fv94gaj0nyqc1vjdjd64vsp9z23nqa8hxvjcaf996rwj9"; depends=[]; };
@@ -6751,7 +6933,7 @@ in with self; {
   smint = derive2 { name="smint"; version="0.4.0"; sha256="1qbmz67c9v45x9sqqd879gs1k0pq531bgfzg8cbll5nmc9nvig45"; depends=[lattice Matrix]; };
   smirnov = derive2 { name="smirnov"; version="1.0-1"; sha256="09mpb45wj8rfi6n6822h4c335xp2pl0xsyxgin1bkfw97yjcvrgk"; depends=[]; };
   smnet = derive2 { name="smnet"; version="2.0"; sha256="0jd574cjkylcrlnlnw859f4vwadi1v955m2lb5z3w3gdpv0lbx3p"; depends=[DBI igraph RSQLite spam SSN]; };
-  smoof = derive2 { name="smoof"; version="1.0"; sha256="10yvx5lr73kzjk7xn4jy97yzvv8qilrp7ilvk0fg5hyimbwlz13s"; depends=[BBmisc checkmate emoa ggplot2 ParamHelpers plot3D RColorBrewer]; };
+  smoof = derive2 { name="smoof"; version="1.1"; sha256="0lb2n82xw1aqddlkm0qqk6lkqk84g642ip046i76nx26b887i678"; depends=[BBmisc checkmate emoa ggplot2 ParamHelpers plot3D RColorBrewer Rcpp RcppArmadillo]; };
   smoothHR = derive2 { name="smoothHR"; version="1.0.2"; sha256="0l33xg3p9pyfrp4rhavz8m1jakk4wr8i14g6jjiizb03rpxdpzqy"; depends=[survival]; };
   smoothSurv = derive2 { name="smoothSurv"; version="1.6"; sha256="1s25gpih0nh8waw4r3iw53n3rc44mlzixkh4i2cykbg5rdrs8pnf"; depends=[survival]; };
   smoother = derive2 { name="smoother"; version="1.1"; sha256="0nqr1bvlr5bnasqg74zmknjjl4x28kla9h5cxpga3kq5z215pdci"; depends=[TTR]; };
@@ -6763,11 +6945,12 @@ in with self; {
   sn = derive2 { name="sn"; version="1.3-0"; sha256="00q58zssf32581m8ni5qazqy3wq36p4fya985ibn1607w76w8vwj"; depends=[mnormt numDeriv]; };
   sna = derive2 { name="sna"; version="2.3-2"; sha256="1dmdv1bi22gg4qdrjkdzdc51qsbb2bg4hn47b50lxnrywdj1b5jy"; depends=[]; };
   snapshot = derive2 { name="snapshot"; version="0.1.2"; sha256="0cif1ybxxjpyp3spnh98qpyw1i5sgi1jlafcbcldbqhsdzfz4q10"; depends=[]; };
-  snht = derive2 { name="snht"; version="1.0.2"; sha256="1rs9q8fmvz3x21ymbmgmgkqr7hqf3ya3xb33zj31px799jlldpb9"; depends=[ggplot2 gridExtra mgcv plyr reshape zoo]; };
+  snht = derive2 { name="snht"; version="1.0.3"; sha256="1yc4c9liaali0p6k5m30l0lavbcc0wdf0wrmxwcvsh1rzc16p8iv"; depends=[ggplot2 gridExtra mgcv mvtnorm plyr reshape2 zoo]; };
   snipEM = derive2 { name="snipEM"; version="1.0"; sha256="0f98c3ycl0g0l3sgjgk7xrjp6ss7n8zzlyzvpcb6agc60cnw3w03"; depends=[GSE MASS mvtnorm Rcpp RcppArmadillo]; };
   snn = derive2 { name="snn"; version="1.1"; sha256="0yywn3v1iz9xizwli3gmzprkx66b5a813mbp8hq2vsj8n4lfj8r5"; depends=[]; };
   snow = derive2 { name="snow"; version="0.4-1"; sha256="19r2yq8aqw99vwyx81p6ay4afsfqffal1wzvizk3dj882s2n4j8w"; depends=[]; };
   snowFT = derive2 { name="snowFT"; version="1.4-0"; sha256="0gw2kn80jh1a6sg6ni9kj6ikvyq29c9dmx52k9m6gzcfpa7l0qbk"; depends=[rlecuyer snow]; };
+  snowboot = derive2 { name="snowboot"; version="0.5.0"; sha256="1fwvgqx5d54libaf13w9szbh471zi0krc03knp0sz99j0i6nwy20"; depends=[igraph VGAM]; };
   snowfall = derive2 { name="snowfall"; version="1.84-6.1"; sha256="13941rlw1jsdjsndp1plzj1cq5aqravizkrqn6l25r9im7rnsi2w"; depends=[snow]; };
   snp_plotter = derive2 { name="snp.plotter"; version="0.5.1"; sha256="16apsqvkah5l0d5qcwp3lq2jspkb6n62wzr0wskmj84jblx483vv"; depends=[genetics]; };
   snpEnrichment = derive2 { name="snpEnrichment"; version="1.7.0"; sha256="1lja1n26nr8lgbca2kraryv933jwa2w3h41appzylflf0w3liz9y"; depends=[ggplot2 snpStats]; };
@@ -6782,13 +6965,13 @@ in with self; {
   softImpute = derive2 { name="softImpute"; version="1.4"; sha256="07cxbzkl08q58m1455i139952rmryjlic4s2f2hscl5zxxmfdxcq"; depends=[Matrix]; };
   softclassval = derive2 { name="softclassval"; version="1.0-20150416"; sha256="1zrf0nmyy4pfs4dzardghzznw1ahl21w4nykfh2pp8il4dpi21fs"; depends=[arrayhelpers svUnit]; };
   soil_spec = derive2 { name="soil.spec"; version="2.1.4"; sha256="129iqr6fdvlchq56jmy34s6qc2j5fcfir6pa5as5prw0djyvbdv0"; depends=[GSIF hexView KernSmooth pls sp wavelets]; };
-  soilDB = derive2 { name="soilDB"; version="1.5-4"; sha256="1n8ybryrg88m12qb6bwiqs04dxgbs4nv8ay27d2vi0xrkqhs99k2"; depends=[aqp Hmisc plyr RCurl sp XML]; };
+  soilDB = derive2 { name="soilDB"; version="1.6.6"; sha256="0hdj5cmfxnm3vdqxw8pqb9v35qrpbqyddpmma23jvc0zjd2g675a"; depends=[aqp Hmisc plyr reshape sp XML]; };
   soilphysics = derive2 { name="soilphysics"; version="2.4"; sha256="0mxh9jv7klk85zb30agg9c60d0y6v7rxapmvmmkc985ih94r5685"; depends=[MASS rpanel]; };
   soilprofile = derive2 { name="soilprofile"; version="1.0"; sha256="0sdfg6m2m6rb11hj017jx2lzcgk6llb01994x749s0qhzxmvx9mb"; depends=[aqp lattice munsell splancs]; };
   soiltexture = derive2 { name="soiltexture"; version="1.3.3"; sha256="1a0j10f6mxwrslqd4fvc1nqvsh47ly1nyhc6l0qq1iz6ffqd37mx"; depends=[MASS sp]; };
   soilwater = derive2 { name="soilwater"; version="1.0.2"; sha256="0rkyh7rcaapp1bxih88ivbaqnrig9jy32694jbg8z04b115hmdpm"; depends=[]; };
   solaR = derive2 { name="solaR"; version="0.41"; sha256="003f8dka0jqlfshzc3d4z9frq5jb5nq6sw3sm44x7rj79w3ynpyg"; depends=[lattice latticeExtra RColorBrewer zoo]; };
-  solarius = derive2 { name="solarius"; version="0.2.3"; sha256="164va71v77b0lyhccgrb47idhi7dlgyyw1vbs2iqci77ld6x50yl"; depends=[data_table ggplot2 plyr]; };
+  solarius = derive2 { name="solarius"; version="0.3.0.2"; sha256="17c765nxq81xshyyl4lfhqjmgvmhn9xyzc6x4qd33wvhh4148f38"; depends=[data_table ggplot2 plyr]; };
   solidearthtide = derive2 { name="solidearthtide"; version="1.0.2"; sha256="0274f7vyjymx6hd7ik68hznip57ni4cxp1bw7z91v1jzp3ch17rv"; depends=[]; };
   solr = derive2 { name="solr"; version="0.1.6"; sha256="0hlysi1yw4l98dcb1shznzrgia9pqzfj0p1hmnfz5gz2j64lf4h4"; depends=[assertthat httr plyr rjson XML]; };
   som = derive2 { name="som"; version="0.3-5"; sha256="01xsysmqj0zhzifqpwcrs0mflh56ndv4q3nm5n5imx7wmzx2lrzp"; depends=[]; };
@@ -6804,7 +6987,7 @@ in with self; {
   sos = derive2 { name="sos"; version="1.3-8"; sha256="0vcgq8hpgdnlmkxc7qh1jqigr0gvm9x3w4ijbhma7x4i5fx3c2il"; depends=[brew]; };
   sos4R = derive2 { name="sos4R"; version="0.2-11"; sha256="0r4lficx8wr0bsd510z4cp6la32xf928rsiznbywpxghnypsrcgg"; depends=[RCurl sp XML]; };
   sotkanet = derive2 { name="sotkanet"; version="0.9.21"; sha256="0x3dg38i2naf270qjc7dzmvf32ziihsa6m8yv1wh0l7sbk78h7cv"; depends=[RCurl rjson]; };
-  soundecology = derive2 { name="soundecology"; version="1.3"; sha256="1kcmsas359xcwqd0lxffr5p996jikqdag6idibq57qb6rnz3hgfz"; depends=[ineq oce pracma seewave tuneR vegan]; };
+  soundecology = derive2 { name="soundecology"; version="1.3.1"; sha256="07ncas8rn55pfqgj66qdwp28wh1v9yb8rkr36anc55a6svqx6g89"; depends=[ineq oce pracma seewave tuneR vegan]; };
   source_gist = derive2 { name="source.gist"; version="1.0.0"; sha256="03bv0l4ccz9p41cjw18wlz081vbjxzfgq3imlhq3pgy9jdwcd8fp"; depends=[RCurl rjson]; };
   sp = derive2 { name="sp"; version="1.2-1"; sha256="1d64lhyfwnj38sv61g4dlwkzgi75a8a15z8rn2p2qx28ymmzai1f"; depends=[lattice]; };
   sp23design = derive2 { name="sp23design"; version="0.9"; sha256="1ihvcld19cxflq2h93m9k9yaidhwixvbn46fqqc1p3wxzplmh8bs"; depends=[mvtnorm survival]; };
@@ -6821,7 +7004,7 @@ in with self; {
   space = derive2 { name="space"; version="0.1-1"; sha256="1qigfz62xz47hqi43aii3yr4h7ddvaf11a5nil7rqprgkd0k6mv3"; depends=[]; };
   spaceExt = derive2 { name="spaceExt"; version="1.0"; sha256="0lp8qmb7vcgxqqpsi89zjy7kxpibg3x2mq205pjmsrbbh7saqzr4"; depends=[glasso limSolve]; };
   spacejam = derive2 { name="spacejam"; version="1.1"; sha256="1mdxmfa1aifh3h279cklm4inin0cx3h0z2lm738bai34j6hpvar7"; depends=[igraph Matrix]; };
-  spacetime = derive2 { name="spacetime"; version="1.1-4"; sha256="1amxdjjqxibllwnb70chqmfnn66n95yf0wjmbrkjnzjszhbb25q2"; depends=[intervals lattice sp xts zoo]; };
+  spacetime = derive2 { name="spacetime"; version="1.1-5"; sha256="0r6ycr0apm12dahw9x00jrxjdwp3888wnbdi02dr3s3imxlfxkrz"; depends=[intervals lattice sp xts zoo]; };
   spacodiR = derive2 { name="spacodiR"; version="0.13.0115"; sha256="0c0grrvillpwjzv6fixviizq9l33y7486ypxniwg7i5j6k36nkpl"; depends=[colorspace picante Rcpp]; };
   spacom = derive2 { name="spacom"; version="1.0-4"; sha256="1jfsbgy7b0mwl4n2pgrkkghx9p8b0wipvg4c5jar6v8ydby6qg94"; depends=[foreach iterators lme4 Matrix nlme spdep]; };
   spam = derive2 { name="spam"; version="1.3-0"; sha256="1zw3c26dj3pj61mnb2xdfzvvlsiandfqax1zacg0cc4pd1d1g342"; depends=[]; };
@@ -6836,7 +7019,7 @@ in with self; {
   sparr = derive2 { name="sparr"; version="0.3-7"; sha256="1q1lc4yhdvhvwh5v3cw90p47v5mw2r13brfz6paz9qg0bhd015lg"; depends=[MASS rgl spatstat]; };
   sparseBC = derive2 { name="sparseBC"; version="1.1"; sha256="1w60n2875n809lbrn0hd4kdmsyfd64aikgzxchza8b59x77l0psy"; depends=[fields glasso]; };
   sparseHessianFD = derive2 { name="sparseHessianFD"; version="0.2.0"; sha256="1sj9d2d8bfjd00jr682gj21d4y0hjm91l3hj7356fpq461nb9pl8"; depends=[Matrix Rcpp RcppEigen]; };
-  sparseLDA = derive2 { name="sparseLDA"; version="0.1-6"; sha256="0k9v2pjx4q4nhvpjhv496v4gfr5h19w0h2h7za7j6zqfn6aygvz6"; depends=[elasticnet lars MASS mda]; };
+  sparseLDA = derive2 { name="sparseLDA"; version="0.1-7"; sha256="1rjjkvs9s25v85rdaxln8gnb88jhdj8s8lw8qxrjsgcgms7nvlqx"; depends=[elasticnet MASS mda]; };
   sparseLTSEigen = derive2 { name="sparseLTSEigen"; version="0.2.0"; sha256="11llmrkq0pnrdphgjvhmg269bq3xbbn4s7kd7xhvk62sigvspkcj"; depends=[Rcpp RcppEigen robustHD]; };
   sparseMVN = derive2 { name="sparseMVN"; version="0.2.0"; sha256="12g387bvpy4249kwq946v006ab095zsmgfsrkc1yqncxhmjwrgqn"; depends=[Matrix]; };
   sparseSEM = derive2 { name="sparseSEM"; version="2.5"; sha256="0ig8apsi94kvbcq3i8nzmywbdizlss7c6r9bppcyl9lxgikc3cds"; depends=[]; };
@@ -6858,17 +7041,17 @@ in with self; {
   spatialnbda = derive2 { name="spatialnbda"; version="1.0"; sha256="14mx5jybymasyia752f3vnr5vmswcavbz8bpqr69vlxphw27qkwk"; depends=[mvtnorm SocialNetworks]; };
   spatialprobit = derive2 { name="spatialprobit"; version="0.9-11"; sha256="1cpxxylc0pm7h9m83m2cklrh4jni5x79r5m5gibxi6viahwxn9kc"; depends=[Matrix mvtnorm spdep tmvtnorm]; };
   spatialsegregation = derive2 { name="spatialsegregation"; version="2.40"; sha256="0kpna2198nrj93bjsdgvj85wnjfj18psdq919fjnnhbzgzdkxs7l"; depends=[spatstat]; };
-  spatstat = derive2 { name="spatstat"; version="1.43-0"; sha256="02p9wlraifan36iniirz9lmvay8lizgxl44v3zpkpf61zaxwpx5w"; depends=[abind deldir goftest Matrix mgcv nlme polyclip tensor]; };
+  spatstat = derive2 { name="spatstat"; version="1.44-1"; sha256="0777lm76am8d6h17hkh6hh5rvmksxq7xafwxmp1qx6ywxgkf8f36"; depends=[abind deldir goftest Matrix mgcv nlme polyclip tensor]; };
   spatsurv = derive2 { name="spatsurv"; version="0.9-11"; sha256="0wmjzccrx2k88i7kbxlxv8ig602b1k9pqb2hn3wxq1l4d8m4izw9"; depends=[fields geostatsp iterators Matrix OpenStreetMap RandomFields raster RColorBrewer rgeos rgl sp spatstat stringr survival]; };
   spc = derive2 { name="spc"; version="0.5.2"; sha256="0z7s87riz1pcrg86dr43qw6s2i59vyy6fp9grl4aqxzdn1hrnsxl"; depends=[]; };
   spcadjust = derive2 { name="spcadjust"; version="1.0"; sha256="1p011x3g1awb2sajg19fhkyrf5d8w4h9qwckxxl1i23jk3kpkyjh"; depends=[]; };
-  spcosa = derive2 { name="spcosa"; version="0.3-5"; sha256="15q0f2sfhm1b13zs5a50yfvqhgcn4fyncf0h5ivin2k9g5xvq4k4"; depends=[ggplot2 rJava sp]; };
+  spcosa = derive2 { name="spcosa"; version="0.3-6"; sha256="0zj5yr0by1pbixs4z6w3c6yr1k55k5gqmvjkwiq2gsgq00vs7q94"; depends=[ggplot2 rJava sp]; };
   spcov = derive2 { name="spcov"; version="1.01"; sha256="1brmy64wbk56bwz9va7mc86a0ajbfy09qpjafyq2jv7gm7a35ph5"; depends=[]; };
   spcr = derive2 { name="spcr"; version="1.2.1"; sha256="0cm59cfw3c24i1br08fdzsz426ldljxb41pdrmbmma4a69jkv1sb"; depends=[]; };
   spd = derive2 { name="spd"; version="2.0-1"; sha256="00zxh4ri47b61jkcjf5idl9hhlfld6rhczsnhmjsax59884f2i8m"; depends=[KernSmooth]; };
-  spdep = derive2 { name="spdep"; version="0.5-88"; sha256="1m2bxbf472xq7wr76znjirslx3hb1ylk6lp7x5003ka3i2zpakxn"; depends=[boot coda deldir LearnBayes MASS Matrix nlme sp]; };
+  spdep = derive2 { name="spdep"; version="0.5-92"; sha256="1b5l6sfscnamfh957n3srgwc50f98az3071dcpqrhk4g4n2ws6yg"; depends=[boot coda deldir LearnBayes MASS Matrix nlme sp]; };
   spduration = derive2 { name="spduration"; version="0.14.0"; sha256="1vv8hr90kylyhy52q8bwdn6m5iil4fwhz7875q9yh73qwklqpnsq"; depends=[corpcor MASS plyr Rcpp RcppArmadillo separationplot xtable]; };
-  spdynmod = derive2 { name="spdynmod"; version="1.1.2"; sha256="0sq2wb5vb441injasmg0rfwn694vk1d9110lwcyf3dsdiysp76ib"; depends=[animation deSolve raster sp]; };
+  spdynmod = derive2 { name="spdynmod"; version="1.1.3"; sha256="0qh0kkxs6hk344k3fys0g9yy0xl0kwnwl18bgiak53fd1k7whskq"; depends=[animation deSolve raster sp]; };
   spe = derive2 { name="spe"; version="1.1.2"; sha256="0xyx42n3gcsgqmy80nc9la6p6gq07anpzx0afwffyx9fv20fvys0"; depends=[]; };
   speaq = derive2 { name="speaq"; version="1.2.1"; sha256="0glvw1jdyc8w8b8m7l74d0rl74xfs4zmanmx4i41l7ynswhmqm01"; depends=[MassSpecWavelet]; };
   speccalt = derive2 { name="speccalt"; version="0.1.1"; sha256="0j7rbidmmx78vgwsqvqjbjjh92fnkf2sdx0q79xlpjl2dph7d6l6"; depends=[]; };
@@ -6908,7 +7091,7 @@ in with self; {
   sprex = derive2 { name="sprex"; version="1.1"; sha256="1lwkdi8g1dlfdnxxvspgpz6f5h2gml176xhfrcxa9gcy3y9rlcpm"; depends=[]; };
   sprint = derive2 { name="sprint"; version="1.0.7"; sha256="1yzx1qjpxx9yc0hbm1mmha5b7aq13iflq66af597b7yj6abm7zjp"; depends=[boot e1071 ff randomForest rlecuyer]; };
   sprinter = derive2 { name="sprinter"; version="1.1.0"; sha256="12v4l4fxijh2d46yzs0w4235a8raip5rfbxskl0dw7701ryh7n8g"; depends=[CoxBoost GAMBoost LogicReg randomForestSRC survival]; };
-  sprm = derive2 { name="sprm"; version="1.2"; sha256="0r3dg6a5xnh5b7kw21yb5wadwxnvmayp3791b4h9v7aa59xvxb63"; depends=[cvTools ggplot2 pcaPP reshape2 robustbase]; };
+  sprm = derive2 { name="sprm"; version="1.2.1"; sha256="1b2x7c1a3f4gv67vnpsbfgzyfpj2g6fpvakp09apq4a399aig6nd"; depends=[cvTools ggplot2 pcaPP reshape2 robustbase]; };
   sprsmdl = derive2 { name="sprsmdl"; version="0.1-0"; sha256="09klwsjp5w6p7dkn5ddmqp7m9a3zcmpr9vhcf00ynwyp1w7d26gi"; depends=[]; };
   spsann = derive2 { name="spsann"; version="1.0-2"; sha256="1wqvr5rqnm4waik8hqf4q12ximp3yal40hb54gn4xxv7w3nyipig"; depends=[pedometrics Rcpp sp SpatialTools]; };
   spsi = derive2 { name="spsi"; version="0.1"; sha256="0q995hdp7knic6nca0kf5yzkvv8rsskisbzpkh9pijxjmp1wnjrx"; depends=[plot3D]; };
@@ -6923,7 +7106,8 @@ in with self; {
   squash = derive2 { name="squash"; version="1.0.7"; sha256="1wdnzagibh9fz7a3x6m4ixckh7493shvwxg7cn5kpnfzf8m1imyj"; depends=[]; };
   sra = derive2 { name="sra"; version="0.1.1"; sha256="03nqjcydl58ld0wq1f9f5p666qnvdfxb5vhd584sdilw1b730ykd"; depends=[]; };
   srd = derive2 { name="srd"; version="1.0"; sha256="04j2gj7fn7p2rm34haayswrfhn6w5lln439d07m9g4c020kqqsr3"; depends=[animation colorspace plyr stringr survival]; };
-  ss3sim = derive2 { name="ss3sim"; version="0.8.2"; sha256="1gj3kf4ccd5n2jr4sm50gny5x1zq4brkhqgw0nww41spnimascfr"; depends=[gtools lubridate plyr r4ss reshape2]; };
+  ss3sim = derive2 { name="ss3sim"; version="0.9.0"; sha256="1fnjrxjcb76g9xwa05lwhwkwxaxp03zfgzq9dy7jbibcclblh7a1"; depends=[bbmle dplyr foreach ggplot2 gtools lubridate magrittr plyr r4ss]; };
+  ssa = derive2 { name="ssa"; version="1.0.0"; sha256="01lbkphl3bd8a7wkb5yrhls3r1cynlx9xvfkcmny061xa1bvbq36"; depends=[]; };
   ssanv = derive2 { name="ssanv"; version="1.1"; sha256="17a4a5azxm5h2vxia16frcwdyd36phpfm7fi40q6mnnrwbpkzsjd"; depends=[]; };
   sscor = derive2 { name="sscor"; version="0.1"; sha256="0bvj6kzkjgdjwia907if8jlicygkh5gnk3s159gv9wvc50rjjab3"; depends=[mvtnorm pcaPP robustbase]; };
   ssd = derive2 { name="ssd"; version="0.3"; sha256="1z61n9m6vn0ijawyz924ak0zfl9z13jsb4k4575b7c424ci2p6gy"; depends=[]; };
@@ -6950,9 +7134,9 @@ in with self; {
   starma = derive2 { name="starma"; version="1.2"; sha256="1jpvwdv8ms69y9qc4lsh4llnv2iw95g11mrfi8ny1wirq069f73w"; depends=[ggplot2 Rcpp RcppArmadillo scales]; };
   startupmsg = derive2 { name="startupmsg"; version="0.9"; sha256="1l75w4v1cf4kkb05akhgzk5n77zsj6h20ds8y0aa6kd2208zxd9f"; depends=[]; };
   stashR = derive2 { name="stashR"; version="0.3-5"; sha256="1lnpi1vb043aj4b9vmmy56anj4344709986b27hqaqk5ajzq9c3w"; depends=[digest filehash]; };
-  statar = derive2 { name="statar"; version="0.3.0"; sha256="0ynvabdyp5vy90gz7c9ywbdyg8dp4vmmz2zjd7z8b5jjk0f8xsf1"; depends=[data_table dplyr ggplot2 lazyeval matrixStats proto stargazer stringr tidyr]; };
+  statar = derive2 { name="statar"; version="0.5.0"; sha256="05n7z2b7yvr58iq5p5i51z4vrab6d7978lpl302g2x4gi6s90v8f"; depends=[data_table dplyr ggplot2 lazyeval matrixStats stargazer stringr tidyr]; };
   statcheck = derive2 { name="statcheck"; version="1.0.1"; sha256="01b40bjagkj6hfyq9ppdlaafwgykv8p9s8sm0abd3if82ivdpixj"; depends=[plyr]; };
-  statebins = derive2 { name="statebins"; version="1.0"; sha256="1mqky4nb31xjhn922csvv8ps2fwgcgazxs56rcn3ka32c59a4mmg"; depends=[ggplot2 gridExtra RColorBrewer scales]; };
+  statebins = derive2 { name="statebins"; version="1.2.2"; sha256="0qfs796dk5x983qah32w3npv9mxzljp3g7kffdd0ansn3z7i1zbb"; depends=[ggplot2 gridExtra RColorBrewer scales]; };
   statfi = derive2 { name="statfi"; version="0.9.8"; sha256="0kg9bj2mmd95ysg604rcg4szqx3whbqm14fwivnd110jgfy20gk2"; depends=[pxR]; };
   stationaRy = derive2 { name="stationaRy"; version="0.4.1"; sha256="1iyzg40vi1l4s68kh50in1p97pcb28z6n932cgrx5k1rv3api13g"; depends=[downloader dplyr leaflet lubridate plyr progress readr stringr]; };
   statmod = derive2 { name="statmod"; version="1.4.22"; sha256="1gmq3sicxl1vkznahcnvbas4lhx3a8f1znylmbhn870p8clch0if"; depends=[]; };
@@ -6976,7 +7160,7 @@ in with self; {
   stmCorrViz = derive2 { name="stmCorrViz"; version="1.2"; sha256="0mhwl64hv4hjq72mqnvc5ii94aibmc0fw5rmdrvsad4bj6gg67p3"; depends=[jsonlite stm]; };
   stocc = derive2 { name="stocc"; version="1.30"; sha256="0xpf9101094l5l75p9lr64gwh2b8jh4saw6z6m2nbn197la3acpw"; depends=[coda fields Matrix rARPACK truncnorm]; };
   stochprofML = derive2 { name="stochprofML"; version="1.2"; sha256="0gqfm2l2hq1dy3cvg9v2ksphydqdmaj8lppl5s5as2khnh6bd1l1"; depends=[MASS numDeriv]; };
-  stochvol = derive2 { name="stochvol"; version="1.2.0"; sha256="10j6iz0nrcmy79b2ns1zszb8w7x2jc85sfj8xaf57j7z4f3n98ff"; depends=[coda Rcpp RcppArmadillo]; };
+  stochvol = derive2 { name="stochvol"; version="1.2.2"; sha256="0dpi2a3c7m12znci7xa3814jaf5lm1iyi0mf4bnzrqskcxb7p76c"; depends=[coda Rcpp RcppArmadillo]; };
   stockPortfolio = derive2 { name="stockPortfolio"; version="1.2"; sha256="0k5ss6lf9yhcvc4hwqmcfpdn6qkbq5kaw0arldkl46391kac3bd1"; depends=[]; };
   stocks = derive2 { name="stocks"; version="1.1.1"; sha256="1qwd16bw40w2ns7b0n9wm8l344r4vyk27rmg0vr5512zsrcjkcfb"; depends=[rbenchmark Rcpp]; };
   stoichcalc = derive2 { name="stoichcalc"; version="1.1-3"; sha256="0z9fnapibfp070jxg27k74fdxpgszl07xiqfj448dkydpg8ydkrb"; depends=[]; };
@@ -6994,17 +7178,19 @@ in with self; {
   streamR = derive2 { name="streamR"; version="0.2.1"; sha256="1ml33mj7zqlzfyyam23xk5d25jkm3qr7rfj2kc5j5vgsih6kr0gl"; depends=[RCurl rjson]; };
   stremo = derive2 { name="stremo"; version="0.2"; sha256="13b9xnd8ykxrm8gnakh0ixbsb7yppqv3isga8dsz473wzy82y6h1"; depends=[lavaan MASS numDeriv]; };
   stressr = derive2 { name="stressr"; version="1.0.0"; sha256="00b93gfh1jd5r7i3dhsfqjidrczf693kyqlsa1krdndg8f0jkyj7"; depends=[lattice latticeExtra XML xts]; };
-  stringdist = derive2 { name="stringdist"; version="0.9.4"; sha256="1cah3zsxyi1i550mbv3r36rin430ymnhb5x8a0iyafr0qw22khkf"; depends=[]; };
+  stringdist = derive2 { name="stringdist"; version="0.9.4.1"; sha256="0a2j1h5kf0p14d117rq8fv6qbk8nwsianmkb73d0f6cb1ikadnmg"; depends=[]; };
   stringgaussnet = derive2 { name="stringgaussnet"; version="1.1"; sha256="161fi78cd7yddbcq71z3fgx1q2sacg1n1ggrkrqz17icwzviqrh5"; depends=[AnnotationDbi biomaRt httr igraph limma pspearman RCurl RJSONIO simone VennDiagram]; };
   stringi = derive2 { name="stringi"; version="1.0-1"; sha256="1ld38536sswyywp6pyys3v8vkngbk5cksrhdxp8jyr6bz7qf8j77"; depends=[]; };
   stringr = derive2 { name="stringr"; version="1.0.0"; sha256="0jnz6r9yqyf7dschr2fnn1slg4wn6b4ik5q00j4zrh43bfw7s9pq"; depends=[magrittr stringi]; };
+  strptimer = derive2 { name="strptimer"; version="0.1.0"; sha256="0fyrapai58rarf6xy9vlg3lmkzgdcpfchrkdlqj69jkiz7ngh4qv"; depends=[dplyr lazyeval magrittr stringi tidyr]; };
   strucchange = derive2 { name="strucchange"; version="1.5-1"; sha256="0cdgvl6kphm2i59bmnppn1y3kv65ml111bk7yzpcx7vv8wh2w3kl"; depends=[sandwich zoo]; };
   structSSI = derive2 { name="structSSI"; version="1.1.1"; sha256="06rwmrgqc4qy4x0bhlshjdsjxfmp5fr9d1wjglhlb1gbp72fmkdv"; depends=[ggplot2 igraph multtest reshape2 rjson]; };
   strum = derive2 { name="strum"; version="0.6.2"; sha256="0f5cb7cfvqhmnv4sjfr58lns4fclmr8iyka595zddy9f6dv5rqp1"; depends=[graph MASS Matrix pedigree Rcpp RcppArmadillo Rgraphviz]; };
   strvalidator = derive2 { name="strvalidator"; version="1.5.2"; sha256="1xqgs50vppg8277s446m71wpdqs32v8i1ymzj130xfx9q832gnxk"; depends=[data_table ggplot2 gridExtra gtable gWidgets gWidgetsRGtk2 plyr RGtk2 scales]; };
   stsm = derive2 { name="stsm"; version="1.7"; sha256="080xakf7rf53vzv64g338hz87sk4cqfwd6ly4f122sxvn4xypq3n"; depends=[KFKSDS]; };
   stsm_class = derive2 { name="stsm.class"; version="1.3"; sha256="19jrja5ff31gh5k2zqhqsyd7w2ivr4s6bkliash6x8fmd22h5zs8"; depends=[]; };
-  stylo = derive2 { name="stylo"; version="0.6.2-1"; sha256="0jba14rzf79iabf6rz8a0va8rjabp456k7jgn5iggcq0n8nn4nnj"; depends=[ape class e1071 lattice pamr tcltk2 tsne]; };
+  stubthat = derive2 { name="stubthat"; version="0.1.0"; sha256="1k6s3sn3swm6pxbv81kw8p2m60q9m1nw64jgimf08qwsrsbfx11h"; depends=[]; };
+  stylo = derive2 { name="stylo"; version="0.6.3"; sha256="18fp9m4sn63icyh5bn2f7xjjjk5c0a55i1b76vc1ydxkxipy9nvc"; depends=[ape class e1071 lattice pamr tcltk2 tsne]; };
   suRtex = derive2 { name="suRtex"; version="0.9"; sha256="0xcy3x1079v10bn3n3y6lxignb9n3h57w4hhrvzi5y14x05jjyda"; depends=[]; };
   subgroup = derive2 { name="subgroup"; version="1.1"; sha256="1n3qw7vih1rngmp4fwjbs050ngby840frj28i8x7d7aa52ha2syf"; depends=[]; };
   subplex = derive2 { name="subplex"; version="1.1-6"; sha256="0camqd0n468h93jxvvcnclki66glr39rb87nvrkrbiklbqd0s1fp"; depends=[]; };
@@ -7042,7 +7228,8 @@ in with self; {
   survey = derive2 { name="survey"; version="3.30-3"; sha256="0vcyph1vpnl4xaqd85ffh1gm0dqhvgr3343q0mlycmyq485x0idy"; depends=[]; };
   surveydata = derive2 { name="surveydata"; version="0.1-14"; sha256="1zcp3wb7yhsa59cl4bdw7p08vpviypvfa9hggwc60w7ashpky73i"; depends=[plyr stringr]; };
   surveyeditor = derive2 { name="surveyeditor"; version="1.0"; sha256="073219bcn1hlxl9ql6gncfvgn0m37pz5sb7h94nq6lf35dymq5zq"; depends=[]; };
-  surveyplanning = derive2 { name="surveyplanning"; version="0.2"; sha256="05gn4zhjg9dwk1ar4hyrbs4wyjdxnr1cac96z129k1blm7y2lbzr"; depends=[data_table]; };
+  surveyoutliers = derive2 { name="surveyoutliers"; version="0.0"; sha256="09xnl1pas8w232daml68jrn2nj7cgmhv0sbclbwg7q8c0wlzxan8"; depends=[]; };
+  surveyplanning = derive2 { name="surveyplanning"; version="1.0"; sha256="183f6l4myadjsnip9b8yy3s3sw55qn466vpb3xw78mfyw671vkvy"; depends=[data_table]; };
   survival = derive2 { name="survival"; version="2.38-3"; sha256="1hkji557sz4q86pp7xj3h4cdwsnfl1mlj4c6c917mnbijj3bm215"; depends=[]; };
   survivalMPL = derive2 { name="survivalMPL"; version="0.1.1"; sha256="0c4hr2q50snd5qm2drg4qzfkcz4klxr4jba6xpc8n2i8wn573cvc"; depends=[survival]; };
   survivalROC = derive2 { name="survivalROC"; version="1.0.3"; sha256="0wnd65ff5w679hxa1zrpfrx9qg47q21pjxppsga6m3h4iq1yfj8l"; depends=[]; };
@@ -7063,16 +7250,19 @@ in with self; {
   svapls = derive2 { name="svapls"; version="1.4"; sha256="12gk8wrgp556phdv89jqza22zmsnachsydr5vlz38s664d2lplbg"; depends=[class pls]; };
   svcm = derive2 { name="svcm"; version="0.1.2"; sha256="1lkik65md8xdxzkmi990dvmbkc6zwkyxv8maypv2vbi2x534jkhl"; depends=[Matrix]; };
   svd = derive2 { name="svd"; version="0.3.3-2"; sha256="064y4iq4rj2h35fhi6749wkffg37ppj29g9aw7h156c2rqvhxcln"; depends=[]; };
+  svdvis = derive2 { name="svdvis"; version="0.1"; sha256="1z3z86izl2gpxllpx56vn6kkdg9cjjikfd90hdjnfi4bmmpx50dn"; depends=[GGally ggplot2 gridExtra RColorBrewer reshape2 scales]; };
   svdvisual = derive2 { name="svdvisual"; version="1.1"; sha256="02mzh2cy4jzb62fd4m1iyq499fzwar99p12pyanbdnmqlx206mc2"; depends=[lattice]; };
   svgPanZoom = derive2 { name="svgPanZoom"; version="0.3.0"; sha256="0vl8sg8dwa9hyvkd5l3nnl79mhn22wj3kkvjm4n2azrjd8xihf2b"; depends=[htmlwidgets]; };
   svgViewR = derive2 { name="svgViewR"; version="1.0.1"; sha256="1ggw5w5xjqp33z6nzszimcab3vkv4rliiilhcqbhppqlnhjb8nab"; depends=[]; };
+  svglite = derive2 { name="svglite"; version="1.0.0"; sha256="0sfljl4y4ws4p4rghpx0ls25divlvm6gpmnjnn2r3m3df6q43qii"; depends=[gdtools Rcpp]; };
   svmpath = derive2 { name="svmpath"; version="0.953"; sha256="0hqga4cwy1az8cckh3nkknbq1ag67f4m5xdg271f2jxvnmhdv6wv"; depends=[]; };
   svs = derive2 { name="svs"; version="1.0.3"; sha256="1mcx9985wn898q7vlj3daxclmdbzz67r6d825451jzvjliy7w91i"; depends=[gtools]; };
   svyPVpack = derive2 { name="svyPVpack"; version="0.1-1"; sha256="15k5ziy2ng853jxl66wjr27lzc90l6i5qr08q8xgcs359vn02pmp"; depends=[survey]; };
   swamp = derive2 { name="swamp"; version="1.2.3"; sha256="1xpnq5yrmmsx3d48x411p7nx6zmwmfc9hz6m3v9avvpjkbc3glkg"; depends=[amap gplots impute MASS]; };
-  sweidnumbr = derive2 { name="sweidnumbr"; version="0.6.5"; sha256="1c3a4rhzjwrygz7accgmvj6f5xvz04p7wl9kh82mvrzl96kac2jv"; depends=[lubridate stringr]; };
+  sweidnumbr = derive2 { name="sweidnumbr"; version="1.0.0"; sha256="0m9iqscgr517y8vv5z1jbzfql27l0iq93046sxkai5njq9kpbhq1"; depends=[lubridate stringr]; };
   swfscMisc = derive2 { name="swfscMisc"; version="1.0.6"; sha256="14bbcn8xkc32nagi92sahdvfbgfd4v7pari1c004dz0qgxxcnz1h"; depends=[mapdata maps spatstat]; };
   swirl = derive2 { name="swirl"; version="2.2.21"; sha256="0lpin7frm1a6y9lz0nyykhvydr1qbx85iqy24sm52r1vxycv2r8h"; depends=[digest httr RCurl stringr testthat yaml]; };
+  swirlify = derive2 { name="swirlify"; version="0.4.1"; sha256="15xd18jgrqsq9w0qa64qxfcinrsy87mjbwc0s22x06yzhpcvcmdk"; depends=[rmarkdown stringr swirl whisker yaml]; };
   switchnpreg = derive2 { name="switchnpreg"; version="0.8-0"; sha256="1vaanz01vd62ds2g2xv4kjlnvp13h59n8yqikwx07293ixd4qhpw"; depends=[expm fda HiddenMarkov MASS]; };
   switchr = derive2 { name="switchr"; version="0.9.19"; sha256="1x8vf6nmy1rsy25ijl2ycxcpwzwkmhffvlmmg5p30m7y4zmcm200"; depends=[]; };
   switchrGist = derive2 { name="switchrGist"; version="0.2.1"; sha256="0n8fzzsxm0m4yic133q07vki803zywhijadymrgyq7qlx3d1m97d"; depends=[gistr httpuv RJSONIO switchr]; };
@@ -7094,12 +7284,13 @@ in with self; {
   synthpop = derive2 { name="synthpop"; version="1.1-1"; sha256="0l65pbjcc163dqalkz1dil5bpfb9f3p4wx6hpr7z4g0ir58anbip"; depends=[coefplot foreign ggplot2 lattice MASS nnet party plyr proto rpart]; };
   sysfonts = derive2 { name="sysfonts"; version="0.5"; sha256="1vppj3jnag88351f8xfk9ds8gbbij3m55iq5rxbnrzy89c04zpzp"; depends=[]; };
   systemfit = derive2 { name="systemfit"; version="1.1-18"; sha256="0sy0v0iz4qzrmazp5j63d62xvlyi9mw5ryd4msd1xmppdl7r453p"; depends=[car lmtest MASS Matrix sandwich]; };
-  systemicrisk = derive2 { name="systemicrisk"; version="0.2"; sha256="06061hca2x9hj0caann69j6x2jgy8bq40nxs27iqb3zfqp2cz44f"; depends=[lpSolve Rcpp]; };
+  systemicrisk = derive2 { name="systemicrisk"; version="0.3"; sha256="07i3pjghx2v8brx0k6xy5bk1d263wwyh5mbg7bzs4vwn4dh5k08f"; depends=[lpSolve Rcpp]; };
   syuzhet = derive2 { name="syuzhet"; version="0.2.0"; sha256="1l83wjiv1xsxw4wrcgcj3ryisi7zn4sbdl0sail0rhw0g9y9cz76"; depends=[NLP openNLP]; };
   taRifx = derive2 { name="taRifx"; version="1.0.6"; sha256="10kp06hkdx1qrzh2zs9mkrgcnn6d31cldjczmk5h9n98r34hmirx"; depends=[plyr reshape2]; };
   taRifx_geo = derive2 { name="taRifx.geo"; version="1.0.6"; sha256="0w7nwp3kvidqhwaxaiq267h99akkrj6xgkviwj0w01511m2lzghs"; depends=[RCurl rgdal rgeos RJSONIO sp taRifx]; };
   tab = derive2 { name="tab"; version="3.1.1"; sha256="05wypi4v9r2qlgwafd9f58vnxn2c4fnz18l8xpb24nhdgm35adqy"; depends=[gee survey survival]; };
   taber = derive2 { name="taber"; version="0.1.0"; sha256="07a18kn65b4cxxf1z568n7adp6y3qx96nrff3a3714x241sd5p6i"; depends=[dplyr magrittr]; };
+  tablaxlsx = derive2 { name="tablaxlsx"; version="1.0.3"; sha256="04f9n3pq17h4zin9dsipizfkqjrnj7s9klsanq1z1l93i38mkalk"; depends=[openxlsx]; };
   table1xls = derive2 { name="table1xls"; version="0.3.1"; sha256="0zd93wrdj4q0ph375qlgdhpqm3n8s941vks5h07ks9gc8id1bnx5"; depends=[XLConnect]; };
   tableone = derive2 { name="tableone"; version="0.7.3"; sha256="0ffir00gzrx4fxci018vra7m8hfiqmvlib52wlxikksna2ha51qv"; depends=[e1071 gmodels MASS survey zoo]; };
   tableplot = derive2 { name="tableplot"; version="0.3-5"; sha256="1jkkl2jw7lwm5zkx2yaiwnq1s3li81vidjkyl393g1aqm9jf129l"; depends=[]; };
@@ -7112,15 +7303,17 @@ in with self; {
   tau = derive2 { name="tau"; version="0.0-18"; sha256="04rj3jrcz4h60dqm1xmnmpr52csz1s7rf2wv6ivybgyvbq0w2ijf"; depends=[]; };
   tawny = derive2 { name="tawny"; version="2.1.2"; sha256="0ihg3qlng8swak1dfpbnlx5xc45d1i9rgqawmqa97v5m91smfa71"; depends=[futile_logger futile_matrix lambda_r lambda_tools PerformanceAnalytics quantmod tawny_types xts zoo]; };
   tawny_types = derive2 { name="tawny.types"; version="1.1.3"; sha256="1v0k6nn45rdczjn5ymsp2fqq0ijnlniyf3bc08ibd8yd1jcdyjnj"; depends=[futile_logger futile_options lambda_r lambda_tools quantmod xts zoo]; };
-  taxize = derive2 { name="taxize"; version="0.6.6"; sha256="00z4d3zvzsrb8hw25ydbmp0h0b372f7lpnhqc1z2iibgkmr064fi"; depends=[ape bold data_table foreach httr jsonlite plyr reshape2 stringr XML]; };
+  taxize = derive2 { name="taxize"; version="0.7.0"; sha256="0ns2x241ha9cw9v38kqa0sflz1jlrl6pg8fj6njzw20ajhivv3b3"; depends=[ape bold data_table foreach httr jsonlite plyr reshape2 stringr XML]; };
   tbart = derive2 { name="tbart"; version="1.0"; sha256="0m8l9ic7na70il6r9ha0pyrjwznbgjq7gk5xwa5k9px4ysws29k5"; depends=[Rcpp sp]; };
   tbdiag = derive2 { name="tbdiag"; version="0.1"; sha256="1wr2whgdk84426hb2pf8iiyradh9c61gyazvcrnbkgx2injkz65q"; depends=[]; };
-  tcR = derive2 { name="tcR"; version="2.2.1"; sha256="0rpi14phjlkk6cwvvrpk5k0vr3zhv5js472786z0kmricyvk13d2"; depends=[data_table dplyr ggplot2 gridExtra gtable igraph Rcpp reshape2 stringdist]; };
+  tcR = derive2 { name="tcR"; version="2.2.1.7"; sha256="1m37ndk73y267q6byzpf8kfx8vsd5j2xdspcgkz6743fkaj1myam"; depends=[data_table dplyr ggplot2 gridExtra gtable igraph Rcpp reshape2 scales stringdist]; };
   tcltk2 = derive2 { name="tcltk2"; version="1.2-11"; sha256="1ibxld379600xx7kiqq3fck083s8psry12859980218rnzikl65d"; depends=[]; };
   tclust = derive2 { name="tclust"; version="1.2-3"; sha256="0a1b7yp4l9wf6ic5czizyl2cnxrc1virj0icr8i6m1vv23jd8jfp"; depends=[cluster mclust mvtnorm sn]; };
   tdr = derive2 { name="tdr"; version="0.11"; sha256="1ga1lczqj5pka2yz7igxfm83xmkx7lla8pz6ryij0ybn284agszs"; depends=[ggplot2 lattice RColorBrewer]; };
   tdthap = derive2 { name="tdthap"; version="1.1-7"; sha256="0lqcw4bzjd995pwn2yrmzay82gnkxnmxxsqplpbn5gg8p6sf5qqk"; depends=[]; };
   teigen = derive2 { name="teigen"; version="2.1.0"; sha256="1b9vkz812jsvzxs4751q8zmkvbc1bh4zbi4pd0550b181vxnn8wa"; depends=[]; };
+  telegram = derive2 { name="telegram"; version="0.3.0"; sha256="1pl95i4z3751li1vqmrf9w3x46a37gxq37gj8cibk0axgwsmk63v"; depends=[httr R6]; };
+  tempcyclesdata = derive2 { name="tempcyclesdata"; version="1.0.1"; sha256="0hciachv59kjpjs119r4z24jskzgnassi1yjg3cgl2r0hyglxxc3"; depends=[]; };
   tempdisagg = derive2 { name="tempdisagg"; version="0.24.0"; sha256="02ld14mppyyqvgz537sypr3mqc758cchfcmpj46b7wswwa2y7fyz"; depends=[]; };
   tensor = derive2 { name="tensor"; version="1.5"; sha256="19mfsgr6vz4lgwidm80i4yw0y1dr3n8i6qz7g4n2xa0k74zc5pp1"; depends=[]; };
   tensorA = derive2 { name="tensorA"; version="0.36"; sha256="1xpczn94a6vfkfibfvr71a7wccksg16pc22h0inpafna4qpygcwp"; depends=[]; };
@@ -7133,17 +7326,19 @@ in with self; {
   testthatsomemore = derive2 { name="testthatsomemore"; version="0.1"; sha256="0j9sszm4l0mn7nqz47li6fq5ycb3yawc2yrad9ngb75cvp47ikkk"; depends=[testthat]; };
   texmex = derive2 { name="texmex"; version="2.1"; sha256="17x4xw2h4g9a10zk4mvi3jz3gf4rf81b29hg2g3gq6a6nrxsj8sy"; depends=[mvtnorm]; };
   texmexseq = derive2 { name="texmexseq"; version="0.1"; sha256="18lpihiwpjkjkc1n7ka6rzasrwv8npn4939s1gl8g1jb27vnhzb5"; depends=[]; };
-  texreg = derive2 { name="texreg"; version="1.35"; sha256="0c1w6kzczzflcmvr544v3gdasvyjxcwqgdm2w2i9wp7kd1va37fr"; depends=[]; };
+  texreg = derive2 { name="texreg"; version="1.36"; sha256="1fk4pm7w1pghx40qvpiqvij2r8zy13lxcyn1bpml466g1359ra5m"; depends=[]; };
   textcat = derive2 { name="textcat"; version="1.0-3"; sha256="0j3sp94bz57l70aqm11033nfshxdz3l9m4sq1gsfzkvxgnlpqrm5"; depends=[slam tau]; };
   textir = derive2 { name="textir"; version="2.0-4"; sha256="1ky22xar980afyydddahppad9m263mxnrdqpj1fcbmdhg8flwjgz"; depends=[distrom gamlr Matrix]; };
+  textmineR = derive2 { name="textmineR"; version="1.5.1"; sha256="193s34g8wrj6hh63a1i6vvqby3fkwvlr02bap2n9vxlf37sbglqs"; depends=[lda Matrix Rcpp RcppArmadillo RcppProgress RWeka tm]; };
   textometry = derive2 { name="textometry"; version="0.1.4"; sha256="17k3v9r5d5yqgp25bz69pj6sw2j55dxdchq63wljxqkhcwxyy9lh"; depends=[]; };
   textreg = derive2 { name="textreg"; version="0.1.3"; sha256="0wp1yybhcybb77aykk9frrylk4kjn0jc98q488195qzx7m5n7ccw"; depends=[NLP Rcpp tm]; };
   textreuse = derive2 { name="textreuse"; version="0.1.2"; sha256="174gh9f4bfgpf8vnwcciq2y70rnzwln5yygzif28x5h960yckv5x"; depends=[assertthat BH digest dplyr NLP Rcpp RcppProgress stringr tidyr]; };
   tfer = derive2 { name="tfer"; version="1.1"; sha256="19d31hkxs6dc4hvj5495a3kmydm29mhp9b2wp65mmig5c82cl9ck"; depends=[]; };
-  tfplot = derive2 { name="tfplot"; version="2015.4-1"; sha256="1qrw8x7pz7xcmpym3j1d095bhvy2s7znxplml1qyw5minc67n1mh"; depends=[tframe]; };
-  tframe = derive2 { name="tframe"; version="2015.1-1"; sha256="10igwmrfslyz3z3cbyldik8fcxq43pwh60yggka6mkl0nzkxagbd"; depends=[]; };
+  tfplot = derive2 { name="tfplot"; version="2015.12-1"; sha256="1x007j6ibbzfr0kncvsr4c7295jv3c4amg2dpyjvdir9h665nc23"; depends=[tframe]; };
+  tframe = derive2 { name="tframe"; version="2015.12-1"; sha256="0k0favda3z6zdg7ykc2nnl28gxz7sfzbyr5pcifiyi984pa2zgfx"; depends=[]; };
   tframePlus = derive2 { name="tframePlus"; version="2015.1-2"; sha256="043ay79x520lbh4jm2nb3331pwd7dvwfw20k1kc9cxbplxiy8pnb"; depends=[tframe timeSeries]; };
   tgcd = derive2 { name="tgcd"; version="1.7"; sha256="1745rrlldzimswv1vnwhcmsv3sxwf3ahnygyhqpk9c8lalnark2i"; depends=[]; };
+  tggd = derive2 { name="tggd"; version="0.1.1"; sha256="1izar1b3w148vp2r8gv3vpwfndib8ilxcjxgbfzbxn7q5mr73mwa"; depends=[gsl]; };
   tglm = derive2 { name="tglm"; version="1.0"; sha256="1gv33jq3bzd5wlrqjvcfb1ax258q9asawkdi64rbj18qp7fg2dbx"; depends=[BayesLogit coda mvtnorm truncnorm]; };
   tgp = derive2 { name="tgp"; version="2.4-11"; sha256="0hdi05bz9qn4zmljfnll5hk9j8z9qaqmya77pdcgr6vc31ckixw5"; depends=[maptree]; };
   tgram = derive2 { name="tgram"; version="0.2-2"; sha256="091g6j5ry1gmjff1kprk5vi2lirl8zbynqxkkywaqpifz302p39q"; depends=[zoo]; };
@@ -7168,7 +7363,7 @@ in with self; {
   timeDate = derive2 { name="timeDate"; version="3012.100"; sha256="0cn4h23y2y2bbg62qgm79xx4cvfla5xbpmi9hbdvkvpmm5yfyqk2"; depends=[]; };
   timeROC = derive2 { name="timeROC"; version="0.3"; sha256="0xl6gpb5ayppzp08wwry4i051rm40lzfx43jw2yn3jy2p3nrcakb"; depends=[mvtnorm pec]; };
   timeSeq = derive2 { name="timeSeq"; version="1.0.1"; sha256="054r5lnvl3wj92sx78qwh0mgrcncwqn94ph941knjwnbds4g2arj"; depends=[doParallel edgeR foreach gss lattice pheatmap reshape]; };
-  timeSeries = derive2 { name="timeSeries"; version="3022.101"; sha256="1xmlm52c5pz1cwfdjmzyqh0hhd6d77633qrrsywsr1pc51ss7yn0"; depends=[timeDate]; };
+  timeSeries = derive2 { name="timeSeries"; version="3022.101.2"; sha256="0yr5j8w6p0k05g76hjhkrbx3vb166p5916grigc1yag6baj6nsij"; depends=[timeDate]; };
   timedelay = derive2 { name="timedelay"; version="1.0.0"; sha256="0wqcc8kzgvn6bn7kclb3wnaibycg5hpcji9g1a66pj14fwdabny3"; depends=[]; };
   timeit = derive2 { name="timeit"; version="0.2.1"; sha256="0fsa67jyk4yizyd079265jg6fvjsifkb60y3fkkxsqm7ffqi6568"; depends=[microbenchmark]; };
   timeline = derive2 { name="timeline"; version="0.9"; sha256="0zkanz3ac6cgsfl80sydgwnjrj9rm7pcfph7wzl3xkh4k0inyjq3"; depends=[ggplot2]; };
@@ -7198,7 +7393,7 @@ in with self; {
   tm_plugin_lexisnexis = derive2 { name="tm.plugin.lexisnexis"; version="1.2"; sha256="0cjw705czzzhd8ybfxkrv0f9kvmv9pcswisc7n9hkx8lxi942h19"; depends=[ISOcodes NLP tm XML]; };
   tm_plugin_mail = derive2 { name="tm.plugin.mail"; version="0.1"; sha256="0ca2w2p5zv3qr4zi0cj3lfz36g6xkgkbck8pdxq5k65kqi5ndzyp"; depends=[NLP tm]; };
   tm_plugin_webmining = derive2 { name="tm.plugin.webmining"; version="1.3"; sha256="1694jidf01ilyk286q43bjchh1gg2fk33a2cwsf5jxv7jky3gl7h"; depends=[boilerpipeR NLP RCurl RJSONIO tm XML]; };
-  tmap = derive2 { name="tmap"; version="1.0"; sha256="1807zh2yjgcpjrl1g83ahby7857l7hd5k9shrb1v6vkv6x5rrrkm"; depends=[classInt gridBase raster RColorBrewer rgdal rgeos sp]; };
+  tmap = derive2 { name="tmap"; version="1.2"; sha256="1qcm1lsyf63q1qdwxc9ki6wp509b4vqks3f8y6k4i5f8a2lzqs8f"; depends=[classInt gridBase gridSVG htmlwidgets KernSmooth osmar raster RColorBrewer rgdal rgeos sp spdep svgPanZoom XML]; };
   tmg = derive2 { name="tmg"; version="0.3"; sha256="0yqavibinzsdh85izzsx8b3bb9l36vzkp5a3bdwdbh410s62j68a"; depends=[Rcpp RcppEigen]; };
   tmle = derive2 { name="tmle"; version="1.2.0-4"; sha256="11hjp2vak1zv73326yzzv99wg8a2xyvfgvbyvx3jfxkgk33mybbm"; depends=[SuperLearner]; };
   tmle_npvi = derive2 { name="tmle.npvi"; version="0.10.0"; sha256="00jav1ql3lv18wh9msxnjvz36z2ds44fdi6lrp1pfphh1in4vdcl"; depends=[geometry MASS Matrix R_methodsS3 R_oo R_utils]; };
@@ -7206,12 +7401,12 @@ in with self; {
   tmod = derive2 { name="tmod"; version="0.19"; sha256="0wnj2dfp3jjvr8xl43kw86b3xgqd1662zjagzb9ayznx5vi2k5zb"; depends=[beeswarm pca3d tagcloud XML]; };
   tmvnsim = derive2 { name="tmvnsim"; version="1.0-1"; sha256="1zl1adx5klhg33j87kx8hqvn7mdyfqi12xxljf29abdqmr4pkp95"; depends=[]; };
   tmvtnorm = derive2 { name="tmvtnorm"; version="1.4-10"; sha256="1w3kmpx25l7rb80vpclqq4pbbv12qgysyqxjq3lp55l9nklkb7qs"; depends=[gmm Matrix mvtnorm]; };
-  tnam = derive2 { name="tnam"; version="1.5.3"; sha256="1h3g259s68dpiszikr5jr3gf6a2mcrmcxhq6qibs7y4wcx625vyx"; depends=[igraph lme4 network Rcpp sna vegan xergm_common]; };
+  tnam = derive2 { name="tnam"; version="1.6"; sha256="138jn4qdhk1c0mk43b8n5rr2zb20svli82kj1vkl75gxri0d5i26"; depends=[igraph lme4 network Rcpp sna vegan xergm_common]; };
   tnet = derive2 { name="tnet"; version="3.0.14"; sha256="05cc6jrkjbwxzmgzq30h63xzhlgq8f0l3wx2q54vrv0wpvlvfphn"; depends=[igraph survival]; };
   toOrdinal = derive2 { name="toOrdinal"; version="0.0-4"; sha256="0vvdz9l4sl7nlq6y93c65gbwssisrp3a9sp021g2l0rli00zq9q1"; depends=[]; };
-  toaster = derive2 { name="toaster"; version="0.3.1"; sha256="1sqhddk1rz72kj8cmrpj8f487yqv0c65cvbns0jz1nhw4dxh9nr5"; depends=[foreach ggmap ggplot2 memoise plyr RColorBrewer reshape2 RODBC scales slam wordcloud]; };
+  toaster = derive2 { name="toaster"; version="0.4.1"; sha256="0xldmkb780fwmq9si98ppcalygj1nrvfhvbrlb3fmnr0wgf5flsr"; depends=[foreach GGally ggmap ggplot2 ggthemes memoise plyr RColorBrewer reshape2 RODBC scales slam wordcloud]; };
   tolBasis = derive2 { name="tolBasis"; version="1.0"; sha256="0g4jdwklx92dffrz38kpm1sjzmvhdqzv6mj6hslsjii6sawiyibh"; depends=[lubridate polynom]; };
-  tolerance = derive2 { name="tolerance"; version="1.1.0"; sha256="1mrgvrdlawrmbz8bhq9cxqgn4fxvn18f1gjf9f9s8fvfnc4nda96"; depends=[rgl]; };
+  tolerance = derive2 { name="tolerance"; version="1.1.1"; sha256="1amy2lfgwqnjnm7swarbb33wnn239j2p8zqlgairf54ps68z0f64"; depends=[rgl]; };
   topicmodels = derive2 { name="topicmodels"; version="0.2-2"; sha256="1nk3jgibs881isaadawyc377f4491af97jaqywc0z905wkzi008r"; depends=[modeltools slam tm]; };
   topmodel = derive2 { name="topmodel"; version="0.7.2-2"; sha256="1nqa8fnpxcn373v6qcd9ma8qzcqwl2md347yql3c8bpqlm9ggz16"; depends=[]; };
   topologyGSA = derive2 { name="topologyGSA"; version="1.4.5"; sha256="1v6plj7v0i5fr6khl0ls34xc0hfd61cpabqpw5s1z3mqmqnma56a"; depends=[fields graph gRbase qpgraph]; };
@@ -7240,8 +7435,8 @@ in with self; {
   tree = derive2 { name="tree"; version="1.0-36"; sha256="0kqsmjw77p7n2awnlbnwny65rmmwb6z37x9rv1k4iqvvf8xbphg1"; depends=[]; };
   treeClust = derive2 { name="treeClust"; version="1.1-1"; sha256="06293w4r1h845jqzdqfnh7w5nsvyz4d0h6nn0w2aj4addj3sbp9y"; depends=[cluster rpart]; };
   treebase = derive2 { name="treebase"; version="0.1.2"; sha256="0rn47gd1kggwwgzxqkjq364l1dcnw8ilqzmnr2cnkyzlx1afk5f3"; depends=[ape RCurl XML]; };
-  treeclim = derive2 { name="treeclim"; version="1.0.11"; sha256="09i7zxwdrbfgridxsm20r554nyvwp40ngc47isy16a7f1q3rwjah"; depends=[abind boot ggplot2 lmodel2 lmtest np plyr Rcpp RcppArmadillo]; };
-  treecm = derive2 { name="treecm"; version="1.2.1"; sha256="02al6iz25pay7y1qmbpy04nw8dj9c5r7km6q5k3v3jdkfal6cm6k"; depends=[plyr]; };
+  treeclim = derive2 { name="treeclim"; version="1.0.13"; sha256="074mx9jf5zm62l9n5ibrh644p7vh8qhz25sg78dbk89m2nkdk85d"; depends=[abind boot ggplot2 lmodel2 lmtest np plyr Rcpp RcppArmadillo]; };
+  treecm = derive2 { name="treecm"; version="1.2.2"; sha256="0vrawg4vvy270dn20gb2k99xi4q89l4mjz0mm7ikpz8wxqypzq2l"; depends=[plyr]; };
   treelet = derive2 { name="treelet"; version="1.1"; sha256="0k3qhxjg7ws6jfhcvvv9jmy26v2wzi4ghnxnwpjm8nh7b90lbysd"; depends=[]; };
   treemap = derive2 { name="treemap"; version="2.4"; sha256="097w7zn1dkv0whs2hsysvk7c05aj1a862sxnpk8ackdi2rmdj4xa"; depends=[colorspace data_table ggplot2 gridBase igraph RColorBrewer shiny]; };
   treeperm = derive2 { name="treeperm"; version="1.6"; sha256="0mz7p9khrsq4dbkijymfvlwr01y4fvs0x6si4x5xid16s2zsnmm4"; depends=[]; };
@@ -7267,6 +7462,7 @@ in with self; {
   truncreg = derive2 { name="truncreg"; version="0.2-1"; sha256="0qvdfj93phk1s2p4n0rmpf8x9gj5n1j75h4z424mrg10r24699rd"; depends=[maxLik]; };
   trust = derive2 { name="trust"; version="0.1-7"; sha256="013gmiqb6frzsl6fsb5pqfdapwdxas0llg954hlcvgki9al5mlg3"; depends=[]; };
   trustOptim = derive2 { name="trustOptim"; version="0.8.5"; sha256="1y9krw2z5skkwgfdjagl8l04l9sbiqbk1fbxp30wrf4qj3pba5w6"; depends=[Matrix Rcpp RcppEigen]; };
+  tsBSS = derive2 { name="tsBSS"; version="0.1"; sha256="1r2hcfki53kvngm1vp209z1aqp082a98jr42bzvxgix62wmh2cfj"; depends=[JADE Rcpp RcppArmadillo]; };
   tsDyn = derive2 { name="tsDyn"; version="0.9-43"; sha256="0fhqfwhac1ac1vakwll41m54l88b1c5y34hln5i1y2ngvhy277l1"; depends=[foreach forecast MASS Matrix mgcv mnormt nnet tseries tseriesChaos urca vars]; };
   tsModel = derive2 { name="tsModel"; version="0.6"; sha256="0mkmhzj4g38ngzfcfx0zsiqpxs2qpw82kgmm1b8gl671s4rz00zs"; depends=[]; };
   tsPI = derive2 { name="tsPI"; version="1.0.0"; sha256="0q6ym2glr7n7kf6ghgs41g9gg5mlsfd9cf8dca4bhmw20bbdsc0z"; depends=[KFAS]; };
@@ -7301,7 +7497,7 @@ in with self; {
   tvm = derive2 { name="tvm"; version="0.3.0"; sha256="1iv0qrks1zdiq8jaqr1h46snq8wc3g3q017hxc8zc6fqnsz1whf6"; depends=[ggplot2 reshape2]; };
   twang = derive2 { name="twang"; version="1.4-9.3"; sha256="06lgawzq3b2jg84rvg24582ndlk8qji4gcbvxz5acf302cvdnmji"; depends=[gbm lattice latticeExtra survey xtable]; };
   tweedie = derive2 { name="tweedie"; version="2.2.1"; sha256="1fsi0qf901bvvwa8bb6qvp90fkx1svzswljlvw4zirdavy65w0iq"; depends=[]; };
-  tweet2r = derive2 { name="tweet2r"; version="0.2"; sha256="0k3hcgs9z3wlnnd3ncssmrp2fmjlwn5wmxr4a5v80h4hqyydb6il"; depends=[rgdal ROAuth RPostgreSQL streamR]; };
+  tweet2r = derive2 { name="tweet2r"; version="0.3"; sha256="0vrgbkdjp19q53m34spvzkahk0123wx8wfqj84vz9b7qwjj9hvc8"; depends=[ggmap ggplot2 plyr rgdal ROAuth RPostgreSQL RSQLite sp streamR]; };
   twiddler = derive2 { name="twiddler"; version="0.5-0"; sha256="0r16nfk2afcw7w0j0n3g0sjs07dnafrp88abwcqg3jyvldp3kxnx"; depends=[]; };
   twitteR = derive2 { name="twitteR"; version="1.1.9"; sha256="1hh055aqb8iddk9bdqw82r3df9rwjqsg5a0d2i0rs1bry8z4kzbr"; depends=[bit64 DBI httr rjson]; };
   twoStageGwasPower = derive2 { name="twoStageGwasPower"; version="0.99.0"; sha256="1xvy6v444v47i29aw54y29xiizkmryv8p3mjha93xr3xq9bx2mq7"; depends=[]; };
@@ -7312,16 +7508,17 @@ in with self; {
   udunits2 = derive2 { name="udunits2"; version="0.8.1"; sha256="0nind45v0ispwz0fgksw64w4y5y6za0r3cx07j02zwg911n32r7c"; depends=[]; };
   ukgasapi = derive2 { name="ukgasapi"; version="0.13"; sha256="0bnblha96ldbxj0nqhcj26d1dk2xm6nkjqqval1jlc2pki20mr9n"; depends=[RCurl XML]; };
   ump = derive2 { name="ump"; version="0.5-6"; sha256="1nd6miz9scc6llckafl73pxiqh0ycfhlsmn2l0swcvjxpj3kb0zv"; depends=[]; };
-  umx = derive2 { name="umx"; version="1.0.0"; sha256="0hs3baf4ri8m4xdkpjy0bq4bb6kjadn78qr2r5dhrcwp36gdd3z8"; depends=[formula_tools MASS Matrix mvtnorm numDeriv OpenMx polycor R2HTML RCurl]; };
+  umx = derive2 { name="umx"; version="1.1.0"; sha256="0dz80260m75in3cz50sqhhsm54k3d36aghsgyd3f93i9gxbgnwy5"; depends=[formula_tools MASS Matrix mvtnorm numDeriv OpenMx polycor R2HTML RCurl]; };
   unbalanced = derive2 { name="unbalanced"; version="2.0"; sha256="18hy9nnq42s1viij0a5i9wzrrfmmbf7y3yzjzymz2wnrx4f2pqwv"; depends=[doParallel FNN foreach mlr RANN]; };
   unbalhaar = derive2 { name="unbalhaar"; version="2.0"; sha256="0v6bkin1cakwl9lmv49s0jnccl9d6vdslbi1a7kfvmr5dgy760hs"; depends=[]; };
   unfoldr = derive2 { name="unfoldr"; version="0.3"; sha256="1zc2a4c228lhflsiypn8z6yn3fl0hr3dpmpzdxfrrijzbfai9215"; depends=[]; };
   uniCox = derive2 { name="uniCox"; version="1.0"; sha256="1glgk6k8gwxk3haqaswd2gmr7a2hgwjkwk2i1qc5ya7gg8svyavv"; depends=[survival]; };
   uniReg = derive2 { name="uniReg"; version="1.0"; sha256="1xl19dqnxxibgiiny9ysll2z8j1i70qrszf4xbacq1a6z31vm840"; depends=[DoseFinding MASS mvtnorm quadprog SEL]; };
+  uniah = derive2 { name="uniah"; version="0.3"; sha256="15cc82kkli9p5nxg9yjn77ipphmsf7bw1j372svvcacv9j6f6nml"; depends=[ahaz Iso survival]; };
   uniftest = derive2 { name="uniftest"; version="1.1"; sha256="0a37m7l3lc6rznx10w9h9krnn5paim2i2wvw47ckwag7bv0d4pm4"; depends=[orthopolynom]; };
   uniqtag = derive2 { name="uniqtag"; version="1.0"; sha256="025q71mzdv3n1jw1fa37bbw8116msnfzcia01p1864si04ch5358"; depends=[]; };
   uniqueAtomMat = derive2 { name="uniqueAtomMat"; version="0.1-0"; sha256="0fizkxxppq00ngqvag4zbk6x7jpv6blgjr3w4p5iqc5p615z2yrb"; depends=[]; };
-  unitedR = derive2 { name="unitedR"; version="0.1"; sha256="045dxm3cjc6l31nb6z0ahxdkq52jv85bg9n4qrxadvbhd7s87dsw"; depends=[plyr]; };
+  unitedR = derive2 { name="unitedR"; version="0.2"; sha256="0glcyji0cypb2687cvyra0zzlzbq0md7qb60abgi0199hf51q3dj"; depends=[plyr]; };
   unittest = derive2 { name="unittest"; version="1.2-0"; sha256="1g3f36kikxrzsiyhwpl73q2si5k28drcwvvrqzsqmfyhbjb14555"; depends=[]; };
   unmarked = derive2 { name="unmarked"; version="0.11-0"; sha256="0n5cm17ns464dxd9sdma6f12x1phnvv05aiwgxsj499lk6jazf0l"; depends=[lattice plyr raster Rcpp RcppArmadillo reshape]; };
   untb = derive2 { name="untb"; version="1.7-2"; sha256="1ha0xj94sz1r325qb4sb5hla9hw1gbqr76703vk792x9696skhji"; depends=[Brobdingnag partitions polynom]; };
@@ -7341,12 +7538,13 @@ in with self; {
   uuid = derive2 { name="uuid"; version="0.1-2"; sha256="1gmisd630fc8ybg845hbg13wmm3pk3npaamrh5wqbc1nqd6p0wfx"; depends=[]; };
   vacem = derive2 { name="vacem"; version="0.1-1"; sha256="0lh32hj4g1hsa45v6pmfyj1hw0klk8gr1k451lvs4hzpkkcwkqbn"; depends=[foreach]; };
   validate = derive2 { name="validate"; version="0.1.3"; sha256="1bnxqi9af807g8y81sdgag27c206kgl1f3kmsbdaxigch61472sw"; depends=[settings yaml]; };
+  validateRS = derive2 { name="validateRS"; version="1.0.0"; sha256="1ivw9ddr6z2wrsqvhbn87p5pikhkxlz8p45pb5nq13dvs359vkww"; depends=[data_table reshape2 triangle truncnorm]; };
   valottery = derive2 { name="valottery"; version="0.0.1"; sha256="0rlv8agm9ng4jcb9ixqifh7kjczvkx7047brq8yf9kg7rb8mzgpz"; depends=[]; };
   varComp = derive2 { name="varComp"; version="0.1-360"; sha256="18xazjx102j6v1jgswxjdqjb0hq6hd646yhwb7bcplqyls9hzha0"; depends=[CompQuadForm MASS Matrix mvtnorm nlme quadprog RLRsim SPA3G]; };
   varSelRF = derive2 { name="varSelRF"; version="0.7-5"; sha256="1800d9vvkqpxjvmiqdr610hw7ji79j0wsbl823s097dndmv51axk"; depends=[randomForest]; };
   varbvs = derive2 { name="varbvs"; version="1.0"; sha256="0ywgb6ibijffjjzqqb5lvh1lk5qznwwiq7kbsyzkwcxbp8xkabjw"; depends=[]; };
   vardiag = derive2 { name="vardiag"; version="0.2-1"; sha256="07i0wv84sw035bpjil3cfw69fdgbcf2j8wq4k22narkrz83iyi2z"; depends=[]; };
-  vardpoor = derive2 { name="vardpoor"; version="0.4.6"; sha256="1hsd2sc92l7a5xl0zvwzpb5mf56rkvkwyvxfxqgpk5gpnn857xx5"; depends=[data_table foreach gdata laeken MASS plyr stringr]; };
+  vardpoor = derive2 { name="vardpoor"; version="0.4.8"; sha256="166dh61wvrk0hiki38y6vifgr03x5gjiijbmnhd68mcgqavcs9cx"; depends=[data_table foreach gdata laeken MASS plyr stringr]; };
   varhandle = derive2 { name="varhandle"; version="1.0.0"; sha256="1bpnzgx7gz95pgn13w7z5gq2lyhm549mc5697kx0625hpk13gddj"; depends=[]; };
   varian = derive2 { name="varian"; version="0.2.1"; sha256="1rk8pmqkbsvjsfz704dawvqrqxdvbnql8sjwv0z38f9kgwvqh5p7"; depends=[Formula ggplot2 gridExtra MASS rstan]; };
   vars = derive2 { name="vars"; version="1.5-2"; sha256="1q45z5b07ww4nafrvjl48z0w1zpck3cd8fssgwgh4pw84id3dyjh"; depends=[lmtest MASS sandwich strucchange urca]; };
@@ -7354,10 +7552,10 @@ in with self; {
   vbdm = derive2 { name="vbdm"; version="0.0.4"; sha256="1rbff0whhbfcf6q5wpr3ws1n4n2kcr79yifcni12vxg69a3v6dd3"; depends=[]; };
   vbsr = derive2 { name="vbsr"; version="0.0.5"; sha256="1avskbxxyinjjdga4rnghcfvd4sypv4m39ysfaij5avvmi89bx3b"; depends=[]; };
   vcd = derive2 { name="vcd"; version="1.4-1"; sha256="1529q8gysqzpgphsnqdwqqr630i4k1kr0zdbmxqq5wpy5r97fk5g"; depends=[colorspace lmtest MASS]; };
-  vcdExtra = derive2 { name="vcdExtra"; version="0.6-11"; sha256="1p8jxamfikmp5gccli930z6yr29v3l4rwjclpcjir9mh06sjgyjd"; depends=[gnm MASS vcd]; };
+  vcdExtra = derive2 { name="vcdExtra"; version="0.6-12"; sha256="0j4zlalbhf31ybyxyby2551xdfndxshwm8n8d35rgz47rjj86fyi"; depends=[gnm MASS vcd]; };
   vcrpart = derive2 { name="vcrpart"; version="0.3-3"; sha256="0rnf9cwynfwr956hwj4kxqiqq3cdw4wf5ia73s7adxixh5kpqxqa"; depends=[nlme numDeriv partykit rpart sandwich strucchange ucminf zoo]; };
   vdg = derive2 { name="vdg"; version="1.1.2"; sha256="1kifcsy5kp4casxa49hghlff1cqfz8syql6pfg9d5214h1hnha04"; depends=[ggplot2 gridExtra proxy quantreg]; };
-  vdmR = derive2 { name="vdmR"; version="0.2.0"; sha256="1qdax3cz0wkww3lh1g3rh4p8gxs2bpsa9rzdkkqj464bf3k80r28"; depends=[dplyr GGally ggplot2 gridSVG maptools plyr rjson Rook]; };
+  vdmR = derive2 { name="vdmR"; version="0.2.1"; sha256="10b1nh26r8x01v1m823issz9ihbphaa1sv12vj0yv82vs0vr808k"; depends=[broom dplyr GGally ggplot2 gridSVG maptools plyr rjson Rook]; };
   vec2dtransf = derive2 { name="vec2dtransf"; version="1.1"; sha256="029xynay9f9rn0syphh2rhd3szv50ib4r0h0xfhhvbbb37h5dc9s"; depends=[sp]; };
   vecsets = derive2 { name="vecsets"; version="1.1"; sha256="0k27g3frc9y9z2qlm19kfpls6wl0422dilhdlk6096f1fp3mc6ij"; depends=[]; };
   vegan = derive2 { name="vegan"; version="2.3-2"; sha256="1b29hbfac736yl53n04ran8ygd6l49vvpd6800wxsq8qpvp18nn6"; depends=[cluster lattice MASS mgcv permute]; };
@@ -7375,13 +7573,14 @@ in with self; {
   vioplot = derive2 { name="vioplot"; version="0.2"; sha256="16wkb26kv6qr34hv5zgqmgq6zzgysg9i78pvy2c097lr60v087v0"; depends=[sm]; };
   viopoints = derive2 { name="viopoints"; version="0.2-1"; sha256="0cpbkkzm1rxch8gnvlmmzy8g521f5ang3nhlcnin419gha0w6avf"; depends=[]; };
   vipor = derive2 { name="vipor"; version="0.3.2"; sha256="12c4f2f5h6na24dra4sj3p8jssswnx6mx60a9ir8mh584npqjhmp"; depends=[]; };
-  viridis = derive2 { name="viridis"; version="0.3.1"; sha256="0zz9i874s1fwhl9bcbiprlzaz7zsy1rj6c729zn3k525d63qbnj7"; depends=[ggplot2 gridExtra]; };
-  viridisLite = derive2 { name="viridisLite"; version="0.1"; sha256="03rpvfm1aykgpyxipv5wbrvpnkl8pqh8h2kkynkzfyv3jjqaq40q"; depends=[]; };
+  viridis = derive2 { name="viridis"; version="0.3.2"; sha256="06hfifi0waz21nndgvwsczn1vk4kvvis05hs382clycyl9qcfxf7"; depends=[ggplot2 gridExtra]; };
+  viridisLite = derive2 { name="viridisLite"; version="0.1.1"; sha256="0cgkp20la0g3qxs716fi2k4ir6awqw0h9mh89s0j4v80za9qcip7"; depends=[]; };
   virtualspecies = derive2 { name="virtualspecies"; version="1.1"; sha256="0znrb6xqyzddd1r999rhx6ix6wgpj1laf5bcns7zgmq6zb39j74s"; depends=[ade4 dismo raster rworldmap]; };
-  visNetwork = derive2 { name="visNetwork"; version="0.1.2"; sha256="1w6jp8why9h263bbqqd4bqz426w2dj6m940bijgr95f0f51m73a9"; depends=[htmltools htmlwidgets jsonlite magrittr]; };
+  visNetwork = derive2 { name="visNetwork"; version="0.2.0"; sha256="0id6j05ddx0jhsc46dzlpdz0zfjwfpfcxhlb3gixivls7c9vibnv"; depends=[htmltools htmlwidgets jsonlite magrittr]; };
   visreg = derive2 { name="visreg"; version="2.2-0"; sha256="1hnyrfgyk5fign5l35aql2q7q4mmw3jby5pkv696h8k1mc8qq096"; depends=[lattice]; };
   visualFields = derive2 { name="visualFields"; version="0.4.2"; sha256="14plg94g4znl8n6798na2rivjjamjgayqkk1qwn1nx5df040l4q5"; depends=[flip gridBase Hmisc matrixStats]; };
   visualize = derive2 { name="visualize"; version="4.2"; sha256="1jgk7j0f3p72wbqnmplrgpy7hlh7k2cmvx83gr2zfnbhygdi22mk"; depends=[]; };
+  vita = derive2 { name="vita"; version="1.0.0"; sha256="114p2lzcr8rn68f0z4kmjdnragqlmi18axda9ma4sbqh8mrmjs9v"; depends=[randomForest Rcpp]; };
   vitality = derive2 { name="vitality"; version="1.1"; sha256="048i6ralh3gbh3hqkdxj3sdkxp1nrjbp3jpwrva4sa8d69vwxla5"; depends=[IMIS]; };
   vmsbase = derive2 { name="vmsbase"; version="2.1"; sha256="0fz4hv08w7bpg906624d5gasd6cnqdsx9pp4194xqvsiygzl4zc4"; depends=[AMORE cairoDevice chron cluster DBI ecodist fields foreign ggmap ggplot2 gmt gsubfn gWidgets gWidgetsRGtk2 intervals mapdata maps maptools marmap outliers PBSmapping plotrix R6 RSQLite sp sqldf VennDiagram]; };
   vowels = derive2 { name="vowels"; version="1.2-1"; sha256="0177xysb5y8jzpxn9wdygq2f74gys67g29cd12zw77vlq3c3kkbr"; depends=[]; };
@@ -7396,11 +7595,12 @@ in with self; {
   wPerm = derive2 { name="wPerm"; version="1.0.1"; sha256="0f3v0kba87wkwyii0pzvs6a8ja897aifpvwkvryl2hzxxxaml7z4"; depends=[]; };
   wSVM = derive2 { name="wSVM"; version="0.1-7"; sha256="0c7rblzgagwfb8mmddkc0nd0f9rv6kapw8znpwapv3fv0j2qzq7h"; depends=[MASS quadprog]; };
   waffect = derive2 { name="waffect"; version="1.2"; sha256="0r5dvm0ggyxyv81hxdr1an658wkqkhqq2xaqzqpnh4sh4wbak35a"; depends=[Rcpp]; };
-  waffle = derive2 { name="waffle"; version="0.3.1"; sha256="0z6snwf29n1p1i4zc3hx95yq388jgw8v3mcmjhsa2w95zsz9dxr0"; depends=[ggplot2 gridExtra gtable RColorBrewer]; };
+  waffle = derive2 { name="waffle"; version="0.5.0"; sha256="0f5gw487vjpaa9rl6x9p1qxvp9rn4s8p4x58y5azalya6v4hyw6y"; depends=[extrafont ggplot2 gridExtra gtable RColorBrewer]; };
   wahc = derive2 { name="wahc"; version="1.0"; sha256="1324xhajgmxq6dxzpnkcvxdpm2m3g47drhyb2b3h227cn3aakxyg"; depends=[]; };
+  wakefield = derive2 { name="wakefield"; version="0.2.0"; sha256="0pjc0j6hghld3izl6i8q5iylly3wcvmdl9qmg5kjig7751ky7xp4"; depends=[chron dplyr ggplot2 stringi]; };
   walkr = derive2 { name="walkr"; version="0.3.3"; sha256="0gyfhpar667ni5g8g0fwq4zgia3xkf5k9knhgvycq8jf554yxyl6"; depends=[ggplot2 hitandrun limSolve MASS Rcpp RcppEigen shinystan]; };
   walkscoreAPI = derive2 { name="walkscoreAPI"; version="1.2"; sha256="1c2gfkl5yl3mkviah8s8zjnqk6lnzma1yilxgfxckdh5wywi39fx"; depends=[]; };
-  warbleR = derive2 { name="warbleR"; version="1.0.3"; sha256="1qqzqhmi0azh70z9sd2vml2sqx0rg91gfsyjylg2q1zcjihlf4vk"; depends=[fftw maps pbapply RCurl rjson seewave tuneR]; };
+  warbleR = derive2 { name="warbleR"; version="1.1.0"; sha256="1zzv9s6i1884j2iybn5bwlyrnzw4ry1s9mvcpq10608nv6bg68pb"; depends=[fftw maps pbapply RCurl rjson seewave tuneR]; };
   wasim = derive2 { name="wasim"; version="1.1.2"; sha256="1zydzw7cihhdwv0474fnc4lgaq5fwrv8jinz79vkbidbgcy7i2fd"; depends=[fast MASS qualV tiger]; };
   water = derive2 { name="water"; version="0.3"; sha256="1f75564l6ai69541rcdmbhq7zp1fnprif09k7fvbzapi7hy4aia3"; depends=[raster rgdal sp]; };
   waterData = derive2 { name="waterData"; version="1.0.4"; sha256="0wk49f079jfbjncyirdvq50wswf9g361iivshjfhyndv83gbqrzk"; depends=[lattice latticeExtra XML]; };
@@ -7414,8 +7614,10 @@ in with self; {
   wbsts = derive2 { name="wbsts"; version="0.3"; sha256="1h749j20q30lrn3b4ffcap3mvxjpih1gchvv8yag0gbzcs0wc1fm"; depends=[mvtnorm wmtsa]; };
   wccsom = derive2 { name="wccsom"; version="1.2.11"; sha256="0f2p7sllp3916lcf02k179pnl17fdmk8s7bjnkwb93kh513rs1yj"; depends=[class kohonen MASS]; };
   weatherData = derive2 { name="weatherData"; version="0.4.1"; sha256="19ynb9w52ay15awaf4bqm9lj2w6pk70lyaipn46jrspwxqsvfhlc"; depends=[plyr]; };
+  weathermetrics = derive2 { name="weathermetrics"; version="1.2.0"; sha256="1zhcgpr9r5bhg88mk13k5bskm2q4kw88dh3gphlha5j6yf2zsq6r"; depends=[]; };
   weatherr = derive2 { name="weatherr"; version="0.1.2"; sha256="11sb5bmqccqkvlabsw4siy9n6ivsrvxavywvaffgrs3blmnygql9"; depends=[ggmap lubridate RJSONIO XML]; };
-  webchem = derive2 { name="webchem"; version="0.0.3.1"; sha256="0cpi12qr7qwlw95wbhwlx6xwbi4d3zk2dd2iavf8csz6kyrvdpyw"; depends=[jsonlite RCurl stringr XML]; };
+  webchem = derive2 { name="webchem"; version="0.0.4.0"; sha256="15v9b43c2c949i0clcw2z3xwmwz02sxd1wby377rzmmqans2bp9s"; depends=[httr jsonlite RCurl stringr XML xml2]; };
+  webp = derive2 { name="webp"; version="0.2"; sha256="1nwb30wyff5jynn0ppmg5ybw6q2ha9smnk69fi182grm3znf85as"; depends=[]; };
   webreadr = derive2 { name="webreadr"; version="0.3.0"; sha256="1xbp1mmqabl9kdg07ysqva5rxfm59q698hm8av481hd3ggcqvv98"; depends=[Rcpp readr]; };
   webuse = derive2 { name="webuse"; version="0.1.2"; sha256="0ks3pb9ir778j9x4l0s4ly2xa1jc9syddqm65wkck52q3lrarg3l"; depends=[haven]; };
   webutils = derive2 { name="webutils"; version="0.4"; sha256="1y8xs2kyf8g4mqpxp0kwb47cidmaqs4n3ysiy7p4s35imhzi16dc"; depends=[jsonlite]; };
@@ -7438,6 +7640,7 @@ in with self; {
   wikibooks = derive2 { name="wikibooks"; version="0.2"; sha256="178lhri1b8if2j7y7l9kqgyvmkn4z0bxp5l4dmm97x3pav98c7ks"; depends=[]; };
   wikipediatrend = derive2 { name="wikipediatrend"; version="1.1.7"; sha256="0qsxgzpn3jalwc4rm3dizn7mnwwbiydlpzxkps1pq37srb97zwsn"; depends=[httr jsonlite RCurl rvest stringr xml2]; };
   wildlifeDI = derive2 { name="wildlifeDI"; version="0.2"; sha256="0z8zyrl3d73x2j32l6xqz5nwhygzy7c9sjfp6bql5acyfvn7ngjv"; depends=[adehabitatLT rgeos sp]; };
+  wildpoker = derive2 { name="wildpoker"; version="1.0"; sha256="17sr166cnvlvbm7znf822lsvaybcpm0q2nzf8c9nir968yh11kyf"; depends=[]; };
   windex = derive2 { name="windex"; version="1.0"; sha256="0ci10x6mm5i03j05fyadxa0ic0ngpyp5nsn05p9m7v1is5jhxci0"; depends=[ape geiger scatterplot3d]; };
   wingui = derive2 { name="wingui"; version="0.2"; sha256="0yf6k33qpcjzyb7ckwsxpdw3pcsja2wsf08vaca7qw27yxrbmaa3"; depends=[Rcpp]; };
   wiod = derive2 { name="wiod"; version="0.3.0"; sha256="1f151xmc6bm5d28w5123nm0hv7j1v8hay4jk5fk8pwn6yljl1pah"; depends=[decompr gvc]; };
@@ -7458,21 +7661,22 @@ in with self; {
   wpp2012 = derive2 { name="wpp2012"; version="2.2-1"; sha256="00283s4r36zzwn67fydrl7ldg6jhn14qkf47h0ifmsky95bd1n5k"; depends=[]; };
   wpp2015 = derive2 { name="wpp2015"; version="1.0-1"; sha256="1vm194b4zccg9sldsmjaf5a95zr5lrdbbg1iwby5a6w06v7g5762"; depends=[]; };
   wppExplorer = derive2 { name="wppExplorer"; version="1.7-1"; sha256="1scxvx0kl1s9yhwrynd65c73b6q3lrz9n26kxcw2zwfzb0c5i1j7"; depends=[DT ggplot2 googleVis Hmisc plyr reshape2 shiny wpp2015]; };
-  wq = derive2 { name="wq"; version="0.4.4"; sha256="1c99jr6wzalz2k7m85j6k1rmv33vrijkrrg24kjr6i08b4xgsxc5"; depends=[ggplot2 reshape2 zoo]; };
+  wq = derive2 { name="wq"; version="0.4.5"; sha256="1hlnv0cdwixpny736wfqww5iv14s5cw95jwcpy0yrx556jpvx3qm"; depends=[ggplot2 reshape2 zoo]; };
   wqs = derive2 { name="wqs"; version="0.0.1"; sha256="14qaa9g9v4nqrv897laflib3wwhflyfaf9wpllmbi5xfv9223rcg"; depends=[glm2 Rsolnp]; };
   wrassp = derive2 { name="wrassp"; version="0.1.3"; sha256="1xza4w5dgc6gda9ybmq386jnb1gkahdi6sds5dqay7pm5mjql6fl"; depends=[]; };
   write_snns = derive2 { name="write.snns"; version="0.0-4.2"; sha256="0sxg7z8rnh4lssbivkrfxldv4ivy37wkndzzndpbvq2gbvbjnp4l"; depends=[]; };
   wrspathrow = derive2 { name="wrspathrow"; version="0.1"; sha256="1xkh12aal85qhk8d0pdj2qbi6pp4jnr6zbxkhdw2zwav57ly3f4i"; depends=[raster rgdal rgeos sp wrspathrowData]; };
   wrspathrowData = derive2 { name="wrspathrowData"; version="1.0"; sha256="0a1aggcll0fmkwfg4h7rs4j5h3v1bh95dkbriwrb0bx0cikg63x3"; depends=[]; };
+  wru = derive2 { name="wru"; version="0.0-1"; sha256="1bl4fni44rapv1z1smjgg07hanhzhkiw0hrmw5g1qfzs0h7kwjk0"; depends=[]; };
   wskm = derive2 { name="wskm"; version="1.4.28"; sha256="0d9hcriakg6fxzc8wjsahc4zkyjza31mb9dv2h4xcf8298xa96i4"; depends=[clv lattice latticeExtra]; };
   wsrf = derive2 { name="wsrf"; version="1.5.29"; sha256="1lp1yv5p2c0yq8znwzwj76gri02ip3zh0vzidlzi2fz4vh3z5ck3"; depends=[Rcpp]; };
-  wtcrsk = derive2 { name="wtcrsk"; version="1.4"; sha256="0bc2iwd5gbzmci69ky5iimp7yrm8ags9dqxwba2zba1hsknplzvi"; depends=[]; };
+  wtcrsk = derive2 { name="wtcrsk"; version="1.6"; sha256="048gs469rdj85sid1gfj6yhh37w7zf9xv4fj8pd48c8ww3v7f61p"; depends=[]; };
   wux = derive2 { name="wux"; version="2.1-1"; sha256="02q9hb9vvw5bw3ficsw40zqkpiwkm9ydilzs7kpw1xw7mll3jr7x"; depends=[abind class corpcor fields gdata Hmisc ncdf reshape rgdal rgeos rworldmap sp stringr]; };
   x_ent = derive2 { name="x.ent"; version="1.1.2"; sha256="0wbbhsnlm5yln72h648nz3y5w83kq9qvpw0pk56lsc1bafps712p"; depends=[ggplot2 jsonlite opencpu rJava statmod stringr venneuler xtable]; };
   x12 = derive2 { name="x12"; version="1.6.0"; sha256="0bl50nva4ai8p24f9hr622m0fc5nmbjakn3rsvl79g050gjsd4i3"; depends=[stringr]; };
   x12GUI = derive2 { name="x12GUI"; version="0.13.0"; sha256="1mga7g9gwb3nv2qs27lz4n9rp6j3svads28hql88sxaif6is3nk1"; depends=[cairoDevice Hmisc lattice RGtk2 stringr x12]; };
   xergm = derive2 { name="xergm"; version="1.5.3"; sha256="0m12k4876zada4ibnfjvnzrdqp0ridbnrgd7fl8x3k5hvqzv2pni"; depends=[btergm tnam xergm_common]; };
-  xergm_common = derive2 { name="xergm.common"; version="1.5.4"; sha256="1hqh46vpkzgykgp53ca8vdfx9cwyjdwbbvixz2vjjbjx6dycii9s"; depends=[ergm network]; };
+  xergm_common = derive2 { name="xergm.common"; version="1.6"; sha256="0qd171gl9a8k4rs4qp0px995wv36srsypcp10fr4cmwab0wwxv4z"; depends=[ergm network]; };
   xgboost = derive2 { name="xgboost"; version="0.4-2"; sha256="1m6jv1ww0cxqg87kq412akcwimj6i7ncg7anrbfhbq2h5v53brak"; depends=[data_table magrittr Matrix stringr]; };
   xgobi = derive2 { name="xgobi"; version="1.2-15"; sha256="03ym5mm16rb1bdwrymr393r3xgprp0ign45ryym3g0x2zi8dy557"; depends=[]; };
   xhmmScripts = derive2 { name="xhmmScripts"; version="1.1"; sha256="1qryyb34jx9c64l8bnwp40b08y81agdj5w0icj8dk052x50ip1hl"; depends=[gplots plotrix]; };
@@ -7485,9 +7689,10 @@ in with self; {
   xpose4 = derive2 { name="xpose4"; version="4.5.3"; sha256="02m3ad4287ljsi4qrzwd84lfj1y6rz9nias2zk4cbqm14gf19pdf"; depends=[gam Hmisc lattice survival]; };
   xseq = derive2 { name="xseq"; version="0.2.1"; sha256="0bsakbfvkfv39q2ch2g21b17g84470sq4v73355cljlshsi6404i"; depends=[e1071 gptk impute preprocessCore RColorBrewer sfsmisc]; };
   xtable = derive2 { name="xtable"; version="1.8-0"; sha256="19l27zic0ynywdhr8z6skbl0qdlyys8bayl0dv2g5q5bliif69ak"; depends=[]; };
-  xtal = derive2 { name="xtal"; version="1.0"; sha256="1717pl64nbliwbdg5fs6cwj7zvgrm00zlyj2dhi06yyg16gq1w8k"; depends=[]; };
+  xtal = derive2 { name="xtal"; version="1.15"; sha256="1zq3vd5x3vw6acn47yd2x7kflr9sm3znmdkm68cs64ha54jbl3vs"; depends=[]; };
   xtermStyle = derive2 { name="xtermStyle"; version="3.0.5"; sha256="1q4qq8w4sgxbbb1x0i4k5xndvwisvjszg830wspwb37wigxz8xvz"; depends=[]; };
   xts = derive2 { name="xts"; version="0.9-7"; sha256="163hzcnxrdb4lbsnwwv7qa00h4qlg4jm289acgvbg4jbiywpq7zi"; depends=[zoo]; };
+  yCrypticRNAs = derive2 { name="yCrypticRNAs"; version="0.99.0"; sha256="1shg5hg60rabvjxcz12f67nzi8vr0z8g74haznf3qxx1nkj32gsg"; depends=[biomaRt data_table IRanges mclust MESS Rcpp Rsamtools]; };
   yaImpute = derive2 { name="yaImpute"; version="1.0-26"; sha256="00w127wnwnhkfkrn4764l1ap3d3njlidglk9izcxm0n4kqj0zb49"; depends=[]; };
   yacca = derive2 { name="yacca"; version="1.1"; sha256="0wg2wgvh1najmccmgzyigj11mshrdb8w4r2pqq360dracpn0ak6x"; depends=[]; };
   yakmoR = derive2 { name="yakmoR"; version="0.1.1"; sha256="09aklz79s0911p2wnpd7gc6vrbr9lmiskhkahsc63pdigggmq9f7"; depends=[BBmisc checkmate Rcpp]; };
@@ -7497,7 +7702,7 @@ in with self; {
   yhatr = derive2 { name="yhatr"; version="0.13.7"; sha256="1n4n8v8qz3isvg8g1cwh0xz83g65n01x9pwzbxzvqidw5ip4ybb0"; depends=[httr jsonlite plyr RCurl rjson stringr]; };
   ykmeans = derive2 { name="ykmeans"; version="1.0"; sha256="0xfji2fmslvc059kk3rwkv575ffzl787sa9d4vw5hxnsmkn8lq50"; depends=[foreach plyr]; };
   yuima = derive2 { name="yuima"; version="1.0.77"; sha256="1jds6l33sjnf4yhhl8rig0pzsn7cwrv9pmxqs34l9sildppjmn61"; depends=[cubature expm mvtnorm zoo]; };
-  yummlyr = derive2 { name="yummlyr"; version="0.1.0"; sha256="1491555089yl5bq25ggqq3m4jbfrn7qbmk3i80mr5d5kq1kbbpys"; depends=[httr jsonlite]; };
+  yummlyr = derive2 { name="yummlyr"; version="0.1.1"; sha256="0xrk6g58laksz92d8mxck923sk4j92g55szrkxk123wjp5kg9vx6"; depends=[httr jsonlite]; };
   zCompositions = derive2 { name="zCompositions"; version="1.0.3"; sha256="0lxy201ys9dvv8c09q8wbks1c2jkjyd1bbrxhjr7zi9j7m0parl7"; depends=[MASS NADA truncnorm]; };
   zendeskR = derive2 { name="zendeskR"; version="0.4"; sha256="06cjwk08w3x6dx717123psinid5bx6c563jnfn890373jw6xnfrk"; depends=[RCurl rjson]; };
   zetadiv = derive2 { name="zetadiv"; version="0.1"; sha256="1p9mxy70mgqxjn7szh44217nvhjh90237kp5znli1r01ch64mx6b"; depends=[car mgcv vegan]; };
@@ -7510,6 +7715,7 @@ in with self; {
   zooaRch = derive2 { name="zooaRch"; version="1.1"; sha256="1a4cbayw5qj9wp925g06a1djiravh7yg3w7vdxzaks5a16pwv5li"; depends=[ggplot2]; };
   zooimage = derive2 { name="zooimage"; version="3.0-5"; sha256="1r3slmyw0dyqfa40dr5xga814z09ibhmmby8p1cii5lh61xm4c39"; depends=[filehash jpeg mlearning png svDialogs svMisc]; };
   zoom = derive2 { name="zoom"; version="2.0.4"; sha256="03f5rxfr6ncf1j6vpn7pip21q7ylj4bx0a5xphqb6x6i33lxf1g5"; depends=[]; };
+  zoon = derive2 { name="zoon"; version="0.4.21"; sha256="08nsyxz6kdnb0qs0y5n0n8m7gkxf52kxkc5n59sbny0gnnr16hnh"; depends=[dismo raster RCurl rfigshare]; };
   ztable = derive2 { name="ztable"; version="0.1.5"; sha256="1jfqnqy9544gfvz3bsb48v4177nwp4b4n9l2743asq8sbq305b5r"; depends=[]; };
   zyp = derive2 { name="zyp"; version="0.10-1"; sha256="0f1fqqxysf3psnvn08s5qly2c958h1hhznjjj8mvpjr5g6hqlr1k"; depends=[Kendall]; };
 }

From 62d2a91b2b99721caf338ad05ec4e1c410380fcf Mon Sep 17 00:00:00 2001
From: Tomasz Kontusz <tomasz.kontusz@gmail.com>
Date: Sat, 19 Dec 2015 15:31:41 +0100
Subject: [PATCH 255/884] gupnp-tools: add required icons, rename from
 gupnptools

---
 pkgs/tools/networking/gupnp-tools/default.nix | 16 +++++++++++-----
 pkgs/top-level/all-packages.nix               |  3 ++-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix
index d0f2ef546691..af6eff5c31e9 100644
--- a/pkgs/tools/networking/gupnp-tools/default.nix
+++ b/pkgs/tools/networking/gupnp-tools/default.nix
@@ -1,4 +1,4 @@
-{fetchurl, stdenv, gupnp, gssdp, pkgconfig, gtk3, libuuid, intltool, gupnp_av, gnome3, makeWrapper}:
+{fetchurl, stdenv, gupnp, gssdp, pkgconfig, gtk3, libuuid, intltool, gupnp_av, gnome3, gnome2, makeWrapper}:
 
 stdenv.mkDerivation rec {
   name = "gupnp-tools-${version}";
@@ -9,11 +9,17 @@ stdenv.mkDerivation rec {
     sha256 = "160dgh9pmlb85qfavwqz46lqawpshs8514bx2b57f9rbiny8kbij";
   };
 
-  buildInputs = [gupnp libuuid gssdp pkgconfig gtk3 intltool gupnp_av 
-                 gnome3.defaultIconTheme gnome3.gnome_themes_standard makeWrapper];
+  buildInputs = [gupnp libuuid gssdp pkgconfig gtk3 intltool gupnp_av
+                 gnome2.gnome_icon_theme makeWrapper];
 
   postInstall = ''
-    wrapProgram "$out/bin/gupnp-av-cp" --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.defaultIconTheme}/share:$out/share"
-    wrapProgram "$out/bin/gupnp-universal-cp" --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.defaultIconTheme}/share:$out/share"
+    for program in gupnp-av-cp gupnp-universal-cp; do
+      wrapProgram "$out/bin/$program" \
+        --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome2.gnome_icon_theme}/share:$out/share"
+    done
   '';
+
+  meta = {
+    platforms = stdenv.lib.platforms.linux;
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 25e65c43119e..3347d99ac40d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1805,7 +1805,7 @@ let
 
   gupnp_igd = callPackage ../development/libraries/gupnp-igd {};
 
-  gupnptools = callPackage ../tools/networking/gupnp-tools {};
+  gupnp-tools = callPackage ../tools/networking/gupnp-tools {};
 
   gvpe = callPackage ../tools/networking/gvpe { };
 
@@ -15856,6 +15856,7 @@ aliases = with self; rec {
   firefoxWrapper = firefox-wrapper;
   fuse_exfat = exfat;                   # 2015-09-11
   grantlee5 = qt5.grantlee;  # added 2015-12-19
+  gupnptools = gupnp-tools;  # added 2015-12-19
   htmlTidy = html-tidy;  # added 2014-12-06
   inherit (haskell.compiler) jhc uhc;   # 2015-05-15
   inotifyTools = inotify-tools;

From 84dc27bf436d6f1524f8f6e293ea5702b3114dea Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 4 Jan 2016 09:57:31 +0100
Subject: [PATCH 256/884] pythonPackages.tqdm: fix failing test

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 71980a33e2dc..4d86b3a0b136 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19120,12 +19120,15 @@ in modules // {
     buildInputs = with self; [ nose coverage pkgs.glibcLocales flake8 ];
     propagatedBuildInputs = with self; [ matplotlib pandas ];
 
+    # Performance test fails
+    prePatch = ''
+      rm tqdm/tests/tests_perf.py
+    '';
+
     preBuild = ''
       export LC_ALL="en_US.UTF-8"
     '';
 
-    doCheck = !(isPy27); # Performance test fails
-
     meta = {
       description = "A Fast, Extensible Progress Meter";
       homepage = https://github.com/tqdm/tqdm;

From f3892a2c3eca5abc3983800ae876755e40b8151b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 4 Jan 2016 09:57:55 +0100
Subject: [PATCH 257/884] pythonPackages.decorator: 4.0.4 -> 4.0.6

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4d86b3a0b136..f8b4835af051 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3975,18 +3975,13 @@ in modules // {
 
   decorator = buildPythonPackage rec {
     name = "decorator-${version}";
-    version = "4.0.4";
+    version = "4.0.6";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/d/decorator/${name}.tar.gz";
-      sha256 = "1qf3iiv401vhsdmf4bd08fwb3fq4xq769q2yl7zqqr1iml7w3l2s";
+      sha256 = "1c6254597777fd003da2e8fb503c3dbf3d9e8f8d55f054709c0e65be3467209c";
     };
 
-    # no idea what that file is doing there (probably bad release)
-    preCheck = ''
-      rm src/tests/x.py
-    '';
-
     meta = {
       homepage = http://pypi.python.org/pypi/decorator;
       description = "Better living through Python with decorators";

From b559020e27ba07676e5bc7b2256fa5b84809bba2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 4 Jan 2016 10:31:58 +0100
Subject: [PATCH 258/884] xorgReplacements: remove this ancient cruft

---
 pkgs/servers/x11/xorg/replacements.nix | 21 ---------------------
 pkgs/top-level/all-packages.nix        |  2 --
 2 files changed, 23 deletions(-)
 delete mode 100644 pkgs/servers/x11/xorg/replacements.nix

diff --git a/pkgs/servers/x11/xorg/replacements.nix b/pkgs/servers/x11/xorg/replacements.nix
deleted file mode 100644
index 175d05b0a364..000000000000
--- a/pkgs/servers/x11/xorg/replacements.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{stdenv, fetchurl, xorg, automake, autoconf, libtool, makeOverridable}:
-{
-  xf86videoati = {src, suffix}: 
-  makeOverridable stdenv.mkDerivation {
-      name = "xf86-video-ati-${suffix}";
-      buildInputs = xorg.xf86videoati.buildInputs ++
-         [autoconf automake libtool];
-      builder = ./builder.sh;
-      inherit src;
-      preConfigure = ''
-        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DPACKAGE_VERSION_MAJOR=6"
-        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DPACKAGE_VERSION_MINOR=9"
-        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DPACKAGE_VERSION_PATCHLEVEL=999"
-
-        sed -e 's/@DRIVER_MAN_SUFFIX@/man/g' -i man/Makefile.am
-        export DRIVER_MAN_DIR=$out/share/man/man5 
-
-        ./autogen.sh
-      '';
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 25e65c43119e..d6b6ee289c0b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9626,8 +9626,6 @@ let
     libdrm = if stdenv.isLinux then libdrm else null;
   } // { inherit xlibsWrapper; } );
 
-  xorgReplacements = callPackage ../servers/x11/xorg/replacements.nix { };
-
   xorgVideoUnichrome = callPackage ../servers/x11/xorg/unichrome/default.nix { };
 
   xwayland = callPackage ../servers/x11/xorg/xwayland.nix { };

From 5bdb1c9cd19583f9f71ef7b8bbc68806596e6c8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 4 Jan 2016 11:47:40 +0100
Subject: [PATCH 259/884] libdrm: update 2.4.65 -> 2.4.66

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

diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index 533512e9b689..154277f9cc66 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev, valgrind }:
 
 stdenv.mkDerivation rec {
-  name = "libdrm-2.4.65";
+  name = "libdrm-2.4.66";
 
   src = fetchurl {
     url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
-    sha256 = "71960ac8bde7d710992b1bc8879935e8300a870c36bd06f22412d0447e3d96c4";
+    sha256 = "79cb8e988749794edfb2d777b298d5292eff353bbbb71ed813589e61d2bc2d76";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 88dff78662be7b2c19e0e948f423c57cd9d3cb06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 4 Jan 2016 11:52:51 +0100
Subject: [PATCH 260/884] xorg.libXfont2: init at 2.0.1

---
 pkgs/servers/x11/xorg/default.nix       | 10 ++++++++++
 pkgs/servers/x11/xorg/tarballs-7.7.list |  1 +
 2 files changed, 11 insertions(+)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 75feb46a7fa0..9fafac3f6d12 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -717,6 +717,16 @@ let
     buildInputs = [pkgconfig libfontenc fontsproto freetype xproto xtrans zlib ];
   }) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;};
 
+  libXfont2 = (mkDerivation "libXfont2" {
+    name = "libXfont2-2.0.1";
+    builder = ./builder.sh;
+    src = fetchurl {
+      url = mirror://xorg/individual/lib/libXfont2-2.0.1.tar.bz2;
+      sha256 = "0znvwk36nhmyqpmhbm9mzisgixp1mp5qkfald8x1n5yxbm3vpyz9";
+    };
+    buildInputs = [pkgconfig libfontenc fontsproto freetype xproto xtrans zlib ];
+  }) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;};
+
   libXft = (mkDerivation "libXft" {
     name = "libXft-2.3.2";
     builder = ./builder.sh;
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 7292c6711444..5cef579b0489 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -69,6 +69,7 @@ mirror://xorg/individual/lib/libXdmcp-1.1.2.tar.bz2
 mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2
 mirror://xorg/individual/lib/libXfixes-5.0.1.tar.bz2
 mirror://xorg/individual/lib/libXfont-1.5.1.tar.bz2
+mirror://xorg/individual/lib/libXfont2-2.0.1.tar.bz2
 mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2
 mirror://xorg/individual/lib/libXi-1.7.5.tar.bz2
 mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2

From a6812c1ca5a8fe564a8bbdb43e4f10699e631e6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 4 Jan 2016 11:54:10 +0100
Subject: [PATCH 261/884] xorg.xf86videorendition: init at 4.2.6

---
 pkgs/servers/x11/xorg/default.nix       | 10 ++++++++++
 pkgs/servers/x11/xorg/tarballs-7.7.list |  1 +
 2 files changed, 11 insertions(+)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 9fafac3f6d12..1401dfcf1684 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1747,6 +1747,16 @@ let
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ];
   }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ;};
 
+  xf86videorendition = (mkDerivation "xf86videorendition" {
+    name = "xf86-video-rendition-4.2.6";
+    builder = ./builder.sh;
+    src = fetchurl {
+      url = mirror://xorg/individual/driver/xf86-video-rendition-4.2.6.tar.bz2;
+      sha256 = "1a7rqafxzc2hd0s5pnq8s8j9d3jg64ndc0xnq4160kasyqhwy3k6";
+    };
+    buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ];
+  }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;};
+
   xf86videos3virge = (mkDerivation "xf86videos3virge" {
     name = "xf86-video-s3virge-1.10.7";
     builder = ./builder.sh;
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 5cef579b0489..02730c97284a 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -151,6 +151,7 @@ mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2
 mirror://xorg/individual/driver/xf86-video-nv-2.1.20.tar.bz2
 mirror://xorg/individual/driver/xf86-video-openchrome-0.3.3.tar.bz2
 mirror://xorg/individual/driver/xf86-video-r128-6.10.0.tar.bz2
+mirror://xorg/individual/driver/xf86-video-rendition-4.2.6.tar.bz2
 mirror://xorg/individual/driver/xf86-video-s3virge-1.10.7.tar.bz2
 mirror://xorg/individual/driver/xf86-video-savage-2.3.8.tar.bz2
 mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.8.tar.bz2

From 9714056914e7b2c0ee6ee451c00b3c6bef7e152b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 4 Jan 2016 11:57:11 +0100
Subject: [PATCH 262/884] xorg: small but mass-rebuild updates

---
 pkgs/servers/x11/xorg/default.nix       | 12 ++++++------
 pkgs/servers/x11/xorg/tarballs-7.7.list |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 1401dfcf1684..ceda4da06005 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -738,11 +738,11 @@ let
   }) // {inherit fontconfig freetype libX11 xproto libXrender ;};
 
   libXi = (mkDerivation "libXi" {
-    name = "libXi-1.7.5";
+    name = "libXi-1.7.6";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXi-1.7.5.tar.bz2;
-      sha256 = "0ad21jy40d8b2f9ldadx7lkspmvka1i9r5jqqfwxdxyqnpgdfr6r";
+      url = mirror://xorg/individual/lib/libXi-1.7.6.tar.bz2;
+      sha256 = "1b5p0l19ynmd6blnqr205wyngh6fagl35nqb4v05dw60rr9aachz";
     };
     buildInputs = [pkgconfig inputproto libX11 libXext xextproto libXfixes xproto ];
   }) // {inherit inputproto libX11 libXext xextproto libXfixes xproto ;};
@@ -2028,11 +2028,11 @@ let
   }) // {inherit inputproto libX11 libXaw xproto libXt ;};
 
   xkeyboardconfig = (mkDerivation "xkeyboardconfig" {
-    name = "xkeyboard-config-2.15";
+    name = "xkeyboard-config-2.16";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.15.tar.bz2;
-      sha256 = "1grqdy5a9f2dii3y24fn0p3kz4q5g9j2kh3jcj2402rgrbvkqi0f";
+      url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.16.tar.bz2;
+      sha256 = "0n0xinsljc5mww1qw7dfp8knv0f1r9hs6pdhl0fggdwn5hhiz2hy";
     };
     buildInputs = [pkgconfig libX11 xproto ];
   }) // {inherit libX11 xproto ;};
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 02730c97284a..09e1dbe1c279 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -71,7 +71,7 @@ mirror://xorg/individual/lib/libXfixes-5.0.1.tar.bz2
 mirror://xorg/individual/lib/libXfont-1.5.1.tar.bz2
 mirror://xorg/individual/lib/libXfont2-2.0.1.tar.bz2
 mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2
-mirror://xorg/individual/lib/libXi-1.7.5.tar.bz2
+mirror://xorg/individual/lib/libXi-1.7.6.tar.bz2
 mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2
 mirror://xorg/individual/lib/libxkbfile-1.0.9.tar.bz2
 mirror://xorg/individual/lib/libXmu-1.1.2.tar.bz2
@@ -176,7 +176,7 @@ mirror://xorg/individual/app/xinput-1.6.1.tar.bz2
 mirror://xorg/individual/app/xkbcomp-1.3.0.tar.bz2
 mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2
 mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2
-mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.15.tar.bz2
+mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.16.tar.bz2
 mirror://xorg/individual/app/xkill-1.0.4.tar.bz2
 mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2
 mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2

From cba685ba4547be4e3037be5c34b08ec73e72ef32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 4 Jan 2016 11:58:30 +0100
Subject: [PATCH 263/884] xorg.xorgcffiles: update 1.0.5 -> 1.0.6 (probably
 unused)

---
 pkgs/servers/x11/xorg/default.nix | 6 +++---
 pkgs/servers/x11/xorg/old.list    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index ceda4da06005..c0ef537ad4ad 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -2108,11 +2108,11 @@ let
   }) // {inherit libX11 xproto ;};
 
   xorgcffiles = (mkDerivation "xorgcffiles" {
-    name = "xorg-cf-files-1.0.5";
+    name = "xorg-cf-files-1.0.6";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/util/xorg-cf-files-1.0.5.tar.bz2;
-      sha256 = "1m3ypq0xcy46ghxc0svl1rbhpy3zvgmy0aa2mn7w7v7d8d8bh8zd";
+      url = mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2;
+      sha256 = "0kckng0zs1viz0nr84rdl6dswgip7ndn4pnh5nfwnviwpsfmmksd";
     };
     buildInputs = [pkgconfig ];
   }) // {inherit ;};
diff --git a/pkgs/servers/x11/xorg/old.list b/pkgs/servers/x11/xorg/old.list
index 92fed797d70f..801f6e0b7971 100644
--- a/pkgs/servers/x11/xorg/old.list
+++ b/pkgs/servers/x11/xorg/old.list
@@ -12,4 +12,4 @@ mirror://xorg/individual/proto/xf86miscproto-0.9.3.tar.bz2
 mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2
 mirror://xorg/individual/util/imake-1.0.7.tar.bz2
 mirror://xorg/individual/util/lndir-1.0.3.tar.bz2
-mirror://xorg/individual/util/xorg-cf-files-1.0.5.tar.bz2
+mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2

From 62bb0329aeebed0514602c1fb1ed241c3495a5bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 4 Jan 2016 12:00:01 +0100
Subject: [PATCH 264/884] xorg.xf86*{libinput,nouveau}: minor driver updates

---
 pkgs/servers/x11/xorg/default.nix       | 12 ++++++------
 pkgs/servers/x11/xorg/tarballs-7.7.list |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index c0ef537ad4ad..53cb30511a64 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1458,11 +1458,11 @@ let
   }) // {inherit inputproto xorgserver xproto ;};
 
   xf86inputlibinput = (mkDerivation "xf86inputlibinput" {
-    name = "xf86-input-libinput-0.15.0";
+    name = "xf86-input-libinput-0.16.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-input-libinput-0.15.0.tar.bz2;
-      sha256 = "0hcs05zx9mpyi9wajsps9qsbyq4v0c9wysp2l48qnr4l8587qw18";
+      url = mirror://xorg/individual/driver/xf86-input-libinput-0.16.0.tar.bz2;
+      sha256 = "0jbgnxsbr3g4g9vkspcc6pqy7av59zx5bb78vkvaqy8yx4qybbgx";
     };
     buildInputs = [pkgconfig inputproto xorgserver xproto ];
   }) // {inherit inputproto xorgserver xproto ;};
@@ -1698,11 +1698,11 @@ let
   }) // {inherit fontsproto randrproto renderproto videoproto xorgserver xproto ;};
 
   xf86videonouveau = (mkDerivation "xf86videonouveau" {
-    name = "xf86-video-nouveau-1.0.11";
+    name = "xf86-video-nouveau-1.0.12";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-nouveau-1.0.11.tar.bz2;
-      sha256 = "0j3847rnffy81iaxxi6vnd8saadrc9jahfmckr0sjgkzg2rf4kzq";
+      url = mirror://xorg/individual/driver/xf86-video-nouveau-1.0.12.tar.bz2;
+      sha256 = "07irv1zkk0rkyn1d7f2gn1icgcz2ix0pwv74sjian763gynmg80f";
     };
     buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
   }) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 09e1dbe1c279..99103bd556c4 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -122,7 +122,7 @@ mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2
 mirror://xorg/individual/driver/xf86-input-evdev-2.9.2.tar.bz2
 mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2
 mirror://xorg/individual/driver/xf86-input-keyboard-1.8.1.tar.bz2
-mirror://xorg/individual/driver/xf86-input-libinput-0.14.0.tar.bz2
+mirror://xorg/individual/driver/xf86-input-libinput-0.16.0.tar.bz2
 mirror://xorg/individual/driver/xf86-input-mouse-1.9.1.tar.bz2
 mirror://xorg/individual/driver/xf86-input-synaptics-1.8.2.tar.bz2
 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2
@@ -131,7 +131,7 @@ mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2
 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2
 mirror://xorg/individual/driver/xf86-video-ati-7.5.0.tar.bz2
 mirror://xorg/individual/driver/glamor-egl-0.6.0.tar.bz2
-mirror://xorg/individual/driver/xf86-video-nouveau-1.0.11.tar.bz2
+mirror://xorg/individual/driver/xf86-video-nouveau-1.0.12.tar.bz2
 mirror://xorg/individual/driver/xf86-video-chips-1.2.6.tar.bz2
 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2
 mirror://xorg/individual/driver/xf86-video-dummy-0.3.7.tar.bz2

From 16d0cd7c680b581f2356c1421454e4a7f24e9dd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 4 Jan 2016 12:01:38 +0100
Subject: [PATCH 265/884] xorg: update tarballs list

There've been some updates of default.nix without corresponding updates
in the tarball list. Re-generation then added lots of downgrade cruft.

The intel driver can't be added this way, but at least we get much closer.
---
 pkgs/servers/x11/xorg/tarballs-7.7.list | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 99103bd556c4..ddda39c76f7f 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -119,17 +119,17 @@ mirror://xorg/individual/proto/xextproto-7.3.0.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2
-mirror://xorg/individual/driver/xf86-input-evdev-2.9.2.tar.bz2
+mirror://xorg/individual/driver/xf86-input-evdev-2.10.0.tar.bz2
 mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2
 mirror://xorg/individual/driver/xf86-input-keyboard-1.8.1.tar.bz2
 mirror://xorg/individual/driver/xf86-input-libinput-0.16.0.tar.bz2
 mirror://xorg/individual/driver/xf86-input-mouse-1.9.1.tar.bz2
-mirror://xorg/individual/driver/xf86-input-synaptics-1.8.2.tar.bz2
+mirror://xorg/individual/driver/xf86-input-synaptics-1.8.3.tar.bz2
 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2
 mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2
 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2
 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2
-mirror://xorg/individual/driver/xf86-video-ati-7.5.0.tar.bz2
+mirror://xorg/individual/driver/xf86-video-ati-7.6.1.tar.bz2
 mirror://xorg/individual/driver/glamor-egl-0.6.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-nouveau-1.0.12.tar.bz2
 mirror://xorg/individual/driver/xf86-video-chips-1.2.6.tar.bz2
@@ -172,8 +172,8 @@ mirror://xorg/individual/app/xgamma-1.0.6.tar.bz2
 mirror://xorg/individual/app/xgc-1.0.5.tar.bz2
 mirror://xorg/individual/app/xhost-1.0.7.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xineramaproto-1.2.1.tar.bz2
-mirror://xorg/individual/app/xinput-1.6.1.tar.bz2
-mirror://xorg/individual/app/xkbcomp-1.3.0.tar.bz2
+mirror://xorg/individual/app/xinput-1.6.2.tar.bz2
+mirror://xorg/individual/app/xkbcomp-1.3.1.tar.bz2
 mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2
 mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2
 mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.16.tar.bz2
@@ -184,7 +184,7 @@ mirror://xorg/individual/app/xlsfonts-1.0.5.tar.bz2
 mirror://xorg/individual/app/xmag-1.0.6.tar.bz2
 mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2
 mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2
-mirror://xorg/individual/xserver/xorg-server-1.17.2.tar.bz2
+mirror://xorg/individual/xserver/xorg-server-1.17.4.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2
 mirror://xorg/individual/app/xprop-1.2.2.tar.bz2

From 6ed6d87afcfed8cb4d5eed86101a94ad9259d893 Mon Sep 17 00:00:00 2001
From: Michel Kuhlmann <michel@kuhlmanns.info>
Date: Mon, 4 Jan 2016 10:06:37 +0100
Subject: [PATCH 266/884] cmark: init at 0.23.0

---
 pkgs/development/libraries/cmark/default.nix | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/libraries/cmark/default.nix

diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/development/libraries/cmark/default.nix
new file mode 100644
index 000000000000..be60c18353ef
--- /dev/null
+++ b/pkgs/development/libraries/cmark/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, cmake }:
+
+stdenv.mkDerivation rec {
+  version = "0.23.0";
+  name = "cmark-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/jgm/cmark/archive/${version}.tar.gz";
+    sha256 = "87d289965066fce7be247d44c0304af1b20817dcc1b563702302ae33f2be0596";
+  };
+
+  buildInputs = [ cmake ];
+
+  meta = {
+    description = "CommonMark parsing and rendering library and program in C";
+    homepage = https://github.com/jgm/cmark;
+    maintainers = [ stdenv.lib.maintainers.michelk ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 25e65c43119e..9267b9fdff44 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -287,6 +287,8 @@ let
 
   buildMaven = callPackage ../build-support/build-maven.nix {};
 
+  cmark = callPackage ../development/libraries/cmark { };
+
   dotnetenv = callPackage ../build-support/dotnetenv {
     dotnetfx = dotnetfx40;
   };

From eea1e003dd6c472c560999f249bd7aa65675a890 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Mon, 4 Jan 2016 12:07:30 +0100
Subject: [PATCH 267/884] libreoffice: adding polish language

---
 pkgs/applications/office/libreoffice/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 8a2f8a37f068..30a4a47896ab 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -12,7 +12,7 @@
 , libatomic_ops, graphite2, harfbuzz, libodfgen
 , librevenge, libe-book, libmwaw, glm, glew, gst_all_1
 , gdb, commonsLogging
-, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" ]
+, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" ]
 , withHelp ? true
 }:
 

From b5bbbd0fe3b7a2791be5891553dfaf5fc4188f0a Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Mon, 4 Jan 2016 14:23:56 +0300
Subject: [PATCH 268/884] f2fs-tools: 1.4.1 -> 1.5.0

---
 pkgs/tools/filesystems/f2fs-tools/default.nix | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/pkgs/tools/filesystems/f2fs-tools/default.nix
index 073dc585e74d..36ffce9cdfe8 100644
--- a/pkgs/tools/filesystems/f2fs-tools/default.nix
+++ b/pkgs/tools/filesystems/f2fs-tools/default.nix
@@ -1,21 +1,16 @@
-{ stdenv, fetchgit, autoconf, automake, libtool, pkgconfig, libuuid }:
+{ stdenv, fetchurl, autoreconfHook, libuuid }:
 
 stdenv.mkDerivation rec {
   name = "f2fs-tools-${version}";
-  version = "1.4.1";
+  version = "1.5.0";
 
-  src = fetchgit {
-    url = git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git;
-    rev = "refs/tags/v${version}";
-    sha256 = "16i74r2656q6x4gg5kgjy2fxipr5czbm10r66s34pi2lfczbwhjr";
+  src = fetchurl {
+    url = "http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/${name}.tar.gz";
+    sha256 = "1pdgl78xkagxlmavy6x118wjzz8yvl8n08fc1m6wah9bf93qlhdf";
   };
 
-  buildInputs = [ autoconf automake libtool pkgconfig libuuid ];
-
-  preConfigure = ''
-    sed -i '/AC_SUBST/d' configure.ac
-    autoreconf --install
-  '';
+  nativeBuildInputs = [ autoreconfHook ];
+  buildInputs = [ libuuid ];
 
   meta = with stdenv.lib; {
     homepage = "http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/";

From 387b38e10b846fd5a35adc00aec7e79e697e56cf Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <jagajaga@users.noreply.github.com>
Date: Mon, 4 Jan 2016 14:39:34 +0300
Subject: [PATCH 269/884] Revert "rkt: align stage1 information with upstream
 source"

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

diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix
index 801f658d0380..eb2a5d737a3e 100644
--- a/pkgs/applications/virtualization/rkt/default.nix
+++ b/pkgs/applications/virtualization/rkt/default.nix
@@ -2,11 +2,11 @@
 , fetchurl, fetchFromGitHub }:
 
 let
-  coreosImageRelease = "794.1.0";
-  coreosImageSystemdVersion = "222";
+  coreosImageRelease = "835.9.0";
+  coreosImageSystemdVersion = "225";
 
   # TODO: track https://github.com/coreos/rkt/issues/1758 to allow "host" flavor.
-  stage1Flavours = [ "coreos" "fly" ];
+  stage1Flavours = [ "coreos" ];
 
 in stdenv.mkDerivation rec {
   version = "0.14.0";
@@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
 
   stage1BaseImage = fetchurl {
     url = "http://stable.release.core-os.net/amd64-usr/${coreosImageRelease}/coreos_production_pxe_image.cpio.gz";
-    sha256 = "05nzl3av6cawr8v203a8c95c443g6h1nfy2n4jmgvn0j4iyy44ym";
+    sha256 = "51dc10b4269b9c1801c233de49da817d29ca8d858bb0881df94dc90f7e86ce70";
   };
 
   buildInputs = [ autoconf automake go file git wget gnupg1 squashfsTools cpio ];

From c2dd20b561da9d7d0ae48235e7dbb6386424f2e1 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Mon, 4 Jan 2016 14:45:05 +0300
Subject: [PATCH 270/884] vimPlugins: update 2016-01-04

---
 pkgs/misc/vim-plugins/default.nix | 180 +++++++++++++++---------------
 1 file changed, 90 insertions(+), 90 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 603e4db4ac6e..fff9ff3fbcee 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -121,11 +121,11 @@ rec {
   };
 
   Hoogle = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Hoogle-2015-11-27";
+    name = "Hoogle-2015-12-24";
     src = fetchgit {
       url = "git://github.com/Twinside/vim-hoogle";
-      rev = "f0deb22baad592329b158217143f8b324548b4bd";
-      sha256 = "e98b9b729b8c7dfcf34ccd36940e4d855975580864cf36f5e4bb88336fd1e263";
+      rev = "a5db36f048ac16ab9774fc86f36cd4ae9a444932";
+      sha256 = "31cb37f9fa38e15a52bc35c050e173afc2af5fe8b3d6e5f2026cd5a89bb1a5a0";
     };
     dependencies = [];
 
@@ -154,11 +154,11 @@ rec {
   };
 
   Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Syntastic-2015-12-10";
+    name = "Syntastic-2016-01-04";
     src = fetchgit {
       url = "git://github.com/scrooloose/syntastic";
-      rev = "48736aa376341518d7bedf3a39daf0ae9e1dcdc0";
-      sha256 = "2a523c7d54b5afee1eda6073c71ffcea7ba60e5240d91ea235f007ad89fb8e55";
+      rev = "3280220e6c612d03a451d7ee0624893093dcb87b";
+      sha256 = "6d066843aeacd9534df5b67c64bb4efd7afb1aaea9024f6dfb74a312a73c8bad";
     };
     dependencies = [];
 
@@ -209,11 +209,11 @@ rec {
   };
 
   UltiSnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "UltiSnips-2015-12-09";
+    name = "UltiSnips-2015-12-22";
     src = fetchgit {
       url = "git://github.com/SirVer/ultisnips";
-      rev = "5a2dcc5cbfa4c1e4a981d57544eb51fc5baeecea";
-      sha256 = "dd9b087b7a08b75a60f104cf734b604f8823a219b76531694b4957fce6a2a8d5";
+      rev = "dbd43ad27cbfed14c9dc3de6d5acb5f4edb8f649";
+      sha256 = "3a1c59ae4097e72c91724157249d6a578e7ef2b10ed675e4372ce9968d66af66";
     };
     dependencies = [];
 
@@ -269,11 +269,11 @@ rec {
   };
 
   ctrlp-py-matcher = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ctrlp-py-matcher-2015-07-18";
+    name = "ctrlp-py-matcher-2015-12-22";
     src = fetchgit {
       url = "git://github.com/FelikZ/ctrlp-py-matcher";
-      rev = "9e84cf8072866b92faf5082cb93a554b75e35fd0";
-      sha256 = "7d4d5f7da148ddc9c8956aca87f53d9d0ff458b8fb4bc4ab2a9bff2ee6026cde";
+      rev = "08b98ff7ba5191616fa4f099a63cdcbad70a0c0f";
+      sha256 = "72514b65e12dfa249e51d676d38ff88933309827ef0ece71f3a90a21b4a943e6";
     };
     dependencies = [];
 
@@ -302,11 +302,11 @@ rec {
   };
 
   fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "fugitive-2015-12-15";
+    name = "fugitive-2015-12-26";
     src = fetchgit {
       url = "git://github.com/tpope/vim-fugitive";
-      rev = "8851b8fe643517af160f59dfc3d88a0c4eed1fa5";
-      sha256 = "bba527606ab63cc6cce24ca1b44226aa37aced7f1aac4c352a6b83ce522c4b5f";
+      rev = "18d6d1ab82d9ac15586d7d3c1a36f9ef6fb50eae";
+      sha256 = "f448970d07eaf35c0a6d29634ee2114650934943602da8f2bf5a4e3920d62aa2";
     };
     dependencies = [];
 
@@ -357,11 +357,11 @@ rec {
   };
 
   neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neomake-2015-12-11";
+    name = "neomake-2015-12-31";
     src = fetchgit {
       url = "git://github.com/benekastah/neomake";
-      rev = "d4c0a6f062a0d098126e87bb718b92fe7b79fd97";
-      sha256 = "1b2f1e024ffdfe0613c0aeb4c6fc64d64c6a25a00841538b7a371efd34cb8615";
+      rev = "6342a7d7e09083a549800a3cdc0ef95358a73ba7";
+      sha256 = "b7d3637b8575ae94dc0e68c4e5fcc41197b3083d1d7302c2e038431a24a3e9d7";
     };
     dependencies = [];
 
@@ -390,22 +390,22 @@ rec {
   };
 
   ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ctrlp-vim-2015-11-30";
+    name = "ctrlp-vim-2015-12-30";
     src = fetchgit {
       url = "git://github.com/ctrlpvim/ctrlp.vim";
-      rev = "7a80267ed061f3dc30bb319f438bdadfd8c7b1fd";
-      sha256 = "ae29eb79ca32ca0edd32602cf6b1e1276ccd4f5086ac4297a7f0dea2dd2e1f1b";
+      rev = "97490deda3326182281133454b8813850db4c444";
+      sha256 = "1671dffe85dfc2655c06784b783b08f8553f5b90e04b7e9a861d7054c695adbc";
     };
     dependencies = [];
 
   };
 
   vim-jade = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-jade-2015-11-23";
+    name = "vim-jade-2016-01-03";
     src = fetchgit {
       url = "git://github.com/digitaltoad/vim-jade";
-      rev = "f760e239386df055eb1892243624fdf7f7c58392";
-      sha256 = "812e65090e6a1c31f433878fd1012673a8244d8b6974b1c2ffd1558c30c716cc";
+      rev = "999cd2859a7772de707a70afc97f5a7d41a82df9";
+      sha256 = "039c1e9b91ac6417c2f38e8b30647115b10ad5485e78782a84100f22ae2da1d8";
     };
     dependencies = [];
 
@@ -434,11 +434,11 @@ rec {
   };
 
   vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-go-2015-12-15";
+    name = "vim-go-2016-01-03";
     src = fetchgit {
       url = "git://github.com/fatih/vim-go";
-      rev = "70c363044df808e34d947815d01a37d4e7564421";
-      sha256 = "9f1764a5e8c7450c4af9fc64b3170e10d89c4d6b4ad69a758878bed16362cf09";
+      rev = "b26351b55a7a44e29f1bde3b82ead43a6980760d";
+      sha256 = "57cc4240de5ea185c645c37a0fc51f0b352ad7d2798124f58786ed95579d1bc3";
     };
     dependencies = [];
 
@@ -621,22 +621,22 @@ rec {
   };
 
   vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimtex-2015-12-16";
+    name = "vimtex-2016-01-03";
     src = fetchgit {
       url = "git://github.com/lervag/vimtex";
-      rev = "e982722e89462716e2ecdb6ce7aa9baea6dc8c98";
-      sha256 = "4c0e8399b97cbd24b0131c3e22fc8873d04576e21156b80e5c678b4ce3d19fe0";
+      rev = "2de4129abd6b7e441d625403ff420734452ed112";
+      sha256 = "0f7a69cd48c6cd6ff9981ec3e4e6bc678491d2b42cf80a274464c0cb762f3397";
     };
     dependencies = [];
 
   };
 
   vim-easymotion = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-easymotion-2015-10-27";
+    name = "vim-easymotion-2016-01-03";
     src = fetchgit {
       url = "git://github.com/lokaltog/vim-easymotion";
-      rev = "a21d4474f0e9df7a721246e0a3b386068901965f";
-      sha256 = "96bb705e9ff626b139a7f92906468eda63d743b8457a1dc1e4de9c3cf9486525";
+      rev = "39abbf30a7bfc16de139b52ce0d7d2a286da52a8";
+      sha256 = "5c0be765c2fdb95c632020e0d03a70a2683a9d8f5b2d934be94b89cdb9bbd089";
     };
     dependencies = [];
 
@@ -658,11 +658,11 @@ rec {
   };
 
   vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-startify-2015-12-11";
+    name = "vim-startify-2015-12-28";
     src = fetchgit {
       url = "git://github.com/mhinz/vim-startify";
-      rev = "295fe7a09a881448eea1aa71d26f53dcda3c499b";
-      sha256 = "a561488ae8870364f822a93ef18d35511b4dd7e779fd18e365851e8d216df61e";
+      rev = "84fb86e5dab808dd99f10565f1aac066292a1289";
+      sha256 = "bb05abdd59e38dcb1985438ddfad7cd23f514a6bc2fe84b5e114872e1ca82dc0";
     };
     dependencies = [];
 
@@ -702,22 +702,22 @@ rec {
   };
 
   vim-watchdogs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-watchdogs-2015-07-29";
+    name = "vim-watchdogs-2015-12-27";
     src = fetchgit {
       url = "git://github.com/osyo-manga/vim-watchdogs";
-      rev = "e1fce3b4bbe07d55bd7340d25ca0dc900747ad6f";
-      sha256 = "72ec214364c674ee1ccd29a6dae925e6cbcaf90e57fef133385a96319108dd2c";
+      rev = "52842b03ab0c2e60563ff121d274f8a66ca7e0fc";
+      sha256 = "bbf304319a40e755d47afbe0f172ad47aea35f5253669e5da60d8bd717b67070";
     };
     dependencies = [];
 
   };
 
   racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "racer-2015-12-11";
+    name = "racer-2016-01-02";
     src = fetchgit {
       url = "git://github.com/phildawes/racer";
-      rev = "ce1915a6fd76f76433f30cfaf1fe1b2a8e21cdd4";
-      sha256 = "24d48cbf6d69e397cd7a9925c42e2a10fb8c9dc4a0ef8b9122894847224fd735";
+      rev = "c94a17f844c13d2f115a53013c0f9e063bc31f23";
+      sha256 = "fc42c224fbe12459e17c941ab6d084c838f11b1aabec55eaeebf617df2037124";
     };
     dependencies = [];
     buildPhase = ''
@@ -727,44 +727,44 @@ rec {
   };
 
   neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neocomplete-vim-2015-12-13";
+    name = "neocomplete-vim-2016-01-03";
     src = fetchgit {
       url = "git://github.com/shougo/neocomplete.vim";
-      rev = "d1cb4c57e5eb8b453b63432dcbcb45a15c0fd07e";
-      sha256 = "a704696e66101875e98a1b2b6815acad647b87a07a3842fd6f9f91b8a70411e5";
+      rev = "4c108ddadcf44c83c2ee38e5ac0dc8b0b31ed9a8";
+      sha256 = "b112cfac177c142f09e4904f9d1b30ca402ed7642f0a4f8f003808dd804df52a";
     };
     dependencies = [];
 
   };
 
   neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-snippets-2015-12-13";
+    name = "neosnippet-snippets-2016-01-04";
     src = fetchgit {
       url = "git://github.com/shougo/neosnippet-snippets";
-      rev = "ec9267240ecb855657de830c9c68e5f6e34cfe65";
-      sha256 = "319a7ac504b462f7e466c9e02ff6e54b8374e5970f148552986c83136c423854";
+      rev = "1c6dacb99fcbeb186646ecafda3f07e07484b326";
+      sha256 = "fd834aa6d612f124d9d443d1ac11a0749d4df18f012de0c3729de2ecc3cbead5";
     };
     dependencies = [];
 
   };
 
   neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-vim-2015-12-16";
+    name = "neosnippet-vim-2016-01-04";
     src = fetchgit {
       url = "git://github.com/shougo/neosnippet.vim";
-      rev = "cfc99eedb5caf3d6baf867db5220a891b4686699";
-      sha256 = "aa34c6e28eb281bec6e617f03eb5e094cd2cfe18951f9e4823dda0ccdabaffad";
+      rev = "ac6ac62a5bf259f2db5aaf0751b919b377d1a9b2";
+      sha256 = "e9eaf68211965a71619bd3ff477982af7eccc30e6cb430a8fbf553469b22c127";
     };
     dependencies = [];
 
   };
 
   unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "unite-vim-2015-12-13";
+    name = "unite-vim-2015-12-29";
     src = fetchgit {
       url = "git://github.com/shougo/unite.vim";
-      rev = "aefd6c32ef8dc5b357efe7d8e5cd3dd4aa785d5c";
-      sha256 = "83562a15afc1c41a5d407fd0eb7d26beec216a9431dd80992bcd615afd595e5e";
+      rev = "da791c335135fbd460caa8c8e4671e324ef1f328";
+      sha256 = "93a892a9acfcf47953e234b69f80249cc2c1d7cc6d097f173cf6f721fd59068f";
     };
     dependencies = [];
 
@@ -790,11 +790,11 @@ rec {
   };
 
   vimshell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimshell-vim-2015-11-24";
+    name = "vimshell-vim-2015-12-23";
     src = fetchgit {
       url = "git://github.com/shougo/vimshell.vim";
-      rev = "7931e3bf9fbba738b26bb76143dfc1df17f7a99b";
-      sha256 = "f51ee4e8b16460226ce74d87236834f13008dca16dbc9090d89576a545f573bc";
+      rev = "a5b3d99ba84e76cf94195c37ab762aef5f7b6e25";
+      sha256 = "9a58b00cca9b2cf7ef73cdef2174ab69b7fb427130e5b125b96c6b385dec1947";
     };
     dependencies = [ "vimproc-vim" ];
   };
@@ -822,11 +822,11 @@ rec {
   };
 
   vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-quickrun-2015-12-17";
+    name = "vim-quickrun-2015-12-28";
     src = fetchgit {
       url = "git://github.com/thinca/vim-quickrun";
-      rev = "97e1c8f6674d3ccce4730510d67c4e15894adcdc";
-      sha256 = "c61167569d5b05767fdaffc1b09aab729c777d01afaff8c0efd641a61ebe758c";
+      rev = "da5328d0aec495e4dc25232fd769a8a2e56d8f7d";
+      sha256 = "a70e2ffa05a2cc2306483e3ecc09972bcdf2d11bfafcfbf3f8195e23475e7102";
     };
     dependencies = [];
 
@@ -877,11 +877,11 @@ rec {
   };
 
   youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "youcompleteme-2015-12-13";
+    name = "youcompleteme-2016-01-01";
     src = fetchgit {
       url = "git://github.com/valloric/youcompleteme";
-      rev = "93c2a8644bcfc84590bea5e19eab350fe245e504";
-      sha256 = "32aaa99c5398d65875c1fdf5ed22f58aeeb267a2840930479523815b94b4111c";
+      rev = "07f4402f49a6cb987ebb17a4c17790816e06c3e7";
+      sha256 = "cf801f2efe00b20244520cc0806c050b56d768d3826ea4143dc0ac658c6019ba";
     };
     dependencies = [];
     buildInputs = [
@@ -1022,22 +1022,22 @@ rec {
   };
 
   vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-wakatime-2015-12-01";
+    name = "vim-wakatime-2015-12-29";
     src = fetchgit {
       url = "git://github.com/wakatime/vim-wakatime";
-      rev = "2b758403d8637cacbab1de603258c611408b9fa7";
-      sha256 = "e3a3da2dd40c4098b18815ca12d83ad1789f5342a8d822669a29e9900600e6ff";
+      rev = "6cf829f08d72ffe56a794a2e4ada5689e7d68237";
+      sha256 = "4913a63dd238bb14c04043e492b3d9f283ea821db86fad559b88ac9f65cf87d8";
     };
     dependencies = [];
     buildInputs = [ python ];
   };
 
   command-t = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "command-t-2015-04-29";
+    name = "command-t-2016-01-01";
     src = fetchgit {
       url = "git://github.com/wincent/command-t";
-      rev = "f7344ebbe95c532b2ad01f19877d6d611db0193b";
-      sha256 = "21d7ee2bbff3f79ec3c81bcf683acac6528ea89faef8b7dd075cc83662930a50";
+      rev = "978c0a6bbd8a318023a19787f95cc2041c614db6";
+      sha256 = "954bf0285ec37e975b227d3a1e80165fc52be673d9c5e510265dc911e06ff066";
     };
     dependencies = [];
     buildInputs = [ perl ruby ];
@@ -1083,11 +1083,11 @@ rec {
   };
 
   pathogen = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "pathogen-2015-09-20";
+    name = "pathogen-2015-12-25";
     src = fetchgit {
       url = "git://github.com/tpope/vim-pathogen";
-      rev = "b4174e4d1a16e7f0c5c6dfca923269a20a9f50c2";
-      sha256 = "703a1d3022cdb03d3d14fbba48be119f4bd7d546ba4bd33185bddaa161bbc63e";
+      rev = "4d584ea8c85408ca0d68b7b1693f3e2db8aa762a";
+      sha256 = "1a1b5e650aa5ff107ce68fecf4d9a57cafc2c15ab74686c5ea3c5985de07470d";
     };
     dependencies = [];
 
@@ -1127,11 +1127,11 @@ rec {
   };
 
   sensible = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "sensible-2015-12-11";
+    name = "sensible-2015-12-26";
     src = fetchgit {
       url = "git://github.com/tpope/vim-sensible";
-      rev = "8c4429c70c186f9be47121b126c13095793062a1";
-      sha256 = "f3b5de776ae4fa2c8769f2f04639d2a0218c88345beba9364899d359d32cf6e5";
+      rev = "680a5c693213daa158c816f068fffa895d961dc9";
+      sha256 = "959b55a97974d85374eccb58379c3f69c0ec43459d4df2484e42a437c61e34bc";
     };
     dependencies = [];
 
@@ -1445,11 +1445,11 @@ rec {
   };
 
   vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-2015-10-18";
+    name = "vim-airline-2015-12-28";
     src = fetchgit {
       url = "git://github.com/bling/vim-airline";
-      rev = "14d14cf951c08fc88ca6c3e6f28fe47b99421e23";
-      sha256 = "cfc686cad3749e3bd933b5ae3ea35c4a9c02765be9223e6b30e7d801a9174aa7";
+      rev = "01383136565840a63aa056b82c74be40afcb8ba3";
+      sha256 = "bc9dfb3a0fa15c1149bb8ca5e6e745ca66e141862bbc08e071afec86b8bf9da9";
     };
     dependencies = [];
 
@@ -1522,11 +1522,11 @@ rec {
   };
 
   vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-multiple-cursors-2015-10-30";
+    name = "vim-multiple-cursors-2016-01-01";
     src = fetchgit {
       url = "git://github.com/terryma/vim-multiple-cursors";
-      rev = "73a78c926ad208bd1984e575ceece276d61a1404";
-      sha256 = "74f51c7c6a903621ee3fc5e78fbce4853b5da086463d015c652808d155cbc7e6";
+      rev = "0dfd3f91b0ea1c70be8873d0a9e5c7d00369610f";
+      sha256 = "820662a93102bc1fac679f108d5e3400f7f5431196d84abf24484849e004c325";
     };
     dependencies = [];
 
@@ -1544,33 +1544,33 @@ rec {
   };
 
   vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-signify-2015-12-09";
+    name = "vim-signify-2015-12-27";
     src = fetchgit {
       url = "git://github.com/mhinz/vim-signify";
-      rev = "ecb796139eb0fc9b79fdc28e9b610fa1a2c5f589";
-      sha256 = "6086fb614a0da7f676f2f567b5dfc6ddd765167141f629dc8dbb02862e7db34c";
+      rev = "812b305b795144617cb44d5f4f6cf1c92e5366eb";
+      sha256 = "34eaaa24e6caf07d0e942f482861a6328578a524d76b630ca41d2fc650084225";
     };
     dependencies = [];
 
   };
 
   vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-snippets-2015-12-17";
+    name = "vim-snippets-2016-01-04";
     src = fetchgit {
       url = "git://github.com/honza/vim-snippets";
-      rev = "d5153d63b16e956e892f039ac5982963660a1c68";
-      sha256 = "c79fc743ec1e565111876357136cee1a04ed6b3f58d1586df322a38b026f8a49";
+      rev = "40bcbf8a34a53d54e34fae9e4122ce25b7225144";
+      sha256 = "ef88a33110115b611ed2d707d052c3a4969ff57d8c44d480dd3fc28c9a44fcec";
     };
     dependencies = [];
 
   };
 
   vim-webdevicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-webdevicons-2015-12-01";
+    name = "vim-webdevicons-2015-12-21";
     src = fetchgit {
       url = "git://github.com/ryanoasis/vim-devicons";
-      rev = "0e1b7864cfee4b0585daa277bedd992f858e1e75";
-      sha256 = "e265c6c0906d0427409a98458192a4eb94afe671f26fc8de8890dae0e66f7764";
+      rev = "8ac3e02537d32648c3f9738c711639f8b940460c";
+      sha256 = "9d4ee89a551ab9e1ec3938e1eba1fd138bbee975ce3b247b5f56eb2613daefbc";
     };
     dependencies = [];
 

From 1e9a4a6d5b6c334ad4b41f72d360836d927bf0db Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Mon, 4 Jan 2016 13:08:11 +0100
Subject: [PATCH 271/884] fixup! rkt: align stage1 information with upstream
 source

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

diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix
index eb2a5d737a3e..abdbb46bc5b1 100644
--- a/pkgs/applications/virtualization/rkt/default.nix
+++ b/pkgs/applications/virtualization/rkt/default.nix
@@ -2,11 +2,11 @@
 , fetchurl, fetchFromGitHub }:
 
 let
-  coreosImageRelease = "835.9.0";
-  coreosImageSystemdVersion = "225";
+  coreosImageRelease = "794.1.0";
+  coreosImageSystemdVersion = "222";
 
   # TODO: track https://github.com/coreos/rkt/issues/1758 to allow "host" flavor.
-  stage1Flavours = [ "coreos" ];
+  stage1Flavours = [ "coreos" "fly" ];
 
 in stdenv.mkDerivation rec {
   version = "0.14.0";
@@ -21,8 +21,8 @@ in stdenv.mkDerivation rec {
   };
 
   stage1BaseImage = fetchurl {
-    url = "http://stable.release.core-os.net/amd64-usr/${coreosImageRelease}/coreos_production_pxe_image.cpio.gz";
-    sha256 = "51dc10b4269b9c1801c233de49da817d29ca8d858bb0881df94dc90f7e86ce70";
+    url = "http://alpha.release.core-os.net/amd64-usr/${coreosImageRelease}/coreos_production_pxe_image.cpio.gz";
+    sha256 = "05nzl3av6cawr8v203a8c95c443g6h1nfy2n4jmgvn0j4iyy44ym";
   };
 
   buildInputs = [ autoconf automake go file git wget gnupg1 squashfsTools cpio ];

From 0e1fe66aad9c8f1afc01d120c06ac1944fd5f7c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 4 Jan 2016 13:59:53 +0100
Subject: [PATCH 272/884] kernel: do not load `configs` module (close #10912)

... because we make it built-in by default.
I can't imagine anyone who wanted to purge this module from his/her system,
so let's keep it simple, at least for now.
---
 nixos/modules/system/boot/kernel.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index ac40e8a49acf..17e3a038221c 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -158,7 +158,7 @@ in
 
     boot.kernel.sysctl."kernel.printk" = config.boot.consoleLogLevel;
 
-    boot.kernelModules = [ "loop" "configs" "atkbd" ];
+    boot.kernelModules = [ "loop" "atkbd" ];
 
     boot.initrd.availableKernelModules =
       [ # Note: most of these (especially the SATA/PATA modules)

From d1cb42f297e11a1ada84b9203da2a7ad5d7ad795 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 4 Jan 2016 14:21:43 +0100
Subject: [PATCH 273/884] system-config-printer: set meta.platforms

---
 pkgs/tools/misc/system-config-printer/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix
index a73d050baa97..6b0be9d2f6e8 100644
--- a/pkgs/tools/misc/system-config-printer/default.nix
+++ b/pkgs/tools/misc/system-config-printer/default.nix
@@ -43,5 +43,6 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://cyberelk.net/tim/software/system-config-printer/;
+    platforms = stdenv.lib.platforms.linux;
   };
 }

From 8f6ae032c0df7d135fe717e19f6d59545892f6b8 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 4 Jan 2016 15:03:42 +0100
Subject: [PATCH 274/884] ccache: cherry-pick a (backported upstream) bug-fix

---
 pkgs/development/tools/misc/ccache/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix
index ed87428f98df..29fe621d6764 100644
--- a/pkgs/development/tools/misc/ccache/default.nix
+++ b/pkgs/development/tools/misc/ccache/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, runCommand, gcc, zlib }:
+{ stdenv, fetchurl, fetchpatch, runCommand, gcc, zlib }:
 
 let
   name = "ccache-${version}";
@@ -13,6 +13,15 @@ stdenv.mkDerivation {
     url = "mirror://samba/ccache/${name}.tar.xz";
   };
 
+  patches = [
+    (fetchpatch {
+      sha256 = "1gwnxx1w2nx1szi0v5vgwcx9i23pxygkqqnrawhal68qgz5c34wh";
+      name = "dont-update-manifest-in-readonly-modes.patch";
+      # The primary git.samba.org doesn't seem to like our curl much...
+      url = "https://github.com/jrosdahl/ccache/commit/a7ab503f07e31ebeaaec34fbaa30e264308a299d.patch";
+    })
+  ];
+
   buildInputs = [ zlib ];
 
   postPatch = ''

From f93e14fa766112bdb178ecdca8b1b83c36657797 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 4 Jan 2016 16:07:47 +0100
Subject: [PATCH 275/884] Make androidsdk refer to a more recent version

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 86a7db3fa0c0..57bebcd5e3f7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -629,7 +629,9 @@ let
     pkgs_i686 = pkgsi686Linux;
   };
 
-  inherit (androidenv) androidsdk_4_4 androidndk;
+  inherit (androidenv)  androidndk;
+
+  androidsdk = androidenv.androidsdk_6_0;
 
   arc-gtk-theme = callPackage ../misc/themes/arc { };
 

From 517d8c88469bc6cd72056e7cc24c42d9ee98334e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 4 Jan 2016 15:59:31 +0100
Subject: [PATCH 276/884] pingtcp: init at 0.0.3

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

diff --git a/pkgs/tools/networking/pingtcp/default.nix b/pkgs/tools/networking/pingtcp/default.nix
new file mode 100644
index 000000000000..4e7c080ea7f9
--- /dev/null
+++ b/pkgs/tools/networking/pingtcp/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchgit, cmake }:
+
+let version = "0.0.3"; in
+stdenv.mkDerivation {
+  name = "pingtcp-${version}";
+
+  # This project uses git submodules, which fetchFromGitHub doesn't support:
+  src = fetchgit {
+    sha256 = "0an4dbwcp2qv1n068q0s34lz88vl1z2rqfh3j9apbq7bislsrwdd";
+    rev = "refs/tags/v${version}";
+    url = "https://github.com/LanetNetwork/pingtcp.git";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  postPatch = ''
+    substituteInPlace {.,pfcquirks}/CMakeLists.txt \
+      --replace "-march=native" ""
+  '';
+
+  enableParallelBuilding = true;
+
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "Measure TCP handshake time";
+    homepage = https://github.com/LanetNetwork/pingtcp;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 57bebcd5e3f7..5d2542a72cd2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2746,6 +2746,8 @@ let
     libcap = if stdenv.isDarwin then null else libcap;
   };
 
+  pingtcp = callPackage ../tools/networking/pingtcp { };
+
   pius = callPackage ../tools/security/pius { };
 
   pk2cmd = callPackage ../tools/misc/pk2cmd { };

From 6d02d7e740396980cf4f36b3a623eea01155b6d2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 4 Jan 2016 16:53:42 +0100
Subject: [PATCH 277/884] NixOS tests: Increase hung_task_timeout_secs

This hopefully fixes intermittent test failures like

  http://hydra.nixos.org/build/29962437

  router# [  240.128835] INFO: task mke2fs:99 blocked for more than 120 seconds.
  router# [  240.130135]       Not tainted 3.18.25 #1-NixOS
  router# [  240.131110] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.

assuming that these are caused by high load on the host.
---
 nixos/modules/system/boot/stage-1-init.sh      |  1 +
 nixos/modules/system/boot/stage-1.nix          | 11 ++++++++++-
 nixos/modules/testing/test-instrumentation.nix |  5 +++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index 2b5d547353f8..7fb368e8c44f 100644
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@@ -140,6 +140,7 @@ done
 
 
 # Create device nodes in /dev.
+@preDeviceCommands@
 echo "running udev..."
 mkdir -p /etc/udev
 ln -sfn @udevRules@ /etc/udev/rules.d
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index 58a0749c74e2..694a5cfb6f85 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -203,7 +203,7 @@ let
     inherit (config.boot) resumeDevice devSize runSize;
 
     inherit (config.boot.initrd) checkJournalingFS
-      postEarlyDeviceCommands preLVMCommands postDeviceCommands postMountCommands kernelModules;
+      preLVMCommands preDeviceCommands postEarlyDeviceCommands postDeviceCommands postMountCommands kernelModules;
 
     resumeDevices = map (sd: if sd ? device then sd.device else "/dev/disk/by-label/${sd.label}")
                     (filter (sd: (sd ? label || hasPrefix "/dev/" sd.device) && !sd.randomEncryption) config.swapDevices);
@@ -303,6 +303,15 @@ in
       '';
     };
 
+    boot.initrd.preDeviceCommands = mkOption {
+      default = "";
+      type = types.lines;
+      description = ''
+        Shell commands to be executed before udev is started to create
+        device nodes.
+      '';
+    };
+
     boot.initrd.postDeviceCommands = mkOption {
       default = "";
       type = types.lines;
diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix
index f37bbd0246da..c233beb63ca7 100644
--- a/nixos/modules/testing/test-instrumentation.nix
+++ b/nixos/modules/testing/test-instrumentation.nix
@@ -43,6 +43,11 @@ let kernel = config.boot.kernelPackages.kernel; in
     # into thinking they're running interactively.
     environment.variables.PAGER = "";
 
+    boot.initrd.preDeviceCommands =
+      ''
+        echo 600 > /proc/sys/kernel/hung_task_timeout_secs
+      '';
+
     boot.initrd.postDeviceCommands =
       ''
         # Using acpi_pm as a clock source causes the guest clock to

From fde89b6762de859a738264750bd184205b9d18a5 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 4 Jan 2016 15:40:10 +0100
Subject: [PATCH 278/884] alt-ergo: also supported on Darwin

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

diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix
index 3bbcda9de110..45e6674439e7 100644
--- a/pkgs/applications/science/logic/alt-ergo/default.nix
+++ b/pkgs/applications/science/logic/alt-ergo/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, ocaml, ocamlPackages }:
+{ fetchurl, stdenv, ocamlPackages }:
 
 stdenv.mkDerivation rec {
   name = "alt-ergo-${version}";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     description = "High-performance theorem prover and SMT solver";
     homepage    = "http://alt-ergo.ocamlpro.com/";
     license     = stdenv.lib.licenses.cecill-c; # LGPL-2 compatible
-    platforms   = stdenv.lib.platforms.linux;
+    platforms   = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
     maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
   };
 }

From a25bfab6903863feaecd7fede22576a68a369544 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ragnar=20Dahl=C3=A9n?= <r.dahlen@gmail.com>
Date: Mon, 4 Jan 2016 17:17:59 +0000
Subject: [PATCH 279/884] boot: Update shell script version and remove
 makeWrapper usage

---
 pkgs/development/tools/build-managers/boot/builder.sh  | 6 +++---
 pkgs/development/tools/build-managers/boot/default.nix | 8 +++-----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/build-managers/boot/builder.sh b/pkgs/development/tools/build-managers/boot/builder.sh
index a60733089204..c1481dc6a144 100644
--- a/pkgs/development/tools/build-managers/boot/builder.sh
+++ b/pkgs/development/tools/build-managers/boot/builder.sh
@@ -8,6 +8,6 @@ chmod -v 755 $boot_bin
 
 patchShebangs $boot_bin
 
-wrapProgram $boot_bin \
-            --set JAVA_HOME "${jdk}" \
-            --prefix PATH ":" "${jdk}/bin"
+sed -i \
+    -e "s;\${BOOT_JAVA_COMMAND:-java};\${BOOT_JAVA_COMMAND:-${jdk}/bin/java};g" \
+    $boot_bin
diff --git a/pkgs/development/tools/build-managers/boot/default.nix b/pkgs/development/tools/build-managers/boot/default.nix
index cd5cf5d070ae..6f9c2ce38a74 100644
--- a/pkgs/development/tools/build-managers/boot/default.nix
+++ b/pkgs/development/tools/build-managers/boot/default.nix
@@ -1,20 +1,18 @@
-{ stdenv, fetchurl, makeWrapper, jdk }:
+{ stdenv, fetchurl, jdk }:
 
 stdenv.mkDerivation rec {
-  version = "2.4.2";
+  version = "2.5.2";
   name = "boot-${version}";
 
   src = fetchurl {
     url = "https://github.com/boot-clj/boot-bin/releases/download/${version}/boot.sh";
-    sha256 = "18d7dks6vvpwpw30jffzy7qqpypw6vhlp2sj838i5rj2q0imh14c";
+    sha256 = "0brsimvmmpksxwc4l5c0x0cl5hhdjz76crd26yxphjvzyf7fypc9";
   };
 
   inherit jdk;
   
   builder = ./builder.sh;
 
-  buildInputs = [ makeWrapper ];
-
   propagatedBuildInputs = [ jdk ];
 
   meta = {

From 7d3bac6bcccbb5a6294927cc299f9e29117df63b Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Mon, 4 Jan 2016 19:01:18 +0100
Subject: [PATCH 280/884] wine unstable/staging: 1.8 -> 1.9.0

---
 pkgs/misc/emulators/wine/versions.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/emulators/wine/versions.nix b/pkgs/misc/emulators/wine/versions.nix
index 057f5214aa2e..7858a655b4e0 100644
--- a/pkgs/misc/emulators/wine/versions.nix
+++ b/pkgs/misc/emulators/wine/versions.nix
@@ -12,15 +12,16 @@ rec {
     monoSha256 = "09dwfccvfdp3walxzp6qvnyxdj2bbyw9wlh6cxw2sx43gxriys5c";
   };
   unstable = {
+    wineVersion = "1.9.0";
+    wineSha256 = "1yfmcckb8biyp1d4czjxlfd10537dpi636g3zsj1cxp7jyn228mp";
     inherit (stable)
-      wineVersion wineSha256
       geckoVersion geckoSha256
       gecko64Version gecko64Sha256
       monoVersion monoSha256;
   };
   staging = {
     version = unstable.wineVersion;
-    sha256 = "1mi2nk5cjgfrkv8g082d4klniz1dprmvvida8c30qf2j4jykn3vb";
+    sha256 = "1frp7zrgvx24m6yqmpvsz99rn18jjgg1bxl5qgcsf3kiych4i8r1";
   };
   winetricks = {
     version = "20151116";

From b4c0495435564d2958de874fa0479e3edbf4015b Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 4 Jan 2016 19:24:43 +0100
Subject: [PATCH 281/884] pythonPackages.libvirt: 1.2.19 -> 1.3.0

This needs to be synchronised with the `libvirt` version.
---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 83ed1f7dddf8..c805c7dd6831 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21722,13 +21722,13 @@ in modules // {
   };
 
   libvirt = let
-    version = "1.2.19";
+    version = "1.3.0";
   in assert version == pkgs.libvirt.version; pkgs.stdenv.mkDerivation rec {
     name = "libvirt-python-${version}";
 
     src = pkgs.fetchurl {
       url = "http://libvirt.org/sources/python/${name}.tar.gz";
-      sha256 = "0jgcggrwaz9512wzlkgxirq56cr7zq2ihmg8qv95nhryqnq67aw8";
+      sha256 = "0z7w79mkx7w322d2mf9d4bz56mmfic3nx0q4bc6fa063aay42z89";
     };
 
     buildInputs = with self; [ python pkgs.pkgconfig pkgs.libvirt lxml ];

From 4b14ebc16dc47ececa365feab68bb8979a19b7e9 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 4 Jan 2016 19:37:18 +0100
Subject: [PATCH 282/884] androidsdk: re-inherit androidsdk_4_4 in all-packages

This was removed in f93e14fa766112bdb178ecdca8b1b83c36657797
but is still used by the `idea` expression.
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 201bd4a27254..ac6d8ae47269 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -629,7 +629,7 @@ let
     pkgs_i686 = pkgsi686Linux;
   };
 
-  inherit (androidenv)  androidndk;
+  inherit (androidenv) androidsdk_4_4 androidndk;
 
   androidsdk = androidenv.androidsdk_6_0;
 

From 286cd8378c7ebdad651ac9ba6f59fea6206e55d2 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 4 Jan 2016 16:50:34 +0100
Subject: [PATCH 283/884] libvirt: apply patch to build 1.3.0 on BSD/Darwin

Upstream bug: https://bugzilla.redhat.com/show_bug.cgi?id=1293060

This patch is based on the one attached to that bug report, but
instead of patching the .x files (parsing of which apparently
fails as well) it modifies the pre-generated .c files directly.

This ought to fix #12139.
---
 .../libraries/libvirt/build-on-bsd.patch      | 58 +++++++++++++++++++
 .../development/libraries/libvirt/default.nix | 13 +++--
 2 files changed, 67 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/libraries/libvirt/build-on-bsd.patch

diff --git a/pkgs/development/libraries/libvirt/build-on-bsd.patch b/pkgs/development/libraries/libvirt/build-on-bsd.patch
new file mode 100644
index 000000000000..830f0f30ff9b
--- /dev/null
+++ b/pkgs/development/libraries/libvirt/build-on-bsd.patch
@@ -0,0 +1,58 @@
+diff -Naur libvirt-1.3.0.orig/src/admin/admin_protocol.c libvirt-1.3.0/src/admin/admin_protocol.c
+--- libvirt-1.3.0.orig/src/admin/admin_protocol.c	2015-12-02 16:17:07.000000000 +0100
++++ libvirt-1.3.0/src/admin/admin_protocol.c	2016-01-04 17:57:10.043412857 +0100
+@@ -6,6 +6,25 @@
+ 
+ #include "admin_protocol.h"
+ 
++/* cygwin's xdr implementation defines xdr_u_int64_t instead of xdr_uint64_t
++ * and lacks IXDR_PUT_INT32 and IXDR_GET_INT32
++ */
++#ifdef HAVE_XDR_U_INT64_T
++# define xdr_uint64_t xdr_u_int64_t
++#endif
++#ifndef IXDR_PUT_INT32
++# define IXDR_PUT_INT32 IXDR_PUT_LONG
++#endif
++#ifndef IXDR_GET_INT32
++# define IXDR_GET_INT32 IXDR_GET_LONG
++#endif
++#ifndef IXDR_PUT_U_INT32
++# define IXDR_PUT_U_INT32 IXDR_PUT_U_LONG
++#endif
++#ifndef IXDR_GET_U_INT32
++# define IXDR_GET_U_INT32 IXDR_GET_U_LONG
++#endif
++
+ bool_t
+ xdr_admin_nonnull_string (XDR *xdrs, admin_nonnull_string *objp)
+ {
+diff -Naur libvirt-1.3.0.orig/src/logging/log_protocol.c libvirt-1.3.0/src/logging/log_protocol.c
+--- libvirt-1.3.0.orig/src/logging/log_protocol.c	2015-12-08 13:07:35.000000000 +0100
++++ libvirt-1.3.0/src/logging/log_protocol.c	2016-01-04 17:56:50.673463563 +0100
+@@ -7,6 +7,25 @@
+ #include "log_protocol.h"
+ #include "internal.h"
+ 
++/* cygwin's xdr implementation defines xdr_u_int64_t instead of xdr_uint64_t
++ * and lacks IXDR_PUT_INT32 and IXDR_GET_INT32
++ */
++#ifdef HAVE_XDR_U_INT64_T
++# define xdr_uint64_t xdr_u_int64_t
++#endif
++#ifndef IXDR_PUT_INT32
++# define IXDR_PUT_INT32 IXDR_PUT_LONG
++#endif
++#ifndef IXDR_GET_INT32
++# define IXDR_GET_INT32 IXDR_GET_LONG
++#endif
++#ifndef IXDR_PUT_U_INT32
++# define IXDR_PUT_U_INT32 IXDR_PUT_U_LONG
++#endif
++#ifndef IXDR_GET_U_INT32
++# define IXDR_GET_U_INT32 IXDR_GET_U_LONG
++#endif
++
+ bool_t
+ xdr_virLogManagerProtocolUUID (XDR *xdrs, virLogManagerProtocolUUID objp)
+ {
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 54addb397b70..980bccd39fb9 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -1,6 +1,8 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, gnutls, devicemapper, perl, python
+{ stdenv, fetchurl, fetchpatch
+, pkgconfig, makeWrapper
+, libxml2, gnutls, devicemapper, perl, python
 , iproute, iptables, readline, lvm2, utillinux, udev, libpciaccess, gettext
-, libtasn1, ebtables, libgcrypt, yajl, makeWrapper, pmutils, libcap_ng
+, libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng
 , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages
 , curl, libiconv, gmp, xen
 }:
@@ -14,9 +16,12 @@ stdenv.mkDerivation rec {
     sha256 = "ebcf5645fa565e3fe2fe94a86e841db9b768cf0e0a7e6cf395c6327f9a23bd64";
   };
 
+  patches = [ ./build-on-bsd.patch ];
+
+  nativeBuildInputs = [ makeWrapper pkgconfig ];
   buildInputs = [
-    pkgconfig libxml2 gnutls perl python readline
-    gettext libtasn1 libgcrypt yajl makeWrapper
+    libxml2 gnutls perl python readline
+    gettext libtasn1 libgcrypt yajl
     libxslt xhtml1 perlPackages.XMLXPath curl libpcap
   ] ++ stdenv.lib.optionals stdenv.isLinux [
     libpciaccess devicemapper lvm2 utillinux udev libcap_ng

From 3a9c8631509ded7563b43fab26e219aeb720edb7 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 4 Jan 2016 21:13:05 +0100
Subject: [PATCH 284/884] pcapc: init at 2015-03-06

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

diff --git a/pkgs/tools/networking/pcapc/default.nix b/pkgs/tools/networking/pcapc/default.nix
new file mode 100644
index 000000000000..7da123a377be
--- /dev/null
+++ b/pkgs/tools/networking/pcapc/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, libpcap }:
+
+let version = "2015-03-06"; in
+stdenv.mkDerivation rec {
+  name = "pcapc-${version}";
+
+  src = fetchFromGitHub {
+    sha256 = "02j45wmxy8qcji0giwx3364pbqb6849s8y0xfvzx40g98mssl027";
+    rev = "9dddf52e65c8cff72c7c11758a951b31bf083436";
+    repo = "pcapc";
+    owner = "pfactum";
+  };
+
+  buildInputs = [ libpcap ];
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  enableParallelBuilding = true;
+
+  doCheck = false;
+
+  postInstall = ''
+    install -Dm644 {.,$out/share/doc/pcapc}/README.md
+  '';
+
+  meta = with stdenv.lib; {
+    inherit version;
+    inherit (src.meta) homepage;
+    description = "Compile libpcap filter expressions into BPF opcodes";
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ac6d8ae47269..32029acdd00f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2714,6 +2714,8 @@ let
 
   bully = callPackage ../tools/networking/bully { };
 
+  pcapc = callPackage ../tools/networking/pcapc { };
+
   pdnsd = callPackage ../tools/networking/pdnsd { };
 
   peco = callPackage ../tools/text/peco { };

From bb288f43af5a031de79133d38725cd7942d8f9f3 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 4 Jan 2016 21:13:46 +0100
Subject: [PATCH 285/884] pingtcp: install README.md

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

diff --git a/pkgs/tools/networking/pingtcp/default.nix b/pkgs/tools/networking/pingtcp/default.nix
index 4e7c080ea7f9..784639b788c3 100644
--- a/pkgs/tools/networking/pingtcp/default.nix
+++ b/pkgs/tools/networking/pingtcp/default.nix
@@ -22,6 +22,10 @@ stdenv.mkDerivation {
 
   doCheck = false;
 
+  postInstall = ''
+    install -Dm644 {..,$out/share/doc/pingtcp}/README.md
+  '';
+
   meta = with stdenv.lib; {
     inherit version;
     description = "Measure TCP handshake time";

From 436fe952b070e4af3c4a8652320751cb3a4a33b1 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 4 Jan 2016 21:48:39 +0100
Subject: [PATCH 286/884] josm: 9060 -> 9229

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

diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix
index 275cc8ff2adb..cd1ac6dc9358 100644
--- a/pkgs/applications/misc/josm/default.nix
+++ b/pkgs/applications/misc/josm/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "josm-${version}";
-  version = "9060";
+  version = "9229";
 
   src = fetchurl {
     url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
-    sha256 = "0c1q0bs3x1j9wzmb52xnppdyvni4li5khbfja7axn2ml09hqa0j2";
+    sha256 = "1a70y2a2srnlca7m5kcg8zijxnmiazhpr6fjl2vwzg00ghv0nxzb";
   };
 
   phases = [ "installPhase" ];

From 1283e01b3863cb9145e9dd88d095ab768b352199 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <steinbach.tim@googlemail.com>
Date: Mon, 4 Jan 2016 20:52:19 +0000
Subject: [PATCH 287/884] linux-testing: 4.4.0-rc7 -> 4.4.0-rc8

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

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 524c8b4ff250..c70d6f79f38b 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.4-rc7";
-  modDirVersion = "4.4.0-rc7";
+  version = "4.4-rc8";
+  modDirVersion = "4.4.0-rc8";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz";
-    sha256 = "11lk368wqsj76djh4c70447hidldr16h28yb839lpx05z6dpzshx";
+    sha256 = "0cwf80lryzhdajd3r97b33ym5njjpf5rbcbjzz7lja0w9xs1dvwj";
   };
 
   features.iwlwifi = true;

From f16594e18bc6b7a67f1d8072701a980fddf97b8c Mon Sep 17 00:00:00 2001
From: Svein Ove Aas <sveina@gmail.com>
Date: Sat, 26 Dec 2015 16:50:37 +0100
Subject: [PATCH 288/884] nixos/fail2ban: Enable jails by default
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

With jails defaulting to 'enabled = true', the sshd jail that NixOS
defines will now be enabled.

[Bjørn: tweak commit message]
---
 nixos/modules/services/security/fail2ban.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/security/fail2ban.nix b/nixos/modules/services/security/fail2ban.nix
index 6288b1b3ba86..1d3e18dcab25 100644
--- a/nixos/modules/services/security/fail2ban.nix
+++ b/nixos/modules/services/security/fail2ban.nix
@@ -138,6 +138,7 @@ in
         findtime = 600
         maxretry = 3
         backend  = systemd
+        enabled  = true
        '';
 
     # Block SSH if there are too many failing connection attempts.

From b9e4cc83faf70877d90ae901214e91951fe98446 Mon Sep 17 00:00:00 2001
From: Eric Seidel <gridaphobe@gmail.com>
Date: Mon, 4 Jan 2016 13:19:28 -0800
Subject: [PATCH 289/884] emacs-packages: remove custom derivations for
 auto-complete, async, and markdown-mode

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

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index fc2e60d7fd11..8c407ac50954 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -234,21 +234,6 @@ let
     };
   };
 
-  async = melpaBuild rec {
-    pname   = "async";
-    version = "1.5";
-    src = fetchFromGitHub {
-      owner  = "jwiegley";
-      repo   = "emacs-async";
-      rev    = "v${version}";
-      sha256 = "1yq1aby4n5k3caasynhxhakng01qp4099zjbsm633d351ib3h20g";
-    };
-    meta = {
-      description = "Asynchronous processing in Emacs";
-      license = gpl3Plus;
-    };
-  };
-
   auctex = melpaBuild rec {
     pname   = "auctex";
     version = "11.87.7";
@@ -266,23 +251,6 @@ let
     };
   };
 
-  auto-complete = melpaBuild rec {
-    pname = "auto-complete";
-    version = "1.4.0";
-    src = fetchFromGitHub {
-      owner = pname;
-      repo  = pname;
-      rev   = "v${version}";
-      sha256 = "050lb8qjq7ra35mqp6j6qkwbvq5zj3yhz73aym5kf1vjd42rmjcw";
-    };
-    packageRequires = [ popup ];
-    meta = {
-      description = "Auto-complete extension for Emacs";
-      homepage = http://cx4a.org/software/auto-complete/;
-      license = gpl3Plus;
-    };
-  };
-
   autotetris = melpaBuild {
     pname = "autotetris-mode";
     version = "20141114.846";
@@ -1293,21 +1261,6 @@ let
     };
   };
 
-  markdown-mode = melpaBuild rec {
-    pname   = "markdown-mode";
-    version = "2.0";
-    src = fetchFromGitHub {
-      owner  = "defunkt";
-      repo   = pname;
-      rev    = "v${version}";
-      sha256 = "1l2w0j9xl8pipz61426s79jq2yns42vjvysc6yjc29kbsnhalj29";
-    };
-    meta = {
-      description = "Major mode for editing markdown files in Emacs";
-      license = gpl3Plus;
-    };
-  };
-
   markdown-toc = melpaBuild rec {
     pname = "markdown-toc";
     version = "0.0.8";

From bb3cd0e4619b8a4ea6457562efe82e081a118e2f Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Mon, 4 Jan 2016 22:55:49 +0100
Subject: [PATCH 290/884] pirate-get: update meta info

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 936af8939928..8b4a02b5a66b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5658,6 +5658,8 @@ in modules // {
       description = "A command line interface for The Pirate Bay";
       homepage = https://github.com/vikstrous/pirate-get;
       license = licenses.gpl1;
+      maintainers = with maintainers; [ rnhmjoj ];
+      platforms = platforms.unix;
     };
   };
 

From f22b28764caceaefb1a7d502511736e12e5e9028 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Mon, 4 Jan 2016 22:58:03 +0100
Subject: [PATCH 291/884] hyp: init at 1.2.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 936af8939928..2652e36a4d6d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6049,6 +6049,24 @@ in modules // {
     doCheck = false;
   };
 
+  hyp = buildPythonPackage rec {
+    name = "hyp-server-${version}";
+    version = "1.2.0";
+    disabled = !isPy3k;
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/h/hyp-server/${name}.tar.gz";
+      sha256 = "1lafjdcn9nnq6xc3hhyizfwh6l69lc7rixn6dx65aq71c913jc15";
+    };
+
+    meta = {
+      description = "Hyperminimal https server";
+      homepage = https://github.com/rnhmjoj/hyp;
+      license = with licenses; [gpl3Plus mit];
+      maintainers = with maintainers; [ rnhmjoj ];
+      platforms = platforms.unix;
+    };
+  };
 
   hypatia = buildPythonPackage rec {
     name = "hypatia-0.3";

From 222f4b9e2b894f514d9cde60106a4abd39834eb2 Mon Sep 17 00:00:00 2001
From: Eric Seidel <gridaphobe@gmail.com>
Date: Mon, 4 Jan 2016 14:07:17 -0800
Subject: [PATCH 292/884] gnustep-make: dont write to /Library/GNUstep

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

diff --git a/pkgs/development/tools/build-managers/gnustep/make/default.nix b/pkgs/development/tools/build-managers/gnustep/make/default.nix
index 4b6455e31ccc..68af0c114c4c 100644
--- a/pkgs/development/tools/build-managers/gnustep/make/default.nix
+++ b/pkgs/development/tools/build-managers/gnustep/make/default.nix
@@ -15,6 +15,9 @@ stdenv.mkDerivation rec {
 
     substituteInPlace FilesystemLayouts/apple \
       --replace /usr/local ""
+
+    substituteInPlace configure \
+      --replace /Library/GNUstep "$out"
   '';
 
   installFlags = [ "PREFIX=$(out)" ];

From 7462d96a65222decdd5ff3e7d288f4163f1ffd81 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 4 Jan 2016 22:12:28 +0100
Subject: [PATCH 293/884] ssreflect, mathcomp: fix build

---
 pkgs/development/coq-modules/mathcomp/generic.nix  | 1 +
 pkgs/development/coq-modules/ssreflect/generic.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkgs/development/coq-modules/mathcomp/generic.nix b/pkgs/development/coq-modules/mathcomp/generic.nix
index b4048aa80037..b257c81e85f8 100644
--- a/pkgs/development/coq-modules/mathcomp/generic.nix
+++ b/pkgs/development/coq-modules/mathcomp/generic.nix
@@ -18,6 +18,7 @@ stdenv.mkDerivation {
   buildFlags = stdenv.lib.optionalString withDoc "doc";
 
   preBuild = ''
+    patchShebangs etc/utils/ssrcoqdep
     cd mathcomp
     export COQBIN=${coq}/bin/
   '';
diff --git a/pkgs/development/coq-modules/ssreflect/generic.nix b/pkgs/development/coq-modules/ssreflect/generic.nix
index d7303ad8852c..891a4e2885a6 100644
--- a/pkgs/development/coq-modules/ssreflect/generic.nix
+++ b/pkgs/development/coq-modules/ssreflect/generic.nix
@@ -18,6 +18,7 @@ stdenv.mkDerivation {
   inherit patches;
 
   preBuild = ''
+    patchShebangs etc/utils/ssrcoqdep
     cd mathcomp/ssreflect
     export COQBIN=${coq}/bin/
   '';

From 3553258b1d5dea20325da3c36293fcba81b09b8e Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 4 Jan 2016 22:36:55 +0100
Subject: [PATCH 294/884] Revert "coqPackages.flocq: 2.4.0 -> 2.5.0"

This reverts commit db9bc6875f3ad5e7bddcbeab7124bd5b8fc684c6.

That reverted commit had introduced a wrong URL.
---
 pkgs/development/coq-modules/flocq/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/coq-modules/flocq/default.nix b/pkgs/development/coq-modules/flocq/default.nix
index 2ee0aeb20a17..1f1087a85d93 100644
--- a/pkgs/development/coq-modules/flocq/default.nix
+++ b/pkgs/development/coq-modules/flocq/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "2.5.0";
 
   src = fetchurl {
-    url = "https://gforge.inria.fr/frs/download.php/file/33979/flocq-${version}.tar.gz";
+    url = https://gforge.inria.fr/frs/download.php/file/35091/flocq-2.5.0.tar.gz;
     sha256 = "0v3qiaz7vxfc5nk8rxwi39mik7hm7p5kb040q2pimb69qgfl6vml";
   };
 

From 2027caa8758eba117cf38f5ec6892bb93e68ddfa Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 4 Jan 2016 22:46:08 +0100
Subject: [PATCH 295/884] coq-flocq: 2.5.0 -> 2.5.1

---
 pkgs/development/coq-modules/flocq/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/coq-modules/flocq/default.nix b/pkgs/development/coq-modules/flocq/default.nix
index 1f1087a85d93..09af50db971d 100644
--- a/pkgs/development/coq-modules/flocq/default.nix
+++ b/pkgs/development/coq-modules/flocq/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
 
   name = "coq-flocq-${coq.coq-version}-${version}";
-  version = "2.5.0";
+  version = "2.5.1";
 
   src = fetchurl {
-    url = https://gforge.inria.fr/frs/download.php/file/35091/flocq-2.5.0.tar.gz;
-    sha256 = "0v3qiaz7vxfc5nk8rxwi39mik7hm7p5kb040q2pimb69qgfl6vml";
+    url = https://gforge.inria.fr/frs/download.php/file/35430/flocq-2.5.1.tar.gz;
+    sha256 = "1a0gznvg32ckxgs3jzznc1368p8x2ny4vfwrnavb3h0ljcl1mlzy";
   };
 
   buildInputs = [ coq.ocaml coq.camlp5 bash which autoconf automake ];

From a8217711ce0289c653506e852a065c8190781cc9 Mon Sep 17 00:00:00 2001
From: Eric Seidel <gridaphobe@gmail.com>
Date: Mon, 4 Jan 2016 15:08:45 -0800
Subject: [PATCH 296/884] fetchgitLocal: make it work in submodules

---
 pkgs/build-support/fetchgitlocal/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/fetchgitlocal/default.nix b/pkgs/build-support/fetchgitlocal/default.nix
index 830133b982d3..60803ddcb1f8 100644
--- a/pkgs/build-support/fetchgitlocal/default.nix
+++ b/pkgs/build-support/fetchgitlocal/default.nix
@@ -10,9 +10,9 @@ let
       preferLocalBuild = true;
     } ''
       cd ${srcStr}
-      ROOT=$(git rev-parse --show-toplevel) # path to repo
+      DOT_GIT=$(git rev-parse --resolve-git-dir .git) # path to repo
 
-      cp $ROOT/.git/index $ROOT/.git/index-user # backup index
+      cp $DOT_GIT/index $DOT_GIT/index-user # backup index
       git reset # reset index
       git add . # add current directory
 
@@ -21,7 +21,7 @@ let
       git rev-parse $(git write-tree) \
         | tr -d '\n' > $out
 
-      mv $ROOT/.git/index-user $ROOT/.git/index # restore index
+      mv $DOT_GIT/index-user $DOT_GIT/index # restore index
     '';
 
   gitHash = builtins.readFile gitHashFile; # cache against git hash

From fb5f7dd953328eb55795a1bdda60f1d8d558909a Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 15 Sep 2015 07:50:46 +0100
Subject: [PATCH 297/884] zfstools: 0.3.2 -> 0.3.3

---
 pkgs/tools/filesystems/zfstools/default.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/filesystems/zfstools/default.nix b/pkgs/tools/filesystems/zfstools/default.nix
index 16df53314765..9bfbb902fea3 100644
--- a/pkgs/tools/filesystems/zfstools/default.nix
+++ b/pkgs/tools/filesystems/zfstools/default.nix
@@ -1,12 +1,11 @@
 { stdenv, fetchFromGitHub, ruby, zfs }:
 
+let version = "0.3.3"; in
 stdenv.mkDerivation rec {
   name = "zfstools-${version}";
 
-  version = "0.3.2";
-
   src = fetchFromGitHub {
-    sha256 = "1dzfir9413qrmx9kqpndi3l2m09f6l1wspnwn84lm3n1g9cr46nd";
+    sha256 = "1gj6jksc9crmjvhsx8yp3l06b5vcm415l0bmdjcil7jjbfhwwp2k";
     rev = "v${version}";
     repo = "zfstools";
     owner = "bdrewery";
@@ -27,15 +26,14 @@ stdenv.mkDerivation rec {
     sed -e 's|cmd.*=.*"zfs |cmd = "${zfs}/sbin/zfs |g' -i $out/lib/zfstools/{dataset,snapshot}.rb
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     inherit version;
-    homepage = https://github.com/bdrewery/zfstools;
-    description = "OpenSolaris-like and compatible auto snapshotting script for ZFS";
+    inherit (src.meta) homepage;
+    description = "OpenSolaris-compatible auto-snapshotting script for ZFS";
     longDescription = ''
       zfstools is an OpenSolaris-like and compatible auto snapshotting script
       for ZFS, which also supports auto snapshotting mysql databases.
     '';
-
-    license = stdenv.lib.licenses.bsd2;
+    license = licenses.bsd2;
   };
 }

From a133ef9a0c866479d1b420549d4ce633e7b6f337 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 5 Jan 2016 00:54:03 +0100
Subject: [PATCH 298/884] liferea, graphite service: fix typo (agregator ->
 aggregator)

---
 nixos/modules/services/monitoring/graphite.nix               | 4 ++--
 pkgs/applications/networking/newsreaders/liferea/default.nix | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix
index 57abb959fdb7..ce8e572cc999 100644
--- a/nixos/modules/services/monitoring/graphite.nix
+++ b/nixos/modules/services/monitoring/graphite.nix
@@ -256,13 +256,13 @@ in {
       };
 
       enableAggregator = mkOption {
-        description = "Whether to enable carbon agregator, the carbon buffering service.";
+        description = "Whether to enable carbon aggregator, the carbon buffering service.";
         default = false;
         type = types.bool;
       };
 
       aggregationRules = mkOption {
-        description = "Defines if and how received metrics will be agregated.";
+        description = "Defines if and how received metrics will be aggregated.";
         default = null;
         type = types.uniq (types.nullOr types.string);
         example = ''
diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix
index 7c148e3de41f..952c763c5f4a 100644
--- a/pkgs/applications/networking/newsreaders/liferea/default.nix
+++ b/pkgs/applications/networking/newsreaders/liferea/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "A GTK-based news feed agregator";
+    description = "A GTK-based news feed aggregator";
     homepage = http://lzone.de/liferea/;
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ vcunat romildo ];

From f2297914540a7ce641cedaaeaba1817f4738b88f Mon Sep 17 00:00:00 2001
From: Shell Turner <cam.turn@gmail.com>
Date: Sun, 3 Jan 2016 14:33:56 +0000
Subject: [PATCH 299/884] freenet: rewrite wrapper to not depend on PATH

---
 .../networking/p2p/freenet/default.nix        | 74 +++++++++++--------
 .../networking/p2p/freenet/freenetWrapper     |  8 +-
 2 files changed, 47 insertions(+), 35 deletions(-)

diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/pkgs/applications/networking/p2p/freenet/default.nix
index 80f8eb840f13..51d7a49cac79 100644
--- a/pkgs/applications/networking/p2p/freenet/default.nix
+++ b/pkgs/applications/networking/p2p/freenet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchgit, ant, jdk, makeWrapper }:
+{ stdenv, fetchurl, fetchgit, ant, jdk, bash, coreutils, substituteAll }:
 
 let
   freenet_ext = fetchurl {
@@ -15,46 +15,56 @@ let
     sha256 = "109zn9w8axdkjwhkkcm2s8dvib0mq0n8imjgs3r8hvi128cjsmg9";
   };
   version = "build01470";
-in
-stdenv.mkDerivation {
-  name = "freenet-${version}";
 
+  freenet-jars = stdenv.mkDerivation {
+    name = "freenet-jars-${version}";
 
-  src = fetchgit {
-    url = https://github.com/freenet/fred;
-    rev = "refs/tags/${version}";
-    sha256 = "1b6e6fec2b9a729d4a25605fa142df9ea42e59b379ff665f580e32c6178c9746";
+    src = fetchgit {
+      url = https://github.com/freenet/fred;
+      rev = "refs/tags/${version}";
+      sha256 = "1b6e6fec2b9a729d4a25605fa142df9ea42e59b379ff665f580e32c6178c9746";
+    };
+
+    patchPhase = ''
+      cp ${freenet_ext} lib/freenet/freenet-ext.jar
+      cp ${bcprov} lib/bcprov-jdk15on-152.jar
+
+      sed '/antcall.*-ext/d' -i build.xml
+      sed 's/@unknown@/${version}/g' -i build-clean.xml
+    '';
+
+    buildInputs = [ ant jdk ];
+
+    buildPhase = "ant package-only";
+
+    installPhase = ''
+      mkdir -p $out/share/freenet
+      cp lib/bcprov-jdk15on-152.jar $out/share/freenet
+      cp lib/freenet/freenet-ext.jar $out/share/freenet
+      cp dist/freenet.jar $out/share/freenet
+    '';
   };
 
-  patchPhase = ''
-    cp ${freenet_ext} lib/freenet/freenet-ext.jar
-    cp ${bcprov} lib/bcprov-jdk15on-152.jar
+in stdenv.mkDerivation {
+  name = "freenet-${version}";
+  inherit version;
 
-    sed '/antcall.*-ext/d' -i build.xml
-    sed 's/@unknown@/${version}/g' -i build-clean.xml
-  '';
+  src = substituteAll {
+    src = ./freenetWrapper;
+    inherit bash coreutils seednodes;
+    freenet = freenet-jars;
+    jre = jdk.jre;
+  };
 
-  buildInputs = [ ant jdk makeWrapper ];
+  jars = freenet-jars;
 
-  buildPhase = "ant package-only";
-
-  freenetWrapper = ./freenetWrapper;
+  phases = [ "installPhase" ];
 
   installPhase = ''
-    mkdir -p $out/share/freenet $out/bin
-    cp lib/bcprov-jdk15on-152.jar $out/share/freenet
-    cp lib/freenet/freenet-ext.jar $out/share/freenet
-    cp dist/freenet.jar $out/share/freenet
-
-    cat <<EOF > $out/bin/freenet.wrapped
-    #!${stdenv.shell}
-    ${jdk.jre}/bin/java -cp $out/share/freenet/bcprov-jdk15on-152.jar:$out/share/freenet/freenet-ext.jar:$out/share/freenet/freenet.jar \\
-      -Xmx1024M freenet.node.NodeStarter
-    EOF
-    chmod +x $out/bin/freenet.wrapped
-    makeWrapper $freenetWrapper $out/bin/freenet \
-      --set FREENET_ROOT "$out" \
-      --set FREENET_SEEDNODES "${seednodes}"
+    mkdir -p $out/bin
+    cp $src $out/bin/freenet
+    chmod +x $out/bin/freenet
+    ln -s ${freenet-jars}/share $out/share
   '';
 
   meta = {
diff --git a/pkgs/applications/networking/p2p/freenet/freenetWrapper b/pkgs/applications/networking/p2p/freenet/freenetWrapper
index c1667f158b97..6df7f4924587 100755
--- a/pkgs/applications/networking/p2p/freenet/freenetWrapper
+++ b/pkgs/applications/networking/p2p/freenet/freenetWrapper
@@ -1,4 +1,6 @@
-#! /usr/bin/env bash
+#! @bash@/bin/bash
+
+PATH=@coreutils@/bin:$PATH
 
 export FREENET_HOME="$HOME/.local/share/freenet"
 if [ -n "$XDG_DATA_HOME" ]
@@ -9,8 +11,8 @@ if [ ! -d $FREENET_HOME ]; then
   mkdir -p $FREENET_HOME
 fi
 
-cp -u $FREENET_SEEDNODES $FREENET_HOME/seednodes.fref
+cp -u @seednodes@ $FREENET_HOME/seednodes.fref
 chmod u+rw $FREENET_HOME/seednodes.fref
 
 cd $FREENET_HOME
-exec $FREENET_ROOT/bin/freenet.wrapped "$@"
+@jre@/bin/java -cp @freenet@/share/freenet/bcprov-jdk15on-152.jar:@freenet@/share/freenet/freenet-ext.jar:@freenet@/share/freenet/freenet.jar -Xmx1024M freenet.node.NodeStarter

From 067467edf3e598d76c2cad83819e63837127eb3b Mon Sep 17 00:00:00 2001
From: Matthew O'Gorman <mog@rldn.net>
Date: Sat, 2 Jan 2016 02:08:18 -0500
Subject: [PATCH 300/884] hexchat: fix enchant dependency usage at runtime.
 xchat: correctly use gtkspell for spell checking.

---
 pkgs/applications/networking/irc/hexchat/default.nix | 5 +++++
 pkgs/applications/networking/irc/xchat/default.nix   | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix
index dfe5c3b0182f..65d365b5981c 100644
--- a/pkgs/applications/networking/irc/hexchat/default.nix
+++ b/pkgs/applications/networking/irc/hexchat/default.nix
@@ -20,6 +20,11 @@ stdenv.mkDerivation rec {
     desktop_file_utils hicolor_icon_theme
   ];
 
+ #hexchat and heachat-text loads enchant spell checking library at run time and so it needs to have route to the path
+  patchPhase = ''
+    sed -i "s,libenchant.so.1,${enchant}/lib/libenchant.so.1,g" src/fe-gtk/sexy-spell-entry.c
+  '';
+
   configureFlags = [ "--enable-shm" "--enable-textfe" ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/irc/xchat/default.nix b/pkgs/applications/networking/irc/xchat/default.nix
index 1999bd030cbc..c6252b1649b6 100644
--- a/pkgs/applications/networking/irc/xchat/default.nix
+++ b/pkgs/applications/networking/irc/xchat/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, tcl, gtk}:
+{stdenv, fetchurl, pkgconfig, tcl, gtk, gtkspell }:
 
 stdenv.mkDerivation {
   name = "xchat-2.8.8";
@@ -6,8 +6,8 @@ stdenv.mkDerivation {
     url = http://www.xchat.org/files/source/2.8/xchat-2.8.8.tar.bz2;
     sha256 = "0d6d69437b5e1e45f3e66270fe369344943de8a1190e498fafa5296315a27db0";
   };
-  buildInputs = [pkgconfig tcl gtk];
-  configureFlags = "--disable-nls";
+  buildInputs = [pkgconfig tcl gtk gtkspell];
+  configureFlags = "--disable-nls --enable-spell=gtkspell";
 
   patches = [ ./glib-top-level-header.patch ];
 

From 32fa84d8e7c90de178427eeefd82516789017baa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 4 Jan 2016 22:58:06 +0100
Subject: [PATCH 301/884] wine: refactor an argument

---
 pkgs/top-level/all-packages.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3c25d094673f..289d9602bc96 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15691,9 +15691,7 @@ let
   wine = callPackage ../misc/emulators/wine {
     wineRelease = config.wine.release or "stable";
     wineBuild = config.wine.build or "wine32";
-    pulseaudioSupport = if (config ? pulseaudio)
-                        then config.pulseaudio
-                        else stdenv.isLinux;
+    pulseaudioSupport = config.pulseaudio or stdenv.isLinux;
   };
   wineStable = wine.override { wineRelease = "stable"; };
   wineUnstable = lowPrio (wine.override { wineRelease = "unstable"; });

From fdbc58fe422bfbf2f79fcfc8e1a336962b5df030 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 5 Jan 2016 09:20:04 +0100
Subject: [PATCH 302/884] release.nix: fixup evaluation after darwin changes

/cc @copumpkin. I can't really test this, but it should unbreak Hydra
evaluation at least.
---
 pkgs/top-level/release.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 50331b83e8e8..4f58e002d88d 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -55,7 +55,7 @@ let
         { inherit (import ../stdenv/linux/make-bootstrap-tools.nix { system = "x86_64-linux"; }) dist test; };
 
       stdenvBootstrapTools.x86_64-darwin =
-        { inherit (import ../stdenv/pure-darwin/make-bootstrap-tools.nix) dist test; };
+        { inherit (import ../stdenv/darwin/make-bootstrap-tools.nix { system = "x86_64-darwin"; }) dist test; };
 
     } // (mapTestOn ((packagePlatforms pkgs) // rec {
 

From 1ebff73b8865606ff4bc14e372e07d22a260d819 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 30 Dec 2015 11:11:33 +0100
Subject: [PATCH 303/884] stdenv/setup.sh: don't skip post-hooks (close #12032)

So far if no configure script is found or no makefile,
the rest of the phase is skipped, *including* post-hooks.
I find that behavior unexpected/unintuitive.

Earlier version of this patch had problems due to me assuming
that $configureScript is always a simple path, but that turned out
to be false in many cases, e.g. perl.
---
 pkgs/stdenv/generic/setup.sh | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index a01af7db70a3..4693974a2b77 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -612,12 +612,8 @@ fixLibtool() {
 configurePhase() {
     runHook preConfigure
 
-    if [ -z "$configureScript" ]; then
+    if [ -z "$configureScript" -a -x ./configure ]; then
         configureScript=./configure
-        if ! [ -x $configureScript ]; then
-            echo "no configure script, doing nothing"
-            return
-        fi
     fi
 
     if [ -z "$dontFixLibtool" ]; then
@@ -645,8 +641,12 @@ configurePhase() {
         fi
     fi
 
-    echo "configure flags: $configureFlags ${configureFlagsArray[@]}"
-    $configureScript $configureFlags "${configureFlagsArray[@]}"
+    if [ -n "$configureScript" ]; then
+        echo "configure flags: $configureFlags ${configureFlagsArray[@]}"
+        $configureScript $configureFlags "${configureFlagsArray[@]}"
+    else
+        echo "no configure script, doing nothing"
+    fi
 
     runHook postConfigure
 }
@@ -657,18 +657,17 @@ buildPhase() {
 
     if [ -z "$makeFlags" ] && ! [ -n "$makefile" -o -e "Makefile" -o -e "makefile" -o -e "GNUmakefile" ]; then
         echo "no Makefile, doing nothing"
-        return
+    else
+        # See https://github.com/NixOS/nixpkgs/pull/1354#issuecomment-31260409
+        makeFlags="SHELL=$SHELL $makeFlags"
+
+        echo "make flags: $makeFlags ${makeFlagsArray[@]} $buildFlags ${buildFlagsArray[@]}"
+        make ${makefile:+-f $makefile} \
+            ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} \
+            $makeFlags "${makeFlagsArray[@]}" \
+            $buildFlags "${buildFlagsArray[@]}"
     fi
 
-    # See https://github.com/NixOS/nixpkgs/pull/1354#issuecomment-31260409
-    makeFlags="SHELL=$SHELL $makeFlags"
-
-    echo "make flags: $makeFlags ${makeFlagsArray[@]} $buildFlags ${buildFlagsArray[@]}"
-    make ${makefile:+-f $makefile} \
-        ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} \
-        $makeFlags "${makeFlagsArray[@]}" \
-        $buildFlags "${buildFlagsArray[@]}"
-
     runHook postBuild
 }
 

From 9b091e8a0c6dcb5892e2a9e704e952d8ea333525 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 2 Jan 2016 11:44:38 +0100
Subject: [PATCH 304/884] krb5: simplify unpacking

---
 pkgs/development/libraries/kerberos/krb5.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index e735285231ea..5b2b09542037 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -26,11 +26,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ openssl ]
     ++ optionals (!libOnly) [ openldap libedit ];
 
-  unpackPhase = ''
-    tar -xf $src
-    #tar -xzf krb5-${version}.tar.gz
-    cd krb5-${version}/src
-  '';
+  preConfigure = "cd ./src";
 
   buildPhase = optionalString libOnly ''
     (cd util; make -j $NIX_BUILD_CORES)

From aa4562596f4cc5a53eae70fdf75a8995cc001c86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 5 Jan 2016 09:42:56 +0100
Subject: [PATCH 305/884] apr-util: refactor options

---
 .../libraries/apr-util/default.nix            | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix
index e0b2832f6e42..c123740f5c12 100644
--- a/pkgs/development/libraries/apr-util/default.nix
+++ b/pkgs/development/libraries/apr-util/default.nix
@@ -20,18 +20,19 @@ stdenv.mkDerivation rec {
     sha256 = "0bn81pfscy9yjvbmyx442svf43s6dhrdfcsnkpxz43fai5qk5kx6";
   };
 
-  patches = stdenv.lib.optionals stdenv.isFreeBSD [ ./include-static-dependencies.patch ];
+  patches = optional stdenv.isFreeBSD ./include-static-dependencies.patch;
 
-  buildInputs = stdenv.lib.optionals stdenv.isFreeBSD [ autoreconfHook ];
+  buildInputs = optional stdenv.isFreeBSD autoreconfHook;
 
-  configureFlags = ''
-    --with-apr=${apr} --with-expat=${expat}
-    ${optionalString (!stdenv.isCygwin) "--with-crypto"}
-    ${stdenv.lib.optionalString sslSupport "--with-openssl=${openssl}"}
-    ${stdenv.lib.optionalString bdbSupport "--with-berkeley-db=${db}"}
-    ${stdenv.lib.optionalString ldapSupport "--with-ldap=ldap"}${
-      optionalString stdenv.isCygwin "--without-pgsql --without-sqlite2 --without-sqlite3 --without-freetds --without-berkeley-db --without-crypto"}
-  '';
+  configureFlags = [ "--with-apr=${apr}" "--with-expat=${expat}" ]
+    ++ optional (!stdenv.isCygwin) "--with-crypto"
+    ++ optional sslSupport "--with-openssl=${openssl}"
+    ++ optional bdbSupport "--with-berkeley-db=${db}"
+    ++ optional ldapSupport "--with-ldap=ldap"
+    ++ optionals stdenv.isCygwin
+      [ "--without-pgsql" "--without-sqlite2" "--without-sqlite3"
+        "--without-freetds" "--without-berkeley-db" "--without-crypto" ]
+    ;
 
   propagatedBuildInputs = [ makeWrapper apr expat libiconv ]
     ++ optional sslSupport openssl

From f61bdd5653f7c29d41dd47d41807ab32745d561e Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jascha@jgeerds.name>
Date: Tue, 5 Jan 2016 10:09:18 +0100
Subject: [PATCH 306/884] virtualenv: 1.11.6 -> 13.1.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c805c7dd6831..5793bf35998b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19638,10 +19638,11 @@ in modules // {
   };
 
   virtualenv = buildPythonPackage rec {
-    name = "virtualenv-1.11.6";
+    name = "virtualenv-13.1.2";
+
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/v/virtualenv/${name}.tar.gz";
-      md5 = "f61cdd983d2c4e6aeabb70b1060d6f49";
+      sha256 = "1p732accxwqfjbdna39k8w8lp9gyw91vr4kzkhm8mgfxikqqxg5a";
     };
 
     pythonPath = [ self.recursivePthLoader ];
@@ -19650,9 +19651,8 @@ in modules // {
 
     propagatedBuildInputs = with self; [ modules.readline modules.sqlite3 modules.curses ];
 
-    buildInputs = with self; [ mock nose ];
-
-    # XXX: Ran 0 tests in 0.003s
+    # Tarball doesn't contain tests
+    doCheck = false;
 
     meta = {
       description = "a tool to create isolated Python environments";

From 550fe7f233b7ccd4b3eec8f16a7b3c07b2845549 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 1 Jan 2016 00:30:49 +0100
Subject: [PATCH 307/884] hackage-packages.nix: update Haskell package set

This update was generated by hackage2nix v20151217-5-ged07a8e using the following inputs:

  - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/665c16fbe13d709f2573ff7d845429c0d534e143
  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/d9755ca900cb3c632f9bf2e4e73ea0f4a3d20254
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/d3e5ae70f97caffd4362b1511f3a2edfdc8a493d
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/56e1f693d5d91367b35c3c752841a537f6e793fb
---
 .../haskell-modules/configuration-lts-0.0.nix |    9 +
 .../haskell-modules/configuration-lts-0.1.nix |    9 +
 .../haskell-modules/configuration-lts-0.2.nix |    9 +
 .../haskell-modules/configuration-lts-0.3.nix |    9 +
 .../haskell-modules/configuration-lts-0.4.nix |    9 +
 .../haskell-modules/configuration-lts-0.5.nix |    9 +
 .../haskell-modules/configuration-lts-0.6.nix |    9 +
 .../haskell-modules/configuration-lts-0.7.nix |    9 +
 .../haskell-modules/configuration-lts-1.0.nix |   10 +
 .../haskell-modules/configuration-lts-1.1.nix |   10 +
 .../configuration-lts-1.10.nix                |   11 +
 .../configuration-lts-1.11.nix                |   11 +
 .../configuration-lts-1.12.nix                |   11 +
 .../configuration-lts-1.13.nix                |   11 +
 .../configuration-lts-1.14.nix                |   11 +
 .../configuration-lts-1.15.nix                |   11 +
 .../haskell-modules/configuration-lts-1.2.nix |   10 +
 .../haskell-modules/configuration-lts-1.4.nix |   10 +
 .../haskell-modules/configuration-lts-1.5.nix |   10 +
 .../haskell-modules/configuration-lts-1.7.nix |   10 +
 .../haskell-modules/configuration-lts-1.8.nix |   10 +
 .../haskell-modules/configuration-lts-1.9.nix |   10 +
 .../haskell-modules/configuration-lts-2.0.nix |   11 +
 .../haskell-modules/configuration-lts-2.1.nix |   11 +
 .../configuration-lts-2.10.nix                |   11 +
 .../configuration-lts-2.11.nix                |   12 +
 .../configuration-lts-2.12.nix                |   12 +
 .../configuration-lts-2.13.nix                |   12 +
 .../configuration-lts-2.14.nix                |   12 +
 .../configuration-lts-2.15.nix                |   12 +
 .../configuration-lts-2.16.nix                |   12 +
 .../configuration-lts-2.17.nix                |   12 +
 .../configuration-lts-2.18.nix                |   12 +
 .../configuration-lts-2.19.nix                |   12 +
 .../haskell-modules/configuration-lts-2.2.nix |   11 +
 .../configuration-lts-2.20.nix                |   12 +
 .../configuration-lts-2.21.nix                |   12 +
 .../configuration-lts-2.22.nix                |   12 +
 .../haskell-modules/configuration-lts-2.3.nix |   11 +
 .../haskell-modules/configuration-lts-2.4.nix |   11 +
 .../haskell-modules/configuration-lts-2.5.nix |   11 +
 .../haskell-modules/configuration-lts-2.6.nix |   11 +
 .../haskell-modules/configuration-lts-2.7.nix |   11 +
 .../haskell-modules/configuration-lts-2.8.nix |   11 +
 .../haskell-modules/configuration-lts-2.9.nix |   11 +
 .../haskell-modules/configuration-lts-3.0.nix |   16 +
 .../haskell-modules/configuration-lts-3.1.nix |   16 +
 .../configuration-lts-3.10.nix                |   23 +
 .../configuration-lts-3.11.nix                |   23 +
 .../configuration-lts-3.12.nix                |   23 +
 .../configuration-lts-3.13.nix                |   24 +
 .../configuration-lts-3.14.nix                |   24 +
 .../configuration-lts-3.15.nix                |   24 +
 .../configuration-lts-3.16.nix                |   25 +
 .../configuration-lts-3.17.nix                |   26 +
 .../configuration-lts-3.18.nix                |   26 +
 .../configuration-lts-3.19.nix                |   27 +
 .../haskell-modules/configuration-lts-3.2.nix |   16 +
 .../configuration-lts-3.20.nix                |   27 +
 .../haskell-modules/configuration-lts-3.3.nix |   16 +
 .../haskell-modules/configuration-lts-3.4.nix |   16 +
 .../haskell-modules/configuration-lts-3.5.nix |   17 +
 .../haskell-modules/configuration-lts-3.6.nix |   17 +
 .../haskell-modules/configuration-lts-3.7.nix |   17 +
 .../haskell-modules/configuration-lts-3.8.nix |   18 +
 .../haskell-modules/configuration-lts-3.9.nix |   18 +
 .../haskell-modules/hackage-packages.nix      | 1529 +++++++++++++----
 67 files changed, 2094 insertions(+), 357 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
index b9645b56cd0a..387d9ce34cba 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
@@ -2458,6 +2458,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3256,6 +3257,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3450,6 +3452,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -4119,6 +4122,7 @@ self: super: {
   "hdocs" = dontDistribute super."hdocs";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heap" = dontDistribute super."heap";
   "heaps" = doDistribute super."heaps_0_3_1";
@@ -4270,6 +4274,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4980,6 +4985,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -6150,6 +6156,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "optional-args" = dontDistribute super."optional-args";
   "options" = doDistribute super."options_1_2";
@@ -8602,6 +8609,7 @@ self: super: {
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
   "web-routing" = dontDistribute super."web-routing";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8677,6 +8685,7 @@ self: super: {
   "wreq" = dontDistribute super."wreq";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
index d6623d248856..67afa95738b3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
@@ -2458,6 +2458,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3256,6 +3257,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3450,6 +3452,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -4119,6 +4122,7 @@ self: super: {
   "hdocs" = dontDistribute super."hdocs";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heap" = dontDistribute super."heap";
   "heaps" = doDistribute super."heaps_0_3_1";
@@ -4270,6 +4274,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4980,6 +4985,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -6150,6 +6156,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "optional-args" = dontDistribute super."optional-args";
   "options" = doDistribute super."options_1_2";
@@ -8602,6 +8609,7 @@ self: super: {
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
   "web-routing" = dontDistribute super."web-routing";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8677,6 +8685,7 @@ self: super: {
   "wreq" = dontDistribute super."wreq";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
index a1aaa4e53517..3fd4bcaf194d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
@@ -2458,6 +2458,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3256,6 +3257,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3450,6 +3452,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -4119,6 +4122,7 @@ self: super: {
   "hdocs" = dontDistribute super."hdocs";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heap" = dontDistribute super."heap";
   "heaps" = doDistribute super."heaps_0_3_1";
@@ -4270,6 +4274,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4980,6 +4985,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -6150,6 +6156,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "optional-args" = dontDistribute super."optional-args";
   "options" = doDistribute super."options_1_2_1";
@@ -8602,6 +8609,7 @@ self: super: {
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
   "web-routing" = dontDistribute super."web-routing";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8677,6 +8685,7 @@ self: super: {
   "wreq" = dontDistribute super."wreq";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
index ce34cb1bcd48..cf83df292401 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
@@ -2458,6 +2458,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3256,6 +3257,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3450,6 +3452,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -4119,6 +4122,7 @@ self: super: {
   "hdocs" = dontDistribute super."hdocs";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heap" = dontDistribute super."heap";
   "heaps" = doDistribute super."heaps_0_3_1";
@@ -4270,6 +4274,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4980,6 +4985,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -6150,6 +6156,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "optional-args" = dontDistribute super."optional-args";
   "options" = doDistribute super."options_1_2_1";
@@ -8602,6 +8609,7 @@ self: super: {
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
   "web-routing" = dontDistribute super."web-routing";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8677,6 +8685,7 @@ self: super: {
   "wreq" = dontDistribute super."wreq";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
index c173363b0527..ffc67b0cfd07 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
@@ -2458,6 +2458,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3255,6 +3256,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3449,6 +3451,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -4116,6 +4119,7 @@ self: super: {
   "hdocs" = dontDistribute super."hdocs";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heap" = dontDistribute super."heap";
   "heaps" = doDistribute super."heaps_0_3_1";
@@ -4267,6 +4271,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4977,6 +4982,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -6147,6 +6153,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "optional-args" = dontDistribute super."optional-args";
   "options" = doDistribute super."options_1_2_1";
@@ -8598,6 +8605,7 @@ self: super: {
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
   "web-routing" = dontDistribute super."web-routing";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8673,6 +8681,7 @@ self: super: {
   "wreq" = dontDistribute super."wreq";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
index 0c7e2e0ac75c..29053c22b134 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
@@ -2458,6 +2458,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3255,6 +3256,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3449,6 +3451,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -4116,6 +4119,7 @@ self: super: {
   "hdocs" = dontDistribute super."hdocs";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heap" = dontDistribute super."heap";
   "heaps" = doDistribute super."heaps_0_3_1";
@@ -4267,6 +4271,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4977,6 +4982,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -6147,6 +6153,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "optional-args" = dontDistribute super."optional-args";
   "options" = doDistribute super."options_1_2_1";
@@ -8598,6 +8605,7 @@ self: super: {
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
   "web-routing" = dontDistribute super."web-routing";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8673,6 +8681,7 @@ self: super: {
   "wreq" = dontDistribute super."wreq";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
index 39bdc2e1efbc..d305f8e8446c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
@@ -2455,6 +2455,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3252,6 +3253,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3446,6 +3448,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -4112,6 +4115,7 @@ self: super: {
   "hdocs" = dontDistribute super."hdocs";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heap" = dontDistribute super."heap";
   "heaps" = doDistribute super."heaps_0_3_1";
@@ -4263,6 +4267,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4973,6 +4978,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -6142,6 +6148,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "optional-args" = dontDistribute super."optional-args";
   "options" = doDistribute super."options_1_2_1";
@@ -8592,6 +8599,7 @@ self: super: {
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
   "web-routing" = dontDistribute super."web-routing";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8667,6 +8675,7 @@ self: super: {
   "wreq" = dontDistribute super."wreq";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
index 144f844f38b6..bd815c7d76c8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
@@ -2455,6 +2455,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3252,6 +3253,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3446,6 +3448,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -4112,6 +4115,7 @@ self: super: {
   "hdocs" = dontDistribute super."hdocs";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heap" = dontDistribute super."heap";
   "heaps" = doDistribute super."heaps_0_3_1";
@@ -4263,6 +4267,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4973,6 +4978,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -6142,6 +6148,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "optional-args" = dontDistribute super."optional-args";
   "options" = doDistribute super."options_1_2_1";
@@ -8592,6 +8599,7 @@ self: super: {
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
   "web-routing" = dontDistribute super."web-routing";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8667,6 +8675,7 @@ self: super: {
   "wreq" = dontDistribute super."wreq";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
index 9e295e4780ae..f2119c8dc9fc 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
@@ -2446,6 +2446,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3242,6 +3243,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3436,6 +3438,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -4102,6 +4105,7 @@ self: super: {
   "hdocs" = dontDistribute super."hdocs";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heap" = dontDistribute super."heap";
   "heaps" = doDistribute super."heaps_0_3_1";
@@ -4252,6 +4256,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4961,6 +4966,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -6130,6 +6136,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "optional-args" = dontDistribute super."optional-args";
   "options" = doDistribute super."options_1_2_1";
@@ -6194,6 +6201,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -8576,6 +8584,7 @@ self: super: {
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
   "web-routing" = dontDistribute super."web-routing";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8651,6 +8660,7 @@ self: super: {
   "wreq" = dontDistribute super."wreq";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
index 728316c3a820..8d687da24aa5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
@@ -2443,6 +2443,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3238,6 +3239,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3432,6 +3434,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -4097,6 +4100,7 @@ self: super: {
   "hdocs" = dontDistribute super."hdocs";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heap" = dontDistribute super."heap";
   "heaps" = doDistribute super."heaps_0_3_1";
@@ -4245,6 +4249,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4954,6 +4959,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -6122,6 +6128,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "optional-args" = dontDistribute super."optional-args";
   "options" = doDistribute super."options_1_2_1";
@@ -6186,6 +6193,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -8562,6 +8570,7 @@ self: super: {
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
   "web-routing" = dontDistribute super."web-routing";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8637,6 +8646,7 @@ self: super: {
   "wreq" = dontDistribute super."wreq";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
index 7fa73aef87f6..155a73c67810 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
@@ -1730,6 +1730,7 @@ self: super: {
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-markup" = doDistribute super."blaze-markup_0_6_3_0";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_4_1";
   "blaze-textual" = doDistribute super."blaze-textual_0_2_0_9";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
@@ -2438,6 +2439,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3229,6 +3231,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3422,6 +3425,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -4085,6 +4089,7 @@ self: super: {
   "hdocs" = dontDistribute super."hdocs";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heap" = dontDistribute super."heap";
   "heaps" = doDistribute super."heaps_0_3_1";
@@ -4233,6 +4238,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4935,6 +4941,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -6100,6 +6107,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "optional-args" = dontDistribute super."optional-args";
   "options-time" = dontDistribute super."options-time";
@@ -6163,6 +6171,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -8530,6 +8539,7 @@ self: super: {
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
   "web-routing" = dontDistribute super."web-routing";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8604,6 +8614,7 @@ self: super: {
   "wreq" = dontDistribute super."wreq";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
index bec2d4451cf0..12f89d91d60b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
@@ -1730,6 +1730,7 @@ self: super: {
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-markup" = doDistribute super."blaze-markup_0_6_3_0";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_4_1";
   "blaze-textual" = doDistribute super."blaze-textual_0_2_0_9";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
@@ -2438,6 +2439,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3228,6 +3230,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3421,6 +3424,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -4084,6 +4088,7 @@ self: super: {
   "hdocs" = dontDistribute super."hdocs";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heap" = dontDistribute super."heap";
   "heaps" = doDistribute super."heaps_0_3_1";
@@ -4232,6 +4237,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4932,6 +4938,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -6096,6 +6103,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "optional-args" = dontDistribute super."optional-args";
   "options-time" = dontDistribute super."options-time";
@@ -6159,6 +6167,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -8526,6 +8535,7 @@ self: super: {
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
   "web-routing" = dontDistribute super."web-routing";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8600,6 +8610,7 @@ self: super: {
   "wreq" = dontDistribute super."wreq";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
index cec00a8f3664..f8a890cbcd86 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
@@ -1730,6 +1730,7 @@ self: super: {
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-markup" = doDistribute super."blaze-markup_0_6_3_0";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_4_1";
   "blaze-textual" = doDistribute super."blaze-textual_0_2_0_9";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
@@ -2438,6 +2439,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3228,6 +3230,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3421,6 +3424,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -4084,6 +4088,7 @@ self: super: {
   "hdocs" = dontDistribute super."hdocs";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heap" = dontDistribute super."heap";
   "heaps" = doDistribute super."heaps_0_3_2";
@@ -4231,6 +4236,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4931,6 +4937,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -6095,6 +6102,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "optional-args" = dontDistribute super."optional-args";
   "options-time" = dontDistribute super."options-time";
@@ -6158,6 +6166,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -8523,6 +8532,7 @@ self: super: {
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
   "web-routing" = dontDistribute super."web-routing";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8597,6 +8607,7 @@ self: super: {
   "wreq" = dontDistribute super."wreq";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
index befe47dcfb41..097541c7f76b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
@@ -1730,6 +1730,7 @@ self: super: {
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-markup" = doDistribute super."blaze-markup_0_6_3_0";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_4_1";
   "blaze-textual" = doDistribute super."blaze-textual_0_2_0_9";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
@@ -2438,6 +2439,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3228,6 +3230,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3421,6 +3424,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -4083,6 +4087,7 @@ self: super: {
   "hdocs" = dontDistribute super."hdocs";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heap" = dontDistribute super."heap";
   "heaps" = doDistribute super."heaps_0_3_2";
@@ -4230,6 +4235,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4930,6 +4936,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -6094,6 +6101,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "optional-args" = dontDistribute super."optional-args";
   "options-time" = dontDistribute super."options-time";
@@ -6157,6 +6165,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -8521,6 +8530,7 @@ self: super: {
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
   "web-routing" = dontDistribute super."web-routing";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8595,6 +8605,7 @@ self: super: {
   "wreq" = dontDistribute super."wreq";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
index cef0ee4bb890..5c957dfef699 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
@@ -1728,6 +1728,7 @@ self: super: {
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-markup" = doDistribute super."blaze-markup_0_6_3_0";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_4_1";
   "blaze-textual" = doDistribute super."blaze-textual_0_2_0_9";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
@@ -2435,6 +2436,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3225,6 +3227,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3418,6 +3421,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -4080,6 +4084,7 @@ self: super: {
   "hdocs" = dontDistribute super."hdocs";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heaps" = doDistribute super."heaps_0_3_2";
   "heapsort" = dontDistribute super."heapsort";
@@ -4226,6 +4231,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4926,6 +4932,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -6087,6 +6094,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "optional-args" = dontDistribute super."optional-args";
   "options-time" = dontDistribute super."options-time";
@@ -6150,6 +6158,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -8513,6 +8522,7 @@ self: super: {
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
   "web-routing" = dontDistribute super."web-routing";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8587,6 +8597,7 @@ self: super: {
   "wreq" = dontDistribute super."wreq";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
index b7a4aea50cf6..3409b3c0ef0c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
@@ -1727,6 +1727,7 @@ self: super: {
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-markup" = doDistribute super."blaze-markup_0_6_3_0";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_4_1";
   "blaze-textual" = doDistribute super."blaze-textual_0_2_0_9";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
@@ -2431,6 +2432,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3220,6 +3222,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3413,6 +3416,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -4075,6 +4079,7 @@ self: super: {
   "hdocs" = dontDistribute super."hdocs";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heaps" = doDistribute super."heaps_0_3_2";
   "heapsort" = dontDistribute super."heapsort";
@@ -4221,6 +4226,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4921,6 +4927,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -6080,6 +6087,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "optional-args" = dontDistribute super."optional-args";
   "options-time" = dontDistribute super."options-time";
@@ -6143,6 +6151,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -8502,6 +8511,7 @@ self: super: {
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
   "web-routing" = dontDistribute super."web-routing";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8575,6 +8585,7 @@ self: super: {
   "wreq" = dontDistribute super."wreq";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
index 1b57d9ff9249..3b85936a5246 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
@@ -2441,6 +2441,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3236,6 +3237,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3429,6 +3431,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -4094,6 +4097,7 @@ self: super: {
   "hdocs" = dontDistribute super."hdocs";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heap" = dontDistribute super."heap";
   "heaps" = doDistribute super."heaps_0_3_1";
@@ -4242,6 +4246,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4951,6 +4956,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -6119,6 +6125,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "optional-args" = dontDistribute super."optional-args";
   "options-time" = dontDistribute super."options-time";
@@ -6182,6 +6189,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -8556,6 +8564,7 @@ self: super: {
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
   "web-routing" = dontDistribute super."web-routing";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8631,6 +8640,7 @@ self: super: {
   "wreq" = dontDistribute super."wreq";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
index d4f0bb300dfe..0f7be7eb06ea 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
@@ -2440,6 +2440,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3234,6 +3235,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3427,6 +3429,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -4091,6 +4094,7 @@ self: super: {
   "hdocs" = dontDistribute super."hdocs";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heap" = dontDistribute super."heap";
   "heaps" = doDistribute super."heaps_0_3_1";
@@ -4239,6 +4243,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4948,6 +4953,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -6115,6 +6121,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "optional-args" = dontDistribute super."optional-args";
   "options-time" = dontDistribute super."options-time";
@@ -6178,6 +6185,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -8551,6 +8559,7 @@ self: super: {
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
   "web-routing" = dontDistribute super."web-routing";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8626,6 +8635,7 @@ self: super: {
   "wreq" = dontDistribute super."wreq";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
index 05ac5e89bf35..82082047ae22 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
@@ -2439,6 +2439,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3233,6 +3234,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3426,6 +3428,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -4090,6 +4093,7 @@ self: super: {
   "hdocs" = dontDistribute super."hdocs";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heap" = dontDistribute super."heap";
   "heaps" = doDistribute super."heaps_0_3_1";
@@ -4238,6 +4242,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4946,6 +4951,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -6113,6 +6119,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "optional-args" = dontDistribute super."optional-args";
   "options-time" = dontDistribute super."options-time";
@@ -6176,6 +6183,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -8547,6 +8555,7 @@ self: super: {
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
   "web-routing" = dontDistribute super."web-routing";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8622,6 +8631,7 @@ self: super: {
   "wreq" = dontDistribute super."wreq";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
index bbbc05f20110..8348d0b6c303 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
@@ -2439,6 +2439,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3233,6 +3234,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3426,6 +3428,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -4090,6 +4093,7 @@ self: super: {
   "hdocs" = dontDistribute super."hdocs";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heap" = dontDistribute super."heap";
   "heaps" = doDistribute super."heaps_0_3_1";
@@ -4238,6 +4242,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4940,6 +4945,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -6107,6 +6113,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "optional-args" = dontDistribute super."optional-args";
   "options-time" = dontDistribute super."options-time";
@@ -6170,6 +6177,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -8541,6 +8549,7 @@ self: super: {
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
   "web-routing" = dontDistribute super."web-routing";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8616,6 +8625,7 @@ self: super: {
   "wreq" = dontDistribute super."wreq";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
index 27fa6d9416b1..6d55ad6fe06b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
@@ -2439,6 +2439,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3231,6 +3232,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3424,6 +3426,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -4087,6 +4090,7 @@ self: super: {
   "hdocs" = dontDistribute super."hdocs";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heap" = dontDistribute super."heap";
   "heaps" = doDistribute super."heaps_0_3_1";
@@ -4235,6 +4239,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4937,6 +4942,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -6103,6 +6109,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "optional-args" = dontDistribute super."optional-args";
   "options-time" = dontDistribute super."options-time";
@@ -6166,6 +6173,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -8536,6 +8544,7 @@ self: super: {
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
   "web-routing" = dontDistribute super."web-routing";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8611,6 +8620,7 @@ self: super: {
   "wreq" = dontDistribute super."wreq";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
index 65cd4a24259b..ab83e91179a9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
@@ -2439,6 +2439,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3230,6 +3231,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3423,6 +3425,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -4086,6 +4089,7 @@ self: super: {
   "hdocs" = dontDistribute super."hdocs";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heap" = dontDistribute super."heap";
   "heaps" = doDistribute super."heaps_0_3_1";
@@ -4234,6 +4238,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4936,6 +4941,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -6102,6 +6108,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "optional-args" = dontDistribute super."optional-args";
   "options-time" = dontDistribute super."options-time";
@@ -6165,6 +6172,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -8535,6 +8543,7 @@ self: super: {
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
   "web-routing" = dontDistribute super."web-routing";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8610,6 +8619,7 @@ self: super: {
   "wreq" = dontDistribute super."wreq";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
index e07f079d116f..85e062fe36f9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
@@ -1715,6 +1715,7 @@ self: super: {
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_4_1";
   "blaze-textual" = doDistribute super."blaze-textual_0_2_0_9";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
@@ -2415,6 +2416,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3200,6 +3202,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3393,6 +3396,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -4051,6 +4055,7 @@ self: super: {
   "hdocs" = doDistribute super."hdocs_0_4_1_3";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heaps" = doDistribute super."heaps_0_3_2";
   "heapsort" = dontDistribute super."heapsort";
@@ -4196,6 +4201,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4887,6 +4893,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -6026,6 +6033,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "optional-args" = dontDistribute super."optional-args";
   "options-time" = dontDistribute super."options-time";
@@ -6090,6 +6098,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -8435,6 +8444,7 @@ self: super: {
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
   "web-routing" = dontDistribute super."web-routing";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8507,6 +8517,7 @@ self: super: {
   "wreq" = doDistribute super."wreq_0_3_0_1";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
index 569843334925..c1590ae945e0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
@@ -1715,6 +1715,7 @@ self: super: {
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_4_1";
   "blaze-textual" = doDistribute super."blaze-textual_0_2_0_9";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
@@ -2414,6 +2415,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3199,6 +3201,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3392,6 +3395,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -4050,6 +4054,7 @@ self: super: {
   "hdocs" = doDistribute super."hdocs_0_4_1_3";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4194,6 +4199,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4885,6 +4891,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -6024,6 +6031,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "optional-args" = dontDistribute super."optional-args";
   "options-time" = dontDistribute super."options-time";
@@ -6088,6 +6096,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -8432,6 +8441,7 @@ self: super: {
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
   "web-routing" = dontDistribute super."web-routing";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8504,6 +8514,7 @@ self: super: {
   "wreq" = doDistribute super."wreq_0_3_0_1";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
index 79d8476e8e63..c68e4d1b057e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
@@ -1706,6 +1706,7 @@ self: super: {
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_4_1";
   "blaze-textual" = doDistribute super."blaze-textual_0_2_0_9";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
@@ -2400,6 +2401,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3180,6 +3182,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3373,6 +3376,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -4028,6 +4032,7 @@ self: super: {
   "hdocs" = doDistribute super."hdocs_0_4_1_3";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4171,6 +4176,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4858,6 +4864,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -5985,6 +5992,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "optional-args" = dontDistribute super."optional-args";
   "options-time" = dontDistribute super."options-time";
@@ -6048,6 +6056,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -8375,6 +8384,7 @@ self: super: {
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
   "web-routing" = dontDistribute super."web-routing";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8446,6 +8456,7 @@ self: super: {
   "wreq" = doDistribute super."wreq_0_3_0_1";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
index a7655f5bea43..757109bd3e62 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
@@ -1705,6 +1705,7 @@ self: super: {
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_4_1";
   "blaze-textual" = doDistribute super."blaze-textual_0_2_0_9";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
@@ -2399,6 +2400,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3179,6 +3181,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3371,6 +3374,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -4025,6 +4029,7 @@ self: super: {
   "hdocs" = doDistribute super."hdocs_0_4_1_3";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4168,6 +4173,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4226,6 +4232,7 @@ self: super: {
   "hnop" = dontDistribute super."hnop";
   "ho-rewriting" = dontDistribute super."ho-rewriting";
   "hoauth" = dontDistribute super."hoauth";
+  "hoauth2" = doDistribute super."hoauth2_0_4_8";
   "hob" = dontDistribute super."hob";
   "hobbes" = dontDistribute super."hobbes";
   "hobbits" = dontDistribute super."hobbits";
@@ -4854,6 +4861,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -5979,6 +5987,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "optional-args" = dontDistribute super."optional-args";
   "options-time" = dontDistribute super."options-time";
@@ -6041,6 +6050,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -8365,6 +8375,7 @@ self: super: {
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
   "web-routing" = dontDistribute super."web-routing";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8436,6 +8447,7 @@ self: super: {
   "wreq" = doDistribute super."wreq_0_3_0_1";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
index 795818378783..4a9ccf73b00c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
@@ -1705,6 +1705,7 @@ self: super: {
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_4_1";
   "blaze-textual" = doDistribute super."blaze-textual_0_2_0_9";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
@@ -2399,6 +2400,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3179,6 +3181,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3371,6 +3374,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -4025,6 +4029,7 @@ self: super: {
   "hdocs" = doDistribute super."hdocs_0_4_1_3";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4168,6 +4173,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4226,6 +4232,7 @@ self: super: {
   "hnop" = dontDistribute super."hnop";
   "ho-rewriting" = dontDistribute super."ho-rewriting";
   "hoauth" = dontDistribute super."hoauth";
+  "hoauth2" = doDistribute super."hoauth2_0_4_8";
   "hob" = dontDistribute super."hob";
   "hobbes" = dontDistribute super."hobbes";
   "hobbits" = dontDistribute super."hobbits";
@@ -4854,6 +4861,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -5979,6 +5987,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "optional-args" = dontDistribute super."optional-args";
   "options-time" = dontDistribute super."options-time";
@@ -6041,6 +6050,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -8364,6 +8374,7 @@ self: super: {
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
   "web-routing" = dontDistribute super."web-routing";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8435,6 +8446,7 @@ self: super: {
   "wreq" = doDistribute super."wreq_0_3_0_1";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
index 7d256156c8d9..86f90c4fad61 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
@@ -1705,6 +1705,7 @@ self: super: {
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_4_1";
   "blaze-textual" = doDistribute super."blaze-textual_0_2_0_9";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
@@ -2399,6 +2400,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3179,6 +3181,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3371,6 +3374,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -4024,6 +4028,7 @@ self: super: {
   "hdocs" = doDistribute super."hdocs_0_4_1_3";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4167,6 +4172,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4225,6 +4231,7 @@ self: super: {
   "hnop" = dontDistribute super."hnop";
   "ho-rewriting" = dontDistribute super."ho-rewriting";
   "hoauth" = dontDistribute super."hoauth";
+  "hoauth2" = doDistribute super."hoauth2_0_4_8";
   "hob" = dontDistribute super."hob";
   "hobbes" = dontDistribute super."hobbes";
   "hobbits" = dontDistribute super."hobbits";
@@ -4852,6 +4859,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -5976,6 +5984,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "optional-args" = dontDistribute super."optional-args";
   "options-time" = dontDistribute super."options-time";
@@ -6038,6 +6047,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -8361,6 +8371,7 @@ self: super: {
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
   "web-routing" = dontDistribute super."web-routing";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8432,6 +8443,7 @@ self: super: {
   "wreq" = doDistribute super."wreq_0_3_0_1";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
index e65538bf9208..a4e27bc81ebb 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
@@ -1704,6 +1704,7 @@ self: super: {
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_4_1";
   "blaze-textual" = doDistribute super."blaze-textual_0_2_0_9";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
@@ -2398,6 +2399,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3177,6 +3179,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3369,6 +3372,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -4022,6 +4026,7 @@ self: super: {
   "hdocs" = doDistribute super."hdocs_0_4_1_3";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4165,6 +4170,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4223,6 +4229,7 @@ self: super: {
   "hnop" = dontDistribute super."hnop";
   "ho-rewriting" = dontDistribute super."ho-rewriting";
   "hoauth" = dontDistribute super."hoauth";
+  "hoauth2" = doDistribute super."hoauth2_0_4_8";
   "hob" = dontDistribute super."hob";
   "hobbes" = dontDistribute super."hobbes";
   "hobbits" = dontDistribute super."hobbits";
@@ -4849,6 +4856,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -5973,6 +5981,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "optional-args" = dontDistribute super."optional-args";
   "options-time" = dontDistribute super."options-time";
@@ -6035,6 +6044,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -8355,6 +8365,7 @@ self: super: {
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
   "web-routing" = dontDistribute super."web-routing";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8425,6 +8436,7 @@ self: super: {
   "wreq" = doDistribute super."wreq_0_3_0_1";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
index 9e373c8b8baa..cf63ab5da0a8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
@@ -1704,6 +1704,7 @@ self: super: {
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_4_1";
   "blaze-textual" = doDistribute super."blaze-textual_0_2_0_9";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
@@ -2398,6 +2399,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3176,6 +3178,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3368,6 +3371,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -4021,6 +4025,7 @@ self: super: {
   "hdocs" = doDistribute super."hdocs_0_4_1_3";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4164,6 +4169,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4222,6 +4228,7 @@ self: super: {
   "hnop" = dontDistribute super."hnop";
   "ho-rewriting" = dontDistribute super."ho-rewriting";
   "hoauth" = dontDistribute super."hoauth";
+  "hoauth2" = doDistribute super."hoauth2_0_4_8";
   "hob" = dontDistribute super."hob";
   "hobbes" = dontDistribute super."hobbes";
   "hobbits" = dontDistribute super."hobbits";
@@ -4848,6 +4855,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -5969,6 +5977,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "optional-args" = dontDistribute super."optional-args";
   "options-time" = dontDistribute super."options-time";
@@ -6031,6 +6040,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -8350,6 +8360,7 @@ self: super: {
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
   "web-routing" = dontDistribute super."web-routing";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8420,6 +8431,7 @@ self: super: {
   "wreq" = doDistribute super."wreq_0_3_0_1";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
index eebcd6863fb5..b6046ed6d24c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
@@ -1703,6 +1703,7 @@ self: super: {
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_4_1";
   "blaze-textual" = doDistribute super."blaze-textual_0_2_0_9";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
@@ -2395,6 +2396,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3171,6 +3173,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3363,6 +3366,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -4015,6 +4019,7 @@ self: super: {
   "hdocs" = doDistribute super."hdocs_0_4_1_3";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4158,6 +4163,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4216,6 +4222,7 @@ self: super: {
   "hnop" = dontDistribute super."hnop";
   "ho-rewriting" = dontDistribute super."ho-rewriting";
   "hoauth" = dontDistribute super."hoauth";
+  "hoauth2" = doDistribute super."hoauth2_0_4_8";
   "hob" = dontDistribute super."hob";
   "hobbes" = dontDistribute super."hobbes";
   "hobbits" = dontDistribute super."hobbits";
@@ -4842,6 +4849,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -5962,6 +5970,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "optional-args" = dontDistribute super."optional-args";
   "options-time" = dontDistribute super."options-time";
@@ -6024,6 +6033,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -8343,6 +8353,7 @@ self: super: {
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
   "web-routing" = dontDistribute super."web-routing";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8413,6 +8424,7 @@ self: super: {
   "wreq" = doDistribute super."wreq_0_3_0_1";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
index 82d59bbc25da..f1fb49b5608c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
@@ -1702,6 +1702,7 @@ self: super: {
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_4_1";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
   "blink1" = dontDistribute super."blink1";
@@ -2393,6 +2394,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3167,6 +3169,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3358,6 +3361,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -4010,6 +4014,7 @@ self: super: {
   "hdocs" = doDistribute super."hdocs_0_4_1_3";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4153,6 +4158,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4211,6 +4217,7 @@ self: super: {
   "hnop" = dontDistribute super."hnop";
   "ho-rewriting" = dontDistribute super."ho-rewriting";
   "hoauth" = dontDistribute super."hoauth";
+  "hoauth2" = doDistribute super."hoauth2_0_4_8";
   "hob" = dontDistribute super."hob";
   "hobbes" = dontDistribute super."hobbes";
   "hobbits" = dontDistribute super."hobbits";
@@ -4837,6 +4844,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -5956,6 +5964,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "optional-args" = dontDistribute super."optional-args";
   "options-time" = dontDistribute super."options-time";
@@ -6018,6 +6027,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -8337,6 +8347,7 @@ self: super: {
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
   "web-routing" = dontDistribute super."web-routing";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8407,6 +8418,7 @@ self: super: {
   "wreq" = doDistribute super."wreq_0_3_0_1";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
index 21cefb587e98..2e62f9b9c5eb 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
@@ -1702,6 +1702,7 @@ self: super: {
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_4_1";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
   "blink1" = dontDistribute super."blink1";
@@ -2392,6 +2393,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3165,6 +3167,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3356,6 +3359,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -4008,6 +4012,7 @@ self: super: {
   "hdocs" = doDistribute super."hdocs_0_4_1_3";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4150,6 +4155,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4208,6 +4214,7 @@ self: super: {
   "hnop" = dontDistribute super."hnop";
   "ho-rewriting" = dontDistribute super."ho-rewriting";
   "hoauth" = dontDistribute super."hoauth";
+  "hoauth2" = doDistribute super."hoauth2_0_4_8";
   "hob" = dontDistribute super."hob";
   "hobbes" = dontDistribute super."hobbes";
   "hobbits" = dontDistribute super."hobbits";
@@ -4834,6 +4841,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -5952,6 +5960,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "optional-args" = dontDistribute super."optional-args";
   "options-time" = dontDistribute super."options-time";
@@ -6014,6 +6023,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -8331,6 +8341,7 @@ self: super: {
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
   "web-routing" = dontDistribute super."web-routing";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8401,6 +8412,7 @@ self: super: {
   "wreq" = doDistribute super."wreq_0_3_0_1";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
index 6f165dfcc9a2..f7d3dd6f0648 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
@@ -1702,6 +1702,7 @@ self: super: {
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_4_1";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
   "blink1" = dontDistribute super."blink1";
@@ -2392,6 +2393,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3164,6 +3166,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3355,6 +3358,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -4007,6 +4011,7 @@ self: super: {
   "hdocs" = doDistribute super."hdocs_0_4_1_3";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4149,6 +4154,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4207,6 +4213,7 @@ self: super: {
   "hnop" = dontDistribute super."hnop";
   "ho-rewriting" = dontDistribute super."ho-rewriting";
   "hoauth" = dontDistribute super."hoauth";
+  "hoauth2" = doDistribute super."hoauth2_0_4_8";
   "hob" = dontDistribute super."hob";
   "hobbes" = dontDistribute super."hobbes";
   "hobbits" = dontDistribute super."hobbits";
@@ -4833,6 +4840,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -5949,6 +5957,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "optional-args" = dontDistribute super."optional-args";
   "options-time" = dontDistribute super."options-time";
@@ -6011,6 +6020,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -8326,6 +8336,7 @@ self: super: {
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
   "web-routing" = dontDistribute super."web-routing";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8395,6 +8406,7 @@ self: super: {
   "wreq" = doDistribute super."wreq_0_3_0_1";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
index cd3071219734..d74835152551 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
@@ -1714,6 +1714,7 @@ self: super: {
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_4_1";
   "blaze-textual" = doDistribute super."blaze-textual_0_2_0_9";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
@@ -2411,6 +2412,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3196,6 +3198,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3389,6 +3392,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -4047,6 +4051,7 @@ self: super: {
   "hdocs" = doDistribute super."hdocs_0_4_1_3";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4191,6 +4196,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4882,6 +4888,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -6021,6 +6028,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "optional-args" = dontDistribute super."optional-args";
   "options-time" = dontDistribute super."options-time";
@@ -6085,6 +6093,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -8429,6 +8438,7 @@ self: super: {
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
   "web-routing" = dontDistribute super."web-routing";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8500,6 +8510,7 @@ self: super: {
   "wreq" = doDistribute super."wreq_0_3_0_1";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
index c7d6ff49218b..e8162894e885 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
@@ -1702,6 +1702,7 @@ self: super: {
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_4_1";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
   "blink1" = dontDistribute super."blink1";
@@ -2391,6 +2392,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3163,6 +3165,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3354,6 +3357,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -4005,6 +4009,7 @@ self: super: {
   "hdocs" = doDistribute super."hdocs_0_4_1_3";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4147,6 +4152,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4205,6 +4211,7 @@ self: super: {
   "hnop" = dontDistribute super."hnop";
   "ho-rewriting" = dontDistribute super."ho-rewriting";
   "hoauth" = dontDistribute super."hoauth";
+  "hoauth2" = doDistribute super."hoauth2_0_4_8";
   "hob" = dontDistribute super."hob";
   "hobbes" = dontDistribute super."hobbes";
   "hobbits" = dontDistribute super."hobbits";
@@ -4831,6 +4838,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -5947,6 +5955,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "optional-args" = dontDistribute super."optional-args";
   "options-time" = dontDistribute super."options-time";
@@ -6009,6 +6018,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -8322,6 +8332,7 @@ self: super: {
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
   "web-routing" = dontDistribute super."web-routing";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8391,6 +8402,7 @@ self: super: {
   "wreq" = doDistribute super."wreq_0_3_0_1";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
index 90a69ad56441..3b73cbcc6d76 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
@@ -1702,6 +1702,7 @@ self: super: {
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_4_1";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
   "blink1" = dontDistribute super."blink1";
@@ -2391,6 +2392,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3163,6 +3165,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3354,6 +3357,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -4005,6 +4009,7 @@ self: super: {
   "hdocs" = doDistribute super."hdocs_0_4_1_3";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4147,6 +4152,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4205,6 +4211,7 @@ self: super: {
   "hnop" = dontDistribute super."hnop";
   "ho-rewriting" = dontDistribute super."ho-rewriting";
   "hoauth" = dontDistribute super."hoauth";
+  "hoauth2" = doDistribute super."hoauth2_0_4_8";
   "hob" = dontDistribute super."hob";
   "hobbes" = dontDistribute super."hobbes";
   "hobbits" = dontDistribute super."hobbits";
@@ -4831,6 +4838,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -5946,6 +5954,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "optional-args" = dontDistribute super."optional-args";
   "options-time" = dontDistribute super."options-time";
@@ -6008,6 +6017,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -8318,6 +8328,7 @@ self: super: {
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
   "web-routing" = dontDistribute super."web-routing";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8387,6 +8398,7 @@ self: super: {
   "wreq" = doDistribute super."wreq_0_3_0_1";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
index 009959fe19e0..80529cce6b3c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
@@ -1702,6 +1702,7 @@ self: super: {
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_4_1";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
   "blink1" = dontDistribute super."blink1";
@@ -2391,6 +2392,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3163,6 +3165,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3354,6 +3357,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -4005,6 +4009,7 @@ self: super: {
   "hdocs" = doDistribute super."hdocs_0_4_1_3";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4146,6 +4151,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4204,6 +4210,7 @@ self: super: {
   "hnop" = dontDistribute super."hnop";
   "ho-rewriting" = dontDistribute super."ho-rewriting";
   "hoauth" = dontDistribute super."hoauth";
+  "hoauth2" = doDistribute super."hoauth2_0_4_8";
   "hob" = dontDistribute super."hob";
   "hobbes" = dontDistribute super."hobbes";
   "hobbits" = dontDistribute super."hobbits";
@@ -4830,6 +4837,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -5944,6 +5952,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "optional-args" = dontDistribute super."optional-args";
   "options-time" = dontDistribute super."options-time";
@@ -6006,6 +6015,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -8316,6 +8326,7 @@ self: super: {
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
   "web-routing" = dontDistribute super."web-routing";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8385,6 +8396,7 @@ self: super: {
   "wreq" = doDistribute super."wreq_0_3_0_1";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
index c546030ccf4a..566a83cd75ce 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
@@ -1714,6 +1714,7 @@ self: super: {
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_4_1";
   "blaze-textual" = doDistribute super."blaze-textual_0_2_0_9";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
@@ -2411,6 +2412,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3195,6 +3197,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3388,6 +3391,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -4046,6 +4050,7 @@ self: super: {
   "hdocs" = doDistribute super."hdocs_0_4_1_3";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4190,6 +4195,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4880,6 +4886,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -6019,6 +6026,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "optional-args" = dontDistribute super."optional-args";
   "options-time" = dontDistribute super."options-time";
@@ -6083,6 +6091,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -8427,6 +8436,7 @@ self: super: {
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
   "web-routing" = dontDistribute super."web-routing";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8498,6 +8508,7 @@ self: super: {
   "wreq" = doDistribute super."wreq_0_3_0_1";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
index 92a77fdf3e04..3923a493fdd3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
@@ -1713,6 +1713,7 @@ self: super: {
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_4_1";
   "blaze-textual" = doDistribute super."blaze-textual_0_2_0_9";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
@@ -2410,6 +2411,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3194,6 +3196,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3387,6 +3390,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -4045,6 +4049,7 @@ self: super: {
   "hdocs" = doDistribute super."hdocs_0_4_1_3";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4189,6 +4194,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4879,6 +4885,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -6017,6 +6024,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "optional-args" = dontDistribute super."optional-args";
   "options-time" = dontDistribute super."options-time";
@@ -6080,6 +6088,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -8422,6 +8431,7 @@ self: super: {
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
   "web-routing" = dontDistribute super."web-routing";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8493,6 +8503,7 @@ self: super: {
   "wreq" = doDistribute super."wreq_0_3_0_1";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
index dd09a2b14827..f3aefecc1278 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
@@ -1713,6 +1713,7 @@ self: super: {
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_4_1";
   "blaze-textual" = doDistribute super."blaze-textual_0_2_0_9";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
@@ -2409,6 +2410,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3193,6 +3195,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3386,6 +3389,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -4044,6 +4048,7 @@ self: super: {
   "hdocs" = doDistribute super."hdocs_0_4_1_3";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4188,6 +4193,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4878,6 +4884,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -6015,6 +6022,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "optional-args" = dontDistribute super."optional-args";
   "options-time" = dontDistribute super."options-time";
@@ -6078,6 +6086,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -8419,6 +8428,7 @@ self: super: {
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
   "web-routing" = dontDistribute super."web-routing";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8490,6 +8500,7 @@ self: super: {
   "wreq" = doDistribute super."wreq_0_3_0_1";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
index 3467818cac8d..cea82a295220 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
@@ -1710,6 +1710,7 @@ self: super: {
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_4_1";
   "blaze-textual" = doDistribute super."blaze-textual_0_2_0_9";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
@@ -2406,6 +2407,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3190,6 +3192,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3383,6 +3386,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -4039,6 +4043,7 @@ self: super: {
   "hdocs" = doDistribute super."hdocs_0_4_1_3";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4183,6 +4188,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4873,6 +4879,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -6009,6 +6016,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "optional-args" = dontDistribute super."optional-args";
   "options-time" = dontDistribute super."options-time";
@@ -6072,6 +6080,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -8411,6 +8420,7 @@ self: super: {
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
   "web-routing" = dontDistribute super."web-routing";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8482,6 +8492,7 @@ self: super: {
   "wreq" = doDistribute super."wreq_0_3_0_1";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
index a6b18dd13999..091f9df6a341 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
@@ -1709,6 +1709,7 @@ self: super: {
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_4_1";
   "blaze-textual" = doDistribute super."blaze-textual_0_2_0_9";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
@@ -2405,6 +2406,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3189,6 +3191,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3382,6 +3385,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -4038,6 +4042,7 @@ self: super: {
   "hdocs" = doDistribute super."hdocs_0_4_1_3";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4182,6 +4187,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4872,6 +4878,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -6008,6 +6015,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "optional-args" = dontDistribute super."optional-args";
   "options-time" = dontDistribute super."options-time";
@@ -6071,6 +6079,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -8410,6 +8419,7 @@ self: super: {
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
   "web-routing" = dontDistribute super."web-routing";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8481,6 +8491,7 @@ self: super: {
   "wreq" = doDistribute super."wreq_0_3_0_1";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
index eae36c64f84d..a106f4f94aaa 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
@@ -1708,6 +1708,7 @@ self: super: {
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_4_1";
   "blaze-textual" = doDistribute super."blaze-textual_0_2_0_9";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
@@ -2404,6 +2405,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3187,6 +3189,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3380,6 +3383,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -4036,6 +4040,7 @@ self: super: {
   "hdocs" = doDistribute super."hdocs_0_4_1_3";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4180,6 +4185,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4869,6 +4875,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -6004,6 +6011,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "optional-args" = dontDistribute super."optional-args";
   "options-time" = dontDistribute super."options-time";
@@ -6067,6 +6075,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -8402,6 +8411,7 @@ self: super: {
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
   "web-routing" = dontDistribute super."web-routing";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8473,6 +8483,7 @@ self: super: {
   "wreq" = doDistribute super."wreq_0_3_0_1";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
index e20360ec9477..ce347e0b1e15 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
@@ -1706,6 +1706,7 @@ self: super: {
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_4_1";
   "blaze-textual" = doDistribute super."blaze-textual_0_2_0_9";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
@@ -2401,6 +2402,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3182,6 +3184,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3375,6 +3378,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -4030,6 +4034,7 @@ self: super: {
   "hdocs" = doDistribute super."hdocs_0_4_1_3";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4174,6 +4179,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4861,6 +4867,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -5994,6 +6001,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "optional-args" = dontDistribute super."optional-args";
   "options-time" = dontDistribute super."options-time";
@@ -6057,6 +6065,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -8387,6 +8396,7 @@ self: super: {
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
   "web-routing" = dontDistribute super."web-routing";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8458,6 +8468,7 @@ self: super: {
   "wreq" = doDistribute super."wreq_0_3_0_1";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
index e9b0d7e7f6cc..70cd63dbd1da 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
@@ -1647,6 +1647,7 @@ self: super: {
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_4_1";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
   "blink1" = dontDistribute super."blink1";
@@ -2317,6 +2318,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3059,6 +3061,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3246,6 +3249,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3887,6 +3891,7 @@ self: super: {
   "hdm" = dontDistribute super."hdm";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4024,6 +4029,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4082,6 +4088,7 @@ self: super: {
   "hnop" = dontDistribute super."hnop";
   "ho-rewriting" = dontDistribute super."ho-rewriting";
   "hoauth" = dontDistribute super."hoauth";
+  "hoauth2" = doDistribute super."hoauth2_0_4_8";
   "hob" = dontDistribute super."hob";
   "hobbes" = dontDistribute super."hobbes";
   "hobbits" = dontDistribute super."hobbits";
@@ -4685,6 +4692,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -5752,6 +5760,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
@@ -5812,6 +5821,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -6647,6 +6657,7 @@ self: super: {
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
   "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandi" = doDistribute super."sandi_0_3_5";
   "sandlib" = dontDistribute super."sandlib";
   "sandman" = dontDistribute super."sandman";
   "sarasvati" = dontDistribute super."sarasvati";
@@ -6782,6 +6793,8 @@ self: super: {
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession-backend-acid-state" = doDistribute super."serversession-backend-acid-state_1_0_1";
+  "serversession-backend-persistent" = doDistribute super."serversession-backend-persistent_1_0_1";
+  "serversession-backend-redis" = doDistribute super."serversession-backend-redis_1_0";
   "servius" = dontDistribute super."servius";
   "ses-html" = dontDistribute super."ses-html";
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
@@ -8008,6 +8021,7 @@ self: super: {
   "wai-predicates" = doDistribute super."wai-predicates_0_8_4";
   "wai-request-spec" = dontDistribute super."wai-request-spec";
   "wai-responsible" = dontDistribute super."wai-responsible";
+  "wai-route" = doDistribute super."wai-route_0_3";
   "wai-router" = dontDistribute super."wai-router";
   "wai-routes" = doDistribute super."wai-routes_0_7_3";
   "wai-routing" = doDistribute super."wai-routing_0_12_1";
@@ -8057,6 +8071,7 @@ self: super: {
   "web-routes-th" = dontDistribute super."web-routes-th";
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8125,6 +8140,7 @@ self: super: {
   "wreq" = doDistribute super."wreq_0_4_0_0";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
index f56ea13f5422..92beaad4c32c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
@@ -1646,6 +1646,7 @@ self: super: {
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_4_1";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
   "blink1" = dontDistribute super."blink1";
@@ -2316,6 +2317,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3055,6 +3057,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3242,6 +3245,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3882,6 +3886,7 @@ self: super: {
   "hdm" = dontDistribute super."hdm";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4019,6 +4024,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4077,6 +4083,7 @@ self: super: {
   "hnop" = dontDistribute super."hnop";
   "ho-rewriting" = dontDistribute super."ho-rewriting";
   "hoauth" = dontDistribute super."hoauth";
+  "hoauth2" = doDistribute super."hoauth2_0_4_8";
   "hob" = dontDistribute super."hob";
   "hobbes" = dontDistribute super."hobbes";
   "hobbits" = dontDistribute super."hobbits";
@@ -4680,6 +4687,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -5745,6 +5753,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
@@ -5805,6 +5814,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -6638,6 +6648,7 @@ self: super: {
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
   "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandi" = doDistribute super."sandi_0_3_5";
   "sandlib" = dontDistribute super."sandlib";
   "sandman" = dontDistribute super."sandman";
   "sarasvati" = dontDistribute super."sarasvati";
@@ -6773,6 +6784,8 @@ self: super: {
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession-backend-acid-state" = doDistribute super."serversession-backend-acid-state_1_0_1";
+  "serversession-backend-persistent" = doDistribute super."serversession-backend-persistent_1_0_1";
+  "serversession-backend-redis" = doDistribute super."serversession-backend-redis_1_0";
   "servius" = dontDistribute super."servius";
   "ses-html" = dontDistribute super."ses-html";
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
@@ -7998,6 +8011,7 @@ self: super: {
   "wai-predicates" = doDistribute super."wai-predicates_0_8_4";
   "wai-request-spec" = dontDistribute super."wai-request-spec";
   "wai-responsible" = dontDistribute super."wai-responsible";
+  "wai-route" = doDistribute super."wai-route_0_3";
   "wai-router" = dontDistribute super."wai-router";
   "wai-routes" = doDistribute super."wai-routes_0_7_3";
   "wai-routing" = doDistribute super."wai-routing_0_12_1";
@@ -8047,6 +8061,7 @@ self: super: {
   "web-routes-th" = dontDistribute super."web-routes-th";
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8115,6 +8130,7 @@ self: super: {
   "wreq" = doDistribute super."wreq_0_4_0_0";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
index db25ffbcf7e6..42ba52782493 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
@@ -1628,6 +1628,7 @@ self: super: {
   "blaze-html-truncate" = dontDistribute super."blaze-html-truncate";
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_4_1";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
   "blink1" = dontDistribute super."blink1";
@@ -2032,6 +2033,7 @@ self: super: {
   "complexity" = dontDistribute super."complexity";
   "compose-ltr" = dontDistribute super."compose-ltr";
   "compose-trans" = dontDistribute super."compose-trans";
+  "composition" = doDistribute super."composition_1_0_2";
   "composition-extra" = doDistribute super."composition-extra_1_1_0";
   "composition-tree" = dontDistribute super."composition-tree";
   "compression" = dontDistribute super."compression";
@@ -2287,6 +2289,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3004,6 +3007,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3190,6 +3194,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3824,6 +3829,7 @@ self: super: {
   "hdm" = dontDistribute super."hdm";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -3959,6 +3965,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4017,6 +4024,7 @@ self: super: {
   "hnop" = dontDistribute super."hnop";
   "ho-rewriting" = dontDistribute super."ho-rewriting";
   "hoauth" = dontDistribute super."hoauth";
+  "hoauth2" = doDistribute super."hoauth2_0_4_8";
   "hob" = dontDistribute super."hob";
   "hobbes" = dontDistribute super."hobbes";
   "hobbits" = dontDistribute super."hobbits";
@@ -4613,6 +4621,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -5663,6 +5672,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
@@ -5722,6 +5732,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -6538,6 +6549,7 @@ self: super: {
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
   "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandi" = doDistribute super."sandi_0_3_5";
   "sandlib" = dontDistribute super."sandlib";
   "sandman" = dontDistribute super."sandman";
   "sarasvati" = dontDistribute super."sarasvati";
@@ -6650,12 +6662,16 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "servant" = doDistribute super."servant_0_4_4_5";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
+  "servant-client" = doDistribute super."servant-client_0_4_4_5";
+  "servant-docs" = doDistribute super."servant-docs_0_4_4_5";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-examples" = dontDistribute super."servant-examples";
   "servant-github" = dontDistribute super."servant-github";
+  "servant-jquery" = doDistribute super."servant-jquery_0_4_4_5";
   "servant-lucid" = dontDistribute super."servant-lucid";
   "servant-mock" = dontDistribute super."servant-mock";
   "servant-pandoc" = doDistribute super."servant-pandoc_0_4_1_1";
@@ -6663,8 +6679,12 @@ self: super: {
   "servant-postgresql" = dontDistribute super."servant-postgresql";
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
+  "servant-server" = doDistribute super."servant-server_0_4_4_5";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-yaml" = dontDistribute super."servant-yaml";
+  "serversession-backend-acid-state" = doDistribute super."serversession-backend-acid-state_1_0_2";
+  "serversession-backend-persistent" = doDistribute super."serversession-backend-persistent_1_0_1";
+  "serversession-backend-redis" = doDistribute super."serversession-backend-redis_1_0";
   "servius" = dontDistribute super."servius";
   "ses-html" = dontDistribute super."ses-html";
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
@@ -7868,6 +7888,7 @@ self: super: {
   "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs";
   "wai-request-spec" = dontDistribute super."wai-request-spec";
   "wai-responsible" = dontDistribute super."wai-responsible";
+  "wai-route" = doDistribute super."wai-route_0_3";
   "wai-router" = dontDistribute super."wai-router";
   "wai-routes" = doDistribute super."wai-routes_0_7_3";
   "wai-routing" = doDistribute super."wai-routing_0_12_1";
@@ -7916,6 +7937,7 @@ self: super: {
   "web-routes-th" = dontDistribute super."web-routes-th";
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -7981,6 +8003,7 @@ self: super: {
   "wreq" = doDistribute super."wreq_0_4_0_0";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
index 6a5f4f910484..1de9c0315350 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
@@ -1627,6 +1627,7 @@ self: super: {
   "blaze-html-truncate" = dontDistribute super."blaze-html-truncate";
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_4_1";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
   "blink1" = dontDistribute super."blink1";
@@ -2030,6 +2031,7 @@ self: super: {
   "complexity" = dontDistribute super."complexity";
   "compose-ltr" = dontDistribute super."compose-ltr";
   "compose-trans" = dontDistribute super."compose-trans";
+  "composition" = doDistribute super."composition_1_0_2";
   "composition-extra" = doDistribute super."composition-extra_1_1_0";
   "composition-tree" = dontDistribute super."composition-tree";
   "compression" = dontDistribute super."compression";
@@ -2285,6 +2287,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3001,6 +3004,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3186,6 +3190,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3820,6 +3825,7 @@ self: super: {
   "hdm" = dontDistribute super."hdm";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -3955,6 +3961,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4013,6 +4020,7 @@ self: super: {
   "hnop" = dontDistribute super."hnop";
   "ho-rewriting" = dontDistribute super."ho-rewriting";
   "hoauth" = dontDistribute super."hoauth";
+  "hoauth2" = doDistribute super."hoauth2_0_4_8";
   "hob" = dontDistribute super."hob";
   "hobbes" = dontDistribute super."hobbes";
   "hobbits" = dontDistribute super."hobbits";
@@ -4609,6 +4617,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -5659,6 +5668,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
@@ -5718,6 +5728,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -6532,6 +6543,7 @@ self: super: {
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
   "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandi" = doDistribute super."sandi_0_3_5";
   "sandlib" = dontDistribute super."sandlib";
   "sandman" = dontDistribute super."sandman";
   "sarasvati" = dontDistribute super."sarasvati";
@@ -6644,12 +6656,16 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "servant" = doDistribute super."servant_0_4_4_5";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
+  "servant-client" = doDistribute super."servant-client_0_4_4_5";
+  "servant-docs" = doDistribute super."servant-docs_0_4_4_5";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-examples" = dontDistribute super."servant-examples";
   "servant-github" = dontDistribute super."servant-github";
+  "servant-jquery" = doDistribute super."servant-jquery_0_4_4_5";
   "servant-lucid" = dontDistribute super."servant-lucid";
   "servant-mock" = dontDistribute super."servant-mock";
   "servant-pandoc" = doDistribute super."servant-pandoc_0_4_1_1";
@@ -6657,8 +6673,12 @@ self: super: {
   "servant-postgresql" = dontDistribute super."servant-postgresql";
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
+  "servant-server" = doDistribute super."servant-server_0_4_4_5";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-yaml" = dontDistribute super."servant-yaml";
+  "serversession-backend-acid-state" = doDistribute super."serversession-backend-acid-state_1_0_2";
+  "serversession-backend-persistent" = doDistribute super."serversession-backend-persistent_1_0_1";
+  "serversession-backend-redis" = doDistribute super."serversession-backend-redis_1_0";
   "servius" = dontDistribute super."servius";
   "ses-html" = dontDistribute super."ses-html";
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
@@ -7860,6 +7880,7 @@ self: super: {
   "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs";
   "wai-request-spec" = dontDistribute super."wai-request-spec";
   "wai-responsible" = dontDistribute super."wai-responsible";
+  "wai-route" = doDistribute super."wai-route_0_3";
   "wai-router" = dontDistribute super."wai-router";
   "wai-routes" = doDistribute super."wai-routes_0_7_3";
   "wai-routing" = doDistribute super."wai-routing_0_12_1";
@@ -7908,6 +7929,7 @@ self: super: {
   "web-routes-th" = dontDistribute super."web-routes-th";
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -7973,6 +7995,7 @@ self: super: {
   "wreq" = doDistribute super."wreq_0_4_0_0";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
index ee4f7152ee08..ad592a39a7d7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
@@ -1626,6 +1626,7 @@ self: super: {
   "blaze-html-truncate" = dontDistribute super."blaze-html-truncate";
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_4_1";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
   "blink1" = dontDistribute super."blink1";
@@ -2025,6 +2026,7 @@ self: super: {
   "complexity" = dontDistribute super."complexity";
   "compose-ltr" = dontDistribute super."compose-ltr";
   "compose-trans" = dontDistribute super."compose-trans";
+  "composition" = doDistribute super."composition_1_0_2";
   "composition-extra" = doDistribute super."composition-extra_1_1_0";
   "composition-tree" = dontDistribute super."composition-tree";
   "compression" = dontDistribute super."compression";
@@ -2280,6 +2282,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -2996,6 +2999,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3181,6 +3185,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3814,6 +3819,7 @@ self: super: {
   "hdm" = dontDistribute super."hdm";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -3949,6 +3955,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4007,6 +4014,7 @@ self: super: {
   "hnop" = dontDistribute super."hnop";
   "ho-rewriting" = dontDistribute super."ho-rewriting";
   "hoauth" = dontDistribute super."hoauth";
+  "hoauth2" = doDistribute super."hoauth2_0_4_8";
   "hob" = dontDistribute super."hob";
   "hobbes" = dontDistribute super."hobbes";
   "hobbits" = dontDistribute super."hobbits";
@@ -4603,6 +4611,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -5653,6 +5662,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
@@ -5712,6 +5722,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -6525,6 +6536,7 @@ self: super: {
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
   "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandi" = doDistribute super."sandi_0_3_5";
   "sandlib" = dontDistribute super."sandlib";
   "sandman" = dontDistribute super."sandman";
   "sarasvati" = dontDistribute super."sarasvati";
@@ -6637,12 +6649,16 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "servant" = doDistribute super."servant_0_4_4_5";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
+  "servant-client" = doDistribute super."servant-client_0_4_4_5";
+  "servant-docs" = doDistribute super."servant-docs_0_4_4_5";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-examples" = dontDistribute super."servant-examples";
   "servant-github" = dontDistribute super."servant-github";
+  "servant-jquery" = doDistribute super."servant-jquery_0_4_4_5";
   "servant-lucid" = dontDistribute super."servant-lucid";
   "servant-mock" = dontDistribute super."servant-mock";
   "servant-pandoc" = doDistribute super."servant-pandoc_0_4_1_1";
@@ -6650,8 +6666,12 @@ self: super: {
   "servant-postgresql" = dontDistribute super."servant-postgresql";
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
+  "servant-server" = doDistribute super."servant-server_0_4_4_5";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-yaml" = dontDistribute super."servant-yaml";
+  "serversession-backend-acid-state" = doDistribute super."serversession-backend-acid-state_1_0_2";
+  "serversession-backend-persistent" = doDistribute super."serversession-backend-persistent_1_0_1";
+  "serversession-backend-redis" = doDistribute super."serversession-backend-redis_1_0";
   "servius" = dontDistribute super."servius";
   "ses-html" = dontDistribute super."ses-html";
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
@@ -7851,6 +7871,7 @@ self: super: {
   "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs";
   "wai-request-spec" = dontDistribute super."wai-request-spec";
   "wai-responsible" = dontDistribute super."wai-responsible";
+  "wai-route" = doDistribute super."wai-route_0_3";
   "wai-router" = dontDistribute super."wai-router";
   "wai-routes" = doDistribute super."wai-routes_0_7_3";
   "wai-routing" = doDistribute super."wai-routing_0_12_1";
@@ -7899,6 +7920,7 @@ self: super: {
   "web-routes-th" = dontDistribute super."web-routes-th";
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -7964,6 +7986,7 @@ self: super: {
   "wreq" = doDistribute super."wreq_0_4_0_0";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
index aabbcc11e745..ca66663e22e4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
@@ -1626,6 +1626,7 @@ self: super: {
   "blaze-html-truncate" = dontDistribute super."blaze-html-truncate";
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_4_1";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
   "blink1" = dontDistribute super."blink1";
@@ -2025,6 +2026,7 @@ self: super: {
   "complexity" = dontDistribute super."complexity";
   "compose-ltr" = dontDistribute super."compose-ltr";
   "compose-trans" = dontDistribute super."compose-trans";
+  "composition" = doDistribute super."composition_1_0_2";
   "composition-extra" = doDistribute super."composition-extra_1_1_0";
   "composition-tree" = dontDistribute super."composition-tree";
   "compression" = dontDistribute super."compression";
@@ -2280,6 +2282,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -2996,6 +2999,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3181,6 +3185,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3814,6 +3819,7 @@ self: super: {
   "hdm" = dontDistribute super."hdm";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -3948,6 +3954,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4006,6 +4013,7 @@ self: super: {
   "hnop" = dontDistribute super."hnop";
   "ho-rewriting" = dontDistribute super."ho-rewriting";
   "hoauth" = dontDistribute super."hoauth";
+  "hoauth2" = doDistribute super."hoauth2_0_4_8";
   "hob" = dontDistribute super."hob";
   "hobbes" = dontDistribute super."hobbes";
   "hobbits" = dontDistribute super."hobbits";
@@ -4602,6 +4610,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -5286,6 +5295,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mongoDB" = doDistribute super."mongoDB_2_0_9";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
   "monitor" = dontDistribute super."monitor";
@@ -5650,6 +5660,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
@@ -5709,6 +5720,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -6521,6 +6533,7 @@ self: super: {
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
   "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandi" = doDistribute super."sandi_0_3_5";
   "sandlib" = dontDistribute super."sandlib";
   "sandman" = dontDistribute super."sandman";
   "sarasvati" = dontDistribute super."sarasvati";
@@ -6633,12 +6646,16 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "servant" = doDistribute super."servant_0_4_4_5";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
+  "servant-client" = doDistribute super."servant-client_0_4_4_5";
+  "servant-docs" = doDistribute super."servant-docs_0_4_4_5";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-examples" = dontDistribute super."servant-examples";
   "servant-github" = dontDistribute super."servant-github";
+  "servant-jquery" = doDistribute super."servant-jquery_0_4_4_5";
   "servant-lucid" = dontDistribute super."servant-lucid";
   "servant-mock" = dontDistribute super."servant-mock";
   "servant-pandoc" = doDistribute super."servant-pandoc_0_4_1_1";
@@ -6646,8 +6663,12 @@ self: super: {
   "servant-postgresql" = dontDistribute super."servant-postgresql";
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
+  "servant-server" = doDistribute super."servant-server_0_4_4_5";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-yaml" = dontDistribute super."servant-yaml";
+  "serversession-backend-acid-state" = doDistribute super."serversession-backend-acid-state_1_0_2";
+  "serversession-backend-persistent" = doDistribute super."serversession-backend-persistent_1_0_1";
+  "serversession-backend-redis" = doDistribute super."serversession-backend-redis_1_0";
   "servius" = dontDistribute super."servius";
   "ses-html" = dontDistribute super."ses-html";
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
@@ -7845,6 +7866,7 @@ self: super: {
   "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs";
   "wai-request-spec" = dontDistribute super."wai-request-spec";
   "wai-responsible" = dontDistribute super."wai-responsible";
+  "wai-route" = doDistribute super."wai-route_0_3";
   "wai-router" = dontDistribute super."wai-router";
   "wai-routes" = doDistribute super."wai-routes_0_7_3";
   "wai-routing" = doDistribute super."wai-routing_0_12_1";
@@ -7893,6 +7915,7 @@ self: super: {
   "web-routes-th" = dontDistribute super."web-routes-th";
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -7958,6 +7981,7 @@ self: super: {
   "wreq" = doDistribute super."wreq_0_4_0_0";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.14.nix b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
index 55af508dd12b..18ca1b6e1c46 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
@@ -1624,6 +1624,7 @@ self: super: {
   "blaze-html-truncate" = dontDistribute super."blaze-html-truncate";
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_4_1";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
   "blink1" = dontDistribute super."blink1";
@@ -2022,6 +2023,7 @@ self: super: {
   "complexity" = dontDistribute super."complexity";
   "compose-ltr" = dontDistribute super."compose-ltr";
   "compose-trans" = dontDistribute super."compose-trans";
+  "composition" = doDistribute super."composition_1_0_2";
   "composition-extra" = doDistribute super."composition-extra_1_1_0";
   "composition-tree" = dontDistribute super."composition-tree";
   "compression" = dontDistribute super."compression";
@@ -2276,6 +2278,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -2988,6 +2991,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3173,6 +3177,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3806,6 +3811,7 @@ self: super: {
   "hdm" = dontDistribute super."hdm";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -3940,6 +3946,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -3998,6 +4005,7 @@ self: super: {
   "hnop" = dontDistribute super."hnop";
   "ho-rewriting" = dontDistribute super."ho-rewriting";
   "hoauth" = dontDistribute super."hoauth";
+  "hoauth2" = doDistribute super."hoauth2_0_4_8";
   "hob" = dontDistribute super."hob";
   "hobbes" = dontDistribute super."hobbes";
   "hobbits" = dontDistribute super."hobbits";
@@ -4593,6 +4601,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -5276,6 +5285,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mongoDB" = doDistribute super."mongoDB_2_0_9";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
   "monitor" = dontDistribute super."monitor";
@@ -5639,6 +5649,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
@@ -5698,6 +5709,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -6509,6 +6521,7 @@ self: super: {
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
   "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandi" = doDistribute super."sandi_0_3_5";
   "sandlib" = dontDistribute super."sandlib";
   "sandman" = dontDistribute super."sandman";
   "sarasvati" = dontDistribute super."sarasvati";
@@ -6621,12 +6634,16 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "servant" = doDistribute super."servant_0_4_4_5";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
+  "servant-client" = doDistribute super."servant-client_0_4_4_5";
+  "servant-docs" = doDistribute super."servant-docs_0_4_4_5";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-examples" = dontDistribute super."servant-examples";
   "servant-github" = dontDistribute super."servant-github";
+  "servant-jquery" = doDistribute super."servant-jquery_0_4_4_5";
   "servant-lucid" = dontDistribute super."servant-lucid";
   "servant-mock" = dontDistribute super."servant-mock";
   "servant-pandoc" = doDistribute super."servant-pandoc_0_4_1_1";
@@ -6634,8 +6651,12 @@ self: super: {
   "servant-postgresql" = dontDistribute super."servant-postgresql";
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
+  "servant-server" = doDistribute super."servant-server_0_4_4_5";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-yaml" = dontDistribute super."servant-yaml";
+  "serversession-backend-acid-state" = doDistribute super."serversession-backend-acid-state_1_0_2";
+  "serversession-backend-persistent" = doDistribute super."serversession-backend-persistent_1_0_1";
+  "serversession-backend-redis" = doDistribute super."serversession-backend-redis_1_0";
   "servius" = dontDistribute super."servius";
   "ses-html" = dontDistribute super."ses-html";
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
@@ -7832,6 +7853,7 @@ self: super: {
   "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs";
   "wai-request-spec" = dontDistribute super."wai-request-spec";
   "wai-responsible" = dontDistribute super."wai-responsible";
+  "wai-route" = doDistribute super."wai-route_0_3";
   "wai-router" = dontDistribute super."wai-router";
   "wai-routes" = doDistribute super."wai-routes_0_7_3";
   "wai-session-alt" = dontDistribute super."wai-session-alt";
@@ -7879,6 +7901,7 @@ self: super: {
   "web-routes-th" = dontDistribute super."web-routes-th";
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -7943,6 +7966,7 @@ self: super: {
   "wreq" = doDistribute super."wreq_0_4_0_0";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.15.nix b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
index 7727c0f3d6d5..2e1a0cff6127 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
@@ -1623,6 +1623,7 @@ self: super: {
   "blaze-html-truncate" = dontDistribute super."blaze-html-truncate";
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_4_1";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
   "blink1" = dontDistribute super."blink1";
@@ -2021,6 +2022,7 @@ self: super: {
   "complexity" = dontDistribute super."complexity";
   "compose-ltr" = dontDistribute super."compose-ltr";
   "compose-trans" = dontDistribute super."compose-trans";
+  "composition" = doDistribute super."composition_1_0_2";
   "composition-extra" = doDistribute super."composition-extra_1_1_0";
   "composition-tree" = dontDistribute super."composition-tree";
   "compression" = dontDistribute super."compression";
@@ -2275,6 +2277,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -2987,6 +2990,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3171,6 +3175,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3803,6 +3808,7 @@ self: super: {
   "hdm" = dontDistribute super."hdm";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -3937,6 +3943,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -3995,6 +4002,7 @@ self: super: {
   "hnop" = dontDistribute super."hnop";
   "ho-rewriting" = dontDistribute super."ho-rewriting";
   "hoauth" = dontDistribute super."hoauth";
+  "hoauth2" = doDistribute super."hoauth2_0_4_8";
   "hob" = dontDistribute super."hob";
   "hobbes" = dontDistribute super."hobbes";
   "hobbits" = dontDistribute super."hobbits";
@@ -4588,6 +4596,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -5271,6 +5280,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mongoDB" = doDistribute super."mongoDB_2_0_9";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
   "monitor" = dontDistribute super."monitor";
@@ -5634,6 +5644,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
@@ -5692,6 +5703,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -6502,6 +6514,7 @@ self: super: {
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
   "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandi" = doDistribute super."sandi_0_3_5";
   "sandlib" = dontDistribute super."sandlib";
   "sandman" = dontDistribute super."sandman";
   "sarasvati" = dontDistribute super."sarasvati";
@@ -6614,20 +6627,28 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "servant" = doDistribute super."servant_0_4_4_5";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
+  "servant-client" = doDistribute super."servant-client_0_4_4_5";
+  "servant-docs" = doDistribute super."servant-docs_0_4_4_5";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-examples" = dontDistribute super."servant-examples";
   "servant-github" = dontDistribute super."servant-github";
+  "servant-jquery" = doDistribute super."servant-jquery_0_4_4_5";
   "servant-lucid" = dontDistribute super."servant-lucid";
   "servant-mock" = dontDistribute super."servant-mock";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
+  "servant-server" = doDistribute super."servant-server_0_4_4_5";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-yaml" = dontDistribute super."servant-yaml";
+  "serversession-backend-acid-state" = doDistribute super."serversession-backend-acid-state_1_0_2";
+  "serversession-backend-persistent" = doDistribute super."serversession-backend-persistent_1_0_1";
+  "serversession-backend-redis" = doDistribute super."serversession-backend-redis_1_0";
   "servius" = dontDistribute super."servius";
   "ses-html" = dontDistribute super."ses-html";
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
@@ -7823,6 +7844,7 @@ self: super: {
   "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs";
   "wai-request-spec" = dontDistribute super."wai-request-spec";
   "wai-responsible" = dontDistribute super."wai-responsible";
+  "wai-route" = doDistribute super."wai-route_0_3";
   "wai-router" = dontDistribute super."wai-router";
   "wai-routes" = doDistribute super."wai-routes_0_7_3";
   "wai-session-alt" = dontDistribute super."wai-session-alt";
@@ -7870,6 +7892,7 @@ self: super: {
   "web-routes-th" = dontDistribute super."web-routes-th";
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -7934,6 +7957,7 @@ self: super: {
   "wreq" = doDistribute super."wreq_0_4_0_0";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.16.nix b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
index 6a50af291be0..903d763496ae 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
@@ -1621,6 +1621,7 @@ self: super: {
   "blaze-html-truncate" = dontDistribute super."blaze-html-truncate";
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_4_1";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
   "blink1" = dontDistribute super."blink1";
@@ -2019,6 +2020,7 @@ self: super: {
   "complexity" = dontDistribute super."complexity";
   "compose-ltr" = dontDistribute super."compose-ltr";
   "compose-trans" = dontDistribute super."compose-trans";
+  "composition" = doDistribute super."composition_1_0_2";
   "composition-extra" = doDistribute super."composition-extra_1_1_0";
   "composition-tree" = dontDistribute super."composition-tree";
   "compression" = dontDistribute super."compression";
@@ -2273,6 +2275,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -2984,6 +2987,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3168,6 +3172,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3799,6 +3804,7 @@ self: super: {
   "hdm" = dontDistribute super."hdm";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -3933,6 +3939,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -3991,6 +3998,7 @@ self: super: {
   "hnop" = dontDistribute super."hnop";
   "ho-rewriting" = dontDistribute super."ho-rewriting";
   "hoauth" = dontDistribute super."hoauth";
+  "hoauth2" = doDistribute super."hoauth2_0_4_8";
   "hob" = dontDistribute super."hob";
   "hobbes" = dontDistribute super."hobbes";
   "hobbits" = dontDistribute super."hobbits";
@@ -4584,6 +4592,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -5264,6 +5273,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mongoDB" = doDistribute super."mongoDB_2_0_9";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
   "monitor" = dontDistribute super."monitor";
@@ -5627,6 +5637,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
@@ -5685,6 +5696,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -6359,6 +6371,7 @@ self: super: {
   "resource-simple" = dontDistribute super."resource-simple";
   "resourcet" = doDistribute super."resourcet_1_1_6";
   "respond" = dontDistribute super."respond";
+  "rest-client" = doDistribute super."rest-client_0_5_0_4";
   "rest-core" = doDistribute super."rest-core_0_36_0_6";
   "rest-example" = dontDistribute super."rest-example";
   "rest-gen" = doDistribute super."rest-gen_0_17_1_3";
@@ -6491,6 +6504,7 @@ self: super: {
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
   "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandi" = doDistribute super."sandi_0_3_5";
   "sandlib" = dontDistribute super."sandlib";
   "sandman" = dontDistribute super."sandman";
   "sarasvati" = dontDistribute super."sarasvati";
@@ -6602,20 +6616,28 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "servant" = doDistribute super."servant_0_4_4_5";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
+  "servant-client" = doDistribute super."servant-client_0_4_4_5";
+  "servant-docs" = doDistribute super."servant-docs_0_4_4_5";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-examples" = dontDistribute super."servant-examples";
   "servant-github" = dontDistribute super."servant-github";
+  "servant-jquery" = doDistribute super."servant-jquery_0_4_4_5";
   "servant-lucid" = dontDistribute super."servant-lucid";
   "servant-mock" = dontDistribute super."servant-mock";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
+  "servant-server" = doDistribute super."servant-server_0_4_4_5";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-yaml" = dontDistribute super."servant-yaml";
+  "serversession-backend-acid-state" = doDistribute super."serversession-backend-acid-state_1_0_2";
+  "serversession-backend-persistent" = doDistribute super."serversession-backend-persistent_1_0_1";
+  "serversession-backend-redis" = doDistribute super."serversession-backend-redis_1_0";
   "servius" = dontDistribute super."servius";
   "ses-html" = dontDistribute super."ses-html";
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
@@ -7807,6 +7829,7 @@ self: super: {
   "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs";
   "wai-request-spec" = dontDistribute super."wai-request-spec";
   "wai-responsible" = dontDistribute super."wai-responsible";
+  "wai-route" = doDistribute super."wai-route_0_3";
   "wai-router" = dontDistribute super."wai-router";
   "wai-routes" = doDistribute super."wai-routes_0_7_3";
   "wai-session-alt" = dontDistribute super."wai-session-alt";
@@ -7854,6 +7877,7 @@ self: super: {
   "web-routes-th" = dontDistribute super."web-routes-th";
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -7918,6 +7942,7 @@ self: super: {
   "wreq" = doDistribute super."wreq_0_4_0_0";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.17.nix b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
index a50419cb5062..2fbf8054e540 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
@@ -462,6 +462,7 @@ self: super: {
   "HSoundFile" = dontDistribute super."HSoundFile";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
+  "HTTP" = doDistribute super."HTTP_4000_2_22";
   "HTTP-Simple" = dontDistribute super."HTTP-Simple";
   "HTab" = dontDistribute super."HTab";
   "HTicTacToe" = dontDistribute super."HTicTacToe";
@@ -1617,6 +1618,7 @@ self: super: {
   "blaze-html-truncate" = dontDistribute super."blaze-html-truncate";
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_4_1";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
   "blink1" = dontDistribute super."blink1";
@@ -2013,6 +2015,7 @@ self: super: {
   "complexity" = dontDistribute super."complexity";
   "compose-ltr" = dontDistribute super."compose-ltr";
   "compose-trans" = dontDistribute super."compose-trans";
+  "composition" = doDistribute super."composition_1_0_2";
   "composition-extra" = doDistribute super."composition-extra_1_1_0";
   "composition-tree" = dontDistribute super."composition-tree";
   "compression" = dontDistribute super."compression";
@@ -2266,6 +2269,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -2976,6 +2980,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3160,6 +3165,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3790,6 +3796,7 @@ self: super: {
   "hdm" = dontDistribute super."hdm";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -3924,6 +3931,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -3982,6 +3990,7 @@ self: super: {
   "hnop" = dontDistribute super."hnop";
   "ho-rewriting" = dontDistribute super."ho-rewriting";
   "hoauth" = dontDistribute super."hoauth";
+  "hoauth2" = doDistribute super."hoauth2_0_4_8";
   "hob" = dontDistribute super."hob";
   "hobbes" = dontDistribute super."hobbes";
   "hobbits" = dontDistribute super."hobbits";
@@ -4573,6 +4582,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -5251,6 +5261,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mongoDB" = doDistribute super."mongoDB_2_0_9";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
   "monitor" = dontDistribute super."monitor";
@@ -5614,6 +5625,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
@@ -5672,6 +5684,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -6343,6 +6356,7 @@ self: super: {
   "resource-pool-monad" = dontDistribute super."resource-pool-monad";
   "resource-simple" = dontDistribute super."resource-simple";
   "respond" = dontDistribute super."respond";
+  "rest-client" = doDistribute super."rest-client_0_5_0_4";
   "rest-core" = doDistribute super."rest-core_0_36_0_6";
   "rest-example" = dontDistribute super."rest-example";
   "rest-gen" = doDistribute super."rest-gen_0_17_1_3";
@@ -6475,6 +6489,7 @@ self: super: {
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
   "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandi" = doDistribute super."sandi_0_3_5";
   "sandlib" = dontDistribute super."sandlib";
   "sandman" = dontDistribute super."sandman";
   "sarasvati" = dontDistribute super."sarasvati";
@@ -6586,20 +6601,28 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "servant" = doDistribute super."servant_0_4_4_5";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
+  "servant-client" = doDistribute super."servant-client_0_4_4_5";
+  "servant-docs" = doDistribute super."servant-docs_0_4_4_5";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-examples" = dontDistribute super."servant-examples";
   "servant-github" = dontDistribute super."servant-github";
+  "servant-jquery" = doDistribute super."servant-jquery_0_4_4_5";
   "servant-lucid" = dontDistribute super."servant-lucid";
   "servant-mock" = dontDistribute super."servant-mock";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
+  "servant-server" = doDistribute super."servant-server_0_4_4_5";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-yaml" = dontDistribute super."servant-yaml";
+  "serversession-backend-acid-state" = doDistribute super."serversession-backend-acid-state_1_0_2";
+  "serversession-backend-persistent" = doDistribute super."serversession-backend-persistent_1_0_1";
+  "serversession-backend-redis" = doDistribute super."serversession-backend-redis_1_0";
   "servius" = dontDistribute super."servius";
   "ses-html" = dontDistribute super."ses-html";
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
@@ -7790,6 +7813,7 @@ self: super: {
   "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs";
   "wai-request-spec" = dontDistribute super."wai-request-spec";
   "wai-responsible" = dontDistribute super."wai-responsible";
+  "wai-route" = doDistribute super."wai-route_0_3";
   "wai-router" = dontDistribute super."wai-router";
   "wai-routes" = doDistribute super."wai-routes_0_7_3";
   "wai-session-alt" = dontDistribute super."wai-session-alt";
@@ -7837,6 +7861,7 @@ self: super: {
   "web-routes-th" = dontDistribute super."web-routes-th";
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -7901,6 +7926,7 @@ self: super: {
   "wreq" = doDistribute super."wreq_0_4_0_0";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.18.nix b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
index 5ee263af1bc1..d1f07ae0f3c7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
@@ -462,6 +462,7 @@ self: super: {
   "HSoundFile" = dontDistribute super."HSoundFile";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
+  "HTTP" = doDistribute super."HTTP_4000_2_22";
   "HTTP-Simple" = dontDistribute super."HTTP-Simple";
   "HTab" = dontDistribute super."HTab";
   "HTicTacToe" = dontDistribute super."HTicTacToe";
@@ -1618,6 +1619,7 @@ self: super: {
   "blaze-html-truncate" = dontDistribute super."blaze-html-truncate";
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_4_1";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
   "blink1" = dontDistribute super."blink1";
@@ -2013,6 +2015,7 @@ self: super: {
   "complexity" = dontDistribute super."complexity";
   "compose-ltr" = dontDistribute super."compose-ltr";
   "compose-trans" = dontDistribute super."compose-trans";
+  "composition" = doDistribute super."composition_1_0_2";
   "composition-extra" = doDistribute super."composition-extra_1_1_0";
   "composition-tree" = dontDistribute super."composition-tree";
   "compression" = dontDistribute super."compression";
@@ -2266,6 +2269,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -2976,6 +2980,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3160,6 +3165,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3785,6 +3791,7 @@ self: super: {
   "hdm" = dontDistribute super."hdm";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -3918,6 +3925,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -3976,6 +3984,7 @@ self: super: {
   "hnop" = dontDistribute super."hnop";
   "ho-rewriting" = dontDistribute super."ho-rewriting";
   "hoauth" = dontDistribute super."hoauth";
+  "hoauth2" = doDistribute super."hoauth2_0_4_8";
   "hob" = dontDistribute super."hob";
   "hobbes" = dontDistribute super."hobbes";
   "hobbits" = dontDistribute super."hobbits";
@@ -4564,6 +4573,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -5241,6 +5251,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mongoDB" = doDistribute super."mongoDB_2_0_9";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
   "monitor" = dontDistribute super."monitor";
@@ -5604,6 +5615,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
@@ -5661,6 +5673,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -6330,6 +6343,7 @@ self: super: {
   "resource-pool-monad" = dontDistribute super."resource-pool-monad";
   "resource-simple" = dontDistribute super."resource-simple";
   "respond" = dontDistribute super."respond";
+  "rest-client" = doDistribute super."rest-client_0_5_0_4";
   "rest-core" = doDistribute super."rest-core_0_36_0_6";
   "rest-example" = dontDistribute super."rest-example";
   "rest-gen" = doDistribute super."rest-gen_0_17_1_3";
@@ -6462,6 +6476,7 @@ self: super: {
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
   "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandi" = doDistribute super."sandi_0_3_5";
   "sandlib" = dontDistribute super."sandlib";
   "sandman" = dontDistribute super."sandman";
   "sarasvati" = dontDistribute super."sarasvati";
@@ -6573,20 +6588,28 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "servant" = doDistribute super."servant_0_4_4_5";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
+  "servant-client" = doDistribute super."servant-client_0_4_4_5";
+  "servant-docs" = doDistribute super."servant-docs_0_4_4_5";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-examples" = dontDistribute super."servant-examples";
   "servant-github" = dontDistribute super."servant-github";
+  "servant-jquery" = doDistribute super."servant-jquery_0_4_4_5";
   "servant-lucid" = dontDistribute super."servant-lucid";
   "servant-mock" = dontDistribute super."servant-mock";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
+  "servant-server" = doDistribute super."servant-server_0_4_4_5";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-yaml" = dontDistribute super."servant-yaml";
+  "serversession-backend-acid-state" = doDistribute super."serversession-backend-acid-state_1_0_2";
+  "serversession-backend-persistent" = doDistribute super."serversession-backend-persistent_1_0_1";
+  "serversession-backend-redis" = doDistribute super."serversession-backend-redis_1_0";
   "servius" = dontDistribute super."servius";
   "ses-html" = dontDistribute super."ses-html";
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
@@ -7772,6 +7795,7 @@ self: super: {
   "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs";
   "wai-request-spec" = dontDistribute super."wai-request-spec";
   "wai-responsible" = dontDistribute super."wai-responsible";
+  "wai-route" = doDistribute super."wai-route_0_3";
   "wai-router" = dontDistribute super."wai-router";
   "wai-routes" = doDistribute super."wai-routes_0_7_3";
   "wai-session-alt" = dontDistribute super."wai-session-alt";
@@ -7819,6 +7843,7 @@ self: super: {
   "web-routes-th" = dontDistribute super."web-routes-th";
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -7883,6 +7908,7 @@ self: super: {
   "wreq" = doDistribute super."wreq_0_4_0_0";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.19.nix b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
index b2719512902c..862b23d25047 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
@@ -461,6 +461,7 @@ self: super: {
   "HSoundFile" = dontDistribute super."HSoundFile";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
+  "HTTP" = doDistribute super."HTTP_4000_2_22";
   "HTTP-Simple" = dontDistribute super."HTTP-Simple";
   "HTab" = dontDistribute super."HTab";
   "HTicTacToe" = dontDistribute super."HTicTacToe";
@@ -1613,6 +1614,7 @@ self: super: {
   "blaze-html-truncate" = dontDistribute super."blaze-html-truncate";
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_4_1";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
   "blink1" = dontDistribute super."blink1";
@@ -2006,6 +2008,7 @@ self: super: {
   "complexity" = dontDistribute super."complexity";
   "compose-ltr" = dontDistribute super."compose-ltr";
   "compose-trans" = dontDistribute super."compose-trans";
+  "composition" = doDistribute super."composition_1_0_2";
   "composition-extra" = doDistribute super."composition-extra_1_1_0";
   "composition-tree" = dontDistribute super."composition-tree";
   "compression" = dontDistribute super."compression";
@@ -2258,6 +2261,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -2968,6 +2972,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3152,6 +3157,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3517,6 +3523,7 @@ self: super: {
   "hake" = dontDistribute super."hake";
   "hakismet" = dontDistribute super."hakismet";
   "hako" = dontDistribute super."hako";
+  "hakyll" = doDistribute super."hakyll_4_7_5_0";
   "hakyll-R" = dontDistribute super."hakyll-R";
   "hakyll-agda" = dontDistribute super."hakyll-agda";
   "hakyll-blaze-templates" = dontDistribute super."hakyll-blaze-templates";
@@ -3776,6 +3783,7 @@ self: super: {
   "hdm" = dontDistribute super."hdm";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -3909,6 +3917,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -3965,6 +3974,7 @@ self: super: {
   "hnop" = dontDistribute super."hnop";
   "ho-rewriting" = dontDistribute super."ho-rewriting";
   "hoauth" = dontDistribute super."hoauth";
+  "hoauth2" = doDistribute super."hoauth2_0_4_8";
   "hob" = dontDistribute super."hob";
   "hobbes" = dontDistribute super."hobbes";
   "hobbits" = dontDistribute super."hobbits";
@@ -4552,6 +4562,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -5227,6 +5238,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mongoDB" = doDistribute super."mongoDB_2_0_9";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
   "monitor" = dontDistribute super."monitor";
@@ -5589,6 +5601,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
@@ -5646,6 +5659,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -6312,6 +6326,7 @@ self: super: {
   "resource-pool-monad" = dontDistribute super."resource-pool-monad";
   "resource-simple" = dontDistribute super."resource-simple";
   "respond" = dontDistribute super."respond";
+  "rest-client" = doDistribute super."rest-client_0_5_0_4";
   "rest-core" = doDistribute super."rest-core_0_36_0_6";
   "rest-example" = dontDistribute super."rest-example";
   "rest-gen" = doDistribute super."rest-gen_0_17_1_3";
@@ -6443,6 +6458,7 @@ self: super: {
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
   "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandi" = doDistribute super."sandi_0_3_5";
   "sandlib" = dontDistribute super."sandlib";
   "sandman" = dontDistribute super."sandman";
   "sarasvati" = dontDistribute super."sarasvati";
@@ -6554,20 +6570,28 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "servant" = doDistribute super."servant_0_4_4_5";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
+  "servant-client" = doDistribute super."servant-client_0_4_4_5";
+  "servant-docs" = doDistribute super."servant-docs_0_4_4_5";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-examples" = dontDistribute super."servant-examples";
   "servant-github" = dontDistribute super."servant-github";
+  "servant-jquery" = doDistribute super."servant-jquery_0_4_4_5";
   "servant-lucid" = dontDistribute super."servant-lucid";
   "servant-mock" = dontDistribute super."servant-mock";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
+  "servant-server" = doDistribute super."servant-server_0_4_4_5";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-yaml" = dontDistribute super."servant-yaml";
+  "serversession-backend-acid-state" = doDistribute super."serversession-backend-acid-state_1_0_2";
+  "serversession-backend-persistent" = doDistribute super."serversession-backend-persistent_1_0_1";
+  "serversession-backend-redis" = doDistribute super."serversession-backend-redis_1_0";
   "servius" = dontDistribute super."servius";
   "ses-html" = dontDistribute super."ses-html";
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
@@ -7751,6 +7775,7 @@ self: super: {
   "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs";
   "wai-request-spec" = dontDistribute super."wai-request-spec";
   "wai-responsible" = dontDistribute super."wai-responsible";
+  "wai-route" = doDistribute super."wai-route_0_3";
   "wai-router" = dontDistribute super."wai-router";
   "wai-routes" = doDistribute super."wai-routes_0_7_3";
   "wai-session-alt" = dontDistribute super."wai-session-alt";
@@ -7798,6 +7823,7 @@ self: super: {
   "web-routes-th" = dontDistribute super."web-routes-th";
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -7862,6 +7888,7 @@ self: super: {
   "wreq" = doDistribute super."wreq_0_4_0_0";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
index cd7a87951e34..8854ad248395 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
@@ -1643,6 +1643,7 @@ self: super: {
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_4_1";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
   "blink1" = dontDistribute super."blink1";
@@ -2313,6 +2314,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3051,6 +3053,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3237,6 +3240,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3877,6 +3881,7 @@ self: super: {
   "hdm" = dontDistribute super."hdm";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4014,6 +4019,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4072,6 +4078,7 @@ self: super: {
   "hnop" = dontDistribute super."hnop";
   "ho-rewriting" = dontDistribute super."ho-rewriting";
   "hoauth" = dontDistribute super."hoauth";
+  "hoauth2" = doDistribute super."hoauth2_0_4_8";
   "hob" = dontDistribute super."hob";
   "hobbes" = dontDistribute super."hobbes";
   "hobbits" = dontDistribute super."hobbits";
@@ -4675,6 +4682,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -5738,6 +5746,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
@@ -5798,6 +5807,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -6628,6 +6638,7 @@ self: super: {
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
   "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandi" = doDistribute super."sandi_0_3_5";
   "sandlib" = dontDistribute super."sandlib";
   "sandman" = dontDistribute super."sandman";
   "sarasvati" = dontDistribute super."sarasvati";
@@ -6762,6 +6773,8 @@ self: super: {
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession-backend-acid-state" = doDistribute super."serversession-backend-acid-state_1_0_1";
+  "serversession-backend-persistent" = doDistribute super."serversession-backend-persistent_1_0_1";
+  "serversession-backend-redis" = doDistribute super."serversession-backend-redis_1_0";
   "servius" = dontDistribute super."servius";
   "ses-html" = dontDistribute super."ses-html";
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
@@ -7983,6 +7996,7 @@ self: super: {
   "wai-predicates" = doDistribute super."wai-predicates_0_8_4";
   "wai-request-spec" = dontDistribute super."wai-request-spec";
   "wai-responsible" = dontDistribute super."wai-responsible";
+  "wai-route" = doDistribute super."wai-route_0_3";
   "wai-router" = dontDistribute super."wai-router";
   "wai-routes" = doDistribute super."wai-routes_0_7_3";
   "wai-routing" = doDistribute super."wai-routing_0_12_1";
@@ -8032,6 +8046,7 @@ self: super: {
   "web-routes-th" = dontDistribute super."web-routes-th";
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8100,6 +8115,7 @@ self: super: {
   "wreq" = doDistribute super."wreq_0_4_0_0";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.20.nix b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
index 04b5fdf0d4f5..b1254506c85b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
@@ -460,6 +460,7 @@ self: super: {
   "HSoundFile" = dontDistribute super."HSoundFile";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
+  "HTTP" = doDistribute super."HTTP_4000_2_22";
   "HTTP-Simple" = dontDistribute super."HTTP-Simple";
   "HTab" = dontDistribute super."HTab";
   "HTicTacToe" = dontDistribute super."HTicTacToe";
@@ -1609,6 +1610,7 @@ self: super: {
   "blaze-html-truncate" = dontDistribute super."blaze-html-truncate";
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_4_1";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
   "blink1" = dontDistribute super."blink1";
@@ -2001,6 +2003,7 @@ self: super: {
   "complexity" = dontDistribute super."complexity";
   "compose-ltr" = dontDistribute super."compose-ltr";
   "compose-trans" = dontDistribute super."compose-trans";
+  "composition" = doDistribute super."composition_1_0_2";
   "composition-extra" = doDistribute super."composition-extra_1_1_0";
   "composition-tree" = dontDistribute super."composition-tree";
   "compression" = dontDistribute super."compression";
@@ -2253,6 +2256,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -2963,6 +2967,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3147,6 +3152,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3512,6 +3518,7 @@ self: super: {
   "hake" = dontDistribute super."hake";
   "hakismet" = dontDistribute super."hakismet";
   "hako" = dontDistribute super."hako";
+  "hakyll" = doDistribute super."hakyll_4_7_5_0";
   "hakyll-R" = dontDistribute super."hakyll-R";
   "hakyll-agda" = dontDistribute super."hakyll-agda";
   "hakyll-blaze-templates" = dontDistribute super."hakyll-blaze-templates";
@@ -3771,6 +3778,7 @@ self: super: {
   "hdm" = dontDistribute super."hdm";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -3904,6 +3912,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -3960,6 +3969,7 @@ self: super: {
   "hnop" = dontDistribute super."hnop";
   "ho-rewriting" = dontDistribute super."ho-rewriting";
   "hoauth" = dontDistribute super."hoauth";
+  "hoauth2" = doDistribute super."hoauth2_0_4_8";
   "hob" = dontDistribute super."hob";
   "hobbes" = dontDistribute super."hobbes";
   "hobbits" = dontDistribute super."hobbits";
@@ -4546,6 +4556,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -5220,6 +5231,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mongoDB" = doDistribute super."mongoDB_2_0_9";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
   "monitor" = dontDistribute super."monitor";
@@ -5582,6 +5594,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
@@ -5639,6 +5652,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -6303,6 +6317,7 @@ self: super: {
   "resource-pool-monad" = dontDistribute super."resource-pool-monad";
   "resource-simple" = dontDistribute super."resource-simple";
   "respond" = dontDistribute super."respond";
+  "rest-client" = doDistribute super."rest-client_0_5_0_4";
   "rest-core" = doDistribute super."rest-core_0_36_0_6";
   "rest-example" = dontDistribute super."rest-example";
   "rest-gen" = doDistribute super."rest-gen_0_17_1_3";
@@ -6434,6 +6449,7 @@ self: super: {
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
   "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandi" = doDistribute super."sandi_0_3_5";
   "sandlib" = dontDistribute super."sandlib";
   "sandman" = dontDistribute super."sandman";
   "sarasvati" = dontDistribute super."sarasvati";
@@ -6545,20 +6561,28 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "servant" = doDistribute super."servant_0_4_4_5";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
+  "servant-client" = doDistribute super."servant-client_0_4_4_5";
+  "servant-docs" = doDistribute super."servant-docs_0_4_4_5";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-examples" = dontDistribute super."servant-examples";
   "servant-github" = dontDistribute super."servant-github";
+  "servant-jquery" = doDistribute super."servant-jquery_0_4_4_5";
   "servant-lucid" = dontDistribute super."servant-lucid";
   "servant-mock" = dontDistribute super."servant-mock";
   "servant-pool" = dontDistribute super."servant-pool";
   "servant-postgresql" = dontDistribute super."servant-postgresql";
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
+  "servant-server" = doDistribute super."servant-server_0_4_4_5";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-yaml" = dontDistribute super."servant-yaml";
+  "serversession-backend-acid-state" = doDistribute super."serversession-backend-acid-state_1_0_2";
+  "serversession-backend-persistent" = doDistribute super."serversession-backend-persistent_1_0_1";
+  "serversession-backend-redis" = doDistribute super."serversession-backend-redis_1_0";
   "servius" = dontDistribute super."servius";
   "ses-html" = dontDistribute super."ses-html";
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
@@ -7739,6 +7763,7 @@ self: super: {
   "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs";
   "wai-request-spec" = dontDistribute super."wai-request-spec";
   "wai-responsible" = dontDistribute super."wai-responsible";
+  "wai-route" = doDistribute super."wai-route_0_3";
   "wai-router" = dontDistribute super."wai-router";
   "wai-routes" = doDistribute super."wai-routes_0_7_3";
   "wai-session-alt" = dontDistribute super."wai-session-alt";
@@ -7786,6 +7811,7 @@ self: super: {
   "web-routes-th" = dontDistribute super."web-routes-th";
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -7849,6 +7875,7 @@ self: super: {
   "wraxml" = dontDistribute super."wraxml";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
index 14ca501a3071..931e82d06afd 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
@@ -1642,6 +1642,7 @@ self: super: {
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_4_1";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
   "blink1" = dontDistribute super."blink1";
@@ -2309,6 +2310,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3046,6 +3048,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3232,6 +3235,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3872,6 +3876,7 @@ self: super: {
   "hdm" = dontDistribute super."hdm";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4008,6 +4013,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4066,6 +4072,7 @@ self: super: {
   "hnop" = dontDistribute super."hnop";
   "ho-rewriting" = dontDistribute super."ho-rewriting";
   "hoauth" = dontDistribute super."hoauth";
+  "hoauth2" = doDistribute super."hoauth2_0_4_8";
   "hob" = dontDistribute super."hob";
   "hobbes" = dontDistribute super."hobbes";
   "hobbits" = dontDistribute super."hobbits";
@@ -4668,6 +4675,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -5731,6 +5739,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
@@ -5791,6 +5800,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -6620,6 +6630,7 @@ self: super: {
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
   "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandi" = doDistribute super."sandi_0_3_5";
   "sandlib" = dontDistribute super."sandlib";
   "sandman" = dontDistribute super."sandman";
   "sarasvati" = dontDistribute super."sarasvati";
@@ -6754,6 +6765,8 @@ self: super: {
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession-backend-acid-state" = doDistribute super."serversession-backend-acid-state_1_0_1";
+  "serversession-backend-persistent" = doDistribute super."serversession-backend-persistent_1_0_1";
+  "serversession-backend-redis" = doDistribute super."serversession-backend-redis_1_0";
   "servius" = dontDistribute super."servius";
   "ses-html" = dontDistribute super."ses-html";
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
@@ -7972,6 +7985,7 @@ self: super: {
   "wai-predicates" = doDistribute super."wai-predicates_0_8_4";
   "wai-request-spec" = dontDistribute super."wai-request-spec";
   "wai-responsible" = dontDistribute super."wai-responsible";
+  "wai-route" = doDistribute super."wai-route_0_3";
   "wai-router" = dontDistribute super."wai-router";
   "wai-routes" = doDistribute super."wai-routes_0_7_3";
   "wai-routing" = doDistribute super."wai-routing_0_12_1";
@@ -8021,6 +8035,7 @@ self: super: {
   "web-routes-th" = dontDistribute super."web-routes-th";
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8089,6 +8104,7 @@ self: super: {
   "wreq" = doDistribute super."wreq_0_4_0_0";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
index 91755dcdbc43..81e330cc0d66 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
@@ -1642,6 +1642,7 @@ self: super: {
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_4_1";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
   "blink1" = dontDistribute super."blink1";
@@ -2308,6 +2309,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3045,6 +3047,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3231,6 +3234,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3871,6 +3875,7 @@ self: super: {
   "hdm" = dontDistribute super."hdm";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4007,6 +4012,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4065,6 +4071,7 @@ self: super: {
   "hnop" = dontDistribute super."hnop";
   "ho-rewriting" = dontDistribute super."ho-rewriting";
   "hoauth" = dontDistribute super."hoauth";
+  "hoauth2" = doDistribute super."hoauth2_0_4_8";
   "hob" = dontDistribute super."hob";
   "hobbes" = dontDistribute super."hobbes";
   "hobbits" = dontDistribute super."hobbits";
@@ -4667,6 +4674,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -5730,6 +5738,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
@@ -5790,6 +5799,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -6619,6 +6629,7 @@ self: super: {
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
   "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandi" = doDistribute super."sandi_0_3_5";
   "sandlib" = dontDistribute super."sandlib";
   "sandman" = dontDistribute super."sandman";
   "sarasvati" = dontDistribute super."sarasvati";
@@ -6752,6 +6763,8 @@ self: super: {
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-yaml" = dontDistribute super."servant-yaml";
   "serversession-backend-acid-state" = doDistribute super."serversession-backend-acid-state_1_0_1";
+  "serversession-backend-persistent" = doDistribute super."serversession-backend-persistent_1_0_1";
+  "serversession-backend-redis" = doDistribute super."serversession-backend-redis_1_0";
   "servius" = dontDistribute super."servius";
   "ses-html" = dontDistribute super."ses-html";
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
@@ -7969,6 +7982,7 @@ self: super: {
   "wai-predicates" = doDistribute super."wai-predicates_0_8_4";
   "wai-request-spec" = dontDistribute super."wai-request-spec";
   "wai-responsible" = dontDistribute super."wai-responsible";
+  "wai-route" = doDistribute super."wai-route_0_3";
   "wai-router" = dontDistribute super."wai-router";
   "wai-routes" = doDistribute super."wai-routes_0_7_3";
   "wai-routing" = doDistribute super."wai-routing_0_12_1";
@@ -8017,6 +8031,7 @@ self: super: {
   "web-routes-th" = dontDistribute super."web-routes-th";
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8085,6 +8100,7 @@ self: super: {
   "wreq" = doDistribute super."wreq_0_4_0_0";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
index 0eb506044e48..bdf39a5597e9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
@@ -1641,6 +1641,7 @@ self: super: {
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_4_1";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
   "blink1" = dontDistribute super."blink1";
@@ -2305,6 +2306,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3040,6 +3042,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3226,6 +3229,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3865,6 +3869,7 @@ self: super: {
   "hdm" = dontDistribute super."hdm";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4000,6 +4005,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4058,6 +4064,7 @@ self: super: {
   "hnop" = dontDistribute super."hnop";
   "ho-rewriting" = dontDistribute super."ho-rewriting";
   "hoauth" = dontDistribute super."hoauth";
+  "hoauth2" = doDistribute super."hoauth2_0_4_8";
   "hob" = dontDistribute super."hob";
   "hobbes" = dontDistribute super."hobbes";
   "hobbits" = dontDistribute super."hobbits";
@@ -4656,6 +4663,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -5718,6 +5726,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
@@ -5778,6 +5787,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -6603,6 +6613,7 @@ self: super: {
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
   "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandi" = doDistribute super."sandi_0_3_5";
   "sandlib" = dontDistribute super."sandlib";
   "sandman" = dontDistribute super."sandman";
   "sarasvati" = dontDistribute super."sarasvati";
@@ -6735,6 +6746,9 @@ self: super: {
   "servant-server" = doDistribute super."servant-server_0_4_4_2";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-yaml" = dontDistribute super."servant-yaml";
+  "serversession-backend-acid-state" = doDistribute super."serversession-backend-acid-state_1_0_2";
+  "serversession-backend-persistent" = doDistribute super."serversession-backend-persistent_1_0_1";
+  "serversession-backend-redis" = doDistribute super."serversession-backend-redis_1_0";
   "servius" = dontDistribute super."servius";
   "ses-html" = dontDistribute super."ses-html";
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
@@ -7949,6 +7963,7 @@ self: super: {
   "wai-predicates" = doDistribute super."wai-predicates_0_8_4";
   "wai-request-spec" = dontDistribute super."wai-request-spec";
   "wai-responsible" = dontDistribute super."wai-responsible";
+  "wai-route" = doDistribute super."wai-route_0_3";
   "wai-router" = dontDistribute super."wai-router";
   "wai-routes" = doDistribute super."wai-routes_0_7_3";
   "wai-routing" = doDistribute super."wai-routing_0_12_1";
@@ -7997,6 +8012,7 @@ self: super: {
   "web-routes-th" = dontDistribute super."web-routes-th";
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8065,6 +8081,7 @@ self: super: {
   "wreq" = doDistribute super."wreq_0_4_0_0";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
index b7e7ce31b3a6..f3705cd917e9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
@@ -1640,6 +1640,7 @@ self: super: {
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_4_1";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
   "blink1" = dontDistribute super."blink1";
@@ -2303,6 +2304,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3035,6 +3037,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3221,6 +3224,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3858,6 +3862,7 @@ self: super: {
   "hdm" = dontDistribute super."hdm";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -3993,6 +3998,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4051,6 +4057,7 @@ self: super: {
   "hnop" = dontDistribute super."hnop";
   "ho-rewriting" = dontDistribute super."ho-rewriting";
   "hoauth" = dontDistribute super."hoauth";
+  "hoauth2" = doDistribute super."hoauth2_0_4_8";
   "hob" = dontDistribute super."hob";
   "hobbes" = dontDistribute super."hobbes";
   "hobbits" = dontDistribute super."hobbits";
@@ -4648,6 +4655,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -5706,6 +5714,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
@@ -5766,6 +5775,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -6590,6 +6600,7 @@ self: super: {
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
   "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandi" = doDistribute super."sandi_0_3_5";
   "sandlib" = dontDistribute super."sandlib";
   "sandman" = dontDistribute super."sandman";
   "sarasvati" = dontDistribute super."sarasvati";
@@ -6722,6 +6733,9 @@ self: super: {
   "servant-server" = doDistribute super."servant-server_0_4_4_2";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-yaml" = dontDistribute super."servant-yaml";
+  "serversession-backend-acid-state" = doDistribute super."serversession-backend-acid-state_1_0_2";
+  "serversession-backend-persistent" = doDistribute super."serversession-backend-persistent_1_0_1";
+  "serversession-backend-redis" = doDistribute super."serversession-backend-redis_1_0";
   "servius" = dontDistribute super."servius";
   "ses-html" = dontDistribute super."ses-html";
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
@@ -7933,6 +7947,7 @@ self: super: {
   "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs";
   "wai-request-spec" = dontDistribute super."wai-request-spec";
   "wai-responsible" = dontDistribute super."wai-responsible";
+  "wai-route" = doDistribute super."wai-route_0_3";
   "wai-router" = dontDistribute super."wai-router";
   "wai-routes" = doDistribute super."wai-routes_0_7_3";
   "wai-routing" = doDistribute super."wai-routing_0_12_1";
@@ -7981,6 +7996,7 @@ self: super: {
   "web-routes-th" = dontDistribute super."web-routes-th";
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8049,6 +8065,7 @@ self: super: {
   "wreq" = doDistribute super."wreq_0_4_0_0";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
index 883096aa7f4c..195f3e23f4fa 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
@@ -1637,6 +1637,7 @@ self: super: {
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-markup" = doDistribute super."blaze-markup_0_7_0_2";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_4_1";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
   "blink1" = dontDistribute super."blink1";
@@ -2299,6 +2300,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3029,6 +3031,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3215,6 +3218,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3850,6 +3854,7 @@ self: super: {
   "hdm" = dontDistribute super."hdm";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -3985,6 +3990,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4043,6 +4049,7 @@ self: super: {
   "hnop" = dontDistribute super."hnop";
   "ho-rewriting" = dontDistribute super."ho-rewriting";
   "hoauth" = dontDistribute super."hoauth";
+  "hoauth2" = doDistribute super."hoauth2_0_4_8";
   "hob" = dontDistribute super."hob";
   "hobbes" = dontDistribute super."hobbes";
   "hobbits" = dontDistribute super."hobbits";
@@ -4640,6 +4647,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -5696,6 +5704,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
@@ -5755,6 +5764,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -6575,6 +6585,7 @@ self: super: {
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
   "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandi" = doDistribute super."sandi_0_3_5";
   "sandlib" = dontDistribute super."sandlib";
   "sandman" = dontDistribute super."sandman";
   "sarasvati" = dontDistribute super."sarasvati";
@@ -6707,6 +6718,9 @@ self: super: {
   "servant-server" = doDistribute super."servant-server_0_4_4_4";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-yaml" = dontDistribute super."servant-yaml";
+  "serversession-backend-acid-state" = doDistribute super."serversession-backend-acid-state_1_0_2";
+  "serversession-backend-persistent" = doDistribute super."serversession-backend-persistent_1_0_1";
+  "serversession-backend-redis" = doDistribute super."serversession-backend-redis_1_0";
   "servius" = dontDistribute super."servius";
   "ses-html" = dontDistribute super."ses-html";
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
@@ -7915,6 +7929,7 @@ self: super: {
   "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs";
   "wai-request-spec" = dontDistribute super."wai-request-spec";
   "wai-responsible" = dontDistribute super."wai-responsible";
+  "wai-route" = doDistribute super."wai-route_0_3";
   "wai-router" = dontDistribute super."wai-router";
   "wai-routes" = doDistribute super."wai-routes_0_7_3";
   "wai-routing" = doDistribute super."wai-routing_0_12_1";
@@ -7963,6 +7978,7 @@ self: super: {
   "web-routes-th" = dontDistribute super."web-routes-th";
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8031,6 +8047,7 @@ self: super: {
   "wreq" = doDistribute super."wreq_0_4_0_0";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
index 9ea33f85d85c..2ae436dea3c3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
@@ -1635,6 +1635,7 @@ self: super: {
   "blaze-html-truncate" = dontDistribute super."blaze-html-truncate";
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_4_1";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
   "blink1" = dontDistribute super."blink1";
@@ -2040,6 +2041,7 @@ self: super: {
   "complexity" = dontDistribute super."complexity";
   "compose-ltr" = dontDistribute super."compose-ltr";
   "compose-trans" = dontDistribute super."compose-trans";
+  "composition" = doDistribute super."composition_1_0_2";
   "composition-extra" = doDistribute super."composition-extra_1_1_0";
   "composition-tree" = dontDistribute super."composition-tree";
   "compression" = dontDistribute super."compression";
@@ -2295,6 +2297,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3020,6 +3023,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3206,6 +3210,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3841,6 +3846,7 @@ self: super: {
   "hdm" = dontDistribute super."hdm";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -3976,6 +3982,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4034,6 +4041,7 @@ self: super: {
   "hnop" = dontDistribute super."hnop";
   "ho-rewriting" = dontDistribute super."ho-rewriting";
   "hoauth" = dontDistribute super."hoauth";
+  "hoauth2" = doDistribute super."hoauth2_0_4_8";
   "hob" = dontDistribute super."hob";
   "hobbes" = dontDistribute super."hobbes";
   "hobbits" = dontDistribute super."hobbits";
@@ -4631,6 +4639,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -5685,6 +5694,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
@@ -5744,6 +5754,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -6561,6 +6572,7 @@ self: super: {
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
   "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandi" = doDistribute super."sandi_0_3_5";
   "sandlib" = dontDistribute super."sandlib";
   "sandman" = dontDistribute super."sandman";
   "sarasvati" = dontDistribute super."sarasvati";
@@ -6693,6 +6705,9 @@ self: super: {
   "servant-server" = doDistribute super."servant-server_0_4_4_4";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-yaml" = dontDistribute super."servant-yaml";
+  "serversession-backend-acid-state" = doDistribute super."serversession-backend-acid-state_1_0_2";
+  "serversession-backend-persistent" = doDistribute super."serversession-backend-persistent_1_0_1";
+  "serversession-backend-redis" = doDistribute super."serversession-backend-redis_1_0";
   "servius" = dontDistribute super."servius";
   "ses-html" = dontDistribute super."ses-html";
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
@@ -7900,6 +7915,7 @@ self: super: {
   "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs";
   "wai-request-spec" = dontDistribute super."wai-request-spec";
   "wai-responsible" = dontDistribute super."wai-responsible";
+  "wai-route" = doDistribute super."wai-route_0_3";
   "wai-router" = dontDistribute super."wai-router";
   "wai-routes" = doDistribute super."wai-routes_0_7_3";
   "wai-routing" = doDistribute super."wai-routing_0_12_1";
@@ -7948,6 +7964,7 @@ self: super: {
   "web-routes-th" = dontDistribute super."web-routes-th";
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8016,6 +8033,7 @@ self: super: {
   "wreq" = doDistribute super."wreq_0_4_0_0";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
index 3e21be78b0b0..1eb0804186b7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
@@ -1632,6 +1632,7 @@ self: super: {
   "blaze-html-truncate" = dontDistribute super."blaze-html-truncate";
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_4_1";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
   "blink1" = dontDistribute super."blink1";
@@ -2036,6 +2037,7 @@ self: super: {
   "complexity" = dontDistribute super."complexity";
   "compose-ltr" = dontDistribute super."compose-ltr";
   "compose-trans" = dontDistribute super."compose-trans";
+  "composition" = doDistribute super."composition_1_0_2";
   "composition-extra" = doDistribute super."composition-extra_1_1_0";
   "composition-tree" = dontDistribute super."composition-tree";
   "compression" = dontDistribute super."compression";
@@ -2291,6 +2293,7 @@ self: super: {
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
   "data-endian" = dontDistribute super."data-endian";
   "data-extend-generic" = dontDistribute super."data-extend-generic";
   "data-extra" = dontDistribute super."data-extra";
@@ -3012,6 +3015,7 @@ self: super: {
   "free-theorems-seq" = dontDistribute super."free-theorems-seq";
   "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
   "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
   "freekick2" = dontDistribute super."freekick2";
   "freenect" = doDistribute super."freenect_1_2";
   "freer" = dontDistribute super."freer";
@@ -3198,6 +3202,7 @@ self: super: {
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3833,6 +3838,7 @@ self: super: {
   "hdm" = dontDistribute super."hdm";
   "hdph" = dontDistribute super."hdph";
   "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -3968,6 +3974,7 @@ self: super: {
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
   "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
@@ -4026,6 +4033,7 @@ self: super: {
   "hnop" = dontDistribute super."hnop";
   "ho-rewriting" = dontDistribute super."ho-rewriting";
   "hoauth" = dontDistribute super."hoauth";
+  "hoauth2" = doDistribute super."hoauth2_0_4_8";
   "hob" = dontDistribute super."hob";
   "hobbes" = dontDistribute super."hobbes";
   "hobbits" = dontDistribute super."hobbits";
@@ -4623,6 +4631,7 @@ self: super: {
   "java-bridge" = dontDistribute super."java-bridge";
   "java-bridge-extras" = dontDistribute super."java-bridge-extras";
   "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
   "java-reflect" = dontDistribute super."java-reflect";
   "javasf" = dontDistribute super."javasf";
   "javav" = dontDistribute super."javav";
@@ -5676,6 +5685,7 @@ self: super: {
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
   "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
@@ -5735,6 +5745,7 @@ self: super: {
   "pappy" = dontDistribute super."pappy";
   "para" = dontDistribute super."para";
   "paragon" = dontDistribute super."paragon";
+  "parallel" = doDistribute super."parallel_3_2_0_6";
   "parallel-tasks" = dontDistribute super."parallel-tasks";
   "parallel-tree-search" = dontDistribute super."parallel-tree-search";
   "parameterized-data" = dontDistribute super."parameterized-data";
@@ -6552,6 +6563,7 @@ self: super: {
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
   "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandi" = doDistribute super."sandi_0_3_5";
   "sandlib" = dontDistribute super."sandlib";
   "sandman" = dontDistribute super."sandman";
   "sarasvati" = dontDistribute super."sarasvati";
@@ -6684,6 +6696,9 @@ self: super: {
   "servant-server" = doDistribute super."servant-server_0_4_4_4";
   "servant-swagger" = dontDistribute super."servant-swagger";
   "servant-yaml" = dontDistribute super."servant-yaml";
+  "serversession-backend-acid-state" = doDistribute super."serversession-backend-acid-state_1_0_2";
+  "serversession-backend-persistent" = doDistribute super."serversession-backend-persistent_1_0_1";
+  "serversession-backend-redis" = doDistribute super."serversession-backend-redis_1_0";
   "servius" = dontDistribute super."servius";
   "ses-html" = dontDistribute super."ses-html";
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
@@ -7891,6 +7906,7 @@ self: super: {
   "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs";
   "wai-request-spec" = dontDistribute super."wai-request-spec";
   "wai-responsible" = dontDistribute super."wai-responsible";
+  "wai-route" = doDistribute super."wai-route_0_3";
   "wai-router" = dontDistribute super."wai-router";
   "wai-routes" = doDistribute super."wai-routes_0_7_3";
   "wai-routing" = doDistribute super."wai-routing_0_12_1";
@@ -7939,6 +7955,7 @@ self: super: {
   "web-routes-th" = dontDistribute super."web-routes-th";
   "web-routes-transformers" = dontDistribute super."web-routes-transformers";
   "web-routes-wai" = dontDistribute super."web-routes-wai";
+  "webapi" = dontDistribute super."webapi";
   "webapp" = dontDistribute super."webapp";
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
@@ -8007,6 +8024,7 @@ self: super: {
   "wreq" = doDistribute super."wreq_0_4_0_0";
   "wreq-sb" = dontDistribute super."wreq-sb";
   "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
   "wsedit" = dontDistribute super."wsedit";
   "wtk" = dontDistribute super."wtk";
   "wtk-gtk" = dontDistribute super."wtk-gtk";
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index f31b62481d8b..d864dc584ca7 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -454,13 +454,18 @@ self: {
      }) {};
 
   "ALUT" = callPackage
-    ({ mkDerivation, base, freealut, OpenAL, StateVar, transformers }:
+    ({ mkDerivation, base, freealut, OpenAL, pretty, StateVar
+     , transformers
+     }:
      mkDerivation {
        pname = "ALUT";
-       version = "2.4.0.1";
-       sha256 = "fcf517a673b0ad2bd6b83033a33f77603b36f293ad651d5ede92c4d30225b56b";
+       version = "2.4.0.2";
+       sha256 = "b8364da380f5f1d85d13e427851a153be2809e1838d16393e37566f34b384b87";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base OpenAL StateVar transformers ];
        librarySystemDepends = [ freealut ];
+       executableHaskellDepends = [ base pretty ];
        homepage = "https://github.com/haskell-openal/ALUT";
        description = "A binding for the OpenAL Utility Toolkit";
        license = stdenv.lib.licenses.bsd3;
@@ -6071,6 +6076,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base base-compat GLUT OpenGL random ];
        executableHaskellDepends = [ base GLUT OpenGL random ];
+       jailbreak = true;
        homepage = "http://joyful.com/fungen";
        description = "A lightweight, cross-platform, OpenGL/GLUT-based game engine";
        license = stdenv.lib.licenses.bsd3;
@@ -6145,6 +6151,7 @@ self: {
        sha256 = "48fc9efb1da85b4bf20c506341999987e3bfeadf750ad19794030e927e4f4ca9";
        libraryHaskellDepends = [ base OpenGL ];
        librarySystemDepends = [ libX11 mesa ];
+       jailbreak = true;
        homepage = "http://haskell.org/haskellwiki/GLFW";
        description = "A Haskell binding for GLFW";
        license = stdenv.lib.licenses.bsd3;
@@ -6336,8 +6343,8 @@ self: {
     ({ mkDerivation, base, freeglut, mesa, OpenGLRaw, transformers }:
      mkDerivation {
        pname = "GLURaw";
-       version = "1.5.0.3";
-       sha256 = "066134b3c68442e074e67299f500d67cd769de7853e98ea01b89b19cd8c00b47";
+       version = "2.0.0.0";
+       sha256 = "8ddd5d1bcab6668f6a6c6cd2dccbe17ff66aa0f58e8f197d78827963621d9104";
        libraryHaskellDepends = [ base OpenGLRaw transformers ];
        librarySystemDepends = [ freeglut mesa ];
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
@@ -6403,17 +6410,22 @@ self: {
      }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;};
 
   "GLUT" = callPackage
-    ({ mkDerivation, array, base, containers, freeglut, mesa, OpenGL
-     , OpenGLRaw, StateVar, transformers
+    ({ mkDerivation, array, base, bytestring, containers, freeglut
+     , mesa, OpenGL, OpenGLRaw, random, StateVar, transformers
      }:
      mkDerivation {
        pname = "GLUT";
-       version = "2.7.0.4";
-       sha256 = "44e80e79895659e00e25033dfc29819f55226046ca6ca46b3373e031262b934c";
+       version = "2.7.0.5";
+       sha256 = "72d4545ef6ca0ad473f0780d6bc934febc7dfbf0b42aad8c3a8ca67e663795bf";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
-         array base containers OpenGL OpenGLRaw StateVar transformers
+         array base containers OpenGL StateVar transformers
        ];
        librarySystemDepends = [ freeglut mesa ];
+       executableHaskellDepends = [
+         array base bytestring OpenGLRaw random
+       ];
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A binding for the OpenGL Utility Toolkit";
        license = stdenv.lib.licenses.bsd3;
@@ -6433,6 +6445,7 @@ self: {
          array base bytestring containers directory filepath hpp JuicyPixels
          linear OpenGL OpenGLRaw transformers vector
        ];
+       jailbreak = true;
        description = "Miscellaneous OpenGL utilities";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -8307,25 +8320,6 @@ self: {
      }) {inherit (pkgs) opencv;};
 
   "HPDF" = callPackage
-    ({ mkDerivation, array, base, base64-bytestring, binary, bytestring
-     , containers, errors, HTF, mtl, random, vector, zlib
-     }:
-     mkDerivation {
-       pname = "HPDF";
-       version = "1.4.9";
-       sha256 = "fde0b80704ae10ba5ffc5a7817bfbfbecf48db3b556f14f0c4021d6297dbdc17";
-       libraryHaskellDepends = [
-         array base base64-bytestring binary bytestring containers errors
-         mtl random vector zlib
-       ];
-       testHaskellDepends = [ base HTF ];
-       doCheck = false;
-       homepage = "http://www.alpheccar.org";
-       description = "Generation of PDF documents";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "HPDF_1_4_10" = callPackage
     ({ mkDerivation, array, base, base64-bytestring, binary, bytestring
      , containers, errors, HTF, mtl, random, vector, zlib
      }:
@@ -8341,7 +8335,6 @@ self: {
        homepage = "http://www.alpheccar.org";
        description = "Generation of PDF documents";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HPath" = callPackage
@@ -8971,7 +8964,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "HTTP" = callPackage
+  "HTTP_4000_2_22" = callPackage
     ({ mkDerivation, array, base, bytestring, case-insensitive, conduit
      , conduit-extra, deepseq, http-types, httpd-shed, HUnit, mtl
      , network, network-uri, old-time, parsec, pureMD5, split
@@ -8994,6 +8987,55 @@ self: {
        homepage = "https://github.com/haskell/HTTP";
        description = "A library for client-side HTTP";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "HTTP" = callPackage
+    ({ mkDerivation, array, base, bytestring, case-insensitive, conduit
+     , conduit-extra, deepseq, http-types, httpd-shed, HUnit, mtl
+     , network, network-uri, old-time, parsec, pureMD5, split
+     , test-framework, test-framework-hunit, wai, warp
+     }:
+     mkDerivation {
+       pname = "HTTP";
+       version = "4000.2.23";
+       sha256 = "ab04f8126196b96b02d10efcef49c4b73a14e7254cb6515cb10c87658c2e103c";
+       libraryHaskellDepends = [
+         array base bytestring mtl network network-uri old-time parsec
+       ];
+       testHaskellDepends = [
+         base bytestring case-insensitive conduit conduit-extra deepseq
+         http-types httpd-shed HUnit mtl network network-uri pureMD5 split
+         test-framework test-framework-hunit wai warp
+       ];
+       doCheck = false;
+       homepage = "https://github.com/haskell/HTTP";
+       description = "A library for client-side HTTP";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "HTTP_4000_3_1" = callPackage
+    ({ mkDerivation, array, base, bytestring, case-insensitive, conduit
+     , conduit-extra, deepseq, http-types, httpd-shed, HUnit, mtl
+     , network, network-uri, parsec, pureMD5, split, test-framework
+     , test-framework-hunit, time, wai, warp
+     }:
+     mkDerivation {
+       pname = "HTTP";
+       version = "4000.3.1";
+       sha256 = "0223366708cb318767d2dce84a5f923c5fbfe88d7c4c4f30ad7b824d4e98215c";
+       libraryHaskellDepends = [
+         array base bytestring mtl network network-uri parsec time
+       ];
+       testHaskellDepends = [
+         base bytestring case-insensitive conduit conduit-extra deepseq
+         http-types httpd-shed HUnit mtl network network-uri pureMD5 split
+         test-framework test-framework-hunit wai warp
+       ];
+       homepage = "https://github.com/haskell/HTTP";
+       description = "A library for client-side HTTP";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HTTP-Simple" = callPackage
@@ -9065,6 +9107,8 @@ self: {
        pname = "HUnit";
        version = "1.3.0.0";
        sha256 = "e130db953a2310d2c256a3923af0250be6ea19317f7d369b56d48f84cf96a55c";
+       revision = "1";
+       editedCabalFile = "23bdbafd3d38f0ae610df6e9768eddef4fdd902de5a6d9b51f23aab1ab22595d";
        libraryHaskellDepends = [ base deepseq ];
        testHaskellDepends = [ base deepseq filepath ];
        homepage = "http://hunit.sourceforge.net/";
@@ -9245,6 +9289,7 @@ self: {
          Strafunski-StrategyLib stringbuilder syb syz time transformers
          transformers-base
        ];
+       doCheck = false;
        homepage = "https://github.com/RefactoringTools/HaRe/wiki";
        description = "the Haskell Refactorer";
        license = stdenv.lib.licenses.bsd3;
@@ -11917,12 +11962,17 @@ self: {
      }) {};
 
   "Lambdaya" = callPackage
-    ({ mkDerivation, base, mtl, unix }:
+    ({ mkDerivation, base, binary, mtl, network, pipes, pipes-binary
+     , pipes-network, pipes-parse
+     }:
      mkDerivation {
        pname = "Lambdaya";
-       version = "0.1.1.0";
-       sha256 = "5ca6d20aa36b1dbc5a2583fe43dc943cd348eaabeef78c5cba65ce4cc0ef685a";
-       libraryHaskellDepends = [ base mtl unix ];
+       version = "0.2.0.0";
+       sha256 = "f2fa4c293546715dff97b41f33ab5125455497f32a4a528c821a35baba64c63e";
+       libraryHaskellDepends = [
+         base binary mtl network pipes pipes-binary pipes-network
+         pipes-parse
+       ];
        description = "Library for RedPitaya";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -14207,12 +14257,15 @@ self: {
      }:
      mkDerivation {
        pname = "OpenAL";
-       version = "1.7.0.2";
-       sha256 = "72fe6db9ae0449df5bdb674fde9b3bfb5a1544261ba6a32dadc5396dd95064af";
+       version = "1.7.0.3";
+       sha256 = "c8051477b773efe58d72cde32a1f24734a01e8a161cfee278420f0757eca2ac6";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base ObjectName OpenGL StateVar transformers
        ];
        librarySystemDepends = [ openal ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/haskell-openal/ALUT";
        description = "A binding to the OpenAL cross-platform 3D audio API";
        license = stdenv.lib.licenses.bsd3;
@@ -14323,8 +14376,8 @@ self: {
      }:
      mkDerivation {
        pname = "OpenGL";
-       version = "2.13.2.1";
-       sha256 = "bc28e7e83bcf40c8654b74a35146a8d1a48fea76ea148c507b681c6d255f5734";
+       version = "3.0.0.0";
+       sha256 = "f05a76b800fed837379f295aa69a142842610d22246f6a6764ec642bbbb05bf0";
        libraryHaskellDepends = [
          base bytestring containers GLURaw ObjectName OpenGLRaw StateVar
          text transformers
@@ -14392,15 +14445,15 @@ self: {
      }) {inherit (pkgs) mesa;};
 
   "OpenGLRaw" = callPackage
-    ({ mkDerivation, base, bytestring, containers, half, mesa, text
-     , transformers
+    ({ mkDerivation, base, bytestring, containers, fixed, half, mesa
+     , text, transformers
      }:
      mkDerivation {
        pname = "OpenGLRaw";
-       version = "2.6.1.1";
-       sha256 = "bac2633ab2ae04ecaa26319aded375ad1c678fa33d9897ecd8c7d58998de183b";
+       version = "3.0.0.0";
+       sha256 = "81efc4c80bb9ddc5a977f95b59e3e322b14620b0e92a210cbe542a2d9f8eabf1";
        libraryHaskellDepends = [
-         base bytestring containers half text transformers
+         base bytestring containers fixed half text transformers
        ];
        librarySystemDepends = [ mesa ];
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
@@ -14415,6 +14468,7 @@ self: {
        version = "2.0.0.2";
        sha256 = "e1af60d7b2b931310b8c04427993b8ea072230d1acdf851cffad506e25e7cfcd";
        libraryHaskellDepends = [ OpenGLRaw ];
+       jailbreak = true;
        description = "The intersection of OpenGL 2.1 and OpenGL 3.1 Core";
        license = "unknown";
      }) {};
@@ -19033,12 +19087,12 @@ self: {
      }) {};
 
   "ViennaRNAParser" = callPackage
-    ({ mkDerivation, base, hspec, parsec, process }:
+    ({ mkDerivation, base, hspec, parsec, process, transformers }:
      mkDerivation {
        pname = "ViennaRNAParser";
-       version = "1.2.6";
-       sha256 = "2cfb08808da1a9d9969a073165aab1bd4188b7b0e4210d8e365b63f04ba4fe82";
-       libraryHaskellDepends = [ base parsec process ];
+       version = "1.2.7";
+       sha256 = "94a6eabf894ce77c16854393ebfcbb14b8f440634c480d4d2a84a2f2c76c1ebf";
+       libraryHaskellDepends = [ base parsec process transformers ];
        testHaskellDepends = [ base hspec parsec ];
        description = "Libary for parsing ViennaRNA package output";
        license = "GPL";
@@ -27869,8 +27923,8 @@ self: {
        pname = "apiary";
        version = "1.4.5";
        sha256 = "6c6f898924b6209f33ef81bc0e2c7ceb166fc04825a8ffb4d6c5732f41429313";
-       revision = "2";
-       editedCabalFile = "4cf36ea7883196978930d9aa0e51a6918234a2da98bbd7d31f0da5ff083d988d";
+       revision = "3";
+       editedCabalFile = "f33e4f880c07f8f174844ce36e701e62dbad0f0feb4f908d30bd76d3d2309f2a";
        libraryHaskellDepends = [
          base blaze-builder blaze-html blaze-markup bytestring
          bytestring-read case-insensitive data-default-class exceptions
@@ -27898,8 +27952,8 @@ self: {
        pname = "apiary-authenticate";
        version = "1.4.0";
        sha256 = "40dbdb0d6799ba7091ae9b72929c7d62a74dd251b5a6e01f8979314d75dbd107";
-       revision = "3";
-       editedCabalFile = "923708ce64b096b916e3e1e830c6ffc13dcdd289524d1580f2206f0e4ce4554b";
+       revision = "4";
+       editedCabalFile = "5888af016171726e81bde323d1cd9044a24b70930c1fe5946ac0336a0f23f193";
        libraryHaskellDepends = [
          apiary apiary-session authenticate base blaze-builder bytestring
          cereal data-default-class http-client http-client-tls http-types
@@ -27938,8 +27992,8 @@ self: {
        pname = "apiary-cookie";
        version = "1.4.0";
        sha256 = "3dcf4cf38377685340ec5c6ab105a0df3ba2b0a4d0d7079fc88593bd15eeeb04";
-       revision = "2";
-       editedCabalFile = "4edecbd2a1e6fb740815be85cc9c4836144338af88e6774348a1703e861a9771";
+       revision = "3";
+       editedCabalFile = "5b9c1a2c95bbedcb6b12196953ce1ebbe8e7c825fbb8ae5e0ddb4c846d3a752b";
        libraryHaskellDepends = [
          apiary base blaze-builder blaze-html bytestring cookie time
          types-compat wai web-routing
@@ -28093,8 +28147,8 @@ self: {
        pname = "apiary-session";
        version = "1.4.0";
        sha256 = "434cd8b985a95bd4c72dde7ac521768d1c1402f3cc8b4835dded6736bdbcd74a";
-       revision = "1";
-       editedCabalFile = "8e4a0b590972ea4e1ab1252696b7339038c4d7206ae44d1f1397a67cdde077dd";
+       revision = "2";
+       editedCabalFile = "777f476e799ceaa21a20e42c6382baec92644fc898e11aea09dcfa96a5e90034";
        libraryHaskellDepends = [
          apiary base types-compat wai web-routing
        ];
@@ -29546,6 +29600,8 @@ self: {
        pname = "asn1-data";
        version = "0.7.2";
        sha256 = "83999c03cbc993f7e0dea010942a4dc39ae986c498c57eadc1e5ee1b4e23aca1";
+       revision = "1";
+       editedCabalFile = "1543bc1ee13d3f4b9ee6f9445edede596d5fe7f8a4551333b54634aad5b112a3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring cereal mtl text ];
@@ -29622,6 +29678,8 @@ self: {
        pname = "asn1-parse";
        version = "0.9.0";
        sha256 = "e3c94b982c34e944c549b7854d738d50158eee0267598ac5f1bbfb66391f0954";
+       revision = "1";
+       editedCabalFile = "f624dd2168154a726f97a980f1f37d5cfdd5ec845c91b83942ef93f8f5719c8c";
        libraryHaskellDepends = [
          asn1-encoding asn1-types base bytestring mtl text
        ];
@@ -29638,6 +29696,8 @@ self: {
        pname = "asn1-parse";
        version = "0.9.1";
        sha256 = "e18087baa87225a5ea41c9758f7499b362ba6293931cb9c5bc3548c90f3133de";
+       revision = "1";
+       editedCabalFile = "9dff7d71ac8bc8c2165071385785b8dcab5d59e2d92c266d2a16f2c31e8e3fd4";
        libraryHaskellDepends = [
          asn1-encoding asn1-types base bytestring mtl
        ];
@@ -30271,8 +30331,8 @@ self: {
      }:
      mkDerivation {
        pname = "atp-haskell";
-       version = "1.9";
-       sha256 = "ef3c046d722fd5b8a2cd2662a0585fa2c2ea2131e58177f094e7a9b4d0909245";
+       version = "1.10";
+       sha256 = "a6e9178c6db9de5a2c1ad4a158d1730f2e3e5eb1b20f9a06a7263597fe8a1d32";
        libraryHaskellDepends = [
          applicative-extras base containers HUnit mtl parsec pretty
          template-haskell time
@@ -32881,6 +32941,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "base-prelude_0_1_21" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "base-prelude";
+       version = "0.1.21";
+       sha256 = "72650e69fd615191be08bed82e07c623b0c17b0b52113b418bc3b2093d74a3a5";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/nikita-volkov/base-prelude";
+       description = "The most complete prelude formed from only the \"base\" package";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "base-unicode-symbols" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -33370,17 +33443,6 @@ self: {
      }) {};
 
   "bcrypt" = callPackage
-    ({ mkDerivation, base, bytestring, entropy, memory }:
-     mkDerivation {
-       pname = "bcrypt";
-       version = "0.0.7";
-       sha256 = "c564fcf27d3248d5dea570c21a445223406e96de53a207e27d0043d204a7c3ce";
-       libraryHaskellDepends = [ base bytestring entropy memory ];
-       description = "Haskell bindings to the bcrypt password hash";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "bcrypt_0_0_8" = callPackage
     ({ mkDerivation, base, bytestring, entropy, memory }:
      mkDerivation {
        pname = "bcrypt";
@@ -33389,7 +33451,6 @@ self: {
        libraryHaskellDepends = [ base bytestring entropy memory ];
        description = "Haskell bindings to the bcrypt password hash";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bdd" = callPackage
@@ -35389,18 +35450,18 @@ self: {
      }) {};
 
   "bindings-sane" = callPackage
-    ({ mkDerivation, base, bindings-DSL, sane-backends }:
+    ({ mkDerivation, base, bindings-DSL, saneBackends }:
      mkDerivation {
        pname = "bindings-sane";
        version = "0.0.1";
        sha256 = "a27eb00e69a804e65f39246611a747f3a833a87dab536c7f3cde60583a60b04b";
        libraryHaskellDepends = [ base bindings-DSL ];
-       libraryPkgconfigDepends = [ sane-backends ];
+       libraryPkgconfigDepends = [ saneBackends ];
        homepage = "http://floss.scru.org/bindings-sane";
        description = "FFI bindings to libsane";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
-     }) {inherit (pkgs) sane-backends;};
+     }) {saneBackends = null;};
 
   "bindings-sc3" = callPackage
     ({ mkDerivation, base, bindings-DSL, scsynth }:
@@ -36966,7 +37027,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "blaze-svg" = callPackage
+  "blaze-svg_0_3_4_1" = callPackage
     ({ mkDerivation, base, blaze-markup, mtl }:
      mkDerivation {
        pname = "blaze-svg";
@@ -36976,6 +37037,19 @@ self: {
        homepage = "https://github.com/deepakjois/blaze-svg";
        description = "SVG combinator library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "blaze-svg" = callPackage
+    ({ mkDerivation, base, blaze-markup, mtl }:
+     mkDerivation {
+       pname = "blaze-svg";
+       version = "0.3.5";
+       sha256 = "9f6979e0c9bb3e1a10b034e1ed41a7881195760ec30d30a95bcab22fd6e9a15a";
+       libraryHaskellDepends = [ base blaze-markup mtl ];
+       homepage = "https://github.com/deepakjois/blaze-svg";
+       description = "SVG combinator library";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "blaze-textual_0_2_0_9" = callPackage
@@ -37400,25 +37474,24 @@ self: {
 
   "board-games" = callPackage
     ({ mkDerivation, array, base, cgi, containers, html, httpd-shed
-     , network, QuickCheck, random, transformers, utility-ht
+     , network-uri, QuickCheck, random, transformers, utility-ht
      }:
      mkDerivation {
        pname = "board-games";
-       version = "0.1.0.1";
-       sha256 = "df4f8a2ecaf4ef0a0e39e2d0bfe8899d9a9ca28199975180e49c46fcd5876589";
+       version = "0.1.0.2";
+       sha256 = "8d261347cae2f9597f696a44e558ee0988f82a3b1ae65846e60e9ce19e45f984";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          array base cgi containers html random transformers utility-ht
        ];
        executableHaskellDepends = [
-         array base cgi containers html httpd-shed network random
+         array base cgi containers html httpd-shed network-uri random
          transformers utility-ht
        ];
        testHaskellDepends = [
          array base containers QuickCheck random transformers utility-ht
        ];
-       jailbreak = true;
        homepage = "http://code.haskell.org/~thielema/games/";
        description = "Three games for inclusion in a web server";
        license = "GPL";
@@ -38389,15 +38462,15 @@ self: {
 
   "buildbox" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, mtl
-     , old-locale, pretty, process, random, stm, time
+     , old-locale, pretty, process, random, stm, text, time
      }:
      mkDerivation {
        pname = "buildbox";
-       version = "2.1.6.1";
-       sha256 = "d13047133040b21de1e399d0babb065f15df69af5838e3702b157353edb2ad95";
+       version = "2.1.7.1";
+       sha256 = "5193d8b22d0b576e972f85f032627a4ebbd6f2d6033aa4a789b312574baf8f58";
        libraryHaskellDepends = [
          base bytestring containers directory mtl old-locale pretty process
-         random stm time
+         random stm text time
        ];
        homepage = "http://code.ouroborus.net/buildbox";
        description = "Rehackable components for writing buildbots and test harnesses";
@@ -38642,20 +38715,21 @@ self: {
          base bytestring gl-capture GLUT OpenGLRaw OpenGLRaw21 repa
          repa-devil
        ];
+       jailbreak = true;
        homepage = "http://code.mathr.co.uk/butterflies";
        description = "butterfly tilings";
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
   "bv" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, ghc-prim, integer-gmp }:
      mkDerivation {
        pname = "bv";
-       version = "0.3.0";
-       sha256 = "4500e98fabb2cb13c752538bae4a11953376332e7d5d8d46ff03731ad3b84b64";
+       version = "0.4.0";
+       sha256 = "aaf6adc5aeccdf7bdaf7b5f832f339cbca45747745cd3bf52f30b496c70cb439";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base ];
+       libraryHaskellDepends = [ base ghc-prim integer-gmp ];
        homepage = "http://bitbucket.org/iago/bv-haskell";
        description = "Bit-vector arithmetic library";
        license = stdenv.lib.licenses.bsd3;
@@ -40238,23 +40312,25 @@ self: {
 
   "cabal-macosx" = callPackage
     ({ mkDerivation, base, Cabal, containers, directory, fgl, filepath
-     , HUnit, parsec, process, temporary, test-framework
+     , hscolour, HUnit, parsec, process, temporary, test-framework
      , test-framework-hunit, text
      }:
      mkDerivation {
        pname = "cabal-macosx";
-       version = "0.2.3.3";
-       sha256 = "0ff1241a0b0a8d9107bba400f0af7f5f35552f988db0096e28e574e771de73ea";
+       version = "0.2.3.4";
+       sha256 = "4c3ae50fdafa3283055624156016834f077bdf5b8237441497e7ccea69308570";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base Cabal containers directory fgl filepath parsec process text
+         base Cabal containers directory fgl filepath hscolour parsec
+         process text
        ];
        executableHaskellDepends = [
          base Cabal containers directory fgl filepath parsec process text
        ];
        testHaskellDepends = [
-         base Cabal HUnit temporary test-framework test-framework-hunit
+         base Cabal containers directory filepath HUnit process temporary
+         test-framework test-framework-hunit text
        ];
        homepage = "http://github.com/danfran/cabal-macosx";
        description = "Cabal support for creating Mac OSX application bundles";
@@ -41248,6 +41324,7 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base cal3d cal3d-opengl OpenGL SDL ];
+       jailbreak = true;
        homepage = "http://haskell.org/haskellwiki/Cal3d_animation";
        description = "Examples for the Cal3d animation library";
        license = "GPL";
@@ -41261,6 +41338,7 @@ self: {
        version = "0.1";
        sha256 = "c269646464707fe10e53722053588cf703fe777b738b7dbcb008f056380fca0a";
        libraryHaskellDepends = [ base cal3d OpenGL ];
+       jailbreak = true;
        homepage = "http://haskell.org/haskellwiki/Cal3d_animation";
        description = "OpenGL rendering for the Cal3D animation library";
        license = "LGPL";
@@ -41739,18 +41817,19 @@ self: {
 
   "casadi-bindings" = callPackage
     ({ mkDerivation, base, binary, casadi, casadi-bindings-core
-     , casadi-bindings-internal, cereal, containers, linear, vector
-     , vector-binary-instances
+     , casadi-bindings-internal, cereal, containers, doctest, linear
+     , vector, vector-binary-instances
      }:
      mkDerivation {
        pname = "casadi-bindings";
-       version = "2.4.1.5";
-       sha256 = "87150f2cf93c8e6aa049d1dc2820e09a52a8178e53539f750f77c40e2322219c";
+       version = "2.4.1.6";
+       sha256 = "cc4e7f894581bf7847733dbffc0c2692c41235822e91459052ffd3b483319a48";
        libraryHaskellDepends = [
          base binary casadi-bindings-core casadi-bindings-internal cereal
          containers linear vector vector-binary-instances
        ];
        libraryPkgconfigDepends = [ casadi ];
+       testHaskellDepends = [ base doctest ];
        homepage = "http://github.com/ghorn/casadi-bindings";
        description = "mid-level bindings to CasADi";
        license = stdenv.lib.licenses.gpl3;
@@ -48104,7 +48183,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "composition" = callPackage
+  "composition_1_0_2" = callPackage
     ({ mkDerivation }:
      mkDerivation {
        pname = "composition";
@@ -48112,9 +48191,10 @@ self: {
        sha256 = "0db6b7579db9a96dc47cfcb30e7835d4742bfab9b46518f00244e168b32405cd";
        description = "Combinators for unorthodox function composition";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "composition_1_0_2_1" = callPackage
+  "composition" = callPackage
     ({ mkDerivation }:
      mkDerivation {
        pname = "composition";
@@ -48122,7 +48202,6 @@ self: {
        sha256 = "7123300f5eca5a7cec4eb731dc0e9c2c44aabe26b37e6579582a7267d9f7ad6a";
        description = "Combinators for unorthodox function composition";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "composition-extra_1_1_0" = callPackage
@@ -49945,8 +50024,8 @@ self: {
        pname = "constraints";
        version = "0.4";
        sha256 = "e5ea72a487dcb65faa77451a1348f771b672be219134fd244188b3f5a9a7d75a";
-       revision = "1";
-       editedCabalFile = "32c308af39b847e2ffe8db73bf072b75667a56c723a3cc0c7bce8516043e1d69";
+       revision = "2";
+       editedCabalFile = "271a82e2293a1a08a90d2fe17a824d1e2b30fc95190cd564817b09ea017c073f";
        libraryHaskellDepends = [ base ghc-prim newtype ];
        homepage = "http://github.com/ekmett/constraints/";
        description = "Constraint manipulation";
@@ -49960,8 +50039,8 @@ self: {
        pname = "constraints";
        version = "0.4.1.1";
        sha256 = "3463b9edb046bd37878f7d8192c9f5b34741652a4e70e2fb7a2573d1151de96c";
-       revision = "1";
-       editedCabalFile = "57f0fc24c7f560187a060244f3ec01338796e6f86f71e49ce7c3fcbd4c4f02ac";
+       revision = "2";
+       editedCabalFile = "76ca1503a834b091b236c5454ef7922868cd05cdde1ef599915334b64e6b9cc5";
        libraryHaskellDepends = [ base ghc-prim newtype ];
        homepage = "http://github.com/ekmett/constraints/";
        description = "Constraint manipulation";
@@ -49975,8 +50054,8 @@ self: {
        pname = "constraints";
        version = "0.4.1.2";
        sha256 = "6711cf0893715f55ba070ff065829a02b1093ba18bb0e14f7b9dd86b2f2c2930";
-       revision = "1";
-       editedCabalFile = "fe68968a6197281f12e4040310beaf276f3ad1cdeba847a77baaea7fb45a5230";
+       revision = "2";
+       editedCabalFile = "9508552b31b6f8a77b3a24d50fc3082deaa04550fbce840d03c53111dabe7c2c";
        libraryHaskellDepends = [ base ghc-prim newtype ];
        homepage = "http://github.com/ekmett/constraints/";
        description = "Constraint manipulation";
@@ -49990,6 +50069,8 @@ self: {
        pname = "constraints";
        version = "0.4.1.3";
        sha256 = "dd4353b66c85980363050566a13d17ad0216f072a06f207cb8d36530ded67af0";
+       revision = "1";
+       editedCabalFile = "8704acefc3b56f37d36de0316625107bffdef2c37d27e599f3a8f26618223459";
        libraryHaskellDepends = [ base ghc-prim newtype ];
        homepage = "http://github.com/ekmett/constraints/";
        description = "Constraint manipulation";
@@ -52211,8 +52292,8 @@ self: {
      }:
      mkDerivation {
        pname = "creatur";
-       version = "5.9.8.2";
-       sha256 = "496359a78a874fac905bee1a91bd8927283d9e7ae73ba4a36efe48b260999295";
+       version = "5.9.9";
+       sha256 = "3662a2b632bb86edb14b5f89d5be7cbda94401e651aa43d4e24f15ddf72aa209";
        libraryHaskellDepends = [
          array base bytestring cereal cond directory exceptions filepath
          gray-extended hdaemonize hsyslog MonadRandom mtl old-locale process
@@ -55007,6 +55088,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "data-embed" = callPackage
+    ({ mkDerivation, base, bytestring, cereal, containers, directory
+     , executable-path, hashable, utf8-string
+     }:
+     mkDerivation {
+       pname = "data-embed";
+       version = "0.1.0.0";
+       sha256 = "180c54a1b5db9905454386c8161e18cb8c8e733897e17b4f0c67390d3869f7de";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring cereal containers directory executable-path
+         hashable utf8-string
+       ];
+       executableHaskellDepends = [
+         base bytestring cereal containers directory executable-path
+         hashable utf8-string
+       ];
+       homepage = "https://github.com/valderman/data-embed";
+       description = "Embed files and other binary blobs inside executables without Template Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "data-endian" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -56970,6 +57074,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "deepseq-generics_0_2_0_0" = callPackage
+    ({ mkDerivation, base, deepseq, ghc-prim, HUnit, test-framework
+     , test-framework-hunit
+     }:
+     mkDerivation {
+       pname = "deepseq-generics";
+       version = "0.2.0.0";
+       sha256 = "b0b3ef5546c0768ef9194519a90c629f8f2ba0348487e620bb89d512187c7c9d";
+       libraryHaskellDepends = [ base deepseq ghc-prim ];
+       testHaskellDepends = [
+         base deepseq ghc-prim HUnit test-framework test-framework-hunit
+       ];
+       homepage = "https://github.com/hvr/deepseq-generics";
+       description = "GHC.Generics-based Control.DeepSeq.rnf implementation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "deepseq-magic" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -61299,8 +61421,8 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-process-monad-control";
-       version = "0.5.1";
-       sha256 = "f500fe350650476374902db8168807c1be0afabae0690875675eff8856fd4d07";
+       version = "0.5.1.1";
+       sha256 = "dab2eb3396e4afa5fdf9f84dd51a3e6bf634c2971a28c782946cc9f4b0e7fa43";
        libraryHaskellDepends = [
          base distributed-process monad-control transformers
          transformers-base
@@ -63615,8 +63737,8 @@ self: {
      }:
      mkDerivation {
        pname = "dynamic-plot";
-       version = "0.1.1.2";
-       sha256 = "f991e349360af3a03723c373a3480764a0280e5ff5bd1037e3711e6c1776d60c";
+       version = "0.1.2.0";
+       sha256 = "9afd0f1a29dd23036d7f7a8da943ea1a015e8c2ceec628f0ffc946203689878f";
        libraryHaskellDepends = [
          async base colour constrained-categories containers data-default
          deepseq diagrams-cairo diagrams-core diagrams-gtk diagrams-lib glib
@@ -65807,8 +65929,8 @@ self: {
      }:
      mkDerivation {
        pname = "engine-io-wai";
-       version = "1.0.4";
-       sha256 = "1d0115fe13212c67db037037c29d6a84cf9fadf3f05def7e7b0592c31d535286";
+       version = "1.0.5";
+       sha256 = "80e4737835acbadb0aafa66defc961e32045c66760040456700853e5baf0dab3";
        libraryHaskellDepends = [
          attoparsec base bytestring either engine-io http-types mtl text
          transformers transformers-compat unordered-containers wai
@@ -66106,6 +66228,8 @@ self: {
        pname = "envy";
        version = "1.1.0.0";
        sha256 = "27a2496640ea74ceab5a23a3fe8ef325bfb23d64a851f5dfc18b7c3411beca99";
+       revision = "1";
+       editedCabalFile = "a3922d3ddac9dd572059abbc0a9af991467cf10c93d6fc579c53faa5d3d22c2e";
        libraryHaskellDepends = [
          base bytestring containers mtl text time transformers
        ];
@@ -67328,8 +67452,8 @@ self: {
      }:
      mkDerivation {
        pname = "eventloop";
-       version = "0.5.0.0";
-       sha256 = "8771bed9a4246ea1c55bf301fdb81adb2f08906152a0bdbc9edf95bb8d72531b";
+       version = "0.5.1.0";
+       sha256 = "512651a08b3677d68854c9a3a2dd723ec8a9b6075924ae7f33019d3d1bbfb7d8";
        libraryHaskellDepends = [
          aeson base bytestring concurrent-utilities network suspend text
          timers websockets
@@ -68285,8 +68409,8 @@ self: {
        pname = "extra";
        version = "1.0";
        sha256 = "6bb6b0d583a1a4de739de145cfb267d962e27b3889660d06e3e156e110e6362a";
-       revision = "1";
-       editedCabalFile = "9deb6a3e50c063fb2c10b17371b99c48d7ebfa50ed3129476b3cbe7e5dc57918";
+       revision = "2";
+       editedCabalFile = "d4393e372b4bca0c8a47a3780430c3548879921bf41c56c1fefabf79e51acdb7";
        libraryHaskellDepends = [
          base directory filepath process time unix
        ];
@@ -68307,6 +68431,8 @@ self: {
        pname = "extra";
        version = "1.0.1";
        sha256 = "46c61e755d20e5780ae417279744205eee03dc37a943e6235ec08e45447cacda";
+       revision = "1";
+       editedCabalFile = "a928bd1bd8516ace1c3b0d6413a60ba7ef164c0fed4bde83b1aea82f1949ecb9";
        libraryHaskellDepends = [
          base directory filepath process time unix
        ];
@@ -68327,6 +68453,8 @@ self: {
        pname = "extra";
        version = "1.1";
        sha256 = "9ebc9f0579b18fd4fae3deedb8e4d6cc707b04604a543c9d65cbd57c7cd91b45";
+       revision = "1";
+       editedCabalFile = "cf929eb72bd834c6dfe7d059c234905077cde112643c961f7bde9e475bf07c0e";
        libraryHaskellDepends = [
          base directory filepath process time unix
        ];
@@ -68670,8 +68798,8 @@ self: {
      }:
      mkDerivation {
        pname = "fast-digits";
-       version = "0.1.0.0";
-       sha256 = "e2c407fef5ce65f3b32db4a344bf90c08454f455ebd39e327b1993bba4a61bb6";
+       version = "0.2.0.0";
+       sha256 = "b5e050775cf9cfffac1adc90ded981b5fbc56be903984aecacc138ac62e98c33";
        libraryHaskellDepends = [ base integer-gmp ];
        testHaskellDepends = [
          base digits QuickCheck smallcheck tasty tasty-quickcheck
@@ -68774,24 +68902,26 @@ self: {
      }) {};
 
   "fast-tags" = callPackage
-    ({ mkDerivation, base, bytestring, containers, cpphs, deepseq
-     , directory, filepath, tasty, tasty-hunit, text
+    ({ mkDerivation, array, async, base, bytestring, containers, cpphs
+     , deepseq, directory, filepath, mtl, tasty, tasty-hunit, text
+     , utf8-string
      }:
      mkDerivation {
        pname = "fast-tags";
-       version = "1.1.1";
-       sha256 = "6c9cafc9d3d67536a748977dcfbacd4f318b817321a7e8d52fc801e4e37a3674";
+       version = "1.2";
+       sha256 = "59033dc40770e9f96207b2ba6b458c68a3138f0102787e4858b71a4299d90eef";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring containers cpphs deepseq directory filepath text
+         array async base bytestring containers cpphs deepseq directory
+         filepath mtl text utf8-string
        ];
        executableHaskellDepends = [
-         base bytestring containers directory filepath text
+         async base bytestring containers directory filepath text
        ];
        testHaskellDepends = [
-         base bytestring containers directory filepath tasty tasty-hunit
-         text
+         async base bytestring containers directory filepath tasty
+         tasty-hunit text
        ];
        homepage = "https://github.com/elaforge/fast-tags";
        description = "Fast incremental vi and emacs tags";
@@ -71374,12 +71504,12 @@ self: {
      }) {};
 
   "fixed-length" = callPackage
-    ({ mkDerivation, base, non-empty, utility-ht }:
+    ({ mkDerivation, base, non-empty, tfp, utility-ht }:
      mkDerivation {
        pname = "fixed-length";
-       version = "0.1.1";
-       sha256 = "64630e4f00c9403e270cad744c862104a1248f8c18f565cd485a8725d45357d5";
-       libraryHaskellDepends = [ base non-empty utility-ht ];
+       version = "0.2";
+       sha256 = "3171f2d443171a8e92733b3935805c7d5b54eae1f39f9fd729a766f887a6389b";
+       libraryHaskellDepends = [ base non-empty tfp utility-ht ];
        homepage = "http://hub.darcs.net/thielema/fixed-length/";
        description = "Lists with statically known length based on non-empty package";
        license = stdenv.lib.licenses.bsd3;
@@ -73789,6 +73919,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "free-vl" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "free-vl";
+       version = "0.1.3";
+       sha256 = "866cb0695f3dca802dbef507246f7833cd5167c46da42abfba88000a1a8d8837";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
+       homepage = "http://github.com/aaronlevin/free-vl";
+       description = "van Laarhoven encoded Free Monad with Extensible Effects";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "freekick2" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , directory, EdisonCore, filepath, FTGL, haskell98, mtl, OpenGL
@@ -77388,8 +77534,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-atk";
-       version = "0.2.16.10";
-       sha256 = "25a86bdf2a3e47742120e69ce589bce53b7558719ff8702c70962450f44b5f9f";
+       version = "0.2.18.10";
+       sha256 = "e56f898c789959b310bd1fcdf9065155751c56ab5065fbf3adbac31ed542f14d";
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi-base text
          transformers
@@ -77406,8 +77552,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-cairo";
-       version = "0.1.14.10";
-       sha256 = "3fd03d79bab120938f5c997b4d2185c27c87269ce10c043a792ab1361f2d5b5e";
+       version = "0.1.14.11";
+       sha256 = "d5662b5f971eb756b57c6cf3699b40ee7489a91cf64ad73074514e2f7a1329b9";
        libraryHaskellDepends = [
          base bytestring containers haskell-gi-base text transformers
        ];
@@ -77425,8 +77571,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gdk";
-       version = "0.3.16.10";
-       sha256 = "eb2725612d11c10c5e80f9e36b98005dfb507d7cf931f8f0e73d697bfca32fa5";
+       version = "0.3.18.10";
+       sha256 = "54c7eeb7d06fe03079aade5c415bb64753269add6195348c35c7dcdcb6ef018e";
        libraryHaskellDepends = [
          base bytestring containers gi-cairo gi-gdkpixbuf gi-gio gi-glib
          gi-gobject gi-pango haskell-gi-base text transformers
@@ -77444,8 +77590,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gdkpixbuf";
-       version = "0.2.31.10";
-       sha256 = "05a99667f23ee1b84698f72f2974a29cecd689f831a53e02eac29f2ad670c8e0";
+       version = "0.2.32.10";
+       sha256 = "b174113ae61ede2035eaf67380edbd6a93270a6c5c9ac3dbc2633b102eca6d29";
        libraryHaskellDepends = [
          base bytestring containers gi-gio gi-glib gi-gobject
          haskell-gi-base text transformers
@@ -77462,8 +77608,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gio";
-       version = "0.2.44.10";
-       sha256 = "1d88b5382117de58d63471f9758509f78887542596fcbda12d1a1b285e6a2198";
+       version = "0.2.46.10";
+       sha256 = "c37256afbbbf492c43ceef81c1fcb3be12ae165316a7576cb4054d10ccdeb6a0";
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi-base text
          transformers
@@ -77480,8 +77626,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-glib";
-       version = "0.2.44.10";
-       sha256 = "cbf1193ab37decfd44b7960a4251f13366660ca1f4923a26c77d0b528615a276";
+       version = "0.2.46.10";
+       sha256 = "4a36df320fce4e7543cb9bd8ffb50a94c3b0a1ef738c69a376080312612ed7f7";
        libraryHaskellDepends = [
          base bytestring containers haskell-gi-base text transformers
        ];
@@ -77497,8 +77643,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gobject";
-       version = "0.2.44.10";
-       sha256 = "b5b0ba17bd8b04f6ba37cbb7084b013ae8573528a42dc60e700b74d1624bc42e";
+       version = "0.2.46.10";
+       sha256 = "0378e905abf11d90d13eb3bb645a2877d8f0885e158bb98758ba5a77a041c2bc";
        libraryHaskellDepends = [
          base bytestring containers gi-glib haskell-gi-base text
          transformers
@@ -77516,8 +77662,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gtk";
-       version = "0.3.16.10";
-       sha256 = "170b20e7d219358fb85145043e22def9910d596a73d2f34d2abc83b7c8ea68a7";
+       version = "0.3.18.10";
+       sha256 = "ad4879b4a216722ac53dc7f71afa64e338e65440a9fecf3179f3f6d431b81458";
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
          gi-gio gi-glib gi-gobject gi-pango haskell-gi-base text
@@ -77536,8 +77682,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-javascriptcore";
-       version = "0.2.4.10";
-       sha256 = "5a8ce2ca47479e13b5c9e995e4ac760a24d777446869492fc36732033e7770db";
+       version = "0.2.10.10";
+       sha256 = "9bea9cfb0554d92c4320e04be53100cea142baec034be29306a80ce7037e9cb7";
        libraryHaskellDepends = [
          base bytestring containers haskell-gi-base text transformers
        ];
@@ -77555,8 +77701,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-notify";
-       version = "0.2.31.10";
-       sha256 = "896a93adc0397a768eca2cdcc911ca4e8b8df71fbbdbad18b97a88c67f6ef1cb";
+       version = "0.2.32.10";
+       sha256 = "c338d32b953fdf73ffb41b959c7c7b2834c40b29f644da77c0c67f9c53aa8f50";
        libraryHaskellDepends = [
          base bytestring containers gi-gdkpixbuf gi-glib gi-gobject
          haskell-gi-base text transformers
@@ -77573,8 +77719,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-pango";
-       version = "0.1.36.10";
-       sha256 = "84892b714d1c18346b4eed7590c8798b857ead43deaec84301a8467f5cf03278";
+       version = "0.1.38.10";
+       sha256 = "05b759c4ecd61dfbd16d62e91541905aecd00b84761931911a88b484630cd6cd";
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi-base text
          transformers
@@ -77591,8 +77737,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-soup";
-       version = "0.2.50.10";
-       sha256 = "7054e257fb68791b96e093642ce4fb85e79113cd798101f67e9caa89be9958d2";
+       version = "0.2.52.10";
+       sha256 = "7b680363b582d69a12d4c7da469530b821db2905bcad0c968f668b32edd663de";
        libraryHaskellDepends = [
          base bytestring containers gi-gio gi-glib gi-gobject
          haskell-gi-base text transformers
@@ -77610,8 +77756,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-vte";
-       version = "0.0.40.10";
-       sha256 = "7340310abfdf61a902fa83d69a8dbf23c79eb8b485fc069e76687d02f21210b1";
+       version = "0.0.42.10";
+       sha256 = "7ac367fb334d70eb852631ad12458682528c0080bd9592fd97377e8c865179ed";
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-gdk gi-gio gi-glib gi-gobject
          gi-gtk gi-pango haskell-gi-base text transformers
@@ -77631,20 +77777,41 @@ self: {
      }:
      mkDerivation {
        pname = "gi-webkit";
-       version = "0.2.4.10";
-       sha256 = "2fffe9bdac52deadfc22fca6814faaaa0a570453b49bbd2705273bd1a932dde3";
+       version = "0.2.4.11";
+       sha256 = "021835a251b1e9ddd2bf2910e0d3c17b4d6b940e9376a7000429f86a925a4013";
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
          gi-gio gi-glib gi-gobject gi-gtk gi-javascriptcore gi-soup
          haskell-gi-base text transformers
        ];
        libraryPkgconfigDepends = [ webkit ];
+       jailbreak = true;
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "WebKit bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) webkit;};
 
+  "gi-webkit2" = callPackage
+    ({ mkDerivation, base, bytestring, containers, gi-atk, gi-cairo
+     , gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk, gi-javascriptcore
+     , gi-soup, haskell-gi-base, text, transformers, webkit2gtk
+     }:
+     mkDerivation {
+       pname = "gi-webkit2";
+       version = "0.2.10.10";
+       sha256 = "03c8a0ba73dd1d1b942dd87d57560a8e7a50ec6684a32b07423aaf731feb9075";
+       libraryHaskellDepends = [
+         base bytestring containers gi-atk gi-cairo gi-gdk gi-gio gi-glib
+         gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi-base text
+         transformers
+       ];
+       libraryPkgconfigDepends = [ webkit2gtk ];
+       homepage = "https://github.com/haskell-gi/haskell-gi";
+       description = "WebKit2 bindings";
+       license = stdenv.lib.licenses.lgpl21;
+     }) {webkit2gtk = null;};
+
   "gimlh" = callPackage
     ({ mkDerivation, base, split }:
      mkDerivation {
@@ -78291,18 +78458,18 @@ self: {
 
   "gitHUD" = callPackage
     ({ mkDerivation, base, mtl, parsec, process, tasty, tasty-hunit
-     , tasty-quickcheck, tasty-smallcheck
+     , tasty-quickcheck, tasty-smallcheck, unix
      }:
      mkDerivation {
        pname = "gitHUD";
-       version = "1.0.0.0";
-       sha256 = "27f85577fa0826470927652a783ad8364c8cda2070a1905d3efecc5aa0e1941d";
+       version = "1.1.0";
+       sha256 = "da4494d601fde664dd90d30ab5431e9648599f561a956d54408b3bacce6032e7";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base mtl parsec process ];
+       libraryHaskellDepends = [ base mtl parsec process unix ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
-         base tasty tasty-hunit tasty-quickcheck tasty-smallcheck
+         base mtl parsec tasty tasty-hunit tasty-quickcheck tasty-smallcheck
        ];
        homepage = "http://github.com/gbataille/gitHUD#readme";
        description = "More efficient replacement to the great git-radar";
@@ -86237,7 +86404,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hakyll" = callPackage
+  "hakyll_4_7_5_0" = callPackage
     ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring
      , cmdargs, containers, cryptohash, data-default, deepseq, directory
      , filepath, fsnotify, http-conduit, http-types, HUnit, lrucache
@@ -86275,6 +86442,46 @@ self: {
        homepage = "http://jaspervdj.be/hakyll";
        description = "A static website compiler library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hakyll" = callPackage
+    ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring
+     , cmdargs, containers, cryptohash, data-default, deepseq, directory
+     , filepath, fsnotify, http-conduit, http-types, HUnit, lrucache
+     , mtl, network, network-uri, pandoc, pandoc-citeproc, parsec
+     , process, QuickCheck, random, regex-base, regex-tdfa, snap-core
+     , snap-server, system-filepath, tagsoup, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, text, time
+     , time-locale-compat
+     }:
+     mkDerivation {
+       pname = "hakyll";
+       version = "4.7.5.1";
+       sha256 = "39efc15d8d9bce1f151587f1556be8daac58c1d3fe6596458f0e9122a659b310";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary blaze-html blaze-markup bytestring cmdargs containers
+         cryptohash data-default deepseq directory filepath fsnotify
+         http-conduit http-types lrucache mtl network network-uri pandoc
+         pandoc-citeproc parsec process random regex-base regex-tdfa
+         snap-core snap-server system-filepath tagsoup text time
+         time-locale-compat
+       ];
+       executableHaskellDepends = [ base directory filepath ];
+       testHaskellDepends = [
+         base binary blaze-html blaze-markup bytestring cmdargs containers
+         cryptohash data-default deepseq directory filepath fsnotify
+         http-conduit http-types HUnit lrucache mtl network network-uri
+         pandoc pandoc-citeproc parsec process QuickCheck random regex-base
+         regex-tdfa snap-core snap-server system-filepath tagsoup
+         test-framework test-framework-hunit test-framework-quickcheck2 text
+         time time-locale-compat
+       ];
+       homepage = "http://jaspervdj.be/hakyll";
+       description = "A static website compiler library";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "hakyll-R" = callPackage
@@ -88954,8 +89161,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-generate";
-       version = "0.2.3";
-       sha256 = "56a56d0fda27baeba1d35e06ec79a11a67782de2c5df957e777dbdde65fa401e";
+       version = "0.2.4";
+       sha256 = "5ee6043024baf2cf79be13505e51f8ec3dab6aacb64df2ebb62f385ecf1b0c88";
        libraryHaskellDepends = [
          base containers haskell-src-exts template-haskell transformers
        ];
@@ -88974,8 +89181,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-gi";
-       version = "0.10.2";
-       sha256 = "d6e6808615a03b69b0653f10f6634315ccc8e3e57b108175a043b708e3608163";
+       version = "0.11";
+       sha256 = "b3843bc0375160280a24bf4f55b9d2c5a581dd3639e7fe7fa6c846831c04ef2b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -88984,6 +89191,7 @@ self: {
          xdg-basedir xml-conduit
        ];
        executablePkgconfigDepends = [ glib gobjectIntrospection ];
+       jailbreak = true;
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Generate Haskell bindings for GObject Introspection capable libraries";
        license = stdenv.lib.licenses.lgpl21;
@@ -88995,8 +89203,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-gi-base";
-       version = "0.10.1";
-       sha256 = "04457204453324cb8cea89d86159153bc9c141d8371212c49fa379aa06f7cde0";
+       version = "0.11";
+       sha256 = "b25c07cb1c4d40a4a2bedd38d0a91633f360dde4ab4b34c7011a281f79a7f880";
        libraryHaskellDepends = [
          base bytestring containers text transformers
        ];
@@ -90297,8 +90505,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskellscrabble";
-       version = "1.2.2";
-       sha256 = "ceba6d9f16a052ff8164fdfafd6ce3f01c17e951794d3e5bf727531a750152e4";
+       version = "1.3.2";
+       sha256 = "aeeeef106ca3bef50fa0882562b1fdca3b2037e6adb274fedde3dc1450d6185c";
        libraryHaskellDepends = [
          array arrows base containers errors listsafe mtl parsec QuickCheck
          random safe semigroups split transformers unordered-containers
@@ -93185,6 +93393,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hdr-histogram" = callPackage
+    ({ mkDerivation, base, deepseq, hspec, primitive, QuickCheck
+     , random, tagged, vector, vector-algorithms
+     }:
+     mkDerivation {
+       pname = "hdr-histogram";
+       version = "0.1.0.0";
+       sha256 = "f8780c975a6d918c04eaef674a90a13b84f1d671079ebd6ffd7447378511762c";
+       libraryHaskellDepends = [
+         base deepseq primitive QuickCheck tagged vector
+       ];
+       testHaskellDepends = [
+         base hspec QuickCheck random tagged vector vector-algorithms
+       ];
+       homepage = "http://github.com/joshbohde/hdr-histogram#readme";
+       description = "Haskell implementation of High Dynamic Range (HDR) Histograms";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "headergen" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
      , filepath, haskeline, time
@@ -96453,6 +96680,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hkdf" = callPackage
+    ({ mkDerivation, base, byteable, bytestring, cryptohash, hspec }:
+     mkDerivation {
+       pname = "hkdf";
+       version = "0.0.1.1";
+       sha256 = "5a1a00abb49577abed25c76b75592ab3bbffe696b1b5884af5d0ea35b8cb7463";
+       libraryHaskellDepends = [ base byteable bytestring cryptohash ];
+       testHaskellDepends = [ base byteable bytestring cryptohash hspec ];
+       homepage = "http://github.com/j1r1k/hkdf";
+       description = "Implementation of HKDF (RFC 5869)";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hlatex" = callPackage
     ({ mkDerivation, base, base-unicode-symbols, containers, derive
      , directory, filepath, frquotes, mtl, process, template-haskell
@@ -97376,8 +97616,8 @@ self: {
      }:
      mkDerivation {
        pname = "hlint";
-       version = "1.9.25";
-       sha256 = "df91b43493f0c408fc6b7f9a1f65802e9dc49ff5c126b5b8f8464d8db7443f95";
+       version = "1.9.26";
+       sha256 = "f9dcb152d05472c16572e9519494b376c12b748a886f79f74ffcfcb973c33553";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -98263,6 +98503,8 @@ self: {
        pname = "ho-rewriting";
        version = "0.2";
        sha256 = "c962e3c2b5e7943bfbc7c781070b35cb81d4c39d2afc221c207dc4bb38785acd";
+       revision = "1";
+       editedCabalFile = "564496857e81054420e85172517d838ecd0b7d0cca6f324c52b92ef5a2fe820c";
        libraryHaskellDepends = [
          base compdata containers mtl patch-combinators
        ];
@@ -98361,7 +98603,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hoauth2" = callPackage
+  "hoauth2_0_4_8" = callPackage
     ({ mkDerivation, aeson, base, bytestring, http-conduit, http-types
      , text
      }:
@@ -98381,6 +98623,29 @@ self: {
        homepage = "https://github.com/freizl/hoauth2";
        description = "hoauth2";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hoauth2" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, http-conduit
+     , http-types, text, wai, warp
+     }:
+     mkDerivation {
+       pname = "hoauth2";
+       version = "0.5.0";
+       sha256 = "8aedac3c8276965a6ace7c634f6c26932a13062e02d8139de3d6278eacd41c2d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring http-conduit http-types text
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring containers http-conduit http-types text wai
+         warp
+       ];
+       homepage = "https://github.com/freizl/hoauth2";
+       description = "hoauth2";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "hob" = callPackage
@@ -105083,8 +105348,8 @@ self: {
      }:
      mkDerivation {
        pname = "htaglib";
-       version = "1.0.0";
-       sha256 = "4d544ad9ca86b1e400393f3173d5416839440d5fefcde2b16ba2e50dd065d1fe";
+       version = "1.0.1";
+       sha256 = "beade72766595be3705b9ac3d13461dffefb821b471c22a53b04b93ff86db760";
        libraryHaskellDepends = [ base bytestring text ];
        librarySystemDepends = [ taglib ];
        testHaskellDepends = [
@@ -112615,6 +112880,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "io-streams_1_3_4_0" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder
+     , deepseq, directory, filepath, HUnit, mtl, network, primitive
+     , process, QuickCheck, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, time, transformers, vector
+     , zlib, zlib-bindings
+     }:
+     mkDerivation {
+       pname = "io-streams";
+       version = "1.3.4.0";
+       sha256 = "dbf96287305efed2ba20bed46b82e70a6ea757ddb7cc66dc184fefd7ce05b431";
+       configureFlags = [ "-fnointeractivetests" ];
+       libraryHaskellDepends = [
+         attoparsec base bytestring bytestring-builder network primitive
+         process text time transformers vector zlib-bindings
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring bytestring-builder deepseq directory
+         filepath HUnit mtl network primitive process QuickCheck
+         test-framework test-framework-hunit test-framework-quickcheck2 text
+         time transformers vector zlib zlib-bindings
+       ];
+       description = "Simple, composable, and easy-to-use stream I/O";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "io-streams-http" = callPackage
     ({ mkDerivation, base, bytestring, http-client, http-client-tls
      , io-streams, mtl, transformers
@@ -114175,6 +114467,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "java-poker" = callPackage
+    ({ mkDerivation, base, random-shuffle }:
+     mkDerivation {
+       pname = "java-poker";
+       version = "0.1.1.0";
+       sha256 = "e8e09b478e518e91a4fe50cdb60161a45c774ff919e95c47527aee6f805f35da";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base random-shuffle ];
+       executableHaskellDepends = [ base ];
+       homepage = "https://github.com/tobynet/java-poker#readme";
+       description = "The etude of the Haskell programming";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "java-reflect" = callPackage
     ({ mkDerivation, base, containers, hx, java-bridge }:
      mkDerivation {
@@ -117541,6 +117848,7 @@ self: {
        sha256 = "aeefa9e99b0533239710f0f8c2786c48370f6deb424fa3a49e579b748fe0f2e8";
        libraryHaskellDepends = [ base bytestring OpenGL ];
        libraryPkgconfigDepends = [ egl glew ];
+       jailbreak = true;
        homepage = "https://github.com/corngood/ktx";
        description = "A binding for libktx from Khronos";
        license = stdenv.lib.licenses.mit;
@@ -119671,19 +119979,43 @@ self: {
      }) {};
 
   "language-thrift" = callPackage
-    ({ mkDerivation, base, hspec, hspec-discover, lens, parsers
-     , QuickCheck, text, transformers, trifecta, wl-pprint
+    ({ mkDerivation, ansi-wl-pprint, base, hspec, hspec-discover, lens
+     , parsers, QuickCheck, text, transformers, trifecta, wl-pprint
      }:
      mkDerivation {
        pname = "language-thrift";
-       version = "0.5.0.0";
-       sha256 = "3163d87531b108f0f85f3e1335cf7b755243722b9ac2e0b57f6e328dffcfca99";
+       version = "0.6.1.0";
+       sha256 = "a3c42400a6d0ca72a131d5d4b63b9e8d05724a9f18b04966b41893293e6553f2";
        libraryHaskellDepends = [
-         base lens parsers text transformers trifecta wl-pprint
+         ansi-wl-pprint base lens parsers text transformers trifecta
+         wl-pprint
        ];
        testHaskellDepends = [
-         base hspec hspec-discover parsers QuickCheck text trifecta
-         wl-pprint
+         ansi-wl-pprint base hspec hspec-discover parsers QuickCheck text
+         trifecta wl-pprint
+       ];
+       homepage = "https://github.com/abhinav/language-thrift";
+       description = "Parser and pretty printer for the Thrift IDL format";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "language-thrift_0_6_2_0" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, hspec, hspec-discover, lens
+     , parsers, QuickCheck, template-haskell, text, transformers
+     , trifecta, wl-pprint
+     }:
+     mkDerivation {
+       pname = "language-thrift";
+       version = "0.6.2.0";
+       sha256 = "eeac9f1310fc93286f196e7421861b428db79c69cfac7465ef00525297a89d32";
+       libraryHaskellDepends = [
+         ansi-wl-pprint base lens parsers template-haskell text transformers
+         trifecta wl-pprint
+       ];
+       testHaskellDepends = [
+         ansi-wl-pprint base hspec hspec-discover parsers QuickCheck text
+         trifecta wl-pprint
        ];
        homepage = "https://github.com/abhinav/language-thrift";
        description = "Parser and pretty printer for the Thrift IDL format";
@@ -121571,24 +121903,24 @@ self: {
 
   "liblastfm" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cereal, containers
-     , crypto-api, hspec, hspec-expectations-lens, http-client
+     , cryptonite, hspec, hspec-expectations-lens, http-client
      , http-client-tls, HUnit, lens, lens-aeson, network-uri
-     , profunctors, pureMD5, semigroups, text, xml-conduit
+     , profunctors, semigroups, text, transformers, xml-conduit
      , xml-html-conduit-lens
      }:
      mkDerivation {
        pname = "liblastfm";
-       version = "0.5.1";
-       sha256 = "fe761fbbaa5fa44b8d40e02db286b49ca2baccb0c072c60d224be21c1402c5ad";
+       version = "0.6.0";
+       sha256 = "2f00f7713e9c235e271c133a41f1806c193a03827b9c675f80b83cd11bc1d264";
        libraryHaskellDepends = [
-         aeson base bytestring cereal containers crypto-api http-client
-         http-client-tls network-uri profunctors pureMD5 semigroups text
-         xml-conduit
+         aeson base bytestring cereal containers cryptonite http-client
+         http-client-tls network-uri profunctors semigroups text
+         transformers xml-conduit
        ];
        testHaskellDepends = [
-         aeson base bytestring cereal containers crypto-api hspec
+         aeson base bytestring cereal containers cryptonite hspec
          hspec-expectations-lens http-client http-client-tls HUnit lens
-         lens-aeson network-uri profunctors pureMD5 text xml-conduit
+         lens-aeson network-uri profunctors text transformers xml-conduit
          xml-html-conduit-lens
        ];
        description = "Lastfm API interface";
@@ -122671,6 +123003,7 @@ self: {
        libraryHaskellDepends = [
          base distributive lens linear OpenGL OpenGLRaw tagged
        ];
+       jailbreak = true;
        homepage = "http://www.github.com/bgamari/linear-opengl";
        description = "Isomorphisms between linear and OpenGL types";
        license = stdenv.lib.licenses.bsd3;
@@ -125460,20 +125793,6 @@ self: {
      }) {};
 
   "lucid-svg" = callPackage
-    ({ mkDerivation, base, blaze-builder, lucid, text, transformers }:
-     mkDerivation {
-       pname = "lucid-svg";
-       version = "0.6.0.0";
-       sha256 = "3d9d43bd40c33931e6f6a5ab6a5153dd598045434bd219e8f3c9e6af65f65f58";
-       libraryHaskellDepends = [
-         base blaze-builder lucid text transformers
-       ];
-       homepage = "http://github.com/jeffreyrosenbluth/lucid-svg.git";
-       description = "DSL for SVG using lucid for HTML";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "lucid-svg_0_6_0_1" = callPackage
     ({ mkDerivation, base, blaze-builder, lucid, text, transformers }:
      mkDerivation {
        pname = "lucid-svg";
@@ -125485,7 +125804,6 @@ self: {
        homepage = "http://github.com/jeffreyrosenbluth/lucid-svg.git";
        description = "DSL for SVG using lucid for HTML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lucienne" = callPackage
@@ -127228,6 +127546,7 @@ self: {
          template-haskell text time tls transformers transformers-base
          unordered-containers utf8-string vector wai warp x509-system
        ];
+       doCheck = false;
        homepage = "https://github.com/prowdsponsor/mangopay";
        description = "Bindings to the MangoPay API";
        license = stdenv.lib.licenses.bsd3;
@@ -127253,8 +127572,8 @@ self: {
      }:
      mkDerivation {
        pname = "manifolds";
-       version = "0.1.6.2";
-       sha256 = "d074a16877f078da4794b7f26b7edea7eec1df7a41527a5005a3b4d6f2abef02";
+       version = "0.1.6.3";
+       sha256 = "52b27094f18303664d91d5042f10d5ff0379de1104a21d14282b85efa954178a";
        libraryHaskellDepends = [
          base comonad constrained-categories containers deepseq hmatrix
          MemoTrie semigroups tagged transformers vector vector-space void
@@ -128665,6 +128984,8 @@ self: {
        pname = "memory";
        version = "0.6";
        sha256 = "7c09b84114044e9183785a6db7bef74fbfdcb710620f1185fd4a972ea0cd20a3";
+       revision = "1";
+       editedCabalFile = "380f7409f7c1bf0d287aefe77267e7d18858f556672519348b26d351f9538f23";
        libraryHaskellDepends = [ base bytestring deepseq ghc-prim ];
        testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
        homepage = "https://github.com/vincenthz/hs-memory";
@@ -128681,6 +129002,8 @@ self: {
        pname = "memory";
        version = "0.7";
        sha256 = "e123c8851a0f9bc3d442a462324bb828f6571d0d90fe1c6cb671f8913bd941fa";
+       revision = "1";
+       editedCabalFile = "f45af2b5e7abcf5f66673d053d3531a62cd6417b3830c0ae375ee704c4c539c8";
        libraryHaskellDepends = [ base bytestring deepseq ghc-prim ];
        testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
        homepage = "https://github.com/vincenthz/hs-memory";
@@ -128697,6 +129020,8 @@ self: {
        pname = "memory";
        version = "0.10";
        sha256 = "4fbd6b86424c9513c4315b0e3649d4545400b07045cce5de5930ca25eb4f1af7";
+       revision = "1";
+       editedCabalFile = "077f03d446f54b00ecc4b9b3af646532f6e9d0a455b911ddfaf2484507c48433";
        libraryHaskellDepends = [ base bytestring deepseq ghc-prim ];
        testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
        homepage = "https://github.com/vincenthz/hs-memory";
@@ -129159,20 +129484,20 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "microlens";
-       version = "0.3.5.0";
-       sha256 = "5bb84795005ae4a8f828c78127044858c9d83cb8adcd373a337b3ac4588d2d2c";
+       version = "0.3.5.1";
+       sha256 = "dcdda73757640dc9b72da6730269debfb318794a94dd9bd6ecfa0ab89107aaa0";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/aelve/microlens";
        description = "A tiny part of the lens library with no dependencies";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "microlens_0_4_0_0" = callPackage
+  "microlens_0_4_0_1" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "microlens";
-       version = "0.4.0.0";
-       sha256 = "6e01798e936ac52295b803c9bf3e9c7999f628c1f928e312b05ddf3787493d42";
+       version = "0.4.0.1";
+       sha256 = "7ebb20642369da49ce3b656aa6893fccccdf95d2dbe68acad35c29c6fad93c14";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/aelve/microlens";
        description = "A tiny part of the lens library with no dependencies";
@@ -129187,8 +129512,8 @@ self: {
      }:
      mkDerivation {
        pname = "microlens-aeson";
-       version = "2.0.0";
-       sha256 = "2643285013e2709100e0e3ded10e3d1a1f4ab75faae604e36d37c2688d9c3743";
+       version = "2.1.0";
+       sha256 = "e0a5471df7e70aa6b79ce29830be8beeae10ce137ee8a358d4928285aff4b561";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring microlens scientific text
          unordered-containers vector
@@ -129492,8 +129817,8 @@ self: {
      }:
      mkDerivation {
        pname = "midi";
-       version = "0.2.1.5";
-       sha256 = "7fd0051d424443ae10b505611a5c2fc4996d7698d48e1dd962fcf4b8a8be296e";
+       version = "0.2.2";
+       sha256 = "e0f32499afddb6f0e790a8cabecd53e6cefdf87a64a789ad1d15a2d862a0fb6d";
        libraryHaskellDepends = [
          base binary bytestring event-list explicit-exception
          monoid-transformer non-negative QuickCheck random transformers
@@ -132358,7 +132683,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "mongoDB" = callPackage
+  "mongoDB_2_0_9" = callPackage
     ({ mkDerivation, array, base, base16-bytestring, base64-bytestring
      , binary, bson, bytestring, containers, cryptohash, hashtables
      , hspec, lifted-base, monad-control, mtl, network, nonce
@@ -132380,6 +132705,30 @@ self: {
        homepage = "https://github.com/mongodb-haskell/mongodb";
        description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "mongoDB" = callPackage
+    ({ mkDerivation, array, base, base16-bytestring, base64-bytestring
+     , binary, bson, bytestring, containers, cryptohash, hashtables
+     , hspec, lifted-base, monad-control, mtl, network, nonce
+     , old-locale, parsec, random, random-shuffle, text, time
+     , transformers-base
+     }:
+     mkDerivation {
+       pname = "mongoDB";
+       version = "2.0.10";
+       sha256 = "8986956648874ce70c0bc4682d7856ea20c1477895405c532e6de34573f5b0df";
+       libraryHaskellDepends = [
+         array base base16-bytestring base64-bytestring binary bson
+         bytestring containers cryptohash hashtables lifted-base
+         monad-control mtl network nonce parsec random random-shuffle text
+         transformers-base
+       ];
+       testHaskellDepends = [ base hspec mtl old-locale text time ];
+       homepage = "https://github.com/mongodb-haskell/mongodb";
+       description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS";
+       license = "unknown";
      }) {};
 
   "mongodb-queue" = callPackage
@@ -133044,8 +133393,8 @@ self: {
      }:
      mkDerivation {
        pname = "morte";
-       version = "1.4.1";
-       sha256 = "3018b6a951b19d0c1bb9109e7e5d11059fe8f78743cb13b33a3be2c1da5e78d6";
+       version = "1.4.2";
+       sha256 = "766814c920fac0fa03a64ffe155ab46c291942d6c9652da6874e8893d6b96148";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -133490,6 +133839,8 @@ self: {
        pname = "mtl";
        version = "2.2.1";
        sha256 = "cae59d79f3a16f8e9f3c9adc1010c7c6cdddc73e8a97ff4305f6439d855c8dc5";
+       revision = "1";
+       editedCabalFile = "4b5a800fe9edf168fc7ae48c7a3fc2aab6b418ac15be2f1dad43c0f48a494a3b";
        libraryHaskellDepends = [ base transformers ];
        homepage = "http://github.com/ekmett/mtl";
        description = "Monad classes, using functional dependencies";
@@ -139933,8 +140284,8 @@ self: {
      }:
      mkDerivation {
        pname = "opaleye-trans";
-       version = "0.3.0";
-       sha256 = "1f709b8402d9a9b395cdeb89cd23d111c9883f992f33599cb1d4f1a5ab159dce";
+       version = "0.3.1";
+       sha256 = "61c5c21c4bbb9bcc3111ed3310fe454c3cd9e612c2c79cc34f5bbbbae28024f7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -139944,7 +140295,6 @@ self: {
        executableHaskellDepends = [
          base opaleye postgresql-simple product-profunctors
        ];
-       jailbreak = true;
        homepage = "https://github.com/tomjaguarpaw/haskell-opaleye";
        description = "A monad transformer for Opaleye";
        license = stdenv.lib.licenses.bsd3;
@@ -139964,6 +140314,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "open-browser_0_2_1_0" = callPackage
+    ({ mkDerivation, base, process }:
+     mkDerivation {
+       pname = "open-browser";
+       version = "0.2.1.0";
+       sha256 = "0bed2e63800f738e78a4803ed22902accb50ac02068b96c17ce83a267244ca66";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base process ];
+       executableHaskellDepends = [ base ];
+       homepage = "https://github.com/rightfold/open-browser";
+       description = "Open a web browser from Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "open-haddock" = callPackage
     ({ mkDerivation, base, basic-prelude, text, turtle }:
      mkDerivation {
@@ -140640,29 +141006,30 @@ self: {
      }) {};
 
   "opml-conduit" = callPackage
-    ({ mkDerivation, base, case-insensitive, conduit
+    ({ mkDerivation, base, bytestring, case-insensitive, conduit
      , conduit-combinators, conduit-parse, containers, data-default
-     , exceptions, hashable, hashable-time, hlint, lens
-     , mono-traversable, monoid-subclasses, mtl, network-uri, parsers
-     , QuickCheck, quickcheck-instances, resourcet, semigroups, tasty
-     , tasty-hunit, tasty-quickcheck, text, time, timerep
-     , unordered-containers, xml-conduit, xml-conduit-parse, xml-types
+     , exceptions, foldl, hlint, lens-simple, mono-traversable
+     , monoid-subclasses, mtl, parsers, QuickCheck, quickcheck-instances
+     , resourcet, semigroups, tasty, tasty-hunit, tasty-quickcheck, text
+     , time, timerep, uri-bytestring, xml-conduit, xml-conduit-parse
+     , xml-types
      }:
      mkDerivation {
        pname = "opml-conduit";
-       version = "0.3.0.0";
-       sha256 = "3f3e7bccd4b598a825e3a237584b3823d3941e16ebe9d05f5e2cecffb4b77302";
+       version = "0.4.0.0";
+       sha256 = "7a684983ad76067cce5d6b9358cfb581a2222a6495928eca9d61aa04bd0e9e1d";
        libraryHaskellDepends = [
-         base case-insensitive conduit conduit-parse containers data-default
-         exceptions hashable hashable-time lens mono-traversable
-         monoid-subclasses network-uri parsers QuickCheck
-         quickcheck-instances semigroups text time timerep
-         unordered-containers xml-conduit xml-conduit-parse xml-types
+         base case-insensitive conduit conduit-parse containers exceptions
+         foldl lens-simple mono-traversable monoid-subclasses parsers
+         semigroups text time timerep uri-bytestring xml-conduit
+         xml-conduit-parse xml-types
        ];
        testHaskellDepends = [
-         base conduit conduit-combinators conduit-parse containers
-         data-default exceptions hlint lens mtl network-uri parsers
-         resourcet tasty tasty-hunit tasty-quickcheck xml-conduit-parse
+         base bytestring conduit conduit-combinators conduit-parse
+         containers data-default exceptions hlint lens-simple
+         mono-traversable mtl parsers QuickCheck quickcheck-instances
+         resourcet semigroups tasty tasty-hunit tasty-quickcheck text time
+         uri-bytestring xml-conduit-parse
        ];
        homepage = "https://github.com/k0ral/opml-conduit";
        description = "Streaming parser/renderer for the OPML 2.0 format.";
@@ -140750,6 +141117,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "option" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "option";
+       version = "0.1.0.1";
+       sha256 = "52cddd415c4baeb2148fadcbca5cfd9105762df58e5b5660a5cd55cd385802d4";
+       libraryHaskellDepends = [ base ];
+       description = "A strict version of Maybe";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "optional" = callPackage
     ({ mkDerivation, base, directory, doctest, filepath, QuickCheck }:
      mkDerivation {
@@ -142189,6 +142567,53 @@ self: {
        license = "GPL";
      }) {};
 
+  "pandoc_1_16" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, array, base
+     , base64-bytestring, binary, blaze-html, blaze-markup, bytestring
+     , cmark, containers, data-default, deepseq-generics, Diff
+     , directory, executable-path, extensible-exceptions, filemanip
+     , filepath, ghc-prim, haddock-library, highlighting-kate, hslua
+     , HTTP, http-client, http-client-tls, http-types, HUnit
+     , JuicyPixels, mtl, network, network-uri, old-time, pandoc-types
+     , parsec, process, QuickCheck, random, scientific, SHA, syb
+     , tagsoup, temporary, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, texmath, text, time
+     , unordered-containers, vector, xml, yaml, zip-archive, zlib
+     }:
+     mkDerivation {
+       pname = "pandoc";
+       version = "1.16";
+       sha256 = "20c0b19a6bf435166da3b9e400c021b90687d8258ad1a0aecfc49fce1f2c6d0c";
+       configureFlags = [ "-fhttps" ];
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson array base base64-bytestring binary blaze-html blaze-markup
+         bytestring cmark containers data-default deepseq-generics directory
+         extensible-exceptions filemanip filepath ghc-prim haddock-library
+         highlighting-kate hslua HTTP http-client http-client-tls http-types
+         JuicyPixels mtl network network-uri old-time pandoc-types parsec
+         process random scientific SHA syb tagsoup temporary texmath text
+         time unordered-containers vector xml yaml zip-archive zlib
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring containers directory extensible-exceptions
+         filepath highlighting-kate HTTP network network-uri pandoc-types
+         text yaml
+       ];
+       testHaskellDepends = [
+         ansi-terminal base bytestring containers Diff directory
+         executable-path filepath highlighting-kate HUnit pandoc-types
+         process QuickCheck syb test-framework test-framework-hunit
+         test-framework-quickcheck2 text zip-archive
+       ];
+       jailbreak = true;
+       homepage = "http://pandoc.org";
+       description = "Conversion between markup formats";
+       license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pandoc-citeproc_0_6" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
      , containers, data-default, directory, filepath, hs-bibutils, mtl
@@ -142385,6 +142810,41 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pandoc-citeproc_0_9" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
+     , containers, data-default, directory, filepath, hs-bibutils, mtl
+     , old-locale, pandoc, pandoc-types, parsec, process, rfc5051
+     , setenv, split, syb, tagsoup, temporary, text, time
+     , unordered-containers, vector, xml-conduit, yaml
+     }:
+     mkDerivation {
+       pname = "pandoc-citeproc";
+       version = "0.9";
+       sha256 = "ae880aa27b5fcaf93886844bd9473c764329dc96211482bf014f350335887fbd";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers data-default directory filepath
+         hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051
+         setenv split syb tagsoup text time unordered-containers vector
+         xml-conduit yaml
+       ];
+       executableHaskellDepends = [
+         aeson aeson-pretty attoparsec base bytestring containers directory
+         filepath pandoc pandoc-types process syb temporary text vector yaml
+       ];
+       testHaskellDepends = [
+         aeson base bytestring directory filepath pandoc pandoc-types
+         process temporary text yaml
+       ];
+       jailbreak = true;
+       doCheck = false;
+       homepage = "https://github.com/jgm/pandoc-citeproc";
+       description = "Supports using pandoc with citeproc";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pandoc-citeproc-preamble" = callPackage
     ({ mkDerivation, base, directory, filepath, pandoc-types, process
      }:
@@ -142408,8 +142868,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-crossref";
-       version = "0.1.6.0";
-       sha256 = "c77a309552b54bb03b7e2624dc45fdf6452dd63756f8955b5db5480df45cedf0";
+       version = "0.1.6.2";
+       sha256 = "5317de67d381210fda43dba79061c33abb64c5eb42707a2fa570c330a165bd57";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -142621,6 +143081,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pandoc-types_1_16" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers
+     , deepseq-generics, ghc-prim, syb
+     }:
+     mkDerivation {
+       pname = "pandoc-types";
+       version = "1.16";
+       sha256 = "5879ba2b292950029e60ce458859ae35a33766acfb2f1ac162a4d3c07c75c8a2";
+       libraryHaskellDepends = [
+         aeson base bytestring containers deepseq-generics ghc-prim syb
+       ];
+       homepage = "http://johnmacfarlane.net/pandoc";
+       description = "Types for representing a structured document";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pandoc-unlit" = callPackage
     ({ mkDerivation, base, pandoc }:
      mkDerivation {
@@ -142819,7 +143296,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "parallel" = callPackage
+  "parallel_3_2_0_6" = callPackage
     ({ mkDerivation, array, base, containers, deepseq }:
      mkDerivation {
        pname = "parallel";
@@ -142828,6 +143305,18 @@ self: {
        libraryHaskellDepends = [ array base containers deepseq ];
        description = "Parallel programming library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "parallel" = callPackage
+    ({ mkDerivation, array, base, containers, deepseq }:
+     mkDerivation {
+       pname = "parallel";
+       version = "3.2.1.0";
+       sha256 = "4de3cdbb71dfd13cbb70a1dc1d1d5cf34fbe9828e05eb02b3dc658fdc2148526";
+       libraryHaskellDepends = [ array base containers deepseq ];
+       description = "Parallel programming library";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "parallel-io" = callPackage
@@ -146902,8 +147391,8 @@ self: {
      }:
      mkDerivation {
        pname = "phoityne";
-       version = "0.0.1.1";
-       sha256 = "ccd94c94aa1c9b2bc435d49ba8c6049f8e747edd2c766c748b794081771f0b29";
+       version = "0.0.2.0";
+       sha256 = "14f496b53ad8bf95d496e685e7d006f226b8cb579284ea2cd2d554590e6050d2";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -148488,19 +148977,19 @@ self: {
   "pkcs10" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base
      , bytestring, cryptonite, pem, QuickCheck, tasty, tasty-hunit
-     , tasty-quickcheck, x509
+     , tasty-quickcheck, transformers, x509
      }:
      mkDerivation {
        pname = "pkcs10";
-       version = "0.1.0.4";
-       sha256 = "8d073426641e1cad88f7c40d7448b6fd2363765554ff89ef75519f96b07e7ba4";
+       version = "0.1.0.5";
+       sha256 = "c07fe8bcf0904e80bfab4816172c827ed07fe01f5d7dc172dc96a2e9da9afc58";
        libraryHaskellDepends = [
          asn1-encoding asn1-parse asn1-types base bytestring cryptonite pem
          x509
        ];
        testHaskellDepends = [
          asn1-encoding asn1-parse asn1-types base bytestring cryptonite pem
-         QuickCheck tasty tasty-hunit tasty-quickcheck x509
+         QuickCheck tasty tasty-hunit tasty-quickcheck transformers x509
        ];
        homepage = "https://github.com/fcomb/pkcs10-hs#readme";
        description = "PKCS#10 library";
@@ -149611,8 +150100,8 @@ self: {
      }:
      mkDerivation {
        pname = "pontarius-xmpp";
-       version = "0.5.0";
-       sha256 = "adf8e8627819dbed26dff553e75b1c9934be049495faa5caee46445ffa3059fe";
+       version = "0.5.1";
+       sha256 = "4bcfeb21bd86d912dbfc8c1574f76ee3b099fda2e35302a7f6fd4dca4f33a475";
        libraryHaskellDepends = [
          attoparsec base base64-bytestring binary bytestring conduit
          containers crypto-api crypto-random cryptohash cryptohash-cryptoapi
@@ -150307,28 +150796,29 @@ self: {
   "postgresql-query" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
      , containers, data-default, either, exceptions, file-embed
-     , haskell-src-meta, hreader, hset, monad-control, monad-logger, mtl
-     , postgresql-simple, QuickCheck, quickcheck-assertions
-     , quickcheck-instances, resource-pool, semigroups, tasty
-     , tasty-hunit, tasty-quickcheck, tasty-th, template-haskell, text
-     , th-lift, th-lift-instances, time, transformers, transformers-base
-     , transformers-compat
+     , haskell-src-meta, hreader, hset, inflections, monad-control
+     , monad-logger, mtl, postgresql-simple, QuickCheck
+     , quickcheck-assertions, quickcheck-instances, resource-pool
+     , semigroups, tasty, tasty-hunit, tasty-quickcheck, tasty-th
+     , template-haskell, text, th-lift, th-lift-instances, time
+     , transformers, transformers-base, transformers-compat
      }:
      mkDerivation {
        pname = "postgresql-query";
-       version = "2.2.0";
-       sha256 = "849978795d764e790d3ce239237ba8ac52294cc255b8b5645f98e3408b402a1d";
+       version = "2.3.0";
+       sha256 = "bd3aaf1bcb3d424090962ace0b973f0b65aeee21aab44c9a1cb8c622936479d7";
        libraryHaskellDepends = [
          aeson attoparsec base blaze-builder bytestring containers
          data-default either exceptions file-embed haskell-src-meta hreader
-         hset monad-control monad-logger mtl postgresql-simple resource-pool
-         semigroups template-haskell text th-lift th-lift-instances time
-         transformers transformers-base transformers-compat
+         hset inflections monad-control monad-logger mtl postgresql-simple
+         resource-pool semigroups template-haskell text th-lift
+         th-lift-instances time transformers transformers-base
+         transformers-compat
        ];
        testHaskellDepends = [
-         attoparsec base QuickCheck quickcheck-assertions
+         attoparsec base inflections QuickCheck quickcheck-assertions
          quickcheck-instances tasty tasty-hunit tasty-quickcheck tasty-th
-         text
+         text time
        ];
        homepage = "https://bitbucket.org/s9gf4ult/postgresql-query";
        description = "Sql interpolating quasiquote plus some kind of primitive ORM using it";
@@ -150875,22 +151365,23 @@ self: {
      }) {};
 
   "pred-trie" = callPackage
-    ({ mkDerivation, base, composition-extra, deepseq, hashable, mtl
-     , QuickCheck, quickcheck-instances, semigroups, tasty, tasty-hunit
-     , tasty-quickcheck, tries, unordered-containers
+    ({ mkDerivation, attoparsec, base, composition-extra, deepseq
+     , errors, hashable, mtl, poly-arity, QuickCheck
+     , quickcheck-instances, semigroups, tasty, tasty-hunit
+     , tasty-quickcheck, text, tries, unordered-containers
      }:
      mkDerivation {
        pname = "pred-trie";
-       version = "0.4.0";
-       sha256 = "38e69ebc2be0a48d62949214a86b29a2657ca5cc0b99d14e681184318ee9689c";
+       version = "0.5.0";
+       sha256 = "c78d3825c80a4a7542fa888c87f91bf86d7153a944d1364f46789e51c4aaefff";
        libraryHaskellDepends = [
-         base composition-extra hashable mtl QuickCheck semigroups tries
-         unordered-containers
+         base composition-extra hashable mtl poly-arity QuickCheck
+         semigroups tries unordered-containers
        ];
        testHaskellDepends = [
-         base composition-extra deepseq hashable mtl QuickCheck
-         quickcheck-instances semigroups tasty tasty-hunit tasty-quickcheck
-         tries unordered-containers
+         attoparsec base composition-extra deepseq errors hashable mtl
+         poly-arity QuickCheck quickcheck-instances semigroups tasty
+         tasty-hunit tasty-quickcheck text tries unordered-containers
        ];
        description = "Predicative tries";
        license = stdenv.lib.licenses.bsd3;
@@ -152565,8 +153056,8 @@ self: {
      }:
      mkDerivation {
        pname = "propellor";
-       version = "2.15.1";
-       sha256 = "44931af0094e7831910dd691687c5ef1bff7553e327cc95dcbf857cf463c8b9e";
+       version = "2.15.2";
+       sha256 = "9409e81802e2809f6ce8bbf9b6ce509c9a0e6e2f787349e752beebd910088a0c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -156269,8 +156760,8 @@ self: {
      }:
      mkDerivation {
        pname = "reactive-banana";
-       version = "1.0.0.1";
-       sha256 = "a2f50eff5ddce60303fa365a9d24c9062877e59c0f98bdfd84c2f5d71e16340b";
+       version = "1.1.0.0";
+       sha256 = "8557c1140f2e27064a59502215b64dd0c005b97b5b1c8ecf999a3dd59881fde2";
        libraryHaskellDepends = [
          base containers hashable pqueue transformers unordered-containers
          vault
@@ -156323,8 +156814,8 @@ self: {
     ({ mkDerivation, base, cabal-macosx, reactive-banana, wx, wxcore }:
      mkDerivation {
        pname = "reactive-banana-wx";
-       version = "1.0.0.0";
-       sha256 = "eb6837d1ebcb19f95ff0a0cc8e13bb1c1f0d5dbb3cfebc743d52bbc48f55faab";
+       version = "1.1.0.0";
+       sha256 = "1938d3f12768ec8a1bcff22330918b619739efbd4219ab2886451026421be89f";
        configureFlags = [ "-f-buildexamples" ];
        isLibrary = true;
        isExecutable = true;
@@ -157247,6 +157738,8 @@ self: {
        pname = "reflection";
        version = "2";
        sha256 = "ee199e899e3810c3c8fd27dbda5cc3d1730f69e4a75f7494482863cf4d9499c2";
+       revision = "1";
+       editedCabalFile = "d57b4c8d539725d15a5bbfc47f99d6eca77238378d42cc82af0fc5253169e376";
        libraryHaskellDepends = [ base template-haskell ];
        homepage = "http://github.com/ekmett/reflection";
        description = "Reifies arbitrary terms into types that can be reflected back into terms";
@@ -157260,6 +157753,8 @@ self: {
        pname = "reflection";
        version = "2.1";
        sha256 = "ef07546fb5446bfd5b5f076a4996e13bf553ee6a33e6c50710559937b6a98383";
+       revision = "1";
+       editedCabalFile = "a89503d1b492dacbc509cc7e3fac2926dc933be2dabb59b4caa34521d15acc01";
        libraryHaskellDepends = [ base template-haskell ];
        homepage = "http://github.com/ekmett/reflection";
        description = "Reifies arbitrary terms into types that can be reflected back into terms";
@@ -159754,7 +160249,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "rest-client" = callPackage
+  "rest-client_0_5_0_4" = callPackage
     ({ mkDerivation, aeson-utils, base, bytestring, case-insensitive
      , data-default, exceptions, http-conduit, http-types, hxt
      , hxt-pickle-utils, monad-control, mtl, resourcet, rest-types
@@ -159773,6 +160268,28 @@ self: {
        ];
        description = "Utility library for use in generated API client libraries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "rest-client" = callPackage
+    ({ mkDerivation, aeson-utils, base, bytestring, case-insensitive
+     , data-default, exceptions, http-conduit, http-types, hxt
+     , hxt-pickle-utils, monad-control, mtl, resourcet, rest-types
+     , tostring, transformers, transformers-base, transformers-compat
+     , uri-encode, utf8-string
+     }:
+     mkDerivation {
+       pname = "rest-client";
+       version = "0.5.1.0";
+       sha256 = "9b75fb30f0f101945440c21b38d64b22a9aad81b81bce8e6a21e4675e6c8136e";
+       libraryHaskellDepends = [
+         aeson-utils base bytestring case-insensitive data-default
+         exceptions http-conduit http-types hxt hxt-pickle-utils
+         monad-control mtl resourcet rest-types tostring transformers
+         transformers-base transformers-compat uri-encode utf8-string
+       ];
+       description = "Utility library for use in generated API client libraries";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "rest-core_0_33_1_2" = callPackage
@@ -160767,6 +161284,7 @@ self: {
        ];
        executableHaskellDepends = [ attoparsec base text ];
        testHaskellDepends = [ base doctest ];
+       doCheck = false;
        homepage = "http://github.com/atnnn/haskell-rethinkdb";
        description = "A driver for RethinkDB 2.1";
        license = stdenv.lib.licenses.asl20;
@@ -162733,8 +163251,8 @@ self: {
        pname = "safecopy";
        version = "0.8.3";
        sha256 = "768cc140b95e36d638008c63edb14c536bd4168912ac367ce48ea0189420ad83";
-       revision = "2";
-       editedCabalFile = "51610f65963ab6ef96c957f776eada734db6f9f2b4c0c2836bc2db23c4512fe2";
+       revision = "3";
+       editedCabalFile = "5a966c6cfe277c6c7044ba81748f2475752eda255d503b9c83f170a912ae3dac";
        libraryHaskellDepends = [
          array base bytestring cereal containers old-time template-haskell
          text time vector
@@ -162759,8 +163277,8 @@ self: {
        pname = "safecopy";
        version = "0.8.4";
        sha256 = "10a9c6d1cea5ef8721a307880bcdc192379c81d36efe867f715dfbfda25a8f7f";
-       revision = "2";
-       editedCabalFile = "9a6fcb8f966ca239245e5438153e627e06d49801905b8780f8f40b65dc966719";
+       revision = "3";
+       editedCabalFile = "35e255ae79778f5e875692b4bd97ef52e0d65a0efbbabfa83e7fd207b732b54b";
        libraryHaskellDepends = [
          array base bytestring cereal containers old-time template-haskell
          text time vector
@@ -162786,8 +163304,8 @@ self: {
        pname = "safecopy";
        version = "0.8.5";
        sha256 = "69566beb14d27d591a040f49b3c557aff347c610beb6ecb59fdd7a688e101be4";
-       revision = "2";
-       editedCabalFile = "259d8d362581ddb2b35d19edd8548d4ea4793a4416c2ac596cdb587e28de84e3";
+       revision = "3";
+       editedCabalFile = "8ea114ff634e746a7e99eb70ab3fcca2c834248f3b980e5b23c20188fae5cf8f";
        libraryHaskellDepends = [
          array base bytestring cereal containers old-time template-haskell
          text time vector
@@ -162813,8 +163331,8 @@ self: {
        pname = "safecopy";
        version = "0.8.6";
        sha256 = "e2b435151fe7e15cd1cbb276646b0a9aee7ad69dbf984dfc68996289d45dd1d6";
-       revision = "1";
-       editedCabalFile = "196493113d37fa7090c92712faa410d26ec4775c2ec421f113321609ddaff584";
+       revision = "2";
+       editedCabalFile = "5ea34be4625333c54135b8aaac9e2f13b5f2dbbd3a9a3348e7fd2c4cedc3faf0";
        libraryHaskellDepends = [
          array base bytestring cereal containers old-time template-haskell
          text time vector
@@ -163225,7 +163743,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "sandi" = callPackage
+  "sandi_0_3_5" = callPackage
     ({ mkDerivation, base, bytestring, conduit, exceptions, HUnit
      , tasty, tasty-hunit, tasty-quickcheck, tasty-th
      }:
@@ -163240,6 +163758,24 @@ self: {
        homepage = "http://hackage.haskell.org/package/sandi";
        description = "Data encoding library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "sandi" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, exceptions, HUnit
+     , tasty, tasty-hunit, tasty-quickcheck, tasty-th
+     }:
+     mkDerivation {
+       pname = "sandi";
+       version = "0.3.6";
+       sha256 = "fafcb3501b8a17238de44239ef62c3051f9a33010424ef91dd76057257bf2284";
+       libraryHaskellDepends = [ base bytestring conduit exceptions ];
+       testHaskellDepends = [
+         base bytestring HUnit tasty tasty-hunit tasty-quickcheck tasty-th
+       ];
+       homepage = "http://hackage.haskell.org/package/sandi";
+       description = "Data encoding library";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "sandlib" = callPackage
@@ -163532,8 +164068,8 @@ self: {
      }:
      mkDerivation {
        pname = "sbv";
-       version = "5.7";
-       sha256 = "dc63f66b56ed39d37996f6a983fbdf62086f66c91c4b52eefafb6e52e5ca9d2c";
+       version = "5.8";
+       sha256 = "202fe6dcf80d2843df21bfa1d74b228729883063fa7d2dc540e440c92f9bf5b3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -163559,8 +164095,8 @@ self: {
      }:
      mkDerivation {
        pname = "sbvPlugin";
-       version = "0.5";
-       sha256 = "7675dfa9a1d1fc8030f04b2eb595601b39090f04c89f5b9b9d5e297588d0b85d";
+       version = "0.6";
+       sha256 = "36355a645df160dd15399a6704759032822f5d5cf9670db4e7c8e249ac1d8f75";
        libraryHaskellDepends = [
          base containers ghc ghc-prim mtl sbv template-haskell
        ];
@@ -164793,8 +165329,8 @@ self: {
      }:
      mkDerivation {
        pname = "sdl2";
-       version = "2.1.0";
-       sha256 = "87310ae520e585a4d1b23fda19f8dfe6794a54213007184707c09fe0c4c9d085";
+       version = "2.1.1";
+       sha256 = "6c38f02842fdda0be25359cc1d2579c09a66a2f80687943cebe0fe14b1d7efad";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -166274,7 +166810,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "servant" = callPackage
+  "servant_0_4_4_5" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring
      , bytestring-conversion, case-insensitive, directory, doctest
      , filemanip, filepath, hspec, http-media, http-types, network-uri
@@ -166298,6 +166834,33 @@ self: {
        homepage = "http://haskell-servant.github.io/";
        description = "A family of combinators for defining webservices APIs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "servant" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring
+     , bytestring-conversion, case-insensitive, directory, doctest
+     , filemanip, filepath, hspec, http-media, http-types, network-uri
+     , parsec, QuickCheck, quickcheck-instances, string-conversions
+     , text, url
+     }:
+     mkDerivation {
+       pname = "servant";
+       version = "0.4.4.6";
+       sha256 = "6adeba12f74f809c3bd9846d2563e1bffb9826d8731084bcea17bce7a145ee6a";
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring bytestring-conversion
+         case-insensitive http-media http-types network-uri
+         string-conversions text
+       ];
+       testHaskellDepends = [
+         aeson attoparsec base bytestring directory doctest filemanip
+         filepath hspec parsec QuickCheck quickcheck-instances
+         string-conversions text url
+       ];
+       homepage = "http://haskell-servant.github.io/";
+       description = "A family of combinators for defining webservices APIs";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "servant-JuicyPixels_0_1_0_0" = callPackage
@@ -166347,8 +166910,8 @@ self: {
     ({ mkDerivation, base, blaze-html, http-media, servant }:
      mkDerivation {
        pname = "servant-blaze";
-       version = "0.4.4.5";
-       sha256 = "b2ac467c4cc6e3e439436616f9132818e1023ea048e918d87f133342705bc991";
+       version = "0.4.4.6";
+       sha256 = "ef7ec4007b43679fd50133c097afb3ed33f64696fb44b03a281160384f693f91";
        libraryHaskellDepends = [ base blaze-html http-media servant ];
        homepage = "http://haskell-servant.github.io/";
        description = "Blaze-html support for servant";
@@ -166359,8 +166922,8 @@ self: {
     ({ mkDerivation, base, cassava, http-media, servant, vector }:
      mkDerivation {
        pname = "servant-cassava";
-       version = "0.4.4.5";
-       sha256 = "2db20898f6dc5bc6847247ad0bf5fd797fe70f6f31bac3716846fad1f5a44b6d";
+       version = "0.4.4.6";
+       sha256 = "2d5b3be61d67d89b95dd3156d4bf5201452f30031517276c4dd7cde4a7456769";
        libraryHaskellDepends = [ base cassava http-media servant vector ];
        homepage = "http://haskell-servant.github.io/";
        description = "Servant CSV content-type for cassava";
@@ -166474,7 +167037,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "servant-client" = callPackage
+  "servant-client_0_4_4_5" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, deepseq
      , either, exceptions, hspec, http-client, http-client-tls
      , http-media, http-types, HUnit, network, network-uri, QuickCheck
@@ -166498,6 +167061,33 @@ self: {
        homepage = "http://haskell-servant.github.io/";
        description = "automatical derivation of querying functions for servant webservices";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "servant-client" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, deepseq
+     , either, exceptions, hspec, http-client, http-client-tls
+     , http-media, http-types, HUnit, network, network-uri, QuickCheck
+     , safe, servant, servant-server, string-conversions, text
+     , transformers, wai, warp
+     }:
+     mkDerivation {
+       pname = "servant-client";
+       version = "0.4.4.6";
+       sha256 = "c4604c462f44963fce5ac32c330281880351ea39f5a206876af95d9945408383";
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring either exceptions http-client
+         http-client-tls http-media http-types network-uri safe servant
+         string-conversions text transformers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring deepseq either hspec http-client http-media
+         http-types HUnit network QuickCheck servant servant-server text wai
+         warp
+       ];
+       homepage = "http://haskell-servant.github.io/";
+       description = "automatical derivation of querying functions for servant webservices";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "servant-docs_0_3_1" = callPackage
@@ -166610,7 +167200,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "servant-docs" = callPackage
+  "servant-docs_0_4_4_5" = callPackage
     ({ mkDerivation, aeson, base, bytestring, bytestring-conversion
      , case-insensitive, hashable, hspec, http-media, http-types, lens
      , servant, string-conversions, text, unordered-containers
@@ -166636,6 +167226,35 @@ self: {
        homepage = "http://haskell-servant.github.io/";
        description = "generate API docs for your servant webservice";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "servant-docs" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, bytestring-conversion
+     , case-insensitive, hashable, hspec, http-media, http-types, lens
+     , servant, string-conversions, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "servant-docs";
+       version = "0.4.4.6";
+       sha256 = "bc3a1209e98f55a1c67c175a5c117bfb5a1b5a0a1b9aebeb31ad93fbc90efd2b";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring bytestring-conversion case-insensitive hashable
+         http-media http-types lens servant string-conversions text
+         unordered-containers
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring-conversion lens servant string-conversions
+         text
+       ];
+       testHaskellDepends = [
+         aeson base hspec lens servant string-conversions
+       ];
+       homepage = "http://haskell-servant.github.io/";
+       description = "generate API docs for your servant webservice";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "servant-ede" = callPackage
@@ -166671,8 +167290,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-examples";
-       version = "0.4.4.5";
-       sha256 = "51a0f8953c3eeed16c6745286d858338f657d000af9ad2f6a7a7531688426425";
+       version = "0.4.4.6";
+       sha256 = "8901e5d619234600d69341f314de044c6659f88e1fd1c6ceed71929565bac0ee";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -166798,7 +167417,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "servant-jquery" = callPackage
+  "servant-jquery_0_4_4_5" = callPackage
     ({ mkDerivation, aeson, base, charset, filepath, hspec
      , hspec-expectations, language-ecmascript, lens, servant
      , servant-server, stm, text, transformers, warp
@@ -166819,14 +167438,38 @@ self: {
        homepage = "http://haskell-servant.github.io/";
        description = "Automatically derive (jquery) javascript functions to query servant webservices";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "servant-jquery" = callPackage
+    ({ mkDerivation, aeson, base, charset, filepath, hspec
+     , hspec-expectations, language-ecmascript, lens, servant
+     , servant-server, stm, text, transformers, warp
+     }:
+     mkDerivation {
+       pname = "servant-jquery";
+       version = "0.4.4.6";
+       sha256 = "6d144efd7d8a267e88ea9b94da766cae8373614673e58e38ff17a95b0e827e7d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base charset lens servant text ];
+       executableHaskellDepends = [
+         aeson base filepath servant servant-server stm transformers warp
+       ];
+       testHaskellDepends = [
+         base hspec hspec-expectations language-ecmascript lens servant
+       ];
+       homepage = "http://haskell-servant.github.io/";
+       description = "Automatically derive (jquery) javascript functions to query servant webservices";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "servant-lucid" = callPackage
     ({ mkDerivation, base, http-media, lucid, servant }:
      mkDerivation {
        pname = "servant-lucid";
-       version = "0.4.4.5";
-       sha256 = "85c922b88dbf4c7c0e8447e326938ab1f3f8dd60400f1b23a0d63109e6159913";
+       version = "0.4.4.6";
+       sha256 = "9dede15f6a6032a3e815bd949e2c83f243a6c15aaca8ee65ee97c163515fdf4b";
        libraryHaskellDepends = [ base http-media lucid servant ];
        homepage = "http://haskell-servant.github.io/";
        description = "Servant support for lucid";
@@ -166839,8 +167482,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-mock";
-       version = "0.4.4.5";
-       sha256 = "3b1cb43127ceb10979fa056c847e588d030293ee8842e13d1c18458b886d7ed6";
+       version = "0.4.4.6";
+       sha256 = "eaf6d4b7635bc0549c2d1fba1e4b6d5130281880e345180f0f78cf78ba7a0665";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -167124,7 +167767,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "servant-server" = callPackage
+  "servant-server_0_4_4_5" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring
      , bytestring-conversion, directory, doctest, either, exceptions
      , filemanip, filepath, hspec, hspec-wai, http-types, mmorph, mtl
@@ -167153,6 +167796,38 @@ self: {
        homepage = "http://haskell-servant.github.io/";
        description = "A family of combinators for defining webservices APIs and serving them";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "servant-server" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring
+     , bytestring-conversion, directory, doctest, either, exceptions
+     , filemanip, filepath, hspec, hspec-wai, http-types, mmorph, mtl
+     , network, network-uri, parsec, QuickCheck, safe, servant, split
+     , string-conversions, system-filepath, temporary, text
+     , transformers, wai, wai-app-static, wai-extra, warp
+     }:
+     mkDerivation {
+       pname = "servant-server";
+       version = "0.4.4.6";
+       sha256 = "04d5b9518ccbb88a9f492ca3ffceb4f382ca4d06ef11524f5f1f691298856a4b";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring either filepath http-types mmorph
+         mtl network-uri safe servant split string-conversions
+         system-filepath text transformers wai wai-app-static warp
+       ];
+       executableHaskellDepends = [ aeson base servant text wai warp ];
+       testHaskellDepends = [
+         aeson base bytestring bytestring-conversion directory doctest
+         either exceptions filemanip filepath hspec hspec-wai http-types mtl
+         network parsec QuickCheck servant string-conversions temporary text
+         transformers wai wai-extra warp
+       ];
+       homepage = "http://haskell-servant.github.io/";
+       description = "A family of combinators for defining webservices APIs and serving them";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "servant-swagger" = callPackage
@@ -167242,7 +167917,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "serversession-backend-acid-state" = callPackage
+  "serversession-backend-acid-state_1_0_2" = callPackage
     ({ mkDerivation, acid-state, base, containers, hspec, mtl, safecopy
      , serversession, unordered-containers
      }:
@@ -167261,9 +167936,10 @@ self: {
        homepage = "https://github.com/yesodweb/serversession";
        description = "Storage backend for serversession using acid-state";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "serversession-backend-acid-state_1_0_3" = callPackage
+  "serversession-backend-acid-state" = callPackage
     ({ mkDerivation, acid-state, base, containers, hspec, mtl, safecopy
      , serversession, unordered-containers
      }:
@@ -167282,10 +167958,9 @@ self: {
        homepage = "https://github.com/yesodweb/serversession";
        description = "Storage backend for serversession using acid-state";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "serversession-backend-persistent" = callPackage
+  "serversession-backend-persistent_1_0_1" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal
      , hspec, monad-logger, path-pieces, persistent
      , persistent-postgresql, persistent-sqlite, persistent-template
@@ -167310,9 +167985,10 @@ self: {
        homepage = "https://github.com/yesodweb/serversession";
        description = "Storage backend for serversession using persistent and an RDBMS";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "serversession-backend-persistent_1_0_2" = callPackage
+  "serversession-backend-persistent" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal
      , hspec, monad-logger, path-pieces, persistent
      , persistent-postgresql, persistent-sqlite, persistent-template
@@ -167337,10 +168013,9 @@ self: {
        homepage = "https://github.com/yesodweb/serversession";
        description = "Storage backend for serversession using persistent and an RDBMS";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "serversession-backend-redis" = callPackage
+  "serversession-backend-redis_1_0" = callPackage
     ({ mkDerivation, base, bytestring, hedis, hspec, path-pieces
      , serversession, tagged, text, time, transformers
      , unordered-containers
@@ -167361,9 +168036,10 @@ self: {
        homepage = "https://github.com/yesodweb/serversession";
        description = "Storage backend for serversession using Redis";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "serversession-backend-redis_1_0_1" = callPackage
+  "serversession-backend-redis" = callPackage
     ({ mkDerivation, base, bytestring, hedis, hspec, path-pieces
      , serversession, tagged, text, time, transformers
      , unordered-containers
@@ -167380,10 +168056,10 @@ self: {
          base bytestring hedis hspec path-pieces serversession text time
          transformers unordered-containers
        ];
+       doCheck = false;
        homepage = "https://github.com/yesodweb/serversession";
        description = "Storage backend for serversession using Redis";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "serversession-frontend-snap" = callPackage
@@ -173990,6 +174666,8 @@ self: {
        pname = "sourcemap";
        version = "0.1.6";
        sha256 = "b9a04cccb4fe7eea8b37a2eaf2bc776eae5640038ab76fb948c5a3ea09a9ce7a";
+       revision = "1";
+       editedCabalFile = "5d35341a581af4ba98187f832cac8b25e463bd1ce451aa1dbad161931521f8b8";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring process text unordered-containers
          utf8-string
@@ -175394,8 +176072,8 @@ self: {
     ({ mkDerivation, base, ghc-prim }:
      mkDerivation {
        pname = "stable-marriage";
-       version = "0.1.0.0";
-       sha256 = "951898bb20439d75282147ba2c17a16f13ea411cb8280564b38e4e6cd3f936fc";
+       version = "0.1.1.0";
+       sha256 = "12da2128ef67c7f30e9bf1fef0ccffc323bbdfc0699126945c422a52a25d09b2";
        libraryHaskellDepends = [ base ghc-prim ];
        homepage = "http://github.com/cutsea110/stable-marriage";
        description = "algorithms around stable marriage";
@@ -176119,8 +176797,8 @@ self: {
      }:
      mkDerivation {
        pname = "stack-run";
-       version = "0.1.0.0";
-       sha256 = "cf128c392f5ab5fff66ae818b0cdf739767b518ba4db94b2db537490657f629d";
+       version = "0.1.0.2";
+       sha256 = "7ebf14489c52f6b52e38f238f6d5975ceedda95f066a60b224990dac85ca25f4";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -178613,8 +179291,8 @@ self: {
      }:
      mkDerivation {
        pname = "streaming-utils";
-       version = "0.1.4.0";
-       sha256 = "ab0c080387b29d8fd116944b560700fa37a23d38d33ab56813a64d74546de00e";
+       version = "0.1.4.1";
+       sha256 = "f38fd329658f5d1e2f8aa720c5266458cffa58d744cbc6d93c208599c414e78a";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring http-client http-client-tls
          json-stream mtl pipes resourcet streaming streaming-bytestring
@@ -182371,6 +183049,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tar_0_4_4_0" = callPackage
+    ({ mkDerivation, array, base, bytestring, bytestring-handle
+     , containers, deepseq, directory, filepath, old-time, QuickCheck
+     , tasty, tasty-quickcheck, time
+     }:
+     mkDerivation {
+       pname = "tar";
+       version = "0.4.4.0";
+       sha256 = "65d12941471e21442f85ef2658a270891df97e0570f71aa0d53a86e8d8647bfe";
+       libraryHaskellDepends = [
+         array base bytestring containers deepseq directory filepath time
+       ];
+       testHaskellDepends = [
+         array base bytestring bytestring-handle containers deepseq
+         directory filepath old-time QuickCheck tasty tasty-quickcheck time
+       ];
+       description = "Reading, writing and manipulating \".tar\" archive files.";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tardis" = callPackage
     ({ mkDerivation, base, mtl }:
      mkDerivation {
@@ -185886,9 +186585,12 @@ self: {
        pname = "th-orphans";
        version = "0.8.2";
        sha256 = "de8db3117fae31e33e3125f66fbcb9cea514771da0a4c4922db6767a85a6a4a5";
+       revision = "1";
+       editedCabalFile = "9a990b97359930791aec671a44eed2cc91ff31793cbfb1e2e65e4db5ce8c0415";
        libraryHaskellDepends = [
          base template-haskell th-lift th-reify-many
        ];
+       jailbreak = true;
        description = "Orphan instances for TH datatypes";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -185916,10 +186618,13 @@ self: {
        pname = "th-orphans";
        version = "0.11.1";
        sha256 = "be0b88c2f83fb8a373498f95044ff9f9b68480cdc74e6bb11a256516f79e2c84";
+       revision = "1";
+       editedCabalFile = "49eccfaa4ed12b68d724c75f02b10ba104295366fd1c17d69ee7151d5d5042b8";
        libraryHaskellDepends = [
          base mtl nats template-haskell th-lift th-reify-many
        ];
        testHaskellDepends = [ base hspec template-haskell ];
+       jailbreak = true;
        description = "Orphan instances for TH datatypes";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -185933,10 +186638,13 @@ self: {
        pname = "th-orphans";
        version = "0.12.2";
        sha256 = "ab3509388cc34b7ec22e8eb8ebd78f98414184f3319b7b15b926ebbf81a06510";
+       revision = "1";
+       editedCabalFile = "625878feb629523b71d80ad65c4bddde91b33f52c37575536ea268fe86cb04f1";
        libraryHaskellDepends = [
          base mtl nats template-haskell th-lift th-reify-many
        ];
        testHaskellDepends = [ base hspec template-haskell ];
+       jailbreak = true;
        description = "Orphan instances for TH datatypes";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -187769,6 +188477,8 @@ self: {
        pname = "tls";
        version = "1.3.1";
        sha256 = "747f840677115d077ef548b4da54acb479253ce3cb58ad3a03275fe2b452d5d0";
+       revision = "1";
+       editedCabalFile = "2b613b97c0a4ac9fd196e985f85e67de684e0cc41d699df8e1715ad72131cc8b";
        libraryHaskellDepends = [
          asn1-encoding asn1-types async base byteable bytestring cereal
          cryptonite data-default-class memory mtl network transformers x509
@@ -187794,6 +188504,8 @@ self: {
        pname = "tls";
        version = "1.3.2";
        sha256 = "e9f2d3685b4731cb865a1d9ea9a2ddd5dce5393c49d8fd89dd9e00e8b0e06ce4";
+       revision = "1";
+       editedCabalFile = "14e3ed2c0cd4707c4ca3b727001eb7ca498239c33af8e935745359c07dbe4ba8";
        libraryHaskellDepends = [
          asn1-encoding asn1-types async base bytestring cereal cryptonite
          data-default-class memory mtl network transformers x509 x509-store
@@ -187819,6 +188531,8 @@ self: {
        pname = "tls";
        version = "1.3.4";
        sha256 = "49fff2bd6b420bb57f7cc78445f9a17547a5ff4a72e29135695c9cc2d91e19c1";
+       revision = "1";
+       editedCabalFile = "52c52c0c7a3816c50437b9bbec9cff59dbdea6330fa64475c1bd51da0dbf6fe9";
        libraryHaskellDepends = [
          asn1-encoding asn1-types async base bytestring cereal cryptonite
          data-default-class memory mtl network transformers x509 x509-store
@@ -194158,6 +194872,8 @@ self: {
        pname = "uulib";
        version = "0.9.21";
        sha256 = "d0bc9e607a5c9b0144994a70d0f95b93c5a3adfa832fcdea66b7b7d121fbf829";
+       revision = "1";
+       editedCabalFile = "8f6cd3a9143ec45a82a5c5c8e228fadb798b483c1b6d03718d6159f495f89518";
        libraryHaskellDepends = [ base ghc-prim ];
        homepage = "https://github.com/UU-ComputerScience/uulib";
        description = "Haskell Utrecht Tools Library";
@@ -197993,6 +198709,36 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wai-middleware-content-type_0_2_0" = callPackage
+    ({ mkDerivation, aeson, base, blaze-builder, blaze-html, bytestring
+     , clay, exceptions, hashable, hspec, hspec-wai, http-media
+     , http-types, lucid, mmorph, monad-control, monad-logger, mtl
+     , pandoc, pandoc-types, resourcet, shakespeare, tasty, tasty-hspec
+     , text, transformers, transformers-base, unordered-containers
+     , urlpath, wai, wai-transformers, warp
+     }:
+     mkDerivation {
+       pname = "wai-middleware-content-type";
+       version = "0.2.0";
+       sha256 = "d45ace35cf7a7ac92d8bd46b9001d1c237d68a20810634467663779b228f5866";
+       libraryHaskellDepends = [
+         aeson base blaze-builder blaze-html bytestring clay exceptions
+         hashable http-media http-types lucid mmorph monad-control
+         monad-logger mtl pandoc resourcet shakespeare text transformers
+         transformers-base unordered-containers urlpath wai
+       ];
+       testHaskellDepends = [
+         aeson base blaze-builder blaze-html bytestring clay exceptions
+         hashable hspec hspec-wai http-media http-types lucid mmorph
+         monad-control monad-logger mtl pandoc pandoc-types resourcet
+         shakespeare tasty tasty-hspec text transformers transformers-base
+         unordered-containers urlpath wai wai-transformers warp
+       ];
+       description = "Route to different middlewares based on the incoming Accept header";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wai-middleware-crowd_0_1_1_2" = callPackage
     ({ mkDerivation, authenticate, base, base64-bytestring, binary
      , blaze-builder, bytestring, case-insensitive, clientsession
@@ -198488,7 +199234,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "wai-route" = callPackage
+  "wai-route_0_3" = callPackage
     ({ mkDerivation, base, bytestring, http-types, mtl, QuickCheck
      , tasty, tasty-quickcheck, unordered-containers, wai
      }:
@@ -198505,6 +199251,26 @@ self: {
        ];
        description = "Minimalistic, efficient routing for WAI";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "wai-route" = callPackage
+    ({ mkDerivation, base, bytestring, http-types, mtl, QuickCheck
+     , tasty, tasty-quickcheck, unordered-containers, wai
+     }:
+     mkDerivation {
+       pname = "wai-route";
+       version = "0.3.1";
+       sha256 = "6715210058c36baf8476f27807f1ac7ef9c190f5769d516f3edfeae4fb753aef";
+       libraryHaskellDepends = [
+         base bytestring http-types unordered-containers wai
+       ];
+       testHaskellDepends = [
+         base bytestring http-types mtl QuickCheck tasty tasty-quickcheck
+         wai
+       ];
+       description = "Minimalistic, efficient routing for WAI";
+       license = "unknown";
      }) {};
 
   "wai-router" = callPackage
@@ -198665,25 +199431,27 @@ self: {
      }) {};
 
   "wai-session-postgresql" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, cookie, entropy
-     , postgresql-session, postgresql-simple, text, time, transformers
-     , wai, wai-session
+    ({ mkDerivation, base, bytestring, cereal, cookie, data-default
+     , entropy, postgresql-simple, resource-pool, text, time
+     , transformers, wai, wai-session
      }:
      mkDerivation {
        pname = "wai-session-postgresql";
-       version = "0.1.1.0";
-       sha256 = "4a4adeddde9b3c6fe54599daa18a0d9abe8386fdd594475913d79658f29b8a58";
+       version = "0.2.0.3";
+       sha256 = "d85434487e19ca592e0f47185f1c93c588f8116a2746b4b24c0e35e8e557bed3";
        libraryHaskellDepends = [
-         base bytestring cereal cookie entropy postgresql-simple text time
-         transformers wai wai-session
+         base bytestring cereal cookie data-default entropy
+         postgresql-simple resource-pool text time transformers wai
+         wai-session
        ];
-       testHaskellDepends = [ base postgresql-session ];
-       jailbreak = true;
+       testHaskellDepends = [
+         base bytestring data-default postgresql-simple text wai-session
+       ];
+       doCheck = false;
        homepage = "https://github.com/hce/postgresql-session#readme";
        description = "PostgreSQL backed Wai session store";
        license = stdenv.lib.licenses.bsd3;
-       broken = true;
-     }) {postgresql-session = null;};
+     }) {};
 
   "wai-session-tokyocabinet" = callPackage
     ({ mkDerivation, base, bytestring, cereal, errors
@@ -199786,7 +200554,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "warp_3_2_0" = callPackage
+  "warp_3_2_1" = callPackage
     ({ mkDerivation, array, async, auto-update, base, blaze-builder
      , bytestring, bytestring-builder, case-insensitive, containers
      , directory, doctest, ghc-prim, hashable, hspec, HTTP, http-date
@@ -199796,8 +200564,8 @@ self: {
      }:
      mkDerivation {
        pname = "warp";
-       version = "3.2.0";
-       sha256 = "a0e3d41261d6842e1e58371a2013f1e5ea942fea78b51fafd6cb14c62b874355";
+       version = "3.2.1";
+       sha256 = "c04acc6a4933ddba8bfa7a0752848f9b546162944b917fa39c65f82bca11b3a3";
        libraryHaskellDepends = [
          array auto-update base blaze-builder bytestring bytestring-builder
          case-insensitive containers ghc-prim hashable http-date http-types
@@ -200276,15 +201044,16 @@ self: {
      }) {};
 
   "wavefront" = callPackage
-    ({ mkDerivation, attoparsec, base, dlist, filepath, mtl, text
-     , transformers, vector
+    ({ mkDerivation, attoparsec, base, dlist, filepath, mtl, semigroups
+     , text, transformers, vector
      }:
      mkDerivation {
        pname = "wavefront";
-       version = "0.4.0.1";
-       sha256 = "91e39b706beb176569c157bd25fa56c4de63015a02e86f70ff7c9b7157fbbed2";
+       version = "0.5.1";
+       sha256 = "aab7e9924060c99cfd80576be9f46f337c986570fec49bd6d76ec68557c20033";
        libraryHaskellDepends = [
-         attoparsec base dlist filepath mtl text transformers vector
+         attoparsec base dlist filepath mtl semigroups text transformers
+         vector
        ];
        homepage = "https://github.com/phaazon/wavefront";
        description = "Wavefront OBJ loader";
@@ -200640,6 +201409,33 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "webapi" = callPackage
+    ({ mkDerivation, aeson, base, binary, blaze-builder, bytestring
+     , bytestring-lexing, bytestring-trie, case-insensitive, containers
+     , cookie, exceptions, hspec, hspec-wai, http-client
+     , http-client-tls, http-media, http-types, network-uri, QuickCheck
+     , resourcet, text, time, transformers, vector, wai, wai-extra, warp
+     }:
+     mkDerivation {
+       pname = "webapi";
+       version = "0.1.0.0";
+       sha256 = "c0d16e251abc585bcf5f3f65a7e8c24039efc08c335515af9c491bc48c2e2465";
+       libraryHaskellDepends = [
+         aeson base binary blaze-builder bytestring bytestring-lexing
+         bytestring-trie case-insensitive containers cookie exceptions
+         http-client http-client-tls http-media http-types network-uri
+         QuickCheck resourcet text time transformers vector wai wai-extra
+       ];
+       testHaskellDepends = [
+         base bytestring hspec hspec-wai http-types QuickCheck text time
+         vector wai wai-extra warp
+       ];
+       jailbreak = true;
+       homepage = "http://byteally.github.io/webapi/";
+       description = "WAI based library for web api";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "webapp" = callPackage
     ({ mkDerivation, alex, attoparsec, base, base16-bytestring
      , blaze-builder, bytestring, cryptohash, css-text, data-default
@@ -202689,6 +203485,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "wsdl" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, exceptions, file-embed
+     , hspec, mtl, network-uri, resourcet, text, xml-conduit, xml-types
+     }:
+     mkDerivation {
+       pname = "wsdl";
+       version = "0.1.0.0";
+       sha256 = "bbf461d30db337ba3e8c7519aa752d470088932189342325ca877919cb94cba1";
+       libraryHaskellDepends = [
+         base bytestring conduit exceptions mtl network-uri resourcet text
+         xml-conduit xml-types
+       ];
+       testHaskellDepends = [
+         base bytestring file-embed hspec network-uri
+       ];
+       description = "WSDL parsing in Haskell";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "wsedit" = callPackage
     ({ mkDerivation, base, bencode, bytestring, containers, directory
      , safe, utf8-string
@@ -209611,19 +210426,20 @@ self: {
 
   "yesod-dsl" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, alex, array, base, bytestring
-     , Cabal, containers, directory, filepath, happy, MissingH, mtl
-     , shakespeare, strict, syb, text, transformers, uniplate, vector
+     , Cabal, containers, directory, filepath, happy, hscolour, MissingH
+     , mtl, shakespeare, strict, syb, text, transformers, uniplate
+     , vector
      }:
      mkDerivation {
        pname = "yesod-dsl";
-       version = "0.2.0";
-       sha256 = "934aa5de181619e11c39054e9299271a4f447e753589d1b6eafd757216193c49";
+       version = "0.2.1";
+       sha256 = "4033df3f27a99cfc279cb32b146909e13725adc81e2a0c584de95f8f70d5a2a8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson aeson-pretty array base bytestring Cabal containers directory
-         filepath MissingH mtl shakespeare strict syb text transformers
-         uniplate vector
+         filepath hscolour MissingH mtl shakespeare strict syb text
+         transformers uniplate vector
        ];
        libraryToolDepends = [ alex happy ];
        executableHaskellDepends = [
@@ -211942,8 +212758,8 @@ self: {
      }:
      mkDerivation {
        pname = "yst";
-       version = "0.5.0.4";
-       sha256 = "7feec519b7f3148f7de67730c471888c97f3b46ddc4128a4d34627a9d881d5ae";
+       version = "0.5.1";
+       sha256 = "603afd33877c086221b0914463bb92943df49aecc9e4a7fb58f4f35386199f71";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -211951,7 +212767,6 @@ self: {
          HStringTemplate lucid old-locale old-time pandoc parsec scientific
          split text time unordered-containers yaml
        ];
-       jailbreak = true;
        homepage = "http://github.com/jgm/yst";
        description = "Builds a static website from templates and data in YAML or CSV files";
        license = "GPL";

From e753f795e2049d38e0f64b9507a6285eca1ff28b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 5 Jan 2016 09:44:18 +0100
Subject: [PATCH 308/884] guvcview: 1.7.2 -> 2.0.2

* Download tarball instead of git repo, drop autoreconfHook.
* The application now needs SDL2 instead of SDL.
* The build failed without 'gsl', so add that. (I think ./configure can
  be told to build without it, but it's only 5.7 MiB.)
---
 pkgs/os-specific/linux/guvcview/default.nix | 24 ++++++++-------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/pkgs/os-specific/linux/guvcview/default.nix b/pkgs/os-specific/linux/guvcview/default.nix
index 6e4a2caba18d..940a627e5c29 100644
--- a/pkgs/os-specific/linux/guvcview/default.nix
+++ b/pkgs/os-specific/linux/guvcview/default.nix
@@ -1,21 +1,18 @@
-{ stdenv, fetchgit, intltool, autoreconfHook, gettext, pkgconfig
-, gtk3, portaudio, libpng, SDL, ffmpeg, udev, libusb1, libv4l, alsaLib }:
+{ stdenv, fetchurl, intltool, gettext, pkgconfig
+, gtk3, portaudio, libpng, SDL2, ffmpeg, udev, libusb1, libv4l, alsaLib, gsl }:
 
 stdenv.mkDerivation rec {
-  version = "1.7.2";
-  rev = "ab84b0b1ed358f0504e1218a0ef792a02b307af8";
-  name = "guvcview-${version}_${rev}";
+  version = "2.0.2";
+  name = "guvcview-${version}";
 
-  src = fetchgit {
-    inherit rev;
-    url = "git://git.code.sf.net/p/guvcview/git-master";
-    sha256 = "08cpbxq3dh2mlsgzk5dj3vfrgap4q281n9h6xzpbsvyifcj1a9n1";
+  src = fetchurl {
+    url = "mirror://sourceforge/project/guvcview/source/guvcview-src-${version}.tar.gz";
+    sha256 = "1hnx6h2d3acwpw93ahj54nhizd6qrmylylq6qbjxvilbfprg6y34";
   };
 
   buildInputs =
-    [ SDL
+    [ SDL2
       alsaLib
-      autoreconfHook
       ffmpeg
       gtk3
       intltool
@@ -24,12 +21,9 @@ stdenv.mkDerivation rec {
       pkgconfig
       portaudio
       udev
+      gsl
     ];
 
-  preConfigure = ''
-    ./bootstrap.sh
-  '';
-
   meta = {
     description = "A simple interface for devices supported by the linux UVC driver";
     homepage = http://guvcview.sourceforge.net;

From 38d115bc71ff33aea1e350827127c9396d9be818 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 5 Jan 2016 09:59:26 +0100
Subject: [PATCH 309/884] guvcview: add pulseaudioSupport option (default true)

---
 pkgs/os-specific/linux/guvcview/default.nix | 7 +++++--
 pkgs/top-level/all-packages.nix             | 4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/guvcview/default.nix b/pkgs/os-specific/linux/guvcview/default.nix
index 940a627e5c29..40c9bdaaeacb 100644
--- a/pkgs/os-specific/linux/guvcview/default.nix
+++ b/pkgs/os-specific/linux/guvcview/default.nix
@@ -1,5 +1,8 @@
 { stdenv, fetchurl, intltool, gettext, pkgconfig
-, gtk3, portaudio, libpng, SDL2, ffmpeg, udev, libusb1, libv4l, alsaLib, gsl }:
+, gtk3, portaudio, libpng, SDL2, ffmpeg, udev, libusb1, libv4l, alsaLib, gsl
+, pulseaudioSupport ? true, libpulseaudio ? null }:
+
+assert pulseaudioSupport -> libpulseaudio != null;
 
 stdenv.mkDerivation rec {
   version = "2.0.2";
@@ -22,7 +25,7 @@ stdenv.mkDerivation rec {
       portaudio
       udev
       gsl
-    ];
+    ] ++ stdenv.lib.optional pulseaudioSupport [ libpulseaudio ];
 
   meta = {
     description = "A simple interface for devices supported by the linux UVC driver";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 39ca0bdb4a01..f705e17b309d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12079,7 +12079,9 @@ let
 
   gv = callPackage ../applications/misc/gv { };
 
-  guvcview = callPackage ../os-specific/linux/guvcview { };
+  guvcview = callPackage ../os-specific/linux/guvcview {
+    pulseaudioSupport = config.pulseaudio or true;
+  };
 
   gxmessage = callPackage ../applications/misc/gxmessage { };
 

From d057af5b005e248432a381f507c6ede8c6a02d60 Mon Sep 17 00:00:00 2001
From: Tim Cuthbertson <tim@gfxmonk.net>
Date: Tue, 5 Jan 2016 20:59:31 +1100
Subject: [PATCH 310/884] ufraw: 0.20 -> 0.22

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

diff --git a/pkgs/applications/graphics/ufraw/default.nix b/pkgs/applications/graphics/ufraw/default.nix
index 3de3d6cdd5a9..23a37ab43ae6 100644
--- a/pkgs/applications/graphics/ufraw/default.nix
+++ b/pkgs/applications/graphics/ufraw/default.nix
@@ -1,18 +1,18 @@
 { fetchurl, stdenv, pkgconfig, gtk, gettext, bzip2, zlib
-, libjpeg, libtiff, cfitsio, exiv2, lcms, gtkimageview, lensfun }:
+, libjpeg, libtiff, cfitsio, exiv2, lcms2, gtkimageview, lensfun }:
 
 stdenv.mkDerivation rec {
-  name = "ufraw-0.20";
+  name = "ufraw-0.22";
 
   src = fetchurl {
     # XXX: These guys appear to mutate uploaded tarballs!
     url = "mirror://sourceforge/ufraw/${name}.tar.gz";
-    sha256 = "1q51p0ynzayxwfpilj0s38aapgkfga00gbl7xi0ndx9q6bvk1kbd";
+    sha256 = "0pm216pg0vr44gwz9vcvq3fsf8r5iayljhf5nis2mnw7wn6d5azp";
   };
 
   buildInputs =
     [ pkgconfig gtk gtkimageview gettext bzip2 zlib
-      libjpeg libtiff cfitsio exiv2 lcms lensfun
+      libjpeg libtiff cfitsio exiv2 lcms2 lensfun
     ];
 
   meta = {

From 8fad959b15cba08a11a1f95b2f8fec6f977b06d1 Mon Sep 17 00:00:00 2001
From: Viktor Kleen <viktor@kleen.org>
Date: Tue, 5 Jan 2016 02:57:52 -0800
Subject: [PATCH 311/884] postfix service: make SMTP services optional using
 enableSmtp option

---
 nixos/modules/services/mail/postfix.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index 3a9e62a02052..c18ed5998685 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -108,10 +108,14 @@ let
     flush     unix  n       -       n       1000?   0       flush
     proxymap  unix  -       -       n       -       -       proxymap
     proxywrite unix -       -       n       -       1       proxymap
+  ''
+  + optionalString cfg.enableSmtp ''
     smtp      unix  -       -       n       -       -       smtp
     relay     unix  -       -       n       -       -       smtp
     	      -o smtp_fallback_relay=
     #       -o smtp_helo_timeout=5 -o smtp_connect_timeout=5
+  ''
+  + ''
     showq     unix  n       -       n       -       -       showq
     error     unix  -       -       n       -       -       error
     retry     unix  -       -       n       -       -       error
@@ -154,6 +158,11 @@ in
         description = "Whether to run the Postfix mail server.";
       };
 
+      enableSmtp = mkOption {
+        default = true;
+        description = "Whether to enable smtp in master.cf.";
+      };
+
       setSendmail = mkOption {
         default = true;
         description = "Whether to set the system sendmail to postfix's.";

From ebd8e2c380c42e375f9860347a20245f01fbfc24 Mon Sep 17 00:00:00 2001
From: Viktor Kleen <viktor@kleen.org>
Date: Tue, 5 Jan 2016 02:59:16 -0800
Subject: [PATCH 312/884] postfix service: include configuration option for
 transport maps

---
 nixos/modules/services/mail/postfix.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index c18ed5998685..2b9175036bea 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -83,6 +83,9 @@ let
     + optionalString (cfg.virtual != "") ''
       virtual_alias_maps = hash:/etc/postfix/virtual
     ''
+    + optionalString (cfg.transport != "") ''
+      transport_maps = hash:/etc/postfix/transport
+    ''
     + cfg.extraConfig;
 
   masterCf = ''
@@ -142,6 +145,7 @@ let
   virtualFile = pkgs.writeText "postfix-virtual" cfg.virtual;
   mainCfFile = pkgs.writeText "postfix-main.cf" mainCf;
   masterCfFile = pkgs.writeText "postfix-master.cf" masterCf;
+  transportFile = pkgs.writeText "postfix-transport" cfg.transport;
 
 in
 
@@ -314,6 +318,13 @@ in
         ";
       };
 
+      transport = mkOption {
+        default = "";
+        description = "
+          Entries for the transport map, cf. man-page transport(8).
+        ";
+      };
+
       extraMasterConf = mkOption {
         default = "";
         example = "submission inet n - n - - smtpd";
@@ -392,6 +403,7 @@ in
           ln -sf ${virtualFile} /var/postfix/conf/virtual
           ln -sf ${mainCfFile} /var/postfix/conf/main.cf
           ln -sf ${masterCfFile} /var/postfix/conf/master.cf
+          ln -sf ${transportFile} /var/postfix/conf/transport
 
           ${pkgs.postfix}/sbin/postalias -c /var/postfix/conf /var/postfix/conf/aliases
           ${pkgs.postfix}/sbin/postmap -c /var/postfix/conf /var/postfix/conf/virtual

From 22848d55e21775ce361a7ef8087871596aab882d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 5 Jan 2016 12:00:14 +0100
Subject: [PATCH 313/884] kdmrc: Build locally

---
 nixos/modules/services/x11/display-managers/kdm.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/x11/display-managers/kdm.nix b/nixos/modules/services/x11/display-managers/kdm.nix
index 558f5e8cfc7e..9b937ff7ee18 100644
--- a/nixos/modules/services/x11/display-managers/kdm.nix
+++ b/nixos/modules/services/x11/display-managers/kdm.nix
@@ -57,6 +57,7 @@ let
   kdmrc = pkgs.stdenv.mkDerivation {
     name = "kdmrc";
     config = defaultConfig + cfg.extraConfig;
+    preferLocalBuild = true;
     buildCommand =
       ''
         echo "$config" > $out

From 45ade79bf928b5c64e580cc5ac8c91183f6d43c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 5 Jan 2016 12:13:07 +0100
Subject: [PATCH 314/884] node-packages: remove 7f

Close #12151, fixes #7091.
I've done no regeneration, just guessed how to remove it by hand.
Hopefully it's OK.
---
 pkgs/top-level/node-packages-generated.nix | 21 ---------------------
 pkgs/top-level/node-packages.json          |  1 -
 2 files changed, 22 deletions(-)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index bf72bbd8dcc7..6a3cdd9f7de2 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -1,27 +1,6 @@
 { self, fetchurl, fetchgit ? null, lib }:
 
 {
-  by-spec."7f"."*" =
-    self.by-version."7f"."1.1.3";
-  by-version."7f"."1.1.3" = self.buildNodePackage {
-    name = "7f-1.1.3";
-    version = "1.1.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/7f/-/7f-1.1.3.tgz";
-      name = "7f-1.1.3.tgz";
-      sha1 = "88d2cb194fceeb96db7b24bc710b283451e7a851";
-    };
-    deps = {
-      "bits-0.1.1" = self.by-version."bits"."0.1.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "7f" = self.by-version."7f"."1.1.3";
   by-spec."Base64"."~0.2.0" =
     self.by-version."Base64"."0.2.1";
   by-version."Base64"."0.2.1" = self.buildNodePackage {
diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json
index d056a98bb86b..e67aecca6951 100644
--- a/pkgs/top-level/node-packages.json
+++ b/pkgs/top-level/node-packages.json
@@ -133,7 +133,6 @@
 , "node-xmpp-server"
 , "node-xmpp-serviceadmin"
 , "node-xmpp-joap"
-, "7f"
 , "jfs"
 , "cordova"
 , "sloc"

From 24e0868763068fb5766cbeb5ab588e0d67280d21 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Tue, 5 Jan 2016 12:20:16 +0100
Subject: [PATCH 315/884] isync: Add unstable variant.

---
 pkgs/tools/networking/isync/unstable.nix | 29 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  1 +
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/tools/networking/isync/unstable.nix

diff --git a/pkgs/tools/networking/isync/unstable.nix b/pkgs/tools/networking/isync/unstable.nix
new file mode 100644
index 000000000000..309190ddfb4d
--- /dev/null
+++ b/pkgs/tools/networking/isync/unstable.nix
@@ -0,0 +1,29 @@
+{ fetchgit, stdenv, openssl, pkgconfig, db, cyrus_sasl
+, autoconf, automake }:
+
+stdenv.mkDerivation rec {
+  name = "isync-git-2015-11-08";
+  rev = "46e792";
+
+  src = fetchgit {
+    url = "git://git.code.sf.net/p/isync/isync";
+    inherit rev;
+    sha256 = "1flm9lkgf1pa6aa678xr0yj5fxwh8c9jpjzd4002f4jjmcf4w57s";
+  };
+
+  buildInputs = [ openssl pkgconfig db cyrus_sasl autoconf automake ];
+
+  preConfigure = ''
+    touch ChangeLog
+    ./autogen.sh
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://isync.sourceforge.net/;
+    description = "Free IMAP and MailDir mailbox synchronizer";
+    license = licenses.gpl2Plus;
+
+    maintainers = with maintainers; [ the-kenny ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f705e17b309d..57b0cc686ac8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1977,6 +1977,7 @@ let
   isl_0_15 = callPackage ../development/libraries/isl/0.15.0.nix { };
 
   isync = callPackage ../tools/networking/isync { };
+  isyncUnstable = callPackage ../tools/networking/isync/unstable.nix { };
 
   jaaa = callPackage ../applications/audio/jaaa { };
 

From 9bce31e9b6b2762356ebe67989769500f9affefb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 5 Jan 2016 12:25:01 +0100
Subject: [PATCH 316/884] firefox: 43.0 -> 43.0.3

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

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 6ee926db693d..fd372064c935 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -133,8 +133,8 @@ in {
 
   firefox = common {
     pname = "firefox";
-    version = "43.0";
-    sha256 = "1slg5m05z67q29mrpjv0a753c4vy1vxhx7p3f75494yfvi0ngcd5";
+    version = "43.0.3";
+    sha256 = "129f8vmsam498j0s4rbi31a88j9ibkzm4m0w19ppcsha7cp25i8m";
   };
 
   firefox-esr = common {

From bab578f961aeb957b7f2c060ccd98054d613250c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 5 Jan 2016 12:29:15 +0100
Subject: [PATCH 317/884] firefox-esr: 38.5.0 -> 38.5.2

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

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index fd372064c935..0c7df04db15d 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -139,8 +139,8 @@ in {
 
   firefox-esr = common {
     pname = "firefox-esr";
-    version = "38.5.0esr";
-    sha256 = "086vkhrls9g0cxf50izfzcf2h60syswqrlzyi2z21awhwg7r07ra";
+    version = "38.5.2esr";
+    sha256 = "0xqirpiys2pgzk9hs4s93svknc0sss8ry60zar7n9jj74cgz590m";
   };
 
 }

From 5d482336b9d724364b95cc21b050c55bcfbe21b0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 5 Jan 2016 12:36:33 +0100
Subject: [PATCH 318/884] doc/meta.xml: don't encourage users to add a
 meta.version attribute

That attribute is completely redundant since it just duplicates information
from "name".

Cc: @7c6f434c who added that section in e39b1f4ec8740e7dd34185c38464db5ac814eed5.
---
 doc/meta.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/doc/meta.xml b/doc/meta.xml
index ea8a363f0fd3..5266d83aea68 100644
--- a/doc/meta.xml
+++ b/doc/meta.xml
@@ -112,11 +112,6 @@ meta-attributes</title>
     package.</para></listitem>
   </varlistentry>
 
-  <varlistentry>
-    <term><varname>version</varname></term>
-    <listitem><para>Package version.</para></listitem>
-  </varlistentry>
-
   <varlistentry>
     <term><varname>branch</varname></term>
     <listitem><para>Release branch. Used to specify that a package is not

From 41a91a5495b7c6153b7f113ffba69a4be2a58a31 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 5 Jan 2016 12:46:01 +0100
Subject: [PATCH 319/884] youtube-dl: remove meta.version

---
 pkgs/tools/misc/youtube-dl/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index cdd213b0eba5..76db7b2ae4f4 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -10,10 +10,10 @@
 
 buildPythonPackage rec {
 
-  name = "youtube-dl-${meta.version}";
+  name = "youtube-dl-2016.01.01";
 
   src = fetchurl {
-    url = "http://yt-dl.org/downloads/${meta.version}/${name}.tar.gz";
+    url = "http://yt-dl.org/downloads/${(builtins.parseDrvName name).version}/${name}.tar.gz";
     sha256 = "0b0pk8h2iswdiyf65c0zcwcad9dm2hid67fnfafj7d3ikp4kfbvk";
   };
 
@@ -24,7 +24,6 @@ buildPythonPackage rec {
     ''wrapProgram $out/bin/youtube-dl --prefix PATH : "${ffmpeg}/bin"'';
 
   meta = with stdenv.lib; {
-    version = "2016.01.01";
     homepage = http://rg3.github.io/youtube-dl/;
     repositories.git = https://github.com/rg3/youtube-dl.git;
     description = "Command-line tool to download videos from YouTube.com and other sites";

From dfc8217aa0e8f8a76308b9317f78a7da8e483fbe Mon Sep 17 00:00:00 2001
From: Sven Keidel <svenkeidel@googlemail.com>
Date: Tue, 5 Jan 2016 16:04:33 +0100
Subject: [PATCH 320/884] ghostscript: change dynamic library path, fixes
 #11165

---
 pkgs/misc/ghostscript/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index 9f930900c410..53b5caf93122 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -93,6 +93,10 @@ stdenv.mkDerivation rec {
     ln -s "${fonts}" "$out/share/ghostscript/fonts"
   '';
 
+  preFixup = stdenv.lib.strings.optionalString stdenv.isDarwin ''
+    install_name_tool -change libgs.dylib.${version} $out/lib/libgs.dylib.${version} $out/bin/gs
+  '';
+
   meta = {
     homepage = "http://www.ghostscript.com/";
     description = "PostScript interpreter (mainline version)";

From f5b087b94e5577e174f2d2af7cb69f1ced1e30e7 Mon Sep 17 00:00:00 2001
From: obadz <dav-github@odav.org>
Date: Tue, 5 Jan 2016 15:00:02 +0000
Subject: [PATCH 321/884] syscall_limiter: init at b02c031

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

diff --git a/pkgs/os-specific/linux/syscall_limiter/default.nix b/pkgs/os-specific/linux/syscall_limiter/default.nix
new file mode 100644
index 000000000000..658137a569ef
--- /dev/null
+++ b/pkgs/os-specific/linux/syscall_limiter/default.nix
@@ -0,0 +1,43 @@
+{ stdenv
+, fetchFromGitHub
+, libseccomp
+, perl
+, which
+}:
+
+stdenv.mkDerivation rec {
+  name = "syscall_limiter-${version}";
+  version = "${date}-${stdenv.lib.strings.substring 0 7 rev}";
+  date = "20160105";
+  rev = "b02c0316a2aaff496f712f1467e20337006655cc";
+
+  src = fetchFromGitHub {
+    owner = "vi";
+    repo = "syscall_limiter";
+    inherit rev;
+    sha256 = "14q5k5c8hk7gnxhgwaamwbibasb3pwj6jnqsxa1bdp16n6jdajxd";
+  };
+
+  configurePhase = "";
+
+  buildPhase = ''
+    make CC="gcc -I${libseccomp}/include -L${libseccomp}/lib"
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -v limit_syscalls $out/bin
+    cp -v monitor.sh $out/bin/limit_syscalls_monitor.sh
+    substituteInPlace $out/bin/limit_syscalls_monitor.sh \
+      --replace perl ${perl}/bin/perl \
+      --replace which ${which}/bin/which
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Start Linux programs with only selected syscalls enabled";
+    homepage = https://github.com/vi/syscall_limiter;
+    license = licenses.mit;
+    maintainers = with maintainers; [ obadz ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 986004c56422..0d18d984eb70 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -885,6 +885,8 @@ let
     pynotify = pythonPackages.notify;
   };
 
+  syscall_limiter = callPackage ../os-specific/linux/syscall_limiter {};
+
   syslogng = callPackage ../tools/system/syslog-ng { };
 
   syslogng_incubator = callPackage ../tools/system/syslog-ng-incubator { };

From f31fbadac38df98932df1f4c69b696aed3b6b5d9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 3 Dec 2015 11:49:32 +0100
Subject: [PATCH 322/884] Set a fallback default value for SOURCE_DATE_EPOCH

This is used by some build tools to provide reproducible builds. See

  https://reproducible-builds.org/specs/source-date-epoch/

for more info.

Later, we'll want to set this to a more intelligent value (such as the
most recent mtime of any source file).
---
 pkgs/stdenv/generic/setup.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 4693974a2b77..d8de9ab2390b 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -184,6 +184,14 @@ installBin() {
 # Initialisation.
 
 
+# Set a fallback default value for SOURCE_DATE_EPOCH, used by some
+# build tools to provide a deterministic substitute for the "current"
+# time. Note that 1 = 1970-01-01 00:00:01. We don't use 0 because it
+# confuses some applications.
+export SOURCE_DATE_EPOCH
+: ${SOURCE_DATE_EPOCH:=1}
+
+
 # Wildcard expansions that don't match should expand to an empty list.
 # This ensures that, for instance, "for i in *; do ...; done" does the
 # right thing.

From 0db7ccb5c6fca69b0d68f67d576a8c801d9a712f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 3 Dec 2015 13:11:34 +0100
Subject: [PATCH 323/884] gcc: Respect $SOURCE_DATE_EPOCH

---
 .../development/compilers/gcc/4.9/default.nix |  3 +-
 pkgs/development/compilers/gcc/5/default.nix  |  3 +-
 .../compilers/gcc/use-source-date-epoch.patch | 52 +++++++++++++++++++
 3 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/compilers/gcc/use-source-date-epoch.patch

diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index fecdd85cd415..add9b30fb629 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -63,7 +63,8 @@ let version = "4.9.3";
 
     enableParallelBuilding = true;
 
-    patches = [ ]
+    patches =
+      [ ../use-source-date-epoch.patch ]
       ++ optionals enableParallelBuilding [ ../parallel-bconfig.patch ./parallel-strsignal.patch ]
       ++ optional (cross != null) ../libstdc++-target.patch
       ++ optional noSysDirs ../no-sys-dirs.patch
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index f3dda7d13f7c..3b105143c0bf 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -64,7 +64,8 @@ let version = "5.3.0";
 
     enableParallelBuilding = true;
 
-    patches = [ ]
+    patches =
+      [ ../use-source-date-epoch.patch ]
       ++ optional (cross != null) ../libstdc++-target.patch
       ++ optional noSysDirs ../no-sys-dirs.patch
       # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its
diff --git a/pkgs/development/compilers/gcc/use-source-date-epoch.patch b/pkgs/development/compilers/gcc/use-source-date-epoch.patch
new file mode 100644
index 000000000000..65a5ab028c1c
--- /dev/null
+++ b/pkgs/development/compilers/gcc/use-source-date-epoch.patch
@@ -0,0 +1,52 @@
+https://gcc.gnu.org/ml/gcc-patches/2015-06/msg02210.html
+
+diff --git a/libcpp/macro.c b/libcpp/macro.c
+index 1e0a0b5..a52e3cb 100644
+--- a/libcpp/macro.c
++++ b/libcpp/macro.c
+@@ -349,14 +349,38 @@ _cpp_builtin_macro_text (cpp_reader *pfile, cpp_hashnode *node)
+ 	     slow on some systems.  */
+ 	  time_t tt;
+ 	  struct tm *tb = NULL;
++	  char *source_date_epoch;
+ 
+-	  /* (time_t) -1 is a legitimate value for "number of seconds
+-	     since the Epoch", so we have to do a little dance to
+-	     distinguish that from a genuine error.  */
+-	  errno = 0;
+-	  tt = time(NULL);
+-	  if (tt != (time_t)-1 || errno == 0)
+-	    tb = localtime (&tt);
++	  /* Allow the date and time to be set externally by an exported
++	     environment variable to enable reproducible builds. */
++	  source_date_epoch = getenv ("SOURCE_DATE_EPOCH");
++	  if (source_date_epoch)
++	    {
++	      errno = 0;
++	      tt = (time_t) strtol (source_date_epoch, NULL, 10);
++	      if (errno == 0)
++	        {
++		  tb = gmtime (&tt);
++		  if (tb == NULL)
++		    cpp_error (pfile, CPP_DL_ERROR,
++			       "SOURCE_DATE_EPOCH=\"%s\" is not a valid date",
++			       source_date_epoch);
++	        }
++	      else
++		cpp_error (pfile, CPP_DL_ERROR,
++			   "SOURCE_DATE_EPOCH=\"%s\" is not a valid number",
++			   source_date_epoch);
++	    }
++	  else
++	    {
++	    /* (time_t) -1 is a legitimate value for "number of seconds
++	       since the Epoch", so we have to do a little dance to
++	       distinguish that from a genuine error.  */
++	    errno = 0;
++	    tt = time(NULL);
++	    if (tt != (time_t)-1 || errno == 0)
++	      tb = localtime (&tt);
++	  }
+ 
+ 	  if (tb)
+ 	    {

From 2b5ed580993b7276f21f55a5d31f8edf0fc155a1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 5 Jan 2016 11:51:12 +0100
Subject: [PATCH 324/884] cc-wrapper: Don't mess with __DATE__ and __TIME__

This is handled by $SOURCE_DATE_EPOCH now.
---
 pkgs/build-support/cc-wrapper/cc-wrapper.sh | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh
index e374e1656a47..5bd59f8c5850 100644
--- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh
@@ -90,14 +90,6 @@ fi
 extraAfter=($NIX_CFLAGS_COMPILE)
 extraBefore=()
 
-# When enforcing purity, pretend gcc can't find the current date and
-# time
-if [ "$NIX_ENFORCE_PURITY" = 1 ]; then
-    extraAfter+=('-D__DATE__="Jan 01 1970"'
-        '-D__TIME__="00:00:01"'
-        -Wno-builtin-macro-redefined)
-fi
-
 
 if [ "$dontLink" != 1 ]; then
 

From 81e530a7499e3f06bec13b6ec974d0f1e3a4ab84 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 5 Jan 2016 15:32:59 +0100
Subject: [PATCH 325/884] Set SOURCE_DATE_EPOCH to latest source file

This provides a timestamp that's more useful than 1970-01-01 yet still
deterministic.
---
 .../set-source-date-epoch-to-latest.sh        | 37 +++++++++++++++++++
 pkgs/stdenv/generic/default.nix               |  1 +
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/build-support/setup-hooks/set-source-date-epoch-to-latest.sh

diff --git a/pkgs/build-support/setup-hooks/set-source-date-epoch-to-latest.sh b/pkgs/build-support/setup-hooks/set-source-date-epoch-to-latest.sh
new file mode 100644
index 000000000000..e57848cff558
--- /dev/null
+++ b/pkgs/build-support/setup-hooks/set-source-date-epoch-to-latest.sh
@@ -0,0 +1,37 @@
+updateSourceDateEpoch() {
+    local path="$1"
+
+    # FIXME: Support Darwin.
+    if ! [[ $system =~ linux ]]; then
+        exit 1
+        return
+    fi
+
+    # Get the last modification time of all regular files, sort them,
+    # and get the most recent. Maybe we should use
+    # https://github.com/0-wiz-0/findnewest here.
+    local -a res=($(find "$path" -type f -print0 | xargs -0 -r stat -c '%Y %n' | sort -n | tail -n1))
+    local time="${res[0]}"
+    local newestFile="${res[1]}"
+
+    # Update $SOURCE_DATE_EPOCH if the most recent file we found is newer.
+    if [ "$time" -gt "$SOURCE_DATE_EPOCH" ]; then
+        echo "setting SOURCE_DATE_EPOCH to timestamp $time of file $newestFile"
+        export SOURCE_DATE_EPOCH="$time"
+
+        # Warn if the new timestamp is too close to the present. This
+        # may indicate that we were being applied to a file generated
+        # during the build, or that an unpacker didn't restore
+        # timestamps properly.
+        local now="$(date +%s)"
+        if [ "$time" -gt $((now - 60)) ]; then
+            echo "warning: file $newestFile may be generated; SOURCE_DATE_EPOCH may be non-deterministic"
+        fi
+    fi
+}
+
+postUnpackHooks+=(_updateSourceDateEpochFromSourceRoot)
+
+_updateSourceDateEpochFromSourceRoot() {
+    updateSourceDateEpoch "$sourceRoot"
+}
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 2fb1f8b39ae4..6dc2553db386 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -84,6 +84,7 @@ let
       ../../build-support/setup-hooks/patch-shebangs.sh
       ../../build-support/setup-hooks/move-sbin.sh
       ../../build-support/setup-hooks/move-lib64.sh
+      ../../build-support/setup-hooks/set-source-date-epoch-to-latest.sh
       cc
     ];
 

From 1974ced66625c983b251b3cc6de62b4b46cef551 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Tue, 5 Jan 2016 19:58:30 +0300
Subject: [PATCH 326/884] vimPlugins: update 2016-01-05

---
 pkgs/misc/vim-plugins/default.nix | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index fff9ff3fbcee..853a2dc5ea4b 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -157,8 +157,8 @@ rec {
     name = "Syntastic-2016-01-04";
     src = fetchgit {
       url = "git://github.com/scrooloose/syntastic";
-      rev = "3280220e6c612d03a451d7ee0624893093dcb87b";
-      sha256 = "6d066843aeacd9534df5b67c64bb4efd7afb1aaea9024f6dfb74a312a73c8bad";
+      rev = "189be0ae74372c13d5a87c72753a86e796812b58";
+      sha256 = "dbca5a1fbc632922856d8e5468f5ed52edeaf1ae5a1c0f3ff3eb0f5dcf19af73";
     };
     dependencies = [];
 
@@ -434,11 +434,11 @@ rec {
   };
 
   vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-go-2016-01-03";
+    name = "vim-go-2016-01-04";
     src = fetchgit {
       url = "git://github.com/fatih/vim-go";
-      rev = "b26351b55a7a44e29f1bde3b82ead43a6980760d";
-      sha256 = "57cc4240de5ea185c645c37a0fc51f0b352ad7d2798124f58786ed95579d1bc3";
+      rev = "eec4e3e8a8227fe24618e114ff2e644615f51ad6";
+      sha256 = "6868d9e9cd8ddad25526407ef843530e86f62e734649e600c8aef9cc2adea381";
     };
     dependencies = [];
 
@@ -456,11 +456,11 @@ rec {
   };
 
   idris-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "idris-vim-2015-12-08";
+    name = "idris-vim-2016-01-04";
     src = fetchgit {
       url = "git://github.com/idris-hackers/idris-vim";
-      rev = "1f9bad6bc1d05b44e7555fe80472fbb7a542f47a";
-      sha256 = "50cfb5a58a6c203c5f3695de61e9bc743e5dca71427e00c5cae86b4409debd3c";
+      rev = "f8e7fda4b8984c7248fd805b62c4a3a2e61bce94";
+      sha256 = "3b4ca5a65acea2c429fc721d1ab00c7ba286c929c31bd131896d8e508df1caaf";
     };
     dependencies = [];
 
@@ -621,11 +621,11 @@ rec {
   };
 
   vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimtex-2016-01-03";
+    name = "vimtex-2016-01-05";
     src = fetchgit {
       url = "git://github.com/lervag/vimtex";
-      rev = "2de4129abd6b7e441d625403ff420734452ed112";
-      sha256 = "0f7a69cd48c6cd6ff9981ec3e4e6bc678491d2b42cf80a274464c0cb762f3397";
+      rev = "12481a9891c0a2cf04018afb555b8ca426988e89";
+      sha256 = "50ddc6de684915d5470d668eb977827162fcdc8ee763c8b26705aa1e8d5dd8ec";
     };
     dependencies = [];
 
@@ -877,11 +877,11 @@ rec {
   };
 
   youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "youcompleteme-2016-01-01";
+    name = "youcompleteme-2016-01-05";
     src = fetchgit {
       url = "git://github.com/valloric/youcompleteme";
-      rev = "07f4402f49a6cb987ebb17a4c17790816e06c3e7";
-      sha256 = "cf801f2efe00b20244520cc0806c050b56d768d3826ea4143dc0ac658c6019ba";
+      rev = "4168a829accbe895ebc82b54de6f929afe4ac9a5";
+      sha256 = "a6df584dd9f244f8888bae0e60bb5742b841169fcf8efef9a052c0353c775405";
     };
     dependencies = [];
     buildInputs = [

From 24dc7f3028e7c340d18016b9f1fefeb243b0dae3 Mon Sep 17 00:00:00 2001
From: Jakob Gillich <jakob@gillich.me>
Date: Tue, 5 Jan 2016 18:00:49 +0100
Subject: [PATCH 327/884] torbrowser: add missing shebang to wrapper script

---
 pkgs/tools/security/tor/torbrowser.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix
index e6ce333cc915..ccfd4ae044d6 100644
--- a/pkgs/tools/security/tor/torbrowser.nix
+++ b/pkgs/tools/security/tor/torbrowser.nix
@@ -46,14 +46,15 @@ in stdenv.mkDerivation rec {
     cp -R * $out/share/tor-browser
 
     cat > "$out/bin/tor-browser" << EOF
-      export HOME="\$HOME/.torbrowser4"
-      if [ ! -d \$HOME ]; then
-        mkdir -p \$HOME && cp -R $out/share/tor-browser/Browser/TorBrowser/Data \$HOME/ && chmod -R +w \$HOME
-        echo "pref(\"extensions.torlauncher.tordatadir_path\", \"\$HOME/Data/Tor/\");" >> \
-          ~/Data/Browser/profile.default/preferences/extension-overrides.js
-      fi
-      export LD_LIBRARY_PATH=${ldLibraryPath}:$out/share/tor-browser/Browser/TorBrowser/Tor
-      $out/share/tor-browser/Browser/firefox -no-remote -profile ~/Data/Browser/profile.default "$@"
+    #!${stdenv.shell}
+    export HOME="\$HOME/.torbrowser4"
+    if [ ! -d \$HOME ]; then
+      mkdir -p \$HOME && cp -R $out/share/tor-browser/Browser/TorBrowser/Data \$HOME/ && chmod -R +w \$HOME
+      echo "pref(\"extensions.torlauncher.tordatadir_path\", \"\$HOME/Data/Tor/\");" >> \
+        ~/Data/Browser/profile.default/preferences/extension-overrides.js
+    fi
+    export LD_LIBRARY_PATH=${ldLibraryPath}:$out/share/tor-browser/Browser/TorBrowser/Tor
+    $out/share/tor-browser/Browser/firefox -no-remote -profile ~/Data/Browser/profile.default "$@"
     EOF
     chmod +x $out/bin/tor-browser
   '';

From 49d18bdfcbd97f813336fab148f05ef35e832654 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 5 Jan 2016 19:32:41 +0100
Subject: [PATCH 328/884] Revert "Basic Declaritive Network Configuration in
 wpa_supplicant Service"

---
 nixos/doc/manual/configuration/wireless.xml   |  14 +-
 .../services/networking/wpa_supplicant.nix    | 160 ++++++++++--------
 2 files changed, 87 insertions(+), 87 deletions(-)

diff --git a/nixos/doc/manual/configuration/wireless.xml b/nixos/doc/manual/configuration/wireless.xml
index 13e4283d241c..373a9168cc87 100644
--- a/nixos/doc/manual/configuration/wireless.xml
+++ b/nixos/doc/manual/configuration/wireless.xml
@@ -18,18 +18,8 @@ NixOS will start wpa_supplicant for you if you enable this setting:
 networking.wireless.enable = true;
 </programlisting>
 
-NixOS lets you specify networks for wpa_supplicant declaratively:
-<programlisting>
-networking.wireless.networks = {
-  echelon = {
-    psk = "abcdefgh";
-  };
-  "free.wifi" = {};
-}
-</programlisting>
-
-When no networks are set it will default to using a configuration file at
-<literal>/etc/wpa_supplicant.conf</literal>. You should edit this file
+NixOS currently does not generate wpa_supplicant's
+configuration file, <literal>/etc/wpa_supplicant.conf</literal>. You should edit this file
 yourself to define wireless networks, WPA keys and so on (see
 wpa_supplicant.conf(5)).
 </para>
diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix
index 397811f96266..9e04bd401906 100644
--- a/nixos/modules/services/networking/wpa_supplicant.nix
+++ b/nixos/modules/services/networking/wpa_supplicant.nix
@@ -3,30 +3,51 @@
 with lib;
 
 let
+
   cfg = config.networking.wireless;
-  configFile = if cfg.networks != {} then pkgs.writeText "wpa_supplicant.conf" ''
-    ${optionalString cfg.userControlled.enable ''
-      ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=${cfg.userControlled.group}
-      update_config=1''}
-    ${concatStringsSep "\n" (mapAttrsToList (ssid: networkConfig: ''
-      network={
-        ssid="${ssid}"
-        ${optionalString (networkConfig.psk != null) ''psk="${networkConfig.psk}"''}
-        ${optionalString (networkConfig.psk == null) ''key_mgmt=NONE''}
-      }
-    '') cfg.networks)}
-  '' else "/etc/wpa_supplicant.conf";
-in {
+  configFile = "/etc/wpa_supplicant.conf";
+
+  ifaces =
+    cfg.interfaces ++
+    optional (config.networking.WLANInterface != "") config.networking.WLANInterface;
+
+in
+
+{
+
+  ###### interface
+
   options = {
+
+    networking.WLANInterface = mkOption {
+      default = "";
+      description = "Obsolete. Use <option>networking.wireless.interfaces</option> instead.";
+    };
+
     networking.wireless = {
-      enable = mkEnableOption "wpa_supplicant";
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to start <command>wpa_supplicant</command> to scan for
+          and associate with wireless networks.  Note: NixOS currently
+          does not manage <command>wpa_supplicant</command>'s
+          configuration file, <filename>${configFile}</filename>.  You
+          should edit this file yourself to define wireless networks,
+          WPA keys and so on (see
+          <citerefentry><refentrytitle>wpa_supplicant.conf</refentrytitle>
+          <manvolnum>5</manvolnum></citerefentry>), or use
+          networking.wireless.userControlled.* to allow users to add entries
+          through <command>wpa_cli</command> and <command>wpa_gui</command>.
+        '';
+      };
 
       interfaces = mkOption {
         type = types.listOf types.str;
         default = [];
         example = [ "wlan0" "wlan1" ];
         description = ''
-          The interfaces <command>wpa_supplicant</command> will use. If empty, it will
+          The interfaces <command>wpa_supplicant</command> will use.  If empty, it will
           automatically use all wireless interfaces.
         '';
       };
@@ -37,34 +58,6 @@ in {
         description = "Force a specific wpa_supplicant driver.";
       };
 
-      networks = mkOption {
-        type = types.attrsOf (types.submodule {
-          options = {
-            psk = mkOption {
-              type = types.nullOr types.str;
-              default = null;
-              description = ''
-                The network's pre-shared key in plaintext defaulting
-                to being a network without any authentication.
-              '';
-            };
-          };
-        });
-        description = ''
-          The network definitions to automatically connect to when
-           <command>wpa_supplicant</command> is running. If this
-           parameter is left empty wpa_supplicant will use
-          /etc/wpa_supplicant.conf as the configuration file.
-        '';
-        default = {};
-        example = literalExample ''
-          echelon = {
-            psk = "abcdefgh";
-          };
-          "free.wifi" = {};
-        '';
-      };
-
       userControlled = {
         enable = mkOption {
           type = types.bool;
@@ -75,8 +68,10 @@ in {
             to depend on a large package such as NetworkManager just to pick nearby
             access points.
 
-            When using a declarative network specification you cannot persist any
-            settings via wpa_gui or wpa_cli.
+            When you want to use this, make sure ${configFile} doesn't exist.
+            It will be created for you.
+
+            Currently it is also necessary to explicitly specify networking.wireless.interfaces.
           '';
         };
 
@@ -90,49 +85,64 @@ in {
     };
   };
 
-  config = mkMerge [
-    (mkIf cfg.enable {
-      environment.systemPackages =  [ pkgs.wpa_supplicant ];
 
-      services.dbus.packages = [ pkgs.wpa_supplicant ];
+  ###### implementation
 
-      # FIXME: start a separate wpa_supplicant instance per interface.
-      systemd.services.wpa_supplicant = let
-        ifaces = cfg.interfaces;
-      in {
-        description = "WPA Supplicant";
+  config = mkIf cfg.enable {
+
+    environment.systemPackages =  [ pkgs.wpa_supplicant ];
+
+    services.dbus.packages = [ pkgs.wpa_supplicant ];
+
+    # FIXME: start a separate wpa_supplicant instance per interface.
+    jobs.wpa_supplicant =
+      { description = "WPA Supplicant";
 
         wantedBy = [ "network.target" ];
 
         path = [ pkgs.wpa_supplicant ];
 
-        script = ''
-          ${if ifaces == [] then ''
-            for i in $(cd /sys/class/net && echo *); do
-              DEVTYPE=
-              source /sys/class/net/$i/uevent
-              if [ "$DEVTYPE" = "wlan" -o -e /sys/class/net/$i/wireless ]; then
-                ifaces="$ifaces''${ifaces:+ -N} -i$i"
-              fi
-            done
-          '' else ''
-            ifaces="${concatStringsSep " -N " (map (i: "-i${i}") ifaces)}"
-          ''}
-          exec wpa_supplicant -s -u -D${cfg.driver} -c ${configFile} $ifaces
+        preStart = ''
+          touch -a ${configFile}
+          chmod 600 ${configFile}
+        '' + optionalString cfg.userControlled.enable ''
+          if [ ! -s ${configFile} ]; then
+            echo "ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=${cfg.userControlled.group}" >> ${configFile}
+            echo "update_config=1" >> ${configFile}
+          fi
         '';
+
+        script =
+          ''
+            ${if ifaces == [] then ''
+              for i in $(cd /sys/class/net && echo *); do
+                DEVTYPE=
+                source /sys/class/net/$i/uevent
+                if [ "$DEVTYPE" = "wlan" -o -e /sys/class/net/$i/wireless ]; then
+                  ifaces="$ifaces''${ifaces:+ -N} -i$i"
+                fi
+              done
+            '' else ''
+              ifaces="${concatStringsSep " -N " (map (i: "-i${i}") ifaces)}"
+            ''}
+            exec wpa_supplicant -s -u -D${cfg.driver} -c ${configFile} $ifaces
+          '';
       };
 
-      powerManagement.resumeCommands = ''
+    powerManagement.resumeCommands =
+      ''
         ${config.systemd.package}/bin/systemctl try-restart wpa_supplicant
       '';
 
-      # Restart wpa_supplicant when a wlan device appears or disappears.
-      services.udev.extraRules = ''
+    assertions = [{ assertion = !cfg.userControlled.enable || cfg.interfaces != [];
+                    message = "user controlled wpa_supplicant needs explicit networking.wireless.interfaces";}];
+
+    # Restart wpa_supplicant when a wlan device appears or disappears.
+    services.udev.extraRules =
+      ''
         ACTION=="add|remove", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", RUN+="${config.systemd.package}/bin/systemctl try-restart wpa_supplicant.service"
       '';
-    })
-    {
-      meta.maintainers = with lib.maintainers; [ globin ];
-    }
-  ];
+
+  };
+
 }

From 9af50919926f5ee654593a67c3446f0bf2f1a015 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 5 Jan 2016 19:57:36 +0100
Subject: [PATCH 329/884] f2fs-tools: add pkgconfig

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

diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/pkgs/tools/filesystems/f2fs-tools/default.nix
index 36ffce9cdfe8..36e95ab2d6a9 100644
--- a/pkgs/tools/filesystems/f2fs-tools/default.nix
+++ b/pkgs/tools/filesystems/f2fs-tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, libuuid }:
+{ stdenv, fetchurl, autoreconfHook, libuuid, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "f2fs-tools-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [ libuuid ];
+  buildInputs = [ libuuid pkgconfig ];
 
   meta = with stdenv.lib; {
     homepage = "http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/";

From 7ca8e139189ff3935dbe6ef12ff014cf8e028e04 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 5 Jan 2016 20:08:22 +0100
Subject: [PATCH 330/884] lib.getVersion: extend the function to cope with
 strings as well as derivations

---
 lib/strings.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/strings.nix b/lib/strings.nix
index 098da975c601..fc6c2152b9fc 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -189,9 +189,13 @@ rec {
   versionAtLeast = v1: v2: !versionOlder v1 v2;
 
 
-  # Get the version of the specified derivation, as specified in its
-  # ‘name’ attribute.
-  getVersion = drv: (builtins.parseDrvName drv.name).version;
+  # This function takes an argument that's either a derivation or a
+  # derivation's "name" attribute and extracts the version part from that
+  # argument. For example:
+  #
+  #    lib.getVersion "youtube-dl-2016.01.01" ==> "2016.01.01"
+  #    lib.getVersion pkgs.youtube-dl         ==> "2016.01.01"
+  getVersion = x: (builtins.parseDrvName (x.name or x)).version;
 
 
   # Extract name with version from URL. Ask for separator which is

From af8c1f33688b6c05822269af44996839f758b08c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 5 Jan 2016 20:08:53 +0100
Subject: [PATCH 331/884] youtube-dl: take advantage of the improved getVersion
 function

---
 pkgs/tools/misc/youtube-dl/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 76db7b2ae4f4..09328c8d8aba 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, buildPythonPackage, makeWrapper, ffmpeg, zip
-, pandoc ? null }:
+, pandoc ? null
+}:
 
 # Pandoc is required to build the package's man page. Release tarballs
 # contain a formatted man page already, though, so it's fine to pass
@@ -13,7 +14,7 @@ buildPythonPackage rec {
   name = "youtube-dl-2016.01.01";
 
   src = fetchurl {
-    url = "http://yt-dl.org/downloads/${(builtins.parseDrvName name).version}/${name}.tar.gz";
+    url = "http://yt-dl.org/downloads/${stdenv.lib.getVersion name}/${name}.tar.gz";
     sha256 = "0b0pk8h2iswdiyf65c0zcwcad9dm2hid67fnfafj7d3ikp4kfbvk";
   };
 

From 0f6659bab7f8f1f888fde385e76aaf4eb933bf7e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 5 Jan 2016 01:21:01 +0100
Subject: [PATCH 332/884] libpsl: list 2015-12-17 -> 2016-01-04

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

diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix
index b8ae3060a2ff..2495b923b798 100644
--- a/pkgs/development/libraries/libpsl/default.nix
+++ b/pkgs/development/libraries/libpsl/default.nix
@@ -5,10 +5,10 @@ let
 
   version = "${libVersion}-list-${listVersion}";
 
-  listVersion = "2015-12-17";
+  listVersion = "2016-01-04";
   listSources = fetchFromGitHub {
-    sha256 = "09scxqlw7cp7vkjn7bp7dr9nqb3wg84kvw3iyapyxddfri4k0rvl";
-    rev = "9636089f5f22b0af98b1a48fb9179dc875f0872d";
+    sha256 = "1pn04yjmzmdh5adanp7ryhyzvg8dz5lmnhh1gikpa3k2r3gj6zxw";
+    rev = "3594dcfbd8cf1cb3ba2c57bd56b761147ea31fca";
     repo = "list";
     owner = "publicsuffix";
   };

From 9f2a7bf862a9780d3da5b7d041a506c2aa5848db Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 5 Jan 2016 01:32:53 +0100
Subject: [PATCH 333/884] mcelog: 128 -> 129

Add support to decode MSCOD values for Broadwell-{de,ep,ex}.
---
 pkgs/os-specific/linux/mcelog/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix
index 1c0362b80ae5..a6818ae86b90 100644
--- a/pkgs/os-specific/linux/mcelog/default.nix
+++ b/pkgs/os-specific/linux/mcelog/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchFromGitHub }:
 
-let version = "128"; in
+let version = "129"; in
 stdenv.mkDerivation {
   name = "mcelog-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "0hm1dmqyh36dig158iyb9fckmvqnd5sgpy1qzj59nsg40pb1vbjs";
+    sha256 = "143xh5zvgax88yhg6mg6img64nrda85yybf76fgsk7a8gc57ghyk";
     rev = "v${version}";
     repo = "mcelog";
     owner = "andikleen";

From ad200bb5bccb6b607ceb4fc6e02ecba1d5b6021c Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 5 Jan 2016 20:37:45 +0100
Subject: [PATCH 334/884] Fix remaining sane{Front,Back}ends

---
 pkgs/applications/graphics/sane/xsane.nix             | 4 ++--
 pkgs/development/haskell-modules/hackage-packages.nix | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix
index 85b23e3c2f2c..751f31f73f29 100644
--- a/pkgs/applications/graphics/sane/xsane.nix
+++ b/pkgs/applications/graphics/sane/xsane.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, sane-backends, saneFrontends, libX11, gtk, pkgconfig, libpng
+{ stdenv, fetchurl, sane-backends, sane-frontends, libX11, gtk, pkgconfig, libpng
 , libusb ? null
 , gimpSupport ? false, gimp_2_8 ? null
 }:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     chmod a+rX -R .
   '';
 
-  buildInputs = [libpng sane-backends saneFrontends libX11 gtk pkgconfig ]
+  buildInputs = [libpng sane-backends sane-frontends libX11 gtk pkgconfig ]
     ++ (if libusb != null then [libusb] else [])
     ++ stdenv.lib.optional gimpSupport gimp_2_8;
 
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index d864dc584ca7..87e2bd68c81d 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -35450,18 +35450,18 @@ self: {
      }) {};
 
   "bindings-sane" = callPackage
-    ({ mkDerivation, base, bindings-DSL, saneBackends }:
+    ({ mkDerivation, base, bindings-DSL, sane-backends }:
      mkDerivation {
        pname = "bindings-sane";
        version = "0.0.1";
        sha256 = "a27eb00e69a804e65f39246611a747f3a833a87dab536c7f3cde60583a60b04b";
        libraryHaskellDepends = [ base bindings-DSL ];
-       libraryPkgconfigDepends = [ saneBackends ];
+       libraryPkgconfigDepends = [ sane-backends ];
        homepage = "http://floss.scru.org/bindings-sane";
        description = "FFI bindings to libsane";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
-     }) {saneBackends = null;};
+     }) {sane-backends = null;};
 
   "bindings-sc3" = callPackage
     ({ mkDerivation, base, bindings-DSL, scsynth }:

From 24100ec0c3474189291a8ea6c2226aeca2be811c Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 5 Jan 2016 03:38:20 +0100
Subject: [PATCH 335/884] soi: 0.1.1 -> 0.1.2

Now builds, but still mark as broken because it quickly segfaults
at run time.
---
 pkgs/games/soi/default.nix      | 32 +++++++++++++++-----------------
 pkgs/top-level/all-packages.nix |  4 +++-
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/pkgs/games/soi/default.nix b/pkgs/games/soi/default.nix
index 78e7dda459d6..2e8a085ef474 100644
--- a/pkgs/games/soi/default.nix
+++ b/pkgs/games/soi/default.nix
@@ -1,31 +1,29 @@
-{ stdenv, fetchurl, mesa, SDL, cmake, eigen }:
-
-let
-  baseName = "soi";
-  majorVersion = "0.1";
-  minorVersion = "1";
-  version = "${majorVersion}.${minorVersion}";
-  name = "${baseName}-${version}";
-in
+{ stdenv, fetchurl, cmake
+, boost, eigen2, lua, luabind, mesa, SDL }:
 
+let version = "0.1.2"; in
 stdenv.mkDerivation rec {
-  inherit name;
+  name = "soi-${version}";
+
   src = fetchurl {
-    url = "mirror://sourceforge/project/${baseName}/${baseName}-${majorVersion}/Spheres%20of%20Influence-${version}-Source.tar.gz";
-    inherit name;
-    sha256 = "dfc59319d2962033709bb751c71728417888addc6c32cbec3da9679087732a81";
+    url = "mirror://sourceforge/project/soi/Spheres%20of%20Influence-${version}-Source.tar.bz2";
+    name = "${name}.tar.bz2";
+    sha256 = "03c3wnvhd42qh8mi68lybf8nv6wzlm1nx16d6pdcn2jzgx1j2lzd";
   };
 
-  buildInputs = [ mesa SDL cmake eigen ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ boost lua luabind mesa SDL ];
 
-  preConfigure = ''export EIGENDIR=${eigen}/include/eigen2'';
+  cmakeFlags = [
+    "-DEIGEN_INCLUDE_DIR=${eigen2}/include/eigen2"
+  ];
 
   meta = with stdenv.lib; {
     description = "A physics-based puzzle game";
-    maintainers = with maintainers; [ raskin ];
+    maintainers = with maintainers; [ raskin nckx ];
     platforms = platforms.linux;
     license = licenses.free;
     broken = true;
-    downloadPage = "http://sourceforge.net/projects/soi/files/";
+    downloadPage = http://sourceforge.net/projects/soi/files/;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9f4000320daf..863798b21ac7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14313,7 +14313,9 @@ let
 
   snake4 = callPackage ../games/snake4 { };
 
-  soi = callPackage ../games/soi {};
+  soi = callPackage ../games/soi {
+    lua = lua5_1;
+  };
 
   # You still can override by passing more arguments.
   spaceOrbit = callPackage ../games/orbit { };

From e5972f309498906e346cbefd6f08fbbb6f1bf982 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 5 Jan 2016 19:36:48 +0100
Subject: [PATCH 336/884] keyfinder: 2.00 -> 2.1; build with qt55

---
 pkgs/applications/audio/keyfinder/default.nix | 5 ++---
 pkgs/top-level/all-packages.nix               | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/keyfinder/default.nix b/pkgs/applications/audio/keyfinder/default.nix
index 7706203104ca..74110c5924e3 100644
--- a/pkgs/applications/audio/keyfinder/default.nix
+++ b/pkgs/applications/audio/keyfinder/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchFromGitHub, libav_0_8, libkeyfinder, qtbase, qtxmlpatterns, taglib }:
 
-let version = "2.00"; in
+let version = "2.1"; in
 stdenv.mkDerivation {
   name = "keyfinder-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "16gyvvws93fyvx5qb2x9qhsg4bn710kgdh6q9sl2dwfsx6npkh9m";
+    sha256 = "0j9k90ll4cr8j8dywb6zf1bs9vijlx7m4zsh6w9hxwrr7ymz89hn";
     rev = version;
     repo = "is_KeyFinder";
     owner = "ibsh";
@@ -29,7 +29,6 @@ stdenv.mkDerivation {
     maintainers = with maintainers; [ nckx ];
   };
 
-  # TODO: upgrade libav when "Audio sample format conversion failed" is fixed
   buildInputs = [ libav_0_8 libkeyfinder qtbase qtxmlpatterns taglib ];
 
   postPatch = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 863798b21ac7..53824be02eb2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12269,7 +12269,7 @@ let
 
   kermit = callPackage ../tools/misc/kermit { };
 
-  keyfinder = qt5.callPackage ../applications/audio/keyfinder { };
+  keyfinder = qt55.callPackage ../applications/audio/keyfinder { };
 
   keyfinder-cli = qt5.callPackage ../applications/audio/keyfinder-cli { };
 

From 108cd9aa7f5a9ffbc2d0d95371e07d29d9baa10f Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 5 Jan 2016 21:35:08 +0100
Subject: [PATCH 337/884] calibre: disable version check

Applies patch from Debian to disable version checking by default.
---
 pkgs/applications/misc/calibre/default.nix       |  6 +++++-
 .../misc/calibre/no_updates_dialog.patch         | 16 ++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/misc/calibre/no_updates_dialog.patch

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index d86aee50bb90..d4786017a473 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -15,7 +15,11 @@ stdenv.mkDerivation rec {
 
   inherit python;
 
-  patches = stdenv.lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch;
+  patches = [
+    # Patch from Debian that switches the version update change from
+    # enabled by default to disabled by default.
+    ./no_updates_dialog.patch
+  ] ++ stdenv.lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch;
 
   prePatch = ''
     sed -i "/pyqt_sip_dir/ s:=.*:= '${pyqt5}/share/sip':"  \
diff --git a/pkgs/applications/misc/calibre/no_updates_dialog.patch b/pkgs/applications/misc/calibre/no_updates_dialog.patch
new file mode 100644
index 000000000000..52364f64dac7
--- /dev/null
+++ b/pkgs/applications/misc/calibre/no_updates_dialog.patch
@@ -0,0 +1,16 @@
+# Description: Disable update check by default.
+Index: calibre/src/calibre/gui2/main.py
+===================================================================
+--- calibre.orig/src/calibre/gui2/main.py	2014-02-02 10:41:28.470954623 +0100
++++ calibre/src/calibre/gui2/main.py	2014-02-02 10:41:56.546954247 +0100
+@@ -37,8 +37,8 @@
+                       help=_('Start minimized to system tray.'))
+     parser.add_option('-v', '--verbose', default=0, action='count',
+                       help=_('Ignored, do not use. Present only for legacy reasons'))
+-    parser.add_option('--no-update-check', default=False, action='store_true',
+-            help=_('Do not check for updates'))
++    parser.add_option('--update-check', dest='no_update_check', default=True, action='store_false',
++            help=_('Check for updates'))
+     parser.add_option('--ignore-plugins', default=False, action='store_true',
+             help=_('Ignore custom plugins, useful if you installed a plugin'
+                 ' that is preventing calibre from starting'))

From ec2a1bcb866d5d52d62d9788d6ba00ac808c08d6 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 5 Jan 2016 21:42:31 +0100
Subject: [PATCH 338/884] anki: disable version check

---
 pkgs/games/anki/default.nix            |  3 +++
 pkgs/games/anki/no-version-check.patch | 13 +++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/games/anki/no-version-check.patch

diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index ca18ca194da1..4c06f9126a96 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -26,6 +26,9 @@ stdenv.mkDerivation rec {
     phases = [ "unpackPhase" "patchPhase" "installPhase" ];
 
     patches = [
+      # Disable updated version check.
+      ./no-version-check.patch
+
       (substituteAll {
         src = ./fix-paths.patch;
         inherit lame mplayer qt4;
diff --git a/pkgs/games/anki/no-version-check.patch b/pkgs/games/anki/no-version-check.patch
new file mode 100644
index 000000000000..ce166b4b87d5
--- /dev/null
+++ b/pkgs/games/anki/no-version-check.patch
@@ -0,0 +1,13 @@
+diff -Nurp anki-2.0.33.orig/aqt/main.py anki-2.0.33/aqt/main.py
+--- anki-2.0.33.orig/aqt/main.py	2016-01-05 21:37:53.904533750 +0100
++++ anki-2.0.33/aqt/main.py	2016-01-05 21:39:11.469175976 +0100
+@@ -820,6 +820,9 @@ title="%s">%s</button>''' % (
+     ##########################################################################
+ 
+     def setupAutoUpdate(self):
++        # Don't check for latest version since the versions are
++        # managed in Nixpkgs.
++        return
+         import aqt.update
+         self.autoUpdate = aqt.update.LatestVersionFinder(self)
+         self.connect(self.autoUpdate, SIGNAL("newVerAvail"), self.newVerAvail)

From 5e5ecb7b6f476af51dcad4ac05b556a3860cad6f Mon Sep 17 00:00:00 2001
From: Jakob Gillich <jakob@gillich.me>
Date: Tue, 5 Jan 2016 18:00:34 +0100
Subject: [PATCH 339/884] fish: fix merge conflict

patches got duplicated
---
 pkgs/shells/fish/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index 0fa8e82fb890..1419b180d728 100644
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -5,16 +5,13 @@ stdenv.mkDerivation rec {
   name = "fish-${version}";
   version = "2.2.0";
 
-  patches = [ ./command-not-found.patch ];
+  patches = [ ./etc_config.patch ./builtin_status.patch ./command-not-found.patch ];
 
   src = fetchurl {
     url = "http://fishshell.com/files/${version}/${name}.tar.gz";
     sha256 = "0ympqz7llmf0hafxwglykplw6j5cz82yhlrw50lw4bnf2kykjqx7";
   };
 
-  # builtin_status has been upstreamed https://github.com/fish-shell/fish-shell/pull/2636
-  patches = [ ./etc_config.patch ./builtin_status.patch ];
-
   buildInputs = [ ncurses libiconv ];
 
   # Required binaries during execution

From 67f4c2a7799e2dc30cae20b3c313c7b186cd1d71 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <bstaffin@fitbit.com>
Date: Fri, 1 Jan 2016 16:35:43 -0800
Subject: [PATCH 340/884] openssh: Add gssapi patch used by other major distros

This patch is borrowed verbatim from Debian, where it is actively
maintained for each openssh update.  It's also included in Fedora's
openssh package, in Arch linux as openssh-gssapi in the AUR, in MacOS
X, and presumably various other platforms and linux distros.

The main relevant parts of this patch:
- Adds several ssh_config options:
  GSSAPIKeyExchange, GSSAPITrustDNS,
  GSSAPIClientIdentity, GSSAPIServerIdentity
  GSSAPIRenewalForcesRekey
- Optionally use an in-memory credentials cache api for security

My primary motivation for wanting the patch is the GSSAPIKeyExchange
and GSSAPITrustDNS features. My user ssh_config is shared across
several OSes, and it's a lot easier to manage if they all support the
same options.
---
 pkgs/tools/networking/openssh/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 67bf5be7d5b7..3a150f19ed23 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -1,7 +1,8 @@
-{ stdenv, fetchurl, zlib, openssl, perl, libedit, pkgconfig, pam
+{ stdenv, fetchurl, fetchpatch, zlib, openssl, perl, libedit, pkgconfig, pam
 , etcDir ? null
 , hpnSupport ? false
 , withKerberos ? false
+, withGssapiPatches ? withKerberos
 , kerberos
 }:
 
@@ -14,6 +15,11 @@ let
     sha256 = "682b4a6880d224ee0b7447241b684330b731018585f1ba519f46660c10d63950";
   };
 
+  gssapiSrc = fetchpatch {
+    url = "http://anonscm.debian.org/cgit/pkg-ssh/openssh.git/plain/debian/patches/gssapi.patch?h=debian/6.9p1-3";
+    sha256 = "03zlgkb3a1igj20kn8cz55ggaxg65h6f0kg20m39m0wsb94qjdb1";
+  };
+
 in
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -30,7 +36,8 @@ stdenv.mkDerivation rec {
       export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s"
     '';
 
-  patches = [ ./locale_archive.patch ./openssh-6.9p1-security-7.0.patch];
+  patches = [ ./locale_archive.patch ./openssh-6.9p1-security-7.0.patch ]
+    ++ optional withGssapiPatches gssapiSrc;
 
   buildInputs = [ zlib openssl libedit pkgconfig pam ]
     ++ optional withKerberos [ kerberos ];

From 38460cfe7246f34ccb09768b1435b9dcfd739e3b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 6 Jan 2016 00:31:27 +0100
Subject: [PATCH 341/884] set-source-date-epoch-to-latest.sh: Support Darwin

---
 .../setup-hooks/set-source-date-epoch-to-latest.sh          | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/set-source-date-epoch-to-latest.sh b/pkgs/build-support/setup-hooks/set-source-date-epoch-to-latest.sh
index e57848cff558..9e325106f821 100644
--- a/pkgs/build-support/setup-hooks/set-source-date-epoch-to-latest.sh
+++ b/pkgs/build-support/setup-hooks/set-source-date-epoch-to-latest.sh
@@ -1,12 +1,6 @@
 updateSourceDateEpoch() {
     local path="$1"
 
-    # FIXME: Support Darwin.
-    if ! [[ $system =~ linux ]]; then
-        exit 1
-        return
-    fi
-
     # Get the last modification time of all regular files, sort them,
     # and get the most recent. Maybe we should use
     # https://github.com/0-wiz-0/findnewest here.

From e3c061e6ef989fa00d6289f4f9a6abed585ff482 Mon Sep 17 00:00:00 2001
From: Wei-Ming Yang <rick68@gmail.com>
Date: Mon, 4 Jan 2016 14:26:54 +0800
Subject: [PATCH 342/884] ostinato: remove ostinato.png and get it from url

---
 .../networking/ostinato/default.nix             |   9 +++++++--
 .../networking/ostinato/ostinato.png            | Bin 18467 -> 0 bytes
 2 files changed, 7 insertions(+), 2 deletions(-)
 delete mode 100644 pkgs/applications/networking/ostinato/ostinato.png

diff --git a/pkgs/applications/networking/ostinato/default.nix b/pkgs/applications/networking/ostinato/default.nix
index 28170b2563d4..1d5986dbfa64 100644
--- a/pkgs/applications/networking/ostinato/default.nix
+++ b/pkgs/applications/networking/ostinato/default.nix
@@ -3,7 +3,7 @@
 , wireshark, gzip, diffutils, gawk
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "ostinato-2015-12-24";
   src = fetchgit {
     url = "https://github.com/pstavirs/ostinato.git";
@@ -11,6 +11,11 @@ stdenv.mkDerivation {
     sha256 = "0hb78bq51r93p0yr4l1z5xlf1i666v5pa3zkdj7jmpb879kj05dx";
   };
 
+  ostinato_png = fetchurl {
+    url = "http://ostinato.org/images/site-logo.png";
+    sha256 = "f5c067823f2934e4d358d76f65a343efd69ad783a7aeabd7ab4ce3cd03490d70";
+  };
+
   buildInputs = [ qt4 protobuf libpcap ];
 
   patches = [ ./drone_ini.patch ];
@@ -28,7 +33,7 @@ stdenv.mkDerivation {
     EOF
 
     mkdir -p $out/share/pixmaps
-    install -D -m 644 ${./ostinato.png} $out/share/pixmaps/ostinato.png
+    cp ${ostinato_png} $out/share/pixmaps/ostinato.png
 
     # Create a desktop item.
     mkdir -p $out/share/applications
diff --git a/pkgs/applications/networking/ostinato/ostinato.png b/pkgs/applications/networking/ostinato/ostinato.png
deleted file mode 100644
index 6a03e6a7d5df5e244fec75af65a33f56736e4538..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 18467
zcmX7w1yoyGw}pcTm*Vbj#VHoto#O896o=sME=5|L;%>#gKyjDi?yfKQe~b|lk^v{#
z`<x|nev2p-C23S7LL>kHfGR5^p$54hf!qdw@R08-*^YaVJ6Ja{Sq&iM%MWNC3Hce(
zSw_bV0Khf)?*=71sQm--B!Ro6w!6BMrMstzs|CQ*)05T4(az1x#My$?$<-?7T#yg|
zAP2}wh-!G{o_@Ch6Mvl#-*l_AqRpy>#Ukg+I;t>C28*in#mfP3a73Y&B|+xu5*U)O
zgK#RM*s2nuqKT5twUP8dSg2)`6FiE-jEX#2Y%y(U9okughqnNC<;<*eU7zoWqc;dM
z9w!?D>mJ9B2c6O~rb2Oa8zh@j1n1HqS?jP?3>UyUfD1fNt|?wfW*)D?7J2y*>Q`tM
zg1SGIFA`{++R>edRlflu?Ej_Hu(IKG7AKT?I0d*S09eL-?Lsw0E3BTnw>(I8Ct8}g
z(-`%EDNk`IRmiG!eSO@K^@9Ovg;WN@C7v|(NiN&p&%-Zv<zf8dO(a~lJ)V;dYi?Et
z<%${4S~g1>hk;lNDex>fvMeU-?S%SuoXEKoYk&O|eI@Rpt+Lkw^8%mhm|mM4R^O`Z
zeGM$Sf;4(jW*d=uaKNWRV+K0Ri5I1A_wy%<^b?TRLa9lclyG|C0AHj#*g{k;@lc67
z1GsERPf)1=<Ml(5ks=s;o#Cqn0Av6&<_J+}z^ByUNP8(~4)7>|hv`jgerYgJPS3ns
zgYoWL+(XT9#2x&0h)uR$v+8+)@$jXmOJ3w3s7tSdimx95?`c|^u<Mu!!@S`q=QNc0
zfGZb`Zpqi!M#+2GVzrvD-kUzq+D_!81HRi05=R0UwkPT1h#qkiuW#ecZ~9#hdg<I$
zVtz3_s({$U78Z$tN9`})&nsKr?mEXItJ%Xfz9RbxozkmI6ugK7<|G+@GU|UZ$=0(O
zc>)OIU8ipd-hFG+KcA3#u=sCPV##r16t#3kkVeeAU7?x5TbZd2BGaeBG(V=-$&Yye
zda$^(0U49abUYo(CrBr#=D-pgM}i>1@E&f!g{P#j)9Srm)ghkBiYaazo&-k$y=1K&
z6N;xn!NT{H2jWq4*PlEin;7QA15O=o3v_xm#DLl!7kje;e=UkUBznf|R(*-SYJ-KH
zejgZyUcY~|(5uh5So+zJ15WI%iN&;Y$A-n=v7YI7*(w939@9P<cVyb+&HQleD%BAg
zgieed5?1~<0X6uZH_HDKAC_V_UjGMp)tHZ-32;)F$kK~V|J<#meIT7!U0tmdjE8{j
ztGYrN5ev5i0IW8X(DS1VE+t1}EV(Bgoi6k_cG2k^pql&X4SSLw-ZO9%^n?tp$a*m5
zbfFLAzm8dt1ymhR`KEcSfRcrTT)<Y3X%sG3<MB6YmCqWebH{$z>pF~-eN&CK0vEEB
zKi7k%L&sWypa|t8{XmngPO0WB1zO&|o*oVQCd^SK=pCG|bU{}dry9jm0B+L1x)PdD
zhl?N)Z~&BM;q3=wa6obbOug@(2!`x<z2#DKS3y!>fBV1}JMubh<_hqeKQiL)-(FYS
zY4dXeU3SmAok^Q=spqPcLUV^f1qi{87(xJ^aC-0{JS?ENRh1GJ$S^Mf2<{caX0R*Q
zkQ`*Xz=A@<Ng_+W)vx(Aoa6BgkI7_c65)}g<^-BqhW}nOz{6g^Vl32iML@)yz6*vy
zK&%!9tlcl5CvpMsA`C8-5vEBRQ9to-?yFNG9QohHuKVmm_NvbtsXoj9GE+!KlQJ6T
zUU+Gva*y>dp1fJg%c`$#hzUaw?wSFR;Cb*XV$lgPqd|#KhJ#QbvoFUl`d3lmM#iXl
zI^-885<MU2ya3=XKx0c;PSw5#xW%p_=gjb>x30ceXysQ9yy=i5jaPwkk}qftxfcrX
zZFogMZf?wud>`cHMw{_+&~DFsQWQk3V24S_Hmwe$58DG}&fmKyrX!lPN2yQI!<Z~5
zvBEu#Ces1(1eu#rlwfAU8~Y)Dd19n!=}p_TeCGIA489-2KFJMIxHvy|jT`xa%X<Rt
z7uDkiEhv56_HEJsyjU{Eu%<~2Q?<nA9=``A5f6%^A&I0K0M!<ens4r!C7rXjkZJOr
zGqKf%ls-{U@9!J{`~sKz^P0qyRln2Orh!mScfp@pc;VOccv4`}b&9>yeT`p&2<T*u
zKN29oUH2Ri^!inNO4Y%^vt>*uY~aPO8W%A7gOA2eBc>zjlI_acJ)p0CQhv30GkjQg
z;tOYRWMuSRW@+T5Ac)7>`R*cei?@1&Et>_CkrL}9enL%6I}6Xd-($VyOYDf6R|JAc
z$|%18wa+gY`ey}@C3m|rHEFn}kw06t>H;E6)S&4q<Fy=y09WhrBGgkc)9Y6z=rXL5
zwn|XIC;S!;STWXdzU3OUcLCD43zj}7n6=8@bvKIESULZTF6xBmJf6h!^Yg16$|N`0
z0GLF0CAu~ZFq!B5!v|~ZFJ&s3``dx?SZ@HWrW;u=6-T^V|H#yi(3KA5GqDV~L-CF|
zXzNexj{c3Ic7CT7YSClKTsItsll9;L+3MOW!QClnUaT*6-Dq4-1bPUUFaFF!2=X?V
zez3v(Ro6lo_g=#x?r0W}`+cysUh1ispIiIOPU2SNFK7qDI0$$zb8u>=>p(o)QKAgr
zD$Vk+A5`^LZRMKPF<g~<89>1rlyKsQdTNTHOgFLQg8Hjrud@_|njp@<*Fo<MEAl6y
z_L(i{_hMadsDpa*+Z6l)5n(g>fa;FTZ@?xRBWK{~>t1=TKVg|C^rbz^nb%+0%du9Q
z4XijRy^7FH`i)QOzaRl=@+#@RlAN!o_p1OjX`*YclrY!V6iAFP{jGA-r`2Pi9)IIi
zR!=Fl#>ED>s?uG(DbTXx=UC10FY3MHNoxv#m8Hg7-&tKDa|m{M^>5N!3TTXj0jQPF
ztzx`(EW98pAR45*&o=wh!bSYV&z-0DN!?y6vhWXdNT$}UM5V@zI}Z;QK<_~y(q@6m
z%NXU)KR-F~{TXz(5cX}4h<meAqh!UGquKu_xC7>}s%aewpL#M*dIF(2`-_Jf%!vb`
zT~!b@WOXp^$iWjt+GmV~r}^J<FXEekosjbwvyd3t**mS}7*(tK*9r(gzQ;F3Zh8t3
z{aGqWHX%)^JYZUPgj(J5@0SNWhn}T0R*5%5FVpnn63VhygW|`=))yiv#*D74p2GR{
z!SQ4MO4-s`d0M6H#teXk6~i3`V)2t#AJ>DueOH`Cm2MHFVsctBk#L0i+sT&ZqxmJn
zx83G$QIsR=6!iO&IEaA4$@?=$wb=n2GH$23(<<c;)9FKQX#V<*cBw?Xkx>S^mlycO
zRg8sfOvo<(?(UC#C7R$u187u4oAa}js62||3|;+#q-g6<7XU!^`^4UFU~f}gnG?_f
zwniayUy_nzKX3T+Vxio?&nth1W0yt{hNwIDa*^&ZBq7I#)`V+Cg<%k{f9LeHcOPO%
z{<6b23~nt+y2DN4+!or;g<L0^ut8y#e>ysb6>nyXQ!O1>Y-%gq?W#fst}aEG{Y2>x
zN`24ta@u-9YB3{qQDx<b#It|L;9fk-M$R~`CfA(aU!P!5t2(5HZV9PPvKye<5PDj1
zc`D=lUT`N+oGWlKKX0qvbeDCSWnhl!(DYj`CooVlI%c<oSci8Wk*xFI+?a`4So~3{
zOHOa%1b6(!-YMAZuW^6r!6V$XJR9&aZBQNMi{zwJ%4_@z*_h(_yasBIqMti5fQdwl
zx6>bGZWG$tDX~5XjH=mAA1o5a>ZsmO-k4<phkC(+&CfnL5o+xUx*C!BMQ-<DH~SOg
z2~zn0<KAGni@#rAV9I!KOGFMyp(BQWPH#p<cDtLW5V*mc>MWoru0?=b5rP+?%Fc^&
zT6t5({a5K5*MU6;y~$a1+V+2bNorRcx+=FX^80E)0-%BsElsev>UX+JJ`gJvhO;o$
z@Sx%i-ra4D;ZSOjcDe=Oz#D+)hK0UWUcwRP^8K=j^Nf*LPK^x`kQpL<U*(vt<^P>H
zvi{f<!l0=YW8(kD{Qb7n{>2ak-4!0uzg+Ol9KDSzJm_rO7t5^y>LeVB4WdpNMUz~M
zH}0xvV|4~bI%%rD$x%Fz;o>sgZdOpEog5z{$-%5+(d#$((iqR~Y}iqpnFqrEAiN4U
zKn;O`MHk;X>~Bb!Uh0LsOHIh%W6$rF0iQw3O~k~WEE(x9L-kY_p3weI8QU`?eqL@x
z<#}WRboZ2^4!5)f3fmJYO77Nee>j&nHW_fWf4`zd_s0T%gtOFePmS?S5+nVN6|M6@
zr|;~mXKtuQTj<GTPc-McCjbQ}EB&6+q(5zdY=UR%wvNdO?Ui%$Vw?N!!Og)G8TsxM
zR7*mXji%v=FBGoCZg5@tku5!>bW{u;)^ZsamYsby9%`<^6-{ip9)fr2x6fLiY3NWD
zL117Y5k~JBe#??C{(Ij$_hasdO?uOJ%hobpXr|O}EsA&dnzxp54+EYU#s0I5b~FMO
z4a)^{<J`0J^Yi=xuaC02CyHqcDFAo+B;LbzdF1e`_8q=)84eR2UU};4Fb&40b{&5k
z?5MIkY2a`CirTI8Mh7w!fXnQ28=w?!%{gFYG*8`=PMo6xo|2N0l$#9pQZ?U{`Y|hZ
z=M@KlrFt^;FXZQLYGcY<lTlQWP1o+hro>j8{bbhH8nBzItt%snCmze1B-lU&TXqS%
z_dt*}y2HZ>%T=U+EG995?ayBQ-EC=>b~^Vo`94+ddtFIk^O!jY+f+7prNgpajfh;J
z6Ff_Bms<0iikZ*JR2iX+psl|$tjHx3)d0<ZSph)Z{s|HP96B^+Du6!4?H=U|NItWU
z69E6`#9L~`C79zMn%Ph+0THeyDlyVvLeLsqV)^_US+EwAApD4#``#qv9G~BMKA|+p
z&S&-(g{AEI$}s$n1^C0RSPAgP?HLkoVRmHNZE*<m8Y&}@5hUC+kPw0Wh<M9#AyQbf
z_{&CTqSGxtO~(-V74z~fz?C-y@?j>)4WW&F(kN=7!&knfjKWGS;*>g^XFw4zz`{wh
z0WYDTGahz-bqoc^zyqj%EX-pNll(XYV^dy1HkcA1BV~r5>J@WA65KJ<yl$;nb8RWr
z4~lkLod38|?*6mq9*2(lo1o>t%pp9}jQ=jn8{>&3GP!F%b!$r%m9q~8-8NAZ3-&A}
zE;U`yhO}G^Tlg5m2p0p~-#?<a9!8|AiT$>ukY~ACVnH*P>5>K^z<|X1vkUZh0n8@W
zh%Je3UwS?Uv(@gZ?$V9eF;>lh`Qrv?*Ay5HBZ4muBSdErRFJ^!MS^)ZYx|tylFJVu
zy*)!S-)yx>r&*W1AGqg?`~Y6%d^RQqTnb}tniXvgOf1#xT(xd$6qobG--v)%5!KTN
zK8yR;=!eY$I=4I%C?{K(D;bMNZEf0uAi1n8@<R!(_hhE+^s<Ne-?Yhb=~kz1qe<Aa
zog|HWK1ZT_%IK~X03%_zlt$siNu%?V8K+Ar#g^8<JTg}LSBp%?odOEHzK>3uMAFJ(
z-JirZtKYhr_y(p(!g@-guh*q+XJgWp>##~ZV8H!;(aeQ~C8+)*JL^{t1Al)zeFBgh
zCu|z`#p;?NLK3OXr8i0-8)Z!jA8OO!z^5K)G18Dro8mog)CWbHYbnv)2^s3^@RRl(
zD22}>46r3CX3_Nah{p1X9Sikac)cR-CXZ!njLGR9gi-kjxYUkv2d5@Oxm**oh*zuR
z1ngxkwhPsU@~Gz77H36K!~as&a<(!c_1pa4scp+sQz&KhicR@4e&%Uw_Y|I_45%!9
zJCd{)I6ZP+=;vv{CkfUJ--f(r)4HW*xf6e=WxSqvpvWg}#qBkP$!c39UAED@r2viR
zdW`TcpC&!8O_jD{HL2~V%TXt>%Z1n-uECSSV)$hCs=(f1Nr}kPnXbu6@fJ&~@lzS2
zIUU&U)CtMFQS2$E<L3~pbPwoAc;;7aj52{jXUUc3kLh1tapoLt1ju2^LDyk_w-<u#
z=#;YE^(*!FQc9li#CSqKytOdL79rbM6CQxgJE4rc>-h0<dw!&UZsg(72+hKoh*6$V
zo^~pDJ@*At4~F-31RvwEyp;Mh1noheFpwH9FiS}r!$l%D_2D!-bgMZ9RumRlf2ae<
zkW~GunfMBpy%nRWdS-Y5I`P}LuJYa2uzBNr-<Cb|BXt8Kwmu0z2xU$1cW^yR&LvCw
zK<bx*zn<E7TgP&&Bq%L>Q$;WKAG``OGPY{|s8Ew`q-#*(4&O(YMeLhg03h0oHjxxJ
z%QSQGkp0~T)a^P;0RXG-+ugd{fv7sh?g|<Re3o3IW4R^gmAy$D4G<VqY?!`osQQe7
zhOHDfB}xpoh{d-+i=^=$^M^U13z#2yj5Nj73K!<5Gyb&3d$yF1?3THtAj4s{%Bz$s
zXai4g1hdt$u{=he7x^$i^xgZ!;I_6U03K9;k`&GubLhA1Vi-JP@tYS*M3y$iBpzC9
z)*S}&C`WXQ=#4hmsATqthDwC(yFct1cGu4pDy_v?=>#PQ>~?yu-GZ7WZIg{o?<aTG
z7pCcRw95pdO|jJX2n!vPyXK1E{!&RqVD&Y#zF1E`llNKk-i-)!?aaYK87aMASGc3k
zj62M<_rogSm9+V5qy(b?Hqu*jh`fcf$4`TvPnM^Z6b8ER0xmbPd8GLY4L_wTT6o39
z&!Bsh)jZ5XT05qLXJ(o0=unKt@2r!E0I+fQIlJv{9kH*qhrW_VFrRvLI4%Dy)jn@%
zmXyP*x%XZgiDS5W&;&I=>Nv$9P#j}i@Kq(4<11!@)C078lgnQNIGi@SUlQc;kWztp
zd^gu$UZ<!t@_@>rWdf2mOrFiMUEfEhQq|Dlf__#}yh1bqs-CHTWI?Si0e8pYqd$4(
zL6o{^rqji%$XZ8YgD^$$GP`EL%N3l<Ja?ln2Fhd+$%jhR5_2p~G_Sk&-yKL6<C~Ep
z@Tk`{CWRHrjlx@u2c<XlpNID1tl1!4l7Y!;o5*)1wxES>l=l4KX!v@FC<BCk-FH^Q
zF}N!(hZn=aFrdxc!TAFlrwqTqb{(<eqp8G^wFV6L#RF%nhhYk`FPNowaSvljCRv}O
zC$!XpjpQ;dC)#Ad+^Z8UnyqulfGquUC}`2V1u_{WMNL8NqRQ9)PmvDW(_UE`YAjq6
zppvY8O>*H=t?=r0$j(tx2Ka8!Y`DA~%ok!}4*LC*0_Z(q>k%`ntLMVdF*E6Nt<xuc
z%k54Ips02=5hO%k6Z$1F6H7w3{f?Tp!@m%FPkHHSg#hZW;)^!-;k*F|?t0c>ttYA$
z*}#j*{iS?}njzDbn&E1ZbY7|La9BOBDR-layvsZQq($6fdDHNz^stftc>=mf{-WD|
zam9Dw;D5;gbg7}yWBT{so}aU01_8iXoL0?riYL5-oh+p48e<&@gSwl<`gVIBKmc%X
zu_dNQbkuytNSF~;@iPV_iHSmUOknZ)7$M~uLP0@sQ+!r*lgG?GT20>4V_UsXu^DbN
zfNuUJ-^et$nj$0=H!;0oOskaVSFe0uhKeke<J5RSK3YCnUYTCwmHF=W(V~T;S(EiG
z&9(NC%o6D#o8QfH(BZwjYr4C4Q@+&z56L6Ok!uiy?QPt%t>1x^=Y&yJmk@}oe;)l>
zHFS<jCB~2U4khHq(cESEKxeTk!dm_X{xjlOYsc~x(jB|gMrWr4B?7cFqXFLKp-ssV
z@0mm&mlda)mlXKB9}$(Key7(}EhkFh1E&gOU2lb_rhm~)T3fCjQ2*B_y1B}W)m#S6
z%iCiLHmz7lh)n{*aMcu1%vO2{3ZrgU7GxHx22@n8ti;1$WNK#hpoDZ5&#Q6IC(0EY
z{;a$gS7r004lj9KI@vgywnmW*y4os_?K{?H#wEGWV)x3XS@AuVH`){iu$xU=M=nS5
zqVhr(*fO%<$2_{4`&)JF<iP{lils$JiI(&FjsMCRvX^u5RwblXB*ffl0J!$XjcoV}
zDTz<n5-OIk-2{Roh$4(XB)Ho3ish@zD#eD^KN+cKEA??LDyYUVG#_;+)<i}-z(69Z
zFA!Wal>?e@(spVMq94nEiQYvx^g)ZG#M;H`^6Bw7$uk@@ts{YRO<eR4t5)Qn<TPBI
zJ-WrJGVfN=v4W$cWnltc*tqMQ?Xv+?__5SuIizQ2=9rfJyE^M{l1rY_JU<xRUggwl
zs}}!ROn=0uHK#<RKbs4ZUX=gNm&|4#+&*}%8TSu>5}$i_S*OlBJvpfq=<S+$jhfo?
zBXZyJmg33r7cE1Ru04U3(I;;CWxSZB`lF`i0u|HCOW&=f$O2UzV>&e&8rOt;7a>F`
zjQWE>rE}+O(dYr2fiAAVCO!B*s|0Ri4FpNZ?oiC#9M~Hdo(8b1&qnC4VlY{_G5)YU
z_BAJ=`b1J3K!94?sgW3CP7KE4z>m6wursSl9e(ypc`xgeWa4T|?J!O&I9ih)7RwTj
z*g%RcIB{3s8oT9<({8}yzA1M8=9kED!pOuRWXkCkP6mGlo?fjmssSQ848`>F6cmcN
z!_SbiybCx$CXVf({^Q_33B01b`zy0yrxy)9sa^+%-D6v1wH>zAs99m-knctd^We=3
zBb>~WG!~Zc+%fdr5`$)~?}$Lw#>PP>tJIc=4`Ad04=JcaI_R&!P*L`@8T}4Vt}}Fx
zbcp;I{Eu6qt8=gV6&_ttPp4Z(uUzHUinG~}kD4^3%$FA`@f0#d(tDO)Tl~SPj6kHO
zb-@ji8p@16e@loYw6wIW{+{DR4Zm?Ydh|TQ^mHcq9?h%i>idk{TK}7}E%*Gd9hdsO
z<3`~Z3oz!ye>NPi5AKB1RZ>k$!r@hwxXt#E=E*V8wh&G%WIkGa;wJ5)enSm?1m|be
z$wcC%9A=m3pmHX<I5;$5k`FLb=FL`a-+}KCR6lN!#-@hp%~tP&bx#aiz5c05z7d2*
zW`F95#t0;vTPBpZu6kEHaud5J%pUe@VkL&ziejv!>um^kY%FW$**t&-4c8aTTlpB~
zvi~E{5FYl%`*%nfNq%@sq%syrZ;{ARSn)heFMZhdA~w=>r<p&t_f92;CKmZ<2ffN+
z)Y>p@^5f3*VL73&o@n^-TmO>VC7Hj!f2C$em=NMCbgzK7H$WNW+#{n?swSucYS!Q5
zpU4&od<P(IV&g#jHKu#Wz$kmsI0v04lgSO4?zkJCUJ)fsq2hSS)20wb1+INbUHH&a
zM(^n8;5}of%qzW(j=MrrvS@gqVLrh~G%=OG2W@m2N}!Q4c_YZSyUf1kfX1K`LhIQs
z9edPmsQH92<5<9#o;Vd9;_3kn|BllVgg(ZYHa7ka^kX<V*#?)=DB9s6rH9n#?ykz2
z1TkIf^W;nvwyHejZhu;8+=V@9gRhoYhv#s+$s+o7uJ26`1`P{R1c+jpV!VxO9flJ4
zrtkX8{S&TgqWIwlyH~rtx3N)yHzjVv8|%MC63YFz&8N6V*onKy;U&J+f`n$k1BhRa
zNSYa$-3{;T`g5fQPtpS~Y%j^X&tG+vLDfapLd422XJYx|(w2@O&QY<fi(+j<S{Vb-
zOk3+whbjh34kbxxqU#j>7_E-&tG0IT@H@!e!^7j7)R+6PE#q(3>h#L$#PD#=zL@sP
z+sv3ayHdj4h7(kn%cH|OZ>pQT`l#miFGH<1@pvN_n3pG?_!vl=3`ckEH;K<#ey+FT
zJ&BR_L=M&|eBa>qzwR4E&Im7;lHwCn`cL(yO6rn5XG!cLw;kuEv9tOV3Ur^9gehmt
zZD)ju`mcqb-o#&A_|4XfIKM^|40e*)UtA9!!riDES!+M30S&oS%VpLnfrH+)DIY~=
zxbPtTok>!1Q?gv~hEnFjcv+&Yp7e7I0AmdFY{1)cmdfx+)7_mE_-~q>(ia;6ydX`B
ze1(bmxndL-*ET6nhPpk)^7M=9vn&t|vtW7%6Gdn783sVUA*zkdTHO(VKBIKMSP=MU
zG&=yq%J%&>0jlT+6}e=vxiNyvFhNp&6+Z8KU~%JWgX)2bDjm^qyV+L;%V)xoSOQKS
zh0MAeRcAabLFk{4!%=fi<lChe^65ve+{x~fzg1vON|YURPgb+5yzt?#E>kU>A-Neo
z$PB=x5MJttoltGbJMI>p*7!?E=9QrL$8;gaHXXJjU@RQNK6E?dRTP%4j#-RfTY|L0
zsx%@XFoq}FmK*?SVBJ2Yb7KxHzRHi8!?fD%?{j*7?=}ypZE;R1hzKgXq>}mBhG|Sl
zNd%J#G^UK40Q`}Vp~Ajox+)_`7&Mi(YFO3^8PnoQl;HX%2-_{S3|*xb;zdR7g8{2q
z<n}GA@$f%iCY{BgJq~xdyl8p1>IXd^1#X-Yq;%NFY});x4|DWk-Nm;#2Xe>^xhTct
z?5C5z?mb62JP+5jDoF@0GFv=icn#{Ja3*?r`VmEuvkQeG$dh|T_UNlLWB&D}Q+9S*
z`Bu&FqAg*nZia|2sJ=x6;2jZ`yLmEa{-yzO&ZcUNm$8{lvhmXH8{T56(0f?`4?oCj
z#kVm91R)iN-<V6@=+gZj0Q!?M(r&@~9@D#KjH_W_VE2U{TmDqb07%9*O5!&l^b!f<
zlq^B_fV*3ZbYj*lx;W-Paj?~Et{sH(kVOucL*dDWGvWXp@U?6+|Jy0cOtZhtP;(&D
zt*35idNe`>b=J{%k%mX<v!2RL9>k70*RswG8elo022Ea`P*R9^!U@@|3iF-up(BaY
z<RI4V^wutC-!tE$|52pI%86h$`sEK6hVR>pi~Niz&zPpGD1L@68tH-4&8h1`y<(Px
z)|(2E*5}Cc@OpJ9(8P_Pc1@u~Qb+fAl=+uK)Z*QA7&ClbtSO?=Wagzdk6Ob6`Y(Lo
zP=a0=Y_jv%p19$$PNMv^fn<XMtkA8VL!$v^UV?3Cekzi$ZgV(zit}XzuD;kvfp==1
zWf#L_5ZvJZS%9T*SAV~}qCL8$ECtIfReC=x2_qF9ifY>m=ngu#n(}p0>is^t6LrLl
ztx`^YD_e*%mgJgi^;QzoFX+dFTP7Hc($<~+#~?b9>A$83hYfo0l|=4{XiKQ7T}U~A
z{ETnU3NEz=>^~FupV=Ua?gMY(qrp)bI2aw>=Z5oAfGQGn5?ArLS*otK#;Fc;5wb=0
zEtlS3dK|7^vh!Qz5XD-2$>*(h<xnBdzjAOiFSpznG-`IX0#J{YNvbJ5TfpS0K*Wuw
z9mlEN+z`QjbDAX(;Q9SuxCyLaZs+$c7knG)fpWz0XM5)tkOb0ir_#PvCtfZ#6K%D&
zwV0w6^qynzj|(RJA(C{9u+=*|09Js2XJWld=r<emD%6GaDFlMZi%mnI6FClgn5@1K
zM}WaZE`P)KTOa|BAf-c6|7)`*H-SAl<?qkL^?q$NL6IZT5X))Lgjy?tpYssiOCDW<
z(xdWnUXC`yTZ4WW4ww2HJASUwPZ#=4cbkj8J#1p+kq2o*Oz{Yw#2^{!9#G>2&=g;a
z52o-Hvn*5C=ab7_e#978dD_LVS9;iW93=F}6Vep9V!us$N(!zdnN66{uSt<LL5cOm
z^z9A+j%x`YQ;D4t^5yr9jSY*-BvhP5k~B>7L=9G75=3Rx3JT(Mu89k-E^(kxupou5
zQ%2ocWs}%bIs?H9NKV%(fKA;9MyJiyVoQl0pyDD1*>405l=#(RHrqg_OR_PQTb17Z
z;=Hkw{&Bb((E>kI35Go<^6TnGC0eTw6sph|h9#HflbVl_miTRYZJh;pFg>>|)d=~r
z;ekEC6E=-%w^QzBPwJDi>3Q^41jIAw51EQ`SY-p?yFAiDQGzY1e3ZjraF4!!|6a)B
z6UqSvXm?xCAr*)!O}m~2C8_CTj>l<SpViFiZ-vl^eF&0yUvXm;Tf_w=Qls8U#(FKu
z<`TvX1}k|9;T?<lg#T+sO3wY;eJlgtVU9d{vJFwYve$k_!>j#ynM8+Z@@uA%jz@0E
zu+r_#Q`L^^y8<K+RaVBvJrDduq0C=aCim8Yp?}BL8?!AJ7)UBXMYA5H4ZygXV9lnM
zaQ99-L#Z<tBSBF`lJ1A+jhg$2KJ7=E?qDBzXA>ppZo+IakV};bbyYVd9~gOCgh|A{
zsoc|&M%j~x|Mq|c>V5_yO<4x))@vTtc~yqta{4?94JuUgPN-8=$=MC`w)?<^mDSaL
zQk-Aq2NtUVSj@_U1+YdZ=jWs~DmHdn&`MnLp^6e@T!UD}!TP#m+i`S`%|~RP)t*!M
z7zpFi+ft|%ZtO8(>C@a=G|w@fl9WncBrbJeFYFahF7)4XO59C*-e4J>UeK+JnM$ev
z0Ij;@6DjWJR>+|riDU{@fZW0K+=9fq^t`dm;>NQ)^UWR5+V3=n6|SKO2fs@`u*W^#
zP$i1|ka+%U{J>P4s1Eo+Un~w0T*jYy$W7L`hZw4aJdE`e$C~qv>ANYP#5l3;t*2kU
zKIir{1oZtY7T?7S51<`LT2;!z;*jXO(81h1piWK*B@~rG^R4r=pL_BIIK?qrfqfZ4
zW1DJNnLgguZYIPC{y)30uixp)+OP4{=}U}>cyLsM)e%Zb5IOG^5nDL9ydFk!eSXS8
zN(a0?Wl9_XXuDpUnWszjEIN`Rj}Rt^Py=kdR3>FSySFopV8esHampF|m|rSdg~kw2
z7%tR6bFhdfojw!1jFeapR|pUYo2pdl?HOabH5jRJU;lVASp306_zS`X5xcO0jA!2`
z)97dwZ`{F!$}3PH?EC5xKPH)nF9+o0>zRO0C=)q^+>(v$RR&OAMWG7`aO)y2Gewo`
zrq4`-r4fG$PWXc(tC?fk;fuwd4w7&TkJZl4D2%lvLT_aJd=BBDbB5Z@$e_3Q7m39#
zfmp`mF?ei-S?pCU|B{ruX0Yv0HQdO3GMR*WFJRRC=cwxZnQ?RSCM@wZ{hi>L$FofV
z`2|A~n9C}mL>TzW*P~F2Z@xxGMg?vpvWr|3{ZxZ^SqCs6V?D_>{2r~&u~12dHv%?g
zEIc4rqW8`I9;8<4H2u<y6?|?XpFxUV;F=xgc||M=yn>KYLHcsqzrQVb{d`qU=h-W_
zrF#am$5D7uApU)cAPIh;|Ivk7lzLF>d1z%w(F-leR<H?Egfig-cRQQ$p9lgmDSL`+
z-UrEFK(DH>8Gu*JC{9s7Me;>Y{3II0Sw9F*HHmVq@QwH&u;>dk)QUQE9x?AkZMU9e
zbm_=;vB4|Zu#2DcizrWC=Mgv6S6c4f(x`I@$}P<)%+Mcir~|8>_OKN*@?G`><e(fm
zfyofSI4q`wv#rcQt1%1|Z3NKm_H|pb@#8OZtB?d4DHHI1$?JNT3Cib-G8SKb_HJ5;
zyQgPDf^-$~b4JZ$4akwkd=r3f0h72cdHD%@?I0z+DZ=P2OMgEA^N}<h8Vq_@Ngpjo
zdR91)zf86)4izLKTKl(KJAnyB+v8k=iP^14G<BiiO+Qsro{zFe$a%ZvJ<%0h&rKYp
z_4O(|nm}B@z#??{4e>_mv!%PolN1U3+)nu;Y0O|V;NJ@<a*OQKvzGr_^I6OOL{0|X
zuCnmpDza2jh2Xy^Yxfp3s%!nvJbiZO=i}H|4|Iw*0s(BvjXSRxpu}&B62;zTEH<0%
z?d@MgbM=l0gK%O;n&#&gQyQuzr$719chLI$iJtmu6Sv(K@0xaP6cXxDJ?EnxDawo+
zgT+j=3>2;c7{7)hE{Z2IvVqO8rZYdzVVLN^#In8Yegevo2|+SC2PvcG(rfj<tGLtw
zuYx`Y?h2W;7b+7>k|flXZm$KEL1gRe>pLl`CwLfl?7?PK!R$bO5y$Mj;J?&Ony!4%
zGx1PM7D-1MBvE|7tIoIpIGcUY8!8MW-^twgTM8KHpz!z4m3mutR8NAF_BQ=)6p=T?
zC{IsMZ~X}(zMDp^3cJGm%Sn^+rMZrUmRl*Q{sJxeHiy}C)iP@RhciG|BU8{HjC-{n
zj-8Jg8q5uG^`!dh<1K&J7Bq&P;05?f(;g5Da)b+|jlUs~vQ8EMRyd55@U!rNP+C`z
zwIzl#lBSxK!N^z6F0s=8rfLli(y5a1V<L$07qoBq9|1Dp_Es!m`z7(ue*FiaNFf0P
zYen;C$=OPD@lF=8cQK?97`jpMCO%S%SGpK00g;9Urue>9T^QW-Tl#Q*;Fj}sG9uL|
zXVy7st~?h@BmGMPc6w;V+*x0=z$9T~;<Wtghj{Oj7+O@I;TEqP=6j?Ciungdf8pJI
zCkQVP9iKaD?QX}ogE=Q+>&3+)(!gvNzIbQ4rQ2rr1PsmA`sU&BRNQJ95|5ILnqVLS
zQ0}x}{VMwntvJ=VtZ!t*2|_tR#98KZ*LuH_OV)P*?Ljavd>$O8HW&VH6P*R@Di=IP
z<r7kcJy$j~->upB8+AZnwMr}MR@hb9Q_l!EIcX-@5NK}qaq=6vmI3lyFa~cybc9+c
z*=2kBs0AqvQ>#^X48@O{nBkrN1rf+O>x)~eL19K?YuZ_O<<SkDmFxc-D9G(3f9u}d
z^3n|iP%GYuV>=lbPj8eL^w(FgJ2Ok=)@D2s--JE==k8!!$usWSkuzykuQ4htHK$Hm
zB~Kr|pl*vMsGx%`nT!YKz(te0xm3Wb?4K7D)p_~s6HX|k&-mtL47e~-7+S9j<N!t)
z<8bS_#nm*a!Gf$piL}Z^1(xmU$8!jdVyhRa74dj5PgQP%FHPA~o-}YYYCU(;!3oh{
zp*{QLU87n#=X1K4Boh2}Afo0N@KGnB^=6{ns}$th{s*=bWYYTHeMcCn57C#URX@TX
zIG<F8T+X2x|9qD{wx4|GfX(n(>!ctT@wGdevG3ywEQ;w@&&=F8YTA!N?hO<SHln4)
ziW+kQ0w54810auo6$;$*&t+DS(k8nj^3eC65ULH=Z18T}3`8g_%-z<42jzrUv<B2N
z+vyYSp<OuJu}bG)Y6MzCuqM>rpv&0ttI0Mc_AL|%-$~qX-XIt`giOQWlNy|!euPpJ
z9J~zbtmZRy20qlhEMId*@&oIUm`gWR2)21NUB*Bu#X;yFxW<L9oVgz+JKoM_qFY0V
zB3Gc61d+mhJSW%C%m+bKxRByHy;<xX8@4kH&Xs`N69&kg?}Wn4tl!G6;vk$hz5yL{
zL1YL^R=)cepW+?V8^7@|`Y?0kUT`eOU1a}4(K^Jek>~g{ebM2eh-gLrp7RAJ+jZb?
zzX~GOS<Im6Y})=j;2YvHln4i)9YfP`jz|k^ha7x?B8M@!b7ixA%z=lAG&#1^T+?qf
zQ-4nvLiMDJj8{xD>~>2u29e)c7b81?AJb<|^NuD%1-|lqTvKS5t^qtLZr{qJ5W5Kf
zi;u%iO>fm|$)rx&fFdne0$X$PWD0jp3C;9+ltrqjXWSkbDaHp_LLdMF$w^nuLcL=&
z?LpgM!#byEUcV*1tEF2ga%r>vA@8{<dYAi>adRgYm$RQ=@luzKN~S2FB-12D?x;hD
z<kIFu(TfA=7AYLF5s-Fqz4-Nm;B3tn6`b}r=WknaqkS}9`Nc-oc#xr+e{6UbC6Zvw
zfZ!o8ogV$QI|iKzHg<=spHND}_`q4RdWt&1Xg*+sKkXa_K#_+P_NlX(=|89V4<4yF
zOAeGGsK=>@xHLIJeD9hPD?y43en8v|003c$VDx%!{R~m)ts_|d-JbovAl}F23Ac;M
z^@YWoy%Nf>kum?HPV0WR;!Em;rIF(5eU|qzeRMrTR}e3x1>;aKV8@L)%Ve+OkHsby
z*#SiNp|M_-Wh{v@runSmoFZ>E4c)a`x(gfM7*kU-fD(TeM{d1ben!K5El3-J0_c|S
zSy#F2QnW4?Y<xN6+q{!!F`NggeQSu6%iNa+62os}JU%LfnF9t37wlS2?i41MgNukR
zqNajp(7)#ViRg)r)XV%`TT^4&mpik1DjFKq<b)e64`J18Sz2iSEUg1XNc8KW2go2K
zX=e6$RY;M=cgY`r?urnZVRzAW|E;i>ql3Ssc%?V@kwRap2-<dOyPu#9>H!R~jG?07
z#B>T6*eviY8luXcxc+6a`Kxu7T3G=;u*5&$e+kc~0Y2&X^WpVerB#=b9MsJ~H_tS?
zFtyU{@HLfSfkA;8iORh%H0n>ny&^n$g5}$uGxjn8V>KOOf|9-AfFEW4be}W6*(+bb
zvJqy$fBE4UQQ40_f^0K<&jEl?12E7&hIDhKR=2lHDnq}rpAkXid3rgLbM|C$ZI*>l
zYnTL!F784C(hS4iJT^o77`M?!^y1(H%qU`P&Cs7o5<jOES0tX!68Gb-NPO9}Yqv-W
z4mma1k!VwizDkB<8KAISMkKD<9vSuT`)4VX;3bxdW3QJS;va<FdmP|~`QO;*gfea>
zieJSD%4hGhax1IaiX%Jo8*o#dEg_%@1Me`l#5hr)^0c1ryVT25^IJV<t<{frE`_9b
zQpCGc{==;&ZY}pMh!2`mcV2TTm)XyNw}*r>m?X5$vTOHHQwX&VYpoG6FYBZjtA~-3
zKjXDJ0q9;@WL_NW)*G_?_oG?A6?9rfo2V7sro85!tr(!x@bluZuYJQ5kJhjcKR74{
zXEzljP!dfj=|6Ht_ZW}8;HFhzRC{t&;AE8x_qSKY@{p{pngQGwjn=i>t3}l5xN<B3
zzu5m%WT}}?{)XBJLyy2v0`n=foR8#VaN!s#c;kL}ww~^2Ny%oZ?GQrPKH&{VjtjAo
zv!;?dyRx9pQ$98*AcYrshcc%k*@5J<asxert@!u&mF6t1`-7Xn8h6oy8-(5$a*c>w
zF&>ifdRpALzV@naw?QlnUijQV4JoryT6Z?CtGqk|fRSi|#gYExjRixhikeuHQVm#&
zb!M?g1g@1G0MIYn0cfB&;3Of)Jm%UtPw{9ut)QP0W41B)1qcFyjeO62)qfv0)O&NJ
zG<YUt?IWtKCFkO|D;il-v)EZtWJI0(X8A<h*=0LlG2)dJ#mbIJNhCgQPVXol=RmPE
z2@Z^O(Uu_G7S@n{IbH%UKI_+@{tt@*3X_;JWRLH<riICh{k`lbu(9iarU)g5eKqCC
z`sKHP5haM$!)8^04L194CZNUaoMEe)vR6kF&Q)*7W$ec)z&PASmogxHs5^NM5>xb<
zvP3W23-0?Uh!VZ@#SPsd0JPZ0am%VimnzsC(K~!VAIXX0N(gu_9TE!z0RFL0Z+61?
z&lXpKiFiy)a-}%smH?ae4+JK*cIFxMh7-v^VhgGogU_#6S!QhE1Jz;M$It=XBr}PD
z%<;Cc)Ez-ImKf+2-%fJD872Z1(cPU(ZxWm0bJEujd!85DA(!6(XJsf{*hYc$&(8uG
z2=?B*5q%Xw;vs0>O(ttbM{byyVtqxv=T4qC-8JPQG}*45%35!X`l4P_6mS7!RDi!<
z^^0((w-Ee~<p`ec-(I;aMqQUPD6}APVwpqqqH*WX*^+TzGjty62c{F37eVR{=C5E5
z##!c|2Pwt!o)5^ZNd}Waz0a>MxZ2>=p13<lF^JnLXX<F;syTI!g{5aezlNCaM+zVp
z-=L(t<VajpWf#V2Ok=qGjFIHq$vOd<kAYCIc;u!Ec$cTn<==A<g6N<~6G!>=irto(
zLY~D7j%W9LAc=zPGDaK<khth&pcYNx5%6?U@kO(|%7^JP*f>*F!Wdhr%)PLt#wiWZ
z0^fL@MIr0P`1Th@cl@Al_e)TIP$JHzxj2ND^=BAvBX?LO!#IA3*@^%_U)TYIv3p`t
zjSphYE^@!+t|F8sqbz;ZNKDVqW2%C={#;*>R?#~2Uy;N<r}=6I2~Z{B=cqqz;Oj?s
zM_b6XyAeZkcfIRbff$S_k*@ss3|h^fLEF9%dyh)gpS~E(Bcyi~Tk%T)B6WVYSUo5q
z@ofi_1#gMP{;^Oaa}vJ<_PB-mSgtge7Ly$O&j6=FMmn-1H>bDw6Amd;`Cy0E%Y3_X
z5veFQr6QLwk&a1)z$NxKxLLeThQg#x0eY@A_Yz=4$JJw}!r;npD=wt*(i6n5-yC7-
zAgbOC7Dc+t09H=8hMF~l72?YD(b;*yiMCM@@qrFtN;my(M-Iw>-UpT$?yppVA_)4L
zC)#Co9K;;5rHF+r@$U)v^xCICiRgQ2(RwbncsVYs{{3n(rf`oQ=s#-$RCV#;{#kn9
zuOfvXF{Z_n#l>KJj~QP=00dZvZ4wMD18cp+l$5BkMC2iua=5<|hsjX2xC`cKSewt&
z^-h8LvdY0H=qbpVrs8z=B)`w5oVg%yi3V-AFMj)NrA~bGezC9b_wPZ(+2aVU%m&+a
zpxW9(snZ%7n0MMyBesr>-UC-G)GlVrGtRZs-ZnAXVYLQ0cGDdPSr7Wd=w4y2;5%bP
z{v5*o+y#j~fz!0h6cXDbz2>CUf%jJ|%BEAN9ne2mWs(Z+FlY7RxgAN-D;2tfCqeO-
zA8<3T^wr4#Eq1|jwe*!4%}o&)#{jZ9XFN=bN)PcX)o)yV=F@~J3g5qYQ2GT}ty97r
z9UmV{e4bmxbC8iF>j<8{CkaJ1?O?Hw4rk|D2SK<;SXh(b4*|)BAEedvi19pBBHXus
z<DtaNa4uPE+*OofKFcF~@sn(o>}NZ3?Z;o-c;|*Kj|Y-6*rcISCCRuW<mLP-4>t61
z<epCE+rp@u3E5L>WUge^q)MCEz_T~!$P%wNV7OXzC5g&!@1*>8+0L_|in*u-r=~Ig
ztnu{|WVA|iV5D)~LZy;Svoq1tUy^pC3gGEeTw0x$jxRITOh$=ssb$hBs`;7>%O^7M
zHr-og;(-5^Ad+&dSq6bZ#qD<6dM8<U6s)by&%Q;Z`xltHQ2GfdM|UMbo5A45Qpaou
z4?7%gZ3#NmOk1QuVNp*mP_rVR^V5p2EUL)+mfN91@o53b1OLPbMxay5#rJ~eOic@$
z_k`KYijboYnJJ1h@Z)%h7Cb3EoCf~K(_=-=29IGfkLS@0YG`PY4;)ei8x{FLI@^=-
zoOA*ih(jrR)x!+LoYqQ3yI24vr*1U?Dd_sSmCC;5I9+WIGQn-r{A1W|_n;dlMumM1
zJ>ZVpN}cpbX4}_6{Hu~u${DY|KbaD#YlK8Fb{RcAjcFOK%FTjvtP3&k)iF#O4O@<l
ze%IUg=6U4iKs~p|0og@09MBs|uIGMGUZvHx@eCo2=H>B$TRjmG|7h!>Lx#W*M<Cu)
zRB8fgl!U2UxZ(~AUnOSUYnpX=(EsdujaE2;o`#*P$69@I>UEW$ky}N(bLPhM`!YPs
z_9?zW(WUDEb{juE>CCpv%plXpAzvb9E)Uqx1(Q;>8fVByY862y*lY4C6gTz+!GTu9
z!?SgDhPo_wk&O-?ZHLm>G7+uMEmR_ZzD#lhLatjp|I)*LUrJXU`*YloRWJoPT||>Y
zCkE?(xg?HZ=1B56i8?to>HRB&L|0W&V2xgH7S+0Ca{3)2AR^2<Tr5x5uG1S|*O44R
zzFQ6)snat329X#@pP^(G9de1ix-aD+P4A2C%Ra6&J^Ch7mMw-TB4`*^Zbt(kWVk39
z-2damF25V}cU#w4ex*6$2<AWeX;GAN&CW4{h_I_lAX)WuA|%Bji?+(JZCg>5%4co-
z=@!-h7x+_x{P@{+5w+PtfckZYhIlK(+>N<*ey%)4j-kA(Ot8uZLzeR!F*thqhqxEr
zcDsem{uj!m{7}Sj%385D?@fuyIAaYISO7H^KY}FU3_0zQ%)f=C4qflV3vz91pXWyz
zU+b`2(Z;?o*#A)+5R4Q3tDaLOy~GM@aDr03%B0;wBlQM}vMsxcNy>nyw9-{FghVI*
zjaxzz^g1AK)Rq*R9aN-Nz8H#iJ>H`PfstMZ|4zBKt>q+QAP4j!j#{5`&fiWnp9K^T
zvPJFliJh|{86>b^S)O*lzQUFnDLkxjk8eGGwp;kc6LokZ4vZGbIr9h~v{T@msG<*g
zI$2y}a~P6rx~u;pH30&Ur;WcOO3+WqLn$jsne{_EM0em}wSE%+N5;r6_IzKJ**e2H
zhucF7ex)+e`Q2w#1({><Z%f@B`4oKMi>Ng>t|!0wC>*@*+NkNetx}vsz-ehOGeZ2h
zOHaHKE9$R8ldx&YUI7mcm?7oo9;n6!fcrKf01tQDp^O?+E(-afigSY+VOs_J^_dZh
z3d<3!ixwrJK*dTsks=4-i(sf|%&LeL@j<v{qX-M`3$VutA??$aClv|S&D)z+SZrLW
z_0x8rK5Hte6BWJ(3}m9SvPliWy9j|)wshvXxv*`#Vfhppg>xQSSV!RjC-1*<+hX96
z?-hr5mAsP{!ni-hxbj9Ua|k4}PardNA_`Of6%*WxzL=}D+`f7o(!Egz2ILv?40)jF
zY11j(5JB_PD+o}w)?zZ0SDMVB!qT@FVhCat!j{ue=o$%d6}t~Lvq52q@#Wyr{G6_;
zJko<qi_Xdk#}}YNZ5y{ZY>6PwqO5e;;9q%lma-iSqKxqVqx&p#i-UdtkRntOG2@+f
zknS3l_IHT=?s>axr^AddHL!$an618%Ar=t^3JlRHQH@)>yiL1XZP4@@XH|v)Kti8k
z8`Z^xHB4m6oC#LgJ31)XHcorAk=#~`^{>xYIenVyrAm-aF=1eyjU2QX-GfwIyJ^g`
zC8e&5M@p!z;_TYa+cmVz1)0P#vYSNw84ujT(Q>wK;5dI))k12PQkOfr_rxMY)*=;A
zSiWxy`B2K<kI=qlLy8pKnVO0JgrCoztgU?7FL%Tb4*f1Cggi#G!*lw26OF_4MM#1u
zy_iH`?#Pca=}<~EU+!`svHakg^3iXs`2uBmvm(<ZTNCP<_;pq}BvHgX_cR+^YObuD
zJLU!3lTMNCl9nuFG-+wKuviuG*@7JOIV5ql`FWYW{$A1x!tS$@zG|)2D`9Q(it<9O
z37qkXR)kn!a~|V5N_~wE)n`<Bz!Ln?C#n3u9C~W+^ifMIOwlu}Y5>2Hi$$y^i&Tag
z8Ht&YjSh3UeoT9ri+jq!*TuBw9*8Z>Ay37~$N9aXpPz*%=(80BA87pbT~;u*wyl9-
zxD--AB78uc1tLtr({A|1CGMiKHFnF1?D_lsnZ-axV7wbpR0K{004TJlFBskKH~aAz
zUL~B8zE$11AbsG<&o(^XE-O(rPQmxNU}@Dk?hK)O=RZ*TIxIrGk{`>{(&zgW_v|8L
z<Yybmkt2uVgD-7E_2_JX@iMFT`9Y>?S?`lLAFvqiE8mlvM_9`>DoW<22I1QD<DMH{
zc%nOjlaQTa3yxV(n&Ijemr;2QW70*#U-O6_-XV&qJb=!_s-sFQwHYyl7}+}hT~!I6
z8)V32zhrc!Z>a+MnEzmph@j?WP8o3own3(_5DPm=he7|&b$0}3;@vu!GARaV@C~kP
zSrS(plS#52iKmzF#PAV-q$1YD5Pyn8RNo(6j8NJ|KHE2;*#-NBLrOYP6cXkR7@oru
zJ4h-S_-G+WGql|T@`qRtZV_Y-!L4m-p+O!CBH&}hIU#yc+A4q5XMq9K6r1Sp7Kd)g
zK$OM}%4bqoCI3wWJlw@p7*9&$Dvr?MVwU<TYZ@Gq(M(<pfQ;_KJGG+}z6CNEIxodF
z7a9EHCKvx%6#(^luao19&*K0Qf^q24S4{zS%eHvzO7ON6F{{{YEER@TN^};!wYRdO
zAms~*oS9ES!FT&Ukb?R~X%R^YT1@*&_t~;8ij~85JOKcN$p8K?0P0`Y1tiD?*=iFY
z7u{A3Q%na10#}yo|M|4<>R5QYBOD5D3I=49x=m^k*3m;$=>#cH+@v?qsgZIv6x7Dw
ztq=@v0Nfpjiep<-oRV;z^v5~e788ZUh!cm>Jrl@9eodv5Dl~hP99{9ysOjRSrnCOX
z#yd}P(-0(R<Hq?bAYMo~<69waDEITxLnvo?iJu*!bN;~WcVP7d-(+2!aH?GPJ_6!Z
z@{SR-Ga^_E_V_FA*DE8;?XQvV%8-G*Y8|w2QHUJAE_rK&>AXPEgL;(fMlCzUa>7ng
zEyYJ80q6{DIyqllT;yFy#;7uY#Bka174c7=5rXtE;E%s5`H(T3u0j4rU*E*VGLYlR
zQo+sT)6D^|g6mxUuc$jx?B?tl<RdiLP7PSs)j9p!zYus;CUbuo{Q7?ZTn3~02w}IU
ziF;jz&o;{qre4PEE|wQ5+kQx>KY@VkQ$u*axcbSYW$m2FW$qW?qX@`bLh!);<ty&!
z?(PmbQoZ*`_Qdv6!oMJR#Jx0~vk!JmCz3R+t5D2v9P;c&{wnQ}rum39g0;>-03e;q
z{Y${v2%jf?3du(jX6&4FF891!On)4d&;64fM&yB_bj`X&(loz9rEi1(6o~-ONZa<Q
zmSxQ}h<O2lS|e_jKaAU;^MF>xb=1mQH^mxCGMU_r`NB;AW{1Cvk7}ik>=+nWo{zNM
zh2ZVS{{cKG?KpL5NUaT1EX%US85+NZ;EMr8R}1B+bgz9&!Zg25;>QTR-oOATr=)Y)
z08N3h!CE<j43bKvUhB@8A16@7;h5~MG@l=cL_V?FE$oe8H~B3Ac_?mKL2eamHSu`7
z$DlkK!Z_a4T0WK+{Yb3G{5y%CBm81~kyi5IwZ%AqwcJ1eU@qqtGLC(E$q_KD&g{kl
zxqh6{c4eOWON3k&P`*uw%af+{hhmnb_ZA7$+*4flX@Eg8NjU}XW*FQw0=yuCk5|#m
zLx@DSuaw?kEVI@d$RHWVxj`%0)lZFNBm|FW6ZMP|-b%r-1bp}42^@=j;kmIW)=&%E
zPMI<xVOf^|@{bTM{P(~$_SPa_Cvis=F8=`J;!Mujdt{2ewSo7HfdD`@n|&UJ`XInR
zRdJh1Vy*!DC?y8~{`oSB2Y&KM!Za`4cFL5nTg_vRcr?EEigDxTgE$rb&p{rLZwlmg
z81BD7RO4;%3c-ETPWFt^2zF`&YxN@CkGN?bD8O&4d(&YhAeRU@g$R|C!Vx7Wq_Ww-
ze28OZk#1Sm#0YV5$iFWG$}b`MC_t*pkwWm+_Cn#rmliF0y~eJN3Er~?0sxj}O))6H
z2k0x}Tmc8*BY^CSFapZJ90i{9vg5qu)0a^-kYqC1p$7^lN-<Ah7$32JqA29OKdOsK
zc}pm#q;lEoYU$@#<2`L4gCwG{FGKXtL+UOK<z)byA)Jx8Ag*&2zHi&MGxFkS8OW?z
zv)bNz?Tup~`n%zxG+6*7i(;@=fMa6Wz4uF@?U>Y})S_DYIu=<c3<MaA=XNhd7=eNM
z7yx*MD{}ErLus{vlnmoA2+su&Yjpi1_%A4DWqR#Djb`*;GgxN~WRRlMqFhq#oVo@G
z@BxVYK_Zdc3x&e?Rv1Vu7TZxYjuP-t1bE*zfPR2Ko6z6?ld<N7+bGsK0|AP;@8YKU
zMGzMtoU%r}yh+F$0l!q?T3rSrB9iFo*%~7IvlxRiz4mTa(=cw<BHzkpv$>YEH%hFN
z1~SOZ&1Y_~dcuk`K%7!V+(M&yd)&$iU15TRM8q&nb2Eedpor`YU>6cQqO~#c50dKK
zOfK_i3)>tu)@cJ7WZNlICamb_JeI=K!sMoC5~~5c4qz#Or6AscNCe=f5KIO!8Nfu;
zqH<C{E(EvHRTpJ?Gof^p-z%&)kRgbO5jV|)K>20}w~KXwRfJp}p?h&F1*69j>kY(%
zL^Qe^l=?h04uGJ0wENRS2*IO5-lXy!H!WPeaOr4wXf#=GAOVPoBu#TiO&<9F?cKpj
zTR|Ab@&B1dEu;&P?j(>vLAtF<_k9EP4SWFKqiZ)Ve1T@wx6mwX>8@g1Q}F7>LKg+$
z)|t=61rf1L(q@ty`F{HgvpI0@%$@Urw#dI_Iu!=JAl`-R>+U2bH_ZwU$cU=D<zWkK
z19-`Fz6r*m1dcG?$3XX?!%gP_`7fPLXECI-3SkY|nyRyv_O#da5Q9@e&y2$m=+S6=
ztov=gI`Dvu*~;?D^E6+snrWSCPWYg?8RKHWr9mN7AS*DPDe=kX!{IFcYF-B(kc?im
zJ4X!e2fptIXb<>_St(geQdCkjr6?&WDJG>DER;sPh#?fsX7hZUEiA6$0m-B)j%)v7
z=nk)2#h3o+kfR@5Zjb81RNWZ-OW9j3I%!?S1CoiEB~{axMxsBrFS;r4fMk^pCi9HT
z#RHPjliv$(88jXD4#8*U=Jqo#$&JVZlF@N-d@0kgv)L2awx3PZiw7jLlkeZUV4M8C
z5BRIZo0ERuU$1J$w|OU|)oLw0Z8Ubwcn!P)E0I1J96Y<a+I_4y@@Cx)Ph}sx_Opkg
P00000NkvXXu0mjfKN1wh


From 4df70063195066a7a2eae547332ba3eceb32d978 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 5 Jan 2016 01:52:12 +0100
Subject: [PATCH 343/884] netsurf: remove dead package & dependencies

Not updated since 2009 (!), not working since 2013.

cc @marcweber
---
 .../networking/browsers/netsurf/default.nix   | 86 -------------------
 .../networking/browsers/netsurf/haru.nix      | 26 ------
 .../networking/browsers/netsurf/libCSS.nix    | 20 -----
 .../browsers/netsurf/libParserUtils.nix       | 21 -----
 .../networking/browsers/netsurf/libnsbmp.nix  | 21 -----
 .../networking/browsers/netsurf/libnsgif.nix  | 21 -----
 .../browsers/netsurf/libsvgtiny.nix           | 22 -----
 .../browsers/netsurf/libwapcaplet.nix         | 22 -----
 .../networking/browsers/netsurf/netsurf.nix   | 38 --------
 pkgs/top-level/all-packages.nix               |  3 -
 10 files changed, 280 deletions(-)
 delete mode 100644 pkgs/applications/networking/browsers/netsurf/default.nix
 delete mode 100644 pkgs/applications/networking/browsers/netsurf/haru.nix
 delete mode 100644 pkgs/applications/networking/browsers/netsurf/libCSS.nix
 delete mode 100644 pkgs/applications/networking/browsers/netsurf/libParserUtils.nix
 delete mode 100644 pkgs/applications/networking/browsers/netsurf/libnsbmp.nix
 delete mode 100644 pkgs/applications/networking/browsers/netsurf/libnsgif.nix
 delete mode 100644 pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix
 delete mode 100644 pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix
 delete mode 100644 pkgs/applications/networking/browsers/netsurf/netsurf.nix

diff --git a/pkgs/applications/networking/browsers/netsurf/default.nix b/pkgs/applications/networking/browsers/netsurf/default.nix
deleted file mode 100644
index 07184bfd9f2c..000000000000
--- a/pkgs/applications/networking/browsers/netsurf/default.nix
+++ /dev/null
@@ -1,86 +0,0 @@
-{ pkgs }:
-with pkgs;
-
-rec {
-
-  libParserUtils = import ./libParserUtils.nix {
-    inherit fetchurl pkgconfig stdenv lib;
-  };
-
-  libCSS = import ./libCSS.nix {
-    inherit fetchurl sourceFromHead stdenv lib pkgconfig libParserUtils
-      libwapcaplet;
-  };
-
-  libnsbmp = import ./libnsbmp.nix {
-    inherit fetchurl stdenv lib;
-  };
-
-  libnsgif = import ./libnsgif.nix {
-    inherit fetchurl stdenv lib;
-  };
-
-  libwapcaplet = import ./libwapcaplet.nix {
-    inherit fetchurl sourceFromHead stdenv lib;
-  };
-
-  libsvgtiny = import ./libsvgtiny.nix {
-    inherit fetchurl sourceFromHead stdenv lib pkgconfig gperf libxml2;
-  };
-
-  hubub = stdenv.mkDerivation {
-    name = "Hubbub-0.0.1";
-
-    src = fetchurl {
-      url = http://www.netsurf-browser.org/projects/releases/hubbub-0.0.1-src.tar.gz;
-      sha256 = "1pwcnxp3h5ysnr3nxhnwghaabri5zjaibrcarsrrnhkn2gvvv81v";
-    };
-
-    installPhase = "make PREFIX=$out install";
-    buildInputs = [pkgconfig libParserUtils];
-
-    meta = { 
-      description = "HTML5 compliant parsing library, written in C";
-      homepage = http://www.netsurf-browser.org/projects/hubbub/;
-      license = stdenv.lib.licenses.mit;
-      maintainers = [lib.maintainers.marcweber];
-      platforms = lib.platforms.linux;
-    };
-  };
-
-  /*
-  # unfinished - experimental
-  libdom = stdenv.mkDerivation {
-    name = "libdom-devel";
-
-    # REGION AUTO UPDATE:     { name="libdom"; type = "svn"; url = "svn://svn.netsurf-browser.org/trunk/dom"; groups = "netsurf_group"; }
-    src= sourceFromHead "libdom-9721.tar.gz"
-                 (fetchurl { url = "http://mawercer.de/~nix/repos/libdom-9721.tar.gz"; sha256 = "ca4b94a8dd32036787331a14133c36a49daded40bdb4c04edc3eab99e2193abc"; });
-    # END
-    installPhase = "make PREFIX=$out install";
-    buildInputs = [pkgconfig];
-
-    meta = { 
-      description = "implementation of the W3C DOM, written in C";
-      homepage = http://www.netsurf-browser.org/projects/hubbub/;
-      license = stdenv.lib.licenses.mit;
-      maintainers = [lib.maintainers.marcweber];
-      platforms = lib.platforms.linux;
-    };
-  };
-  */
-
-  netsurfHaru = import ./haru.nix {
-    inherit fetchurl sourceFromHead stdenv lib zlib libpng; 
-  };
-
-  browser = import ./netsurf.nix {
-    inherit fetchurl sourceFromHead stdenv lib pkgconfig
-      libnsbmp libnsgif libsvgtiny libwapcaplet hubub libParserUtils
-      libpng libxml2 libCSS lcms curl libmng glib gtk;
-    libharu = netsurfHaru;
-    inherit (gnome) libglade;
-  };
-
-
-}
diff --git a/pkgs/applications/networking/browsers/netsurf/haru.nix b/pkgs/applications/networking/browsers/netsurf/haru.nix
deleted file mode 100644
index 7aa362c613fd..000000000000
--- a/pkgs/applications/networking/browsers/netsurf/haru.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-args: with args;
-stdenv.mkDerivation {
-
-  name = "netsurf-haru-trunk";
-
-  # REGION AUTO UPDATE:     { name="netsurf_haru"; type = "svn"; url = "svn://svn.netsurf-browser.org/trunk/libharu"; groups = "netsurf_group"; }
-  src= sourceFromHead "netsurf_haru-9721.tar.gz"
-               (fetchurl { url = "http://mawercer.de/~nix/repos/netsurf_haru-9721.tar.gz"; sha256 = "8113492823e1069f428ef8970c2c7a09b4c36c645480ce81f8351331ce097656"; });
-  # END
-
-  preConfigure = "cd upstream";
-  configureFlags = "--with-zlib=${zlib} --with-png=${libpng}";
-
-  buildInputs = [zlib libpng];
-
-  installPhase = "make PREFIX=$out install";
-
-  meta = {
-    description = "cross platform, open source library for generating PDF files";
-    homepage = http://libharu.org/wiki/Main_Page;
-    license = with stdenv.lib.licenses; [ libpng zlib ];
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
-    broken = true;
-  };
-}
diff --git a/pkgs/applications/networking/browsers/netsurf/libCSS.nix b/pkgs/applications/networking/browsers/netsurf/libCSS.nix
deleted file mode 100644
index 99192fda113a..000000000000
--- a/pkgs/applications/networking/browsers/netsurf/libCSS.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-args: with args;
-stdenv.mkDerivation {
-  name = "libCSS-devel";
-
-  # REGION AUTO UPDATE:       { name="libCSS"; type = "svn"; url = "svn://svn.netsurf-browser.org/trunk/libcss"; groups = "netsurf_group"; }
-  src= sourceFromHead "libCSS-9721.tar.gz"
-               (fetchurl { url = "http://mawercer.de/~nix/repos/libCSS-9721.tar.gz"; sha256 = "47b44653f7b53c21da6224ffb1f81df934cc711d6a5795c5584755a8bd48e5ac"; });
-  # END
-
-  installPhase = "make PREFIX=$out install";
-  buildInputs = [pkgconfig libParserUtils libwapcaplet];
-
-  meta = { 
-    description = "A CSS parser and selection engine, written in C"; # used by netsurf
-    homepage = http://www.netsurf-browser.org/projects/libcss/;
-    license = stdenv.lib.licenses.mit;
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/applications/networking/browsers/netsurf/libParserUtils.nix b/pkgs/applications/networking/browsers/netsurf/libParserUtils.nix
deleted file mode 100644
index 3c2b7693be7f..000000000000
--- a/pkgs/applications/networking/browsers/netsurf/libParserUtils.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-args: with args;
-stdenv.mkDerivation {
-  name = "libParserUtils-0.0.1";
-
-  src = fetchurl {
-    url = http://www.netsurf-browser.org/projects/releases/libparserutils-0.0.1-src.tar.gz;
-    sha256 = "0r9ia32kgvcfjy82xyiyihyg9yhh3l9pdzk6sp6d6gh2sbglxvas";
-  };
-
-  installPhase = "make PREFIX=$out install";
-  buildInputs = [pkgconfig];
-
-  meta = { 
-    description = "A library for building efficient parsers, written in C";
-    homepage = http://www.netsurf-browser.org/projects/libparserutils/;
-    license = stdenv.lib.licenses.mit;
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
-    broken = true;
-  };
-}
diff --git a/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix b/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix
deleted file mode 100644
index 083850bb5450..000000000000
--- a/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-args: with args;
-stdenv.mkDerivation {
-  name = "libnsbmp-0.0.1";
-
-  src = fetchurl {
-    url = http://www.netsurf-browser.org/projects/releases/libnsbmp-0.0.1-src.tar.gz;
-    sha256 = "1ldng20w5f725rhfns3v58x1mh3d93zwrx4c8f88rsm6wym14ka2";
-  };
-
-  installPhase = "make PREFIX=$out install";
-  buildInputs = [];
-
-  meta = { 
-    description = "A decoding library for BMP and ICO image file formats"; # used by netsurf
-    homepage = http://www.netsurf-browser.org/projects/libnsbmp/;
-    license = stdenv.lib.licenses.mit;
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
-    broken = true;
-  };
-}
diff --git a/pkgs/applications/networking/browsers/netsurf/libnsgif.nix b/pkgs/applications/networking/browsers/netsurf/libnsgif.nix
deleted file mode 100644
index 5e2acb4f313f..000000000000
--- a/pkgs/applications/networking/browsers/netsurf/libnsgif.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-args: with args;
-stdenv.mkDerivation {
-  name = "libnsgif-0.0.1";
-
-  src = fetchurl {
-    url = http://www.netsurf-browser.org/projects/releases/libnsgif-0.0.1-src.tar.gz;
-    sha256 = "0lnvyhfdb9dm979fly33mi2jlf2rfx9ldx93viawvana63sidwsl";
-  };
-
-  installPhase = "make PREFIX=$out install";
-  buildInputs = [];
-
-  meta = {
-    description = "A decoding library for gif image file formats"; # used by netsurf
-    homepage = http://www.netsurf-browser.org/projects/libnsgif/;
-    license = stdenv.lib.licenses.mit;
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
-    broken = true;
-  };
-}
diff --git a/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix b/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix
deleted file mode 100644
index 1e9f74a1ffd4..000000000000
--- a/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-args: with args;
-stdenv.mkDerivation {
-  name = "libsvgtiny-devel";
-
-  # REGION AUTO UPDATE:      { name="libsvgtiny"; type = "svn"; url = "svn://svn.netsurf-browser.org/trunk/libsvgtiny"; groups = "netsurf_group"; }
-  src= sourceFromHead "libsvgtiny-9721.tar.gz"
-               (fetchurl { url = "http://mawercer.de/~nix/repos/libsvgtiny-9721.tar.gz"; sha256 = "0c4c8e357c220218a32ef789eb2ba8226a403d4c2b550d7c65f351a0af5d1a71"; });
-  # END
-
-  NIX_CFLAGS_COMPILE = "-Wno-error=cpp";
-
-  installPhase = "make PREFIX=$out install";
-  buildInputs = [pkgconfig gperf libxml2];
-
-  meta = { 
-    description = "implementation of SVG Tiny, written in C";
-    homepage = http://www.netsurf-browser.org/projects/libsvgtiny/;
-    license = stdenv.lib.licenses.mit;
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix b/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix
deleted file mode 100644
index a4cd09d1d860..000000000000
--- a/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-args: with args;
-stdenv.mkDerivation {
-  name = "libwapcaplet-devel";
-
-  # REGION AUTO UPDATE:     { name="libwapcaplet"; type = "svn"; url = "svn://svn.netsurf-browser.org/trunk/libwapcaplet"; groups = "netsurf_group"; }
-  src= sourceFromHead "libwapcaplet-9721.tar.gz"
-               (fetchurl { url = "http://mawercer.de/~nix/repos/libwapcaplet-9721.tar.gz"; sha256 = "7f9f32ca772c939d67f3bc8bf0705544c2b2950760da3fe6a4e069ad0f77d91a"; });
-  # END
-
-  NIX_CFLAGS_COMPILE = "-Wno-error=cpp";
-
-  installPhase = "make PREFIX=$out install";
-  buildInputs = [];
-
-  meta = { 
-    description = "A string internment library, written in C";
-    homepage = http://www.netsurf-browser.org/projects/libwapcaplet/;
-    license = stdenv.lib.licenses.mit;
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/applications/networking/browsers/netsurf/netsurf.nix b/pkgs/applications/networking/browsers/netsurf/netsurf.nix
deleted file mode 100644
index f7e90b61a941..000000000000
--- a/pkgs/applications/networking/browsers/netsurf/netsurf.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-args: with args;
-stdenv.mkDerivation {
-
-  name = "netsurf-devel";
-  # REGION AUTO UPDATE:      { name="netsurf"; type = "svn"; url = "svn://svn.netsurf-browser.org/trunk/netsurf"; groups = "netsurf_group"; }
-  src= sourceFromHead "netsurf-9721.tar.gz"
-               (fetchurl { url = "http://mawercer.de/~nix/repos/netsurf-9721.tar.gz"; sha256 = "4705f059596fbd95b1a80d9a6c5d08daf051fd0e5e868ccd40b30af8a45e8f56"; });
-  # END
-
-  # name = "netsurf-2.1";
-  /*
-  src = fetchurl {
-    url = http://www.netsurf-browser.org/downloads/releases/netsurf-2.1-src.tar.gz;
-    sha256 = "10as2skm0pklx8bb8s0z2hh72f17snavkhj7dhi8r4sjr10wz8nd";
-  };
-  */
-
-  buildInputs = [pkgconfig
-    libnsbmp libnsgif libwapcaplet libsvgtiny hubub libParserUtils
-    curl libpng libxml2 lcms glib libharu libmng
-    gtk libglade libCSS];
-
-  buildPhase = "make PREFIX=$out";
-  installPhase = "make PREFIX=$out install";
-
-  meta = with args.lib; {
-    description = "free, open source web browser";
-    homepage = http://www.netsurf-browser.org;
-    license = with licenses; [
-      gpl2
-      mit /* visual work */
-    ];
-    maintainers = with maintainers; [ marcweber ];
-    platforms = platforms.linux;
-  };
-
-}
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 90bc9bfdc6b7..48ebf07e285b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12713,9 +12713,6 @@ let
     motif = lesstif;
   };
 
-  netsurfBrowser = netsurf.browser;
-  netsurf = recurseIntoAttrs (callPackage ../applications/networking/browsers/netsurf {});
-
   notmuch = callPackage ../applications/networking/mailreaders/notmuch {
     # No need to build Emacs - notmuch.el works just fine without
     # byte-compilation. Use emacs24Packages.notmuch if you want to

From 5989c97665bf56e5ce2ae23e62720430ad676c63 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 5 Jan 2016 01:58:56 +0100
Subject: [PATCH 344/884] tvtime: remove dead package

Upstream dried up in 2005. Not updated since 2012, broken since 2013.

cc @qknight
---
 pkgs/applications/video/tvtime/default.nix    | 65 -----------------
 .../video/tvtime/tvtime-1.0.2-autotools.patch | 73 -------------------
 .../video/tvtime/tvtime-1.0.2-gcc41.patch     | 57 ---------------
 .../tvtime/tvtime-1.0.2-glibc-2.10.patch      | 24 ------
 .../video/tvtime/tvtime-1.0.2-libsupc++.patch | 16 ----
 .../video/tvtime/tvtime-1.0.2-xinerama.patch  | 32 --------
 .../video/tvtime/tvtime-libpng-1.5.patch      | 14 ----
 .../video/tvtime/tvtime-pic.patch             | 11 ---
 pkgs/top-level/all-packages.nix               |  4 -
 9 files changed, 296 deletions(-)
 delete mode 100644 pkgs/applications/video/tvtime/default.nix
 delete mode 100644 pkgs/applications/video/tvtime/tvtime-1.0.2-autotools.patch
 delete mode 100644 pkgs/applications/video/tvtime/tvtime-1.0.2-gcc41.patch
 delete mode 100644 pkgs/applications/video/tvtime/tvtime-1.0.2-glibc-2.10.patch
 delete mode 100644 pkgs/applications/video/tvtime/tvtime-1.0.2-libsupc++.patch
 delete mode 100644 pkgs/applications/video/tvtime/tvtime-1.0.2-xinerama.patch
 delete mode 100644 pkgs/applications/video/tvtime/tvtime-libpng-1.5.patch
 delete mode 100644 pkgs/applications/video/tvtime/tvtime-pic.patch

diff --git a/pkgs/applications/video/tvtime/default.nix b/pkgs/applications/video/tvtime/default.nix
deleted file mode 100644
index 459ea533dba7..000000000000
--- a/pkgs/applications/video/tvtime/default.nix
+++ /dev/null
@@ -1,65 +0,0 @@
-{stdenv, fetchurl, xorg, libX11, libXtst, libSM, libXext, libXv, libXxf86vm, libXau, 
-   libXdmcp, zlib, libpng, libxml2, freetype, libICE, intltool, libXinerama, gettext, 
-   pkgconfig, kernel, file, libXi}:
-
-stdenv.mkDerivation rec {
-  name = "tvtime-1.0.2";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/tvtime/${name}.tar.gz";
-    sha256 = "aef2a4bab084df252428d66cabec61b4c63fab32cdfc0cc6599d82efd77f0523";
-  };
-
-  # many of these patches were copied from gentoo's portage team (maybe all?!)
-  patchPhase = ''
-    # to avoid this error message:
-    # ...-glibc-2.12.2/include/xlocale.h:43:20: note: previous declaration of 'locale_t' was here
-    patch -p1 < ${ ./tvtime-1.0.2-glibc-2.10.patch}
-
-    # to avoid this error message:
-    #  videodev2.h:19:46: fatal error: linux/compiler.h: No such file or directory
-    sed -i -e "s/videodev.h/linux\/videodev.h/" src/videoinput.c
-    sed -i -e "s/videodev2.h/linux\/videodev2.h/" src/videoinput.c
-
-    # to avoid this error message:
-    # 1 out of 2 hunks FAILED -- saving rejects to file src/Makefile.am.rej
-    patch -p1 < ${ ./tvtime-1.0.2-libsupc++.patch }
-
-    # to avoid this error message:
-    # ../plugins/greedyh.asm:21:6: error: extra qualification 'DScalerFilterGreedyH::' on member 'filterDScaler_SSE'
-    patch -p1 < ${ ./tvtime-1.0.2-gcc41.patch }
-
-    # compiles without this patch
-    patch -p1 < ${ ./tvtime-pic.patch }
-
-    # compiles without this patch
-    patch -p1 < ${ ./tvtime-1.0.2-autotools.patch }
-
-    # compiles without this patch
-    patch -p1 < ${ ./tvtime-1.0.2-xinerama.patch }
-
-    # libpng 1.5 patch (gentoo)
-    patch -p1 < ${ ./tvtime-libpng-1.5.patch }
-
-    # /usr/bin/file - ltmain.sh configure aclocal.m4
-    sed -i -e "s%/usr/bin/file%/nix/store/f92pyxmbi274q7fzrfnlc2xiy6d3cyi1-file-5.04/bi/file%g" ltmain.sh
-    sed -i -e "s%/usr/bin/file%/nix/store/f92pyxmbi274q7fzrfnlc2xiy6d3cyi1-file-5.04/bin/file%g" configure
-    sed -i -e "s%/usr/bin/file%/nix/store/f92pyxmbi274q7fzrfnlc2xiy6d3cyi1-file-5.04/bin/file%g" aclocal.m4
-  '';
-
-  configureFlags = '' 
-    --x-includes=${xorg.libX11}/include 
-    --x-libraries=${xorg.libX11}/lib
-  '';
-
-  buildInputs = [ libX11 libXtst libSM libXext libXv libXxf86vm libXau libXdmcp zlib libpng libxml2 freetype libICE intltool libXinerama gettext pkgconfig file libXi ];
-
-  meta = {
-    description = "High quality television application for use with video capture cards";
-    homepage = lhttp://tvtime.sourceforge.net/;
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [qknight];
-    platforms = with stdenv.lib.platforms; linux;
-    broken = true;
-  };
-}
diff --git a/pkgs/applications/video/tvtime/tvtime-1.0.2-autotools.patch b/pkgs/applications/video/tvtime/tvtime-1.0.2-autotools.patch
deleted file mode 100644
index bf02ebefa529..000000000000
--- a/pkgs/applications/video/tvtime/tvtime-1.0.2-autotools.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-Index: tvtime-1.0.2/src/Makefile.am
-===================================================================
---- tvtime-1.0.2.orig/src/Makefile.am
-+++ tvtime-1.0.2/src/Makefile.am
-@@ -19,9 +19,6 @@ pkgsysconfdir = $(sysconfdir)/@PACKAGE@
- tmpdir = /tmp
- localedir = $(datadir)/locale
- 
--TTF_CFLAGS = `$(FREETYPE_CONFIG) --cflags`
--TTF_LIBS = `$(FREETYPE_CONFIG) --libs`
--
- # Set the following if you want to specify an additional font directory
- # FONT_CFLAGS = -DFONTDIR='/usr/share/fonts/truetype/freefont/'
- 
-@@ -76,20 +73,20 @@ tvtime_SOURCES = $(COMMON_SRCS) $(OUTPUT
- tvtime_CFLAGS = $(TTF_CFLAGS) $(PNG_CFLAGS) $(OPT_CFLAGS) \
- 	$(PLUGIN_CFLAGS) $(X11_CFLAGS) $(XML2_FLAG) \
- 	$(FONT_CFLAGS) $(AM_CFLAGS)
--tvtime_LDFLAGS  = $(TTF_LIBS) $(ZLIB_LIBS) $(PNG_LIBS) \
-+tvtime_LDADD  = $(TTF_LIBS) $(ZLIB_LIBS) $(PNG_LIBS) \
- 	$(X11_LIBS) $(XML2_LIBS) -lm -lsupc++
- 
- tvtime_command_SOURCES = utils.h utils.c tvtimeconf.h tvtimeconf.c \
- 	tvtime-command.c
- tvtime_command_CFLAGS = $(OPT_CFLAGS) $(XML2_FLAG) $(AM_CFLAGS)
--tvtime_command_LDFLAGS  = $(ZLIB_LIBS) $(XML2_LIBS)
-+tvtime_command_LDADD  = $(ZLIB_LIBS) $(XML2_LIBS)
- tvtime_configure_SOURCES = utils.h utils.c tvtimeconf.h tvtimeconf.c \
- 	tvtime-configure.c
- tvtime_configure_CFLAGS = $(OPT_CFLAGS) $(XML2_FLAG) $(AM_CFLAGS)
--tvtime_configure_LDFLAGS  = $(ZLIB_LIBS) $(XML2_LIBS)
-+tvtime_configure_LDADD  = $(ZLIB_LIBS) $(XML2_LIBS)
- tvtime_scanner_SOURCES = utils.h utils.c videoinput.h videoinput.c \
- 	tvtimeconf.h tvtimeconf.c station.h station.c tvtime-scanner.c \
- 	mixer.h mixer.c
- tvtime_scanner_CFLAGS = $(OPT_CFLAGS) $(XML2_FLAG) $(AM_CFLAGS)
--tvtime_scanner_LDFLAGS  = $(ZLIB_LIBS) $(XML2_LIBS)
-+tvtime_scanner_LDADD  = $(ZLIB_LIBS) $(XML2_LIBS)
- 
-Index: tvtime-1.0.2/configure.ac
-===================================================================
---- tvtime-1.0.2.orig/configure.ac
-+++ tvtime-1.0.2/configure.ac
-@@ -10,6 +10,7 @@ if test x"$host_alias" = x""; then host_
- 
- # Check for compilers.
- AC_PROG_CC
-+AM_PROG_CC_C_O
- AC_CHECK_PROG(found_cc, "$CC", yes, no)
- test "x$found_cc" = "xyes" || exit 1
- 
-@@ -17,9 +18,6 @@ AC_PROG_CXX
- AC_CHECK_PROG(found_cxx, "$CXX", yes, no)
- test "x$found_cxx" = "xyes" || exit 1
- 
--# Check for libtool.
--AC_PROG_LIBTOOL
--
- # Checks for header files.
- AC_HEADER_STDC
- AC_CHECK_HEADERS([ctype.h dirent.h errno.h fcntl.h getopt.h langinfo.h math.h netinet/in.h pwd.h signal.h stdint.h stdio.h stdlib.h string.h sys/ioctl.h sys/mman.h sys/resource.h sys/stat.h sys/time.h sys/wait.h sys/types.h unistd.h wordexp.h locale.h])
-@@ -65,10 +63,7 @@ dnl ------------------------------------
- dnl freetype
- dnl ---------------------------------------------
- dnl Test for freetype
--AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
--if test "$FREETYPE_CONFIG" = "no" ; then
--  AC_MSG_ERROR(freetype2 needed and freetype-config not found)
--fi
-+PKG_CHECK_MODULES([TTF], [freetype2])
- 
- dnl ---------------------------------------------
- dnl libxml2
diff --git a/pkgs/applications/video/tvtime/tvtime-1.0.2-gcc41.patch b/pkgs/applications/video/tvtime/tvtime-1.0.2-gcc41.patch
deleted file mode 100644
index 58e9bb204e10..000000000000
--- a/pkgs/applications/video/tvtime/tvtime-1.0.2-gcc41.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -Naur tvtime-1.0.1/plugins/greedyh.asm tvtime-1.0.1-gcc41/plugins/greedyh.asm
---- tvtime-1.0.1/plugins/greedyh.asm	2005-08-14 18:16:43.000000000 +0200
-+++ tvtime-1.0.1-gcc41/plugins/greedyh.asm	2005-11-28 17:53:09.210774544 +0100
-@@ -18,7 +18,7 @@
- 
- #include "x86-64_macros.inc"
- 
--void DScalerFilterGreedyH::FUNCT_NAME(TDeinterlaceInfo* pInfo)
-+void FUNCT_NAME(TDeinterlaceInfo* pInfo)
- {
-     int64_t i;
-     bool InfoIsOdd = (pInfo->PictureHistory[0]->Flags & PICTURE_INTERLACED_ODD) ? 1 : 0;
-diff -Naur tvtime-1.0.1/plugins/tomsmocomp/TomsMoCompAll2.inc tvtime-1.0.1-gcc41/plugins/tomsmocomp/TomsMoCompAll2.inc
---- tvtime-1.0.1/plugins/tomsmocomp/TomsMoCompAll2.inc	2004-10-20 17:31:05.000000000 +0200
-+++ tvtime-1.0.1-gcc41/plugins/tomsmocomp/TomsMoCompAll2.inc	2005-11-28 17:53:33.251119856 +0100
-@@ -5,9 +5,9 @@
- #endif
- 
- #ifdef USE_STRANGE_BOB
--#define SEARCH_EFFORT_FUNC(n) DScalerFilterTomsMoComp::SEFUNC(n##_SB)
-+#define SEARCH_EFFORT_FUNC(n) SEFUNC(n##_SB)
- #else
--#define SEARCH_EFFORT_FUNC(n) DScalerFilterTomsMoComp::SEFUNC(n)
-+#define SEARCH_EFFORT_FUNC(n) SEFUNC(n)
- #endif
- 
- int SEARCH_EFFORT_FUNC(0)		// we don't try at all ;-)
-diff -Naur tvtime-1.0.1/plugins/tomsmocomp.cpp tvtime-1.0.1-gcc41/plugins/tomsmocomp.cpp
---- tvtime-1.0.1/plugins/tomsmocomp.cpp	2004-10-20 19:38:04.000000000 +0200
-+++ tvtime-1.0.1-gcc41/plugins/tomsmocomp.cpp	2005-11-28 17:52:53.862107896 +0100
-@@ -31,7 +31,7 @@
- 
- #define IS_MMX
- #define SSE_TYPE MMX
--#define FUNCT_NAME DScalerFilterTomsMoComp::filterDScaler_MMX
-+#define FUNCT_NAME filterDScaler_MMX
- #include "tomsmocomp/TomsMoCompAll.inc"
- #undef  IS_MMX
- #undef  SSE_TYPE
-@@ -39,7 +39,7 @@
- 
- #define IS_3DNOW
- #define SSE_TYPE 3DNOW
--#define FUNCT_NAME DScalerFilterTomsMoComp::filterDScaler_3DNOW
-+#define FUNCT_NAME filterDScaler_3DNOW
- #include "tomsmocomp/TomsMoCompAll.inc"
- #undef  IS_3DNOW
- #undef  SSE_TYPE
-@@ -47,7 +47,7 @@
- 
- #define IS_SSE
- #define SSE_TYPE SSE
--#define FUNCT_NAME DScalerFilterTomsMoComp::filterDScaler_SSE
-+#define FUNCT_NAME filterDScaler_SSE
- #include "tomsmocomp/TomsMoCompAll.inc"
- #undef  IS_SSE
- #undef  SSE_TYPE
diff --git a/pkgs/applications/video/tvtime/tvtime-1.0.2-glibc-2.10.patch b/pkgs/applications/video/tvtime/tvtime-1.0.2-glibc-2.10.patch
deleted file mode 100644
index c3d8ad87d733..000000000000
--- a/pkgs/applications/video/tvtime/tvtime-1.0.2-glibc-2.10.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur tvtime-1.0.2.org/src/xmltv.c tvtime-1.0.2/src/xmltv.c
---- tvtime-1.0.2.org/src/xmltv.c	2009-07-02 21:48:49.426191088 +0200
-+++ tvtime-1.0.2/src/xmltv.c	2009-07-02 21:50:20.842066085 +0200
-@@ -118,9 +118,9 @@
- typedef struct {
-     const char *code;
-     const char *name;
--} locale_t;
-+} tvtime_locale_t;
- 
--static locale_t locale_table[] = {
-+static tvtime_locale_t locale_table[] = {
-     {"AA", "Afar"},           {"AB", "Abkhazian"},      {"AF", "Afrikaans"},
-     {"AM", "Amharic"},        {"AR", "Arabic"},         {"AS", "Assamese"},
-     {"AY", "Aymara"},         {"AZ", "Azerbaijani"},    {"BA", "Bashkir"},
-@@ -168,7 +168,7 @@
-     {"XH", "Xhosa"},          {"YO", "Yoruba"},         {"ZH", "Chinese"},
-     {"ZU", "Zulu"} };
- 
--const int num_locales = sizeof( locale_table ) / sizeof( locale_t );
-+const int num_locales = sizeof( locale_table ) / sizeof( tvtime_locale_t );
- 
- /**
-  * Timezone parsing code based loosely on the algorithm in
diff --git a/pkgs/applications/video/tvtime/tvtime-1.0.2-libsupc++.patch b/pkgs/applications/video/tvtime/tvtime-1.0.2-libsupc++.patch
deleted file mode 100644
index cc76d2decc62..000000000000
--- a/pkgs/applications/video/tvtime/tvtime-1.0.2-libsupc++.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Link to libsupc++ instead of bringing in libstdc++ just because tomsocomp
-is written in C++. It does not use STL so it needs not the whole standard
-library.
-Index: tvtime-1.0.2/src/Makefile.am
-===================================================================
---- tvtime-1.0.2.orig/src/Makefile.am
-+++ tvtime-1.0.2/src/Makefile.am
-@@ -77,7 +77,7 @@ tvtime_CFLAGS = $(TTF_CFLAGS) $(PNG_CFLA
- 	$(PLUGIN_CFLAGS) $(X11_CFLAGS) $(XML2_FLAG) \
- 	$(FONT_CFLAGS) $(AM_CFLAGS)
- tvtime_LDFLAGS  = $(TTF_LIBS) $(ZLIB_LIBS) $(PNG_LIBS) \
--	$(X11_LIBS) $(XML2_LIBS) -lm -lstdc++
-+	$(X11_LIBS) $(XML2_LIBS) -lm -lsupc++
- 
- tvtime_command_SOURCES = utils.h utils.c tvtimeconf.h tvtimeconf.c \
- 	tvtime-command.c
diff --git a/pkgs/applications/video/tvtime/tvtime-1.0.2-xinerama.patch b/pkgs/applications/video/tvtime/tvtime-1.0.2-xinerama.patch
deleted file mode 100644
index 0964d055768d..000000000000
--- a/pkgs/applications/video/tvtime/tvtime-1.0.2-xinerama.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: tvtime-1.0.2/configure.ac
-===================================================================
---- tvtime-1.0.2.orig/configure.ac
-+++ tvtime-1.0.2/configure.ac
-@@ -99,6 +99,8 @@ dnl ------------------------------------
- dnl check for X11, Xv and XF86VidModeExtension
- dnl ---------------------------------------------
- AC_PATH_XTRA
-+AC_ARG_WITH([xinerama],
-+    [AS_HELP_STRING([--without-xinerama], [Disable Xinerama extension support (default: check)])])
- if test x"$no_x" != x"yes"; then
-     dnl check for Xshm
-     AC_CHECK_LIB([Xext],[XShmCreateImage],
-@@ -112,11 +114,13 @@ if test x"$no_x" != x"yes"; then
- 	    X11_LIBS="$X11_LIBS -lXv"],,
- 	    [$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS -lXext])
- 
--	dnl check for Xinerama
--	AC_CHECK_LIB([Xinerama],[XineramaQueryScreens],
--	    [AC_DEFINE([HAVE_XINERAMA],,[Xinerama support])
--	    X11_LIBS="$X11_LIBS -lXinerama"],,
--	    [$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS -lXext])
-+	if test "x$with_xinerama" != "xno"; then
-+		dnl check for Xinerama
-+		AC_CHECK_LIB([Xinerama],[XineramaQueryScreens],
-+		    [AC_DEFINE([HAVE_XINERAMA],,[Xinerama support])
-+		    X11_LIBS="$X11_LIBS -lXinerama"],,
-+		    [$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS -lXext])
-+	fi
- 
- 	dnl check for XTest
-         AC_CHECK_LIB([Xtst],[XTestFakeKeyEvent],
diff --git a/pkgs/applications/video/tvtime/tvtime-libpng-1.5.patch b/pkgs/applications/video/tvtime/tvtime-libpng-1.5.patch
deleted file mode 100644
index bfa22ed98d02..000000000000
--- a/pkgs/applications/video/tvtime/tvtime-libpng-1.5.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Include zlib.h which is no longer implicitly included with libpng-1.5
-Bug 369663
-
-diff -ru tvtime-111b28cca42d.orig/src/pngoutput.c tvtime-111b28cca42d/src/pngoutput.c
---- tvtime-111b28cca42d.orig/src/pngoutput.c	2011-02-01 02:35:26.000000000 +0100
-+++ tvtime-111b28cca42d/src/pngoutput.c	2011-06-02 13:36:55.965999463 +0200
-@@ -18,6 +18,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <zlib.h>
- #include <png.h>
- #include "pngoutput.h"
- 
diff --git a/pkgs/applications/video/tvtime/tvtime-pic.patch b/pkgs/applications/video/tvtime/tvtime-pic.patch
deleted file mode 100644
index 00b040e60af9..000000000000
--- a/pkgs/applications/video/tvtime/tvtime-pic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tvtime/src/cpu_accel.c
-+++ tvtime/src/cpu_accel.c
-@@ -35,7 +35,7 @@
-     int AMD;
-     uint32_t caps;
- 
--#ifndef PIC
-+#if !defined(__PIC__) || defined(__x86_64__)
- #define cpuid(op,eax,ebx,ecx,edx)	\
-     __asm__ ("cpuid"			\
- 	     : "=a" (eax),		\
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 48ebf07e285b..259b366f5710 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12689,10 +12689,6 @@ let
 
   mythtv = callPackage ../applications/video/mythtv { };
 
-  tvtime = callPackage ../applications/video/tvtime {
-    kernel = linux;
-  };
-
   nano = callPackage ../applications/editors/nano { };
 
   nanoblogger = callPackage ../applications/misc/nanoblogger { };

From 432c0bd003bc3dca7f691b8099f86ad90c820905 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 5 Jan 2016 02:08:54 +0100
Subject: [PATCH 345/884] cc1394: remove dead package

Not updated since 2012. Broken since 2013. Sources long gone.

cc @viric
---
 pkgs/applications/video/cc1394/default.nix | 38 ----------------------
 pkgs/top-level/all-packages.nix            |  2 --
 2 files changed, 40 deletions(-)
 delete mode 100644 pkgs/applications/video/cc1394/default.nix

diff --git a/pkgs/applications/video/cc1394/default.nix b/pkgs/applications/video/cc1394/default.nix
deleted file mode 100644
index 1040f8e009a3..000000000000
--- a/pkgs/applications/video/cc1394/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, fetchurl, libraw1394, libdc1394avt, qt4, SDL }:
-
-stdenv.mkDerivation rec {
-  name = "cc1394-3.0";
-
-  src = fetchurl {
-    url = http://www.alliedvisiontec.com/fileadmin/content/PDF/Software/AVT_software/zip_files/AVTFire4Linux3v0.src.tar;
-    sha256 = "13fz3apxcv2rkb34hxd48lbhss6vagp9h96f55148l4mlf5iyyfv";
-  };
-
-  unpackPhase = ''
-    tar xf $src
-    BIGTAR=`echo *`
-    tar xf */cc1394*.tar.gz
-    rm -R $BIGTAR
-    cd cc*
-  '';
-
-  NIX_LDFLAGS = "-lX11";
-
-  enableParalellBuilding = true;
-
-  preConfigure = ''
-    sed -i -e s,/usr,$out, cc1394.pro
-    qmake PREFIX=$out
-  '';
-
-  buildInputs = [ libraw1394 libdc1394avt qt4 SDL ];
-
-  meta = {
-    homepage = http://www.alliedvisiontec.com/us/products/software/linux/avt-fire4linux.html;
-    description = "AVT Viewer application for AVT cameras";
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = [ stdenv.lib.maintainers.viric ];
-    platforms = stdenv.lib.platforms.linux;
-    hydraPlatforms = []; # because libdc1394avt is broken
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 259b366f5710..b09d3a311882 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11229,8 +11229,6 @@ let
 
   cbc = callPackage ../applications/science/math/cbc { };
 
-  cc1394 = callPackage ../applications/video/cc1394 { };
-
   cddiscid = callPackage ../applications/audio/cd-discid { };
 
   cdparanoia = cdparanoiaIII;

From 894299f187a0823abb58432fcecdae7aa53dc822 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 5 Jan 2016 02:15:03 +0100
Subject: [PATCH 346/884] libdc1394avt: remove dead package

Orphaned dependency of cc1394. Broken since 2013. Sources long gone.

cc @viric
---
 .../libraries/libdc1394avt/default.nix        | 29 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 31 deletions(-)
 delete mode 100644 pkgs/development/libraries/libdc1394avt/default.nix

diff --git a/pkgs/development/libraries/libdc1394avt/default.nix b/pkgs/development/libraries/libdc1394avt/default.nix
deleted file mode 100644
index 7565502cc1c1..000000000000
--- a/pkgs/development/libraries/libdc1394avt/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchurl, libraw1394, libusb1, pkgconfig }:
-
-stdenv.mkDerivation rec {
-  name = "libdc1394avt-2.1.2";
-
-  src = fetchurl {
-    url = http://www.alliedvisiontec.com/fileadmin/content/PDF/Software/AVT_software/zip_files/AVTFire4Linux3v0.src.tar;
-    sha256 = "13fz3apxcv2rkb34hxd48lbhss6vagp9h96f55148l4mlf5iyyfv";
-  };
-
-  unpackPhase = ''
-    tar xf $src
-    BIGTAR=`echo *`
-    tar xf */libdc1394*.tar.gz
-    rm -R $BIGTAR
-    cd libd*
-  '';
-
-  buildInputs = [ libraw1394 libusb1 pkgconfig ];
-
-  meta = {
-    homepage = http://www.alliedvisiontec.com/us/products/software/linux/avt-fire4linux.html;
-    description = "Capture and control API for IIDC cameras with AVT extensions";
-    license = stdenv.lib.licenses.lgpl21Plus;
-    maintainers = [ stdenv.lib.maintainers.viric ];
-    platforms = stdenv.lib.platforms.linux;
-    broken = true;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b09d3a311882..bf1a3bd3b0a9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7081,8 +7081,6 @@ let
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };
 
-  libdc1394avt = callPackage ../development/libraries/libdc1394avt { };
-
   libdevil = callPackage ../development/libraries/libdevil {
     inherit (darwin.apple_sdk.frameworks) OpenGL;
   };

From 42420a30d5b601a5b38de0d7dd24a7b8063913b2 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 5 Jan 2016 02:27:48 +0100
Subject: [PATCH 347/884] xmltv: remove dead package

Not updated since 2008. Broken since 2013. Nothing else will miss it.
---
 pkgs/tools/misc/xmltv/default.nix | 16 ----------------
 pkgs/top-level/all-packages.nix   |  2 --
 2 files changed, 18 deletions(-)
 delete mode 100644 pkgs/tools/misc/xmltv/default.nix

diff --git a/pkgs/tools/misc/xmltv/default.nix b/pkgs/tools/misc/xmltv/default.nix
deleted file mode 100644
index 9d3939406066..000000000000
--- a/pkgs/tools/misc/xmltv/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ fetchurl, perl, perlPackages }:
-
-import ../../../development/perl-modules/generic perl {
-  name = "xmltv-0.5.51";
-  src = fetchurl {
-    url = mirror://sourceforge/xmltv/xmltv-0.5.51.tar.bz2;
-    sha256 = "0vgc167y6y847m18vg3qwjy3df12bryjy9par01n5b9mjalx9jpd";
-  };
-  #makeMakerFlags = "-components tv_grab_nl";
-  buildInputs = [
-    perlPackages.TermReadKey perlPackages.XMLTwig perlPackages.XMLWriter
-    perlPackages.DateManip perlPackages.HTMLTree perlPackages.HTMLParser
-    perlPackages.HTMLTagset perlPackages.URI perlPackages.LWP
-  ];
-  meta.broken = true;
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bf1a3bd3b0a9..ec4f796fd9e0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3676,8 +3676,6 @@ let
     w3m = w3m-batch;
   };
 
-  xmltv = callPackage ../tools/misc/xmltv { };
-
   xmpppy = pythonPackages.xmpppy;
 
   xorriso = callPackage ../tools/cd-dvd/xorriso { };

From bc6f9ff90dc6441933434bdf21961e3e81c9d04b Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 6 Jan 2016 02:12:28 +0100
Subject: [PATCH 348/884] muscleframework: remove dead package

Broken since 2013. Upstream don't smell too good since 2009.
---
 .../security/muscleframework/default.nix      | 31 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 33 deletions(-)
 delete mode 100644 pkgs/tools/security/muscleframework/default.nix

diff --git a/pkgs/tools/security/muscleframework/default.nix b/pkgs/tools/security/muscleframework/default.nix
deleted file mode 100644
index c1b9dad91ff4..000000000000
--- a/pkgs/tools/security/muscleframework/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-# The tarball has different plugins in it, and as I don't need all of them,
-# I only build one of those in this derivation
-# This is an arbitrary decision, and this simplicity fit my needs.
-# Anyone can extend the extension to build all the plugins, or to make
-# different derivations for each plugin.
-
-{stdenv, fetchurl, libmusclecard, pkgconfig, pcsclite}:
-stdenv.mkDerivation {
-  name = "muscleframework-mcardplugin-1.1.7";
-
-  src = fetchurl {
-    url = https://alioth.debian.org/frs/download.php/3056/muscleframework-1.1.7.tar.gz;
-    sha256 = "081sq25fa3k1gz0asq2995krx7pzxbfq5vx1ahsd5sbmwnplv94v";
-  };
-
-  preConfigure = ''
-    cd MCardPlugin
-    configureFlags="$configureFlags --enable-muscledropdir=$out/pcsc/services"
-  '';
-
-  buildInputs = [ libmusclecard pkgconfig pcsclite];
-
-  meta = with stdenv.lib; {
-    description = "MUSCLE smart card framework - mcard plugin";
-    homepage = http://muscleplugins.alioth.debian.org/;
-    license = licenses.bsd3;
-    maintainers = with maintainers; [viric];
-    # XXX: don't build before libmusclecard is fixed
-    # platforms = with stdenv.lib.platforms; linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ec4f796fd9e0..4265d29dd41c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2358,8 +2358,6 @@ let
 
   munge = callPackage ../tools/security/munge { };
 
-  muscleframework = callPackage ../tools/security/muscleframework { };
-
   muscletool = callPackage ../tools/security/muscletool { };
 
   mysql2pgsql = callPackage ../tools/misc/mysql2pgsql { };

From f30b8a91977e104c8a2474fd1e60fb30e5f816a7 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 6 Jan 2016 02:13:24 +0100
Subject: [PATCH 349/884] muscletool: remove dead package

Broken since 2013. Upstream don't smell too good since 2009.
---
 pkgs/tools/security/muscletool/default.nix | 20 --------------------
 pkgs/top-level/all-packages.nix            |  2 --
 2 files changed, 22 deletions(-)
 delete mode 100644 pkgs/tools/security/muscletool/default.nix

diff --git a/pkgs/tools/security/muscletool/default.nix b/pkgs/tools/security/muscletool/default.nix
deleted file mode 100644
index 34f75609e4ff..000000000000
--- a/pkgs/tools/security/muscletool/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{stdenv, fetchurl, libmusclecard, pcsclite, pkgconfig }:
-stdenv.mkDerivation {
-  name = "muscletool-2.1.1";
-
-  src = fetchurl {
-    url = https://alioth.debian.org/frs/download.php/3180/muscletool-2.1.1.tar.bz2;
-    sha256 = "11d812ijvhsaxwkr05hzxfl0n6ji9hwl5j1kv56f9gv8kyy3b9kw";
-  };
-
-  buildInputs = [ libmusclecard pcsclite pkgconfig ];
-
-  meta = with stdenv.lib; {
-    description = "Smart card applications for use with MUSCLE plugins";
-    homepage = http://muscleapps.alioth.debian.org/;
-    license = licenses.bsd3;
-    maintainers = with maintainers; [viric];
-    # XXX: don't build before libmusclecard is fixed
-    # platforms = with stdenv.lib.platforms; linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4265d29dd41c..2e554fadd562 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2358,8 +2358,6 @@ let
 
   munge = callPackage ../tools/security/munge { };
 
-  muscletool = callPackage ../tools/security/muscletool { };
-
   mysql2pgsql = callPackage ../tools/misc/mysql2pgsql { };
 
   nabi = callPackage ../tools/inputmethods/nabi { };

From 2ee6396bf78f4a6cf8c4fb76f9b438b5d3d02186 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 6 Jan 2016 02:03:20 +0100
Subject: [PATCH 350/884] libmusclecard: remove dead package

No upstream release since 2009. Broken since 2013.
---
 .../libraries/libmusclecard/default.nix       | 23 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 25 deletions(-)
 delete mode 100644 pkgs/development/libraries/libmusclecard/default.nix

diff --git a/pkgs/development/libraries/libmusclecard/default.nix b/pkgs/development/libraries/libmusclecard/default.nix
deleted file mode 100644
index fa8b41a17724..000000000000
--- a/pkgs/development/libraries/libmusclecard/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{stdenv, fetchurl, pkgconfig, pcsclite}:
-stdenv.mkDerivation {
-  name = "libmusclecard-1.3.6";
-
-  src = fetchurl {
-    url = https://alioth.debian.org/frs/download.php/3024/libmusclecard-1.3.6.tar.bz2;
-    sha256 = "1sswy7vcy0w9p6818al7prv9d3whj7w3w98k55zw9nhspbj6lppb";
-  };
-
-  # The OS should care on preparing the services into this location
-  configureFlags = [ "--enable-muscledropdir=/var/lib/pcsc/services" ];
-
-  buildInputs = [ pkgconfig pcsclite ];
-
-  meta = {
-    description = "Library for MUSCLE smartcard applications";
-    homepage = http://pcsclite.alioth.debian.org/;
-    license = stdenv.lib.licenses.lgpl21;
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
-    broken = true;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2e554fadd562..2486370c6064 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7424,8 +7424,6 @@ let
 
   libmspack = callPackage ../development/libraries/libmspack { };
 
-  libmusclecard = callPackage ../development/libraries/libmusclecard { };
-
   libmusicbrainz2 = callPackage ../development/libraries/libmusicbrainz/2.x.nix { };
 
   libmusicbrainz3 = callPackage ../development/libraries/libmusicbrainz { };

From 08f6f75c69d678ed7992af06238d039972eff2c9 Mon Sep 17 00:00:00 2001
From: Jakob Gillich <jakob@gillich.me>
Date: Wed, 6 Jan 2016 02:33:07 +0100
Subject: [PATCH 351/884] removed xchat

No release since 2010 and vulnerable to CVE-2011-5129. Hexchat is available
as a alternative.
---
 .../networking/irc/xchat/default.nix          | 19 -----
 .../irc/xchat/glib-top-level-header.patch     | 75 -------------------
 pkgs/top-level/all-packages.nix               |  2 -
 3 files changed, 96 deletions(-)
 delete mode 100644 pkgs/applications/networking/irc/xchat/default.nix
 delete mode 100644 pkgs/applications/networking/irc/xchat/glib-top-level-header.patch

diff --git a/pkgs/applications/networking/irc/xchat/default.nix b/pkgs/applications/networking/irc/xchat/default.nix
deleted file mode 100644
index c6252b1649b6..000000000000
--- a/pkgs/applications/networking/irc/xchat/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{stdenv, fetchurl, pkgconfig, tcl, gtk, gtkspell }:
-
-stdenv.mkDerivation {
-  name = "xchat-2.8.8";
-  src = fetchurl {
-    url = http://www.xchat.org/files/source/2.8/xchat-2.8.8.tar.bz2;
-    sha256 = "0d6d69437b5e1e45f3e66270fe369344943de8a1190e498fafa5296315a27db0";
-  };
-  buildInputs = [pkgconfig tcl gtk gtkspell];
-  configureFlags = "--disable-nls --enable-spell=gtkspell";
-
-  patches = [ ./glib-top-level-header.patch ];
-
-  meta = {
-    description = "IRC client using GTK";
-    homepage = http://www.xchat.org;
-    platforms = with stdenv.lib.platforms; linux;
-  };
-}
diff --git a/pkgs/applications/networking/irc/xchat/glib-top-level-header.patch b/pkgs/applications/networking/irc/xchat/glib-top-level-header.patch
deleted file mode 100644
index b1413b357537..000000000000
--- a/pkgs/applications/networking/irc/xchat/glib-top-level-header.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff -Naur xchat-2.8.8-orig/src/common/dbus/dbus-plugin.c xchat-2.8.8/src/common/dbus/dbus-plugin.c
---- xchat-2.8.8-orig/src/common/dbus/dbus-plugin.c	2009-08-16 05:40:15.000000000 -0400
-+++ xchat-2.8.8/src/common/dbus/dbus-plugin.c	2012-07-15 23:07:33.678948703 -0400
-@@ -24,7 +24,7 @@
- #include <config.h>
- #include <dbus/dbus-glib.h>
- #include <dbus/dbus-glib-lowlevel.h>
--#include <glib/gi18n.h>
-+#include <glib.h>
- #include "../xchat-plugin.h"
- 
- #define PNAME _("remote access")
-diff -Naur xchat-2.8.8-orig/src/common/modes.c xchat-2.8.8/src/common/modes.c
---- xchat-2.8.8-orig/src/common/modes.c	2010-05-29 21:52:18.000000000 -0400
-+++ xchat-2.8.8/src/common/modes.c	2012-07-15 23:07:33.654948723 -0400
-@@ -20,7 +20,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <glib.h>
--#include <glib/gprintf.h>
-+#include <glib.h>
- 
- #include "xchat.h"
- #include "xchatc.h"
-diff -Naur xchat-2.8.8-orig/src/common/servlist.c xchat-2.8.8/src/common/servlist.c
---- xchat-2.8.8-orig/src/common/servlist.c	2010-05-16 03:24:26.000000000 -0400
-+++ xchat-2.8.8/src/common/servlist.c	2012-07-15 23:07:33.643948732 -0400
-@@ -24,7 +24,7 @@
- #include <unistd.h>
- 
- #include "xchat.h"
--#include <glib/ghash.h>
-+#include <glib.h>
- 
- #include "cfgfiles.h"
- #include "fe.h"
-diff -Naur xchat-2.8.8-orig/src/common/text.c xchat-2.8.8/src/common/text.c
---- xchat-2.8.8-orig/src/common/text.c	2010-05-29 22:14:41.000000000 -0400
-+++ xchat-2.8.8/src/common/text.c	2012-07-15 23:07:33.671948706 -0400
-@@ -28,7 +28,7 @@
- #include <sys/mman.h>
- 
- #include "xchat.h"
--#include <glib/ghash.h>
-+#include <glib.h>
- #include "cfgfiles.h"
- #include "chanopt.h"
- #include "plugin.h"
-diff -Naur xchat-2.8.8-orig/src/common/util.c xchat-2.8.8/src/common/util.c
---- xchat-2.8.8-orig/src/common/util.c	2009-08-16 05:40:16.000000000 -0400
-+++ xchat-2.8.8/src/common/util.c	2012-07-15 23:07:33.649948724 -0400
-@@ -39,7 +39,7 @@
- #include <errno.h>
- #include "xchat.h"
- #include "xchatc.h"
--#include <glib/gmarkup.h>
-+#include <glib.h>
- #include <ctype.h>
- #include "util.h"
- #include "../../config.h"
-diff -Naur xchat-2.8.8-orig/src/common/xchat.h xchat-2.8.8/src/common/xchat.h
---- xchat-2.8.8-orig/src/common/xchat.h	2009-08-16 05:40:16.000000000 -0400
-+++ xchat-2.8.8/src/common/xchat.h	2012-07-15 23:08:20.855910521 -0400
-@@ -1,10 +1,6 @@
- #include "../../config.h"
- 
--#include <glib/gslist.h>
--#include <glib/glist.h>
--#include <glib/gutils.h>
--#include <glib/giochannel.h>
--#include <glib/gstrfuncs.h>
-+#include <glib.h>
- #include <time.h>			/* need time_t */
- 
- #ifndef XCHAT_H
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 90bc9bfdc6b7..614b77de7fac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13774,8 +13774,6 @@ let
 
   xchainkeys = callPackage ../tools/X11/xchainkeys { };
 
-  xchat = callPackage ../applications/networking/irc/xchat { };
-
   xchm = callPackage ../applications/misc/xchm { };
 
   inherit (xorg) xcompmgr;

From eed2fa3de47fac257351a21f2c3addc9cd45848e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 6 Jan 2016 03:10:56 +0100
Subject: [PATCH 352/884] qrdecode: remove dead package

Never maintained, no updates since 2010, and broken since 2013. Bye.
---
 pkgs/tools/graphics/qrdecode/default.nix | 29 ------------------------
 pkgs/top-level/all-packages.nix          |  5 ----
 2 files changed, 34 deletions(-)
 delete mode 100644 pkgs/tools/graphics/qrdecode/default.nix

diff --git a/pkgs/tools/graphics/qrdecode/default.nix b/pkgs/tools/graphics/qrdecode/default.nix
deleted file mode 100644
index 308183d7ae11..000000000000
--- a/pkgs/tools/graphics/qrdecode/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchurl, libpng, opencv }:
-
-stdenv.mkDerivation rec {
-  name = "libdecodeqr-${version}";
-  version = "0.9.3";
-
-  src = fetchurl {
-    url = "mirror://debian/pool/main/libd/libdecodeqr/libdecodeqr_${version}.orig.tar.gz";
-    sha256 = "1kmljwx69h7zq6zlp2j19bbpz11px45z1abw03acrxjyzz5f1f13";
-  };
-
-  buildInputs = [ libpng opencv ];
-
-  preConfigure = ''
-    cd src
-    sed -e /LDCONFIG/d -i libdecodeqr/Makefile.in
-    sed -e '/#include <cv.h>/a#include <ml.h>' -i libdecodeqr/imagereader.h
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${opencv}/include/opencv"
-    export NIX_LDFLAGS="$NIX_LDFLAGS -lcxcore"
-  '';
-
-  preInstall = "mkdir -p $out/bin $out/lib $out/include $out/share";
-  postInstall = "cp sample/simple/simpletest $out/bin/qrdecode";
-
-  meta = {
-    description = "QR code decoder library";
-    broken = true;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2486370c6064..3ffbc199c81a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12020,11 +12020,6 @@ let
     java = if stdenv.isLinux then jre else jdk;
   };
 
-  qrdecode = callPackage ../tools/graphics/qrdecode {
-    libpng = libpng12;
-    opencv = opencv_2_1;
-  };
-
   qrencode = callPackage ../tools/graphics/qrencode { };
 
   gecko_mediaplayer = callPackage ../applications/networking/browsers/mozilla-plugins/gecko-mediaplayer {

From e1f555477cbc3f949e645e4f4f812abeb10815ce Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 6 Jan 2016 03:49:46 +0100
Subject: [PATCH 353/884] opencv_2_1: remove dead package

Broken since 2013. Only used by qrdecode which suffered the same fate.

cc @viric
---
 pkgs/development/libraries/opencv/2.1.nix | 35 -----------------------
 pkgs/top-level/all-packages.nix           |  4 ---
 2 files changed, 39 deletions(-)
 delete mode 100644 pkgs/development/libraries/opencv/2.1.nix

diff --git a/pkgs/development/libraries/opencv/2.1.nix b/pkgs/development/libraries/opencv/2.1.nix
deleted file mode 100644
index 302ac10d4ab0..000000000000
--- a/pkgs/development/libraries/opencv/2.1.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, fetchurl, cmake, gtk, glib, libjpeg, libpng, libtiff, jasper, ffmpeg, pkgconfig,
-  xineLib, gstreamer }:
-
-stdenv.mkDerivation rec {
-  name = "opencv-2.1.0";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/opencvlibrary/OpenCV-2.1.0.tar.bz2";
-    sha256 = "26061fd52ab0ab593c093ff94b5f5c09b956d7deda96b47019ff11932111397f";
-  };
-
-  # The order is important; libpng should go before X libs, because they
-  # propagate the libpng 1.5 (and opencv wants libpng 1.2)
-  buildInputs = [ cmake libpng gtk glib libjpeg libtiff jasper ffmpeg pkgconfig
-    xineLib gstreamer ];
-
-  enableParallelBuilding = true;
-
-  patchPhase = ''
-    sed -i 's/ptrdiff_t/std::ptrdiff_t/' include/opencv/*
-  '';
-
-  preConfigure = ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -D__STDC_CONSTANT_MACROS "
-  '';
-
-  meta = {
-    description = "Open Computer Vision Library with more than 500 algorithms";
-    homepage = http://opencv.willowgarage.com/;
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
-    broken = true;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3ffbc199c81a..0aab338409b2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7980,10 +7980,6 @@ let
 
   opencv = callPackage ../development/libraries/opencv { };
 
-  opencv_2_1 = callPackage ../development/libraries/opencv/2.1.nix {
-    libpng = libpng12;
-  };
-
   opencv3 = callPackage ../development/libraries/opencv/3.x.nix { };
 
   # this ctl version is needed by openexr_viewers

From 7d973a56d0a38b8b0bb7e1e715ca3e3ebcdb2ac3 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 26 Dec 2015 01:09:00 +0000
Subject: [PATCH 354/884] wpa_supplicant module: remove obsolete option

networking.WLANInterface has been obsolete for years
---
 .../services/networking/wpa_supplicant.nix      | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix
index 9e04bd401906..bef4b2bc0b99 100644
--- a/nixos/modules/services/networking/wpa_supplicant.nix
+++ b/nixos/modules/services/networking/wpa_supplicant.nix
@@ -3,14 +3,8 @@
 with lib;
 
 let
-
   cfg = config.networking.wireless;
   configFile = "/etc/wpa_supplicant.conf";
-
-  ifaces =
-    cfg.interfaces ++
-    optional (config.networking.WLANInterface != "") config.networking.WLANInterface;
-
 in
 
 {
@@ -18,12 +12,6 @@ in
   ###### interface
 
   options = {
-
-    networking.WLANInterface = mkOption {
-      default = "";
-      description = "Obsolete. Use <option>networking.wireless.interfaces</option> instead.";
-    };
-
     networking.wireless = {
       enable = mkOption {
         type = types.bool;
@@ -95,8 +83,9 @@ in
     services.dbus.packages = [ pkgs.wpa_supplicant ];
 
     # FIXME: start a separate wpa_supplicant instance per interface.
-    jobs.wpa_supplicant =
-      { description = "WPA Supplicant";
+    jobs.wpa_supplicant = let
+      ifaces = cfg.interfaces;
+    in { description = "WPA Supplicant";
 
         wantedBy = [ "network.target" ];
 

From 3a5f48844593fc129184d00a1ee32717b42e5e57 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 26 Dec 2015 01:12:32 +0000
Subject: [PATCH 355/884] wpa_supplicant module: refactor

---
 .../services/networking/wpa_supplicant.nix    | 75 ++++++++-----------
 1 file changed, 32 insertions(+), 43 deletions(-)

diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix
index bef4b2bc0b99..5979ab7fbe33 100644
--- a/nixos/modules/services/networking/wpa_supplicant.nix
+++ b/nixos/modules/services/networking/wpa_supplicant.nix
@@ -5,12 +5,7 @@ with lib;
 let
   cfg = config.networking.wireless;
   configFile = "/etc/wpa_supplicant.conf";
-in
-
-{
-
-  ###### interface
-
+in {
   options = {
     networking.wireless = {
       enable = mkOption {
@@ -73,19 +68,17 @@ in
     };
   };
 
+  config = mkMerge [
+    (mkIf cfg.enable {
+      environment.systemPackages =  [ pkgs.wpa_supplicant ];
 
-  ###### implementation
+      services.dbus.packages = [ pkgs.wpa_supplicant ];
 
-  config = mkIf cfg.enable {
-
-    environment.systemPackages =  [ pkgs.wpa_supplicant ];
-
-    services.dbus.packages = [ pkgs.wpa_supplicant ];
-
-    # FIXME: start a separate wpa_supplicant instance per interface.
-    jobs.wpa_supplicant = let
-      ifaces = cfg.interfaces;
-    in { description = "WPA Supplicant";
+      # FIXME: start a separate wpa_supplicant instance per interface.
+      systemd.services.wpa_supplicant = let
+        ifaces = cfg.interfaces;
+      in {
+        description = "WPA Supplicant";
 
         wantedBy = [ "network.target" ];
 
@@ -101,37 +94,33 @@ in
           fi
         '';
 
-        script =
-          ''
-            ${if ifaces == [] then ''
-              for i in $(cd /sys/class/net && echo *); do
-                DEVTYPE=
-                source /sys/class/net/$i/uevent
-                if [ "$DEVTYPE" = "wlan" -o -e /sys/class/net/$i/wireless ]; then
-                  ifaces="$ifaces''${ifaces:+ -N} -i$i"
-                fi
-              done
-            '' else ''
-              ifaces="${concatStringsSep " -N " (map (i: "-i${i}") ifaces)}"
-            ''}
-            exec wpa_supplicant -s -u -D${cfg.driver} -c ${configFile} $ifaces
-          '';
+        script = ''
+          ${if ifaces == [] then ''
+            for i in $(cd /sys/class/net && echo *); do
+              DEVTYPE=
+              source /sys/class/net/$i/uevent
+              if [ "$DEVTYPE" = "wlan" -o -e /sys/class/net/$i/wireless ]; then
+                ifaces="$ifaces''${ifaces:+ -N} -i$i"
+              fi
+            done
+          '' else ''
+            ifaces="${concatStringsSep " -N " (map (i: "-i${i}") ifaces)}"
+          ''}
+          exec wpa_supplicant -s -u -D${cfg.driver} -c ${configFile} $ifaces
+        '';
       };
 
-    powerManagement.resumeCommands =
-      ''
+      powerManagement.resumeCommands = ''
         ${config.systemd.package}/bin/systemctl try-restart wpa_supplicant
       '';
 
-    assertions = [{ assertion = !cfg.userControlled.enable || cfg.interfaces != [];
-                    message = "user controlled wpa_supplicant needs explicit networking.wireless.interfaces";}];
-
-    # Restart wpa_supplicant when a wlan device appears or disappears.
-    services.udev.extraRules =
-      ''
+      # Restart wpa_supplicant when a wlan device appears or disappears.
+      services.udev.extraRules = ''
         ACTION=="add|remove", SUBSYSTEM=="net", ENV{DEVTYPE}=="wlan", RUN+="${config.systemd.package}/bin/systemctl try-restart wpa_supplicant.service"
       '';
-
-  };
-
+    })
+    {
+      meta.maintainers = with lib.maintainers; [ globin ];
+    }
+  ];
 }

From d03b35f881941f57d5159ae0a58b10f7c3142682 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 29 Dec 2015 10:21:38 +0000
Subject: [PATCH 356/884] wpa_supplicant module: add networks option

---
 nixos/doc/manual/configuration/wireless.xml   | 14 +++-
 .../services/networking/wpa_supplicant.nix    | 66 ++++++++++++-------
 2 files changed, 56 insertions(+), 24 deletions(-)

diff --git a/nixos/doc/manual/configuration/wireless.xml b/nixos/doc/manual/configuration/wireless.xml
index 373a9168cc87..13e4283d241c 100644
--- a/nixos/doc/manual/configuration/wireless.xml
+++ b/nixos/doc/manual/configuration/wireless.xml
@@ -18,8 +18,18 @@ NixOS will start wpa_supplicant for you if you enable this setting:
 networking.wireless.enable = true;
 </programlisting>
 
-NixOS currently does not generate wpa_supplicant's
-configuration file, <literal>/etc/wpa_supplicant.conf</literal>. You should edit this file
+NixOS lets you specify networks for wpa_supplicant declaratively:
+<programlisting>
+networking.wireless.networks = {
+  echelon = {
+    psk = "abcdefgh";
+  };
+  "free.wifi" = {};
+}
+</programlisting>
+
+When no networks are set it will default to using a configuration file at
+<literal>/etc/wpa_supplicant.conf</literal>. You should edit this file
 yourself to define wireless networks, WPA keys and so on (see
 wpa_supplicant.conf(5)).
 </para>
diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix
index 5979ab7fbe33..1292ca7f08e0 100644
--- a/nixos/modules/services/networking/wpa_supplicant.nix
+++ b/nixos/modules/services/networking/wpa_supplicant.nix
@@ -4,33 +4,29 @@ with lib;
 
 let
   cfg = config.networking.wireless;
-  configFile = "/etc/wpa_supplicant.conf";
+  configFile = if cfg.networks != {} then pkgs.writeText "wpa_supplicant.conf" ''
+    ${optionalString cfg.userControlled.enable ''
+      ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=${cfg.userControlled.group}
+      update_config=1''}
+    ${concatStringsSep "\n" (mapAttrsToList (ssid: networkConfig: ''
+      network={
+        ssid="${ssid}"
+        ${optionalString (networkConfig.psk != null) ''psk="${networkConfig.psk}"''}
+        ${optionalString (networkConfig.psk == null) ''key_mgmt=NONE''}
+      }
+    '') cfg.networks)}
+  '' else "/etc/wpa_supplicant.conf";
 in {
   options = {
     networking.wireless = {
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Whether to start <command>wpa_supplicant</command> to scan for
-          and associate with wireless networks.  Note: NixOS currently
-          does not manage <command>wpa_supplicant</command>'s
-          configuration file, <filename>${configFile}</filename>.  You
-          should edit this file yourself to define wireless networks,
-          WPA keys and so on (see
-          <citerefentry><refentrytitle>wpa_supplicant.conf</refentrytitle>
-          <manvolnum>5</manvolnum></citerefentry>), or use
-          networking.wireless.userControlled.* to allow users to add entries
-          through <command>wpa_cli</command> and <command>wpa_gui</command>.
-        '';
-      };
+      enable = mkEnableOption "wpa_supplicant";
 
       interfaces = mkOption {
         type = types.listOf types.str;
         default = [];
         example = [ "wlan0" "wlan1" ];
         description = ''
-          The interfaces <command>wpa_supplicant</command> will use.  If empty, it will
+          The interfaces <command>wpa_supplicant</command> will use. If empty, it will
           automatically use all wireless interfaces.
         '';
       };
@@ -41,6 +37,34 @@ in {
         description = "Force a specific wpa_supplicant driver.";
       };
 
+      networks = mkOption {
+        type = types.attrsOf (types.submodule {
+          options = {
+            psk = mkOption {
+              type = types.nullOr types.str;
+              default = null;
+              description = ''
+                The network's pre-shared key in plaintext defaulting
+                to being a network without any authentication.
+              '';
+            };
+          };
+        });
+        description = ''
+          The network definitions to automatically connect to when
+           <command>wpa_supplicant</command> is running. If this
+           parameter is left empty wpa_supplicant will use
+          /etc/wpa_supplicant.conf as the configuration file.
+        '';
+        default = {};
+        example = literalExample ''
+          echelon = {
+            psk = "abcdefgh";
+          };
+          "free.wifi" = {};
+        '';
+      };
+
       userControlled = {
         enable = mkOption {
           type = types.bool;
@@ -51,10 +75,8 @@ in {
             to depend on a large package such as NetworkManager just to pick nearby
             access points.
 
-            When you want to use this, make sure ${configFile} doesn't exist.
-            It will be created for you.
-
-            Currently it is also necessary to explicitly specify networking.wireless.interfaces.
+            When using a declarative network specification you cannot persist any
+            settings via wpa_gui or wpa_cli.
           '';
         };
 

From 609457458e24b619b45a18666738b704077f434b Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 29 Dec 2015 10:22:03 +0000
Subject: [PATCH 357/884] wpa_supplicant module: remove preStart hack

If the config file is managed imperatively we shouldn't touch it.
---
 nixos/modules/services/networking/wpa_supplicant.nix | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix
index 1292ca7f08e0..397811f96266 100644
--- a/nixos/modules/services/networking/wpa_supplicant.nix
+++ b/nixos/modules/services/networking/wpa_supplicant.nix
@@ -106,16 +106,6 @@ in {
 
         path = [ pkgs.wpa_supplicant ];
 
-        preStart = ''
-          touch -a ${configFile}
-          chmod 600 ${configFile}
-        '' + optionalString cfg.userControlled.enable ''
-          if [ ! -s ${configFile} ]; then
-            echo "ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=${cfg.userControlled.group}" >> ${configFile}
-            echo "update_config=1" >> ${configFile}
-          fi
-        '';
-
         script = ''
           ${if ifaces == [] then ''
             for i in $(cd /sys/class/net && echo *); do

From 391c33004242b17d41d9e15e8a0a7c416087c17a Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 6 Jan 2016 03:52:56 +0000
Subject: [PATCH 358/884] wpa_supplicant service: jobs -> systemd.services

Fixes an occurence of `jobs` usage causing tests to fail to evaluate.

thanks @domenkozar
---
 nixos/modules/profiles/installation-device.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix
index 946032781f40..669b6975c690 100644
--- a/nixos/modules/profiles/installation-device.nix
+++ b/nixos/modules/profiles/installation-device.nix
@@ -51,7 +51,7 @@ with lib;
 
     # Enable wpa_supplicant, but don't start it by default.
     networking.wireless.enable = mkDefault true;
-    jobs.wpa_supplicant.startOn = mkOverride 50 "";
+    systemd.services.wpa_supplicant.wantedBy = mkOverride 50 [];
 
     # Tell the Nix evaluator to garbage collect more aggressively.
     # This is desirable in memory-constrained environments that don't

From 246f0e91cda1357ef31708e414d4b697ec9a15a7 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 6 Jan 2016 03:57:25 +0000
Subject: [PATCH 359/884] wpa_supplicant service: Warn about plaintext keys in
 docs

---
 nixos/doc/manual/configuration/wireless.xml          | 4 +++-
 nixos/modules/services/networking/wpa_supplicant.nix | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/configuration/wireless.xml b/nixos/doc/manual/configuration/wireless.xml
index 13e4283d241c..e4560f2da36b 100644
--- a/nixos/doc/manual/configuration/wireless.xml
+++ b/nixos/doc/manual/configuration/wireless.xml
@@ -28,7 +28,9 @@ networking.wireless.networks = {
 }
 </programlisting>
 
-When no networks are set it will default to using a configuration file at
+Be aware that keys will be written to the nix store in plaintext!
+
+When no networks are set, it will default to using a configuration file at
 <literal>/etc/wpa_supplicant.conf</literal>. You should edit this file
 yourself to define wireless networks, WPA keys and so on (see
 wpa_supplicant.conf(5)).
diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix
index 397811f96266..1b655af6c82d 100644
--- a/nixos/modules/services/networking/wpa_supplicant.nix
+++ b/nixos/modules/services/networking/wpa_supplicant.nix
@@ -46,6 +46,9 @@ in {
               description = ''
                 The network's pre-shared key in plaintext defaulting
                 to being a network without any authentication.
+
+                Be aware that these will be written to the nix store
+                in plaintext!
               '';
             };
           };

From 2c4c9bee13f171e944e7f7a15f7f2e7b65063a23 Mon Sep 17 00:00:00 2001
From: somaticweb <somaticweb@gmail.com>
Date: Tue, 5 Jan 2016 22:15:17 -0800
Subject: [PATCH 360/884] git: 2.6.4 -> 2.7.0

Also corrected the license, which is GPL2-only
---
 .../version-management/git-and-tools/git/default.nix        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 84b033f981fc..1045724090ff 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -9,7 +9,7 @@
 }:
 
 let
-  version = "2.6.4";
+  version = "2.7.0";
   svn = subversionClient.override { perlBindings = true; };
 in
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    sha256 = "0rnlbp7l4ggq3lk96v24rzw7qqawp6477i3b4m0b5q3346ap008w";
+    sha256 = "03bvb8s5j8i54qbi3yayl42bv0wf2fpgnh1a2lkhbj79zi7b77zs";
   };
 
   patches = [
@@ -143,7 +143,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://git-scm.com/;
     description = "Distributed version control system";
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = stdenv.lib.licenses.gpl2;
 
     longDescription = ''
       Git, a popular distributed version control system designed to

From e182ddf0089cb4c04075740afb75c1acd96353f9 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 5 Jan 2016 22:36:30 +0100
Subject: [PATCH 361/884] coqPackages.coquelicot: init at 2.1.1

Coquelicot is a Coq library for Reals.

Homepage: http://coquelicot.saclay.inria.fr/
---
 .../coq-modules/coquelicot/default.nix        | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/coq-modules/coquelicot/default.nix

diff --git a/pkgs/development/coq-modules/coquelicot/default.nix b/pkgs/development/coq-modules/coquelicot/default.nix
new file mode 100644
index 000000000000..a57686177c4e
--- /dev/null
+++ b/pkgs/development/coq-modules/coquelicot/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, which, coq, ssreflect }:
+
+stdenv.mkDerivation {
+  name = "coq${coq.coq-version}-coquelicot-2.1.1";
+  src = fetchurl {
+    url = https://gforge.inria.fr/frs/download.php/file/35429/coquelicot-2.1.1.tar.gz;
+    sha256 = "1wxds73h26q03r2xiw8shplh97rsbim2i2s0r7af0fa490bp44km";
+  };
+
+  nativeBuildInputs = [ which ];
+  buildInputs = [ coq ];
+  propagatedBuildInputs = [ ssreflect ];
+
+  configureFlags = "--libdir=$out/lib/coq/${coq.coq-version}/user-contrib/Coquelicot";
+  buildPhase = "./remake";
+  installPhase = "./remake install";
+
+  meta = {
+    homepage = http://coquelicot.saclay.inria.fr/;
+    description = "A Coq library for Reals";
+    license = stdenv.lib.licenses.lgpl3;
+    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    inherit (coq.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0aab338409b2..b6f83d5d3de1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14993,6 +14993,8 @@ let
 
     coqeal = callPackage ../development/coq-modules/coqeal {};
 
+    coquelicot = callPackage ../development/coq-modules/coquelicot {};
+
     domains = callPackage ../development/coq-modules/domains {};
 
     fiat = callPackage ../development/coq-modules/fiat {};
@@ -15027,6 +15029,8 @@ let
 
     coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {};
 
+    coquelicot = callPackage ../development/coq-modules/coquelicot {};
+
     flocq = callPackage ../development/coq-modules/flocq {};
 
     mathcomp = callPackage ../development/coq-modules/mathcomp { };

From ca8ef0fa1d973548f85c3318f7e3d517a0f8130e Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 6 Jan 2016 09:35:05 +0100
Subject: [PATCH 362/884] coq-interval: 2.1.0 -> 2.2.1

---
 pkgs/development/coq-modules/interval/default.nix | 10 +++++-----
 pkgs/top-level/all-packages.nix                   |  2 ++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/coq-modules/interval/default.nix b/pkgs/development/coq-modules/interval/default.nix
index 628aa9735620..f367dad1fcaa 100644
--- a/pkgs/development/coq-modules/interval/default.nix
+++ b/pkgs/development/coq-modules/interval/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, which, coq, flocq, mathcomp }:
+{ stdenv, fetchurl, which, coq, coquelicot, flocq, mathcomp }:
 
 stdenv.mkDerivation {
-  name = "coq-interval-${coq.coq-version}-2.1.0";
+  name = "coq-interval-${coq.coq-version}-2.2.1";
 
   src = fetchurl {
-    url = https://gforge.inria.fr/frs/download.php/file/35092/interval-2.1.0.tar.gz;
-    sha256 = "02sn8mh85kxwn7681h2z6r7vnac9idh4ik3hbmr2yvixizakb70b";
+    url = https://gforge.inria.fr/frs/download.php/file/35431/interval-2.2.1.tar.gz;
+    sha256 = "1i6v7da9mf6907sa803xa0llsf9lj4akxbrl8rma6gsdgff2d78n";
   };
 
   nativeBuildInputs = [ which ];
   buildInputs = [ coq ];
-  propagatedBuildInputs = [ flocq mathcomp ];
+  propagatedBuildInputs = [ coquelicot flocq mathcomp ];
 
   configurePhase = "./configure --libdir=$out/lib/coq/${coq.coq-version}/user-contrib/Interval";
   buildPhase = "./remake";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b6f83d5d3de1..fd72495703e0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15033,6 +15033,8 @@ let
 
     flocq = callPackage ../development/coq-modules/flocq {};
 
+    interval = callPackage ../development/coq-modules/interval {};
+
     mathcomp = callPackage ../development/coq-modules/mathcomp { };
 
     ssreflect = callPackage ../development/coq-modules/ssreflect { };

From c87ef760276b630a2467ef489c4ce00a738d4c57 Mon Sep 17 00:00:00 2001
From: Matthew O'Gorman <mog@rldn.net>
Date: Wed, 6 Jan 2016 03:50:49 -0500
Subject: [PATCH 363/884] build-fhs-userenv: added the option meta to be passed
 down to the final derivation.

---
 pkgs/build-support/build-fhs-userenv/default.nix | 3 ++-
 pkgs/top-level/all-packages.nix                  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/build-fhs-userenv/default.nix b/pkgs/build-support/build-fhs-userenv/default.nix
index 54ce3e768975..5db0d98b79a8 100644
--- a/pkgs/build-support/build-fhs-userenv/default.nix
+++ b/pkgs/build-support/build-fhs-userenv/default.nix
@@ -1,5 +1,5 @@
 { runCommand, lib, writeText, writeScriptBin, stdenv, bash, ruby } :
-{ env, runScript ? "${bash}/bin/bash", extraBindMounts ? [], extraInstallCommands ? "" } :
+{ env, runScript ? "${bash}/bin/bash", extraBindMounts ? [], extraInstallCommands ? "", importMeta ? {} } :
 
 let
   name = env.pname;
@@ -26,6 +26,7 @@ let
   '';
 
 in runCommand name {
+  meta = importMeta;
   passthru.env =
     runCommand "${name}-shell-env" {
       shellHook = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 992719704608..b6f85d1adf78 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -279,10 +279,11 @@ let
   };
 
   buildFHSUserEnv = args: userFHSEnv {
-    env = buildFHSEnv (removeAttrs args [ "runScript" "extraBindMounts" "extraInstallCommands" ]);
+    env = buildFHSEnv (removeAttrs args [ "runScript" "extraBindMounts" "extraInstallCommands" "meta" ]);
     runScript = args.runScript or "bash";
     extraBindMounts = args.extraBindMounts or [];
     extraInstallCommands = args.extraInstallCommands or "";
+    importMeta = args.meta or {};
   };
 
   buildMaven = callPackage ../build-support/build-maven.nix {};

From ecac5e9f671db3d6677f1349ad1b4354e12b6c15 Mon Sep 17 00:00:00 2001
From: Matthew O'Gorman <mog@rldn.net>
Date: Wed, 6 Jan 2016 03:56:01 -0500
Subject: [PATCH 364/884] click_5: init at 5.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 71980a33e2dc..8d8935a63541 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2629,6 +2629,26 @@ in modules // {
     };
   };
 
+  click_5 = buildPythonPackage rec {
+    name = "click-5.1";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/c/click/${name}.tar.gz";
+      sha256 = "0njsm0wn31l21bi118g5825ma5sa3rwn7v2x4wjd7yiiahkri337";
+    };
+
+    meta = {
+      homepage = http://click.pocoo.org/;
+      description = "Create beautiful command line interfaces in Python";
+      longDescription = ''
+        A Python package for creating beautiful command line interfaces in a
+        composable way, with as little code as necessary.
+      '';
+      license = licenses.bsd3;
+      maintainers = with maintainers; [ mog ];
+    };
+  };
+
   click-log = buildPythonPackage rec {
     version = "0.1.1";
     name = "click-log-${version}";

From 119a9458fbe45c6a1928eb48396b8045067a90f0 Mon Sep 17 00:00:00 2001
From: Matthew O'Gorman <mog@rldn.net>
Date: Wed, 6 Jan 2016 04:05:19 -0500
Subject: [PATCH 365/884] platformio: init at 2.7.0

---
 .../arduino/platformio/chrootenv.nix          | 33 +++++++++++++++++++
 .../arduino/platformio/default.nix            | 11 +++++++
 pkgs/top-level/all-packages.nix               |  3 ++
 pkgs/top-level/python-packages.nix            | 21 ++++++++++++
 4 files changed, 68 insertions(+)
 create mode 100644 pkgs/development/arduino/platformio/chrootenv.nix
 create mode 100644 pkgs/development/arduino/platformio/default.nix

diff --git a/pkgs/development/arduino/platformio/chrootenv.nix b/pkgs/development/arduino/platformio/chrootenv.nix
new file mode 100644
index 000000000000..4aad955ec24e
--- /dev/null
+++ b/pkgs/development/arduino/platformio/chrootenv.nix
@@ -0,0 +1,33 @@
+{ lib, buildFHSUserEnv, platformio, stdenv }:
+
+buildFHSUserEnv {
+  name = "platformio";
+
+  targetPkgs = pkgs: (with pkgs;
+    [
+      python27Packages.python
+      python27Packages.setuptools
+      python27Packages.pip
+      python27Packages.bottle
+      python27Packages.platformio
+      zlib
+    ]);
+  multiPkgs = pkgs: (with pkgs;
+    [
+      python27Packages.python
+      python27Packages.setuptools
+      python27Packages.pip
+      python27Packages.bottle
+      zlib
+      python27Packages.platformio
+    ]);
+
+   meta = with stdenv.lib; {
+     description = "An open source ecosystem for IoT development";
+     homepage = http://platformio.org;
+     maintainers = with maintainers; [ mog ];
+     license = licenses.asl20;
+  };
+
+  runScript = "platformio";
+}
diff --git a/pkgs/development/arduino/platformio/default.nix b/pkgs/development/arduino/platformio/default.nix
new file mode 100644
index 000000000000..dfdd8141aaaa
--- /dev/null
+++ b/pkgs/development/arduino/platformio/default.nix
@@ -0,0 +1,11 @@
+
+{ pkgs, newScope }:
+
+let
+  callPackage = newScope self;
+
+  self = rec {
+      platformio-chrootenv = callPackage ./chrootenv.nix { };
+  };
+
+in self
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b6f85d1adf78..baf60ddbd92b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2747,6 +2747,9 @@ let
 
   plan9port = callPackage ../tools/system/plan9port { };
 
+  platformioPackages = callPackage ../development/arduino/platformio { };
+  platformio = platformioPackages.platformio-chrootenv.override {};
+
   plex = callPackage ../servers/plex { };
 
   ploticus = callPackage ../tools/graphics/ploticus {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8d8935a63541..3a8dca6c33b2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13780,6 +13780,27 @@ in modules // {
     propagatedBuildInputs = with self; [ unittest2 ];
   };
 
+  platformio =  buildPythonPackage rec {
+    name = "platformio-${version}";
+    version="2.7.0";
+
+    disabled = isPy3k || isPyPy;
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/p/platformio/platformio-${version}.tar.gz";
+      sha256 = "0bjp8gapd8v5az0xvsgh44zyma5kazhhbq266fk092i2q348zbv6";
+     };
+
+     propagatedBuildInputs = with self; [ click_5 requests2 bottle pyserial lockfile colorama];
+
+     meta = with stdenv.lib; {
+     description = "An open source ecosystem for IoT development";
+     homepage = http://platformio.org;
+     maintainers = with maintainers; [ mog ];
+     license = licenses.asl20;
+     };
+  };
+
   pylibconfig2 = buildPythonPackage rec {
     name = "pylibconfig2-${version}";
     version = "0.2.4";

From c90be3dd3aac96a328062b6d379a0fd75d255aff Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Wed, 6 Jan 2016 11:59:54 +0100
Subject: [PATCH 366/884] geolite-legacy 2015-11-23 -> 2016-01-06

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

diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix
index 070bfe047c83..826891834746 100644
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@@ -8,29 +8,29 @@ let
 
   # Annoyingly, these files are updated without a change in URL. This means that
   # builds will start failing every month or so, until the hashes are updated.
-  version = "2015-11-23";
+  version = "2016-01-06";
 in
 stdenv.mkDerivation {
   name = "geolite-legacy-${version}";
 
   srcGeoIP = fetchDB
     "GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz"
-    "18nwbxy6l153zhd7fi4zdyibnmpcb197p3jlb9cjci852asd465l";
+    "07h1ha7z9i877ph41fw4blcfb11ynv8k9snrrsgsjrvv2yqvsc37";
   srcGeoIPv6 = fetchDB
     "GeoIPv6.dat.gz" "GeoIPv6.dat.gz"
-    "0dm8qvsx8vpwdv9y4z70jiws9bwmw10vdn5sc8jdms53p4rgr4n4";
+    "14wsc0w8ir5q1lq6d9bpr03qvrbi2i0g04gkfcwbnh63yqxc31m9";
   srcGeoLiteCity = fetchDB
     "GeoLiteCity.dat.xz" "GeoIPCity.dat.xz"
-    "1bq9kg6fsdsjssd3i6phq26n1px9jmljnq60gfsh8yb9s18hymfq";
+    "1nra64shc3bp1d6vk9rdv7wyd8jmkgsybqgr3imdg7fv837kwvnh";
   srcGeoLiteCityv6 = fetchDB
     "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" "GeoIPCityv6.dat.gz"
-    "0anx3kppql6wzkpmkf7k1322g4ragb5hh96apl71n2lmwb33i148";
+    "1fksbnmda2a05cpax41h9r7jhi8102q41kl5nij4ai42d6yqy73x";
   srcGeoIPASNum = fetchDB
     "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
-    "0zlc5gb0qy9am2xzpfv41i9wdydasrscmjwy1drccfsspqwrjvs7";
+    "15sagwf6l5fmfgf780qyf1sc3kcmxkv37510h7b9db76mzmicgln";
   srcGeoIPASNumv6 = fetchDB
     "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz"
-    "0p9lwngvrk88an3kqx3v2b3kcs0l51mbrr7lwxg3ckkjyl9si1k3";
+    "0dyrpis64sgijl701vfpwklxcdr1wq3z0saymaw6scy3a1anpyfi";
 
   meta = with stdenv.lib; {
     inherit version;

From 6c377c43a9cea37e783153789e2afcc455e541cc Mon Sep 17 00:00:00 2001
From: Jos van den Oever <jos@vandenoever.info>
Date: Wed, 6 Jan 2016 12:10:54 +0100
Subject: [PATCH 367/884] testdisk 6.14 -> 7.0

---
 pkgs/tools/misc/testdisk/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/testdisk/default.nix b/pkgs/tools/misc/testdisk/default.nix
index a80e560b5ebc..312c0ae6db5a 100644
--- a/pkgs/tools/misc/testdisk/default.nix
+++ b/pkgs/tools/misc/testdisk/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses, libjpeg, e2fsprogs, zlib, openssl, libuuid, ntfs3g }:
 
 stdenv.mkDerivation {
-  name = "testdisk-6.14";
+  name = "testdisk-7.0";
 
   src = fetchurl {
-    url = http://www.cgsecurity.org/testdisk-6.14.tar.bz2;
-    sha256 = "0v1jap83f5h99zv01v3qmqm160d36n4ysi0gyq7xzb3mqgmw75x5";
+    url = http://www.cgsecurity.org/testdisk-7.0.tar.bz2;
+    sha256 = "00bb3b6b22e6aba88580eeb887037aef026968c21a87b5f906c6652cbee3442d";
   };
 
   buildInputs = [ ncurses libjpeg zlib openssl libuuid ]

From fe00c8a83f696e3430ee4aa3fc850f171da52450 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Tue, 5 Jan 2016 22:04:36 -0500
Subject: [PATCH 368/884] Revert "iptables: 1.4.21 -> 1.6.0"

This reverts commit b2ac241e958c767c4d817e65c37802014499d7a4, which
upgraded iptables, because it causes connmand to segfault on my machine:

    Jan 05 22:02:06 aching connmand[7866]: Connection Manager version 1.30
    Jan 05 22:02:06 aching audit: NETFILTER_CFG table=filter family=2 entries=27
    Jan 05 22:02:06 aching audit[7866]: SYSCALL arch=c000003e syscall=54 success=yes exit=0 a0=a a1=0 a2=40 a3=103a5b0 items=0 ppid=1 pid=7866 auid=4294967295 uid=0 gid=0 euid=0 suid=0 fsuid=0 egid=0 sgid=0 fsgid=0 tty=(none) ses=4294967295 comm="connmand" exe="/nix/store/x7lyis4srvd68lflgnqqmg2bc1fm2whb-connman-1.30/bin/connmand" key=(null)
    Jan 05 22:02:06 aching audit: PROCTITLE proctitle=2F6E69782F73746F72652F78376C796973347372766436386C666C676E71716D6732626331666D327768622D636F6E6E6D616E2D312E33302F7362696E2F636F6E6E6D616E64002D2D636F6E6669673D2F6E69782F73746F72652F37383078797137726367376766306271706A3130306C666238336B69367938762D636F6E6E
    Jan 05 22:02:06 aching audit: NETFILTER_CFG table=mangle family=2 entries=6
    Jan 05 22:02:06 aching audit[7866]: SYSCALL arch=c000003e syscall=54 success=yes exit=0 a0=a a1=0 a2=40 a3=1038c00 items=0 ppid=1 pid=7866 auid=4294967295 uid=0 gid=0 euid=0 suid=0 fsuid=0 egid=0 sgid=0 fsgid=0 tty=(none) ses=4294967295 comm="connmand" exe="/nix/store/x7lyis4srvd68lflgnqqmg2bc1fm2whb-connman-1.30/bin/connmand" key=(null)
    Jan 05 22:02:06 aching audit: PROCTITLE proctitle=2F6E69782F73746F72652F78376C796973347372766436386C666C676E71716D6732626331666D327768622D636F6E6E6D616E2D312E33302F7362696E2F636F6E6E6D616E64002D2D636F6E6669673D2F6E69782F73746F72652F37383078797137726367376766306271706A3130306C666238336B69367938762D636F6E6E
    Jan 05 22:02:06 aching audit: NETFILTER_CFG table=nat family=2 entries=5
    Jan 05 22:02:06 aching audit[7866]: SYSCALL arch=c000003e syscall=54 success=yes exit=0 a0=a a1=0 a2=40 a3=1037800 items=0 ppid=1 pid=7866 auid=4294967295 uid=0 gid=0 euid=0 suid=0 fsuid=0 egid=0 sgid=0 fsgid=0 tty=(none) ses=4294967295 comm="connmand" exe="/nix/store/x7lyis4srvd68lflgnqqmg2bc1fm2whb-connman-1.30/bin/connmand" key=(null)
    Jan 05 22:02:06 aching audit: PROCTITLE proctitle=2F6E69782F73746F72652F78376C796973347372766436386C666C676E71716D6732626331666D327768622D636F6E6E6D616E2D312E33302F7362696E2F636F6E6E6D616E64002D2D636F6E6669673D2F6E69782F73746F72652F37383078797137726367376766306271706A3130306C666238336B69367938762D636F6E6E
    Jan 05 22:02:06 aching connmand[7866]: Aborting (signal 11) [/nix/store/x7lyis4srvd68lflgnqqmg2bc1fm2whb-connman-1.30/sbin/connmand]
    Jan 05 22:02:06 aching connmand[7866]: ++++++++ backtrace ++++++++
    Jan 05 22:02:06 aching connmand[7866]: +++++++++++++++++++++++++++
    Jan 05 22:02:06 aching systemd[1]: connman.service: Main process exited, code=exited, status=1/FAILURE
    Jan 05 22:02:06 aching systemd[1]: connman.service: Unit entered failed state.
    Jan 05 22:02:06 aching systemd[1]: connman.service: Failed with result 'exit-code'.
    Jan 05 22:02:06 aching systemd[1]: connman.service: Service hold-off time over, scheduling restart.
    Jan 05 22:02:06 aching systemd[1]: Stopped Connection service.

Arrived at through bisection, verified using this commit.
---
 pkgs/os-specific/linux/iptables/default.nix | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix
index 8c815029661b..2221250d57c0 100644
--- a/pkgs/os-specific/linux/iptables/default.nix
+++ b/pkgs/os-specific/linux/iptables/default.nix
@@ -1,22 +1,14 @@
-{stdenv, fetchurl, bison, flex, libnetfilter_conntrack, libnftnl, libmnl}:
+{stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
   name = "iptables-${version}";
-  version = "1.6.0";
+  version = "1.4.21";
 
   src = fetchurl {
     url = "http://www.netfilter.org/projects/iptables/files/${name}.tar.bz2";
-    sha256 = "0q0w1x4aijid8wj7dg1ny9fqwll483f1sqw7kvkskd8q1c52mdsb";
+    sha256 = "1q6kg7sf0pgpq0qhab6sywl23cngxxfzc9zdzscsba8x09l4q02j";
   };
 
-  nativeBuildInputs = [bison flex];
-
-  buildInputs = [libnetfilter_conntrack libnftnl libmnl];
-
-  preConfigure = ''
-    export NIX_LDFLAGS="$NIX_LDFLAGS -lmnl -lnftnl"
-  '';
-
   configureFlags = ''
     --enable-devel
     --enable-shared

From 9178c850df35668b21b115380d864eb1fc07e3ba Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 6 Jan 2016 13:14:19 +0100
Subject: [PATCH 369/884] pythonPackages.cytoolz: 0.7.3 -> 0.7.4

Update cytoolz.
Add correct testrunner, even though tests have to be disabled.
---
 pkgs/top-level/python-packages.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 061f2683dc7e..f84a1e50c36b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3022,13 +3022,21 @@ in modules // {
 
   cytoolz = buildPythonPackage rec {
     name = "cytoolz-${version}";
-    version = "0.7.3";
+    version = "0.7.4";
 
     src = pkgs.fetchurl{
       url = "https://pypi.python.org/packages/source/c/cytoolz/cytoolz-${version}.tar.gz";
-      md5 = "e9f0441d9f340a23c60357f68f25d163";
+      sha256 = "9c2e3dda8232b6cd5b84b8c8df6c8155c2adeb8734eb7ec38e189affc0f2eba5";
     };
 
+    buildInputs = with self; [ nose ];
+
+    checkPhase = ''
+      nosetests cytoolz/tests
+    '';
+
+    doCheck = false; # Cannot import the extension module
+
     meta = {
       homepage = "http://github.com/pytoolz/cytoolz/";
       description = "Cython implementation of Toolz: High performance functional utilities";

From 7ba14e904e184efc9a671ec199eaea1d25f3daad Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 6 Jan 2016 13:14:40 +0100
Subject: [PATCH 370/884] pythonPackages.toolz: use correct testrunner

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f84a1e50c36b..a1bb7d7469cb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19113,6 +19113,12 @@ in modules // {
       sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd";
     };
 
+    buildInputs = with self; [ nose ];
+
+    checkPhase = ''
+      nosetests toolz/tests
+    '';
+
     meta = {
       homepage = "http://github.com/pytoolz/toolz/";
       description = "List processing tools and functional utilities";

From ae8ea1c1479ac4537868acdb66a5a6f3549bf656 Mon Sep 17 00:00:00 2001
From: = <anothersms@gmail.com>
Date: Wed, 6 Jan 2016 13:27:22 +0000
Subject: [PATCH 371/884] drumgizmo: 0.9.6 -> 0.9.8.1

---
 pkgs/applications/audio/drumgizmo/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/pkgs/applications/audio/drumgizmo/default.nix
index 92ea6ee2faef..9afcae1901ef 100644
--- a/pkgs/applications/audio/drumgizmo/default.nix
+++ b/pkgs/applications/audio/drumgizmo/default.nix
@@ -1,21 +1,21 @@
 { stdenv, fetchurl, alsaLib, expat, glib, libjack2, libX11, libpng
-, libpthreadstubs, libsmf, libsndfile, lv2, pkgconfig
+, libpthreadstubs, libsmf, libsndfile, lv2, pkgconfig, zita-resampler
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.9.6";
+  version = "0.9.8.1";
   name = "drumgizmo-${version}";
 
   src = fetchurl {
     url = "http://www.drumgizmo.org/releases/${name}/${name}.tar.gz";
-    sha256 = "1qs8aa1v8cw5zgfzcnr2dc4w0y5yzsgrywlnx2hfvx2si3as0mw4";
+    sha256 = "1plfjhwhaz1mr3kgf5imcp3kjflk6ni9sq39gmxjxzya6gn2r6gg";
   };
 
   configureFlags = [ "--enable-lv2" ];
 
   buildInputs = [
     alsaLib expat glib libjack2 libX11 libpng libpthreadstubs libsmf
-    libsndfile lv2 pkgconfig
+    libsndfile lv2 pkgconfig zita-resampler
   ];
 
   meta = with stdenv.lib; {
@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.drumgizmo.org;
     license = licenses.gpl3;
     platforms = platforms.linux;
-    maintainers = [ maintainers.goibhniu ];
+    maintainers = [ maintainers.goibhniu maintainers.nico202 ];
   };
 }

From 19f6edbfb805822a533a696cb1f23f55ece30931 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Wed, 6 Jan 2016 07:25:05 -0500
Subject: [PATCH 372/884] top-level/release.nix: make Darwin builds do more

---
 pkgs/top-level/release.nix | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 4f58e002d88d..4795fa21a901 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -45,6 +45,10 @@ let
               jobs.thunderbird.i686-linux
               jobs.glib-tested.x86_64-linux # standard glib doesn't do checks
               jobs.glib-tested.i686-linux
+              # Ensure that basic stuff works on darwin
+              jobs.git.x86_64-darwin
+              jobs.mysql.x86_64-darwin
+              jobs.vim.x86_64-darwin
             ] ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools;
         };
 
@@ -55,10 +59,24 @@ let
         { inherit (import ../stdenv/linux/make-bootstrap-tools.nix { system = "x86_64-linux"; }) dist test; };
 
       stdenvBootstrapTools.x86_64-darwin =
-        { inherit (import ../stdenv/darwin/make-bootstrap-tools.nix { system = "x86_64-darwin"; }) dist test; };
+        let
+          bootstrap = import ../stdenv/darwin/make-bootstrap-tools.nix { system = "x86_64-darwin"; };
+        in {
+          # Lightweight distribution and test
+          inherit (bootstrap) dist test;
+          # Test a full stdenv bootstrap from the bootstrap tools definition
+          inherit (bootstrap.test-pkgs) stdenv;
+        };
 
     } // (mapTestOn ((packagePlatforms pkgs) // rec {
 
+      # TODO: most (but possibly not all) of the jobs specified here are unnecessary now that we have release-lib.nix
+      # traversing all packages and looking at their meta.platform attributes. Someone who's better at this than I am
+      # should go through these and kill the ones that are safe to kill.
+      #
+      # <niksnut> note that all that " = linux" stuff in release.nix is legacy, from before we had meta.platforms
+      # <copumpkin> niksnut: so should I just kill all the obsolete jobs in release.nix?
+      # <niksnut> I don't know if they're all covered
       abcde = linux;
       aspell = all;
       atlas = linux;

From 7672c68ed73a876e306cb04cd80f1c0e4b3c501f Mon Sep 17 00:00:00 2001
From: Johannes Bornhold <johannes@bornhold.name>
Date: Fri, 25 Dec 2015 20:58:05 +0100
Subject: [PATCH 373/884] dmd: Avoid depending on gcc for the darwin build
 (close #11949)

Adding stdenv.cc into the PATH, also setting CC, so that on Darwin
clang will be used by default. Still allowing to use an existing value
of CC if it is set already.

Replacing __inline_isnanl with __inline_isnan on darwin since the former
one was not defined.
---
 pkgs/development/compilers/dmd/default.nix | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix
index 1cd894372bb9..12e8745ece16 100644
--- a/pkgs/development/compilers/dmd/default.nix
+++ b/pkgs/development/compilers/dmd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, curl, makeWrapper, gcc }:
+{ stdenv, fetchurl, unzip, curl, makeWrapper }:
 
 stdenv.mkDerivation {
   name = "dmd-2.067.1";
@@ -10,9 +10,15 @@ stdenv.mkDerivation {
 
   buildInputs = [ unzip curl makeWrapper ];
 
-  # Allow to use "clang++", commented in Makefile
   postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
-      substituteInPlace src/dmd/posix.mak --replace g++ clang++
+      # Allow to use "clang++", commented in Makefile
+      substituteInPlace src/dmd/posix.mak \
+          --replace g++ clang++ \
+          --replace MACOSX_DEPLOYMENT_TARGET MACOSX_DEPLOYMENT_TARGET_
+
+      # Was not able to compile on darwin due to "__inline_isnanl"
+      # being undefined.
+      substituteInPlace src/dmd/root/port.c --replace __inline_isnanl __inline_isnan
   '';
 
   # Buid and install are based on http://wiki.dlang.org/Building_DMD
@@ -48,7 +54,9 @@ stdenv.mkDerivation {
       cp -r std $out/include/d2
       cp -r etc $out/include/d2
 
-      wrapProgram $out/bin/dmd --prefix PATH ":" "${gcc}/bin/"
+      wrapProgram $out/bin/dmd \
+          --prefix PATH ":" "${stdenv.cc}/bin" \
+          --set CC "$""{CC:-$CC""}"
 
       cd $out/bin
       tee dmd.conf << EOF

From f3e492807951841146ae2b53f74e1a0cbfa6acf8 Mon Sep 17 00:00:00 2001
From: Sven Keidel <svenkeidel@googlemail.com>
Date: Wed, 6 Jan 2016 15:33:36 +0100
Subject: [PATCH 374/884] biber: add darwin to platforms of perl dependencies

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 35625c610d28..9dce40913726 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4757,7 +4757,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       description = "Simple and Efficient Reading/Writing/Modifying of Complete Files";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      platforms = stdenv.lib.platforms.linux;
+      platforms = with stdenv.lib.platforms; linux ++ darwin;
     };
   };
 
@@ -6601,7 +6601,7 @@ let self = _self // overrides; _self = with self; {
     meta = {
       description = "Provide https support for LWP::UserAgent";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      platforms = stdenv.lib.platforms.linux;
+      platforms = with stdenv.lib.platforms; linux ++ darwin;
     };
   };
 

From 4c384722eaa80c60413ffbf1e8d11aaf95b40b67 Mon Sep 17 00:00:00 2001
From: = <anothersms@gmail.com>
Date: Wed, 6 Jan 2016 15:02:02 +0000
Subject: [PATCH 375/884] non: 2015-10-6 -> 2015-12-16

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

diff --git a/pkgs/applications/audio/non/default.nix b/pkgs/applications/audio/non/default.nix
index 6c9e7eb708ac..84fcd50adc05 100644
--- a/pkgs/applications/audio/non/default.nix
+++ b/pkgs/applications/audio/non/default.nix
@@ -4,12 +4,12 @@ ladspaH, liblrdf, liblo, libsigcxx
 
 stdenv.mkDerivation rec {
   name = "non-${version}";
-  version = "2015-10-6";
+  version = "2015-12-16";
   src = fetchFromGitHub {
     owner = "original-male";
     repo = "non";
-    rev = "88fe7e7b97c97b8733506685f043cbc71b196646";
-    sha256 = "15cffp6c14rlssc8g3mrw8zvb88wffb8k8g1vhd299qlcgv7di2h";
+    rev = "5d274f430c867f73ed1dcb306b49be0371d28128";
+    sha256 = "1yckac3r1hqn5p450j4lf4349v4knjj7n9s5p3wdcvxhs0pjv2sy";
   };
 
     buildInputs = [ pkgconfig python2 cairo libjpeg ntk libjack2 libsndfile

From b12cabd22384526831e96dac4dd2e78339b87462 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Wed, 6 Jan 2016 19:05:00 +0100
Subject: [PATCH 376/884] electron: 0.28.2 -> 0.36.2

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

diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix
index d686da98fa38..dd7dabf2bf28 100644
--- a/pkgs/development/tools/electron/default.nix
+++ b/pkgs/development/tools/electron/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib
 , dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf
 , cairo, cups, expat, libgpgerror, nspr, gconf, nss, xorg, libcap, unzip
-, systemd
+, systemd, libnotify
 }:
 let
   atomEnv = buildEnv {
@@ -11,16 +11,16 @@ let
       fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss
       xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
       xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
-      xorg.libXcursor libcap systemd
+      xorg.libXcursor libcap systemd libnotify
     ];
   };
 in stdenv.mkDerivation rec {
   name = "electron-${version}";
-  version = "0.28.2";
+  version = "0.36.2";
 
   src = fetchurl {
     url = "https://github.com/atom/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip";
-    sha256 = "55b0880e2f78a60d95a58e83cd75006c34cb6ed90836e1f34e3359c3e5d0b8f0";
+    sha256 = "01d78j8dfrdygm1r141681b3bfz1f1xqg9vddz7j52z1mlfv9f1d";
     name = "${name}.zip";
   };
 

From 93fc00b1578e459cd20d5ad3bd923364b26c9f08 Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Wed, 6 Jan 2016 10:38:57 +0100
Subject: [PATCH 377/884] ocaml-pcre: use buildOcaml

---
 pkgs/development/ocaml-modules/pcre/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/pcre/default.nix b/pkgs/development/ocaml-modules/pcre/default.nix
index b6c2488b2502..7f7caf8e5a87 100644
--- a/pkgs/development/ocaml-modules/pcre/default.nix
+++ b/pkgs/development/ocaml-modules/pcre/default.nix
@@ -1,7 +1,8 @@
-{stdenv, fetchurl, pcre, ocaml, findlib}:
+{stdenv, buildOcaml, fetchurl, pcre, ocaml, findlib}:
 
-stdenv.mkDerivation {
-  name = "ocaml-pcre-7.1.1";
+buildOcaml {
+  name = "ocaml-pcre";
+  version = "7.1.1";
 
   src = fetchurl {
     url = https://github.com/mmottl/pcre-ocaml/releases/download/v7.1.1/pcre-ocaml-7.1.1.tar.gz;
@@ -13,6 +14,8 @@ stdenv.mkDerivation {
 
   createFindlibDestdir = true;
 
+  hasSharedObjects = true;
+
   configurePhase = "true";	# Skip configure phase
 
   meta = with stdenv.lib; {

From f54ed090965481369b6d878105587fb3909872c9 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 6 Jan 2016 20:33:00 +0100
Subject: [PATCH 378/884] jhead: add libjpeg as dependency

The `jpegtran` tool from libjpeg is required for the `-autorot` command.
---
 pkgs/tools/graphics/jhead/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/jhead/default.nix b/pkgs/tools/graphics/jhead/default.nix
index 470a2efdf6ba..dfbd7c4e5e06 100644
--- a/pkgs/tools/graphics/jhead/default.nix
+++ b/pkgs/tools/graphics/jhead/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, libjpeg }:
 
 stdenv.mkDerivation rec {
   name = "jhead-${version}";
@@ -9,12 +9,15 @@ stdenv.mkDerivation rec {
     sha256 = "0pl9s9ssb2a9di82f3ypin2hd098ns8kzdsxw3i2y94f07d03k48";
   };
 
+  buildInputs = [ libjpeg ];
+
   patchPhase = ''
     substituteInPlace makefile \
       --replace /usr/local/bin $out/bin
 
     substituteInPlace jhead.c \
-      --replace "\"   Compiled: \"__DATE__" ""
+      --replace "\"   Compiled: \"__DATE__" "" \
+      --replace "jpegtran -trim" "${libjpeg}/bin/jpegtran -trim"
   '';
 
   installPhase = ''

From c21707ec1fa52895ab47e0c93731a5ddd9e34ce3 Mon Sep 17 00:00:00 2001
From: William Giokas <1007380@gmail.com>
Date: Wed, 6 Jan 2016 13:52:42 -0600
Subject: [PATCH 379/884] vim-configurable: Change python versioning

Instead of explicitly stating "I want version 3" or "I want version 2"
you now simply specify what the python argument will be, and
vim_configurable will set up the flags for you. config.vim.python must
be set, still.
---
 .../applications/editors/vim/configurable.nix | 21 ++++---------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix
index 3d6c9ffa859f..e2715b1499a5 100644
--- a/pkgs/applications/editors/vim/configurable.nix
+++ b/pkgs/applications/editors/vim/configurable.nix
@@ -108,26 +108,14 @@ composableDerivation {
 
       // edf {
         name = "python";
-        feat = "pythoninterp";
+        feat = "python${if python ? isPy3 then "3" else ""}interp";
         enable = {
           nativeBuildInputs = [ python ];
         } // lib.optionalAttrs stdenv.isDarwin {
           configureFlags
-            = [ "--enable-pythoninterp=yes"
-                "--with-python-config-dir=${python}/lib" ];
-        };
-      }
-
-      // edf {
-        name = "python3";
-        feat = "python3interp";
-        enable = {
-          nativeBuildInputs = [ pkgs.python3 ];
-        } // lib.optionalAttrs stdenv.isDarwin {
-          configureFlags
-            = [ "--enable-python3interp=yes"
-                "--with-python3-config-dir=${pkgs.python3}/lib"
-                "--disable-pythoninterp" ];
+            = [ "--enable-python${if python ? isPy3 then "3" else ""}interp=yes"
+                "--with-python${if python ? isPy3 then "3" else ""}-config-dir=${python}/lib"
+                "--disable-python${if python ? isPy3 then "" else "3"}interp" ];
         };
       }
 
@@ -160,7 +148,6 @@ composableDerivation {
   cfg = {
     luaSupport       = config.vim.lua or true;
     pythonSupport    = config.vim.python or true;
-    python3Support   = config.vim.python3 or false;
     rubySupport      = config.vim.ruby or true;
     nlsSupport       = config.vim.nls or false;
     tclSupport       = config.vim.tcl or false;

From db25c680c980c0685435501c0933e0e08c107eba Mon Sep 17 00:00:00 2001
From: noctuid <noct@openmailbox.org>
Date: Wed, 6 Jan 2016 03:12:04 -0500
Subject: [PATCH 380/884] setroot: init at 1.4.4

---
 pkgs/tools/X11/setroot/default.nix | 31 ++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/tools/X11/setroot/default.nix

diff --git a/pkgs/tools/X11/setroot/default.nix b/pkgs/tools/X11/setroot/default.nix
new file mode 100644
index 000000000000..74e0ed8d029c
--- /dev/null
+++ b/pkgs/tools/X11/setroot/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, lib, fetchFromGitHub, libX11, imlib2
+, enableXinerama ? true, libXinerama ? null
+}:
+
+assert enableXinerama -> libXinerama != null;
+
+stdenv.mkDerivation rec {
+  version = "1.4.4";
+  name = "setroot-${version}";
+
+  src = fetchFromGitHub {
+    owner = "ttzhou";
+    repo = "setroot";
+    rev = "v${version}";
+    sha256 = "0vphma0as8pnqrakdw6gaiiz7xawb4y72sc9dna755kkclgbyl8m";
+  };
+
+  buildInputs = [ libX11 imlib2 ]
+    ++ stdenv.lib.optional enableXinerama libXinerama;
+
+  buildFlags = if enableXinerama then "xinerama=1" else "xinerama=0";
+
+  installFlags = "DESTDIR=$(out) PREFIX=";
+
+  meta = with stdenv.lib; {
+    description = "Simple X background setter inspired by imlibsetroot and feh";
+    homepage = https://github.com/ttzhou/setroot;
+    license = licenses.gpl3Plus;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 90bc9bfdc6b7..318d53e9a347 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3037,6 +3037,8 @@ let
 
   seccure = callPackage ../tools/security/seccure { };
 
+  setroot = callPackage  ../tools/X11/setroot { };
+
   setserial = callPackage ../tools/system/setserial { };
 
   seqdiag = pythonPackages.seqdiag;

From 26f80d7a6fc0e3e8142bb1d09f81f755e51710b8 Mon Sep 17 00:00:00 2001
From: Michel Kuhlmann <michel@kuhlmanns.info>
Date: Wed, 6 Jan 2016 14:06:33 +0100
Subject: [PATCH 381/884] r-modules: update list of broken packages

Closes https://github.com/NixOS/nixpkgs/pull/12181.
---
 pkgs/development/r-modules/default.nix | 48 ++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index ee3a17fdb3cc..d72f9bca03d1 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -735,6 +735,7 @@ let
     "aop" # broken build
     "apaTables" # depends on broken package r-car-2.1-0
     "apComplex" # build is broken
+    "apex" # depends on broken package Biostrings-2.38.2
     "apmsWAPP" # broken build
     "apt" # depends on broken package nlopt-2.4.2
     "ArfimaMLM" # depends on broken package nlopt-2.4.2
@@ -752,6 +753,7 @@ let
     "AssetPricing" # broken build
     "AtelieR" # broken build
     "attract" # depends on broken package AnnotationForge-1.11.3
+    "auRoc" # depends on broken package rjags-4-4
     "AutoModel" # depends on broken package r-car-2.1-0
     "babel" # broken build
     "BACA" # depends on broken package Category-2.35.1
@@ -781,6 +783,7 @@ let
     "BcDiag" # broken build
     "BCRANK" # broken build
     "bcrypt"
+    "bdynsys" # depends on broken package car-2.1
     "beadarray" # broken build
     "beadarrayFilter" # broken build
     "beadarrayMSV" # broken build
@@ -838,7 +841,9 @@ let
     "BradleyTerry2" # depends on broken package nlopt-2.4.2
     "BrailleR" # broken build
     "BRAIN" # broken build
+    "brainGraph" # build is broken
     "BrainStars" # broken build
+    "brms" # build is broken
     "BrowserViz" # broken build
     "BrowserVizDemo" # broken build
     "brr" # broken build
@@ -929,14 +934,17 @@ let
     "cnvGSA" # broken build
     "CNVPanelizer" # depends on broken cn.mops-1.15.1
     "CNVrd2" # depends on broken package Rsamtools-1.21.8
+    "coalescentMCMC" # depends on broken package Biostrings-2.38.2
     "cobindR" # depends on broken package Rsamtools-1.21.8
     "CoCiteStats" # Build Is Broken
     "codelink" # broken build
     "CODEX" # depends on broken package Rsamtools-1.21.8
+    "coefplot" # build is broken
     "cogena" # broken build
     "COHCAP" # build is broken
     "colorscience"
     "coMET" # depends on broken package Rsamtools-1.21.8
+    "CommT" # depends on broken package Biostrings-2.38.2
     "compcodeR" # broken build
     "compendiumdb" # broken build
     "compEpiTools" # depends on broken package topGO-2.21.0
@@ -947,6 +955,7 @@ let
     "convert" # broken build
     "convevol" # broken build
     "copa" # broken build
+    "CopulaDTA" # depends on broken package r-rstan-2.8.2
     "CopyNumber450k" # depends on broken package Rsamtools-1.21.8
     "copynumber" # broken build
     "CopywriteR" # depends on broken package Rsamtools-1.21.8
@@ -962,6 +971,7 @@ let
     "cpgen" # depends on broken package r-pedigreemm-0.3-3
     "cplexAPI" # build is broken
     "cpvSNP" # depends on broken package Rsamtools-1.21.8
+    "cquad" # depends on broken package car-2.1-1
     "creditr" # broken build
     "CRImage" # broken build
     "CRISPRseek" # depends on broken package Rsamtools-1.21.8
@@ -1013,6 +1023,7 @@ let
     "derfinder" # depends on broken package Rsamtools-1.21.8
     "derfinderHelper" # broken build
     "derfinderPlot" # depends on broken package Rsamtools-1.21.8
+    "DescribeDisplay" # build is broken
     "DESeq2" # broken build
     "DESeq" # broken build
     "DESP" # broken build
@@ -1030,6 +1041,7 @@ let
     "discSurv" # depends on broken package nlopt-2.4.2
     "DistatisR" # depends on broken package nlopt-2.4.2
     "diveRsity" # depends on broken package nlopt-2.4.2
+    "DJL" # depends on broken package r-car-2.1-0
     "DMRcaller" # broken build
     "DMRcate" # depends on broken package Rsamtools-1.21.8
     "DMRforPairs" # depends on broken package Rsamtools-1.21.8
@@ -1056,6 +1068,7 @@ let
     "EBarrays" # broken build
     "EBcoexpress" # broken build
     "EBImage" # broken build
+    "ecd" # depends on broken package r-polynom-1.3-8
     "ecolitk" # broken build
     "EDASeq" # depends on broken package Rsamtools-1.21.8
     "EDDA" # broken build
@@ -1090,6 +1103,7 @@ let
     "erpR" # depends on broken package rpanel-1.1-3
     "ESKNN" # depends on broken package r-caret-6.0-52
     "eulerian" # broken build
+    "euroMix" # build is broken
     "evobiR" # broken build
     "evolqg" # broken build
     "ExiMiR" # depends on broken package affyio-1.37.0
@@ -1099,6 +1113,7 @@ let
     "ExpressionView" # depends on broken package Category-2.35.1
     "extRemes" # depends on broken package nlopt-2.4.2
     "ez" # depends on broken package nlopt-2.4.2
+    "ezec" # depends on broken package drc-2.5
     "fabia" # broken build
     "facopy" # depends on broken package nlopt-2.4.2
     "factDesign" # broken build
@@ -1156,6 +1171,7 @@ let
     "frma" # depends on broken package affyio-1.37.0
     "frmaTools" # depends on broken package affyio-1.37.0
     "frmqa" # broken build
+    "FSA" # depends on broken package car-2.1-1
     "fscaret" # depends on broken package nlopt-2.4.2
     "fulltext" # broken build
     "FunciSNP" # depends on broken package snpStats-1.19.0
@@ -1223,6 +1239,8 @@ let
     "gfcanalysis" # broken build
     "GGBase" # depends on broken package snpStats-1.19.0
     "ggbio" # depends on broken package Rsamtools-1.21.8
+    "ggsubplot" # build is broken
+    "ggtern" # build is broken
     "GGtools" # depends on broken package snpStats-1.19.0
     "ggtree" # broken build
     "gimme" # depends on broken package nlopt-2.4.2
@@ -1266,6 +1284,7 @@ let
     "gRc" # broken build
     "GreyListChIP" # depends on broken package Rsamtools-1.21.8
     "gridDebug" # broken build
+    "gridGraphics" # build is broken
     "gridGraphviz" # broken build
     "gRim" # broken build
     "groHMM" # depends on broken package Rsamtools-1.21.8
@@ -1333,6 +1352,7 @@ let
     "iBMQ" # broken build
     "iccbeta" # depends on broken package nlopt-2.4.2
     "iCheck" # depends on broken package r-affy-1.48.0
+    "iClick" # depends on broken package rugarch-1.3-6
     "IdeoViz" # depends on broken package Rsamtools-1.21.8
     "idiogram" # broken build
     "IdMappingAnalysis" # broken build
@@ -1444,6 +1464,7 @@ let
     "maPredictDSC" # depends on broken package nlopt-2.4.2
     "mar1s" # broken build
     "marked" # depends on broken package nlopt-2.4.2
+    "markophylo" # depends on broken package r-Biostrings-2.38.2
     "maSigPro" # broken build
     "maskBAD" # depends on broken package affyio-1.37.0
     "massiR" # broken build
@@ -1455,6 +1476,7 @@ let
     "mbest" # depends on broken package nlopt-2.4.2
     "MBmca" # depends on broken nloptr-1.0.4
     "mBPCR" # depends on broken package affyio-1.37.0
+    "mBvs" # build is broken
     "mcaGUI" # depends on broken package Rsamtools-1.21.8
     "MCRestimate" # build is broken
     "mdgsa" # build is broken
@@ -1482,6 +1504,7 @@ let
     "metagene" # depends on broken package Rsamtools-1.21.8
     "metagenomeFeatures" # depends on broken package r-Biobase-2.30.0
     "metagenomeSeq" # broken build
+    "metaheur" # depends on broken package r-preprocomb-0.2.0
     "MetaLandSim" # broken build
     "metamisc"
     "metaMix" # build is broken
@@ -1531,6 +1554,7 @@ let
     "mitoODE" # build is broken
     "mixAK" # depends on broken package nlopt-2.4.2
     "MixedPoisson" # broken build
+    "MIXFIM" # build is broken
     "mixlm" # depends on broken package nlopt-2.4.2
     "MixMAP" # depends on broken package nlopt-2.4.2
     "MLInterfaces" # broken build
@@ -1607,6 +1631,7 @@ let
     "netbenchmark" # build is broken
     "netClass" # broken build
     "nethet" # broken build
+    "NetPreProc" # depends on broken package graph-1.48.0
     "netresponse" # broken build
     "NetSAM" # broken build
     "nettools" # depends on broken package WGCNA-1.47
@@ -1631,6 +1656,7 @@ let
     "oligoClasses" # depends on broken package affyio-1.37.0
     "oligo" # depends on broken package affyio-1.37.0
     "OmicCircos" # broken build
+    "omics" # depends on broken package lme4-1.1-10
     "OmicsMarkeR" # depends on broken package nlopt-2.4.2
     "OncoSimulR" # broken build
     "oneChannelGUI" # depends on broken package affyio-1.37.0
@@ -1707,7 +1733,9 @@ let
     "pequod" # depends on broken package nlopt-2.4.2
     "PerfMeas" # broken build
     "PGA" # depends on broken package Rsamtools-1.21.8
+    "pglm" # depends on broken package car-2.1-1
     "PGSEA" # depends on broken package annaffy-1.41.1
+    "phangorn" # depends on broken package Biostrings-2.38.2
     "PharmacoGx"
     "phenoDist" # depends on broken package Category-2.35.1
     "phenoTest" # depends on broken package Category-2.35.1
@@ -1716,6 +1744,7 @@ let
     "phreeqc" # broken build
     "phylocurve" # depends on broken package nlopt-2.4.2
     "phyloseq" # broken build
+    "PhySortR" # depends on broken package phytools-0.5-10
     "phytools" # broken build
     "piano" # broken build
     "PICS" # depends on broken package Rsamtools-1.21.8
@@ -1727,6 +1756,7 @@ let
     "plfMA" # broken build
     "plgem" # broken build
     "plier" # depends on broken package affyio-1.37.0
+    "plm" # depends on broken package car-2.1-1
     "PLPE" # broken build
     "plrs" # broken build
     "plsRbeta" # depends on broken package nlopt-2.4.2
@@ -1740,6 +1770,8 @@ let
     "Polyfit" # broken build
     "polynom" # broken build
     "pomp" # depends on broken package nlopt-2.4.2
+    "poppr" # depends on broken package  Biostrings-2.38.2
+    "popprxl" # depends on broken package Biostrings-2.38.2
     "ppiPre" # depends on broken package GOSemSim-1.27.3
     "ppiStats" # depends on broken package Category-2.35.1
     "prada" # broken build
@@ -1810,6 +1842,7 @@ let
     "RAM" # broken build
     "RamiGO" # depends on broken package RCytoscape-1.19.0
     "randPack" # broken build
+    "RANKS" # depends on broken package graph-1.48.0
     "RapidPolygonLookup" # depends on broken package PBSmapping-2.69.76
     "RAPIDR" # depends on broken package Rsamtools-1.21.8
     "RareVariantVis" # depends on broken VariantAnnotation-1.15.19
@@ -1830,6 +1863,7 @@ let
     "rCGH" # depends on broken package r-affy-1.47.1
     "Rchemcpp" # depends on broken package ChemmineR-2.21.7
     "rchess" # depends on broken package r-V8-0.9
+    "Rchoice" # depends on broken package car-2.1
     "RchyOptimyx" # broken build
     "Rcmdr" # depends on broken package nlopt-2.4.2
     "RcmdrMisc" # depends on broken package nlopt-2.4.2
@@ -1898,6 +1932,7 @@ let
     "regioneR" # depends on broken package Rsamtools-1.21.8
     "regionReport" # depends on broken package Rsamtools-1.21.8
     "regRSM" # broken build
+    "REndo" # depends on broken package AER-1.2-4
     "repijson" # depends on broken package V8-0.6
     "Repitools" # depends on broken package affyio-1.37.0
     "ReportingTools" # depends on broken package Category-2.35.1
@@ -1935,6 +1970,7 @@ let
     "rminer" # depends on broken package nlopt-2.4.2
     "RmiR" # Build Is Broken
     "Rmosek" # build is broken
+    "rmumps" # build is broken
     "RMySQL" # broken build
     "RNAinteract" # depends on broken package Category-2.35.1
     "RNAither" # depends on broken package nlopt-2.4.2
@@ -1979,6 +2015,7 @@ let
     "RSeed" # broken build
     "rSFFreader" # depends on broken package Rsamtools-1.21.8
     "Rsomoclu"
+    "rstan" # build is broken
     "RStoolbox" # depends on broken package r-caret-6.0-52
     "Rsubread" # Build Is Broken
     "RSVSim" # depends on broken package Rsamtools-1.21.8
@@ -2040,6 +2077,7 @@ let
     "SeqFeatR" # broken build
     "SeqGrapheR" # Build Is Broken
     "SeqGSEA" # broken build
+    "seqHMM" # depends on broken package nloptr-1.0.4
     "seqPattern" # broken build
     "seqplots" # depends on broken package Rsamtools-1.21.8
     "seqTools" # build is broken
@@ -2112,6 +2150,7 @@ let
     "spliceR" # depends on broken package Rsamtools-1.21.8
     "spliceSites" # broken build
     "SplicingGraphs" # depends on broken package Rsamtools-1.21.8
+    "splm" # depends on broken package car-2.1-1
     "spocc" # depends on broken package V8-0.6
     "spoccutils" # depends on broken spocc-0.3.0
     "spsann" # depends on broken package r-pedometrics-0.6-2
@@ -2142,9 +2181,12 @@ let
     "Surrogate" # depends on broken package nlopt-2.4.2
     "Sushi" # broken build
     "sva" # broken build
+    "svglite" # depends on broken package gdtools-0.0.6
     "SVM2CRM" # depends on broken package Rsamtools-1.21.8
     "sybilSBML" # build is broken
     "synapter" # depends on broken package affyio-1.37.0
+    "synchronicity" # build is broken
+    "synthpop" # build is broken
     "systemfit" # depends on broken package nlopt-2.4.2
     "systemPipeR" # depends on broken package AnnotationForge-1.11.3
     "TargetSearch" # depends on broken package mzR-2.3.1
@@ -2157,12 +2199,14 @@ let
     "TDMR" # depends on broken package nlopt-2.4.2
     "TED" # broken build
     "TEQC" # depends on broken package Rsamtools-1.21.8
+    "TextoMineR"  # depends on broken package FactoMineR-1.31.4
     "TFBSTools" # depends on broken package DirichletMultinomial-1.11.1
     "tigerstats" # depends on broken package nlopt-2.4.2
     "tigre" # broken build
     "tilingArray" # depends on broken package affyio-1.37.0
     "timecourse" # broken build
     "timeSeq" # broken build
+    "timetree" # depends on broken package Biostrings-2.38.2
     "TIN" # depends on broken package WGCNA-1.47
     "TitanCNA" # depends on broken package Rsamtools-1.21.8
     "TKF" # broken build
@@ -2180,6 +2224,7 @@ let
     "tRanslatome" # depends on broken package GOSemSim-1.27.3
     "TransView" # depends on broken package Rsamtools-1.21.8
     "traseR"
+    "treescape" # depends on broken package Biostrings-2.38.2
     "triform" # broken build
     "trigger" # broken build
     "TriMatch" # depends on broken package nlopt-2.4.2
@@ -2206,6 +2251,7 @@ let
     "V8" # build is broken
     "VanillaICE" # depends on broken package affyio-1.37.0
     "varComp" # depends on broken package r-lme4-1.1-9
+    "varian" # build is broken
     "variancePartition" # depends on broken package lme4-1.1-8
     "VariantAnnotation" # depends on broken package Rsamtools-1.21.8
     "VariantFiltering" # depends on broken package Rsamtools-1.21.8
@@ -2223,6 +2269,7 @@ let
     "wavClusteR" # depends on broken package Rsamtools-1.21.8
     "waveTiling" # depends on broken package affyio-1.37.0
     "webbioc" # depends on broken package affyio-1.37.0
+    "webp" # build is broken
     "wfe" # depends on broken package nlopt-2.4.2
     "WGCNA" # build is broken
     "wgsea" # depends on broken package snpStats-1.19.0
@@ -2236,6 +2283,7 @@ let
     "xps" # build is broken
     "XVector" # broken build
     "yaqcaffy" # depends on broken package affyio-1.37.0
+    "yCrypticRNAs" # depends on broken package biomaRt-2.26.1
     "ZeligChoice" # depends on broken package r-AER-1.2-4
     "Zelig" # depends on broken package r-AER-1.2-4
     "ZeligMultilevel" # depends on broken package nlopt-2.4.2

From a225a650bf8659ee30c535d8160f3f5288284837 Mon Sep 17 00:00:00 2001
From: Asko Soukka <asko.soukka@iki.fi>
Date: Mon, 29 Jun 2015 03:42:31 +0300
Subject: [PATCH 382/884] R: fix Darwin build

Merged manually from https://github.com/NixOS/nixpkgs/pull/10623.
---
 pkgs/applications/science/math/R/default.nix  | 30 ++++++++++++++-----
 pkgs/development/r-modules/default.nix        |  5 +++-
 .../development/r-modules/generic-builder.nix |  8 +++--
 pkgs/top-level/all-packages.nix               |  2 ++
 4 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index 183a1f503753..edbf8a843a5a 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, bzip2, gfortran, libX11, libXmu, libXt
-, libjpeg, libpng, libtiff, ncurses, pango, pcre, perl, readline, tcl
-, texLive, tk, xz, zlib, less, texinfo, graphviz, icu, pkgconfig, bison
-, imake, which, jdk, openblas, curl
+{ stdenv, fetchurl, bzip2, gfortran, libX11, libXmu, libXt, libjpeg, libpng
+, libtiff, ncurses, pango, pcre, perl, readline, tcl, texLive, tk, xz, zlib
+, less, texinfo, graphviz, icu, pkgconfig, bison, imake, which, jdk, openblas
+, curl, Cocoa, Foundation, cf-private, libobjc, tzdata
 , withRecommendedPackages ? true
 }:
 
@@ -14,10 +14,11 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ bzip2 gfortran libX11 libXmu libXt
-    libXt libjpeg libpng libtiff ncurses pango pcre perl readline tcl
-    texLive tk xz zlib less texinfo graphviz icu pkgconfig bison imake
-    which jdk openblas curl
-  ];
+    libXt libjpeg libpng libtiff ncurses pango pcre perl readline
+    texLive xz zlib less texinfo graphviz icu pkgconfig bison imake
+    which jdk openblas curl ]
+    ++ stdenv.lib.optionals (!stdenv.isDarwin) [ tcl tk ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation cf-private libobjc ];
 
   patches = [ ./no-usr-local-search-paths.patch ];
 
@@ -48,10 +49,23 @@ stdenv.mkDerivation rec {
       LDFLAGS="-L${gfortran.cc}/lib"
       RANLIB=$(type -p ranlib)
       R_SHELL="${stdenv.shell}"
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+      --without-tcltk
+      --without-aqua
+      --disable-R-framework
+      CC="clang"
+      CXX="clang++"
+      OBJC="clang"
+  '' + ''
     )
     echo "TCLLIBPATH=${tk}/lib" >>etc/Renviron.in
   '';
 
+  postConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
+    sed -i 's|/usr/share/zoneinfo|${tzdata}/share/zoneinfo|g' src/library/base/R/datetime.R
+    sed -i 's|getenv("R_SHARE_DIR")|"${tzdata}/share"|g' src/extra/tzone/localtime.c
+  '';
+
   installTargets = [ "install" "install-info" "install-pdf" ];
 
   doCheck = true;
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index d72f9bca03d1..68e9fc6b4585 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -5,7 +5,10 @@
 let
   inherit (pkgs) fetchurl stdenv lib;
 
-  buildRPackage = pkgs.callPackage ./generic-builder.nix { inherit R; };
+  buildRPackage = pkgs.callPackage ./generic-builder.nix {
+    inherit R;
+    inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa Foundation;
+  };
 
   # Generates package templates given per-repository settings
   #
diff --git a/pkgs/development/r-modules/generic-builder.nix b/pkgs/development/r-modules/generic-builder.nix
index 45c377635c90..62883af2c737 100644
--- a/pkgs/development/r-modules/generic-builder.nix
+++ b/pkgs/development/r-modules/generic-builder.nix
@@ -1,10 +1,14 @@
-{ stdenv, R, xvfb_run, utillinux }:
+{ stdenv, R, libcxx, xvfb_run, utillinux, Cocoa, Foundation }:
 
 { name, buildInputs ? [], ... } @ attrs:
 
 stdenv.mkDerivation ({
   buildInputs = buildInputs ++ [R] ++
-                stdenv.lib.optionals attrs.requireX [utillinux xvfb_run];
+                stdenv.lib.optionals attrs.requireX [utillinux xvfb_run] ++
+                stdenv.lib.optionals stdenv.isDarwin [Cocoa Foundation];
+
+  NIX_CFLAGS_COMPILE =
+    stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
 
   configurePhase = ''
     runHook preConfigure
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index acbb0f68e432..ddf1e999b862 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9078,6 +9078,8 @@ let
     };
     openblas = openblasCompat;
     withRecommendedPackages = false;
+    inherit (darwin.apple_sdk.frameworks) Cocoa Foundation;
+    inherit (darwin) cf-private libobjc;
   };
 
   rWrapper = callPackage ../development/r-modules/wrapper.nix {

From 36e7b376ebeef5ca0988fae9c6592784586763bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 7 Jan 2016 00:17:59 +0100
Subject: [PATCH 383/884] pciutils: minor update 3.4.0 -> 3.4.1

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

diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix
index 447b1cd63b94..7c2365885444 100644
--- a/pkgs/tools/system/pciutils/default.nix
+++ b/pkgs/tools/system/pciutils/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, zlib, kmod, which }:
 
 stdenv.mkDerivation rec {
-  name = "pciutils-3.4.0"; # with database from 2015-09
+  name = "pciutils-3.4.1"; # with database from 2016-01
 
   src = fetchurl {
     url = "mirror://kernel/software/utils/pciutils/${name}.tar.xz";
-    sha256 = "15liffqvdwbpza210wfqy2y135dvg7sbyqr7gvhyjllgspv8z2gq";
+    sha256 = "0am8hiv435h2dayclnkdk8qjlpj08m4djf6sv15n9l84av658mc6";
   };
 
   buildInputs = [ pkgconfig zlib kmod which ];

From beac2ae9abcc19863f9e39d303b52f7588da7b8b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 6 Jan 2016 17:29:46 -0600
Subject: [PATCH 384/884] kde5: plasma-5.5.2 -> plasma-5.5.3

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

diff --git a/pkgs/desktops/plasma-5.5/fetchsrcs.sh b/pkgs/desktops/plasma-5.5/fetchsrcs.sh
index 48ecc6ff469f..7d80ec7890d6 100755
--- a/pkgs/desktops/plasma-5.5/fetchsrcs.sh
+++ b/pkgs/desktops/plasma-5.5/fetchsrcs.sh
@@ -4,7 +4,7 @@
 set -x
 
 # The trailing slash at the end is necessary!
-RELEASE_URL="http://download.kde.org/stable/plasma/5.5.2/"
+RELEASE_URL="http://download.kde.org/stable/plasma/5.5.3/"
 EXTRA_WGET_ARGS='-A *.tar.xz'
 
 mkdir tmp; cd tmp
diff --git a/pkgs/desktops/plasma-5.5/srcs.nix b/pkgs/desktops/plasma-5.5/srcs.nix
index 107946da8a2b..a96450b482db 100644
--- a/pkgs/desktops/plasma-5.5/srcs.nix
+++ b/pkgs/desktops/plasma-5.5/srcs.nix
@@ -3,307 +3,307 @@
 
 {
   bluedevil = {
-    version = "5.5.2";
+    version = "5.5.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.2/bluedevil-5.5.2.tar.xz";
-      sha256 = "0z13vj9ybdilsixnn44wixr54f50lbbq52ryjfc4bxllycv9fzjf";
-      name = "bluedevil-5.5.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.3/bluedevil-5.5.3.tar.xz";
+      sha256 = "079bj1s86w9xycijs7imfwkhbg6k8sw22dh6p52q0kzsbz4sh7mk";
+      name = "bluedevil-5.5.3.tar.xz";
     };
   };
   breeze = {
-    version = "5.5.2";
+    version = "5.5.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.2/breeze-5.5.2.tar.xz";
-      sha256 = "171n9i642i2p1a8sd5pjamm41phbih5f244f1f5f6h2r29bpccgr";
-      name = "breeze-5.5.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.3/breeze-5.5.3.tar.xz";
+      sha256 = "1kaw4mv86lw0igqhbl7v60k11s9az2cj14rs6yqrl96k2ki3931x";
+      name = "breeze-5.5.3.tar.xz";
     };
   };
   breeze-gtk = {
-    version = "5.5.2";
+    version = "5.5.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.2/breeze-gtk-5.5.2.tar.xz";
-      sha256 = "1zlxdb6rlg7r4dfd87l9p0js52c9k190l8aj2zd9hhw2wyc388x0";
-      name = "breeze-gtk-5.5.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.3/breeze-gtk-5.5.3.tar.xz";
+      sha256 = "0ph3n77s37rklcjmh5g9rj047hmiym6h4dn27zxmfnfybr52zfjv";
+      name = "breeze-gtk-5.5.3.tar.xz";
     };
   };
   discover = {
-    version = "5.5.2";
+    version = "5.5.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.2/discover-5.5.2.tar.xz";
-      sha256 = "13wm838yqhl1xw4wp93b0avfacp2zgg9rvml1hm6ksfbbyh8xxj0";
-      name = "discover-5.5.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.3/discover-5.5.3.tar.xz";
+      sha256 = "0qhhgnjpwdir3y6i3z4cvfvgigbrmsblwkxhsafg015ralklgcnd";
+      name = "discover-5.5.3.tar.xz";
     };
   };
   kde-cli-tools = {
-    version = "5.5.2";
+    version = "5.5.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.2/kde-cli-tools-5.5.2.tar.xz";
-      sha256 = "0di7qxifrck1d1y24dypvgd3b60pkddlk2nnf6m230m0qacw6kk6";
-      name = "kde-cli-tools-5.5.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.3/kde-cli-tools-5.5.3.tar.xz";
+      sha256 = "0aw936amj3jigi3n8ldhlihmp4v9m7mbjbxlhp8s7643963f3n3w";
+      name = "kde-cli-tools-5.5.3.tar.xz";
     };
   };
   kdecoration = {
-    version = "5.5.2";
+    version = "5.5.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.2/kdecoration-5.5.2.tar.xz";
-      sha256 = "1g9bvkqvzy8h5l79qcm3zf4s146fld4la3ri83bbsfd9my6lrwph";
-      name = "kdecoration-5.5.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.3/kdecoration-5.5.3.tar.xz";
+      sha256 = "1lhzbk9bwn7biilqbk7n8dd453a7580n50571lyxxr6b7kfs6ikv";
+      name = "kdecoration-5.5.3.tar.xz";
     };
   };
   kde-gtk-config = {
-    version = "5.5.2";
+    version = "5.5.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.2/kde-gtk-config-5.5.2.tar.xz";
-      sha256 = "0pd8a36ggdrp145mxk28n33r8fd436v74jq8xzvq0f2gfh4lcih8";
-      name = "kde-gtk-config-5.5.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.3/kde-gtk-config-5.5.3.tar.xz";
+      sha256 = "0dk2gda8qc1mg8fra3lgb4mizl5q2bx8zx5j2w3r8gqrw2g6vk5v";
+      name = "kde-gtk-config-5.5.3.tar.xz";
     };
   };
   kdeplasma-addons = {
-    version = "5.5.2";
+    version = "5.5.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.2/kdeplasma-addons-5.5.2.tar.xz";
-      sha256 = "0lqhgqy25bijpm62hlzn2ksia0dldvvdf4s9ax8b2g4jq114wrl4";
-      name = "kdeplasma-addons-5.5.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.3/kdeplasma-addons-5.5.3.tar.xz";
+      sha256 = "0i2j5m51dlbrh54ndspk9zl4ggwpfampsbdjs6kzwisxa4ksyz1s";
+      name = "kdeplasma-addons-5.5.3.tar.xz";
     };
   };
   kgamma5 = {
-    version = "5.5.2";
+    version = "5.5.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.2/kgamma5-5.5.2.tar.xz";
-      sha256 = "0lcz7frb3134k7pvll7di1x08bs8q1cxr4hy0d1danns6jj19w6q";
-      name = "kgamma5-5.5.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.3/kgamma5-5.5.3.tar.xz";
+      sha256 = "0pm41wfihayp980z4zb5jdsh7qvyd93bql36jzicv8mmj2z7p3g4";
+      name = "kgamma5-5.5.3.tar.xz";
     };
   };
   khelpcenter = {
-    version = "5.5.2";
+    version = "5.5.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.2/khelpcenter-5.5.2.tar.xz";
-      sha256 = "1ypy0p9ld9gy06z8r19lcysbzbg202m3ljdmzkzixvr8173lg01x";
-      name = "khelpcenter-5.5.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.3/khelpcenter-5.5.3.tar.xz";
+      sha256 = "0gazbv5z1145zv0d7zrm41byqs9blis2x6ij2yha7h8i0vf748rc";
+      name = "khelpcenter-5.5.3.tar.xz";
     };
   };
   khotkeys = {
-    version = "5.5.2";
+    version = "5.5.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.2/khotkeys-5.5.2.tar.xz";
-      sha256 = "0dcdh0hxhlqaip3vk02npw3bk2pgpsrfhjr80k8bmhiy9g95z7ab";
-      name = "khotkeys-5.5.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.3/khotkeys-5.5.3.tar.xz";
+      sha256 = "0mmszjnwcza30b5npd6ddkj88g4zy3nhnpw7bdghz053cn1lb1m0";
+      name = "khotkeys-5.5.3.tar.xz";
     };
   };
   kinfocenter = {
-    version = "5.5.2";
+    version = "5.5.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.2/kinfocenter-5.5.2.tar.xz";
-      sha256 = "1wg8yv096glby3ds822b643x0lrhmf67karr1xcd98xr5l188ngw";
-      name = "kinfocenter-5.5.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.3/kinfocenter-5.5.3.tar.xz";
+      sha256 = "1c5bbvkfmdizkmd4n0mqbg6mpixkxvmahprsrlczh4fyd12j1r00";
+      name = "kinfocenter-5.5.3.tar.xz";
     };
   };
   kmenuedit = {
-    version = "5.5.2";
+    version = "5.5.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.2/kmenuedit-5.5.2.tar.xz";
-      sha256 = "1gqb2wrb1ahdqljm451w9kbyl0mmqm7axrpnf4hblh4453ym19wr";
-      name = "kmenuedit-5.5.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.3/kmenuedit-5.5.3.tar.xz";
+      sha256 = "1vihqqc431na4b29hliflcv61lhw1r43l0m4bficcy0l6xkmiyxz";
+      name = "kmenuedit-5.5.3.tar.xz";
     };
   };
   kscreen = {
-    version = "5.5.2";
+    version = "5.5.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.2/kscreen-5.5.2.tar.xz";
-      sha256 = "0kqf296r6gxfq0cz2s8yg05jazb3048fxbm2v0b9mv235c5j5xap";
-      name = "kscreen-5.5.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.3/kscreen-5.5.3.tar.xz";
+      sha256 = "12r4k9ihlx62wgra7aw3pj5gjscg3jw1akkjrw9dkjy1vbpdxmpg";
+      name = "kscreen-5.5.3.tar.xz";
     };
   };
   kscreenlocker = {
-    version = "5.5.2";
+    version = "5.5.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.2/kscreenlocker-5.5.2.tar.xz";
-      sha256 = "1yknbrxnk162jvi8da4m23qxcwxqm1jsa1l1yxw4nj6rdz3jl6dm";
-      name = "kscreenlocker-5.5.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.3/kscreenlocker-5.5.3.tar.xz";
+      sha256 = "1crgnq6hwi7hy1yx2brs8hln57ib889ifz5ba72v9j4wk0439p49";
+      name = "kscreenlocker-5.5.3.tar.xz";
     };
   };
   ksshaskpass = {
-    version = "5.5.2";
+    version = "5.5.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.2/ksshaskpass-5.5.2.tar.xz";
-      sha256 = "0dq1qifmq3qdb6ia19n22wrxv5pndl77hlr2pyn2i67rz19zxywf";
-      name = "ksshaskpass-5.5.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.3/ksshaskpass-5.5.3.tar.xz";
+      sha256 = "14xlvbb411vc3rfkdfcyx7jdgdnaf9gwy6xd6bivvdlj9hq2nikb";
+      name = "ksshaskpass-5.5.3.tar.xz";
     };
   };
   ksysguard = {
-    version = "5.5.2";
+    version = "5.5.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.2/ksysguard-5.5.2.tar.xz";
-      sha256 = "0c1iaimpwnh6naryj7apqxkdcaj5wmyir1yvlpr5v9wp49gkn2nx";
-      name = "ksysguard-5.5.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.3/ksysguard-5.5.3.tar.xz";
+      sha256 = "1y5x3n1rqncnzvs7j1icb4k3i2254l5mvvw6rrr6ymd1mvl8h1hx";
+      name = "ksysguard-5.5.3.tar.xz";
     };
   };
   kwallet-pam = {
-    version = "5.5.2";
+    version = "5.5.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.2/kwallet-pam-5.5.2.tar.xz";
-      sha256 = "0gmk2jm1svvy1jxr5nsq14gscalzknrmzyar858nijyc9k5wb1n0";
-      name = "kwallet-pam-5.5.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.3/kwallet-pam-5.5.3.tar.xz";
+      sha256 = "0nlzrvdzf339pjcvm359brf0dmlx983gamjr75wm4277hhxwmphd";
+      name = "kwallet-pam-5.5.3.tar.xz";
     };
   };
   kwayland = {
-    version = "5.5.2";
+    version = "5.5.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.2/kwayland-5.5.2.tar.xz";
-      sha256 = "1i1gx3f1ygh9l1hwh4jcipjzl9b00issqk22i1li3054cb45g0mv";
-      name = "kwayland-5.5.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.3/kwayland-5.5.3.tar.xz";
+      sha256 = "0jmv4zphy2fb1pnkxcgsy1qcd926llqgqcdqn0kiwlxaznll0lnz";
+      name = "kwayland-5.5.3.tar.xz";
     };
   };
   kwayland-integration = {
-    version = "5.5.2";
+    version = "5.5.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.2/kwayland-integration-5.5.2.tar.xz";
-      sha256 = "09czrmyz75mkpaq9ca8n4w2b9x15dhw1l4g2vyqzarc8y5id4bnv";
-      name = "kwayland-integration-5.5.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.3/kwayland-integration-5.5.3.tar.xz";
+      sha256 = "1yyp8vq6b544gbphpfcdayn1n0g4i3lyb5n1pnxb71nvv2j5ji95";
+      name = "kwayland-integration-5.5.3.tar.xz";
     };
   };
   kwin = {
-    version = "5.5.2";
+    version = "5.5.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.2/kwin-5.5.2.tar.xz";
-      sha256 = "0cly3mnb7d64h0pcfiqhcqs7p9plwsh0zb7kgz7ahcahqqgzbx4p";
-      name = "kwin-5.5.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.3/kwin-5.5.3.tar.xz";
+      sha256 = "1hjgxm8l25vdc7zfv6kivgdwhbjvjfia7lqdsv8r4rf110f4an70";
+      name = "kwin-5.5.3.tar.xz";
     };
   };
   kwrited = {
-    version = "5.5.2";
+    version = "5.5.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.2/kwrited-5.5.2.tar.xz";
-      sha256 = "0fm6bvihyksiizxdp3alpal19c897pjmhqp2cyf7z9aahkyhpgh8";
-      name = "kwrited-5.5.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.3/kwrited-5.5.3.tar.xz";
+      sha256 = "1bggps8icam3ngkzxz6hkf8r5slz4x25wd1c47651y8prvqdagx9";
+      name = "kwrited-5.5.3.tar.xz";
     };
   };
   libkscreen = {
-    version = "5.5.2";
+    version = "5.5.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.2/libkscreen-5.5.2.tar.xz";
-      sha256 = "02aaaqzblahn477m07xzrk4vc21gc9szhj9aj780qyvpng8jifn2";
-      name = "libkscreen-5.5.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.3/libkscreen-5.5.3.tar.xz";
+      sha256 = "04gm7sqpij0mnivrhx7n2y0y1dpsffsvbn5l5l754q5bis6f182y";
+      name = "libkscreen-5.5.3.tar.xz";
     };
   };
   libksysguard = {
-    version = "5.5.2";
+    version = "5.5.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.2/libksysguard-5.5.2.tar.xz";
-      sha256 = "1z4riwjb3i9wv3zd34y5cv1s2pb3x1v6kayl5bq89v8pyqqkp5n5";
-      name = "libksysguard-5.5.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.3/libksysguard-5.5.3.tar.xz";
+      sha256 = "1p35agppwplfz396irdprsjgqjqpin4vbcigzylxflbvp7yp5sgl";
+      name = "libksysguard-5.5.3.tar.xz";
     };
   };
   milou = {
-    version = "5.5.2";
+    version = "5.5.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.2/milou-5.5.2.tar.xz";
-      sha256 = "180i93zlypqnsw5105xqgfjnvg024z7i7qxhv7snidzm9yrc3f0q";
-      name = "milou-5.5.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.3/milou-5.5.3.tar.xz";
+      sha256 = "0sddp3x8hm5d300bxn2m6j0vvy49kw8hidqmc7yim5gvimipzn92";
+      name = "milou-5.5.3.tar.xz";
     };
   };
   oxygen = {
-    version = "5.5.2";
+    version = "5.5.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.2/oxygen-5.5.2.tar.xz";
-      sha256 = "0q9mbazync4skgkz595ccjznndkv6v3qwhhyx2ycs73s2v4380kp";
-      name = "oxygen-5.5.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.3/oxygen-5.5.3.tar.xz";
+      sha256 = "1rynv9scc4pm682imjc8w8czcf4yryzkwvsviyl86iqx1v14jydn";
+      name = "oxygen-5.5.3.tar.xz";
     };
   };
   plasma-desktop = {
-    version = "5.5.2";
+    version = "5.5.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.2/plasma-desktop-5.5.2.tar.xz";
-      sha256 = "08c4hmnmwzy67cp01p001mil9cvf0gx37dxf0iwghxw7b7nzmxnf";
-      name = "plasma-desktop-5.5.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.3/plasma-desktop-5.5.3.tar.xz";
+      sha256 = "1w5bphy231722ly2f8ybpgdck0sbrlibjjxvkby2r2pynzsgbr0m";
+      name = "plasma-desktop-5.5.3.tar.xz";
     };
   };
   plasma-mediacenter = {
-    version = "5.5.2";
+    version = "5.5.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.2/plasma-mediacenter-5.5.2.tar.xz";
-      sha256 = "1019nbgb6f37bn9ncbjzmybrcfi187sf0rg0mxpvrhh1imdfxwsj";
-      name = "plasma-mediacenter-5.5.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.3/plasma-mediacenter-5.5.3.tar.xz";
+      sha256 = "15sisk0pyggrirfkvbq2qcy17m1jgxn43vznfnbzp8dp9yrz0wbv";
+      name = "plasma-mediacenter-5.5.3.tar.xz";
     };
   };
   plasma-nm = {
-    version = "5.5.2";
+    version = "5.5.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.2/plasma-nm-5.5.2.tar.xz";
-      sha256 = "00fx5m6avbq14wkmd6jjd1wda8rznav2hs5x70jx9dnkl1c6463x";
-      name = "plasma-nm-5.5.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.3/plasma-nm-5.5.3.tar.xz";
+      sha256 = "1ijqx0aphdhk5zffy4mnc1lbkkzdhj0qng0v4978kkxxjdq7g26q";
+      name = "plasma-nm-5.5.3.tar.xz";
     };
   };
   plasma-pa = {
-    version = "5.5.2";
+    version = "5.5.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.2/plasma-pa-5.5.2.tar.xz";
-      sha256 = "0nikv5ms1dnyf4w41c97gsx2wvy7da3qz7hddx3xnkzk3hh596fi";
-      name = "plasma-pa-5.5.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.3/plasma-pa-5.5.3.tar.xz";
+      sha256 = "0hpdf9vhsys0jbv8fya2dqdnig8bvbnaxp01x0zwa59lxb6b3czf";
+      name = "plasma-pa-5.5.3.tar.xz";
     };
   };
   plasma-sdk = {
-    version = "5.5.2";
+    version = "5.5.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.2/plasma-sdk-5.5.2.tar.xz";
-      sha256 = "0ain65582dz075xjfq8kh7rkcf8hzbr7fdw4hifmcjfp4lh0da4g";
-      name = "plasma-sdk-5.5.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.3/plasma-sdk-5.5.3.tar.xz";
+      sha256 = "0cqg8a3gmmifgicca7fg559didqmr7hgpfybw7j8rlibsh8wdlk5";
+      name = "plasma-sdk-5.5.3.tar.xz";
     };
   };
   plasma-workspace = {
-    version = "5.5.2";
+    version = "5.5.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.2/plasma-workspace-5.5.2.tar.xz";
-      sha256 = "00nmfq864lkj03z82cgfczxhijafhd9nxiw0cprs6x9kvp1d3ylc";
-      name = "plasma-workspace-5.5.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.3/plasma-workspace-5.5.3.tar.xz";
+      sha256 = "0wpsmw1rbidr8fc4zcfp84h05gs6cfxcl6cn0azb8lc2zh3v4ja9";
+      name = "plasma-workspace-5.5.3.tar.xz";
     };
   };
   plasma-workspace-wallpapers = {
-    version = "5.5.2";
+    version = "5.5.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.2/plasma-workspace-wallpapers-5.5.2.tar.xz";
-      sha256 = "11gymzyhszb9192z0q54z6dlgxqivixj2grhynj2096r4c8jb1rk";
-      name = "plasma-workspace-wallpapers-5.5.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.3/plasma-workspace-wallpapers-5.5.3.tar.xz";
+      sha256 = "1i1gysw489spvpbfr654yncf8yjpg29aggk21ykmmmyc2qpz1jxp";
+      name = "plasma-workspace-wallpapers-5.5.3.tar.xz";
     };
   };
   polkit-kde-agent = {
-    version = "1-5.5.2";
+    version = "1-5.5.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.2/polkit-kde-agent-1-5.5.2.tar.xz";
-      sha256 = "0jmsmx41ixksl1cja295c06agpcs4hn4c0jvhc30b5l9i7nf79j9";
-      name = "polkit-kde-agent-1-5.5.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.3/polkit-kde-agent-1-5.5.3.tar.xz";
+      sha256 = "1hh3i0chc817bvxaydb2ak1wq65wzrqyj7dl3q1wl4l7a4yyh8ab";
+      name = "polkit-kde-agent-1-5.5.3.tar.xz";
     };
   };
   powerdevil = {
-    version = "5.5.2";
+    version = "5.5.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.2/powerdevil-5.5.2.tar.xz";
-      sha256 = "1l5765izd4p6i5q1f2r77ra0fip8fb0c1pl5bxg45sg3hnnaxk21";
-      name = "powerdevil-5.5.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.3/powerdevil-5.5.3.tar.xz";
+      sha256 = "0ilx44rhy0z8c0kv439nypr5rrs7wk30a1hnhdzssqbhc4d43kzy";
+      name = "powerdevil-5.5.3.tar.xz";
     };
   };
   sddm-kcm = {
-    version = "5.5.2";
+    version = "5.5.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.2/sddm-kcm-5.5.2.tar.xz";
-      sha256 = "0fcyhndi1hh17cpbadm8alfhrkal847h4a7rx2rs8rrgypxdzhf9";
-      name = "sddm-kcm-5.5.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.3/sddm-kcm-5.5.3.tar.xz";
+      sha256 = "0gijb75bzqih7h4m6r6kqg16p5l7rj4nb1cc959gqqkkqxghgfd0";
+      name = "sddm-kcm-5.5.3.tar.xz";
     };
   };
   systemsettings = {
-    version = "5.5.2";
+    version = "5.5.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.2/systemsettings-5.5.2.tar.xz";
-      sha256 = "03y6mhfy3ax12g2s937w88hd88ln23asvcbsl52fy8h37b9vlnba";
-      name = "systemsettings-5.5.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.3/systemsettings-5.5.3.tar.xz";
+      sha256 = "1wcbgs10shhgip1dxz80wxpgxifrcal863h6ygzpqwj9jb53dj7x";
+      name = "systemsettings-5.5.3.tar.xz";
     };
   };
   user-manager = {
-    version = "5.5.2";
+    version = "5.5.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.2/user-manager-5.5.2.tar.xz";
-      sha256 = "0lvl8dhy8vymngb4p5x4y7miih8g004ii237lwrxv254ddv60azn";
-      name = "user-manager-5.5.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.3/user-manager-5.5.3.tar.xz";
+      sha256 = "1v421xfy089m6kj7x5175lvvsaqjk9y9zr7s33jsnhg8zd1hwwcm";
+      name = "user-manager-5.5.3.tar.xz";
     };
   };
 }

From 63bfe20b7253fa579ca1c35d07d1d790475f74c5 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Thu, 7 Jan 2016 03:06:10 +0000
Subject: [PATCH 385/884] security.audit: add NixOS module

Part of the way towards #11864. We still don't have the auditd
userland logging daemon, but journald also tracks audit logs so we
can already use this.
---
 nixos/modules/module-list.nix    |   1 +
 nixos/modules/security/audit.nix | 109 +++++++++++++++++++++++++++++++
 2 files changed, 110 insertions(+)
 create mode 100644 nixos/modules/security/audit.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index bbcb8d593cec..81daad099a8b 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -84,6 +84,7 @@
   ./security/acme.nix
   ./security/apparmor.nix
   ./security/apparmor-suid.nix
+  ./security/audit.nix
   ./security/ca.nix
   ./security/duosec.nix
   ./security/grsecurity.nix
diff --git a/nixos/modules/security/audit.nix b/nixos/modules/security/audit.nix
new file mode 100644
index 000000000000..3aa31e079073
--- /dev/null
+++ b/nixos/modules/security/audit.nix
@@ -0,0 +1,109 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.security.audit;
+
+  failureModes = {
+    silent = 0;
+    printk = 1;
+    panic  = 2;
+  };
+
+  # TODO: it seems like people like their rules to be somewhat secret, yet they will not be if
+  # put in the store like this. At the same time, it doesn't feel like a huge deal and working
+  # around that is a pain so I'm leaving it like this for now.
+  startScript = pkgs.writeScript "audit-start" ''
+    #!${pkgs.stdenv.shell} -eu
+    # Clear out any rules we may start with
+    auditctl -D
+
+    # Put the rules in a temporary file owned and only readable by root
+    rulesfile="$(mktemp)"
+    ${concatMapStrings (x: "echo '${x}' >> $rulesfile\n") cfg.rules}
+
+    # Apply the requested rules
+    auditctl -R "$rulesfile"
+
+    # Enable and configure auditing
+    auditctl \
+      -e ${if cfg.enable == "lock" then "2" else "1"} \
+      -b ${toString cfg.backlogLimit} \
+      -f ${toString failureModes.${cfg.failureMode}} \
+      -r ${toString cfg.rateLimit}
+  '';
+
+  stopScript = pkgs.writeScript "audit-stop" ''
+    #!${pkgs.stdenv.shell} -eu
+    # Clear the rules
+    auditctl -D
+
+    # Disable auditing
+    auditctl -e 0
+  '';
+in {
+  options = {
+    security.audit = {
+      enable = mkOption {
+        type        = types.enum [ false true "lock" ];
+        default     = true; # The kernel seems to enable it by default with no rules anyway
+        description = ''
+          Whether to enable the Linux audit system. The special `lock' value can be used to
+          enable auditing and prevent disabling it until a restart. Be careful about locking
+          this, as it will prevent you from changing your audit configuration until you
+          restart. If possible, test your configuration using build-vm beforehand.
+        '';
+      };
+
+      failureMode = mkOption {
+        type        = types.enum [ "silent" "printk" "panic" ];
+        default     = "printk";
+        description = "How to handle critical errors in the auditing system";
+      };
+
+      backlogLimit = mkOption {
+        type        = types.int;
+        default     = 64; # Apparently the kernel default
+        description = ''
+          The maximum number of outstanding audit buffers allowed; exceeding this is
+          considered a failure and handled in a manner specified by failureMode.
+        '';
+      };
+
+      rateLimit = mkOption {
+        type        = types.int;
+        default     = 0;
+        description = ''
+          The maximum messages per second permitted before triggering a failure as
+          specified by failureMode. Setting it to zero disables the limit.
+        '';
+      };
+
+      rules = mkOption {
+        type        = types.listOf types.str; # (types.either types.str (types.submodule rule));
+        default     = [];
+        example     = [ "-a exit,always -F arch=b64 -S execve" ];
+        description = ''
+          The ordered audit rules, with each string appearing as one line of the audit.rules file.
+        '';
+      };
+    };
+  };
+
+  config = mkIf (cfg.enable == "lock" || cfg.enable) {
+    systemd.services.audit = {
+      description = "pseudo-service representing the kernel audit state";
+      wantedBy = [ "basic.target" ];
+
+      path = [ pkgs.audit ];
+
+      serviceConfig = {
+        Type = "oneshot";
+        RemainAfterExit = true;
+        ExecStart = "@${startScript} audit-start";
+        ExecStop  = "@${stopScript}  audit-stop";
+      };
+    };
+  };
+}

From 668179f31efe3df2709c403da85347f2162df3a6 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Thu, 7 Jan 2016 03:25:56 +0000
Subject: [PATCH 386/884] tests.ec2-config: fix to not try to talk to the
 internet (which breaks on Hydra)

---
 nixos/tests/ec2.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/ec2.nix b/nixos/tests/ec2.nix
index b12d498e3a09..1925ab37419a 100644
--- a/nixos/tests/ec2.nix
+++ b/nixos/tests/ec2.nix
@@ -125,8 +125,8 @@ in {
     name         = "config-userdata";
     sshPublicKey = snakeOilPublicKey;
 
+    # ### http://nixos.org/channels/nixos-unstable nixos
     userData = ''
-      ### http://nixos.org/channels/nixos-unstable nixos
       {
         imports = [
           <nixpkgs/nixos/modules/virtualisation/amazon-image.nix>

From 57d6dfe932d393130536f14cb5c570ae278f92c6 Mon Sep 17 00:00:00 2001
From: Jakob Gillich <jakob@gillich.me>
Date: Thu, 7 Jan 2016 04:34:31 +0100
Subject: [PATCH 387/884] notbit: removed dead package

The Bitmessage protocol v3 became mandatory on 16 Nov 2014 and notbit does not support it, nor has there been any activity in the project repository since then.
---
 nixos/modules/misc/ids.nix                    |   4 +-
 nixos/modules/module-list.nix                 |   1 -
 nixos/modules/services/networking/notbit.nix  | 130 ------------------
 .../networking/notbit/default.nix             |  24 ----
 pkgs/top-level/all-packages.nix               |   2 -
 5 files changed, 2 insertions(+), 159 deletions(-)
 delete mode 100644 nixos/modules/services/networking/notbit.nix
 delete mode 100644 pkgs/applications/networking/notbit/default.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 1da3737b07cb..01d2dd2996da 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -136,7 +136,7 @@
       kippo = 108;
       jenkins = 109;
       systemd-journal-gateway = 110;
-      notbit = 111;
+      #notbit = 111; # unused
       ngircd = 112;
       btsync = 113;
       minecraft = 114;
@@ -356,7 +356,7 @@
       kippo = 108;
       jenkins = 109;
       systemd-journal-gateway = 110;
-      notbit = 111;
+      #notbit = 111; # unused
       #ngircd = 112; # unused
       btsync = 113;
       #minecraft = 114; # unused
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index bbcb8d593cec..2035fb4419bb 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -323,7 +323,6 @@
   ./services/networking/networkmanager.nix
   ./services/networking/ngircd.nix
   ./services/networking/nix-serve.nix
-  ./services/networking/notbit.nix
   ./services/networking/nsd.nix
   ./services/networking/ntopng.nix
   ./services/networking/ntpd.nix
diff --git a/nixos/modules/services/networking/notbit.nix b/nixos/modules/services/networking/notbit.nix
deleted file mode 100644
index a96e181cb808..000000000000
--- a/nixos/modules/services/networking/notbit.nix
+++ /dev/null
@@ -1,130 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-let
-  cfg = config.services.notbit;
-  varDir = "/var/lib/notbit";
-  
-  sendmail = pkgs.stdenv.mkDerivation {
-    name = "notbit-wrapper";
-    buildInputs = [ pkgs.makeWrapper ];
-    propagatedBuildInputs = [ pkgs.notbit ];
-    buildCommand = ''
-      mkdir -p $out/bin
-      makeWrapper ${pkgs.notbit}/bin/notbit-sendmail $out/bin/notbit-system-sendmail \
-        --set XDG_RUNTIME_DIR ${varDir}
-    '';
-  };
-  opts = "${optionalString cfg.allowPrivateAddresses "-L"} ${optionalString cfg.noBootstrap "-b"} ${optionalString cfg.specifiedPeersOnly "-e"}";
-  peers = concatStringsSep " " (map (str: "-P \"${str}\"") cfg.peers);
-  listen = if cfg.listenAddress == [] then "-p ${toString cfg.port}" else
-    concatStringsSep " " (map (addr: "-a \"${addr}:${toString cfg.port}\"") cfg.listenAddress);
-in
-
-with lib;
-{
-
-  ### configuration
-
-  options = {
-
-    services.notbit = {
-
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Enables the notbit daemon and provides a sendmail binary named `notbit-system-sendmail` for sending mail over the system instance of notbit. Users must be in the notbit group in order to send mail over the system notbit instance. Currently mail recipt is not supported.
-        '';
-      };
-
-      port = mkOption {
-        type = types.int;
-        default = 8444;
-        description = "The port which the daemon listens for other bitmessage clients";
-      };
-
-      nice = mkOption {
-        type = types.int;
-        default = 10;
-        description = "Set the nice level for the notbit daemon";
-      };
-
-      listenAddress = mkOption {
-        type = types.listOf types.str;
-        default = [ ];
-        example = [ "localhost" "myhostname" ];
-        description = "The addresses which notbit will use to listen for incoming connections. These addresses are advertised to connecting clients.";
-      };
-
-      peers = mkOption {
-        type = types.listOf types.str;
-        default = [ ];
-        example = [ "bitmessage.org:8877" ];
-        description = "The initial set of peers notbit will connect to.";
-      };
-
-      specifiedPeersOnly = mkOption {
-        type = types.bool;
-        default = false;
-        description = "If true, notbit will only connect to peers specified by the peers option.";
-      };
-
-      allowPrivateAddresses = mkOption {
-        type = types.bool;
-        default = false;
-        description = "If true, notbit will allow connections to to RFC 1918 addresses.";
-      };
-
-      noBootstrap = mkOption {
-        type = types.bool;
-        default = false;
-        description = "If true, notbit will not bootstrap an initial peerlist from bitmessage.org servers";
-      };
-
-    };
-
-  };
-
-  ### implementation
-
-  config = mkIf cfg.enable {
-
-    environment.systemPackages = [ sendmail ];
-
-    systemd.services.notbit = {
-      description = "Notbit daemon";
-      after = [ "network.target" ];
-      wantedBy = [ "multi-user.target" ];
-      path = [ pkgs.notbit ];
-      environment = { XDG_RUNTIME_DIR = varDir; };
-
-      postStart = ''
-        [ ! -f "${varDir}/addr" ] && notbit-keygen > ${varDir}/addr
-        chmod 0640 ${varDir}/{addr,notbit/notbit-ipc.lock}
-        chmod 0750 ${varDir}/notbit/{,notbit-ipc}
-      '';
-
-      serviceConfig = {
-        Type = "forking";
-        ExecStart = "${pkgs.notbit}/bin/notbit -d ${listen} ${peers} ${opts}";
-        User = "notbit";
-        Group = "notbit";
-        UMask = "0077";
-        WorkingDirectory = varDir;
-        Nice = cfg.nice;
-      };
-    };
-
-    users.extraUsers.notbit = {
-      group = "notbit";
-      description = "Notbit daemon user";
-      home = varDir;
-      createHome = true;
-      uid = config.ids.uids.notbit;
-    };
-
-    users.extraGroups.notbit.gid = config.ids.gids.notbit;
-  };
-
-}
diff --git a/pkgs/applications/networking/notbit/default.nix b/pkgs/applications/networking/notbit/default.nix
deleted file mode 100644
index aa5d47730a4a..000000000000
--- a/pkgs/applications/networking/notbit/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchgit, autoconf, automake, pkgconfig, openssl }:
-
-stdenv.mkDerivation rec {
-  name = "notbit-git-6f1ca59";
-
-  src = fetchgit {
-    url = "git://github.com/bpeel/notbit";
-    rev = "6f1ca5987c7f217c9c3dd27adf6ac995004c29a1";
-    sha256 = "0h9nzm248pw9wrdsfkr580ghiqvh6mk6vx7r2r752awrc13wvgis";
-  };
-
-  buildInputs = [ autoconf automake pkgconfig openssl ];
-
-  preConfigure = "autoreconf -vfi";
-
-  meta = with stdenv.lib; { 
-    homepage = http://busydoingnothing.co.uk/notbit/;
-    description = "A minimal bitmessage client";
-    license = licenses.mit;
-
-    # This is planned to change when the project officially supports other platforms
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 90bc9bfdc6b7..0a26ed8a827a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2469,8 +2469,6 @@ let
     graphicalSupport = true;
   };
 
-  notbit = callPackage ../applications/networking/notbit { };
-
   notify-osd = callPackage ../applications/misc/notify-osd { };
 
   nox = callPackage ../tools/package-management/nox {

From ff02a4e3c22a74ac4704f455aa538df6ac219cc4 Mon Sep 17 00:00:00 2001
From: Jakob Gillich <jakob@gillich.me>
Date: Thu, 7 Jan 2016 05:55:16 +0100
Subject: [PATCH 388/884] axis2: 1.6.3 -> 1.6.4

fixes CVE-2013-0248
---
 pkgs/servers/http/tomcat/axis2/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/http/tomcat/axis2/default.nix b/pkgs/servers/http/tomcat/axis2/default.nix
index 9aacc6aa85ad..50e6b2987045 100644
--- a/pkgs/servers/http/tomcat/axis2/default.nix
+++ b/pkgs/servers/http/tomcat/axis2/default.nix
@@ -1,11 +1,12 @@
-{stdenv, fetchurl, apacheAnt, jdk, unzip}:
+{ stdenv, fetchurl, apacheAnt, jdk, unzip }:
 
-stdenv.mkDerivation {
-  name = "axis2-1.6.3";
+stdenv.mkDerivation rec {
+  name = "axis2-${version}";
+  version = "1.6.4";
 
   src = fetchurl {
-    url = http://apache.proserve.nl/axis/axis2/java/core/1.6.3/axis2-1.6.3-bin.zip;
-    sha256 = "0a49m7g1gxb904d0az2kbkab8rg02wm8nzbyipiad9k028masr6r";
+    url = "http://apache.proserve.nl/axis/axis2/java/core/${version}/${name}-bin.zip";
+    sha256 = "12ir706dn95567j6lkxdwrh28vnp6292h59qwjyqjm7ckglkmgyr";
   };
 
   buildInputs = [ unzip apacheAnt jdk ];

From 57e691a06f670599695f164a817d4a99dbabf78e Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 4 Jan 2016 03:25:46 -0600
Subject: [PATCH 389/884] nixpkgs: bittorrentSync20 2.0.105 -> 2.2.7

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/applications/networking/bittorrentsync/2.0.x.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/bittorrentsync/2.0.x.nix b/pkgs/applications/networking/bittorrentsync/2.0.x.nix
index 83b6151e4f79..1ae3041b4da9 100644
--- a/pkgs/applications/networking/bittorrentsync/2.0.x.nix
+++ b/pkgs/applications/networking/bittorrentsync/2.0.x.nix
@@ -5,15 +5,15 @@ let
     else if stdenv.system == "i686-linux" then "i386"
     else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
 
-  sha256 = if stdenv.system == "x86_64-linux" then "9e1427b7a6c6e960a378b97ac458ad53c445457ed0e5c8bf693f446597377b78"
-    else if stdenv.system == "i686-linux" then "4d446255ff6332da9a244737d6c20e7dcd32d24a8eaabffbaf73147e5898ed8f"
+  sha256 = if stdenv.system == "x86_64-linux" then "1ldhi0ydpxdbpd0ak5c3zv93wif5sqsgfj4ggav2b0djm76al2gb"
+    else if stdenv.system == "i686-linux" then "1fhki13isw3g7785b5jdl4warayg94ihah6wsr5h9gljjjghgi1c"
     else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
 
   libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ];
 in
 stdenv.mkDerivation rec {
   name = "btsync-${version}";
-  version = "2.0.105";
+  version = "2.2.7";
 
   src  = fetchurl {
     url  = "https://download-cdn.getsyncapp.com/${version}/linux-${arch}/BitTorrent-Sync_${arch}.tar.gz";

From d89454bb79d2495df903fc91d8c7a74ebdcc9cc3 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 4 Jan 2016 04:00:18 -0600
Subject: [PATCH 390/884] nixos: btsync - add directoryRoot option

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 nixos/modules/services/networking/btsync.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/networking/btsync.nix b/nixos/modules/services/networking/btsync.nix
index bd7a5bcebe68..fe462aeba9cb 100644
--- a/nixos/modules/services/networking/btsync.nix
+++ b/nixos/modules/services/networking/btsync.nix
@@ -16,9 +16,10 @@ let
     ''
       "webui":
       {
-        ${optionalEmptyStr cfg.httpLogin "\"login\":    \"${cfg.httpLogin}\","}
-        ${optionalEmptyStr cfg.httpPass  "\"password\": \"${cfg.httpPass}\","}
-        ${optionalEmptyStr cfg.apiKey    "\"api_key\":  \"${cfg.apiKey}\","}
+        ${optionalEmptyStr cfg.httpLogin     "\"login\":          \"${cfg.httpLogin}\","}
+        ${optionalEmptyStr cfg.httpPass      "\"password\":       \"${cfg.httpPass}\","}
+        ${optionalEmptyStr cfg.apiKey        "\"api_key\":        \"${cfg.apiKey}\","}
+        ${optionalEmptyStr cfg.directoryRoot "\"directory_root\": \"${cfg.directoryRoot}\","}
         "listen": "${listenAddr}"
       }
     '';
@@ -221,6 +222,13 @@ in
         description = "API key, which enables the developer API.";
       };
 
+      directoryRoot = mkOption {
+        type = types.str;
+        default = "";
+        example = "/media";
+        description = "Default directory to add folders in the web UI.";
+      };
+
       sharedFolders = mkOption {
         default = [];
         example =

From af50b03f50d88954e98018c7c18c0581928b7165 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 6 Jan 2016 04:58:21 +0000
Subject: [PATCH 391/884] fuppes: remove obsolete broken package and service

---
 nixos/modules/module-list.nix                 |   2 -
 nixos/modules/services/audio/fuppes.nix       | 115 -------------
 .../modules/services/audio/fuppes/vfolder.cfg | 155 ------------------
 pkgs/tools/networking/fuppes/default.nix      |  56 -------
 ...-faad-exanpse-backward-symbols-macro.patch |  91 ----------
 pkgs/top-level/all-packages.nix               |   2 -
 6 files changed, 421 deletions(-)
 delete mode 100644 nixos/modules/services/audio/fuppes.nix
 delete mode 100644 nixos/modules/services/audio/fuppes/vfolder.cfg
 delete mode 100644 pkgs/tools/networking/fuppes/default.nix
 delete mode 100644 pkgs/tools/networking/fuppes/fuppes-faad-exanpse-backward-symbols-macro.patch

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 81daad099a8b..117487dac68e 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -100,8 +100,6 @@
   ./services/amqp/activemq/default.nix
   ./services/amqp/rabbitmq.nix
   ./services/audio/alsa.nix
-  # Disabled as fuppes no longer builds.
-  # ./services/audio/fuppes.nix
   ./services/audio/icecast.nix
   ./services/audio/liquidsoap.nix
   ./services/audio/mpd.nix
diff --git a/nixos/modules/services/audio/fuppes.nix b/nixos/modules/services/audio/fuppes.nix
deleted file mode 100644
index 4a975ed5f538..000000000000
--- a/nixos/modules/services/audio/fuppes.nix
+++ /dev/null
@@ -1,115 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  cfg = config.services.fuppesd;
-in
-
-with lib;
-
-{
-  options = {
-    services.fuppesd = {
-      enable = mkOption {
-        default = false;
-        type = with types; bool;
-        description = ''
-          Enables Fuppes (UPnP A/V Media Server).  Can be used to watch
-          photos, video and listen to music from a phone/tv connected to the
-          local network.
-        '';
-      };
-
-      name = mkOption {
-        example = "Media Center";
-        type = types.str;
-        description = ''
-          Enables Fuppes (UPnP A/V Media Server).  Can be used to watch
-          photos, video and listen to music from a phone/tv connected to the
-          local network.
-        '';
-      };
-
-      log = {
-        level = mkOption {
-          default = 0;
-          example = 3;
-          type = with types; uniq int;
-          description = ''
-            Logging level of fuppes, An integer between 0 and 3.
-          '';
-        };
-
-        file = mkOption {
-          default = "/var/log/fuppes.log";
-          type = types.str;
-          description = ''
-            File which will contains the log produced by the daemon.
-          '';
-        };
-      };
-
-      config = mkOption {
-        example = "/etc/fuppes/fuppes.cfg";
-        type = types.str;
-        description = ''
-          Mutable configuration file which can be edited with the web
-          interface.  Due to possible modification, double quote the full
-          path of the filename stored in your filesystem to avoid attempts
-          to modify the content of the nix store.
-        '';
-      };
-
-      vfolder = mkOption {
-        example = literalExample "/etc/fuppes/vfolder.cfg";
-        description = ''
-          XML file describing the layout of virtual folder visible by the
-          client.
-        '';
-      };
-
-      database = mkOption {
-        default = "/var/lib/fuppes/fuppes.db";
-        type = types.str;
-        description = ''
-          Database file which index all shared files.
-        '';
-      };
-
-      ## At the moment, no plugins are packaged.
-      /*
-      plugins = mkOption {
-        type = with types; listOf package;
-        description = ''
-          List of Fuppes plugins.
-        '';
-      };
-      */
-
-      user = mkOption {
-        default = "root"; # The default is not secure.
-        example = "fuppes";
-        type = types.str;
-        description = ''
-          Name of the user which own the configuration files and under which
-          the fuppes daemon will be executed.
-        '';
-      };
-
-    };
-  };
-
-  config = mkIf cfg.enable {
-    jobs.fuppesd = {
-      description = "UPnP A/V Media Server. (${cfg.name})";
-      startOn = "ip-up";
-      daemonType = "fork";
-      exec = ''/var/setuid-wrappers/sudo -u ${cfg.user} -- ${pkgs.fuppes}/bin/fuppesd --friendly-name ${cfg.name} --log-level ${toString cfg.log.level} --log-file ${cfg.log.file} --config-file ${cfg.config} --vfolder-config-file ${cfg.vfolder} --database-file ${cfg.database}'';
-    };
-
-    services.fuppesd.name = mkDefault config.networking.hostName;
-
-    services.fuppesd.vfolder = mkDefault ./fuppes/vfolder.cfg;
-
-    security.sudo.enable = true;
-  };
-}
diff --git a/nixos/modules/services/audio/fuppes/vfolder.cfg b/nixos/modules/services/audio/fuppes/vfolder.cfg
deleted file mode 100644
index 35ec3bffeb0a..000000000000
--- a/nixos/modules/services/audio/fuppes/vfolder.cfg
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fuppes_vfolder_config version="0.2">
-
- <vfolder_layout device="default" enabled="false">
-
-    <vfolder name="Genre">
-      <vfolders property="genre">
-        <items type="audioItem" />
-      </vfolders>
-    </vfolder>
-
-    <vfolder name="Genre/Artists">
-      <vfolders property="genre">
-        <vfolders property="artist">
-          <items type="audioItem" />
-        </vfolders>
-      </vfolders>
-    </vfolder>
-
-    <vfolder name="Artists/Albums">
-      <vfolders property="artist">
-        <vfolders property="album">
-          <items type="audioItem" />
-        </vfolders>
-      </vfolders>
-    </vfolder> 
-    
-    <vfolder name="ABC/Artists/Albums">
-      <vfolders split="ABC">
-        <vfolders property="artist">
-          <vfolders property="album">
-            <items type="audioItem" />
-          </vfolders>
-        </vfolders>
-      </vfolders>
-    </vfolder>
-       
-    <vfolder name="Photos">
-      <vfolder name="All">
-        <items type="imageItem" />
-      </vfolder>
-      <vfolder name="Folders">
-        <folders filter="contains(imageItem)" />
-      </vfolder>      
-    </vfolder>
-
-    <vfolder name="Videos">
-      <vfolder name="All">
-        <items type="videoItem" />
-      </vfolder>
-      <vfolder name="Folders">
-        <folders filter="contains(videoItem)" />
-      </vfolder>
-    </vfolder>
-    
-    <vfolder name="shared dirs">
-      <shared_dirs full_extend="true" />
-    </vfolder>
-    
-  </vfolder_layout>
-
-  <vfolder_layout device="Xbox 360" enabled="false">
-
-    <vfolder name="Music" id="1">
-      <vfolder name="Album" id="7">
-        <vfolders property="album">
-          <items type="audioItem" />
-        </vfolders>
-      </vfolder>
-            
-      <vfolder name="All Music" id="4">
-        <items type="audioItem" />
-      </vfolder>
-      
-      <vfolder name="Artist" id="6">
-        <vfolders property="artist">
-          <items type="audioItem" />
-        </vfolders>
-      </vfolder>
-      
-      <vfolder name="Folders" id="20">
-        <folders filter="contains(audioItem)" />
-      </vfolder>
-      
-      <vfolder name="Genre" id="5">
-        <vfolders property="genre">
-          <items type="audioItem" />
-        </vfolders>
-      </vfolder>
-      
-      <vfolder name="Playlist" id="15" />
-    </vfolder>
-   
-    <vfolder name="Pictures" id="3">
-      <vfolder name="Album" id="13" />
-      
-      <vfolder name="All Pictures" id="11">
-        <items type="imageItem" />
-      </vfolder>
-      
-      <vfolder name="Date Taken" id="12" />
-      
-      <vfolder name="Folders" id="22">
-        <folders filter="contains(imageItem)" />
-      </vfolder>
-    </vfolder>
-
-    <vfolder name="Playlists" id="18">
-      <vfolder name="All Playlists" id="19" />
-      <vfolder name="Folders" id="23" />
-    </vfolder>
-
-    <vfolder name="Video" id="2">
-      <vfolder name="Actor" id="10" />
-      <vfolder name="Album" id="14" />
-      <vfolder name="All Video" id="8">
-				<items type="videoItem" />
-			</vfolder>
-      <vfolder name="Folders" id="21">
-			   <folders filter="contains(videoItem)" />
-			</vfolder>
-      <vfolder name="Genre" id="9" />
-    </vfolder>
-
-  </vfolder_layout>
-
-  <vfolder_layout device="Yamaha" enabled="false" create_references="true" >
-
-    <vfolder name="Playlists" />
-
-    <vfolder name="Artists">
-      <vfolders property="artist">
-        <items type="audioItem" />
-      </vfolders>
-    </vfolder>
-
-    <vfolder name="Albums">
-      <vfolders property="album">
-        <items type="audioItem" />
-      </vfolders>
-    </vfolder>
-
-    <vfolder name="Songs">
-      <items type="audioItem" />
-    </vfolder>
-
-    <vfolder name="Genres">
-      <vfolders property="genre">
-        <items type="audioItem" />
-      </vfolders>
-    </vfolder>
-
-  </vfolder_layout>
-
-</fuppes_vfolder_config>
diff --git a/pkgs/tools/networking/fuppes/default.nix b/pkgs/tools/networking/fuppes/default.nix
deleted file mode 100644
index 67e3b581f24f..000000000000
--- a/pkgs/tools/networking/fuppes/default.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{stdenv, fetchurl, pkgconfig, pcre, libxml2, sqlite, ffmpeg, imagemagick,
-exiv2, mp4v2, lame, libvorbis, flac, libmad, faad2}:
-
-stdenv.mkDerivation rec {
-  name = "fuppes-0.660";
-  src = fetchurl {
-    url = mirror://sourceforge/project/fuppes/fuppes/SVN-660/fuppes-0.660.tar.gz;
-    sha256 = "1c385b29878927e5f1e55ae2c9ad284849d1522d9517a88e34feb92bd5195173";
-  };
-
-  patches = [
-    ./fuppes-faad-exanpse-backward-symbols-macro.patch
-  ];
-
-  buildInputs = [
-    pkgconfig pcre libxml2 sqlite ffmpeg imagemagick exiv2 mp4v2 lame
-    libvorbis flac libmad faad2
-  ];
-
-  configureFlags = [
-    "--enable-ffmpegthumbnailer"
-    "--enable-magickwand"
-    "--enable-exiv2"
-    "--enable-transcoder-ffmpeg"
-    "--enable-mp4v2"
-    "--enable-lame"
-    "--enable-vorbis"
-    "--enable-flac"
-    "--enable-mad"
-    "--enable-faad"
-  ];
-
-  postFixup = ''
-    patchelf --set-rpath "$(patchelf --print-rpath $out/bin/fuppes):${faad2}/lib" $out/bin/fuppes
-    patchelf --set-rpath "$(patchelf --print-rpath $out/bin/fuppesd):${faad2}/lib" $out/bin/fuppesd
-  '';
-
-  meta = {
-    description = "UPnP A/V Media Server";
-    longDescription = ''
-      FUPPES is a free, multiplatform UPnP A/V Media Server.
-
-      FUPPES supports a wide range of UPnP MediaRenderers as well as
-      on-the-fly transcoding of various audio, video and image formats.
-
-      FUPPES also includes basic DLNA support.
-    '';
-    homepage = http://fuppes.ulrich-voelkel.de/;
-    license = stdenv.lib.licenses.gpl2;
-
-    maintainers = [ stdenv.lib.maintainers.pierron ];
-    platforms = stdenv.lib.platforms.all;
-
-    broken = true;
-  };
-}
diff --git a/pkgs/tools/networking/fuppes/fuppes-faad-exanpse-backward-symbols-macro.patch b/pkgs/tools/networking/fuppes/fuppes-faad-exanpse-backward-symbols-macro.patch
deleted file mode 100644
index c88a6fb4427e..000000000000
--- a/pkgs/tools/networking/fuppes/fuppes-faad-exanpse-backward-symbols-macro.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-diff -x _inst -x _build -x .svn -ur fuppes-0.660/src/lib/Transcoding/FaadWrapper.cpp fuppes-0.660.new/src/lib/Transcoding/FaadWrapper.cpp
---- fuppes-0.660/src/lib/Transcoding/FaadWrapper.cpp	2009-11-19 10:16:25.000000000 +0100
-+++ fuppes-0.660.new/src/lib/Transcoding/FaadWrapper.cpp	2011-01-30 22:25:34.171263052 +0100
-@@ -329,13 +329,19 @@
-   
-   CloseFile();
- }
--  
-+
-+// These macros are used to convert old function names to new ones based on
-+// the #define declared in faad headers.  The two-level macro are used to
-+// expanse the macro which are gave to to_str.
-+#define to_str_(fun) #fun
-+#define to_str(fun) to_str_(fun)
-+
- bool CFaadWrapper::LoadLib()
- {
-   #ifdef WIN32 
--  std::string sLibName = "libfaad-0.dll"; 
-+  std::string sLibName = "libfaad-2.dll"; 
-   #else   
--  std::string sLibName = "libfaad.so.0"; 
-+  std::string sLibName = "libfaad.so.2"; 
-   #endif 
-    
-   if(!CSharedConfig::Shared()->FaadLibName().empty()) { 
-@@ -350,54 +356,54 @@
-     return false; 
-   }
-  
--  m_faacDecOpen = (faacDecOpen_t)FuppesGetProcAddress(m_LibHandle, "faacDecOpen"); 
-+  m_faacDecOpen = (faacDecOpen_t)FuppesGetProcAddress(m_LibHandle, to_str(faacDecOpen)); 
-   if(!m_faacDecOpen) { 
-     CSharedLog::Shared()->Log(L_EXT, "cannot load symbol 'faacDecOpen'", __FILE__, __LINE__);    
-     return false; 
-   }
- 
--  m_faacDecGetErrorMessage = (faacDecGetErrorMessage_t)FuppesGetProcAddress(m_LibHandle, "faacDecGetErrorMessage"); 
-+  m_faacDecGetErrorMessage = (faacDecGetErrorMessage_t)FuppesGetProcAddress(m_LibHandle, to_str(faacDecGetErrorMessage)); 
-   if(!m_faacDecGetErrorMessage) { 
-     CSharedLog::Shared()->Log(L_EXT, "cannot load symbol 'faacDecGetErrorMessage'", __FILE__, __LINE__);    
-     return false; 
-   }
-   
--  m_faacDecGetCurrentConfiguration = (faacDecGetCurrentConfiguration_t)FuppesGetProcAddress(m_LibHandle, "faacDecGetCurrentConfiguration"); 
-+  m_faacDecGetCurrentConfiguration = (faacDecGetCurrentConfiguration_t)FuppesGetProcAddress(m_LibHandle, to_str(faacDecGetCurrentConfiguration)); 
-   if(!m_faacDecGetCurrentConfiguration) { 
-     CSharedLog::Shared()->Log(L_EXT, "cannot load symbol 'faacDecGetCurrentConfiguration'", __FILE__, __LINE__);    
-   } 
- 
--  m_faacDecSetConfiguration = (faacDecSetConfiguration_t)FuppesGetProcAddress(m_LibHandle, "faacDecSetConfiguration"); 
-+  m_faacDecSetConfiguration = (faacDecSetConfiguration_t)FuppesGetProcAddress(m_LibHandle, to_str(faacDecSetConfiguration)); 
-   if(!m_faacDecSetConfiguration) { 
-     CSharedLog::Shared()->Log(L_EXT, "cannot load symbol 'faacDecSetConfiguration'", __FILE__, __LINE__);    
-   } 
- 
--  m_faacDecInit = (faacDecInit_t)FuppesGetProcAddress(m_LibHandle, "faacDecInit"); 
-+  m_faacDecInit = (faacDecInit_t)FuppesGetProcAddress(m_LibHandle, to_str(faacDecInit)); 
-   if(!m_faacDecInit) { 
-     CSharedLog::Shared()->Log(L_EXT, "cannot load symbol 'faacDecInit'", __FILE__, __LINE__);    
-   } 
- 
--  m_faacDecInit2 = (faacDecInit2_t)FuppesGetProcAddress(m_LibHandle, "faacDecInit2"); 
-+  m_faacDecInit2 = (faacDecInit2_t)FuppesGetProcAddress(m_LibHandle, to_str(faacDecInit2)); 
-   if(!m_faacDecInit2) { 
-     CSharedLog::Shared()->Log(L_EXT, "cannot load symbol 'faacDecInit2'", __FILE__, __LINE__);    
-     return false; 
-   }
-   
--  m_faacDecDecode = (faacDecDecode_t)FuppesGetProcAddress(m_LibHandle, "faacDecDecode"); 
-+  m_faacDecDecode = (faacDecDecode_t)FuppesGetProcAddress(m_LibHandle, to_str(faacDecDecode)); 
-   if(!m_faacDecDecode) { 
-     CSharedLog::Shared()->Log(L_EXT, "cannot load symbol 'faacDecDecode'", __FILE__, __LINE__);    
-     return false; 
-   } 
- 
--  m_faacDecClose = (faacDecClose_t)FuppesGetProcAddress(m_LibHandle, "faacDecClose"); 
-+  m_faacDecClose = (faacDecClose_t)FuppesGetProcAddress(m_LibHandle, to_str(faacDecClose)); 
-   if(!m_faacDecClose) { 
-     CSharedLog::Shared()->Log(L_EXT, "cannot load symbol 'faacDecClose'", __FILE__, __LINE__);    
-     return false; 
-   } 
- 
--  m_AudioSpecificConfig = (AudioSpecificConfig_t)FuppesGetProcAddress(m_LibHandle, "AudioSpecificConfig"); 
-+  m_AudioSpecificConfig = (AudioSpecificConfig_t)FuppesGetProcAddress(m_LibHandle, to_str(AudioSpecificConfig)); 
-   if(!m_AudioSpecificConfig) {
--		m_AudioSpecificConfig = (AudioSpecificConfig_t)FuppesGetProcAddress(m_LibHandle, "faacDecAudioSpecificConfig"); 
-+		m_AudioSpecificConfig = (AudioSpecificConfig_t)FuppesGetProcAddress(m_LibHandle, to_str(faacDecAudioSpecificConfig)); 
- 		if(!m_AudioSpecificConfig) {  
-   	  CSharedLog::Shared()->Log(L_EXT, "cannot load symbol '(faacDec)AudioSpecificConfig'", __FILE__, __LINE__);    
-       return false;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ddf1e999b862..159ea3a71c4c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1564,8 +1564,6 @@ let
 
   ftop = callPackage ../os-specific/linux/ftop { };
 
-  fuppes = callPackage ../tools/networking/fuppes { };
-
   fsfs = callPackage ../tools/filesystems/fsfs { };
 
   fuseiso = callPackage ../tools/filesystems/fuseiso { };

From 88292fdf09960e9cb8e3c063a6b95ac4284222ec Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 6 Jan 2016 06:50:18 +0000
Subject: [PATCH 392/884] jobs -> systemd.services

---
 .../cd-dvd/system-tarball-fuloong2f.nix       |   3 +-
 .../cd-dvd/system-tarball-sheevaplug.nix      |   2 +-
 nixos/modules/module-list.nix                 |   1 -
 .../services/databases/4store-endpoint.nix    |   8 +-
 nixos/modules/services/databases/4store.nix   |   9 +-
 nixos/modules/services/databases/virtuoso.nix |  25 +-
 nixos/modules/services/games/ghost-one.nix    |   4 +-
 nixos/modules/services/hardware/acpid.nix     |  26 +-
 nixos/modules/services/hardware/pommed.nix    |  15 +-
 nixos/modules/services/logging/klogd.nix      |  25 +-
 nixos/modules/services/mail/freepops.nix      |  17 +-
 nixos/modules/services/mail/spamassassin.nix  |   6 +-
 nixos/modules/services/misc/dictd.nix         |  15 +-
 nixos/modules/services/misc/disnix.nix        | 104 +++--
 nixos/modules/services/misc/felix.nix         |  83 ++--
 .../modules/services/misc/folding-at-home.nix |  32 +-
 nixos/modules/services/misc/svnserve.nix      |  10 +-
 nixos/modules/services/monitoring/monit.nix   |  16 +-
 nixos/modules/services/monitoring/ups.nix     |  29 +-
 .../services/network-filesystems/drbd.nix     |  38 +-
 .../openafs-client/default.nix                |  48 +--
 nixos/modules/services/networking/amuled.nix  |  27 +-
 nixos/modules/services/networking/bind.nix    |  23 +-
 .../modules/services/networking/ejabberd.nix  | 128 +++---
 .../services/networking/git-daemon.nix        |   9 +-
 nixos/modules/services/networking/gvpe.nix    |  32 +-
 nixos/modules/services/networking/ifplugd.nix |  26 +-
 .../networking/ircd-hybrid/default.nix        |  18 +-
 nixos/modules/services/networking/oidentd.nix |  17 +-
 .../modules/services/networking/openfire.nix  |  48 +--
 nixos/modules/services/networking/prayer.nix  |  25 +-
 .../modules/services/networking/radicale.nix  |  12 +-
 .../modules/services/networking/softether.nix |   6 +-
 .../modules/services/networking/ssh/lshd.nix  | 100 +++--
 .../modules/services/networking/tcpcrypt.nix  |   8 +-
 nixos/modules/services/networking/wicd.nix    |  14 +-
 nixos/modules/services/networking/xinetd.nix  |  22 +-
 nixos/modules/services/scheduling/atd.nix     |  74 ++--
 nixos/modules/services/scheduling/fcron.nix   |  38 +-
 nixos/modules/services/security/fprot.nix     |  32 +-
 nixos/modules/services/system/kerberos.nix    |  33 +-
 nixos/modules/services/system/uptimed.nix     |  26 +-
 .../services/web-servers/jboss/default.nix    |  13 +-
 nixos/modules/services/web-servers/tomcat.nix | 388 +++++++++---------
 nixos/modules/services/x11/xfs.nix            |  17 +-
 nixos/modules/system/upstart/upstart.nix      | 290 -------------
 nixos/modules/tasks/filesystems/btrfs.nix     |   8 -
 nixos/modules/virtualisation/libvirtd.nix     |  40 +-
 nixos/tests/quake3.nix                        |   6 +-
 49 files changed, 772 insertions(+), 1224 deletions(-)
 delete mode 100644 nixos/modules/system/upstart/upstart.nix

diff --git a/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix b/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
index f0351d127183..6fe490b02bf4 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
@@ -149,8 +149,7 @@ in
   # not be started by default on the installation CD because the
   # default root password is empty.
   services.openssh.enable = true;
-
-  jobs.openssh.startOn = lib.mkOverride 50 "";
+  systemd.services.openssh.wantedBy = lib.mkOverride 50 [];
 
   boot.loader.grub.enable = false;
   boot.loader.generationsDir.enable = false;
diff --git a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
index cdacc56f7ab9..de0cc604bf3b 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
@@ -164,7 +164,7 @@ in
   # not be started by default on the installation CD because the
   # default root password is empty.
   services.openssh.enable = true;
-  jobs.openssh.startOn = lib.mkOverride 50 "";
+  systemd.services.openssh.wantedBy = lib.mkOverride 50 [];
 
   # cpufrequtils fails to build on non-pc
   powerManagement.enable = false;
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 117487dac68e..78cd587db81d 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -475,7 +475,6 @@
   ./system/boot/timesyncd.nix
   ./system/boot/tmp.nix
   ./system/etc/etc.nix
-  ./system/upstart/upstart.nix
   ./tasks/bcache.nix
   ./tasks/cpu-freq.nix
   ./tasks/encrypted-devices.nix
diff --git a/nixos/modules/services/databases/4store-endpoint.nix b/nixos/modules/services/databases/4store-endpoint.nix
index a03790433718..5c55ef406d57 100644
--- a/nixos/modules/services/databases/4store-endpoint.nix
+++ b/nixos/modules/services/databases/4store-endpoint.nix
@@ -60,11 +60,9 @@ with lib;
 
     services.avahi.enable = true;
 
-    jobs.fourStoreEndpoint = {
-      name = "4store-endpoint";
-      startOn = "ip-up";
-
-      exec = ''
+    systemd.services."4store-endpoint" = {
+      wantedBy = [ "ip-up.target" ];
+      script = ''
         ${run} '${pkgs.rdf4store}/bin/4s-httpd -D ${cfg.options} ${if cfg.listenAddress!=null then "-H ${cfg.listenAddress}" else "" } -p ${toString cfg.port} ${cfg.database}'
       '';
     };
diff --git a/nixos/modules/services/databases/4store.nix b/nixos/modules/services/databases/4store.nix
index 807317d27454..33e731e96816 100644
--- a/nixos/modules/services/databases/4store.nix
+++ b/nixos/modules/services/databases/4store.nix
@@ -52,9 +52,8 @@ with lib;
 
     services.avahi.enable = true;
 
-    jobs.fourStore = {
-      name = "4store";
-      startOn = "ip-up";
+    systemd.services."4store" = {
+      wantedBy = [ "ip-up.target" ];
 
       preStart = ''
         mkdir -p ${stateDir}/
@@ -64,11 +63,9 @@ with lib;
         fi
       '';
 
-      exec = ''
+      script = ''
         ${run} -c '${pkgs.rdf4store}/bin/4s-backend -D ${cfg.options} ${cfg.database}'
       '';
     };
-
   };
-
 }
diff --git a/nixos/modules/services/databases/virtuoso.nix b/nixos/modules/services/databases/virtuoso.nix
index 8a49e13395c7..bdd210a2550e 100644
--- a/nixos/modules/services/databases/virtuoso.nix
+++ b/nixos/modules/services/databases/virtuoso.nix
@@ -29,20 +29,20 @@ with lib;
       };
 
       listenAddress = mkOption {
-	default = "1111";
-	example = "myserver:1323";
+        default = "1111";
+        example = "myserver:1323";
         description = "ip:port or port to listen on.";
       };
 
       httpListenAddress = mkOption {
-	default = null;
-	example = "myserver:8080";
+        default = null;
+        example = "myserver:8080";
         description = "ip:port or port for Virtuoso HTTP server to listen on.";
       };
 
       dirsAllowed = mkOption {
-	default = null;
-	example = "/www, /home/";
+        default = null;
+        example = "/www, /home/";
         description = "A list of directories Virtuoso is allowed to access";
       };
     };
@@ -61,18 +61,17 @@ with lib;
         home = stateDir;
       };
 
-    jobs.virtuoso = {
-      name = "virtuoso";
-      startOn = "ip-up";
+    systemd.services.virtuoso = {
+      wantedBy = [ "ip-up.target" ];
 
       preStart = ''
-	mkdir -p ${stateDir}
-	chown ${virtuosoUser} ${stateDir}
+        mkdir -p ${stateDir}
+        chown ${virtuosoUser} ${stateDir}
       '';
 
       script = ''
-	cd ${stateDir}
-	${pkgs.virtuoso}/bin/virtuoso-t +foreground +configfile ${pkgs.writeText "virtuoso.ini" cfg.config}
+        cd ${stateDir}
+        ${pkgs.virtuoso}/bin/virtuoso-t +foreground +configfile ${pkgs.writeText "virtuoso.ini" cfg.config}
       '';
     };
 
diff --git a/nixos/modules/services/games/ghost-one.nix b/nixos/modules/services/games/ghost-one.nix
index 07d7287ed88e..5762148df2bb 100644
--- a/nixos/modules/services/games/ghost-one.nix
+++ b/nixos/modules/services/games/ghost-one.nix
@@ -78,8 +78,8 @@ in
       bot_replaypath = replays
     '';
 
-    jobs.ghostOne = {
-      name = "ghost-one";
+    systemd.services."ghost-one" = {
+      wantedBy = [ "multi-user.target" ];
       script = ''
         mkdir -p ${stateDir}
         cd ${stateDir}
diff --git a/nixos/modules/services/hardware/acpid.nix b/nixos/modules/services/hardware/acpid.nix
index a20b1a1ee3ad..e3421899d36e 100644
--- a/nixos/modules/services/hardware/acpid.nix
+++ b/nixos/modules/services/hardware/acpid.nix
@@ -98,22 +98,26 @@ in
 
   config = mkIf config.services.acpid.enable {
 
-    jobs.acpid =
-      { description = "ACPI Daemon";
+    systemd.services.acpid = {
+      description = "ACPI Daemon";
 
-        wantedBy = [ "multi-user.target" ];
-        after = [ "systemd-udev-settle.service" ];
+      wantedBy = [ "multi-user.target" ];
+      after = [ "systemd-udev-settle.service" ];
 
-        path = [ pkgs.acpid ];
+      path = [ pkgs.acpid ];
 
-        daemonType = "fork";
-
-        exec = "acpid --confdir ${acpiConfDir}";
-
-        unitConfig.ConditionVirtualization = "!systemd-nspawn";
-        unitConfig.ConditionPathExists = [ "/proc/acpi" ];
+      serviceConfig = {
+        Type = "forking";
       };
 
+      unitConfig = {
+        ConditionVirtualization = "!systemd-nspawn";
+        ConditionPathExists = [ "/proc/acpi" ];
+      };
+
+      script = "acpid --confdir ${acpiConfDir}";
+    };
+
   };
 
 }
diff --git a/nixos/modules/services/hardware/pommed.nix b/nixos/modules/services/hardware/pommed.nix
index a24557b40ba1..7be4dc1e8464 100644
--- a/nixos/modules/services/hardware/pommed.nix
+++ b/nixos/modules/services/hardware/pommed.nix
@@ -35,18 +35,13 @@ with lib;
 
     services.dbus.packages = [ pkgs.pommed ];
 
-    jobs.pommed = { name = "pommed";
-
+    systemd.services.pommed = {
       description = "Pommed hotkey management";
-
-      startOn = "started dbus";
-
+      wantedBy = [ "multi-user.target" ];
+      after = [ "dbus.service" ];
       postStop = "rm -f /var/run/pommed.pid";
-
-      exec = "${pkgs.pommed}/bin/pommed";
-
-      daemonType = "fork";
-
+      script = "${pkgs.pommed}/bin/pommed";
+      serviceConfig.Type = "forking";
       path = [ pkgs.eject ];
     };
   };
diff --git a/nixos/modules/services/logging/klogd.nix b/nixos/modules/services/logging/klogd.nix
index f69e08152b55..2d1f515da920 100644
--- a/nixos/modules/services/logging/klogd.nix
+++ b/nixos/modules/services/logging/klogd.nix
@@ -24,21 +24,14 @@ with lib;
   ###### implementation
 
   config = mkIf config.services.klogd.enable {
-
-    jobs.klogd =
-      { description = "Kernel Log Daemon";
-
-        wantedBy = [ "multi-user.target" ];
-
-        path = [ pkgs.sysklogd ];
-
-        unitConfig.ConditionVirtualization = "!systemd-nspawn";
-
-        exec =
-          "klogd -c 1 -2 -n " +
-          "-k $(dirname $(readlink -f /run/booted-system/kernel))/System.map";
-      };
-
+    systemd.services.klogd = {
+      description = "Kernel Log Daemon";
+      wantedBy = [ "multi-user.target" ];
+      path = [ pkgs.sysklogd ];
+      unitConfig.ConditionVirtualization = "!systemd-nspawn";
+      script =
+        "klogd -c 1 -2 -n " +
+        "-k $(dirname $(readlink -f /run/booted-system/kernel))/System.map";
+    };
   };
-
 }
diff --git a/nixos/modules/services/mail/freepops.nix b/nixos/modules/services/mail/freepops.nix
index 2dd27a2033a7..e8c30a36923f 100644
--- a/nixos/modules/services/mail/freepops.nix
+++ b/nixos/modules/services/mail/freepops.nix
@@ -72,15 +72,16 @@ in
   };
 
   config = mkIf cfg.enable {
-    jobs.freepopsd = {
+    systemd.services.freepopsd = {
       description = "Freepopsd (webmail over POP3)";
-      startOn = "ip-up";
-      exec = ''${pkgs.freepops}/bin/freepopsd \
-        -p ${toString cfg.port} \
-        -t ${toString cfg.threads} \
-        -b ${cfg.bind} \
-        -vv -l ${cfg.logFile} \
-        -s ${cfg.suid.user}.${cfg.suid.group}
+      wantedBy = [ "ip-up.target" ];
+      script = ''
+        ${pkgs.freepops}/bin/freepopsd \
+          -p ${toString cfg.port} \
+          -t ${toString cfg.threads} \
+          -b ${cfg.bind} \
+          -vv -l ${cfg.logFile} \
+          -s ${cfg.suid.user}.${cfg.suid.group}
       '';
     };
   };
diff --git a/nixos/modules/services/mail/spamassassin.nix b/nixos/modules/services/mail/spamassassin.nix
index a3ac9e372422..08953134b3b3 100644
--- a/nixos/modules/services/mail/spamassassin.nix
+++ b/nixos/modules/services/mail/spamassassin.nix
@@ -50,15 +50,13 @@ in
       gid = config.ids.gids.spamd;
     };
 
-    jobs.spamd = {
+    systemd.services.spamd = {
       description = "Spam Assassin Server";
 
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
 
-      exec = "${pkgs.spamassassin}/bin/spamd ${optionalString cfg.debug "-D"} --username=spamd --groupname=spamd --nouser-config --virtual-config-dir=/var/lib/spamassassin/user-%u --allow-tell --pidfile=/var/run/spamd.pid";
+      script = "${pkgs.spamassassin}/bin/spamd ${optionalString cfg.debug "-D"} --username=spamd --groupname=spamd --nouser-config --virtual-config-dir=/var/lib/spamassassin/user-%u --allow-tell --pidfile=/var/run/spamd.pid";
     };
-
   };
-
 }
diff --git a/nixos/modules/services/misc/dictd.nix b/nixos/modules/services/misc/dictd.nix
index 552e0a435efe..118d299042d5 100644
--- a/nixos/modules/services/misc/dictd.nix
+++ b/nixos/modules/services/misc/dictd.nix
@@ -51,13 +51,12 @@ with lib;
         gid = config.ids.gids.dictd;
       };
 
-    jobs.dictd =
-      { description = "DICT.org Dictionary Server";
-        startOn = "startup";
-        environment = { LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive"; };
-        daemonType = "fork";
-        exec = "${pkgs.dict}/sbin/dictd -s -c ${dictdb}/share/dictd/dictd.conf --locale en_US.UTF-8";
-      };
+    systemd.services.dictd = {
+      description = "DICT.org Dictionary Server";
+      wantedBy = [ "multi-user.target" ];
+      environment = { LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive"; };
+      serviceConfig.Type = "forking";
+      script = "${pkgs.dict}/sbin/dictd -s -c ${dictdb}/share/dictd/dictd.conf --locale en_US.UTF-8";
+    };
   };
-
 }
diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix
index 0534c4fc942d..469a2a7ce3b4 100644
--- a/nixos/modules/services/misc/disnix.nix
+++ b/nixos/modules/services/misc/disnix.nix
@@ -91,7 +91,7 @@ in
       ( { hostname = config.networking.hostName;
           #targetHost = config.deployment.targetHost;
           system = if config.nixpkgs.system == "" then builtins.currentSystem else config.nixpkgs.system;
-          
+
           supportedTypes = (import "${pkgs.stdenv.mkDerivation {
             name = "supportedtypes";
             buildCommand = ''
@@ -117,63 +117,61 @@ in
 
     services.disnix.publishInfrastructure.enable = cfg.publishAvahi;
 
-    jobs = {
-      disnix =
-        { description = "Disnix server";
-        
-          wants = [ "dysnomia.target" ];
-          wantedBy = [ "multi-user.target" ];
-          after = [ "dbus.service" ]
-            ++ optional config.services.httpd.enable "httpd.service"
-            ++ optional config.services.mysql.enable "mysql.service"
-            ++ optional config.services.postgresql.enable "postgresql.service"
-            ++ optional config.services.tomcat.enable "tomcat.service"
-            ++ optional config.services.svnserve.enable "svnserve.service"
-            ++ optional config.services.mongodb.enable "mongodb.service";
+    systemd.services = {
+      disnix = {
+        description = "Disnix server";
+        wants = [ "dysnomia.target" ];
+        wantedBy = [ "multi-user.target" ];
+        after = [ "dbus.service" ]
+          ++ optional config.services.httpd.enable "httpd.service"
+          ++ optional config.services.mysql.enable "mysql.service"
+          ++ optional config.services.postgresql.enable "postgresql.service"
+          ++ optional config.services.tomcat.enable "tomcat.service"
+          ++ optional config.services.svnserve.enable "svnserve.service"
+          ++ optional config.services.mongodb.enable "mongodb.service";
 
-          restartIfChanged = false;
-          
-          path = [ pkgs.nix pkgs.disnix dysnomia "/run/current-system/sw" ];
-          
-          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
-          '';
+        restartIfChanged = false;
 
-          exec = "disnix-service";
+        path = [ pkgs.nix pkgs.disnix dysnomia "/run/current-system/sw" ];
+
+        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
+        '';
+
+        script = "disnix-service";
+      };
     } // optionalAttrs cfg.publishAvahi {
-      disnixAvahi =
-        { description = "Disnix Avahi publisher";
+      disnixAvahi = {
+        description = "Disnix Avahi publisher";
+        wants = [ "avahi-daemon.service" ];
+        wantedBy = [ "multi-user.target" ];
 
-          startOn = "started avahi-daemon";
-
-          exec =
-          ''
-            ${pkgs.avahi}/bin/avahi-publish-service disnix-${config.networking.hostName} _disnix._tcp 22 \
-              "mem=$(grep 'MemTotal:' /proc/meminfo | sed -e 's/kB//' -e 's/MemTotal://' -e 's/ //g')" \
-              ${concatMapStrings (infrastructureAttrName:
-                let infrastructureAttrValue = getAttr infrastructureAttrName (cfg.infrastructure);
-                in
-                if isInt infrastructureAttrValue then
-                ''${infrastructureAttrName}=${toString infrastructureAttrValue} \
-                ''
-                else
-                ''${infrastructureAttrName}=\"${infrastructureAttrValue}\" \
-                ''
-                ) (attrNames (cfg.infrastructure))}
-          '';
-        };
+        script = ''
+          ${pkgs.avahi}/bin/avahi-publish-service disnix-${config.networking.hostName} _disnix._tcp 22 \
+            "mem=$(grep 'MemTotal:' /proc/meminfo | sed -e 's/kB//' -e 's/MemTotal://' -e 's/ //g')" \
+            ${concatMapStrings (infrastructureAttrName:
+              let infrastructureAttrValue = getAttr infrastructureAttrName (cfg.infrastructure);
+              in
+              if isInt infrastructureAttrValue then
+              ''${infrastructureAttrName}=${toString infrastructureAttrValue} \
+              ''
+              else
+              ''${infrastructureAttrName}=\"${infrastructureAttrValue}\" \
+              ''
+              ) (attrNames (cfg.infrastructure))}
+        '';
+      };
     };
   };
 }
diff --git a/nixos/modules/services/misc/felix.nix b/nixos/modules/services/misc/felix.nix
index a01c7f08b914..08a8581711f9 100644
--- a/nixos/modules/services/misc/felix.nix
+++ b/nixos/modules/services/misc/felix.nix
@@ -57,54 +57,51 @@ in
         home = "/homeless-shelter";
       };
 
-    jobs.felix =
-      { description = "Felix server";
+    systemd.services.felix = {
+      description = "Felix server";
+      wantedBy = [ "multi-user.target" ];
 
-        preStart =
-	  ''
-	    # Initialise felix instance on first startup
-	    if [ ! -d /var/felix ]
-	    then
-	        # Symlink system files
+      preStart = ''
+        # Initialise felix instance on first startup
+        if [ ! -d /var/felix ]
+        then
+          # Symlink system files
 
-	        mkdir -p /var/felix
-		chown ${cfg.user}:${cfg.group} /var/felix
+          mkdir -p /var/felix
+          chown ${cfg.user}:${cfg.group} /var/felix
 
-		for i in ${pkgs.felix}/*
-		do
-		    if [ "$i" != "${pkgs.felix}/bundle" ]
-		    then
-		        ln -sfn $i /var/felix/$(basename $i)
-		    fi
-		done
+          for i in ${pkgs.felix}/*
+          do
+              if [ "$i" != "${pkgs.felix}/bundle" ]
+              then
+                  ln -sfn $i /var/felix/$(basename $i)
+              fi
+          done
 
-		# Symlink bundles
-		mkdir -p /var/felix/bundle
-		chown ${cfg.user}:${cfg.group} /var/felix/bundle
+          # Symlink bundles
+          mkdir -p /var/felix/bundle
+          chown ${cfg.user}:${cfg.group} /var/felix/bundle
 
-		for i in ${pkgs.felix}/bundle/* ${toString cfg.bundles}
-		do
-		    if [ -f $i ]
-		    then
-		        ln -sfn $i /var/felix/bundle/$(basename $i)
-		    elif [ -d $i ]
-		    then
-		        for j in $i/bundle/*
-			do
-			    ln -sfn $j /var/felix/bundle/$(basename $j)
-			done
-		    fi
-		done
-	    fi
-	  '';
-
-        script =
-          ''
-	    cd /var/felix
-            ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c '${pkgs.jre}/bin/java -jar bin/felix.jar'
-          '';
-      };
+          for i in ${pkgs.felix}/bundle/* ${toString cfg.bundles}
+          do
+              if [ -f $i ]
+              then
+                  ln -sfn $i /var/felix/bundle/$(basename $i)
+              elif [ -d $i ]
+              then
+                  for j in $i/bundle/*
+              do
+                  ln -sfn $j /var/felix/bundle/$(basename $j)
+              done
+              fi
+          done
+        fi
+      '';
 
+      script = ''
+        cd /var/felix
+        ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c '${pkgs.jre}/bin/java -jar bin/felix.jar'
+      '';
+    };
   };
-
 }
diff --git a/nixos/modules/services/misc/folding-at-home.nix b/nixos/modules/services/misc/folding-at-home.nix
index 392d2d1f0028..4f09cbfdd79b 100644
--- a/nixos/modules/services/misc/folding-at-home.nix
+++ b/nixos/modules/services/misc/folding-at-home.nix
@@ -49,26 +49,20 @@ in {
         home = stateDir;
       };
 
-    jobs.foldingAtHome =
-      { name = "foldingathome";
-
-        startOn = "started network-interfaces";
-        stopOn = "stopping network-interfaces";
-
-        preStart =
-          ''
-            mkdir -m 0755 -p ${stateDir}
-            chown ${fahUser} ${stateDir}
-            cp -f ${pkgs.writeText "client.cfg" cfg.config} ${stateDir}/client.cfg
-          '';
-        exec = "${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${fahUser} -c 'cd ${stateDir}; ${pkgs.foldingathome}/bin/fah6'";
-      };
-
-      services.foldingAtHome.config = ''
-          [settings]
-          username=${cfg.nickname}
+    systemd.services.foldingathome = {
+      after = [ "network-interfaces.target" ];
+      wantedBy = [ "multi-user.target" ];
+      preStart = ''
+        mkdir -m 0755 -p ${stateDir}
+        chown ${fahUser} ${stateDir}
+        cp -f ${pkgs.writeText "client.cfg" cfg.config} ${stateDir}/client.cfg
       '';
+      script = "${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${fahUser} -c 'cd ${stateDir}; ${pkgs.foldingathome}/bin/fah6'";
+    };
 
+    services.foldingAtHome.config = ''
+        [settings]
+        username=${cfg.nickname}
+    '';
   };
-
 }
diff --git a/nixos/modules/services/misc/svnserve.nix b/nixos/modules/services/misc/svnserve.nix
index 848905ca457f..37dd133e137d 100644
--- a/nixos/modules/services/misc/svnserve.nix
+++ b/nixos/modules/services/misc/svnserve.nix
@@ -34,13 +34,11 @@ in
   ###### implementation
 
   config = mkIf cfg.enable {
-    jobs.svnserve = {
-      startOn = "started network-interfaces";
-      stopOn = "stopping network-interfaces";
-
+    systemd.services.svnserve = {
+      after = [ "network-interfaces.target" ];
+      wantedBy = [ "multi-user.target" ];
       preStart = "mkdir -p ${cfg.svnBaseDir}";
-
-      exec = "${pkgs.subversion}/bin/svnserve -r ${cfg.svnBaseDir} -d --foreground --pid-file=/var/run/svnserve.pid";
+      script = "${pkgs.subversion}/bin/svnserve -r ${cfg.svnBaseDir} -d --foreground --pid-file=/var/run/svnserve.pid";
     };
   };
 }
diff --git a/nixos/modules/services/monitoring/monit.nix b/nixos/modules/services/monitoring/monit.nix
index 642fac3b3a01..704693969a35 100644
--- a/nixos/modules/services/monitoring/monit.nix
+++ b/nixos/modules/services/monitoring/monit.nix
@@ -19,10 +19,6 @@ in
         default = "";
         description = "monit.conf content";
       };
-      startOn = mkOption {
-        default = "started network-interfaces";
-        description = "What Monit supposes to be already present";
-      };
     };
   };
 
@@ -39,14 +35,12 @@ in
       }
     ];
 
-    jobs.monit = {
+    systemd.services.monit = {
       description = "Monit system watcher";
-
-      startOn = config.services.monit.startOn;
-
-      exec = "${pkgs.monit}/bin/monit -I -c /etc/monit.conf";
-
-      respawn = true;
+      after = [ "network-interfaces.target" ];
+      wantedBy = [ "multi-user.target" ];
+      script = "${pkgs.monit}/bin/monit -I -c /etc/monit.conf";
+      serviceConfig.Restart = "always";
     };
   };
 }
diff --git a/nixos/modules/services/monitoring/ups.nix b/nixos/modules/services/monitoring/ups.nix
index eb478f7da65d..5f80d547dbcb 100644
--- a/nixos/modules/services/monitoring/ups.nix
+++ b/nixos/modules/services/monitoring/ups.nix
@@ -180,31 +180,36 @@ in
 
     environment.systemPackages = [ pkgs.nut ];
 
-    jobs.upsmon = {
+    systemd.services.upsmon = {
       description = "Uninterruptible Power Supplies (Monitor)";
-      startOn = "ip-up";
-      daemonType = "fork";
-      exec = ''${pkgs.nut}/sbin/upsmon'';
+      wantedBy = [ "ip-up.target" ];
+      serviceConfig.Type = "forking";
+      script = "${pkgs.nut}/sbin/upsmon";
       environment.NUT_CONFPATH = "/etc/nut/";
       environment.NUT_STATEPATH = "/var/lib/nut/";
     };
 
-    jobs.upsd = {
+    systemd.services.upsd = {
       description = "Uninterruptible Power Supplies (Daemon)";
-      startOn = "started network-interfaces and started upsmon";
-      daemonType = "fork";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network-interfaces.target" "upsmon.service" ];
+      serviceConfig.Type = "forking";
       # TODO: replace 'root' by another username.
-      exec = ''${pkgs.nut}/sbin/upsd -u root'';
+      script = "${pkgs.nut}/sbin/upsd -u root";
       environment.NUT_CONFPATH = "/etc/nut/";
       environment.NUT_STATEPATH = "/var/lib/nut/";
     };
 
-    jobs.upsdrv = {
+    systemd.services.upsdrv = {
       description = "Uninterruptible Power Supplies (Register all UPS)";
-      startOn = "started upsd";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "upsd.service" ];
       # TODO: replace 'root' by another username.
-      exec = ''${pkgs.nut}/bin/upsdrvctl -u root start'';
-      task = true;
+      script = ''${pkgs.nut}/bin/upsdrvctl -u root start'';
+      serviceConfig = {
+        Type = "oneshot";
+        RemainAfterExit = true;
+      };
       environment.NUT_CONFPATH = "/etc/nut/";
       environment.NUT_STATEPATH = "/var/lib/nut/";
     };
diff --git a/nixos/modules/services/network-filesystems/drbd.nix b/nixos/modules/services/network-filesystems/drbd.nix
index 1bd67206444e..9896a93b1894 100644
--- a/nixos/modules/services/network-filesystems/drbd.nix
+++ b/nixos/modules/services/network-filesystems/drbd.nix
@@ -31,13 +31,13 @@ let cfg = config.services.drbd; in
 
   };
 
-  
+
   ###### implementation
 
   config = mkIf cfg.enable {
-  
+
     environment.systemPackages = [ pkgs.drbd ];
-    
+
     services.udev.packages = [ pkgs.drbd ];
 
     boot.kernelModules = [ "drbd" ];
@@ -52,26 +52,16 @@ let cfg = config.services.drbd; in
         target = "drbd.conf";
       };
 
-    jobs.drbd_up =
-      { name = "drbd-up";
-        startOn = "stopped udevtrigger or ip-up";
-        task = true;
-        script =
-          ''
-            ${pkgs.drbd}/sbin/drbdadm up all
-          '';
-      };
-    
-    jobs.drbd_down =
-      { name = "drbd-down";
-        startOn = "starting shutdown";
-        task = true;
-        script =
-          ''
-            ${pkgs.drbd}/sbin/drbdadm down all
-          '';
-      };
-    
+    systemd.services.drbd = {
+      after = [ "systemd-udev.settle.service" ];
+      wants = [ "systemd-udev.settle.service" ];
+      wantedBy = [ "ip-up.target" ];
+      script = ''
+        ${pkgs.drbd}/sbin/drbdadm up all
+      '';
+      serviceConfig.ExecStop = ''
+        ${pkgs.drbd}/sbin/drbdadm down all
+      '';
+    };
   };
-  
 }
diff --git a/nixos/modules/services/network-filesystems/openafs-client/default.nix b/nixos/modules/services/network-filesystems/openafs-client/default.nix
index 0297da9e865f..7a44fc1ea5ec 100644
--- a/nixos/modules/services/network-filesystems/openafs-client/default.nix
+++ b/nixos/modules/services/network-filesystems/openafs-client/default.nix
@@ -72,34 +72,28 @@ in
       }
     ];
 
-    jobs.openafsClient =
-      { name = "afsd";
+    systemd.services.afsd = {
+      description = "AFS client";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network-interfaces.target" ];
 
-        description = "AFS client";
-
-        startOn = "started network-interfaces";
-        stopOn = "stopping network-interfaces";
-
-        preStart = ''
-          mkdir -p -m 0755 /afs
-          mkdir -m 0700 -p ${cfg.cacheDirectory}
-          ${pkgs.module_init_tools}/sbin/insmod ${openafsPkgs}/lib/openafs/libafs-*.ko || true
-          ${openafsPkgs}/sbin/afsd -confdir ${afsConfig} -cachedir ${cfg.cacheDirectory} ${if cfg.sparse then "-dynroot-sparse" else "-dynroot"} -fakestat -afsdb
-          ${openafsPkgs}/bin/fs setcrypt ${if cfg.crypt then "on" else "off"}
-        '';
-
-        # Doing this in preStop, because after these commands AFS is basically
-        # stopped, so systemd has nothing to do, just noticing it.  If done in
-        # postStop, then we get a hang + kernel oops, because AFS can't be
-        # stopped simply by sending signals to processes.
-        preStop = ''
-          ${pkgs.utillinux}/bin/umount /afs
-          ${openafsPkgs}/sbin/afsd -shutdown
-          ${pkgs.module_init_tools}/sbin/rmmod libafs
-        '';
-
-      };
+      preStart = ''
+        mkdir -p -m 0755 /afs
+        mkdir -m 0700 -p ${cfg.cacheDirectory}
+        ${pkgs.module_init_tools}/sbin/insmod ${openafsPkgs}/lib/openafs/libafs-*.ko || true
+        ${openafsPkgs}/sbin/afsd -confdir ${afsConfig} -cachedir ${cfg.cacheDirectory} ${if cfg.sparse then "-dynroot-sparse" else "-dynroot"} -fakestat -afsdb
+        ${openafsPkgs}/bin/fs setcrypt ${if cfg.crypt then "on" else "off"}
+      '';
 
+      # Doing this in preStop, because after these commands AFS is basically
+      # stopped, so systemd has nothing to do, just noticing it.  If done in
+      # postStop, then we get a hang + kernel oops, because AFS can't be
+      # stopped simply by sending signals to processes.
+      preStop = ''
+        ${pkgs.utillinux}/bin/umount /afs
+        ${openafsPkgs}/sbin/afsd -shutdown
+        ${pkgs.module_init_tools}/sbin/rmmod libafs
+      '';
+    };
   };
-
 }
diff --git a/nixos/modules/services/networking/amuled.nix b/nixos/modules/services/networking/amuled.nix
index 516238fdddf6..bc488d0e9100 100644
--- a/nixos/modules/services/networking/amuled.nix
+++ b/nixos/modules/services/networking/amuled.nix
@@ -57,22 +57,19 @@ in
         gid = config.ids.gids.amule;
       } ];
 
-    jobs.amuled =
-      { description = "AMule daemon";
+    systemd.services.amuled = {
+      description = "AMule daemon";
+      wantedBy = [ "ip-up.target" ];
 
-        startOn = "ip-up";
-
-        preStart = ''
-            mkdir -p ${cfg.dataDir}
-            chown ${user} ${cfg.dataDir}
-        '';
-
-        exec = ''
-            ${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${user} \
-                -c 'HOME="${cfg.dataDir}" ${pkgs.amuleDaemon}/bin/amuled'
-        '';
-      };
+      preStart = ''
+        mkdir -p ${cfg.dataDir}
+        chown ${user} ${cfg.dataDir}
+      '';
 
+      script = ''
+        ${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${user} \
+            -c 'HOME="${cfg.dataDir}" ${pkgs.amuleDaemon}/bin/amuled'
+      '';
+    };
   };
-
 }
diff --git a/nixos/modules/services/networking/bind.nix b/nixos/modules/services/networking/bind.nix
index 34e7470dfc6f..dc11524ffeb8 100644
--- a/nixos/modules/services/networking/bind.nix
+++ b/nixos/modules/services/networking/bind.nix
@@ -142,20 +142,17 @@ in
         description = "BIND daemon user";
       };
 
-    jobs.bind =
-      { description = "BIND name server job";
+    systemd.services.bind = {
+      description = "BIND name server job";
+      after = [ "network-interfaces.target" ];
+      wantedBy = [ "multi-user.target" ];
 
-        startOn = "started network-interfaces";
-
-        preStart =
-          ''
-            ${pkgs.coreutils}/bin/mkdir -p /var/run/named
-            chown ${bindUser} /var/run/named
-          '';
-
-        exec = "${pkgs.bind}/sbin/named -u ${bindUser} ${optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile} -f";
-      };
+      preStart = ''
+        ${pkgs.coreutils}/bin/mkdir -p /var/run/named
+        chown ${bindUser} /var/run/named
+      '';
 
+      script = "${pkgs.bind}/sbin/named -u ${bindUser} ${optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile} -f";
+    };
   };
-
 }
diff --git a/nixos/modules/services/networking/ejabberd.nix b/nixos/modules/services/networking/ejabberd.nix
index 28b8e234a5cf..97360396c79e 100644
--- a/nixos/modules/services/networking/ejabberd.nix
+++ b/nixos/modules/services/networking/ejabberd.nix
@@ -56,81 +56,73 @@ in
   config = mkIf cfg.enable {
     environment.systemPackages = [ pkgs.ejabberd ];
 
-    jobs.ejabberd =
-      { description = "EJabberd server";
+    systemd.services.ejabberd = {
+      description = "EJabberd server";
+      after = [ "network-interfaces.target" ];
+      wantedBy = [ "multi-user.target" ];
+      path = with pkgs; [ ejabberd coreutils bash gnused ];
 
-        startOn = "started network-interfaces";
-        stopOn = "stopping network-interfaces";
+      preStart = ''
+        # Initialise state data
+        mkdir -p ${cfg.logsDir}
 
-        environment = {
-          PATH = "$PATH:${pkgs.ejabberd}/sbin:${pkgs.ejabberd}/bin:${pkgs.coreutils}/bin:${pkgs.bash}/bin:${pkgs.gnused}/bin";
-        };
+        if ! test -d ${cfg.spoolDir}
+        then
+            initialize=1
+            cp -av ${pkgs.ejabberd}/var/lib/ejabberd /var/lib
+        fi
 
-        preStart =
+        if ! test -d ${cfg.confDir}
+        then
+            mkdir -p ${cfg.confDir}
+            cp ${pkgs.ejabberd}/etc/ejabberd/* ${cfg.confDir}
+            sed -e 's|{hosts, \["localhost"\]}.|{hosts, \[${cfg.virtualHosts}\]}.|' ${pkgs.ejabberd}/etc/ejabberd/ejabberd.cfg > ${cfg.confDir}/ejabberd.cfg
+        fi
+
+        ejabberdctl --config-dir ${cfg.confDir} --logs ${cfg.logsDir} --spool ${cfg.spoolDir} start
+
+        ${if cfg.loadDumps == [] then "" else
           ''
-            PATH="$PATH:${pkgs.ejabberd}/sbin:${pkgs.ejabberd}/bin:${pkgs.coreutils}/bin:${pkgs.bash}/bin:${pkgs.gnused}/bin";
-	    
-            # Initialise state data
-            mkdir -p ${cfg.logsDir}
-
-            if ! test -d ${cfg.spoolDir}
+            if [ "$initialize" = "1" ]
             then
-                initialize=1
-                cp -av ${pkgs.ejabberd}/var/lib/ejabberd /var/lib
+                # Wait until the ejabberd server is available for use
+                count=0
+                while ! ejabberdctl --config-dir ${cfg.confDir} --logs ${cfg.logsDir} --spool ${cfg.spoolDir} status
+                do
+                    if [ $count -eq 30 ]
+                    then
+                        echo "Tried 30 times, giving up..."
+                        exit 1
+                    fi
+
+                    echo "Ejabberd daemon not yet started. Waiting for 1 second..."
+                    count=$((count++))
+                    sleep 1
+                done
+
+                ${concatMapStrings (dump:
+                  ''
+                    echo "Importing dump: ${dump}"
+
+                    if [ -f ${dump} ]
+                    then
+                        ejabberdctl --config-dir ${cfg.confDir} --logs ${cfg.logsDir} --spool ${cfg.spoolDir} load ${dump}
+                    elif [ -d ${dump} ]
+                    then
+                        for i in ${dump}/ejabberd-dump/*
+                        do
+                            ejabberdctl --config-dir ${cfg.confDir} --logs ${cfg.logsDir} --spool ${cfg.spoolDir} load $i
+                        done
+                    fi
+                  '') cfg.loadDumps}
             fi
+          ''}
+      '';
 
-            if ! test -d ${cfg.confDir}
-            then
-                mkdir -p ${cfg.confDir}
-                cp ${pkgs.ejabberd}/etc/ejabberd/* ${cfg.confDir}
-                sed -e 's|{hosts, \["localhost"\]}.|{hosts, \[${cfg.virtualHosts}\]}.|' ${pkgs.ejabberd}/etc/ejabberd/ejabberd.cfg > ${cfg.confDir}/ejabberd.cfg
-            fi
-
-            ejabberdctl --config-dir ${cfg.confDir} --logs ${cfg.logsDir} --spool ${cfg.spoolDir} start
-
-            ${if cfg.loadDumps == [] then "" else
-              ''
-                if [ "$initialize" = "1" ]
-                then
-                    # Wait until the ejabberd server is available for use
-                    count=0
-                    while ! ejabberdctl --config-dir ${cfg.confDir} --logs ${cfg.logsDir} --spool ${cfg.spoolDir} status
-                    do
-                        if [ $count -eq 30 ]
-                        then
-                            echo "Tried 30 times, giving up..."
-                            exit 1
-                        fi
-
-                        echo "Ejabberd daemon not yet started. Waiting for 1 second..."
-                        count=$((count++))
-                        sleep 1
-                    done
-
-                    ${concatMapStrings (dump:
-                      ''
-                        echo "Importing dump: ${dump}"
-
-                        if [ -f ${dump} ]
-                        then
-                            ejabberdctl --config-dir ${cfg.confDir} --logs ${cfg.logsDir} --spool ${cfg.spoolDir} load ${dump}
-                        elif [ -d ${dump} ]
-                        then
-                            for i in ${dump}/ejabberd-dump/*
-                            do
-                                ejabberdctl --config-dir ${cfg.confDir} --logs ${cfg.logsDir} --spool ${cfg.spoolDir} load $i
-                            done
-                        fi
-                      '') cfg.loadDumps}
-                fi
-              ''}
-          '';
-
-        postStop =
-          ''
-            ejabberdctl --config-dir ${cfg.confDir} --logs ${cfg.logsDir} --spool ${cfg.spoolDir} stop
-          '';
-      };
+      postStop = ''
+        ejabberdctl --config-dir ${cfg.confDir} --logs ${cfg.logsDir} --spool ${cfg.spoolDir} stop
+      '';
+    };
 
     security.pam.services.ejabberd = {};
 
diff --git a/nixos/modules/services/networking/git-daemon.nix b/nixos/modules/services/networking/git-daemon.nix
index 566936a7d0fa..215ffe48a563 100644
--- a/nixos/modules/services/networking/git-daemon.nix
+++ b/nixos/modules/services/networking/git-daemon.nix
@@ -16,7 +16,7 @@ in
         type = types.bool;
         default = false;
         description = ''
-          Enable Git daemon, which allows public hosting  of git repositories
+          Enable Git daemon, which allows public hosting of git repositories
           without any access controls. This is mostly intended for read-only access.
 
           You can allow write access by setting daemon.receivepack configuration
@@ -115,10 +115,9 @@ in
         gid = config.ids.gids.git;
       };
 
-    jobs.gitDaemon = {
-      name = "git-daemon";
-      startOn = "ip-up";
-      exec = "${pkgs.git}/bin/git daemon --reuseaddr "
+    systemd.services."git-daemon" = {
+      wantedBy = [ "ip-up.target" ];
+      script = "${pkgs.git}/bin/git daemon --reuseaddr "
         + (optionalString (cfg.basePath != "") "--base-path=${cfg.basePath} ")
         + (optionalString (cfg.listenAddress != "") "--listen=${cfg.listenAddress} ")
         + "--port=${toString cfg.port} --user=${cfg.user} --group=${cfg.group} ${cfg.options} "
diff --git a/nixos/modules/services/networking/gvpe.nix b/nixos/modules/services/networking/gvpe.nix
index c633ffedef49..27b64b5bb95f 100644
--- a/nixos/modules/services/networking/gvpe.nix
+++ b/nixos/modules/services/networking/gvpe.nix
@@ -37,13 +37,6 @@ let
     '';
     executable = true;
   });
-
-  exec = "${pkgs.gvpe}/sbin/gvpe -c /var/gvpe -D ${cfg.nodename} "
-    + " ${cfg.nodename}.pid-file=/var/gvpe/gvpe.pid"
-    + " ${cfg.nodename}.if-up=if-up"
-    + " &> /var/log/gvpe";
-
-  inherit (cfg) startOn stopOn;
 in
 
 {
@@ -55,18 +48,6 @@ in
           Whether to run gvpe
         '';
       };
-      startOn = mkOption {
-        default = "started network-interfaces";
-        description = ''
-          Condition to start GVPE
-        '';
-      };
-      stopOn = mkOption {
-        default = "stopping network-interfaces";
-        description = ''
-          Condition to stop GVPE
-        '';
-      };
       nodename = mkOption {
         default = null;
         description =''
@@ -122,10 +103,10 @@ in
     };
   };
   config = mkIf cfg.enable {
-    jobs.gvpe = {
+    systemd.services.gvpe = {
       description = "GNU Virtual Private Ethernet node";
-
-      inherit startOn stopOn;
+      after = [ "network-interfaces.target" ];
+      wantedBy = [ "multi-user.target" ];
 
       preStart = ''
         mkdir -p /var/gvpe
@@ -136,9 +117,12 @@ in
         cp ${ifupScript} /var/gvpe/if-up
       '';
 
-      inherit exec;
+      script = "${pkgs.gvpe}/sbin/gvpe -c /var/gvpe -D ${cfg.nodename} "
+        + " ${cfg.nodename}.pid-file=/var/gvpe/gvpe.pid"
+        + " ${cfg.nodename}.if-up=if-up"
+        + " &> /var/log/gvpe";
 
-      respawn = true;
+      serviceConfig.Restart = "always";
     };
   };
 }
diff --git a/nixos/modules/services/networking/ifplugd.nix b/nixos/modules/services/networking/ifplugd.nix
index 20bfca8f8723..00b94fe2284e 100644
--- a/nixos/modules/services/networking/ifplugd.nix
+++ b/nixos/modules/services/networking/ifplugd.nix
@@ -66,23 +66,17 @@ in
   ###### implementation
 
   config = mkIf cfg.enable {
-
-    jobs.ifplugd =
-      { description = "Network interface connectivity monitor";
-
-        startOn = "started network-interfaces";
-        stopOn = "stopping network-interfaces";
-
-        exec =
-          ''
-            ${ifplugd}/sbin/ifplugd --no-daemon --no-startup --no-shutdown \
-              ${if config.networking.interfaceMonitor.beep then "" else "--no-beep"} \
-              --run ${plugScript}
-          '';
-      };
+    systemd.services.ifplugd = {
+      description = "Network interface connectivity monitor";
+      after = [ "network-interfaces.target" ];
+      wantedBy = [ "multi-user.target" ];
+      script = ''
+        ${ifplugd}/sbin/ifplugd --no-daemon --no-startup --no-shutdown \
+          ${if config.networking.interfaceMonitor.beep then "" else "--no-beep"} \
+          --run ${plugScript}
+      '';
+    };
 
     environment.systemPackages = [ ifplugd ];
-
   };
-
 }
diff --git a/nixos/modules/services/networking/ircd-hybrid/default.nix b/nixos/modules/services/networking/ircd-hybrid/default.nix
index 2c397f94d230..ede57c5046d3 100644
--- a/nixos/modules/services/networking/ircd-hybrid/default.nix
+++ b/nixos/modules/services/networking/ircd-hybrid/default.nix
@@ -121,17 +121,11 @@ in
 
     users.extraGroups.ircd.gid = config.ids.gids.ircd;
 
-    jobs.ircd_hybrid =
-      { name = "ircd-hybrid";
-
-        description = "IRCD Hybrid server";
-
-        startOn = "started networking";
-        stopOn = "stopping networking";
-
-        exec = "${ircdService}/bin/control start";
-      };
-
+    systemd.services."ircd-hybrid" = {
+      description = "IRCD Hybrid server";
+      after = [ "started networking" ];
+      wantedBy = [ "multi-user.target" ];
+      script = "${ircdService}/bin/control start";
+    };
   };
-
 }
diff --git a/nixos/modules/services/networking/oidentd.nix b/nixos/modules/services/networking/oidentd.nix
index 738ab8313a5d..651bb8e967cf 100644
--- a/nixos/modules/services/networking/oidentd.nix
+++ b/nixos/modules/services/networking/oidentd.nix
@@ -20,18 +20,17 @@ with lib;
 
   };
 
-  
+
   ###### implementation
 
   config = mkIf config.services.oidentd.enable {
-
-    jobs.oidentd =
-      { startOn = "started network-interfaces";
-        daemonType = "fork";
-        exec = "${pkgs.oidentd}/sbin/oidentd -u oidentd -g nogroup" +
-          optionalString config.networking.enableIPv6 " -a ::"
-        ;
-      };
+    systemd.services.oidentd = {
+      after = [ "network-interfaces.target" ];
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig.Type = "forking";
+      script = "${pkgs.oidentd}/sbin/oidentd -u oidentd -g nogroup" +
+          optionalString config.networking.enableIPv6 " -a ::";
+    };
 
     users.extraUsers.oidentd = {
       description = "Ident Protocol daemon user";
diff --git a/nixos/modules/services/networking/openfire.nix b/nixos/modules/services/networking/openfire.nix
index c3b4ba90b4e7..ed91b45ec945 100644
--- a/nixos/modules/services/networking/openfire.nix
+++ b/nixos/modules/services/networking/openfire.nix
@@ -2,17 +2,7 @@
 
 with lib;
 
-let
-
-  inherit (pkgs) jre openfire coreutils which gnugrep gawk gnused;
-
-  extraStartDependency =
-    if config.services.openfire.usePostgreSQL then "and started postgresql" else "";
-
-in
-
 {
-
   ###### interface
 
   options = {
@@ -47,26 +37,24 @@ in
         message = "OpenFire assertion failed.";
       };
 
-    jobs.openfire =
-      { description = "OpenFire XMPP server";
-
-        startOn = "started networking ${extraStartDependency}";
-
-        script =
-          ''
-            export PATH=${jre}/bin:${openfire}/bin:${coreutils}/bin:${which}/bin:${gnugrep}/bin:${gawk}/bin:${gnused}/bin
-            export HOME=/tmp
-            mkdir /var/log/openfire || true
-            mkdir /etc/openfire || true
-            for i in ${openfire}/conf.inst/*; do
-                if ! test -f /etc/openfire/$(basename $i); then
-                    cp $i /etc/openfire/
-                fi
-            done
-            openfire start
-          ''; # */
-      };
-
+    systemd.services.openfire = {
+      description = "OpenFire XMPP server";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "networking.target" ] ++
+        optional config.services.openfire.usePostgreSQL "postgresql.service";
+      path = with pkgs; [ jre openfire coreutils which gnugrep gawk gnused ];
+      script = ''
+        export HOME=/tmp
+        mkdir /var/log/openfire || true
+        mkdir /etc/openfire || true
+        for i in ${openfire}/conf.inst/*; do
+            if ! test -f /etc/openfire/$(basename $i); then
+                cp $i /etc/openfire/
+            fi
+        done
+        openfire start
+      ''; # */
+    };
   };
 
 }
diff --git a/nixos/modules/services/networking/prayer.nix b/nixos/modules/services/networking/prayer.nix
index ad0fb0af01cb..cb8fe6bf4fe9 100644
--- a/nixos/modules/services/networking/prayer.nix
+++ b/nixos/modules/services/networking/prayer.nix
@@ -83,21 +83,14 @@ in
         gid = config.ids.gids.prayer;
       };
 
-    jobs.prayer =
-      { name = "prayer";
-
-        startOn = "startup";
-
-        preStart =
-          ''
-            mkdir -m 0755 -p ${stateDir}
-            chown ${prayerUser}.${prayerGroup} ${stateDir}
-          '';
-
-        daemonType = "daemon";
-
-        exec = "${prayer}/sbin/prayer --config-file=${prayerCfg}";
-      };
+    systemd.services.prayer = {
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig.Type = "forking";
+      preStart = ''
+        mkdir -m 0755 -p ${stateDir}
+        chown ${prayerUser}.${prayerGroup} ${stateDir}
+      '';
+      script = "${prayer}/sbin/prayer --config-file=${prayerCfg}";
+    };
   };
-
 }
diff --git a/nixos/modules/services/networking/radicale.nix b/nixos/modules/services/networking/radicale.nix
index fc9afc70aca4..4b77ef22ac12 100644
--- a/nixos/modules/services/networking/radicale.nix
+++ b/nixos/modules/services/networking/radicale.nix
@@ -33,16 +33,14 @@ in
   };
 
   config = mkIf cfg.enable {
-
     environment.systemPackages = [ pkgs.pythonPackages.radicale ];
 
-    jobs.radicale = {
+    systemd.services.radicale = {
       description = "A Simple Calendar and Contact Server";
-      startOn = "started network-interfaces";
-      exec = "${pkgs.pythonPackages.radicale}/bin/radicale -C ${confFile} -d";
-      daemonType = "fork";
+      after = [ "network-interfaces.target" ];
+      wantedBy = [ "multi-user.target" ];
+      script = "${pkgs.pythonPackages.radicale}/bin/radicale -C ${confFile} -d";
+      serviceConfig.Type = "forking";
     };
-
   };
-
 }
diff --git a/nixos/modules/services/networking/softether.nix b/nixos/modules/services/networking/softether.nix
index 49538af7d351..a421b32f02c2 100644
--- a/nixos/modules/services/networking/softether.nix
+++ b/nixos/modules/services/networking/softether.nix
@@ -61,9 +61,10 @@ in
             dataDir = cfg.dataDir;
           }))
         ];
-      jobs.softether = {
+      systemd.services.softether = {
         description = "SoftEther VPN services initial job";
-        startOn = "started network-interfaces";
+        after = [ "network-interfaces.target" ];
+        wantedBy = [ "multi-user.target" ];
         preStart = ''
             for d in vpnserver vpnbridge vpnclient vpncmd; do
                 if ! test -e ${cfg.dataDir}/$d; then
@@ -74,7 +75,6 @@ in
             rm -rf ${cfg.dataDir}/vpncmd/vpncmd
             ln -s ${pkg}${cfg.dataDir}/vpncmd/vpncmd ${cfg.dataDir}/vpncmd/vpncmd
         '';
-        exec = "true";
       };
     }
 
diff --git a/nixos/modules/services/networking/ssh/lshd.nix b/nixos/modules/services/networking/ssh/lshd.nix
index 81e523fd2a51..661a6a524631 100644
--- a/nixos/modules/services/networking/ssh/lshd.nix
+++ b/nixos/modules/services/networking/ssh/lshd.nix
@@ -117,62 +117,60 @@ in
 
     services.lshd.subsystems = [ ["sftp" "${pkgs.lsh}/sbin/sftp-server"] ];
 
-    jobs.lshd =
-      { description = "GNU lshd SSH2 daemon";
+    systemd.services.lshd = {
+      description = "GNU lshd SSH2 daemon";
 
-        startOn = "started network-interfaces";
-        stopOn = "stopping network-interfaces";
+      after = [ "network-interfaces.target" ];
 
-        environment =
-          { LD_LIBRARY_PATH = config.system.nssModules.path; };
+      wantedBy = [ "multi-user.target" ];
 
-        preStart =
-          ''
-            test -d /etc/lsh || mkdir -m 0755 -p /etc/lsh
-            test -d /var/spool/lsh || mkdir -m 0755 -p /var/spool/lsh
-
-            if ! test -f /var/spool/lsh/yarrow-seed-file
-            then
-                # XXX: It would be nice to provide feedback to the
-                # user when this fails, so that they can retry it
-                # manually.
-                ${lsh}/bin/lsh-make-seed --sloppy \
-                   -o /var/spool/lsh/yarrow-seed-file
-            fi
-
-            if ! test -f "${cfg.hostKey}"
-            then
-                ${lsh}/bin/lsh-keygen --server | \
-                ${lsh}/bin/lsh-writekey --server -o "${cfg.hostKey}"
-            fi
-          '';
-
-        exec = with cfg;
-          ''
-            ${lsh}/sbin/lshd --daemonic \
-              --password-helper="${lsh}/sbin/lsh-pam-checkpw" \
-              -p ${toString portNumber} \
-              ${if interfaces == [] then ""
-                else (concatStrings (map (i: "--interface=\"${i}\"")
-                                         interfaces))} \
-              -h "${hostKey}" \
-              ${if !syslog then "--no-syslog" else ""} \
-              ${if passwordAuthentication then "--password" else "--no-password" } \
-              ${if publicKeyAuthentication then "--publickey" else "--no-publickey" } \
-              ${if rootLogin then "--root-login" else "--no-root-login" } \
-              ${if loginShell != null then "--login-shell=\"${loginShell}\"" else "" } \
-              ${if srpKeyExchange then "--srp-keyexchange" else "--no-srp-keyexchange" } \
-              ${if !tcpForwarding then "--no-tcpip-forward" else "--tcpip-forward"} \
-              ${if x11Forwarding then "--x11-forward" else "--no-x11-forward" } \
-              --subsystems=${concatStringsSep ","
-                                              (map (pair: (head pair) + "=" +
-                                                          (head (tail pair)))
-                                                   subsystems)}
-          '';
+      environment = {
+        LD_LIBRARY_PATH = config.system.nssModules.path;
       };
 
+      preStart = ''
+        test -d /etc/lsh || mkdir -m 0755 -p /etc/lsh
+        test -d /var/spool/lsh || mkdir -m 0755 -p /var/spool/lsh
+
+        if ! test -f /var/spool/lsh/yarrow-seed-file
+        then
+            # XXX: It would be nice to provide feedback to the
+            # user when this fails, so that they can retry it
+            # manually.
+            ${lsh}/bin/lsh-make-seed --sloppy \
+               -o /var/spool/lsh/yarrow-seed-file
+        fi
+
+        if ! test -f "${cfg.hostKey}"
+        then
+            ${lsh}/bin/lsh-keygen --server | \
+            ${lsh}/bin/lsh-writekey --server -o "${cfg.hostKey}"
+        fi
+      '';
+
+      script = with cfg; ''
+        ${lsh}/sbin/lshd --daemonic \
+          --password-helper="${lsh}/sbin/lsh-pam-checkpw" \
+          -p ${toString portNumber} \
+          ${if interfaces == [] then ""
+            else (concatStrings (map (i: "--interface=\"${i}\"")
+                                     interfaces))} \
+          -h "${hostKey}" \
+          ${if !syslog then "--no-syslog" else ""} \
+          ${if passwordAuthentication then "--password" else "--no-password" } \
+          ${if publicKeyAuthentication then "--publickey" else "--no-publickey" } \
+          ${if rootLogin then "--root-login" else "--no-root-login" } \
+          ${if loginShell != null then "--login-shell=\"${loginShell}\"" else "" } \
+          ${if srpKeyExchange then "--srp-keyexchange" else "--no-srp-keyexchange" } \
+          ${if !tcpForwarding then "--no-tcpip-forward" else "--tcpip-forward"} \
+          ${if x11Forwarding then "--x11-forward" else "--no-x11-forward" } \
+          --subsystems=${concatStringsSep ","
+                                          (map (pair: (head pair) + "=" +
+                                                      (head (tail pair)))
+                                               subsystems)}
+      '';
+    };
+
     security.pam.services.lshd = {};
-
   };
-
 }
diff --git a/nixos/modules/services/networking/tcpcrypt.nix b/nixos/modules/services/networking/tcpcrypt.nix
index fbd581cc4b4c..267653abce03 100644
--- a/nixos/modules/services/networking/tcpcrypt.nix
+++ b/nixos/modules/services/networking/tcpcrypt.nix
@@ -35,11 +35,11 @@ in
       description = "tcpcrypt daemon user";
     };
 
-    jobs.tcpcrypt = {
+    systemd.services.tcpcrypt = {
       description = "tcpcrypt";
 
-      wantedBy = ["multi-user.target"];
-      after = ["network-interfaces.target"];
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network-interfaces.target" ];
 
       path = [ pkgs.iptables pkgs.tcpcrypt pkgs.procps ];
 
@@ -58,7 +58,7 @@ in
         iptables -t mangle -I POSTROUTING -j nixos-tcpcrypt
       '';
 
-      exec = "tcpcryptd -x 0x10";
+      script = "tcpcryptd -x 0x10";
 
       postStop = ''
         if [ -f /run/pre-tcpcrypt-ecn-state ]; then
diff --git a/nixos/modules/services/networking/wicd.nix b/nixos/modules/services/networking/wicd.nix
index 18258084fc2c..9e5a437b4856 100644
--- a/nixos/modules/services/networking/wicd.nix
+++ b/nixos/modules/services/networking/wicd.nix
@@ -25,17 +25,13 @@ with lib;
 
     environment.systemPackages = [pkgs.wicd];
 
-    jobs.wicd =
-      { startOn = "started network-interfaces";
-        stopOn = "stopping network-interfaces";
-
-        script =
-          "${pkgs.wicd}/sbin/wicd -f";
-      };
+    systemd.services.wicd = {
+      after = [ "network-interfaces.target" ];
+      wantedBy = [ "multi-user.target" ];
+      script = "${pkgs.wicd}/sbin/wicd -f";
+    };
 
     services.dbus.enable = true;
     services.dbus.packages = [pkgs.wicd];
-
   };
-
 }
diff --git a/nixos/modules/services/networking/xinetd.nix b/nixos/modules/services/networking/xinetd.nix
index 14ee52ae52e6..08680b517808 100644
--- a/nixos/modules/services/networking/xinetd.nix
+++ b/nixos/modules/services/networking/xinetd.nix
@@ -6,8 +6,6 @@ let
 
   cfg = config.services.xinetd;
 
-  inherit (pkgs) xinetd;
-
   configFile = pkgs.writeText "xinetd.conf"
     ''
       defaults
@@ -141,18 +139,12 @@ in
   ###### implementation
 
   config = mkIf cfg.enable {
-
-    jobs.xinetd =
-      { description = "xinetd server";
-
-        startOn = "started network-interfaces";
-        stopOn = "stopping network-interfaces";
-
-        path = [ xinetd ];
-
-        exec = "xinetd -syslog daemon -dontfork -stayalive -f ${configFile}";
-      };
-
+    systemd.services.xinetd = {
+      description = "xinetd server";
+      after = [ "network-interfaces.target" ];
+      wantedBy = [ "multi-user.target" ];
+      path = [ pkgs.xinetd ];
+      script = "xinetd -syslog daemon -dontfork -stayalive -f ${configFile}";
+    };
   };
-
 }
diff --git a/nixos/modules/services/scheduling/atd.nix b/nixos/modules/services/scheduling/atd.nix
index c6f128ec4026..2070b2ffa018 100644
--- a/nixos/modules/services/scheduling/atd.nix
+++ b/nixos/modules/services/scheduling/atd.nix
@@ -66,49 +66,47 @@ in
         gid = config.ids.gids.atd;
       };
 
-    jobs.atd =
-      { description = "Job Execution Daemon (atd)";
+    systemd.services.atd = {
+      description = "Job Execution Daemon (atd)";
+      after = [ "systemd-udev-settle.service" ];
+      wants = [ "systemd-udev-settle.service" ];
+      wantedBy = [ "multi-user.target" ];
 
-        startOn = "stopped udevtrigger";
+      path = [ at ];
 
-        path = [ at ];
+      preStart = ''
+        # Snippets taken and adapted from the original `install' rule of
+        # the makefile.
 
-        preStart =
-          ''
-            # Snippets taken and adapted from the original `install' rule of
-            # the makefile.
+        # We assume these values are those actually used in Nixpkgs for
+        # `at'.
+        spooldir=/var/spool/atspool
+        jobdir=/var/spool/atjobs
+        etcdir=/etc/at
 
-            # We assume these values are those actually used in Nixpkgs for
-            # `at'.
-            spooldir=/var/spool/atspool
-            jobdir=/var/spool/atjobs
-            etcdir=/etc/at
+        for dir in "$spooldir" "$jobdir" "$etcdir"; do
+          if [ ! -d "$dir" ]; then
+              mkdir -p "$dir"
+              chown atd:atd "$dir"
+          fi
+        done
+        chmod 1770 "$spooldir" "$jobdir"
+        ${if cfg.allowEveryone then ''chmod a+rwxt "$spooldir" "$jobdir" '' else ""}
+        if [ ! -f "$etcdir"/at.deny ]; then
+            touch "$etcdir"/at.deny
+            chown root:atd "$etcdir"/at.deny
+            chmod 640 "$etcdir"/at.deny
+        fi
+        if [ ! -f "$jobdir"/.SEQ ]; then
+            touch "$jobdir"/.SEQ
+            chown atd:atd "$jobdir"/.SEQ
+            chmod 600 "$jobdir"/.SEQ
+        fi
+      '';
 
-            for dir in "$spooldir" "$jobdir" "$etcdir"; do
-              if [ ! -d "$dir" ]; then
-                  mkdir -p "$dir"
-                  chown atd:atd "$dir"
-              fi
-            done
-            chmod 1770 "$spooldir" "$jobdir"
-            ${if cfg.allowEveryone then ''chmod a+rwxt "$spooldir" "$jobdir" '' else ""}
-            if [ ! -f "$etcdir"/at.deny ]; then
-                touch "$etcdir"/at.deny
-                chown root:atd "$etcdir"/at.deny
-                chmod 640 "$etcdir"/at.deny
-            fi
-            if [ ! -f "$jobdir"/.SEQ ]; then
-                touch "$jobdir"/.SEQ
-                chown atd:atd "$jobdir"/.SEQ
-                chmod 600 "$jobdir"/.SEQ
-            fi
-          '';
-
-        exec = "atd";
-
-        daemonType = "fork";
-      };
+      script = "atd";
 
+      serviceConfig.Type = "forking";
+    };
   };
-
 }
diff --git a/nixos/modules/services/scheduling/fcron.nix b/nixos/modules/services/scheduling/fcron.nix
index ade8c19329ca..7b4665a82046 100644
--- a/nixos/modules/services/scheduling/fcron.nix
+++ b/nixos/modules/services/scheduling/fcron.nix
@@ -108,29 +108,25 @@ in
 
     security.setuidPrograms = [ "fcrontab" ];
 
-    jobs.fcron =
-      { description = "fcron daemon";
+    systemd.services.fcron = {
+      description = "fcron daemon";
+      after = [ "local-fs.target" ];
+      wantedBy = [ "multi-user.target" ];
 
-        startOn = "startup";
-
-        after = [ "local-fs.target" ];
-
-        environment =
-          { PATH = "/run/current-system/sw/bin";
-          };
-
-        preStart =
-          ''
-            ${pkgs.coreutils}/bin/mkdir -m 0700 -p /var/spool/fcron
-            # load system crontab file
-            ${pkgs.fcron}/bin/fcrontab -u systab ${pkgs.writeText "systab" cfg.systab}
-          '';
-
-        daemonType = "fork";
-
-        exec = "${pkgs.fcron}/sbin/fcron -m ${toString cfg.maxSerialJobs} ${queuelen}";
+      # FIXME use specific path
+      environment = {
+        PATH = "/run/current-system/sw/bin";
       };
 
-  };
+      preStart = ''
+        ${pkgs.coreutils}/bin/mkdir -m 0700 -p /var/spool/fcron
+        # load system crontab file
+        ${pkgs.fcron}/bin/fcrontab -u systab ${pkgs.writeText "systab" cfg.systab}
+      '';
 
+      serviceConfig.Type = "forking";
+
+      script = "${pkgs.fcron}/sbin/fcron -m ${toString cfg.maxSerialJobs} ${queuelen}";
+    };
+  };
 }
diff --git a/nixos/modules/services/security/fprot.nix b/nixos/modules/services/security/fprot.nix
index 7270a9f98145..a12aa01503e3 100644
--- a/nixos/modules/services/security/fprot.nix
+++ b/nixos/modules/services/security/fprot.nix
@@ -67,24 +67,22 @@ in {
 
     services.cron.systemCronJobs = [ "*/${toString cfg.updater.frequency} * * * * root start fprot-updater" ];
 
-    jobs = {
-      fprot_updater = {
-        name = "fprot-updater";
-          task = true;
-
-          # have to copy fpupdate executable because it insists on storing the virus database in the same dir
-          preStart = ''
-            mkdir -m 0755 -p ${stateDir}
-            chown ${fprotUser}:${fprotGroup} ${stateDir}
-            cp ${pkgs.fprot}/opt/f-prot/fpupdate ${stateDir}
-            ln -sf ${cfg.updater.productData} ${stateDir}/product.data
-          '';
-          #setuid = fprotUser;
-          #setgid = fprotGroup;
-          exec = "/var/lib/fprot/fpupdate --keyfile ${cfg.updater.licenseKeyfile}";
+    systemd.services."fprot-updater" = {
+      serviceConfig = {
+        Type = "oneshot";
+        RemainAfterExit = false;
       };
+      wantedBy = [ "multi-user.target" ];
+
+      # have to copy fpupdate executable because it insists on storing the virus database in the same dir
+      preStart = ''
+        mkdir -m 0755 -p ${stateDir}
+        chown ${fprotUser}:${fprotGroup} ${stateDir}
+        cp ${pkgs.fprot}/opt/f-prot/fpupdate ${stateDir}
+        ln -sf ${cfg.updater.productData} ${stateDir}/product.data
+      '';
+
+      script = "/var/lib/fprot/fpupdate --keyfile ${cfg.updater.licenseKeyfile}";
     };
-
  };
-
 }
diff --git a/nixos/modules/services/system/kerberos.nix b/nixos/modules/services/system/kerberos.nix
index 3a0171ca1b9b..e0c3f95c3ccc 100644
--- a/nixos/modules/services/system/kerberos.nix
+++ b/nixos/modules/services/system/kerberos.nix
@@ -45,27 +45,20 @@ in
         serverArgs = "${pkgs.heimdal}/sbin/kadmind";
       };
 
-    jobs.kdc =
-      { description = "Kerberos Domain Controller daemon";
+    systemd.services.kdc = {
+      description = "Kerberos Domain Controller daemon";
+      wantedBy = [ "multi-user.target" ];
+      preStart = ''
+        mkdir -m 0755 -p ${stateDir}
+      '';
+      script = "${heimdal}/sbin/kdc";
+    };
 
-        startOn = "ip-up";
-
-        preStart =
-          ''
-            mkdir -m 0755 -p ${stateDir}
-          '';
-
-        exec = "${heimdal}/sbin/kdc";
-
-      };
-
-    jobs.kpasswdd =
-      { description = "Kerberos Domain Controller daemon";
-
-        startOn = "ip-up";
-
-        exec = "${heimdal}/sbin/kpasswdd";
-      };
+    systemd.services.kpasswdd = {
+      description = "Kerberos Domain Controller daemon";
+      wantedBy = [ "multi-user.target" ];
+      script = "${heimdal}/sbin/kpasswdd";
+    };
   };
 
 }
diff --git a/nixos/modules/services/system/uptimed.nix b/nixos/modules/services/system/uptimed.nix
index ab46c508914d..5f8916bbf9a4 100644
--- a/nixos/modules/services/system/uptimed.nix
+++ b/nixos/modules/services/system/uptimed.nix
@@ -45,23 +45,21 @@ in
         home = stateDir;
       };
 
-    jobs.uptimed =
-      { description = "Uptimed daemon";
+    systemd.services.uptimed = {
+      description = "Uptimed daemon";
+      wantedBy = [ "multi-user.target" ];
 
-        startOn = "startup";
+      preStart = ''
+        mkdir -m 0755 -p ${stateDir}
+        chown ${uptimedUser} ${stateDir}
 
-        preStart =
-          ''
-            mkdir -m 0755 -p ${stateDir}
-            chown ${uptimedUser} ${stateDir}
+        if ! test -f ${stateDir}/bootid ; then
+          ${uptimed}/sbin/uptimed -b
+        fi
+      '';
 
-            if ! test -f ${stateDir}/bootid ; then
-              ${uptimed}/sbin/uptimed -b
-            fi
-          '';
-
-        exec = "${uptimed}/sbin/uptimed";
-      };
+      script = "${uptimed}/sbin/uptimed";
+    };
 
   };
 
diff --git a/nixos/modules/services/web-servers/jboss/default.nix b/nixos/modules/services/web-servers/jboss/default.nix
index 8a292ad67917..583fe56eb5e2 100644
--- a/nixos/modules/services/web-servers/jboss/default.nix
+++ b/nixos/modules/services/web-servers/jboss/default.nix
@@ -71,13 +71,10 @@ in
   ###### implementation
 
   config = mkIf config.services.jboss.enable {
-
-    jobs.jboss =
-      { description = "JBoss server";
-
-        exec = "${jbossService}/bin/control start";
-      };
-
+    systemd.services.jboss = {
+      description = "JBoss server";
+      script = "${jbossService}/bin/control start";
+      wantedBy = [ "multi-user.target" ];
+    };
   };
-
 }
diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix
index 99460a48835d..9f1be5a82904 100644
--- a/nixos/modules/services/web-servers/tomcat.nix
+++ b/nixos/modules/services/web-servers/tomcat.nix
@@ -127,124 +127,205 @@ in
         extraGroups = cfg.extraGroups;
       };
 
-    jobs.tomcat =
-      { description = "Apache Tomcat server";
+    systemd.services.tomcat = {
+      description = "Apache Tomcat server";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network-interfaces.target" ];
+      serviceConfig.Type = "daemon";
 
-        startOn = "started network-interfaces";
-        stopOn = "stopping network-interfaces";
+      preStart = ''
+        # Create the base directory
+        mkdir -p ${cfg.baseDir}
 
-        daemonType = "daemon";
+        # Create a symlink to the bin directory of the tomcat component
+        ln -sfn ${tomcat}/bin ${cfg.baseDir}/bin
+
+        # Create a conf/ directory
+        mkdir -p ${cfg.baseDir}/conf
+        chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/conf
+
+        # Symlink the config files in the conf/ directory (except for catalina.properties and server.xml)
+        for i in $(ls ${tomcat}/conf | grep -v catalina.properties | grep -v server.xml)
+        do
+            ln -sfn ${tomcat}/conf/$i ${cfg.baseDir}/conf/`basename $i`
+        done
+
+        # Create subdirectory for virtual hosts
+        mkdir -p ${cfg.baseDir}/virtualhosts
+
+        # Create a modified catalina.properties file
+        # Change all references from CATALINA_HOME to CATALINA_BASE and add support for shared libraries
+        sed -e 's|''${catalina.home}|''${catalina.base}|g' \
+            -e 's|shared.loader=|shared.loader=''${catalina.base}/shared/lib/*.jar|' \
+            ${tomcat}/conf/catalina.properties > ${cfg.baseDir}/conf/catalina.properties
+
+        # Create a modified server.xml which also includes all virtual hosts
+        sed -e "/<Engine name=\"Catalina\" defaultHost=\"localhost\">/a\  ${
+                     toString (map (virtualHost: ''<Host name=\"${virtualHost.name}\" appBase=\"virtualhosts/${virtualHost.name}/webapps\" unpackWARs=\"true\" autoDeploy=\"true\" xmlValidation=\"false\" xmlNamespaceAware=\"false\" >${if cfg.logPerVirtualHost then ''<Valve className=\"org.apache.catalina.valves.AccessLogValve\" directory=\"logs/${virtualHost.name}\"  prefix=\"${virtualHost.name}_access_log.\" pattern=\"combined\" resolveHosts=\"false\"/>'' else ""}</Host>'') cfg.virtualHosts)}" \
+            ${tomcat}/conf/server.xml > ${cfg.baseDir}/conf/server.xml
+
+        # Create a logs/ directory
+        mkdir -p ${cfg.baseDir}/logs
+        chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/logs
+        ${if cfg.logPerVirtualHost then
+           toString (map (h: ''
+                                mkdir -p ${cfg.baseDir}/logs/${h.name}
+                                chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/logs/${h.name}
+                             '') cfg.virtualHosts) else ''''}
+
+        # Create a temp/ directory
+        mkdir -p ${cfg.baseDir}/temp
+        chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/temp
+
+        # Create a lib/ directory
+        mkdir -p ${cfg.baseDir}/lib
+        chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/lib
+
+        # Create a shared/lib directory
+        mkdir -p ${cfg.baseDir}/shared/lib
+        chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/shared/lib
+
+        # Create a webapps/ directory
+        mkdir -p ${cfg.baseDir}/webapps
+        chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/webapps
+
+        # Symlink all the given common libs files or paths into the lib/ directory
+        for i in ${tomcat} ${toString cfg.commonLibs}
+        do
+            if [ -f $i ]
+            then
+                # If the given web application is a file, symlink it into the common/lib/ directory
+                ln -sfn $i ${cfg.baseDir}/lib/`basename $i`
+            elif [ -d $i ]
+            then
+                # If the given web application is a directory, then iterate over the files
+                # in the special purpose directories and symlink them into the tomcat tree
+
+                for j in $i/lib/*
+                do
+                    ln -sfn $j ${cfg.baseDir}/lib/`basename $j`
+                done
+            fi
+        done
+
+        # Symlink all the given shared libs files or paths into the shared/lib/ directory
+        for i in ${toString cfg.sharedLibs}
+        do
+            if [ -f $i ]
+            then
+                # If the given web application is a file, symlink it into the common/lib/ directory
+                ln -sfn $i ${cfg.baseDir}/shared/lib/`basename $i`
+            elif [ -d $i ]
+            then
+                # If the given web application is a directory, then iterate over the files
+                # in the special purpose directories and symlink them into the tomcat tree
+
+                for j in $i/shared/lib/*
+                do
+                    ln -sfn $j ${cfg.baseDir}/shared/lib/`basename $j`
+                done
+            fi
+        done
+
+        # Symlink all the given web applications files or paths into the webapps/ directory
+        for i in ${toString cfg.webapps}
+        do
+            if [ -f $i ]
+            then
+                # If the given web application is a file, symlink it into the webapps/ directory
+                ln -sfn $i ${cfg.baseDir}/webapps/`basename $i`
+            elif [ -d $i ]
+            then
+                # If the given web application is a directory, then iterate over the files
+                # in the special purpose directories and symlink them into the tomcat tree
+
+                for j in $i/webapps/*
+                do
+                    ln -sfn $j ${cfg.baseDir}/webapps/`basename $j`
+                done
+
+                # Also symlink the configuration files if they are included
+                if [ -d $i/conf/Catalina ]
+                then
+                    for j in $i/conf/Catalina/*
+                    do
+                        mkdir -p ${cfg.baseDir}/conf/Catalina/localhost
+                        ln -sfn $j ${cfg.baseDir}/conf/Catalina/localhost/`basename $j`
+                    done
+                fi
+            fi
+        done
+
+        ${toString (map (virtualHost: ''
+          # Create webapps directory for the virtual host
+          mkdir -p ${cfg.baseDir}/virtualhosts/${virtualHost.name}/webapps
+
+          # Modify ownership
+          chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/virtualhosts/${virtualHost.name}/webapps
+
+          # Symlink all the given web applications files or paths into the webapps/ directory
+          # of this virtual host
+          for i in "${if virtualHost ? webapps then toString virtualHost.webapps else ""}"
+          do
+              if [ -f $i ]
+              then
+                  # If the given web application is a file, symlink it into the webapps/ directory
+                  ln -sfn $i ${cfg.baseDir}/virtualhosts/${virtualHost.name}/webapps/`basename $i`
+              elif [ -d $i ]
+              then
+                  # If the given web application is a directory, then iterate over the files
+                  # in the special purpose directories and symlink them into the tomcat tree
+
+                  for j in $i/webapps/*
+                  do
+                      ln -sfn $j ${cfg.baseDir}/virtualhosts/${virtualHost.name}/webapps/`basename $j`
+                  done
+
+                  # Also symlink the configuration files if they are included
+                  if [ -d $i/conf/Catalina ]
+                  then
+                      for j in $i/conf/Catalina/*
+                      do
+                          mkdir -p ${cfg.baseDir}/conf/Catalina/${virtualHost.name}
+                          ln -sfn $j ${cfg.baseDir}/conf/Catalina/${virtualHost.name}/`basename $j`
+                      done
+                  fi
+              fi
+          done
 
-        preStart =
           ''
-            # Create the base directory
-            mkdir -p ${cfg.baseDir}
+        ) cfg.virtualHosts) }
 
-            # Create a symlink to the bin directory of the tomcat component
-            ln -sfn ${tomcat}/bin ${cfg.baseDir}/bin
+        # Create a work/ directory
+        mkdir -p ${cfg.baseDir}/work
+        chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/work
 
-            # Create a conf/ directory
-            mkdir -p ${cfg.baseDir}/conf
-            chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/conf
+        ${if cfg.axis2.enable then
+            ''
+            # Copy the Axis2 web application
+            cp -av ${pkgs.axis2}/webapps/axis2 ${cfg.baseDir}/webapps
 
-            # Symlink the config files in the conf/ directory (except for catalina.properties and server.xml)
-            for i in $(ls ${tomcat}/conf | grep -v catalina.properties | grep -v server.xml)
-            do
-                ln -sfn ${tomcat}/conf/$i ${cfg.baseDir}/conf/`basename $i`
-            done
+            # Turn off addressing, which causes many errors
+            sed -i -e 's%<module ref="addressing"/>%<!-- <module ref="addressing"/> -->%' ${cfg.baseDir}/webapps/axis2/WEB-INF/conf/axis2.xml
 
-            # Create subdirectory for virtual hosts
-            mkdir -p ${cfg.baseDir}/virtualhosts
+            # Modify permissions on the Axis2 application
+            chown -R ${cfg.user}:${cfg.group} ${cfg.baseDir}/webapps/axis2
 
-            # Create a modified catalina.properties file
-            # Change all references from CATALINA_HOME to CATALINA_BASE and add support for shared libraries
-            sed -e 's|''${catalina.home}|''${catalina.base}|g' \
-                -e 's|shared.loader=|shared.loader=''${catalina.base}/shared/lib/*.jar|' \
-                ${tomcat}/conf/catalina.properties > ${cfg.baseDir}/conf/catalina.properties
-
-            # Create a modified server.xml which also includes all virtual hosts
-            sed -e "/<Engine name=\"Catalina\" defaultHost=\"localhost\">/a\  ${
-                         toString (map (virtualHost: ''<Host name=\"${virtualHost.name}\" appBase=\"virtualhosts/${virtualHost.name}/webapps\" unpackWARs=\"true\" autoDeploy=\"true\" xmlValidation=\"false\" xmlNamespaceAware=\"false\" >${if cfg.logPerVirtualHost then ''<Valve className=\"org.apache.catalina.valves.AccessLogValve\" directory=\"logs/${virtualHost.name}\"  prefix=\"${virtualHost.name}_access_log.\" pattern=\"combined\" resolveHosts=\"false\"/>'' else ""}</Host>'') cfg.virtualHosts)}" \
-                ${tomcat}/conf/server.xml > ${cfg.baseDir}/conf/server.xml
-
-            # Create a logs/ directory
-            mkdir -p ${cfg.baseDir}/logs
-            chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/logs
-            ${if cfg.logPerVirtualHost then
-               toString (map (h: ''
-                                    mkdir -p ${cfg.baseDir}/logs/${h.name}
-                                    chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/logs/${h.name}
-                                 '') cfg.virtualHosts) else ''''}
-
-            # Create a temp/ directory
-            mkdir -p ${cfg.baseDir}/temp
-            chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/temp
-
-            # Create a lib/ directory
-            mkdir -p ${cfg.baseDir}/lib
-            chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/lib
-
-            # Create a shared/lib directory
-            mkdir -p ${cfg.baseDir}/shared/lib
-            chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/shared/lib
-
-            # Create a webapps/ directory
-            mkdir -p ${cfg.baseDir}/webapps
-            chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/webapps
-
-            # Symlink all the given common libs files or paths into the lib/ directory
-            for i in ${tomcat} ${toString cfg.commonLibs}
+            # Symlink all the given web service files or paths into the webapps/axis2/WEB-INF/services directory
+            for i in ${toString cfg.axis2.services}
             do
                 if [ -f $i ]
                 then
-                    # If the given web application is a file, symlink it into the common/lib/ directory
-                    ln -sfn $i ${cfg.baseDir}/lib/`basename $i`
+                    # If the given web service is a file, symlink it into the webapps/axis2/WEB-INF/services
+                    ln -sfn $i ${cfg.baseDir}/webapps/axis2/WEB-INF/services/`basename $i`
                 elif [ -d $i ]
                 then
                     # If the given web application is a directory, then iterate over the files
                     # in the special purpose directories and symlink them into the tomcat tree
 
-                    for j in $i/lib/*
+                    for j in $i/webapps/axis2/WEB-INF/services/*
                     do
-                        ln -sfn $j ${cfg.baseDir}/lib/`basename $j`
-                    done
-                fi
-            done
-
-            # Symlink all the given shared libs files or paths into the shared/lib/ directory
-            for i in ${toString cfg.sharedLibs}
-            do
-                if [ -f $i ]
-                then
-                    # If the given web application is a file, symlink it into the common/lib/ directory
-                    ln -sfn $i ${cfg.baseDir}/shared/lib/`basename $i`
-                elif [ -d $i ]
-                then
-                    # If the given web application is a directory, then iterate over the files
-                    # in the special purpose directories and symlink them into the tomcat tree
-
-                    for j in $i/shared/lib/*
-                    do
-                        ln -sfn $j ${cfg.baseDir}/shared/lib/`basename $j`
-                    done
-                fi
-            done
-
-            # Symlink all the given web applications files or paths into the webapps/ directory
-            for i in ${toString cfg.webapps}
-            do
-                if [ -f $i ]
-                then
-                    # If the given web application is a file, symlink it into the webapps/ directory
-                    ln -sfn $i ${cfg.baseDir}/webapps/`basename $i`
-                elif [ -d $i ]
-                then
-                    # If the given web application is a directory, then iterate over the files
-                    # in the special purpose directories and symlink them into the tomcat tree
-
-                    for j in $i/webapps/*
-                    do
-                        ln -sfn $j ${cfg.baseDir}/webapps/`basename $j`
+                        ln -sfn $j ${cfg.baseDir}/webapps/axis2/WEB-INF/services/`basename $j`
                     done
 
                     # Also symlink the configuration files if they are included
@@ -252,110 +333,25 @@ in
                     then
                         for j in $i/conf/Catalina/*
                         do
-                            mkdir -p ${cfg.baseDir}/conf/Catalina/localhost
                             ln -sfn $j ${cfg.baseDir}/conf/Catalina/localhost/`basename $j`
                         done
                     fi
                 fi
             done
+            ''
+        else ""}
+      '';
 
-            ${toString (map (virtualHost: ''
-              # Create webapps directory for the virtual host
-              mkdir -p ${cfg.baseDir}/virtualhosts/${virtualHost.name}/webapps
+      script = ''
+          ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c 'CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${cfg.jdk} JAVA_OPTS="${cfg.javaOpts}" CATALINA_OPTS="${cfg.catalinaOpts}" ${tomcat}/bin/startup.sh'
+      '';
 
-              # Modify ownership
-              chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/virtualhosts/${virtualHost.name}/webapps
+      postStop = ''
+        echo "Stopping tomcat..."
+        CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${cfg.jdk} ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c ${tomcat}/bin/shutdown.sh
+      '';
 
-              # Symlink all the given web applications files or paths into the webapps/ directory
-              # of this virtual host
-              for i in "${if virtualHost ? webapps then toString virtualHost.webapps else ""}"
-              do
-                  if [ -f $i ]
-                  then
-                      # If the given web application is a file, symlink it into the webapps/ directory
-                      ln -sfn $i ${cfg.baseDir}/virtualhosts/${virtualHost.name}/webapps/`basename $i`
-                  elif [ -d $i ]
-                  then
-                      # If the given web application is a directory, then iterate over the files
-                      # in the special purpose directories and symlink them into the tomcat tree
-
-                      for j in $i/webapps/*
-                      do
-                          ln -sfn $j ${cfg.baseDir}/virtualhosts/${virtualHost.name}/webapps/`basename $j`
-                      done
-
-                      # Also symlink the configuration files if they are included
-                      if [ -d $i/conf/Catalina ]
-                      then
-                          for j in $i/conf/Catalina/*
-                          do
-                              mkdir -p ${cfg.baseDir}/conf/Catalina/${virtualHost.name}
-                              ln -sfn $j ${cfg.baseDir}/conf/Catalina/${virtualHost.name}/`basename $j`
-                          done
-                      fi
-                  fi
-              done
-
-              ''
-            ) cfg.virtualHosts) }
-
-            # Create a work/ directory
-            mkdir -p ${cfg.baseDir}/work
-            chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/work
-
-            ${if cfg.axis2.enable then
-                ''
-                # Copy the Axis2 web application
-                cp -av ${pkgs.axis2}/webapps/axis2 ${cfg.baseDir}/webapps
-
-                # Turn off addressing, which causes many errors
-                sed -i -e 's%<module ref="addressing"/>%<!-- <module ref="addressing"/> -->%' ${cfg.baseDir}/webapps/axis2/WEB-INF/conf/axis2.xml
-
-                # Modify permissions on the Axis2 application
-                chown -R ${cfg.user}:${cfg.group} ${cfg.baseDir}/webapps/axis2
-
-                # Symlink all the given web service files or paths into the webapps/axis2/WEB-INF/services directory
-                for i in ${toString cfg.axis2.services}
-                do
-                    if [ -f $i ]
-                    then
-                        # If the given web service is a file, symlink it into the webapps/axis2/WEB-INF/services
-                        ln -sfn $i ${cfg.baseDir}/webapps/axis2/WEB-INF/services/`basename $i`
-                    elif [ -d $i ]
-                    then
-                        # If the given web application is a directory, then iterate over the files
-                        # in the special purpose directories and symlink them into the tomcat tree
-
-                        for j in $i/webapps/axis2/WEB-INF/services/*
-                        do
-                            ln -sfn $j ${cfg.baseDir}/webapps/axis2/WEB-INF/services/`basename $j`
-                        done
-
-                        # Also symlink the configuration files if they are included
-                        if [ -d $i/conf/Catalina ]
-                        then
-                            for j in $i/conf/Catalina/*
-                            do
-                                ln -sfn $j ${cfg.baseDir}/conf/Catalina/localhost/`basename $j`
-                            done
-                        fi
-                    fi
-                done
-                ''
-            else ""}
-          '';
-
-        script = ''
-            ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c 'CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${cfg.jdk} JAVA_OPTS="${cfg.javaOpts}" CATALINA_OPTS="${cfg.catalinaOpts}" ${tomcat}/bin/startup.sh'
-        '';
-
-        postStop =
-          ''
-            echo "Stopping tomcat..."
-            CATALINA_BASE=${cfg.baseDir} JAVA_HOME=${cfg.jdk} ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c ${tomcat}/bin/shutdown.sh
-          '';
-
-      };
+    };
 
   };
 
diff --git a/nixos/modules/services/x11/xfs.nix b/nixos/modules/services/x11/xfs.nix
index 196f3beb41e9..ea7cfa1aa43c 100644
--- a/nixos/modules/services/x11/xfs.nix
+++ b/nixos/modules/services/x11/xfs.nix
@@ -30,20 +30,17 @@ in
   ###### implementation
 
   config = mkIf config.services.xfs.enable {
-
     assertions = singleton
       { assertion = config.fonts.enableFontDir;
         message = "Please enable fonts.enableFontDir to use the X Font Server.";
       };
 
-    jobs.xfs =
-      { description = "X Font Server";
-
-        startOn = "started networking";
-
-        exec = "${pkgs.xorg.xfs}/bin/xfs -config ${configFile}";
-      };
-
+    systemd.services.xfs = {
+      description = "X Font Server";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      path = [ pkgs.xorg.xfs ];
+      script = "xfs -config ${configFile}";
+    };
   };
-
 }
diff --git a/nixos/modules/system/upstart/upstart.nix b/nixos/modules/system/upstart/upstart.nix
deleted file mode 100644
index 5c0461304072..000000000000
--- a/nixos/modules/system/upstart/upstart.nix
+++ /dev/null
@@ -1,290 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-with import ../boot/systemd-unit-options.nix { inherit config lib; };
-
-let
-
-  userExists = u:
-    (u == "") || any (uu: uu.name == u) (attrValues config.users.extraUsers);
-
-  groupExists = g:
-    (g == "") || any (gg: gg.name == g) (attrValues config.users.extraGroups);
-
-  makeJobScript = name: content: "${pkgs.writeScriptBin name content}/bin/${name}";
-
-  # From a job description, generate an systemd unit file.
-  makeUnit = job:
-
-    let
-      hasMain = job.script != "" || job.exec != "";
-
-      env = job.environment;
-
-      preStartScript = makeJobScript "${job.name}-pre-start"
-        ''
-          #! ${pkgs.stdenv.shell} -e
-          ${job.preStart}
-        '';
-
-      startScript = makeJobScript "${job.name}-start"
-        ''
-          #! ${pkgs.stdenv.shell} -e
-          ${if job.script != "" then job.script else ''
-            exec ${job.exec}
-          ''}
-        '';
-
-      postStartScript = makeJobScript "${job.name}-post-start"
-        ''
-          #! ${pkgs.stdenv.shell} -e
-          ${job.postStart}
-        '';
-
-      preStopScript = makeJobScript "${job.name}-pre-stop"
-        ''
-          #! ${pkgs.stdenv.shell} -e
-          ${job.preStop}
-        '';
-
-      postStopScript = makeJobScript "${job.name}-post-stop"
-        ''
-          #! ${pkgs.stdenv.shell} -e
-          ${job.postStop}
-        '';
-    in {
-
-      inherit (job) description requires before partOf environment path restartIfChanged unitConfig;
-
-      after =
-        (if job.startOn == "stopped udevtrigger" then [ "systemd-udev-settle.service" ] else
-         if job.startOn == "started udev" then [ "systemd-udev.service" ] else
-         if job.startOn == "started network-interfaces" then [ "network-interfaces.target" ] else
-         if job.startOn == "started networking" then [ "network.target" ] else
-         if job.startOn == "ip-up" then [] else
-         if job.startOn == "" || job.startOn == "startup" then [] else
-         builtins.trace "Warning: job ‘${job.name}’ has unknown startOn value ‘${job.startOn}’." []
-        ) ++ job.after;
-
-      wants = 
-        (if job.startOn == "stopped udevtrigger" then [ "systemd-udev-settle.service" ] else []
-        ) ++ job.wants;
-
-      wantedBy =
-        (if job.startOn == "" then [] else
-         if job.startOn == "ip-up" then [ "ip-up.target" ] else
-         [ "multi-user.target" ]) ++ job.wantedBy;
-
-      serviceConfig =
-        job.serviceConfig
-        // optionalAttrs (job.preStart != "" && (job.script != "" || job.exec != ""))
-          { ExecStartPre = preStartScript; }
-        // optionalAttrs (job.preStart != "" && job.script == "" && job.exec == "")
-          { ExecStart = preStartScript; }
-        // optionalAttrs (job.script != "" || job.exec != "")
-          { ExecStart = startScript; }
-        // optionalAttrs (job.postStart != "")
-          { ExecStartPost = postStartScript; }
-        // optionalAttrs (job.preStop != "")
-          { ExecStop = preStopScript; }
-        // optionalAttrs (job.postStop != "")
-          { ExecStopPost = postStopScript; }
-        // (if job.script == "" && job.exec == "" then { Type = "oneshot"; RemainAfterExit = true; } else
-            if job.daemonType == "fork" || job.daemonType == "daemon" then { Type = "forking"; GuessMainPID = true; } else
-            if job.daemonType == "none" then { } else
-            throw "invalid daemon type `${job.daemonType}'")
-        // optionalAttrs (!job.task && !(job.script == "" && job.exec == "") && job.respawn)
-          { Restart = "always"; }
-        // optionalAttrs job.task
-          { Type = "oneshot"; RemainAfterExit = false; };
-    };
-
-
-  jobOptions = serviceOptions // {
-
-    name = mkOption {
-      # !!! The type should ensure that this could be a filename.
-      type = types.str;
-      example = "sshd";
-      description = ''
-        Name of the job, mapped to the systemd unit
-        <literal><replaceable>name</replaceable>.service</literal>.
-      '';
-    };
-
-    startOn = mkOption {
-      #type = types.str;
-      default = "";
-      description = ''
-        The Upstart event that triggers this job to be started.  Some
-        are mapped to systemd dependencies; otherwise you will get a
-        warning.  If empty, the job will not start automatically.
-      '';
-    };
-
-    stopOn = mkOption {
-      type = types.str;
-      default = "starting shutdown";
-      description = ''
-        Ignored; this was the Upstart event that triggers this job to be stopped.
-      '';
-    };
-
-    postStart = mkOption {
-      type = types.lines;
-      default = "";
-      description = ''
-        Shell commands executed after the job is started (i.e. after
-        the job's main process is started), but before the job is
-        considered “running”.
-      '';
-    };
-
-    preStop = mkOption {
-      type = types.lines;
-      default = "";
-      description = ''
-        Shell commands executed before the job is stopped
-        (i.e. before systemd kills the job's main process).  This can
-        be used to cleanly shut down a daemon.
-      '';
-    };
-
-    postStop = mkOption {
-      type = types.lines;
-      default = "";
-      description = ''
-        Shell commands executed after the job has stopped
-        (i.e. after the job's main process has terminated).
-      '';
-    };
-
-    exec = mkOption {
-      type = types.str;
-      default = "";
-      description = ''
-        Command to start the job's main process.  If empty, the
-        job has no main process, but can still have pre/post-start
-        and pre/post-stop scripts, and is considered “running”
-        until it is stopped.
-      '';
-    };
-
-    respawn = mkOption {
-      type = types.bool;
-      default = true;
-      description = ''
-        Whether to restart the job automatically if its process
-        ends unexpectedly.
-      '';
-    };
-
-    task = mkOption {
-      type = types.bool;
-      default = false;
-      description = ''
-        Whether this job is a task rather than a service.  Tasks
-        are executed only once, while services are restarted when
-        they exit.
-      '';
-    };
-
-    daemonType = mkOption {
-      type = types.str;
-      default = "none";
-      description = ''
-        Determines how systemd detects when a daemon should be
-        considered “running”.  The value <literal>none</literal> means
-        that the daemon is considered ready immediately.  The value
-        <literal>fork</literal> means that the daemon will fork once.
-        The value <literal>daemon</literal> means that the daemon will
-        fork twice.  The value <literal>stop</literal> means that the
-        daemon will raise the SIGSTOP signal to indicate readiness.
-      '';
-    };
-
-    setuid = mkOption {
-      type = types.addCheck types.str userExists;
-      default = "";
-      description = ''
-        Run the daemon as a different user.
-      '';
-    };
-
-    setgid = mkOption {
-      type = types.addCheck types.str groupExists;
-      default = "";
-      description = ''
-        Run the daemon as a different group.
-      '';
-    };
-
-    path = mkOption {
-      default = [];
-      description = ''
-        Packages added to the job's <envar>PATH</envar> environment variable.
-        Both the <filename>bin</filename> and <filename>sbin</filename>
-        subdirectories of each package are added.
-      '';
-    };
-
-  };
-
-
-  upstartJob = { name, config, ... }: {
-
-    options = {
-
-      unit = mkOption {
-        default = makeUnit config;
-        description = "Generated definition of the systemd unit corresponding to this job.";
-      };
-
-    };
-
-    config = {
-
-      # The default name is the name extracted from the attribute path.
-      name = mkDefault name;
-
-    };
-
-  };
-
-in
-
-{
-
-  ###### interface
-
-  options = {
-
-    jobs = mkOption {
-      default = {};
-      description = ''
-        This option is a legacy method to define system services,
-        dating from the era where NixOS used Upstart instead of
-        systemd.  You should use <option>systemd.services</option>
-        instead.  Services defined using <option>jobs</option> are
-        mapped automatically to <option>systemd.services</option>, but
-        may not work perfectly; in particular, most
-        <option>startOn</option> conditions are not supported.
-      '';
-      type = types.loaOf types.optionSet;
-      options = [ jobOptions upstartJob ];
-    };
-
-  };
-
-
-  ###### implementation
-
-  config = {
-
-    systemd.services =
-      flip mapAttrs' config.jobs (name: job:
-        nameValuePair job.name job.unit);
-
-  };
-
-}
diff --git a/nixos/modules/tasks/filesystems/btrfs.nix b/nixos/modules/tasks/filesystems/btrfs.nix
index 2e5b34a3246e..8cfa1b6921d3 100644
--- a/nixos/modules/tasks/filesystems/btrfs.nix
+++ b/nixos/modules/tasks/filesystems/btrfs.nix
@@ -31,13 +31,5 @@ in
       ''
         btrfs device scan
       '';
-
-    # !!! This is broken.  There should be a udev rule to do this when
-    # new devices are discovered.
-    jobs.udev.postStart =
-      ''
-        ${pkgs.btrfs-progs}/bin/btrfs device scan
-      '';
-
   };
 }
diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix
index 16aedbbb185d..3668d17ac89b 100644
--- a/nixos/modules/virtualisation/libvirtd.nix
+++ b/nixos/modules/virtualisation/libvirtd.nix
@@ -166,33 +166,33 @@ in
           '';
       };
 
-    jobs."libvirt-guests" =
-      { description = "Libvirt Virtual Machines";
+    systemd.services."libvirt-guests" = {
+      description = "Libvirt Virtual Machines";
 
-        wantedBy = [ "multi-user.target" ];
-        wants = [ "libvirtd.service" ];
-        after = [ "libvirtd.service" ];
+      wantedBy = [ "multi-user.target" ];
+      wants = [ "libvirtd.service" ];
+      after = [ "libvirtd.service" ];
 
-        restartIfChanged = false;
+      restartIfChanged = false;
 
-        path = [ pkgs.gettext pkgs.libvirt pkgs.gawk ];
+      path = with pkgs; [ gettext libvirt gawk ];
 
-        preStart =
-          ''
-            mkdir -p /var/lock/subsys -m 755
-            ${pkgs.libvirt}/etc/rc.d/init.d/libvirt-guests start || true
-          '';
+      preStart = ''
+        mkdir -p /var/lock/subsys -m 755
+        ${pkgs.libvirt}/etc/rc.d/init.d/libvirt-guests start || true
+      '';
 
-        postStop = 
-            ''
-            export PATH=${pkgs.gettext}/bin:$PATH
-            export ON_SHUTDOWN=${cfg.onShutdown}
-            ${pkgs.libvirt}/etc/rc.d/init.d/libvirt-guests stop
-            '';
+      postStop = ''
+        export PATH=${pkgs.gettext}/bin:$PATH
+        export ON_SHUTDOWN=${cfg.onShutdown}
+        ${pkgs.libvirt}/etc/rc.d/init.d/libvirt-guests stop
+      '';
 
-        serviceConfig.Type = "oneshot";
-        serviceConfig.RemainAfterExit = true;
+      serviceConfig = {
+        Type = "oneshot";
+        RemainAfterExit = true;
       };
+    };
 
     users.extraGroups.libvirtd.gid = config.ids.gids.libvirtd;
 
diff --git a/nixos/tests/quake3.nix b/nixos/tests/quake3.nix
index c72d94e11a8d..d42f7471c832 100644
--- a/nixos/tests/quake3.nix
+++ b/nixos/tests/quake3.nix
@@ -34,9 +34,9 @@ rec {
     { server =
         { config, pkgs, ... }:
 
-        { jobs."quake3-server" =
-            { startOn = "startup";
-              exec =
+        { systemd.services."quake3-server" =
+            { wantedBy = [ "multi-user.target" ];
+              script =
                 "${pkgs.quake3demo}/bin/quake3-server '+set g_gametype 0' " +
                 "'+map q3dm7' '+addbot grunt' '+addbot daemia' 2> /tmp/log";
             };

From 2357918b0040c668706d6b94582bd1eca63262e7 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 6 Jan 2016 16:27:45 +0100
Subject: [PATCH 393/884] opensc-dnie lib & wrapper: remove dead packages

Last updated in 2010, broken since 2013.

cc @viric
---
 .../libraries/libopensc-dnie/default.nix      | 53 ---------------
 .../security/opensc-dnie-wrapper/default.nix  | 67 -------------------
 pkgs/top-level/all-packages.nix               |  4 --
 3 files changed, 124 deletions(-)
 delete mode 100644 pkgs/development/libraries/libopensc-dnie/default.nix
 delete mode 100644 pkgs/tools/security/opensc-dnie-wrapper/default.nix

diff --git a/pkgs/development/libraries/libopensc-dnie/default.nix b/pkgs/development/libraries/libopensc-dnie/default.nix
deleted file mode 100644
index f2855dd2a924..000000000000
--- a/pkgs/development/libraries/libopensc-dnie/default.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ stdenv, fetchurl, writeScript, patchelf, glib, opensc, openssl, openct
-, libtool, pcsclite, zlib
-}:
-
-stdenv.mkDerivation rec {
-  name = "libopensc-dnie-1.4.6-2";
-
-  src = if stdenv.system == "i686-linux" then (fetchurl {
-      url = http://www.dnielectronico.es/descargas/PKCS11_para_Sistemas_Unix/1.4.6.Ubuntu_Jaunty_32/Ubuntu_Jaunty_opensc-dnie_1.4.6-2_i386.deb.tar;
-      sha256 = "1i6r9ahjr0rkcxjfzkg2rrib1rjsjd5raxswvvfiya98q8rlv39i";
-    })
-    else if stdenv.system == "x86_64-linux" then (fetchurl { url = http://www.dnielectronico.es/descargas/PKCS11_para_Sistemas_Unix/1.4.6.Ubuntu_Jaunty_64/Ubuntu_Jaunty_opensc-dnie_1.4.6-2_amd64.deb.tar;
-      sha256 = "1py2bxavdcj0crhk1lwqzjgya5lvyhdfdbr4g04iysj56amxb7f9";
-    })
-    else throw "Architecture not supported";
-
-  buildInputs = [ patchelf glib ];
-
-  builder = writeScript (name + "-builder.sh") ''
-    source $stdenv/setup
-    tar xf $src
-    ar x opensc-dnie*
-    tar xf data.tar.gz
-
-    RPATH=${glib}/lib:${opensc}/lib:${openssl}/lib:${openct}/lib:${libtool}/lib:${pcsclite}/lib:${stdenv.cc.libc}/lib:${zlib}/lib
-
-    for a in "usr/lib/"*.so*; do
-        if ! test -L $a; then
-            patchelf --set-rpath $RPATH $a
-        fi
-    done
-
-    sed -i s,/usr,$out, "usr/lib/pkgconfig/"*
-
-    mkdir -p $out
-    cp -R usr/lib $out
-    cp -R usr/share $out
-  '';
-
-  passthru = {
-    # This will help keeping the proper opensc version when using this libopensc-dnie library
-    inherit opensc;
-  };
-
-  meta = {
-    homepage = http://www.dnielectronico.es/descargas/;
-    description = "Opensc plugin to access the Spanish national ID smartcard";
-    license = stdenv.lib.licenses.unfree;
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
-    broken = true;
-  };
-}
diff --git a/pkgs/tools/security/opensc-dnie-wrapper/default.nix b/pkgs/tools/security/opensc-dnie-wrapper/default.nix
deleted file mode 100644
index 8003073159a9..000000000000
--- a/pkgs/tools/security/opensc-dnie-wrapper/default.nix
+++ /dev/null
@@ -1,67 +0,0 @@
-{stdenv, makeWrapper, ed, libopensc_dnie}:
-
-let
-   opensc = libopensc_dnie.opensc;
-in
-stdenv.mkDerivation rec {
-  name = "${opensc.name}-dnie-wrapper";
-
-  buildInputs = [ makeWrapper ];
-  
-  phases = [ "installPhase" ];
-
-  installPhase = ''
-    mkdir -p $out/etc
-    cp ${opensc}/etc/opensc.conf $out/etc
-    chmod +w $out/etc/opensc.conf
-
-    # NOTE: The libopensc-dnie.so driver requires /usr/bin/pinentry available, to sign
-
-    ${ed}/bin/ed $out/etc/opensc.conf << EOF
-    /card_drivers
-    a
-    card_drivers = dnie;
-    card_driver dnie {
-      module = ${libopensc_dnie}/lib/libopensc-dnie.so;
-    }
-    .
-    w
-    q
-    EOF
-
-    # Disable pkcs15 file caching, otherwise the card does not work
-    sed -i 's/use_caching = true/use_caching = false/' $out/etc/opensc.conf
-
-    for a in ${opensc}/bin/*; do
-      makeWrapper $a $out/bin/`basename $a` \
-        --set OPENSC_CONF $out/etc/opensc.conf
-    done
-
-    # Special wrapper for pkcs11-tool, which needs an additional parameter
-    rm $out/bin/pkcs11-tool
-    makeWrapper ${opensc}/bin/pkcs11-tool $out/bin/pkcs11-tool \
-      --set OPENSC_CONF $out/etc/opensc.conf \
-      --add-flags "--module ${opensc}/lib/opensc-pkcs11.so"
-
-    # Add, as bonus, a wrapper for the firefox in the PATH, that loads the
-    # proper opensc configuration.
-    cat > $out/bin/firefox-dnie << EOF
-    #!${stdenv.shell}
-    export OPENSC_CONF=$out/etc/opensc.conf
-    exec firefox
-    EOF
-    chmod +x $out/bin/firefox-dnie
-  '';
-
-  meta = {
-    description = "Access to the opensc tools and firefox using the Spanish national ID SmartCard";
-    longDescription = ''
-      Opensc needs a special configuration and special drivers to use the SmartCard
-      the Spanish government provides to the citizens as ID card.
-      Some wrapper scripts take care for the proper opensc configuration to be used, in order
-      to access the certificates in the SmartCard through the opensc tools or firefox.
-      Opensc will require a pcscd daemon running, managing the access to the card reader.
-    '';
-    maintainers = with stdenv.lib.maintainers; [viric];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7bc014e33a44..5601fb7ca7e1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2559,8 +2559,6 @@ let
 
   opensc = callPackage ../tools/security/opensc { };
 
-  opensc_dnie_wrapper = callPackage ../tools/security/opensc-dnie-wrapper { };
-
   openssh =
     callPackage ../tools/networking/openssh {
       hpnSupport = false;
@@ -7991,8 +7989,6 @@ let
 
   openldap = callPackage ../development/libraries/openldap { };
 
-  libopensc_dnie = callPackage ../development/libraries/libopensc-dnie { };
-
   opencolorio = callPackage ../development/libraries/opencolorio { };
 
   ois = callPackage ../development/libraries/ois {};

From 4f4eebbded6b18d3e308c6e03943355a6622b489 Mon Sep 17 00:00:00 2001
From: Jakob Gillich <jakob@gillich.me>
Date: Thu, 7 Jan 2016 05:19:06 +0100
Subject: [PATCH 394/884] mcrypt: fix several security issues (close #12194)

CVE-2012-4409, CVE-2012-4426, CVE-2012-4527

Patches taken from https://gitweb.gentoo.org/repo/gentoo.git/tree/app-crypt/mcrypt/files
---
 pkgs/tools/misc/mcrypt/default.nix         |  12 ++-
 pkgs/tools/misc/mcrypt/format-string.patch |  31 ++++++
 pkgs/tools/misc/mcrypt/overflow.patch      |  24 +++++
 pkgs/tools/misc/mcrypt/segv.patch          |  39 ++++++++
 pkgs/tools/misc/mcrypt/sprintf.patch       | 108 +++++++++++++++++++++
 5 files changed, 209 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/tools/misc/mcrypt/format-string.patch
 create mode 100644 pkgs/tools/misc/mcrypt/overflow.patch
 create mode 100644 pkgs/tools/misc/mcrypt/segv.patch
 create mode 100644 pkgs/tools/misc/mcrypt/sprintf.patch

diff --git a/pkgs/tools/misc/mcrypt/default.nix b/pkgs/tools/misc/mcrypt/default.nix
index ffd8966a80eb..52c96fda1973 100644
--- a/pkgs/tools/misc/mcrypt/default.nix
+++ b/pkgs/tools/misc/mcrypt/default.nix
@@ -1,16 +1,18 @@
 { stdenv, fetchurl, libmcrypt, libmhash }:
- 
+
 stdenv.mkDerivation rec {
   version = "2.6.8";
   name = "mcrypt-${version}";
-  
+
   src = fetchurl {
     url = "mirror://sourceforge/mcrypt/MCrypt/${version}/${name}.tar.gz";
     sha256 = "5145aa844e54cca89ddab6fb7dd9e5952811d8d787c4f4bf27eb261e6c182098";
   };
- 
-  buildInputs = [libmcrypt libmhash];
- 
+
+  patches = [ ./format-string.patch ./overflow.patch ./segv.patch ./sprintf.patch ];
+
+  buildInputs = [ libmcrypt libmhash ];
+
   meta = {
     description = "Replacement for old UNIX crypt(1)";
     longDescription = ''
diff --git a/pkgs/tools/misc/mcrypt/format-string.patch b/pkgs/tools/misc/mcrypt/format-string.patch
new file mode 100644
index 000000000000..322ab473811f
--- /dev/null
+++ b/pkgs/tools/misc/mcrypt/format-string.patch
@@ -0,0 +1,31 @@
+--- mcrypt-2.6.8/src/errors.c
++++ mcrypt-2.6.8/src/errors.c
+@@ -25,24 +25,24 @@
+
+ void err_quit(char *errmsg)
+ {
+-	fprintf(stderr, errmsg);
++	fprintf(stderr, "%s", errmsg);
+ 	exit(-1);
+ }
+
+ void err_warn(char *errmsg)
+ {
+ 	if (quiet <= 1)
+-		fprintf(stderr, errmsg);
++		fprintf(stderr, "%s", errmsg);
+ }
+
+ void err_info(char *errmsg)
+ {
+ 	if (quiet == 0)
+-		fprintf(stderr, errmsg);
++		fprintf(stderr, "%s", errmsg);
+ }
+
+ void err_crit(char *errmsg)
+ {
+ 	if (quiet <= 2)
+-		fprintf(stderr, errmsg);
++		fprintf(stderr, "%s", errmsg);
+ }
diff --git a/pkgs/tools/misc/mcrypt/overflow.patch b/pkgs/tools/misc/mcrypt/overflow.patch
new file mode 100644
index 000000000000..bf747a58266a
--- /dev/null
+++ b/pkgs/tools/misc/mcrypt/overflow.patch
@@ -0,0 +1,24 @@
+From 3efb40e17ce4f76717ae17a1ce1e1f747ddf59fd Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sat, 22 Dec 2012 22:37:06 +0200
+Subject: [PATCH] cleanup: buffer overflow
+
+---
+ mcrypt-2.6.8/src/extra.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/mcrypt-2.6.8/src/extra.c b/mcrypt-2.6.8/src/extra.c
+index 3082f82..c7a1ac0 100644
+--- a/src/extra.c
++++ b/src/extra.c
+@@ -241,6 +241,8 @@ int check_file_head(FILE * fstream, char *algorithm, char *mode,
+ 		if (m_getbit(6, flags) == 1) { /* if the salt bit is set */
+ 			if (m_getbit(0, sflag) != 0) { /* if the first bit is set */
+ 				*salt_size = m_setbit(0, sflag, 0);
++				if (*salt_size > sizeof(tmp_buf))
++					err_quit(_("Salt is too long\n"));
+ 				if (*salt_size > 0) {
+ 					fread(tmp_buf, 1, *salt_size,
+ 					      fstream);
+--
+1.7.8.6
diff --git a/pkgs/tools/misc/mcrypt/segv.patch b/pkgs/tools/misc/mcrypt/segv.patch
new file mode 100644
index 000000000000..6796163418f5
--- /dev/null
+++ b/pkgs/tools/misc/mcrypt/segv.patch
@@ -0,0 +1,39 @@
+From 5bee29fae8f0e936ad4c957aef6035d09532a57a Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sat, 22 Dec 2012 22:04:27 +0200
+Subject: [PATCH] cleanup: fixup segv on buffer access
+
+use exact buffer size instead of guess.
+
+do not copy out of source buffer.
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ mcrypt-2.6.8/src/rfc2440.c |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/mcrypt-2.6.8/src/rfc2440.c b/mcrypt-2.6.8/src/rfc2440.c
+index 5a1f296..929b9ab 100644
+--- a/src/rfc2440.c
++++ b/src/rfc2440.c
+@@ -497,7 +497,7 @@ plaintext_encode(const USTRING dat)
+     time_t t;
+
+     assert(dat->len > 0);
+-    result = make_ustring( NULL,  2 * dat->len); /* xxx */
++    result = make_ustring( NULL,  dat->len + 12); /* xxx */
+     newdat = (USTRING)dat;
+     result->d[pos++] = (0x80 | 0x40 | PKT_PLAINTEXT);
+
+@@ -810,7 +810,8 @@ encrypted_encode(const USTRING pt, const DEK *dek)
+     _mcrypt_encrypt(dek->hd, rndpref, dek->blocklen + 2, NULL, 0);
+     _mcrypt_sync(dek->hd, rndpref, dek->blocklen);
+
+-    ct = make_ustring( rndpref,   2 * pt->len); /* xxx */
++    ct = make_ustring( NULL, dek->blocklen + 2 + pt->len + 12); /* xxx */
++    memcpy(ct->d, rndpref, dek->blocklen + 2);
+     pos = dek->blocklen + 2;
+
+     _mcrypt_encrypt(dek->hd, ct->d + pos, pt->len, pt->d, pt->len);
+--
+1.7.8.6
diff --git a/pkgs/tools/misc/mcrypt/sprintf.patch b/pkgs/tools/misc/mcrypt/sprintf.patch
new file mode 100644
index 000000000000..1c9ade807778
--- /dev/null
+++ b/pkgs/tools/misc/mcrypt/sprintf.patch
@@ -0,0 +1,108 @@
+Description: [CVE-2012-4527] Stack-based buffer overflow with long file names
+ .
+ A buffer overflow in mcrypt version 2.6.8 and earlier due to long filenames.
+ If a user were tricked into attempting to encrypt/decrypt specially crafted
+ long filename(s), this flaw would cause a stack-based buffer overflow that
+ could potentially lead to arbitrary code execution.
+ .
+ Note that this is caught by FORTIFY_SOURCE, which makes this a crash-only
+ bug on wheezy.
+Author: Attila Bogar, Jean-Michel Vourgère <jmv_deb@nirgal.com>
+Origin: https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2012-4527
+Bug: CVE-2012-4527
+Bug-Debian: http://bugs.debian.org/690924
+Forwarded: no
+Last-Update: 2012-11-01
+Index: mcrypt-2.6.8/src/mcrypt.c
+===================================================================
+--- mcrypt-2.6.8.orig/src/mcrypt.c
++++ mcrypt-2.6.8/src/mcrypt.c
+@@ -41,4 +41,6 @@
+
++/* Temporary error message can contain one file name and 1k of text */
++#define ERRWIDTH ((PATH_MAX)+1024)
+-char tmperr[128];
++char tmperr[ERRWIDTH];
+ unsigned int stream_flag = FALSE;
+ char *keymode = NULL;
+ char *mode = NULL;
+@@ -482,7 +485,7 @@
+ #ifdef HAVE_STAT
+       if (stream_flag == FALSE) {
+ 	 if (is_normal_file(file[i]) == FALSE) {
+-	    sprintf(tmperr,
++	    snprintf(tmperr, ERRWIDTH,
+ 		    _
+ 		    ("%s: %s is not a regular file. Skipping...\n"),
+ 		    program_name, file[i]);
+@@ -501,7 +504,7 @@
+ 	    dinfile = file[i];
+ 	 if ((isatty(fileno((FILE *) (stdin))) == 1)
+ 	     && (stream_flag == TRUE) && (force == 0)) {	/* not a tty */
+-	    sprintf(tmperr,
++	    snprintf(tmperr, ERRWIDTH,
+ 		    _
+ 		    ("%s: Encrypted data will not be read from a terminal.\n"),
+ 		    program_name);
+@@ -520,7 +523,7 @@
+ 	    einfile = file[i];
+ 	 if ((isatty(fileno((FILE *) (stdout))) == 1)
+ 	     && (stream_flag == TRUE) && (force == 0)) {	/* not a tty */
+-	    sprintf(tmperr,
++	    snprintf(tmperr, ERRWIDTH,
+ 		    _
+ 		    ("%s: Encrypted data will not be written to a terminal.\n"),
+ 		    program_name);
+@@ -544,7 +547,7 @@
+ 	    strcpy(outfile, einfile);
+ 	    /* if file has already the .nc ignore it */
+ 	    if (strstr(outfile, ".nc") != NULL) {
+-	       sprintf(tmperr,
++	       snprintf(tmperr, ERRWIDTH,
+ 		       _
+ 		       ("%s: file %s has the .nc suffix... skipping...\n"),
+ 		       program_name, outfile);
+@@ -590,10 +593,10 @@
+
+ 	 if (x == 0) {
+ 	    if (stream_flag == FALSE) {
+-	       sprintf(tmperr, _("File %s was decrypted.\n"), dinfile);
++	       snprintf(tmperr, ERRWIDTH, _("File %s was decrypted.\n"), dinfile);
+ 	       err_warn(tmperr);
+ 	    } else {
+-	       sprintf(tmperr, _("Stdin was decrypted.\n"));
++	       snprintf(tmperr, ERRWIDTH, _("Stdin was decrypted.\n"));
+ 	       err_warn(tmperr);
+ 	    }
+ #ifdef HAVE_STAT
+@@ -610,7 +613,7 @@
+
+ 	 } else {
+ 	    if (stream_flag == FALSE) {
+-	       sprintf(tmperr,
++	       snprintf(tmperr, ERRWIDTH,
+ 		       _
+ 		       ("File %s was NOT decrypted successfully.\n"),
+ 		       dinfile);
+@@ -636,10 +639,10 @@
+
+ 	 if (x == 0) {
+ 	    if (stream_flag == FALSE) {
+-	       sprintf(tmperr, _("File %s was encrypted.\n"), einfile);
++	       snprintf(tmperr, ERRWIDTH, _("File %s was encrypted.\n"), einfile);
+ 	       err_warn(tmperr);
+ 	    } else {
+-	       sprintf(tmperr, _("Stdin was encrypted.\n"));
++	       snprintf(tmperr, ERRWIDTH, _("Stdin was encrypted.\n"));
+ 	       err_warn(tmperr);
+ 	    }
+ #ifdef HAVE_STAT
+@@ -655,7 +658,7 @@
+
+ 	 } else {
+ 	    if (stream_flag == FALSE) {
+-	       sprintf(tmperr,
++	       snprintf(tmperr, ERRWIDTH,
+ 		       _
+ 		       ("File %s was NOT encrypted successfully.\n"),
+ 		       einfile);

From 1a0d004cc202ca15b15c90374c4551e790fdf374 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Mon, 9 Nov 2015 18:21:30 +0100
Subject: [PATCH 395/884] tinc module: Ed25519PrivateKeyFile, listenAddress

---
 nixos/modules/services/networking/tinc.nix | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix
index 2d43c3d962dd..828bbe130e67 100644
--- a/nixos/modules/services/networking/tinc.nix
+++ b/nixos/modules/services/networking/tinc.nix
@@ -43,6 +43,14 @@ in
             '';
           };
 
+          ed25519PrivateKeyFile = mkOption {
+            default = null;
+            type = types.nullOr types.path;
+            description = ''
+              Path of the private ed25519 keyfile.
+            '';
+          };
+
           debugLevel = mkOption {
             default = 0;
             type = types.addCheck types.int (l: l >= 0 && l <= 5);
@@ -70,6 +78,14 @@ in
             '';
           };
 
+          listenAddress = mkOption {
+            default = null;
+            type = types.nullOr types.str;
+            description = ''
+              The ip adress to bind to.
+            '';
+          };
+
           package = mkOption {
             default = pkgs.tinc_pre;
             description = ''
@@ -99,6 +115,8 @@ in
             text = ''
               Name = ${if data.name == null then "$HOST" else data.name}
               DeviceType = ${data.interfaceType}
+              ${optionalString (data.ed25519PrivateKeyFile != null) "Ed25519PrivateKeyFile = ${data.ed25519PrivateKeyFile}"}
+              ${optionalString (data.listenAddress != null) "BindToAddress = ${data.listenAddress}"}
               Device = /dev/net/tun
               Interface = tinc.${network}
               ${data.extraConfig}
@@ -134,10 +152,10 @@ in
           # Determine how we should generate our keys
           if type tinc >/dev/null 2>&1; then
             # Tinc 1.1+ uses the tinc helper application for key generation
-
+          ${if data.ed25519PrivateKeyFile != null then "  # Keyfile managed by nix" else ''
             # Prefer ED25519 keys (only in 1.1+)
             [ -f "/etc/tinc/${network}/ed25519_key.priv" ] || tinc -n ${network} generate-ed25519-keys
-
+          ''}
             # Otherwise use RSA keys
             [ -f "/etc/tinc/${network}/rsa_key.priv" ] || tinc -n ${network} generate-rsa-keys 4096
           else

From aee934b3aaaba33f96a153b1706728320d8c2357 Mon Sep 17 00:00:00 2001
From: Jakob Gillich <jakob@gillich.me>
Date: Thu, 7 Jan 2016 06:24:37 +0100
Subject: [PATCH 396/884] libxml2: security update 2.9.2 -> 2.9.3 (close
 #12197)

---
 pkgs/development/libraries/libxml2/default.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 2fdc198aa115..cac8f10d37aa 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -4,16 +4,13 @@ assert pythonSupport -> python != null;
 
 #TODO: share most stuff between python and non-python builds, perhaps via multiple-output
 
-let
-  version = "2.9.2";
-in
-
 stdenv.mkDerivation (rec {
   name = "libxml2-${version}";
+  version = "2.9.3";
 
   src = fetchurl {
     url = "http://xmlsoft.org/sources/${name}.tar.gz";
-    sha256 = "1g6mf03xcabmk5ing1lwqmasr803616gb2xhn7pll10x2l5w6y2i";
+    sha256 = "0bd17g6znn2r98gzpjppsqjg33iraky4px923j3k8kdl8qgy7sad";
   };
 
   outputs = [ "out" "doc" ];
@@ -48,4 +45,3 @@ stdenv.mkDerivation (rec {
 } // stdenv.lib.optionalAttrs (!pythonSupport) {
   configureFlags = "--with-python=no"; # otherwise build impurity bites us
 })
-

From 90b853b70698c2b9a6ab5ce814263a417aa80bdf Mon Sep 17 00:00:00 2001
From: Jakob Gillich <jakob@gillich.me>
Date: Thu, 7 Jan 2016 05:42:28 +0100
Subject: [PATCH 397/884] plib: fix CVE-2012-4552 (close #12195)

patch source: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=694810#10
---
 .../libraries/plib/CVE-2012-4552.patch        | 55 +++++++++++++++++++
 pkgs/development/libraries/plib/default.nix   |  2 +
 2 files changed, 57 insertions(+)
 create mode 100644 pkgs/development/libraries/plib/CVE-2012-4552.patch

diff --git a/pkgs/development/libraries/plib/CVE-2012-4552.patch b/pkgs/development/libraries/plib/CVE-2012-4552.patch
new file mode 100644
index 000000000000..d38532830769
--- /dev/null
+++ b/pkgs/development/libraries/plib/CVE-2012-4552.patch
@@ -0,0 +1,55 @@
+diff -up plib-1.8.5/src/ssg/ssgParser.cxx~ plib-1.8.5/src/ssg/ssgParser.cxx
+--- plib-1.8.5/src/ssg/ssgParser.cxx~	2008-03-11 03:06:23.000000000 +0100
++++ plib-1.8.5/src/ssg/ssgParser.cxx	2012-11-01 15:33:12.424483374 +0100
+@@ -57,18 +57,16 @@ void _ssgParser::error( const char *form
+   char msgbuff[ 255 ];
+   va_list argp;
+
+-  char* msgptr = msgbuff;
+-  if (linenum)
+-  {
+-    msgptr += sprintf ( msgptr,"%s, line %d: ",
+-      path, linenum );
+-  }
+-
+   va_start( argp, format );
+-  vsprintf( msgptr, format, argp );
++  vsnprintf( msgbuff, sizeof(msgbuff), format, argp );
+   va_end( argp );
+
+-  ulSetError ( UL_WARNING, "%s", msgbuff ) ;
++  if (linenum)
++  {
++    ulSetError ( UL_WARNING, "%s, line %d: %s", path, linenum, msgbuff ) ;
++  } else {
++    ulSetError ( UL_WARNING, "%s", msgbuff ) ;
++  }
+ }
+
+
+@@ -78,18 +76,16 @@ void _ssgParser::message( const char *fo
+   char msgbuff[ 255 ];
+   va_list argp;
+
+-  char* msgptr = msgbuff;
+-  if (linenum)
+-  {
+-    msgptr += sprintf ( msgptr,"%s, line %d: ",
+-      path, linenum );
+-  }
+-
+   va_start( argp, format );
+-  vsprintf( msgptr, format, argp );
++  vsnprintf( msgbuff, sizeof(msgbuff), format, argp );
+   va_end( argp );
+
+-  ulSetError ( UL_DEBUG, "%s", msgbuff ) ;
++  if (linenum)
++  {
++    ulSetError ( UL_DEBUG, "%s, line %d: %s", path, linenum, msgbuff ) ;
++  } else {
++    ulSetError ( UL_DEBUG, "%s", msgbuff ) ;
++  }
+ }
+
+ // Opens the file and does a few internal calculations based on the spec.
diff --git a/pkgs/development/libraries/plib/default.nix b/pkgs/development/libraries/plib/default.nix
index 4ab6fb3ad8b4..ff60e62cad3f 100644
--- a/pkgs/development/libraries/plib/default.nix
+++ b/pkgs/development/libraries/plib/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "0cha71mflpa10vh2l7ipyqk67dq2y0k5xbafwdks03fwdyzj4ns8";
   };
 
+  patches = [ ./CVE-2012-4552.patch ];
+
   NIX_CFLAGS_COMPILE = if enablePIC then "-fPIC" else "";
 
   propagatedBuildInputs = [

From 4dc7cab40ec9370816bf67b786a35679a1ebf2d1 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 7 Jan 2016 00:10:05 -0600
Subject: [PATCH 398/884] nixos: btsync - switch to using systemd user services

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 nixos/modules/services/networking/btsync.nix | 25 ++++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/nixos/modules/services/networking/btsync.nix b/nixos/modules/services/networking/btsync.nix
index fe462aeba9cb..572a7387316b 100644
--- a/nixos/modules/services/networking/btsync.nix
+++ b/nixos/modules/services/networking/btsync.nix
@@ -83,15 +83,13 @@ in
         type = types.bool;
         default = false;
         description = ''
-          If enabled, start the Bittorrent Sync daemon. Once enabled,
-          you can interact with the service through the Web UI, or
-          configure it in your NixOS configuration. Enabling the
-          <literal>btsync</literal> service also installs a
-          multi-instance systemd unit which can be used to start
-          user-specific copies of the daemon. Once installed, you can
-          use <literal>systemctl start btsync@user</literal> to start
-          the daemon only for user <literal>user</literal>, using the
-          configuration file located at
+          If enabled, start the Bittorrent Sync daemon. Once enabled, you can
+          interact with the service through the Web UI, or configure it in your
+          NixOS configuration. Enabling the <literal>btsync</literal> service
+          also installs a systemd user unit which can be used to start
+          user-specific copies of the daemon. Once installed, you can use
+          <literal>systemctl --user start btsync</literal> as your user to start
+          the daemon using the configuration file located at
           <literal>$HOME/.config/btsync.conf</literal>.
         '';
       };
@@ -212,7 +210,9 @@ in
         default = "/var/lib/btsync/";
         example = "/var/lib/btsync/";
         description = ''
-          Where to store the bittorrent sync files.
+          Where BitTorrent Sync will store it's database files (containing
+          things like username info and licenses). Generally, you should not
+          need to ever change this.
         '';
       };
 
@@ -311,12 +311,11 @@ in
       };
     };
 
-    systemd.services."btsync@" = with pkgs; {
-      description = "Bittorrent Sync Service for %i";
+    systemd.user.services.btsync = with pkgs; {
+      description = "Bittorrent Sync user service";
       after       = [ "network.target" "local-fs.target" ];
       serviceConfig = {
         Restart   = "on-abort";
-        User      = "%i";
         ExecStart =
           "${bittorrentSync}/bin/btsync --nodaemon --config %h/.config/btsync.conf";
       };

From 897fb98a9699fe44060e84ae22ac102449d72121 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 7 Jan 2016 05:16:47 +0000
Subject: [PATCH 399/884] llvm: 3.7.0 -> 3.7.1 (close #12200)

This obsoletes a backport for rust.
---
 .../compilers/llvm/3.7/clang/default.nix      |  2 +-
 .../compilers/llvm/3.7/default.nix            |  6 +-
 .../compilers/llvm/3.7/libc++/default.nix     |  2 +-
 .../compilers/llvm/3.7/libc++abi.nix          |  2 +-
 pkgs/development/compilers/llvm/3.7/lldb.nix  |  2 +-
 pkgs/development/compilers/llvm/3.7/llvm.nix  |  7 +--
 .../3.7/r242372-fix-LLVMBuildLandingPad.patch | 60 -------------------
 7 files changed, 8 insertions(+), 73 deletions(-)
 delete mode 100644 pkgs/development/compilers/llvm/3.7/r242372-fix-LLVMBuildLandingPad.patch

diff --git a/pkgs/development/compilers/llvm/3.7/clang/default.nix b/pkgs/development/compilers/llvm/3.7/clang/default.nix
index 9fb212b9c054..e6369b1167e7 100644
--- a/pkgs/development/compilers/llvm/3.7/clang/default.nix
+++ b/pkgs/development/compilers/llvm/3.7/clang/default.nix
@@ -6,7 +6,7 @@ in stdenv.mkDerivation {
   name = "clang-${version}";
 
   unpackPhase = ''
-    unpackFile ${fetch "cfe" "1k517b0jj74c4vgnnd4ikbrpb96na541bi8q845ckw8xm72l1msf"}
+    unpackFile ${fetch "cfe" "0x065d0w9b51xvdjxwfzjxng0gzpbx45fgiaxpap45ragi61dqjn"}
     mv cfe-${version}.src clang
     sourceRoot=$PWD/clang
     unpackFile ${clang-tools-extra_src}
diff --git a/pkgs/development/compilers/llvm/3.7/default.nix b/pkgs/development/compilers/llvm/3.7/default.nix
index cbd0f89ae086..d7864d11d7bf 100644
--- a/pkgs/development/compilers/llvm/3.7/default.nix
+++ b/pkgs/development/compilers/llvm/3.7/default.nix
@@ -2,7 +2,7 @@
 let
   callPackage = newScope (self // { inherit stdenv isl version fetch; });
 
-  version = "3.7.0";
+  version = "3.7.1";
 
   fetch = fetch_v version;
   fetch_v = ver: name: sha256: fetchurl {
@@ -10,8 +10,8 @@ let
     inherit sha256;
   };
 
-  compiler-rt_src = fetch "compiler-rt" "02rbsqdnj1dw9q3d8w5wwmvz5gfraiv8xp18lis4kj8baacajzr2";
-  clang-tools-extra_src = fetch "clang-tools-extra" "1k894zkx4w8grigmgv5y4q9zrcic2ypz0zfn28270ykbm6is1s4a";
+  compiler-rt_src = fetch "compiler-rt" "10c1mz2q4bdq9bqfgr3dirc6hz1h3sq8573srd5q5lr7m7j6jiwx";
+  clang-tools-extra_src = fetch "clang-tools-extra" "0sxw2l3q5msbrwxv1ck72arggdw6n5ysi929gi69ikniranfv4aa";
 
   self = {
     llvm = callPackage ./llvm.nix {
diff --git a/pkgs/development/compilers/llvm/3.7/libc++/default.nix b/pkgs/development/compilers/llvm/3.7/libc++/default.nix
index db1475cfc14f..00bfb3518b10 100644
--- a/pkgs/development/compilers/llvm/3.7/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/3.7/libc++/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   name = "libc++-${version}";
 
-  src = fetch "libcxx" "13nh78zp5d2jf732mxnalw679zjywbjpz9942j66fznd6f1kr3y1";
+  src = fetch "libcxx" "0i7iyzk024krda5spfpfi8jksh83yp3bxqkal0xp76ffi11bszrm";
 
   postUnpack = ''
     unpackFile ${libcxxabi.src}
diff --git a/pkgs/development/compilers/llvm/3.7/libc++abi.nix b/pkgs/development/compilers/llvm/3.7/libc++abi.nix
index a495e1860ad2..ec0be51a11cf 100644
--- a/pkgs/development/compilers/llvm/3.7/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/3.7/libc++abi.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libc++abi-${version}";
 
-  src = fetch "libcxxabi" "1swvnhrf9g67579c5picg0l869f8l2bwi4xqpbcb4n296gyp9c28";
+  src = fetch "libcxxabi" "0ambfcmr2nh88hx000xb7yjm9lsqjjz49w5mlf6dlxzmj3nslzx4";
 
   buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
 
diff --git a/pkgs/development/compilers/llvm/3.7/lldb.nix b/pkgs/development/compilers/llvm/3.7/lldb.nix
index 60f1550dd447..fe69130e71a7 100644
--- a/pkgs/development/compilers/llvm/3.7/lldb.nix
+++ b/pkgs/development/compilers/llvm/3.7/lldb.nix
@@ -15,7 +15,7 @@
 stdenv.mkDerivation {
   name = "lldb-${version}";
 
-  src = fetch "lldb" "1sbi9c6c4m73wfw249dn0n2974p444i03brk82m4w10iq5dm1mzl";
+  src = fetch "lldb" "008fdbyza13ym3v0xpans4z4azw4y16hcbgrrnc4rx2mxwaw62ws";
 
   patchPhase = ''
     sed -i 's|/usr/bin/env||' \
diff --git a/pkgs/development/compilers/llvm/3.7/llvm.nix b/pkgs/development/compilers/llvm/3.7/llvm.nix
index bbeb0c858e57..393e889024be 100644
--- a/pkgs/development/compilers/llvm/3.7/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.7/llvm.nix
@@ -18,15 +18,10 @@
 }:
 
 let
-  src = fetch "llvm" "0lrirklh4nrcb078qc2f6vbmmc34kxqgsy9s18a1xbfdkmgqjidb";
+  src = fetch "llvm" "1masakdp9g2dan1yrazg7md5am2vacbkb3nahb3dchpc1knr8xxy";
 in stdenv.mkDerivation rec {
   name = "llvm-${version}";
 
-  patches = [
-    # Backport for Rust, remove when 3.7.1 is released
-    ./r242372-fix-LLVMBuildLandingPad.patch
-  ];
-
   unpackPhase = ''
     unpackFile ${src}
     mv llvm-${version}.src llvm
diff --git a/pkgs/development/compilers/llvm/3.7/r242372-fix-LLVMBuildLandingPad.patch b/pkgs/development/compilers/llvm/3.7/r242372-fix-LLVMBuildLandingPad.patch
deleted file mode 100644
index 749de6e9b6a1..000000000000
--- a/pkgs/development/compilers/llvm/3.7/r242372-fix-LLVMBuildLandingPad.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Index: llvm/bindings/ocaml/llvm/llvm_ocaml.c
-===================================================================
---- llvm/bindings/ocaml/llvm/llvm_ocaml.c	(revision 242371)
-+++ llvm/bindings/ocaml/llvm/llvm_ocaml.c	(revision 242372)
-@@ -1745,7 +1745,7 @@
- CAMLprim LLVMValueRef llvm_build_landingpad(LLVMTypeRef Ty, LLVMValueRef PersFn,
-                                             value NumClauses,  value Name,
-                                             value B) {
--    return LLVMBuildLandingPad(Builder_val(B), Ty, Int_val(NumClauses),
-+    return LLVMBuildLandingPad(Builder_val(B), Ty, PersFn, Int_val(NumClauses),
-                                String_val(Name));
- }
- 
-Index: llvm/bindings/go/llvm/ir.go
-===================================================================
---- llvm/bindings/go/llvm/ir.go	(revision 242371)
-+++ llvm/bindings/go/llvm/ir.go	(revision 242372)
-@@ -1731,7 +1731,7 @@
- func (b Builder) CreateLandingPad(t Type, nclauses int, name string) (l Value) {
- 	cname := C.CString(name)
- 	defer C.free(unsafe.Pointer(cname))
--	l.C = C.LLVMBuildLandingPad(b.C, t.C, C.unsigned(nclauses), cname)
-+	l.C = C.LLVMBuildLandingPad(b.C, t.C, nil, C.unsigned(nclauses), cname)
- 	return l
- }
- 
-Index: llvm/lib/IR/Core.cpp
-===================================================================
---- llvm/lib/IR/Core.cpp	(revision 242371)
-+++ llvm/lib/IR/Core.cpp	(revision 242372)
-@@ -2257,7 +2257,14 @@
- }
- 
- LLVMValueRef LLVMBuildLandingPad(LLVMBuilderRef B, LLVMTypeRef Ty,
--                                 unsigned NumClauses, const char *Name) {
-+                                 LLVMValueRef PersFn, unsigned NumClauses,
-+                                 const char *Name) {
-+  // The personality used to live on the landingpad instruction, but now it
-+  // lives on the parent function. For compatibility, take the provided
-+  // personality and put it on the parent function.
-+  if (PersFn)
-+    unwrap(B)->GetInsertBlock()->getParent()->setPersonalityFn(
-+        cast<Function>(unwrap(PersFn)));
-   return wrap(unwrap(B)->CreateLandingPad(unwrap(Ty), NumClauses, Name));
- }
- 
-Index: llvm/include/llvm-c/Core.h
-===================================================================
---- llvm/include/llvm-c/Core.h	(revision 242371)
-+++ llvm/include/llvm-c/Core.h	(revision 242372)
-@@ -2675,7 +2675,8 @@
-                              LLVMBasicBlockRef Then, LLVMBasicBlockRef Catch,
-                              const char *Name);
- LLVMValueRef LLVMBuildLandingPad(LLVMBuilderRef B, LLVMTypeRef Ty,
--                                 unsigned NumClauses, const char *Name);
-+                                 LLVMValueRef PersFn, unsigned NumClauses,
-+                                 const char *Name);
- LLVMValueRef LLVMBuildResume(LLVMBuilderRef B, LLVMValueRef Exn);
- LLVMValueRef LLVMBuildUnreachable(LLVMBuilderRef);
- 

From 78096e9b8969f18ea2fb6c4729db2e4d7180b32a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 7 Jan 2016 11:19:22 +0100
Subject: [PATCH 400/884] python: 3.4.3 -> 3.4.4

---
 pkgs/development/interpreters/python/3.4/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/python/3.4/default.nix b/pkgs/development/interpreters/python/3.4/default.nix
index 570c7cc35d13..ecada35a26e8 100644
--- a/pkgs/development/interpreters/python/3.4/default.nix
+++ b/pkgs/development/interpreters/python/3.4/default.nix
@@ -23,7 +23,7 @@ with stdenv.lib;
 let
   majorVersion = "3.4";
   pythonVersion = majorVersion;
-  version = "${majorVersion}.3";
+  version = "${majorVersion}.4";
   fullVersion = "${version}";
 
   buildInputs = filter (p: p != null) [
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz";
-    sha256 = "1f4nm4z08sy0kqwisvv95l02crv6dyysdmx44p1mz3bn6csrdcxm";
+    sha256 = "18kb5c29w04rj4gyz3jngm72sy8izfnbjlm6ajv6rv2m061d75x7";
   };
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";

From 5f0253ace683bae4c7989f4db167676dd0a507e7 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 7 Jan 2016 04:23:54 -0600
Subject: [PATCH 401/884] nixos: tarsnap - separate archive cachedirs

Tarsnap locks the cachedir during backup, meaning if you specify
multiple backups with a shared cache that might overlap (for example,
one backup may take an hour), secondary backups will fail. This isn't
very nice behavior for the obvious reasons.

This splits the cache dirs for each archive appropriately. Note that
this will require a rebuild of your archive caches (although if you were
only using one archive for your whole system, you can just move the
directory).

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 nixos/modules/services/backup/tarsnap.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/backup/tarsnap.nix b/nixos/modules/services/backup/tarsnap.nix
index 57121e238553..f0b250689494 100644
--- a/nixos/modules/services/backup/tarsnap.nix
+++ b/nixos/modules/services/backup/tarsnap.nix
@@ -5,8 +5,8 @@ with lib;
 let
   cfg = config.services.tarsnap;
 
-  configFile = cfg: ''
-    cachedir ${config.services.tarsnap.cachedir}
+  configFile = name: cfg: ''
+    cachedir ${config.services.tarsnap.cachedir}/${name}
     keyfile  ${config.services.tarsnap.keyfile}
     ${optionalString cfg.nodump "nodump"}
     ${optionalString cfg.printStats "print-stats"}
@@ -57,6 +57,12 @@ in
           will refuse to run until you manually rebuild the cache with
           <command>tarsnap --fsck</command>.
 
+          Note that each individual archive (specified below) has its own cache
+          directory specified under <literal>cachedir</literal>; this is because
+          tarsnap locks the cache during backups, meaning multiple services
+          archives cannot be backed up concurrently or overlap with a shared
+          cache.
+
           Set to <literal>null</literal> to disable caching.
         '';
       };
@@ -251,6 +257,7 @@ in
         mkdir -p -m 0700 ${cfg.cachedir}
         chown root:root ${cfg.cachedir}
         chmod 0700 ${cfg.cachedir}
+        mkdir -p -m 0700 ${cfg.cachedir}/$1
         DIRS=`cat /etc/tarsnap/$1.dirs`
         exec tarsnap --configfile /etc/tarsnap/$1.conf -c -f $1-$(date +"%Y%m%d%H%M%S") $DIRS
       '';
@@ -269,7 +276,7 @@ in
 
     environment.etc =
       (mapAttrs' (name: cfg: nameValuePair "tarsnap/${name}.conf"
-        { text = configFile cfg;
+        { text = configFile name cfg;
         }) cfg.archives) //
       (mapAttrs' (name: cfg: nameValuePair "tarsnap/${name}.dirs"
         { text = concatStringsSep " " cfg.directories;

From 472a5192fd67c40bded56a594eeaaa86ee9bde4b Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 7 Jan 2016 04:51:58 -0600
Subject: [PATCH 402/884] Revert "nixos: tarsnap - separate archive cachedirs"

This reverts commit 5f0253ace683bae4c7989f4db167676dd0a507e7.

I didn't intend to push this - I meant to push it to *my fork's*
remote...
---
 nixos/modules/services/backup/tarsnap.nix | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/backup/tarsnap.nix b/nixos/modules/services/backup/tarsnap.nix
index f0b250689494..57121e238553 100644
--- a/nixos/modules/services/backup/tarsnap.nix
+++ b/nixos/modules/services/backup/tarsnap.nix
@@ -5,8 +5,8 @@ with lib;
 let
   cfg = config.services.tarsnap;
 
-  configFile = name: cfg: ''
-    cachedir ${config.services.tarsnap.cachedir}/${name}
+  configFile = cfg: ''
+    cachedir ${config.services.tarsnap.cachedir}
     keyfile  ${config.services.tarsnap.keyfile}
     ${optionalString cfg.nodump "nodump"}
     ${optionalString cfg.printStats "print-stats"}
@@ -57,12 +57,6 @@ in
           will refuse to run until you manually rebuild the cache with
           <command>tarsnap --fsck</command>.
 
-          Note that each individual archive (specified below) has its own cache
-          directory specified under <literal>cachedir</literal>; this is because
-          tarsnap locks the cache during backups, meaning multiple services
-          archives cannot be backed up concurrently or overlap with a shared
-          cache.
-
           Set to <literal>null</literal> to disable caching.
         '';
       };
@@ -257,7 +251,6 @@ in
         mkdir -p -m 0700 ${cfg.cachedir}
         chown root:root ${cfg.cachedir}
         chmod 0700 ${cfg.cachedir}
-        mkdir -p -m 0700 ${cfg.cachedir}/$1
         DIRS=`cat /etc/tarsnap/$1.dirs`
         exec tarsnap --configfile /etc/tarsnap/$1.conf -c -f $1-$(date +"%Y%m%d%H%M%S") $DIRS
       '';
@@ -276,7 +269,7 @@ in
 
     environment.etc =
       (mapAttrs' (name: cfg: nameValuePair "tarsnap/${name}.conf"
-        { text = configFile name cfg;
+        { text = configFile cfg;
         }) cfg.archives) //
       (mapAttrs' (name: cfg: nameValuePair "tarsnap/${name}.dirs"
         { text = concatStringsSep " " cfg.directories;

From ad796f155bc2e44d6944f002ad95596e39711670 Mon Sep 17 00:00:00 2001
From: Tanner Doshier <doshitan@gmail.com>
Date: Thu, 7 Jan 2016 05:06:05 -0600
Subject: [PATCH 403/884] nixos: tarsnap - make systemd timer persistent

A machine may not always be active (or online!) when a backup timer
triggers, meaning backups can be missed - now we properly set the
tarsnap timer's Persistent option so systemd will run the command even
when the machine wasn't online at that exact time.

However, we also need to make sure that we can contact the tarsnap
server reliably before we start the backup. So, we attempt to ping the
access endpoint in a loop with a sleep, before continuing.

This fixes #8823.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 nixos/modules/services/backup/tarsnap.nix | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/backup/tarsnap.nix b/nixos/modules/services/backup/tarsnap.nix
index 57121e238553..3a51e6b7aa6c 100644
--- a/nixos/modules/services/backup/tarsnap.nix
+++ b/nixos/modules/services/backup/tarsnap.nix
@@ -242,9 +242,16 @@ in
 
     systemd.services."tarsnap@" = {
       description = "Tarsnap archive '%i'";
-      requires    = [ "network.target" ];
+      requires    = [ "network-online.target" ];
+      after       = [ "network-online.target" ];
 
-      path = [ pkgs.tarsnap pkgs.coreutils ];
+      path = [ pkgs.iputils pkgs.tarsnap pkgs.coreutils ];
+
+      # In order for the persistent tarsnap timer to work reliably, we have to
+      # make sure that the tarsnap server is reachable after systemd starts up
+      # the service - therefore we sleep in a loop until we can ping the
+      # endpoint.
+      preStart = "while ! ping -q -c 1 betatest-server.tarsnap.com &> /dev/null; do sleep 3; done";
       scriptArgs = "%i";
       script = ''
         mkdir -p -m 0755 ${dirOf cfg.cachedir}
@@ -259,11 +266,15 @@ in
         IOSchedulingClass = "idle";
         NoNewPrivileges = "true";
         CapabilityBoundingSet = "CAP_DAC_READ_SEARCH";
+        PermissionsStartOnly = "true";
       };
     };
 
+    # Note: the timer must be Persistent=true, so that systemd will start it even
+    # if e.g. your laptop was asleep while the latest interval occurred.
     systemd.timers = mapAttrs' (name: cfg: nameValuePair "tarsnap@${name}"
       { timerConfig.OnCalendar = cfg.period;
+        timerConfig.Persistent = "true";
         wantedBy = [ "timers.target" ];
       }) cfg.archives;
 

From 274cf0339bb026cda635c0bcd65092b011e111dd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 6 Jan 2016 23:28:34 +0100
Subject: [PATCH 404/884] hackage-packages.nix: update Haskell package set

This update was generated by hackage2nix v20151217-5-ged07a8e using the following inputs:

  - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/f24e81fbd318567e102841e7815b23f73ce0d07e
  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/01c9e56f5db0c9963bec403d9213312fd5326ac6
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/87e2d54643d6d6e4f8a3c7edffce9fa06eb9f0a0
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/c30758374f9a5d52c2cb917ce35d594781bb36d6
---
 .../haskell-modules/configuration-lts-0.0.nix |    7 +
 .../haskell-modules/configuration-lts-0.1.nix |    7 +
 .../haskell-modules/configuration-lts-0.2.nix |    7 +
 .../haskell-modules/configuration-lts-0.3.nix |    7 +
 .../haskell-modules/configuration-lts-0.4.nix |    7 +
 .../haskell-modules/configuration-lts-0.5.nix |    7 +
 .../haskell-modules/configuration-lts-0.6.nix |    7 +
 .../haskell-modules/configuration-lts-0.7.nix |    7 +
 .../haskell-modules/configuration-lts-1.0.nix |    7 +
 .../haskell-modules/configuration-lts-1.1.nix |    7 +
 .../configuration-lts-1.10.nix                |    8 +
 .../configuration-lts-1.11.nix                |    8 +
 .../configuration-lts-1.12.nix                |    8 +
 .../configuration-lts-1.13.nix                |    8 +
 .../configuration-lts-1.14.nix                |    8 +
 .../configuration-lts-1.15.nix                |    8 +
 .../haskell-modules/configuration-lts-1.2.nix |    7 +
 .../haskell-modules/configuration-lts-1.4.nix |    7 +
 .../haskell-modules/configuration-lts-1.5.nix |    7 +
 .../haskell-modules/configuration-lts-1.7.nix |    7 +
 .../haskell-modules/configuration-lts-1.8.nix |    8 +
 .../haskell-modules/configuration-lts-1.9.nix |    8 +
 .../haskell-modules/configuration-lts-2.0.nix |    8 +
 .../haskell-modules/configuration-lts-2.1.nix |    8 +
 .../configuration-lts-2.10.nix                |    8 +
 .../configuration-lts-2.11.nix                |    8 +
 .../configuration-lts-2.12.nix                |    8 +
 .../configuration-lts-2.13.nix                |    8 +
 .../configuration-lts-2.14.nix                |    8 +
 .../configuration-lts-2.15.nix                |    8 +
 .../configuration-lts-2.16.nix                |    8 +
 .../configuration-lts-2.17.nix                |    8 +
 .../configuration-lts-2.18.nix                |    8 +
 .../configuration-lts-2.19.nix                |    8 +
 .../haskell-modules/configuration-lts-2.2.nix |    8 +
 .../configuration-lts-2.20.nix                |    8 +
 .../configuration-lts-2.21.nix                |    8 +
 .../configuration-lts-2.22.nix                |    8 +
 .../haskell-modules/configuration-lts-2.3.nix |    8 +
 .../haskell-modules/configuration-lts-2.4.nix |    8 +
 .../haskell-modules/configuration-lts-2.5.nix |    8 +
 .../haskell-modules/configuration-lts-2.6.nix |    8 +
 .../haskell-modules/configuration-lts-2.7.nix |    8 +
 .../haskell-modules/configuration-lts-2.8.nix |    8 +
 .../haskell-modules/configuration-lts-2.9.nix |    8 +
 .../haskell-modules/configuration-lts-3.0.nix |   12 +
 .../haskell-modules/configuration-lts-3.1.nix |   12 +
 .../configuration-lts-3.10.nix                |   14 +
 .../configuration-lts-3.11.nix                |   14 +
 .../configuration-lts-3.12.nix                |   14 +
 .../configuration-lts-3.13.nix                |   14 +
 .../configuration-lts-3.14.nix                |   14 +
 .../configuration-lts-3.15.nix                |   14 +
 .../configuration-lts-3.16.nix                |   14 +
 .../configuration-lts-3.17.nix                |   15 +
 .../configuration-lts-3.18.nix                |   15 +
 .../configuration-lts-3.19.nix                |   16 +
 .../haskell-modules/configuration-lts-3.2.nix |   12 +
 .../configuration-lts-3.20.nix                |   16 +
 .../configuration-lts-3.21.nix                | 8120 +++++++++++++++++
 .../haskell-modules/configuration-lts-3.3.nix |   12 +
 .../haskell-modules/configuration-lts-3.4.nix |   12 +
 .../haskell-modules/configuration-lts-3.5.nix |   12 +
 .../haskell-modules/configuration-lts-3.6.nix |   12 +
 .../haskell-modules/configuration-lts-3.7.nix |   12 +
 .../haskell-modules/configuration-lts-3.8.nix |   12 +
 .../haskell-modules/configuration-lts-3.9.nix |   12 +
 .../haskell-modules/configuration-lts-4.0.nix | 7571 +++++++++++++++
 .../haskell-modules/hackage-packages.nix      |  829 +-
 69 files changed, 16966 insertions(+), 180 deletions(-)
 create mode 100644 pkgs/development/haskell-modules/configuration-lts-3.21.nix
 create mode 100644 pkgs/development/haskell-modules/configuration-lts-4.0.nix

diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
index 387d9ce34cba..b68ec942dbc8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
@@ -4161,6 +4161,7 @@ self: super: {
   "here" = doDistribute super."here_1_2_6";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -5898,6 +5899,7 @@ self: super: {
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
   "nanospec" = doDistribute super."nanospec_0_2_0";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
@@ -6065,6 +6067,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -7278,6 +7281,7 @@ self: super: {
   "shake-language-c" = dontDistribute super."shake-language-c";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_2_1";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7887,6 +7891,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template" = dontDistribute super."template";
   "template-default" = dontDistribute super."template-default";
@@ -8817,6 +8823,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
index 67afa95738b3..eb4efb80d5de 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
@@ -4161,6 +4161,7 @@ self: super: {
   "here" = doDistribute super."here_1_2_6";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -5898,6 +5899,7 @@ self: super: {
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
   "nanospec" = doDistribute super."nanospec_0_2_0";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
@@ -6065,6 +6067,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -7278,6 +7281,7 @@ self: super: {
   "shake-language-c" = dontDistribute super."shake-language-c";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_2_1";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7887,6 +7891,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template" = dontDistribute super."template";
   "template-default" = dontDistribute super."template-default";
@@ -8817,6 +8823,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
index 3fd4bcaf194d..ecb5a1b74bb9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
@@ -4161,6 +4161,7 @@ self: super: {
   "here" = doDistribute super."here_1_2_6";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -5898,6 +5899,7 @@ self: super: {
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
   "nanospec" = doDistribute super."nanospec_0_2_0";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
@@ -6065,6 +6067,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -7278,6 +7281,7 @@ self: super: {
   "shake-language-c" = dontDistribute super."shake-language-c";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_2_1";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7887,6 +7891,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template" = dontDistribute super."template";
   "template-default" = dontDistribute super."template-default";
@@ -8817,6 +8823,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
index cf83df292401..2d600fd95e0a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
@@ -4161,6 +4161,7 @@ self: super: {
   "here" = doDistribute super."here_1_2_6";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -5898,6 +5899,7 @@ self: super: {
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
   "nanospec" = doDistribute super."nanospec_0_2_0";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
@@ -6065,6 +6067,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -7278,6 +7281,7 @@ self: super: {
   "shake-language-c" = dontDistribute super."shake-language-c";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_2_1";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7887,6 +7891,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template" = dontDistribute super."template";
   "template-default" = dontDistribute super."template-default";
@@ -8817,6 +8823,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
index ffc67b0cfd07..838aa0b1a139 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
@@ -4158,6 +4158,7 @@ self: super: {
   "here" = doDistribute super."here_1_2_6";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -5895,6 +5896,7 @@ self: super: {
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
   "nanospec" = doDistribute super."nanospec_0_2_0";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
@@ -6062,6 +6064,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -7274,6 +7277,7 @@ self: super: {
   "shake-language-c" = dontDistribute super."shake-language-c";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_2_1";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7883,6 +7887,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template" = dontDistribute super."template";
   "template-default" = dontDistribute super."template-default";
@@ -8813,6 +8819,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
index 29053c22b134..6881b910cbbc 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
@@ -4158,6 +4158,7 @@ self: super: {
   "here" = doDistribute super."here_1_2_6";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -5895,6 +5896,7 @@ self: super: {
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
   "nanospec" = doDistribute super."nanospec_0_2_0";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
@@ -6062,6 +6064,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -7274,6 +7277,7 @@ self: super: {
   "shake-language-c" = dontDistribute super."shake-language-c";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_2_1";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7883,6 +7887,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template" = dontDistribute super."template";
   "template-default" = dontDistribute super."template-default";
@@ -8813,6 +8819,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
index d305f8e8446c..dceed3e9f1c5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
@@ -4154,6 +4154,7 @@ self: super: {
   "here" = doDistribute super."here_1_2_6";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -5891,6 +5892,7 @@ self: super: {
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
   "nanospec" = doDistribute super."nanospec_0_2_0";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
@@ -6057,6 +6059,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -7268,6 +7271,7 @@ self: super: {
   "shake-language-c" = dontDistribute super."shake-language-c";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_2_1";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7877,6 +7881,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template" = dontDistribute super."template";
   "template-default" = dontDistribute super."template-default";
@@ -8806,6 +8812,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
index bd815c7d76c8..f561547f7b87 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
@@ -4154,6 +4154,7 @@ self: super: {
   "here" = doDistribute super."here_1_2_6";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -5891,6 +5892,7 @@ self: super: {
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
   "nanospec" = doDistribute super."nanospec_0_2_0";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
@@ -6057,6 +6059,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -7268,6 +7271,7 @@ self: super: {
   "shake-language-c" = dontDistribute super."shake-language-c";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_2_1";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7877,6 +7881,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template" = dontDistribute super."template";
   "template-default" = dontDistribute super."template-default";
@@ -8806,6 +8812,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
index f2119c8dc9fc..8c229e353e7c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
@@ -4144,6 +4144,7 @@ self: super: {
   "here" = doDistribute super."here_1_2_6";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -5879,6 +5880,7 @@ self: super: {
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
   "nanospec" = doDistribute super."nanospec_0_2_0";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
@@ -6045,6 +6047,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -7255,6 +7258,7 @@ self: super: {
   "shake-language-c" = doDistribute super."shake-language-c_0_6_3";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_2_1";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7863,6 +7867,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template" = dontDistribute super."template";
   "template-default" = dontDistribute super."template-default";
@@ -8791,6 +8797,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
index 8d687da24aa5..036525771f8f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
@@ -4139,6 +4139,7 @@ self: super: {
   "here" = doDistribute super."here_1_2_6";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -5871,6 +5872,7 @@ self: super: {
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
   "nanospec" = doDistribute super."nanospec_0_2_0";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
@@ -6037,6 +6039,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -7246,6 +7249,7 @@ self: super: {
   "shake-language-c" = doDistribute super."shake-language-c_0_6_3";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_2_2";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7853,6 +7857,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template" = dontDistribute super."template";
   "template-default" = dontDistribute super."template-default";
@@ -8777,6 +8783,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
index 155a73c67810..0acdf21c5d0c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
@@ -4128,6 +4128,7 @@ self: super: {
   "here" = doDistribute super."here_1_2_6";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -5851,6 +5852,7 @@ self: super: {
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
   "nanospec" = doDistribute super."nanospec_0_2_0";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
@@ -6016,6 +6018,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -7222,6 +7225,7 @@ self: super: {
   "shake-language-c" = doDistribute super."shake-language-c_0_6_4";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_4_1";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7826,6 +7830,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template" = dontDistribute super."template";
   "template-default" = dontDistribute super."template-default";
@@ -8744,6 +8750,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8881,6 +8888,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
index 12f89d91d60b..247a81038b00 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
@@ -4127,6 +4127,7 @@ self: super: {
   "here" = doDistribute super."here_1_2_6";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -5847,6 +5848,7 @@ self: super: {
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
   "nanospec" = doDistribute super."nanospec_0_2_0";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
@@ -6012,6 +6014,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -7218,6 +7221,7 @@ self: super: {
   "shake-language-c" = doDistribute super."shake-language-c_0_6_4";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_4_1";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7822,6 +7826,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template" = dontDistribute super."template";
   "template-default" = dontDistribute super."template-default";
@@ -8740,6 +8746,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8877,6 +8884,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
index f8a890cbcd86..e4777fed04ab 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
@@ -4126,6 +4126,7 @@ self: super: {
   "herbalizer" = dontDistribute super."herbalizer";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -5846,6 +5847,7 @@ self: super: {
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
   "nanospec" = doDistribute super."nanospec_0_2_0";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
@@ -6011,6 +6013,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -7217,6 +7220,7 @@ self: super: {
   "shake-language-c" = doDistribute super."shake-language-c_0_6_4";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_4_1";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7820,6 +7824,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template" = dontDistribute super."template";
   "template-default" = dontDistribute super."template-default";
@@ -8737,6 +8743,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8874,6 +8881,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
index 097541c7f76b..ee061b36df03 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
@@ -4125,6 +4125,7 @@ self: super: {
   "herbalizer" = dontDistribute super."herbalizer";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -5845,6 +5846,7 @@ self: super: {
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
   "nanospec" = doDistribute super."nanospec_0_2_0";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
@@ -6010,6 +6012,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -7216,6 +7219,7 @@ self: super: {
   "shake-language-c" = doDistribute super."shake-language-c_0_6_4";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_4_1";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7818,6 +7822,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template" = dontDistribute super."template";
   "template-default" = dontDistribute super."template-default";
@@ -8735,6 +8741,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8872,6 +8879,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
index 5c957dfef699..0ed1162a0c6d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
@@ -4121,6 +4121,7 @@ self: super: {
   "herbalizer" = dontDistribute super."herbalizer";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -5838,6 +5839,7 @@ self: super: {
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
   "nanospec" = doDistribute super."nanospec_0_2_0";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
@@ -6003,6 +6005,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -7208,6 +7211,7 @@ self: super: {
   "shake-language-c" = doDistribute super."shake-language-c_0_6_4";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_4_1";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7810,6 +7814,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template" = dontDistribute super."template";
   "template-default" = dontDistribute super."template-default";
@@ -8727,6 +8733,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8864,6 +8871,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
index 3409b3c0ef0c..7875d9c2d011 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
@@ -4116,6 +4116,7 @@ self: super: {
   "herbalizer" = dontDistribute super."herbalizer";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -5831,6 +5832,7 @@ self: super: {
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
   "nanospec" = doDistribute super."nanospec_0_2_0";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
@@ -5996,6 +5998,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -7199,6 +7202,7 @@ self: super: {
   "shake-language-c" = doDistribute super."shake-language-c_0_6_4";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_4_1";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7799,6 +7803,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template" = dontDistribute super."template";
   "template-default" = dontDistribute super."template-default";
@@ -8715,6 +8721,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8852,6 +8859,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
index 3b85936a5246..434ab825afc7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
@@ -4136,6 +4136,7 @@ self: super: {
   "here" = doDistribute super."here_1_2_6";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -5868,6 +5869,7 @@ self: super: {
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
   "nanospec" = doDistribute super."nanospec_0_2_0";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
@@ -6034,6 +6036,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -7240,6 +7243,7 @@ self: super: {
   "shake-language-c" = doDistribute super."shake-language-c_0_6_4";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_3";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7847,6 +7851,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template" = dontDistribute super."template";
   "template-default" = dontDistribute super."template-default";
@@ -8771,6 +8777,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
index 0f7be7eb06ea..7b1bc7bd66f0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
@@ -4133,6 +4133,7 @@ self: super: {
   "here" = doDistribute super."here_1_2_6";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -5864,6 +5865,7 @@ self: super: {
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
   "nanospec" = doDistribute super."nanospec_0_2_0";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
@@ -6030,6 +6032,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -7236,6 +7239,7 @@ self: super: {
   "shake-language-c" = doDistribute super."shake-language-c_0_6_4";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_4";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7842,6 +7846,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template" = dontDistribute super."template";
   "template-default" = dontDistribute super."template-default";
@@ -8766,6 +8772,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
index 82082047ae22..c33af0630394 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
@@ -4132,6 +4132,7 @@ self: super: {
   "here" = doDistribute super."here_1_2_6";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -5862,6 +5863,7 @@ self: super: {
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
   "nanospec" = doDistribute super."nanospec_0_2_0";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
@@ -6028,6 +6030,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -7234,6 +7237,7 @@ self: super: {
   "shake-language-c" = doDistribute super."shake-language-c_0_6_4";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_4";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7840,6 +7844,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template" = dontDistribute super."template";
   "template-default" = dontDistribute super."template-default";
@@ -8762,6 +8768,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
index 8348d0b6c303..cc6f270828ac 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
@@ -4132,6 +4132,7 @@ self: super: {
   "here" = doDistribute super."here_1_2_6";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -5856,6 +5857,7 @@ self: super: {
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
   "nanospec" = doDistribute super."nanospec_0_2_0";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
@@ -6022,6 +6024,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -7228,6 +7231,7 @@ self: super: {
   "shake-language-c" = doDistribute super."shake-language-c_0_6_4";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_4";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7834,6 +7838,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template" = dontDistribute super."template";
   "template-default" = dontDistribute super."template-default";
@@ -8756,6 +8762,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
index 6d55ad6fe06b..4730ae44b72f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
@@ -4129,6 +4129,7 @@ self: super: {
   "here" = doDistribute super."here_1_2_6";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -5852,6 +5853,7 @@ self: super: {
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
   "nanospec" = doDistribute super."nanospec_0_2_0";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
@@ -6018,6 +6020,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -7224,6 +7227,7 @@ self: super: {
   "shake-language-c" = doDistribute super."shake-language-c_0_6_4";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_4";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7830,6 +7834,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template" = dontDistribute super."template";
   "template-default" = dontDistribute super."template-default";
@@ -8751,6 +8757,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8888,6 +8895,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
index ab83e91179a9..ad6b11963c52 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
@@ -4128,6 +4128,7 @@ self: super: {
   "here" = doDistribute super."here_1_2_6";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -5851,6 +5852,7 @@ self: super: {
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
   "nanospec" = doDistribute super."nanospec_0_2_0";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
@@ -6017,6 +6019,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -7223,6 +7226,7 @@ self: super: {
   "shake-language-c" = doDistribute super."shake-language-c_0_6_4";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_4";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7829,6 +7833,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template" = dontDistribute super."template";
   "template-default" = dontDistribute super."template-default";
@@ -8750,6 +8756,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8887,6 +8894,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
index 85e062fe36f9..4f5c63d1d67e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
@@ -4092,6 +4092,7 @@ self: super: {
   "herbalizer" = dontDistribute super."herbalizer";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -5780,6 +5781,7 @@ self: super: {
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
   "nanospec" = doDistribute super."nanospec_0_2_0";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
@@ -5942,6 +5944,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -7141,6 +7144,7 @@ self: super: {
   "shake-language-c" = doDistribute super."shake-language-c_0_6_4";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_4_1";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7735,6 +7739,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template" = dontDistribute super."template";
   "template-default" = dontDistribute super."template-default";
@@ -8644,6 +8650,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8781,6 +8788,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
index c1590ae945e0..0a85ad40ee6e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
@@ -4090,6 +4090,7 @@ self: super: {
   "herbalizer" = dontDistribute super."herbalizer";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -5778,6 +5779,7 @@ self: super: {
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
   "nanospec" = doDistribute super."nanospec_0_2_0";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
@@ -5940,6 +5942,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -7139,6 +7142,7 @@ self: super: {
   "shake-language-c" = doDistribute super."shake-language-c_0_6_4";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_4_1";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7733,6 +7737,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template" = dontDistribute super."template";
   "template-default" = dontDistribute super."template-default";
@@ -8641,6 +8647,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8778,6 +8785,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
index c68e4d1b057e..bee495f96a14 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
@@ -4068,6 +4068,7 @@ self: super: {
   "herbalizer" = dontDistribute super."herbalizer";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -5740,6 +5741,7 @@ self: super: {
   "nanomsg" = dontDistribute super."nanomsg";
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
@@ -5901,6 +5903,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -7093,6 +7096,7 @@ self: super: {
   "shake-language-c" = doDistribute super."shake-language-c_0_6_4";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_5";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7678,6 +7682,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template" = dontDistribute super."template";
   "template-default" = dontDistribute super."template-default";
@@ -8582,6 +8588,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8718,6 +8725,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
index 757109bd3e62..bd33d70414f7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
@@ -4065,6 +4065,7 @@ self: super: {
   "herbalizer" = dontDistribute super."herbalizer";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -5735,6 +5736,7 @@ self: super: {
   "nanomsg" = dontDistribute super."nanomsg";
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
@@ -5896,6 +5898,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -7086,6 +7089,7 @@ self: super: {
   "shake-language-c" = doDistribute super."shake-language-c_0_6_4";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_5";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7669,6 +7673,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template" = dontDistribute super."template";
   "template-default" = dontDistribute super."template-default";
@@ -8573,6 +8579,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8709,6 +8716,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
index 4a9ccf73b00c..a894c489103f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
@@ -4065,6 +4065,7 @@ self: super: {
   "herbalizer" = dontDistribute super."herbalizer";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -5735,6 +5736,7 @@ self: super: {
   "nanomsg" = dontDistribute super."nanomsg";
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
@@ -5896,6 +5898,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -7085,6 +7088,7 @@ self: super: {
   "shake-language-c" = doDistribute super."shake-language-c_0_6_4";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_5";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7668,6 +7672,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template" = dontDistribute super."template";
   "template-default" = dontDistribute super."template-default";
@@ -8572,6 +8578,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8708,6 +8715,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
index 86f90c4fad61..ab240f3c3ec2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
@@ -4064,6 +4064,7 @@ self: super: {
   "herbalizer" = dontDistribute super."herbalizer";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -5733,6 +5734,7 @@ self: super: {
   "nanomsg" = dontDistribute super."nanomsg";
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
@@ -5893,6 +5895,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -7082,6 +7085,7 @@ self: super: {
   "shake-language-c" = doDistribute super."shake-language-c_0_6_4";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_5";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7665,6 +7669,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template" = dontDistribute super."template";
   "template-default" = dontDistribute super."template-default";
@@ -8569,6 +8575,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8705,6 +8712,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
index a4e27bc81ebb..73f83460ba21 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
@@ -4062,6 +4062,7 @@ self: super: {
   "herbalizer" = dontDistribute super."herbalizer";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -5730,6 +5731,7 @@ self: super: {
   "nanomsg" = dontDistribute super."nanomsg";
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
@@ -5890,6 +5892,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -7078,6 +7081,7 @@ self: super: {
   "shake-language-c" = doDistribute super."shake-language-c_0_6_4";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_5";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7660,6 +7664,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template" = dontDistribute super."template";
   "template-default" = dontDistribute super."template-default";
@@ -8562,6 +8568,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8697,6 +8704,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
index cf63ab5da0a8..9c1593ada07d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
@@ -4061,6 +4061,7 @@ self: super: {
   "herbalizer" = dontDistribute super."herbalizer";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -5728,6 +5729,7 @@ self: super: {
   "nanomsg" = dontDistribute super."nanomsg";
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
@@ -5886,6 +5888,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -7074,6 +7077,7 @@ self: super: {
   "shake-language-c" = doDistribute super."shake-language-c_0_6_4";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_5";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7655,6 +7659,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template" = dontDistribute super."template";
   "template-default" = dontDistribute super."template-default";
@@ -8557,6 +8563,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8691,6 +8698,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
index b6046ed6d24c..7c44628aab7e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
@@ -4055,6 +4055,7 @@ self: super: {
   "herbalizer" = dontDistribute super."herbalizer";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -5721,6 +5722,7 @@ self: super: {
   "nanomsg" = dontDistribute super."nanomsg";
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
@@ -5879,6 +5881,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -7067,6 +7070,7 @@ self: super: {
   "shake-language-c" = doDistribute super."shake-language-c_0_6_4";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_5";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7648,6 +7652,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template" = dontDistribute super."template";
   "template-default" = dontDistribute super."template-default";
@@ -8550,6 +8556,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8683,6 +8690,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
index f1fb49b5608c..ad7b129ba9c7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
@@ -4050,6 +4050,7 @@ self: super: {
   "herbalizer" = dontDistribute super."herbalizer";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -5716,6 +5717,7 @@ self: super: {
   "nanomsg" = dontDistribute super."nanomsg";
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
@@ -5873,6 +5875,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -7061,6 +7064,7 @@ self: super: {
   "shake-language-c" = doDistribute super."shake-language-c_0_6_4";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_5";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7642,6 +7646,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template" = dontDistribute super."template";
   "template-default" = dontDistribute super."template-default";
@@ -8544,6 +8550,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8677,6 +8684,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
index 2e62f9b9c5eb..5cd4bf38b8fc 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
@@ -4047,6 +4047,7 @@ self: super: {
   "herbalizer" = dontDistribute super."herbalizer";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -5713,6 +5714,7 @@ self: super: {
   "nanomsg" = dontDistribute super."nanomsg";
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
@@ -5869,6 +5871,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -7056,6 +7059,7 @@ self: super: {
   "shake-language-c" = doDistribute super."shake-language-c_0_6_4";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_5";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7636,6 +7640,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template" = dontDistribute super."template";
   "template-default" = dontDistribute super."template-default";
@@ -8537,6 +8543,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8670,6 +8677,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
index f7d3dd6f0648..8cd773650dfa 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
@@ -4046,6 +4046,7 @@ self: super: {
   "herbalizer" = dontDistribute super."herbalizer";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -5710,6 +5711,7 @@ self: super: {
   "nanomsg" = dontDistribute super."nanomsg";
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
@@ -5866,6 +5868,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -7053,6 +7056,7 @@ self: super: {
   "shake-language-c" = doDistribute super."shake-language-c_0_6_4";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_5";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7631,6 +7635,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template" = dontDistribute super."template";
   "template-default" = dontDistribute super."template-default";
@@ -8531,6 +8537,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8664,6 +8671,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
index d74835152551..11ae6e2ebd7e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
@@ -4087,6 +4087,7 @@ self: super: {
   "herbalizer" = dontDistribute super."herbalizer";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -5775,6 +5776,7 @@ self: super: {
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
   "nanospec" = doDistribute super."nanospec_0_2_0";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
@@ -5937,6 +5939,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -7136,6 +7139,7 @@ self: super: {
   "shake-language-c" = doDistribute super."shake-language-c_0_6_4";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_4_1";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7730,6 +7734,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template" = dontDistribute super."template";
   "template-default" = dontDistribute super."template-default";
@@ -8637,6 +8643,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8774,6 +8781,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
index e8162894e885..8f0646e0c7e8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
@@ -4044,6 +4044,7 @@ self: super: {
   "herbalizer" = dontDistribute super."herbalizer";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -5708,6 +5709,7 @@ self: super: {
   "nanomsg" = dontDistribute super."nanomsg";
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
@@ -5864,6 +5866,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -7050,6 +7053,7 @@ self: super: {
   "shake-language-c" = doDistribute super."shake-language-c_0_6_4";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_5";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7627,6 +7631,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template" = dontDistribute super."template";
   "template-default" = dontDistribute super."template-default";
@@ -8527,6 +8533,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8660,6 +8667,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
index 3b73cbcc6d76..465745d0e54e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
@@ -4044,6 +4044,7 @@ self: super: {
   "herbalizer" = dontDistribute super."herbalizer";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -5707,6 +5708,7 @@ self: super: {
   "nanomsg" = dontDistribute super."nanomsg";
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
@@ -5863,6 +5865,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -7048,6 +7051,7 @@ self: super: {
   "shake-language-c" = doDistribute super."shake-language-c_0_6_4";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_5";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7625,6 +7629,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template" = dontDistribute super."template";
   "template-default" = dontDistribute super."template-default";
@@ -8522,6 +8528,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8655,6 +8662,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
index 80529cce6b3c..f3ac43514e85 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
@@ -4044,6 +4044,7 @@ self: super: {
   "herbalizer" = dontDistribute super."herbalizer";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -5705,6 +5706,7 @@ self: super: {
   "nanomsg" = dontDistribute super."nanomsg";
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
@@ -5861,6 +5863,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -7046,6 +7049,7 @@ self: super: {
   "shake-language-c" = doDistribute super."shake-language-c_0_6_4";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_5";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7623,6 +7627,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template" = dontDistribute super."template";
   "template-default" = dontDistribute super."template-default";
@@ -8520,6 +8526,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8653,6 +8660,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
index 566a83cd75ce..240c70b0cfb8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
@@ -4086,6 +4086,7 @@ self: super: {
   "herbalizer" = dontDistribute super."herbalizer";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -5773,6 +5774,7 @@ self: super: {
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
   "nanospec" = doDistribute super."nanospec_0_2_0";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
@@ -5935,6 +5937,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -7134,6 +7137,7 @@ self: super: {
   "shake-language-c" = doDistribute super."shake-language-c_0_6_4";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_4_1";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7728,6 +7732,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template" = dontDistribute super."template";
   "template-default" = dontDistribute super."template-default";
@@ -8635,6 +8641,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8772,6 +8779,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
index 3923a493fdd3..d59628a35f77 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
@@ -4085,6 +4085,7 @@ self: super: {
   "herbalizer" = dontDistribute super."herbalizer";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -5771,6 +5772,7 @@ self: super: {
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
   "nanospec" = doDistribute super."nanospec_0_2_0";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
@@ -5933,6 +5935,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -7129,6 +7132,7 @@ self: super: {
   "shake-language-c" = doDistribute super."shake-language-c_0_6_4";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_4_1";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7723,6 +7727,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template" = dontDistribute super."template";
   "template-default" = dontDistribute super."template-default";
@@ -8630,6 +8636,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8767,6 +8774,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
index f3aefecc1278..32d9eeb7fb56 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
@@ -4084,6 +4084,7 @@ self: super: {
   "herbalizer" = dontDistribute super."herbalizer";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -5769,6 +5770,7 @@ self: super: {
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
   "nanospec" = doDistribute super."nanospec_0_2_0";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
@@ -5931,6 +5933,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -7127,6 +7130,7 @@ self: super: {
   "shake-language-c" = doDistribute super."shake-language-c_0_6_4";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_4_1";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7720,6 +7724,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template" = dontDistribute super."template";
   "template-default" = dontDistribute super."template-default";
@@ -8627,6 +8633,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8764,6 +8771,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
index cea82a295220..bb0b738d8150 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
@@ -4079,6 +4079,7 @@ self: super: {
   "herbalizer" = dontDistribute super."herbalizer";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -5763,6 +5764,7 @@ self: super: {
   "nanomsg" = dontDistribute super."nanomsg";
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
@@ -5925,6 +5927,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -7121,6 +7124,7 @@ self: super: {
   "shake-language-c" = doDistribute super."shake-language-c_0_6_4";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_4_1";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7714,6 +7718,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template" = dontDistribute super."template";
   "template-default" = dontDistribute super."template-default";
@@ -8619,6 +8625,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8755,6 +8762,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
index 091f9df6a341..ed84976e0fb7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
@@ -4078,6 +4078,7 @@ self: super: {
   "herbalizer" = dontDistribute super."herbalizer";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -5763,6 +5764,7 @@ self: super: {
   "nanomsg" = dontDistribute super."nanomsg";
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
@@ -5924,6 +5926,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -7120,6 +7123,7 @@ self: super: {
   "shake-language-c" = doDistribute super."shake-language-c_0_6_4";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_4_1";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7713,6 +7717,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template" = dontDistribute super."template";
   "template-default" = dontDistribute super."template-default";
@@ -8618,6 +8624,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8754,6 +8761,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
index a106f4f94aaa..b4abbeddb86d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
@@ -4076,6 +4076,7 @@ self: super: {
   "herbalizer" = dontDistribute super."herbalizer";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -5759,6 +5760,7 @@ self: super: {
   "nanomsg" = dontDistribute super."nanomsg";
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
@@ -5920,6 +5922,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -7115,6 +7118,7 @@ self: super: {
   "shake-language-c" = doDistribute super."shake-language-c_0_6_4";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_4_1";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7705,6 +7709,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template" = dontDistribute super."template";
   "template-default" = dontDistribute super."template-default";
@@ -8610,6 +8616,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8746,6 +8753,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
index ce347e0b1e15..ea77ce3e80f7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
@@ -4070,6 +4070,7 @@ self: super: {
   "herbalizer" = dontDistribute super."herbalizer";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -5749,6 +5750,7 @@ self: super: {
   "nanomsg" = dontDistribute super."nanomsg";
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = dontDistribute super."nationstates";
@@ -5910,6 +5912,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -7104,6 +7107,7 @@ self: super: {
   "shake-language-c" = doDistribute super."shake-language-c_0_6_4";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_5";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7690,6 +7694,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template" = dontDistribute super."template";
   "template-default" = dontDistribute super."template-default";
@@ -8594,6 +8600,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8730,6 +8737,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
index 70cd63dbd1da..182a082f39b9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
@@ -2193,6 +2193,7 @@ self: super: {
   "cpuperf" = dontDistribute super."cpuperf";
   "cpython" = dontDistribute super."cpython";
   "cql" = doDistribute super."cql_3_0_5";
+  "cql-io" = doDistribute super."cql-io_0_14_5";
   "cqrs" = dontDistribute super."cqrs";
   "cqrs-core" = dontDistribute super."cqrs-core";
   "cqrs-example" = dontDistribute super."cqrs-example";
@@ -3925,6 +3926,7 @@ self: super: {
   "herbalizer" = dontDistribute super."herbalizer";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -4499,7 +4501,9 @@ self: super: {
   "iban" = dontDistribute super."iban";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
+  "ide-backend" = doDistribute super."ide-backend_0_10_0";
   "ide-backend-common" = doDistribute super."ide-backend-common_0_10_0";
+  "ide-backend-server" = doDistribute super."ide-backend-server_0_10_0";
   "ideas" = dontDistribute super."ideas";
   "ideas-math" = dontDistribute super."ideas-math";
   "idempotent" = dontDistribute super."idempotent";
@@ -5518,6 +5522,7 @@ self: super: {
   "nanomsg" = dontDistribute super."nanomsg";
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = doDistribute super."nationstates_0_2_0_0";
@@ -5673,6 +5678,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -6395,6 +6401,7 @@ self: super: {
   "reddit" = dontDistribute super."reddit";
   "redis" = dontDistribute super."redis";
   "redis-hs" = dontDistribute super."redis-hs";
+  "redis-io" = doDistribute super."redis-io_0_5_1";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
@@ -6827,6 +6834,7 @@ self: super: {
   "shake-language-c" = doDistribute super."shake-language-c_0_8_0";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_5";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7393,6 +7401,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template-default" = dontDistribute super."template-default";
   "template-haskell-util" = dontDistribute super."template-haskell-util";
@@ -8262,6 +8272,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8388,6 +8399,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
index 92beaad4c32c..31e57a21d4eb 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
@@ -2192,6 +2192,7 @@ self: super: {
   "cpuperf" = dontDistribute super."cpuperf";
   "cpython" = dontDistribute super."cpython";
   "cql" = doDistribute super."cql_3_0_5";
+  "cql-io" = doDistribute super."cql-io_0_14_5";
   "cqrs" = dontDistribute super."cqrs";
   "cqrs-core" = dontDistribute super."cqrs-core";
   "cqrs-example" = dontDistribute super."cqrs-example";
@@ -3920,6 +3921,7 @@ self: super: {
   "herbalizer" = dontDistribute super."herbalizer";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -4494,7 +4496,9 @@ self: super: {
   "iban" = dontDistribute super."iban";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
+  "ide-backend" = doDistribute super."ide-backend_0_10_0";
   "ide-backend-common" = doDistribute super."ide-backend-common_0_10_0";
+  "ide-backend-server" = doDistribute super."ide-backend-server_0_10_0";
   "ideas" = dontDistribute super."ideas";
   "ideas-math" = dontDistribute super."ideas-math";
   "idempotent" = dontDistribute super."idempotent";
@@ -5511,6 +5515,7 @@ self: super: {
   "nanomsg" = dontDistribute super."nanomsg";
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = doDistribute super."nationstates_0_2_0_0";
@@ -5666,6 +5671,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -6387,6 +6393,7 @@ self: super: {
   "reddit" = dontDistribute super."reddit";
   "redis" = dontDistribute super."redis";
   "redis-hs" = dontDistribute super."redis-hs";
+  "redis-io" = doDistribute super."redis-io_0_5_1";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
@@ -6818,6 +6825,7 @@ self: super: {
   "shake-language-c" = doDistribute super."shake-language-c_0_8_0";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_5";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7384,6 +7392,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template-default" = dontDistribute super."template-default";
   "template-haskell-util" = dontDistribute super."template-haskell-util";
@@ -8252,6 +8262,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8378,6 +8389,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
index 42ba52782493..c0a0fa14bae7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
@@ -2164,6 +2164,7 @@ self: super: {
   "cpuperf" = dontDistribute super."cpuperf";
   "cpython" = dontDistribute super."cpython";
   "cql" = doDistribute super."cql_3_0_5";
+  "cql-io" = doDistribute super."cql-io_0_14_5";
   "cqrs" = dontDistribute super."cqrs";
   "cqrs-core" = dontDistribute super."cqrs-core";
   "cqrs-example" = dontDistribute super."cqrs-example";
@@ -2851,6 +2852,7 @@ self: super: {
   "fdo-trash" = dontDistribute super."fdo-trash";
   "fec" = dontDistribute super."fec";
   "fedora-packages" = dontDistribute super."fedora-packages";
+  "feed" = doDistribute super."feed_0_3_10_3";
   "feed-cli" = dontDistribute super."feed-cli";
   "feed-collect" = dontDistribute super."feed-collect";
   "feed-crawl" = dontDistribute super."feed-crawl";
@@ -3863,6 +3865,7 @@ self: super: {
   "herbalizer" = dontDistribute super."herbalizer";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -4433,6 +4436,9 @@ self: super: {
   "iban" = dontDistribute super."iban";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
+  "ide-backend" = doDistribute super."ide-backend_0_10_0";
+  "ide-backend-common" = doDistribute super."ide-backend-common_0_10_1_1";
+  "ide-backend-server" = doDistribute super."ide-backend-server_0_10_0";
   "ideas" = dontDistribute super."ideas";
   "ideas-math" = dontDistribute super."ideas-math";
   "idempotent" = dontDistribute super."idempotent";
@@ -5433,6 +5439,7 @@ self: super: {
   "nanomsg" = dontDistribute super."nanomsg";
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = doDistribute super."nationstates_0_2_0_3";
@@ -5586,6 +5593,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -6290,6 +6298,7 @@ self: super: {
   "reddit" = dontDistribute super."reddit";
   "redis" = dontDistribute super."redis";
   "redis-hs" = dontDistribute super."redis-hs";
+  "redis-io" = doDistribute super."redis-io_0_5_1";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
@@ -6716,6 +6725,7 @@ self: super: {
   "shake-extras" = dontDistribute super."shake-extras";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_6";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7270,6 +7280,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template-default" = dontDistribute super."template-default";
   "template-haskell-util" = dontDistribute super."template-haskell-util";
@@ -8122,6 +8134,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8245,6 +8258,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
index 1de9c0315350..b33d8d00e572 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
@@ -2162,6 +2162,7 @@ self: super: {
   "cpuperf" = dontDistribute super."cpuperf";
   "cpython" = dontDistribute super."cpython";
   "cql" = doDistribute super."cql_3_0_5";
+  "cql-io" = doDistribute super."cql-io_0_14_5";
   "cqrs" = dontDistribute super."cqrs";
   "cqrs-core" = dontDistribute super."cqrs-core";
   "cqrs-example" = dontDistribute super."cqrs-example";
@@ -2848,6 +2849,7 @@ self: super: {
   "fdo-trash" = dontDistribute super."fdo-trash";
   "fec" = dontDistribute super."fec";
   "fedora-packages" = dontDistribute super."fedora-packages";
+  "feed" = doDistribute super."feed_0_3_10_3";
   "feed-cli" = dontDistribute super."feed-cli";
   "feed-collect" = dontDistribute super."feed-collect";
   "feed-crawl" = dontDistribute super."feed-crawl";
@@ -3859,6 +3861,7 @@ self: super: {
   "herbalizer" = dontDistribute super."herbalizer";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -4429,6 +4432,9 @@ self: super: {
   "iban" = dontDistribute super."iban";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
+  "ide-backend" = doDistribute super."ide-backend_0_10_0";
+  "ide-backend-common" = doDistribute super."ide-backend-common_0_10_1_1";
+  "ide-backend-server" = doDistribute super."ide-backend-server_0_10_0";
   "ideas" = dontDistribute super."ideas";
   "ideas-math" = dontDistribute super."ideas-math";
   "idempotent" = dontDistribute super."idempotent";
@@ -5429,6 +5435,7 @@ self: super: {
   "nanomsg" = dontDistribute super."nanomsg";
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = doDistribute super."nationstates_0_2_0_3";
@@ -5582,6 +5589,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -6285,6 +6293,7 @@ self: super: {
   "reddit" = dontDistribute super."reddit";
   "redis" = dontDistribute super."redis";
   "redis-hs" = dontDistribute super."redis-hs";
+  "redis-io" = doDistribute super."redis-io_0_5_1";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
@@ -6710,6 +6719,7 @@ self: super: {
   "shake-extras" = dontDistribute super."shake-extras";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
@@ -7262,6 +7272,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template-default" = dontDistribute super."template-default";
   "template-haskell-util" = dontDistribute super."template-haskell-util";
@@ -8114,6 +8126,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8237,6 +8250,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
index ad592a39a7d7..54dadd125cab 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
@@ -2157,6 +2157,7 @@ self: super: {
   "cpuperf" = dontDistribute super."cpuperf";
   "cpython" = dontDistribute super."cpython";
   "cql" = doDistribute super."cql_3_0_5";
+  "cql-io" = doDistribute super."cql-io_0_14_5";
   "cqrs" = dontDistribute super."cqrs";
   "cqrs-core" = dontDistribute super."cqrs-core";
   "cqrs-example" = dontDistribute super."cqrs-example";
@@ -2843,6 +2844,7 @@ self: super: {
   "fdo-trash" = dontDistribute super."fdo-trash";
   "fec" = dontDistribute super."fec";
   "fedora-packages" = dontDistribute super."fedora-packages";
+  "feed" = doDistribute super."feed_0_3_10_3";
   "feed-cli" = dontDistribute super."feed-cli";
   "feed-collect" = dontDistribute super."feed-collect";
   "feed-crawl" = dontDistribute super."feed-crawl";
@@ -3853,6 +3855,7 @@ self: super: {
   "herbalizer" = dontDistribute super."herbalizer";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -4423,6 +4426,9 @@ self: super: {
   "iban" = dontDistribute super."iban";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
+  "ide-backend" = doDistribute super."ide-backend_0_10_0";
+  "ide-backend-common" = doDistribute super."ide-backend-common_0_10_1_1";
+  "ide-backend-server" = doDistribute super."ide-backend-server_0_10_0";
   "ideas" = dontDistribute super."ideas";
   "ideas-math" = dontDistribute super."ideas-math";
   "idempotent" = dontDistribute super."idempotent";
@@ -5423,6 +5429,7 @@ self: super: {
   "nanomsg" = dontDistribute super."nanomsg";
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = doDistribute super."nationstates_0_2_0_3";
@@ -5576,6 +5583,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -6278,6 +6286,7 @@ self: super: {
   "reddit" = dontDistribute super."reddit";
   "redis" = dontDistribute super."redis";
   "redis-hs" = dontDistribute super."redis-hs";
+  "redis-io" = doDistribute super."redis-io_0_5_1";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
@@ -6703,6 +6712,7 @@ self: super: {
   "shake-extras" = dontDistribute super."shake-extras";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
@@ -7255,6 +7265,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template-default" = dontDistribute super."template-default";
   "template-haskell-util" = dontDistribute super."template-haskell-util";
@@ -8105,6 +8117,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8226,6 +8239,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
index ca66663e22e4..52a7f28c2430 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
@@ -2157,6 +2157,7 @@ self: super: {
   "cpuperf" = dontDistribute super."cpuperf";
   "cpython" = dontDistribute super."cpython";
   "cql" = doDistribute super."cql_3_0_6";
+  "cql-io" = doDistribute super."cql-io_0_14_5";
   "cqrs" = dontDistribute super."cqrs";
   "cqrs-core" = dontDistribute super."cqrs-core";
   "cqrs-example" = dontDistribute super."cqrs-example";
@@ -2843,6 +2844,7 @@ self: super: {
   "fdo-trash" = dontDistribute super."fdo-trash";
   "fec" = dontDistribute super."fec";
   "fedora-packages" = dontDistribute super."fedora-packages";
+  "feed" = doDistribute super."feed_0_3_10_3";
   "feed-cli" = dontDistribute super."feed-cli";
   "feed-collect" = dontDistribute super."feed-collect";
   "feed-crawl" = dontDistribute super."feed-crawl";
@@ -3853,6 +3855,7 @@ self: super: {
   "herbalizer" = dontDistribute super."herbalizer";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -4422,6 +4425,9 @@ self: super: {
   "iban" = dontDistribute super."iban";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
+  "ide-backend" = doDistribute super."ide-backend_0_10_0";
+  "ide-backend-common" = doDistribute super."ide-backend-common_0_10_1_1";
+  "ide-backend-server" = doDistribute super."ide-backend-server_0_10_0";
   "ideas" = dontDistribute super."ideas";
   "ideas-math" = dontDistribute super."ideas-math";
   "idempotent" = dontDistribute super."idempotent";
@@ -5421,6 +5427,7 @@ self: super: {
   "nanomsg" = dontDistribute super."nanomsg";
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = doDistribute super."nationstates_0_2_0_3";
@@ -5574,6 +5581,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -6275,6 +6283,7 @@ self: super: {
   "reddit" = dontDistribute super."reddit";
   "redis" = dontDistribute super."redis";
   "redis-hs" = dontDistribute super."redis-hs";
+  "redis-io" = doDistribute super."redis-io_0_5_1";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
@@ -6700,6 +6709,7 @@ self: super: {
   "shake-extras" = dontDistribute super."shake-extras";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
@@ -7251,6 +7261,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template-default" = dontDistribute super."template-default";
   "template-haskell-util" = dontDistribute super."template-haskell-util";
@@ -8100,6 +8112,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8221,6 +8234,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.14.nix b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
index 18ca1b6e1c46..a4ea40b61bde 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
@@ -2153,6 +2153,7 @@ self: super: {
   "cpuid" = dontDistribute super."cpuid";
   "cpuperf" = dontDistribute super."cpuperf";
   "cpython" = dontDistribute super."cpython";
+  "cql-io" = doDistribute super."cql-io_0_14_5";
   "cqrs" = dontDistribute super."cqrs";
   "cqrs-core" = dontDistribute super."cqrs-core";
   "cqrs-example" = dontDistribute super."cqrs-example";
@@ -2835,6 +2836,7 @@ self: super: {
   "fdo-trash" = dontDistribute super."fdo-trash";
   "fec" = dontDistribute super."fec";
   "fedora-packages" = dontDistribute super."fedora-packages";
+  "feed" = doDistribute super."feed_0_3_10_3";
   "feed-cli" = dontDistribute super."feed-cli";
   "feed-collect" = dontDistribute super."feed-collect";
   "feed-crawl" = dontDistribute super."feed-crawl";
@@ -3845,6 +3847,7 @@ self: super: {
   "herbalizer" = dontDistribute super."herbalizer";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -4413,6 +4416,9 @@ self: super: {
   "iban" = dontDistribute super."iban";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
+  "ide-backend" = doDistribute super."ide-backend_0_10_0";
+  "ide-backend-common" = doDistribute super."ide-backend-common_0_10_1_1";
+  "ide-backend-server" = doDistribute super."ide-backend-server_0_10_0";
   "ideas" = dontDistribute super."ideas";
   "ideas-math" = dontDistribute super."ideas-math";
   "idempotent" = dontDistribute super."idempotent";
@@ -5410,6 +5416,7 @@ self: super: {
   "nanomsg" = dontDistribute super."nanomsg";
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = doDistribute super."nationstates_0_2_0_3";
@@ -5563,6 +5570,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -6263,6 +6271,7 @@ self: super: {
   "reddit" = dontDistribute super."reddit";
   "redis" = dontDistribute super."redis";
   "redis-hs" = dontDistribute super."redis-hs";
+  "redis-io" = doDistribute super."redis-io_0_5_1";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
@@ -6688,6 +6697,7 @@ self: super: {
   "shake-extras" = dontDistribute super."shake-extras";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
@@ -7238,6 +7248,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template-default" = dontDistribute super."template-default";
   "template-haskell-util" = dontDistribute super."template-haskell-util";
@@ -8085,6 +8097,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8206,6 +8219,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.15.nix b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
index 2e1a0cff6127..b50a2b8052f1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
@@ -2152,6 +2152,7 @@ self: super: {
   "cpuid" = dontDistribute super."cpuid";
   "cpuperf" = dontDistribute super."cpuperf";
   "cpython" = dontDistribute super."cpython";
+  "cql-io" = doDistribute super."cql-io_0_14_5";
   "cqrs" = dontDistribute super."cqrs";
   "cqrs-core" = dontDistribute super."cqrs-core";
   "cqrs-example" = dontDistribute super."cqrs-example";
@@ -2834,6 +2835,7 @@ self: super: {
   "fdo-trash" = dontDistribute super."fdo-trash";
   "fec" = dontDistribute super."fec";
   "fedora-packages" = dontDistribute super."fedora-packages";
+  "feed" = doDistribute super."feed_0_3_10_3";
   "feed-cli" = dontDistribute super."feed-cli";
   "feed-collect" = dontDistribute super."feed-collect";
   "feed-crawl" = dontDistribute super."feed-crawl";
@@ -3842,6 +3844,7 @@ self: super: {
   "herbalizer" = dontDistribute super."herbalizer";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -4408,6 +4411,9 @@ self: super: {
   "iban" = dontDistribute super."iban";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
+  "ide-backend" = doDistribute super."ide-backend_0_10_0";
+  "ide-backend-common" = doDistribute super."ide-backend-common_0_10_1_1";
+  "ide-backend-server" = doDistribute super."ide-backend-server_0_10_0";
   "ideas" = dontDistribute super."ideas";
   "ideas-math" = dontDistribute super."ideas-math";
   "idempotent" = dontDistribute super."idempotent";
@@ -5405,6 +5411,7 @@ self: super: {
   "nanomsg" = dontDistribute super."nanomsg";
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = doDistribute super."nationstates_0_2_0_3";
@@ -5558,6 +5565,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -6256,6 +6264,7 @@ self: super: {
   "reddit" = dontDistribute super."reddit";
   "redis" = dontDistribute super."redis";
   "redis-hs" = dontDistribute super."redis-hs";
+  "redis-io" = doDistribute super."redis-io_0_5_1";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
@@ -6680,6 +6689,7 @@ self: super: {
   "shake-extras" = dontDistribute super."shake-extras";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
@@ -7230,6 +7240,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template-default" = dontDistribute super."template-default";
   "template-haskell-util" = dontDistribute super."template-haskell-util";
@@ -8076,6 +8088,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8197,6 +8210,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.16.nix b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
index 903d763496ae..e9b603bd5bbe 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
@@ -2150,6 +2150,7 @@ self: super: {
   "cpuid" = dontDistribute super."cpuid";
   "cpuperf" = dontDistribute super."cpuperf";
   "cpython" = dontDistribute super."cpython";
+  "cql-io" = doDistribute super."cql-io_0_14_5";
   "cqrs" = dontDistribute super."cqrs";
   "cqrs-core" = dontDistribute super."cqrs-core";
   "cqrs-example" = dontDistribute super."cqrs-example";
@@ -2831,6 +2832,7 @@ self: super: {
   "fdo-trash" = dontDistribute super."fdo-trash";
   "fec" = dontDistribute super."fec";
   "fedora-packages" = dontDistribute super."fedora-packages";
+  "feed" = doDistribute super."feed_0_3_10_3";
   "feed-cli" = dontDistribute super."feed-cli";
   "feed-collect" = dontDistribute super."feed-collect";
   "feed-crawl" = dontDistribute super."feed-crawl";
@@ -3838,6 +3840,7 @@ self: super: {
   "herbalizer" = dontDistribute super."herbalizer";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -4404,6 +4407,9 @@ self: super: {
   "iban" = dontDistribute super."iban";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
+  "ide-backend" = doDistribute super."ide-backend_0_10_0";
+  "ide-backend-common" = doDistribute super."ide-backend-common_0_10_1_1";
+  "ide-backend-server" = doDistribute super."ide-backend-server_0_10_0";
   "ideas" = dontDistribute super."ideas";
   "ideas-math" = dontDistribute super."ideas-math";
   "idempotent" = dontDistribute super."idempotent";
@@ -5398,6 +5404,7 @@ self: super: {
   "nanomsg" = dontDistribute super."nanomsg";
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = doDistribute super."nationstates_0_2_0_3";
@@ -5551,6 +5558,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -6247,6 +6255,7 @@ self: super: {
   "reddit" = dontDistribute super."reddit";
   "redis" = dontDistribute super."redis";
   "redis-hs" = dontDistribute super."redis-hs";
+  "redis-io" = doDistribute super."redis-io_0_5_1";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
@@ -6669,6 +6678,7 @@ self: super: {
   "shake-extras" = dontDistribute super."shake-extras";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
@@ -7216,6 +7226,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template-default" = dontDistribute super."template-default";
   "template-haskell-util" = dontDistribute super."template-haskell-util";
@@ -8061,6 +8073,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8182,6 +8195,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.17.nix b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
index 2fbf8054e540..36c6b1130704 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
@@ -2144,6 +2144,7 @@ self: super: {
   "cpuid" = dontDistribute super."cpuid";
   "cpuperf" = dontDistribute super."cpuperf";
   "cpython" = dontDistribute super."cpython";
+  "cql-io" = doDistribute super."cql-io_0_14_5";
   "cqrs" = dontDistribute super."cqrs";
   "cqrs-core" = dontDistribute super."cqrs-core";
   "cqrs-example" = dontDistribute super."cqrs-example";
@@ -2824,6 +2825,7 @@ self: super: {
   "fdo-trash" = dontDistribute super."fdo-trash";
   "fec" = dontDistribute super."fec";
   "fedora-packages" = dontDistribute super."fedora-packages";
+  "feed" = doDistribute super."feed_0_3_10_3";
   "feed-cli" = dontDistribute super."feed-cli";
   "feed-collect" = dontDistribute super."feed-collect";
   "feed-crawl" = dontDistribute super."feed-crawl";
@@ -3830,6 +3832,7 @@ self: super: {
   "herbalizer" = dontDistribute super."herbalizer";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -4396,6 +4399,9 @@ self: super: {
   "iban" = dontDistribute super."iban";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
+  "ide-backend" = doDistribute super."ide-backend_0_10_0";
+  "ide-backend-common" = doDistribute super."ide-backend-common_0_10_1_1";
+  "ide-backend-server" = doDistribute super."ide-backend-server_0_10_0";
   "ideas" = dontDistribute super."ideas";
   "ideas-math" = dontDistribute super."ideas-math";
   "idempotent" = dontDistribute super."idempotent";
@@ -4501,6 +4507,7 @@ self: super: {
   "io-reactive" = dontDistribute super."io-reactive";
   "io-region" = dontDistribute super."io-region";
   "io-storage" = dontDistribute super."io-storage";
+  "io-streams" = doDistribute super."io-streams_1_3_3_1";
   "io-streams-http" = dontDistribute super."io-streams-http";
   "io-throttle" = dontDistribute super."io-throttle";
   "ioctl" = dontDistribute super."ioctl";
@@ -5386,6 +5393,7 @@ self: super: {
   "nanomsg" = dontDistribute super."nanomsg";
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = doDistribute super."nationstates_0_2_0_3";
@@ -5539,6 +5547,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -6233,6 +6242,7 @@ self: super: {
   "reddit" = dontDistribute super."reddit";
   "redis" = dontDistribute super."redis";
   "redis-hs" = dontDistribute super."redis-hs";
+  "redis-io" = doDistribute super."redis-io_0_5_1";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
@@ -6654,6 +6664,7 @@ self: super: {
   "shake-extras" = dontDistribute super."shake-extras";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
@@ -7201,6 +7212,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template-default" = dontDistribute super."template-default";
   "template-haskell-util" = dontDistribute super."template-haskell-util";
@@ -8044,6 +8057,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8162,6 +8176,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.18.nix b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
index d1f07ae0f3c7..0338135e6d42 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
@@ -2144,6 +2144,7 @@ self: super: {
   "cpuid" = dontDistribute super."cpuid";
   "cpuperf" = dontDistribute super."cpuperf";
   "cpython" = dontDistribute super."cpython";
+  "cql-io" = doDistribute super."cql-io_0_14_5";
   "cqrs" = dontDistribute super."cqrs";
   "cqrs-core" = dontDistribute super."cqrs-core";
   "cqrs-example" = dontDistribute super."cqrs-example";
@@ -2824,6 +2825,7 @@ self: super: {
   "fdo-trash" = dontDistribute super."fdo-trash";
   "fec" = dontDistribute super."fec";
   "fedora-packages" = dontDistribute super."fedora-packages";
+  "feed" = doDistribute super."feed_0_3_10_3";
   "feed-cli" = dontDistribute super."feed-cli";
   "feed-collect" = dontDistribute super."feed-collect";
   "feed-crawl" = dontDistribute super."feed-crawl";
@@ -3825,6 +3827,7 @@ self: super: {
   "herbalizer" = dontDistribute super."herbalizer";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -4387,6 +4390,9 @@ self: super: {
   "iban" = dontDistribute super."iban";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
+  "ide-backend" = doDistribute super."ide-backend_0_10_0";
+  "ide-backend-common" = doDistribute super."ide-backend-common_0_10_1_1";
+  "ide-backend-server" = doDistribute super."ide-backend-server_0_10_0";
   "ideas" = dontDistribute super."ideas";
   "ideas-math" = dontDistribute super."ideas-math";
   "idempotent" = dontDistribute super."idempotent";
@@ -4492,6 +4498,7 @@ self: super: {
   "io-reactive" = dontDistribute super."io-reactive";
   "io-region" = dontDistribute super."io-region";
   "io-storage" = dontDistribute super."io-storage";
+  "io-streams" = doDistribute super."io-streams_1_3_3_1";
   "io-streams-http" = dontDistribute super."io-streams-http";
   "io-throttle" = dontDistribute super."io-throttle";
   "ioctl" = dontDistribute super."ioctl";
@@ -5376,6 +5383,7 @@ self: super: {
   "nanomsg" = dontDistribute super."nanomsg";
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = doDistribute super."nationstates_0_2_0_3";
@@ -5529,6 +5537,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -6220,6 +6229,7 @@ self: super: {
   "reddit" = dontDistribute super."reddit";
   "redis" = dontDistribute super."redis";
   "redis-hs" = dontDistribute super."redis-hs";
+  "redis-io" = doDistribute super."redis-io_0_5_1";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
@@ -6641,6 +6651,7 @@ self: super: {
   "shake-extras" = dontDistribute super."shake-extras";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
@@ -7187,6 +7198,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template-default" = dontDistribute super."template-default";
   "template-haskell-util" = dontDistribute super."template-haskell-util";
@@ -8026,6 +8039,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8144,6 +8158,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.19.nix b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
index 862b23d25047..f675cf4ef18a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
@@ -1437,6 +1437,7 @@ self: super: {
   "base-generics" = dontDistribute super."base-generics";
   "base-io-access" = dontDistribute super."base-io-access";
   "base-noprelude" = dontDistribute super."base-noprelude";
+  "base-prelude" = doDistribute super."base-prelude_0_1_20";
   "base32-bytestring" = dontDistribute super."base32-bytestring";
   "base58-bytestring" = dontDistribute super."base58-bytestring";
   "base58address" = dontDistribute super."base58address";
@@ -2136,6 +2137,7 @@ self: super: {
   "cpuid" = dontDistribute super."cpuid";
   "cpuperf" = dontDistribute super."cpuperf";
   "cpython" = dontDistribute super."cpython";
+  "cql-io" = doDistribute super."cql-io_0_14_5";
   "cqrs" = dontDistribute super."cqrs";
   "cqrs-core" = dontDistribute super."cqrs-core";
   "cqrs-example" = dontDistribute super."cqrs-example";
@@ -2816,6 +2818,7 @@ self: super: {
   "fdo-trash" = dontDistribute super."fdo-trash";
   "fec" = dontDistribute super."fec";
   "fedora-packages" = dontDistribute super."fedora-packages";
+  "feed" = doDistribute super."feed_0_3_10_3";
   "feed-cli" = dontDistribute super."feed-cli";
   "feed-collect" = dontDistribute super."feed-collect";
   "feed-crawl" = dontDistribute super."feed-crawl";
@@ -3817,6 +3820,7 @@ self: super: {
   "herbalizer" = dontDistribute super."herbalizer";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -4376,6 +4380,9 @@ self: super: {
   "iban" = dontDistribute super."iban";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
+  "ide-backend" = doDistribute super."ide-backend_0_10_0";
+  "ide-backend-common" = doDistribute super."ide-backend-common_0_10_1_1";
+  "ide-backend-server" = doDistribute super."ide-backend-server_0_10_0";
   "ideas" = dontDistribute super."ideas";
   "ideas-math" = dontDistribute super."ideas-math";
   "idempotent" = dontDistribute super."idempotent";
@@ -4481,6 +4488,7 @@ self: super: {
   "io-reactive" = dontDistribute super."io-reactive";
   "io-region" = dontDistribute super."io-region";
   "io-storage" = dontDistribute super."io-storage";
+  "io-streams" = doDistribute super."io-streams_1_3_3_1";
   "io-streams-http" = dontDistribute super."io-streams-http";
   "io-throttle" = dontDistribute super."io-throttle";
   "ioctl" = dontDistribute super."ioctl";
@@ -5363,6 +5371,7 @@ self: super: {
   "nanomsg" = dontDistribute super."nanomsg";
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = doDistribute super."nationstates_0_2_0_3";
@@ -5515,6 +5524,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -6203,6 +6213,7 @@ self: super: {
   "reddit" = dontDistribute super."reddit";
   "redis" = dontDistribute super."redis";
   "redis-hs" = dontDistribute super."redis-hs";
+  "redis-io" = doDistribute super."redis-io_0_5_1";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
@@ -6623,6 +6634,7 @@ self: super: {
   "shake-extras" = dontDistribute super."shake-extras";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
@@ -7168,6 +7180,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template-default" = dontDistribute super."template-default";
   "template-haskell-util" = dontDistribute super."template-haskell-util";
@@ -8005,6 +8019,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8122,6 +8137,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
index 8854ad248395..642160eba469 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
@@ -2189,6 +2189,7 @@ self: super: {
   "cpuperf" = dontDistribute super."cpuperf";
   "cpython" = dontDistribute super."cpython";
   "cql" = doDistribute super."cql_3_0_5";
+  "cql-io" = doDistribute super."cql-io_0_14_5";
   "cqrs" = dontDistribute super."cqrs";
   "cqrs-core" = dontDistribute super."cqrs-core";
   "cqrs-example" = dontDistribute super."cqrs-example";
@@ -3915,6 +3916,7 @@ self: super: {
   "herbalizer" = dontDistribute super."herbalizer";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -4489,7 +4491,9 @@ self: super: {
   "iban" = dontDistribute super."iban";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
+  "ide-backend" = doDistribute super."ide-backend_0_10_0";
   "ide-backend-common" = doDistribute super."ide-backend-common_0_10_0";
+  "ide-backend-server" = doDistribute super."ide-backend-server_0_10_0";
   "ideas" = dontDistribute super."ideas";
   "ideas-math" = dontDistribute super."ideas-math";
   "idempotent" = dontDistribute super."idempotent";
@@ -5504,6 +5508,7 @@ self: super: {
   "nanomsg" = dontDistribute super."nanomsg";
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = doDistribute super."nationstates_0_2_0_0";
@@ -5659,6 +5664,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -6378,6 +6384,7 @@ self: super: {
   "reddit" = dontDistribute super."reddit";
   "redis" = dontDistribute super."redis";
   "redis-hs" = dontDistribute super."redis-hs";
+  "redis-io" = doDistribute super."redis-io_0_5_1";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
@@ -6807,6 +6814,7 @@ self: super: {
   "shake-language-c" = doDistribute super."shake-language-c_0_8_0";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_5";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7370,6 +7378,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template-default" = dontDistribute super."template-default";
   "template-haskell-util" = dontDistribute super."template-haskell-util";
@@ -8237,6 +8247,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8363,6 +8374,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.20.nix b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
index b1254506c85b..235f301fc191 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
@@ -1434,6 +1434,7 @@ self: super: {
   "base-generics" = dontDistribute super."base-generics";
   "base-io-access" = dontDistribute super."base-io-access";
   "base-noprelude" = dontDistribute super."base-noprelude";
+  "base-prelude" = doDistribute super."base-prelude_0_1_20";
   "base32-bytestring" = dontDistribute super."base32-bytestring";
   "base58-bytestring" = dontDistribute super."base58-bytestring";
   "base58address" = dontDistribute super."base58address";
@@ -2131,6 +2132,7 @@ self: super: {
   "cpuid" = dontDistribute super."cpuid";
   "cpuperf" = dontDistribute super."cpuperf";
   "cpython" = dontDistribute super."cpython";
+  "cql-io" = doDistribute super."cql-io_0_14_5";
   "cqrs" = dontDistribute super."cqrs";
   "cqrs-core" = dontDistribute super."cqrs-core";
   "cqrs-example" = dontDistribute super."cqrs-example";
@@ -2811,6 +2813,7 @@ self: super: {
   "fdo-trash" = dontDistribute super."fdo-trash";
   "fec" = dontDistribute super."fec";
   "fedora-packages" = dontDistribute super."fedora-packages";
+  "feed" = doDistribute super."feed_0_3_10_3";
   "feed-cli" = dontDistribute super."feed-cli";
   "feed-collect" = dontDistribute super."feed-collect";
   "feed-crawl" = dontDistribute super."feed-crawl";
@@ -3812,6 +3815,7 @@ self: super: {
   "herbalizer" = dontDistribute super."herbalizer";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -4370,6 +4374,9 @@ self: super: {
   "iban" = dontDistribute super."iban";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
+  "ide-backend" = doDistribute super."ide-backend_0_10_0";
+  "ide-backend-common" = doDistribute super."ide-backend-common_0_10_1_1";
+  "ide-backend-server" = doDistribute super."ide-backend-server_0_10_0";
   "ideas" = dontDistribute super."ideas";
   "ideas-math" = dontDistribute super."ideas-math";
   "idempotent" = dontDistribute super."idempotent";
@@ -4475,6 +4482,7 @@ self: super: {
   "io-reactive" = dontDistribute super."io-reactive";
   "io-region" = dontDistribute super."io-region";
   "io-storage" = dontDistribute super."io-storage";
+  "io-streams" = doDistribute super."io-streams_1_3_3_1";
   "io-streams-http" = dontDistribute super."io-streams-http";
   "io-throttle" = dontDistribute super."io-throttle";
   "ioctl" = dontDistribute super."ioctl";
@@ -5356,6 +5364,7 @@ self: super: {
   "nanomsg" = dontDistribute super."nanomsg";
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = doDistribute super."nationstates_0_2_0_3";
@@ -5508,6 +5517,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -6195,6 +6205,7 @@ self: super: {
   "reddit" = dontDistribute super."reddit";
   "redis" = dontDistribute super."redis";
   "redis-hs" = dontDistribute super."redis-hs";
+  "redis-io" = doDistribute super."redis-io_0_5_1";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
@@ -6614,6 +6625,7 @@ self: super: {
   "shake-extras" = dontDistribute super."shake-extras";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
@@ -7157,6 +7169,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template-default" = dontDistribute super."template-default";
   "template-haskell-util" = dontDistribute super."template-haskell-util";
@@ -7991,6 +8005,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8108,6 +8123,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.21.nix b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
new file mode 100644
index 000000000000..26b4ec38f29b
--- /dev/null
+++ b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
@@ -0,0 +1,8120 @@
+{ pkgs }:
+
+with import ./lib.nix { inherit pkgs; };
+
+self: super: {
+
+  # core libraries provided by the compiler
+  Cabal = null;
+  array = null;
+  base = null;
+  bin-package-db = null;
+  binary = null;
+  bytestring = null;
+  containers = null;
+  deepseq = null;
+  directory = null;
+  filepath = null;
+  ghc-prim = null;
+  hoopl = null;
+  hpc = null;
+  integer-gmp = null;
+  pretty = null;
+  process = null;
+  rts = null;
+  template-haskell = null;
+  time = null;
+  transformers = null;
+  unix = null;
+
+  # lts-3.21 packages
+  "3d-graphics-examples" = dontDistribute super."3d-graphics-examples";
+  "3dmodels" = dontDistribute super."3dmodels";
+  "4Blocks" = dontDistribute super."4Blocks";
+  "AAI" = dontDistribute super."AAI";
+  "ABList" = dontDistribute super."ABList";
+  "AC-Angle" = dontDistribute super."AC-Angle";
+  "AC-Boolean" = dontDistribute super."AC-Boolean";
+  "AC-BuildPlatform" = dontDistribute super."AC-BuildPlatform";
+  "AC-Colour" = dontDistribute super."AC-Colour";
+  "AC-EasyRaster-GTK" = dontDistribute super."AC-EasyRaster-GTK";
+  "AC-HalfInteger" = dontDistribute super."AC-HalfInteger";
+  "AC-MiniTest" = dontDistribute super."AC-MiniTest";
+  "AC-PPM" = dontDistribute super."AC-PPM";
+  "AC-Random" = dontDistribute super."AC-Random";
+  "AC-Terminal" = dontDistribute super."AC-Terminal";
+  "AC-VanillaArray" = dontDistribute super."AC-VanillaArray";
+  "AC-Vector-Fancy" = dontDistribute super."AC-Vector-Fancy";
+  "ACME" = dontDistribute super."ACME";
+  "ADPfusion" = dontDistribute super."ADPfusion";
+  "AERN-Basics" = dontDistribute super."AERN-Basics";
+  "AERN-Net" = dontDistribute super."AERN-Net";
+  "AERN-Real" = dontDistribute super."AERN-Real";
+  "AERN-Real-Double" = dontDistribute super."AERN-Real-Double";
+  "AERN-Real-Interval" = dontDistribute super."AERN-Real-Interval";
+  "AERN-RnToRm" = dontDistribute super."AERN-RnToRm";
+  "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot";
+  "AES" = dontDistribute super."AES";
+  "AGI" = dontDistribute super."AGI";
+  "ALUT" = dontDistribute super."ALUT";
+  "AMI" = dontDistribute super."AMI";
+  "ANum" = dontDistribute super."ANum";
+  "ASN1" = dontDistribute super."ASN1";
+  "AVar" = dontDistribute super."AVar";
+  "AWin32Console" = dontDistribute super."AWin32Console";
+  "AbortT-monadstf" = dontDistribute super."AbortT-monadstf";
+  "AbortT-mtl" = dontDistribute super."AbortT-mtl";
+  "AbortT-transformers" = dontDistribute super."AbortT-transformers";
+  "ActionKid" = dontDistribute super."ActionKid";
+  "Adaptive" = dontDistribute super."Adaptive";
+  "Adaptive-Blaisorblade" = dontDistribute super."Adaptive-Blaisorblade";
+  "Advgame" = dontDistribute super."Advgame";
+  "AesonBson" = dontDistribute super."AesonBson";
+  "Agata" = dontDistribute super."Agata";
+  "Agda-executable" = dontDistribute super."Agda-executable";
+  "AhoCorasick" = dontDistribute super."AhoCorasick";
+  "AlgorithmW" = dontDistribute super."AlgorithmW";
+  "AlignmentAlgorithms" = dontDistribute super."AlignmentAlgorithms";
+  "Allure" = dontDistribute super."Allure";
+  "AndroidViewHierarchyImporter" = dontDistribute super."AndroidViewHierarchyImporter";
+  "Animas" = dontDistribute super."Animas";
+  "Annotations" = dontDistribute super."Annotations";
+  "Ansi2Html" = dontDistribute super."Ansi2Html";
+  "ApplePush" = dontDistribute super."ApplePush";
+  "AppleScript" = dontDistribute super."AppleScript";
+  "ApproxFun-hs" = dontDistribute super."ApproxFun-hs";
+  "ArrayRef" = dontDistribute super."ArrayRef";
+  "ArrowVHDL" = dontDistribute super."ArrowVHDL";
+  "AspectAG" = dontDistribute super."AspectAG";
+  "AttoBencode" = dontDistribute super."AttoBencode";
+  "AttoJson" = dontDistribute super."AttoJson";
+  "Attrac" = dontDistribute super."Attrac";
+  "Aurochs" = dontDistribute super."Aurochs";
+  "AutoForms" = dontDistribute super."AutoForms";
+  "AvlTree" = dontDistribute super."AvlTree";
+  "BASIC" = dontDistribute super."BASIC";
+  "BCMtools" = dontDistribute super."BCMtools";
+  "BNFC" = dontDistribute super."BNFC";
+  "BNFC-meta" = dontDistribute super."BNFC-meta";
+  "Baggins" = dontDistribute super."Baggins";
+  "Bang" = dontDistribute super."Bang";
+  "Barracuda" = dontDistribute super."Barracuda";
+  "Befunge93" = dontDistribute super."Befunge93";
+  "BenchmarkHistory" = dontDistribute super."BenchmarkHistory";
+  "BerkeleyDB" = dontDistribute super."BerkeleyDB";
+  "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML";
+  "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm";
+  "BigPixel" = dontDistribute super."BigPixel";
+  "Binpack" = dontDistribute super."Binpack";
+  "Biobase" = dontDistribute super."Biobase";
+  "BiobaseBlast" = dontDistribute super."BiobaseBlast";
+  "BiobaseDotP" = dontDistribute super."BiobaseDotP";
+  "BiobaseFR3D" = dontDistribute super."BiobaseFR3D";
+  "BiobaseFasta" = dontDistribute super."BiobaseFasta";
+  "BiobaseInfernal" = dontDistribute super."BiobaseInfernal";
+  "BiobaseMAF" = dontDistribute super."BiobaseMAF";
+  "BiobaseTrainingData" = dontDistribute super."BiobaseTrainingData";
+  "BiobaseTurner" = dontDistribute super."BiobaseTurner";
+  "BiobaseTypes" = dontDistribute super."BiobaseTypes";
+  "BiobaseVienna" = dontDistribute super."BiobaseVienna";
+  "BiobaseXNA" = dontDistribute super."BiobaseXNA";
+  "BirdPP" = dontDistribute super."BirdPP";
+  "BitSyntax" = dontDistribute super."BitSyntax";
+  "Bitly" = dontDistribute super."Bitly";
+  "Blobs" = dontDistribute super."Blobs";
+  "BluePrintCSS" = dontDistribute super."BluePrintCSS";
+  "Blueprint" = dontDistribute super."Blueprint";
+  "Bookshelf" = dontDistribute super."Bookshelf";
+  "Bravo" = dontDistribute super."Bravo";
+  "BufferedSocket" = dontDistribute super."BufferedSocket";
+  "Buster" = dontDistribute super."Buster";
+  "CBOR" = dontDistribute super."CBOR";
+  "CC-delcont" = dontDistribute super."CC-delcont";
+  "CC-delcont-alt" = dontDistribute super."CC-delcont-alt";
+  "CC-delcont-cxe" = dontDistribute super."CC-delcont-cxe";
+  "CC-delcont-exc" = dontDistribute super."CC-delcont-exc";
+  "CC-delcont-ref" = dontDistribute super."CC-delcont-ref";
+  "CC-delcont-ref-tf" = dontDistribute super."CC-delcont-ref-tf";
+  "CCA" = dontDistribute super."CCA";
+  "CHXHtml" = dontDistribute super."CHXHtml";
+  "CLASE" = dontDistribute super."CLASE";
+  "CLI" = dontDistribute super."CLI";
+  "CMCompare" = dontDistribute super."CMCompare";
+  "CMQ" = dontDistribute super."CMQ";
+  "COrdering" = dontDistribute super."COrdering";
+  "CPBrainfuck" = dontDistribute super."CPBrainfuck";
+  "CPL" = dontDistribute super."CPL";
+  "CSPM-CoreLanguage" = dontDistribute super."CSPM-CoreLanguage";
+  "CSPM-FiringRules" = dontDistribute super."CSPM-FiringRules";
+  "CSPM-Frontend" = dontDistribute super."CSPM-Frontend";
+  "CSPM-Interpreter" = dontDistribute super."CSPM-Interpreter";
+  "CSPM-ToProlog" = dontDistribute super."CSPM-ToProlog";
+  "CSPM-cspm" = dontDistribute super."CSPM-cspm";
+  "CTRex" = dontDistribute super."CTRex";
+  "CV" = dontDistribute super."CV";
+  "CabalSearch" = dontDistribute super."CabalSearch";
+  "Capabilities" = dontDistribute super."Capabilities";
+  "Cardinality" = dontDistribute super."Cardinality";
+  "CarneadesDSL" = dontDistribute super."CarneadesDSL";
+  "CarneadesIntoDung" = dontDistribute super."CarneadesIntoDung";
+  "Cartesian" = dontDistribute super."Cartesian";
+  "Cascade" = dontDistribute super."Cascade";
+  "Catana" = dontDistribute super."Catana";
+  "Chart-gtk" = dontDistribute super."Chart-gtk";
+  "Chart-simple" = dontDistribute super."Chart-simple";
+  "CheatSheet" = dontDistribute super."CheatSheet";
+  "Checked" = dontDistribute super."Checked";
+  "Chitra" = dontDistribute super."Chitra";
+  "ChristmasTree" = dontDistribute super."ChristmasTree";
+  "CirruParser" = dontDistribute super."CirruParser";
+  "ClassLaws" = dontDistribute super."ClassLaws";
+  "ClassyPrelude" = dontDistribute super."ClassyPrelude";
+  "Clean" = dontDistribute super."Clean";
+  "Clipboard" = dontDistribute super."Clipboard";
+  "ClustalParser" = dontDistribute super."ClustalParser";
+  "Coadjute" = dontDistribute super."Coadjute";
+  "Codec-Compression-LZF" = dontDistribute super."Codec-Compression-LZF";
+  "Codec-Image-DevIL" = dontDistribute super."Codec-Image-DevIL";
+  "Combinatorrent" = dontDistribute super."Combinatorrent";
+  "Command" = dontDistribute super."Command";
+  "Commando" = dontDistribute super."Commando";
+  "ComonadSheet" = dontDistribute super."ComonadSheet";
+  "ConcurrentUtils" = dontDistribute super."ConcurrentUtils";
+  "Concurrential" = dontDistribute super."Concurrential";
+  "Condor" = dontDistribute super."Condor";
+  "ConfigFileTH" = dontDistribute super."ConfigFileTH";
+  "Configger" = dontDistribute super."Configger";
+  "Configurable" = dontDistribute super."Configurable";
+  "ConsStream" = dontDistribute super."ConsStream";
+  "Conscript" = dontDistribute super."Conscript";
+  "ConstraintKinds" = dontDistribute super."ConstraintKinds";
+  "Consumer" = dontDistribute super."Consumer";
+  "ContArrow" = dontDistribute super."ContArrow";
+  "ContextAlgebra" = dontDistribute super."ContextAlgebra";
+  "Contract" = dontDistribute super."Contract";
+  "Control-Engine" = dontDistribute super."Control-Engine";
+  "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass";
+  "Control-Monad-ST2" = dontDistribute super."Control-Monad-ST2";
+  "CoreDump" = dontDistribute super."CoreDump";
+  "CoreErlang" = dontDistribute super."CoreErlang";
+  "CoreFoundation" = dontDistribute super."CoreFoundation";
+  "Coroutine" = dontDistribute super."Coroutine";
+  "CouchDB" = dontDistribute super."CouchDB";
+  "Craft3e" = dontDistribute super."Craft3e";
+  "Crypto" = dontDistribute super."Crypto";
+  "CurryDB" = dontDistribute super."CurryDB";
+  "DAG-Tournament" = dontDistribute super."DAG-Tournament";
+  "DAV" = doDistribute super."DAV_1_0_7";
+  "DBlimited" = dontDistribute super."DBlimited";
+  "DBus" = dontDistribute super."DBus";
+  "DCFL" = dontDistribute super."DCFL";
+  "DMuCheck" = dontDistribute super."DMuCheck";
+  "DOM" = dontDistribute super."DOM";
+  "DP" = dontDistribute super."DP";
+  "DPM" = dontDistribute super."DPM";
+  "DSA" = dontDistribute super."DSA";
+  "DSH" = dontDistribute super."DSH";
+  "DSTM" = dontDistribute super."DSTM";
+  "DTC" = dontDistribute super."DTC";
+  "Dangerous" = dontDistribute super."Dangerous";
+  "Dao" = dontDistribute super."Dao";
+  "DarcsHelpers" = dontDistribute super."DarcsHelpers";
+  "Data-Hash-Consistent" = dontDistribute super."Data-Hash-Consistent";
+  "Data-Rope" = dontDistribute super."Data-Rope";
+  "DataTreeView" = dontDistribute super."DataTreeView";
+  "Deadpan-DDP" = dontDistribute super."Deadpan-DDP";
+  "DebugTraceHelpers" = dontDistribute super."DebugTraceHelpers";
+  "DecisionTree" = dontDistribute super."DecisionTree";
+  "DeepArrow" = dontDistribute super."DeepArrow";
+  "DefendTheKing" = dontDistribute super."DefendTheKing";
+  "DescriptiveKeys" = dontDistribute super."DescriptiveKeys";
+  "Dflow" = dontDistribute super."Dflow";
+  "DifferenceLogic" = dontDistribute super."DifferenceLogic";
+  "DifferentialEvolution" = dontDistribute super."DifferentialEvolution";
+  "Digit" = dontDistribute super."Digit";
+  "DigitalOcean" = dontDistribute super."DigitalOcean";
+  "DimensionalHash" = dontDistribute super."DimensionalHash";
+  "DirectSound" = dontDistribute super."DirectSound";
+  "DisTract" = dontDistribute super."DisTract";
+  "DiscussionSupportSystem" = dontDistribute super."DiscussionSupportSystem";
+  "Dish" = dontDistribute super."Dish";
+  "Dist" = dontDistribute super."Dist";
+  "DistanceTransform" = dontDistribute super."DistanceTransform";
+  "DistanceUnits" = dontDistribute super."DistanceUnits";
+  "DnaProteinAlignment" = dontDistribute super."DnaProteinAlignment";
+  "DocTest" = dontDistribute super."DocTest";
+  "Docs" = dontDistribute super."Docs";
+  "DrHylo" = dontDistribute super."DrHylo";
+  "DrIFT" = dontDistribute super."DrIFT";
+  "DrIFT-cabalized" = dontDistribute super."DrIFT-cabalized";
+  "Dung" = dontDistribute super."Dung";
+  "Dust" = dontDistribute super."Dust";
+  "Dust-crypto" = dontDistribute super."Dust-crypto";
+  "Dust-tools" = dontDistribute super."Dust-tools";
+  "Dust-tools-pcap" = dontDistribute super."Dust-tools-pcap";
+  "DynamicTimeWarp" = dontDistribute super."DynamicTimeWarp";
+  "DysFRP" = dontDistribute super."DysFRP";
+  "DysFRP-Cairo" = dontDistribute super."DysFRP-Cairo";
+  "DysFRP-Craftwerk" = dontDistribute super."DysFRP-Craftwerk";
+  "EEConfig" = dontDistribute super."EEConfig";
+  "Earley" = doDistribute super."Earley_0_9_0";
+  "Ebnf2ps" = dontDistribute super."Ebnf2ps";
+  "EdisonAPI" = dontDistribute super."EdisonAPI";
+  "EdisonCore" = dontDistribute super."EdisonCore";
+  "EditTimeReport" = dontDistribute super."EditTimeReport";
+  "EitherT" = dontDistribute super."EitherT";
+  "Elm" = dontDistribute super."Elm";
+  "Emping" = dontDistribute super."Emping";
+  "Encode" = dontDistribute super."Encode";
+  "EntrezHTTP" = dontDistribute super."EntrezHTTP";
+  "EnumContainers" = dontDistribute super."EnumContainers";
+  "EnumMap" = dontDistribute super."EnumMap";
+  "Eq" = dontDistribute super."Eq";
+  "EqualitySolver" = dontDistribute super."EqualitySolver";
+  "EsounD" = dontDistribute super."EsounD";
+  "EstProgress" = dontDistribute super."EstProgress";
+  "EtaMOO" = dontDistribute super."EtaMOO";
+  "Etage" = dontDistribute super."Etage";
+  "Etage-Graph" = dontDistribute super."Etage-Graph";
+  "Eternal10Seconds" = dontDistribute super."Eternal10Seconds";
+  "Etherbunny" = dontDistribute super."Etherbunny";
+  "EuroIT" = dontDistribute super."EuroIT";
+  "Euterpea" = dontDistribute super."Euterpea";
+  "EventSocket" = dontDistribute super."EventSocket";
+  "Extra" = dontDistribute super."Extra";
+  "FComp" = dontDistribute super."FComp";
+  "FM-SBLEX" = dontDistribute super."FM-SBLEX";
+  "FModExRaw" = dontDistribute super."FModExRaw";
+  "FPretty" = dontDistribute super."FPretty";
+  "FTGL" = dontDistribute super."FTGL";
+  "FTGL-bytestring" = dontDistribute super."FTGL-bytestring";
+  "FTPLine" = dontDistribute super."FTPLine";
+  "Facts" = dontDistribute super."Facts";
+  "FailureT" = dontDistribute super."FailureT";
+  "FastxPipe" = dontDistribute super."FastxPipe";
+  "FermatsLastMargin" = dontDistribute super."FermatsLastMargin";
+  "FerryCore" = dontDistribute super."FerryCore";
+  "Feval" = dontDistribute super."Feval";
+  "FieldTrip" = dontDistribute super."FieldTrip";
+  "FileManip" = dontDistribute super."FileManip";
+  "FileManipCompat" = dontDistribute super."FileManipCompat";
+  "FilePather" = dontDistribute super."FilePather";
+  "FileSystem" = dontDistribute super."FileSystem";
+  "Finance-Quote-Yahoo" = dontDistribute super."Finance-Quote-Yahoo";
+  "Finance-Treasury" = dontDistribute super."Finance-Treasury";
+  "FindBin" = dontDistribute super."FindBin";
+  "FiniteMap" = dontDistribute super."FiniteMap";
+  "FirstOrderTheory" = dontDistribute super."FirstOrderTheory";
+  "FixedPoint-simple" = dontDistribute super."FixedPoint-simple";
+  "Flippi" = dontDistribute super."Flippi";
+  "Focus" = dontDistribute super."Focus";
+  "Folly" = dontDistribute super."Folly";
+  "ForSyDe" = dontDistribute super."ForSyDe";
+  "ForkableT" = dontDistribute super."ForkableT";
+  "FormalGrammars" = dontDistribute super."FormalGrammars";
+  "Foster" = dontDistribute super."Foster";
+  "FpMLv53" = dontDistribute super."FpMLv53";
+  "FractalArt" = dontDistribute super."FractalArt";
+  "Fractaler" = dontDistribute super."Fractaler";
+  "Frames" = dontDistribute super."Frames";
+  "Frank" = dontDistribute super."Frank";
+  "FreeTypeGL" = dontDistribute super."FreeTypeGL";
+  "FunGEn" = dontDistribute super."FunGEn";
+  "Fungi" = dontDistribute super."Fungi";
+  "GA" = dontDistribute super."GA";
+  "GGg" = dontDistribute super."GGg";
+  "GHood" = dontDistribute super."GHood";
+  "GLFW" = dontDistribute super."GLFW";
+  "GLFW-OGL" = dontDistribute super."GLFW-OGL";
+  "GLFW-b" = dontDistribute super."GLFW-b";
+  "GLFW-b-demo" = dontDistribute super."GLFW-b-demo";
+  "GLFW-task" = dontDistribute super."GLFW-task";
+  "GLHUI" = dontDistribute super."GLHUI";
+  "GLM" = dontDistribute super."GLM";
+  "GLMatrix" = dontDistribute super."GLMatrix";
+  "GLURaw" = dontDistribute super."GLURaw";
+  "GLUT" = dontDistribute super."GLUT";
+  "GLUtil" = dontDistribute super."GLUtil";
+  "GPX" = dontDistribute super."GPX";
+  "GPipe" = dontDistribute super."GPipe";
+  "GPipe-Collada" = dontDistribute super."GPipe-Collada";
+  "GPipe-Examples" = dontDistribute super."GPipe-Examples";
+  "GPipe-GLFW" = dontDistribute super."GPipe-GLFW";
+  "GPipe-TextureLoad" = dontDistribute super."GPipe-TextureLoad";
+  "GTALib" = dontDistribute super."GTALib";
+  "Gamgine" = dontDistribute super."Gamgine";
+  "Ganymede" = dontDistribute super."Ganymede";
+  "GaussQuadIntegration" = dontDistribute super."GaussQuadIntegration";
+  "GeBoP" = dontDistribute super."GeBoP";
+  "GenI" = dontDistribute super."GenI";
+  "GenSmsPdu" = dontDistribute super."GenSmsPdu";
+  "Genbank" = dontDistribute super."Genbank";
+  "GeneralTicTacToe" = dontDistribute super."GeneralTicTacToe";
+  "GenussFold" = dontDistribute super."GenussFold";
+  "GeoIp" = dontDistribute super."GeoIp";
+  "GeocoderOpenCage" = dontDistribute super."GeocoderOpenCage";
+  "Geodetic" = dontDistribute super."Geodetic";
+  "GeomPredicates" = dontDistribute super."GeomPredicates";
+  "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE";
+  "GiST" = dontDistribute super."GiST";
+  "GiveYouAHead" = dontDistribute super."GiveYouAHead";
+  "GlomeTrace" = dontDistribute super."GlomeTrace";
+  "GlomeVec" = dontDistribute super."GlomeVec";
+  "GlomeView" = dontDistribute super."GlomeView";
+  "GoogleChart" = dontDistribute super."GoogleChart";
+  "GoogleDirections" = dontDistribute super."GoogleDirections";
+  "GoogleSB" = dontDistribute super."GoogleSB";
+  "GoogleSuggest" = dontDistribute super."GoogleSuggest";
+  "GoogleTranslate" = dontDistribute super."GoogleTranslate";
+  "GotoT-transformers" = dontDistribute super."GotoT-transformers";
+  "GrammarProducts" = dontDistribute super."GrammarProducts";
+  "Graph500" = dontDistribute super."Graph500";
+  "GraphHammer" = dontDistribute super."GraphHammer";
+  "GraphHammer-examples" = dontDistribute super."GraphHammer-examples";
+  "Graphalyze" = dontDistribute super."Graphalyze";
+  "Grempa" = dontDistribute super."Grempa";
+  "GroteTrap" = dontDistribute super."GroteTrap";
+  "Grow" = dontDistribute super."Grow";
+  "GrowlNotify" = dontDistribute super."GrowlNotify";
+  "Gtk2hsGenerics" = dontDistribute super."Gtk2hsGenerics";
+  "GtkGLTV" = dontDistribute super."GtkGLTV";
+  "GtkTV" = dontDistribute super."GtkTV";
+  "GuiHaskell" = dontDistribute super."GuiHaskell";
+  "GuiTV" = dontDistribute super."GuiTV";
+  "H" = dontDistribute super."H";
+  "HARM" = dontDistribute super."HARM";
+  "HAppS-Data" = dontDistribute super."HAppS-Data";
+  "HAppS-IxSet" = dontDistribute super."HAppS-IxSet";
+  "HAppS-Server" = dontDistribute super."HAppS-Server";
+  "HAppS-State" = dontDistribute super."HAppS-State";
+  "HAppS-Util" = dontDistribute super."HAppS-Util";
+  "HAppSHelpers" = dontDistribute super."HAppSHelpers";
+  "HCL" = dontDistribute super."HCL";
+  "HCard" = dontDistribute super."HCard";
+  "HDBC" = dontDistribute super."HDBC";
+  "HDBC-mysql" = dontDistribute super."HDBC-mysql";
+  "HDBC-odbc" = dontDistribute super."HDBC-odbc";
+  "HDBC-postgresql" = dontDistribute super."HDBC-postgresql";
+  "HDBC-postgresql-hstore" = dontDistribute super."HDBC-postgresql-hstore";
+  "HDBC-session" = dontDistribute super."HDBC-session";
+  "HDBC-sqlite3" = dontDistribute super."HDBC-sqlite3";
+  "HDRUtils" = dontDistribute super."HDRUtils";
+  "HERA" = dontDistribute super."HERA";
+  "HFrequencyQueue" = dontDistribute super."HFrequencyQueue";
+  "HFuse" = dontDistribute super."HFuse";
+  "HGL" = dontDistribute super."HGL";
+  "HGamer3D" = dontDistribute super."HGamer3D";
+  "HGamer3D-API" = dontDistribute super."HGamer3D-API";
+  "HGamer3D-Audio" = dontDistribute super."HGamer3D-Audio";
+  "HGamer3D-Bullet-Binding" = dontDistribute super."HGamer3D-Bullet-Binding";
+  "HGamer3D-CAudio-Binding" = dontDistribute super."HGamer3D-CAudio-Binding";
+  "HGamer3D-CEGUI-Binding" = dontDistribute super."HGamer3D-CEGUI-Binding";
+  "HGamer3D-Common" = dontDistribute super."HGamer3D-Common";
+  "HGamer3D-Data" = dontDistribute super."HGamer3D-Data";
+  "HGamer3D-Enet-Binding" = dontDistribute super."HGamer3D-Enet-Binding";
+  "HGamer3D-GUI" = dontDistribute super."HGamer3D-GUI";
+  "HGamer3D-Graphics3D" = dontDistribute super."HGamer3D-Graphics3D";
+  "HGamer3D-InputSystem" = dontDistribute super."HGamer3D-InputSystem";
+  "HGamer3D-Network" = dontDistribute super."HGamer3D-Network";
+  "HGamer3D-OIS-Binding" = dontDistribute super."HGamer3D-OIS-Binding";
+  "HGamer3D-Ogre-Binding" = dontDistribute super."HGamer3D-Ogre-Binding";
+  "HGamer3D-SDL2-Binding" = dontDistribute super."HGamer3D-SDL2-Binding";
+  "HGamer3D-SFML-Binding" = dontDistribute super."HGamer3D-SFML-Binding";
+  "HGamer3D-WinEvent" = dontDistribute super."HGamer3D-WinEvent";
+  "HGamer3D-Wire" = dontDistribute super."HGamer3D-Wire";
+  "HGraphStorage" = dontDistribute super."HGraphStorage";
+  "HHDL" = dontDistribute super."HHDL";
+  "HJScript" = dontDistribute super."HJScript";
+  "HJVM" = dontDistribute super."HJVM";
+  "HJavaScript" = dontDistribute super."HJavaScript";
+  "HLearn-algebra" = dontDistribute super."HLearn-algebra";
+  "HLearn-approximation" = dontDistribute super."HLearn-approximation";
+  "HLearn-classification" = dontDistribute super."HLearn-classification";
+  "HLearn-datastructures" = dontDistribute super."HLearn-datastructures";
+  "HLearn-distributions" = dontDistribute super."HLearn-distributions";
+  "HListPP" = dontDistribute super."HListPP";
+  "HLogger" = dontDistribute super."HLogger";
+  "HMM" = dontDistribute super."HMM";
+  "HMap" = dontDistribute super."HMap";
+  "HNM" = dontDistribute super."HNM";
+  "HODE" = dontDistribute super."HODE";
+  "HOpenCV" = dontDistribute super."HOpenCV";
+  "HPDF" = dontDistribute super."HPDF";
+  "HPath" = dontDistribute super."HPath";
+  "HPi" = dontDistribute super."HPi";
+  "HPlot" = dontDistribute super."HPlot";
+  "HPong" = dontDistribute super."HPong";
+  "HROOT" = dontDistribute super."HROOT";
+  "HROOT-core" = dontDistribute super."HROOT-core";
+  "HROOT-graf" = dontDistribute super."HROOT-graf";
+  "HROOT-hist" = dontDistribute super."HROOT-hist";
+  "HROOT-io" = dontDistribute super."HROOT-io";
+  "HROOT-math" = dontDistribute super."HROOT-math";
+  "HRay" = dontDistribute super."HRay";
+  "HSFFIG" = dontDistribute super."HSFFIG";
+  "HSGEP" = dontDistribute super."HSGEP";
+  "HSH" = dontDistribute super."HSH";
+  "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSlippyMap" = dontDistribute super."HSlippyMap";
+  "HSmarty" = dontDistribute super."HSmarty";
+  "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
+  "HSvm" = dontDistribute super."HSvm";
+  "HTTP-Simple" = dontDistribute super."HTTP-Simple";
+  "HTab" = dontDistribute super."HTab";
+  "HTicTacToe" = dontDistribute super."HTicTacToe";
+  "HUnit" = doDistribute super."HUnit_1_2_5_2";
+  "HUnit-Diff" = dontDistribute super."HUnit-Diff";
+  "HUnit-Plus" = dontDistribute super."HUnit-Plus";
+  "HUnit-approx" = dontDistribute super."HUnit-approx";
+  "HXMPP" = dontDistribute super."HXMPP";
+  "HXQ" = dontDistribute super."HXQ";
+  "HaLeX" = dontDistribute super."HaLeX";
+  "HaMinitel" = dontDistribute super."HaMinitel";
+  "HaPy" = dontDistribute super."HaPy";
+  "HaRe" = dontDistribute super."HaRe";
+  "HaTeX-meta" = dontDistribute super."HaTeX-meta";
+  "HaTeX-qq" = dontDistribute super."HaTeX-qq";
+  "HaVSA" = dontDistribute super."HaVSA";
+  "Hach" = dontDistribute super."Hach";
+  "HackMail" = dontDistribute super."HackMail";
+  "Haggressive" = dontDistribute super."Haggressive";
+  "HandlerSocketClient" = dontDistribute super."HandlerSocketClient";
+  "Hangman" = dontDistribute super."Hangman";
+  "HarmTrace" = dontDistribute super."HarmTrace";
+  "HarmTrace-Base" = dontDistribute super."HarmTrace-Base";
+  "HasGP" = dontDistribute super."HasGP";
+  "Haschoo" = dontDistribute super."Haschoo";
+  "Hashell" = dontDistribute super."Hashell";
+  "HaskRel" = dontDistribute super."HaskRel";
+  "HaskellForMaths" = dontDistribute super."HaskellForMaths";
+  "HaskellLM" = dontDistribute super."HaskellLM";
+  "HaskellNN" = dontDistribute super."HaskellNN";
+  "HaskellNet" = doDistribute super."HaskellNet_0_4_5";
+  "HaskellNet-SSL" = dontDistribute super."HaskellNet-SSL";
+  "HaskellTorrent" = dontDistribute super."HaskellTorrent";
+  "HaskellTutorials" = dontDistribute super."HaskellTutorials";
+  "Haskelloids" = dontDistribute super."Haskelloids";
+  "Hate" = dontDistribute super."Hate";
+  "Hawk" = dontDistribute super."Hawk";
+  "Hayoo" = dontDistribute super."Hayoo";
+  "Hclip" = dontDistribute super."Hclip";
+  "Hedi" = dontDistribute super."Hedi";
+  "HerbiePlugin" = dontDistribute super."HerbiePlugin";
+  "Hermes" = dontDistribute super."Hermes";
+  "Hieroglyph" = dontDistribute super."Hieroglyph";
+  "HiggsSet" = dontDistribute super."HiggsSet";
+  "Hipmunk" = dontDistribute super."Hipmunk";
+  "HipmunkPlayground" = dontDistribute super."HipmunkPlayground";
+  "Hish" = dontDistribute super."Hish";
+  "Histogram" = dontDistribute super."Histogram";
+  "Hmpf" = dontDistribute super."Hmpf";
+  "Hoed" = dontDistribute super."Hoed";
+  "HoleyMonoid" = dontDistribute super."HoleyMonoid";
+  "Holumbus-Distribution" = dontDistribute super."Holumbus-Distribution";
+  "Holumbus-MapReduce" = dontDistribute super."Holumbus-MapReduce";
+  "Holumbus-Searchengine" = dontDistribute super."Holumbus-Searchengine";
+  "Holumbus-Storage" = dontDistribute super."Holumbus-Storage";
+  "Homology" = dontDistribute super."Homology";
+  "HongoDB" = dontDistribute super."HongoDB";
+  "HostAndPort" = dontDistribute super."HostAndPort";
+  "Hricket" = dontDistribute super."Hricket";
+  "Hs2lib" = dontDistribute super."Hs2lib";
+  "HsASA" = dontDistribute super."HsASA";
+  "HsHaruPDF" = dontDistribute super."HsHaruPDF";
+  "HsHyperEstraier" = dontDistribute super."HsHyperEstraier";
+  "HsJudy" = dontDistribute super."HsJudy";
+  "HsOpenSSL-x509-system" = dontDistribute super."HsOpenSSL-x509-system";
+  "HsParrot" = dontDistribute super."HsParrot";
+  "HsPerl5" = dontDistribute super."HsPerl5";
+  "HsSVN" = dontDistribute super."HsSVN";
+  "HsSyck" = dontDistribute super."HsSyck";
+  "HsTools" = dontDistribute super."HsTools";
+  "Hsed" = dontDistribute super."Hsed";
+  "Hsmtlib" = dontDistribute super."Hsmtlib";
+  "HueAPI" = dontDistribute super."HueAPI";
+  "HulkImport" = dontDistribute super."HulkImport";
+  "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres";
+  "IDynamic" = dontDistribute super."IDynamic";
+  "IFS" = dontDistribute super."IFS";
+  "INblobs" = dontDistribute super."INblobs";
+  "IOR" = dontDistribute super."IOR";
+  "IORefCAS" = dontDistribute super."IORefCAS";
+  "IcoGrid" = dontDistribute super."IcoGrid";
+  "Imlib" = dontDistribute super."Imlib";
+  "ImperativeHaskell" = dontDistribute super."ImperativeHaskell";
+  "IndentParser" = dontDistribute super."IndentParser";
+  "IndexedList" = dontDistribute super."IndexedList";
+  "InfixApplicative" = dontDistribute super."InfixApplicative";
+  "Interpolation" = dontDistribute super."Interpolation";
+  "Interpolation-maxs" = dontDistribute super."Interpolation-maxs";
+  "IntervalMap" = dontDistribute super."IntervalMap";
+  "Irc" = dontDistribute super."Irc";
+  "IrrHaskell" = dontDistribute super."IrrHaskell";
+  "IsNull" = dontDistribute super."IsNull";
+  "JSON-Combinator" = dontDistribute super."JSON-Combinator";
+  "JSON-Combinator-Examples" = dontDistribute super."JSON-Combinator-Examples";
+  "JSONb" = dontDistribute super."JSONb";
+  "JYU-Utils" = dontDistribute super."JYU-Utils";
+  "JackMiniMix" = dontDistribute super."JackMiniMix";
+  "Javasf" = dontDistribute super."Javasf";
+  "Javav" = dontDistribute super."Javav";
+  "JsContracts" = dontDistribute super."JsContracts";
+  "JsonGrammar" = dontDistribute super."JsonGrammar";
+  "JuicyPixels-canvas" = dontDistribute super."JuicyPixels-canvas";
+  "JuicyPixels-repa" = dontDistribute super."JuicyPixels-repa";
+  "JuicyPixels-scale-dct" = dontDistribute super."JuicyPixels-scale-dct";
+  "JuicyPixels-util" = dontDistribute super."JuicyPixels-util";
+  "JunkDB" = dontDistribute super."JunkDB";
+  "JunkDB-driver-gdbm" = dontDistribute super."JunkDB-driver-gdbm";
+  "JunkDB-driver-hashtables" = dontDistribute super."JunkDB-driver-hashtables";
+  "JustParse" = dontDistribute super."JustParse";
+  "KMP" = dontDistribute super."KMP";
+  "KSP" = dontDistribute super."KSP";
+  "Kalman" = dontDistribute super."Kalman";
+  "KdTree" = dontDistribute super."KdTree";
+  "Ketchup" = dontDistribute super."Ketchup";
+  "KiCS" = dontDistribute super."KiCS";
+  "KiCS-debugger" = dontDistribute super."KiCS-debugger";
+  "KiCS-prophecy" = dontDistribute super."KiCS-prophecy";
+  "Kleislify" = dontDistribute super."Kleislify";
+  "Konf" = dontDistribute super."Konf";
+  "Kriens" = dontDistribute super."Kriens";
+  "KyotoCabinet" = dontDistribute super."KyotoCabinet";
+  "L-seed" = dontDistribute super."L-seed";
+  "LDAP" = dontDistribute super."LDAP";
+  "LRU" = dontDistribute super."LRU";
+  "LTree" = dontDistribute super."LTree";
+  "LambdaCalculator" = dontDistribute super."LambdaCalculator";
+  "LambdaHack" = dontDistribute super."LambdaHack";
+  "LambdaINet" = dontDistribute super."LambdaINet";
+  "LambdaNet" = dontDistribute super."LambdaNet";
+  "LambdaPrettyQuote" = dontDistribute super."LambdaPrettyQuote";
+  "LambdaShell" = dontDistribute super."LambdaShell";
+  "Lambdajudge" = dontDistribute super."Lambdajudge";
+  "Lambdaya" = dontDistribute super."Lambdaya";
+  "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
+  "Lastik" = dontDistribute super."Lastik";
+  "Lattices" = dontDistribute super."Lattices";
+  "LazyVault" = dontDistribute super."LazyVault";
+  "Level0" = dontDistribute super."Level0";
+  "LibClang" = dontDistribute super."LibClang";
+  "LibZip" = dontDistribute super."LibZip";
+  "Limit" = dontDistribute super."Limit";
+  "LinearSplit" = dontDistribute super."LinearSplit";
+  "LinguisticsTypes" = dontDistribute super."LinguisticsTypes";
+  "LinkChecker" = dontDistribute super."LinkChecker";
+  "ListTree" = dontDistribute super."ListTree";
+  "ListWriter" = dontDistribute super."ListWriter";
+  "ListZipper" = dontDistribute super."ListZipper";
+  "Logic" = dontDistribute super."Logic";
+  "LogicGrowsOnTrees" = dontDistribute super."LogicGrowsOnTrees";
+  "LogicGrowsOnTrees-MPI" = dontDistribute super."LogicGrowsOnTrees-MPI";
+  "LogicGrowsOnTrees-network" = dontDistribute super."LogicGrowsOnTrees-network";
+  "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
+  "LslPlus" = dontDistribute super."LslPlus";
+  "Lucu" = dontDistribute super."Lucu";
+  "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
+  "MFlow" = dontDistribute super."MFlow";
+  "MHask" = dontDistribute super."MHask";
+  "MSQueue" = dontDistribute super."MSQueue";
+  "MTGBuilder" = dontDistribute super."MTGBuilder";
+  "MagicHaskeller" = dontDistribute super."MagicHaskeller";
+  "MailchimpSimple" = dontDistribute super."MailchimpSimple";
+  "MaybeT" = dontDistribute super."MaybeT";
+  "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf";
+  "MaybeT-transformers" = dontDistribute super."MaybeT-transformers";
+  "MazesOfMonad" = dontDistribute super."MazesOfMonad";
+  "MeanShift" = dontDistribute super."MeanShift";
+  "Measure" = dontDistribute super."Measure";
+  "MetaHDBC" = dontDistribute super."MetaHDBC";
+  "MetaObject" = dontDistribute super."MetaObject";
+  "Metrics" = dontDistribute super."Metrics";
+  "Mhailist" = dontDistribute super."Mhailist";
+  "Michelangelo" = dontDistribute super."Michelangelo";
+  "MicrosoftTranslator" = dontDistribute super."MicrosoftTranslator";
+  "MiniAgda" = dontDistribute super."MiniAgda";
+  "MissingK" = dontDistribute super."MissingK";
+  "MissingM" = dontDistribute super."MissingM";
+  "MissingPy" = dontDistribute super."MissingPy";
+  "Modulo" = dontDistribute super."Modulo";
+  "Moe" = dontDistribute super."Moe";
+  "MoeDict" = dontDistribute super."MoeDict";
+  "MonadCatchIO-mtl" = dontDistribute super."MonadCatchIO-mtl";
+  "MonadCatchIO-mtl-foreign" = dontDistribute super."MonadCatchIO-mtl-foreign";
+  "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign";
+  "MonadCompose" = dontDistribute super."MonadCompose";
+  "MonadLab" = dontDistribute super."MonadLab";
+  "MonadRandomLazy" = dontDistribute super."MonadRandomLazy";
+  "MonadStack" = dontDistribute super."MonadStack";
+  "Monadius" = dontDistribute super."Monadius";
+  "Monaris" = dontDistribute super."Monaris";
+  "Monatron" = dontDistribute super."Monatron";
+  "Monatron-IO" = dontDistribute super."Monatron-IO";
+  "Monocle" = dontDistribute super."Monocle";
+  "MorseCode" = dontDistribute super."MorseCode";
+  "MuCheck" = dontDistribute super."MuCheck";
+  "MuCheck-HUnit" = dontDistribute super."MuCheck-HUnit";
+  "MuCheck-Hspec" = dontDistribute super."MuCheck-Hspec";
+  "MuCheck-QuickCheck" = dontDistribute super."MuCheck-QuickCheck";
+  "MuCheck-SmallCheck" = dontDistribute super."MuCheck-SmallCheck";
+  "Munkres" = dontDistribute super."Munkres";
+  "Munkres-simple" = dontDistribute super."Munkres-simple";
+  "MusicBrainz" = dontDistribute super."MusicBrainz";
+  "MusicBrainz-libdiscid" = dontDistribute super."MusicBrainz-libdiscid";
+  "MyPrimes" = dontDistribute super."MyPrimes";
+  "NGrams" = dontDistribute super."NGrams";
+  "NTRU" = dontDistribute super."NTRU";
+  "NXT" = dontDistribute super."NXT";
+  "NXTDSL" = dontDistribute super."NXTDSL";
+  "NanoProlog" = dontDistribute super."NanoProlog";
+  "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets";
+  "NaturalSort" = dontDistribute super."NaturalSort";
+  "NearContextAlgebra" = dontDistribute super."NearContextAlgebra";
+  "Neks" = dontDistribute super."Neks";
+  "NestedFunctor" = dontDistribute super."NestedFunctor";
+  "NestedSampling" = dontDistribute super."NestedSampling";
+  "NetSNMP" = dontDistribute super."NetSNMP";
+  "NewBinary" = dontDistribute super."NewBinary";
+  "Ninjas" = dontDistribute super."Ninjas";
+  "NoSlow" = dontDistribute super."NoSlow";
+  "NoTrace" = dontDistribute super."NoTrace";
+  "Noise" = dontDistribute super."Noise";
+  "Nomyx" = dontDistribute super."Nomyx";
+  "Nomyx-Core" = dontDistribute super."Nomyx-Core";
+  "Nomyx-Language" = dontDistribute super."Nomyx-Language";
+  "Nomyx-Rules" = dontDistribute super."Nomyx-Rules";
+  "Nomyx-Web" = dontDistribute super."Nomyx-Web";
+  "NonEmpty" = dontDistribute super."NonEmpty";
+  "NonEmptyList" = dontDistribute super."NonEmptyList";
+  "NumLazyByteString" = dontDistribute super."NumLazyByteString";
+  "NumberSieves" = dontDistribute super."NumberSieves";
+  "Numbers" = dontDistribute super."Numbers";
+  "Nussinov78" = dontDistribute super."Nussinov78";
+  "Nutri" = dontDistribute super."Nutri";
+  "OGL" = dontDistribute super."OGL";
+  "OSM" = dontDistribute super."OSM";
+  "OTP" = dontDistribute super."OTP";
+  "Object" = dontDistribute super."Object";
+  "ObjectIO" = dontDistribute super."ObjectIO";
+  "ObjectName" = dontDistribute super."ObjectName";
+  "Obsidian" = dontDistribute super."Obsidian";
+  "OddWord" = dontDistribute super."OddWord";
+  "Omega" = dontDistribute super."Omega";
+  "OpenAFP" = dontDistribute super."OpenAFP";
+  "OpenAFP-Utils" = dontDistribute super."OpenAFP-Utils";
+  "OpenAL" = dontDistribute super."OpenAL";
+  "OpenCL" = dontDistribute super."OpenCL";
+  "OpenCLRaw" = dontDistribute super."OpenCLRaw";
+  "OpenCLWrappers" = dontDistribute super."OpenCLWrappers";
+  "OpenGL" = dontDistribute super."OpenGL";
+  "OpenGLCheck" = dontDistribute super."OpenGLCheck";
+  "OpenGLRaw" = dontDistribute super."OpenGLRaw";
+  "OpenGLRaw21" = dontDistribute super."OpenGLRaw21";
+  "OpenSCAD" = dontDistribute super."OpenSCAD";
+  "OpenVG" = dontDistribute super."OpenVG";
+  "OpenVGRaw" = dontDistribute super."OpenVGRaw";
+  "Operads" = dontDistribute super."Operads";
+  "OptDir" = dontDistribute super."OptDir";
+  "OrPatterns" = dontDistribute super."OrPatterns";
+  "OrchestrateDB" = dontDistribute super."OrchestrateDB";
+  "OrderedBits" = dontDistribute super."OrderedBits";
+  "Ordinals" = dontDistribute super."Ordinals";
+  "PArrows" = dontDistribute super."PArrows";
+  "PBKDF2" = dontDistribute super."PBKDF2";
+  "PCLT" = dontDistribute super."PCLT";
+  "PCLT-DB" = dontDistribute super."PCLT-DB";
+  "PDBtools" = dontDistribute super."PDBtools";
+  "PTQ" = dontDistribute super."PTQ";
+  "PageIO" = dontDistribute super."PageIO";
+  "Paillier" = dontDistribute super."Paillier";
+  "PandocAgda" = dontDistribute super."PandocAgda";
+  "Paraiso" = dontDistribute super."Paraiso";
+  "Parry" = dontDistribute super."Parry";
+  "ParsecTools" = dontDistribute super."ParsecTools";
+  "ParserFunction" = dontDistribute super."ParserFunction";
+  "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures";
+  "PasswordGenerator" = dontDistribute super."PasswordGenerator";
+  "PastePipe" = dontDistribute super."PastePipe";
+  "Pathfinder" = dontDistribute super."Pathfinder";
+  "Peano" = dontDistribute super."Peano";
+  "PeanoWitnesses" = dontDistribute super."PeanoWitnesses";
+  "PerfectHash" = dontDistribute super."PerfectHash";
+  "PermuteEffects" = dontDistribute super."PermuteEffects";
+  "Phsu" = dontDistribute super."Phsu";
+  "Pipe" = dontDistribute super."Pipe";
+  "Piso" = dontDistribute super."Piso";
+  "PlayHangmanGame" = dontDistribute super."PlayHangmanGame";
+  "PlayingCards" = dontDistribute super."PlayingCards";
+  "Plot-ho-matic" = dontDistribute super."Plot-ho-matic";
+  "PlslTools" = dontDistribute super."PlslTools";
+  "Plural" = dontDistribute super."Plural";
+  "Pollutocracy" = dontDistribute super."Pollutocracy";
+  "PortFusion" = dontDistribute super."PortFusion";
+  "PortMidi" = dontDistribute super."PortMidi";
+  "PostgreSQL" = dontDistribute super."PostgreSQL";
+  "PrimitiveArray" = dontDistribute super."PrimitiveArray";
+  "Printf-TH" = dontDistribute super."Printf-TH";
+  "PriorityChansConverger" = dontDistribute super."PriorityChansConverger";
+  "ProbabilityMonads" = dontDistribute super."ProbabilityMonads";
+  "PropLogic" = dontDistribute super."PropLogic";
+  "Proper" = dontDistribute super."Proper";
+  "ProxN" = dontDistribute super."ProxN";
+  "Pugs" = dontDistribute super."Pugs";
+  "Pup-Events" = dontDistribute super."Pup-Events";
+  "Pup-Events-Client" = dontDistribute super."Pup-Events-Client";
+  "Pup-Events-Demo" = dontDistribute super."Pup-Events-Demo";
+  "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
+  "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
+  "QIO" = dontDistribute super."QIO";
+  "QuadEdge" = dontDistribute super."QuadEdge";
+  "QuadTree" = dontDistribute super."QuadTree";
+  "Quelea" = dontDistribute super."Quelea";
+  "QuickAnnotate" = dontDistribute super."QuickAnnotate";
+  "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT";
+  "Quickson" = dontDistribute super."Quickson";
+  "R-pandoc" = dontDistribute super."R-pandoc";
+  "RANSAC" = dontDistribute super."RANSAC";
+  "RBTree" = dontDistribute super."RBTree";
+  "RESTng" = dontDistribute super."RESTng";
+  "RFC1751" = dontDistribute super."RFC1751";
+  "RJson" = dontDistribute super."RJson";
+  "RMP" = dontDistribute super."RMP";
+  "RNAFold" = dontDistribute super."RNAFold";
+  "RNAFoldProgs" = dontDistribute super."RNAFoldProgs";
+  "RNAdesign" = dontDistribute super."RNAdesign";
+  "RNAdraw" = dontDistribute super."RNAdraw";
+  "RNAlien" = dontDistribute super."RNAlien";
+  "RNAwolf" = dontDistribute super."RNAwolf";
+  "RSA" = doDistribute super."RSA_2_1_0_3";
+  "Raincat" = dontDistribute super."Raincat";
+  "Random123" = dontDistribute super."Random123";
+  "RandomDotOrg" = dontDistribute super."RandomDotOrg";
+  "Randometer" = dontDistribute super."Randometer";
+  "Range" = dontDistribute super."Range";
+  "Ranged-sets" = dontDistribute super."Ranged-sets";
+  "Ranka" = dontDistribute super."Ranka";
+  "Rasenschach" = dontDistribute super."Rasenschach";
+  "Redmine" = dontDistribute super."Redmine";
+  "Ref" = dontDistribute super."Ref";
+  "Referees" = dontDistribute super."Referees";
+  "RepLib" = dontDistribute super."RepLib";
+  "ReplicateEffects" = dontDistribute super."ReplicateEffects";
+  "ReviewBoard" = dontDistribute super."ReviewBoard";
+  "RichConditional" = dontDistribute super."RichConditional";
+  "RollingDirectory" = dontDistribute super."RollingDirectory";
+  "RoyalMonad" = dontDistribute super."RoyalMonad";
+  "RxHaskell" = dontDistribute super."RxHaskell";
+  "SBench" = dontDistribute super."SBench";
+  "SConfig" = dontDistribute super."SConfig";
+  "SDL" = dontDistribute super."SDL";
+  "SDL-gfx" = dontDistribute super."SDL-gfx";
+  "SDL-image" = dontDistribute super."SDL-image";
+  "SDL-mixer" = dontDistribute super."SDL-mixer";
+  "SDL-mpeg" = dontDistribute super."SDL-mpeg";
+  "SDL-ttf" = dontDistribute super."SDL-ttf";
+  "SDL2-ttf" = dontDistribute super."SDL2-ttf";
+  "SFML" = dontDistribute super."SFML";
+  "SFML-control" = dontDistribute super."SFML-control";
+  "SFont" = dontDistribute super."SFont";
+  "SG" = dontDistribute super."SG";
+  "SGdemo" = dontDistribute super."SGdemo";
+  "SHA2" = dontDistribute super."SHA2";
+  "SMTPClient" = dontDistribute super."SMTPClient";
+  "SNet" = dontDistribute super."SNet";
+  "SQLDeps" = dontDistribute super."SQLDeps";
+  "STL" = dontDistribute super."STL";
+  "SVG2Q" = dontDistribute super."SVG2Q";
+  "SVGPath" = dontDistribute super."SVGPath";
+  "SWMMoutGetMB" = dontDistribute super."SWMMoutGetMB";
+  "SableCC2Hs" = dontDistribute super."SableCC2Hs";
+  "Safe" = dontDistribute super."Safe";
+  "Salsa" = dontDistribute super."Salsa";
+  "Saturnin" = dontDistribute super."Saturnin";
+  "SciFlow" = dontDistribute super."SciFlow";
+  "ScratchFs" = dontDistribute super."ScratchFs";
+  "Scurry" = dontDistribute super."Scurry";
+  "SegmentTree" = dontDistribute super."SegmentTree";
+  "Semantique" = dontDistribute super."Semantique";
+  "Semigroup" = dontDistribute super."Semigroup";
+  "SeqAlign" = dontDistribute super."SeqAlign";
+  "SessionLogger" = dontDistribute super."SessionLogger";
+  "ShellCheck" = dontDistribute super."ShellCheck";
+  "Shellac" = dontDistribute super."Shellac";
+  "Shellac-compatline" = dontDistribute super."Shellac-compatline";
+  "Shellac-editline" = dontDistribute super."Shellac-editline";
+  "Shellac-haskeline" = dontDistribute super."Shellac-haskeline";
+  "Shellac-readline" = dontDistribute super."Shellac-readline";
+  "ShowF" = dontDistribute super."ShowF";
+  "Shrub" = dontDistribute super."Shrub";
+  "Shu-thing" = dontDistribute super."Shu-thing";
+  "SimpleAES" = dontDistribute super."SimpleAES";
+  "SimpleEA" = dontDistribute super."SimpleEA";
+  "SimpleGL" = dontDistribute super."SimpleGL";
+  "SimpleH" = dontDistribute super."SimpleH";
+  "SimpleLog" = dontDistribute super."SimpleLog";
+  "SizeCompare" = dontDistribute super."SizeCompare";
+  "Slides" = dontDistribute super."Slides";
+  "Smooth" = dontDistribute super."Smooth";
+  "SmtLib" = dontDistribute super."SmtLib";
+  "Snusmumrik" = dontDistribute super."Snusmumrik";
+  "SoOSiM" = dontDistribute super."SoOSiM";
+  "SoccerFun" = dontDistribute super."SoccerFun";
+  "SoccerFunGL" = dontDistribute super."SoccerFunGL";
+  "Sonnex" = dontDistribute super."Sonnex";
+  "SourceGraph" = dontDistribute super."SourceGraph";
+  "Southpaw" = dontDistribute super."Southpaw";
+  "SpaceInvaders" = dontDistribute super."SpaceInvaders";
+  "SpacePrivateers" = dontDistribute super."SpacePrivateers";
+  "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spock" = doDistribute super."Spock_0_8_1_0";
+  "Spock-auth" = dontDistribute super."Spock-auth";
+  "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1";
+  "SpreadsheetML" = dontDistribute super."SpreadsheetML";
+  "Sprig" = dontDistribute super."Sprig";
+  "Stasis" = dontDistribute super."Stasis";
+  "StateVar-transformer" = dontDistribute super."StateVar-transformer";
+  "StatisticalMethods" = dontDistribute super."StatisticalMethods";
+  "Stomp" = dontDistribute super."Stomp";
+  "Strafunski-ATermLib" = dontDistribute super."Strafunski-ATermLib";
+  "Strafunski-Sdf2Haskell" = dontDistribute super."Strafunski-Sdf2Haskell";
+  "Strafunski-StrategyLib" = dontDistribute super."Strafunski-StrategyLib";
+  "StrappedTemplates" = dontDistribute super."StrappedTemplates";
+  "StrategyLib" = dontDistribute super."StrategyLib";
+  "StrictBench" = dontDistribute super."StrictBench";
+  "SuffixStructures" = dontDistribute super."SuffixStructures";
+  "SybWidget" = dontDistribute super."SybWidget";
+  "SyntaxMacros" = dontDistribute super."SyntaxMacros";
+  "Sysmon" = dontDistribute super."Sysmon";
+  "TBC" = dontDistribute super."TBC";
+  "TBit" = dontDistribute super."TBit";
+  "THEff" = dontDistribute super."THEff";
+  "TTTAS" = dontDistribute super."TTTAS";
+  "TV" = dontDistribute super."TV";
+  "TYB" = dontDistribute super."TYB";
+  "TableAlgebra" = dontDistribute super."TableAlgebra";
+  "Tables" = dontDistribute super."Tables";
+  "Tablify" = dontDistribute super."Tablify";
+  "Tainted" = dontDistribute super."Tainted";
+  "Takusen" = dontDistribute super."Takusen";
+  "Tape" = dontDistribute super."Tape";
+  "Taxonomy" = dontDistribute super."Taxonomy";
+  "TaxonomyTools" = dontDistribute super."TaxonomyTools";
+  "TeaHS" = dontDistribute super."TeaHS";
+  "Tensor" = dontDistribute super."Tensor";
+  "TernaryTrees" = dontDistribute super."TernaryTrees";
+  "TestExplode" = dontDistribute super."TestExplode";
+  "Theora" = dontDistribute super."Theora";
+  "Thingie" = dontDistribute super."Thingie";
+  "ThreadObjects" = dontDistribute super."ThreadObjects";
+  "Thrift" = dontDistribute super."Thrift";
+  "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe";
+  "TicTacToe" = dontDistribute super."TicTacToe";
+  "TigerHash" = dontDistribute super."TigerHash";
+  "TimePiece" = dontDistribute super."TimePiece";
+  "TinyLaunchbury" = dontDistribute super."TinyLaunchbury";
+  "TinyURL" = dontDistribute super."TinyURL";
+  "Titim" = dontDistribute super."Titim";
+  "Top" = dontDistribute super."Top";
+  "Tournament" = dontDistribute super."Tournament";
+  "TraceUtils" = dontDistribute super."TraceUtils";
+  "TransformersStepByStep" = dontDistribute super."TransformersStepByStep";
+  "Transhare" = dontDistribute super."Transhare";
+  "TreeCounter" = dontDistribute super."TreeCounter";
+  "TreeStructures" = dontDistribute super."TreeStructures";
+  "TreeT" = dontDistribute super."TreeT";
+  "Treiber" = dontDistribute super."Treiber";
+  "TrendGraph" = dontDistribute super."TrendGraph";
+  "TrieMap" = dontDistribute super."TrieMap";
+  "Twofish" = dontDistribute super."Twofish";
+  "TypeClass" = dontDistribute super."TypeClass";
+  "TypeCompose" = dontDistribute super."TypeCompose";
+  "TypeIlluminator" = dontDistribute super."TypeIlluminator";
+  "TypeNat" = dontDistribute super."TypeNat";
+  "TypingTester" = dontDistribute super."TypingTester";
+  "UISF" = dontDistribute super."UISF";
+  "UMM" = dontDistribute super."UMM";
+  "URLT" = dontDistribute super."URLT";
+  "URLb" = dontDistribute super."URLb";
+  "UTFTConverter" = dontDistribute super."UTFTConverter";
+  "Unique" = dontDistribute super."Unique";
+  "Unixutils-shadow" = dontDistribute super."Unixutils-shadow";
+  "Updater" = dontDistribute super."Updater";
+  "UrlDisp" = dontDistribute super."UrlDisp";
+  "Useful" = dontDistribute super."Useful";
+  "UtilityTM" = dontDistribute super."UtilityTM";
+  "VKHS" = dontDistribute super."VKHS";
+  "Validation" = dontDistribute super."Validation";
+  "Vec" = dontDistribute super."Vec";
+  "Vec-Boolean" = dontDistribute super."Vec-Boolean";
+  "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
+  "Vec-Transform" = dontDistribute super."Vec-Transform";
+  "VecN" = dontDistribute super."VecN";
+  "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
+  "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "WAVE" = dontDistribute super."WAVE";
+  "WL500gPControl" = dontDistribute super."WL500gPControl";
+  "WL500gPLib" = dontDistribute super."WL500gPLib";
+  "WMSigner" = dontDistribute super."WMSigner";
+  "WURFL" = dontDistribute super."WURFL";
+  "WXDiffCtrl" = dontDistribute super."WXDiffCtrl";
+  "WashNGo" = dontDistribute super."WashNGo";
+  "WaveFront" = dontDistribute super."WaveFront";
+  "Weather" = dontDistribute super."Weather";
+  "WebBits" = dontDistribute super."WebBits";
+  "WebBits-Html" = dontDistribute super."WebBits-Html";
+  "WebBits-multiplate" = dontDistribute super."WebBits-multiplate";
+  "WebCont" = dontDistribute super."WebCont";
+  "WeberLogic" = dontDistribute super."WeberLogic";
+  "Webrexp" = dontDistribute super."Webrexp";
+  "Wheb" = dontDistribute super."Wheb";
+  "WikimediaParser" = dontDistribute super."WikimediaParser";
+  "Win32-dhcp-server" = dontDistribute super."Win32-dhcp-server";
+  "Win32-errors" = dontDistribute super."Win32-errors";
+  "Win32-extras" = dontDistribute super."Win32-extras";
+  "Win32-junction-point" = dontDistribute super."Win32-junction-point";
+  "Win32-security" = dontDistribute super."Win32-security";
+  "Win32-services" = dontDistribute super."Win32-services";
+  "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper";
+  "Wired" = dontDistribute super."Wired";
+  "WordAlignment" = dontDistribute super."WordAlignment";
+  "WordNet" = dontDistribute super."WordNet";
+  "WordNet-ghc74" = dontDistribute super."WordNet-ghc74";
+  "Wordlint" = dontDistribute super."Wordlint";
+  "WxGeneric" = dontDistribute super."WxGeneric";
+  "X11-extras" = dontDistribute super."X11-extras";
+  "X11-rm" = dontDistribute super."X11-rm";
+  "X11-xdamage" = dontDistribute super."X11-xdamage";
+  "X11-xfixes" = dontDistribute super."X11-xfixes";
+  "X11-xft" = dontDistribute super."X11-xft";
+  "X11-xshape" = dontDistribute super."X11-xshape";
+  "XAttr" = dontDistribute super."XAttr";
+  "XInput" = dontDistribute super."XInput";
+  "XMMS" = dontDistribute super."XMMS";
+  "XMPP" = dontDistribute super."XMPP";
+  "XSaiga" = dontDistribute super."XSaiga";
+  "Xauth" = dontDistribute super."Xauth";
+  "Xec" = dontDistribute super."Xec";
+  "XmlHtmlWriter" = dontDistribute super."XmlHtmlWriter";
+  "Xorshift128Plus" = dontDistribute super."Xorshift128Plus";
+  "YACPong" = dontDistribute super."YACPong";
+  "YFrob" = dontDistribute super."YFrob";
+  "Yablog" = dontDistribute super."Yablog";
+  "YamlReference" = dontDistribute super."YamlReference";
+  "Yampa-core" = dontDistribute super."Yampa-core";
+  "Yocto" = dontDistribute super."Yocto";
+  "Yogurt" = dontDistribute super."Yogurt";
+  "Yogurt-Standalone" = dontDistribute super."Yogurt-Standalone";
+  "ZEBEDDE" = dontDistribute super."ZEBEDDE";
+  "ZFS" = dontDistribute super."ZFS";
+  "ZMachine" = dontDistribute super."ZMachine";
+  "ZipFold" = dontDistribute super."ZipFold";
+  "ZipperAG" = dontDistribute super."ZipperAG";
+  "Zora" = dontDistribute super."Zora";
+  "Zwaluw" = dontDistribute super."Zwaluw";
+  "a50" = dontDistribute super."a50";
+  "abacate" = dontDistribute super."abacate";
+  "abc-puzzle" = dontDistribute super."abc-puzzle";
+  "abcBridge" = dontDistribute super."abcBridge";
+  "abcnotation" = dontDistribute super."abcnotation";
+  "abeson" = dontDistribute super."abeson";
+  "abstract-deque-tests" = dontDistribute super."abstract-deque-tests";
+  "abstract-par-accelerate" = dontDistribute super."abstract-par-accelerate";
+  "abt" = dontDistribute super."abt";
+  "ac-machine" = dontDistribute super."ac-machine";
+  "ac-machine-conduit" = dontDistribute super."ac-machine-conduit";
+  "accelerate-arithmetic" = dontDistribute super."accelerate-arithmetic";
+  "accelerate-cublas" = dontDistribute super."accelerate-cublas";
+  "accelerate-cuda" = dontDistribute super."accelerate-cuda";
+  "accelerate-cufft" = dontDistribute super."accelerate-cufft";
+  "accelerate-examples" = dontDistribute super."accelerate-examples";
+  "accelerate-fft" = dontDistribute super."accelerate-fft";
+  "accelerate-fftw" = dontDistribute super."accelerate-fftw";
+  "accelerate-fourier" = dontDistribute super."accelerate-fourier";
+  "accelerate-fourier-benchmark" = dontDistribute super."accelerate-fourier-benchmark";
+  "accelerate-io" = dontDistribute super."accelerate-io";
+  "accelerate-random" = dontDistribute super."accelerate-random";
+  "accelerate-utility" = dontDistribute super."accelerate-utility";
+  "accentuateus" = dontDistribute super."accentuateus";
+  "access-time" = dontDistribute super."access-time";
+  "acid-state" = doDistribute super."acid-state_0_12_4";
+  "acid-state-dist" = dontDistribute super."acid-state-dist";
+  "acid-state-tls" = dontDistribute super."acid-state-tls";
+  "acl2" = dontDistribute super."acl2";
+  "acme-all-monad" = dontDistribute super."acme-all-monad";
+  "acme-box" = dontDistribute super."acme-box";
+  "acme-cadre" = dontDistribute super."acme-cadre";
+  "acme-cofunctor" = dontDistribute super."acme-cofunctor";
+  "acme-colosson" = dontDistribute super."acme-colosson";
+  "acme-comonad" = dontDistribute super."acme-comonad";
+  "acme-cutegirl" = dontDistribute super."acme-cutegirl";
+  "acme-dont" = dontDistribute super."acme-dont";
+  "acme-flipping-tables" = dontDistribute super."acme-flipping-tables";
+  "acme-grawlix" = dontDistribute super."acme-grawlix";
+  "acme-hq9plus" = dontDistribute super."acme-hq9plus";
+  "acme-http" = dontDistribute super."acme-http";
+  "acme-inator" = dontDistribute super."acme-inator";
+  "acme-io" = dontDistribute super."acme-io";
+  "acme-lolcat" = dontDistribute super."acme-lolcat";
+  "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
+  "acme-memorandom" = dontDistribute super."acme-memorandom";
+  "acme-microwave" = dontDistribute super."acme-microwave";
+  "acme-miscorder" = dontDistribute super."acme-miscorder";
+  "acme-missiles" = dontDistribute super."acme-missiles";
+  "acme-now" = dontDistribute super."acme-now";
+  "acme-numbersystem" = dontDistribute super."acme-numbersystem";
+  "acme-omitted" = dontDistribute super."acme-omitted";
+  "acme-one" = dontDistribute super."acme-one";
+  "acme-operators" = dontDistribute super."acme-operators";
+  "acme-php" = dontDistribute super."acme-php";
+  "acme-pointful-numbers" = dontDistribute super."acme-pointful-numbers";
+  "acme-realworld" = dontDistribute super."acme-realworld";
+  "acme-safe" = dontDistribute super."acme-safe";
+  "acme-schoenfinkel" = dontDistribute super."acme-schoenfinkel";
+  "acme-strfry" = dontDistribute super."acme-strfry";
+  "acme-stringly-typed" = dontDistribute super."acme-stringly-typed";
+  "acme-strtok" = dontDistribute super."acme-strtok";
+  "acme-timemachine" = dontDistribute super."acme-timemachine";
+  "acme-year" = dontDistribute super."acme-year";
+  "acme-zero" = dontDistribute super."acme-zero";
+  "activehs" = dontDistribute super."activehs";
+  "activehs-base" = dontDistribute super."activehs-base";
+  "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
+  "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_2_4";
+  "adaptive-containers" = dontDistribute super."adaptive-containers";
+  "adaptive-tuple" = dontDistribute super."adaptive-tuple";
+  "adb" = dontDistribute super."adb";
+  "adblock2privoxy" = dontDistribute super."adblock2privoxy";
+  "addLicenseInfo" = dontDistribute super."addLicenseInfo";
+  "adhoc-network" = dontDistribute super."adhoc-network";
+  "adict" = dontDistribute super."adict";
+  "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange";
+  "adp-multi" = dontDistribute super."adp-multi";
+  "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp";
+  "aeson" = doDistribute super."aeson_0_8_0_2";
+  "aeson-applicative" = dontDistribute super."aeson-applicative";
+  "aeson-bson" = dontDistribute super."aeson-bson";
+  "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-diff" = dontDistribute super."aeson-diff";
+  "aeson-extra" = doDistribute super."aeson-extra_0_2_3_0";
+  "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-lens" = dontDistribute super."aeson-lens";
+  "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
+  "aeson-schema" = doDistribute super."aeson-schema_0_3_0_7";
+  "aeson-serialize" = dontDistribute super."aeson-serialize";
+  "aeson-smart" = dontDistribute super."aeson-smart";
+  "aeson-streams" = dontDistribute super."aeson-streams";
+  "aeson-t" = dontDistribute super."aeson-t";
+  "aeson-toolkit" = dontDistribute super."aeson-toolkit";
+  "aeson-value-parser" = dontDistribute super."aeson-value-parser";
+  "aeson-yak" = dontDistribute super."aeson-yak";
+  "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
+  "afis" = dontDistribute super."afis";
+  "afv" = dontDistribute super."afv";
+  "agda-server" = dontDistribute super."agda-server";
+  "agda-snippets" = dontDistribute super."agda-snippets";
+  "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
+  "agum" = dontDistribute super."agum";
+  "aig" = dontDistribute super."aig";
+  "air" = dontDistribute super."air";
+  "air-extra" = dontDistribute super."air-extra";
+  "air-spec" = dontDistribute super."air-spec";
+  "air-th" = dontDistribute super."air-th";
+  "airbrake" = dontDistribute super."airbrake";
+  "airship" = dontDistribute super."airship";
+  "aivika" = dontDistribute super."aivika";
+  "aivika-experiment" = dontDistribute super."aivika-experiment";
+  "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
+  "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
+  "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-transformers" = dontDistribute super."aivika-transformers";
+  "ajhc" = dontDistribute super."ajhc";
+  "al" = dontDistribute super."al";
+  "alea" = dontDistribute super."alea";
+  "alex" = doDistribute super."alex_3_1_4";
+  "alex-meta" = dontDistribute super."alex-meta";
+  "alfred" = dontDistribute super."alfred";
+  "alga" = dontDistribute super."alga";
+  "algebra" = dontDistribute super."algebra";
+  "algebra-dag" = dontDistribute super."algebra-dag";
+  "algebra-sql" = dontDistribute super."algebra-sql";
+  "algebraic" = dontDistribute super."algebraic";
+  "algebraic-classes" = dontDistribute super."algebraic-classes";
+  "align" = dontDistribute super."align";
+  "align-text" = dontDistribute super."align-text";
+  "aligned-foreignptr" = dontDistribute super."aligned-foreignptr";
+  "allocated-processor" = dontDistribute super."allocated-processor";
+  "alloy" = dontDistribute super."alloy";
+  "alloy-proxy-fd" = dontDistribute super."alloy-proxy-fd";
+  "almost-fix" = dontDistribute super."almost-fix";
+  "alms" = dontDistribute super."alms";
+  "alpha" = dontDistribute super."alpha";
+  "alpino-tools" = dontDistribute super."alpino-tools";
+  "alsa" = dontDistribute super."alsa";
+  "alsa-core" = dontDistribute super."alsa-core";
+  "alsa-gui" = dontDistribute super."alsa-gui";
+  "alsa-midi" = dontDistribute super."alsa-midi";
+  "alsa-mixer" = dontDistribute super."alsa-mixer";
+  "alsa-pcm" = dontDistribute super."alsa-pcm";
+  "alsa-pcm-tests" = dontDistribute super."alsa-pcm-tests";
+  "alsa-seq" = dontDistribute super."alsa-seq";
+  "alsa-seq-tests" = dontDistribute super."alsa-seq-tests";
+  "altcomposition" = dontDistribute super."altcomposition";
+  "alternative-io" = dontDistribute super."alternative-io";
+  "altfloat" = dontDistribute super."altfloat";
+  "alure" = dontDistribute super."alure";
+  "amazon-emailer" = dontDistribute super."amazon-emailer";
+  "amazon-emailer-client-snap" = dontDistribute super."amazon-emailer-client-snap";
+  "amazon-products" = dontDistribute super."amazon-products";
+  "amazonka" = doDistribute super."amazonka_0_3_6";
+  "amazonka-apigateway" = dontDistribute super."amazonka-apigateway";
+  "amazonka-autoscaling" = doDistribute super."amazonka-autoscaling_0_3_6";
+  "amazonka-cloudformation" = doDistribute super."amazonka-cloudformation_0_3_6";
+  "amazonka-cloudfront" = doDistribute super."amazonka-cloudfront_0_3_6";
+  "amazonka-cloudhsm" = doDistribute super."amazonka-cloudhsm_0_3_6";
+  "amazonka-cloudsearch" = doDistribute super."amazonka-cloudsearch_0_3_6";
+  "amazonka-cloudsearch-domains" = doDistribute super."amazonka-cloudsearch-domains_0_3_6";
+  "amazonka-cloudtrail" = doDistribute super."amazonka-cloudtrail_0_3_6";
+  "amazonka-cloudwatch" = doDistribute super."amazonka-cloudwatch_0_3_6";
+  "amazonka-cloudwatch-logs" = doDistribute super."amazonka-cloudwatch-logs_0_3_6";
+  "amazonka-codecommit" = dontDistribute super."amazonka-codecommit";
+  "amazonka-codedeploy" = doDistribute super."amazonka-codedeploy_0_3_6";
+  "amazonka-codepipeline" = dontDistribute super."amazonka-codepipeline";
+  "amazonka-cognito-identity" = doDistribute super."amazonka-cognito-identity_0_3_6";
+  "amazonka-cognito-sync" = doDistribute super."amazonka-cognito-sync_0_3_6";
+  "amazonka-config" = doDistribute super."amazonka-config_0_3_6";
+  "amazonka-core" = doDistribute super."amazonka-core_0_3_6";
+  "amazonka-datapipeline" = doDistribute super."amazonka-datapipeline_0_3_6";
+  "amazonka-devicefarm" = dontDistribute super."amazonka-devicefarm";
+  "amazonka-directconnect" = doDistribute super."amazonka-directconnect_0_3_6";
+  "amazonka-ds" = dontDistribute super."amazonka-ds";
+  "amazonka-dynamodb" = doDistribute super."amazonka-dynamodb_0_3_6";
+  "amazonka-dynamodb-streams" = dontDistribute super."amazonka-dynamodb-streams";
+  "amazonka-ec2" = doDistribute super."amazonka-ec2_0_3_6_1";
+  "amazonka-ecs" = doDistribute super."amazonka-ecs_0_3_6";
+  "amazonka-efs" = dontDistribute super."amazonka-efs";
+  "amazonka-elasticache" = doDistribute super."amazonka-elasticache_0_3_6";
+  "amazonka-elasticbeanstalk" = doDistribute super."amazonka-elasticbeanstalk_0_3_6";
+  "amazonka-elasticsearch" = dontDistribute super."amazonka-elasticsearch";
+  "amazonka-elastictranscoder" = doDistribute super."amazonka-elastictranscoder_0_3_6";
+  "amazonka-elb" = doDistribute super."amazonka-elb_0_3_6";
+  "amazonka-emr" = doDistribute super."amazonka-emr_0_3_6";
+  "amazonka-glacier" = doDistribute super."amazonka-glacier_0_3_6";
+  "amazonka-iam" = doDistribute super."amazonka-iam_0_3_6";
+  "amazonka-importexport" = doDistribute super."amazonka-importexport_0_3_6";
+  "amazonka-inspector" = dontDistribute super."amazonka-inspector";
+  "amazonka-iot" = dontDistribute super."amazonka-iot";
+  "amazonka-iot-dataplane" = dontDistribute super."amazonka-iot-dataplane";
+  "amazonka-kinesis" = doDistribute super."amazonka-kinesis_0_3_6";
+  "amazonka-kinesis-firehose" = dontDistribute super."amazonka-kinesis-firehose";
+  "amazonka-kms" = doDistribute super."amazonka-kms_0_3_6";
+  "amazonka-lambda" = doDistribute super."amazonka-lambda_0_3_6";
+  "amazonka-marketplace-analytics" = dontDistribute super."amazonka-marketplace-analytics";
+  "amazonka-ml" = doDistribute super."amazonka-ml_0_3_6";
+  "amazonka-opsworks" = doDistribute super."amazonka-opsworks_0_3_6";
+  "amazonka-rds" = doDistribute super."amazonka-rds_0_3_6";
+  "amazonka-redshift" = doDistribute super."amazonka-redshift_0_3_6";
+  "amazonka-route53" = doDistribute super."amazonka-route53_0_3_6_1";
+  "amazonka-route53-domains" = doDistribute super."amazonka-route53-domains_0_3_6";
+  "amazonka-s3" = doDistribute super."amazonka-s3_0_3_6";
+  "amazonka-sdb" = doDistribute super."amazonka-sdb_0_3_6";
+  "amazonka-ses" = doDistribute super."amazonka-ses_0_3_6";
+  "amazonka-sns" = doDistribute super."amazonka-sns_0_3_6";
+  "amazonka-sqs" = doDistribute super."amazonka-sqs_0_3_6";
+  "amazonka-ssm" = doDistribute super."amazonka-ssm_0_3_6";
+  "amazonka-storagegateway" = doDistribute super."amazonka-storagegateway_0_3_6";
+  "amazonka-sts" = doDistribute super."amazonka-sts_0_3_6";
+  "amazonka-support" = doDistribute super."amazonka-support_0_3_6";
+  "amazonka-swf" = doDistribute super."amazonka-swf_0_3_6";
+  "amazonka-test" = dontDistribute super."amazonka-test";
+  "amazonka-waf" = dontDistribute super."amazonka-waf";
+  "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6";
+  "ampersand" = dontDistribute super."ampersand";
+  "amqp-conduit" = dontDistribute super."amqp-conduit";
+  "amrun" = dontDistribute super."amrun";
+  "analyze-client" = dontDistribute super."analyze-client";
+  "anansi" = dontDistribute super."anansi";
+  "anansi-hscolour" = dontDistribute super."anansi-hscolour";
+  "anansi-pandoc" = dontDistribute super."anansi-pandoc";
+  "anatomy" = dontDistribute super."anatomy";
+  "android" = dontDistribute super."android";
+  "android-lint-summary" = dontDistribute super."android-lint-summary";
+  "animalcase" = dontDistribute super."animalcase";
+  "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0";
+  "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
+  "ansi-pretty" = dontDistribute super."ansi-pretty";
+  "ansigraph" = dontDistribute super."ansigraph";
+  "antagonist" = dontDistribute super."antagonist";
+  "antfarm" = dontDistribute super."antfarm";
+  "anticiv" = dontDistribute super."anticiv";
+  "antigate" = dontDistribute super."antigate";
+  "antimirov" = dontDistribute super."antimirov";
+  "antiquoter" = dontDistribute super."antiquoter";
+  "antisplice" = dontDistribute super."antisplice";
+  "antlrc" = dontDistribute super."antlrc";
+  "anydbm" = dontDistribute super."anydbm";
+  "aosd" = dontDistribute super."aosd";
+  "ap-reflect" = dontDistribute super."ap-reflect";
+  "apache-md5" = dontDistribute super."apache-md5";
+  "apelsin" = dontDistribute super."apelsin";
+  "api-builder" = dontDistribute super."api-builder";
+  "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode";
+  "api-tools" = dontDistribute super."api-tools";
+  "apiary-helics" = dontDistribute super."apiary-helics";
+  "apiary-purescript" = dontDistribute super."apiary-purescript";
+  "apis" = dontDistribute super."apis";
+  "apotiki" = dontDistribute super."apotiki";
+  "app-lens" = dontDistribute super."app-lens";
+  "app-settings" = dontDistribute super."app-settings";
+  "appc" = dontDistribute super."appc";
+  "applicative-extras" = dontDistribute super."applicative-extras";
+  "applicative-fail" = dontDistribute super."applicative-fail";
+  "applicative-numbers" = dontDistribute super."applicative-numbers";
+  "applicative-parsec" = dontDistribute super."applicative-parsec";
+  "apply-refact" = dontDistribute super."apply-refact";
+  "apportionment" = dontDistribute super."apportionment";
+  "approx-rand-test" = dontDistribute super."approx-rand-test";
+  "approximate-equality" = dontDistribute super."approximate-equality";
+  "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper";
+  "arb-fft" = dontDistribute super."arb-fft";
+  "arbb-vm" = dontDistribute super."arbb-vm";
+  "archive" = dontDistribute super."archive";
+  "archiver" = dontDistribute super."archiver";
+  "archlinux" = dontDistribute super."archlinux";
+  "archlinux-web" = dontDistribute super."archlinux-web";
+  "archnews" = dontDistribute super."archnews";
+  "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
+  "argon" = dontDistribute super."argon";
+  "argparser" = dontDistribute super."argparser";
+  "arguedit" = dontDistribute super."arguedit";
+  "ariadne" = dontDistribute super."ariadne";
+  "arion" = dontDistribute super."arion";
+  "arith-encode" = dontDistribute super."arith-encode";
+  "arithmatic" = dontDistribute super."arithmatic";
+  "arithmetic" = dontDistribute super."arithmetic";
+  "arithmoi" = dontDistribute super."arithmoi";
+  "armada" = dontDistribute super."armada";
+  "arpa" = dontDistribute super."arpa";
+  "array-forth" = dontDistribute super."array-forth";
+  "array-memoize" = dontDistribute super."array-memoize";
+  "array-primops" = dontDistribute super."array-primops";
+  "array-utils" = dontDistribute super."array-utils";
+  "arrow-improve" = dontDistribute super."arrow-improve";
+  "arrowapply-utils" = dontDistribute super."arrowapply-utils";
+  "arrowp" = dontDistribute super."arrowp";
+  "artery" = dontDistribute super."artery";
+  "arx" = dontDistribute super."arx";
+  "arxiv" = dontDistribute super."arxiv";
+  "ascetic" = dontDistribute super."ascetic";
+  "ascii" = dontDistribute super."ascii";
+  "ascii-progress" = dontDistribute super."ascii-progress";
+  "ascii-vector-avc" = dontDistribute super."ascii-vector-avc";
+  "ascii85-conduit" = dontDistribute super."ascii85-conduit";
+  "asic" = dontDistribute super."asic";
+  "asil" = dontDistribute super."asil";
+  "asn1-data" = dontDistribute super."asn1-data";
+  "asn1dump" = dontDistribute super."asn1dump";
+  "assembler" = dontDistribute super."assembler";
+  "assert" = dontDistribute super."assert";
+  "assert-failure" = dontDistribute super."assert-failure";
+  "assertions" = dontDistribute super."assertions";
+  "assimp" = dontDistribute super."assimp";
+  "astar" = dontDistribute super."astar";
+  "astrds" = dontDistribute super."astrds";
+  "astview" = dontDistribute super."astview";
+  "astview-utils" = dontDistribute super."astview-utils";
+  "async-dejafu" = dontDistribute super."async-dejafu";
+  "async-extras" = dontDistribute super."async-extras";
+  "async-manager" = dontDistribute super."async-manager";
+  "async-pool" = dontDistribute super."async-pool";
+  "asynchronous-exceptions" = dontDistribute super."asynchronous-exceptions";
+  "aterm" = dontDistribute super."aterm";
+  "aterm-utils" = dontDistribute super."aterm-utils";
+  "atl" = dontDistribute super."atl";
+  "atlassian-connect-core" = dontDistribute super."atlassian-connect-core";
+  "atlassian-connect-descriptor" = dontDistribute super."atlassian-connect-descriptor";
+  "atmos" = dontDistribute super."atmos";
+  "atmos-dimensional" = dontDistribute super."atmos-dimensional";
+  "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atom" = dontDistribute super."atom";
+  "atom-basic" = dontDistribute super."atom-basic";
+  "atom-conduit" = dontDistribute super."atom-conduit";
+  "atom-msp430" = dontDistribute super."atom-msp430";
+  "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign";
+  "atomic-primops-vector" = dontDistribute super."atomic-primops-vector";
+  "atomic-write" = dontDistribute super."atomic-write";
+  "atomo" = dontDistribute super."atomo";
+  "atp-haskell" = dontDistribute super."atp-haskell";
+  "attempt" = dontDistribute super."attempt";
+  "atto-lisp" = dontDistribute super."atto-lisp";
+  "attoparsec" = doDistribute super."attoparsec_0_12_1_6";
+  "attoparsec-arff" = dontDistribute super."attoparsec-arff";
+  "attoparsec-binary" = dontDistribute super."attoparsec-binary";
+  "attoparsec-conduit" = dontDistribute super."attoparsec-conduit";
+  "attoparsec-csv" = dontDistribute super."attoparsec-csv";
+  "attoparsec-iteratee" = dontDistribute super."attoparsec-iteratee";
+  "attoparsec-parsec" = dontDistribute super."attoparsec-parsec";
+  "attoparsec-text" = dontDistribute super."attoparsec-text";
+  "attoparsec-text-enumerator" = dontDistribute super."attoparsec-text-enumerator";
+  "attosplit" = dontDistribute super."attosplit";
+  "atuin" = dontDistribute super."atuin";
+  "audacity" = dontDistribute super."audacity";
+  "audiovisual" = dontDistribute super."audiovisual";
+  "augeas" = dontDistribute super."augeas";
+  "augur" = dontDistribute super."augur";
+  "aur" = dontDistribute super."aur";
+  "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
+  "authenticate-ldap" = dontDistribute super."authenticate-ldap";
+  "authinfo-hs" = dontDistribute super."authinfo-hs";
+  "authoring" = dontDistribute super."authoring";
+  "autonix-deps" = dontDistribute super."autonix-deps";
+  "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
+  "autoproc" = dontDistribute super."autoproc";
+  "avahi" = dontDistribute super."avahi";
+  "avatar-generator" = dontDistribute super."avatar-generator";
+  "average" = dontDistribute super."average";
+  "avers" = dontDistribute super."avers";
+  "avl-static" = dontDistribute super."avl-static";
+  "avr-shake" = dontDistribute super."avr-shake";
+  "awesomium" = dontDistribute super."awesomium";
+  "awesomium-glut" = dontDistribute super."awesomium-glut";
+  "awesomium-raw" = dontDistribute super."awesomium-raw";
+  "aws" = doDistribute super."aws_0_12_1";
+  "aws-cloudfront-signer" = dontDistribute super."aws-cloudfront-signer";
+  "aws-configuration-tools" = dontDistribute super."aws-configuration-tools";
+  "aws-dynamodb-conduit" = dontDistribute super."aws-dynamodb-conduit";
+  "aws-dynamodb-streams" = dontDistribute super."aws-dynamodb-streams";
+  "aws-ec2" = dontDistribute super."aws-ec2";
+  "aws-elastic-transcoder" = dontDistribute super."aws-elastic-transcoder";
+  "aws-general" = dontDistribute super."aws-general";
+  "aws-kinesis" = dontDistribute super."aws-kinesis";
+  "aws-kinesis-client" = dontDistribute super."aws-kinesis-client";
+  "aws-kinesis-reshard" = dontDistribute super."aws-kinesis-reshard";
+  "aws-lambda" = dontDistribute super."aws-lambda";
+  "aws-performance-tests" = dontDistribute super."aws-performance-tests";
+  "aws-route53" = dontDistribute super."aws-route53";
+  "aws-sdk" = dontDistribute super."aws-sdk";
+  "aws-sdk-text-converter" = dontDistribute super."aws-sdk-text-converter";
+  "aws-sdk-xml-unordered" = dontDistribute super."aws-sdk-xml-unordered";
+  "aws-sign4" = dontDistribute super."aws-sign4";
+  "aws-sns" = dontDistribute super."aws-sns";
+  "azure-acs" = dontDistribute super."azure-acs";
+  "azure-service-api" = dontDistribute super."azure-service-api";
+  "azure-servicebus" = dontDistribute super."azure-servicebus";
+  "azurify" = dontDistribute super."azurify";
+  "b-tree" = dontDistribute super."b-tree";
+  "babylon" = dontDistribute super."babylon";
+  "backdropper" = dontDistribute super."backdropper";
+  "backtracking-exceptions" = dontDistribute super."backtracking-exceptions";
+  "backward-state" = dontDistribute super."backward-state";
+  "bacteria" = dontDistribute super."bacteria";
+  "bag" = dontDistribute super."bag";
+  "bamboo" = dontDistribute super."bamboo";
+  "bamboo-launcher" = dontDistribute super."bamboo-launcher";
+  "bamboo-plugin-highlight" = dontDistribute super."bamboo-plugin-highlight";
+  "bamboo-plugin-photo" = dontDistribute super."bamboo-plugin-photo";
+  "bamboo-theme-blueprint" = dontDistribute super."bamboo-theme-blueprint";
+  "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
+  "bamse" = dontDistribute super."bamse";
+  "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
+  "banwords" = dontDistribute super."banwords";
+  "barchart" = dontDistribute super."barchart";
+  "barcodes-code128" = dontDistribute super."barcodes-code128";
+  "barecheck" = dontDistribute super."barecheck";
+  "barley" = dontDistribute super."barley";
+  "barrie" = dontDistribute super."barrie";
+  "barrier" = dontDistribute super."barrier";
+  "barrier-monad" = dontDistribute super."barrier-monad";
+  "base-generics" = dontDistribute super."base-generics";
+  "base-io-access" = dontDistribute super."base-io-access";
+  "base-noprelude" = dontDistribute super."base-noprelude";
+  "base32-bytestring" = dontDistribute super."base32-bytestring";
+  "base58-bytestring" = dontDistribute super."base58-bytestring";
+  "base58address" = dontDistribute super."base58address";
+  "base64-conduit" = dontDistribute super."base64-conduit";
+  "base91" = dontDistribute super."base91";
+  "basex-client" = dontDistribute super."basex-client";
+  "bash" = dontDistribute super."bash";
+  "basic-lens" = dontDistribute super."basic-lens";
+  "basic-sop" = dontDistribute super."basic-sop";
+  "baskell" = dontDistribute super."baskell";
+  "battlenet" = dontDistribute super."battlenet";
+  "battlenet-yesod" = dontDistribute super."battlenet-yesod";
+  "battleships" = dontDistribute super."battleships";
+  "bayes-stack" = dontDistribute super."bayes-stack";
+  "bbdb" = dontDistribute super."bbdb";
+  "bbi" = dontDistribute super."bbi";
+  "bcrypt" = doDistribute super."bcrypt_0_0_6";
+  "bdd" = dontDistribute super."bdd";
+  "bdelta" = dontDistribute super."bdelta";
+  "bdo" = dontDistribute super."bdo";
+  "beamable" = dontDistribute super."beamable";
+  "beautifHOL" = dontDistribute super."beautifHOL";
+  "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
+  "bein" = dontDistribute super."bein";
+  "benchmark-function" = dontDistribute super."benchmark-function";
+  "benchpress" = dontDistribute super."benchpress";
+  "bencoding" = dontDistribute super."bencoding";
+  "berkeleydb" = dontDistribute super."berkeleydb";
+  "berp" = dontDistribute super."berp";
+  "bert" = dontDistribute super."bert";
+  "besout" = dontDistribute super."besout";
+  "bet" = dontDistribute super."bet";
+  "betacode" = dontDistribute super."betacode";
+  "between" = dontDistribute super."between";
+  "bf-cata" = dontDistribute super."bf-cata";
+  "bff" = dontDistribute super."bff";
+  "bff-mono" = dontDistribute super."bff-mono";
+  "bgmax" = dontDistribute super."bgmax";
+  "bgzf" = dontDistribute super."bgzf";
+  "bibtex" = dontDistribute super."bibtex";
+  "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
+  "bidispec" = dontDistribute super."bidispec";
+  "bidispec-extras" = dontDistribute super."bidispec-extras";
+  "bifunctors" = doDistribute super."bifunctors_5";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
+  "billboard-parser" = dontDistribute super."billboard-parser";
+  "billeksah-forms" = dontDistribute super."billeksah-forms";
+  "billeksah-main" = dontDistribute super."billeksah-main";
+  "billeksah-main-static" = dontDistribute super."billeksah-main-static";
+  "billeksah-pane" = dontDistribute super."billeksah-pane";
+  "billeksah-services" = dontDistribute super."billeksah-services";
+  "bimap" = dontDistribute super."bimap";
+  "bimap-server" = dontDistribute super."bimap-server";
+  "bimaps" = dontDistribute super."bimaps";
+  "binary-bits" = dontDistribute super."binary-bits";
+  "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-derive" = dontDistribute super."binary-derive";
+  "binary-enum" = dontDistribute super."binary-enum";
+  "binary-file" = dontDistribute super."binary-file";
+  "binary-generic" = dontDistribute super."binary-generic";
+  "binary-indexed-tree" = dontDistribute super."binary-indexed-tree";
+  "binary-literal-qq" = dontDistribute super."binary-literal-qq";
+  "binary-parser" = dontDistribute super."binary-parser";
+  "binary-protocol" = dontDistribute super."binary-protocol";
+  "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
+  "binary-shared" = dontDistribute super."binary-shared";
+  "binary-state" = dontDistribute super."binary-state";
+  "binary-store" = dontDistribute super."binary-store";
+  "binary-streams" = dontDistribute super."binary-streams";
+  "binary-strict" = dontDistribute super."binary-strict";
+  "binary-typed" = dontDistribute super."binary-typed";
+  "binarydefer" = dontDistribute super."binarydefer";
+  "bind-marshal" = dontDistribute super."bind-marshal";
+  "binding-core" = dontDistribute super."binding-core";
+  "binding-gtk" = dontDistribute super."binding-gtk";
+  "binding-wx" = dontDistribute super."binding-wx";
+  "bindings" = dontDistribute super."bindings";
+  "bindings-EsounD" = dontDistribute super."bindings-EsounD";
+  "bindings-GLFW" = dontDistribute super."bindings-GLFW";
+  "bindings-K8055" = dontDistribute super."bindings-K8055";
+  "bindings-apr" = dontDistribute super."bindings-apr";
+  "bindings-apr-util" = dontDistribute super."bindings-apr-util";
+  "bindings-audiofile" = dontDistribute super."bindings-audiofile";
+  "bindings-bfd" = dontDistribute super."bindings-bfd";
+  "bindings-cctools" = dontDistribute super."bindings-cctools";
+  "bindings-codec2" = dontDistribute super."bindings-codec2";
+  "bindings-common" = dontDistribute super."bindings-common";
+  "bindings-dc1394" = dontDistribute super."bindings-dc1394";
+  "bindings-directfb" = dontDistribute super."bindings-directfb";
+  "bindings-eskit" = dontDistribute super."bindings-eskit";
+  "bindings-fann" = dontDistribute super."bindings-fann";
+  "bindings-fluidsynth" = dontDistribute super."bindings-fluidsynth";
+  "bindings-friso" = dontDistribute super."bindings-friso";
+  "bindings-glib" = dontDistribute super."bindings-glib";
+  "bindings-gobject" = dontDistribute super."bindings-gobject";
+  "bindings-gpgme" = dontDistribute super."bindings-gpgme";
+  "bindings-gsl" = dontDistribute super."bindings-gsl";
+  "bindings-gts" = dontDistribute super."bindings-gts";
+  "bindings-hamlib" = dontDistribute super."bindings-hamlib";
+  "bindings-hdf5" = dontDistribute super."bindings-hdf5";
+  "bindings-levmar" = dontDistribute super."bindings-levmar";
+  "bindings-libcddb" = dontDistribute super."bindings-libcddb";
+  "bindings-libffi" = dontDistribute super."bindings-libffi";
+  "bindings-libftdi" = dontDistribute super."bindings-libftdi";
+  "bindings-librrd" = dontDistribute super."bindings-librrd";
+  "bindings-libstemmer" = dontDistribute super."bindings-libstemmer";
+  "bindings-libusb" = dontDistribute super."bindings-libusb";
+  "bindings-libv4l2" = dontDistribute super."bindings-libv4l2";
+  "bindings-libzip" = dontDistribute super."bindings-libzip";
+  "bindings-linux-videodev2" = dontDistribute super."bindings-linux-videodev2";
+  "bindings-lxc" = dontDistribute super."bindings-lxc";
+  "bindings-mmap" = dontDistribute super."bindings-mmap";
+  "bindings-mpdecimal" = dontDistribute super."bindings-mpdecimal";
+  "bindings-nettle" = dontDistribute super."bindings-nettle";
+  "bindings-parport" = dontDistribute super."bindings-parport";
+  "bindings-portaudio" = dontDistribute super."bindings-portaudio";
+  "bindings-posix" = dontDistribute super."bindings-posix";
+  "bindings-potrace" = dontDistribute super."bindings-potrace";
+  "bindings-ppdev" = dontDistribute super."bindings-ppdev";
+  "bindings-saga-cmd" = dontDistribute super."bindings-saga-cmd";
+  "bindings-sane" = dontDistribute super."bindings-sane";
+  "bindings-sc3" = dontDistribute super."bindings-sc3";
+  "bindings-sipc" = dontDistribute super."bindings-sipc";
+  "bindings-sophia" = dontDistribute super."bindings-sophia";
+  "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
+  "bindings-svm" = dontDistribute super."bindings-svm";
+  "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-yices" = dontDistribute super."bindings-yices";
+  "bindynamic" = dontDistribute super."bindynamic";
+  "binembed" = dontDistribute super."binembed";
+  "binembed-example" = dontDistribute super."binembed-example";
+  "bio" = dontDistribute super."bio";
+  "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
+  "biophd" = dontDistribute super."biophd";
+  "biosff" = dontDistribute super."biosff";
+  "biostockholm" = dontDistribute super."biostockholm";
+  "bird" = dontDistribute super."bird";
+  "bit-array" = dontDistribute super."bit-array";
+  "bit-vector" = dontDistribute super."bit-vector";
+  "bitarray" = dontDistribute super."bitarray";
+  "bitcoin-rpc" = dontDistribute super."bitcoin-rpc";
+  "bitly-cli" = dontDistribute super."bitly-cli";
+  "bitmap" = dontDistribute super."bitmap";
+  "bitmap-opengl" = dontDistribute super."bitmap-opengl";
+  "bitmaps" = dontDistribute super."bitmaps";
+  "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-conduit" = dontDistribute super."bits-conduit";
+  "bits-extras" = dontDistribute super."bits-extras";
+  "bitset" = dontDistribute super."bitset";
+  "bitspeak" = dontDistribute super."bitspeak";
+  "bitstream" = dontDistribute super."bitstream";
+  "bitstring" = dontDistribute super."bitstring";
+  "bittorrent" = dontDistribute super."bittorrent";
+  "bitvec" = dontDistribute super."bitvec";
+  "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
+  "bk-tree" = dontDistribute super."bk-tree";
+  "bkr" = dontDistribute super."bkr";
+  "bktrees" = dontDistribute super."bktrees";
+  "bla" = dontDistribute super."bla";
+  "black-jewel" = dontDistribute super."black-jewel";
+  "blacktip" = dontDistribute super."blacktip";
+  "blake2" = dontDistribute super."blake2";
+  "blakesum" = dontDistribute super."blakesum";
+  "blakesum-demo" = dontDistribute super."blakesum-demo";
+  "blank-canvas" = dontDistribute super."blank-canvas";
+  "blas" = dontDistribute super."blas";
+  "blas-hs" = dontDistribute super."blas-hs";
+  "blaze" = dontDistribute super."blaze";
+  "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
+  "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
+  "blaze-from-html" = dontDistribute super."blaze-from-html";
+  "blaze-html-contrib" = dontDistribute super."blaze-html-contrib";
+  "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat";
+  "blaze-html-truncate" = dontDistribute super."blaze-html-truncate";
+  "blaze-json" = dontDistribute super."blaze-json";
+  "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-textual-native" = dontDistribute super."blaze-textual-native";
+  "blazeMarker" = dontDistribute super."blazeMarker";
+  "blink1" = dontDistribute super."blink1";
+  "blip" = dontDistribute super."blip";
+  "bliplib" = dontDistribute super."bliplib";
+  "blocking-transactions" = dontDistribute super."blocking-transactions";
+  "blogination" = dontDistribute super."blogination";
+  "bloodhound" = doDistribute super."bloodhound_0_7_0_1";
+  "bloxorz" = dontDistribute super."bloxorz";
+  "blubber" = dontDistribute super."blubber";
+  "blubber-server" = dontDistribute super."blubber-server";
+  "bluetile" = dontDistribute super."bluetile";
+  "bluetileutils" = dontDistribute super."bluetileutils";
+  "blunt" = dontDistribute super."blunt";
+  "board-games" = dontDistribute super."board-games";
+  "bogre-banana" = dontDistribute super."bogre-banana";
+  "bond" = dontDistribute super."bond";
+  "boolean-list" = dontDistribute super."boolean-list";
+  "boolean-normal-forms" = dontDistribute super."boolean-normal-forms";
+  "boolexpr" = dontDistribute super."boolexpr";
+  "bools" = dontDistribute super."bools";
+  "boolsimplifier" = dontDistribute super."boolsimplifier";
+  "boomange" = dontDistribute super."boomange";
+  "boomerang" = dontDistribute super."boomerang";
+  "boomslang" = dontDistribute super."boomslang";
+  "borel" = dontDistribute super."borel";
+  "bot" = dontDistribute super."bot";
+  "both" = dontDistribute super."both";
+  "botpp" = dontDistribute super."botpp";
+  "bound-gen" = dontDistribute super."bound-gen";
+  "bounded-tchan" = dontDistribute super."bounded-tchan";
+  "boundingboxes" = dontDistribute super."boundingboxes";
+  "bowntz" = dontDistribute super."bowntz";
+  "bpann" = dontDistribute super."bpann";
+  "brainfuck-monad" = dontDistribute super."brainfuck-monad";
+  "brainfuck-tut" = dontDistribute super."brainfuck-tut";
+  "break" = dontDistribute super."break";
+  "breakout" = dontDistribute super."breakout";
+  "breve" = dontDistribute super."breve";
+  "brians-brain" = dontDistribute super."brians-brain";
+  "brick" = dontDistribute super."brick";
+  "brillig" = dontDistribute super."brillig";
+  "broccoli" = dontDistribute super."broccoli";
+  "broker-haskell" = dontDistribute super."broker-haskell";
+  "bsd-sysctl" = dontDistribute super."bsd-sysctl";
+  "bson-generic" = dontDistribute super."bson-generic";
+  "bson-generics" = dontDistribute super."bson-generics";
+  "bson-lens" = dontDistribute super."bson-lens";
+  "bson-mapping" = dontDistribute super."bson-mapping";
+  "bspack" = dontDistribute super."bspack";
+  "bsparse" = dontDistribute super."bsparse";
+  "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffon" = dontDistribute super."buffon";
+  "bugzilla" = dontDistribute super."bugzilla";
+  "buildable" = dontDistribute super."buildable";
+  "buildbox" = dontDistribute super."buildbox";
+  "buildbox-tools" = dontDistribute super."buildbox-tools";
+  "buildwrapper" = dontDistribute super."buildwrapper";
+  "bullet" = dontDistribute super."bullet";
+  "burst-detection" = dontDistribute super."burst-detection";
+  "bus-pirate" = dontDistribute super."bus-pirate";
+  "buster" = dontDistribute super."buster";
+  "buster-gtk" = dontDistribute super."buster-gtk";
+  "buster-network" = dontDistribute super."buster-network";
+  "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
+  "bv" = dontDistribute super."bv";
+  "byline" = dontDistribute super."byline";
+  "bytable" = dontDistribute super."bytable";
+  "byteset" = dontDistribute super."byteset";
+  "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary";
+  "bytestring-class" = dontDistribute super."bytestring-class";
+  "bytestring-csv" = dontDistribute super."bytestring-csv";
+  "bytestring-delta" = dontDistribute super."bytestring-delta";
+  "bytestring-from" = dontDistribute super."bytestring-from";
+  "bytestring-nums" = dontDistribute super."bytestring-nums";
+  "bytestring-plain" = dontDistribute super."bytestring-plain";
+  "bytestring-rematch" = dontDistribute super."bytestring-rematch";
+  "bytestring-short" = dontDistribute super."bytestring-short";
+  "bytestring-show" = dontDistribute super."bytestring-show";
+  "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder";
+  "bytestringparser" = dontDistribute super."bytestringparser";
+  "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
+  "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "c-dsl" = dontDistribute super."c-dsl";
+  "c-io" = dontDistribute super."c-io";
+  "c-storable-deriving" = dontDistribute super."c-storable-deriving";
+  "c0check" = dontDistribute super."c0check";
+  "c0parser" = dontDistribute super."c0parser";
+  "c10k" = dontDistribute super."c10k";
+  "c2hs" = doDistribute super."c2hs_0_25_2";
+  "c2hsc" = dontDistribute super."c2hsc";
+  "cab" = dontDistribute super."cab";
+  "cabal-audit" = dontDistribute super."cabal-audit";
+  "cabal-bounds" = dontDistribute super."cabal-bounds";
+  "cabal-cargs" = dontDistribute super."cabal-cargs";
+  "cabal-constraints" = dontDistribute super."cabal-constraints";
+  "cabal-db" = dontDistribute super."cabal-db";
+  "cabal-debian" = doDistribute super."cabal-debian_4_30_2";
+  "cabal-dependency-licenses" = dontDistribute super."cabal-dependency-licenses";
+  "cabal-dev" = dontDistribute super."cabal-dev";
+  "cabal-dir" = dontDistribute super."cabal-dir";
+  "cabal-ghc-dynflags" = dontDistribute super."cabal-ghc-dynflags";
+  "cabal-ghci" = dontDistribute super."cabal-ghci";
+  "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
+  "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
+  "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
+  "cabal-install-ghc74" = dontDistribute super."cabal-install-ghc74";
+  "cabal-lenses" = dontDistribute super."cabal-lenses";
+  "cabal-macosx" = dontDistribute super."cabal-macosx";
+  "cabal-meta" = dontDistribute super."cabal-meta";
+  "cabal-mon" = dontDistribute super."cabal-mon";
+  "cabal-nirvana" = dontDistribute super."cabal-nirvana";
+  "cabal-progdeps" = dontDistribute super."cabal-progdeps";
+  "cabal-query" = dontDistribute super."cabal-query";
+  "cabal-scripts" = dontDistribute super."cabal-scripts";
+  "cabal-setup" = dontDistribute super."cabal-setup";
+  "cabal-sign" = dontDistribute super."cabal-sign";
+  "cabal-sort" = dontDistribute super."cabal-sort";
+  "cabal-test" = dontDistribute super."cabal-test";
+  "cabal-test-bin" = dontDistribute super."cabal-test-bin";
+  "cabal-test-compat" = dontDistribute super."cabal-test-compat";
+  "cabal-test-quickcheck" = dontDistribute super."cabal-test-quickcheck";
+  "cabal-uninstall" = dontDistribute super."cabal-uninstall";
+  "cabal-upload" = dontDistribute super."cabal-upload";
+  "cabal2arch" = dontDistribute super."cabal2arch";
+  "cabal2doap" = dontDistribute super."cabal2doap";
+  "cabal2ebuild" = dontDistribute super."cabal2ebuild";
+  "cabal2ghci" = dontDistribute super."cabal2ghci";
+  "cabal2nix" = dontDistribute super."cabal2nix";
+  "cabal2spec" = dontDistribute super."cabal2spec";
+  "cabalQuery" = dontDistribute super."cabalQuery";
+  "cabalg" = dontDistribute super."cabalg";
+  "cabalgraph" = dontDistribute super."cabalgraph";
+  "cabalmdvrpm" = dontDistribute super."cabalmdvrpm";
+  "cabalrpmdeps" = dontDistribute super."cabalrpmdeps";
+  "cabalvchk" = dontDistribute super."cabalvchk";
+  "cabin" = dontDistribute super."cabin";
+  "cabocha" = dontDistribute super."cabocha";
+  "cached-io" = dontDistribute super."cached-io";
+  "cached-traversable" = dontDistribute super."cached-traversable";
+  "cacophony" = dontDistribute super."cacophony";
+  "caf" = dontDistribute super."caf";
+  "cafeteria-prelude" = dontDistribute super."cafeteria-prelude";
+  "caffegraph" = dontDistribute super."caffegraph";
+  "cairo-appbase" = dontDistribute super."cairo-appbase";
+  "cake" = dontDistribute super."cake";
+  "cake3" = dontDistribute super."cake3";
+  "cakyrespa" = dontDistribute super."cakyrespa";
+  "cal3d" = dontDistribute super."cal3d";
+  "cal3d-examples" = dontDistribute super."cal3d-examples";
+  "cal3d-opengl" = dontDistribute super."cal3d-opengl";
+  "calc" = dontDistribute super."calc";
+  "calculator" = dontDistribute super."calculator";
+  "caldims" = dontDistribute super."caldims";
+  "caledon" = dontDistribute super."caledon";
+  "call" = dontDistribute super."call";
+  "call-haskell-from-anything" = dontDistribute super."call-haskell-from-anything";
+  "camh" = dontDistribute super."camh";
+  "campfire" = dontDistribute super."campfire";
+  "canonical-filepath" = dontDistribute super."canonical-filepath";
+  "canteven-config" = dontDistribute super."canteven-config";
+  "canteven-listen-http" = dontDistribute super."canteven-listen-http";
+  "canteven-log" = dontDistribute super."canteven-log";
+  "canteven-template" = dontDistribute super."canteven-template";
+  "cantor" = dontDistribute super."cantor";
+  "cao" = dontDistribute super."cao";
+  "cap" = dontDistribute super."cap";
+  "capped-list" = dontDistribute super."capped-list";
+  "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
+  "caramia" = dontDistribute super."caramia";
+  "carboncopy" = dontDistribute super."carboncopy";
+  "carettah" = dontDistribute super."carettah";
+  "carray" = dontDistribute super."carray";
+  "casadi-bindings" = dontDistribute super."casadi-bindings";
+  "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
+  "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
+  "casadi-bindings-internal" = dontDistribute super."casadi-bindings-internal";
+  "casadi-bindings-ipopt-interface" = dontDistribute super."casadi-bindings-ipopt-interface";
+  "casadi-bindings-snopt-interface" = dontDistribute super."casadi-bindings-snopt-interface";
+  "cascading" = dontDistribute super."cascading";
+  "case-conversion" = dontDistribute super."case-conversion";
+  "cased" = dontDistribute super."cased";
+  "cash" = dontDistribute super."cash";
+  "casing" = dontDistribute super."casing";
+  "cassandra-cql" = dontDistribute super."cassandra-cql";
+  "cassandra-thrift" = dontDistribute super."cassandra-thrift";
+  "cassava-conduit" = dontDistribute super."cassava-conduit";
+  "cassava-streams" = dontDistribute super."cassava-streams";
+  "cassette" = dontDistribute super."cassette";
+  "cassy" = dontDistribute super."cassy";
+  "castle" = dontDistribute super."castle";
+  "casui" = dontDistribute super."casui";
+  "catamorphism" = dontDistribute super."catamorphism";
+  "catch-fd" = dontDistribute super."catch-fd";
+  "categorical-algebra" = dontDistribute super."categorical-algebra";
+  "categories" = dontDistribute super."categories";
+  "category-extras" = dontDistribute super."category-extras";
+  "cayley-dickson" = dontDistribute super."cayley-dickson";
+  "cblrepo" = dontDistribute super."cblrepo";
+  "cci" = dontDistribute super."cci";
+  "ccnx" = dontDistribute super."ccnx";
+  "cctools-workqueue" = dontDistribute super."cctools-workqueue";
+  "cedict" = dontDistribute super."cedict";
+  "cef" = dontDistribute super."cef";
+  "ceilometer-common" = dontDistribute super."ceilometer-common";
+  "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
+  "cerberus" = dontDistribute super."cerberus";
+  "cereal-derive" = dontDistribute super."cereal-derive";
+  "cereal-enumerator" = dontDistribute super."cereal-enumerator";
+  "cereal-ieee754" = dontDistribute super."cereal-ieee754";
+  "cereal-plus" = dontDistribute super."cereal-plus";
+  "cereal-text" = dontDistribute super."cereal-text";
+  "certificate" = dontDistribute super."certificate";
+  "cf" = dontDistribute super."cf";
+  "cfipu" = dontDistribute super."cfipu";
+  "cflp" = dontDistribute super."cflp";
+  "cfopu" = dontDistribute super."cfopu";
+  "cg" = dontDistribute super."cg";
+  "cgen" = dontDistribute super."cgen";
+  "cgi-undecidable" = dontDistribute super."cgi-undecidable";
+  "cgi-utils" = dontDistribute super."cgi-utils";
+  "cgrep" = dontDistribute super."cgrep";
+  "chain-codes" = dontDistribute super."chain-codes";
+  "chalk" = dontDistribute super."chalk";
+  "chalkboard" = dontDistribute super."chalkboard";
+  "chalkboard-viewer" = dontDistribute super."chalkboard-viewer";
+  "chalmers-lava2000" = dontDistribute super."chalmers-lava2000";
+  "chan-split" = dontDistribute super."chan-split";
+  "change-monger" = dontDistribute super."change-monger";
+  "charade" = dontDistribute super."charade";
+  "charsetdetect" = dontDistribute super."charsetdetect";
+  "charsetdetect-ae" = dontDistribute super."charsetdetect-ae";
+  "chart-histogram" = dontDistribute super."chart-histogram";
+  "chaselev-deque" = dontDistribute super."chaselev-deque";
+  "chatter" = dontDistribute super."chatter";
+  "chatty" = dontDistribute super."chatty";
+  "chatty-text" = dontDistribute super."chatty-text";
+  "chatty-utils" = dontDistribute super."chatty-utils";
+  "cheapskate" = dontDistribute super."cheapskate";
+  "check-pvp" = dontDistribute super."check-pvp";
+  "checked" = dontDistribute super."checked";
+  "chell-hunit" = dontDistribute super."chell-hunit";
+  "chesshs" = dontDistribute super."chesshs";
+  "chevalier-common" = dontDistribute super."chevalier-common";
+  "chp" = dontDistribute super."chp";
+  "chp-mtl" = dontDistribute super."chp-mtl";
+  "chp-plus" = dontDistribute super."chp-plus";
+  "chp-spec" = dontDistribute super."chp-spec";
+  "chp-transformers" = dontDistribute super."chp-transformers";
+  "chronograph" = dontDistribute super."chronograph";
+  "chu2" = dontDistribute super."chu2";
+  "chuchu" = dontDistribute super."chuchu";
+  "chunks" = dontDistribute super."chunks";
+  "chunky" = dontDistribute super."chunky";
+  "church-list" = dontDistribute super."church-list";
+  "cil" = dontDistribute super."cil";
+  "cinvoke" = dontDistribute super."cinvoke";
+  "cio" = dontDistribute super."cio";
+  "cipher-rc5" = dontDistribute super."cipher-rc5";
+  "ciphersaber2" = dontDistribute super."ciphersaber2";
+  "circ" = dontDistribute super."circ";
+  "cirru-parser" = dontDistribute super."cirru-parser";
+  "citation-resolve" = dontDistribute super."citation-resolve";
+  "citeproc-hs" = dontDistribute super."citeproc-hs";
+  "citeproc-hs-pandoc-filter" = dontDistribute super."citeproc-hs-pandoc-filter";
+  "cityhash" = dontDistribute super."cityhash";
+  "cjk" = dontDistribute super."cjk";
+  "clac" = dontDistribute super."clac";
+  "clafer" = dontDistribute super."clafer";
+  "claferIG" = dontDistribute super."claferIG";
+  "claferwiki" = dontDistribute super."claferwiki";
+  "clang-pure" = dontDistribute super."clang-pure";
+  "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
+  "clash" = dontDistribute super."clash";
+  "clash-ghc" = doDistribute super."clash-ghc_0_5_15";
+  "clash-lib" = doDistribute super."clash-lib_0_5_13";
+  "clash-prelude" = doDistribute super."clash-prelude_0_9_3";
+  "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck";
+  "clash-systemverilog" = doDistribute super."clash-systemverilog_0_5_10";
+  "clash-verilog" = doDistribute super."clash-verilog_0_5_10";
+  "clash-vhdl" = doDistribute super."clash-vhdl_0_5_12";
+  "classify" = dontDistribute super."classify";
+  "classy-parallel" = dontDistribute super."classy-parallel";
+  "clckwrks" = dontDistribute super."clckwrks";
+  "clckwrks-cli" = dontDistribute super."clckwrks-cli";
+  "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
+  "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
+  "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
+  "clckwrks-plugin-media" = dontDistribute super."clckwrks-plugin-media";
+  "clckwrks-plugin-page" = dontDistribute super."clckwrks-plugin-page";
+  "clckwrks-theme-bootstrap" = dontDistribute super."clckwrks-theme-bootstrap";
+  "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks";
+  "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap";
+  "cld2" = dontDistribute super."cld2";
+  "clean-home" = dontDistribute super."clean-home";
+  "clean-unions" = dontDistribute super."clean-unions";
+  "cless" = dontDistribute super."cless";
+  "clevercss" = dontDistribute super."clevercss";
+  "cli" = dontDistribute super."cli";
+  "click-clack" = dontDistribute super."click-clack";
+  "clifford" = dontDistribute super."clifford";
+  "clippard" = dontDistribute super."clippard";
+  "clipper" = dontDistribute super."clipper";
+  "clippings" = dontDistribute super."clippings";
+  "clist" = dontDistribute super."clist";
+  "clock" = doDistribute super."clock_0_5_1";
+  "clocked" = dontDistribute super."clocked";
+  "clogparse" = dontDistribute super."clogparse";
+  "clone-all" = dontDistribute super."clone-all";
+  "closure" = dontDistribute super."closure";
+  "cloud-haskell" = dontDistribute super."cloud-haskell";
+  "cloudfront-signer" = dontDistribute super."cloudfront-signer";
+  "cloudyfs" = dontDistribute super."cloudyfs";
+  "cltw" = dontDistribute super."cltw";
+  "clua" = dontDistribute super."clua";
+  "cluss" = dontDistribute super."cluss";
+  "clustertools" = dontDistribute super."clustertools";
+  "clutterhs" = dontDistribute super."clutterhs";
+  "cmaes" = dontDistribute super."cmaes";
+  "cmath" = dontDistribute super."cmath";
+  "cmathml3" = dontDistribute super."cmathml3";
+  "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs-browser" = dontDistribute super."cmdargs-browser";
+  "cmdlib" = dontDistribute super."cmdlib";
+  "cmdtheline" = dontDistribute super."cmdtheline";
+  "cml" = dontDistribute super."cml";
+  "cmonad" = dontDistribute super."cmonad";
+  "cmu" = dontDistribute super."cmu";
+  "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
+  "cndict" = dontDistribute super."cndict";
+  "codec" = dontDistribute super."codec";
+  "codec-libevent" = dontDistribute super."codec-libevent";
+  "codec-mbox" = dontDistribute super."codec-mbox";
+  "codecov-haskell" = dontDistribute super."codecov-haskell";
+  "codemonitor" = dontDistribute super."codemonitor";
+  "codepad" = dontDistribute super."codepad";
+  "codex" = doDistribute super."codex_0_3_0_10";
+  "codo-notation" = dontDistribute super."codo-notation";
+  "cofunctor" = dontDistribute super."cofunctor";
+  "cognimeta-utils" = dontDistribute super."cognimeta-utils";
+  "coinbase-exchange" = dontDistribute super."coinbase-exchange";
+  "colada" = dontDistribute super."colada";
+  "colchis" = dontDistribute super."colchis";
+  "collada-output" = dontDistribute super."collada-output";
+  "collada-types" = dontDistribute super."collada-types";
+  "collapse-util" = dontDistribute super."collapse-util";
+  "collection-json" = dontDistribute super."collection-json";
+  "collections" = dontDistribute super."collections";
+  "collections-api" = dontDistribute super."collections-api";
+  "collections-base-instances" = dontDistribute super."collections-base-instances";
+  "colock" = dontDistribute super."colock";
+  "colorize-haskell" = dontDistribute super."colorize-haskell";
+  "colors" = dontDistribute super."colors";
+  "coltrane" = dontDistribute super."coltrane";
+  "com" = dontDistribute super."com";
+  "combinat" = dontDistribute super."combinat";
+  "combinat-diagrams" = dontDistribute super."combinat-diagrams";
+  "combinator-interactive" = dontDistribute super."combinator-interactive";
+  "combinatorial-problems" = dontDistribute super."combinatorial-problems";
+  "combinatorics" = dontDistribute super."combinatorics";
+  "combobuffer" = dontDistribute super."combobuffer";
+  "comfort-graph" = dontDistribute super."comfort-graph";
+  "command" = dontDistribute super."command";
+  "command-qq" = dontDistribute super."command-qq";
+  "commodities" = dontDistribute super."commodities";
+  "commsec" = dontDistribute super."commsec";
+  "commsec-keyexchange" = dontDistribute super."commsec-keyexchange";
+  "commutative" = dontDistribute super."commutative";
+  "comonad-extras" = dontDistribute super."comonad-extras";
+  "comonad-random" = dontDistribute super."comonad-random";
+  "compact-map" = dontDistribute super."compact-map";
+  "compact-socket" = dontDistribute super."compact-socket";
+  "compact-string" = dontDistribute super."compact-string";
+  "compact-string-fix" = dontDistribute super."compact-string-fix";
+  "compactmap" = dontDistribute super."compactmap";
+  "compare-type" = dontDistribute super."compare-type";
+  "compdata-automata" = dontDistribute super."compdata-automata";
+  "compdata-dags" = dontDistribute super."compdata-dags";
+  "compdata-param" = dontDistribute super."compdata-param";
+  "compensated" = dontDistribute super."compensated";
+  "competition" = dontDistribute super."competition";
+  "compilation" = dontDistribute super."compilation";
+  "complex-generic" = dontDistribute super."complex-generic";
+  "complex-integrate" = dontDistribute super."complex-integrate";
+  "complexity" = dontDistribute super."complexity";
+  "compose-ltr" = dontDistribute super."compose-ltr";
+  "compose-trans" = dontDistribute super."compose-trans";
+  "composition-extra" = doDistribute super."composition-extra_1_1_0";
+  "composition-tree" = dontDistribute super."composition-tree";
+  "compression" = dontDistribute super."compression";
+  "compstrat" = dontDistribute super."compstrat";
+  "comptrans" = dontDistribute super."comptrans";
+  "computational-algebra" = dontDistribute super."computational-algebra";
+  "computations" = dontDistribute super."computations";
+  "conceit" = dontDistribute super."conceit";
+  "concorde" = dontDistribute super."concorde";
+  "concraft" = dontDistribute super."concraft";
+  "concraft-hr" = dontDistribute super."concraft-hr";
+  "concraft-pl" = dontDistribute super."concraft-pl";
+  "concrete-relaxng-parser" = dontDistribute super."concrete-relaxng-parser";
+  "concrete-typerep" = dontDistribute super."concrete-typerep";
+  "concurrent-barrier" = dontDistribute super."concurrent-barrier";
+  "concurrent-dns-cache" = dontDistribute super."concurrent-dns-cache";
+  "concurrent-machines" = dontDistribute super."concurrent-machines";
+  "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-sa" = dontDistribute super."concurrent-sa";
+  "concurrent-split" = dontDistribute super."concurrent-split";
+  "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-utilities" = dontDistribute super."concurrent-utilities";
+  "concurrentoutput" = dontDistribute super."concurrentoutput";
+  "condor" = dontDistribute super."condor";
+  "condorcet" = dontDistribute super."condorcet";
+  "conductive-base" = dontDistribute super."conductive-base";
+  "conductive-clock" = dontDistribute super."conductive-clock";
+  "conductive-hsc3" = dontDistribute super."conductive-hsc3";
+  "conductive-song" = dontDistribute super."conductive-song";
+  "conduit-audio" = dontDistribute super."conduit-audio";
+  "conduit-audio-lame" = dontDistribute super."conduit-audio-lame";
+  "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate";
+  "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile";
+  "conduit-connection" = dontDistribute super."conduit-connection";
+  "conduit-iconv" = dontDistribute super."conduit-iconv";
+  "conduit-network-stream" = dontDistribute super."conduit-network-stream";
+  "conduit-parse" = dontDistribute super."conduit-parse";
+  "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conf" = dontDistribute super."conf";
+  "config-select" = dontDistribute super."config-select";
+  "config-value" = dontDistribute super."config-value";
+  "configifier" = dontDistribute super."configifier";
+  "configuration" = dontDistribute super."configuration";
+  "configuration-tools" = dontDistribute super."configuration-tools";
+  "confsolve" = dontDistribute super."confsolve";
+  "congruence-relation" = dontDistribute super."congruence-relation";
+  "conjugateGradient" = dontDistribute super."conjugateGradient";
+  "conjure" = dontDistribute super."conjure";
+  "conlogger" = dontDistribute super."conlogger";
+  "connection-pool" = dontDistribute super."connection-pool";
+  "consistent" = dontDistribute super."consistent";
+  "console-program" = dontDistribute super."console-program";
+  "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin";
+  "constrained-categories" = dontDistribute super."constrained-categories";
+  "constrained-normal" = dontDistribute super."constrained-normal";
+  "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_2_1";
+  "consumers" = dontDistribute super."consumers";
+  "container" = dontDistribute super."container";
+  "container-classes" = dontDistribute super."container-classes";
+  "containers-benchmark" = dontDistribute super."containers-benchmark";
+  "containers-deepseq" = dontDistribute super."containers-deepseq";
+  "context-free-grammar" = dontDistribute super."context-free-grammar";
+  "context-stack" = dontDistribute super."context-stack";
+  "continue" = dontDistribute super."continue";
+  "continued-fractions" = dontDistribute super."continued-fractions";
+  "continuum" = dontDistribute super."continuum";
+  "continuum-client" = dontDistribute super."continuum-client";
+  "contravariant-extras" = dontDistribute super."contravariant-extras";
+  "control-event" = dontDistribute super."control-event";
+  "control-monad-attempt" = dontDistribute super."control-monad-attempt";
+  "control-monad-exception" = dontDistribute super."control-monad-exception";
+  "control-monad-exception-monadsfd" = dontDistribute super."control-monad-exception-monadsfd";
+  "control-monad-exception-monadstf" = dontDistribute super."control-monad-exception-monadstf";
+  "control-monad-exception-mtl" = dontDistribute super."control-monad-exception-mtl";
+  "control-monad-failure" = dontDistribute super."control-monad-failure";
+  "control-monad-failure-mtl" = dontDistribute super."control-monad-failure-mtl";
+  "control-monad-omega" = dontDistribute super."control-monad-omega";
+  "control-monad-queue" = dontDistribute super."control-monad-queue";
+  "control-timeout" = dontDistribute super."control-timeout";
+  "contstuff" = dontDistribute super."contstuff";
+  "contstuff-monads-tf" = dontDistribute super."contstuff-monads-tf";
+  "contstuff-transformers" = dontDistribute super."contstuff-transformers";
+  "converge" = dontDistribute super."converge";
+  "conversion" = dontDistribute super."conversion";
+  "conversion-bytestring" = dontDistribute super."conversion-bytestring";
+  "conversion-case-insensitive" = dontDistribute super."conversion-case-insensitive";
+  "conversion-text" = dontDistribute super."conversion-text";
+  "convert" = dontDistribute super."convert";
+  "convertible-ascii" = dontDistribute super."convertible-ascii";
+  "convertible-text" = dontDistribute super."convertible-text";
+  "cookbook" = dontDistribute super."cookbook";
+  "coordinate" = dontDistribute super."coordinate";
+  "copilot" = dontDistribute super."copilot";
+  "copilot-c99" = dontDistribute super."copilot-c99";
+  "copilot-cbmc" = dontDistribute super."copilot-cbmc";
+  "copilot-core" = dontDistribute super."copilot-core";
+  "copilot-language" = dontDistribute super."copilot-language";
+  "copilot-libraries" = dontDistribute super."copilot-libraries";
+  "copilot-sbv" = dontDistribute super."copilot-sbv";
+  "copilot-theorem" = dontDistribute super."copilot-theorem";
+  "copr" = dontDistribute super."copr";
+  "core" = dontDistribute super."core";
+  "core-haskell" = dontDistribute super."core-haskell";
+  "corebot-bliki" = dontDistribute super."corebot-bliki";
+  "coroutine-enumerator" = dontDistribute super."coroutine-enumerator";
+  "coroutine-iteratee" = dontDistribute super."coroutine-iteratee";
+  "coroutine-object" = dontDistribute super."coroutine-object";
+  "couch-hs" = dontDistribute super."couch-hs";
+  "couch-simple" = dontDistribute super."couch-simple";
+  "couchdb-conduit" = dontDistribute super."couchdb-conduit";
+  "couchdb-enumerator" = dontDistribute super."couchdb-enumerator";
+  "count" = dontDistribute super."count";
+  "countable" = dontDistribute super."countable";
+  "counter" = dontDistribute super."counter";
+  "court" = dontDistribute super."court";
+  "coverage" = dontDistribute super."coverage";
+  "cpio-conduit" = dontDistribute super."cpio-conduit";
+  "cplusplus-th" = dontDistribute super."cplusplus-th";
+  "cprng-aes-effect" = dontDistribute super."cprng-aes-effect";
+  "cpsa" = dontDistribute super."cpsa";
+  "cpuid" = dontDistribute super."cpuid";
+  "cpuperf" = dontDistribute super."cpuperf";
+  "cpython" = dontDistribute super."cpython";
+  "cql-io" = doDistribute super."cql-io_0_14_5";
+  "cqrs" = dontDistribute super."cqrs";
+  "cqrs-core" = dontDistribute super."cqrs-core";
+  "cqrs-example" = dontDistribute super."cqrs-example";
+  "cqrs-memory" = dontDistribute super."cqrs-memory";
+  "cqrs-postgresql" = dontDistribute super."cqrs-postgresql";
+  "cqrs-sqlite3" = dontDistribute super."cqrs-sqlite3";
+  "cqrs-test" = dontDistribute super."cqrs-test";
+  "cqrs-testkit" = dontDistribute super."cqrs-testkit";
+  "cqrs-types" = dontDistribute super."cqrs-types";
+  "cr" = dontDistribute super."cr";
+  "crack" = dontDistribute super."crack";
+  "craftwerk" = dontDistribute super."craftwerk";
+  "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
+  "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "crc16" = dontDistribute super."crc16";
+  "crc16-table" = dontDistribute super."crc16-table";
+  "creatur" = dontDistribute super."creatur";
+  "crf-chain1" = dontDistribute super."crf-chain1";
+  "crf-chain1-constrained" = dontDistribute super."crf-chain1-constrained";
+  "crf-chain2-generic" = dontDistribute super."crf-chain2-generic";
+  "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers";
+  "critbit" = dontDistribute super."critbit";
+  "criterion-plus" = dontDistribute super."criterion-plus";
+  "criterion-to-html" = dontDistribute super."criterion-to-html";
+  "crockford" = dontDistribute super."crockford";
+  "crocodile" = dontDistribute super."crocodile";
+  "cron" = doDistribute super."cron_0_3_0";
+  "cron-compat" = dontDistribute super."cron-compat";
+  "cruncher-types" = dontDistribute super."cruncher-types";
+  "crunghc" = dontDistribute super."crunghc";
+  "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks";
+  "crypto-classical" = dontDistribute super."crypto-classical";
+  "crypto-conduit" = dontDistribute super."crypto-conduit";
+  "crypto-enigma" = dontDistribute super."crypto-enigma";
+  "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh";
+  "crypto-random-effect" = dontDistribute super."crypto-random-effect";
+  "crypto-totp" = dontDistribute super."crypto-totp";
+  "cryptol" = doDistribute super."cryptol_2_2_5";
+  "cryptonite" = doDistribute super."cryptonite_0_6";
+  "cryptsy-api" = dontDistribute super."cryptsy-api";
+  "crystalfontz" = dontDistribute super."crystalfontz";
+  "cse-ghc-plugin" = dontDistribute super."cse-ghc-plugin";
+  "csound-catalog" = dontDistribute super."csound-catalog";
+  "csound-expression" = dontDistribute super."csound-expression";
+  "csound-expression-dynamic" = dontDistribute super."csound-expression-dynamic";
+  "csound-expression-opcodes" = dontDistribute super."csound-expression-opcodes";
+  "csound-expression-typed" = dontDistribute super."csound-expression-typed";
+  "csound-sampler" = dontDistribute super."csound-sampler";
+  "csp" = dontDistribute super."csp";
+  "cspmchecker" = dontDistribute super."cspmchecker";
+  "css" = dontDistribute super."css";
+  "css-syntax" = dontDistribute super."css-syntax";
+  "csv-enumerator" = dontDistribute super."csv-enumerator";
+  "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-to-qif" = dontDistribute super."csv-to-qif";
+  "ctemplate" = dontDistribute super."ctemplate";
+  "ctkl" = dontDistribute super."ctkl";
+  "ctpl" = dontDistribute super."ctpl";
+  "ctrie" = dontDistribute super."ctrie";
+  "cube" = dontDistribute super."cube";
+  "cubical" = dontDistribute super."cubical";
+  "cubicbezier" = dontDistribute super."cubicbezier";
+  "cubicspline" = doDistribute super."cubicspline_0_1_1";
+  "cublas" = dontDistribute super."cublas";
+  "cuboid" = dontDistribute super."cuboid";
+  "cuda" = dontDistribute super."cuda";
+  "cudd" = dontDistribute super."cudd";
+  "cufft" = dontDistribute super."cufft";
+  "curl-aeson" = dontDistribute super."curl-aeson";
+  "curlhs" = dontDistribute super."curlhs";
+  "currency" = dontDistribute super."currency";
+  "current-locale" = dontDistribute super."current-locale";
+  "curry-base" = dontDistribute super."curry-base";
+  "curry-frontend" = dontDistribute super."curry-frontend";
+  "cursedcsv" = dontDistribute super."cursedcsv";
+  "curve25519" = dontDistribute super."curve25519";
+  "curves" = dontDistribute super."curves";
+  "custom-prelude" = dontDistribute super."custom-prelude";
+  "cv-combinators" = dontDistribute super."cv-combinators";
+  "cyclotomic" = dontDistribute super."cyclotomic";
+  "cypher" = dontDistribute super."cypher";
+  "d-bus" = dontDistribute super."d-bus";
+  "d3js" = dontDistribute super."d3js";
+  "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
+  "daemons" = dontDistribute super."daemons";
+  "dag" = dontDistribute super."dag";
+  "damnpacket" = dontDistribute super."damnpacket";
+  "dao" = dontDistribute super."dao";
+  "dapi" = dontDistribute super."dapi";
+  "darcs" = dontDistribute super."darcs";
+  "darcs-benchmark" = dontDistribute super."darcs-benchmark";
+  "darcs-beta" = dontDistribute super."darcs-beta";
+  "darcs-buildpackage" = dontDistribute super."darcs-buildpackage";
+  "darcs-cabalized" = dontDistribute super."darcs-cabalized";
+  "darcs-fastconvert" = dontDistribute super."darcs-fastconvert";
+  "darcs-graph" = dontDistribute super."darcs-graph";
+  "darcs-monitor" = dontDistribute super."darcs-monitor";
+  "darcs-scripts" = dontDistribute super."darcs-scripts";
+  "darcs2dot" = dontDistribute super."darcs2dot";
+  "darcsden" = dontDistribute super."darcsden";
+  "darcswatch" = dontDistribute super."darcswatch";
+  "darkplaces-demo" = dontDistribute super."darkplaces-demo";
+  "darkplaces-rcon" = dontDistribute super."darkplaces-rcon";
+  "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
+  "darkplaces-text" = dontDistribute super."darkplaces-text";
+  "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor-monadLib" = dontDistribute super."data-accessor-monadLib";
+  "data-accessor-monads-fd" = dontDistribute super."data-accessor-monads-fd";
+  "data-accessor-monads-tf" = dontDistribute super."data-accessor-monads-tf";
+  "data-accessor-template" = dontDistribute super."data-accessor-template";
+  "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
+  "data-aviary" = dontDistribute super."data-aviary";
+  "data-bword" = dontDistribute super."data-bword";
+  "data-carousel" = dontDistribute super."data-carousel";
+  "data-category" = dontDistribute super."data-category";
+  "data-cell" = dontDistribute super."data-cell";
+  "data-checked" = dontDistribute super."data-checked";
+  "data-clist" = dontDistribute super."data-clist";
+  "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
+  "data-construction" = dontDistribute super."data-construction";
+  "data-cycle" = dontDistribute super."data-cycle";
+  "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-dispersal" = dontDistribute super."data-dispersal";
+  "data-dword" = dontDistribute super."data-dword";
+  "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
+  "data-endian" = dontDistribute super."data-endian";
+  "data-extend-generic" = dontDistribute super."data-extend-generic";
+  "data-extra" = dontDistribute super."data-extra";
+  "data-filepath" = dontDistribute super."data-filepath";
+  "data-fin" = dontDistribute super."data-fin";
+  "data-fin-simple" = dontDistribute super."data-fin-simple";
+  "data-fix" = dontDistribute super."data-fix";
+  "data-fix-cse" = dontDistribute super."data-fix-cse";
+  "data-flags" = dontDistribute super."data-flags";
+  "data-flagset" = dontDistribute super."data-flagset";
+  "data-fresh" = dontDistribute super."data-fresh";
+  "data-interval" = dontDistribute super."data-interval";
+  "data-ivar" = dontDistribute super."data-ivar";
+  "data-kiln" = dontDistribute super."data-kiln";
+  "data-layer" = dontDistribute super."data-layer";
+  "data-layout" = dontDistribute super."data-layout";
+  "data-lens" = dontDistribute super."data-lens";
+  "data-lens-fd" = dontDistribute super."data-lens-fd";
+  "data-lens-ixset" = dontDistribute super."data-lens-ixset";
+  "data-lens-template" = dontDistribute super."data-lens-template";
+  "data-list-sequences" = dontDistribute super."data-list-sequences";
+  "data-map-multikey" = dontDistribute super."data-map-multikey";
+  "data-named" = dontDistribute super."data-named";
+  "data-nat" = dontDistribute super."data-nat";
+  "data-object" = dontDistribute super."data-object";
+  "data-object-json" = dontDistribute super."data-object-json";
+  "data-object-yaml" = dontDistribute super."data-object-yaml";
+  "data-or" = dontDistribute super."data-or";
+  "data-partition" = dontDistribute super."data-partition";
+  "data-pprint" = dontDistribute super."data-pprint";
+  "data-quotientref" = dontDistribute super."data-quotientref";
+  "data-r-tree" = dontDistribute super."data-r-tree";
+  "data-ref" = dontDistribute super."data-ref";
+  "data-reify-cse" = dontDistribute super."data-reify-cse";
+  "data-repr" = dontDistribute super."data-repr";
+  "data-rev" = dontDistribute super."data-rev";
+  "data-rope" = dontDistribute super."data-rope";
+  "data-rtuple" = dontDistribute super."data-rtuple";
+  "data-size" = dontDistribute super."data-size";
+  "data-spacepart" = dontDistribute super."data-spacepart";
+  "data-store" = dontDistribute super."data-store";
+  "data-stringmap" = dontDistribute super."data-stringmap";
+  "data-structure-inferrer" = dontDistribute super."data-structure-inferrer";
+  "data-tensor" = dontDistribute super."data-tensor";
+  "data-textual" = dontDistribute super."data-textual";
+  "data-timeout" = dontDistribute super."data-timeout";
+  "data-transform" = dontDistribute super."data-transform";
+  "data-treify" = dontDistribute super."data-treify";
+  "data-type" = dontDistribute super."data-type";
+  "data-util" = dontDistribute super."data-util";
+  "data-variant" = dontDistribute super."data-variant";
+  "database-migrate" = dontDistribute super."database-migrate";
+  "database-study" = dontDistribute super."database-study";
+  "dataenc" = dontDistribute super."dataenc";
+  "dataflow" = dontDistribute super."dataflow";
+  "datalog" = dontDistribute super."datalog";
+  "datapacker" = dontDistribute super."datapacker";
+  "dataurl" = dontDistribute super."dataurl";
+  "date-cache" = dontDistribute super."date-cache";
+  "dates" = dontDistribute super."dates";
+  "datetime" = dontDistribute super."datetime";
+  "datetime-sb" = dontDistribute super."datetime-sb";
+  "dawdle" = dontDistribute super."dawdle";
+  "dawg" = dontDistribute super."dawg";
+  "dbcleaner" = dontDistribute super."dbcleaner";
+  "dbf" = dontDistribute super."dbf";
+  "dbjava" = dontDistribute super."dbjava";
+  "dbmigrations" = dontDistribute super."dbmigrations";
+  "dbus-client" = dontDistribute super."dbus-client";
+  "dbus-core" = dontDistribute super."dbus-core";
+  "dbus-qq" = dontDistribute super."dbus-qq";
+  "dbus-th" = dontDistribute super."dbus-th";
+  "dclabel" = dontDistribute super."dclabel";
+  "dclabel-eci11" = dontDistribute super."dclabel-eci11";
+  "ddc-base" = dontDistribute super."ddc-base";
+  "ddc-build" = dontDistribute super."ddc-build";
+  "ddc-code" = dontDistribute super."ddc-code";
+  "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-eval" = dontDistribute super."ddc-core-eval";
+  "ddc-core-flow" = dontDistribute super."ddc-core-flow";
+  "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
+  "ddc-core-salt" = dontDistribute super."ddc-core-salt";
+  "ddc-core-simpl" = dontDistribute super."ddc-core-simpl";
+  "ddc-core-tetra" = dontDistribute super."ddc-core-tetra";
+  "ddc-driver" = dontDistribute super."ddc-driver";
+  "ddc-interface" = dontDistribute super."ddc-interface";
+  "ddc-source-tetra" = dontDistribute super."ddc-source-tetra";
+  "ddc-tools" = dontDistribute super."ddc-tools";
+  "ddc-war" = dontDistribute super."ddc-war";
+  "ddci-core" = dontDistribute super."ddci-core";
+  "dead-code-detection" = dontDistribute super."dead-code-detection";
+  "dead-simple-json" = dontDistribute super."dead-simple-json";
+  "debian" = doDistribute super."debian_3_87_2";
+  "debian-binary" = dontDistribute super."debian-binary";
+  "debian-build" = dontDistribute super."debian-build";
+  "debug-diff" = dontDistribute super."debug-diff";
+  "decepticons" = dontDistribute super."decepticons";
+  "declarative" = dontDistribute super."declarative";
+  "decode-utf8" = dontDistribute super."decode-utf8";
+  "decoder-conduit" = dontDistribute super."decoder-conduit";
+  "dedukti" = dontDistribute super."dedukti";
+  "deepcontrol" = dontDistribute super."deepcontrol";
+  "deeplearning-hs" = dontDistribute super."deeplearning-hs";
+  "deepseq-bounded" = dontDistribute super."deepseq-bounded";
+  "deepseq-magic" = dontDistribute super."deepseq-magic";
+  "deepseq-th" = dontDistribute super."deepseq-th";
+  "deepzoom" = dontDistribute super."deepzoom";
+  "defargs" = dontDistribute super."defargs";
+  "definitive-base" = dontDistribute super."definitive-base";
+  "definitive-filesystem" = dontDistribute super."definitive-filesystem";
+  "definitive-graphics" = dontDistribute super."definitive-graphics";
+  "definitive-parser" = dontDistribute super."definitive-parser";
+  "definitive-reactive" = dontDistribute super."definitive-reactive";
+  "definitive-sound" = dontDistribute super."definitive-sound";
+  "deiko-config" = dontDistribute super."deiko-config";
+  "dejafu" = dontDistribute super."dejafu";
+  "deka" = dontDistribute super."deka";
+  "deka-tests" = dontDistribute super."deka-tests";
+  "delaunay" = dontDistribute super."delaunay";
+  "delicious" = dontDistribute super."delicious";
+  "delimited-text" = dontDistribute super."delimited-text";
+  "delimiter-separated" = dontDistribute super."delimiter-separated";
+  "delta" = dontDistribute super."delta";
+  "delta-h" = dontDistribute super."delta-h";
+  "demarcate" = dontDistribute super."demarcate";
+  "denominate" = dontDistribute super."denominate";
+  "dependent-map" = doDistribute super."dependent-map_0_1_1_3";
+  "dependent-sum" = doDistribute super."dependent-sum_0_2_1_0";
+  "depends" = dontDistribute super."depends";
+  "dephd" = dontDistribute super."dephd";
+  "dequeue" = dontDistribute super."dequeue";
+  "derangement" = dontDistribute super."derangement";
+  "derivation-trees" = dontDistribute super."derivation-trees";
+  "derive" = doDistribute super."derive_2_5_22";
+  "derive-IG" = dontDistribute super."derive-IG";
+  "derive-enumerable" = dontDistribute super."derive-enumerable";
+  "derive-gadt" = dontDistribute super."derive-gadt";
+  "derive-topdown" = dontDistribute super."derive-topdown";
+  "derive-trie" = dontDistribute super."derive-trie";
+  "deriving-compat" = dontDistribute super."deriving-compat";
+  "derp" = dontDistribute super."derp";
+  "derp-lib" = dontDistribute super."derp-lib";
+  "descrilo" = dontDistribute super."descrilo";
+  "despair" = dontDistribute super."despair";
+  "deterministic-game-engine" = dontDistribute super."deterministic-game-engine";
+  "detrospector" = dontDistribute super."detrospector";
+  "deunicode" = dontDistribute super."deunicode";
+  "devil" = dontDistribute super."devil";
+  "dewdrop" = dontDistribute super."dewdrop";
+  "dfrac" = dontDistribute super."dfrac";
+  "dfsbuild" = dontDistribute super."dfsbuild";
+  "dgim" = dontDistribute super."dgim";
+  "dgs" = dontDistribute super."dgs";
+  "dia-base" = dontDistribute super."dia-base";
+  "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams-canvas" = dontDistribute super."diagrams-canvas";
+  "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
+  "diagrams-gtk" = dontDistribute super."diagrams-gtk";
+  "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_7";
+  "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-lib" = doDistribute super."diagrams-lib_1_3_0_3";
+  "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
+  "diagrams-pdf" = dontDistribute super."diagrams-pdf";
+  "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
+  "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
+  "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_7";
+  "diagrams-tikz" = dontDistribute super."diagrams-tikz";
+  "dialog" = dontDistribute super."dialog";
+  "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
+  "dicom" = dontDistribute super."dicom";
+  "dictparser" = dontDistribute super."dictparser";
+  "diet" = dontDistribute super."diet";
+  "diff-gestalt" = dontDistribute super."diff-gestalt";
+  "diff-parse" = dontDistribute super."diff-parse";
+  "diffarray" = dontDistribute super."diffarray";
+  "diffcabal" = dontDistribute super."diffcabal";
+  "diffdump" = dontDistribute super."diffdump";
+  "digamma" = dontDistribute super."digamma";
+  "digest-pure" = dontDistribute super."digest-pure";
+  "digestive-bootstrap" = dontDistribute super."digestive-bootstrap";
+  "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid";
+  "digestive-functors-blaze" = dontDistribute super."digestive-functors-blaze";
+  "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack";
+  "digestive-functors-heist" = dontDistribute super."digestive-functors-heist";
+  "digestive-functors-hsp" = dontDistribute super."digestive-functors-hsp";
+  "digestive-functors-scotty" = dontDistribute super."digestive-functors-scotty";
+  "digestive-functors-snap" = dontDistribute super."digestive-functors-snap";
+  "digit" = dontDistribute super."digit";
+  "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
+  "dimensional" = doDistribute super."dimensional_0_13_0_2";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
+  "dimensional-tf" = dontDistribute super."dimensional-tf";
+  "dingo-core" = dontDistribute super."dingo-core";
+  "dingo-example" = dontDistribute super."dingo-example";
+  "dingo-widgets" = dontDistribute super."dingo-widgets";
+  "diophantine" = dontDistribute super."diophantine";
+  "diplomacy" = dontDistribute super."diplomacy";
+  "diplomacy-server" = dontDistribute super."diplomacy-server";
+  "direct-binary-files" = dontDistribute super."direct-binary-files";
+  "direct-daemonize" = dontDistribute super."direct-daemonize";
+  "direct-fastcgi" = dontDistribute super."direct-fastcgi";
+  "direct-http" = dontDistribute super."direct-http";
+  "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
+  "direct-plugins" = dontDistribute super."direct-plugins";
+  "directed-cubical" = dontDistribute super."directed-cubical";
+  "directory-layout" = dontDistribute super."directory-layout";
+  "dirfiles" = dontDistribute super."dirfiles";
+  "dirstream" = dontDistribute super."dirstream";
+  "disassembler" = dontDistribute super."disassembler";
+  "discordian-calendar" = dontDistribute super."discordian-calendar";
+  "discount" = dontDistribute super."discount";
+  "discrete-space-map" = dontDistribute super."discrete-space-map";
+  "discrimination" = dontDistribute super."discrimination";
+  "disjoint-set" = dontDistribute super."disjoint-set";
+  "disjoint-sets-st" = dontDistribute super."disjoint-sets-st";
+  "dist-upload" = dontDistribute super."dist-upload";
+  "distributed-closure" = dontDistribute super."distributed-closure";
+  "distributed-process" = dontDistribute super."distributed-process";
+  "distributed-process-async" = dontDistribute super."distributed-process-async";
+  "distributed-process-azure" = dontDistribute super."distributed-process-azure";
+  "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-execution" = dontDistribute super."distributed-process-execution";
+  "distributed-process-extras" = dontDistribute super."distributed-process-extras";
+  "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
+  "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
+  "distributed-process-platform" = dontDistribute super."distributed-process-platform";
+  "distributed-process-registry" = dontDistribute super."distributed-process-registry";
+  "distributed-process-simplelocalnet" = dontDistribute super."distributed-process-simplelocalnet";
+  "distributed-process-supervisor" = dontDistribute super."distributed-process-supervisor";
+  "distributed-process-task" = dontDistribute super."distributed-process-task";
+  "distributed-process-tests" = dontDistribute super."distributed-process-tests";
+  "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper";
+  "distributed-static" = dontDistribute super."distributed-static";
+  "distribution" = dontDistribute super."distribution";
+  "distribution-plot" = dontDistribute super."distribution-plot";
+  "diversity" = dontDistribute super."diversity";
+  "dixi" = dontDistribute super."dixi";
+  "djinn" = dontDistribute super."djinn";
+  "djinn-th" = dontDistribute super."djinn-th";
+  "dnscache" = dontDistribute super."dnscache";
+  "dnsrbl" = dontDistribute super."dnsrbl";
+  "dnssd" = dontDistribute super."dnssd";
+  "doc-review" = dontDistribute super."doc-review";
+  "doccheck" = dontDistribute super."doccheck";
+  "docidx" = dontDistribute super."docidx";
+  "docker" = dontDistribute super."docker";
+  "dockercook" = dontDistribute super."dockercook";
+  "docopt" = dontDistribute super."docopt";
+  "doctest-discover" = dontDistribute super."doctest-discover";
+  "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
+  "doctest-prop" = dontDistribute super."doctest-prop";
+  "dom-lt" = dontDistribute super."dom-lt";
+  "dom-selector" = dontDistribute super."dom-selector";
+  "domain-auth" = dontDistribute super."domain-auth";
+  "dominion" = dontDistribute super."dominion";
+  "domplate" = dontDistribute super."domplate";
+  "dot2graphml" = dontDistribute super."dot2graphml";
+  "dotenv" = dontDistribute super."dotenv";
+  "dotfs" = dontDistribute super."dotfs";
+  "dotgen" = dontDistribute super."dotgen";
+  "double-metaphone" = dontDistribute super."double-metaphone";
+  "dove" = dontDistribute super."dove";
+  "dow" = dontDistribute super."dow";
+  "download" = dontDistribute super."download";
+  "download-curl" = dontDistribute super."download-curl";
+  "download-media-content" = dontDistribute super."download-media-content";
+  "dozenal" = dontDistribute super."dozenal";
+  "dozens" = dontDistribute super."dozens";
+  "dph-base" = dontDistribute super."dph-base";
+  "dph-examples" = dontDistribute super."dph-examples";
+  "dph-lifted-base" = dontDistribute super."dph-lifted-base";
+  "dph-lifted-copy" = dontDistribute super."dph-lifted-copy";
+  "dph-lifted-vseg" = dontDistribute super."dph-lifted-vseg";
+  "dph-par" = dontDistribute super."dph-par";
+  "dph-prim-interface" = dontDistribute super."dph-prim-interface";
+  "dph-prim-par" = dontDistribute super."dph-prim-par";
+  "dph-prim-seq" = dontDistribute super."dph-prim-seq";
+  "dph-seq" = dontDistribute super."dph-seq";
+  "dpkg" = dontDistribute super."dpkg";
+  "drClickOn" = dontDistribute super."drClickOn";
+  "draw-poker" = dontDistribute super."draw-poker";
+  "drawille" = dontDistribute super."drawille";
+  "drifter" = dontDistribute super."drifter";
+  "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "dropbox-sdk" = dontDistribute super."dropbox-sdk";
+  "dropsolve" = dontDistribute super."dropsolve";
+  "ds-kanren" = dontDistribute super."ds-kanren";
+  "dsh-sql" = dontDistribute super."dsh-sql";
+  "dsmc" = dontDistribute super."dsmc";
+  "dsmc-tools" = dontDistribute super."dsmc-tools";
+  "dson" = dontDistribute super."dson";
+  "dson-parsec" = dontDistribute super."dson-parsec";
+  "dsp" = dontDistribute super."dsp";
+  "dstring" = dontDistribute super."dstring";
+  "dtab" = dontDistribute super."dtab";
+  "dtd" = dontDistribute super."dtd";
+  "dtd-text" = dontDistribute super."dtd-text";
+  "dtd-types" = dontDistribute super."dtd-types";
+  "dtrace" = dontDistribute super."dtrace";
+  "dtw" = dontDistribute super."dtw";
+  "dump" = dontDistribute super."dump";
+  "duplo" = dontDistribute super."duplo";
+  "dvda" = dontDistribute super."dvda";
+  "dvdread" = dontDistribute super."dvdread";
+  "dvi-processing" = dontDistribute super."dvi-processing";
+  "dvorak" = dontDistribute super."dvorak";
+  "dwarf" = dontDistribute super."dwarf";
+  "dwarf-el" = dontDistribute super."dwarf-el";
+  "dwarfadt" = dontDistribute super."dwarfadt";
+  "dx9base" = dontDistribute super."dx9base";
+  "dx9d3d" = dontDistribute super."dx9d3d";
+  "dx9d3dx" = dontDistribute super."dx9d3dx";
+  "dynamic-cabal" = dontDistribute super."dynamic-cabal";
+  "dynamic-graph" = dontDistribute super."dynamic-graph";
+  "dynamic-linker-template" = dontDistribute super."dynamic-linker-template";
+  "dynamic-loader" = dontDistribute super."dynamic-loader";
+  "dynamic-mvector" = dontDistribute super."dynamic-mvector";
+  "dynamic-object" = dontDistribute super."dynamic-object";
+  "dynamic-plot" = dontDistribute super."dynamic-plot";
+  "dynamic-pp" = dontDistribute super."dynamic-pp";
+  "dynamic-state" = dontDistribute super."dynamic-state";
+  "dynobud" = dontDistribute super."dynobud";
+  "dyre" = dontDistribute super."dyre";
+  "dywapitchtrack" = dontDistribute super."dywapitchtrack";
+  "dzen-utils" = dontDistribute super."dzen-utils";
+  "eager-sockets" = dontDistribute super."eager-sockets";
+  "easy-api" = dontDistribute super."easy-api";
+  "easy-bitcoin" = dontDistribute super."easy-bitcoin";
+  "easyjson" = dontDistribute super."easyjson";
+  "easyplot" = dontDistribute super."easyplot";
+  "easyrender" = dontDistribute super."easyrender";
+  "ebeats" = dontDistribute super."ebeats";
+  "ebnf-bff" = dontDistribute super."ebnf-bff";
+  "ec2-signature" = dontDistribute super."ec2-signature";
+  "ecdsa" = dontDistribute super."ecdsa";
+  "ecma262" = dontDistribute super."ecma262";
+  "ecu" = dontDistribute super."ecu";
+  "ed25519" = dontDistribute super."ed25519";
+  "ed25519-donna" = dontDistribute super."ed25519-donna";
+  "eddie" = dontDistribute super."eddie";
+  "edenmodules" = dontDistribute super."edenmodules";
+  "edenskel" = dontDistribute super."edenskel";
+  "edentv" = dontDistribute super."edentv";
+  "edge" = dontDistribute super."edge";
+  "edis" = dontDistribute super."edis";
+  "edit-distance-vector" = dontDistribute super."edit-distance-vector";
+  "edit-lenses" = dontDistribute super."edit-lenses";
+  "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
+  "editable" = dontDistribute super."editable";
+  "editline" = dontDistribute super."editline";
+  "effect-monad" = dontDistribute super."effect-monad";
+  "effective-aspects" = dontDistribute super."effective-aspects";
+  "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
+  "effects" = dontDistribute super."effects";
+  "effects-parser" = dontDistribute super."effects-parser";
+  "effin" = dontDistribute super."effin";
+  "egison" = dontDistribute super."egison";
+  "egison-quote" = dontDistribute super."egison-quote";
+  "egison-tutorial" = dontDistribute super."egison-tutorial";
+  "ehaskell" = dontDistribute super."ehaskell";
+  "ehs" = dontDistribute super."ehs";
+  "eibd-client-simple" = dontDistribute super."eibd-client-simple";
+  "eigen" = dontDistribute super."eigen";
+  "either-unwrap" = dontDistribute super."either-unwrap";
+  "eithers" = dontDistribute super."eithers";
+  "ekg" = dontDistribute super."ekg";
+  "ekg-bosun" = dontDistribute super."ekg-bosun";
+  "ekg-carbon" = dontDistribute super."ekg-carbon";
+  "ekg-json" = dontDistribute super."ekg-json";
+  "ekg-log" = dontDistribute super."ekg-log";
+  "ekg-push" = dontDistribute super."ekg-push";
+  "ekg-rrd" = dontDistribute super."ekg-rrd";
+  "ekg-statsd" = dontDistribute super."ekg-statsd";
+  "electrum-mnemonic" = dontDistribute super."electrum-mnemonic";
+  "elerea" = dontDistribute super."elerea";
+  "elerea-examples" = dontDistribute super."elerea-examples";
+  "elerea-sdl" = dontDistribute super."elerea-sdl";
+  "elevator" = dontDistribute super."elevator";
+  "elf" = dontDistribute super."elf";
+  "elm-bridge" = dontDistribute super."elm-bridge";
+  "elm-build-lib" = dontDistribute super."elm-build-lib";
+  "elm-compiler" = dontDistribute super."elm-compiler";
+  "elm-get" = dontDistribute super."elm-get";
+  "elm-init" = dontDistribute super."elm-init";
+  "elm-make" = dontDistribute super."elm-make";
+  "elm-package" = dontDistribute super."elm-package";
+  "elm-reactor" = dontDistribute super."elm-reactor";
+  "elm-repl" = dontDistribute super."elm-repl";
+  "elm-server" = dontDistribute super."elm-server";
+  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
+  "elocrypt" = dontDistribute super."elocrypt";
+  "emacs-keys" = dontDistribute super."emacs-keys";
+  "email" = dontDistribute super."email";
+  "email-header" = dontDistribute super."email-header";
+  "email-postmark" = dontDistribute super."email-postmark";
+  "email-validator" = dontDistribute super."email-validator";
+  "embeddock" = dontDistribute super."embeddock";
+  "embeddock-example" = dontDistribute super."embeddock-example";
+  "embroidery" = dontDistribute super."embroidery";
+  "emgm" = dontDistribute super."emgm";
+  "empty" = dontDistribute super."empty";
+  "encoding" = dontDistribute super."encoding";
+  "endo" = dontDistribute super."endo";
+  "engine-io-snap" = dontDistribute super."engine-io-snap";
+  "engine-io-wai" = dontDistribute super."engine-io-wai";
+  "engine-io-yesod" = dontDistribute super."engine-io-yesod";
+  "engineering-units" = dontDistribute super."engineering-units";
+  "enumerable" = dontDistribute super."enumerable";
+  "enumerate" = dontDistribute super."enumerate";
+  "enumeration" = dontDistribute super."enumeration";
+  "enumerator-fd" = dontDistribute super."enumerator-fd";
+  "enumerator-tf" = dontDistribute super."enumerator-tf";
+  "enumfun" = dontDistribute super."enumfun";
+  "enummapmap" = dontDistribute super."enummapmap";
+  "enummapset" = dontDistribute super."enummapset";
+  "enummapset-th" = dontDistribute super."enummapset-th";
+  "enumset" = dontDistribute super."enumset";
+  "env-parser" = dontDistribute super."env-parser";
+  "envparse" = dontDistribute super."envparse";
+  "envy" = dontDistribute super."envy";
+  "epanet-haskell" = dontDistribute super."epanet-haskell";
+  "epass" = dontDistribute super."epass";
+  "epic" = dontDistribute super."epic";
+  "epoll" = dontDistribute super."epoll";
+  "eprocess" = dontDistribute super."eprocess";
+  "epub" = dontDistribute super."epub";
+  "epub-metadata" = dontDistribute super."epub-metadata";
+  "epub-tools" = dontDistribute super."epub-tools";
+  "epubname" = dontDistribute super."epubname";
+  "equal-files" = dontDistribute super."equal-files";
+  "equational-reasoning" = dontDistribute super."equational-reasoning";
+  "erd" = dontDistribute super."erd";
+  "erf-native" = dontDistribute super."erf-native";
+  "erlang" = dontDistribute super."erlang";
+  "eros" = dontDistribute super."eros";
+  "eros-client" = dontDistribute super."eros-client";
+  "eros-http" = dontDistribute super."eros-http";
+  "errno" = dontDistribute super."errno";
+  "error-analyze" = dontDistribute super."error-analyze";
+  "error-continuations" = dontDistribute super."error-continuations";
+  "error-list" = dontDistribute super."error-list";
+  "error-loc" = dontDistribute super."error-loc";
+  "error-location" = dontDistribute super."error-location";
+  "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
+  "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance";
+  "ersatz" = dontDistribute super."ersatz";
+  "ersatz-toysat" = dontDistribute super."ersatz-toysat";
+  "ert" = dontDistribute super."ert";
+  "esotericbot" = dontDistribute super."esotericbot";
+  "ess" = dontDistribute super."ess";
+  "estimator" = dontDistribute super."estimator";
+  "estimators" = dontDistribute super."estimators";
+  "estreps" = dontDistribute super."estreps";
+  "etcd" = dontDistribute super."etcd";
+  "eternal" = dontDistribute super."eternal";
+  "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell";
+  "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db";
+  "ethereum-rlp" = dontDistribute super."ethereum-rlp";
+  "ety" = dontDistribute super."ety";
+  "euler" = dontDistribute super."euler";
+  "euphoria" = dontDistribute super."euphoria";
+  "eurofxref" = dontDistribute super."eurofxref";
+  "event-driven" = dontDistribute super."event-driven";
+  "event-handlers" = dontDistribute super."event-handlers";
+  "event-list" = dontDistribute super."event-list";
+  "event-monad" = dontDistribute super."event-monad";
+  "eventloop" = dontDistribute super."eventloop";
+  "eventstore" = dontDistribute super."eventstore";
+  "every-bit-counts" = dontDistribute super."every-bit-counts";
+  "ewe" = dontDistribute super."ewe";
+  "ex-pool" = dontDistribute super."ex-pool";
+  "exact-combinatorics" = dontDistribute super."exact-combinatorics";
+  "exact-pi" = dontDistribute super."exact-pi";
+  "exact-real" = dontDistribute super."exact-real";
+  "exception-hierarchy" = dontDistribute super."exception-hierarchy";
+  "exception-mailer" = dontDistribute super."exception-mailer";
+  "exception-monads-fd" = dontDistribute super."exception-monads-fd";
+  "exception-monads-tf" = dontDistribute super."exception-monads-tf";
+  "exherbo-cabal" = dontDistribute super."exherbo-cabal";
+  "exif" = dontDistribute super."exif";
+  "exinst" = dontDistribute super."exinst";
+  "exinst-aeson" = dontDistribute super."exinst-aeson";
+  "exinst-bytes" = dontDistribute super."exinst-bytes";
+  "exinst-deepseq" = dontDistribute super."exinst-deepseq";
+  "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "exists" = dontDistribute super."exists";
+  "exit-codes" = dontDistribute super."exit-codes";
+  "exp-extended" = dontDistribute super."exp-extended";
+  "exp-pairs" = dontDistribute super."exp-pairs";
+  "expand" = dontDistribute super."expand";
+  "expat-enumerator" = dontDistribute super."expat-enumerator";
+  "expiring-mvar" = dontDistribute super."expiring-mvar";
+  "explain" = dontDistribute super."explain";
+  "explicit-determinant" = dontDistribute super."explicit-determinant";
+  "explicit-exception" = dontDistribute super."explicit-exception";
+  "explicit-iomodes" = dontDistribute super."explicit-iomodes";
+  "explicit-iomodes-bytestring" = dontDistribute super."explicit-iomodes-bytestring";
+  "explicit-iomodes-text" = dontDistribute super."explicit-iomodes-text";
+  "explicit-sharing" = dontDistribute super."explicit-sharing";
+  "explore" = dontDistribute super."explore";
+  "exposed-containers" = dontDistribute super."exposed-containers";
+  "expression-parser" = dontDistribute super."expression-parser";
+  "extcore" = dontDistribute super."extcore";
+  "extemp" = dontDistribute super."extemp";
+  "extended-categories" = dontDistribute super."extended-categories";
+  "extended-reals" = dontDistribute super."extended-reals";
+  "extensible" = dontDistribute super."extensible";
+  "extensible-data" = dontDistribute super."extensible-data";
+  "extensible-effects" = dontDistribute super."extensible-effects";
+  "external-sort" = dontDistribute super."external-sort";
+  "extract-dependencies" = dontDistribute super."extract-dependencies";
+  "extractelf" = dontDistribute super."extractelf";
+  "ez-couch" = dontDistribute super."ez-couch";
+  "faceted" = dontDistribute super."faceted";
+  "factory" = dontDistribute super."factory";
+  "factual-api" = dontDistribute super."factual-api";
+  "fad" = dontDistribute super."fad";
+  "failable-list" = dontDistribute super."failable-list";
+  "failure" = dontDistribute super."failure";
+  "fair-predicates" = dontDistribute super."fair-predicates";
+  "fake-type" = dontDistribute super."fake-type";
+  "faker" = dontDistribute super."faker";
+  "falling-turnip" = dontDistribute super."falling-turnip";
+  "fallingblocks" = dontDistribute super."fallingblocks";
+  "family-tree" = dontDistribute super."family-tree";
+  "farmhash" = dontDistribute super."farmhash";
+  "fast-digits" = dontDistribute super."fast-digits";
+  "fast-math" = dontDistribute super."fast-math";
+  "fast-tags" = dontDistribute super."fast-tags";
+  "fast-tagsoup" = dontDistribute super."fast-tagsoup";
+  "fast-tagsoup-utf8-only" = dontDistribute super."fast-tagsoup-utf8-only";
+  "fasta" = dontDistribute super."fasta";
+  "fastbayes" = dontDistribute super."fastbayes";
+  "fastcgi" = dontDistribute super."fastcgi";
+  "fastedit" = dontDistribute super."fastedit";
+  "fastirc" = dontDistribute super."fastirc";
+  "fault-tree" = dontDistribute super."fault-tree";
+  "fay" = doDistribute super."fay_0_23_1_8";
+  "fay-geoposition" = dontDistribute super."fay-geoposition";
+  "fay-hsx" = dontDistribute super."fay-hsx";
+  "fay-ref" = dontDistribute super."fay-ref";
+  "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
+  "fcd" = dontDistribute super."fcd";
+  "fckeditor" = dontDistribute super."fckeditor";
+  "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
+  "fdo-trash" = dontDistribute super."fdo-trash";
+  "fec" = dontDistribute super."fec";
+  "fedora-packages" = dontDistribute super."fedora-packages";
+  "feed-cli" = dontDistribute super."feed-cli";
+  "feed-collect" = dontDistribute super."feed-collect";
+  "feed-crawl" = dontDistribute super."feed-crawl";
+  "feed-translator" = dontDistribute super."feed-translator";
+  "feed2lj" = dontDistribute super."feed2lj";
+  "feed2twitter" = dontDistribute super."feed2twitter";
+  "feldspar-compiler" = dontDistribute super."feldspar-compiler";
+  "feldspar-language" = dontDistribute super."feldspar-language";
+  "feldspar-signal" = dontDistribute super."feldspar-signal";
+  "fen2s" = dontDistribute super."fen2s";
+  "fences" = dontDistribute super."fences";
+  "fenfire" = dontDistribute super."fenfire";
+  "fez-conf" = dontDistribute super."fez-conf";
+  "ffeed" = dontDistribute super."ffeed";
+  "fficxx" = dontDistribute super."fficxx";
+  "fficxx-runtime" = dontDistribute super."fficxx-runtime";
+  "ffmpeg-light" = dontDistribute super."ffmpeg-light";
+  "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials";
+  "fft" = dontDistribute super."fft";
+  "fftwRaw" = dontDistribute super."fftwRaw";
+  "fgl-arbitrary" = dontDistribute super."fgl-arbitrary";
+  "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions";
+  "fgl-visualize" = dontDistribute super."fgl-visualize";
+  "fibon" = dontDistribute super."fibon";
+  "fibonacci" = dontDistribute super."fibonacci";
+  "fields" = dontDistribute super."fields";
+  "fields-json" = dontDistribute super."fields-json";
+  "fieldwise" = dontDistribute super."fieldwise";
+  "fig" = dontDistribute super."fig";
+  "file-collection" = dontDistribute super."file-collection";
+  "file-command-qq" = dontDistribute super."file-command-qq";
+  "file-modules" = dontDistribute super."file-modules";
+  "filecache" = dontDistribute super."filecache";
+  "filediff" = dontDistribute super."filediff";
+  "filepath-io-access" = dontDistribute super."filepath-io-access";
+  "filepather" = dontDistribute super."filepather";
+  "filestore" = dontDistribute super."filestore";
+  "filesystem-conduit" = dontDistribute super."filesystem-conduit";
+  "filesystem-enumerator" = dontDistribute super."filesystem-enumerator";
+  "filesystem-trees" = dontDistribute super."filesystem-trees";
+  "filtrable" = dontDistribute super."filtrable";
+  "final" = dontDistribute super."final";
+  "find-conduit" = dontDistribute super."find-conduit";
+  "fingertree-tf" = dontDistribute super."fingertree-tf";
+  "finite-field" = dontDistribute super."finite-field";
+  "finite-typelits" = dontDistribute super."finite-typelits";
+  "first-and-last" = dontDistribute super."first-and-last";
+  "first-class-patterns" = dontDistribute super."first-class-patterns";
+  "firstify" = dontDistribute super."firstify";
+  "fishfood" = dontDistribute super."fishfood";
+  "fit" = dontDistribute super."fit";
+  "fitsio" = dontDistribute super."fitsio";
+  "fix-imports" = dontDistribute super."fix-imports";
+  "fix-parser-simple" = dontDistribute super."fix-parser-simple";
+  "fix-symbols-gitit" = dontDistribute super."fix-symbols-gitit";
+  "fixed-length" = dontDistribute super."fixed-length";
+  "fixed-point" = dontDistribute super."fixed-point";
+  "fixed-point-vector" = dontDistribute super."fixed-point-vector";
+  "fixed-point-vector-space" = dontDistribute super."fixed-point-vector-space";
+  "fixed-precision" = dontDistribute super."fixed-precision";
+  "fixed-storable-array" = dontDistribute super."fixed-storable-array";
+  "fixed-vector-binary" = dontDistribute super."fixed-vector-binary";
+  "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal";
+  "fixedprec" = dontDistribute super."fixedprec";
+  "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixhs" = dontDistribute super."fixhs";
+  "fixplate" = dontDistribute super."fixplate";
+  "fixpoint" = dontDistribute super."fixpoint";
+  "fixtime" = dontDistribute super."fixtime";
+  "fizz-buzz" = dontDistribute super."fizz-buzz";
+  "flaccuraterip" = dontDistribute super."flaccuraterip";
+  "flamethrower" = dontDistribute super."flamethrower";
+  "flamingra" = dontDistribute super."flamingra";
+  "flat-maybe" = dontDistribute super."flat-maybe";
+  "flat-mcmc" = dontDistribute super."flat-mcmc";
+  "flat-tex" = dontDistribute super."flat-tex";
+  "flexible-time" = dontDistribute super."flexible-time";
+  "flexible-unlit" = dontDistribute super."flexible-unlit";
+  "flexiwrap" = dontDistribute super."flexiwrap";
+  "flexiwrap-smallcheck" = dontDistribute super."flexiwrap-smallcheck";
+  "flickr" = dontDistribute super."flickr";
+  "flippers" = dontDistribute super."flippers";
+  "flite" = dontDistribute super."flite";
+  "flo" = dontDistribute super."flo";
+  "float-binstring" = dontDistribute super."float-binstring";
+  "floating-bits" = dontDistribute super."floating-bits";
+  "floatshow" = dontDistribute super."floatshow";
+  "flow2dot" = dontDistribute super."flow2dot";
+  "flowdock-api" = dontDistribute super."flowdock-api";
+  "flowdock-rest" = dontDistribute super."flowdock-rest";
+  "flower" = dontDistribute super."flower";
+  "flowlocks-framework" = dontDistribute super."flowlocks-framework";
+  "flowsim" = dontDistribute super."flowsim";
+  "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fluent-logger" = dontDistribute super."fluent-logger";
+  "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
+  "fluidsynth" = dontDistribute super."fluidsynth";
+  "fmark" = dontDistribute super."fmark";
+  "fn" = dontDistribute super."fn";
+  "fn-extra" = dontDistribute super."fn-extra";
+  "fold-debounce" = dontDistribute super."fold-debounce";
+  "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit";
+  "foldl-incremental" = dontDistribute super."foldl-incremental";
+  "foldl-transduce" = dontDistribute super."foldl-transduce";
+  "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec";
+  "folds" = dontDistribute super."folds";
+  "folds-common" = dontDistribute super."folds-common";
+  "follower" = dontDistribute super."follower";
+  "foma" = dontDistribute super."foma";
+  "font-opengl-basic4x6" = dontDistribute super."font-opengl-basic4x6";
+  "foo" = dontDistribute super."foo";
+  "for-free" = dontDistribute super."for-free";
+  "forbidden-fruit" = dontDistribute super."forbidden-fruit";
+  "fordo" = dontDistribute super."fordo";
+  "forecast-io" = dontDistribute super."forecast-io";
+  "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric";
+  "foreign-var" = dontDistribute super."foreign-var";
+  "forger" = dontDistribute super."forger";
+  "forkable-monad" = dontDistribute super."forkable-monad";
+  "formal" = dontDistribute super."formal";
+  "format" = dontDistribute super."format";
+  "format-status" = dontDistribute super."format-status";
+  "formattable" = dontDistribute super."formattable";
+  "forml" = dontDistribute super."forml";
+  "formlets" = dontDistribute super."formlets";
+  "formlets-hsp" = dontDistribute super."formlets-hsp";
+  "formura" = dontDistribute super."formura";
+  "forth-hll" = dontDistribute super."forth-hll";
+  "foscam-directory" = dontDistribute super."foscam-directory";
+  "foscam-filename" = dontDistribute super."foscam-filename";
+  "foscam-sort" = dontDistribute super."foscam-sort";
+  "fountain" = dontDistribute super."fountain";
+  "fpco-api" = dontDistribute super."fpco-api";
+  "fpipe" = dontDistribute super."fpipe";
+  "fpnla" = dontDistribute super."fpnla";
+  "fpnla-examples" = dontDistribute super."fpnla-examples";
+  "fptest" = dontDistribute super."fptest";
+  "fquery" = dontDistribute super."fquery";
+  "fractal" = dontDistribute super."fractal";
+  "fractals" = dontDistribute super."fractals";
+  "fraction" = dontDistribute super."fraction";
+  "frag" = dontDistribute super."frag";
+  "frame" = dontDistribute super."frame";
+  "frame-markdown" = dontDistribute super."frame-markdown";
+  "franchise" = dontDistribute super."franchise";
+  "free-concurrent" = dontDistribute super."free-concurrent";
+  "free-functors" = dontDistribute super."free-functors";
+  "free-game" = dontDistribute super."free-game";
+  "free-http" = dontDistribute super."free-http";
+  "free-operational" = dontDistribute super."free-operational";
+  "free-theorems" = dontDistribute super."free-theorems";
+  "free-theorems-counterexamples" = dontDistribute super."free-theorems-counterexamples";
+  "free-theorems-seq" = dontDistribute super."free-theorems-seq";
+  "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
+  "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
+  "freekick2" = dontDistribute super."freekick2";
+  "freenect" = doDistribute super."freenect_1_2";
+  "freer" = dontDistribute super."freer";
+  "freesect" = dontDistribute super."freesect";
+  "freesound" = dontDistribute super."freesound";
+  "freetype-simple" = dontDistribute super."freetype-simple";
+  "freetype2" = dontDistribute super."freetype2";
+  "fresh" = dontDistribute super."fresh";
+  "friday" = dontDistribute super."friday";
+  "friday-devil" = dontDistribute super."friday-devil";
+  "friday-juicypixels" = dontDistribute super."friday-juicypixels";
+  "friday-scale-dct" = dontDistribute super."friday-scale-dct";
+  "friendly-time" = dontDistribute super."friendly-time";
+  "frontmatter" = dontDistribute super."frontmatter";
+  "frp-arduino" = dontDistribute super."frp-arduino";
+  "frpnow" = dontDistribute super."frpnow";
+  "frpnow-gloss" = dontDistribute super."frpnow-gloss";
+  "frpnow-gtk" = dontDistribute super."frpnow-gtk";
+  "frquotes" = dontDistribute super."frquotes";
+  "fs-events" = dontDistribute super."fs-events";
+  "fsharp" = dontDistribute super."fsharp";
+  "fsmActions" = dontDistribute super."fsmActions";
+  "fst" = dontDistribute super."fst";
+  "fsutils" = dontDistribute super."fsutils";
+  "fswatcher" = dontDistribute super."fswatcher";
+  "ftdi" = dontDistribute super."ftdi";
+  "ftp-conduit" = dontDistribute super."ftp-conduit";
+  "ftphs" = dontDistribute super."ftphs";
+  "ftree" = dontDistribute super."ftree";
+  "ftshell" = dontDistribute super."ftshell";
+  "fugue" = dontDistribute super."fugue";
+  "full-sessions" = dontDistribute super."full-sessions";
+  "full-text-search" = dontDistribute super."full-text-search";
+  "fullstop" = dontDistribute super."fullstop";
+  "funbot" = dontDistribute super."funbot";
+  "funbot-client" = dontDistribute super."funbot-client";
+  "funbot-ext-events" = dontDistribute super."funbot-ext-events";
+  "funbot-git-hook" = dontDistribute super."funbot-git-hook";
+  "funcmp" = dontDistribute super."funcmp";
+  "function-combine" = dontDistribute super."function-combine";
+  "function-instances-algebra" = dontDistribute super."function-instances-algebra";
+  "functional-arrow" = dontDistribute super."functional-arrow";
+  "functional-kmp" = dontDistribute super."functional-kmp";
+  "functor-apply" = dontDistribute super."functor-apply";
+  "functor-combo" = dontDistribute super."functor-combo";
+  "functor-infix" = dontDistribute super."functor-infix";
+  "functor-monadic" = dontDistribute super."functor-monadic";
+  "functor-utils" = dontDistribute super."functor-utils";
+  "functorm" = dontDistribute super."functorm";
+  "functors" = dontDistribute super."functors";
+  "funion" = dontDistribute super."funion";
+  "funpat" = dontDistribute super."funpat";
+  "funsat" = dontDistribute super."funsat";
+  "fusion" = dontDistribute super."fusion";
+  "futun" = dontDistribute super."futun";
+  "future" = dontDistribute super."future";
+  "future-resource" = dontDistribute super."future-resource";
+  "fuzzy" = dontDistribute super."fuzzy";
+  "fuzzy-timings" = dontDistribute super."fuzzy-timings";
+  "fuzzytime" = dontDistribute super."fuzzytime";
+  "fwgl" = dontDistribute super."fwgl";
+  "fwgl-glfw" = dontDistribute super."fwgl-glfw";
+  "fwgl-javascript" = dontDistribute super."fwgl-javascript";
+  "g-npm" = dontDistribute super."g-npm";
+  "gact" = dontDistribute super."gact";
+  "game-of-life" = dontDistribute super."game-of-life";
+  "game-probability" = dontDistribute super."game-probability";
+  "game-tree" = dontDistribute super."game-tree";
+  "gameclock" = dontDistribute super."gameclock";
+  "gamma" = dontDistribute super."gamma";
+  "gang-of-threads" = dontDistribute super."gang-of-threads";
+  "garepinoh" = dontDistribute super."garepinoh";
+  "garsia-wachs" = dontDistribute super."garsia-wachs";
+  "gbu" = dontDistribute super."gbu";
+  "gc" = dontDistribute super."gc";
+  "gc-monitoring-wai" = dontDistribute super."gc-monitoring-wai";
+  "gconf" = dontDistribute super."gconf";
+  "gdiff" = dontDistribute super."gdiff";
+  "gdiff-ig" = dontDistribute super."gdiff-ig";
+  "gdiff-th" = dontDistribute super."gdiff-th";
+  "gearbox" = dontDistribute super."gearbox";
+  "geek" = dontDistribute super."geek";
+  "geek-server" = dontDistribute super."geek-server";
+  "gelatin" = dontDistribute super."gelatin";
+  "gemstone" = dontDistribute super."gemstone";
+  "gencheck" = dontDistribute super."gencheck";
+  "gender" = dontDistribute super."gender";
+  "genders" = dontDistribute super."genders";
+  "general-prelude" = dontDistribute super."general-prelude";
+  "generator" = dontDistribute super."generator";
+  "generators" = dontDistribute super."generators";
+  "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-binary" = dontDistribute super."generic-binary";
+  "generic-church" = dontDistribute super."generic-church";
+  "generic-deepseq" = dontDistribute super."generic-deepseq";
+  "generic-deriving" = doDistribute super."generic-deriving_1_8_0";
+  "generic-lucid-scaffold" = dontDistribute super."generic-lucid-scaffold";
+  "generic-maybe" = dontDistribute super."generic-maybe";
+  "generic-pretty" = dontDistribute super."generic-pretty";
+  "generic-server" = dontDistribute super."generic-server";
+  "generic-storable" = dontDistribute super."generic-storable";
+  "generic-tree" = dontDistribute super."generic-tree";
+  "generic-trie" = dontDistribute super."generic-trie";
+  "generic-xml" = dontDistribute super."generic-xml";
+  "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
+  "genericserialize" = dontDistribute super."genericserialize";
+  "genetics" = dontDistribute super."genetics";
+  "geni-gui" = dontDistribute super."geni-gui";
+  "geni-util" = dontDistribute super."geni-util";
+  "geniconvert" = dontDistribute super."geniconvert";
+  "genifunctors" = dontDistribute super."genifunctors";
+  "geniplate" = dontDistribute super."geniplate";
+  "geniserver" = dontDistribute super."geniserver";
+  "genprog" = dontDistribute super."genprog";
+  "gentlemark" = dontDistribute super."gentlemark";
+  "geo-resolver" = dontDistribute super."geo-resolver";
+  "geo-uk" = dontDistribute super."geo-uk";
+  "geocalc" = dontDistribute super."geocalc";
+  "geocode-google" = dontDistribute super."geocode-google";
+  "geodetic" = dontDistribute super."geodetic";
+  "geodetics" = dontDistribute super."geodetics";
+  "geohash" = dontDistribute super."geohash";
+  "geoip2" = dontDistribute super."geoip2";
+  "geojson" = dontDistribute super."geojson";
+  "geom2d" = dontDistribute super."geom2d";
+  "getemx" = dontDistribute super."getemx";
+  "getflag" = dontDistribute super."getflag";
+  "getopt-generics" = doDistribute super."getopt-generics_0_10_0_1";
+  "getopt-simple" = dontDistribute super."getopt-simple";
+  "gf" = dontDistribute super."gf";
+  "ggtsTC" = dontDistribute super."ggtsTC";
+  "ghc-core" = dontDistribute super."ghc-core";
+  "ghc-core-html" = dontDistribute super."ghc-core-html";
+  "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dup" = dontDistribute super."ghc-dup";
+  "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
+  "ghc-events-parallel" = dontDistribute super."ghc-events-parallel";
+  "ghc-exactprint" = dontDistribute super."ghc-exactprint";
+  "ghc-gc-tune" = dontDistribute super."ghc-gc-tune";
+  "ghc-generic-instances" = dontDistribute super."ghc-generic-instances";
+  "ghc-heap-view" = dontDistribute super."ghc-heap-view";
+  "ghc-imported-from" = dontDistribute super."ghc-imported-from";
+  "ghc-make" = dontDistribute super."ghc-make";
+  "ghc-man-completion" = dontDistribute super."ghc-man-completion";
+  "ghc-mod" = dontDistribute super."ghc-mod";
+  "ghc-options" = dontDistribute super."ghc-options";
+  "ghc-parmake" = dontDistribute super."ghc-parmake";
+  "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix";
+  "ghc-pkg-lib" = dontDistribute super."ghc-pkg-lib";
+  "ghc-prof-flamegraph" = dontDistribute super."ghc-prof-flamegraph";
+  "ghc-server" = dontDistribute super."ghc-server";
+  "ghc-session" = dontDistribute super."ghc-session";
+  "ghc-simple" = dontDistribute super."ghc-simple";
+  "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin";
+  "ghc-syb" = dontDistribute super."ghc-syb";
+  "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
+  "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra";
+  "ghc-vis" = dontDistribute super."ghc-vis";
+  "ghci-diagrams" = dontDistribute super."ghci-diagrams";
+  "ghci-haskeline" = dontDistribute super."ghci-haskeline";
+  "ghci-lib" = dontDistribute super."ghci-lib";
+  "ghci-ng" = dontDistribute super."ghci-ng";
+  "ghci-pretty" = dontDistribute super."ghci-pretty";
+  "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
+  "ghcjs-dom" = dontDistribute super."ghcjs-dom";
+  "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
+  "ghcjs-websockets" = dontDistribute super."ghcjs-websockets";
+  "ghclive" = dontDistribute super."ghclive";
+  "ghczdecode" = dontDistribute super."ghczdecode";
+  "ght" = dontDistribute super."ght";
+  "gi-atk" = dontDistribute super."gi-atk";
+  "gi-cairo" = dontDistribute super."gi-cairo";
+  "gi-gdk" = dontDistribute super."gi-gdk";
+  "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
+  "gi-gio" = dontDistribute super."gi-gio";
+  "gi-glib" = dontDistribute super."gi-glib";
+  "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gtk" = dontDistribute super."gi-gtk";
+  "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
+  "gi-notify" = dontDistribute super."gi-notify";
+  "gi-pango" = dontDistribute super."gi-pango";
+  "gi-soup" = dontDistribute super."gi-soup";
+  "gi-vte" = dontDistribute super."gi-vte";
+  "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gimlh" = dontDistribute super."gimlh";
+  "ginger" = dontDistribute super."ginger";
+  "ginsu" = dontDistribute super."ginsu";
+  "gipeda" = doDistribute super."gipeda_0_1_2_1";
+  "gist" = dontDistribute super."gist";
+  "git-all" = dontDistribute super."git-all";
+  "git-annex" = doDistribute super."git-annex_5_20150727";
+  "git-checklist" = dontDistribute super."git-checklist";
+  "git-date" = dontDistribute super."git-date";
+  "git-embed" = dontDistribute super."git-embed";
+  "git-fmt" = dontDistribute super."git-fmt";
+  "git-freq" = dontDistribute super."git-freq";
+  "git-gpush" = dontDistribute super."git-gpush";
+  "git-jump" = dontDistribute super."git-jump";
+  "git-monitor" = dontDistribute super."git-monitor";
+  "git-object" = dontDistribute super."git-object";
+  "git-repair" = dontDistribute super."git-repair";
+  "git-sanity" = dontDistribute super."git-sanity";
+  "git-vogue" = dontDistribute super."git-vogue";
+  "gitHUD" = dontDistribute super."gitHUD";
+  "gitcache" = dontDistribute super."gitcache";
+  "gitdo" = dontDistribute super."gitdo";
+  "github" = dontDistribute super."github";
+  "github-backup" = dontDistribute super."github-backup";
+  "github-post-receive" = dontDistribute super."github-post-receive";
+  "github-types" = dontDistribute super."github-types";
+  "github-utils" = dontDistribute super."github-utils";
+  "github-webhook-handler" = dontDistribute super."github-webhook-handler";
+  "github-webhook-handler-snap" = dontDistribute super."github-webhook-handler-snap";
+  "gitignore" = dontDistribute super."gitignore";
+  "gitit" = dontDistribute super."gitit";
+  "gitlib-cmdline" = dontDistribute super."gitlib-cmdline";
+  "gitlib-cross" = dontDistribute super."gitlib-cross";
+  "gitlib-s3" = dontDistribute super."gitlib-s3";
+  "gitlib-sample" = dontDistribute super."gitlib-sample";
+  "gitlib-utils" = dontDistribute super."gitlib-utils";
+  "gitter" = dontDistribute super."gitter";
+  "gl-capture" = dontDistribute super."gl-capture";
+  "glade" = dontDistribute super."glade";
+  "gladexml-accessor" = dontDistribute super."gladexml-accessor";
+  "glambda" = dontDistribute super."glambda";
+  "glapp" = dontDistribute super."glapp";
+  "glasso" = dontDistribute super."glasso";
+  "glicko" = dontDistribute super."glicko";
+  "glider-nlp" = dontDistribute super."glider-nlp";
+  "glintcollider" = dontDistribute super."glintcollider";
+  "gll" = dontDistribute super."gll";
+  "global" = dontDistribute super."global";
+  "global-config" = dontDistribute super."global-config";
+  "global-lock" = dontDistribute super."global-lock";
+  "global-variables" = dontDistribute super."global-variables";
+  "glome-hs" = dontDistribute super."glome-hs";
+  "gloss" = dontDistribute super."gloss";
+  "gloss-accelerate" = dontDistribute super."gloss-accelerate";
+  "gloss-algorithms" = dontDistribute super."gloss-algorithms";
+  "gloss-banana" = dontDistribute super."gloss-banana";
+  "gloss-devil" = dontDistribute super."gloss-devil";
+  "gloss-examples" = dontDistribute super."gloss-examples";
+  "gloss-game" = dontDistribute super."gloss-game";
+  "gloss-juicy" = dontDistribute super."gloss-juicy";
+  "gloss-raster" = dontDistribute super."gloss-raster";
+  "gloss-raster-accelerate" = dontDistribute super."gloss-raster-accelerate";
+  "gloss-rendering" = dontDistribute super."gloss-rendering";
+  "gloss-sodium" = dontDistribute super."gloss-sodium";
+  "glpk-hs" = dontDistribute super."glpk-hs";
+  "glue" = dontDistribute super."glue";
+  "glue-common" = dontDistribute super."glue-common";
+  "glue-core" = dontDistribute super."glue-core";
+  "glue-ekg" = dontDistribute super."glue-ekg";
+  "glue-example" = dontDistribute super."glue-example";
+  "gluturtle" = dontDistribute super."gluturtle";
+  "gmap" = dontDistribute super."gmap";
+  "gmndl" = dontDistribute super."gmndl";
+  "gnome-desktop" = dontDistribute super."gnome-desktop";
+  "gnome-keyring" = dontDistribute super."gnome-keyring";
+  "gnomevfs" = dontDistribute super."gnomevfs";
+  "gnss-converters" = dontDistribute super."gnss-converters";
+  "gnuplot" = dontDistribute super."gnuplot";
+  "goa" = dontDistribute super."goa";
+  "goal-core" = dontDistribute super."goal-core";
+  "goal-geometry" = dontDistribute super."goal-geometry";
+  "goal-probability" = dontDistribute super."goal-probability";
+  "goal-simulation" = dontDistribute super."goal-simulation";
+  "goatee" = dontDistribute super."goatee";
+  "goatee-gtk" = dontDistribute super."goatee-gtk";
+  "gofer-prelude" = dontDistribute super."gofer-prelude";
+  "gogol" = dontDistribute super."gogol";
+  "gogol-adexchange-buyer" = dontDistribute super."gogol-adexchange-buyer";
+  "gogol-adexchange-seller" = dontDistribute super."gogol-adexchange-seller";
+  "gogol-admin-datatransfer" = dontDistribute super."gogol-admin-datatransfer";
+  "gogol-admin-directory" = dontDistribute super."gogol-admin-directory";
+  "gogol-admin-emailmigration" = dontDistribute super."gogol-admin-emailmigration";
+  "gogol-admin-reports" = dontDistribute super."gogol-admin-reports";
+  "gogol-adsense" = dontDistribute super."gogol-adsense";
+  "gogol-adsense-host" = dontDistribute super."gogol-adsense-host";
+  "gogol-affiliates" = dontDistribute super."gogol-affiliates";
+  "gogol-analytics" = dontDistribute super."gogol-analytics";
+  "gogol-android-enterprise" = dontDistribute super."gogol-android-enterprise";
+  "gogol-android-publisher" = dontDistribute super."gogol-android-publisher";
+  "gogol-appengine" = dontDistribute super."gogol-appengine";
+  "gogol-apps-activity" = dontDistribute super."gogol-apps-activity";
+  "gogol-apps-calendar" = dontDistribute super."gogol-apps-calendar";
+  "gogol-apps-licensing" = dontDistribute super."gogol-apps-licensing";
+  "gogol-apps-reseller" = dontDistribute super."gogol-apps-reseller";
+  "gogol-apps-tasks" = dontDistribute super."gogol-apps-tasks";
+  "gogol-appstate" = dontDistribute super."gogol-appstate";
+  "gogol-autoscaler" = dontDistribute super."gogol-autoscaler";
+  "gogol-bigquery" = dontDistribute super."gogol-bigquery";
+  "gogol-billing" = dontDistribute super."gogol-billing";
+  "gogol-blogger" = dontDistribute super."gogol-blogger";
+  "gogol-books" = dontDistribute super."gogol-books";
+  "gogol-civicinfo" = dontDistribute super."gogol-civicinfo";
+  "gogol-classroom" = dontDistribute super."gogol-classroom";
+  "gogol-cloudtrace" = dontDistribute super."gogol-cloudtrace";
+  "gogol-compute" = dontDistribute super."gogol-compute";
+  "gogol-container" = dontDistribute super."gogol-container";
+  "gogol-core" = dontDistribute super."gogol-core";
+  "gogol-customsearch" = dontDistribute super."gogol-customsearch";
+  "gogol-dataflow" = dontDistribute super."gogol-dataflow";
+  "gogol-datastore" = dontDistribute super."gogol-datastore";
+  "gogol-debugger" = dontDistribute super."gogol-debugger";
+  "gogol-deploymentmanager" = dontDistribute super."gogol-deploymentmanager";
+  "gogol-dfareporting" = dontDistribute super."gogol-dfareporting";
+  "gogol-discovery" = dontDistribute super."gogol-discovery";
+  "gogol-dns" = dontDistribute super."gogol-dns";
+  "gogol-doubleclick-bids" = dontDistribute super."gogol-doubleclick-bids";
+  "gogol-doubleclick-search" = dontDistribute super."gogol-doubleclick-search";
+  "gogol-drive" = dontDistribute super."gogol-drive";
+  "gogol-fitness" = dontDistribute super."gogol-fitness";
+  "gogol-fonts" = dontDistribute super."gogol-fonts";
+  "gogol-freebasesearch" = dontDistribute super."gogol-freebasesearch";
+  "gogol-fusiontables" = dontDistribute super."gogol-fusiontables";
+  "gogol-games" = dontDistribute super."gogol-games";
+  "gogol-games-configuration" = dontDistribute super."gogol-games-configuration";
+  "gogol-games-management" = dontDistribute super."gogol-games-management";
+  "gogol-genomics" = dontDistribute super."gogol-genomics";
+  "gogol-gmail" = dontDistribute super."gogol-gmail";
+  "gogol-groups-migration" = dontDistribute super."gogol-groups-migration";
+  "gogol-groups-settings" = dontDistribute super."gogol-groups-settings";
+  "gogol-identity-toolkit" = dontDistribute super."gogol-identity-toolkit";
+  "gogol-latencytest" = dontDistribute super."gogol-latencytest";
+  "gogol-logging" = dontDistribute super."gogol-logging";
+  "gogol-maps-coordinate" = dontDistribute super."gogol-maps-coordinate";
+  "gogol-maps-engine" = dontDistribute super."gogol-maps-engine";
+  "gogol-mirror" = dontDistribute super."gogol-mirror";
+  "gogol-monitoring" = dontDistribute super."gogol-monitoring";
+  "gogol-oauth2" = dontDistribute super."gogol-oauth2";
+  "gogol-pagespeed" = dontDistribute super."gogol-pagespeed";
+  "gogol-partners" = dontDistribute super."gogol-partners";
+  "gogol-play-moviespartner" = dontDistribute super."gogol-play-moviespartner";
+  "gogol-plus" = dontDistribute super."gogol-plus";
+  "gogol-plus-domains" = dontDistribute super."gogol-plus-domains";
+  "gogol-prediction" = dontDistribute super."gogol-prediction";
+  "gogol-proximitybeacon" = dontDistribute super."gogol-proximitybeacon";
+  "gogol-pubsub" = dontDistribute super."gogol-pubsub";
+  "gogol-qpxexpress" = dontDistribute super."gogol-qpxexpress";
+  "gogol-replicapool" = dontDistribute super."gogol-replicapool";
+  "gogol-replicapool-updater" = dontDistribute super."gogol-replicapool-updater";
+  "gogol-resourcemanager" = dontDistribute super."gogol-resourcemanager";
+  "gogol-resourceviews" = dontDistribute super."gogol-resourceviews";
+  "gogol-shopping-content" = dontDistribute super."gogol-shopping-content";
+  "gogol-siteverification" = dontDistribute super."gogol-siteverification";
+  "gogol-spectrum" = dontDistribute super."gogol-spectrum";
+  "gogol-sqladmin" = dontDistribute super."gogol-sqladmin";
+  "gogol-storage" = dontDistribute super."gogol-storage";
+  "gogol-storage-transfer" = dontDistribute super."gogol-storage-transfer";
+  "gogol-tagmanager" = dontDistribute super."gogol-tagmanager";
+  "gogol-taskqueue" = dontDistribute super."gogol-taskqueue";
+  "gogol-translate" = dontDistribute super."gogol-translate";
+  "gogol-urlshortener" = dontDistribute super."gogol-urlshortener";
+  "gogol-useraccounts" = dontDistribute super."gogol-useraccounts";
+  "gogol-webmaster-tools" = dontDistribute super."gogol-webmaster-tools";
+  "gogol-youtube" = dontDistribute super."gogol-youtube";
+  "gogol-youtube-analytics" = dontDistribute super."gogol-youtube-analytics";
+  "gogol-youtube-reporting" = dontDistribute super."gogol-youtube-reporting";
+  "gooey" = dontDistribute super."gooey";
+  "google-cloud" = dontDistribute super."google-cloud";
+  "google-dictionary" = dontDistribute super."google-dictionary";
+  "google-drive" = dontDistribute super."google-drive";
+  "google-html5-slide" = dontDistribute super."google-html5-slide";
+  "google-mail-filters" = dontDistribute super."google-mail-filters";
+  "google-oauth2" = dontDistribute super."google-oauth2";
+  "google-search" = dontDistribute super."google-search";
+  "google-translate" = dontDistribute super."google-translate";
+  "googleplus" = dontDistribute super."googleplus";
+  "googlepolyline" = dontDistribute super."googlepolyline";
+  "gopherbot" = dontDistribute super."gopherbot";
+  "gpah" = dontDistribute super."gpah";
+  "gpcsets" = dontDistribute super."gpcsets";
+  "gpolyline" = dontDistribute super."gpolyline";
+  "gps" = dontDistribute super."gps";
+  "gps2htmlReport" = dontDistribute super."gps2htmlReport";
+  "gpx-conduit" = dontDistribute super."gpx-conduit";
+  "graceful" = dontDistribute super."graceful";
+  "grammar-combinators" = dontDistribute super."grammar-combinators";
+  "grapefruit-examples" = dontDistribute super."grapefruit-examples";
+  "grapefruit-frp" = dontDistribute super."grapefruit-frp";
+  "grapefruit-records" = dontDistribute super."grapefruit-records";
+  "grapefruit-ui" = dontDistribute super."grapefruit-ui";
+  "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-generators" = dontDistribute super."graph-generators";
+  "graph-matchings" = dontDistribute super."graph-matchings";
+  "graph-rewriting" = dontDistribute super."graph-rewriting";
+  "graph-rewriting-cl" = dontDistribute super."graph-rewriting-cl";
+  "graph-rewriting-gl" = dontDistribute super."graph-rewriting-gl";
+  "graph-rewriting-lambdascope" = dontDistribute super."graph-rewriting-lambdascope";
+  "graph-rewriting-layout" = dontDistribute super."graph-rewriting-layout";
+  "graph-rewriting-ski" = dontDistribute super."graph-rewriting-ski";
+  "graph-rewriting-strategies" = dontDistribute super."graph-rewriting-strategies";
+  "graph-rewriting-trs" = dontDistribute super."graph-rewriting-trs";
+  "graph-rewriting-ww" = dontDistribute super."graph-rewriting-ww";
+  "graph-serialize" = dontDistribute super."graph-serialize";
+  "graph-utils" = dontDistribute super."graph-utils";
+  "graph-visit" = dontDistribute super."graph-visit";
+  "graphbuilder" = dontDistribute super."graphbuilder";
+  "graphene" = dontDistribute super."graphene";
+  "graphics-drawingcombinators" = dontDistribute super."graphics-drawingcombinators";
+  "graphics-formats-collada" = dontDistribute super."graphics-formats-collada";
+  "graphicsFormats" = dontDistribute super."graphicsFormats";
+  "graphicstools" = dontDistribute super."graphicstools";
+  "graphmod" = dontDistribute super."graphmod";
+  "graphql" = dontDistribute super."graphql";
+  "graphtype" = dontDistribute super."graphtype";
+  "graphviz" = dontDistribute super."graphviz";
+  "gray-code" = dontDistribute super."gray-code";
+  "gray-extended" = dontDistribute super."gray-extended";
+  "greencard" = dontDistribute super."greencard";
+  "greencard-lib" = dontDistribute super."greencard-lib";
+  "greg-client" = dontDistribute super."greg-client";
+  "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "grid" = dontDistribute super."grid";
+  "gridland" = dontDistribute super."gridland";
+  "grm" = dontDistribute super."grm";
+  "groom" = dontDistribute super."groom";
+  "groundhog-inspector" = dontDistribute super."groundhog-inspector";
+  "group-with" = dontDistribute super."group-with";
+  "grouped-list" = dontDistribute super."grouped-list";
+  "groupoid" = dontDistribute super."groupoid";
+  "gruff" = dontDistribute super."gruff";
+  "gruff-examples" = dontDistribute super."gruff-examples";
+  "gsc-weighting" = dontDistribute super."gsc-weighting";
+  "gsl-random" = dontDistribute super."gsl-random";
+  "gsl-random-fu" = dontDistribute super."gsl-random-fu";
+  "gsmenu" = dontDistribute super."gsmenu";
+  "gstreamer" = dontDistribute super."gstreamer";
+  "gt-tools" = dontDistribute super."gt-tools";
+  "gtfs" = dontDistribute super."gtfs";
+  "gtk" = doDistribute super."gtk_0_13_9";
+  "gtk-helpers" = dontDistribute super."gtk-helpers";
+  "gtk-jsinput" = dontDistribute super."gtk-jsinput";
+  "gtk-largeTreeStore" = dontDistribute super."gtk-largeTreeStore";
+  "gtk-mac-integration" = dontDistribute super."gtk-mac-integration";
+  "gtk-serialized-event" = dontDistribute super."gtk-serialized-event";
+  "gtk-simple-list-view" = dontDistribute super."gtk-simple-list-view";
+  "gtk-toggle-button-list" = dontDistribute super."gtk-toggle-button-list";
+  "gtk-toy" = dontDistribute super."gtk-toy";
+  "gtk-traymanager" = dontDistribute super."gtk-traymanager";
+  "gtk2hs-cast-glade" = dontDistribute super."gtk2hs-cast-glade";
+  "gtk2hs-cast-glib" = dontDistribute super."gtk2hs-cast-glib";
+  "gtk2hs-cast-gnomevfs" = dontDistribute super."gtk2hs-cast-gnomevfs";
+  "gtk2hs-cast-gtk" = dontDistribute super."gtk2hs-cast-gtk";
+  "gtk2hs-cast-gtkglext" = dontDistribute super."gtk2hs-cast-gtkglext";
+  "gtk2hs-cast-gtksourceview2" = dontDistribute super."gtk2hs-cast-gtksourceview2";
+  "gtk2hs-cast-th" = dontDistribute super."gtk2hs-cast-th";
+  "gtk2hs-hello" = dontDistribute super."gtk2hs-hello";
+  "gtk2hs-rpn" = dontDistribute super."gtk2hs-rpn";
+  "gtk3-mac-integration" = dontDistribute super."gtk3-mac-integration";
+  "gtkglext" = dontDistribute super."gtkglext";
+  "gtkimageview" = dontDistribute super."gtkimageview";
+  "gtkrsync" = dontDistribute super."gtkrsync";
+  "gtksourceview2" = dontDistribute super."gtksourceview2";
+  "gtksourceview3" = dontDistribute super."gtksourceview3";
+  "guarded-rewriting" = dontDistribute super."guarded-rewriting";
+  "guess-combinator" = dontDistribute super."guess-combinator";
+  "gulcii" = dontDistribute super."gulcii";
+  "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis";
+  "gyah-bin" = dontDistribute super."gyah-bin";
+  "h-booru" = dontDistribute super."h-booru";
+  "h-gpgme" = dontDistribute super."h-gpgme";
+  "h2048" = dontDistribute super."h2048";
+  "hArduino" = dontDistribute super."hArduino";
+  "hBDD" = dontDistribute super."hBDD";
+  "hBDD-CMUBDD" = dontDistribute super."hBDD-CMUBDD";
+  "hBDD-CUDD" = dontDistribute super."hBDD-CUDD";
+  "hCsound" = dontDistribute super."hCsound";
+  "hDFA" = dontDistribute super."hDFA";
+  "hF2" = dontDistribute super."hF2";
+  "hGelf" = dontDistribute super."hGelf";
+  "hLLVM" = dontDistribute super."hLLVM";
+  "hMollom" = dontDistribute super."hMollom";
+  "hOpenPGP" = dontDistribute super."hOpenPGP";
+  "hPDB-examples" = dontDistribute super."hPDB-examples";
+  "hPushover" = dontDistribute super."hPushover";
+  "hR" = dontDistribute super."hR";
+  "hRESP" = dontDistribute super."hRESP";
+  "hS3" = dontDistribute super."hS3";
+  "hScraper" = dontDistribute super."hScraper";
+  "hSimpleDB" = dontDistribute super."hSimpleDB";
+  "hTalos" = dontDistribute super."hTalos";
+  "hTensor" = dontDistribute super."hTensor";
+  "hVOIDP" = dontDistribute super."hVOIDP";
+  "hXmixer" = dontDistribute super."hXmixer";
+  "haar" = dontDistribute super."haar";
+  "hacanon-light" = dontDistribute super."hacanon-light";
+  "hack" = dontDistribute super."hack";
+  "hack-contrib" = dontDistribute super."hack-contrib";
+  "hack-contrib-press" = dontDistribute super."hack-contrib-press";
+  "hack-frontend-happstack" = dontDistribute super."hack-frontend-happstack";
+  "hack-frontend-monadcgi" = dontDistribute super."hack-frontend-monadcgi";
+  "hack-handler-cgi" = dontDistribute super."hack-handler-cgi";
+  "hack-handler-epoll" = dontDistribute super."hack-handler-epoll";
+  "hack-handler-evhttp" = dontDistribute super."hack-handler-evhttp";
+  "hack-handler-fastcgi" = dontDistribute super."hack-handler-fastcgi";
+  "hack-handler-happstack" = dontDistribute super."hack-handler-happstack";
+  "hack-handler-hyena" = dontDistribute super."hack-handler-hyena";
+  "hack-handler-kibro" = dontDistribute super."hack-handler-kibro";
+  "hack-handler-simpleserver" = dontDistribute super."hack-handler-simpleserver";
+  "hack-middleware-cleanpath" = dontDistribute super."hack-middleware-cleanpath";
+  "hack-middleware-clientsession" = dontDistribute super."hack-middleware-clientsession";
+  "hack-middleware-gzip" = dontDistribute super."hack-middleware-gzip";
+  "hack-middleware-jsonp" = dontDistribute super."hack-middleware-jsonp";
+  "hack2" = dontDistribute super."hack2";
+  "hack2-contrib" = dontDistribute super."hack2-contrib";
+  "hack2-contrib-extra" = dontDistribute super."hack2-contrib-extra";
+  "hack2-handler-happstack-server" = dontDistribute super."hack2-handler-happstack-server";
+  "hack2-handler-mongrel2-http" = dontDistribute super."hack2-handler-mongrel2-http";
+  "hack2-handler-snap-server" = dontDistribute super."hack2-handler-snap-server";
+  "hack2-handler-warp" = dontDistribute super."hack2-handler-warp";
+  "hack2-interface-wai" = dontDistribute super."hack2-interface-wai";
+  "hackage-diff" = dontDistribute super."hackage-diff";
+  "hackage-plot" = dontDistribute super."hackage-plot";
+  "hackage-proxy" = dontDistribute super."hackage-proxy";
+  "hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
+  "hackage-security" = dontDistribute super."hackage-security";
+  "hackage-security-HTTP" = dontDistribute super."hackage-security-HTTP";
+  "hackage-server" = dontDistribute super."hackage-server";
+  "hackage-sparks" = dontDistribute super."hackage-sparks";
+  "hackage-whatsnew" = dontDistribute super."hackage-whatsnew";
+  "hackage2hwn" = dontDistribute super."hackage2hwn";
+  "hackage2twitter" = dontDistribute super."hackage2twitter";
+  "hackager" = dontDistribute super."hackager";
+  "hackernews" = dontDistribute super."hackernews";
+  "hackertyper" = dontDistribute super."hackertyper";
+  "hackmanager" = dontDistribute super."hackmanager";
+  "hackport" = dontDistribute super."hackport";
+  "hactor" = dontDistribute super."hactor";
+  "hactors" = dontDistribute super."hactors";
+  "haddock" = dontDistribute super."haddock";
+  "haddock-leksah" = dontDistribute super."haddock-leksah";
+  "haddocset" = dontDistribute super."haddocset";
+  "hadoop-formats" = dontDistribute super."hadoop-formats";
+  "hadoop-rpc" = dontDistribute super."hadoop-rpc";
+  "hadoop-tools" = dontDistribute super."hadoop-tools";
+  "haeredes" = dontDistribute super."haeredes";
+  "haggis" = dontDistribute super."haggis";
+  "haha" = dontDistribute super."haha";
+  "hailgun" = dontDistribute super."hailgun";
+  "hailgun-send" = dontDistribute super."hailgun-send";
+  "hails" = dontDistribute super."hails";
+  "hails-bin" = dontDistribute super."hails-bin";
+  "hairy" = dontDistribute super."hairy";
+  "hakaru" = dontDistribute super."hakaru";
+  "hake" = dontDistribute super."hake";
+  "hakismet" = dontDistribute super."hakismet";
+  "hako" = dontDistribute super."hako";
+  "hakyll-R" = dontDistribute super."hakyll-R";
+  "hakyll-agda" = dontDistribute super."hakyll-agda";
+  "hakyll-blaze-templates" = dontDistribute super."hakyll-blaze-templates";
+  "hakyll-contrib" = dontDistribute super."hakyll-contrib";
+  "hakyll-contrib-hyphenation" = dontDistribute super."hakyll-contrib-hyphenation";
+  "hakyll-contrib-links" = dontDistribute super."hakyll-contrib-links";
+  "hakyll-convert" = dontDistribute super."hakyll-convert";
+  "hakyll-elm" = dontDistribute super."hakyll-elm";
+  "hakyll-sass" = dontDistribute super."hakyll-sass";
+  "halberd" = dontDistribute super."halberd";
+  "halfs" = dontDistribute super."halfs";
+  "halipeto" = dontDistribute super."halipeto";
+  "halive" = dontDistribute super."halive";
+  "halma" = dontDistribute super."halma";
+  "haltavista" = dontDistribute super."haltavista";
+  "hamid" = dontDistribute super."hamid";
+  "hampp" = dontDistribute super."hampp";
+  "hamtmap" = dontDistribute super."hamtmap";
+  "hamusic" = dontDistribute super."hamusic";
+  "handa-gdata" = dontDistribute super."handa-gdata";
+  "handa-geodata" = dontDistribute super."handa-geodata";
+  "handa-opengl" = dontDistribute super."handa-opengl";
+  "handle-like" = dontDistribute super."handle-like";
+  "handsy" = dontDistribute super."handsy";
+  "hangman" = dontDistribute super."hangman";
+  "hannahci" = dontDistribute super."hannahci";
+  "hans" = dontDistribute super."hans";
+  "hans-pcap" = dontDistribute super."hans-pcap";
+  "hans-pfq" = dontDistribute super."hans-pfq";
+  "haphviz" = dontDistribute super."haphviz";
+  "hapistrano" = dontDistribute super."hapistrano";
+  "happindicator" = dontDistribute super."happindicator";
+  "happindicator3" = dontDistribute super."happindicator3";
+  "happraise" = dontDistribute super."happraise";
+  "happs-hsp" = dontDistribute super."happs-hsp";
+  "happs-hsp-template" = dontDistribute super."happs-hsp-template";
+  "happs-tutorial" = dontDistribute super."happs-tutorial";
+  "happstack" = dontDistribute super."happstack";
+  "happstack-auth" = dontDistribute super."happstack-auth";
+  "happstack-authenticate" = dontDistribute super."happstack-authenticate";
+  "happstack-clientsession" = dontDistribute super."happstack-clientsession";
+  "happstack-contrib" = dontDistribute super."happstack-contrib";
+  "happstack-data" = dontDistribute super."happstack-data";
+  "happstack-dlg" = dontDistribute super."happstack-dlg";
+  "happstack-facebook" = dontDistribute super."happstack-facebook";
+  "happstack-fastcgi" = dontDistribute super."happstack-fastcgi";
+  "happstack-fay" = dontDistribute super."happstack-fay";
+  "happstack-fay-ajax" = dontDistribute super."happstack-fay-ajax";
+  "happstack-foundation" = dontDistribute super."happstack-foundation";
+  "happstack-hamlet" = dontDistribute super."happstack-hamlet";
+  "happstack-heist" = dontDistribute super."happstack-heist";
+  "happstack-helpers" = dontDistribute super."happstack-helpers";
+  "happstack-hsp" = dontDistribute super."happstack-hsp";
+  "happstack-hstringtemplate" = dontDistribute super."happstack-hstringtemplate";
+  "happstack-ixset" = dontDistribute super."happstack-ixset";
+  "happstack-jmacro" = dontDistribute super."happstack-jmacro";
+  "happstack-lite" = dontDistribute super."happstack-lite";
+  "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
+  "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server-tls" = dontDistribute super."happstack-server-tls";
+  "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
+  "happstack-state" = dontDistribute super."happstack-state";
+  "happstack-static-routing" = dontDistribute super."happstack-static-routing";
+  "happstack-util" = dontDistribute super."happstack-util";
+  "happstack-yui" = dontDistribute super."happstack-yui";
+  "happy-meta" = dontDistribute super."happy-meta";
+  "happybara" = dontDistribute super."happybara";
+  "happybara-webkit" = dontDistribute super."happybara-webkit";
+  "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "har" = dontDistribute super."har";
+  "harchive" = dontDistribute super."harchive";
+  "hark" = dontDistribute super."hark";
+  "harmony" = dontDistribute super."harmony";
+  "haroonga" = dontDistribute super."haroonga";
+  "haroonga-httpd" = dontDistribute super."haroonga-httpd";
+  "harp" = dontDistribute super."harp";
+  "harpy" = dontDistribute super."harpy";
+  "has" = dontDistribute super."has";
+  "has-th" = dontDistribute super."has-th";
+  "hascal" = dontDistribute super."hascal";
+  "hascat" = dontDistribute super."hascat";
+  "hascat-lib" = dontDistribute super."hascat-lib";
+  "hascat-setup" = dontDistribute super."hascat-setup";
+  "hascat-system" = dontDistribute super."hascat-system";
+  "hash" = dontDistribute super."hash";
+  "hashable-generics" = dontDistribute super."hashable-generics";
+  "hashable-time" = dontDistribute super."hashable-time";
+  "hashabler" = dontDistribute super."hashabler";
+  "hashed-storage" = dontDistribute super."hashed-storage";
+  "hashids" = dontDistribute super."hashids";
+  "hashring" = dontDistribute super."hashring";
+  "hashtables-plus" = dontDistribute super."hashtables-plus";
+  "hasim" = dontDistribute super."hasim";
+  "hask" = dontDistribute super."hask";
+  "hask-home" = dontDistribute super."hask-home";
+  "haskades" = dontDistribute super."haskades";
+  "haskakafka" = dontDistribute super."haskakafka";
+  "haskanoid" = dontDistribute super."haskanoid";
+  "haskarrow" = dontDistribute super."haskarrow";
+  "haskbot-core" = dontDistribute super."haskbot-core";
+  "haskdeep" = dontDistribute super."haskdeep";
+  "haskdogs" = dontDistribute super."haskdogs";
+  "haskeem" = dontDistribute super."haskeem";
+  "haskeline" = doDistribute super."haskeline_0_7_2_2";
+  "haskeline-class" = dontDistribute super."haskeline-class";
+  "haskell-aliyun" = dontDistribute super."haskell-aliyun";
+  "haskell-awk" = dontDistribute super."haskell-awk";
+  "haskell-bcrypt" = dontDistribute super."haskell-bcrypt";
+  "haskell-brainfuck" = dontDistribute super."haskell-brainfuck";
+  "haskell-cnc" = dontDistribute super."haskell-cnc";
+  "haskell-coffee" = dontDistribute super."haskell-coffee";
+  "haskell-compression" = dontDistribute super."haskell-compression";
+  "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
+  "haskell-docs" = dontDistribute super."haskell-docs";
+  "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-formatter" = dontDistribute super."haskell-formatter";
+  "haskell-ftp" = dontDistribute super."haskell-ftp";
+  "haskell-generate" = dontDistribute super."haskell-generate";
+  "haskell-gi" = dontDistribute super."haskell-gi";
+  "haskell-gi-base" = dontDistribute super."haskell-gi-base";
+  "haskell-import-graph" = dontDistribute super."haskell-import-graph";
+  "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpi" = dontDistribute super."haskell-mpi";
+  "haskell-names" = doDistribute super."haskell-names_0_5_3";
+  "haskell-openflow" = dontDistribute super."haskell-openflow";
+  "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
+  "haskell-platform-test" = dontDistribute super."haskell-platform-test";
+  "haskell-plot" = dontDistribute super."haskell-plot";
+  "haskell-qrencode" = dontDistribute super."haskell-qrencode";
+  "haskell-read-editor" = dontDistribute super."haskell-read-editor";
+  "haskell-reflect" = dontDistribute super."haskell-reflect";
+  "haskell-rules" = dontDistribute super."haskell-rules";
+  "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1";
+  "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq";
+  "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton";
+  "haskell-token-utils" = dontDistribute super."haskell-token-utils";
+  "haskell-tor" = dontDistribute super."haskell-tor";
+  "haskell-type-exts" = dontDistribute super."haskell-type-exts";
+  "haskell-typescript" = dontDistribute super."haskell-typescript";
+  "haskell-tyrant" = dontDistribute super."haskell-tyrant";
+  "haskell-updater" = dontDistribute super."haskell-updater";
+  "haskell-xmpp" = dontDistribute super."haskell-xmpp";
+  "haskell2010" = dontDistribute super."haskell2010";
+  "haskell98" = dontDistribute super."haskell98";
+  "haskell98libraries" = dontDistribute super."haskell98libraries";
+  "haskelldb" = dontDistribute super."haskelldb";
+  "haskelldb-connect-hdbc" = dontDistribute super."haskelldb-connect-hdbc";
+  "haskelldb-connect-hdbc-catchio-mtl" = dontDistribute super."haskelldb-connect-hdbc-catchio-mtl";
+  "haskelldb-connect-hdbc-catchio-tf" = dontDistribute super."haskelldb-connect-hdbc-catchio-tf";
+  "haskelldb-connect-hdbc-catchio-transformers" = dontDistribute super."haskelldb-connect-hdbc-catchio-transformers";
+  "haskelldb-connect-hdbc-lifted" = dontDistribute super."haskelldb-connect-hdbc-lifted";
+  "haskelldb-dynamic" = dontDistribute super."haskelldb-dynamic";
+  "haskelldb-flat" = dontDistribute super."haskelldb-flat";
+  "haskelldb-hdbc" = dontDistribute super."haskelldb-hdbc";
+  "haskelldb-hdbc-mysql" = dontDistribute super."haskelldb-hdbc-mysql";
+  "haskelldb-hdbc-odbc" = dontDistribute super."haskelldb-hdbc-odbc";
+  "haskelldb-hdbc-postgresql" = dontDistribute super."haskelldb-hdbc-postgresql";
+  "haskelldb-hdbc-sqlite3" = dontDistribute super."haskelldb-hdbc-sqlite3";
+  "haskelldb-hsql" = dontDistribute super."haskelldb-hsql";
+  "haskelldb-hsql-mysql" = dontDistribute super."haskelldb-hsql-mysql";
+  "haskelldb-hsql-odbc" = dontDistribute super."haskelldb-hsql-odbc";
+  "haskelldb-hsql-oracle" = dontDistribute super."haskelldb-hsql-oracle";
+  "haskelldb-hsql-postgresql" = dontDistribute super."haskelldb-hsql-postgresql";
+  "haskelldb-hsql-sqlite" = dontDistribute super."haskelldb-hsql-sqlite";
+  "haskelldb-hsql-sqlite3" = dontDistribute super."haskelldb-hsql-sqlite3";
+  "haskelldb-th" = dontDistribute super."haskelldb-th";
+  "haskelldb-wx" = dontDistribute super."haskelldb-wx";
+  "haskellscrabble" = dontDistribute super."haskellscrabble";
+  "haskellscript" = dontDistribute super."haskellscript";
+  "haskelm" = dontDistribute super."haskelm";
+  "haskgame" = dontDistribute super."haskgame";
+  "haskheap" = dontDistribute super."haskheap";
+  "haskhol-core" = dontDistribute super."haskhol-core";
+  "haskintex" = doDistribute super."haskintex_0_5_1_0";
+  "haskmon" = dontDistribute super."haskmon";
+  "haskoin" = dontDistribute super."haskoin";
+  "haskoin-core" = dontDistribute super."haskoin-core";
+  "haskoin-crypto" = dontDistribute super."haskoin-crypto";
+  "haskoin-node" = dontDistribute super."haskoin-node";
+  "haskoin-protocol" = dontDistribute super."haskoin-protocol";
+  "haskoin-script" = dontDistribute super."haskoin-script";
+  "haskoin-util" = dontDistribute super."haskoin-util";
+  "haskoin-wallet" = dontDistribute super."haskoin-wallet";
+  "haskoon" = dontDistribute super."haskoon";
+  "haskoon-httpspec" = dontDistribute super."haskoon-httpspec";
+  "haskoon-salvia" = dontDistribute super."haskoon-salvia";
+  "haskore" = dontDistribute super."haskore";
+  "haskore-realtime" = dontDistribute super."haskore-realtime";
+  "haskore-supercollider" = dontDistribute super."haskore-supercollider";
+  "haskore-synthesizer" = dontDistribute super."haskore-synthesizer";
+  "haskore-vintage" = dontDistribute super."haskore-vintage";
+  "hasktags" = dontDistribute super."hasktags";
+  "haslo" = dontDistribute super."haslo";
+  "hasloGUI" = dontDistribute super."hasloGUI";
+  "hasparql-client" = dontDistribute super."hasparql-client";
+  "haspell" = dontDistribute super."haspell";
+  "hasql" = doDistribute super."hasql_0_7_4";
+  "hasql-pool" = dontDistribute super."hasql-pool";
+  "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
+  "hasql-th" = dontDistribute super."hasql-th";
+  "hasql-transaction" = dontDistribute super."hasql-transaction";
+  "hastache-aeson" = dontDistribute super."hastache-aeson";
+  "haste" = dontDistribute super."haste";
+  "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-markup" = dontDistribute super."haste-markup";
+  "haste-perch" = dontDistribute super."haste-perch";
+  "hastily" = dontDistribute super."hastily";
+  "hasty-hamiltonian" = dontDistribute super."hasty-hamiltonian";
+  "hat" = dontDistribute super."hat";
+  "hatex-guide" = dontDistribute super."hatex-guide";
+  "hath" = dontDistribute super."hath";
+  "hatt" = dontDistribute super."hatt";
+  "haverer" = dontDistribute super."haverer";
+  "hawitter" = dontDistribute super."hawitter";
+  "haxl" = dontDistribute super."haxl";
+  "haxl-amazonka" = dontDistribute super."haxl-amazonka";
+  "haxl-facebook" = dontDistribute super."haxl-facebook";
+  "haxparse" = dontDistribute super."haxparse";
+  "haxr-th" = dontDistribute super."haxr-th";
+  "haxy" = dontDistribute super."haxy";
+  "hayland" = dontDistribute super."hayland";
+  "hayoo-cli" = dontDistribute super."hayoo-cli";
+  "hback" = dontDistribute super."hback";
+  "hbayes" = dontDistribute super."hbayes";
+  "hbb" = dontDistribute super."hbb";
+  "hbcd" = dontDistribute super."hbcd";
+  "hbeat" = dontDistribute super."hbeat";
+  "hblas" = dontDistribute super."hblas";
+  "hblock" = dontDistribute super."hblock";
+  "hbro" = dontDistribute super."hbro";
+  "hbro-contrib" = dontDistribute super."hbro-contrib";
+  "hburg" = dontDistribute super."hburg";
+  "hcc" = dontDistribute super."hcc";
+  "hcg-minus" = dontDistribute super."hcg-minus";
+  "hcg-minus-cairo" = dontDistribute super."hcg-minus-cairo";
+  "hcheat" = dontDistribute super."hcheat";
+  "hchesslib" = dontDistribute super."hchesslib";
+  "hcltest" = dontDistribute super."hcltest";
+  "hcron" = dontDistribute super."hcron";
+  "hcube" = dontDistribute super."hcube";
+  "hcwiid" = dontDistribute super."hcwiid";
+  "hdaemonize-buildfix" = dontDistribute super."hdaemonize-buildfix";
+  "hdbc-aeson" = dontDistribute super."hdbc-aeson";
+  "hdbc-postgresql-hstore" = dontDistribute super."hdbc-postgresql-hstore";
+  "hdbc-tuple" = dontDistribute super."hdbc-tuple";
+  "hdbi" = dontDistribute super."hdbi";
+  "hdbi-conduit" = dontDistribute super."hdbi-conduit";
+  "hdbi-postgresql" = dontDistribute super."hdbi-postgresql";
+  "hdbi-sqlite" = dontDistribute super."hdbi-sqlite";
+  "hdbi-tests" = dontDistribute super."hdbi-tests";
+  "hdf" = dontDistribute super."hdf";
+  "hdigest" = dontDistribute super."hdigest";
+  "hdirect" = dontDistribute super."hdirect";
+  "hdis86" = dontDistribute super."hdis86";
+  "hdiscount" = dontDistribute super."hdiscount";
+  "hdm" = dontDistribute super."hdm";
+  "hdph" = dontDistribute super."hdph";
+  "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
+  "headergen" = dontDistribute super."headergen";
+  "heapsort" = dontDistribute super."heapsort";
+  "hecc" = dontDistribute super."hecc";
+  "hedis-config" = dontDistribute super."hedis-config";
+  "hedis-monadic" = dontDistribute super."hedis-monadic";
+  "hedis-pile" = dontDistribute super."hedis-pile";
+  "hedis-simple" = dontDistribute super."hedis-simple";
+  "hedis-tags" = dontDistribute super."hedis-tags";
+  "hedn" = dontDistribute super."hedn";
+  "hein" = dontDistribute super."hein";
+  "heist-aeson" = dontDistribute super."heist-aeson";
+  "heist-async" = dontDistribute super."heist-async";
+  "helics" = dontDistribute super."helics";
+  "helics-wai" = dontDistribute super."helics-wai";
+  "helisp" = dontDistribute super."helisp";
+  "helium" = dontDistribute super."helium";
+  "hell" = dontDistribute super."hell";
+  "hellage" = dontDistribute super."hellage";
+  "hellnet" = dontDistribute super."hellnet";
+  "hello" = dontDistribute super."hello";
+  "helm" = dontDistribute super."helm";
+  "help-esb" = dontDistribute super."help-esb";
+  "hemkay" = dontDistribute super."hemkay";
+  "hemkay-core" = dontDistribute super."hemkay-core";
+  "hemokit" = dontDistribute super."hemokit";
+  "hen" = dontDistribute super."hen";
+  "henet" = dontDistribute super."henet";
+  "hepevt" = dontDistribute super."hepevt";
+  "her-lexer" = dontDistribute super."her-lexer";
+  "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
+  "herbalizer" = dontDistribute super."herbalizer";
+  "hermit" = dontDistribute super."hermit";
+  "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
+  "heroku" = dontDistribute super."heroku";
+  "heroku-persistent" = dontDistribute super."heroku-persistent";
+  "herringbone" = dontDistribute super."herringbone";
+  "herringbone-embed" = dontDistribute super."herringbone-embed";
+  "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesql" = dontDistribute super."hesql";
+  "hetero-map" = dontDistribute super."hetero-map";
+  "hetris" = dontDistribute super."hetris";
+  "heukarya" = dontDistribute super."heukarya";
+  "hevolisa" = dontDistribute super."hevolisa";
+  "hevolisa-dph" = dontDistribute super."hevolisa-dph";
+  "hexdump" = dontDistribute super."hexdump";
+  "hexif" = dontDistribute super."hexif";
+  "hexpat-iteratee" = dontDistribute super."hexpat-iteratee";
+  "hexpat-lens" = dontDistribute super."hexpat-lens";
+  "hexpat-pickle" = dontDistribute super."hexpat-pickle";
+  "hexpat-pickle-generic" = dontDistribute super."hexpat-pickle-generic";
+  "hexpat-tagsoup" = dontDistribute super."hexpat-tagsoup";
+  "hexpr" = dontDistribute super."hexpr";
+  "hexquote" = dontDistribute super."hexquote";
+  "heyefi" = dontDistribute super."heyefi";
+  "hfann" = dontDistribute super."hfann";
+  "hfd" = dontDistribute super."hfd";
+  "hfiar" = dontDistribute super."hfiar";
+  "hfmt" = dontDistribute super."hfmt";
+  "hfoil" = dontDistribute super."hfoil";
+  "hfov" = dontDistribute super."hfov";
+  "hfractal" = dontDistribute super."hfractal";
+  "hfusion" = dontDistribute super."hfusion";
+  "hg-buildpackage" = dontDistribute super."hg-buildpackage";
+  "hgal" = dontDistribute super."hgal";
+  "hgalib" = dontDistribute super."hgalib";
+  "hgdbmi" = dontDistribute super."hgdbmi";
+  "hgearman" = dontDistribute super."hgearman";
+  "hgen" = dontDistribute super."hgen";
+  "hgeometric" = dontDistribute super."hgeometric";
+  "hgeometry" = dontDistribute super."hgeometry";
+  "hgettext" = dontDistribute super."hgettext";
+  "hgithub" = dontDistribute super."hgithub";
+  "hgl-example" = dontDistribute super."hgl-example";
+  "hgom" = dontDistribute super."hgom";
+  "hgopher" = dontDistribute super."hgopher";
+  "hgrev" = dontDistribute super."hgrev";
+  "hgrib" = dontDistribute super."hgrib";
+  "hharp" = dontDistribute super."hharp";
+  "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
+  "hiccup" = dontDistribute super."hiccup";
+  "hichi" = dontDistribute super."hichi";
+  "hidapi" = dontDistribute super."hidapi";
+  "hieraclus" = dontDistribute super."hieraclus";
+  "hierarchical-clustering" = dontDistribute super."hierarchical-clustering";
+  "hierarchical-clustering-diagrams" = dontDistribute super."hierarchical-clustering-diagrams";
+  "hierarchical-exceptions" = dontDistribute super."hierarchical-exceptions";
+  "hierarchy" = dontDistribute super."hierarchy";
+  "hiernotify" = dontDistribute super."hiernotify";
+  "highWaterMark" = dontDistribute super."highWaterMark";
+  "higher-leveldb" = dontDistribute super."higher-leveldb";
+  "higherorder" = dontDistribute super."higherorder";
+  "highlight-versions" = dontDistribute super."highlight-versions";
+  "highlighter" = dontDistribute super."highlighter";
+  "highlighter2" = dontDistribute super."highlighter2";
+  "hills" = dontDistribute super."hills";
+  "himerge" = dontDistribute super."himerge";
+  "himg" = dontDistribute super."himg";
+  "himpy" = dontDistribute super."himpy";
+  "hindent" = doDistribute super."hindent_4_5_5";
+  "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
+  "hinduce-classifier" = dontDistribute super."hinduce-classifier";
+  "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
+  "hinduce-examples" = dontDistribute super."hinduce-examples";
+  "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinquire" = dontDistribute super."hinquire";
+  "hinstaller" = dontDistribute super."hinstaller";
+  "hint-server" = dontDistribute super."hint-server";
+  "hinvaders" = dontDistribute super."hinvaders";
+  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hipbot" = dontDistribute super."hipbot";
+  "hipe" = dontDistribute super."hipe";
+  "hips" = dontDistribute super."hips";
+  "hircules" = dontDistribute super."hircules";
+  "hirt" = dontDistribute super."hirt";
+  "hissmetrics" = dontDistribute super."hissmetrics";
+  "hist-pl" = dontDistribute super."hist-pl";
+  "hist-pl-dawg" = dontDistribute super."hist-pl-dawg";
+  "hist-pl-fusion" = dontDistribute super."hist-pl-fusion";
+  "hist-pl-lexicon" = dontDistribute super."hist-pl-lexicon";
+  "hist-pl-lmf" = dontDistribute super."hist-pl-lmf";
+  "hist-pl-transliter" = dontDistribute super."hist-pl-transliter";
+  "hist-pl-types" = dontDistribute super."hist-pl-types";
+  "histogram-fill-binary" = dontDistribute super."histogram-fill-binary";
+  "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal";
+  "historian" = dontDistribute super."historian";
+  "hjcase" = dontDistribute super."hjcase";
+  "hjpath" = dontDistribute super."hjpath";
+  "hjs" = dontDistribute super."hjs";
+  "hjson" = dontDistribute super."hjson";
+  "hjson-query" = dontDistribute super."hjson-query";
+  "hjsonpointer" = dontDistribute super."hjsonpointer";
+  "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
+  "hlatex" = dontDistribute super."hlatex";
+  "hlbfgsb" = dontDistribute super."hlbfgsb";
+  "hlcm" = dontDistribute super."hlcm";
+  "hledger" = doDistribute super."hledger_0_26";
+  "hledger-chart" = dontDistribute super."hledger-chart";
+  "hledger-diff" = dontDistribute super."hledger-diff";
+  "hledger-interest" = dontDistribute super."hledger-interest";
+  "hledger-irr" = dontDistribute super."hledger-irr";
+  "hledger-lib" = doDistribute super."hledger-lib_0_26";
+  "hledger-ui" = dontDistribute super."hledger-ui";
+  "hledger-vty" = dontDistribute super."hledger-vty";
+  "hledger-web" = doDistribute super."hledger-web_0_26";
+  "hlibBladeRF" = dontDistribute super."hlibBladeRF";
+  "hlibev" = dontDistribute super."hlibev";
+  "hlibfam" = dontDistribute super."hlibfam";
+  "hlint" = doDistribute super."hlint_1_9_22";
+  "hlogger" = dontDistribute super."hlogger";
+  "hlongurl" = dontDistribute super."hlongurl";
+  "hls" = dontDistribute super."hls";
+  "hlwm" = dontDistribute super."hlwm";
+  "hly" = dontDistribute super."hly";
+  "hmark" = dontDistribute super."hmark";
+  "hmarkup" = dontDistribute super."hmarkup";
+  "hmatrix" = doDistribute super."hmatrix_0_16_1_5";
+  "hmatrix-banded" = dontDistribute super."hmatrix-banded";
+  "hmatrix-csv" = dontDistribute super."hmatrix-csv";
+  "hmatrix-glpk" = dontDistribute super."hmatrix-glpk";
+  "hmatrix-gsl" = doDistribute super."hmatrix-gsl_0_16_0_3";
+  "hmatrix-gsl-stats" = doDistribute super."hmatrix-gsl-stats_0_4_1_1";
+  "hmatrix-mmap" = dontDistribute super."hmatrix-mmap";
+  "hmatrix-nipals" = dontDistribute super."hmatrix-nipals";
+  "hmatrix-quadprogpp" = dontDistribute super."hmatrix-quadprogpp";
+  "hmatrix-special" = dontDistribute super."hmatrix-special";
+  "hmatrix-static" = dontDistribute super."hmatrix-static";
+  "hmatrix-svdlibc" = dontDistribute super."hmatrix-svdlibc";
+  "hmatrix-syntax" = dontDistribute super."hmatrix-syntax";
+  "hmatrix-tests" = dontDistribute super."hmatrix-tests";
+  "hmeap" = dontDistribute super."hmeap";
+  "hmeap-utils" = dontDistribute super."hmeap-utils";
+  "hmemdb" = dontDistribute super."hmemdb";
+  "hmenu" = dontDistribute super."hmenu";
+  "hmidi" = dontDistribute super."hmidi";
+  "hmk" = dontDistribute super."hmk";
+  "hmm" = dontDistribute super."hmm";
+  "hmm-hmatrix" = dontDistribute super."hmm-hmatrix";
+  "hmp3" = dontDistribute super."hmp3";
+  "hmpfr" = dontDistribute super."hmpfr";
+  "hmt" = dontDistribute super."hmt";
+  "hmt-diagrams" = dontDistribute super."hmt-diagrams";
+  "hmumps" = dontDistribute super."hmumps";
+  "hnetcdf" = dontDistribute super."hnetcdf";
+  "hnix" = dontDistribute super."hnix";
+  "hnn" = dontDistribute super."hnn";
+  "hnop" = dontDistribute super."hnop";
+  "ho-rewriting" = dontDistribute super."ho-rewriting";
+  "hoauth" = dontDistribute super."hoauth";
+  "hoauth2" = doDistribute super."hoauth2_0_4_8";
+  "hob" = dontDistribute super."hob";
+  "hobbes" = dontDistribute super."hobbes";
+  "hobbits" = dontDistribute super."hobbits";
+  "hoe" = dontDistribute super."hoe";
+  "hofix-mtl" = dontDistribute super."hofix-mtl";
+  "hog" = dontDistribute super."hog";
+  "hogg" = dontDistribute super."hogg";
+  "hogre" = dontDistribute super."hogre";
+  "hogre-examples" = dontDistribute super."hogre-examples";
+  "hois" = dontDistribute super."hois";
+  "hoist-error" = dontDistribute super."hoist-error";
+  "hold-em" = dontDistribute super."hold-em";
+  "hole" = dontDistribute super."hole";
+  "holey-format" = dontDistribute super."holey-format";
+  "homeomorphic" = dontDistribute super."homeomorphic";
+  "hommage" = dontDistribute super."hommage";
+  "hommage-ds" = dontDistribute super."hommage-ds";
+  "homplexity" = dontDistribute super."homplexity";
+  "honi" = dontDistribute super."honi";
+  "honk" = dontDistribute super."honk";
+  "hoobuddy" = dontDistribute super."hoobuddy";
+  "hood" = dontDistribute super."hood";
+  "hood-off" = dontDistribute super."hood-off";
+  "hood2" = dontDistribute super."hood2";
+  "hoodie" = dontDistribute super."hoodie";
+  "hoodle" = dontDistribute super."hoodle";
+  "hoodle-builder" = dontDistribute super."hoodle-builder";
+  "hoodle-core" = dontDistribute super."hoodle-core";
+  "hoodle-extra" = dontDistribute super."hoodle-extra";
+  "hoodle-parser" = dontDistribute super."hoodle-parser";
+  "hoodle-publish" = dontDistribute super."hoodle-publish";
+  "hoodle-render" = dontDistribute super."hoodle-render";
+  "hoodle-types" = dontDistribute super."hoodle-types";
+  "hoogle-index" = dontDistribute super."hoogle-index";
+  "hooks-dir" = dontDistribute super."hooks-dir";
+  "hoovie" = dontDistribute super."hoovie";
+  "hopencc" = dontDistribute super."hopencc";
+  "hopencl" = dontDistribute super."hopencl";
+  "hopenpgp-tools" = dontDistribute super."hopenpgp-tools";
+  "hopenssl" = dontDistribute super."hopenssl";
+  "hopfield" = dontDistribute super."hopfield";
+  "hopfield-networks" = dontDistribute super."hopfield-networks";
+  "hopfli" = dontDistribute super."hopfli";
+  "hops" = dontDistribute super."hops";
+  "hoq" = dontDistribute super."hoq";
+  "horizon" = dontDistribute super."horizon";
+  "hosc" = dontDistribute super."hosc";
+  "hosc-json" = dontDistribute super."hosc-json";
+  "hosc-utils" = dontDistribute super."hosc-utils";
+  "hosts-server" = dontDistribute super."hosts-server";
+  "hothasktags" = dontDistribute super."hothasktags";
+  "hotswap" = dontDistribute super."hotswap";
+  "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
+  "hp2any-core" = dontDistribute super."hp2any-core";
+  "hp2any-graph" = dontDistribute super."hp2any-graph";
+  "hp2any-manager" = dontDistribute super."hp2any-manager";
+  "hp2html" = dontDistribute super."hp2html";
+  "hp2pretty" = dontDistribute super."hp2pretty";
+  "hpack" = dontDistribute super."hpack";
+  "hpaco" = dontDistribute super."hpaco";
+  "hpaco-lib" = dontDistribute super."hpaco-lib";
+  "hpage" = dontDistribute super."hpage";
+  "hpapi" = dontDistribute super."hpapi";
+  "hpaste" = dontDistribute super."hpaste";
+  "hpasteit" = dontDistribute super."hpasteit";
+  "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
+  "hpc-strobe" = dontDistribute super."hpc-strobe";
+  "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hplayground" = dontDistribute super."hplayground";
+  "hplaylist" = dontDistribute super."hplaylist";
+  "hpodder" = dontDistribute super."hpodder";
+  "hpp" = dontDistribute super."hpp";
+  "hpqtypes" = dontDistribute super."hpqtypes";
+  "hprotoc-fork" = dontDistribute super."hprotoc-fork";
+  "hps" = dontDistribute super."hps";
+  "hps-cairo" = dontDistribute super."hps-cairo";
+  "hps-kmeans" = dontDistribute super."hps-kmeans";
+  "hpuz" = dontDistribute super."hpuz";
+  "hpygments" = dontDistribute super."hpygments";
+  "hpylos" = dontDistribute super."hpylos";
+  "hpyrg" = dontDistribute super."hpyrg";
+  "hquantlib" = dontDistribute super."hquantlib";
+  "hquery" = dontDistribute super."hquery";
+  "hranker" = dontDistribute super."hranker";
+  "hreader" = dontDistribute super."hreader";
+  "hricket" = dontDistribute super."hricket";
+  "hruby" = dontDistribute super."hruby";
+  "hs-GeoIP" = dontDistribute super."hs-GeoIP";
+  "hs-blake2" = dontDistribute super."hs-blake2";
+  "hs-captcha" = dontDistribute super."hs-captcha";
+  "hs-carbon" = dontDistribute super."hs-carbon";
+  "hs-carbon-examples" = dontDistribute super."hs-carbon-examples";
+  "hs-cdb" = dontDistribute super."hs-cdb";
+  "hs-dotnet" = dontDistribute super."hs-dotnet";
+  "hs-duktape" = dontDistribute super."hs-duktape";
+  "hs-excelx" = dontDistribute super."hs-excelx";
+  "hs-ffmpeg" = dontDistribute super."hs-ffmpeg";
+  "hs-fltk" = dontDistribute super."hs-fltk";
+  "hs-gchart" = dontDistribute super."hs-gchart";
+  "hs-gen-iface" = dontDistribute super."hs-gen-iface";
+  "hs-gizapp" = dontDistribute super."hs-gizapp";
+  "hs-inspector" = dontDistribute super."hs-inspector";
+  "hs-java" = dontDistribute super."hs-java";
+  "hs-json-rpc" = dontDistribute super."hs-json-rpc";
+  "hs-logo" = dontDistribute super."hs-logo";
+  "hs-mesos" = dontDistribute super."hs-mesos";
+  "hs-nombre-generator" = dontDistribute super."hs-nombre-generator";
+  "hs-pgms" = dontDistribute super."hs-pgms";
+  "hs-php-session" = dontDistribute super."hs-php-session";
+  "hs-pkg-config" = dontDistribute super."hs-pkg-config";
+  "hs-pkpass" = dontDistribute super."hs-pkpass";
+  "hs-re" = dontDistribute super."hs-re";
+  "hs-scrape" = dontDistribute super."hs-scrape";
+  "hs-twitter" = dontDistribute super."hs-twitter";
+  "hs-twitterarchiver" = dontDistribute super."hs-twitterarchiver";
+  "hs-vcard" = dontDistribute super."hs-vcard";
+  "hs2048" = dontDistribute super."hs2048";
+  "hs2bf" = dontDistribute super."hs2bf";
+  "hs2dot" = dontDistribute super."hs2dot";
+  "hsConfigure" = dontDistribute super."hsConfigure";
+  "hsSqlite3" = dontDistribute super."hsSqlite3";
+  "hsXenCtrl" = dontDistribute super."hsXenCtrl";
+  "hsass" = doDistribute super."hsass_0_3_0";
+  "hsay" = dontDistribute super."hsay";
+  "hsb2hs" = dontDistribute super."hsb2hs";
+  "hsbackup" = dontDistribute super."hsbackup";
+  "hsbencher" = dontDistribute super."hsbencher";
+  "hsbencher-codespeed" = dontDistribute super."hsbencher-codespeed";
+  "hsbencher-fusion" = dontDistribute super."hsbencher-fusion";
+  "hsc2hs" = dontDistribute super."hsc2hs";
+  "hsc3" = dontDistribute super."hsc3";
+  "hsc3-auditor" = dontDistribute super."hsc3-auditor";
+  "hsc3-cairo" = dontDistribute super."hsc3-cairo";
+  "hsc3-data" = dontDistribute super."hsc3-data";
+  "hsc3-db" = dontDistribute super."hsc3-db";
+  "hsc3-dot" = dontDistribute super."hsc3-dot";
+  "hsc3-forth" = dontDistribute super."hsc3-forth";
+  "hsc3-graphs" = dontDistribute super."hsc3-graphs";
+  "hsc3-lang" = dontDistribute super."hsc3-lang";
+  "hsc3-lisp" = dontDistribute super."hsc3-lisp";
+  "hsc3-plot" = dontDistribute super."hsc3-plot";
+  "hsc3-process" = dontDistribute super."hsc3-process";
+  "hsc3-rec" = dontDistribute super."hsc3-rec";
+  "hsc3-rw" = dontDistribute super."hsc3-rw";
+  "hsc3-server" = dontDistribute super."hsc3-server";
+  "hsc3-sf" = dontDistribute super."hsc3-sf";
+  "hsc3-sf-hsndfile" = dontDistribute super."hsc3-sf-hsndfile";
+  "hsc3-unsafe" = dontDistribute super."hsc3-unsafe";
+  "hsc3-utils" = dontDistribute super."hsc3-utils";
+  "hscamwire" = dontDistribute super."hscamwire";
+  "hscassandra" = dontDistribute super."hscassandra";
+  "hscd" = dontDistribute super."hscd";
+  "hsclock" = dontDistribute super."hsclock";
+  "hscope" = dontDistribute super."hscope";
+  "hscrtmpl" = dontDistribute super."hscrtmpl";
+  "hscuid" = dontDistribute super."hscuid";
+  "hscurses" = dontDistribute super."hscurses";
+  "hscurses-fish-ex" = dontDistribute super."hscurses-fish-ex";
+  "hsdev" = dontDistribute super."hsdev";
+  "hsdif" = dontDistribute super."hsdif";
+  "hsdip" = dontDistribute super."hsdip";
+  "hsdns" = dontDistribute super."hsdns";
+  "hsdns-cache" = dontDistribute super."hsdns-cache";
+  "hsemail-ns" = dontDistribute super."hsemail-ns";
+  "hsenv" = dontDistribute super."hsenv";
+  "hserv" = dontDistribute super."hserv";
+  "hset" = dontDistribute super."hset";
+  "hsexif" = dontDistribute super."hsexif";
+  "hsfacter" = dontDistribute super."hsfacter";
+  "hsfcsh" = dontDistribute super."hsfcsh";
+  "hsfilt" = dontDistribute super."hsfilt";
+  "hsgnutls" = dontDistribute super."hsgnutls";
+  "hsgnutls-yj" = dontDistribute super."hsgnutls-yj";
+  "hsgsom" = dontDistribute super."hsgsom";
+  "hsgtd" = dontDistribute super."hsgtd";
+  "hsharc" = dontDistribute super."hsharc";
+  "hsignal" = doDistribute super."hsignal_0_2_7_1";
+  "hsilop" = dontDistribute super."hsilop";
+  "hsimport" = dontDistribute super."hsimport";
+  "hsini" = dontDistribute super."hsini";
+  "hskeleton" = dontDistribute super."hskeleton";
+  "hslackbuilder" = dontDistribute super."hslackbuilder";
+  "hslibsvm" = dontDistribute super."hslibsvm";
+  "hslinks" = dontDistribute super."hslinks";
+  "hslogger-reader" = dontDistribute super."hslogger-reader";
+  "hslogger-template" = dontDistribute super."hslogger-template";
+  "hslogger4j" = dontDistribute super."hslogger4j";
+  "hslogstash" = dontDistribute super."hslogstash";
+  "hsmagick" = dontDistribute super."hsmagick";
+  "hsmisc" = dontDistribute super."hsmisc";
+  "hsmtpclient" = dontDistribute super."hsmtpclient";
+  "hsndfile" = dontDistribute super."hsndfile";
+  "hsndfile-storablevector" = dontDistribute super."hsndfile-storablevector";
+  "hsndfile-vector" = dontDistribute super."hsndfile-vector";
+  "hsnock" = dontDistribute super."hsnock";
+  "hsnoise" = dontDistribute super."hsnoise";
+  "hsns" = dontDistribute super."hsns";
+  "hsnsq" = dontDistribute super."hsnsq";
+  "hsntp" = dontDistribute super."hsntp";
+  "hsoptions" = dontDistribute super."hsoptions";
+  "hsp" = dontDistribute super."hsp";
+  "hsp-cgi" = dontDistribute super."hsp-cgi";
+  "hsparklines" = dontDistribute super."hsparklines";
+  "hsparql" = dontDistribute super."hsparql";
+  "hspear" = dontDistribute super."hspear";
+  "hspec" = doDistribute super."hspec_2_1_10";
+  "hspec-checkers" = dontDistribute super."hspec-checkers";
+  "hspec-core" = doDistribute super."hspec-core_2_1_10";
+  "hspec-discover" = doDistribute super."hspec-discover_2_1_10";
+  "hspec-expectations" = doDistribute super."hspec-expectations_0_7_1";
+  "hspec-expectations-lens" = dontDistribute super."hspec-expectations-lens";
+  "hspec-expectations-lifted" = dontDistribute super."hspec-expectations-lifted";
+  "hspec-expectations-pretty" = dontDistribute super."hspec-expectations-pretty";
+  "hspec-expectations-pretty-diff" = dontDistribute super."hspec-expectations-pretty-diff";
+  "hspec-experimental" = dontDistribute super."hspec-experimental";
+  "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-meta" = doDistribute super."hspec-meta_2_1_7";
+  "hspec-monad-control" = dontDistribute super."hspec-monad-control";
+  "hspec-server" = dontDistribute super."hspec-server";
+  "hspec-setup" = dontDistribute super."hspec-setup";
+  "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0";
+  "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0";
+  "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
+  "hspec-test-framework" = dontDistribute super."hspec-test-framework";
+  "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th";
+  "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox";
+  "hspec-webdriver" = doDistribute super."hspec-webdriver_1_0_3";
+  "hspec2" = dontDistribute super."hspec2";
+  "hspr-sh" = dontDistribute super."hspr-sh";
+  "hspread" = dontDistribute super."hspread";
+  "hspresent" = dontDistribute super."hspresent";
+  "hsprocess" = dontDistribute super."hsprocess";
+  "hsql" = dontDistribute super."hsql";
+  "hsql-mysql" = dontDistribute super."hsql-mysql";
+  "hsql-odbc" = dontDistribute super."hsql-odbc";
+  "hsql-postgresql" = dontDistribute super."hsql-postgresql";
+  "hsql-sqlite3" = dontDistribute super."hsql-sqlite3";
+  "hsqml" = dontDistribute super."hsqml";
+  "hsqml-datamodel" = dontDistribute super."hsqml-datamodel";
+  "hsqml-datamodel-vinyl" = dontDistribute super."hsqml-datamodel-vinyl";
+  "hsqml-demo-morris" = dontDistribute super."hsqml-demo-morris";
+  "hsqml-demo-notes" = dontDistribute super."hsqml-demo-notes";
+  "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples";
+  "hsqml-morris" = dontDistribute super."hsqml-morris";
+  "hsreadability" = dontDistribute super."hsreadability";
+  "hsseccomp" = dontDistribute super."hsseccomp";
+  "hsshellscript" = dontDistribute super."hsshellscript";
+  "hssourceinfo" = dontDistribute super."hssourceinfo";
+  "hssqlppp" = dontDistribute super."hssqlppp";
+  "hstatistics" = doDistribute super."hstatistics_0_2_5_2";
+  "hstats" = dontDistribute super."hstats";
+  "hstest" = dontDistribute super."hstest";
+  "hstidy" = dontDistribute super."hstidy";
+  "hstorchat" = dontDistribute super."hstorchat";
+  "hstradeking" = dontDistribute super."hstradeking";
+  "hstyle" = dontDistribute super."hstyle";
+  "hstzaar" = dontDistribute super."hstzaar";
+  "hsubconvert" = dontDistribute super."hsubconvert";
+  "hsverilog" = dontDistribute super."hsverilog";
+  "hswip" = dontDistribute super."hswip";
+  "hsx" = dontDistribute super."hsx";
+  "hsx-jmacro" = dontDistribute super."hsx-jmacro";
+  "hsx-xhtml" = dontDistribute super."hsx-xhtml";
+  "hsx2hs" = dontDistribute super."hsx2hs";
+  "hsyscall" = dontDistribute super."hsyscall";
+  "hszephyr" = dontDistribute super."hszephyr";
+  "htaglib" = dontDistribute super."htaglib";
+  "htags" = dontDistribute super."htags";
+  "htar" = dontDistribute super."htar";
+  "htiled" = dontDistribute super."htiled";
+  "htime" = dontDistribute super."htime";
+  "html-email-validate" = dontDistribute super."html-email-validate";
+  "html-entities" = dontDistribute super."html-entities";
+  "html-kure" = dontDistribute super."html-kure";
+  "html-minimalist" = dontDistribute super."html-minimalist";
+  "html-rules" = dontDistribute super."html-rules";
+  "html-tokenizer" = dontDistribute super."html-tokenizer";
+  "html-truncate" = dontDistribute super."html-truncate";
+  "html2hamlet" = dontDistribute super."html2hamlet";
+  "html5-entity" = dontDistribute super."html5-entity";
+  "htodo" = dontDistribute super."htodo";
+  "htoml" = dontDistribute super."htoml";
+  "htrace" = dontDistribute super."htrace";
+  "hts" = dontDistribute super."hts";
+  "htsn" = dontDistribute super."htsn";
+  "htsn-common" = dontDistribute super."htsn-common";
+  "htsn-import" = dontDistribute super."htsn-import";
+  "http-accept" = dontDistribute super."http-accept";
+  "http-attoparsec" = dontDistribute super."http-attoparsec";
+  "http-client-auth" = dontDistribute super."http-client-auth";
+  "http-client-conduit" = dontDistribute super."http-client-conduit";
+  "http-client-lens" = dontDistribute super."http-client-lens";
+  "http-client-multipart" = dontDistribute super."http-client-multipart";
+  "http-client-openssl" = dontDistribute super."http-client-openssl";
+  "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers";
+  "http-client-streams" = dontDistribute super."http-client-streams";
+  "http-conduit-browser" = dontDistribute super."http-conduit-browser";
+  "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-encodings" = dontDistribute super."http-encodings";
+  "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kit" = dontDistribute super."http-kit";
+  "http-link-header" = dontDistribute super."http-link-header";
+  "http-listen" = dontDistribute super."http-listen";
+  "http-monad" = dontDistribute super."http-monad";
+  "http-proxy" = dontDistribute super."http-proxy";
+  "http-querystring" = dontDistribute super."http-querystring";
+  "http-server" = dontDistribute super."http-server";
+  "http-shed" = dontDistribute super."http-shed";
+  "http-test" = dontDistribute super."http-test";
+  "http-types" = doDistribute super."http-types_0_8_6";
+  "http-wget" = dontDistribute super."http-wget";
+  "http2" = doDistribute super."http2_1_0_4";
+  "httpd-shed" = dontDistribute super."httpd-shed";
+  "https-everywhere-rules" = dontDistribute super."https-everywhere-rules";
+  "https-everywhere-rules-raw" = dontDistribute super."https-everywhere-rules-raw";
+  "httpspec" = dontDistribute super."httpspec";
+  "htune" = dontDistribute super."htune";
+  "htzaar" = dontDistribute super."htzaar";
+  "hub" = dontDistribute super."hub";
+  "hubigraph" = dontDistribute super."hubigraph";
+  "hubris" = dontDistribute super."hubris";
+  "huckleberry" = dontDistribute super."huckleberry";
+  "huffman" = dontDistribute super."huffman";
+  "hugs2yc" = dontDistribute super."hugs2yc";
+  "hulk" = dontDistribute super."hulk";
+  "human-readable-duration" = dontDistribute super."human-readable-duration";
+  "hums" = dontDistribute super."hums";
+  "hunch" = dontDistribute super."hunch";
+  "hunit-dejafu" = dontDistribute super."hunit-dejafu";
+  "hunit-gui" = dontDistribute super."hunit-gui";
+  "hunit-parsec" = dontDistribute super."hunit-parsec";
+  "hunit-rematch" = dontDistribute super."hunit-rematch";
+  "hunp" = dontDistribute super."hunp";
+  "hunt-searchengine" = dontDistribute super."hunt-searchengine";
+  "hunt-server" = dontDistribute super."hunt-server";
+  "hunt-server-cli" = dontDistribute super."hunt-server-cli";
+  "hurdle" = dontDistribute super."hurdle";
+  "husk-scheme" = dontDistribute super."husk-scheme";
+  "husk-scheme-libs" = dontDistribute super."husk-scheme-libs";
+  "husky" = dontDistribute super."husky";
+  "hutton" = dontDistribute super."hutton";
+  "huttons-razor" = dontDistribute super."huttons-razor";
+  "huzzy" = dontDistribute super."huzzy";
+  "hvect" = doDistribute super."hvect_0_2_0_0";
+  "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
+  "hworker" = dontDistribute super."hworker";
+  "hworker-ses" = dontDistribute super."hworker-ses";
+  "hws" = dontDistribute super."hws";
+  "hwsl2" = dontDistribute super."hwsl2";
+  "hwsl2-bytevector" = dontDistribute super."hwsl2-bytevector";
+  "hwsl2-reducers" = dontDistribute super."hwsl2-reducers";
+  "hx" = dontDistribute super."hx";
+  "hxmppc" = dontDistribute super."hxmppc";
+  "hxournal" = dontDistribute super."hxournal";
+  "hxt-binary" = dontDistribute super."hxt-binary";
+  "hxt-cache" = dontDistribute super."hxt-cache";
+  "hxt-extras" = dontDistribute super."hxt-extras";
+  "hxt-filter" = dontDistribute super."hxt-filter";
+  "hxt-xpath" = dontDistribute super."hxt-xpath";
+  "hxt-xslt" = dontDistribute super."hxt-xslt";
+  "hxthelper" = dontDistribute super."hxthelper";
+  "hxweb" = dontDistribute super."hxweb";
+  "hyahtzee" = dontDistribute super."hyahtzee";
+  "hyakko" = dontDistribute super."hyakko";
+  "hybrid" = dontDistribute super."hybrid";
+  "hybrid-vectors" = dontDistribute super."hybrid-vectors";
+  "hydra-hs" = dontDistribute super."hydra-hs";
+  "hydra-print" = dontDistribute super."hydra-print";
+  "hydrogen" = dontDistribute super."hydrogen";
+  "hydrogen-cli" = dontDistribute super."hydrogen-cli";
+  "hydrogen-cli-args" = dontDistribute super."hydrogen-cli-args";
+  "hydrogen-data" = dontDistribute super."hydrogen-data";
+  "hydrogen-multimap" = dontDistribute super."hydrogen-multimap";
+  "hydrogen-parsing" = dontDistribute super."hydrogen-parsing";
+  "hydrogen-prelude" = dontDistribute super."hydrogen-prelude";
+  "hydrogen-prelude-parsec" = dontDistribute super."hydrogen-prelude-parsec";
+  "hydrogen-syntax" = dontDistribute super."hydrogen-syntax";
+  "hydrogen-util" = dontDistribute super."hydrogen-util";
+  "hydrogen-version" = dontDistribute super."hydrogen-version";
+  "hyena" = dontDistribute super."hyena";
+  "hylolib" = dontDistribute super."hylolib";
+  "hylotab" = dontDistribute super."hylotab";
+  "hyloutils" = dontDistribute super."hyloutils";
+  "hyperdrive" = dontDistribute super."hyperdrive";
+  "hyperfunctions" = dontDistribute super."hyperfunctions";
+  "hyperloglog" = doDistribute super."hyperloglog_0_3_4";
+  "hyperpublic" = dontDistribute super."hyperpublic";
+  "hyphenate" = dontDistribute super."hyphenate";
+  "hypher" = dontDistribute super."hypher";
+  "hzk" = dontDistribute super."hzk";
+  "hzulip" = dontDistribute super."hzulip";
+  "i18n" = dontDistribute super."i18n";
+  "iCalendar" = dontDistribute super."iCalendar";
+  "iException" = dontDistribute super."iException";
+  "iap-verifier" = dontDistribute super."iap-verifier";
+  "ib-api" = dontDistribute super."ib-api";
+  "iban" = dontDistribute super."iban";
+  "ical" = dontDistribute super."ical";
+  "iconv" = dontDistribute super."iconv";
+  "ideas" = dontDistribute super."ideas";
+  "ideas-math" = dontDistribute super."ideas-math";
+  "idempotent" = dontDistribute super."idempotent";
+  "identifiers" = dontDistribute super."identifiers";
+  "idiii" = dontDistribute super."idiii";
+  "idna" = dontDistribute super."idna";
+  "idna2008" = dontDistribute super."idna2008";
+  "idris" = dontDistribute super."idris";
+  "ieee" = dontDistribute super."ieee";
+  "ieee-utils" = dontDistribute super."ieee-utils";
+  "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754-parser" = dontDistribute super."ieee754-parser";
+  "ifcxt" = dontDistribute super."ifcxt";
+  "iff" = dontDistribute super."iff";
+  "ifscs" = dontDistribute super."ifscs";
+  "ig" = dontDistribute super."ig";
+  "ige-mac-integration" = dontDistribute super."ige-mac-integration";
+  "igraph" = dontDistribute super."igraph";
+  "igrf" = dontDistribute super."igrf";
+  "ihaskell" = doDistribute super."ihaskell_0_6_5_0";
+  "ihaskell-display" = dontDistribute super."ihaskell-display";
+  "ihaskell-inline-r" = dontDistribute super."ihaskell-inline-r";
+  "ihaskell-parsec" = dontDistribute super."ihaskell-parsec";
+  "ihaskell-plot" = dontDistribute super."ihaskell-plot";
+  "ihaskell-widgets" = dontDistribute super."ihaskell-widgets";
+  "ihttp" = dontDistribute super."ihttp";
+  "illuminate" = dontDistribute super."illuminate";
+  "image-type" = dontDistribute super."image-type";
+  "imagefilters" = dontDistribute super."imagefilters";
+  "imagemagick" = dontDistribute super."imagemagick";
+  "imagepaste" = dontDistribute super."imagepaste";
+  "imapget" = dontDistribute super."imapget";
+  "imbib" = dontDistribute super."imbib";
+  "imgurder" = dontDistribute super."imgurder";
+  "imm" = dontDistribute super."imm";
+  "imparse" = dontDistribute super."imparse";
+  "imperative-edsl" = dontDistribute super."imperative-edsl";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
+  "implicit" = dontDistribute super."implicit";
+  "implicit-params" = dontDistribute super."implicit-params";
+  "imports" = dontDistribute super."imports";
+  "improve" = dontDistribute super."improve";
+  "inc-ref" = dontDistribute super."inc-ref";
+  "inch" = dontDistribute super."inch";
+  "incremental-computing" = dontDistribute super."incremental-computing";
+  "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
+  "increments" = dontDistribute super."increments";
+  "indentation" = dontDistribute super."indentation";
+  "indentparser" = dontDistribute super."indentparser";
+  "index-core" = dontDistribute super."index-core";
+  "indexed" = dontDistribute super."indexed";
+  "indexed-do-notation" = dontDistribute super."indexed-do-notation";
+  "indexed-extras" = dontDistribute super."indexed-extras";
+  "indexed-free" = dontDistribute super."indexed-free";
+  "indian-language-font-converter" = dontDistribute super."indian-language-font-converter";
+  "indices" = dontDistribute super."indices";
+  "indieweb-algorithms" = dontDistribute super."indieweb-algorithms";
+  "inf-interval" = dontDistribute super."inf-interval";
+  "infer-upstream" = dontDistribute super."infer-upstream";
+  "infernu" = dontDistribute super."infernu";
+  "infinite-search" = dontDistribute super."infinite-search";
+  "infinity" = dontDistribute super."infinity";
+  "infix" = dontDistribute super."infix";
+  "inflist" = dontDistribute super."inflist";
+  "influxdb" = dontDistribute super."influxdb";
+  "informative" = dontDistribute super."informative";
+  "ini" = doDistribute super."ini_0_3_3";
+  "inilist" = dontDistribute super."inilist";
+  "inject" = dontDistribute super."inject";
+  "inject-function" = dontDistribute super."inject-function";
+  "inline-c" = dontDistribute super."inline-c";
+  "inline-c-cpp" = dontDistribute super."inline-c-cpp";
+  "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-r" = dontDistribute super."inline-r";
+  "inquire" = dontDistribute super."inquire";
+  "inserts" = dontDistribute super."inserts";
+  "inspection-proxy" = dontDistribute super."inspection-proxy";
+  "instant-aeson" = dontDistribute super."instant-aeson";
+  "instant-bytes" = dontDistribute super."instant-bytes";
+  "instant-deepseq" = dontDistribute super."instant-deepseq";
+  "instant-generics" = dontDistribute super."instant-generics";
+  "instant-hashable" = dontDistribute super."instant-hashable";
+  "instant-zipper" = dontDistribute super."instant-zipper";
+  "instinct" = dontDistribute super."instinct";
+  "instrument-chord" = dontDistribute super."instrument-chord";
+  "int-cast" = dontDistribute super."int-cast";
+  "integer-pure" = dontDistribute super."integer-pure";
+  "intel-aes" = dontDistribute super."intel-aes";
+  "interchangeable" = dontDistribute super."interchangeable";
+  "interleavableGen" = dontDistribute super."interleavableGen";
+  "interleavableIO" = dontDistribute super."interleavableIO";
+  "interleave" = dontDistribute super."interleave";
+  "interlude" = dontDistribute super."interlude";
+  "intern" = dontDistribute super."intern";
+  "internetmarke" = dontDistribute super."internetmarke";
+  "interpol" = dontDistribute super."interpol";
+  "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
+  "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
+  "interpolation" = dontDistribute super."interpolation";
+  "intricacy" = dontDistribute super."intricacy";
+  "intset" = dontDistribute super."intset";
+  "invertible-syntax" = dontDistribute super."invertible-syntax";
+  "io-capture" = dontDistribute super."io-capture";
+  "io-reactive" = dontDistribute super."io-reactive";
+  "io-region" = dontDistribute super."io-region";
+  "io-storage" = dontDistribute super."io-storage";
+  "io-streams-http" = dontDistribute super."io-streams-http";
+  "io-throttle" = dontDistribute super."io-throttle";
+  "ioctl" = dontDistribute super."ioctl";
+  "ioref-stable" = dontDistribute super."ioref-stable";
+  "iothread" = dontDistribute super."iothread";
+  "iotransaction" = dontDistribute super."iotransaction";
+  "ip-quoter" = dontDistribute super."ip-quoter";
+  "ipatch" = dontDistribute super."ipatch";
+  "ipc" = dontDistribute super."ipc";
+  "ipcvar" = dontDistribute super."ipcvar";
+  "ipopt-hs" = dontDistribute super."ipopt-hs";
+  "ipprint" = dontDistribute super."ipprint";
+  "iproute" = doDistribute super."iproute_1_5_0";
+  "iptables-helpers" = dontDistribute super."iptables-helpers";
+  "iptadmin" = dontDistribute super."iptadmin";
+  "ipython-kernel" = doDistribute super."ipython-kernel_0_6_1_3";
+  "irc" = dontDistribute super."irc";
+  "irc-bytestring" = dontDistribute super."irc-bytestring";
+  "irc-client" = dontDistribute super."irc-client";
+  "irc-colors" = dontDistribute super."irc-colors";
+  "irc-conduit" = dontDistribute super."irc-conduit";
+  "irc-core" = dontDistribute super."irc-core";
+  "irc-ctcp" = dontDistribute super."irc-ctcp";
+  "irc-fun-bot" = dontDistribute super."irc-fun-bot";
+  "irc-fun-client" = dontDistribute super."irc-fun-client";
+  "irc-fun-color" = dontDistribute super."irc-fun-color";
+  "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "ircbot" = dontDistribute super."ircbot";
+  "ircbouncer" = dontDistribute super."ircbouncer";
+  "ireal" = dontDistribute super."ireal";
+  "iron-mq" = dontDistribute super."iron-mq";
+  "ironforge" = dontDistribute super."ironforge";
+  "is" = dontDistribute super."is";
+  "isdicom" = dontDistribute super."isdicom";
+  "isevaluated" = dontDistribute super."isevaluated";
+  "isiz" = dontDistribute super."isiz";
+  "ismtp" = dontDistribute super."ismtp";
+  "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
+  "iso8601-time" = dontDistribute super."iso8601-time";
+  "isohunt" = dontDistribute super."isohunt";
+  "itanium-abi" = dontDistribute super."itanium-abi";
+  "iter-stats" = dontDistribute super."iter-stats";
+  "iterIO" = dontDistribute super."iterIO";
+  "iteratee" = dontDistribute super."iteratee";
+  "iteratee-compress" = dontDistribute super."iteratee-compress";
+  "iteratee-mtl" = dontDistribute super."iteratee-mtl";
+  "iteratee-parsec" = dontDistribute super."iteratee-parsec";
+  "iteratee-stm" = dontDistribute super."iteratee-stm";
+  "iterio-server" = dontDistribute super."iterio-server";
+  "ivar-simple" = dontDistribute super."ivar-simple";
+  "ivor" = dontDistribute super."ivor";
+  "ivory" = dontDistribute super."ivory";
+  "ivory-backend-c" = dontDistribute super."ivory-backend-c";
+  "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-examples" = dontDistribute super."ivory-examples";
+  "ivory-hw" = dontDistribute super."ivory-hw";
+  "ivory-opts" = dontDistribute super."ivory-opts";
+  "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-stdlib" = dontDistribute super."ivory-stdlib";
+  "ivy-web" = dontDistribute super."ivy-web";
+  "ix-shapable" = dontDistribute super."ix-shapable";
+  "ixdopp" = dontDistribute super."ixdopp";
+  "ixmonad" = dontDistribute super."ixmonad";
+  "ixset" = dontDistribute super."ixset";
+  "ixset-typed" = dontDistribute super."ixset-typed";
+  "iyql" = dontDistribute super."iyql";
+  "j2hs" = dontDistribute super."j2hs";
+  "ja-base-extra" = dontDistribute super."ja-base-extra";
+  "jack" = dontDistribute super."jack";
+  "jack-bindings" = dontDistribute super."jack-bindings";
+  "jackminimix" = dontDistribute super."jackminimix";
+  "jacobi-roots" = dontDistribute super."jacobi-roots";
+  "jail" = dontDistribute super."jail";
+  "jailbreak-cabal" = dontDistribute super."jailbreak-cabal";
+  "jalaali" = dontDistribute super."jalaali";
+  "jalla" = dontDistribute super."jalla";
+  "jammittools" = dontDistribute super."jammittools";
+  "jarfind" = dontDistribute super."jarfind";
+  "java-bridge" = dontDistribute super."java-bridge";
+  "java-bridge-extras" = dontDistribute super."java-bridge-extras";
+  "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
+  "java-reflect" = dontDistribute super."java-reflect";
+  "javasf" = dontDistribute super."javasf";
+  "javav" = dontDistribute super."javav";
+  "jcdecaux-vls" = dontDistribute super."jcdecaux-vls";
+  "jdi" = dontDistribute super."jdi";
+  "jespresso" = dontDistribute super."jespresso";
+  "jobqueue" = dontDistribute super."jobqueue";
+  "join" = dontDistribute super."join";
+  "joinlist" = dontDistribute super."joinlist";
+  "jonathanscard" = dontDistribute super."jonathanscard";
+  "jort" = dontDistribute super."jort";
+  "jose" = dontDistribute super."jose";
+  "jose-jwt" = doDistribute super."jose-jwt_0_6_2";
+  "jpeg" = dontDistribute super."jpeg";
+  "js-good-parts" = dontDistribute super."js-good-parts";
+  "jsaddle" = dontDistribute super."jsaddle";
+  "jsaddle-hello" = dontDistribute super."jsaddle-hello";
+  "jsc" = dontDistribute super."jsc";
+  "jsmw" = dontDistribute super."jsmw";
+  "json-assertions" = dontDistribute super."json-assertions";
+  "json-b" = dontDistribute super."json-b";
+  "json-encoder" = dontDistribute super."json-encoder";
+  "json-enumerator" = dontDistribute super."json-enumerator";
+  "json-extra" = dontDistribute super."json-extra";
+  "json-fu" = dontDistribute super."json-fu";
+  "json-litobj" = dontDistribute super."json-litobj";
+  "json-python" = dontDistribute super."json-python";
+  "json-qq" = dontDistribute super."json-qq";
+  "json-rpc" = dontDistribute super."json-rpc";
+  "json-rpc-client" = dontDistribute super."json-rpc-client";
+  "json-rpc-server" = dontDistribute super."json-rpc-server";
+  "json-sop" = dontDistribute super."json-sop";
+  "json-state" = dontDistribute super."json-state";
+  "json-stream" = dontDistribute super."json-stream";
+  "json-togo" = dontDistribute super."json-togo";
+  "json-tools" = dontDistribute super."json-tools";
+  "json-types" = dontDistribute super."json-types";
+  "json2" = dontDistribute super."json2";
+  "json2-hdbc" = dontDistribute super."json2-hdbc";
+  "json2-types" = dontDistribute super."json2-types";
+  "json2yaml" = dontDistribute super."json2yaml";
+  "jsonresume" = dontDistribute super."jsonresume";
+  "jsonrpc-conduit" = dontDistribute super."jsonrpc-conduit";
+  "jsonschema-gen" = dontDistribute super."jsonschema-gen";
+  "jsonsql" = dontDistribute super."jsonsql";
+  "jsontsv" = dontDistribute super."jsontsv";
+  "jspath" = dontDistribute super."jspath";
+  "judy" = dontDistribute super."judy";
+  "jukebox" = dontDistribute super."jukebox";
+  "jumpthefive" = dontDistribute super."jumpthefive";
+  "jvm-parser" = dontDistribute super."jvm-parser";
+  "kademlia" = dontDistribute super."kademlia";
+  "kafka-client" = dontDistribute super."kafka-client";
+  "kangaroo" = dontDistribute super."kangaroo";
+  "kansas-comet" = dontDistribute super."kansas-comet";
+  "kansas-lava" = dontDistribute super."kansas-lava";
+  "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
+  "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio";
+  "kansas-lava-shake" = dontDistribute super."kansas-lava-shake";
+  "karakuri" = dontDistribute super."karakuri";
+  "karver" = dontDistribute super."karver";
+  "katt" = dontDistribute super."katt";
+  "kbq-gu" = dontDistribute super."kbq-gu";
+  "kd-tree" = dontDistribute super."kd-tree";
+  "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
+  "keera-callbacks" = dontDistribute super."keera-callbacks";
+  "keera-hails-i18n" = dontDistribute super."keera-hails-i18n";
+  "keera-hails-mvc-controller" = dontDistribute super."keera-hails-mvc-controller";
+  "keera-hails-mvc-environment-gtk" = dontDistribute super."keera-hails-mvc-environment-gtk";
+  "keera-hails-mvc-model-lightmodel" = dontDistribute super."keera-hails-mvc-model-lightmodel";
+  "keera-hails-mvc-model-protectedmodel" = dontDistribute super."keera-hails-mvc-model-protectedmodel";
+  "keera-hails-mvc-solutions-config" = dontDistribute super."keera-hails-mvc-solutions-config";
+  "keera-hails-mvc-solutions-gtk" = dontDistribute super."keera-hails-mvc-solutions-gtk";
+  "keera-hails-mvc-view" = dontDistribute super."keera-hails-mvc-view";
+  "keera-hails-mvc-view-gtk" = dontDistribute super."keera-hails-mvc-view-gtk";
+  "keera-hails-reactive-fs" = dontDistribute super."keera-hails-reactive-fs";
+  "keera-hails-reactive-gtk" = dontDistribute super."keera-hails-reactive-gtk";
+  "keera-hails-reactive-network" = dontDistribute super."keera-hails-reactive-network";
+  "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling";
+  "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx";
+  "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa";
+  "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses";
+  "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues";
+  "keera-posture" = dontDistribute super."keera-posture";
+  "keiretsu" = dontDistribute super."keiretsu";
+  "kevin" = dontDistribute super."kevin";
+  "keyed" = dontDistribute super."keyed";
+  "keyring" = dontDistribute super."keyring";
+  "keystore" = dontDistribute super."keystore";
+  "keyvaluehash" = dontDistribute super."keyvaluehash";
+  "keyword-args" = dontDistribute super."keyword-args";
+  "kibro" = dontDistribute super."kibro";
+  "kicad-data" = dontDistribute super."kicad-data";
+  "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
+  "kickchan" = dontDistribute super."kickchan";
+  "kif-parser" = dontDistribute super."kif-parser";
+  "kinds" = dontDistribute super."kinds";
+  "kit" = dontDistribute super."kit";
+  "kmeans-par" = dontDistribute super."kmeans-par";
+  "kmeans-vector" = dontDistribute super."kmeans-vector";
+  "knots" = dontDistribute super."knots";
+  "koellner-phonetic" = dontDistribute super."koellner-phonetic";
+  "kontrakcja-templates" = dontDistribute super."kontrakcja-templates";
+  "korfu" = dontDistribute super."korfu";
+  "kqueue" = dontDistribute super."kqueue";
+  "kraken" = dontDistribute super."kraken";
+  "krpc" = dontDistribute super."krpc";
+  "ks-test" = dontDistribute super."ks-test";
+  "ktx" = dontDistribute super."ktx";
+  "kure-your-boilerplate" = dontDistribute super."kure-your-boilerplate";
+  "kyotocabinet" = dontDistribute super."kyotocabinet";
+  "l-bfgs-b" = dontDistribute super."l-bfgs-b";
+  "labeled-graph" = dontDistribute super."labeled-graph";
+  "labeled-tree" = dontDistribute super."labeled-tree";
+  "laborantin-hs" = dontDistribute super."laborantin-hs";
+  "labyrinth" = dontDistribute super."labyrinth";
+  "labyrinth-server" = dontDistribute super."labyrinth-server";
+  "lackey" = dontDistribute super."lackey";
+  "lagrangian" = dontDistribute super."lagrangian";
+  "laika" = dontDistribute super."laika";
+  "lambda-ast" = dontDistribute super."lambda-ast";
+  "lambda-bridge" = dontDistribute super."lambda-bridge";
+  "lambda-canvas" = dontDistribute super."lambda-canvas";
+  "lambda-devs" = dontDistribute super."lambda-devs";
+  "lambda-options" = dontDistribute super."lambda-options";
+  "lambda-placeholders" = dontDistribute super."lambda-placeholders";
+  "lambda-toolbox" = dontDistribute super."lambda-toolbox";
+  "lambda2js" = dontDistribute super."lambda2js";
+  "lambdaBase" = dontDistribute super."lambdaBase";
+  "lambdaFeed" = dontDistribute super."lambdaFeed";
+  "lambdaLit" = dontDistribute super."lambdaLit";
+  "lambdabot-utils" = dontDistribute super."lambdabot-utils";
+  "lambdacat" = dontDistribute super."lambdacat";
+  "lambdacms-core" = dontDistribute super."lambdacms-core";
+  "lambdacms-media" = dontDistribute super."lambdacms-media";
+  "lambdacube" = dontDistribute super."lambdacube";
+  "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-core" = dontDistribute super."lambdacube-core";
+  "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
+  "lambdacube-engine" = dontDistribute super."lambdacube-engine";
+  "lambdacube-examples" = dontDistribute super."lambdacube-examples";
+  "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-samples" = dontDistribute super."lambdacube-samples";
+  "lambdatex" = dontDistribute super."lambdatex";
+  "lambdatwit" = dontDistribute super."lambdatwit";
+  "lambdiff" = dontDistribute super."lambdiff";
+  "lame-tester" = dontDistribute super."lame-tester";
+  "language-asn1" = dontDistribute super."language-asn1";
+  "language-bash" = dontDistribute super."language-bash";
+  "language-boogie" = dontDistribute super."language-boogie";
+  "language-c-comments" = dontDistribute super."language-c-comments";
+  "language-c-inline" = dontDistribute super."language-c-inline";
+  "language-cil" = dontDistribute super."language-cil";
+  "language-css" = dontDistribute super."language-css";
+  "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
+  "language-eiffel" = dontDistribute super."language-eiffel";
+  "language-fortran" = dontDistribute super."language-fortran";
+  "language-gcl" = dontDistribute super."language-gcl";
+  "language-go" = dontDistribute super."language-go";
+  "language-guess" = dontDistribute super."language-guess";
+  "language-java-classfile" = dontDistribute super."language-java-classfile";
+  "language-kort" = dontDistribute super."language-kort";
+  "language-lua" = dontDistribute super."language-lua";
+  "language-lua-qq" = dontDistribute super."language-lua-qq";
+  "language-lua2" = dontDistribute super."language-lua2";
+  "language-mixal" = dontDistribute super."language-mixal";
+  "language-nix" = dontDistribute super."language-nix";
+  "language-objc" = dontDistribute super."language-objc";
+  "language-openscad" = dontDistribute super."language-openscad";
+  "language-pig" = dontDistribute super."language-pig";
+  "language-puppet" = dontDistribute super."language-puppet";
+  "language-python" = dontDistribute super."language-python";
+  "language-python-colour" = dontDistribute super."language-python-colour";
+  "language-python-test" = dontDistribute super."language-python-test";
+  "language-qux" = dontDistribute super."language-qux";
+  "language-sh" = dontDistribute super."language-sh";
+  "language-slice" = dontDistribute super."language-slice";
+  "language-spelling" = dontDistribute super."language-spelling";
+  "language-sqlite" = dontDistribute super."language-sqlite";
+  "language-thrift" = dontDistribute super."language-thrift";
+  "language-typescript" = dontDistribute super."language-typescript";
+  "language-vhdl" = dontDistribute super."language-vhdl";
+  "largeword" = doDistribute super."largeword_1_2_3";
+  "lat" = dontDistribute super."lat";
+  "latest-npm-version" = dontDistribute super."latest-npm-version";
+  "latex" = dontDistribute super."latex";
+  "latex-formulae-hakyll" = dontDistribute super."latex-formulae-hakyll";
+  "latex-formulae-image" = dontDistribute super."latex-formulae-image";
+  "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc";
+  "lattices" = doDistribute super."lattices_1_3";
+  "launchpad-control" = dontDistribute super."launchpad-control";
+  "lax" = dontDistribute super."lax";
+  "layers" = dontDistribute super."layers";
+  "layers-game" = dontDistribute super."layers-game";
+  "layout" = dontDistribute super."layout";
+  "layout-bootstrap" = dontDistribute super."layout-bootstrap";
+  "lazy-io" = dontDistribute super."lazy-io";
+  "lazyarray" = dontDistribute super."lazyarray";
+  "lazyio" = dontDistribute super."lazyio";
+  "lazysplines" = dontDistribute super."lazysplines";
+  "lbfgs" = dontDistribute super."lbfgs";
+  "lcs" = dontDistribute super."lcs";
+  "lda" = dontDistribute super."lda";
+  "ldap-client" = dontDistribute super."ldap-client";
+  "ldif" = dontDistribute super."ldif";
+  "leaf" = dontDistribute super."leaf";
+  "leaky" = dontDistribute super."leaky";
+  "leankit-api" = dontDistribute super."leankit-api";
+  "leapseconds-announced" = dontDistribute super."leapseconds-announced";
+  "learn" = dontDistribute super."learn";
+  "learn-physics" = dontDistribute super."learn-physics";
+  "learn-physics-examples" = dontDistribute super."learn-physics-examples";
+  "learning-hmm" = dontDistribute super."learning-hmm";
+  "leetify" = dontDistribute super."leetify";
+  "leksah" = dontDistribute super."leksah";
+  "leksah-server" = dontDistribute super."leksah-server";
+  "lendingclub" = dontDistribute super."lendingclub";
+  "lens" = doDistribute super."lens_4_12_3";
+  "lens-datetime" = dontDistribute super."lens-datetime";
+  "lens-prelude" = dontDistribute super."lens-prelude";
+  "lens-properties" = dontDistribute super."lens-properties";
+  "lens-regex" = dontDistribute super."lens-regex";
+  "lens-sop" = dontDistribute super."lens-sop";
+  "lens-text-encoding" = dontDistribute super."lens-text-encoding";
+  "lens-time" = dontDistribute super."lens-time";
+  "lens-tutorial" = dontDistribute super."lens-tutorial";
+  "lens-utils" = dontDistribute super."lens-utils";
+  "lenses" = dontDistribute super."lenses";
+  "lensref" = dontDistribute super."lensref";
+  "lentil" = dontDistribute super."lentil";
+  "lenz" = dontDistribute super."lenz";
+  "lenz-template" = dontDistribute super."lenz-template";
+  "level-monad" = dontDistribute super."level-monad";
+  "leveldb-haskell" = dontDistribute super."leveldb-haskell";
+  "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
+  "levmar" = dontDistribute super."levmar";
+  "levmar-chart" = dontDistribute super."levmar-chart";
+  "lgtk" = dontDistribute super."lgtk";
+  "lha" = dontDistribute super."lha";
+  "lhae" = dontDistribute super."lhae";
+  "lhc" = dontDistribute super."lhc";
+  "lhe" = dontDistribute super."lhe";
+  "lhs2TeX-hl" = dontDistribute super."lhs2TeX-hl";
+  "lhs2html" = dontDistribute super."lhs2html";
+  "lhslatex" = dontDistribute super."lhslatex";
+  "libGenI" = dontDistribute super."libGenI";
+  "libarchive-conduit" = dontDistribute super."libarchive-conduit";
+  "libconfig" = dontDistribute super."libconfig";
+  "libcspm" = dontDistribute super."libcspm";
+  "libexpect" = dontDistribute super."libexpect";
+  "libffi" = dontDistribute super."libffi";
+  "libgraph" = dontDistribute super."libgraph";
+  "libhbb" = dontDistribute super."libhbb";
+  "libinfluxdb" = dontDistribute super."libinfluxdb";
+  "libjenkins" = dontDistribute super."libjenkins";
+  "liblastfm" = dontDistribute super."liblastfm";
+  "liblinear-enumerator" = dontDistribute super."liblinear-enumerator";
+  "libltdl" = dontDistribute super."libltdl";
+  "libmpd" = dontDistribute super."libmpd";
+  "libnvvm" = dontDistribute super."libnvvm";
+  "liboleg" = dontDistribute super."liboleg";
+  "libpafe" = dontDistribute super."libpafe";
+  "libpq" = dontDistribute super."libpq";
+  "librandomorg" = dontDistribute super."librandomorg";
+  "libravatar" = dontDistribute super."libravatar";
+  "libssh2" = dontDistribute super."libssh2";
+  "libssh2-conduit" = dontDistribute super."libssh2-conduit";
+  "libstackexchange" = dontDistribute super."libstackexchange";
+  "libsystemd-daemon" = dontDistribute super."libsystemd-daemon";
+  "libsystemd-journal" = dontDistribute super."libsystemd-journal";
+  "libtagc" = dontDistribute super."libtagc";
+  "libvirt-hs" = dontDistribute super."libvirt-hs";
+  "libvorbis" = dontDistribute super."libvorbis";
+  "libxml" = dontDistribute super."libxml";
+  "libxml-enumerator" = dontDistribute super."libxml-enumerator";
+  "libxslt" = dontDistribute super."libxslt";
+  "life" = dontDistribute super."life";
+  "lift-generics" = dontDistribute super."lift-generics";
+  "lifted-threads" = dontDistribute super."lifted-threads";
+  "lifter" = dontDistribute super."lifter";
+  "ligature" = dontDistribute super."ligature";
+  "ligd" = dontDistribute super."ligd";
+  "lighttpd-conf" = dontDistribute super."lighttpd-conf";
+  "lighttpd-conf-qq" = dontDistribute super."lighttpd-conf-qq";
+  "lilypond" = dontDistribute super."lilypond";
+  "limp" = dontDistribute super."limp";
+  "limp-cbc" = dontDistribute super."limp-cbc";
+  "lin-alg" = dontDistribute super."lin-alg";
+  "linda" = dontDistribute super."linda";
+  "lindenmayer" = dontDistribute super."lindenmayer";
+  "line-break" = dontDistribute super."line-break";
+  "line2pdf" = dontDistribute super."line2pdf";
+  "linear" = doDistribute super."linear_1_19_1_3";
+  "linear-algebra-cblas" = dontDistribute super."linear-algebra-cblas";
+  "linear-circuit" = dontDistribute super."linear-circuit";
+  "linear-grammar" = dontDistribute super."linear-grammar";
+  "linear-maps" = dontDistribute super."linear-maps";
+  "linear-opengl" = dontDistribute super."linear-opengl";
+  "linear-vect" = dontDistribute super."linear-vect";
+  "linearEqSolver" = dontDistribute super."linearEqSolver";
+  "linearscan" = dontDistribute super."linearscan";
+  "linearscan-hoopl" = dontDistribute super."linearscan-hoopl";
+  "linebreak" = dontDistribute super."linebreak";
+  "linguistic-ordinals" = dontDistribute super."linguistic-ordinals";
+  "link-relations" = dontDistribute super."link-relations";
+  "linkchk" = dontDistribute super."linkchk";
+  "linkcore" = dontDistribute super."linkcore";
+  "linkedhashmap" = dontDistribute super."linkedhashmap";
+  "linklater" = dontDistribute super."linklater";
+  "linode" = dontDistribute super."linode";
+  "linux-blkid" = dontDistribute super."linux-blkid";
+  "linux-cgroup" = dontDistribute super."linux-cgroup";
+  "linux-evdev" = dontDistribute super."linux-evdev";
+  "linux-inotify" = dontDistribute super."linux-inotify";
+  "linux-kmod" = dontDistribute super."linux-kmod";
+  "linux-mount" = dontDistribute super."linux-mount";
+  "linux-perf" = dontDistribute super."linux-perf";
+  "linux-ptrace" = dontDistribute super."linux-ptrace";
+  "linux-xattr" = dontDistribute super."linux-xattr";
+  "linx-gateway" = dontDistribute super."linx-gateway";
+  "lio" = dontDistribute super."lio";
+  "lio-eci11" = dontDistribute super."lio-eci11";
+  "lio-fs" = dontDistribute super."lio-fs";
+  "lio-simple" = dontDistribute super."lio-simple";
+  "lipsum-gen" = dontDistribute super."lipsum-gen";
+  "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
+  "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "lispparser" = dontDistribute super."lispparser";
+  "list-extras" = dontDistribute super."list-extras";
+  "list-grouping" = dontDistribute super."list-grouping";
+  "list-mux" = dontDistribute super."list-mux";
+  "list-prompt" = dontDistribute super."list-prompt";
+  "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t-attoparsec" = dontDistribute super."list-t-attoparsec";
+  "list-t-html-parser" = dontDistribute super."list-t-html-parser";
+  "list-t-http-client" = dontDistribute super."list-t-http-client";
+  "list-t-libcurl" = dontDistribute super."list-t-libcurl";
+  "list-t-text" = dontDistribute super."list-t-text";
+  "list-tries" = dontDistribute super."list-tries";
+  "list-zip-def" = dontDistribute super."list-zip-def";
+  "listlike-instances" = dontDistribute super."listlike-instances";
+  "lists" = dontDistribute super."lists";
+  "listsafe" = dontDistribute super."listsafe";
+  "lit" = dontDistribute super."lit";
+  "literals" = dontDistribute super."literals";
+  "live-sequencer" = dontDistribute super."live-sequencer";
+  "ll-picosat" = dontDistribute super."ll-picosat";
+  "llrbtree" = dontDistribute super."llrbtree";
+  "llsd" = dontDistribute super."llsd";
+  "llvm" = dontDistribute super."llvm";
+  "llvm-analysis" = dontDistribute super."llvm-analysis";
+  "llvm-base" = dontDistribute super."llvm-base";
+  "llvm-base-types" = dontDistribute super."llvm-base-types";
+  "llvm-base-util" = dontDistribute super."llvm-base-util";
+  "llvm-data-interop" = dontDistribute super."llvm-data-interop";
+  "llvm-extra" = dontDistribute super."llvm-extra";
+  "llvm-ffi" = dontDistribute super."llvm-ffi";
+  "llvm-general" = dontDistribute super."llvm-general";
+  "llvm-general-pure" = dontDistribute super."llvm-general-pure";
+  "llvm-general-quote" = dontDistribute super."llvm-general-quote";
+  "llvm-ht" = dontDistribute super."llvm-ht";
+  "llvm-pkg-config" = dontDistribute super."llvm-pkg-config";
+  "llvm-pretty" = dontDistribute super."llvm-pretty";
+  "llvm-pretty-bc-parser" = dontDistribute super."llvm-pretty-bc-parser";
+  "llvm-tf" = dontDistribute super."llvm-tf";
+  "llvm-tools" = dontDistribute super."llvm-tools";
+  "lmdb" = dontDistribute super."lmdb";
+  "load-env" = dontDistribute super."load-env";
+  "loadavg" = dontDistribute super."loadavg";
+  "local-address" = dontDistribute super."local-address";
+  "local-search" = dontDistribute super."local-search";
+  "located-base" = dontDistribute super."located-base";
+  "locators" = dontDistribute super."locators";
+  "loch" = dontDistribute super."loch";
+  "lock-file" = dontDistribute super."lock-file";
+  "locked-poll" = dontDistribute super."locked-poll";
+  "lockfree-queue" = dontDistribute super."lockfree-queue";
+  "log" = dontDistribute super."log";
+  "log-effect" = dontDistribute super."log-effect";
+  "log2json" = dontDistribute super."log2json";
+  "logfloat" = dontDistribute super."logfloat";
+  "logger" = dontDistribute super."logger";
+  "logging" = dontDistribute super."logging";
+  "logging-facade-journald" = dontDistribute super."logging-facade-journald";
+  "logic-TPTP" = dontDistribute super."logic-TPTP";
+  "logic-classes" = dontDistribute super."logic-classes";
+  "logicst" = dontDistribute super."logicst";
+  "logplex-parse" = dontDistribute super."logplex-parse";
+  "logsink" = dontDistribute super."logsink";
+  "lojban" = dontDistribute super."lojban";
+  "lojbanParser" = dontDistribute super."lojbanParser";
+  "lojbanXiragan" = dontDistribute super."lojbanXiragan";
+  "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
+  "loli" = dontDistribute super."loli";
+  "lookup-tables" = dontDistribute super."lookup-tables";
+  "loop" = doDistribute super."loop_0_2_0";
+  "loop-effin" = dontDistribute super."loop-effin";
+  "loop-while" = dontDistribute super."loop-while";
+  "loops" = dontDistribute super."loops";
+  "loopy" = dontDistribute super."loopy";
+  "lord" = dontDistribute super."lord";
+  "lorem" = dontDistribute super."lorem";
+  "loris" = dontDistribute super."loris";
+  "loshadka" = dontDistribute super."loshadka";
+  "lostcities" = dontDistribute super."lostcities";
+  "lowgl" = dontDistribute super."lowgl";
+  "ls-usb" = dontDistribute super."ls-usb";
+  "lscabal" = dontDistribute super."lscabal";
+  "lss" = dontDistribute super."lss";
+  "lsystem" = dontDistribute super."lsystem";
+  "ltk" = dontDistribute super."ltk";
+  "ltl" = dontDistribute super."ltl";
+  "lua-bytecode" = dontDistribute super."lua-bytecode";
+  "luachunk" = dontDistribute super."luachunk";
+  "luautils" = dontDistribute super."luautils";
+  "lub" = dontDistribute super."lub";
+  "lucid-foundation" = dontDistribute super."lucid-foundation";
+  "lucid-svg" = doDistribute super."lucid-svg_0_5_0_0";
+  "lucienne" = dontDistribute super."lucienne";
+  "luhn" = dontDistribute super."luhn";
+  "lui" = dontDistribute super."lui";
+  "luka" = dontDistribute super."luka";
+  "luminance" = dontDistribute super."luminance";
+  "luminance-samples" = dontDistribute super."luminance-samples";
+  "lushtags" = dontDistribute super."lushtags";
+  "luthor" = dontDistribute super."luthor";
+  "lvish" = dontDistribute super."lvish";
+  "lvmlib" = dontDistribute super."lvmlib";
+  "lvmrun" = dontDistribute super."lvmrun";
+  "lxc" = dontDistribute super."lxc";
+  "lye" = dontDistribute super."lye";
+  "lz4" = dontDistribute super."lz4";
+  "lzma" = dontDistribute super."lzma";
+  "lzma-clib" = dontDistribute super."lzma-clib";
+  "lzma-enumerator" = dontDistribute super."lzma-enumerator";
+  "lzma-streams" = dontDistribute super."lzma-streams";
+  "maam" = dontDistribute super."maam";
+  "mac" = dontDistribute super."mac";
+  "maccatcher" = dontDistribute super."maccatcher";
+  "machinecell" = dontDistribute super."machinecell";
+  "machines-binary" = dontDistribute super."machines-binary";
+  "machines-zlib" = dontDistribute super."machines-zlib";
+  "macho" = dontDistribute super."macho";
+  "maclight" = dontDistribute super."maclight";
+  "macosx-make-standalone" = dontDistribute super."macosx-make-standalone";
+  "mage" = dontDistribute super."mage";
+  "magico" = dontDistribute super."magico";
+  "magma" = dontDistribute super."magma";
+  "mahoro" = dontDistribute super."mahoro";
+  "maid" = dontDistribute super."maid";
+  "mailbox-count" = dontDistribute super."mailbox-count";
+  "mailchimp-subscribe" = dontDistribute super."mailchimp-subscribe";
+  "mailgun" = dontDistribute super."mailgun";
+  "majordomo" = dontDistribute super."majordomo";
+  "majority" = dontDistribute super."majority";
+  "make-hard-links" = dontDistribute super."make-hard-links";
+  "make-package" = dontDistribute super."make-package";
+  "makedo" = dontDistribute super."makedo";
+  "manatee" = dontDistribute super."manatee";
+  "manatee-all" = dontDistribute super."manatee-all";
+  "manatee-anything" = dontDistribute super."manatee-anything";
+  "manatee-browser" = dontDistribute super."manatee-browser";
+  "manatee-core" = dontDistribute super."manatee-core";
+  "manatee-curl" = dontDistribute super."manatee-curl";
+  "manatee-editor" = dontDistribute super."manatee-editor";
+  "manatee-filemanager" = dontDistribute super."manatee-filemanager";
+  "manatee-imageviewer" = dontDistribute super."manatee-imageviewer";
+  "manatee-ircclient" = dontDistribute super."manatee-ircclient";
+  "manatee-mplayer" = dontDistribute super."manatee-mplayer";
+  "manatee-pdfviewer" = dontDistribute super."manatee-pdfviewer";
+  "manatee-processmanager" = dontDistribute super."manatee-processmanager";
+  "manatee-reader" = dontDistribute super."manatee-reader";
+  "manatee-template" = dontDistribute super."manatee-template";
+  "manatee-terminal" = dontDistribute super."manatee-terminal";
+  "manatee-welcome" = dontDistribute super."manatee-welcome";
+  "mancala" = dontDistribute super."mancala";
+  "mandrill" = doDistribute super."mandrill_0_3_0_0";
+  "mandulia" = dontDistribute super."mandulia";
+  "mangopay" = doDistribute super."mangopay_1_11_5";
+  "manifold-random" = dontDistribute super."manifold-random";
+  "manifolds" = dontDistribute super."manifolds";
+  "marionetta" = dontDistribute super."marionetta";
+  "markdown-kate" = dontDistribute super."markdown-kate";
+  "markdown-pap" = dontDistribute super."markdown-pap";
+  "markdown-unlit" = dontDistribute super."markdown-unlit";
+  "markdown2svg" = dontDistribute super."markdown2svg";
+  "marked-pretty" = dontDistribute super."marked-pretty";
+  "markov" = dontDistribute super."markov";
+  "markov-chain" = dontDistribute super."markov-chain";
+  "markov-processes" = dontDistribute super."markov-processes";
+  "markup" = doDistribute super."markup_1_1_0";
+  "markup-preview" = dontDistribute super."markup-preview";
+  "marmalade-upload" = dontDistribute super."marmalade-upload";
+  "marquise" = dontDistribute super."marquise";
+  "marxup" = dontDistribute super."marxup";
+  "masakazu-bot" = dontDistribute super."masakazu-bot";
+  "mastermind" = dontDistribute super."mastermind";
+  "matchers" = dontDistribute super."matchers";
+  "mathblog" = dontDistribute super."mathblog";
+  "mathgenealogy" = dontDistribute super."mathgenealogy";
+  "mathista" = dontDistribute super."mathista";
+  "mathlink" = dontDistribute super."mathlink";
+  "matlab" = dontDistribute super."matlab";
+  "matrix-market" = dontDistribute super."matrix-market";
+  "matrix-market-pure" = dontDistribute super."matrix-market-pure";
+  "matsuri" = dontDistribute super."matsuri";
+  "maude" = dontDistribute super."maude";
+  "maxent" = dontDistribute super."maxent";
+  "maxsharing" = dontDistribute super."maxsharing";
+  "maybe-justify" = dontDistribute super."maybe-justify";
+  "maybench" = dontDistribute super."maybench";
+  "mbox-tools" = dontDistribute super."mbox-tools";
+  "mcmaster-gloss-examples" = dontDistribute super."mcmaster-gloss-examples";
+  "mcmc-samplers" = dontDistribute super."mcmc-samplers";
+  "mcmc-synthesis" = dontDistribute super."mcmc-synthesis";
+  "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";
+  "mecha" = dontDistribute super."mecha";
+  "mediawiki" = dontDistribute super."mediawiki";
+  "mediawiki2latex" = dontDistribute super."mediawiki2latex";
+  "medium-sdk-haskell" = dontDistribute super."medium-sdk-haskell";
+  "meep" = dontDistribute super."meep";
+  "mega-sdist" = dontDistribute super."mega-sdist";
+  "megaparsec" = dontDistribute super."megaparsec";
+  "meldable-heap" = dontDistribute super."meldable-heap";
+  "melody" = dontDistribute super."melody";
+  "memcache" = dontDistribute super."memcache";
+  "memcache-conduit" = dontDistribute super."memcache-conduit";
+  "memcache-haskell" = dontDistribute super."memcache-haskell";
+  "memcached" = dontDistribute super."memcached";
+  "memexml" = dontDistribute super."memexml";
+  "memo-ptr" = dontDistribute super."memo-ptr";
+  "memo-sqlite" = dontDistribute super."memo-sqlite";
+  "memoization-utils" = dontDistribute super."memoization-utils";
+  "memory" = doDistribute super."memory_0_7";
+  "memscript" = dontDistribute super."memscript";
+  "mersenne-random" = dontDistribute super."mersenne-random";
+  "messente" = dontDistribute super."messente";
+  "meta-misc" = dontDistribute super."meta-misc";
+  "meta-par" = dontDistribute super."meta-par";
+  "meta-par-accelerate" = dontDistribute super."meta-par-accelerate";
+  "metadata" = dontDistribute super."metadata";
+  "metamorphic" = dontDistribute super."metamorphic";
+  "metaplug" = dontDistribute super."metaplug";
+  "metric" = dontDistribute super."metric";
+  "metricsd-client" = dontDistribute super."metricsd-client";
+  "metronome" = dontDistribute super."metronome";
+  "mezzolens" = dontDistribute super."mezzolens";
+  "mfsolve" = dontDistribute super."mfsolve";
+  "mgeneric" = dontDistribute super."mgeneric";
+  "mi" = dontDistribute super."mi";
+  "microbench" = dontDistribute super."microbench";
+  "microformats2-parser" = dontDistribute super."microformats2-parser";
+  "microformats2-types" = dontDistribute super."microformats2-types";
+  "microlens" = doDistribute super."microlens_0_2_0_0";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
+  "microlens-each" = dontDistribute super."microlens-each";
+  "microlens-ghc" = doDistribute super."microlens-ghc_0_1_0_1";
+  "microlens-mtl" = doDistribute super."microlens-mtl_0_1_4_0";
+  "microlens-platform" = dontDistribute super."microlens-platform";
+  "microlens-th" = doDistribute super."microlens-th_0_2_1_1";
+  "microtimer" = dontDistribute super."microtimer";
+  "mida" = dontDistribute super."mida";
+  "midi" = dontDistribute super."midi";
+  "midi-alsa" = dontDistribute super."midi-alsa";
+  "midi-music-box" = dontDistribute super."midi-music-box";
+  "midi-util" = dontDistribute super."midi-util";
+  "midimory" = dontDistribute super."midimory";
+  "midisurface" = dontDistribute super."midisurface";
+  "mighttpd" = dontDistribute super."mighttpd";
+  "mighttpd2" = dontDistribute super."mighttpd2";
+  "mighty-metropolis" = dontDistribute super."mighty-metropolis";
+  "mikmod" = dontDistribute super."mikmod";
+  "miku" = dontDistribute super."miku";
+  "milena" = dontDistribute super."milena";
+  "mime" = dontDistribute super."mime";
+  "mime-directory" = dontDistribute super."mime-directory";
+  "mime-string" = dontDistribute super."mime-string";
+  "mines" = dontDistribute super."mines";
+  "minesweeper" = dontDistribute super."minesweeper";
+  "miniball" = dontDistribute super."miniball";
+  "miniforth" = dontDistribute super."miniforth";
+  "minilens" = dontDistribute super."minilens";
+  "minimal-configuration" = dontDistribute super."minimal-configuration";
+  "minimorph" = dontDistribute super."minimorph";
+  "minimung" = dontDistribute super."minimung";
+  "minions" = dontDistribute super."minions";
+  "minioperational" = dontDistribute super."minioperational";
+  "miniplex" = dontDistribute super."miniplex";
+  "minirotate" = dontDistribute super."minirotate";
+  "minisat" = dontDistribute super."minisat";
+  "ministg" = dontDistribute super."ministg";
+  "miniutter" = dontDistribute super."miniutter";
+  "minst-idx" = dontDistribute super."minst-idx";
+  "mirror-tweet" = dontDistribute super."mirror-tweet";
+  "missing-py2" = dontDistribute super."missing-py2";
+  "mix-arrows" = dontDistribute super."mix-arrows";
+  "mixed-strategies" = dontDistribute super."mixed-strategies";
+  "mkbndl" = dontDistribute super."mkbndl";
+  "mkcabal" = dontDistribute super."mkcabal";
+  "ml-w" = dontDistribute super."ml-w";
+  "mlist" = dontDistribute super."mlist";
+  "mmtl" = dontDistribute super."mmtl";
+  "mmtl-base" = dontDistribute super."mmtl-base";
+  "moan" = dontDistribute super."moan";
+  "modbus-tcp" = dontDistribute super."modbus-tcp";
+  "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
+  "modsplit" = dontDistribute super."modsplit";
+  "modular-arithmetic" = dontDistribute super."modular-arithmetic";
+  "modular-prelude" = dontDistribute super."modular-prelude";
+  "modular-prelude-classy" = dontDistribute super."modular-prelude-classy";
+  "module-management" = dontDistribute super."module-management";
+  "modulespection" = dontDistribute super."modulespection";
+  "modulo" = dontDistribute super."modulo";
+  "moe" = dontDistribute super."moe";
+  "moesocks" = dontDistribute super."moesocks";
+  "mohws" = dontDistribute super."mohws";
+  "mole" = dontDistribute super."mole";
+  "monad-abort-fd" = dontDistribute super."monad-abort-fd";
+  "monad-atom" = dontDistribute super."monad-atom";
+  "monad-atom-simple" = dontDistribute super."monad-atom-simple";
+  "monad-bool" = dontDistribute super."monad-bool";
+  "monad-classes" = dontDistribute super."monad-classes";
+  "monad-codec" = dontDistribute super."monad-codec";
+  "monad-exception" = dontDistribute super."monad-exception";
+  "monad-fork" = dontDistribute super."monad-fork";
+  "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
+  "monad-interleave" = dontDistribute super."monad-interleave";
+  "monad-levels" = dontDistribute super."monad-levels";
+  "monad-loops-stm" = dontDistribute super."monad-loops-stm";
+  "monad-lrs" = dontDistribute super."monad-lrs";
+  "monad-memo" = dontDistribute super."monad-memo";
+  "monad-mersenne-random" = dontDistribute super."monad-mersenne-random";
+  "monad-open" = dontDistribute super."monad-open";
+  "monad-ox" = dontDistribute super."monad-ox";
+  "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
+  "monad-param" = dontDistribute super."monad-param";
+  "monad-ran" = dontDistribute super."monad-ran";
+  "monad-resumption" = dontDistribute super."monad-resumption";
+  "monad-state" = dontDistribute super."monad-state";
+  "monad-statevar" = dontDistribute super."monad-statevar";
+  "monad-stlike-io" = dontDistribute super."monad-stlike-io";
+  "monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
+  "monad-supply" = dontDistribute super."monad-supply";
+  "monad-task" = dontDistribute super."monad-task";
+  "monad-time" = dontDistribute super."monad-time";
+  "monad-tx" = dontDistribute super."monad-tx";
+  "monad-unify" = dontDistribute super."monad-unify";
+  "monad-wrap" = dontDistribute super."monad-wrap";
+  "monadIO" = dontDistribute super."monadIO";
+  "monadLib-compose" = dontDistribute super."monadLib-compose";
+  "monadacme" = dontDistribute super."monadacme";
+  "monadbi" = dontDistribute super."monadbi";
+  "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1";
+  "monadfibre" = dontDistribute super."monadfibre";
+  "monadiccp" = dontDistribute super."monadiccp";
+  "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
+  "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
+  "monadlist" = dontDistribute super."monadlist";
+  "monadloc" = dontDistribute super."monadloc";
+  "monadloc-pp" = dontDistribute super."monadloc-pp";
+  "monadplus" = dontDistribute super."monadplus";
+  "monads-fd" = dontDistribute super."monads-fd";
+  "monadtransform" = dontDistribute super."monadtransform";
+  "monarch" = dontDistribute super."monarch";
+  "mongodb-queue" = dontDistribute super."mongodb-queue";
+  "mongrel2-handler" = dontDistribute super."mongrel2-handler";
+  "monitor" = dontDistribute super."monitor";
+  "mono-foldable" = dontDistribute super."mono-foldable";
+  "mono-traversable" = doDistribute super."mono-traversable_0_9_3";
+  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-owns" = dontDistribute super."monoid-owns";
+  "monoid-record" = dontDistribute super."monoid-record";
+  "monoid-statistics" = dontDistribute super."monoid-statistics";
+  "monoid-transformer" = dontDistribute super."monoid-transformer";
+  "monoidplus" = dontDistribute super."monoidplus";
+  "monoids" = dontDistribute super."monoids";
+  "monomorphic" = dontDistribute super."monomorphic";
+  "montage" = dontDistribute super."montage";
+  "montage-client" = dontDistribute super."montage-client";
+  "monte-carlo" = dontDistribute super."monte-carlo";
+  "moo" = dontDistribute super."moo";
+  "moonshine" = dontDistribute super."moonshine";
+  "morfette" = dontDistribute super."morfette";
+  "morfeusz" = dontDistribute super."morfeusz";
+  "morte" = dontDistribute super."morte";
+  "mosaico-lib" = dontDistribute super."mosaico-lib";
+  "mount" = dontDistribute super."mount";
+  "mp" = dontDistribute super."mp";
+  "mp3decoder" = dontDistribute super."mp3decoder";
+  "mpdmate" = dontDistribute super."mpdmate";
+  "mpppc" = dontDistribute super."mpppc";
+  "mpretty" = dontDistribute super."mpretty";
+  "mpris" = dontDistribute super."mpris";
+  "mprover" = dontDistribute super."mprover";
+  "mps" = dontDistribute super."mps";
+  "mpvguihs" = dontDistribute super."mpvguihs";
+  "mqtt-hs" = dontDistribute super."mqtt-hs";
+  "ms" = dontDistribute super."ms";
+  "msgpack" = dontDistribute super."msgpack";
+  "msgpack-aeson" = dontDistribute super."msgpack-aeson";
+  "msgpack-idl" = dontDistribute super."msgpack-idl";
+  "msgpack-rpc" = dontDistribute super."msgpack-rpc";
+  "msh" = dontDistribute super."msh";
+  "msu" = dontDistribute super."msu";
+  "mtgoxapi" = dontDistribute super."mtgoxapi";
+  "mtl-c" = dontDistribute super."mtl-c";
+  "mtl-evil-instances" = dontDistribute super."mtl-evil-instances";
+  "mtl-tf" = dontDistribute super."mtl-tf";
+  "mtl-unleashed" = dontDistribute super."mtl-unleashed";
+  "mtlparse" = dontDistribute super."mtlparse";
+  "mtlx" = dontDistribute super."mtlx";
+  "mtp" = dontDistribute super."mtp";
+  "mtree" = dontDistribute super."mtree";
+  "mucipher" = dontDistribute super."mucipher";
+  "mudbath" = dontDistribute super."mudbath";
+  "muesli" = dontDistribute super."muesli";
+  "multext-east-msd" = dontDistribute super."multext-east-msd";
+  "multi-cabal" = dontDistribute super."multi-cabal";
+  "multifocal" = dontDistribute super."multifocal";
+  "multihash" = dontDistribute super."multihash";
+  "multipart-names" = dontDistribute super."multipart-names";
+  "multipass" = dontDistribute super."multipass";
+  "multiplate" = dontDistribute super."multiplate";
+  "multiplate-simplified" = dontDistribute super."multiplate-simplified";
+  "multiplicity" = dontDistribute super."multiplicity";
+  "multirec" = dontDistribute super."multirec";
+  "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver";
+  "multirec-binary" = dontDistribute super."multirec-binary";
+  "multiset-comb" = dontDistribute super."multiset-comb";
+  "multisetrewrite" = dontDistribute super."multisetrewrite";
+  "multistate" = dontDistribute super."multistate";
+  "muon" = dontDistribute super."muon";
+  "murder" = dontDistribute super."murder";
+  "murmur3" = dontDistribute super."murmur3";
+  "murmurhash3" = dontDistribute super."murmurhash3";
+  "music-articulation" = dontDistribute super."music-articulation";
+  "music-diatonic" = dontDistribute super."music-diatonic";
+  "music-dynamics" = dontDistribute super."music-dynamics";
+  "music-dynamics-literal" = dontDistribute super."music-dynamics-literal";
+  "music-graphics" = dontDistribute super."music-graphics";
+  "music-parts" = dontDistribute super."music-parts";
+  "music-pitch" = dontDistribute super."music-pitch";
+  "music-pitch-literal" = dontDistribute super."music-pitch-literal";
+  "music-preludes" = dontDistribute super."music-preludes";
+  "music-score" = dontDistribute super."music-score";
+  "music-sibelius" = dontDistribute super."music-sibelius";
+  "music-suite" = dontDistribute super."music-suite";
+  "music-util" = dontDistribute super."music-util";
+  "musicbrainz-email" = dontDistribute super."musicbrainz-email";
+  "musicxml" = dontDistribute super."musicxml";
+  "musicxml2" = dontDistribute super."musicxml2";
+  "mustache" = dontDistribute super."mustache";
+  "mustache-haskell" = dontDistribute super."mustache-haskell";
+  "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-iter" = dontDistribute super."mutable-iter";
+  "mute-unmute" = dontDistribute super."mute-unmute";
+  "mvc" = dontDistribute super."mvc";
+  "mvc-updates" = dontDistribute super."mvc-updates";
+  "mvclient" = dontDistribute super."mvclient";
+  "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random-monad" = dontDistribute super."mwc-random-monad";
+  "myTestlll" = dontDistribute super."myTestlll";
+  "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
+  "myo" = dontDistribute super."myo";
+  "mysnapsession" = dontDistribute super."mysnapsession";
+  "mysnapsession-example" = dontDistribute super."mysnapsession-example";
+  "mysql-effect" = dontDistribute super."mysql-effect";
+  "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi";
+  "mysql-simple-typed" = dontDistribute super."mysql-simple-typed";
+  "mzv" = dontDistribute super."mzv";
+  "n-m" = dontDistribute super."n-m";
+  "nagios-check" = dontDistribute super."nagios-check";
+  "nagios-perfdata" = dontDistribute super."nagios-perfdata";
+  "nagios-plugin-ekg" = dontDistribute super."nagios-plugin-ekg";
+  "named-formlet" = dontDistribute super."named-formlet";
+  "named-lock" = dontDistribute super."named-lock";
+  "named-records" = dontDistribute super."named-records";
+  "namelist" = dontDistribute super."namelist";
+  "names" = dontDistribute super."names";
+  "names-th" = dontDistribute super."names-th";
+  "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-hmac" = dontDistribute super."nano-hmac";
+  "nano-md5" = dontDistribute super."nano-md5";
+  "nanoAgda" = dontDistribute super."nanoAgda";
+  "nanocurses" = dontDistribute super."nanocurses";
+  "nanomsg" = dontDistribute super."nanomsg";
+  "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
+  "nanoparsec" = dontDistribute super."nanoparsec";
+  "nanq" = dontDistribute super."nanq";
+  "narc" = dontDistribute super."narc";
+  "nat" = dontDistribute super."nat";
+  "nationstates" = doDistribute super."nationstates_0_2_0_3";
+  "nats" = doDistribute super."nats_1";
+  "nats-queue" = dontDistribute super."nats-queue";
+  "natural-number" = dontDistribute super."natural-number";
+  "natural-numbers" = dontDistribute super."natural-numbers";
+  "natural-sort" = dontDistribute super."natural-sort";
+  "natural-transformation" = dontDistribute super."natural-transformation";
+  "naturalcomp" = dontDistribute super."naturalcomp";
+  "naturals" = dontDistribute super."naturals";
+  "naver-translate" = dontDistribute super."naver-translate";
+  "nbt" = dontDistribute super."nbt";
+  "nc-indicators" = dontDistribute super."nc-indicators";
+  "ncurses" = dontDistribute super."ncurses";
+  "neat" = dontDistribute super."neat";
+  "neat-interpolation" = doDistribute super."neat-interpolation_0_2_3";
+  "needle" = dontDistribute super."needle";
+  "neet" = dontDistribute super."neet";
+  "nehe-tuts" = dontDistribute super."nehe-tuts";
+  "neil" = dontDistribute super."neil";
+  "neither" = dontDistribute super."neither";
+  "nemesis" = dontDistribute super."nemesis";
+  "nemesis-titan" = dontDistribute super."nemesis-titan";
+  "nerf" = dontDistribute super."nerf";
+  "nero" = dontDistribute super."nero";
+  "nero-wai" = dontDistribute super."nero-wai";
+  "nero-warp" = dontDistribute super."nero-warp";
+  "nested-routes" = dontDistribute super."nested-routes";
+  "nested-sets" = dontDistribute super."nested-sets";
+  "nestedmap" = dontDistribute super."nestedmap";
+  "net-concurrent" = dontDistribute super."net-concurrent";
+  "netclock" = dontDistribute super."netclock";
+  "netcore" = dontDistribute super."netcore";
+  "netlines" = dontDistribute super."netlines";
+  "netlink" = dontDistribute super."netlink";
+  "netlist" = dontDistribute super."netlist";
+  "netlist-to-vhdl" = dontDistribute super."netlist-to-vhdl";
+  "netpbm" = dontDistribute super."netpbm";
+  "netrc" = dontDistribute super."netrc";
+  "netspec" = dontDistribute super."netspec";
+  "netstring-enumerator" = dontDistribute super."netstring-enumerator";
+  "nettle" = dontDistribute super."nettle";
+  "nettle-frp" = dontDistribute super."nettle-frp";
+  "nettle-netkit" = dontDistribute super."nettle-netkit";
+  "nettle-openflow" = dontDistribute super."nettle-openflow";
+  "netwire" = dontDistribute super."netwire";
+  "netwire-input" = dontDistribute super."netwire-input";
+  "netwire-input-glfw" = dontDistribute super."netwire-input-glfw";
+  "network-address" = dontDistribute super."network-address";
+  "network-anonymous-tor" = doDistribute super."network-anonymous-tor_0_9_2";
+  "network-api-support" = dontDistribute super."network-api-support";
+  "network-bitcoin" = dontDistribute super."network-bitcoin";
+  "network-builder" = dontDistribute super."network-builder";
+  "network-bytestring" = dontDistribute super."network-bytestring";
+  "network-conduit" = dontDistribute super."network-conduit";
+  "network-connection" = dontDistribute super."network-connection";
+  "network-data" = dontDistribute super."network-data";
+  "network-dbus" = dontDistribute super."network-dbus";
+  "network-dns" = dontDistribute super."network-dns";
+  "network-enumerator" = dontDistribute super."network-enumerator";
+  "network-fancy" = dontDistribute super."network-fancy";
+  "network-house" = dontDistribute super."network-house";
+  "network-interfacerequest" = dontDistribute super."network-interfacerequest";
+  "network-ip" = dontDistribute super."network-ip";
+  "network-metrics" = dontDistribute super."network-metrics";
+  "network-minihttp" = dontDistribute super."network-minihttp";
+  "network-msg" = dontDistribute super."network-msg";
+  "network-netpacket" = dontDistribute super."network-netpacket";
+  "network-pgi" = dontDistribute super."network-pgi";
+  "network-rpca" = dontDistribute super."network-rpca";
+  "network-server" = dontDistribute super."network-server";
+  "network-service" = dontDistribute super."network-service";
+  "network-simple-sockaddr" = dontDistribute super."network-simple-sockaddr";
+  "network-simple-tls" = dontDistribute super."network-simple-tls";
+  "network-socket-options" = dontDistribute super."network-socket-options";
+  "network-stream" = dontDistribute super."network-stream";
+  "network-topic-models" = dontDistribute super."network-topic-models";
+  "network-transport-amqp" = dontDistribute super."network-transport-amqp";
+  "network-transport-composed" = dontDistribute super."network-transport-composed";
+  "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tcp" = dontDistribute super."network-transport-tcp";
+  "network-transport-tests" = dontDistribute super."network-transport-tests";
+  "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
+  "network-uri-static" = dontDistribute super."network-uri-static";
+  "network-wai-router" = dontDistribute super."network-wai-router";
+  "network-websocket" = dontDistribute super."network-websocket";
+  "networked-game" = dontDistribute super."networked-game";
+  "newports" = dontDistribute super."newports";
+  "newsynth" = dontDistribute super."newsynth";
+  "newt" = dontDistribute super."newt";
+  "newtype-deriving" = dontDistribute super."newtype-deriving";
+  "newtype-th" = dontDistribute super."newtype-th";
+  "newtyper" = dontDistribute super."newtyper";
+  "nextstep-plist" = dontDistribute super."nextstep-plist";
+  "nf" = dontDistribute super."nf";
+  "ngrams-loader" = dontDistribute super."ngrams-loader";
+  "niagra" = dontDistribute super."niagra";
+  "nibblestring" = dontDistribute super."nibblestring";
+  "nicify" = dontDistribute super."nicify";
+  "nicify-lib" = dontDistribute super."nicify-lib";
+  "nicovideo-translator" = dontDistribute super."nicovideo-translator";
+  "nikepub" = dontDistribute super."nikepub";
+  "nimber" = dontDistribute super."nimber";
+  "nitro" = dontDistribute super."nitro";
+  "nix-eval" = dontDistribute super."nix-eval";
+  "nix-paths" = dontDistribute super."nix-paths";
+  "nixfromnpm" = dontDistribute super."nixfromnpm";
+  "nixos-types" = dontDistribute super."nixos-types";
+  "nkjp" = dontDistribute super."nkjp";
+  "nlp-scores" = dontDistribute super."nlp-scores";
+  "nlp-scores-scripts" = dontDistribute super."nlp-scores-scripts";
+  "nm" = dontDistribute super."nm";
+  "nme" = dontDistribute super."nme";
+  "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
+  "no-role-annots" = dontDistribute super."no-role-annots";
+  "nofib-analyse" = dontDistribute super."nofib-analyse";
+  "nofib-analyze" = dontDistribute super."nofib-analyze";
+  "noise" = dontDistribute super."noise";
+  "non-empty" = dontDistribute super."non-empty";
+  "non-negative" = dontDistribute super."non-negative";
+  "nondeterminism" = dontDistribute super."nondeterminism";
+  "nonfree" = dontDistribute super."nonfree";
+  "nonlinear-optimization" = dontDistribute super."nonlinear-optimization";
+  "nonlinear-optimization-ad" = dontDistribute super."nonlinear-optimization-ad";
+  "noodle" = dontDistribute super."noodle";
+  "normaldistribution" = dontDistribute super."normaldistribution";
+  "not-gloss" = dontDistribute super."not-gloss";
+  "not-gloss-examples" = dontDistribute super."not-gloss-examples";
+  "not-in-base" = dontDistribute super."not-in-base";
+  "notcpp" = dontDistribute super."notcpp";
+  "notmuch-haskell" = dontDistribute super."notmuch-haskell";
+  "notmuch-web" = dontDistribute super."notmuch-web";
+  "notzero" = dontDistribute super."notzero";
+  "np-extras" = dontDistribute super."np-extras";
+  "np-linear" = dontDistribute super."np-linear";
+  "nptools" = dontDistribute super."nptools";
+  "nth-prime" = dontDistribute super."nth-prime";
+  "nthable" = dontDistribute super."nthable";
+  "ntp-control" = dontDistribute super."ntp-control";
+  "null-canvas" = dontDistribute super."null-canvas";
+  "nullary" = dontDistribute super."nullary";
+  "number" = dontDistribute super."number";
+  "numbering" = dontDistribute super."numbering";
+  "numerals" = dontDistribute super."numerals";
+  "numerals-base" = dontDistribute super."numerals-base";
+  "numeric-extras" = doDistribute super."numeric-extras_0_0_3";
+  "numeric-limits" = dontDistribute super."numeric-limits";
+  "numeric-prelude" = dontDistribute super."numeric-prelude";
+  "numeric-qq" = dontDistribute super."numeric-qq";
+  "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
+  "numeric-tools" = dontDistribute super."numeric-tools";
+  "numericpeano" = dontDistribute super."numericpeano";
+  "nums" = dontDistribute super."nums";
+  "numtype-dk" = dontDistribute super."numtype-dk";
+  "numtype-tf" = dontDistribute super."numtype-tf";
+  "nurbs" = dontDistribute super."nurbs";
+  "nvim-hs" = dontDistribute super."nvim-hs";
+  "nvim-hs-contrib" = dontDistribute super."nvim-hs-contrib";
+  "nyan" = dontDistribute super."nyan";
+  "nylas" = dontDistribute super."nylas";
+  "nymphaea" = dontDistribute super."nymphaea";
+  "oauthenticated" = dontDistribute super."oauthenticated";
+  "obdd" = dontDistribute super."obdd";
+  "oberon0" = dontDistribute super."oberon0";
+  "obj" = dontDistribute super."obj";
+  "objectid" = dontDistribute super."objectid";
+  "observable-sharing" = dontDistribute super."observable-sharing";
+  "octohat" = dontDistribute super."octohat";
+  "octopus" = dontDistribute super."octopus";
+  "oculus" = dontDistribute super."oculus";
+  "off-simple" = dontDistribute super."off-simple";
+  "ofx" = dontDistribute super."ofx";
+  "ohloh-hs" = dontDistribute super."ohloh-hs";
+  "oi" = dontDistribute super."oi";
+  "oidc-client" = dontDistribute super."oidc-client";
+  "ois-input-manager" = dontDistribute super."ois-input-manager";
+  "old-version" = dontDistribute super."old-version";
+  "olwrapper" = dontDistribute super."olwrapper";
+  "omaketex" = dontDistribute super."omaketex";
+  "omega" = dontDistribute super."omega";
+  "omnicodec" = dontDistribute super."omnicodec";
+  "omnifmt" = dontDistribute super."omnifmt";
+  "on-a-horse" = dontDistribute super."on-a-horse";
+  "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel";
+  "once" = dontDistribute super."once";
+  "one-liner" = dontDistribute super."one-liner";
+  "one-time-password" = dontDistribute super."one-time-password";
+  "oneOfN" = dontDistribute super."oneOfN";
+  "oneormore" = dontDistribute super."oneormore";
+  "only" = dontDistribute super."only";
+  "onu-course" = dontDistribute super."onu-course";
+  "oo-prototypes" = dontDistribute super."oo-prototypes";
+  "opaleye-classy" = dontDistribute super."opaleye-classy";
+  "opaleye-sqlite" = dontDistribute super."opaleye-sqlite";
+  "opaleye-trans" = dontDistribute super."opaleye-trans";
+  "open-browser" = dontDistribute super."open-browser";
+  "open-haddock" = dontDistribute super."open-haddock";
+  "open-pandoc" = dontDistribute super."open-pandoc";
+  "open-symbology" = dontDistribute super."open-symbology";
+  "open-typerep" = dontDistribute super."open-typerep";
+  "open-union" = dontDistribute super."open-union";
+  "open-witness" = dontDistribute super."open-witness";
+  "opencog-atomspace" = dontDistribute super."opencog-atomspace";
+  "opencv-raw" = dontDistribute super."opencv-raw";
+  "opendatatable" = dontDistribute super."opendatatable";
+  "openexchangerates" = dontDistribute super."openexchangerates";
+  "openflow" = dontDistribute super."openflow";
+  "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
+  "opengles" = dontDistribute super."opengles";
+  "openid" = dontDistribute super."openid";
+  "openpgp" = dontDistribute super."openpgp";
+  "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
+  "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
+  "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "openssh-github-keys" = dontDistribute super."openssh-github-keys";
+  "openssl-createkey" = dontDistribute super."openssl-createkey";
+  "opentheory" = dontDistribute super."opentheory";
+  "opentheory-bits" = dontDistribute super."opentheory-bits";
+  "opentheory-byte" = dontDistribute super."opentheory-byte";
+  "opentheory-char" = dontDistribute super."opentheory-char";
+  "opentheory-divides" = dontDistribute super."opentheory-divides";
+  "opentheory-fibonacci" = dontDistribute super."opentheory-fibonacci";
+  "opentheory-parser" = dontDistribute super."opentheory-parser";
+  "opentheory-prime" = dontDistribute super."opentheory-prime";
+  "opentheory-primitive" = dontDistribute super."opentheory-primitive";
+  "opentheory-probability" = dontDistribute super."opentheory-probability";
+  "opentheory-stream" = dontDistribute super."opentheory-stream";
+  "opentheory-unicode" = dontDistribute super."opentheory-unicode";
+  "operational-alacarte" = dontDistribute super."operational-alacarte";
+  "opml" = dontDistribute super."opml";
+  "opml-conduit" = dontDistribute super."opml-conduit";
+  "opn" = dontDistribute super."opn";
+  "optimal-blocks" = dontDistribute super."optimal-blocks";
+  "optimization" = dontDistribute super."optimization";
+  "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
+  "optional" = dontDistribute super."optional";
+  "options-time" = dontDistribute super."options-time";
+  "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
+  "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "orc" = dontDistribute super."orc";
+  "orchestrate" = dontDistribute super."orchestrate";
+  "orchid" = dontDistribute super."orchid";
+  "orchid-demo" = dontDistribute super."orchid-demo";
+  "ord-adhoc" = dontDistribute super."ord-adhoc";
+  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistics" = dontDistribute super."order-statistics";
+  "ordered" = dontDistribute super."ordered";
+  "orders" = dontDistribute super."orders";
+  "ordrea" = dontDistribute super."ordrea";
+  "organize-imports" = dontDistribute super."organize-imports";
+  "orgmode" = dontDistribute super."orgmode";
+  "orgmode-parse" = dontDistribute super."orgmode-parse";
+  "origami" = dontDistribute super."origami";
+  "os-release" = dontDistribute super."os-release";
+  "osc" = dontDistribute super."osc";
+  "osm-download" = dontDistribute super."osm-download";
+  "oso2pdf" = dontDistribute super."oso2pdf";
+  "osx-ar" = dontDistribute super."osx-ar";
+  "ot" = dontDistribute super."ot";
+  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overture" = dontDistribute super."overture";
+  "pack" = dontDistribute super."pack";
+  "package-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";
+  "packed-dawg" = dontDistribute super."packed-dawg";
+  "packedstring" = dontDistribute super."packedstring";
+  "packer" = dontDistribute super."packer";
+  "packman" = dontDistribute super."packman";
+  "packunused" = dontDistribute super."packunused";
+  "pacman-memcache" = dontDistribute super."pacman-memcache";
+  "padKONTROL" = dontDistribute super."padKONTROL";
+  "pagarme" = dontDistribute super."pagarme";
+  "pagerduty" = doDistribute super."pagerduty_0_0_3_3";
+  "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palindromes" = dontDistribute super."palindromes";
+  "pam" = dontDistribute super."pam";
+  "panda" = dontDistribute super."panda";
+  "pandoc-citeproc" = doDistribute super."pandoc-citeproc_0_7_4";
+  "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble";
+  "pandoc-crossref" = dontDistribute super."pandoc-crossref";
+  "pandoc-csv2table" = dontDistribute super."pandoc-csv2table";
+  "pandoc-include" = dontDistribute super."pandoc-include";
+  "pandoc-lens" = dontDistribute super."pandoc-lens";
+  "pandoc-placetable" = dontDistribute super."pandoc-placetable";
+  "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams";
+  "pandoc-unlit" = dontDistribute super."pandoc-unlit";
+  "papillon" = dontDistribute super."papillon";
+  "pappy" = dontDistribute super."pappy";
+  "para" = dontDistribute super."para";
+  "paragon" = dontDistribute super."paragon";
+  "parallel-tasks" = dontDistribute super."parallel-tasks";
+  "parallel-tree-search" = dontDistribute super."parallel-tree-search";
+  "parameterized-data" = dontDistribute super."parameterized-data";
+  "parco" = dontDistribute super."parco";
+  "parco-attoparsec" = dontDistribute super."parco-attoparsec";
+  "parco-parsec" = dontDistribute super."parco-parsec";
+  "parcom-lib" = dontDistribute super."parcom-lib";
+  "parconc-examples" = dontDistribute super."parconc-examples";
+  "parport" = dontDistribute super."parport";
+  "parse-dimacs" = dontDistribute super."parse-dimacs";
+  "parse-help" = dontDistribute super."parse-help";
+  "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";
+  "parsec-permutation" = dontDistribute super."parsec-permutation";
+  "parsec-tagsoup" = dontDistribute super."parsec-tagsoup";
+  "parsec-trace" = dontDistribute super."parsec-trace";
+  "parsec-utils" = dontDistribute super."parsec-utils";
+  "parsec1" = dontDistribute super."parsec1";
+  "parsec2" = dontDistribute super."parsec2";
+  "parsec3" = dontDistribute super."parsec3";
+  "parsec3-numbers" = dontDistribute super."parsec3-numbers";
+  "parsedate" = dontDistribute super."parsedate";
+  "parseerror-eq" = dontDistribute super."parseerror-eq";
+  "parsek" = dontDistribute super."parsek";
+  "parsely" = dontDistribute super."parsely";
+  "parser-helper" = dontDistribute super."parser-helper";
+  "parser241" = dontDistribute super."parser241";
+  "parsergen" = dontDistribute super."parsergen";
+  "parsestar" = dontDistribute super."parsestar";
+  "parsimony" = dontDistribute super."parsimony";
+  "partial" = dontDistribute super."partial";
+  "partial-isomorphisms" = dontDistribute super."partial-isomorphisms";
+  "partial-lens" = dontDistribute super."partial-lens";
+  "partial-uri" = dontDistribute super."partial-uri";
+  "partly" = dontDistribute super."partly";
+  "passage" = dontDistribute super."passage";
+  "passwords" = dontDistribute super."passwords";
+  "pastis" = dontDistribute super."pastis";
+  "pasty" = dontDistribute super."pasty";
+  "patch-combinators" = dontDistribute super."patch-combinators";
+  "patch-image" = dontDistribute super."patch-image";
+  "patches-vector" = dontDistribute super."patches-vector";
+  "path-extra" = dontDistribute super."path-extra";
+  "pathfinding" = dontDistribute super."pathfinding";
+  "pathfindingcore" = dontDistribute super."pathfindingcore";
+  "pathtype" = dontDistribute super."pathtype";
+  "pathwalk" = dontDistribute super."pathwalk";
+  "patronscraper" = dontDistribute super."patronscraper";
+  "patterns" = dontDistribute super."patterns";
+  "paymill" = dontDistribute super."paymill";
+  "paypal-adaptive-hoops" = dontDistribute super."paypal-adaptive-hoops";
+  "paypal-api" = dontDistribute super."paypal-api";
+  "pb" = dontDistribute super."pb";
+  "pbc4hs" = dontDistribute super."pbc4hs";
+  "pbkdf" = dontDistribute super."pbkdf";
+  "pcap" = dontDistribute super."pcap";
+  "pcap-conduit" = dontDistribute super."pcap-conduit";
+  "pcap-enumerator" = dontDistribute super."pcap-enumerator";
+  "pcd-loader" = dontDistribute super."pcd-loader";
+  "pcf" = dontDistribute super."pcf";
+  "pcg-random" = dontDistribute super."pcg-random";
+  "pcre-heavy" = doDistribute super."pcre-heavy_0_2_5";
+  "pcre-less" = dontDistribute super."pcre-less";
+  "pcre-light-extra" = dontDistribute super."pcre-light-extra";
+  "pcre-utils" = dontDistribute super."pcre-utils";
+  "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content";
+  "pdf-toolbox-core" = dontDistribute super."pdf-toolbox-core";
+  "pdf-toolbox-document" = dontDistribute super."pdf-toolbox-document";
+  "pdf-toolbox-viewer" = dontDistribute super."pdf-toolbox-viewer";
+  "pdf2line" = dontDistribute super."pdf2line";
+  "pdfsplit" = dontDistribute super."pdfsplit";
+  "pdynload" = dontDistribute super."pdynload";
+  "peakachu" = dontDistribute super."peakachu";
+  "peano" = dontDistribute super."peano";
+  "peano-inf" = dontDistribute super."peano-inf";
+  "pec" = dontDistribute super."pec";
+  "pecoff" = dontDistribute super."pecoff";
+  "peg" = dontDistribute super."peg";
+  "peggy" = dontDistribute super."peggy";
+  "pell" = dontDistribute super."pell";
+  "penn-treebank" = dontDistribute super."penn-treebank";
+  "penny" = dontDistribute super."penny";
+  "penny-bin" = dontDistribute super."penny-bin";
+  "penny-lib" = dontDistribute super."penny-lib";
+  "peparser" = dontDistribute super."peparser";
+  "perceptron" = dontDistribute super."perceptron";
+  "perdure" = dontDistribute super."perdure";
+  "period" = dontDistribute super."period";
+  "perm" = dontDistribute super."perm";
+  "permutation" = dontDistribute super."permutation";
+  "permute" = dontDistribute super."permute";
+  "persist2er" = dontDistribute super."persist2er";
+  "persistable-record" = dontDistribute super."persistable-record";
+  "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
+  "persistent-cereal" = dontDistribute super."persistent-cereal";
+  "persistent-equivalence" = dontDistribute super."persistent-equivalence";
+  "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
+  "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
+  "persistent-map" = dontDistribute super."persistent-map";
+  "persistent-mysql" = doDistribute super."persistent-mysql_2_2";
+  "persistent-odbc" = dontDistribute super."persistent-odbc";
+  "persistent-protobuf" = dontDistribute super."persistent-protobuf";
+  "persistent-ratelimit" = dontDistribute super."persistent-ratelimit";
+  "persistent-redis" = dontDistribute super."persistent-redis";
+  "persistent-vector" = dontDistribute super."persistent-vector";
+  "persistent-zookeeper" = dontDistribute super."persistent-zookeeper";
+  "persona" = dontDistribute super."persona";
+  "persona-idp" = dontDistribute super."persona-idp";
+  "pesca" = dontDistribute super."pesca";
+  "peyotls" = dontDistribute super."peyotls";
+  "peyotls-codec" = dontDistribute super."peyotls-codec";
+  "pez" = dontDistribute super."pez";
+  "pg-harness" = dontDistribute super."pg-harness";
+  "pg-harness-client" = dontDistribute super."pg-harness-client";
+  "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pgdl" = dontDistribute super."pgdl";
+  "pgm" = dontDistribute super."pgm";
+  "pgp-wordlist" = dontDistribute super."pgp-wordlist";
+  "pgsql-simple" = dontDistribute super."pgsql-simple";
+  "pgstream" = dontDistribute super."pgstream";
+  "phasechange" = dontDistribute super."phasechange";
+  "phizzle" = dontDistribute super."phizzle";
+  "phoityne" = dontDistribute super."phoityne";
+  "phone-numbers" = dontDistribute super."phone-numbers";
+  "phone-push" = dontDistribute super."phone-push";
+  "phonetic-code" = dontDistribute super."phonetic-code";
+  "phooey" = dontDistribute super."phooey";
+  "photoname" = dontDistribute super."photoname";
+  "phraskell" = dontDistribute super."phraskell";
+  "phybin" = dontDistribute super."phybin";
+  "pi-calculus" = dontDistribute super."pi-calculus";
+  "pia-forward" = dontDistribute super."pia-forward";
+  "pianola" = dontDistribute super."pianola";
+  "picologic" = dontDistribute super."picologic";
+  "picosat" = dontDistribute super."picosat";
+  "piet" = dontDistribute super."piet";
+  "piki" = dontDistribute super."piki";
+  "pinboard" = dontDistribute super."pinboard";
+  "pinch" = dontDistribute super."pinch";
+  "pinchot" = dontDistribute super."pinchot";
+  "pipe-enumerator" = dontDistribute super."pipe-enumerator";
+  "pipeclip" = dontDistribute super."pipeclip";
+  "pipes-async" = dontDistribute super."pipes-async";
+  "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
+  "pipes-cacophony" = dontDistribute super."pipes-cacophony";
+  "pipes-cellular" = dontDistribute super."pipes-cellular";
+  "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
+  "pipes-cereal" = dontDistribute super."pipes-cereal";
+  "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus";
+  "pipes-concurrency" = doDistribute super."pipes-concurrency_2_0_5";
+  "pipes-conduit" = dontDistribute super."pipes-conduit";
+  "pipes-core" = dontDistribute super."pipes-core";
+  "pipes-courier" = dontDistribute super."pipes-courier";
+  "pipes-csv" = dontDistribute super."pipes-csv";
+  "pipes-errors" = dontDistribute super."pipes-errors";
+  "pipes-extra" = dontDistribute super."pipes-extra";
+  "pipes-extras" = dontDistribute super."pipes-extras";
+  "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-mongodb" = dontDistribute super."pipes-mongodb";
+  "pipes-network-tls" = dontDistribute super."pipes-network-tls";
+  "pipes-p2p" = dontDistribute super."pipes-p2p";
+  "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
+  "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple";
+  "pipes-rt" = dontDistribute super."pipes-rt";
+  "pipes-shell" = dontDistribute super."pipes-shell";
+  "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
+  "pipes-transduce" = dontDistribute super."pipes-transduce";
+  "pipes-vector" = dontDistribute super."pipes-vector";
+  "pipes-websockets" = dontDistribute super."pipes-websockets";
+  "pipes-zeromq4" = dontDistribute super."pipes-zeromq4";
+  "pipes-zlib" = dontDistribute super."pipes-zlib";
+  "pisigma" = dontDistribute super."pisigma";
+  "pit" = dontDistribute super."pit";
+  "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
+  "pkcs1" = dontDistribute super."pkcs1";
+  "pkcs10" = dontDistribute super."pkcs10";
+  "pkcs7" = dontDistribute super."pkcs7";
+  "pkggraph" = dontDistribute super."pkggraph";
+  "pktree" = dontDistribute super."pktree";
+  "plailude" = dontDistribute super."plailude";
+  "planar-graph" = dontDistribute super."planar-graph";
+  "plat" = dontDistribute super."plat";
+  "playlists" = dontDistribute super."playlists";
+  "plist" = dontDistribute super."plist";
+  "plist-buddy" = dontDistribute super."plist-buddy";
+  "plivo" = dontDistribute super."plivo";
+  "plot" = doDistribute super."plot_0_2_3_4";
+  "plot-gtk" = doDistribute super."plot-gtk_0_2_0_2";
+  "plot-gtk-ui" = dontDistribute super."plot-gtk-ui";
+  "plot-gtk3" = doDistribute super."plot-gtk3_0_1_0_1";
+  "plot-lab" = dontDistribute super."plot-lab";
+  "plotfont" = dontDistribute super."plotfont";
+  "plotserver-api" = dontDistribute super."plotserver-api";
+  "plugins" = dontDistribute super."plugins";
+  "plugins-auto" = dontDistribute super."plugins-auto";
+  "plugins-multistage" = dontDistribute super."plugins-multistage";
+  "plumbers" = dontDistribute super."plumbers";
+  "ply-loader" = dontDistribute super."ply-loader";
+  "png-file" = dontDistribute super."png-file";
+  "pngload" = dontDistribute super."pngload";
+  "pngload-fixed" = dontDistribute super."pngload-fixed";
+  "pnm" = dontDistribute super."pnm";
+  "pocket-dns" = dontDistribute super."pocket-dns";
+  "pointedlist" = dontDistribute super."pointedlist";
+  "pointfree" = dontDistribute super."pointfree";
+  "pointful" = dontDistribute super."pointful";
+  "pointless-fun" = dontDistribute super."pointless-fun";
+  "pointless-haskell" = dontDistribute super."pointless-haskell";
+  "pointless-lenses" = dontDistribute super."pointless-lenses";
+  "pointless-rewrite" = dontDistribute super."pointless-rewrite";
+  "poker-eval" = dontDistribute super."poker-eval";
+  "pokitdok" = dontDistribute super."pokitdok";
+  "polar" = dontDistribute super."polar";
+  "polar-configfile" = dontDistribute super."polar-configfile";
+  "polar-shader" = dontDistribute super."polar-shader";
+  "polh-lexicon" = dontDistribute super."polh-lexicon";
+  "polimorf" = dontDistribute super."polimorf";
+  "poll" = dontDistribute super."poll";
+  "polyToMonoid" = dontDistribute super."polyToMonoid";
+  "polymap" = dontDistribute super."polymap";
+  "polynomial" = dontDistribute super."polynomial";
+  "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
+  "polyseq" = dontDistribute super."polyseq";
+  "polysoup" = dontDistribute super."polysoup";
+  "polytypeable" = dontDistribute super."polytypeable";
+  "polytypeable-utils" = dontDistribute super."polytypeable-utils";
+  "ponder" = dontDistribute super."ponder";
+  "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
+  "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
+  "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
+  "pony" = dontDistribute super."pony";
+  "pool" = dontDistribute super."pool";
+  "pool-conduit" = dontDistribute super."pool-conduit";
+  "pooled-io" = dontDistribute super."pooled-io";
+  "pop3-client" = dontDistribute super."pop3-client";
+  "popenhs" = dontDistribute super."popenhs";
+  "poppler" = dontDistribute super."poppler";
+  "populate-setup-exe-cache" = dontDistribute super."populate-setup-exe-cache";
+  "portable-lines" = dontDistribute super."portable-lines";
+  "portaudio" = dontDistribute super."portaudio";
+  "porte" = dontDistribute super."porte";
+  "porter" = dontDistribute super."porter";
+  "ports" = dontDistribute super."ports";
+  "ports-tools" = dontDistribute super."ports-tools";
+  "positive" = dontDistribute super."positive";
+  "posix-acl" = dontDistribute super."posix-acl";
+  "posix-escape" = dontDistribute super."posix-escape";
+  "posix-filelock" = dontDistribute super."posix-filelock";
+  "posix-paths" = dontDistribute super."posix-paths";
+  "posix-pty" = dontDistribute super."posix-pty";
+  "posix-timer" = dontDistribute super."posix-timer";
+  "posix-waitpid" = dontDistribute super."posix-waitpid";
+  "possible" = dontDistribute super."possible";
+  "post-mess-age" = doDistribute super."post-mess-age_0_1_0_0";
+  "postcodes" = dontDistribute super."postcodes";
+  "postgresql-binary" = doDistribute super."postgresql-binary_0_5_2_1";
+  "postgresql-config" = dontDistribute super."postgresql-config";
+  "postgresql-connector" = dontDistribute super."postgresql-connector";
+  "postgresql-copy-escape" = dontDistribute super."postgresql-copy-escape";
+  "postgresql-cube" = dontDistribute super."postgresql-cube";
+  "postgresql-error-codes" = dontDistribute super."postgresql-error-codes";
+  "postgresql-orm" = dontDistribute super."postgresql-orm";
+  "postgresql-query" = dontDistribute super."postgresql-query";
+  "postgresql-schema" = dontDistribute super."postgresql-schema";
+  "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0";
+  "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
+  "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
+  "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-typed" = dontDistribute super."postgresql-typed";
+  "postgrest" = dontDistribute super."postgrest";
+  "postie" = dontDistribute super."postie";
+  "postmark" = dontDistribute super."postmark";
+  "postmaster" = dontDistribute super."postmaster";
+  "potato-tool" = dontDistribute super."potato-tool";
+  "potrace" = dontDistribute super."potrace";
+  "potrace-diagrams" = dontDistribute super."potrace-diagrams";
+  "powermate" = dontDistribute super."powermate";
+  "powerpc" = dontDistribute super."powerpc";
+  "ppm" = dontDistribute super."ppm";
+  "pqc" = dontDistribute super."pqc";
+  "pqueue-mtl" = dontDistribute super."pqueue-mtl";
+  "practice-room" = dontDistribute super."practice-room";
+  "precis" = dontDistribute super."precis";
+  "pred-trie" = doDistribute super."pred-trie_0_2_0";
+  "predicates" = dontDistribute super."predicates";
+  "prednote-test" = dontDistribute super."prednote-test";
+  "prefix-units" = doDistribute super."prefix-units_0_1_0_2";
+  "prefork" = dontDistribute super."prefork";
+  "pregame" = dontDistribute super."pregame";
+  "prelude-edsl" = dontDistribute super."prelude-edsl";
+  "prelude-generalize" = dontDistribute super."prelude-generalize";
+  "prelude-plus" = dontDistribute super."prelude-plus";
+  "prelude-prime" = dontDistribute super."prelude-prime";
+  "prelude-safeenum" = dontDistribute super."prelude-safeenum";
+  "preprocess-haskell" = dontDistribute super."preprocess-haskell";
+  "preprocessor-tools" = dontDistribute super."preprocessor-tools";
+  "present" = dontDistribute super."present";
+  "press" = dontDistribute super."press";
+  "presto-hdbc" = dontDistribute super."presto-hdbc";
+  "prettify" = dontDistribute super."prettify";
+  "pretty-compact" = dontDistribute super."pretty-compact";
+  "pretty-error" = dontDistribute super."pretty-error";
+  "pretty-hex" = dontDistribute super."pretty-hex";
+  "pretty-ncols" = dontDistribute super."pretty-ncols";
+  "pretty-sop" = dontDistribute super."pretty-sop";
+  "pretty-tree" = dontDistribute super."pretty-tree";
+  "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-uniq" = dontDistribute super."prim-uniq";
+  "primula-board" = dontDistribute super."primula-board";
+  "primula-bot" = dontDistribute super."primula-bot";
+  "printf-mauke" = dontDistribute super."printf-mauke";
+  "printxosd" = dontDistribute super."printxosd";
+  "priority-queue" = dontDistribute super."priority-queue";
+  "priority-sync" = dontDistribute super."priority-sync";
+  "privileged-concurrency" = dontDistribute super."privileged-concurrency";
+  "prizm" = dontDistribute super."prizm";
+  "probability" = dontDistribute super."probability";
+  "probable" = dontDistribute super."probable";
+  "proc" = dontDistribute super."proc";
+  "process-conduit" = dontDistribute super."process-conduit";
+  "process-iterio" = dontDistribute super."process-iterio";
+  "process-leksah" = dontDistribute super."process-leksah";
+  "process-listlike" = dontDistribute super."process-listlike";
+  "process-progress" = dontDistribute super."process-progress";
+  "process-qq" = dontDistribute super."process-qq";
+  "process-streaming" = dontDistribute super."process-streaming";
+  "processing" = dontDistribute super."processing";
+  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
+  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
+  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
+  "procstat" = dontDistribute super."procstat";
+  "proctest" = dontDistribute super."proctest";
+  "prof2dot" = dontDistribute super."prof2dot";
+  "prof2pretty" = dontDistribute super."prof2pretty";
+  "profiteur" = dontDistribute super."profiteur";
+  "progress" = dontDistribute super."progress";
+  "progressbar" = dontDistribute super."progressbar";
+  "progression" = dontDistribute super."progression";
+  "progressive" = dontDistribute super."progressive";
+  "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings";
+  "projection" = dontDistribute super."projection";
+  "projectroot" = dontDistribute super."projectroot";
+  "prolog" = dontDistribute super."prolog";
+  "prolog-graph" = dontDistribute super."prolog-graph";
+  "prolog-graph-lib" = dontDistribute super."prolog-graph-lib";
+  "prologue" = dontDistribute super."prologue";
+  "promise" = dontDistribute super."promise";
+  "promises" = dontDistribute super."promises";
+  "prompt" = dontDistribute super."prompt";
+  "propane" = dontDistribute super."propane";
+  "propellor" = dontDistribute super."propellor";
+  "properties" = dontDistribute super."properties";
+  "property-list" = dontDistribute super."property-list";
+  "proplang" = dontDistribute super."proplang";
+  "props" = dontDistribute super."props";
+  "prosper" = dontDistribute super."prosper";
+  "proteaaudio" = dontDistribute super."proteaaudio";
+  "protobuf" = dontDistribute super."protobuf";
+  "protobuf-native" = dontDistribute super."protobuf-native";
+  "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork";
+  "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork";
+  "proton-haskell" = dontDistribute super."proton-haskell";
+  "prototype" = dontDistribute super."prototype";
+  "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxy-kindness" = dontDistribute super."proxy-kindness";
+  "psc-ide" = dontDistribute super."psc-ide";
+  "pseudo-boolean" = dontDistribute super."pseudo-boolean";
+  "pseudo-trie" = dontDistribute super."pseudo-trie";
+  "pseudomacros" = dontDistribute super."pseudomacros";
+  "pub" = dontDistribute super."pub";
+  "publicsuffix" = dontDistribute super."publicsuffix";
+  "publicsuffixlist" = dontDistribute super."publicsuffixlist";
+  "publicsuffixlistcreate" = dontDistribute super."publicsuffixlistcreate";
+  "pubnub" = dontDistribute super."pubnub";
+  "pubsub" = dontDistribute super."pubsub";
+  "puffytools" = dontDistribute super."puffytools";
+  "pugixml" = dontDistribute super."pugixml";
+  "pugs-DrIFT" = dontDistribute super."pugs-DrIFT";
+  "pugs-HsSyck" = dontDistribute super."pugs-HsSyck";
+  "pugs-compat" = dontDistribute super."pugs-compat";
+  "pugs-hsregex" = dontDistribute super."pugs-hsregex";
+  "pulse-simple" = dontDistribute super."pulse-simple";
+  "punkt" = dontDistribute super."punkt";
+  "punycode" = dontDistribute super."punycode";
+  "puppetresources" = dontDistribute super."puppetresources";
+  "pure-cdb" = dontDistribute super."pure-cdb";
+  "pure-fft" = dontDistribute super."pure-fft";
+  "pure-priority-queue" = dontDistribute super."pure-priority-queue";
+  "pure-priority-queue-tests" = dontDistribute super."pure-priority-queue-tests";
+  "pure-zlib" = dontDistribute super."pure-zlib";
+  "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "push-notify" = dontDistribute super."push-notify";
+  "push-notify-ccs" = dontDistribute super."push-notify-ccs";
+  "push-notify-general" = dontDistribute super."push-notify-general";
+  "pusher-haskell" = dontDistribute super."pusher-haskell";
+  "pusher-http-haskell" = dontDistribute super."pusher-http-haskell";
+  "pushme" = dontDistribute super."pushme";
+  "putlenses" = dontDistribute super."putlenses";
+  "puzzle-draw" = dontDistribute super."puzzle-draw";
+  "puzzle-draw-cmdline" = dontDistribute super."puzzle-draw-cmdline";
+  "pvd" = dontDistribute super."pvd";
+  "pwstore-cli" = dontDistribute super."pwstore-cli";
+  "pwstore-purehaskell" = dontDistribute super."pwstore-purehaskell";
+  "pxsl-tools" = dontDistribute super."pxsl-tools";
+  "pyffi" = dontDistribute super."pyffi";
+  "pyfi" = dontDistribute super."pyfi";
+  "python-pickle" = dontDistribute super."python-pickle";
+  "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator";
+  "qd" = dontDistribute super."qd";
+  "qd-vec" = dontDistribute super."qd-vec";
+  "qed" = dontDistribute super."qed";
+  "qhull-simple" = dontDistribute super."qhull-simple";
+  "qrcode" = dontDistribute super."qrcode";
+  "qt" = dontDistribute super."qt";
+  "quadratic-irrational" = dontDistribute super."quadratic-irrational";
+  "quantfin" = dontDistribute super."quantfin";
+  "quantities" = dontDistribute super."quantities";
+  "quantum-arrow" = dontDistribute super."quantum-arrow";
+  "qudb" = dontDistribute super."qudb";
+  "quenya-verb" = dontDistribute super."quenya-verb";
+  "querystring-pickle" = dontDistribute super."querystring-pickle";
+  "questioner" = dontDistribute super."questioner";
+  "queue" = dontDistribute super."queue";
+  "queuelike" = dontDistribute super."queuelike";
+  "quick-generator" = dontDistribute super."quick-generator";
+  "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-poly" = dontDistribute super."quickcheck-poly";
+  "quickcheck-properties" = dontDistribute super."quickcheck-properties";
+  "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
+  "quickcheck-property-monad" = dontDistribute super."quickcheck-property-monad";
+  "quickcheck-regex" = dontDistribute super."quickcheck-regex";
+  "quickcheck-relaxng" = dontDistribute super."quickcheck-relaxng";
+  "quickcheck-rematch" = dontDistribute super."quickcheck-rematch";
+  "quickcheck-script" = dontDistribute super."quickcheck-script";
+  "quickcheck-simple" = dontDistribute super."quickcheck-simple";
+  "quickcheck-text" = dontDistribute super."quickcheck-text";
+  "quickcheck-webdriver" = dontDistribute super."quickcheck-webdriver";
+  "quicklz" = dontDistribute super."quicklz";
+  "quickpull" = dontDistribute super."quickpull";
+  "quickset" = dontDistribute super."quickset";
+  "quickspec" = dontDistribute super."quickspec";
+  "quicktest" = dontDistribute super."quicktest";
+  "quickwebapp" = dontDistribute super."quickwebapp";
+  "quiver" = dontDistribute super."quiver";
+  "quiver-bytestring" = dontDistribute super."quiver-bytestring";
+  "quiver-cell" = dontDistribute super."quiver-cell";
+  "quiver-csv" = dontDistribute super."quiver-csv";
+  "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-http" = dontDistribute super."quiver-http";
+  "quoridor-hs" = dontDistribute super."quoridor-hs";
+  "qux" = dontDistribute super."qux";
+  "rabocsv2qif" = dontDistribute super."rabocsv2qif";
+  "rad" = dontDistribute super."rad";
+  "radian" = dontDistribute super."radian";
+  "radium" = dontDistribute super."radium";
+  "radium-formula-parser" = dontDistribute super."radium-formula-parser";
+  "radix" = dontDistribute super."radix";
+  "rados-haskell" = dontDistribute super."rados-haskell";
+  "rail-compiler-editor" = dontDistribute super."rail-compiler-editor";
+  "rainbow-tests" = dontDistribute super."rainbow-tests";
+  "rake" = dontDistribute super."rake";
+  "rakhana" = dontDistribute super."rakhana";
+  "ralist" = dontDistribute super."ralist";
+  "rallod" = dontDistribute super."rallod";
+  "raml" = dontDistribute super."raml";
+  "rand-vars" = dontDistribute super."rand-vars";
+  "randfile" = dontDistribute super."randfile";
+  "random-access-list" = dontDistribute super."random-access-list";
+  "random-derive" = dontDistribute super."random-derive";
+  "random-eff" = dontDistribute super."random-eff";
+  "random-effin" = dontDistribute super."random-effin";
+  "random-extras" = dontDistribute super."random-extras";
+  "random-hypergeometric" = dontDistribute super."random-hypergeometric";
+  "random-stream" = dontDistribute super."random-stream";
+  "random-variates" = dontDistribute super."random-variates";
+  "randomgen" = dontDistribute super."randomgen";
+  "randproc" = dontDistribute super."randproc";
+  "randsolid" = dontDistribute super."randsolid";
+  "range-set-list" = dontDistribute super."range-set-list";
+  "range-space" = dontDistribute super."range-space";
+  "rangemin" = dontDistribute super."rangemin";
+  "ranges" = dontDistribute super."ranges";
+  "rank1dynamic" = dontDistribute super."rank1dynamic";
+  "rascal" = dontDistribute super."rascal";
+  "rate-limit" = dontDistribute super."rate-limit";
+  "ratio-int" = dontDistribute super."ratio-int";
+  "raven-haskell" = dontDistribute super."raven-haskell";
+  "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
+  "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2";
+  "rawstring-qm" = dontDistribute super."rawstring-qm";
+  "razom-text-util" = dontDistribute super."razom-text-util";
+  "rbr" = dontDistribute super."rbr";
+  "rclient" = dontDistribute super."rclient";
+  "rcu" = dontDistribute super."rcu";
+  "rdf4h" = dontDistribute super."rdf4h";
+  "rdioh" = dontDistribute super."rdioh";
+  "rdtsc" = dontDistribute super."rdtsc";
+  "rdtsc-enolan" = dontDistribute super."rdtsc-enolan";
+  "re2" = dontDistribute super."re2";
+  "react-flux" = dontDistribute super."react-flux";
+  "react-haskell" = dontDistribute super."react-haskell";
+  "reaction-logic" = dontDistribute super."reaction-logic";
+  "reactive" = dontDistribute super."reactive";
+  "reactive-bacon" = dontDistribute super."reactive-bacon";
+  "reactive-balsa" = dontDistribute super."reactive-balsa";
+  "reactive-banana" = dontDistribute super."reactive-banana";
+  "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
+  "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
+  "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
+  "reactive-glut" = dontDistribute super."reactive-glut";
+  "reactive-haskell" = dontDistribute super."reactive-haskell";
+  "reactive-io" = dontDistribute super."reactive-io";
+  "reactive-thread" = dontDistribute super."reactive-thread";
+  "reactor" = dontDistribute super."reactor";
+  "read-bounded" = dontDistribute super."read-bounded";
+  "read-editor" = dontDistribute super."read-editor";
+  "readable" = dontDistribute super."readable";
+  "readline" = dontDistribute super."readline";
+  "readline-statevar" = dontDistribute super."readline-statevar";
+  "readpyc" = dontDistribute super."readpyc";
+  "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
+  "reasonable-lens" = dontDistribute super."reasonable-lens";
+  "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "recaptcha" = dontDistribute super."recaptcha";
+  "record" = dontDistribute super."record";
+  "record-aeson" = dontDistribute super."record-aeson";
+  "record-gl" = dontDistribute super."record-gl";
+  "record-preprocessor" = dontDistribute super."record-preprocessor";
+  "record-syntax" = dontDistribute super."record-syntax";
+  "records" = dontDistribute super."records";
+  "records-th" = dontDistribute super."records-th";
+  "recursion-schemes" = dontDistribute super."recursion-schemes";
+  "recursive-line-count" = dontDistribute super."recursive-line-count";
+  "redHandlers" = dontDistribute super."redHandlers";
+  "reddit" = dontDistribute super."reddit";
+  "redis" = dontDistribute super."redis";
+  "redis-hs" = dontDistribute super."redis-hs";
+  "redis-job-queue" = dontDistribute super."redis-job-queue";
+  "redis-simple" = dontDistribute super."redis-simple";
+  "redo" = dontDistribute super."redo";
+  "reducers" = doDistribute super."reducers_3_10_3_2";
+  "reedsolomon" = dontDistribute super."reedsolomon";
+  "reenact" = dontDistribute super."reenact";
+  "reexport-crypto-random" = dontDistribute super."reexport-crypto-random";
+  "ref" = dontDistribute super."ref";
+  "ref-mtl" = dontDistribute super."ref-mtl";
+  "ref-tf" = dontDistribute super."ref-tf";
+  "refcount" = dontDistribute super."refcount";
+  "reference" = dontDistribute super."reference";
+  "references" = dontDistribute super."references";
+  "refh" = dontDistribute super."refh";
+  "refined" = dontDistribute super."refined";
+  "reflection" = doDistribute super."reflection_2";
+  "reflection-extras" = dontDistribute super."reflection-extras";
+  "reflection-without-remorse" = dontDistribute super."reflection-without-remorse";
+  "reflex" = dontDistribute super."reflex";
+  "reflex-animation" = dontDistribute super."reflex-animation";
+  "reflex-dom" = dontDistribute super."reflex-dom";
+  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
+  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
+  "reform" = dontDistribute super."reform";
+  "reform-blaze" = dontDistribute super."reform-blaze";
+  "reform-hamlet" = dontDistribute super."reform-hamlet";
+  "reform-happstack" = dontDistribute super."reform-happstack";
+  "reform-hsp" = dontDistribute super."reform-hsp";
+  "regex-applicative-text" = dontDistribute super."regex-applicative-text";
+  "regex-compat-tdfa" = dontDistribute super."regex-compat-tdfa";
+  "regex-deriv" = dontDistribute super."regex-deriv";
+  "regex-dfa" = dontDistribute super."regex-dfa";
+  "regex-easy" = dontDistribute super."regex-easy";
+  "regex-genex" = dontDistribute super."regex-genex";
+  "regex-parsec" = dontDistribute super."regex-parsec";
+  "regex-pderiv" = dontDistribute super."regex-pderiv";
+  "regex-posix-unittest" = dontDistribute super."regex-posix-unittest";
+  "regex-tdfa-pipes" = dontDistribute super."regex-tdfa-pipes";
+  "regex-tdfa-quasiquoter" = dontDistribute super."regex-tdfa-quasiquoter";
+  "regex-tdfa-text" = dontDistribute super."regex-tdfa-text";
+  "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
+  "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
+  "regex-tre" = dontDistribute super."regex-tre";
+  "regex-xmlschema" = dontDistribute super."regex-xmlschema";
+  "regexchar" = dontDistribute super."regexchar";
+  "regexdot" = dontDistribute super."regexdot";
+  "regexp-tries" = dontDistribute super."regexp-tries";
+  "regexpr" = dontDistribute super."regexpr";
+  "regexpr-symbolic" = dontDistribute super."regexpr-symbolic";
+  "regexqq" = dontDistribute super."regexqq";
+  "regional-pointers" = dontDistribute super."regional-pointers";
+  "regions" = dontDistribute super."regions";
+  "regions-monadsfd" = dontDistribute super."regions-monadsfd";
+  "regions-monadstf" = dontDistribute super."regions-monadstf";
+  "regions-mtl" = dontDistribute super."regions-mtl";
+  "regress" = dontDistribute super."regress";
+  "regular" = dontDistribute super."regular";
+  "regular-extras" = dontDistribute super."regular-extras";
+  "regular-web" = dontDistribute super."regular-web";
+  "regular-xmlpickler" = dontDistribute super."regular-xmlpickler";
+  "reheat" = dontDistribute super."reheat";
+  "rehoo" = dontDistribute super."rehoo";
+  "rei" = dontDistribute super."rei";
+  "reified-records" = dontDistribute super."reified-records";
+  "reify" = dontDistribute super."reify";
+  "reinterpret-cast" = dontDistribute super."reinterpret-cast";
+  "relacion" = dontDistribute super."relacion";
+  "relation" = dontDistribute super."relation";
+  "relational-postgresql8" = dontDistribute super."relational-postgresql8";
+  "relational-query" = dontDistribute super."relational-query";
+  "relational-query-HDBC" = dontDistribute super."relational-query-HDBC";
+  "relational-record" = dontDistribute super."relational-record";
+  "relational-record-examples" = dontDistribute super."relational-record-examples";
+  "relational-schemas" = dontDistribute super."relational-schemas";
+  "relative-date" = dontDistribute super."relative-date";
+  "relit" = dontDistribute super."relit";
+  "rematch" = dontDistribute super."rematch";
+  "rematch-text" = dontDistribute super."rematch-text";
+  "remote" = dontDistribute super."remote";
+  "remote-debugger" = dontDistribute super."remote-debugger";
+  "remotion" = dontDistribute super."remotion";
+  "renderable" = dontDistribute super."renderable";
+  "reord" = dontDistribute super."reord";
+  "reorderable" = dontDistribute super."reorderable";
+  "repa" = doDistribute super."repa_3_4_0_1";
+  "repa-algorithms" = doDistribute super."repa-algorithms_3_4_0_1";
+  "repa-array" = dontDistribute super."repa-array";
+  "repa-bytestring" = dontDistribute super."repa-bytestring";
+  "repa-convert" = dontDistribute super."repa-convert";
+  "repa-eval" = dontDistribute super."repa-eval";
+  "repa-examples" = dontDistribute super."repa-examples";
+  "repa-fftw" = dontDistribute super."repa-fftw";
+  "repa-flow" = dontDistribute super."repa-flow";
+  "repa-io" = doDistribute super."repa-io_3_4_0_1";
+  "repa-linear-algebra" = dontDistribute super."repa-linear-algebra";
+  "repa-plugin" = dontDistribute super."repa-plugin";
+  "repa-scalar" = dontDistribute super."repa-scalar";
+  "repa-series" = dontDistribute super."repa-series";
+  "repa-sndfile" = dontDistribute super."repa-sndfile";
+  "repa-stream" = dontDistribute super."repa-stream";
+  "repa-v4l2" = dontDistribute super."repa-v4l2";
+  "repl" = dontDistribute super."repl";
+  "repl-toolkit" = dontDistribute super."repl-toolkit";
+  "repline" = dontDistribute super."repline";
+  "repo-based-blog" = dontDistribute super."repo-based-blog";
+  "repr" = dontDistribute super."repr";
+  "repr-tree-syb" = dontDistribute super."repr-tree-syb";
+  "representable-functors" = dontDistribute super."representable-functors";
+  "representable-profunctors" = dontDistribute super."representable-profunctors";
+  "representable-tries" = dontDistribute super."representable-tries";
+  "request-monad" = dontDistribute super."request-monad";
+  "reserve" = dontDistribute super."reserve";
+  "resistor-cube" = dontDistribute super."resistor-cube";
+  "resolve-trivial-conflicts" = dontDistribute super."resolve-trivial-conflicts";
+  "resource-effect" = dontDistribute super."resource-effect";
+  "resource-embed" = dontDistribute super."resource-embed";
+  "resource-pool-catchio" = dontDistribute super."resource-pool-catchio";
+  "resource-pool-monad" = dontDistribute super."resource-pool-monad";
+  "resource-simple" = dontDistribute super."resource-simple";
+  "respond" = dontDistribute super."respond";
+  "rest-core" = doDistribute super."rest-core_0_36_0_6";
+  "rest-example" = dontDistribute super."rest-example";
+  "rest-gen" = doDistribute super."rest-gen_0_17_1_3";
+  "rest-happstack" = doDistribute super."rest-happstack_0_2_10_8";
+  "rest-snap" = doDistribute super."rest-snap_0_1_17_18";
+  "rest-wai" = doDistribute super."rest-wai_0_1_0_8";
+  "restful-snap" = dontDistribute super."restful-snap";
+  "restricted-workers" = dontDistribute super."restricted-workers";
+  "restyle" = dontDistribute super."restyle";
+  "resumable-exceptions" = dontDistribute super."resumable-exceptions";
+  "rethinkdb" = dontDistribute super."rethinkdb";
+  "rethinkdb-model" = dontDistribute super."rethinkdb-model";
+  "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
+  "retry" = doDistribute super."retry_0_6";
+  "retryer" = dontDistribute super."retryer";
+  "revdectime" = dontDistribute super."revdectime";
+  "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-geocoding" = dontDistribute super."reverse-geocoding";
+  "reversi" = dontDistribute super."reversi";
+  "rewrite" = dontDistribute super."rewrite";
+  "rewriting" = dontDistribute super."rewriting";
+  "rex" = dontDistribute super."rex";
+  "rezoom" = dontDistribute super."rezoom";
+  "rfc3339" = dontDistribute super."rfc3339";
+  "rhythm-game-tutorial" = dontDistribute super."rhythm-game-tutorial";
+  "riak" = dontDistribute super."riak";
+  "riak-protobuf" = dontDistribute super."riak-protobuf";
+  "richreports" = dontDistribute super."richreports";
+  "riemann" = dontDistribute super."riemann";
+  "riff" = dontDistribute super."riff";
+  "ring-buffer" = dontDistribute super."ring-buffer";
+  "riot" = dontDistribute super."riot";
+  "ripple" = dontDistribute super."ripple";
+  "ripple-federation" = dontDistribute super."ripple-federation";
+  "risc386" = dontDistribute super."risc386";
+  "rivers" = dontDistribute super."rivers";
+  "rivet" = dontDistribute super."rivet";
+  "rivet-core" = dontDistribute super."rivet-core";
+  "rivet-migration" = dontDistribute super."rivet-migration";
+  "rivet-simple-deploy" = dontDistribute super."rivet-simple-deploy";
+  "rlglue" = dontDistribute super."rlglue";
+  "rmonad" = dontDistribute super."rmonad";
+  "rncryptor" = dontDistribute super."rncryptor";
+  "rng-utils" = dontDistribute super."rng-utils";
+  "robin" = dontDistribute super."robin";
+  "robot" = dontDistribute super."robot";
+  "robots-txt" = dontDistribute super."robots-txt";
+  "rocksdb-haskell" = dontDistribute super."rocksdb-haskell";
+  "roguestar" = dontDistribute super."roguestar";
+  "roguestar-engine" = dontDistribute super."roguestar-engine";
+  "roguestar-gl" = dontDistribute super."roguestar-gl";
+  "roguestar-glut" = dontDistribute super."roguestar-glut";
+  "rollbar" = dontDistribute super."rollbar";
+  "roller" = dontDistribute super."roller";
+  "rolling-queue" = dontDistribute super."rolling-queue";
+  "roman-numerals" = dontDistribute super."roman-numerals";
+  "romkan" = dontDistribute super."romkan";
+  "roots" = dontDistribute super."roots";
+  "rope" = dontDistribute super."rope";
+  "rosa" = dontDistribute super."rosa";
+  "rose-trees" = dontDistribute super."rose-trees";
+  "rose-trie" = dontDistribute super."rose-trie";
+  "rosezipper" = dontDistribute super."rosezipper";
+  "roshask" = dontDistribute super."roshask";
+  "rosso" = dontDistribute super."rosso";
+  "rot13" = dontDistribute super."rot13";
+  "rotating-log" = dontDistribute super."rotating-log";
+  "rounding" = dontDistribute super."rounding";
+  "roundtrip" = dontDistribute super."roundtrip";
+  "roundtrip-aeson" = dontDistribute super."roundtrip-aeson";
+  "roundtrip-string" = dontDistribute super."roundtrip-string";
+  "roundtrip-xml" = dontDistribute super."roundtrip-xml";
+  "route-generator" = dontDistribute super."route-generator";
+  "route-planning" = dontDistribute super."route-planning";
+  "rowrecord" = dontDistribute super."rowrecord";
+  "rpc" = dontDistribute super."rpc";
+  "rpc-framework" = dontDistribute super."rpc-framework";
+  "rpf" = dontDistribute super."rpf";
+  "rpm" = dontDistribute super."rpm";
+  "rsagl" = dontDistribute super."rsagl";
+  "rsagl-frp" = dontDistribute super."rsagl-frp";
+  "rsagl-math" = dontDistribute super."rsagl-math";
+  "rspp" = dontDistribute super."rspp";
+  "rss" = dontDistribute super."rss";
+  "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
+  "rtld" = dontDistribute super."rtld";
+  "rtlsdr" = dontDistribute super."rtlsdr";
+  "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";
+  "rtorrent-state" = dontDistribute super."rtorrent-state";
+  "rubberband" = dontDistribute super."rubberband";
+  "ruby-marshal" = dontDistribute super."ruby-marshal";
+  "ruby-qq" = dontDistribute super."ruby-qq";
+  "ruff" = dontDistribute super."ruff";
+  "ruler" = dontDistribute super."ruler";
+  "ruler-core" = dontDistribute super."ruler-core";
+  "rungekutta" = dontDistribute super."rungekutta";
+  "runghc" = dontDistribute super."runghc";
+  "rwlock" = dontDistribute super."rwlock";
+  "rws" = dontDistribute super."rws";
+  "s-cargot" = dontDistribute super."s-cargot";
+  "s3-signer" = dontDistribute super."s3-signer";
+  "safe-access" = dontDistribute super."safe-access";
+  "safe-failure" = dontDistribute super."safe-failure";
+  "safe-failure-cme" = dontDistribute super."safe-failure-cme";
+  "safe-freeze" = dontDistribute super."safe-freeze";
+  "safe-globals" = dontDistribute super."safe-globals";
+  "safe-lazy-io" = dontDistribute super."safe-lazy-io";
+  "safe-length" = dontDistribute super."safe-length";
+  "safe-plugins" = dontDistribute super."safe-plugins";
+  "safe-printf" = dontDistribute super."safe-printf";
+  "safeint" = dontDistribute super."safeint";
+  "safer-file-handles" = dontDistribute super."safer-file-handles";
+  "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring";
+  "safer-file-handles-text" = dontDistribute super."safer-file-handles-text";
+  "saferoute" = dontDistribute super."saferoute";
+  "sai-shape-syb" = dontDistribute super."sai-shape-syb";
+  "saltine" = dontDistribute super."saltine";
+  "saltine-quickcheck" = dontDistribute super."saltine-quickcheck";
+  "salvia" = dontDistribute super."salvia";
+  "salvia-demo" = dontDistribute super."salvia-demo";
+  "salvia-extras" = dontDistribute super."salvia-extras";
+  "salvia-protocol" = dontDistribute super."salvia-protocol";
+  "salvia-sessions" = dontDistribute super."salvia-sessions";
+  "salvia-websocket" = dontDistribute super."salvia-websocket";
+  "sample-frame" = dontDistribute super."sample-frame";
+  "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "samtools" = dontDistribute super."samtools";
+  "samtools-conduit" = dontDistribute super."samtools-conduit";
+  "samtools-enumerator" = dontDistribute super."samtools-enumerator";
+  "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandlib" = dontDistribute super."sandlib";
+  "sandman" = dontDistribute super."sandman";
+  "sarasvati" = dontDistribute super."sarasvati";
+  "sasl" = dontDistribute super."sasl";
+  "sat" = dontDistribute super."sat";
+  "sat-micro-hs" = dontDistribute super."sat-micro-hs";
+  "satchmo" = dontDistribute super."satchmo";
+  "satchmo-backends" = dontDistribute super."satchmo-backends";
+  "satchmo-examples" = dontDistribute super."satchmo-examples";
+  "satchmo-funsat" = dontDistribute super."satchmo-funsat";
+  "satchmo-minisat" = dontDistribute super."satchmo-minisat";
+  "satchmo-toysat" = dontDistribute super."satchmo-toysat";
+  "sbp" = dontDistribute super."sbp";
+  "sbv" = doDistribute super."sbv_4_4";
+  "sbvPlugin" = dontDistribute super."sbvPlugin";
+  "sc3-rdu" = dontDistribute super."sc3-rdu";
+  "scalable-server" = dontDistribute super."scalable-server";
+  "scaleimage" = dontDistribute super."scaleimage";
+  "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scan" = dontDistribute super."scan";
+  "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scat" = dontDistribute super."scat";
+  "scc" = dontDistribute super."scc";
+  "scenegraph" = dontDistribute super."scenegraph";
+  "scgi" = dontDistribute super."scgi";
+  "schedevr" = dontDistribute super."schedevr";
+  "schedule-planner" = dontDistribute super."schedule-planner";
+  "schedyield" = dontDistribute super."schedyield";
+  "scholdoc" = dontDistribute super."scholdoc";
+  "scholdoc-citeproc" = dontDistribute super."scholdoc-citeproc";
+  "scholdoc-texmath" = dontDistribute super."scholdoc-texmath";
+  "scholdoc-types" = dontDistribute super."scholdoc-types";
+  "schonfinkeling" = dontDistribute super."schonfinkeling";
+  "sci-ratio" = dontDistribute super."sci-ratio";
+  "science-constants" = dontDistribute super."science-constants";
+  "science-constants-dimensional" = dontDistribute super."science-constants-dimensional";
+  "scion" = dontDistribute super."scion";
+  "scion-browser" = dontDistribute super."scion-browser";
+  "scons2dot" = dontDistribute super."scons2dot";
+  "scope" = dontDistribute super."scope";
+  "scope-cairo" = dontDistribute super."scope-cairo";
+  "scottish" = dontDistribute super."scottish";
+  "scotty-binding-play" = dontDistribute super."scotty-binding-play";
+  "scotty-blaze" = dontDistribute super."scotty-blaze";
+  "scotty-cookie" = dontDistribute super."scotty-cookie";
+  "scotty-fay" = dontDistribute super."scotty-fay";
+  "scotty-hastache" = dontDistribute super."scotty-hastache";
+  "scotty-rest" = dontDistribute super."scotty-rest";
+  "scotty-session" = dontDistribute super."scotty-session";
+  "scotty-tls" = dontDistribute super."scotty-tls";
+  "scp-streams" = dontDistribute super."scp-streams";
+  "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrobble" = dontDistribute super."scrobble";
+  "scroll" = dontDistribute super."scroll";
+  "scrypt" = dontDistribute super."scrypt";
+  "scrz" = dontDistribute super."scrz";
+  "scyther-proof" = dontDistribute super."scyther-proof";
+  "sde-solver" = dontDistribute super."sde-solver";
+  "sdf2p1-parser" = dontDistribute super."sdf2p1-parser";
+  "sdl2" = doDistribute super."sdl2_1_3_1";
+  "sdl2-cairo" = dontDistribute super."sdl2-cairo";
+  "sdl2-cairo-image" = dontDistribute super."sdl2-cairo-image";
+  "sdl2-compositor" = dontDistribute super."sdl2-compositor";
+  "sdl2-image" = dontDistribute super."sdl2-image";
+  "sdl2-ttf" = dontDistribute super."sdl2-ttf";
+  "sdnv" = dontDistribute super."sdnv";
+  "sdr" = dontDistribute super."sdr";
+  "seacat" = dontDistribute super."seacat";
+  "seal-module" = dontDistribute super."seal-module";
+  "search" = dontDistribute super."search";
+  "sec" = dontDistribute super."sec";
+  "secdh" = dontDistribute super."secdh";
+  "seclib" = dontDistribute super."seclib";
+  "second-transfer" = doDistribute super."second-transfer_0_6_1_0";
+  "secp256k1" = dontDistribute super."secp256k1";
+  "secret-santa" = dontDistribute super."secret-santa";
+  "secret-sharing" = dontDistribute super."secret-sharing";
+  "secrm" = dontDistribute super."secrm";
+  "secure-sockets" = dontDistribute super."secure-sockets";
+  "sednaDBXML" = dontDistribute super."sednaDBXML";
+  "select" = dontDistribute super."select";
+  "selectors" = dontDistribute super."selectors";
+  "selenium" = dontDistribute super."selenium";
+  "selenium-server" = dontDistribute super."selenium-server";
+  "selfrestart" = dontDistribute super."selfrestart";
+  "selinux" = dontDistribute super."selinux";
+  "semaphore-plus" = dontDistribute super."semaphore-plus";
+  "semi-iso" = dontDistribute super."semi-iso";
+  "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax";
+  "semigroups" = doDistribute super."semigroups_0_16_2_2";
+  "semigroups-actions" = dontDistribute super."semigroups-actions";
+  "semiring" = dontDistribute super."semiring";
+  "semiring-simple" = dontDistribute super."semiring-simple";
+  "semver-range" = dontDistribute super."semver-range";
+  "sendgrid-haskell" = dontDistribute super."sendgrid-haskell";
+  "sensenet" = dontDistribute super."sensenet";
+  "sentry" = dontDistribute super."sentry";
+  "senza" = dontDistribute super."senza";
+  "separated" = dontDistribute super."separated";
+  "seqaid" = dontDistribute super."seqaid";
+  "seqid" = dontDistribute super."seqid";
+  "seqid-streams" = dontDistribute super."seqid-streams";
+  "seqloc-datafiles" = dontDistribute super."seqloc-datafiles";
+  "sequence" = dontDistribute super."sequence";
+  "sequent-core" = dontDistribute super."sequent-core";
+  "sequential-index" = dontDistribute super."sequential-index";
+  "sequor" = dontDistribute super."sequor";
+  "serial" = dontDistribute super."serial";
+  "serial-test-generators" = dontDistribute super."serial-test-generators";
+  "serialport" = dontDistribute super."serialport";
+  "serv" = dontDistribute super."serv";
+  "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
+  "servant-blaze" = dontDistribute super."servant-blaze";
+  "servant-cassava" = dontDistribute super."servant-cassava";
+  "servant-ede" = dontDistribute super."servant-ede";
+  "servant-examples" = dontDistribute super."servant-examples";
+  "servant-github" = dontDistribute super."servant-github";
+  "servant-lucid" = dontDistribute super."servant-lucid";
+  "servant-mock" = dontDistribute super."servant-mock";
+  "servant-pool" = dontDistribute super."servant-pool";
+  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-response" = dontDistribute super."servant-response";
+  "servant-scotty" = dontDistribute super."servant-scotty";
+  "servant-swagger" = dontDistribute super."servant-swagger";
+  "servant-yaml" = dontDistribute super."servant-yaml";
+  "servius" = dontDistribute super."servius";
+  "ses-html" = dontDistribute super."ses-html";
+  "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
+  "sessions" = dontDistribute super."sessions";
+  "set-cover" = dontDistribute super."set-cover";
+  "set-with" = dontDistribute super."set-with";
+  "setdown" = dontDistribute super."setdown";
+  "setgame" = dontDistribute super."setgame";
+  "setops" = dontDistribute super."setops";
+  "sets" = dontDistribute super."sets";
+  "setters" = dontDistribute super."setters";
+  "settings" = dontDistribute super."settings";
+  "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
+  "sexp-show" = dontDistribute super."sexp-show";
+  "sexpr" = dontDistribute super."sexpr";
+  "sext" = dontDistribute super."sext";
+  "sfml-audio" = dontDistribute super."sfml-audio";
+  "sfmt" = dontDistribute super."sfmt";
+  "sgd" = dontDistribute super."sgd";
+  "sgf" = dontDistribute super."sgf";
+  "sgrep" = dontDistribute super."sgrep";
+  "sha-streams" = dontDistribute super."sha-streams";
+  "shadower" = dontDistribute super."shadower";
+  "shadowsocks" = dontDistribute super."shadowsocks";
+  "shady-gen" = dontDistribute super."shady-gen";
+  "shady-graphics" = dontDistribute super."shady-graphics";
+  "shake-cabal-build" = dontDistribute super."shake-cabal-build";
+  "shake-extras" = dontDistribute super."shake-extras";
+  "shake-minify" = dontDistribute super."shake-minify";
+  "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
+  "shaker" = dontDistribute super."shaker";
+  "shakespeare-css" = dontDistribute super."shakespeare-css";
+  "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
+  "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-text" = dontDistribute super."shakespeare-text";
+  "shana" = dontDistribute super."shana";
+  "shapefile" = dontDistribute super."shapefile";
+  "shapely-data" = dontDistribute super."shapely-data";
+  "sharc-timbre" = dontDistribute super."sharc-timbre";
+  "shared-buffer" = dontDistribute super."shared-buffer";
+  "shared-fields" = dontDistribute super."shared-fields";
+  "shared-memory" = dontDistribute super."shared-memory";
+  "sharedio" = dontDistribute super."sharedio";
+  "she" = dontDistribute super."she";
+  "shelduck" = dontDistribute super."shelduck";
+  "shell-escape" = dontDistribute super."shell-escape";
+  "shell-monad" = dontDistribute super."shell-monad";
+  "shell-pipe" = dontDistribute super."shell-pipe";
+  "shellish" = dontDistribute super."shellish";
+  "shellmate" = dontDistribute super."shellmate";
+  "shelly-extra" = dontDistribute super."shelly-extra";
+  "shivers-cfg" = dontDistribute super."shivers-cfg";
+  "shoap" = dontDistribute super."shoap";
+  "shortcircuit" = dontDistribute super."shortcircuit";
+  "shorten-strings" = dontDistribute super."shorten-strings";
+  "should-not-typecheck" = dontDistribute super."should-not-typecheck";
+  "show-type" = dontDistribute super."show-type";
+  "showdown" = dontDistribute super."showdown";
+  "shpider" = dontDistribute super."shpider";
+  "shplit" = dontDistribute super."shplit";
+  "shqq" = dontDistribute super."shqq";
+  "shuffle" = dontDistribute super."shuffle";
+  "sieve" = dontDistribute super."sieve";
+  "sifflet" = dontDistribute super."sifflet";
+  "sifflet-lib" = dontDistribute super."sifflet-lib";
+  "sign" = dontDistribute super."sign";
+  "signal" = dontDistribute super."signal";
+  "signals" = dontDistribute super."signals";
+  "signed-multiset" = dontDistribute super."signed-multiset";
+  "simd" = dontDistribute super."simd";
+  "simgi" = dontDistribute super."simgi";
+  "simple" = dontDistribute super."simple";
+  "simple-actors" = dontDistribute super."simple-actors";
+  "simple-atom" = dontDistribute super."simple-atom";
+  "simple-bluetooth" = dontDistribute super."simple-bluetooth";
+  "simple-c-value" = dontDistribute super."simple-c-value";
+  "simple-conduit" = dontDistribute super."simple-conduit";
+  "simple-config" = dontDistribute super."simple-config";
+  "simple-css" = dontDistribute super."simple-css";
+  "simple-eval" = dontDistribute super."simple-eval";
+  "simple-firewire" = dontDistribute super."simple-firewire";
+  "simple-form" = dontDistribute super."simple-form";
+  "simple-genetic-algorithm" = dontDistribute super."simple-genetic-algorithm";
+  "simple-genetic-algorithm-mr" = dontDistribute super."simple-genetic-algorithm-mr";
+  "simple-get-opt" = dontDistribute super."simple-get-opt";
+  "simple-index" = dontDistribute super."simple-index";
+  "simple-log" = dontDistribute super."simple-log";
+  "simple-log-syslog" = dontDistribute super."simple-log-syslog";
+  "simple-neural-networks" = dontDistribute super."simple-neural-networks";
+  "simple-nix" = dontDistribute super."simple-nix";
+  "simple-observer" = dontDistribute super."simple-observer";
+  "simple-pascal" = dontDistribute super."simple-pascal";
+  "simple-pipe" = dontDistribute super."simple-pipe";
+  "simple-postgresql-orm" = dontDistribute super."simple-postgresql-orm";
+  "simple-rope" = dontDistribute super."simple-rope";
+  "simple-server" = dontDistribute super."simple-server";
+  "simple-session" = dontDistribute super."simple-session";
+  "simple-sessions" = dontDistribute super."simple-sessions";
+  "simple-smt" = dontDistribute super."simple-smt";
+  "simple-sql-parser" = dontDistribute super."simple-sql-parser";
+  "simple-stacked-vm" = dontDistribute super."simple-stacked-vm";
+  "simple-tabular" = dontDistribute super."simple-tabular";
+  "simple-templates" = dontDistribute super."simple-templates";
+  "simple-vec3" = dontDistribute super."simple-vec3";
+  "simpleargs" = dontDistribute super."simpleargs";
+  "simpleirc" = dontDistribute super."simpleirc";
+  "simpleirc-lens" = dontDistribute super."simpleirc-lens";
+  "simplenote" = dontDistribute super."simplenote";
+  "simpleprelude" = dontDistribute super."simpleprelude";
+  "simplesmtpclient" = dontDistribute super."simplesmtpclient";
+  "simplessh" = dontDistribute super."simplessh";
+  "simplest-sqlite" = dontDistribute super."simplest-sqlite";
+  "simplex" = dontDistribute super."simplex";
+  "simplex-basic" = dontDistribute super."simplex-basic";
+  "simseq" = dontDistribute super."simseq";
+  "simtreelo" = dontDistribute super."simtreelo";
+  "sindre" = dontDistribute super."sindre";
+  "singleton-nats" = dontDistribute super."singleton-nats";
+  "singletons" = doDistribute super."singletons_1_1_2_1";
+  "sink" = dontDistribute super."sink";
+  "sirkel" = dontDistribute super."sirkel";
+  "sitemap" = dontDistribute super."sitemap";
+  "sized" = dontDistribute super."sized";
+  "sized-types" = dontDistribute super."sized-types";
+  "sized-vector" = dontDistribute super."sized-vector";
+  "sizes" = dontDistribute super."sizes";
+  "sjsp" = dontDistribute super."sjsp";
+  "skeleton" = dontDistribute super."skeleton";
+  "skeletons" = dontDistribute super."skeletons";
+  "skell" = dontDistribute super."skell";
+  "skemmtun" = dontDistribute super."skemmtun";
+  "skype4hs" = dontDistribute super."skype4hs";
+  "skypelogexport" = dontDistribute super."skypelogexport";
+  "slack" = dontDistribute super."slack";
+  "slack-api" = dontDistribute super."slack-api";
+  "slack-notify-haskell" = dontDistribute super."slack-notify-haskell";
+  "slice-cpp-gen" = dontDistribute super."slice-cpp-gen";
+  "slidemews" = dontDistribute super."slidemews";
+  "sloane" = dontDistribute super."sloane";
+  "slot-lambda" = dontDistribute super."slot-lambda";
+  "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
+  "smallarray" = dontDistribute super."smallarray";
+  "smallcaps" = dontDistribute super."smallcaps";
+  "smallcheck-laws" = dontDistribute super."smallcheck-laws";
+  "smallcheck-lens" = dontDistribute super."smallcheck-lens";
+  "smallcheck-series" = dontDistribute super."smallcheck-series";
+  "smallpt-hs" = dontDistribute super."smallpt-hs";
+  "smallstring" = dontDistribute super."smallstring";
+  "smaoin" = dontDistribute super."smaoin";
+  "smartGroup" = dontDistribute super."smartGroup";
+  "smartcheck" = dontDistribute super."smartcheck";
+  "smartconstructor" = dontDistribute super."smartconstructor";
+  "smartword" = dontDistribute super."smartword";
+  "sme" = dontDistribute super."sme";
+  "smsaero" = dontDistribute super."smsaero";
+  "smt-lib" = dontDistribute super."smt-lib";
+  "smtlib2" = dontDistribute super."smtlib2";
+  "smtp-mail-ng" = dontDistribute super."smtp-mail-ng";
+  "smtp2mta" = dontDistribute super."smtp2mta";
+  "smtps-gmail" = dontDistribute super."smtps-gmail";
+  "snake-game" = dontDistribute super."snake-game";
+  "snap-accept" = dontDistribute super."snap-accept";
+  "snap-app" = dontDistribute super."snap-app";
+  "snap-auth-cli" = dontDistribute super."snap-auth-cli";
+  "snap-blaze" = dontDistribute super."snap-blaze";
+  "snap-blaze-clay" = dontDistribute super."snap-blaze-clay";
+  "snap-configuration-utilities" = dontDistribute super."snap-configuration-utilities";
+  "snap-cors" = dontDistribute super."snap-cors";
+  "snap-elm" = dontDistribute super."snap-elm";
+  "snap-error-collector" = dontDistribute super."snap-error-collector";
+  "snap-extras" = dontDistribute super."snap-extras";
+  "snap-language" = dontDistribute super."snap-language";
+  "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic";
+  "snap-loader-static" = dontDistribute super."snap-loader-static";
+  "snap-predicates" = dontDistribute super."snap-predicates";
+  "snap-testing" = dontDistribute super."snap-testing";
+  "snap-utils" = dontDistribute super."snap-utils";
+  "snap-web-routes" = dontDistribute super."snap-web-routes";
+  "snaplet-acid-state" = dontDistribute super."snaplet-acid-state";
+  "snaplet-actionlog" = dontDistribute super."snaplet-actionlog";
+  "snaplet-amqp" = dontDistribute super."snaplet-amqp";
+  "snaplet-auth-acid" = dontDistribute super."snaplet-auth-acid";
+  "snaplet-coffee" = dontDistribute super."snaplet-coffee";
+  "snaplet-css-min" = dontDistribute super."snaplet-css-min";
+  "snaplet-environments" = dontDistribute super."snaplet-environments";
+  "snaplet-ghcjs" = dontDistribute super."snaplet-ghcjs";
+  "snaplet-hasql" = dontDistribute super."snaplet-hasql";
+  "snaplet-haxl" = dontDistribute super."snaplet-haxl";
+  "snaplet-hdbc" = dontDistribute super."snaplet-hdbc";
+  "snaplet-hslogger" = dontDistribute super."snaplet-hslogger";
+  "snaplet-i18n" = dontDistribute super."snaplet-i18n";
+  "snaplet-influxdb" = dontDistribute super."snaplet-influxdb";
+  "snaplet-lss" = dontDistribute super."snaplet-lss";
+  "snaplet-mandrill" = dontDistribute super."snaplet-mandrill";
+  "snaplet-mongoDB" = dontDistribute super."snaplet-mongoDB";
+  "snaplet-mongodb-minimalistic" = dontDistribute super."snaplet-mongodb-minimalistic";
+  "snaplet-mysql-simple" = dontDistribute super."snaplet-mysql-simple";
+  "snaplet-oauth" = dontDistribute super."snaplet-oauth";
+  "snaplet-persistent" = dontDistribute super."snaplet-persistent";
+  "snaplet-postgresql-simple" = dontDistribute super."snaplet-postgresql-simple";
+  "snaplet-postmark" = dontDistribute super."snaplet-postmark";
+  "snaplet-purescript" = dontDistribute super."snaplet-purescript";
+  "snaplet-recaptcha" = dontDistribute super."snaplet-recaptcha";
+  "snaplet-redis" = dontDistribute super."snaplet-redis";
+  "snaplet-redson" = dontDistribute super."snaplet-redson";
+  "snaplet-rest" = dontDistribute super."snaplet-rest";
+  "snaplet-riak" = dontDistribute super."snaplet-riak";
+  "snaplet-sass" = dontDistribute super."snaplet-sass";
+  "snaplet-sedna" = dontDistribute super."snaplet-sedna";
+  "snaplet-ses-html" = dontDistribute super."snaplet-ses-html";
+  "snaplet-sqlite-simple" = dontDistribute super."snaplet-sqlite-simple";
+  "snaplet-stripe" = dontDistribute super."snaplet-stripe";
+  "snaplet-tasks" = dontDistribute super."snaplet-tasks";
+  "snaplet-typed-sessions" = dontDistribute super."snaplet-typed-sessions";
+  "snaplet-wordpress" = dontDistribute super."snaplet-wordpress";
+  "snappy" = dontDistribute super."snappy";
+  "snappy-conduit" = dontDistribute super."snappy-conduit";
+  "snappy-framing" = dontDistribute super."snappy-framing";
+  "snappy-iteratee" = dontDistribute super."snappy-iteratee";
+  "sndfile-enumerators" = dontDistribute super."sndfile-enumerators";
+  "sneakyterm" = dontDistribute super."sneakyterm";
+  "sneathlane-haste" = dontDistribute super."sneathlane-haste";
+  "snippet-extractor" = dontDistribute super."snippet-extractor";
+  "snm" = dontDistribute super."snm";
+  "snow-white" = dontDistribute super."snow-white";
+  "snowball" = dontDistribute super."snowball";
+  "snowglobe" = dontDistribute super."snowglobe";
+  "soap" = dontDistribute super."soap";
+  "soap-openssl" = dontDistribute super."soap-openssl";
+  "soap-tls" = dontDistribute super."soap-tls";
+  "sock2stream" = dontDistribute super."sock2stream";
+  "sockaddr" = dontDistribute super."sockaddr";
+  "socket" = dontDistribute super."socket";
+  "socket-activation" = dontDistribute super."socket-activation";
+  "socket-sctp" = dontDistribute super."socket-sctp";
+  "socketio" = dontDistribute super."socketio";
+  "soegtk" = dontDistribute super."soegtk";
+  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
+  "sophia" = dontDistribute super."sophia";
+  "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
+  "sorted" = dontDistribute super."sorted";
+  "sorted-list" = dontDistribute super."sorted-list";
+  "sorting" = dontDistribute super."sorting";
+  "sorty" = dontDistribute super."sorty";
+  "sound-collage" = dontDistribute super."sound-collage";
+  "sounddelay" = dontDistribute super."sounddelay";
+  "source-code-server" = dontDistribute super."source-code-server";
+  "sourcemap" = doDistribute super."sourcemap_0_1_3_0";
+  "sousit" = dontDistribute super."sousit";
+  "sox" = dontDistribute super."sox";
+  "soxlib" = dontDistribute super."soxlib";
+  "soyuz" = dontDistribute super."soyuz";
+  "spacefill" = dontDistribute super."spacefill";
+  "spacepart" = dontDistribute super."spacepart";
+  "spaceprobe" = dontDistribute super."spaceprobe";
+  "spanout" = dontDistribute super."spanout";
+  "sparse" = dontDistribute super."sparse";
+  "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
+  "sparsebit" = dontDistribute super."sparsebit";
+  "sparsecheck" = dontDistribute super."sparsecheck";
+  "sparser" = dontDistribute super."sparser";
+  "spata" = dontDistribute super."spata";
+  "spatial-math" = dontDistribute super."spatial-math";
+  "spawn" = dontDistribute super."spawn";
+  "spe" = dontDistribute super."spe";
+  "special-functors" = dontDistribute super."special-functors";
+  "special-keys" = dontDistribute super."special-keys";
+  "specialize-th" = dontDistribute super."specialize-th";
+  "species" = dontDistribute super."species";
+  "speculation-transformers" = dontDistribute super."speculation-transformers";
+  "speedy-slice" = dontDistribute super."speedy-slice";
+  "spelling-suggest" = dontDistribute super."spelling-suggest";
+  "sphero" = dontDistribute super."sphero";
+  "sphinx-cli" = dontDistribute super."sphinx-cli";
+  "spice" = dontDistribute super."spice";
+  "spike" = dontDistribute super."spike";
+  "spine" = dontDistribute super."spine";
+  "spir-v" = dontDistribute super."spir-v";
+  "splay" = dontDistribute super."splay";
+  "splaytree" = dontDistribute super."splaytree";
+  "spline3" = dontDistribute super."spline3";
+  "splines" = dontDistribute super."splines";
+  "split-channel" = dontDistribute super."split-channel";
+  "split-record" = dontDistribute super."split-record";
+  "split-tchan" = dontDistribute super."split-tchan";
+  "splitter" = dontDistribute super."splitter";
+  "splot" = dontDistribute super."splot";
+  "spool" = dontDistribute super."spool";
+  "spoonutil" = dontDistribute super."spoonutil";
+  "spoty" = dontDistribute super."spoty";
+  "spreadsheet" = dontDistribute super."spreadsheet";
+  "spritz" = dontDistribute super."spritz";
+  "spsa" = dontDistribute super."spsa";
+  "spy" = dontDistribute super."spy";
+  "sql-simple" = dontDistribute super."sql-simple";
+  "sql-simple-mysql" = dontDistribute super."sql-simple-mysql";
+  "sql-simple-pool" = dontDistribute super."sql-simple-pool";
+  "sql-simple-postgresql" = dontDistribute super."sql-simple-postgresql";
+  "sql-simple-sqlite" = dontDistribute super."sql-simple-sqlite";
+  "sql-words" = dontDistribute super."sql-words";
+  "sqlite" = dontDistribute super."sqlite";
+  "sqlite-simple-typed" = dontDistribute super."sqlite-simple-typed";
+  "sqlvalue-list" = dontDistribute super."sqlvalue-list";
+  "squeeze" = dontDistribute super."squeeze";
+  "sr-extra" = dontDistribute super."sr-extra";
+  "srcinst" = dontDistribute super."srcinst";
+  "srec" = dontDistribute super."srec";
+  "sscgi" = dontDistribute super."sscgi";
+  "ssh" = dontDistribute super."ssh";
+  "sshd-lint" = dontDistribute super."sshd-lint";
+  "sshtun" = dontDistribute super."sshtun";
+  "sssp" = dontDistribute super."sssp";
+  "sstable" = dontDistribute super."sstable";
+  "ssv" = dontDistribute super."ssv";
+  "stable-heap" = dontDistribute super."stable-heap";
+  "stable-maps" = dontDistribute super."stable-maps";
+  "stable-marriage" = dontDistribute super."stable-marriage";
+  "stable-memo" = dontDistribute super."stable-memo";
+  "stable-tree" = dontDistribute super."stable-tree";
+  "stack" = doDistribute super."stack_0_1_10_1";
+  "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
+  "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
+  "stack-run-auto" = dontDistribute super."stack-run-auto";
+  "stackage-curator" = dontDistribute super."stackage-curator";
+  "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
+  "standalone-haddock" = dontDistribute super."standalone-haddock";
+  "star-to-star" = dontDistribute super."star-to-star";
+  "star-to-star-contra" = dontDistribute super."star-to-star-contra";
+  "starling" = dontDistribute super."starling";
+  "starrover2" = dontDistribute super."starrover2";
+  "stash" = dontDistribute super."stash";
+  "state" = dontDistribute super."state";
+  "state-plus" = dontDistribute super."state-plus";
+  "state-record" = dontDistribute super."state-record";
+  "stateWriter" = dontDistribute super."stateWriter";
+  "statechart" = dontDistribute super."statechart";
+  "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statethread" = dontDistribute super."statethread";
+  "statgrab" = dontDistribute super."statgrab";
+  "static-hash" = dontDistribute super."static-hash";
+  "static-resources" = dontDistribute super."static-resources";
+  "staticanalysis" = dontDistribute super."staticanalysis";
+  "statistics-dirichlet" = dontDistribute super."statistics-dirichlet";
+  "statistics-fusion" = dontDistribute super."statistics-fusion";
+  "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar";
+  "stats" = dontDistribute super."stats";
+  "statsd" = dontDistribute super."statsd";
+  "statsd-client" = dontDistribute super."statsd-client";
+  "statsd-datadog" = dontDistribute super."statsd-datadog";
+  "statvfs" = dontDistribute super."statvfs";
+  "stb-image" = dontDistribute super."stb-image";
+  "stb-truetype" = dontDistribute super."stb-truetype";
+  "stdata" = dontDistribute super."stdata";
+  "stdf" = dontDistribute super."stdf";
+  "steambrowser" = dontDistribute super."steambrowser";
+  "steeloverseer" = dontDistribute super."steeloverseer";
+  "stemmer" = dontDistribute super."stemmer";
+  "step-function" = dontDistribute super."step-function";
+  "stepwise" = dontDistribute super."stepwise";
+  "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
+  "stitch" = dontDistribute super."stitch";
+  "stm-channelize" = dontDistribute super."stm-channelize";
+  "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
+  "stm-conduit" = doDistribute super."stm-conduit_2_6_1";
+  "stm-firehose" = dontDistribute super."stm-firehose";
+  "stm-io-hooks" = dontDistribute super."stm-io-hooks";
+  "stm-lifted" = dontDistribute super."stm-lifted";
+  "stm-linkedlist" = dontDistribute super."stm-linkedlist";
+  "stm-orelse-io" = dontDistribute super."stm-orelse-io";
+  "stm-promise" = dontDistribute super."stm-promise";
+  "stm-queue-extras" = dontDistribute super."stm-queue-extras";
+  "stm-sbchan" = dontDistribute super."stm-sbchan";
+  "stm-split" = dontDistribute super."stm-split";
+  "stm-tlist" = dontDistribute super."stm-tlist";
+  "stmcontrol" = dontDistribute super."stmcontrol";
+  "stomp-conduit" = dontDistribute super."stomp-conduit";
+  "stomp-patterns" = dontDistribute super."stomp-patterns";
+  "stomp-queue" = dontDistribute super."stomp-queue";
+  "stompl" = dontDistribute super."stompl";
+  "stopwatch" = dontDistribute super."stopwatch";
+  "storable" = dontDistribute super."storable";
+  "storable-record" = dontDistribute super."storable-record";
+  "storable-static-array" = dontDistribute super."storable-static-array";
+  "storable-tuple" = dontDistribute super."storable-tuple";
+  "storablevector" = dontDistribute super."storablevector";
+  "storablevector-carray" = dontDistribute super."storablevector-carray";
+  "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
+  "str" = dontDistribute super."str";
+  "stratum-tool" = dontDistribute super."stratum-tool";
+  "stream-fusion" = dontDistribute super."stream-fusion";
+  "stream-monad" = dontDistribute super."stream-monad";
+  "streamed" = dontDistribute super."streamed";
+  "streaming" = dontDistribute super."streaming";
+  "streaming-bytestring" = dontDistribute super."streaming-bytestring";
+  "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-utils" = dontDistribute super."streaming-utils";
+  "streaming-wai" = dontDistribute super."streaming-wai";
+  "streamproc" = dontDistribute super."streamproc";
+  "strict-base-types" = dontDistribute super."strict-base-types";
+  "strict-concurrency" = dontDistribute super."strict-concurrency";
+  "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin";
+  "strict-identity" = dontDistribute super."strict-identity";
+  "strict-io" = dontDistribute super."strict-io";
+  "strictify" = dontDistribute super."strictify";
+  "strictly" = dontDistribute super."strictly";
+  "string" = dontDistribute super."string";
+  "string-conv" = dontDistribute super."string-conv";
+  "string-convert" = dontDistribute super."string-convert";
+  "string-qq" = dontDistribute super."string-qq";
+  "string-quote" = dontDistribute super."string-quote";
+  "string-similarity" = dontDistribute super."string-similarity";
+  "stringlike" = dontDistribute super."stringlike";
+  "stringprep" = dontDistribute super."stringprep";
+  "strings" = dontDistribute super."strings";
+  "stringtable-atom" = dontDistribute super."stringtable-atom";
+  "strio" = dontDistribute super."strio";
+  "stripe" = dontDistribute super."stripe";
+  "stripe-core" = dontDistribute super."stripe-core";
+  "stripe-haskell" = dontDistribute super."stripe-haskell";
+  "stripe-http-streams" = dontDistribute super."stripe-http-streams";
+  "strive" = dontDistribute super."strive";
+  "strptime" = dontDistribute super."strptime";
+  "structs" = dontDistribute super."structs";
+  "structural-induction" = dontDistribute super."structural-induction";
+  "structured-haskell-mode" = dontDistribute super."structured-haskell-mode";
+  "structured-mongoDB" = dontDistribute super."structured-mongoDB";
+  "structures" = dontDistribute super."structures";
+  "stunclient" = dontDistribute super."stunclient";
+  "stunts" = dontDistribute super."stunts";
+  "stylish-haskell" = doDistribute super."stylish-haskell_0_5_14_3";
+  "stylized" = dontDistribute super."stylized";
+  "sub-state" = dontDistribute super."sub-state";
+  "subhask" = dontDistribute super."subhask";
+  "subleq-toolchain" = dontDistribute super."subleq-toolchain";
+  "subnet" = dontDistribute super."subnet";
+  "subtitleParser" = dontDistribute super."subtitleParser";
+  "subtitles" = dontDistribute super."subtitles";
+  "success" = dontDistribute super."success";
+  "suffixarray" = dontDistribute super."suffixarray";
+  "suffixtree" = dontDistribute super."suffixtree";
+  "sugarhaskell" = dontDistribute super."sugarhaskell";
+  "suitable" = dontDistribute super."suitable";
+  "sump" = dontDistribute super."sump";
+  "sundown" = dontDistribute super."sundown";
+  "sunlight" = dontDistribute super."sunlight";
+  "sunroof-compiler" = dontDistribute super."sunroof-compiler";
+  "sunroof-examples" = dontDistribute super."sunroof-examples";
+  "sunroof-server" = dontDistribute super."sunroof-server";
+  "super-user-spark" = dontDistribute super."super-user-spark";
+  "supercollider-ht" = dontDistribute super."supercollider-ht";
+  "supercollider-midi" = dontDistribute super."supercollider-midi";
+  "superdoc" = dontDistribute super."superdoc";
+  "supero" = dontDistribute super."supero";
+  "supervisor" = dontDistribute super."supervisor";
+  "suspend" = dontDistribute super."suspend";
+  "svg2q" = dontDistribute super."svg2q";
+  "svgcairo" = dontDistribute super."svgcairo";
+  "svgutils" = dontDistribute super."svgutils";
+  "svm" = dontDistribute super."svm";
+  "svm-light-utils" = dontDistribute super."svm-light-utils";
+  "svm-simple" = dontDistribute super."svm-simple";
+  "svndump" = dontDistribute super."svndump";
+  "swagger2" = dontDistribute super."swagger2";
+  "swapper" = dontDistribute super."swapper";
+  "swearjure" = dontDistribute super."swearjure";
+  "swf" = dontDistribute super."swf";
+  "swift-lda" = dontDistribute super."swift-lda";
+  "swish" = dontDistribute super."swish";
+  "sws" = dontDistribute super."sws";
+  "syb" = doDistribute super."syb_0_5_1";
+  "syb-extras" = dontDistribute super."syb-extras";
+  "syb-with-class" = dontDistribute super."syb-with-class";
+  "syb-with-class-instances-text" = dontDistribute super."syb-with-class-instances-text";
+  "sylvia" = dontDistribute super."sylvia";
+  "sym" = dontDistribute super."sym";
+  "sym-plot" = dontDistribute super."sym-plot";
+  "sync" = dontDistribute super."sync";
+  "sync-mht" = dontDistribute super."sync-mht";
+  "synchronous-channels" = dontDistribute super."synchronous-channels";
+  "syncthing-hs" = dontDistribute super."syncthing-hs";
+  "synt" = dontDistribute super."synt";
+  "syntactic" = dontDistribute super."syntactic";
+  "syntactical" = dontDistribute super."syntactical";
+  "syntax" = dontDistribute super."syntax";
+  "syntax-attoparsec" = dontDistribute super."syntax-attoparsec";
+  "syntax-example" = dontDistribute super."syntax-example";
+  "syntax-example-json" = dontDistribute super."syntax-example-json";
+  "syntax-pretty" = dontDistribute super."syntax-pretty";
+  "syntax-printer" = dontDistribute super."syntax-printer";
+  "syntax-trees" = dontDistribute super."syntax-trees";
+  "syntax-trees-fork-bairyn" = dontDistribute super."syntax-trees-fork-bairyn";
+  "synthesizer" = dontDistribute super."synthesizer";
+  "synthesizer-alsa" = dontDistribute super."synthesizer-alsa";
+  "synthesizer-core" = dontDistribute super."synthesizer-core";
+  "synthesizer-dimensional" = dontDistribute super."synthesizer-dimensional";
+  "synthesizer-filter" = dontDistribute super."synthesizer-filter";
+  "synthesizer-inference" = dontDistribute super."synthesizer-inference";
+  "synthesizer-llvm" = dontDistribute super."synthesizer-llvm";
+  "synthesizer-midi" = dontDistribute super."synthesizer-midi";
+  "sys-auth-smbclient" = dontDistribute super."sys-auth-smbclient";
+  "sys-process" = dontDistribute super."sys-process";
+  "system-canonicalpath" = dontDistribute super."system-canonicalpath";
+  "system-command" = dontDistribute super."system-command";
+  "system-gpio" = dontDistribute super."system-gpio";
+  "system-inotify" = dontDistribute super."system-inotify";
+  "system-lifted" = dontDistribute super."system-lifted";
+  "system-random-effect" = dontDistribute super."system-random-effect";
+  "system-time-monotonic" = dontDistribute super."system-time-monotonic";
+  "system-util" = dontDistribute super."system-util";
+  "system-uuid" = dontDistribute super."system-uuid";
+  "systemd" = dontDistribute super."systemd";
+  "syz" = dontDistribute super."syz";
+  "t-regex" = dontDistribute super."t-regex";
+  "ta" = dontDistribute super."ta";
+  "table" = dontDistribute super."table";
+  "table-tennis" = dontDistribute super."table-tennis";
+  "tableaux" = dontDistribute super."tableaux";
+  "tables" = dontDistribute super."tables";
+  "tablestorage" = dontDistribute super."tablestorage";
+  "tabloid" = dontDistribute super."tabloid";
+  "taffybar" = dontDistribute super."taffybar";
+  "tag-bits" = dontDistribute super."tag-bits";
+  "tag-stream" = dontDistribute super."tag-stream";
+  "tagchup" = dontDistribute super."tagchup";
+  "tagged-exception-core" = dontDistribute super."tagged-exception-core";
+  "tagged-list" = dontDistribute super."tagged-list";
+  "tagged-th" = dontDistribute super."tagged-th";
+  "tagged-transformer" = dontDistribute super."tagged-transformer";
+  "tagging" = dontDistribute super."tagging";
+  "taggy" = dontDistribute super."taggy";
+  "taggy-lens" = dontDistribute super."taggy-lens";
+  "taglib" = dontDistribute super."taglib";
+  "taglib-api" = dontDistribute super."taglib-api";
+  "tagset-positional" = dontDistribute super."tagset-positional";
+  "tagsoup-ht" = dontDistribute super."tagsoup-ht";
+  "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "takahashi" = dontDistribute super."takahashi";
+  "takusen-oracle" = dontDistribute super."takusen-oracle";
+  "tamarin-prover" = dontDistribute super."tamarin-prover";
+  "tamarin-prover-term" = dontDistribute super."tamarin-prover-term";
+  "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory";
+  "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
+  "tamper" = dontDistribute super."tamper";
+  "target" = dontDistribute super."target";
+  "task" = dontDistribute super."task";
+  "taskpool" = dontDistribute super."taskpool";
+  "tasty" = doDistribute super."tasty_0_10_1_2";
+  "tasty-dejafu" = dontDistribute super."tasty-dejafu";
+  "tasty-expected-failure" = dontDistribute super."tasty-expected-failure";
+  "tasty-fail-fast" = dontDistribute super."tasty-fail-fast";
+  "tasty-html" = dontDistribute super."tasty-html";
+  "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
+  "tasty-integrate" = dontDistribute super."tasty-integrate";
+  "tasty-laws" = dontDistribute super."tasty-laws";
+  "tasty-lens" = dontDistribute super."tasty-lens";
+  "tasty-program" = dontDistribute super."tasty-program";
+  "tasty-tap" = dontDistribute super."tasty-tap";
+  "tateti-tateti" = dontDistribute super."tateti-tateti";
+  "tau" = dontDistribute super."tau";
+  "tbox" = dontDistribute super."tbox";
+  "tcache-AWS" = dontDistribute super."tcache-AWS";
+  "tccli" = dontDistribute super."tccli";
+  "tce-conf" = dontDistribute super."tce-conf";
+  "tconfig" = dontDistribute super."tconfig";
+  "tcp" = dontDistribute super."tcp";
+  "tdd-util" = dontDistribute super."tdd-util";
+  "tdoc" = dontDistribute super."tdoc";
+  "teams" = dontDistribute super."teams";
+  "teeth" = dontDistribute super."teeth";
+  "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
+  "tellbot" = dontDistribute super."tellbot";
+  "template-default" = dontDistribute super."template-default";
+  "template-haskell-util" = dontDistribute super."template-haskell-util";
+  "template-hsml" = dontDistribute super."template-hsml";
+  "template-yj" = dontDistribute super."template-yj";
+  "templatepg" = dontDistribute super."templatepg";
+  "templater" = dontDistribute super."templater";
+  "tempodb" = dontDistribute super."tempodb";
+  "temporal-csound" = dontDistribute super."temporal-csound";
+  "temporal-media" = dontDistribute super."temporal-media";
+  "temporal-music-notation" = dontDistribute super."temporal-music-notation";
+  "temporal-music-notation-demo" = dontDistribute super."temporal-music-notation-demo";
+  "temporal-music-notation-western" = dontDistribute super."temporal-music-notation-western";
+  "temporary-resourcet" = dontDistribute super."temporary-resourcet";
+  "tempus" = dontDistribute super."tempus";
+  "tempus-fugit" = dontDistribute super."tempus-fugit";
+  "tensor" = dontDistribute super."tensor";
+  "term-rewriting" = dontDistribute super."term-rewriting";
+  "termbox-bindings" = dontDistribute super."termbox-bindings";
+  "termination-combinators" = dontDistribute super."termination-combinators";
+  "terminfo" = doDistribute super."terminfo_0_4_0_2";
+  "terminfo-hs" = dontDistribute super."terminfo-hs";
+  "termplot" = dontDistribute super."termplot";
+  "terrahs" = dontDistribute super."terrahs";
+  "tersmu" = dontDistribute super."tersmu";
+  "test-framework-doctest" = dontDistribute super."test-framework-doctest";
+  "test-framework-golden" = dontDistribute super."test-framework-golden";
+  "test-framework-program" = dontDistribute super."test-framework-program";
+  "test-framework-quickcheck" = dontDistribute super."test-framework-quickcheck";
+  "test-framework-sandbox" = dontDistribute super."test-framework-sandbox";
+  "test-framework-skip" = dontDistribute super."test-framework-skip";
+  "test-framework-smallcheck" = dontDistribute super."test-framework-smallcheck";
+  "test-framework-testing-feat" = dontDistribute super."test-framework-testing-feat";
+  "test-framework-th-prime" = dontDistribute super."test-framework-th-prime";
+  "test-invariant" = dontDistribute super."test-invariant";
+  "test-pkg" = dontDistribute super."test-pkg";
+  "test-sandbox" = dontDistribute super."test-sandbox";
+  "test-sandbox-compose" = dontDistribute super."test-sandbox-compose";
+  "test-sandbox-hunit" = dontDistribute super."test-sandbox-hunit";
+  "test-sandbox-quickcheck" = dontDistribute super."test-sandbox-quickcheck";
+  "test-shouldbe" = dontDistribute super."test-shouldbe";
+  "test-simple" = dontDistribute super."test-simple";
+  "testPkg" = dontDistribute super."testPkg";
+  "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
+  "testloop" = dontDistribute super."testloop";
+  "testpack" = dontDistribute super."testpack";
+  "testpattern" = dontDistribute super."testpattern";
+  "testrunner" = dontDistribute super."testrunner";
+  "tetris" = dontDistribute super."tetris";
+  "tex2txt" = dontDistribute super."tex2txt";
+  "texrunner" = dontDistribute super."texrunner";
+  "text-and-plots" = dontDistribute super."text-and-plots";
+  "text-format-simple" = dontDistribute super."text-format-simple";
+  "text-icu-translit" = dontDistribute super."text-icu-translit";
+  "text-json-qq" = dontDistribute super."text-json-qq";
+  "text-latin1" = dontDistribute super."text-latin1";
+  "text-ldap" = dontDistribute super."text-ldap";
+  "text-locale-encoding" = dontDistribute super."text-locale-encoding";
+  "text-normal" = dontDistribute super."text-normal";
+  "text-position" = dontDistribute super."text-position";
+  "text-postgresql" = dontDistribute super."text-postgresql";
+  "text-printer" = dontDistribute super."text-printer";
+  "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-register-machine" = dontDistribute super."text-register-machine";
+  "text-render" = dontDistribute super."text-render";
+  "text-show" = doDistribute super."text-show_2";
+  "text-show-instances" = dontDistribute super."text-show-instances";
+  "text-stream-decode" = dontDistribute super."text-stream-decode";
+  "text-utf7" = dontDistribute super."text-utf7";
+  "text-xml-generic" = dontDistribute super."text-xml-generic";
+  "text-xml-qq" = dontDistribute super."text-xml-qq";
+  "text-zipper" = dontDistribute super."text-zipper";
+  "text1" = dontDistribute super."text1";
+  "textPlot" = dontDistribute super."textPlot";
+  "textmatetags" = dontDistribute super."textmatetags";
+  "textocat-api" = dontDistribute super."textocat-api";
+  "texts" = dontDistribute super."texts";
+  "tfp" = dontDistribute super."tfp";
+  "tfp-th" = dontDistribute super."tfp-th";
+  "tftp" = dontDistribute super."tftp";
+  "tga" = dontDistribute super."tga";
+  "th-alpha" = dontDistribute super."th-alpha";
+  "th-build" = dontDistribute super."th-build";
+  "th-cas" = dontDistribute super."th-cas";
+  "th-context" = dontDistribute super."th-context";
+  "th-fold" = dontDistribute super."th-fold";
+  "th-inline-io-action" = dontDistribute super."th-inline-io-action";
+  "th-instance-reification" = dontDistribute super."th-instance-reification";
+  "th-instances" = dontDistribute super."th-instances";
+  "th-kinds" = dontDistribute super."th-kinds";
+  "th-kinds-fork" = dontDistribute super."th-kinds-fork";
+  "th-lift-instances" = dontDistribute super."th-lift-instances";
+  "th-orphans" = doDistribute super."th-orphans_0_12_2";
+  "th-printf" = dontDistribute super."th-printf";
+  "th-sccs" = dontDistribute super."th-sccs";
+  "th-traced" = dontDistribute super."th-traced";
+  "th-typegraph" = dontDistribute super."th-typegraph";
+  "themoviedb" = dontDistribute super."themoviedb";
+  "themplate" = dontDistribute super."themplate";
+  "theoremquest" = dontDistribute super."theoremquest";
+  "theoremquest-client" = dontDistribute super."theoremquest-client";
+  "these" = dontDistribute super."these";
+  "thespian" = dontDistribute super."thespian";
+  "theta-functions" = dontDistribute super."theta-functions";
+  "thih" = dontDistribute super."thih";
+  "thimk" = dontDistribute super."thimk";
+  "thorn" = dontDistribute super."thorn";
+  "thread-local-storage" = dontDistribute super."thread-local-storage";
+  "threadPool" = dontDistribute super."threadPool";
+  "threadmanager" = dontDistribute super."threadmanager";
+  "threads-pool" = dontDistribute super."threads-pool";
+  "threads-supervisor" = dontDistribute super."threads-supervisor";
+  "threadscope" = dontDistribute super."threadscope";
+  "threefish" = dontDistribute super."threefish";
+  "threepenny-gui" = dontDistribute super."threepenny-gui";
+  "thrift" = dontDistribute super."thrift";
+  "thrist" = dontDistribute super."thrist";
+  "throttle" = dontDistribute super."throttle";
+  "thumbnail" = dontDistribute super."thumbnail";
+  "tianbar" = dontDistribute super."tianbar";
+  "tic-tac-toe" = dontDistribute super."tic-tac-toe";
+  "tickle" = dontDistribute super."tickle";
+  "tictactoe3d" = dontDistribute super."tictactoe3d";
+  "tidal" = dontDistribute super."tidal";
+  "tidal-midi" = dontDistribute super."tidal-midi";
+  "tidal-vis" = dontDistribute super."tidal-vis";
+  "tie-knot" = dontDistribute super."tie-knot";
+  "tiempo" = dontDistribute super."tiempo";
+  "tiger" = dontDistribute super."tiger";
+  "tight-apply" = dontDistribute super."tight-apply";
+  "tightrope" = dontDistribute super."tightrope";
+  "tighttp" = dontDistribute super."tighttp";
+  "tilings" = dontDistribute super."tilings";
+  "timberc" = dontDistribute super."timberc";
+  "time-extras" = dontDistribute super."time-extras";
+  "time-exts" = dontDistribute super."time-exts";
+  "time-http" = dontDistribute super."time-http";
+  "time-interval" = dontDistribute super."time-interval";
+  "time-io-access" = dontDistribute super."time-io-access";
+  "time-parsers" = dontDistribute super."time-parsers";
+  "time-patterns" = dontDistribute super."time-patterns";
+  "time-qq" = dontDistribute super."time-qq";
+  "time-recurrence" = dontDistribute super."time-recurrence";
+  "time-series" = dontDistribute super."time-series";
+  "time-units" = dontDistribute super."time-units";
+  "time-w3c" = dontDistribute super."time-w3c";
+  "timecalc" = dontDistribute super."timecalc";
+  "timeconsole" = dontDistribute super."timeconsole";
+  "timeless" = dontDistribute super."timeless";
+  "timelike" = dontDistribute super."timelike";
+  "timelike-time" = dontDistribute super."timelike-time";
+  "timemap" = dontDistribute super."timemap";
+  "timeout" = dontDistribute super."timeout";
+  "timeout-control" = dontDistribute super."timeout-control";
+  "timeout-with-results" = dontDistribute super."timeout-with-results";
+  "timeparsers" = dontDistribute super."timeparsers";
+  "timeplot" = dontDistribute super."timeplot";
+  "timers" = dontDistribute super."timers";
+  "timers-updatable" = dontDistribute super."timers-updatable";
+  "timestamp-subprocess-lines" = dontDistribute super."timestamp-subprocess-lines";
+  "timestamper" = dontDistribute super."timestamper";
+  "timezone-olson-th" = dontDistribute super."timezone-olson-th";
+  "timing-convenience" = dontDistribute super."timing-convenience";
+  "tinyMesh" = dontDistribute super."tinyMesh";
+  "tinytemplate" = dontDistribute super."tinytemplate";
+  "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
+  "tip-lib" = dontDistribute super."tip-lib";
+  "titlecase" = dontDistribute super."titlecase";
+  "tkhs" = dontDistribute super."tkhs";
+  "tkyprof" = dontDistribute super."tkyprof";
+  "tld" = dontDistribute super."tld";
+  "tls" = doDistribute super."tls_1_3_2";
+  "tls-debug" = doDistribute super."tls-debug_0_4_0";
+  "tls-extra" = dontDistribute super."tls-extra";
+  "tmpl" = dontDistribute super."tmpl";
+  "tn" = dontDistribute super."tn";
+  "tnet" = dontDistribute super."tnet";
+  "to-haskell" = dontDistribute super."to-haskell";
+  "to-string-class" = dontDistribute super."to-string-class";
+  "to-string-instances" = dontDistribute super."to-string-instances";
+  "todos" = dontDistribute super."todos";
+  "tofromxml" = dontDistribute super."tofromxml";
+  "toilet" = dontDistribute super."toilet";
+  "tokenify" = dontDistribute super."tokenify";
+  "tokenize" = dontDistribute super."tokenize";
+  "toktok" = dontDistribute super."toktok";
+  "tokyocabinet-haskell" = dontDistribute super."tokyocabinet-haskell";
+  "tokyotyrant-haskell" = dontDistribute super."tokyotyrant-haskell";
+  "tomato-rubato-openal" = dontDistribute super."tomato-rubato-openal";
+  "toml" = dontDistribute super."toml";
+  "toolshed" = dontDistribute super."toolshed";
+  "topkata" = dontDistribute super."topkata";
+  "torch" = dontDistribute super."torch";
+  "total" = dontDistribute super."total";
+  "total-map" = dontDistribute super."total-map";
+  "total-maps" = dontDistribute super."total-maps";
+  "touched" = dontDistribute super."touched";
+  "toysolver" = dontDistribute super."toysolver";
+  "tpdb" = dontDistribute super."tpdb";
+  "trace" = dontDistribute super."trace";
+  "trace-call" = dontDistribute super."trace-call";
+  "trace-function-call" = dontDistribute super."trace-function-call";
+  "traced" = dontDistribute super."traced";
+  "tracer" = dontDistribute super."tracer";
+  "tracker" = dontDistribute super."tracker";
+  "tracy" = dontDistribute super."tracy";
+  "trajectory" = dontDistribute super."trajectory";
+  "transactional-events" = dontDistribute super."transactional-events";
+  "transf" = dontDistribute super."transf";
+  "transformations" = dontDistribute super."transformations";
+  "transformers-abort" = dontDistribute super."transformers-abort";
+  "transformers-compose" = dontDistribute super."transformers-compose";
+  "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-runnable" = dontDistribute super."transformers-runnable";
+  "transformers-supply" = dontDistribute super."transformers-supply";
+  "transient" = dontDistribute super."transient";
+  "translatable-intset" = dontDistribute super."translatable-intset";
+  "translate" = dontDistribute super."translate";
+  "travis" = dontDistribute super."travis";
+  "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
+  "trawl" = dontDistribute super."trawl";
+  "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-monad" = dontDistribute super."tree-monad";
+  "treemap-html" = dontDistribute super."treemap-html";
+  "treemap-html-tools" = dontDistribute super."treemap-html-tools";
+  "treersec" = dontDistribute super."treersec";
+  "treeviz" = dontDistribute super."treeviz";
+  "tremulous-query" = dontDistribute super."tremulous-query";
+  "trhsx" = dontDistribute super."trhsx";
+  "triangulation" = dontDistribute super."triangulation";
+  "tries" = dontDistribute super."tries";
+  "trimpolya" = dontDistribute super."trimpolya";
+  "tripLL" = dontDistribute super."tripLL";
+  "trivia" = dontDistribute super."trivia";
+  "trivial-constraint" = dontDistribute super."trivial-constraint";
+  "tropical" = dontDistribute super."tropical";
+  "true-name" = dontDistribute super."true-name";
+  "truelevel" = dontDistribute super."truelevel";
+  "trurl" = dontDistribute super."trurl";
+  "truthful" = dontDistribute super."truthful";
+  "tsession" = dontDistribute super."tsession";
+  "tsession-happstack" = dontDistribute super."tsession-happstack";
+  "tskiplist" = dontDistribute super."tskiplist";
+  "tslogger" = dontDistribute super."tslogger";
+  "tsp-viz" = dontDistribute super."tsp-viz";
+  "tsparse" = dontDistribute super."tsparse";
+  "tst" = dontDistribute super."tst";
+  "tsvsql" = dontDistribute super."tsvsql";
+  "ttrie" = dontDistribute super."ttrie";
+  "tttool" = doDistribute super."tttool_1_4_0_5";
+  "tubes" = dontDistribute super."tubes";
+  "tuntap" = dontDistribute super."tuntap";
+  "tup-functor" = dontDistribute super."tup-functor";
+  "tuple-gen" = dontDistribute super."tuple-gen";
+  "tuple-generic" = dontDistribute super."tuple-generic";
+  "tuple-hlist" = dontDistribute super."tuple-hlist";
+  "tuple-lenses" = dontDistribute super."tuple-lenses";
+  "tuple-morph" = dontDistribute super."tuple-morph";
+  "tuple-th" = dontDistribute super."tuple-th";
+  "tupleinstances" = dontDistribute super."tupleinstances";
+  "turing" = dontDistribute super."turing";
+  "turing-music" = dontDistribute super."turing-music";
+  "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
+  "turni" = dontDistribute super."turni";
+  "turtle" = doDistribute super."turtle_1_2_5";
+  "tweak" = dontDistribute super."tweak";
+  "twentefp" = dontDistribute super."twentefp";
+  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
+  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
+  "twentefp-graphs" = dontDistribute super."twentefp-graphs";
+  "twentefp-number" = dontDistribute super."twentefp-number";
+  "twentefp-rosetree" = dontDistribute super."twentefp-rosetree";
+  "twentefp-trees" = dontDistribute super."twentefp-trees";
+  "twentefp-websockets" = dontDistribute super."twentefp-websockets";
+  "twhs" = dontDistribute super."twhs";
+  "twidge" = dontDistribute super."twidge";
+  "twilight-stm" = dontDistribute super."twilight-stm";
+  "twilio" = dontDistribute super."twilio";
+  "twill" = dontDistribute super."twill";
+  "twiml" = dontDistribute super."twiml";
+  "twine" = dontDistribute super."twine";
+  "twisty" = dontDistribute super."twisty";
+  "twitch" = dontDistribute super."twitch";
+  "twitter" = dontDistribute super."twitter";
+  "twitter-conduit" = dontDistribute super."twitter-conduit";
+  "twitter-enumerator" = dontDistribute super."twitter-enumerator";
+  "twitter-types" = dontDistribute super."twitter-types";
+  "twitter-types-lens" = dontDistribute super."twitter-types-lens";
+  "tx" = dontDistribute super."tx";
+  "txt-sushi" = dontDistribute super."txt-sushi";
+  "txt2rtf" = dontDistribute super."txt2rtf";
+  "txtblk" = dontDistribute super."txtblk";
+  "ty" = dontDistribute super."ty";
+  "typalyze" = dontDistribute super."typalyze";
+  "type-aligned" = dontDistribute super."type-aligned";
+  "type-booleans" = dontDistribute super."type-booleans";
+  "type-cereal" = dontDistribute super."type-cereal";
+  "type-combinators" = dontDistribute super."type-combinators";
+  "type-combinators-quote" = dontDistribute super."type-combinators-quote";
+  "type-digits" = dontDistribute super."type-digits";
+  "type-equality" = dontDistribute super."type-equality";
+  "type-equality-check" = dontDistribute super."type-equality-check";
+  "type-fun" = dontDistribute super."type-fun";
+  "type-functions" = dontDistribute super."type-functions";
+  "type-hint" = dontDistribute super."type-hint";
+  "type-int" = dontDistribute super."type-int";
+  "type-iso" = dontDistribute super."type-iso";
+  "type-level" = dontDistribute super."type-level";
+  "type-level-bst" = dontDistribute super."type-level-bst";
+  "type-level-natural-number" = dontDistribute super."type-level-natural-number";
+  "type-level-natural-number-induction" = dontDistribute super."type-level-natural-number-induction";
+  "type-level-natural-number-operations" = dontDistribute super."type-level-natural-number-operations";
+  "type-level-sets" = dontDistribute super."type-level-sets";
+  "type-level-tf" = dontDistribute super."type-level-tf";
+  "type-list" = doDistribute super."type-list_0_2_0_0";
+  "type-natural" = dontDistribute super."type-natural";
+  "type-ord" = dontDistribute super."type-ord";
+  "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
+  "type-prelude" = dontDistribute super."type-prelude";
+  "type-settheory" = dontDistribute super."type-settheory";
+  "type-spine" = dontDistribute super."type-spine";
+  "type-structure" = dontDistribute super."type-structure";
+  "type-sub-th" = dontDistribute super."type-sub-th";
+  "type-unary" = dontDistribute super."type-unary";
+  "typeable-th" = dontDistribute super."typeable-th";
+  "typed-spreadsheet" = dontDistribute super."typed-spreadsheet";
+  "typed-wire" = dontDistribute super."typed-wire";
+  "typed-wire-utils" = dontDistribute super."typed-wire-utils";
+  "typedquery" = dontDistribute super."typedquery";
+  "typehash" = dontDistribute super."typehash";
+  "typelevel" = dontDistribute super."typelevel";
+  "typelevel-tensor" = dontDistribute super."typelevel-tensor";
+  "typelits-witnesses" = dontDistribute super."typelits-witnesses";
+  "typeof" = dontDistribute super."typeof";
+  "typeparams" = dontDistribute super."typeparams";
+  "typesafe-endian" = dontDistribute super."typesafe-endian";
+  "typescript-docs" = dontDistribute super."typescript-docs";
+  "typical" = dontDistribute super."typical";
+  "typography-geometry" = dontDistribute super."typography-geometry";
+  "tz" = dontDistribute super."tz";
+  "tzdata" = dontDistribute super."tzdata";
+  "uAgda" = dontDistribute super."uAgda";
+  "ua-parser" = dontDistribute super."ua-parser";
+  "uacpid" = dontDistribute super."uacpid";
+  "uberlast" = dontDistribute super."uberlast";
+  "uconv" = dontDistribute super."uconv";
+  "udbus" = dontDistribute super."udbus";
+  "udbus-model" = dontDistribute super."udbus-model";
+  "udcode" = dontDistribute super."udcode";
+  "udev" = dontDistribute super."udev";
+  "uglymemo" = dontDistribute super."uglymemo";
+  "uhc-light" = dontDistribute super."uhc-light";
+  "uhc-util" = dontDistribute super."uhc-util";
+  "uhexdump" = dontDistribute super."uhexdump";
+  "uhttpc" = dontDistribute super."uhttpc";
+  "ui-command" = dontDistribute super."ui-command";
+  "uid" = dontDistribute super."uid";
+  "una" = dontDistribute super."una";
+  "unagi-chan" = dontDistribute super."unagi-chan";
+  "unagi-streams" = dontDistribute super."unagi-streams";
+  "unamb" = dontDistribute super."unamb";
+  "unamb-custom" = dontDistribute super."unamb-custom";
+  "unbound" = dontDistribute super."unbound";
+  "unbound-generics" = doDistribute super."unbound-generics_0_2";
+  "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
+  "unboxed-containers" = dontDistribute super."unboxed-containers";
+  "unbreak" = dontDistribute super."unbreak";
+  "unexceptionalio" = dontDistribute super."unexceptionalio";
+  "unfoldable" = dontDistribute super."unfoldable";
+  "ungadtagger" = dontDistribute super."ungadtagger";
+  "uni-events" = dontDistribute super."uni-events";
+  "uni-graphs" = dontDistribute super."uni-graphs";
+  "uni-htk" = dontDistribute super."uni-htk";
+  "uni-posixutil" = dontDistribute super."uni-posixutil";
+  "uni-reactor" = dontDistribute super."uni-reactor";
+  "uni-uDrawGraph" = dontDistribute super."uni-uDrawGraph";
+  "uni-util" = dontDistribute super."uni-util";
+  "unicode" = dontDistribute super."unicode";
+  "unicode-names" = dontDistribute super."unicode-names";
+  "unicode-normalization" = dontDistribute super."unicode-normalization";
+  "unicode-prelude" = dontDistribute super."unicode-prelude";
+  "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-symbols" = dontDistribute super."unicode-symbols";
+  "unicoder" = dontDistribute super."unicoder";
+  "unification-fd" = dontDistribute super."unification-fd";
+  "uniform-io" = dontDistribute super."uniform-io";
+  "uniform-pair" = dontDistribute super."uniform-pair";
+  "union-find-array" = dontDistribute super."union-find-array";
+  "union-map" = dontDistribute super."union-map";
+  "unique" = dontDistribute super."unique";
+  "unique-logic" = dontDistribute super."unique-logic";
+  "unique-logic-tf" = dontDistribute super."unique-logic-tf";
+  "uniqueid" = dontDistribute super."uniqueid";
+  "unit" = dontDistribute super."unit";
+  "units" = dontDistribute super."units";
+  "units-attoparsec" = dontDistribute super."units-attoparsec";
+  "units-defs" = dontDistribute super."units-defs";
+  "units-parser" = dontDistribute super."units-parser";
+  "unittyped" = dontDistribute super."unittyped";
+  "universal-binary" = dontDistribute super."universal-binary";
+  "universe" = dontDistribute super."universe";
+  "universe-base" = dontDistribute super."universe-base";
+  "universe-instances-base" = dontDistribute super."universe-instances-base";
+  "universe-instances-extended" = dontDistribute super."universe-instances-extended";
+  "universe-instances-trans" = dontDistribute super."universe-instances-trans";
+  "universe-reverse-instances" = dontDistribute super."universe-reverse-instances";
+  "universe-th" = dontDistribute super."universe-th";
+  "unix-bytestring" = dontDistribute super."unix-bytestring";
+  "unix-fcntl" = dontDistribute super."unix-fcntl";
+  "unix-handle" = dontDistribute super."unix-handle";
+  "unix-io-extra" = dontDistribute super."unix-io-extra";
+  "unix-memory" = dontDistribute super."unix-memory";
+  "unix-process-conduit" = dontDistribute super."unix-process-conduit";
+  "unix-pty-light" = dontDistribute super."unix-pty-light";
+  "unlit" = dontDistribute super."unlit";
+  "unm-hip" = dontDistribute super."unm-hip";
+  "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
+  "unordered-graphs" = dontDistribute super."unordered-graphs";
+  "unpack-funcs" = dontDistribute super."unpack-funcs";
+  "unroll-ghc-plugin" = dontDistribute super."unroll-ghc-plugin";
+  "unsafe" = dontDistribute super."unsafe";
+  "unsafe-promises" = dontDistribute super."unsafe-promises";
+  "unsafely" = dontDistribute super."unsafely";
+  "unsafeperformst" = dontDistribute super."unsafeperformst";
+  "unscramble" = dontDistribute super."unscramble";
+  "unusable-pkg" = dontDistribute super."unusable-pkg";
+  "uom-plugin" = dontDistribute super."uom-plugin";
+  "up" = dontDistribute super."up";
+  "up-grade" = dontDistribute super."up-grade";
+  "uploadcare" = dontDistribute super."uploadcare";
+  "upskirt" = dontDistribute super."upskirt";
+  "ureader" = dontDistribute super."ureader";
+  "urembed" = dontDistribute super."urembed";
+  "uri" = dontDistribute super."uri";
+  "uri-conduit" = dontDistribute super."uri-conduit";
+  "uri-enumerator" = dontDistribute super."uri-enumerator";
+  "uri-enumerator-file" = dontDistribute super."uri-enumerator-file";
+  "uri-template" = dontDistribute super."uri-template";
+  "url-generic" = dontDistribute super."url-generic";
+  "urlcheck" = dontDistribute super."urlcheck";
+  "urldecode" = dontDistribute super."urldecode";
+  "urldisp-happstack" = dontDistribute super."urldisp-happstack";
+  "urlencoded" = dontDistribute super."urlencoded";
+  "urlpath" = doDistribute super."urlpath_2_1_0";
+  "urn" = dontDistribute super."urn";
+  "urxml" = dontDistribute super."urxml";
+  "usb" = dontDistribute super."usb";
+  "usb-enumerator" = dontDistribute super."usb-enumerator";
+  "usb-hid" = dontDistribute super."usb-hid";
+  "usb-id-database" = dontDistribute super."usb-id-database";
+  "usb-iteratee" = dontDistribute super."usb-iteratee";
+  "usb-safe" = dontDistribute super."usb-safe";
+  "userid" = dontDistribute super."userid";
+  "utc" = dontDistribute super."utc";
+  "utf8-env" = dontDistribute super."utf8-env";
+  "utf8-prelude" = dontDistribute super."utf8-prelude";
+  "utility-ht" = dontDistribute super."utility-ht";
+  "uu-cco" = dontDistribute super."uu-cco";
+  "uu-cco-examples" = dontDistribute super."uu-cco-examples";
+  "uu-cco-hut-parsing" = dontDistribute super."uu-cco-hut-parsing";
+  "uu-cco-uu-parsinglib" = dontDistribute super."uu-cco-uu-parsinglib";
+  "uu-options" = dontDistribute super."uu-options";
+  "uu-tc" = dontDistribute super."uu-tc";
+  "uuagc" = dontDistribute super."uuagc";
+  "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap";
+  "uuagc-cabal" = dontDistribute super."uuagc-cabal";
+  "uuagc-diagrams" = dontDistribute super."uuagc-diagrams";
+  "uuagd" = dontDistribute super."uuagd";
+  "uuid-aeson" = dontDistribute super."uuid-aeson";
+  "uuid-le" = dontDistribute super."uuid-le";
+  "uuid-orphans" = dontDistribute super."uuid-orphans";
+  "uuid-quasi" = dontDistribute super."uuid-quasi";
+  "uulib" = dontDistribute super."uulib";
+  "uvector" = dontDistribute super."uvector";
+  "uvector-algorithms" = dontDistribute super."uvector-algorithms";
+  "uxadt" = dontDistribute super."uxadt";
+  "uzbl-with-source" = dontDistribute super."uzbl-with-source";
+  "v4l2" = dontDistribute super."v4l2";
+  "v4l2-examples" = dontDistribute super."v4l2-examples";
+  "vacuum" = dontDistribute super."vacuum";
+  "vacuum-cairo" = dontDistribute super."vacuum-cairo";
+  "vacuum-graphviz" = dontDistribute super."vacuum-graphviz";
+  "vacuum-opengl" = dontDistribute super."vacuum-opengl";
+  "vacuum-ubigraph" = dontDistribute super."vacuum-ubigraph";
+  "vado" = dontDistribute super."vado";
+  "valid-names" = dontDistribute super."valid-names";
+  "validate" = dontDistribute super."validate";
+  "validate-input" = doDistribute super."validate-input_0_2_0_0";
+  "validated-literals" = dontDistribute super."validated-literals";
+  "validation" = dontDistribute super."validation";
+  "validations" = dontDistribute super."validations";
+  "value-supply" = dontDistribute super."value-supply";
+  "vampire" = dontDistribute super."vampire";
+  "var" = dontDistribute super."var";
+  "varan" = dontDistribute super."varan";
+  "variable-precision" = dontDistribute super."variable-precision";
+  "variables" = dontDistribute super."variables";
+  "varying" = dontDistribute super."varying";
+  "vaultaire-common" = dontDistribute super."vaultaire-common";
+  "vcache" = dontDistribute super."vcache";
+  "vcache-trie" = dontDistribute super."vcache-trie";
+  "vcard" = dontDistribute super."vcard";
+  "vcd" = dontDistribute super."vcd";
+  "vcs-revision" = dontDistribute super."vcs-revision";
+  "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
+  "vcsgui" = dontDistribute super."vcsgui";
+  "vcswrapper" = dontDistribute super."vcswrapper";
+  "vect" = dontDistribute super."vect";
+  "vect-floating" = dontDistribute super."vect-floating";
+  "vect-floating-accelerate" = dontDistribute super."vect-floating-accelerate";
+  "vect-opengl" = dontDistribute super."vect-opengl";
+  "vector" = doDistribute super."vector_0_10_12_3";
+  "vector-binary" = dontDistribute super."vector-binary";
+  "vector-bytestring" = dontDistribute super."vector-bytestring";
+  "vector-clock" = dontDistribute super."vector-clock";
+  "vector-conduit" = dontDistribute super."vector-conduit";
+  "vector-fftw" = dontDistribute super."vector-fftw";
+  "vector-functorlazy" = dontDistribute super."vector-functorlazy";
+  "vector-heterogenous" = dontDistribute super."vector-heterogenous";
+  "vector-instances-collections" = dontDistribute super."vector-instances-collections";
+  "vector-mmap" = dontDistribute super."vector-mmap";
+  "vector-random" = dontDistribute super."vector-random";
+  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space-map" = dontDistribute super."vector-space-map";
+  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
+  "vector-static" = dontDistribute super."vector-static";
+  "vector-strategies" = dontDistribute super."vector-strategies";
+  "verbalexpressions" = dontDistribute super."verbalexpressions";
+  "verbosity" = dontDistribute super."verbosity";
+  "verdict" = dontDistribute super."verdict";
+  "verdict-json" = dontDistribute super."verdict-json";
+  "verilog" = dontDistribute super."verilog";
+  "versions" = dontDistribute super."versions";
+  "vhdl" = dontDistribute super."vhdl";
+  "views" = dontDistribute super."views";
+  "vigilance" = dontDistribute super."vigilance";
+  "vimeta" = dontDistribute super."vimeta";
+  "vimus" = dontDistribute super."vimus";
+  "vintage-basic" = dontDistribute super."vintage-basic";
+  "vinyl" = dontDistribute super."vinyl";
+  "vinyl-gl" = dontDistribute super."vinyl-gl";
+  "vinyl-json" = dontDistribute super."vinyl-json";
+  "vinyl-utils" = dontDistribute super."vinyl-utils";
+  "vinyl-vectors" = dontDistribute super."vinyl-vectors";
+  "virthualenv" = dontDistribute super."virthualenv";
+  "visibility" = dontDistribute super."visibility";
+  "vision" = dontDistribute super."vision";
+  "visual-graphrewrite" = dontDistribute super."visual-graphrewrite";
+  "visual-prof" = dontDistribute super."visual-prof";
+  "vivid" = dontDistribute super."vivid";
+  "vk-aws-route53" = dontDistribute super."vk-aws-route53";
+  "vk-posix-pty" = dontDistribute super."vk-posix-pty";
+  "vocabulary-kadma" = dontDistribute super."vocabulary-kadma";
+  "vorbiscomment" = dontDistribute super."vorbiscomment";
+  "vowpal-utils" = dontDistribute super."vowpal-utils";
+  "voyeur" = dontDistribute super."voyeur";
+  "vrpn" = dontDistribute super."vrpn";
+  "vte" = dontDistribute super."vte";
+  "vtegtk3" = dontDistribute super."vtegtk3";
+  "vty" = dontDistribute super."vty";
+  "vty-examples" = dontDistribute super."vty-examples";
+  "vty-menu" = dontDistribute super."vty-menu";
+  "vty-ui" = dontDistribute super."vty-ui";
+  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "waddle" = dontDistribute super."waddle";
+  "wai-accept-language" = dontDistribute super."wai-accept-language";
+  "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-devel" = dontDistribute super."wai-devel";
+  "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
+  "wai-dispatch" = dontDistribute super."wai-dispatch";
+  "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi";
+  "wai-graceful" = dontDistribute super."wai-graceful";
+  "wai-handler-devel" = dontDistribute super."wai-handler-devel";
+  "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
+  "wai-handler-snap" = dontDistribute super."wai-handler-snap";
+  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
+  "wai-hastache" = dontDistribute super."wai-hastache";
+  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-lens" = dontDistribute super."wai-lens";
+  "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
+  "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
+  "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
+  "wai-middleware-caching" = dontDistribute super."wai-middleware-caching";
+  "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru";
+  "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis";
+  "wai-middleware-catch" = dontDistribute super."wai-middleware-catch";
+  "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type";
+  "wai-middleware-etag" = dontDistribute super."wai-middleware-etag";
+  "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip";
+  "wai-middleware-headers" = dontDistribute super."wai-middleware-headers";
+  "wai-middleware-hmac" = dontDistribute super."wai-middleware-hmac";
+  "wai-middleware-hmac-client" = dontDistribute super."wai-middleware-hmac-client";
+  "wai-middleware-metrics" = dontDistribute super."wai-middleware-metrics";
+  "wai-middleware-preprocessor" = dontDistribute super."wai-middleware-preprocessor";
+  "wai-middleware-route" = dontDistribute super."wai-middleware-route";
+  "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1";
+  "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching";
+  "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs";
+  "wai-request-spec" = dontDistribute super."wai-request-spec";
+  "wai-responsible" = dontDistribute super."wai-responsible";
+  "wai-router" = dontDistribute super."wai-router";
+  "wai-routes" = doDistribute super."wai-routes_0_7_3";
+  "wai-session-alt" = dontDistribute super."wai-session-alt";
+  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
+  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
+  "wai-static-cache" = dontDistribute super."wai-static-cache";
+  "wai-static-pages" = dontDistribute super."wai-static-pages";
+  "wai-test" = dontDistribute super."wai-test";
+  "wai-thrift" = dontDistribute super."wai-thrift";
+  "wai-throttler" = dontDistribute super."wai-throttler";
+  "wai-transformers" = dontDistribute super."wai-transformers";
+  "wai-util" = dontDistribute super."wai-util";
+  "wait-handle" = dontDistribute super."wait-handle";
+  "waitfree" = dontDistribute super."waitfree";
+  "warc" = dontDistribute super."warc";
+  "warp" = doDistribute super."warp_3_1_3_1";
+  "warp-dynamic" = dontDistribute super."warp-dynamic";
+  "warp-static" = dontDistribute super."warp-static";
+  "warp-tls" = doDistribute super."warp-tls_3_1_3";
+  "warp-tls-uid" = dontDistribute super."warp-tls-uid";
+  "watchdog" = dontDistribute super."watchdog";
+  "watcher" = dontDistribute super."watcher";
+  "watchit" = dontDistribute super."watchit";
+  "wavconvert" = dontDistribute super."wavconvert";
+  "wavefront" = dontDistribute super."wavefront";
+  "wavesurfer" = dontDistribute super."wavesurfer";
+  "wavy" = dontDistribute super."wavy";
+  "wcwidth" = dontDistribute super."wcwidth";
+  "weather-api" = dontDistribute super."weather-api";
+  "web-browser-in-haskell" = dontDistribute super."web-browser-in-haskell";
+  "web-css" = dontDistribute super."web-css";
+  "web-encodings" = dontDistribute super."web-encodings";
+  "web-mongrel2" = dontDistribute super."web-mongrel2";
+  "web-page" = dontDistribute super."web-page";
+  "web-plugins" = dontDistribute super."web-plugins";
+  "web-routes" = dontDistribute super."web-routes";
+  "web-routes-boomerang" = dontDistribute super."web-routes-boomerang";
+  "web-routes-happstack" = dontDistribute super."web-routes-happstack";
+  "web-routes-hsp" = dontDistribute super."web-routes-hsp";
+  "web-routes-mtl" = dontDistribute super."web-routes-mtl";
+  "web-routes-quasi" = dontDistribute super."web-routes-quasi";
+  "web-routes-regular" = dontDistribute super."web-routes-regular";
+  "web-routes-th" = dontDistribute super."web-routes-th";
+  "web-routes-transformers" = dontDistribute super."web-routes-transformers";
+  "web-routes-wai" = dontDistribute super."web-routes-wai";
+  "webapi" = dontDistribute super."webapi";
+  "webapp" = dontDistribute super."webapp";
+  "webcrank" = dontDistribute super."webcrank";
+  "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
+  "webcrank-wai" = dontDistribute super."webcrank-wai";
+  "webdriver" = doDistribute super."webdriver_0_6_3_1";
+  "webdriver-snoy" = dontDistribute super."webdriver-snoy";
+  "webfinger-client" = dontDistribute super."webfinger-client";
+  "webidl" = dontDistribute super."webidl";
+  "webify" = dontDistribute super."webify";
+  "webkit" = dontDistribute super."webkit";
+  "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore";
+  "webkitgtk3" = dontDistribute super."webkitgtk3";
+  "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore";
+  "webrtc-vad" = dontDistribute super."webrtc-vad";
+  "webserver" = dontDistribute super."webserver";
+  "websnap" = dontDistribute super."websnap";
+  "websockets-snap" = dontDistribute super."websockets-snap";
+  "webwire" = dontDistribute super."webwire";
+  "wedding-announcement" = dontDistribute super."wedding-announcement";
+  "wedged" = dontDistribute super."wedged";
+  "weighted-regexp" = dontDistribute super."weighted-regexp";
+  "weighted-search" = dontDistribute super."weighted-search";
+  "welshy" = dontDistribute super."welshy";
+  "wheb-mongo" = dontDistribute super."wheb-mongo";
+  "wheb-redis" = dontDistribute super."wheb-redis";
+  "wheb-strapped" = dontDistribute super."wheb-strapped";
+  "while-lang-parser" = dontDistribute super."while-lang-parser";
+  "whim" = dontDistribute super."whim";
+  "whiskers" = dontDistribute super."whiskers";
+  "whitespace" = dontDistribute super."whitespace";
+  "whois" = dontDistribute super."whois";
+  "why3" = dontDistribute super."why3";
+  "wigner-symbols" = dontDistribute super."wigner-symbols";
+  "wikipedia4epub" = dontDistribute super."wikipedia4epub";
+  "win-hp-path" = dontDistribute super."win-hp-path";
+  "windowslive" = dontDistribute super."windowslive";
+  "winerror" = dontDistribute super."winerror";
+  "winio" = dontDistribute super."winio";
+  "wiring" = dontDistribute super."wiring";
+  "withdependencies" = dontDistribute super."withdependencies";
+  "witness" = dontDistribute super."witness";
+  "witty" = dontDistribute super."witty";
+  "wkt" = dontDistribute super."wkt";
+  "wl-pprint-ansiterm" = dontDistribute super."wl-pprint-ansiterm";
+  "wlc-hs" = dontDistribute super."wlc-hs";
+  "wobsurv" = dontDistribute super."wobsurv";
+  "woffex" = dontDistribute super."woffex";
+  "wol" = dontDistribute super."wol";
+  "wolf" = dontDistribute super."wolf";
+  "woot" = dontDistribute super."woot";
+  "word-trie" = dontDistribute super."word-trie";
+  "word24" = dontDistribute super."word24";
+  "wordcloud" = dontDistribute super."wordcloud";
+  "wordexp" = dontDistribute super."wordexp";
+  "words" = dontDistribute super."words";
+  "wordsearch" = dontDistribute super."wordsearch";
+  "wordsetdiff" = dontDistribute super."wordsetdiff";
+  "workflow-osx" = dontDistribute super."workflow-osx";
+  "wp-archivebot" = dontDistribute super."wp-archivebot";
+  "wraparound" = dontDistribute super."wraparound";
+  "wraxml" = dontDistribute super."wraxml";
+  "wreq-sb" = dontDistribute super."wreq-sb";
+  "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
+  "wsedit" = dontDistribute super."wsedit";
+  "wtk" = dontDistribute super."wtk";
+  "wtk-gtk" = dontDistribute super."wtk-gtk";
+  "wumpus-basic" = dontDistribute super."wumpus-basic";
+  "wumpus-core" = dontDistribute super."wumpus-core";
+  "wumpus-drawing" = dontDistribute super."wumpus-drawing";
+  "wumpus-microprint" = dontDistribute super."wumpus-microprint";
+  "wumpus-tree" = dontDistribute super."wumpus-tree";
+  "wuss" = dontDistribute super."wuss";
+  "wx" = dontDistribute super."wx";
+  "wxAsteroids" = dontDistribute super."wxAsteroids";
+  "wxFruit" = dontDistribute super."wxFruit";
+  "wxc" = dontDistribute super."wxc";
+  "wxcore" = dontDistribute super."wxcore";
+  "wxdirect" = dontDistribute super."wxdirect";
+  "wxhnotepad" = dontDistribute super."wxhnotepad";
+  "wxturtle" = dontDistribute super."wxturtle";
+  "wybor" = dontDistribute super."wybor";
+  "wyvern" = dontDistribute super."wyvern";
+  "x-dsp" = dontDistribute super."x-dsp";
+  "x11-xim" = dontDistribute super."x11-xim";
+  "x11-xinput" = dontDistribute super."x11-xinput";
+  "x509-util" = dontDistribute super."x509-util";
+  "xattr" = dontDistribute super."xattr";
+  "xbattbar" = dontDistribute super."xbattbar";
+  "xcb-types" = dontDistribute super."xcb-types";
+  "xcffib" = dontDistribute super."xcffib";
+  "xchat-plugin" = dontDistribute super."xchat-plugin";
+  "xcp" = dontDistribute super."xcp";
+  "xdg-basedir" = dontDistribute super."xdg-basedir";
+  "xdg-userdirs" = dontDistribute super."xdg-userdirs";
+  "xdot" = dontDistribute super."xdot";
+  "xfconf" = dontDistribute super."xfconf";
+  "xhaskell-library" = dontDistribute super."xhaskell-library";
+  "xhb" = dontDistribute super."xhb";
+  "xhb-atom-cache" = dontDistribute super."xhb-atom-cache";
+  "xhb-ewmh" = dontDistribute super."xhb-ewmh";
+  "xhtml" = doDistribute super."xhtml_3000_2_1";
+  "xhtml-combinators" = dontDistribute super."xhtml-combinators";
+  "xilinx-lava" = dontDistribute super."xilinx-lava";
+  "xine" = dontDistribute super."xine";
+  "xing-api" = dontDistribute super."xing-api";
+  "xinput-conduit" = dontDistribute super."xinput-conduit";
+  "xkbcommon" = dontDistribute super."xkbcommon";
+  "xkcd" = dontDistribute super."xkcd";
+  "xlsx" = doDistribute super."xlsx_0_1_2";
+  "xlsx-templater" = dontDistribute super."xlsx-templater";
+  "xml-basic" = dontDistribute super."xml-basic";
+  "xml-catalog" = dontDistribute super."xml-catalog";
+  "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
+  "xml-conduit-writer" = dontDistribute super."xml-conduit-writer";
+  "xml-enumerator" = dontDistribute super."xml-enumerator";
+  "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
+  "xml-extractors" = dontDistribute super."xml-extractors";
+  "xml-helpers" = dontDistribute super."xml-helpers";
+  "xml-html-conduit-lens" = dontDistribute super."xml-html-conduit-lens";
+  "xml-monad" = dontDistribute super."xml-monad";
+  "xml-parsec" = dontDistribute super."xml-parsec";
+  "xml-picklers" = dontDistribute super."xml-picklers";
+  "xml-pipe" = dontDistribute super."xml-pipe";
+  "xml-prettify" = dontDistribute super."xml-prettify";
+  "xml-push" = dontDistribute super."xml-push";
+  "xml-query" = dontDistribute super."xml-query";
+  "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit";
+  "xml-query-xml-types" = dontDistribute super."xml-query-xml-types";
+  "xml2html" = dontDistribute super."xml2html";
+  "xml2json" = dontDistribute super."xml2json";
+  "xml2x" = dontDistribute super."xml2x";
+  "xmltv" = dontDistribute super."xmltv";
+  "xmms2-client" = dontDistribute super."xmms2-client";
+  "xmms2-client-glib" = dontDistribute super."xmms2-client-glib";
+  "xmobar" = dontDistribute super."xmobar";
+  "xmonad" = dontDistribute super."xmonad";
+  "xmonad-bluetilebranch" = dontDistribute super."xmonad-bluetilebranch";
+  "xmonad-contrib" = dontDistribute super."xmonad-contrib";
+  "xmonad-contrib-bluetilebranch" = dontDistribute super."xmonad-contrib-bluetilebranch";
+  "xmonad-contrib-gpl" = dontDistribute super."xmonad-contrib-gpl";
+  "xmonad-entryhelper" = dontDistribute super."xmonad-entryhelper";
+  "xmonad-eval" = dontDistribute super."xmonad-eval";
+  "xmonad-extras" = dontDistribute super."xmonad-extras";
+  "xmonad-screenshot" = dontDistribute super."xmonad-screenshot";
+  "xmonad-utils" = dontDistribute super."xmonad-utils";
+  "xmonad-wallpaper" = dontDistribute super."xmonad-wallpaper";
+  "xmonad-windownames" = dontDistribute super."xmonad-windownames";
+  "xmpipe" = dontDistribute super."xmpipe";
+  "xorshift" = dontDistribute super."xorshift";
+  "xosd" = dontDistribute super."xosd";
+  "xournal-builder" = dontDistribute super."xournal-builder";
+  "xournal-convert" = dontDistribute super."xournal-convert";
+  "xournal-parser" = dontDistribute super."xournal-parser";
+  "xournal-render" = dontDistribute super."xournal-render";
+  "xournal-types" = dontDistribute super."xournal-types";
+  "xsact" = dontDistribute super."xsact";
+  "xsd" = dontDistribute super."xsd";
+  "xsha1" = dontDistribute super."xsha1";
+  "xslt" = dontDistribute super."xslt";
+  "xtc" = dontDistribute super."xtc";
+  "xtest" = dontDistribute super."xtest";
+  "xturtle" = dontDistribute super."xturtle";
+  "xxhash" = dontDistribute super."xxhash";
+  "y0l0bot" = dontDistribute super."y0l0bot";
+  "yabi" = dontDistribute super."yabi";
+  "yabi-muno" = dontDistribute super."yabi-muno";
+  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
+  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
+  "yajl" = dontDistribute super."yajl";
+  "yajl-enumerator" = dontDistribute super."yajl-enumerator";
+  "yall" = dontDistribute super."yall";
+  "yamemo" = dontDistribute super."yamemo";
+  "yaml-config" = dontDistribute super."yaml-config";
+  "yaml-light" = dontDistribute super."yaml-light";
+  "yaml-light-lens" = dontDistribute super."yaml-light-lens";
+  "yaml-rpc" = dontDistribute super."yaml-rpc";
+  "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
+  "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
+  "yaml2owl" = dontDistribute super."yaml2owl";
+  "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
+  "yampa-canvas" = dontDistribute super."yampa-canvas";
+  "yampa-glfw" = dontDistribute super."yampa-glfw";
+  "yampa-glut" = dontDistribute super."yampa-glut";
+  "yampa2048" = dontDistribute super."yampa2048";
+  "yaop" = dontDistribute super."yaop";
+  "yap" = dontDistribute super."yap";
+  "yarr" = dontDistribute super."yarr";
+  "yarr-image-io" = dontDistribute super."yarr-image-io";
+  "yate" = dontDistribute super."yate";
+  "yavie" = dontDistribute super."yavie";
+  "ycextra" = dontDistribute super."ycextra";
+  "yeganesh" = dontDistribute super."yeganesh";
+  "yeller" = dontDistribute super."yeller";
+  "yes-precure5-command" = dontDistribute super."yes-precure5-command";
+  "yesod-angular" = dontDistribute super."yesod-angular";
+  "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
+  "yesod-auth-account-fork" = dontDistribute super."yesod-auth-account-fork";
+  "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
+  "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos";
+  "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
+  "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
+  "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
+  "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
+  "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
+  "yesod-bootstrap" = dontDistribute super."yesod-bootstrap";
+  "yesod-comments" = dontDistribute super."yesod-comments";
+  "yesod-content-pdf" = dontDistribute super."yesod-content-pdf";
+  "yesod-continuations" = dontDistribute super."yesod-continuations";
+  "yesod-crud" = dontDistribute super."yesod-crud";
+  "yesod-crud-persist" = dontDistribute super."yesod-crud-persist";
+  "yesod-csp" = dontDistribute super."yesod-csp";
+  "yesod-datatables" = dontDistribute super."yesod-datatables";
+  "yesod-dsl" = dontDistribute super."yesod-dsl";
+  "yesod-examples" = dontDistribute super."yesod-examples";
+  "yesod-form-json" = dontDistribute super."yesod-form-json";
+  "yesod-goodies" = dontDistribute super."yesod-goodies";
+  "yesod-json" = dontDistribute super."yesod-json";
+  "yesod-links" = dontDistribute super."yesod-links";
+  "yesod-lucid" = dontDistribute super."yesod-lucid";
+  "yesod-mangopay" = doDistribute super."yesod-mangopay_1_11_5";
+  "yesod-markdown" = dontDistribute super."yesod-markdown";
+  "yesod-media-simple" = dontDistribute super."yesod-media-simple";
+  "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_4_0_1";
+  "yesod-paginate" = dontDistribute super."yesod-paginate";
+  "yesod-pagination" = dontDistribute super."yesod-pagination";
+  "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-platform" = dontDistribute super."yesod-platform";
+  "yesod-pnotify" = dontDistribute super."yesod-pnotify";
+  "yesod-pure" = dontDistribute super."yesod-pure";
+  "yesod-purescript" = dontDistribute super."yesod-purescript";
+  "yesod-raml" = dontDistribute super."yesod-raml";
+  "yesod-raml-bin" = dontDistribute super."yesod-raml-bin";
+  "yesod-raml-docs" = dontDistribute super."yesod-raml-docs";
+  "yesod-raml-mock" = dontDistribute super."yesod-raml-mock";
+  "yesod-recaptcha" = dontDistribute super."yesod-recaptcha";
+  "yesod-routes" = dontDistribute super."yesod-routes";
+  "yesod-routes-flow" = dontDistribute super."yesod-routes-flow";
+  "yesod-routes-typescript" = dontDistribute super."yesod-routes-typescript";
+  "yesod-rst" = dontDistribute super."yesod-rst";
+  "yesod-s3" = dontDistribute super."yesod-s3";
+  "yesod-sass" = dontDistribute super."yesod-sass";
+  "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-table" = doDistribute super."yesod-table_1_0_6";
+  "yesod-tableview" = dontDistribute super."yesod-tableview";
+  "yesod-test" = doDistribute super."yesod-test_1_4_4";
+  "yesod-test-json" = dontDistribute super."yesod-test-json";
+  "yesod-tls" = dontDistribute super."yesod-tls";
+  "yesod-transloadit" = dontDistribute super."yesod-transloadit";
+  "yesod-vend" = dontDistribute super."yesod-vend";
+  "yesod-websockets-extra" = dontDistribute super."yesod-websockets-extra";
+  "yesod-worker" = dontDistribute super."yesod-worker";
+  "yet-another-logger" = dontDistribute super."yet-another-logger";
+  "yhccore" = dontDistribute super."yhccore";
+  "yi" = dontDistribute super."yi";
+  "yi-contrib" = dontDistribute super."yi-contrib";
+  "yi-emacs-colours" = dontDistribute super."yi-emacs-colours";
+  "yi-fuzzy-open" = dontDistribute super."yi-fuzzy-open";
+  "yi-gtk" = dontDistribute super."yi-gtk";
+  "yi-language" = dontDistribute super."yi-language";
+  "yi-monokai" = dontDistribute super."yi-monokai";
+  "yi-rope" = dontDistribute super."yi-rope";
+  "yi-snippet" = dontDistribute super."yi-snippet";
+  "yi-solarized" = dontDistribute super."yi-solarized";
+  "yi-spolsky" = dontDistribute super."yi-spolsky";
+  "yi-vty" = dontDistribute super."yi-vty";
+  "yices" = dontDistribute super."yices";
+  "yices-easy" = dontDistribute super."yices-easy";
+  "yices-painless" = dontDistribute super."yices-painless";
+  "yjftp" = dontDistribute super."yjftp";
+  "yjftp-libs" = dontDistribute super."yjftp-libs";
+  "yjsvg" = dontDistribute super."yjsvg";
+  "yjtools" = dontDistribute super."yjtools";
+  "yocto" = dontDistribute super."yocto";
+  "yoko" = dontDistribute super."yoko";
+  "york-lava" = dontDistribute super."york-lava";
+  "youtube" = dontDistribute super."youtube";
+  "yql" = dontDistribute super."yql";
+  "yst" = dontDistribute super."yst";
+  "yuiGrid" = dontDistribute super."yuiGrid";
+  "yuuko" = dontDistribute super."yuuko";
+  "yxdb-utils" = dontDistribute super."yxdb-utils";
+  "z3" = dontDistribute super."z3";
+  "zalgo" = dontDistribute super."zalgo";
+  "zampolit" = dontDistribute super."zampolit";
+  "zasni-gerna" = dontDistribute super."zasni-gerna";
+  "zcache" = dontDistribute super."zcache";
+  "zenc" = dontDistribute super."zenc";
+  "zendesk-api" = dontDistribute super."zendesk-api";
+  "zeno" = dontDistribute super."zeno";
+  "zerobin" = dontDistribute super."zerobin";
+  "zeromq-haskell" = dontDistribute super."zeromq-haskell";
+  "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
+  "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeroth" = dontDistribute super."zeroth";
+  "zigbee-znet25" = dontDistribute super."zigbee-znet25";
+  "zim-parser" = dontDistribute super."zim-parser";
+  "zip-conduit" = dontDistribute super."zip-conduit";
+  "zipedit" = dontDistribute super."zipedit";
+  "zipkin" = dontDistribute super."zipkin";
+  "zipper" = dontDistribute super."zipper";
+  "zippers" = dontDistribute super."zippers";
+  "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
+  "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zmcat" = dontDistribute super."zmcat";
+  "zmidi-core" = dontDistribute super."zmidi-core";
+  "zmidi-score" = dontDistribute super."zmidi-score";
+  "zmqat" = dontDistribute super."zmqat";
+  "zoneinfo" = dontDistribute super."zoneinfo";
+  "zoom" = dontDistribute super."zoom";
+  "zoom-cache" = dontDistribute super."zoom-cache";
+  "zoom-cache-pcm" = dontDistribute super."zoom-cache-pcm";
+  "zoom-cache-sndfile" = dontDistribute super."zoom-cache-sndfile";
+  "zoom-refs" = dontDistribute super."zoom-refs";
+  "zot" = dontDistribute super."zot";
+  "zsh-battery" = dontDistribute super."zsh-battery";
+  "ztail" = dontDistribute super."ztail";
+
+}
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
index 931e82d06afd..350c15183447 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
@@ -2185,6 +2185,7 @@ self: super: {
   "cpuperf" = dontDistribute super."cpuperf";
   "cpython" = dontDistribute super."cpython";
   "cql" = doDistribute super."cql_3_0_5";
+  "cql-io" = doDistribute super."cql-io_0_14_5";
   "cqrs" = dontDistribute super."cqrs";
   "cqrs-core" = dontDistribute super."cqrs-core";
   "cqrs-example" = dontDistribute super."cqrs-example";
@@ -3910,6 +3911,7 @@ self: super: {
   "herbalizer" = dontDistribute super."herbalizer";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -4482,7 +4484,9 @@ self: super: {
   "iban" = dontDistribute super."iban";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
+  "ide-backend" = doDistribute super."ide-backend_0_10_0";
   "ide-backend-common" = doDistribute super."ide-backend-common_0_10_0";
+  "ide-backend-server" = doDistribute super."ide-backend-server_0_10_0";
   "ideas" = dontDistribute super."ideas";
   "ideas-math" = dontDistribute super."ideas-math";
   "idempotent" = dontDistribute super."idempotent";
@@ -5497,6 +5501,7 @@ self: super: {
   "nanomsg" = dontDistribute super."nanomsg";
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = doDistribute super."nationstates_0_2_0_1";
@@ -5652,6 +5657,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -6371,6 +6377,7 @@ self: super: {
   "reddit" = dontDistribute super."reddit";
   "redis" = dontDistribute super."redis";
   "redis-hs" = dontDistribute super."redis-hs";
+  "redis-io" = doDistribute super."redis-io_0_5_1";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
@@ -6799,6 +6806,7 @@ self: super: {
   "shake-language-c" = doDistribute super."shake-language-c_0_8_0";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_5";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7360,6 +7368,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template-default" = dontDistribute super."template-default";
   "template-haskell-util" = dontDistribute super."template-haskell-util";
@@ -8226,6 +8236,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8351,6 +8362,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
index 81e330cc0d66..a99d3e7bd44c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
@@ -2184,6 +2184,7 @@ self: super: {
   "cpuperf" = dontDistribute super."cpuperf";
   "cpython" = dontDistribute super."cpython";
   "cql" = doDistribute super."cql_3_0_5";
+  "cql-io" = doDistribute super."cql-io_0_14_5";
   "cqrs" = dontDistribute super."cqrs";
   "cqrs-core" = dontDistribute super."cqrs-core";
   "cqrs-example" = dontDistribute super."cqrs-example";
@@ -3909,6 +3910,7 @@ self: super: {
   "herbalizer" = dontDistribute super."herbalizer";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -4481,7 +4483,9 @@ self: super: {
   "iban" = dontDistribute super."iban";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
+  "ide-backend" = doDistribute super."ide-backend_0_10_0";
   "ide-backend-common" = doDistribute super."ide-backend-common_0_10_0";
+  "ide-backend-server" = doDistribute super."ide-backend-server_0_10_0";
   "ideas" = dontDistribute super."ideas";
   "ideas-math" = dontDistribute super."ideas-math";
   "idempotent" = dontDistribute super."idempotent";
@@ -5496,6 +5500,7 @@ self: super: {
   "nanomsg" = dontDistribute super."nanomsg";
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = doDistribute super."nationstates_0_2_0_2";
@@ -5651,6 +5656,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -6370,6 +6376,7 @@ self: super: {
   "reddit" = dontDistribute super."reddit";
   "redis" = dontDistribute super."redis";
   "redis-hs" = dontDistribute super."redis-hs";
+  "redis-io" = doDistribute super."redis-io_0_5_1";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
@@ -6797,6 +6804,7 @@ self: super: {
   "shake-language-c" = doDistribute super."shake-language-c_0_8_1";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_5";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7357,6 +7365,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template-default" = dontDistribute super."template-default";
   "template-haskell-util" = dontDistribute super."template-haskell-util";
@@ -8222,6 +8232,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8347,6 +8358,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
index bdf39a5597e9..ddaa62371983 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
@@ -2181,6 +2181,7 @@ self: super: {
   "cpuperf" = dontDistribute super."cpuperf";
   "cpython" = dontDistribute super."cpython";
   "cql" = doDistribute super."cql_3_0_5";
+  "cql-io" = doDistribute super."cql-io_0_14_5";
   "cqrs" = dontDistribute super."cqrs";
   "cqrs-core" = dontDistribute super."cqrs-core";
   "cqrs-example" = dontDistribute super."cqrs-example";
@@ -3903,6 +3904,7 @@ self: super: {
   "herbalizer" = dontDistribute super."herbalizer";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -4473,7 +4475,9 @@ self: super: {
   "iban" = dontDistribute super."iban";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
+  "ide-backend" = doDistribute super."ide-backend_0_10_0";
   "ide-backend-common" = doDistribute super."ide-backend-common_0_10_0";
+  "ide-backend-server" = doDistribute super."ide-backend-server_0_10_0";
   "ideas" = dontDistribute super."ideas";
   "ideas-math" = dontDistribute super."ideas-math";
   "idempotent" = dontDistribute super."idempotent";
@@ -5484,6 +5488,7 @@ self: super: {
   "nanomsg" = dontDistribute super."nanomsg";
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = doDistribute super."nationstates_0_2_0_3";
@@ -5639,6 +5644,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -6354,6 +6360,7 @@ self: super: {
   "reddit" = dontDistribute super."reddit";
   "redis" = dontDistribute super."redis";
   "redis-hs" = dontDistribute super."redis-hs";
+  "redis-io" = doDistribute super."redis-io_0_5_1";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
@@ -6781,6 +6788,7 @@ self: super: {
   "shake-language-c" = doDistribute super."shake-language-c_0_8_1";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_5";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7339,6 +7347,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template-default" = dontDistribute super."template-default";
   "template-haskell-util" = dontDistribute super."template-haskell-util";
@@ -8202,6 +8212,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8325,6 +8336,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
index f3705cd917e9..97b18eac90a0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
@@ -2179,6 +2179,7 @@ self: super: {
   "cpuperf" = dontDistribute super."cpuperf";
   "cpython" = dontDistribute super."cpython";
   "cql" = doDistribute super."cql_3_0_5";
+  "cql-io" = doDistribute super."cql-io_0_14_5";
   "cqrs" = dontDistribute super."cqrs";
   "cqrs-core" = dontDistribute super."cqrs-core";
   "cqrs-example" = dontDistribute super."cqrs-example";
@@ -3896,6 +3897,7 @@ self: super: {
   "herbalizer" = dontDistribute super."herbalizer";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -4466,7 +4468,9 @@ self: super: {
   "iban" = dontDistribute super."iban";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
+  "ide-backend" = doDistribute super."ide-backend_0_10_0";
   "ide-backend-common" = doDistribute super."ide-backend-common_0_10_0";
+  "ide-backend-server" = doDistribute super."ide-backend-server_0_10_0";
   "ideas" = dontDistribute super."ideas";
   "ideas-math" = dontDistribute super."ideas-math";
   "idempotent" = dontDistribute super."idempotent";
@@ -5472,6 +5476,7 @@ self: super: {
   "nanomsg" = dontDistribute super."nanomsg";
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = doDistribute super."nationstates_0_2_0_3";
@@ -5627,6 +5632,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -6341,6 +6347,7 @@ self: super: {
   "reddit" = dontDistribute super."reddit";
   "redis" = dontDistribute super."redis";
   "redis-hs" = dontDistribute super."redis-hs";
+  "redis-io" = doDistribute super."redis-io_0_5_1";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
@@ -6768,6 +6775,7 @@ self: super: {
   "shake-language-c" = doDistribute super."shake-language-c_0_8_1";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_6";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7326,6 +7334,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template-default" = dontDistribute super."template-default";
   "template-haskell-util" = dontDistribute super."template-haskell-util";
@@ -8186,6 +8196,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8309,6 +8320,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
index 195f3e23f4fa..fc34b8c560cd 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
@@ -2175,6 +2175,7 @@ self: super: {
   "cpuperf" = dontDistribute super."cpuperf";
   "cpython" = dontDistribute super."cpython";
   "cql" = doDistribute super."cql_3_0_5";
+  "cql-io" = doDistribute super."cql-io_0_14_5";
   "cqrs" = dontDistribute super."cqrs";
   "cqrs-core" = dontDistribute super."cqrs-core";
   "cqrs-example" = dontDistribute super."cqrs-example";
@@ -3888,6 +3889,7 @@ self: super: {
   "herbalizer" = dontDistribute super."herbalizer";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -4458,7 +4460,9 @@ self: super: {
   "iban" = dontDistribute super."iban";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
+  "ide-backend" = doDistribute super."ide-backend_0_10_0";
   "ide-backend-common" = doDistribute super."ide-backend-common_0_10_0";
+  "ide-backend-server" = doDistribute super."ide-backend-server_0_10_0";
   "ideas" = dontDistribute super."ideas";
   "ideas-math" = dontDistribute super."ideas-math";
   "idempotent" = dontDistribute super."idempotent";
@@ -5462,6 +5466,7 @@ self: super: {
   "nanomsg" = dontDistribute super."nanomsg";
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = doDistribute super."nationstates_0_2_0_3";
@@ -5617,6 +5622,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -6326,6 +6332,7 @@ self: super: {
   "reddit" = dontDistribute super."reddit";
   "redis" = dontDistribute super."redis";
   "redis-hs" = dontDistribute super."redis-hs";
+  "redis-io" = doDistribute super."redis-io_0_5_1";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
@@ -6753,6 +6760,7 @@ self: super: {
   "shake-language-c" = doDistribute super."shake-language-c_0_8_1";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_6";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7309,6 +7317,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template-default" = dontDistribute super."template-default";
   "template-haskell-util" = dontDistribute super."template-haskell-util";
@@ -8166,6 +8176,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8289,6 +8300,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
index 2ae436dea3c3..456cad5611d2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
@@ -2172,6 +2172,7 @@ self: super: {
   "cpuperf" = dontDistribute super."cpuperf";
   "cpython" = dontDistribute super."cpython";
   "cql" = doDistribute super."cql_3_0_5";
+  "cql-io" = doDistribute super."cql-io_0_14_5";
   "cqrs" = dontDistribute super."cqrs";
   "cqrs-core" = dontDistribute super."cqrs-core";
   "cqrs-example" = dontDistribute super."cqrs-example";
@@ -3880,6 +3881,7 @@ self: super: {
   "herbalizer" = dontDistribute super."herbalizer";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -4450,7 +4452,9 @@ self: super: {
   "iban" = dontDistribute super."iban";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
+  "ide-backend" = doDistribute super."ide-backend_0_10_0";
   "ide-backend-common" = doDistribute super."ide-backend-common_0_10_0";
+  "ide-backend-server" = doDistribute super."ide-backend-server_0_10_0";
   "ideas" = dontDistribute super."ideas";
   "ideas-math" = dontDistribute super."ideas-math";
   "idempotent" = dontDistribute super."idempotent";
@@ -5452,6 +5456,7 @@ self: super: {
   "nanomsg" = dontDistribute super."nanomsg";
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = doDistribute super."nationstates_0_2_0_3";
@@ -5607,6 +5612,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -6313,6 +6319,7 @@ self: super: {
   "reddit" = dontDistribute super."reddit";
   "redis" = dontDistribute super."redis";
   "redis-hs" = dontDistribute super."redis-hs";
+  "redis-io" = doDistribute super."redis-io_0_5_1";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
@@ -6740,6 +6747,7 @@ self: super: {
   "shake-language-c" = doDistribute super."shake-language-c_0_8_1";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_6";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7295,6 +7303,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template-default" = dontDistribute super."template-default";
   "template-haskell-util" = dontDistribute super."template-haskell-util";
@@ -8152,6 +8162,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8275,6 +8286,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
index 1eb0804186b7..df3387872670 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
@@ -2168,6 +2168,7 @@ self: super: {
   "cpuperf" = dontDistribute super."cpuperf";
   "cpython" = dontDistribute super."cpython";
   "cql" = doDistribute super."cql_3_0_5";
+  "cql-io" = doDistribute super."cql-io_0_14_5";
   "cqrs" = dontDistribute super."cqrs";
   "cqrs-core" = dontDistribute super."cqrs-core";
   "cqrs-example" = dontDistribute super."cqrs-example";
@@ -3872,6 +3873,7 @@ self: super: {
   "herbalizer" = dontDistribute super."herbalizer";
   "hermit" = dontDistribute super."hermit";
   "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
   "heroku" = dontDistribute super."heroku";
   "heroku-persistent" = dontDistribute super."heroku-persistent";
   "herringbone" = dontDistribute super."herringbone";
@@ -4442,7 +4444,9 @@ self: super: {
   "iban" = dontDistribute super."iban";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
+  "ide-backend" = doDistribute super."ide-backend_0_10_0";
   "ide-backend-common" = doDistribute super."ide-backend-common_0_10_0";
+  "ide-backend-server" = doDistribute super."ide-backend-server_0_10_0";
   "ideas" = dontDistribute super."ideas";
   "ideas-math" = dontDistribute super."ideas-math";
   "idempotent" = dontDistribute super."idempotent";
@@ -5444,6 +5448,7 @@ self: super: {
   "nanomsg" = dontDistribute super."nanomsg";
   "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
   "nanoparsec" = dontDistribute super."nanoparsec";
+  "nanq" = dontDistribute super."nanq";
   "narc" = dontDistribute super."narc";
   "nat" = dontDistribute super."nat";
   "nationstates" = doDistribute super."nationstates_0_2_0_3";
@@ -5599,6 +5604,7 @@ self: super: {
   "numeric-prelude" = dontDistribute super."numeric-prelude";
   "numeric-qq" = dontDistribute super."numeric-qq";
   "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
   "numeric-tools" = dontDistribute super."numeric-tools";
   "numericpeano" = dontDistribute super."numericpeano";
   "nums" = dontDistribute super."nums";
@@ -6304,6 +6310,7 @@ self: super: {
   "reddit" = dontDistribute super."reddit";
   "redis" = dontDistribute super."redis";
   "redis-hs" = dontDistribute super."redis-hs";
+  "redis-io" = doDistribute super."redis-io_0_5_1";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
@@ -6731,6 +6738,7 @@ self: super: {
   "shake-language-c" = doDistribute super."shake-language-c_0_8_3";
   "shake-minify" = dontDistribute super."shake-minify";
   "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_6";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
@@ -7286,6 +7294,8 @@ self: super: {
   "teams" = dontDistribute super."teams";
   "teeth" = dontDistribute super."teeth";
   "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
   "tellbot" = dontDistribute super."tellbot";
   "template-default" = dontDistribute super."template-default";
   "template-haskell-util" = dontDistribute super."template-haskell-util";
@@ -8143,6 +8153,7 @@ self: super: {
   "yaml-rpc" = dontDistribute super."yaml-rpc";
   "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
   "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
   "yaml2owl" = dontDistribute super."yaml2owl";
   "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
   "yampa-canvas" = dontDistribute super."yampa-canvas";
@@ -8266,6 +8277,7 @@ self: super: {
   "zeromq-haskell" = dontDistribute super."zeromq-haskell";
   "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
   "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeromq4-haskell" = doDistribute super."zeromq4-haskell_0_6_3";
   "zeroth" = dontDistribute super."zeroth";
   "zigbee-znet25" = dontDistribute super."zigbee-znet25";
   "zim-parser" = dontDistribute super."zim-parser";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.0.nix b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
new file mode 100644
index 000000000000..0bcf67fb7013
--- /dev/null
+++ b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
@@ -0,0 +1,7571 @@
+{ pkgs }:
+
+with import ./lib.nix { inherit pkgs; };
+
+self: super: {
+
+  # core libraries provided by the compiler
+  Cabal = null;
+  array = null;
+  base = null;
+  bin-package-db = null;
+  binary = null;
+  bytestring = null;
+  containers = null;
+  deepseq = null;
+  directory = null;
+  filepath = null;
+  ghc-prim = null;
+  hoopl = null;
+  hpc = null;
+  integer-gmp = null;
+  pretty = null;
+  process = null;
+  rts = null;
+  template-haskell = null;
+  time = null;
+  transformers = null;
+  unix = null;
+
+  # lts-4.0 packages
+  "3d-graphics-examples" = dontDistribute super."3d-graphics-examples";
+  "3dmodels" = dontDistribute super."3dmodels";
+  "4Blocks" = dontDistribute super."4Blocks";
+  "AAI" = dontDistribute super."AAI";
+  "ABList" = dontDistribute super."ABList";
+  "AC-Angle" = dontDistribute super."AC-Angle";
+  "AC-Boolean" = dontDistribute super."AC-Boolean";
+  "AC-BuildPlatform" = dontDistribute super."AC-BuildPlatform";
+  "AC-Colour" = dontDistribute super."AC-Colour";
+  "AC-EasyRaster-GTK" = dontDistribute super."AC-EasyRaster-GTK";
+  "AC-HalfInteger" = dontDistribute super."AC-HalfInteger";
+  "AC-MiniTest" = dontDistribute super."AC-MiniTest";
+  "AC-PPM" = dontDistribute super."AC-PPM";
+  "AC-Random" = dontDistribute super."AC-Random";
+  "AC-Terminal" = dontDistribute super."AC-Terminal";
+  "AC-VanillaArray" = dontDistribute super."AC-VanillaArray";
+  "AC-Vector-Fancy" = dontDistribute super."AC-Vector-Fancy";
+  "ACME" = dontDistribute super."ACME";
+  "ADPfusion" = dontDistribute super."ADPfusion";
+  "AERN-Basics" = dontDistribute super."AERN-Basics";
+  "AERN-Net" = dontDistribute super."AERN-Net";
+  "AERN-Real" = dontDistribute super."AERN-Real";
+  "AERN-Real-Double" = dontDistribute super."AERN-Real-Double";
+  "AERN-Real-Interval" = dontDistribute super."AERN-Real-Interval";
+  "AERN-RnToRm" = dontDistribute super."AERN-RnToRm";
+  "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot";
+  "AES" = dontDistribute super."AES";
+  "AGI" = dontDistribute super."AGI";
+  "ALUT" = dontDistribute super."ALUT";
+  "AMI" = dontDistribute super."AMI";
+  "ANum" = dontDistribute super."ANum";
+  "ASN1" = dontDistribute super."ASN1";
+  "AVar" = dontDistribute super."AVar";
+  "AWin32Console" = dontDistribute super."AWin32Console";
+  "AbortT-monadstf" = dontDistribute super."AbortT-monadstf";
+  "AbortT-mtl" = dontDistribute super."AbortT-mtl";
+  "AbortT-transformers" = dontDistribute super."AbortT-transformers";
+  "ActionKid" = dontDistribute super."ActionKid";
+  "Adaptive" = dontDistribute super."Adaptive";
+  "Adaptive-Blaisorblade" = dontDistribute super."Adaptive-Blaisorblade";
+  "Advgame" = dontDistribute super."Advgame";
+  "AesonBson" = dontDistribute super."AesonBson";
+  "Agata" = dontDistribute super."Agata";
+  "Agda-executable" = dontDistribute super."Agda-executable";
+  "AhoCorasick" = dontDistribute super."AhoCorasick";
+  "AlgorithmW" = dontDistribute super."AlgorithmW";
+  "AlignmentAlgorithms" = dontDistribute super."AlignmentAlgorithms";
+  "Allure" = dontDistribute super."Allure";
+  "AndroidViewHierarchyImporter" = dontDistribute super."AndroidViewHierarchyImporter";
+  "Animas" = dontDistribute super."Animas";
+  "Annotations" = dontDistribute super."Annotations";
+  "Ansi2Html" = dontDistribute super."Ansi2Html";
+  "ApplePush" = dontDistribute super."ApplePush";
+  "AppleScript" = dontDistribute super."AppleScript";
+  "ApproxFun-hs" = dontDistribute super."ApproxFun-hs";
+  "ArrayRef" = dontDistribute super."ArrayRef";
+  "ArrowVHDL" = dontDistribute super."ArrowVHDL";
+  "AspectAG" = dontDistribute super."AspectAG";
+  "AttoBencode" = dontDistribute super."AttoBencode";
+  "AttoJson" = dontDistribute super."AttoJson";
+  "Attrac" = dontDistribute super."Attrac";
+  "Aurochs" = dontDistribute super."Aurochs";
+  "AutoForms" = dontDistribute super."AutoForms";
+  "AvlTree" = dontDistribute super."AvlTree";
+  "BASIC" = dontDistribute super."BASIC";
+  "BCMtools" = dontDistribute super."BCMtools";
+  "BNFC" = dontDistribute super."BNFC";
+  "BNFC-meta" = dontDistribute super."BNFC-meta";
+  "Baggins" = dontDistribute super."Baggins";
+  "Bang" = dontDistribute super."Bang";
+  "Barracuda" = dontDistribute super."Barracuda";
+  "Befunge93" = dontDistribute super."Befunge93";
+  "BenchmarkHistory" = dontDistribute super."BenchmarkHistory";
+  "BerkeleyDB" = dontDistribute super."BerkeleyDB";
+  "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML";
+  "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm";
+  "BigPixel" = dontDistribute super."BigPixel";
+  "Binpack" = dontDistribute super."Binpack";
+  "Biobase" = dontDistribute super."Biobase";
+  "BiobaseBlast" = dontDistribute super."BiobaseBlast";
+  "BiobaseDotP" = dontDistribute super."BiobaseDotP";
+  "BiobaseFR3D" = dontDistribute super."BiobaseFR3D";
+  "BiobaseFasta" = dontDistribute super."BiobaseFasta";
+  "BiobaseInfernal" = dontDistribute super."BiobaseInfernal";
+  "BiobaseMAF" = dontDistribute super."BiobaseMAF";
+  "BiobaseTrainingData" = dontDistribute super."BiobaseTrainingData";
+  "BiobaseTurner" = dontDistribute super."BiobaseTurner";
+  "BiobaseTypes" = dontDistribute super."BiobaseTypes";
+  "BiobaseVienna" = dontDistribute super."BiobaseVienna";
+  "BiobaseXNA" = dontDistribute super."BiobaseXNA";
+  "BirdPP" = dontDistribute super."BirdPP";
+  "BitSyntax" = dontDistribute super."BitSyntax";
+  "Bitly" = dontDistribute super."Bitly";
+  "Blobs" = dontDistribute super."Blobs";
+  "BluePrintCSS" = dontDistribute super."BluePrintCSS";
+  "Blueprint" = dontDistribute super."Blueprint";
+  "Bookshelf" = dontDistribute super."Bookshelf";
+  "Bravo" = dontDistribute super."Bravo";
+  "BufferedSocket" = dontDistribute super."BufferedSocket";
+  "Buster" = dontDistribute super."Buster";
+  "CBOR" = dontDistribute super."CBOR";
+  "CC-delcont" = dontDistribute super."CC-delcont";
+  "CC-delcont-alt" = dontDistribute super."CC-delcont-alt";
+  "CC-delcont-cxe" = dontDistribute super."CC-delcont-cxe";
+  "CC-delcont-exc" = dontDistribute super."CC-delcont-exc";
+  "CC-delcont-ref" = dontDistribute super."CC-delcont-ref";
+  "CC-delcont-ref-tf" = dontDistribute super."CC-delcont-ref-tf";
+  "CCA" = dontDistribute super."CCA";
+  "CHXHtml" = dontDistribute super."CHXHtml";
+  "CLASE" = dontDistribute super."CLASE";
+  "CLI" = dontDistribute super."CLI";
+  "CMCompare" = dontDistribute super."CMCompare";
+  "CMQ" = dontDistribute super."CMQ";
+  "COrdering" = dontDistribute super."COrdering";
+  "CPBrainfuck" = dontDistribute super."CPBrainfuck";
+  "CPL" = dontDistribute super."CPL";
+  "CSPM-CoreLanguage" = dontDistribute super."CSPM-CoreLanguage";
+  "CSPM-FiringRules" = dontDistribute super."CSPM-FiringRules";
+  "CSPM-Frontend" = dontDistribute super."CSPM-Frontend";
+  "CSPM-Interpreter" = dontDistribute super."CSPM-Interpreter";
+  "CSPM-ToProlog" = dontDistribute super."CSPM-ToProlog";
+  "CSPM-cspm" = dontDistribute super."CSPM-cspm";
+  "CTRex" = dontDistribute super."CTRex";
+  "CV" = dontDistribute super."CV";
+  "CabalSearch" = dontDistribute super."CabalSearch";
+  "Capabilities" = dontDistribute super."Capabilities";
+  "Cardinality" = dontDistribute super."Cardinality";
+  "CarneadesDSL" = dontDistribute super."CarneadesDSL";
+  "CarneadesIntoDung" = dontDistribute super."CarneadesIntoDung";
+  "Cartesian" = dontDistribute super."Cartesian";
+  "Cascade" = dontDistribute super."Cascade";
+  "Catana" = dontDistribute super."Catana";
+  "Chart-diagrams" = dontDistribute super."Chart-diagrams";
+  "Chart-gtk" = dontDistribute super."Chart-gtk";
+  "Chart-simple" = dontDistribute super."Chart-simple";
+  "CheatSheet" = dontDistribute super."CheatSheet";
+  "Checked" = dontDistribute super."Checked";
+  "Chitra" = dontDistribute super."Chitra";
+  "ChristmasTree" = dontDistribute super."ChristmasTree";
+  "CirruParser" = dontDistribute super."CirruParser";
+  "ClassLaws" = dontDistribute super."ClassLaws";
+  "ClassyPrelude" = dontDistribute super."ClassyPrelude";
+  "Clean" = dontDistribute super."Clean";
+  "Clipboard" = dontDistribute super."Clipboard";
+  "Coadjute" = dontDistribute super."Coadjute";
+  "Codec-Compression-LZF" = dontDistribute super."Codec-Compression-LZF";
+  "Codec-Image-DevIL" = dontDistribute super."Codec-Image-DevIL";
+  "Combinatorrent" = dontDistribute super."Combinatorrent";
+  "Command" = dontDistribute super."Command";
+  "Commando" = dontDistribute super."Commando";
+  "ComonadSheet" = dontDistribute super."ComonadSheet";
+  "ConcurrentUtils" = dontDistribute super."ConcurrentUtils";
+  "Concurrential" = dontDistribute super."Concurrential";
+  "Condor" = dontDistribute super."Condor";
+  "ConfigFileTH" = dontDistribute super."ConfigFileTH";
+  "Configger" = dontDistribute super."Configger";
+  "Configurable" = dontDistribute super."Configurable";
+  "ConsStream" = dontDistribute super."ConsStream";
+  "Conscript" = dontDistribute super."Conscript";
+  "ConstraintKinds" = dontDistribute super."ConstraintKinds";
+  "Consumer" = dontDistribute super."Consumer";
+  "ContArrow" = dontDistribute super."ContArrow";
+  "ContextAlgebra" = dontDistribute super."ContextAlgebra";
+  "Contract" = dontDistribute super."Contract";
+  "Control-Engine" = dontDistribute super."Control-Engine";
+  "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass";
+  "Control-Monad-ST2" = dontDistribute super."Control-Monad-ST2";
+  "CoreDump" = dontDistribute super."CoreDump";
+  "CoreErlang" = dontDistribute super."CoreErlang";
+  "CoreFoundation" = dontDistribute super."CoreFoundation";
+  "Coroutine" = dontDistribute super."Coroutine";
+  "CouchDB" = dontDistribute super."CouchDB";
+  "Craft3e" = dontDistribute super."Craft3e";
+  "Crypto" = dontDistribute super."Crypto";
+  "CurryDB" = dontDistribute super."CurryDB";
+  "DAG-Tournament" = dontDistribute super."DAG-Tournament";
+  "DBlimited" = dontDistribute super."DBlimited";
+  "DBus" = dontDistribute super."DBus";
+  "DCFL" = dontDistribute super."DCFL";
+  "DMuCheck" = dontDistribute super."DMuCheck";
+  "DOM" = dontDistribute super."DOM";
+  "DP" = dontDistribute super."DP";
+  "DPM" = dontDistribute super."DPM";
+  "DSA" = dontDistribute super."DSA";
+  "DSH" = dontDistribute super."DSH";
+  "DSTM" = dontDistribute super."DSTM";
+  "DTC" = dontDistribute super."DTC";
+  "Dangerous" = dontDistribute super."Dangerous";
+  "Dao" = dontDistribute super."Dao";
+  "DarcsHelpers" = dontDistribute super."DarcsHelpers";
+  "Data-Hash-Consistent" = dontDistribute super."Data-Hash-Consistent";
+  "Data-Rope" = dontDistribute super."Data-Rope";
+  "DataTreeView" = dontDistribute super."DataTreeView";
+  "Deadpan-DDP" = dontDistribute super."Deadpan-DDP";
+  "DebugTraceHelpers" = dontDistribute super."DebugTraceHelpers";
+  "DecisionTree" = dontDistribute super."DecisionTree";
+  "DeepArrow" = dontDistribute super."DeepArrow";
+  "DefendTheKing" = dontDistribute super."DefendTheKing";
+  "DescriptiveKeys" = dontDistribute super."DescriptiveKeys";
+  "Dflow" = dontDistribute super."Dflow";
+  "DifferenceLogic" = dontDistribute super."DifferenceLogic";
+  "DifferentialEvolution" = dontDistribute super."DifferentialEvolution";
+  "Digit" = dontDistribute super."Digit";
+  "DigitalOcean" = dontDistribute super."DigitalOcean";
+  "DimensionalHash" = dontDistribute super."DimensionalHash";
+  "DirectSound" = dontDistribute super."DirectSound";
+  "DisTract" = dontDistribute super."DisTract";
+  "DiscussionSupportSystem" = dontDistribute super."DiscussionSupportSystem";
+  "Dish" = dontDistribute super."Dish";
+  "Dist" = dontDistribute super."Dist";
+  "DistanceTransform" = dontDistribute super."DistanceTransform";
+  "DistanceUnits" = dontDistribute super."DistanceUnits";
+  "DnaProteinAlignment" = dontDistribute super."DnaProteinAlignment";
+  "DocTest" = dontDistribute super."DocTest";
+  "Docs" = dontDistribute super."Docs";
+  "DrHylo" = dontDistribute super."DrHylo";
+  "DrIFT" = dontDistribute super."DrIFT";
+  "DrIFT-cabalized" = dontDistribute super."DrIFT-cabalized";
+  "Dung" = dontDistribute super."Dung";
+  "Dust" = dontDistribute super."Dust";
+  "Dust-crypto" = dontDistribute super."Dust-crypto";
+  "Dust-tools" = dontDistribute super."Dust-tools";
+  "Dust-tools-pcap" = dontDistribute super."Dust-tools-pcap";
+  "DynamicTimeWarp" = dontDistribute super."DynamicTimeWarp";
+  "DysFRP" = dontDistribute super."DysFRP";
+  "DysFRP-Cairo" = dontDistribute super."DysFRP-Cairo";
+  "DysFRP-Craftwerk" = dontDistribute super."DysFRP-Craftwerk";
+  "EEConfig" = dontDistribute super."EEConfig";
+  "EdisonAPI" = dontDistribute super."EdisonAPI";
+  "EdisonCore" = dontDistribute super."EdisonCore";
+  "EditTimeReport" = dontDistribute super."EditTimeReport";
+  "EitherT" = dontDistribute super."EitherT";
+  "Elm" = dontDistribute super."Elm";
+  "Emping" = dontDistribute super."Emping";
+  "Encode" = dontDistribute super."Encode";
+  "EnumContainers" = dontDistribute super."EnumContainers";
+  "EnumMap" = dontDistribute super."EnumMap";
+  "Eq" = dontDistribute super."Eq";
+  "EqualitySolver" = dontDistribute super."EqualitySolver";
+  "EsounD" = dontDistribute super."EsounD";
+  "EstProgress" = dontDistribute super."EstProgress";
+  "EtaMOO" = dontDistribute super."EtaMOO";
+  "Etage" = dontDistribute super."Etage";
+  "Etage-Graph" = dontDistribute super."Etage-Graph";
+  "Eternal10Seconds" = dontDistribute super."Eternal10Seconds";
+  "Etherbunny" = dontDistribute super."Etherbunny";
+  "EuroIT" = dontDistribute super."EuroIT";
+  "Euterpea" = dontDistribute super."Euterpea";
+  "EventSocket" = dontDistribute super."EventSocket";
+  "Extra" = dontDistribute super."Extra";
+  "FComp" = dontDistribute super."FComp";
+  "FM-SBLEX" = dontDistribute super."FM-SBLEX";
+  "FModExRaw" = dontDistribute super."FModExRaw";
+  "FPretty" = dontDistribute super."FPretty";
+  "FTGL" = dontDistribute super."FTGL";
+  "FTGL-bytestring" = dontDistribute super."FTGL-bytestring";
+  "FTPLine" = dontDistribute super."FTPLine";
+  "Facts" = dontDistribute super."Facts";
+  "FailureT" = dontDistribute super."FailureT";
+  "FastxPipe" = dontDistribute super."FastxPipe";
+  "FermatsLastMargin" = dontDistribute super."FermatsLastMargin";
+  "FerryCore" = dontDistribute super."FerryCore";
+  "Feval" = dontDistribute super."Feval";
+  "FieldTrip" = dontDistribute super."FieldTrip";
+  "FileManip" = dontDistribute super."FileManip";
+  "FileManipCompat" = dontDistribute super."FileManipCompat";
+  "FilePather" = dontDistribute super."FilePather";
+  "FileSystem" = dontDistribute super."FileSystem";
+  "Finance-Quote-Yahoo" = dontDistribute super."Finance-Quote-Yahoo";
+  "Finance-Treasury" = dontDistribute super."Finance-Treasury";
+  "FindBin" = dontDistribute super."FindBin";
+  "FiniteMap" = dontDistribute super."FiniteMap";
+  "FirstOrderTheory" = dontDistribute super."FirstOrderTheory";
+  "FixedPoint-simple" = dontDistribute super."FixedPoint-simple";
+  "Flippi" = dontDistribute super."Flippi";
+  "Focus" = dontDistribute super."Focus";
+  "Folly" = dontDistribute super."Folly";
+  "ForSyDe" = dontDistribute super."ForSyDe";
+  "ForkableT" = dontDistribute super."ForkableT";
+  "FormalGrammars" = dontDistribute super."FormalGrammars";
+  "Foster" = dontDistribute super."Foster";
+  "FpMLv53" = dontDistribute super."FpMLv53";
+  "FractalArt" = dontDistribute super."FractalArt";
+  "Fractaler" = dontDistribute super."Fractaler";
+  "Frames" = dontDistribute super."Frames";
+  "Frank" = dontDistribute super."Frank";
+  "FreeTypeGL" = dontDistribute super."FreeTypeGL";
+  "FunGEn" = dontDistribute super."FunGEn";
+  "Fungi" = dontDistribute super."Fungi";
+  "GA" = dontDistribute super."GA";
+  "GGg" = dontDistribute super."GGg";
+  "GHood" = dontDistribute super."GHood";
+  "GLFW" = dontDistribute super."GLFW";
+  "GLFW-OGL" = dontDistribute super."GLFW-OGL";
+  "GLFW-b-demo" = dontDistribute super."GLFW-b-demo";
+  "GLFW-task" = dontDistribute super."GLFW-task";
+  "GLHUI" = dontDistribute super."GLHUI";
+  "GLM" = dontDistribute super."GLM";
+  "GLMatrix" = dontDistribute super."GLMatrix";
+  "GLUtil" = dontDistribute super."GLUtil";
+  "GPX" = dontDistribute super."GPX";
+  "GPipe-Collada" = dontDistribute super."GPipe-Collada";
+  "GPipe-Examples" = dontDistribute super."GPipe-Examples";
+  "GPipe-TextureLoad" = dontDistribute super."GPipe-TextureLoad";
+  "GTALib" = dontDistribute super."GTALib";
+  "Gamgine" = dontDistribute super."Gamgine";
+  "Ganymede" = dontDistribute super."Ganymede";
+  "GaussQuadIntegration" = dontDistribute super."GaussQuadIntegration";
+  "GeBoP" = dontDistribute super."GeBoP";
+  "GenI" = dontDistribute super."GenI";
+  "GenSmsPdu" = dontDistribute super."GenSmsPdu";
+  "GeneralTicTacToe" = dontDistribute super."GeneralTicTacToe";
+  "GenussFold" = dontDistribute super."GenussFold";
+  "GeoIp" = dontDistribute super."GeoIp";
+  "GeocoderOpenCage" = dontDistribute super."GeocoderOpenCage";
+  "Geodetic" = dontDistribute super."Geodetic";
+  "GeomPredicates" = dontDistribute super."GeomPredicates";
+  "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE";
+  "GiST" = dontDistribute super."GiST";
+  "GiveYouAHead" = dontDistribute super."GiveYouAHead";
+  "GlomeTrace" = dontDistribute super."GlomeTrace";
+  "GlomeVec" = dontDistribute super."GlomeVec";
+  "GlomeView" = dontDistribute super."GlomeView";
+  "GoogleChart" = dontDistribute super."GoogleChart";
+  "GoogleDirections" = dontDistribute super."GoogleDirections";
+  "GoogleSB" = dontDistribute super."GoogleSB";
+  "GoogleSuggest" = dontDistribute super."GoogleSuggest";
+  "GoogleTranslate" = dontDistribute super."GoogleTranslate";
+  "GotoT-transformers" = dontDistribute super."GotoT-transformers";
+  "GrammarProducts" = dontDistribute super."GrammarProducts";
+  "Graph500" = dontDistribute super."Graph500";
+  "GraphHammer" = dontDistribute super."GraphHammer";
+  "GraphHammer-examples" = dontDistribute super."GraphHammer-examples";
+  "Graphalyze" = dontDistribute super."Graphalyze";
+  "Grempa" = dontDistribute super."Grempa";
+  "GroteTrap" = dontDistribute super."GroteTrap";
+  "Grow" = dontDistribute super."Grow";
+  "GrowlNotify" = dontDistribute super."GrowlNotify";
+  "Gtk2hsGenerics" = dontDistribute super."Gtk2hsGenerics";
+  "GtkGLTV" = dontDistribute super."GtkGLTV";
+  "GtkTV" = dontDistribute super."GtkTV";
+  "GuiHaskell" = dontDistribute super."GuiHaskell";
+  "GuiTV" = dontDistribute super."GuiTV";
+  "H" = dontDistribute super."H";
+  "HARM" = dontDistribute super."HARM";
+  "HAppS-Data" = dontDistribute super."HAppS-Data";
+  "HAppS-IxSet" = dontDistribute super."HAppS-IxSet";
+  "HAppS-Server" = dontDistribute super."HAppS-Server";
+  "HAppS-State" = dontDistribute super."HAppS-State";
+  "HAppS-Util" = dontDistribute super."HAppS-Util";
+  "HAppSHelpers" = dontDistribute super."HAppSHelpers";
+  "HCL" = dontDistribute super."HCL";
+  "HCard" = dontDistribute super."HCard";
+  "HDBC-mysql" = dontDistribute super."HDBC-mysql";
+  "HDBC-odbc" = dontDistribute super."HDBC-odbc";
+  "HDBC-postgresql-hstore" = dontDistribute super."HDBC-postgresql-hstore";
+  "HDBC-session" = dontDistribute super."HDBC-session";
+  "HDRUtils" = dontDistribute super."HDRUtils";
+  "HERA" = dontDistribute super."HERA";
+  "HFrequencyQueue" = dontDistribute super."HFrequencyQueue";
+  "HFuse" = dontDistribute super."HFuse";
+  "HGL" = dontDistribute super."HGL";
+  "HGamer3D" = dontDistribute super."HGamer3D";
+  "HGamer3D-API" = dontDistribute super."HGamer3D-API";
+  "HGamer3D-Audio" = dontDistribute super."HGamer3D-Audio";
+  "HGamer3D-Bullet-Binding" = dontDistribute super."HGamer3D-Bullet-Binding";
+  "HGamer3D-CAudio-Binding" = dontDistribute super."HGamer3D-CAudio-Binding";
+  "HGamer3D-CEGUI-Binding" = dontDistribute super."HGamer3D-CEGUI-Binding";
+  "HGamer3D-Common" = dontDistribute super."HGamer3D-Common";
+  "HGamer3D-Data" = dontDistribute super."HGamer3D-Data";
+  "HGamer3D-Enet-Binding" = dontDistribute super."HGamer3D-Enet-Binding";
+  "HGamer3D-GUI" = dontDistribute super."HGamer3D-GUI";
+  "HGamer3D-Graphics3D" = dontDistribute super."HGamer3D-Graphics3D";
+  "HGamer3D-InputSystem" = dontDistribute super."HGamer3D-InputSystem";
+  "HGamer3D-Network" = dontDistribute super."HGamer3D-Network";
+  "HGamer3D-OIS-Binding" = dontDistribute super."HGamer3D-OIS-Binding";
+  "HGamer3D-Ogre-Binding" = dontDistribute super."HGamer3D-Ogre-Binding";
+  "HGamer3D-SDL2-Binding" = dontDistribute super."HGamer3D-SDL2-Binding";
+  "HGamer3D-SFML-Binding" = dontDistribute super."HGamer3D-SFML-Binding";
+  "HGamer3D-WinEvent" = dontDistribute super."HGamer3D-WinEvent";
+  "HGamer3D-Wire" = dontDistribute super."HGamer3D-Wire";
+  "HGraphStorage" = dontDistribute super."HGraphStorage";
+  "HHDL" = dontDistribute super."HHDL";
+  "HJScript" = dontDistribute super."HJScript";
+  "HJVM" = dontDistribute super."HJVM";
+  "HJavaScript" = dontDistribute super."HJavaScript";
+  "HLearn-algebra" = dontDistribute super."HLearn-algebra";
+  "HLearn-approximation" = dontDistribute super."HLearn-approximation";
+  "HLearn-classification" = dontDistribute super."HLearn-classification";
+  "HLearn-datastructures" = dontDistribute super."HLearn-datastructures";
+  "HLearn-distributions" = dontDistribute super."HLearn-distributions";
+  "HListPP" = dontDistribute super."HListPP";
+  "HLogger" = dontDistribute super."HLogger";
+  "HMM" = dontDistribute super."HMM";
+  "HMap" = dontDistribute super."HMap";
+  "HNM" = dontDistribute super."HNM";
+  "HODE" = dontDistribute super."HODE";
+  "HOpenCV" = dontDistribute super."HOpenCV";
+  "HPath" = dontDistribute super."HPath";
+  "HPi" = dontDistribute super."HPi";
+  "HPlot" = dontDistribute super."HPlot";
+  "HPong" = dontDistribute super."HPong";
+  "HROOT" = dontDistribute super."HROOT";
+  "HROOT-core" = dontDistribute super."HROOT-core";
+  "HROOT-graf" = dontDistribute super."HROOT-graf";
+  "HROOT-hist" = dontDistribute super."HROOT-hist";
+  "HROOT-io" = dontDistribute super."HROOT-io";
+  "HROOT-math" = dontDistribute super."HROOT-math";
+  "HRay" = dontDistribute super."HRay";
+  "HSFFIG" = dontDistribute super."HSFFIG";
+  "HSGEP" = dontDistribute super."HSGEP";
+  "HSH" = dontDistribute super."HSH";
+  "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSlippyMap" = dontDistribute super."HSlippyMap";
+  "HSmarty" = dontDistribute super."HSmarty";
+  "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
+  "HSvm" = dontDistribute super."HSvm";
+  "HTTP-Simple" = dontDistribute super."HTTP-Simple";
+  "HTab" = dontDistribute super."HTab";
+  "HTicTacToe" = dontDistribute super."HTicTacToe";
+  "HUnit-Diff" = dontDistribute super."HUnit-Diff";
+  "HUnit-Plus" = dontDistribute super."HUnit-Plus";
+  "HUnit-approx" = dontDistribute super."HUnit-approx";
+  "HXMPP" = dontDistribute super."HXMPP";
+  "HXQ" = dontDistribute super."HXQ";
+  "HaLeX" = dontDistribute super."HaLeX";
+  "HaMinitel" = dontDistribute super."HaMinitel";
+  "HaPy" = dontDistribute super."HaPy";
+  "HaTeX-meta" = dontDistribute super."HaTeX-meta";
+  "HaTeX-qq" = dontDistribute super."HaTeX-qq";
+  "HaVSA" = dontDistribute super."HaVSA";
+  "Hach" = dontDistribute super."Hach";
+  "HackMail" = dontDistribute super."HackMail";
+  "Haggressive" = dontDistribute super."Haggressive";
+  "HandlerSocketClient" = dontDistribute super."HandlerSocketClient";
+  "Hangman" = dontDistribute super."Hangman";
+  "HarmTrace" = dontDistribute super."HarmTrace";
+  "HarmTrace-Base" = dontDistribute super."HarmTrace-Base";
+  "HasGP" = dontDistribute super."HasGP";
+  "Haschoo" = dontDistribute super."Haschoo";
+  "Hashell" = dontDistribute super."Hashell";
+  "HaskRel" = dontDistribute super."HaskRel";
+  "HaskellForMaths" = dontDistribute super."HaskellForMaths";
+  "HaskellLM" = dontDistribute super."HaskellLM";
+  "HaskellNN" = dontDistribute super."HaskellNN";
+  "HaskellTorrent" = dontDistribute super."HaskellTorrent";
+  "HaskellTutorials" = dontDistribute super."HaskellTutorials";
+  "Haskelloids" = dontDistribute super."Haskelloids";
+  "Hate" = dontDistribute super."Hate";
+  "Hawk" = dontDistribute super."Hawk";
+  "Hayoo" = dontDistribute super."Hayoo";
+  "Hclip" = dontDistribute super."Hclip";
+  "Hedi" = dontDistribute super."Hedi";
+  "HerbiePlugin" = dontDistribute super."HerbiePlugin";
+  "Hermes" = dontDistribute super."Hermes";
+  "Hieroglyph" = dontDistribute super."Hieroglyph";
+  "HiggsSet" = dontDistribute super."HiggsSet";
+  "Hipmunk" = dontDistribute super."Hipmunk";
+  "HipmunkPlayground" = dontDistribute super."HipmunkPlayground";
+  "Hish" = dontDistribute super."Hish";
+  "Histogram" = dontDistribute super."Histogram";
+  "Hmpf" = dontDistribute super."Hmpf";
+  "Hoed" = dontDistribute super."Hoed";
+  "HoleyMonoid" = dontDistribute super."HoleyMonoid";
+  "Holumbus-Distribution" = dontDistribute super."Holumbus-Distribution";
+  "Holumbus-MapReduce" = dontDistribute super."Holumbus-MapReduce";
+  "Holumbus-Searchengine" = dontDistribute super."Holumbus-Searchengine";
+  "Holumbus-Storage" = dontDistribute super."Holumbus-Storage";
+  "Homology" = dontDistribute super."Homology";
+  "HongoDB" = dontDistribute super."HongoDB";
+  "HostAndPort" = dontDistribute super."HostAndPort";
+  "Hricket" = dontDistribute super."Hricket";
+  "Hs2lib" = dontDistribute super."Hs2lib";
+  "HsASA" = dontDistribute super."HsASA";
+  "HsHaruPDF" = dontDistribute super."HsHaruPDF";
+  "HsHyperEstraier" = dontDistribute super."HsHyperEstraier";
+  "HsJudy" = dontDistribute super."HsJudy";
+  "HsOpenSSL-x509-system" = dontDistribute super."HsOpenSSL-x509-system";
+  "HsParrot" = dontDistribute super."HsParrot";
+  "HsPerl5" = dontDistribute super."HsPerl5";
+  "HsSVN" = dontDistribute super."HsSVN";
+  "HsTools" = dontDistribute super."HsTools";
+  "Hsed" = dontDistribute super."Hsed";
+  "Hsmtlib" = dontDistribute super."Hsmtlib";
+  "HueAPI" = dontDistribute super."HueAPI";
+  "HulkImport" = dontDistribute super."HulkImport";
+  "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres";
+  "IDynamic" = dontDistribute super."IDynamic";
+  "IFS" = dontDistribute super."IFS";
+  "INblobs" = dontDistribute super."INblobs";
+  "IOR" = dontDistribute super."IOR";
+  "IORefCAS" = dontDistribute super."IORefCAS";
+  "IOSpec" = dontDistribute super."IOSpec";
+  "IcoGrid" = dontDistribute super."IcoGrid";
+  "Imlib" = dontDistribute super."Imlib";
+  "ImperativeHaskell" = dontDistribute super."ImperativeHaskell";
+  "IndentParser" = dontDistribute super."IndentParser";
+  "IndexedList" = dontDistribute super."IndexedList";
+  "InfixApplicative" = dontDistribute super."InfixApplicative";
+  "Interpolation" = dontDistribute super."Interpolation";
+  "Interpolation-maxs" = dontDistribute super."Interpolation-maxs";
+  "Irc" = dontDistribute super."Irc";
+  "IrrHaskell" = dontDistribute super."IrrHaskell";
+  "IsNull" = dontDistribute super."IsNull";
+  "JSON-Combinator" = dontDistribute super."JSON-Combinator";
+  "JSON-Combinator-Examples" = dontDistribute super."JSON-Combinator-Examples";
+  "JSONb" = dontDistribute super."JSONb";
+  "JYU-Utils" = dontDistribute super."JYU-Utils";
+  "JackMiniMix" = dontDistribute super."JackMiniMix";
+  "Javasf" = dontDistribute super."Javasf";
+  "Javav" = dontDistribute super."Javav";
+  "JsContracts" = dontDistribute super."JsContracts";
+  "JsonGrammar" = dontDistribute super."JsonGrammar";
+  "JuicyPixels-canvas" = dontDistribute super."JuicyPixels-canvas";
+  "JunkDB" = dontDistribute super."JunkDB";
+  "JunkDB-driver-gdbm" = dontDistribute super."JunkDB-driver-gdbm";
+  "JunkDB-driver-hashtables" = dontDistribute super."JunkDB-driver-hashtables";
+  "JustParse" = dontDistribute super."JustParse";
+  "KMP" = dontDistribute super."KMP";
+  "KSP" = dontDistribute super."KSP";
+  "Kalman" = dontDistribute super."Kalman";
+  "KdTree" = dontDistribute super."KdTree";
+  "Ketchup" = dontDistribute super."Ketchup";
+  "KiCS" = dontDistribute super."KiCS";
+  "KiCS-debugger" = dontDistribute super."KiCS-debugger";
+  "KiCS-prophecy" = dontDistribute super."KiCS-prophecy";
+  "Kleislify" = dontDistribute super."Kleislify";
+  "Konf" = dontDistribute super."Konf";
+  "Kriens" = dontDistribute super."Kriens";
+  "KyotoCabinet" = dontDistribute super."KyotoCabinet";
+  "L-seed" = dontDistribute super."L-seed";
+  "LDAP" = dontDistribute super."LDAP";
+  "LRU" = dontDistribute super."LRU";
+  "LTree" = dontDistribute super."LTree";
+  "LambdaCalculator" = dontDistribute super."LambdaCalculator";
+  "LambdaHack" = dontDistribute super."LambdaHack";
+  "LambdaINet" = dontDistribute super."LambdaINet";
+  "LambdaNet" = dontDistribute super."LambdaNet";
+  "LambdaPrettyQuote" = dontDistribute super."LambdaPrettyQuote";
+  "LambdaShell" = dontDistribute super."LambdaShell";
+  "Lambdajudge" = dontDistribute super."Lambdajudge";
+  "Lambdaya" = dontDistribute super."Lambdaya";
+  "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
+  "Lastik" = dontDistribute super."Lastik";
+  "Lattices" = dontDistribute super."Lattices";
+  "LazyVault" = dontDistribute super."LazyVault";
+  "Level0" = dontDistribute super."Level0";
+  "LibClang" = dontDistribute super."LibClang";
+  "LibZip" = dontDistribute super."LibZip";
+  "Limit" = dontDistribute super."Limit";
+  "LinearSplit" = dontDistribute super."LinearSplit";
+  "LinguisticsTypes" = dontDistribute super."LinguisticsTypes";
+  "LinkChecker" = dontDistribute super."LinkChecker";
+  "ListTree" = dontDistribute super."ListTree";
+  "ListWriter" = dontDistribute super."ListWriter";
+  "ListZipper" = dontDistribute super."ListZipper";
+  "Logic" = dontDistribute super."Logic";
+  "LogicGrowsOnTrees" = dontDistribute super."LogicGrowsOnTrees";
+  "LogicGrowsOnTrees-MPI" = dontDistribute super."LogicGrowsOnTrees-MPI";
+  "LogicGrowsOnTrees-network" = dontDistribute super."LogicGrowsOnTrees-network";
+  "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
+  "LslPlus" = dontDistribute super."LslPlus";
+  "Lucu" = dontDistribute super."Lucu";
+  "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
+  "MHask" = dontDistribute super."MHask";
+  "MSQueue" = dontDistribute super."MSQueue";
+  "MTGBuilder" = dontDistribute super."MTGBuilder";
+  "MagicHaskeller" = dontDistribute super."MagicHaskeller";
+  "MailchimpSimple" = dontDistribute super."MailchimpSimple";
+  "MaybeT" = dontDistribute super."MaybeT";
+  "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf";
+  "MaybeT-transformers" = dontDistribute super."MaybeT-transformers";
+  "MazesOfMonad" = dontDistribute super."MazesOfMonad";
+  "MeanShift" = dontDistribute super."MeanShift";
+  "Measure" = dontDistribute super."Measure";
+  "MetaHDBC" = dontDistribute super."MetaHDBC";
+  "MetaObject" = dontDistribute super."MetaObject";
+  "Metrics" = dontDistribute super."Metrics";
+  "Mhailist" = dontDistribute super."Mhailist";
+  "Michelangelo" = dontDistribute super."Michelangelo";
+  "MicrosoftTranslator" = dontDistribute super."MicrosoftTranslator";
+  "MiniAgda" = dontDistribute super."MiniAgda";
+  "MissingK" = dontDistribute super."MissingK";
+  "MissingM" = dontDistribute super."MissingM";
+  "MissingPy" = dontDistribute super."MissingPy";
+  "Modulo" = dontDistribute super."Modulo";
+  "Moe" = dontDistribute super."Moe";
+  "MoeDict" = dontDistribute super."MoeDict";
+  "MonadCatchIO-mtl" = dontDistribute super."MonadCatchIO-mtl";
+  "MonadCatchIO-mtl-foreign" = dontDistribute super."MonadCatchIO-mtl-foreign";
+  "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign";
+  "MonadCompose" = dontDistribute super."MonadCompose";
+  "MonadLab" = dontDistribute super."MonadLab";
+  "MonadRandomLazy" = dontDistribute super."MonadRandomLazy";
+  "MonadStack" = dontDistribute super."MonadStack";
+  "Monadius" = dontDistribute super."Monadius";
+  "Monaris" = dontDistribute super."Monaris";
+  "Monatron" = dontDistribute super."Monatron";
+  "Monatron-IO" = dontDistribute super."Monatron-IO";
+  "Monocle" = dontDistribute super."Monocle";
+  "MorseCode" = dontDistribute super."MorseCode";
+  "MuCheck" = dontDistribute super."MuCheck";
+  "MuCheck-HUnit" = dontDistribute super."MuCheck-HUnit";
+  "MuCheck-Hspec" = dontDistribute super."MuCheck-Hspec";
+  "MuCheck-QuickCheck" = dontDistribute super."MuCheck-QuickCheck";
+  "MuCheck-SmallCheck" = dontDistribute super."MuCheck-SmallCheck";
+  "Munkres" = dontDistribute super."Munkres";
+  "Munkres-simple" = dontDistribute super."Munkres-simple";
+  "MusicBrainz-libdiscid" = dontDistribute super."MusicBrainz-libdiscid";
+  "MyPrimes" = dontDistribute super."MyPrimes";
+  "NGrams" = dontDistribute super."NGrams";
+  "NTRU" = dontDistribute super."NTRU";
+  "NXT" = dontDistribute super."NXT";
+  "NXTDSL" = dontDistribute super."NXTDSL";
+  "NanoProlog" = dontDistribute super."NanoProlog";
+  "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets";
+  "NaturalSort" = dontDistribute super."NaturalSort";
+  "NearContextAlgebra" = dontDistribute super."NearContextAlgebra";
+  "Neks" = dontDistribute super."Neks";
+  "NestedFunctor" = dontDistribute super."NestedFunctor";
+  "NestedSampling" = dontDistribute super."NestedSampling";
+  "NetSNMP" = dontDistribute super."NetSNMP";
+  "NewBinary" = dontDistribute super."NewBinary";
+  "Ninjas" = dontDistribute super."Ninjas";
+  "NoSlow" = dontDistribute super."NoSlow";
+  "NoTrace" = dontDistribute super."NoTrace";
+  "Noise" = dontDistribute super."Noise";
+  "Nomyx" = dontDistribute super."Nomyx";
+  "Nomyx-Core" = dontDistribute super."Nomyx-Core";
+  "Nomyx-Language" = dontDistribute super."Nomyx-Language";
+  "Nomyx-Rules" = dontDistribute super."Nomyx-Rules";
+  "Nomyx-Web" = dontDistribute super."Nomyx-Web";
+  "NonEmpty" = dontDistribute super."NonEmpty";
+  "NonEmptyList" = dontDistribute super."NonEmptyList";
+  "NumLazyByteString" = dontDistribute super."NumLazyByteString";
+  "NumberSieves" = dontDistribute super."NumberSieves";
+  "Numbers" = dontDistribute super."Numbers";
+  "Nussinov78" = dontDistribute super."Nussinov78";
+  "Nutri" = dontDistribute super."Nutri";
+  "OGL" = dontDistribute super."OGL";
+  "OSM" = dontDistribute super."OSM";
+  "OTP" = dontDistribute super."OTP";
+  "Object" = dontDistribute super."Object";
+  "ObjectIO" = dontDistribute super."ObjectIO";
+  "Obsidian" = dontDistribute super."Obsidian";
+  "OddWord" = dontDistribute super."OddWord";
+  "Omega" = dontDistribute super."Omega";
+  "OneTuple" = dontDistribute super."OneTuple";
+  "OpenAFP" = dontDistribute super."OpenAFP";
+  "OpenAFP-Utils" = dontDistribute super."OpenAFP-Utils";
+  "OpenAL" = dontDistribute super."OpenAL";
+  "OpenCL" = dontDistribute super."OpenCL";
+  "OpenCLRaw" = dontDistribute super."OpenCLRaw";
+  "OpenCLWrappers" = dontDistribute super."OpenCLWrappers";
+  "OpenGLCheck" = dontDistribute super."OpenGLCheck";
+  "OpenGLRaw21" = dontDistribute super."OpenGLRaw21";
+  "OpenSCAD" = dontDistribute super."OpenSCAD";
+  "OpenVG" = dontDistribute super."OpenVG";
+  "OpenVGRaw" = dontDistribute super."OpenVGRaw";
+  "Operads" = dontDistribute super."Operads";
+  "OptDir" = dontDistribute super."OptDir";
+  "OrPatterns" = dontDistribute super."OrPatterns";
+  "OrchestrateDB" = dontDistribute super."OrchestrateDB";
+  "OrderedBits" = dontDistribute super."OrderedBits";
+  "Ordinals" = dontDistribute super."Ordinals";
+  "PArrows" = dontDistribute super."PArrows";
+  "PBKDF2" = dontDistribute super."PBKDF2";
+  "PCLT" = dontDistribute super."PCLT";
+  "PCLT-DB" = dontDistribute super."PCLT-DB";
+  "PDBtools" = dontDistribute super."PDBtools";
+  "PTQ" = dontDistribute super."PTQ";
+  "PageIO" = dontDistribute super."PageIO";
+  "Paillier" = dontDistribute super."Paillier";
+  "PandocAgda" = dontDistribute super."PandocAgda";
+  "Paraiso" = dontDistribute super."Paraiso";
+  "Parry" = dontDistribute super."Parry";
+  "ParsecTools" = dontDistribute super."ParsecTools";
+  "ParserFunction" = dontDistribute super."ParserFunction";
+  "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures";
+  "PasswordGenerator" = dontDistribute super."PasswordGenerator";
+  "PastePipe" = dontDistribute super."PastePipe";
+  "Pathfinder" = dontDistribute super."Pathfinder";
+  "Peano" = dontDistribute super."Peano";
+  "PeanoWitnesses" = dontDistribute super."PeanoWitnesses";
+  "PerfectHash" = dontDistribute super."PerfectHash";
+  "PermuteEffects" = dontDistribute super."PermuteEffects";
+  "Phsu" = dontDistribute super."Phsu";
+  "Pipe" = dontDistribute super."Pipe";
+  "Piso" = dontDistribute super."Piso";
+  "PlayHangmanGame" = dontDistribute super."PlayHangmanGame";
+  "PlayingCards" = dontDistribute super."PlayingCards";
+  "Plot-ho-matic" = dontDistribute super."Plot-ho-matic";
+  "PlslTools" = dontDistribute super."PlslTools";
+  "Plural" = dontDistribute super."Plural";
+  "Pollutocracy" = dontDistribute super."Pollutocracy";
+  "PortFusion" = dontDistribute super."PortFusion";
+  "PortMidi" = dontDistribute super."PortMidi";
+  "PostgreSQL" = dontDistribute super."PostgreSQL";
+  "PrimitiveArray" = dontDistribute super."PrimitiveArray";
+  "Printf-TH" = dontDistribute super."Printf-TH";
+  "PriorityChansConverger" = dontDistribute super."PriorityChansConverger";
+  "ProbabilityMonads" = dontDistribute super."ProbabilityMonads";
+  "PropLogic" = dontDistribute super."PropLogic";
+  "Proper" = dontDistribute super."Proper";
+  "ProxN" = dontDistribute super."ProxN";
+  "Pugs" = dontDistribute super."Pugs";
+  "Pup-Events" = dontDistribute super."Pup-Events";
+  "Pup-Events-Client" = dontDistribute super."Pup-Events-Client";
+  "Pup-Events-Demo" = dontDistribute super."Pup-Events-Demo";
+  "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
+  "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
+  "QIO" = dontDistribute super."QIO";
+  "QuadEdge" = dontDistribute super."QuadEdge";
+  "QuadTree" = dontDistribute super."QuadTree";
+  "Quelea" = dontDistribute super."Quelea";
+  "QuickAnnotate" = dontDistribute super."QuickAnnotate";
+  "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT";
+  "QuickCheck-safe" = dontDistribute super."QuickCheck-safe";
+  "Quickson" = dontDistribute super."Quickson";
+  "R-pandoc" = dontDistribute super."R-pandoc";
+  "RANSAC" = dontDistribute super."RANSAC";
+  "RBTree" = dontDistribute super."RBTree";
+  "RESTng" = dontDistribute super."RESTng";
+  "RFC1751" = dontDistribute super."RFC1751";
+  "RJson" = dontDistribute super."RJson";
+  "RMP" = dontDistribute super."RMP";
+  "RNAFold" = dontDistribute super."RNAFold";
+  "RNAFoldProgs" = dontDistribute super."RNAFoldProgs";
+  "RNAdesign" = dontDistribute super."RNAdesign";
+  "RNAdraw" = dontDistribute super."RNAdraw";
+  "RNAwolf" = dontDistribute super."RNAwolf";
+  "Raincat" = dontDistribute super."Raincat";
+  "Random123" = dontDistribute super."Random123";
+  "RandomDotOrg" = dontDistribute super."RandomDotOrg";
+  "Randometer" = dontDistribute super."Randometer";
+  "Range" = dontDistribute super."Range";
+  "Ranged-sets" = dontDistribute super."Ranged-sets";
+  "Ranka" = dontDistribute super."Ranka";
+  "Rasenschach" = dontDistribute super."Rasenschach";
+  "Redmine" = dontDistribute super."Redmine";
+  "Ref" = dontDistribute super."Ref";
+  "Referees" = dontDistribute super."Referees";
+  "RepLib" = dontDistribute super."RepLib";
+  "ReplicateEffects" = dontDistribute super."ReplicateEffects";
+  "ReviewBoard" = dontDistribute super."ReviewBoard";
+  "RichConditional" = dontDistribute super."RichConditional";
+  "RollingDirectory" = dontDistribute super."RollingDirectory";
+  "RoyalMonad" = dontDistribute super."RoyalMonad";
+  "RxHaskell" = dontDistribute super."RxHaskell";
+  "SBench" = dontDistribute super."SBench";
+  "SConfig" = dontDistribute super."SConfig";
+  "SDL" = dontDistribute super."SDL";
+  "SDL-gfx" = dontDistribute super."SDL-gfx";
+  "SDL-image" = dontDistribute super."SDL-image";
+  "SDL-mixer" = dontDistribute super."SDL-mixer";
+  "SDL-mpeg" = dontDistribute super."SDL-mpeg";
+  "SDL-ttf" = dontDistribute super."SDL-ttf";
+  "SDL2-ttf" = dontDistribute super."SDL2-ttf";
+  "SFML" = dontDistribute super."SFML";
+  "SFML-control" = dontDistribute super."SFML-control";
+  "SFont" = dontDistribute super."SFont";
+  "SG" = dontDistribute super."SG";
+  "SGdemo" = dontDistribute super."SGdemo";
+  "SHA2" = dontDistribute super."SHA2";
+  "SMTPClient" = dontDistribute super."SMTPClient";
+  "SNet" = dontDistribute super."SNet";
+  "SQLDeps" = dontDistribute super."SQLDeps";
+  "STL" = dontDistribute super."STL";
+  "SVG2Q" = dontDistribute super."SVG2Q";
+  "SVGFonts" = dontDistribute super."SVGFonts";
+  "SVGPath" = dontDistribute super."SVGPath";
+  "SWMMoutGetMB" = dontDistribute super."SWMMoutGetMB";
+  "SableCC2Hs" = dontDistribute super."SableCC2Hs";
+  "Safe" = dontDistribute super."Safe";
+  "Salsa" = dontDistribute super."Salsa";
+  "Saturnin" = dontDistribute super."Saturnin";
+  "SciFlow" = dontDistribute super."SciFlow";
+  "ScratchFs" = dontDistribute super."ScratchFs";
+  "Scurry" = dontDistribute super."Scurry";
+  "Semantique" = dontDistribute super."Semantique";
+  "Semigroup" = dontDistribute super."Semigroup";
+  "SeqAlign" = dontDistribute super."SeqAlign";
+  "SessionLogger" = dontDistribute super."SessionLogger";
+  "ShellCheck" = dontDistribute super."ShellCheck";
+  "Shellac" = dontDistribute super."Shellac";
+  "Shellac-compatline" = dontDistribute super."Shellac-compatline";
+  "Shellac-editline" = dontDistribute super."Shellac-editline";
+  "Shellac-haskeline" = dontDistribute super."Shellac-haskeline";
+  "Shellac-readline" = dontDistribute super."Shellac-readline";
+  "ShowF" = dontDistribute super."ShowF";
+  "Shrub" = dontDistribute super."Shrub";
+  "Shu-thing" = dontDistribute super."Shu-thing";
+  "SimpleAES" = dontDistribute super."SimpleAES";
+  "SimpleEA" = dontDistribute super."SimpleEA";
+  "SimpleGL" = dontDistribute super."SimpleGL";
+  "SimpleH" = dontDistribute super."SimpleH";
+  "SimpleLog" = dontDistribute super."SimpleLog";
+  "SizeCompare" = dontDistribute super."SizeCompare";
+  "Slides" = dontDistribute super."Slides";
+  "Smooth" = dontDistribute super."Smooth";
+  "SmtLib" = dontDistribute super."SmtLib";
+  "Snusmumrik" = dontDistribute super."Snusmumrik";
+  "SoOSiM" = dontDistribute super."SoOSiM";
+  "SoccerFun" = dontDistribute super."SoccerFun";
+  "SoccerFunGL" = dontDistribute super."SoccerFunGL";
+  "Sonnex" = dontDistribute super."Sonnex";
+  "SourceGraph" = dontDistribute super."SourceGraph";
+  "Southpaw" = dontDistribute super."Southpaw";
+  "SpaceInvaders" = dontDistribute super."SpaceInvaders";
+  "SpacePrivateers" = dontDistribute super."SpacePrivateers";
+  "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spock-auth" = dontDistribute super."Spock-auth";
+  "SpreadsheetML" = dontDistribute super."SpreadsheetML";
+  "Sprig" = dontDistribute super."Sprig";
+  "Stasis" = dontDistribute super."Stasis";
+  "StateVar-transformer" = dontDistribute super."StateVar-transformer";
+  "StatisticalMethods" = dontDistribute super."StatisticalMethods";
+  "Stomp" = dontDistribute super."Stomp";
+  "Strafunski-ATermLib" = dontDistribute super."Strafunski-ATermLib";
+  "Strafunski-Sdf2Haskell" = dontDistribute super."Strafunski-Sdf2Haskell";
+  "StrappedTemplates" = dontDistribute super."StrappedTemplates";
+  "StrategyLib" = dontDistribute super."StrategyLib";
+  "Stream" = dontDistribute super."Stream";
+  "StrictBench" = dontDistribute super."StrictBench";
+  "SuffixStructures" = dontDistribute super."SuffixStructures";
+  "SybWidget" = dontDistribute super."SybWidget";
+  "SyntaxMacros" = dontDistribute super."SyntaxMacros";
+  "Sysmon" = dontDistribute super."Sysmon";
+  "TBC" = dontDistribute super."TBC";
+  "TBit" = dontDistribute super."TBit";
+  "THEff" = dontDistribute super."THEff";
+  "TTTAS" = dontDistribute super."TTTAS";
+  "TV" = dontDistribute super."TV";
+  "TYB" = dontDistribute super."TYB";
+  "TableAlgebra" = dontDistribute super."TableAlgebra";
+  "Tables" = dontDistribute super."Tables";
+  "Tablify" = dontDistribute super."Tablify";
+  "Tainted" = dontDistribute super."Tainted";
+  "Takusen" = dontDistribute super."Takusen";
+  "Tape" = dontDistribute super."Tape";
+  "TeaHS" = dontDistribute super."TeaHS";
+  "Tensor" = dontDistribute super."Tensor";
+  "TernaryTrees" = dontDistribute super."TernaryTrees";
+  "TestExplode" = dontDistribute super."TestExplode";
+  "Theora" = dontDistribute super."Theora";
+  "Thingie" = dontDistribute super."Thingie";
+  "ThreadObjects" = dontDistribute super."ThreadObjects";
+  "Thrift" = dontDistribute super."Thrift";
+  "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe";
+  "TicTacToe" = dontDistribute super."TicTacToe";
+  "TigerHash" = dontDistribute super."TigerHash";
+  "TimePiece" = dontDistribute super."TimePiece";
+  "TinyLaunchbury" = dontDistribute super."TinyLaunchbury";
+  "TinyURL" = dontDistribute super."TinyURL";
+  "Titim" = dontDistribute super."Titim";
+  "Top" = dontDistribute super."Top";
+  "Tournament" = dontDistribute super."Tournament";
+  "TraceUtils" = dontDistribute super."TraceUtils";
+  "TransformersStepByStep" = dontDistribute super."TransformersStepByStep";
+  "Transhare" = dontDistribute super."Transhare";
+  "TreeCounter" = dontDistribute super."TreeCounter";
+  "TreeStructures" = dontDistribute super."TreeStructures";
+  "TreeT" = dontDistribute super."TreeT";
+  "Treiber" = dontDistribute super."Treiber";
+  "TrendGraph" = dontDistribute super."TrendGraph";
+  "TrieMap" = dontDistribute super."TrieMap";
+  "Twofish" = dontDistribute super."Twofish";
+  "TypeClass" = dontDistribute super."TypeClass";
+  "TypeCompose" = dontDistribute super."TypeCompose";
+  "TypeIlluminator" = dontDistribute super."TypeIlluminator";
+  "TypeNat" = dontDistribute super."TypeNat";
+  "TypingTester" = dontDistribute super."TypingTester";
+  "UISF" = dontDistribute super."UISF";
+  "UMM" = dontDistribute super."UMM";
+  "URLT" = dontDistribute super."URLT";
+  "URLb" = dontDistribute super."URLb";
+  "UTFTConverter" = dontDistribute super."UTFTConverter";
+  "Unique" = dontDistribute super."Unique";
+  "Unixutils-shadow" = dontDistribute super."Unixutils-shadow";
+  "Updater" = dontDistribute super."Updater";
+  "UrlDisp" = dontDistribute super."UrlDisp";
+  "Useful" = dontDistribute super."Useful";
+  "UtilityTM" = dontDistribute super."UtilityTM";
+  "VKHS" = dontDistribute super."VKHS";
+  "Validation" = dontDistribute super."Validation";
+  "Vec" = dontDistribute super."Vec";
+  "Vec-Boolean" = dontDistribute super."Vec-Boolean";
+  "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
+  "Vec-Transform" = dontDistribute super."Vec-Transform";
+  "VecN" = dontDistribute super."VecN";
+  "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
+  "WAVE" = dontDistribute super."WAVE";
+  "WL500gPControl" = dontDistribute super."WL500gPControl";
+  "WL500gPLib" = dontDistribute super."WL500gPLib";
+  "WMSigner" = dontDistribute super."WMSigner";
+  "WURFL" = dontDistribute super."WURFL";
+  "WXDiffCtrl" = dontDistribute super."WXDiffCtrl";
+  "WashNGo" = dontDistribute super."WashNGo";
+  "WaveFront" = dontDistribute super."WaveFront";
+  "Weather" = dontDistribute super."Weather";
+  "WebBits" = dontDistribute super."WebBits";
+  "WebBits-Html" = dontDistribute super."WebBits-Html";
+  "WebBits-multiplate" = dontDistribute super."WebBits-multiplate";
+  "WebCont" = dontDistribute super."WebCont";
+  "WeberLogic" = dontDistribute super."WeberLogic";
+  "Webrexp" = dontDistribute super."Webrexp";
+  "Wheb" = dontDistribute super."Wheb";
+  "WikimediaParser" = dontDistribute super."WikimediaParser";
+  "Win32-dhcp-server" = dontDistribute super."Win32-dhcp-server";
+  "Win32-errors" = dontDistribute super."Win32-errors";
+  "Win32-junction-point" = dontDistribute super."Win32-junction-point";
+  "Win32-security" = dontDistribute super."Win32-security";
+  "Win32-services" = dontDistribute super."Win32-services";
+  "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper";
+  "Wired" = dontDistribute super."Wired";
+  "WordAlignment" = dontDistribute super."WordAlignment";
+  "WordNet" = dontDistribute super."WordNet";
+  "WordNet-ghc74" = dontDistribute super."WordNet-ghc74";
+  "Wordlint" = dontDistribute super."Wordlint";
+  "WxGeneric" = dontDistribute super."WxGeneric";
+  "X11-extras" = dontDistribute super."X11-extras";
+  "X11-rm" = dontDistribute super."X11-rm";
+  "X11-xdamage" = dontDistribute super."X11-xdamage";
+  "X11-xfixes" = dontDistribute super."X11-xfixes";
+  "X11-xft" = dontDistribute super."X11-xft";
+  "X11-xshape" = dontDistribute super."X11-xshape";
+  "XAttr" = dontDistribute super."XAttr";
+  "XInput" = dontDistribute super."XInput";
+  "XMMS" = dontDistribute super."XMMS";
+  "XMPP" = dontDistribute super."XMPP";
+  "XSaiga" = dontDistribute super."XSaiga";
+  "Xec" = dontDistribute super."Xec";
+  "XmlHtmlWriter" = dontDistribute super."XmlHtmlWriter";
+  "Xorshift128Plus" = dontDistribute super."Xorshift128Plus";
+  "YACPong" = dontDistribute super."YACPong";
+  "YFrob" = dontDistribute super."YFrob";
+  "Yablog" = dontDistribute super."Yablog";
+  "YamlReference" = dontDistribute super."YamlReference";
+  "Yampa-core" = dontDistribute super."Yampa-core";
+  "Yocto" = dontDistribute super."Yocto";
+  "Yogurt" = dontDistribute super."Yogurt";
+  "Yogurt-Standalone" = dontDistribute super."Yogurt-Standalone";
+  "ZEBEDDE" = dontDistribute super."ZEBEDDE";
+  "ZFS" = dontDistribute super."ZFS";
+  "ZMachine" = dontDistribute super."ZMachine";
+  "ZipFold" = dontDistribute super."ZipFold";
+  "ZipperAG" = dontDistribute super."ZipperAG";
+  "Zora" = dontDistribute super."Zora";
+  "Zwaluw" = dontDistribute super."Zwaluw";
+  "a50" = dontDistribute super."a50";
+  "abacate" = dontDistribute super."abacate";
+  "abc-puzzle" = dontDistribute super."abc-puzzle";
+  "abcBridge" = dontDistribute super."abcBridge";
+  "abcnotation" = dontDistribute super."abcnotation";
+  "abeson" = dontDistribute super."abeson";
+  "abstract-deque-tests" = dontDistribute super."abstract-deque-tests";
+  "abstract-par-accelerate" = dontDistribute super."abstract-par-accelerate";
+  "abt" = dontDistribute super."abt";
+  "ac-machine" = dontDistribute super."ac-machine";
+  "ac-machine-conduit" = dontDistribute super."ac-machine-conduit";
+  "accelerate-arithmetic" = dontDistribute super."accelerate-arithmetic";
+  "accelerate-cublas" = dontDistribute super."accelerate-cublas";
+  "accelerate-cuda" = dontDistribute super."accelerate-cuda";
+  "accelerate-cufft" = dontDistribute super."accelerate-cufft";
+  "accelerate-examples" = dontDistribute super."accelerate-examples";
+  "accelerate-fft" = dontDistribute super."accelerate-fft";
+  "accelerate-fftw" = dontDistribute super."accelerate-fftw";
+  "accelerate-fourier" = dontDistribute super."accelerate-fourier";
+  "accelerate-fourier-benchmark" = dontDistribute super."accelerate-fourier-benchmark";
+  "accelerate-io" = dontDistribute super."accelerate-io";
+  "accelerate-random" = dontDistribute super."accelerate-random";
+  "accelerate-utility" = dontDistribute super."accelerate-utility";
+  "accentuateus" = dontDistribute super."accentuateus";
+  "access-time" = dontDistribute super."access-time";
+  "acid-state-dist" = dontDistribute super."acid-state-dist";
+  "acid-state-tls" = dontDistribute super."acid-state-tls";
+  "acl2" = dontDistribute super."acl2";
+  "acme-all-monad" = dontDistribute super."acme-all-monad";
+  "acme-box" = dontDistribute super."acme-box";
+  "acme-cadre" = dontDistribute super."acme-cadre";
+  "acme-cofunctor" = dontDistribute super."acme-cofunctor";
+  "acme-colosson" = dontDistribute super."acme-colosson";
+  "acme-comonad" = dontDistribute super."acme-comonad";
+  "acme-cutegirl" = dontDistribute super."acme-cutegirl";
+  "acme-dont" = dontDistribute super."acme-dont";
+  "acme-flipping-tables" = dontDistribute super."acme-flipping-tables";
+  "acme-grawlix" = dontDistribute super."acme-grawlix";
+  "acme-hq9plus" = dontDistribute super."acme-hq9plus";
+  "acme-http" = dontDistribute super."acme-http";
+  "acme-inator" = dontDistribute super."acme-inator";
+  "acme-io" = dontDistribute super."acme-io";
+  "acme-lolcat" = dontDistribute super."acme-lolcat";
+  "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
+  "acme-memorandom" = dontDistribute super."acme-memorandom";
+  "acme-microwave" = dontDistribute super."acme-microwave";
+  "acme-miscorder" = dontDistribute super."acme-miscorder";
+  "acme-missiles" = dontDistribute super."acme-missiles";
+  "acme-now" = dontDistribute super."acme-now";
+  "acme-numbersystem" = dontDistribute super."acme-numbersystem";
+  "acme-omitted" = dontDistribute super."acme-omitted";
+  "acme-one" = dontDistribute super."acme-one";
+  "acme-operators" = dontDistribute super."acme-operators";
+  "acme-php" = dontDistribute super."acme-php";
+  "acme-pointful-numbers" = dontDistribute super."acme-pointful-numbers";
+  "acme-realworld" = dontDistribute super."acme-realworld";
+  "acme-safe" = dontDistribute super."acme-safe";
+  "acme-schoenfinkel" = dontDistribute super."acme-schoenfinkel";
+  "acme-strfry" = dontDistribute super."acme-strfry";
+  "acme-stringly-typed" = dontDistribute super."acme-stringly-typed";
+  "acme-strtok" = dontDistribute super."acme-strtok";
+  "acme-timemachine" = dontDistribute super."acme-timemachine";
+  "acme-year" = dontDistribute super."acme-year";
+  "acme-zero" = dontDistribute super."acme-zero";
+  "activehs" = dontDistribute super."activehs";
+  "activehs-base" = dontDistribute super."activehs-base";
+  "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
+  "actor" = dontDistribute super."actor";
+  "adaptive-containers" = dontDistribute super."adaptive-containers";
+  "adaptive-tuple" = dontDistribute super."adaptive-tuple";
+  "adb" = dontDistribute super."adb";
+  "adblock2privoxy" = dontDistribute super."adblock2privoxy";
+  "addLicenseInfo" = dontDistribute super."addLicenseInfo";
+  "adhoc-network" = dontDistribute super."adhoc-network";
+  "adict" = dontDistribute super."adict";
+  "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange";
+  "adp-multi" = dontDistribute super."adp-multi";
+  "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp";
+  "aeson-applicative" = dontDistribute super."aeson-applicative";
+  "aeson-bson" = dontDistribute super."aeson-bson";
+  "aeson-diff" = dontDistribute super."aeson-diff";
+  "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-lens" = dontDistribute super."aeson-lens";
+  "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
+  "aeson-schema" = dontDistribute super."aeson-schema";
+  "aeson-serialize" = dontDistribute super."aeson-serialize";
+  "aeson-smart" = dontDistribute super."aeson-smart";
+  "aeson-streams" = dontDistribute super."aeson-streams";
+  "aeson-t" = dontDistribute super."aeson-t";
+  "aeson-toolkit" = dontDistribute super."aeson-toolkit";
+  "aeson-value-parser" = dontDistribute super."aeson-value-parser";
+  "aeson-yak" = dontDistribute super."aeson-yak";
+  "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
+  "afis" = dontDistribute super."afis";
+  "afv" = dontDistribute super."afv";
+  "agda-server" = dontDistribute super."agda-server";
+  "agda-snippets" = dontDistribute super."agda-snippets";
+  "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
+  "agum" = dontDistribute super."agum";
+  "aig" = dontDistribute super."aig";
+  "air" = dontDistribute super."air";
+  "air-extra" = dontDistribute super."air-extra";
+  "air-spec" = dontDistribute super."air-spec";
+  "air-th" = dontDistribute super."air-th";
+  "airbrake" = dontDistribute super."airbrake";
+  "aivika" = dontDistribute super."aivika";
+  "aivika-experiment" = dontDistribute super."aivika-experiment";
+  "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
+  "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
+  "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-transformers" = dontDistribute super."aivika-transformers";
+  "ajhc" = dontDistribute super."ajhc";
+  "al" = dontDistribute super."al";
+  "alea" = dontDistribute super."alea";
+  "alex-meta" = dontDistribute super."alex-meta";
+  "alfred" = dontDistribute super."alfred";
+  "alga" = dontDistribute super."alga";
+  "algebra" = dontDistribute super."algebra";
+  "algebra-dag" = dontDistribute super."algebra-dag";
+  "algebra-sql" = dontDistribute super."algebra-sql";
+  "algebraic" = dontDistribute super."algebraic";
+  "algebraic-classes" = dontDistribute super."algebraic-classes";
+  "align" = dontDistribute super."align";
+  "align-text" = dontDistribute super."align-text";
+  "aligned-foreignptr" = dontDistribute super."aligned-foreignptr";
+  "allocated-processor" = dontDistribute super."allocated-processor";
+  "alloy" = dontDistribute super."alloy";
+  "alloy-proxy-fd" = dontDistribute super."alloy-proxy-fd";
+  "almost-fix" = dontDistribute super."almost-fix";
+  "alms" = dontDistribute super."alms";
+  "alpha" = dontDistribute super."alpha";
+  "alpino-tools" = dontDistribute super."alpino-tools";
+  "alsa" = dontDistribute super."alsa";
+  "alsa-core" = dontDistribute super."alsa-core";
+  "alsa-gui" = dontDistribute super."alsa-gui";
+  "alsa-midi" = dontDistribute super."alsa-midi";
+  "alsa-mixer" = dontDistribute super."alsa-mixer";
+  "alsa-pcm" = dontDistribute super."alsa-pcm";
+  "alsa-pcm-tests" = dontDistribute super."alsa-pcm-tests";
+  "alsa-seq" = dontDistribute super."alsa-seq";
+  "alsa-seq-tests" = dontDistribute super."alsa-seq-tests";
+  "altcomposition" = dontDistribute super."altcomposition";
+  "alternative-io" = dontDistribute super."alternative-io";
+  "altfloat" = dontDistribute super."altfloat";
+  "alure" = dontDistribute super."alure";
+  "amazon-emailer" = dontDistribute super."amazon-emailer";
+  "amazon-emailer-client-snap" = dontDistribute super."amazon-emailer-client-snap";
+  "amazon-products" = dontDistribute super."amazon-products";
+  "ampersand" = dontDistribute super."ampersand";
+  "amqp-conduit" = dontDistribute super."amqp-conduit";
+  "amrun" = dontDistribute super."amrun";
+  "analyze-client" = dontDistribute super."analyze-client";
+  "anansi" = dontDistribute super."anansi";
+  "anansi-hscolour" = dontDistribute super."anansi-hscolour";
+  "anansi-pandoc" = dontDistribute super."anansi-pandoc";
+  "anatomy" = dontDistribute super."anatomy";
+  "android" = dontDistribute super."android";
+  "android-lint-summary" = dontDistribute super."android-lint-summary";
+  "animalcase" = dontDistribute super."animalcase";
+  "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
+  "ansi-pretty" = dontDistribute super."ansi-pretty";
+  "ansigraph" = dontDistribute super."ansigraph";
+  "antagonist" = dontDistribute super."antagonist";
+  "antfarm" = dontDistribute super."antfarm";
+  "anticiv" = dontDistribute super."anticiv";
+  "antigate" = dontDistribute super."antigate";
+  "antimirov" = dontDistribute super."antimirov";
+  "antiquoter" = dontDistribute super."antiquoter";
+  "antisplice" = dontDistribute super."antisplice";
+  "antlrc" = dontDistribute super."antlrc";
+  "anydbm" = dontDistribute super."anydbm";
+  "aosd" = dontDistribute super."aosd";
+  "ap-reflect" = dontDistribute super."ap-reflect";
+  "apache-md5" = dontDistribute super."apache-md5";
+  "apelsin" = dontDistribute super."apelsin";
+  "api-builder" = dontDistribute super."api-builder";
+  "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode";
+  "api-tools" = dontDistribute super."api-tools";
+  "apiary-helics" = dontDistribute super."apiary-helics";
+  "apiary-purescript" = dontDistribute super."apiary-purescript";
+  "apis" = dontDistribute super."apis";
+  "apotiki" = dontDistribute super."apotiki";
+  "app-lens" = dontDistribute super."app-lens";
+  "appc" = dontDistribute super."appc";
+  "applicative-extras" = dontDistribute super."applicative-extras";
+  "applicative-fail" = dontDistribute super."applicative-fail";
+  "applicative-numbers" = dontDistribute super."applicative-numbers";
+  "applicative-parsec" = dontDistribute super."applicative-parsec";
+  "applicative-quoters" = dontDistribute super."applicative-quoters";
+  "apportionment" = dontDistribute super."apportionment";
+  "approx-rand-test" = dontDistribute super."approx-rand-test";
+  "approximate-equality" = dontDistribute super."approximate-equality";
+  "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper";
+  "arb-fft" = dontDistribute super."arb-fft";
+  "arbb-vm" = dontDistribute super."arbb-vm";
+  "archive" = dontDistribute super."archive";
+  "archiver" = dontDistribute super."archiver";
+  "archlinux" = dontDistribute super."archlinux";
+  "archlinux-web" = dontDistribute super."archlinux-web";
+  "archnews" = dontDistribute super."archnews";
+  "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
+  "argparser" = dontDistribute super."argparser";
+  "arguedit" = dontDistribute super."arguedit";
+  "ariadne" = dontDistribute super."ariadne";
+  "arion" = dontDistribute super."arion";
+  "arith-encode" = dontDistribute super."arith-encode";
+  "arithmatic" = dontDistribute super."arithmatic";
+  "arithmetic" = dontDistribute super."arithmetic";
+  "arithmoi" = dontDistribute super."arithmoi";
+  "armada" = dontDistribute super."armada";
+  "arpa" = dontDistribute super."arpa";
+  "array-forth" = dontDistribute super."array-forth";
+  "array-memoize" = dontDistribute super."array-memoize";
+  "array-primops" = dontDistribute super."array-primops";
+  "array-utils" = dontDistribute super."array-utils";
+  "arrow-improve" = dontDistribute super."arrow-improve";
+  "arrowapply-utils" = dontDistribute super."arrowapply-utils";
+  "arrowp" = dontDistribute super."arrowp";
+  "arrows" = dontDistribute super."arrows";
+  "artery" = dontDistribute super."artery";
+  "arx" = dontDistribute super."arx";
+  "arxiv" = dontDistribute super."arxiv";
+  "ascetic" = dontDistribute super."ascetic";
+  "ascii" = dontDistribute super."ascii";
+  "ascii-vector-avc" = dontDistribute super."ascii-vector-avc";
+  "ascii85-conduit" = dontDistribute super."ascii85-conduit";
+  "asic" = dontDistribute super."asic";
+  "asil" = dontDistribute super."asil";
+  "asn1-data" = dontDistribute super."asn1-data";
+  "asn1dump" = dontDistribute super."asn1dump";
+  "assembler" = dontDistribute super."assembler";
+  "assert" = dontDistribute super."assert";
+  "assert-failure" = dontDistribute super."assert-failure";
+  "assertions" = dontDistribute super."assertions";
+  "assimp" = dontDistribute super."assimp";
+  "astar" = dontDistribute super."astar";
+  "astrds" = dontDistribute super."astrds";
+  "astview" = dontDistribute super."astview";
+  "astview-utils" = dontDistribute super."astview-utils";
+  "async-extras" = dontDistribute super."async-extras";
+  "async-manager" = dontDistribute super."async-manager";
+  "async-pool" = dontDistribute super."async-pool";
+  "asynchronous-exceptions" = dontDistribute super."asynchronous-exceptions";
+  "aterm" = dontDistribute super."aterm";
+  "aterm-utils" = dontDistribute super."aterm-utils";
+  "atl" = dontDistribute super."atl";
+  "atlassian-connect-core" = dontDistribute super."atlassian-connect-core";
+  "atlassian-connect-descriptor" = dontDistribute super."atlassian-connect-descriptor";
+  "atmos" = dontDistribute super."atmos";
+  "atmos-dimensional" = dontDistribute super."atmos-dimensional";
+  "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atom" = dontDistribute super."atom";
+  "atom-basic" = dontDistribute super."atom-basic";
+  "atom-conduit" = dontDistribute super."atom-conduit";
+  "atom-msp430" = dontDistribute super."atom-msp430";
+  "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign";
+  "atomic-primops-vector" = dontDistribute super."atomic-primops-vector";
+  "atomic-write" = dontDistribute super."atomic-write";
+  "atomo" = dontDistribute super."atomo";
+  "atp-haskell" = dontDistribute super."atp-haskell";
+  "attempt" = dontDistribute super."attempt";
+  "atto-lisp" = dontDistribute super."atto-lisp";
+  "attoparsec-arff" = dontDistribute super."attoparsec-arff";
+  "attoparsec-binary" = dontDistribute super."attoparsec-binary";
+  "attoparsec-conduit" = dontDistribute super."attoparsec-conduit";
+  "attoparsec-csv" = dontDistribute super."attoparsec-csv";
+  "attoparsec-iteratee" = dontDistribute super."attoparsec-iteratee";
+  "attoparsec-parsec" = dontDistribute super."attoparsec-parsec";
+  "attoparsec-text" = dontDistribute super."attoparsec-text";
+  "attoparsec-text-enumerator" = dontDistribute super."attoparsec-text-enumerator";
+  "attosplit" = dontDistribute super."attosplit";
+  "atuin" = dontDistribute super."atuin";
+  "audacity" = dontDistribute super."audacity";
+  "audiovisual" = dontDistribute super."audiovisual";
+  "augeas" = dontDistribute super."augeas";
+  "augur" = dontDistribute super."augur";
+  "aur" = dontDistribute super."aur";
+  "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
+  "authenticate-ldap" = dontDistribute super."authenticate-ldap";
+  "authinfo-hs" = dontDistribute super."authinfo-hs";
+  "authoring" = dontDistribute super."authoring";
+  "autonix-deps" = dontDistribute super."autonix-deps";
+  "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
+  "autoproc" = dontDistribute super."autoproc";
+  "avahi" = dontDistribute super."avahi";
+  "avatar-generator" = dontDistribute super."avatar-generator";
+  "average" = dontDistribute super."average";
+  "avers" = dontDistribute super."avers";
+  "avl-static" = dontDistribute super."avl-static";
+  "avr-shake" = dontDistribute super."avr-shake";
+  "awesomium" = dontDistribute super."awesomium";
+  "awesomium-glut" = dontDistribute super."awesomium-glut";
+  "awesomium-raw" = dontDistribute super."awesomium-raw";
+  "aws-cloudfront-signer" = dontDistribute super."aws-cloudfront-signer";
+  "aws-configuration-tools" = dontDistribute super."aws-configuration-tools";
+  "aws-dynamodb-conduit" = dontDistribute super."aws-dynamodb-conduit";
+  "aws-dynamodb-streams" = dontDistribute super."aws-dynamodb-streams";
+  "aws-ec2" = dontDistribute super."aws-ec2";
+  "aws-elastic-transcoder" = dontDistribute super."aws-elastic-transcoder";
+  "aws-general" = dontDistribute super."aws-general";
+  "aws-kinesis" = dontDistribute super."aws-kinesis";
+  "aws-kinesis-client" = dontDistribute super."aws-kinesis-client";
+  "aws-kinesis-reshard" = dontDistribute super."aws-kinesis-reshard";
+  "aws-lambda" = dontDistribute super."aws-lambda";
+  "aws-performance-tests" = dontDistribute super."aws-performance-tests";
+  "aws-route53" = dontDistribute super."aws-route53";
+  "aws-sdk" = dontDistribute super."aws-sdk";
+  "aws-sdk-text-converter" = dontDistribute super."aws-sdk-text-converter";
+  "aws-sdk-xml-unordered" = dontDistribute super."aws-sdk-xml-unordered";
+  "aws-sign4" = dontDistribute super."aws-sign4";
+  "aws-sns" = dontDistribute super."aws-sns";
+  "azure-acs" = dontDistribute super."azure-acs";
+  "azure-service-api" = dontDistribute super."azure-service-api";
+  "azure-servicebus" = dontDistribute super."azure-servicebus";
+  "azurify" = dontDistribute super."azurify";
+  "b-tree" = dontDistribute super."b-tree";
+  "babylon" = dontDistribute super."babylon";
+  "backdropper" = dontDistribute super."backdropper";
+  "backtracking-exceptions" = dontDistribute super."backtracking-exceptions";
+  "backward-state" = dontDistribute super."backward-state";
+  "bacteria" = dontDistribute super."bacteria";
+  "bag" = dontDistribute super."bag";
+  "bamboo" = dontDistribute super."bamboo";
+  "bamboo-launcher" = dontDistribute super."bamboo-launcher";
+  "bamboo-plugin-highlight" = dontDistribute super."bamboo-plugin-highlight";
+  "bamboo-plugin-photo" = dontDistribute super."bamboo-plugin-photo";
+  "bamboo-theme-blueprint" = dontDistribute super."bamboo-theme-blueprint";
+  "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
+  "bamse" = dontDistribute super."bamse";
+  "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
+  "banwords" = dontDistribute super."banwords";
+  "barchart" = dontDistribute super."barchart";
+  "barcodes-code128" = dontDistribute super."barcodes-code128";
+  "barecheck" = dontDistribute super."barecheck";
+  "barley" = dontDistribute super."barley";
+  "barrie" = dontDistribute super."barrie";
+  "barrier-monad" = dontDistribute super."barrier-monad";
+  "base-generics" = dontDistribute super."base-generics";
+  "base-io-access" = dontDistribute super."base-io-access";
+  "base32-bytestring" = dontDistribute super."base32-bytestring";
+  "base58-bytestring" = dontDistribute super."base58-bytestring";
+  "base58address" = dontDistribute super."base58address";
+  "base64-conduit" = dontDistribute super."base64-conduit";
+  "base91" = dontDistribute super."base91";
+  "basex-client" = dontDistribute super."basex-client";
+  "bash" = dontDistribute super."bash";
+  "basic-lens" = dontDistribute super."basic-lens";
+  "basic-sop" = dontDistribute super."basic-sop";
+  "baskell" = dontDistribute super."baskell";
+  "battlenet" = dontDistribute super."battlenet";
+  "battlenet-yesod" = dontDistribute super."battlenet-yesod";
+  "battleships" = dontDistribute super."battleships";
+  "bayes-stack" = dontDistribute super."bayes-stack";
+  "bbdb" = dontDistribute super."bbdb";
+  "bbi" = dontDistribute super."bbi";
+  "bdd" = dontDistribute super."bdd";
+  "bdelta" = dontDistribute super."bdelta";
+  "bdo" = dontDistribute super."bdo";
+  "beamable" = dontDistribute super."beamable";
+  "beautifHOL" = dontDistribute super."beautifHOL";
+  "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
+  "bein" = dontDistribute super."bein";
+  "benchmark-function" = dontDistribute super."benchmark-function";
+  "bencoding" = dontDistribute super."bencoding";
+  "berkeleydb" = dontDistribute super."berkeleydb";
+  "berp" = dontDistribute super."berp";
+  "bert" = dontDistribute super."bert";
+  "besout" = dontDistribute super."besout";
+  "bet" = dontDistribute super."bet";
+  "betacode" = dontDistribute super."betacode";
+  "between" = dontDistribute super."between";
+  "bf-cata" = dontDistribute super."bf-cata";
+  "bff" = dontDistribute super."bff";
+  "bff-mono" = dontDistribute super."bff-mono";
+  "bgmax" = dontDistribute super."bgmax";
+  "bgzf" = dontDistribute super."bgzf";
+  "bibtex" = dontDistribute super."bibtex";
+  "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
+  "bidispec" = dontDistribute super."bidispec";
+  "bidispec-extras" = dontDistribute super."bidispec-extras";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
+  "billboard-parser" = dontDistribute super."billboard-parser";
+  "billeksah-forms" = dontDistribute super."billeksah-forms";
+  "billeksah-main" = dontDistribute super."billeksah-main";
+  "billeksah-main-static" = dontDistribute super."billeksah-main-static";
+  "billeksah-pane" = dontDistribute super."billeksah-pane";
+  "billeksah-services" = dontDistribute super."billeksah-services";
+  "bimaps" = dontDistribute super."bimaps";
+  "binary-bits" = dontDistribute super."binary-bits";
+  "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-derive" = dontDistribute super."binary-derive";
+  "binary-enum" = dontDistribute super."binary-enum";
+  "binary-file" = dontDistribute super."binary-file";
+  "binary-generic" = dontDistribute super."binary-generic";
+  "binary-indexed-tree" = dontDistribute super."binary-indexed-tree";
+  "binary-literal-qq" = dontDistribute super."binary-literal-qq";
+  "binary-protocol" = dontDistribute super."binary-protocol";
+  "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
+  "binary-shared" = dontDistribute super."binary-shared";
+  "binary-state" = dontDistribute super."binary-state";
+  "binary-store" = dontDistribute super."binary-store";
+  "binary-streams" = dontDistribute super."binary-streams";
+  "binary-strict" = dontDistribute super."binary-strict";
+  "binarydefer" = dontDistribute super."binarydefer";
+  "bind-marshal" = dontDistribute super."bind-marshal";
+  "binding-core" = dontDistribute super."binding-core";
+  "binding-gtk" = dontDistribute super."binding-gtk";
+  "binding-wx" = dontDistribute super."binding-wx";
+  "bindings" = dontDistribute super."bindings";
+  "bindings-EsounD" = dontDistribute super."bindings-EsounD";
+  "bindings-K8055" = dontDistribute super."bindings-K8055";
+  "bindings-apr" = dontDistribute super."bindings-apr";
+  "bindings-apr-util" = dontDistribute super."bindings-apr-util";
+  "bindings-audiofile" = dontDistribute super."bindings-audiofile";
+  "bindings-bfd" = dontDistribute super."bindings-bfd";
+  "bindings-cctools" = dontDistribute super."bindings-cctools";
+  "bindings-codec2" = dontDistribute super."bindings-codec2";
+  "bindings-common" = dontDistribute super."bindings-common";
+  "bindings-dc1394" = dontDistribute super."bindings-dc1394";
+  "bindings-directfb" = dontDistribute super."bindings-directfb";
+  "bindings-eskit" = dontDistribute super."bindings-eskit";
+  "bindings-fann" = dontDistribute super."bindings-fann";
+  "bindings-fluidsynth" = dontDistribute super."bindings-fluidsynth";
+  "bindings-friso" = dontDistribute super."bindings-friso";
+  "bindings-glib" = dontDistribute super."bindings-glib";
+  "bindings-gobject" = dontDistribute super."bindings-gobject";
+  "bindings-gpgme" = dontDistribute super."bindings-gpgme";
+  "bindings-gsl" = dontDistribute super."bindings-gsl";
+  "bindings-gts" = dontDistribute super."bindings-gts";
+  "bindings-hamlib" = dontDistribute super."bindings-hamlib";
+  "bindings-hdf5" = dontDistribute super."bindings-hdf5";
+  "bindings-levmar" = dontDistribute super."bindings-levmar";
+  "bindings-libcddb" = dontDistribute super."bindings-libcddb";
+  "bindings-libffi" = dontDistribute super."bindings-libffi";
+  "bindings-libftdi" = dontDistribute super."bindings-libftdi";
+  "bindings-librrd" = dontDistribute super."bindings-librrd";
+  "bindings-libstemmer" = dontDistribute super."bindings-libstemmer";
+  "bindings-libusb" = dontDistribute super."bindings-libusb";
+  "bindings-libv4l2" = dontDistribute super."bindings-libv4l2";
+  "bindings-libzip" = dontDistribute super."bindings-libzip";
+  "bindings-linux-videodev2" = dontDistribute super."bindings-linux-videodev2";
+  "bindings-lxc" = dontDistribute super."bindings-lxc";
+  "bindings-mmap" = dontDistribute super."bindings-mmap";
+  "bindings-mpdecimal" = dontDistribute super."bindings-mpdecimal";
+  "bindings-nettle" = dontDistribute super."bindings-nettle";
+  "bindings-parport" = dontDistribute super."bindings-parport";
+  "bindings-portaudio" = dontDistribute super."bindings-portaudio";
+  "bindings-potrace" = dontDistribute super."bindings-potrace";
+  "bindings-ppdev" = dontDistribute super."bindings-ppdev";
+  "bindings-saga-cmd" = dontDistribute super."bindings-saga-cmd";
+  "bindings-sane" = dontDistribute super."bindings-sane";
+  "bindings-sc3" = dontDistribute super."bindings-sc3";
+  "bindings-sipc" = dontDistribute super."bindings-sipc";
+  "bindings-sophia" = dontDistribute super."bindings-sophia";
+  "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
+  "bindings-svm" = dontDistribute super."bindings-svm";
+  "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-yices" = dontDistribute super."bindings-yices";
+  "bindynamic" = dontDistribute super."bindynamic";
+  "binembed" = dontDistribute super."binembed";
+  "binembed-example" = dontDistribute super."binembed-example";
+  "bio" = dontDistribute super."bio";
+  "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
+  "biosff" = dontDistribute super."biosff";
+  "biostockholm" = dontDistribute super."biostockholm";
+  "bird" = dontDistribute super."bird";
+  "bit-array" = dontDistribute super."bit-array";
+  "bit-vector" = dontDistribute super."bit-vector";
+  "bitarray" = dontDistribute super."bitarray";
+  "bitcoin-rpc" = dontDistribute super."bitcoin-rpc";
+  "bitly-cli" = dontDistribute super."bitly-cli";
+  "bitmap" = dontDistribute super."bitmap";
+  "bitmap-opengl" = dontDistribute super."bitmap-opengl";
+  "bitmaps" = dontDistribute super."bitmaps";
+  "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-conduit" = dontDistribute super."bits-conduit";
+  "bits-extras" = dontDistribute super."bits-extras";
+  "bitset" = dontDistribute super."bitset";
+  "bitspeak" = dontDistribute super."bitspeak";
+  "bitstream" = dontDistribute super."bitstream";
+  "bitstring" = dontDistribute super."bitstring";
+  "bittorrent" = dontDistribute super."bittorrent";
+  "bitvec" = dontDistribute super."bitvec";
+  "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
+  "bk-tree" = dontDistribute super."bk-tree";
+  "bkr" = dontDistribute super."bkr";
+  "bktrees" = dontDistribute super."bktrees";
+  "bla" = dontDistribute super."bla";
+  "black-jewel" = dontDistribute super."black-jewel";
+  "blacktip" = dontDistribute super."blacktip";
+  "blakesum" = dontDistribute super."blakesum";
+  "blakesum-demo" = dontDistribute super."blakesum-demo";
+  "blank-canvas" = dontDistribute super."blank-canvas";
+  "blas" = dontDistribute super."blas";
+  "blas-hs" = dontDistribute super."blas-hs";
+  "blaze" = dontDistribute super."blaze";
+  "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
+  "blaze-from-html" = dontDistribute super."blaze-from-html";
+  "blaze-html-contrib" = dontDistribute super."blaze-html-contrib";
+  "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat";
+  "blaze-html-truncate" = dontDistribute super."blaze-html-truncate";
+  "blaze-json" = dontDistribute super."blaze-json";
+  "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-textual-native" = dontDistribute super."blaze-textual-native";
+  "blazeMarker" = dontDistribute super."blazeMarker";
+  "blink1" = dontDistribute super."blink1";
+  "blip" = dontDistribute super."blip";
+  "bliplib" = dontDistribute super."bliplib";
+  "blocking-transactions" = dontDistribute super."blocking-transactions";
+  "blogination" = dontDistribute super."blogination";
+  "bloxorz" = dontDistribute super."bloxorz";
+  "blubber" = dontDistribute super."blubber";
+  "blubber-server" = dontDistribute super."blubber-server";
+  "bluetile" = dontDistribute super."bluetile";
+  "bluetileutils" = dontDistribute super."bluetileutils";
+  "blunt" = dontDistribute super."blunt";
+  "board-games" = dontDistribute super."board-games";
+  "bogre-banana" = dontDistribute super."bogre-banana";
+  "bond" = dontDistribute super."bond";
+  "boolean-list" = dontDistribute super."boolean-list";
+  "boolean-normal-forms" = dontDistribute super."boolean-normal-forms";
+  "boolexpr" = dontDistribute super."boolexpr";
+  "bools" = dontDistribute super."bools";
+  "boolsimplifier" = dontDistribute super."boolsimplifier";
+  "boomange" = dontDistribute super."boomange";
+  "boomslang" = dontDistribute super."boomslang";
+  "borel" = dontDistribute super."borel";
+  "bot" = dontDistribute super."bot";
+  "botpp" = dontDistribute super."botpp";
+  "bound-gen" = dontDistribute super."bound-gen";
+  "bounded-tchan" = dontDistribute super."bounded-tchan";
+  "boundingboxes" = dontDistribute super."boundingboxes";
+  "bowntz" = dontDistribute super."bowntz";
+  "bpann" = dontDistribute super."bpann";
+  "brainfuck" = dontDistribute super."brainfuck";
+  "brainfuck-monad" = dontDistribute super."brainfuck-monad";
+  "brainfuck-tut" = dontDistribute super."brainfuck-tut";
+  "break" = dontDistribute super."break";
+  "breakout" = dontDistribute super."breakout";
+  "breve" = dontDistribute super."breve";
+  "brians-brain" = dontDistribute super."brians-brain";
+  "brillig" = dontDistribute super."brillig";
+  "broccoli" = dontDistribute super."broccoli";
+  "broker-haskell" = dontDistribute super."broker-haskell";
+  "bsd-sysctl" = dontDistribute super."bsd-sysctl";
+  "bson-generic" = dontDistribute super."bson-generic";
+  "bson-generics" = dontDistribute super."bson-generics";
+  "bson-mapping" = dontDistribute super."bson-mapping";
+  "bspack" = dontDistribute super."bspack";
+  "bsparse" = dontDistribute super."bsparse";
+  "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffon" = dontDistribute super."buffon";
+  "bugzilla" = dontDistribute super."bugzilla";
+  "buildable" = dontDistribute super."buildable";
+  "buildbox" = dontDistribute super."buildbox";
+  "buildbox-tools" = dontDistribute super."buildbox-tools";
+  "buildwrapper" = dontDistribute super."buildwrapper";
+  "bullet" = dontDistribute super."bullet";
+  "burst-detection" = dontDistribute super."burst-detection";
+  "bus-pirate" = dontDistribute super."bus-pirate";
+  "buster" = dontDistribute super."buster";
+  "buster-gtk" = dontDistribute super."buster-gtk";
+  "buster-network" = dontDistribute super."buster-network";
+  "butterflies" = dontDistribute super."butterflies";
+  "bv" = dontDistribute super."bv";
+  "byline" = dontDistribute super."byline";
+  "bytable" = dontDistribute super."bytable";
+  "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary";
+  "bytestring-class" = dontDistribute super."bytestring-class";
+  "bytestring-csv" = dontDistribute super."bytestring-csv";
+  "bytestring-delta" = dontDistribute super."bytestring-delta";
+  "bytestring-from" = dontDistribute super."bytestring-from";
+  "bytestring-handle" = dontDistribute super."bytestring-handle";
+  "bytestring-nums" = dontDistribute super."bytestring-nums";
+  "bytestring-plain" = dontDistribute super."bytestring-plain";
+  "bytestring-rematch" = dontDistribute super."bytestring-rematch";
+  "bytestring-short" = dontDistribute super."bytestring-short";
+  "bytestring-show" = dontDistribute super."bytestring-show";
+  "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder";
+  "bytestringparser" = dontDistribute super."bytestringparser";
+  "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
+  "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "c-dsl" = dontDistribute super."c-dsl";
+  "c-io" = dontDistribute super."c-io";
+  "c-storable-deriving" = dontDistribute super."c-storable-deriving";
+  "c0check" = dontDistribute super."c0check";
+  "c0parser" = dontDistribute super."c0parser";
+  "c10k" = dontDistribute super."c10k";
+  "c2hsc" = dontDistribute super."c2hsc";
+  "cab" = dontDistribute super."cab";
+  "cabal-audit" = dontDistribute super."cabal-audit";
+  "cabal-bounds" = dontDistribute super."cabal-bounds";
+  "cabal-cargs" = dontDistribute super."cabal-cargs";
+  "cabal-constraints" = dontDistribute super."cabal-constraints";
+  "cabal-db" = dontDistribute super."cabal-db";
+  "cabal-dependency-licenses" = dontDistribute super."cabal-dependency-licenses";
+  "cabal-dev" = dontDistribute super."cabal-dev";
+  "cabal-dir" = dontDistribute super."cabal-dir";
+  "cabal-ghc-dynflags" = dontDistribute super."cabal-ghc-dynflags";
+  "cabal-ghci" = dontDistribute super."cabal-ghci";
+  "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
+  "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
+  "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
+  "cabal-install-ghc74" = dontDistribute super."cabal-install-ghc74";
+  "cabal-lenses" = dontDistribute super."cabal-lenses";
+  "cabal-macosx" = dontDistribute super."cabal-macosx";
+  "cabal-meta" = dontDistribute super."cabal-meta";
+  "cabal-mon" = dontDistribute super."cabal-mon";
+  "cabal-nirvana" = dontDistribute super."cabal-nirvana";
+  "cabal-progdeps" = dontDistribute super."cabal-progdeps";
+  "cabal-query" = dontDistribute super."cabal-query";
+  "cabal-scripts" = dontDistribute super."cabal-scripts";
+  "cabal-setup" = dontDistribute super."cabal-setup";
+  "cabal-sign" = dontDistribute super."cabal-sign";
+  "cabal-test" = dontDistribute super."cabal-test";
+  "cabal-test-bin" = dontDistribute super."cabal-test-bin";
+  "cabal-test-compat" = dontDistribute super."cabal-test-compat";
+  "cabal-test-quickcheck" = dontDistribute super."cabal-test-quickcheck";
+  "cabal-uninstall" = dontDistribute super."cabal-uninstall";
+  "cabal-upload" = dontDistribute super."cabal-upload";
+  "cabal2arch" = dontDistribute super."cabal2arch";
+  "cabal2doap" = dontDistribute super."cabal2doap";
+  "cabal2ebuild" = dontDistribute super."cabal2ebuild";
+  "cabal2ghci" = dontDistribute super."cabal2ghci";
+  "cabal2nix" = dontDistribute super."cabal2nix";
+  "cabal2spec" = dontDistribute super."cabal2spec";
+  "cabalQuery" = dontDistribute super."cabalQuery";
+  "cabalg" = dontDistribute super."cabalg";
+  "cabalgraph" = dontDistribute super."cabalgraph";
+  "cabalmdvrpm" = dontDistribute super."cabalmdvrpm";
+  "cabalrpmdeps" = dontDistribute super."cabalrpmdeps";
+  "cabalvchk" = dontDistribute super."cabalvchk";
+  "cabin" = dontDistribute super."cabin";
+  "cabocha" = dontDistribute super."cabocha";
+  "cached-io" = dontDistribute super."cached-io";
+  "cached-traversable" = dontDistribute super."cached-traversable";
+  "caf" = dontDistribute super."caf";
+  "cafeteria-prelude" = dontDistribute super."cafeteria-prelude";
+  "caffegraph" = dontDistribute super."caffegraph";
+  "cairo-appbase" = dontDistribute super."cairo-appbase";
+  "cake" = dontDistribute super."cake";
+  "cake3" = dontDistribute super."cake3";
+  "cakyrespa" = dontDistribute super."cakyrespa";
+  "cal3d" = dontDistribute super."cal3d";
+  "cal3d-examples" = dontDistribute super."cal3d-examples";
+  "cal3d-opengl" = dontDistribute super."cal3d-opengl";
+  "calc" = dontDistribute super."calc";
+  "caldims" = dontDistribute super."caldims";
+  "caledon" = dontDistribute super."caledon";
+  "call" = dontDistribute super."call";
+  "call-haskell-from-anything" = dontDistribute super."call-haskell-from-anything";
+  "camh" = dontDistribute super."camh";
+  "campfire" = dontDistribute super."campfire";
+  "canonical-filepath" = dontDistribute super."canonical-filepath";
+  "canteven-config" = dontDistribute super."canteven-config";
+  "canteven-listen-http" = dontDistribute super."canteven-listen-http";
+  "canteven-log" = dontDistribute super."canteven-log";
+  "canteven-template" = dontDistribute super."canteven-template";
+  "cantor" = dontDistribute super."cantor";
+  "cao" = dontDistribute super."cao";
+  "cap" = dontDistribute super."cap";
+  "capped-list" = dontDistribute super."capped-list";
+  "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
+  "caramia" = dontDistribute super."caramia";
+  "carboncopy" = dontDistribute super."carboncopy";
+  "carettah" = dontDistribute super."carettah";
+  "casadi-bindings" = dontDistribute super."casadi-bindings";
+  "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
+  "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
+  "casadi-bindings-internal" = dontDistribute super."casadi-bindings-internal";
+  "casadi-bindings-ipopt-interface" = dontDistribute super."casadi-bindings-ipopt-interface";
+  "casadi-bindings-snopt-interface" = dontDistribute super."casadi-bindings-snopt-interface";
+  "cascading" = dontDistribute super."cascading";
+  "case-conversion" = dontDistribute super."case-conversion";
+  "cash" = dontDistribute super."cash";
+  "casing" = dontDistribute super."casing";
+  "cassandra-cql" = dontDistribute super."cassandra-cql";
+  "cassandra-thrift" = dontDistribute super."cassandra-thrift";
+  "cassava-conduit" = dontDistribute super."cassava-conduit";
+  "cassava-streams" = dontDistribute super."cassava-streams";
+  "cassette" = dontDistribute super."cassette";
+  "cassy" = dontDistribute super."cassy";
+  "castle" = dontDistribute super."castle";
+  "casui" = dontDistribute super."casui";
+  "catamorphism" = dontDistribute super."catamorphism";
+  "catch-fd" = dontDistribute super."catch-fd";
+  "categorical-algebra" = dontDistribute super."categorical-algebra";
+  "categories" = dontDistribute super."categories";
+  "category-extras" = dontDistribute super."category-extras";
+  "cayley-dickson" = dontDistribute super."cayley-dickson";
+  "cblrepo" = dontDistribute super."cblrepo";
+  "cci" = dontDistribute super."cci";
+  "ccnx" = dontDistribute super."ccnx";
+  "cctools-workqueue" = dontDistribute super."cctools-workqueue";
+  "cedict" = dontDistribute super."cedict";
+  "cef" = dontDistribute super."cef";
+  "ceilometer-common" = dontDistribute super."ceilometer-common";
+  "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
+  "cerberus" = dontDistribute super."cerberus";
+  "cereal-derive" = dontDistribute super."cereal-derive";
+  "cereal-enumerator" = dontDistribute super."cereal-enumerator";
+  "cereal-ieee754" = dontDistribute super."cereal-ieee754";
+  "cereal-plus" = dontDistribute super."cereal-plus";
+  "cereal-text" = dontDistribute super."cereal-text";
+  "certificate" = dontDistribute super."certificate";
+  "cf" = dontDistribute super."cf";
+  "cfipu" = dontDistribute super."cfipu";
+  "cflp" = dontDistribute super."cflp";
+  "cfopu" = dontDistribute super."cfopu";
+  "cg" = dontDistribute super."cg";
+  "cgen" = dontDistribute super."cgen";
+  "cgi-undecidable" = dontDistribute super."cgi-undecidable";
+  "cgi-utils" = dontDistribute super."cgi-utils";
+  "cgrep" = dontDistribute super."cgrep";
+  "chain-codes" = dontDistribute super."chain-codes";
+  "chalk" = dontDistribute super."chalk";
+  "chalkboard" = dontDistribute super."chalkboard";
+  "chalkboard-viewer" = dontDistribute super."chalkboard-viewer";
+  "chalmers-lava2000" = dontDistribute super."chalmers-lava2000";
+  "chan-split" = dontDistribute super."chan-split";
+  "change-monger" = dontDistribute super."change-monger";
+  "charade" = dontDistribute super."charade";
+  "charsetdetect" = dontDistribute super."charsetdetect";
+  "chart-histogram" = dontDistribute super."chart-histogram";
+  "chaselev-deque" = dontDistribute super."chaselev-deque";
+  "chatter" = dontDistribute super."chatter";
+  "chatty" = dontDistribute super."chatty";
+  "chatty-text" = dontDistribute super."chatty-text";
+  "chatty-utils" = dontDistribute super."chatty-utils";
+  "check-pvp" = dontDistribute super."check-pvp";
+  "checked" = dontDistribute super."checked";
+  "chell-hunit" = dontDistribute super."chell-hunit";
+  "chesshs" = dontDistribute super."chesshs";
+  "chevalier-common" = dontDistribute super."chevalier-common";
+  "chp" = dontDistribute super."chp";
+  "chp-mtl" = dontDistribute super."chp-mtl";
+  "chp-plus" = dontDistribute super."chp-plus";
+  "chp-spec" = dontDistribute super."chp-spec";
+  "chp-transformers" = dontDistribute super."chp-transformers";
+  "chronograph" = dontDistribute super."chronograph";
+  "chu2" = dontDistribute super."chu2";
+  "chuchu" = dontDistribute super."chuchu";
+  "chunks" = dontDistribute super."chunks";
+  "chunky" = dontDistribute super."chunky";
+  "church-list" = dontDistribute super."church-list";
+  "cil" = dontDistribute super."cil";
+  "cinvoke" = dontDistribute super."cinvoke";
+  "cio" = dontDistribute super."cio";
+  "cipher-rc5" = dontDistribute super."cipher-rc5";
+  "ciphersaber2" = dontDistribute super."ciphersaber2";
+  "circ" = dontDistribute super."circ";
+  "cirru-parser" = dontDistribute super."cirru-parser";
+  "citation-resolve" = dontDistribute super."citation-resolve";
+  "citeproc-hs" = dontDistribute super."citeproc-hs";
+  "citeproc-hs-pandoc-filter" = dontDistribute super."citeproc-hs-pandoc-filter";
+  "cityhash" = dontDistribute super."cityhash";
+  "cjk" = dontDistribute super."cjk";
+  "clac" = dontDistribute super."clac";
+  "clafer" = dontDistribute super."clafer";
+  "claferIG" = dontDistribute super."claferIG";
+  "claferwiki" = dontDistribute super."claferwiki";
+  "clang-pure" = dontDistribute super."clang-pure";
+  "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
+  "clash" = dontDistribute super."clash";
+  "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck";
+  "classify" = dontDistribute super."classify";
+  "classy-parallel" = dontDistribute super."classy-parallel";
+  "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
+  "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
+  "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
+  "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks";
+  "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap";
+  "cld2" = dontDistribute super."cld2";
+  "clean-home" = dontDistribute super."clean-home";
+  "clean-unions" = dontDistribute super."clean-unions";
+  "cless" = dontDistribute super."cless";
+  "clevercss" = dontDistribute super."clevercss";
+  "cli" = dontDistribute super."cli";
+  "click-clack" = dontDistribute super."click-clack";
+  "clifford" = dontDistribute super."clifford";
+  "clippard" = dontDistribute super."clippard";
+  "clipper" = dontDistribute super."clipper";
+  "clippings" = dontDistribute super."clippings";
+  "clist" = dontDistribute super."clist";
+  "clocked" = dontDistribute super."clocked";
+  "clogparse" = dontDistribute super."clogparse";
+  "clone-all" = dontDistribute super."clone-all";
+  "closure" = dontDistribute super."closure";
+  "cloud-haskell" = dontDistribute super."cloud-haskell";
+  "cloudfront-signer" = dontDistribute super."cloudfront-signer";
+  "cloudyfs" = dontDistribute super."cloudyfs";
+  "cltw" = dontDistribute super."cltw";
+  "clua" = dontDistribute super."clua";
+  "cluss" = dontDistribute super."cluss";
+  "clustertools" = dontDistribute super."clustertools";
+  "clutterhs" = dontDistribute super."clutterhs";
+  "cmaes" = dontDistribute super."cmaes";
+  "cmath" = dontDistribute super."cmath";
+  "cmathml3" = dontDistribute super."cmathml3";
+  "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs-browser" = dontDistribute super."cmdargs-browser";
+  "cmdlib" = dontDistribute super."cmdlib";
+  "cmdtheline" = dontDistribute super."cmdtheline";
+  "cml" = dontDistribute super."cml";
+  "cmonad" = dontDistribute super."cmonad";
+  "cmu" = dontDistribute super."cmu";
+  "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
+  "cndict" = dontDistribute super."cndict";
+  "codec" = dontDistribute super."codec";
+  "codec-libevent" = dontDistribute super."codec-libevent";
+  "codec-mbox" = dontDistribute super."codec-mbox";
+  "codecov-haskell" = dontDistribute super."codecov-haskell";
+  "codemonitor" = dontDistribute super."codemonitor";
+  "codepad" = dontDistribute super."codepad";
+  "codo-notation" = dontDistribute super."codo-notation";
+  "cofunctor" = dontDistribute super."cofunctor";
+  "cognimeta-utils" = dontDistribute super."cognimeta-utils";
+  "coinbase-exchange" = dontDistribute super."coinbase-exchange";
+  "colada" = dontDistribute super."colada";
+  "colchis" = dontDistribute super."colchis";
+  "collada-output" = dontDistribute super."collada-output";
+  "collada-types" = dontDistribute super."collada-types";
+  "collapse-util" = dontDistribute super."collapse-util";
+  "collection-json" = dontDistribute super."collection-json";
+  "collections" = dontDistribute super."collections";
+  "collections-api" = dontDistribute super."collections-api";
+  "collections-base-instances" = dontDistribute super."collections-base-instances";
+  "colock" = dontDistribute super."colock";
+  "colorize-haskell" = dontDistribute super."colorize-haskell";
+  "colors" = dontDistribute super."colors";
+  "coltrane" = dontDistribute super."coltrane";
+  "com" = dontDistribute super."com";
+  "combinat" = dontDistribute super."combinat";
+  "combinat-diagrams" = dontDistribute super."combinat-diagrams";
+  "combinator-interactive" = dontDistribute super."combinator-interactive";
+  "combinatorial-problems" = dontDistribute super."combinatorial-problems";
+  "combinatorics" = dontDistribute super."combinatorics";
+  "combobuffer" = dontDistribute super."combobuffer";
+  "comfort-graph" = dontDistribute super."comfort-graph";
+  "command" = dontDistribute super."command";
+  "command-qq" = dontDistribute super."command-qq";
+  "commodities" = dontDistribute super."commodities";
+  "commsec" = dontDistribute super."commsec";
+  "commsec-keyexchange" = dontDistribute super."commsec-keyexchange";
+  "comonad-extras" = dontDistribute super."comonad-extras";
+  "comonad-random" = dontDistribute super."comonad-random";
+  "compact-map" = dontDistribute super."compact-map";
+  "compact-socket" = dontDistribute super."compact-socket";
+  "compact-string" = dontDistribute super."compact-string";
+  "compact-string-fix" = dontDistribute super."compact-string-fix";
+  "compare-type" = dontDistribute super."compare-type";
+  "compdata-automata" = dontDistribute super."compdata-automata";
+  "compdata-dags" = dontDistribute super."compdata-dags";
+  "compdata-param" = dontDistribute super."compdata-param";
+  "compensated" = dontDistribute super."compensated";
+  "competition" = dontDistribute super."competition";
+  "compilation" = dontDistribute super."compilation";
+  "complex-generic" = dontDistribute super."complex-generic";
+  "complex-integrate" = dontDistribute super."complex-integrate";
+  "complexity" = dontDistribute super."complexity";
+  "compose-ltr" = dontDistribute super."compose-ltr";
+  "compose-trans" = dontDistribute super."compose-trans";
+  "compression" = dontDistribute super."compression";
+  "compstrat" = dontDistribute super."compstrat";
+  "comptrans" = dontDistribute super."comptrans";
+  "computational-algebra" = dontDistribute super."computational-algebra";
+  "computations" = dontDistribute super."computations";
+  "conceit" = dontDistribute super."conceit";
+  "concorde" = dontDistribute super."concorde";
+  "concraft" = dontDistribute super."concraft";
+  "concraft-hr" = dontDistribute super."concraft-hr";
+  "concraft-pl" = dontDistribute super."concraft-pl";
+  "concrete-relaxng-parser" = dontDistribute super."concrete-relaxng-parser";
+  "concrete-typerep" = dontDistribute super."concrete-typerep";
+  "concurrent-barrier" = dontDistribute super."concurrent-barrier";
+  "concurrent-dns-cache" = dontDistribute super."concurrent-dns-cache";
+  "concurrent-extra" = dontDistribute super."concurrent-extra";
+  "concurrent-machines" = dontDistribute super."concurrent-machines";
+  "concurrent-sa" = dontDistribute super."concurrent-sa";
+  "concurrent-split" = dontDistribute super."concurrent-split";
+  "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-utilities" = dontDistribute super."concurrent-utilities";
+  "concurrentoutput" = dontDistribute super."concurrentoutput";
+  "cond" = dontDistribute super."cond";
+  "condor" = dontDistribute super."condor";
+  "condorcet" = dontDistribute super."condorcet";
+  "conductive-base" = dontDistribute super."conductive-base";
+  "conductive-clock" = dontDistribute super."conductive-clock";
+  "conductive-hsc3" = dontDistribute super."conductive-hsc3";
+  "conductive-song" = dontDistribute super."conductive-song";
+  "conduit-audio" = dontDistribute super."conduit-audio";
+  "conduit-audio-lame" = dontDistribute super."conduit-audio-lame";
+  "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate";
+  "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile";
+  "conduit-network-stream" = dontDistribute super."conduit-network-stream";
+  "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conf" = dontDistribute super."conf";
+  "config-select" = dontDistribute super."config-select";
+  "config-value" = dontDistribute super."config-value";
+  "configifier" = dontDistribute super."configifier";
+  "configuration" = dontDistribute super."configuration";
+  "configuration-tools" = dontDistribute super."configuration-tools";
+  "confsolve" = dontDistribute super."confsolve";
+  "congruence-relation" = dontDistribute super."congruence-relation";
+  "conjugateGradient" = dontDistribute super."conjugateGradient";
+  "conjure" = dontDistribute super."conjure";
+  "conlogger" = dontDistribute super."conlogger";
+  "connection-pool" = dontDistribute super."connection-pool";
+  "consistent" = dontDistribute super."consistent";
+  "console-program" = dontDistribute super."console-program";
+  "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin";
+  "constrained-categories" = dontDistribute super."constrained-categories";
+  "constrained-normal" = dontDistribute super."constrained-normal";
+  "constructible" = dontDistribute super."constructible";
+  "constructive-algebra" = dontDistribute super."constructive-algebra";
+  "consumers" = dontDistribute super."consumers";
+  "container" = dontDistribute super."container";
+  "container-classes" = dontDistribute super."container-classes";
+  "containers-benchmark" = dontDistribute super."containers-benchmark";
+  "containers-deepseq" = dontDistribute super."containers-deepseq";
+  "context-free-grammar" = dontDistribute super."context-free-grammar";
+  "context-stack" = dontDistribute super."context-stack";
+  "continue" = dontDistribute super."continue";
+  "continued-fractions" = dontDistribute super."continued-fractions";
+  "continuum" = dontDistribute super."continuum";
+  "continuum-client" = dontDistribute super."continuum-client";
+  "control-event" = dontDistribute super."control-event";
+  "control-monad-attempt" = dontDistribute super."control-monad-attempt";
+  "control-monad-exception" = dontDistribute super."control-monad-exception";
+  "control-monad-exception-monadsfd" = dontDistribute super."control-monad-exception-monadsfd";
+  "control-monad-exception-monadstf" = dontDistribute super."control-monad-exception-monadstf";
+  "control-monad-exception-mtl" = dontDistribute super."control-monad-exception-mtl";
+  "control-monad-failure" = dontDistribute super."control-monad-failure";
+  "control-monad-failure-mtl" = dontDistribute super."control-monad-failure-mtl";
+  "control-monad-omega" = dontDistribute super."control-monad-omega";
+  "control-monad-queue" = dontDistribute super."control-monad-queue";
+  "control-timeout" = dontDistribute super."control-timeout";
+  "contstuff" = dontDistribute super."contstuff";
+  "contstuff-monads-tf" = dontDistribute super."contstuff-monads-tf";
+  "contstuff-transformers" = dontDistribute super."contstuff-transformers";
+  "converge" = dontDistribute super."converge";
+  "conversion" = dontDistribute super."conversion";
+  "conversion-bytestring" = dontDistribute super."conversion-bytestring";
+  "conversion-case-insensitive" = dontDistribute super."conversion-case-insensitive";
+  "conversion-text" = dontDistribute super."conversion-text";
+  "convert" = dontDistribute super."convert";
+  "convertible-ascii" = dontDistribute super."convertible-ascii";
+  "convertible-text" = dontDistribute super."convertible-text";
+  "cookbook" = dontDistribute super."cookbook";
+  "coordinate" = dontDistribute super."coordinate";
+  "copilot" = dontDistribute super."copilot";
+  "copilot-c99" = dontDistribute super."copilot-c99";
+  "copilot-cbmc" = dontDistribute super."copilot-cbmc";
+  "copilot-core" = dontDistribute super."copilot-core";
+  "copilot-language" = dontDistribute super."copilot-language";
+  "copilot-libraries" = dontDistribute super."copilot-libraries";
+  "copilot-sbv" = dontDistribute super."copilot-sbv";
+  "copilot-theorem" = dontDistribute super."copilot-theorem";
+  "copr" = dontDistribute super."copr";
+  "core" = dontDistribute super."core";
+  "core-haskell" = dontDistribute super."core-haskell";
+  "corebot-bliki" = dontDistribute super."corebot-bliki";
+  "coroutine-enumerator" = dontDistribute super."coroutine-enumerator";
+  "coroutine-iteratee" = dontDistribute super."coroutine-iteratee";
+  "coroutine-object" = dontDistribute super."coroutine-object";
+  "couch-hs" = dontDistribute super."couch-hs";
+  "couch-simple" = dontDistribute super."couch-simple";
+  "couchdb-conduit" = dontDistribute super."couchdb-conduit";
+  "couchdb-enumerator" = dontDistribute super."couchdb-enumerator";
+  "count" = dontDistribute super."count";
+  "countable" = dontDistribute super."countable";
+  "counter" = dontDistribute super."counter";
+  "court" = dontDistribute super."court";
+  "coverage" = dontDistribute super."coverage";
+  "cpio-conduit" = dontDistribute super."cpio-conduit";
+  "cplusplus-th" = dontDistribute super."cplusplus-th";
+  "cprng-aes-effect" = dontDistribute super."cprng-aes-effect";
+  "cpsa" = dontDistribute super."cpsa";
+  "cpuid" = dontDistribute super."cpuid";
+  "cpuperf" = dontDistribute super."cpuperf";
+  "cpython" = dontDistribute super."cpython";
+  "cqrs" = dontDistribute super."cqrs";
+  "cqrs-core" = dontDistribute super."cqrs-core";
+  "cqrs-example" = dontDistribute super."cqrs-example";
+  "cqrs-memory" = dontDistribute super."cqrs-memory";
+  "cqrs-postgresql" = dontDistribute super."cqrs-postgresql";
+  "cqrs-sqlite3" = dontDistribute super."cqrs-sqlite3";
+  "cqrs-test" = dontDistribute super."cqrs-test";
+  "cqrs-testkit" = dontDistribute super."cqrs-testkit";
+  "cqrs-types" = dontDistribute super."cqrs-types";
+  "cr" = dontDistribute super."cr";
+  "crack" = dontDistribute super."crack";
+  "craftwerk" = dontDistribute super."craftwerk";
+  "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
+  "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "crc16" = dontDistribute super."crc16";
+  "crc16-table" = dontDistribute super."crc16-table";
+  "creatur" = dontDistribute super."creatur";
+  "crf-chain1" = dontDistribute super."crf-chain1";
+  "crf-chain1-constrained" = dontDistribute super."crf-chain1-constrained";
+  "crf-chain2-generic" = dontDistribute super."crf-chain2-generic";
+  "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers";
+  "critbit" = dontDistribute super."critbit";
+  "criterion-plus" = dontDistribute super."criterion-plus";
+  "criterion-to-html" = dontDistribute super."criterion-to-html";
+  "crockford" = dontDistribute super."crockford";
+  "crocodile" = dontDistribute super."crocodile";
+  "cron-compat" = dontDistribute super."cron-compat";
+  "cruncher-types" = dontDistribute super."cruncher-types";
+  "crunghc" = dontDistribute super."crunghc";
+  "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks";
+  "crypto-classical" = dontDistribute super."crypto-classical";
+  "crypto-conduit" = dontDistribute super."crypto-conduit";
+  "crypto-enigma" = dontDistribute super."crypto-enigma";
+  "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh";
+  "crypto-random-effect" = dontDistribute super."crypto-random-effect";
+  "crypto-totp" = dontDistribute super."crypto-totp";
+  "cryptsy-api" = dontDistribute super."cryptsy-api";
+  "crystalfontz" = dontDistribute super."crystalfontz";
+  "cse-ghc-plugin" = dontDistribute super."cse-ghc-plugin";
+  "csound-catalog" = dontDistribute super."csound-catalog";
+  "csound-expression" = dontDistribute super."csound-expression";
+  "csound-expression-dynamic" = dontDistribute super."csound-expression-dynamic";
+  "csound-expression-opcodes" = dontDistribute super."csound-expression-opcodes";
+  "csound-expression-typed" = dontDistribute super."csound-expression-typed";
+  "csound-sampler" = dontDistribute super."csound-sampler";
+  "csp" = dontDistribute super."csp";
+  "cspmchecker" = dontDistribute super."cspmchecker";
+  "css" = dontDistribute super."css";
+  "csv-enumerator" = dontDistribute super."csv-enumerator";
+  "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-to-qif" = dontDistribute super."csv-to-qif";
+  "ctemplate" = dontDistribute super."ctemplate";
+  "ctkl" = dontDistribute super."ctkl";
+  "ctpl" = dontDistribute super."ctpl";
+  "cube" = dontDistribute super."cube";
+  "cubical" = dontDistribute super."cubical";
+  "cubicbezier" = dontDistribute super."cubicbezier";
+  "cublas" = dontDistribute super."cublas";
+  "cuboid" = dontDistribute super."cuboid";
+  "cuda" = dontDistribute super."cuda";
+  "cudd" = dontDistribute super."cudd";
+  "cufft" = dontDistribute super."cufft";
+  "curl-aeson" = dontDistribute super."curl-aeson";
+  "curlhs" = dontDistribute super."curlhs";
+  "currency" = dontDistribute super."currency";
+  "current-locale" = dontDistribute super."current-locale";
+  "curry-base" = dontDistribute super."curry-base";
+  "curry-frontend" = dontDistribute super."curry-frontend";
+  "cursedcsv" = dontDistribute super."cursedcsv";
+  "curve25519" = dontDistribute super."curve25519";
+  "curves" = dontDistribute super."curves";
+  "custom-prelude" = dontDistribute super."custom-prelude";
+  "cv-combinators" = dontDistribute super."cv-combinators";
+  "cyclotomic" = dontDistribute super."cyclotomic";
+  "cypher" = dontDistribute super."cypher";
+  "d-bus" = dontDistribute super."d-bus";
+  "d3js" = dontDistribute super."d3js";
+  "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
+  "daemons" = dontDistribute super."daemons";
+  "dag" = dontDistribute super."dag";
+  "damnpacket" = dontDistribute super."damnpacket";
+  "dao" = dontDistribute super."dao";
+  "dapi" = dontDistribute super."dapi";
+  "darcs" = dontDistribute super."darcs";
+  "darcs-benchmark" = dontDistribute super."darcs-benchmark";
+  "darcs-beta" = dontDistribute super."darcs-beta";
+  "darcs-buildpackage" = dontDistribute super."darcs-buildpackage";
+  "darcs-cabalized" = dontDistribute super."darcs-cabalized";
+  "darcs-fastconvert" = dontDistribute super."darcs-fastconvert";
+  "darcs-graph" = dontDistribute super."darcs-graph";
+  "darcs-monitor" = dontDistribute super."darcs-monitor";
+  "darcs-scripts" = dontDistribute super."darcs-scripts";
+  "darcs2dot" = dontDistribute super."darcs2dot";
+  "darcsden" = dontDistribute super."darcsden";
+  "darcswatch" = dontDistribute super."darcswatch";
+  "darkplaces-demo" = dontDistribute super."darkplaces-demo";
+  "darkplaces-rcon" = dontDistribute super."darkplaces-rcon";
+  "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
+  "darkplaces-text" = dontDistribute super."darkplaces-text";
+  "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor-monadLib" = dontDistribute super."data-accessor-monadLib";
+  "data-accessor-monads-fd" = dontDistribute super."data-accessor-monads-fd";
+  "data-accessor-monads-tf" = dontDistribute super."data-accessor-monads-tf";
+  "data-accessor-template" = dontDistribute super."data-accessor-template";
+  "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
+  "data-aviary" = dontDistribute super."data-aviary";
+  "data-bword" = dontDistribute super."data-bword";
+  "data-carousel" = dontDistribute super."data-carousel";
+  "data-category" = dontDistribute super."data-category";
+  "data-cell" = dontDistribute super."data-cell";
+  "data-checked" = dontDistribute super."data-checked";
+  "data-clist" = dontDistribute super."data-clist";
+  "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
+  "data-construction" = dontDistribute super."data-construction";
+  "data-cycle" = dontDistribute super."data-cycle";
+  "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-dispersal" = dontDistribute super."data-dispersal";
+  "data-dword" = dontDistribute super."data-dword";
+  "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
+  "data-endian" = dontDistribute super."data-endian";
+  "data-extend-generic" = dontDistribute super."data-extend-generic";
+  "data-extra" = dontDistribute super."data-extra";
+  "data-filepath" = dontDistribute super."data-filepath";
+  "data-fin" = dontDistribute super."data-fin";
+  "data-fin-simple" = dontDistribute super."data-fin-simple";
+  "data-fix" = dontDistribute super."data-fix";
+  "data-fix-cse" = dontDistribute super."data-fix-cse";
+  "data-flags" = dontDistribute super."data-flags";
+  "data-flagset" = dontDistribute super."data-flagset";
+  "data-fresh" = dontDistribute super."data-fresh";
+  "data-interval" = dontDistribute super."data-interval";
+  "data-ivar" = dontDistribute super."data-ivar";
+  "data-kiln" = dontDistribute super."data-kiln";
+  "data-layer" = dontDistribute super."data-layer";
+  "data-layout" = dontDistribute super."data-layout";
+  "data-lens" = dontDistribute super."data-lens";
+  "data-lens-fd" = dontDistribute super."data-lens-fd";
+  "data-lens-ixset" = dontDistribute super."data-lens-ixset";
+  "data-lens-template" = dontDistribute super."data-lens-template";
+  "data-list-sequences" = dontDistribute super."data-list-sequences";
+  "data-map-multikey" = dontDistribute super."data-map-multikey";
+  "data-named" = dontDistribute super."data-named";
+  "data-nat" = dontDistribute super."data-nat";
+  "data-object" = dontDistribute super."data-object";
+  "data-object-json" = dontDistribute super."data-object-json";
+  "data-object-yaml" = dontDistribute super."data-object-yaml";
+  "data-or" = dontDistribute super."data-or";
+  "data-partition" = dontDistribute super."data-partition";
+  "data-pprint" = dontDistribute super."data-pprint";
+  "data-quotientref" = dontDistribute super."data-quotientref";
+  "data-r-tree" = dontDistribute super."data-r-tree";
+  "data-ref" = dontDistribute super."data-ref";
+  "data-reify-cse" = dontDistribute super."data-reify-cse";
+  "data-repr" = dontDistribute super."data-repr";
+  "data-rev" = dontDistribute super."data-rev";
+  "data-rope" = dontDistribute super."data-rope";
+  "data-rtuple" = dontDistribute super."data-rtuple";
+  "data-size" = dontDistribute super."data-size";
+  "data-spacepart" = dontDistribute super."data-spacepart";
+  "data-store" = dontDistribute super."data-store";
+  "data-stringmap" = dontDistribute super."data-stringmap";
+  "data-structure-inferrer" = dontDistribute super."data-structure-inferrer";
+  "data-tensor" = dontDistribute super."data-tensor";
+  "data-textual" = dontDistribute super."data-textual";
+  "data-timeout" = dontDistribute super."data-timeout";
+  "data-transform" = dontDistribute super."data-transform";
+  "data-treify" = dontDistribute super."data-treify";
+  "data-type" = dontDistribute super."data-type";
+  "data-util" = dontDistribute super."data-util";
+  "data-variant" = dontDistribute super."data-variant";
+  "database-migrate" = dontDistribute super."database-migrate";
+  "database-study" = dontDistribute super."database-study";
+  "datadog" = dontDistribute super."datadog";
+  "dataenc" = dontDistribute super."dataenc";
+  "dataflow" = dontDistribute super."dataflow";
+  "datalog" = dontDistribute super."datalog";
+  "datapacker" = dontDistribute super."datapacker";
+  "dataurl" = dontDistribute super."dataurl";
+  "date-cache" = dontDistribute super."date-cache";
+  "dates" = dontDistribute super."dates";
+  "datetime" = dontDistribute super."datetime";
+  "datetime-sb" = dontDistribute super."datetime-sb";
+  "dawdle" = dontDistribute super."dawdle";
+  "dawg" = dontDistribute super."dawg";
+  "dbcleaner" = dontDistribute super."dbcleaner";
+  "dbf" = dontDistribute super."dbf";
+  "dbjava" = dontDistribute super."dbjava";
+  "dbus-client" = dontDistribute super."dbus-client";
+  "dbus-core" = dontDistribute super."dbus-core";
+  "dbus-qq" = dontDistribute super."dbus-qq";
+  "dbus-th" = dontDistribute super."dbus-th";
+  "dclabel" = dontDistribute super."dclabel";
+  "dclabel-eci11" = dontDistribute super."dclabel-eci11";
+  "ddc-base" = dontDistribute super."ddc-base";
+  "ddc-build" = dontDistribute super."ddc-build";
+  "ddc-code" = dontDistribute super."ddc-code";
+  "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-eval" = dontDistribute super."ddc-core-eval";
+  "ddc-core-flow" = dontDistribute super."ddc-core-flow";
+  "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
+  "ddc-core-salt" = dontDistribute super."ddc-core-salt";
+  "ddc-core-simpl" = dontDistribute super."ddc-core-simpl";
+  "ddc-core-tetra" = dontDistribute super."ddc-core-tetra";
+  "ddc-driver" = dontDistribute super."ddc-driver";
+  "ddc-interface" = dontDistribute super."ddc-interface";
+  "ddc-source-tetra" = dontDistribute super."ddc-source-tetra";
+  "ddc-tools" = dontDistribute super."ddc-tools";
+  "ddc-war" = dontDistribute super."ddc-war";
+  "ddci-core" = dontDistribute super."ddci-core";
+  "dead-code-detection" = dontDistribute super."dead-code-detection";
+  "dead-simple-json" = dontDistribute super."dead-simple-json";
+  "debian-binary" = dontDistribute super."debian-binary";
+  "debian-build" = dontDistribute super."debian-build";
+  "debug-diff" = dontDistribute super."debug-diff";
+  "decepticons" = dontDistribute super."decepticons";
+  "decode-utf8" = dontDistribute super."decode-utf8";
+  "decoder-conduit" = dontDistribute super."decoder-conduit";
+  "dedukti" = dontDistribute super."dedukti";
+  "deepcontrol" = dontDistribute super."deepcontrol";
+  "deeplearning-hs" = dontDistribute super."deeplearning-hs";
+  "deepseq-bounded" = dontDistribute super."deepseq-bounded";
+  "deepseq-magic" = dontDistribute super."deepseq-magic";
+  "deepseq-th" = dontDistribute super."deepseq-th";
+  "deepzoom" = dontDistribute super."deepzoom";
+  "defargs" = dontDistribute super."defargs";
+  "definitive-base" = dontDistribute super."definitive-base";
+  "definitive-filesystem" = dontDistribute super."definitive-filesystem";
+  "definitive-graphics" = dontDistribute super."definitive-graphics";
+  "definitive-parser" = dontDistribute super."definitive-parser";
+  "definitive-reactive" = dontDistribute super."definitive-reactive";
+  "definitive-sound" = dontDistribute super."definitive-sound";
+  "deiko-config" = dontDistribute super."deiko-config";
+  "deka" = dontDistribute super."deka";
+  "deka-tests" = dontDistribute super."deka-tests";
+  "delaunay" = dontDistribute super."delaunay";
+  "delicious" = dontDistribute super."delicious";
+  "delimited-text" = dontDistribute super."delimited-text";
+  "delimiter-separated" = dontDistribute super."delimiter-separated";
+  "delta" = dontDistribute super."delta";
+  "delta-h" = dontDistribute super."delta-h";
+  "demarcate" = dontDistribute super."demarcate";
+  "denominate" = dontDistribute super."denominate";
+  "depends" = dontDistribute super."depends";
+  "dephd" = dontDistribute super."dephd";
+  "dequeue" = dontDistribute super."dequeue";
+  "derangement" = dontDistribute super."derangement";
+  "derivation-trees" = dontDistribute super."derivation-trees";
+  "derive-IG" = dontDistribute super."derive-IG";
+  "derive-enumerable" = dontDistribute super."derive-enumerable";
+  "derive-gadt" = dontDistribute super."derive-gadt";
+  "derive-topdown" = dontDistribute super."derive-topdown";
+  "derive-trie" = dontDistribute super."derive-trie";
+  "deriving-compat" = dontDistribute super."deriving-compat";
+  "derp" = dontDistribute super."derp";
+  "derp-lib" = dontDistribute super."derp-lib";
+  "descrilo" = dontDistribute super."descrilo";
+  "despair" = dontDistribute super."despair";
+  "deterministic-game-engine" = dontDistribute super."deterministic-game-engine";
+  "detrospector" = dontDistribute super."detrospector";
+  "deunicode" = dontDistribute super."deunicode";
+  "devil" = dontDistribute super."devil";
+  "dewdrop" = dontDistribute super."dewdrop";
+  "dfrac" = dontDistribute super."dfrac";
+  "dfsbuild" = dontDistribute super."dfsbuild";
+  "dgim" = dontDistribute super."dgim";
+  "dgs" = dontDistribute super."dgs";
+  "dia-base" = dontDistribute super."dia-base";
+  "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams-canvas" = dontDistribute super."diagrams-canvas";
+  "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
+  "diagrams-gtk" = dontDistribute super."diagrams-gtk";
+  "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
+  "diagrams-pdf" = dontDistribute super."diagrams-pdf";
+  "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
+  "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
+  "diagrams-tikz" = dontDistribute super."diagrams-tikz";
+  "dialog" = dontDistribute super."dialog";
+  "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
+  "dicom" = dontDistribute super."dicom";
+  "dictparser" = dontDistribute super."dictparser";
+  "diet" = dontDistribute super."diet";
+  "diff-gestalt" = dontDistribute super."diff-gestalt";
+  "diff-parse" = dontDistribute super."diff-parse";
+  "diffarray" = dontDistribute super."diffarray";
+  "diffcabal" = dontDistribute super."diffcabal";
+  "diffdump" = dontDistribute super."diffdump";
+  "digamma" = dontDistribute super."digamma";
+  "digest-pure" = dontDistribute super."digest-pure";
+  "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid";
+  "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack";
+  "digestive-functors-heist" = dontDistribute super."digestive-functors-heist";
+  "digestive-functors-hsp" = dontDistribute super."digestive-functors-hsp";
+  "digestive-functors-scotty" = dontDistribute super."digestive-functors-scotty";
+  "digestive-functors-snap" = dontDistribute super."digestive-functors-snap";
+  "digit" = dontDistribute super."digit";
+  "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
+  "dimensional-tf" = dontDistribute super."dimensional-tf";
+  "dingo-core" = dontDistribute super."dingo-core";
+  "dingo-example" = dontDistribute super."dingo-example";
+  "dingo-widgets" = dontDistribute super."dingo-widgets";
+  "diophantine" = dontDistribute super."diophantine";
+  "diplomacy" = dontDistribute super."diplomacy";
+  "diplomacy-server" = dontDistribute super."diplomacy-server";
+  "direct-binary-files" = dontDistribute super."direct-binary-files";
+  "direct-daemonize" = dontDistribute super."direct-daemonize";
+  "direct-fastcgi" = dontDistribute super."direct-fastcgi";
+  "direct-http" = dontDistribute super."direct-http";
+  "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
+  "direct-plugins" = dontDistribute super."direct-plugins";
+  "directed-cubical" = dontDistribute super."directed-cubical";
+  "directory-layout" = dontDistribute super."directory-layout";
+  "dirfiles" = dontDistribute super."dirfiles";
+  "dirstream" = dontDistribute super."dirstream";
+  "disassembler" = dontDistribute super."disassembler";
+  "discordian-calendar" = dontDistribute super."discordian-calendar";
+  "discount" = dontDistribute super."discount";
+  "discrete-space-map" = dontDistribute super."discrete-space-map";
+  "discrimination" = dontDistribute super."discrimination";
+  "disjoint-set" = dontDistribute super."disjoint-set";
+  "disjoint-sets-st" = dontDistribute super."disjoint-sets-st";
+  "dist-upload" = dontDistribute super."dist-upload";
+  "distributed-closure" = dontDistribute super."distributed-closure";
+  "distributed-process-async" = dontDistribute super."distributed-process-async";
+  "distributed-process-azure" = dontDistribute super."distributed-process-azure";
+  "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-execution" = dontDistribute super."distributed-process-execution";
+  "distributed-process-extras" = dontDistribute super."distributed-process-extras";
+  "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
+  "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
+  "distributed-process-platform" = dontDistribute super."distributed-process-platform";
+  "distributed-process-registry" = dontDistribute super."distributed-process-registry";
+  "distributed-process-simplelocalnet" = dontDistribute super."distributed-process-simplelocalnet";
+  "distributed-process-supervisor" = dontDistribute super."distributed-process-supervisor";
+  "distributed-process-task" = dontDistribute super."distributed-process-task";
+  "distributed-process-tests" = dontDistribute super."distributed-process-tests";
+  "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper";
+  "distribution" = dontDistribute super."distribution";
+  "distribution-plot" = dontDistribute super."distribution-plot";
+  "djinn" = dontDistribute super."djinn";
+  "djinn-th" = dontDistribute super."djinn-th";
+  "dnscache" = dontDistribute super."dnscache";
+  "dnsrbl" = dontDistribute super."dnsrbl";
+  "dnssd" = dontDistribute super."dnssd";
+  "doc-review" = dontDistribute super."doc-review";
+  "doccheck" = dontDistribute super."doccheck";
+  "docidx" = dontDistribute super."docidx";
+  "docker" = dontDistribute super."docker";
+  "dockercook" = dontDistribute super."dockercook";
+  "doctest-discover" = dontDistribute super."doctest-discover";
+  "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
+  "doctest-prop" = dontDistribute super."doctest-prop";
+  "dom-lt" = dontDistribute super."dom-lt";
+  "dom-selector" = dontDistribute super."dom-selector";
+  "domain-auth" = dontDistribute super."domain-auth";
+  "dominion" = dontDistribute super."dominion";
+  "domplate" = dontDistribute super."domplate";
+  "dot2graphml" = dontDistribute super."dot2graphml";
+  "dotenv" = dontDistribute super."dotenv";
+  "dotfs" = dontDistribute super."dotfs";
+  "dotgen" = dontDistribute super."dotgen";
+  "double-metaphone" = dontDistribute super."double-metaphone";
+  "dove" = dontDistribute super."dove";
+  "dow" = dontDistribute super."dow";
+  "download" = dontDistribute super."download";
+  "download-curl" = dontDistribute super."download-curl";
+  "download-media-content" = dontDistribute super."download-media-content";
+  "dozenal" = dontDistribute super."dozenal";
+  "dozens" = dontDistribute super."dozens";
+  "dph-base" = dontDistribute super."dph-base";
+  "dph-examples" = dontDistribute super."dph-examples";
+  "dph-lifted-base" = dontDistribute super."dph-lifted-base";
+  "dph-lifted-copy" = dontDistribute super."dph-lifted-copy";
+  "dph-lifted-vseg" = dontDistribute super."dph-lifted-vseg";
+  "dph-par" = dontDistribute super."dph-par";
+  "dph-prim-interface" = dontDistribute super."dph-prim-interface";
+  "dph-prim-par" = dontDistribute super."dph-prim-par";
+  "dph-prim-seq" = dontDistribute super."dph-prim-seq";
+  "dph-seq" = dontDistribute super."dph-seq";
+  "dpkg" = dontDistribute super."dpkg";
+  "drClickOn" = dontDistribute super."drClickOn";
+  "draw-poker" = dontDistribute super."draw-poker";
+  "drifter" = dontDistribute super."drifter";
+  "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "dropbox-sdk" = dontDistribute super."dropbox-sdk";
+  "dropsolve" = dontDistribute super."dropsolve";
+  "ds-kanren" = dontDistribute super."ds-kanren";
+  "dsh-sql" = dontDistribute super."dsh-sql";
+  "dsmc" = dontDistribute super."dsmc";
+  "dsmc-tools" = dontDistribute super."dsmc-tools";
+  "dson" = dontDistribute super."dson";
+  "dson-parsec" = dontDistribute super."dson-parsec";
+  "dsp" = dontDistribute super."dsp";
+  "dstring" = dontDistribute super."dstring";
+  "dtab" = dontDistribute super."dtab";
+  "dtd" = dontDistribute super."dtd";
+  "dtd-text" = dontDistribute super."dtd-text";
+  "dtd-types" = dontDistribute super."dtd-types";
+  "dtrace" = dontDistribute super."dtrace";
+  "dtw" = dontDistribute super."dtw";
+  "dump" = dontDistribute super."dump";
+  "duplo" = dontDistribute super."duplo";
+  "dvda" = dontDistribute super."dvda";
+  "dvdread" = dontDistribute super."dvdread";
+  "dvi-processing" = dontDistribute super."dvi-processing";
+  "dvorak" = dontDistribute super."dvorak";
+  "dwarf" = dontDistribute super."dwarf";
+  "dwarf-el" = dontDistribute super."dwarf-el";
+  "dwarfadt" = dontDistribute super."dwarfadt";
+  "dx9base" = dontDistribute super."dx9base";
+  "dx9d3d" = dontDistribute super."dx9d3d";
+  "dx9d3dx" = dontDistribute super."dx9d3dx";
+  "dynamic-cabal" = dontDistribute super."dynamic-cabal";
+  "dynamic-graph" = dontDistribute super."dynamic-graph";
+  "dynamic-linker-template" = dontDistribute super."dynamic-linker-template";
+  "dynamic-loader" = dontDistribute super."dynamic-loader";
+  "dynamic-mvector" = dontDistribute super."dynamic-mvector";
+  "dynamic-object" = dontDistribute super."dynamic-object";
+  "dynamic-plot" = dontDistribute super."dynamic-plot";
+  "dynamic-pp" = dontDistribute super."dynamic-pp";
+  "dynobud" = dontDistribute super."dynobud";
+  "dywapitchtrack" = dontDistribute super."dywapitchtrack";
+  "dzen-utils" = dontDistribute super."dzen-utils";
+  "eager-sockets" = dontDistribute super."eager-sockets";
+  "easy-api" = dontDistribute super."easy-api";
+  "easy-bitcoin" = dontDistribute super."easy-bitcoin";
+  "easyjson" = dontDistribute super."easyjson";
+  "easyplot" = dontDistribute super."easyplot";
+  "easyrender" = dontDistribute super."easyrender";
+  "ebeats" = dontDistribute super."ebeats";
+  "ebnf-bff" = dontDistribute super."ebnf-bff";
+  "ec2-signature" = dontDistribute super."ec2-signature";
+  "ecdsa" = dontDistribute super."ecdsa";
+  "ecma262" = dontDistribute super."ecma262";
+  "ecu" = dontDistribute super."ecu";
+  "ed25519" = dontDistribute super."ed25519";
+  "ed25519-donna" = dontDistribute super."ed25519-donna";
+  "eddie" = dontDistribute super."eddie";
+  "edenmodules" = dontDistribute super."edenmodules";
+  "edenskel" = dontDistribute super."edenskel";
+  "edentv" = dontDistribute super."edentv";
+  "edge" = dontDistribute super."edge";
+  "edis" = dontDistribute super."edis";
+  "edit-lenses" = dontDistribute super."edit-lenses";
+  "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
+  "editable" = dontDistribute super."editable";
+  "editline" = dontDistribute super."editline";
+  "effect-monad" = dontDistribute super."effect-monad";
+  "effective-aspects" = dontDistribute super."effective-aspects";
+  "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
+  "effects" = dontDistribute super."effects";
+  "effects-parser" = dontDistribute super."effects-parser";
+  "effin" = dontDistribute super."effin";
+  "egison" = dontDistribute super."egison";
+  "egison-quote" = dontDistribute super."egison-quote";
+  "egison-tutorial" = dontDistribute super."egison-tutorial";
+  "ehaskell" = dontDistribute super."ehaskell";
+  "ehs" = dontDistribute super."ehs";
+  "eibd-client-simple" = dontDistribute super."eibd-client-simple";
+  "eigen" = dontDistribute super."eigen";
+  "eithers" = dontDistribute super."eithers";
+  "ekg-bosun" = dontDistribute super."ekg-bosun";
+  "ekg-carbon" = dontDistribute super."ekg-carbon";
+  "ekg-log" = dontDistribute super."ekg-log";
+  "ekg-push" = dontDistribute super."ekg-push";
+  "ekg-rrd" = dontDistribute super."ekg-rrd";
+  "ekg-statsd" = dontDistribute super."ekg-statsd";
+  "electrum-mnemonic" = dontDistribute super."electrum-mnemonic";
+  "elerea" = dontDistribute super."elerea";
+  "elerea-examples" = dontDistribute super."elerea-examples";
+  "elerea-sdl" = dontDistribute super."elerea-sdl";
+  "elevator" = dontDistribute super."elevator";
+  "elf" = dontDistribute super."elf";
+  "elm-build-lib" = dontDistribute super."elm-build-lib";
+  "elm-compiler" = dontDistribute super."elm-compiler";
+  "elm-get" = dontDistribute super."elm-get";
+  "elm-init" = dontDistribute super."elm-init";
+  "elm-make" = dontDistribute super."elm-make";
+  "elm-package" = dontDistribute super."elm-package";
+  "elm-reactor" = dontDistribute super."elm-reactor";
+  "elm-repl" = dontDistribute super."elm-repl";
+  "elm-server" = dontDistribute super."elm-server";
+  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
+  "elocrypt" = dontDistribute super."elocrypt";
+  "emacs-keys" = dontDistribute super."emacs-keys";
+  "email" = dontDistribute super."email";
+  "email-header" = dontDistribute super."email-header";
+  "email-postmark" = dontDistribute super."email-postmark";
+  "email-validator" = dontDistribute super."email-validator";
+  "embeddock" = dontDistribute super."embeddock";
+  "embeddock-example" = dontDistribute super."embeddock-example";
+  "embroidery" = dontDistribute super."embroidery";
+  "emgm" = dontDistribute super."emgm";
+  "empty" = dontDistribute super."empty";
+  "encoding" = dontDistribute super."encoding";
+  "endo" = dontDistribute super."endo";
+  "engine-io-growler" = dontDistribute super."engine-io-growler";
+  "engine-io-snap" = dontDistribute super."engine-io-snap";
+  "engineering-units" = dontDistribute super."engineering-units";
+  "enumerable" = dontDistribute super."enumerable";
+  "enumerate" = dontDistribute super."enumerate";
+  "enumeration" = dontDistribute super."enumeration";
+  "enumerator-fd" = dontDistribute super."enumerator-fd";
+  "enumerator-tf" = dontDistribute super."enumerator-tf";
+  "enumfun" = dontDistribute super."enumfun";
+  "enummapmap" = dontDistribute super."enummapmap";
+  "enummapset" = dontDistribute super."enummapset";
+  "enummapset-th" = dontDistribute super."enummapset-th";
+  "enumset" = dontDistribute super."enumset";
+  "env-parser" = dontDistribute super."env-parser";
+  "envparse" = dontDistribute super."envparse";
+  "envy" = dontDistribute super."envy";
+  "epanet-haskell" = dontDistribute super."epanet-haskell";
+  "epass" = dontDistribute super."epass";
+  "epic" = dontDistribute super."epic";
+  "epoll" = dontDistribute super."epoll";
+  "eprocess" = dontDistribute super."eprocess";
+  "epub" = dontDistribute super."epub";
+  "epub-metadata" = dontDistribute super."epub-metadata";
+  "epub-tools" = dontDistribute super."epub-tools";
+  "epubname" = dontDistribute super."epubname";
+  "equal-files" = dontDistribute super."equal-files";
+  "equational-reasoning" = dontDistribute super."equational-reasoning";
+  "erd" = dontDistribute super."erd";
+  "erf-native" = dontDistribute super."erf-native";
+  "erlang" = dontDistribute super."erlang";
+  "eros" = dontDistribute super."eros";
+  "eros-client" = dontDistribute super."eros-client";
+  "eros-http" = dontDistribute super."eros-http";
+  "errno" = dontDistribute super."errno";
+  "error-analyze" = dontDistribute super."error-analyze";
+  "error-continuations" = dontDistribute super."error-continuations";
+  "error-list" = dontDistribute super."error-list";
+  "error-loc" = dontDistribute super."error-loc";
+  "error-location" = dontDistribute super."error-location";
+  "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
+  "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance";
+  "ersatz" = dontDistribute super."ersatz";
+  "ersatz-toysat" = dontDistribute super."ersatz-toysat";
+  "ert" = dontDistribute super."ert";
+  "esotericbot" = dontDistribute super."esotericbot";
+  "ess" = dontDistribute super."ess";
+  "estimator" = dontDistribute super."estimator";
+  "estimators" = dontDistribute super."estimators";
+  "estreps" = dontDistribute super."estreps";
+  "eternal" = dontDistribute super."eternal";
+  "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell";
+  "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db";
+  "ethereum-rlp" = dontDistribute super."ethereum-rlp";
+  "ety" = dontDistribute super."ety";
+  "euler" = dontDistribute super."euler";
+  "euphoria" = dontDistribute super."euphoria";
+  "eurofxref" = dontDistribute super."eurofxref";
+  "event-driven" = dontDistribute super."event-driven";
+  "event-handlers" = dontDistribute super."event-handlers";
+  "event-list" = dontDistribute super."event-list";
+  "event-monad" = dontDistribute super."event-monad";
+  "eventloop" = dontDistribute super."eventloop";
+  "every-bit-counts" = dontDistribute super."every-bit-counts";
+  "ewe" = dontDistribute super."ewe";
+  "ex-pool" = dontDistribute super."ex-pool";
+  "exact-combinatorics" = dontDistribute super."exact-combinatorics";
+  "exception-hierarchy" = dontDistribute super."exception-hierarchy";
+  "exception-mailer" = dontDistribute super."exception-mailer";
+  "exception-monads-fd" = dontDistribute super."exception-monads-fd";
+  "exception-monads-tf" = dontDistribute super."exception-monads-tf";
+  "exception-mtl" = dontDistribute super."exception-mtl";
+  "exherbo-cabal" = dontDistribute super."exherbo-cabal";
+  "exif" = dontDistribute super."exif";
+  "exinst" = dontDistribute super."exinst";
+  "exinst-aeson" = dontDistribute super."exinst-aeson";
+  "exinst-bytes" = dontDistribute super."exinst-bytes";
+  "exinst-deepseq" = dontDistribute super."exinst-deepseq";
+  "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "exists" = dontDistribute super."exists";
+  "exit-codes" = dontDistribute super."exit-codes";
+  "exp-extended" = dontDistribute super."exp-extended";
+  "exp-pairs" = dontDistribute super."exp-pairs";
+  "expand" = dontDistribute super."expand";
+  "expat-enumerator" = dontDistribute super."expat-enumerator";
+  "expiring-mvar" = dontDistribute super."expiring-mvar";
+  "explain" = dontDistribute super."explain";
+  "explicit-determinant" = dontDistribute super."explicit-determinant";
+  "explicit-iomodes" = dontDistribute super."explicit-iomodes";
+  "explicit-iomodes-bytestring" = dontDistribute super."explicit-iomodes-bytestring";
+  "explicit-iomodes-text" = dontDistribute super."explicit-iomodes-text";
+  "explicit-sharing" = dontDistribute super."explicit-sharing";
+  "explore" = dontDistribute super."explore";
+  "exposed-containers" = dontDistribute super."exposed-containers";
+  "expression-parser" = dontDistribute super."expression-parser";
+  "extcore" = dontDistribute super."extcore";
+  "extemp" = dontDistribute super."extemp";
+  "extended-categories" = dontDistribute super."extended-categories";
+  "extended-reals" = dontDistribute super."extended-reals";
+  "extensible" = dontDistribute super."extensible";
+  "extensible-data" = dontDistribute super."extensible-data";
+  "extensible-effects" = dontDistribute super."extensible-effects";
+  "external-sort" = dontDistribute super."external-sort";
+  "extractelf" = dontDistribute super."extractelf";
+  "ez-couch" = dontDistribute super."ez-couch";
+  "faceted" = dontDistribute super."faceted";
+  "factory" = dontDistribute super."factory";
+  "factual-api" = dontDistribute super."factual-api";
+  "fad" = dontDistribute super."fad";
+  "failable-list" = dontDistribute super."failable-list";
+  "failure" = dontDistribute super."failure";
+  "fair-predicates" = dontDistribute super."fair-predicates";
+  "fake-type" = dontDistribute super."fake-type";
+  "faker" = dontDistribute super."faker";
+  "falling-turnip" = dontDistribute super."falling-turnip";
+  "fallingblocks" = dontDistribute super."fallingblocks";
+  "family-tree" = dontDistribute super."family-tree";
+  "fast-digits" = dontDistribute super."fast-digits";
+  "fast-math" = dontDistribute super."fast-math";
+  "fast-tags" = dontDistribute super."fast-tags";
+  "fast-tagsoup" = dontDistribute super."fast-tagsoup";
+  "fast-tagsoup-utf8-only" = dontDistribute super."fast-tagsoup-utf8-only";
+  "fastbayes" = dontDistribute super."fastbayes";
+  "fastcgi" = dontDistribute super."fastcgi";
+  "fastedit" = dontDistribute super."fastedit";
+  "fastirc" = dontDistribute super."fastirc";
+  "fault-tree" = dontDistribute super."fault-tree";
+  "fay-geoposition" = dontDistribute super."fay-geoposition";
+  "fay-hsx" = dontDistribute super."fay-hsx";
+  "fay-ref" = dontDistribute super."fay-ref";
+  "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
+  "fcd" = dontDistribute super."fcd";
+  "fckeditor" = dontDistribute super."fckeditor";
+  "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
+  "fdo-trash" = dontDistribute super."fdo-trash";
+  "fec" = dontDistribute super."fec";
+  "fedora-packages" = dontDistribute super."fedora-packages";
+  "feed-cli" = dontDistribute super."feed-cli";
+  "feed-collect" = dontDistribute super."feed-collect";
+  "feed-crawl" = dontDistribute super."feed-crawl";
+  "feed-translator" = dontDistribute super."feed-translator";
+  "feed2lj" = dontDistribute super."feed2lj";
+  "feed2twitter" = dontDistribute super."feed2twitter";
+  "feldspar-compiler" = dontDistribute super."feldspar-compiler";
+  "feldspar-language" = dontDistribute super."feldspar-language";
+  "feldspar-signal" = dontDistribute super."feldspar-signal";
+  "fen2s" = dontDistribute super."fen2s";
+  "fences" = dontDistribute super."fences";
+  "fenfire" = dontDistribute super."fenfire";
+  "fez-conf" = dontDistribute super."fez-conf";
+  "ffeed" = dontDistribute super."ffeed";
+  "fficxx" = dontDistribute super."fficxx";
+  "fficxx-runtime" = dontDistribute super."fficxx-runtime";
+  "ffmpeg-light" = dontDistribute super."ffmpeg-light";
+  "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials";
+  "fftwRaw" = dontDistribute super."fftwRaw";
+  "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions";
+  "fgl-visualize" = dontDistribute super."fgl-visualize";
+  "fibon" = dontDistribute super."fibon";
+  "fibonacci" = dontDistribute super."fibonacci";
+  "fields" = dontDistribute super."fields";
+  "fields-json" = dontDistribute super."fields-json";
+  "fieldwise" = dontDistribute super."fieldwise";
+  "fig" = dontDistribute super."fig";
+  "file-collection" = dontDistribute super."file-collection";
+  "file-command-qq" = dontDistribute super."file-command-qq";
+  "filediff" = dontDistribute super."filediff";
+  "filepath-io-access" = dontDistribute super."filepath-io-access";
+  "filepather" = dontDistribute super."filepather";
+  "filestore" = dontDistribute super."filestore";
+  "filesystem-conduit" = dontDistribute super."filesystem-conduit";
+  "filesystem-enumerator" = dontDistribute super."filesystem-enumerator";
+  "filesystem-trees" = dontDistribute super."filesystem-trees";
+  "filtrable" = dontDistribute super."filtrable";
+  "final" = dontDistribute super."final";
+  "find-conduit" = dontDistribute super."find-conduit";
+  "fingertree-tf" = dontDistribute super."fingertree-tf";
+  "finite-field" = dontDistribute super."finite-field";
+  "finite-typelits" = dontDistribute super."finite-typelits";
+  "first-and-last" = dontDistribute super."first-and-last";
+  "first-class-patterns" = dontDistribute super."first-class-patterns";
+  "firstify" = dontDistribute super."firstify";
+  "fishfood" = dontDistribute super."fishfood";
+  "fit" = dontDistribute super."fit";
+  "fitsio" = dontDistribute super."fitsio";
+  "fix-imports" = dontDistribute super."fix-imports";
+  "fix-parser-simple" = dontDistribute super."fix-parser-simple";
+  "fix-symbols-gitit" = dontDistribute super."fix-symbols-gitit";
+  "fixed-length" = dontDistribute super."fixed-length";
+  "fixed-point" = dontDistribute super."fixed-point";
+  "fixed-point-vector" = dontDistribute super."fixed-point-vector";
+  "fixed-point-vector-space" = dontDistribute super."fixed-point-vector-space";
+  "fixed-precision" = dontDistribute super."fixed-precision";
+  "fixed-storable-array" = dontDistribute super."fixed-storable-array";
+  "fixed-vector-binary" = dontDistribute super."fixed-vector-binary";
+  "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal";
+  "fixedprec" = dontDistribute super."fixedprec";
+  "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixhs" = dontDistribute super."fixhs";
+  "fixplate" = dontDistribute super."fixplate";
+  "fixpoint" = dontDistribute super."fixpoint";
+  "fixtime" = dontDistribute super."fixtime";
+  "fizz-buzz" = dontDistribute super."fizz-buzz";
+  "flaccuraterip" = dontDistribute super."flaccuraterip";
+  "flamethrower" = dontDistribute super."flamethrower";
+  "flamingra" = dontDistribute super."flamingra";
+  "flat-maybe" = dontDistribute super."flat-maybe";
+  "flat-mcmc" = dontDistribute super."flat-mcmc";
+  "flat-tex" = dontDistribute super."flat-tex";
+  "flexible-time" = dontDistribute super."flexible-time";
+  "flexible-unlit" = dontDistribute super."flexible-unlit";
+  "flexiwrap" = dontDistribute super."flexiwrap";
+  "flexiwrap-smallcheck" = dontDistribute super."flexiwrap-smallcheck";
+  "flickr" = dontDistribute super."flickr";
+  "flippers" = dontDistribute super."flippers";
+  "flite" = dontDistribute super."flite";
+  "flo" = dontDistribute super."flo";
+  "float-binstring" = dontDistribute super."float-binstring";
+  "floating-bits" = dontDistribute super."floating-bits";
+  "floatshow" = dontDistribute super."floatshow";
+  "flow2dot" = dontDistribute super."flow2dot";
+  "flowdock" = dontDistribute super."flowdock";
+  "flowdock-api" = dontDistribute super."flowdock-api";
+  "flowdock-rest" = dontDistribute super."flowdock-rest";
+  "flower" = dontDistribute super."flower";
+  "flowlocks-framework" = dontDistribute super."flowlocks-framework";
+  "flowsim" = dontDistribute super."flowsim";
+  "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fluent-logger" = dontDistribute super."fluent-logger";
+  "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
+  "fluidsynth" = dontDistribute super."fluidsynth";
+  "fmark" = dontDistribute super."fmark";
+  "fold-debounce" = dontDistribute super."fold-debounce";
+  "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit";
+  "foldl-incremental" = dontDistribute super."foldl-incremental";
+  "foldl-transduce" = dontDistribute super."foldl-transduce";
+  "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec";
+  "folds" = dontDistribute super."folds";
+  "folds-common" = dontDistribute super."folds-common";
+  "follower" = dontDistribute super."follower";
+  "foma" = dontDistribute super."foma";
+  "font-opengl-basic4x6" = dontDistribute super."font-opengl-basic4x6";
+  "foo" = dontDistribute super."foo";
+  "for-free" = dontDistribute super."for-free";
+  "forbidden-fruit" = dontDistribute super."forbidden-fruit";
+  "fordo" = dontDistribute super."fordo";
+  "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric";
+  "foreign-var" = dontDistribute super."foreign-var";
+  "forger" = dontDistribute super."forger";
+  "forkable-monad" = dontDistribute super."forkable-monad";
+  "formal" = dontDistribute super."formal";
+  "format" = dontDistribute super."format";
+  "format-status" = dontDistribute super."format-status";
+  "formattable" = dontDistribute super."formattable";
+  "forml" = dontDistribute super."forml";
+  "formlets" = dontDistribute super."formlets";
+  "formlets-hsp" = dontDistribute super."formlets-hsp";
+  "formura" = dontDistribute super."formura";
+  "forth-hll" = dontDistribute super."forth-hll";
+  "foscam-directory" = dontDistribute super."foscam-directory";
+  "foscam-filename" = dontDistribute super."foscam-filename";
+  "foscam-sort" = dontDistribute super."foscam-sort";
+  "fountain" = dontDistribute super."fountain";
+  "fpco-api" = dontDistribute super."fpco-api";
+  "fpipe" = dontDistribute super."fpipe";
+  "fpnla" = dontDistribute super."fpnla";
+  "fpnla-examples" = dontDistribute super."fpnla-examples";
+  "fptest" = dontDistribute super."fptest";
+  "fquery" = dontDistribute super."fquery";
+  "fractal" = dontDistribute super."fractal";
+  "fractals" = dontDistribute super."fractals";
+  "fraction" = dontDistribute super."fraction";
+  "frag" = dontDistribute super."frag";
+  "frame" = dontDistribute super."frame";
+  "frame-markdown" = dontDistribute super."frame-markdown";
+  "franchise" = dontDistribute super."franchise";
+  "free-concurrent" = dontDistribute super."free-concurrent";
+  "free-functors" = dontDistribute super."free-functors";
+  "free-game" = dontDistribute super."free-game";
+  "free-http" = dontDistribute super."free-http";
+  "free-operational" = dontDistribute super."free-operational";
+  "free-theorems" = dontDistribute super."free-theorems";
+  "free-theorems-counterexamples" = dontDistribute super."free-theorems-counterexamples";
+  "free-theorems-seq" = dontDistribute super."free-theorems-seq";
+  "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
+  "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
+  "freekick2" = dontDistribute super."freekick2";
+  "freer" = dontDistribute super."freer";
+  "freesect" = dontDistribute super."freesect";
+  "freesound" = dontDistribute super."freesound";
+  "freetype-simple" = dontDistribute super."freetype-simple";
+  "freetype2" = dontDistribute super."freetype2";
+  "fresh" = dontDistribute super."fresh";
+  "friday" = dontDistribute super."friday";
+  "friday-devil" = dontDistribute super."friday-devil";
+  "friday-juicypixels" = dontDistribute super."friday-juicypixels";
+  "friday-scale-dct" = dontDistribute super."friday-scale-dct";
+  "friendly-time" = dontDistribute super."friendly-time";
+  "frp-arduino" = dontDistribute super."frp-arduino";
+  "frpnow" = dontDistribute super."frpnow";
+  "frpnow-gloss" = dontDistribute super."frpnow-gloss";
+  "frpnow-gtk" = dontDistribute super."frpnow-gtk";
+  "frquotes" = dontDistribute super."frquotes";
+  "fs-events" = dontDistribute super."fs-events";
+  "fsharp" = dontDistribute super."fsharp";
+  "fsmActions" = dontDistribute super."fsmActions";
+  "fst" = dontDistribute super."fst";
+  "fsutils" = dontDistribute super."fsutils";
+  "fswatcher" = dontDistribute super."fswatcher";
+  "ftdi" = dontDistribute super."ftdi";
+  "ftp-conduit" = dontDistribute super."ftp-conduit";
+  "ftphs" = dontDistribute super."ftphs";
+  "ftree" = dontDistribute super."ftree";
+  "ftshell" = dontDistribute super."ftshell";
+  "fugue" = dontDistribute super."fugue";
+  "full-sessions" = dontDistribute super."full-sessions";
+  "full-text-search" = dontDistribute super."full-text-search";
+  "fullstop" = dontDistribute super."fullstop";
+  "funbot" = dontDistribute super."funbot";
+  "funbot-client" = dontDistribute super."funbot-client";
+  "funbot-ext-events" = dontDistribute super."funbot-ext-events";
+  "funbot-git-hook" = dontDistribute super."funbot-git-hook";
+  "function-combine" = dontDistribute super."function-combine";
+  "function-instances-algebra" = dontDistribute super."function-instances-algebra";
+  "functional-arrow" = dontDistribute super."functional-arrow";
+  "functional-kmp" = dontDistribute super."functional-kmp";
+  "functor-apply" = dontDistribute super."functor-apply";
+  "functor-combo" = dontDistribute super."functor-combo";
+  "functor-infix" = dontDistribute super."functor-infix";
+  "functor-monadic" = dontDistribute super."functor-monadic";
+  "functor-utils" = dontDistribute super."functor-utils";
+  "functorm" = dontDistribute super."functorm";
+  "functors" = dontDistribute super."functors";
+  "funion" = dontDistribute super."funion";
+  "funpat" = dontDistribute super."funpat";
+  "funsat" = dontDistribute super."funsat";
+  "fusion" = dontDistribute super."fusion";
+  "futun" = dontDistribute super."futun";
+  "future" = dontDistribute super."future";
+  "future-resource" = dontDistribute super."future-resource";
+  "fuzzy" = dontDistribute super."fuzzy";
+  "fuzzy-timings" = dontDistribute super."fuzzy-timings";
+  "fuzzytime" = dontDistribute super."fuzzytime";
+  "fwgl" = dontDistribute super."fwgl";
+  "fwgl-glfw" = dontDistribute super."fwgl-glfw";
+  "fwgl-javascript" = dontDistribute super."fwgl-javascript";
+  "g-npm" = dontDistribute super."g-npm";
+  "gact" = dontDistribute super."gact";
+  "game-of-life" = dontDistribute super."game-of-life";
+  "game-probability" = dontDistribute super."game-probability";
+  "game-tree" = dontDistribute super."game-tree";
+  "gameclock" = dontDistribute super."gameclock";
+  "gamma" = dontDistribute super."gamma";
+  "gang-of-threads" = dontDistribute super."gang-of-threads";
+  "garepinoh" = dontDistribute super."garepinoh";
+  "garsia-wachs" = dontDistribute super."garsia-wachs";
+  "gbu" = dontDistribute super."gbu";
+  "gc" = dontDistribute super."gc";
+  "gc-monitoring-wai" = dontDistribute super."gc-monitoring-wai";
+  "gconf" = dontDistribute super."gconf";
+  "gdiff" = dontDistribute super."gdiff";
+  "gdiff-ig" = dontDistribute super."gdiff-ig";
+  "gdiff-th" = dontDistribute super."gdiff-th";
+  "gearbox" = dontDistribute super."gearbox";
+  "geek" = dontDistribute super."geek";
+  "geek-server" = dontDistribute super."geek-server";
+  "gelatin" = dontDistribute super."gelatin";
+  "gemstone" = dontDistribute super."gemstone";
+  "gencheck" = dontDistribute super."gencheck";
+  "gender" = dontDistribute super."gender";
+  "genders" = dontDistribute super."genders";
+  "general-prelude" = dontDistribute super."general-prelude";
+  "generator" = dontDistribute super."generator";
+  "generators" = dontDistribute super."generators";
+  "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-binary" = dontDistribute super."generic-binary";
+  "generic-church" = dontDistribute super."generic-church";
+  "generic-deepseq" = dontDistribute super."generic-deepseq";
+  "generic-lucid-scaffold" = dontDistribute super."generic-lucid-scaffold";
+  "generic-maybe" = dontDistribute super."generic-maybe";
+  "generic-pretty" = dontDistribute super."generic-pretty";
+  "generic-server" = dontDistribute super."generic-server";
+  "generic-storable" = dontDistribute super."generic-storable";
+  "generic-tree" = dontDistribute super."generic-tree";
+  "generic-trie" = dontDistribute super."generic-trie";
+  "generic-xml" = dontDistribute super."generic-xml";
+  "genericserialize" = dontDistribute super."genericserialize";
+  "genetics" = dontDistribute super."genetics";
+  "geni-gui" = dontDistribute super."geni-gui";
+  "geni-util" = dontDistribute super."geni-util";
+  "geniconvert" = dontDistribute super."geniconvert";
+  "genifunctors" = dontDistribute super."genifunctors";
+  "geniplate" = dontDistribute super."geniplate";
+  "geniserver" = dontDistribute super."geniserver";
+  "genprog" = dontDistribute super."genprog";
+  "gentlemark" = dontDistribute super."gentlemark";
+  "geo-resolver" = dontDistribute super."geo-resolver";
+  "geo-uk" = dontDistribute super."geo-uk";
+  "geocalc" = dontDistribute super."geocalc";
+  "geocode-google" = dontDistribute super."geocode-google";
+  "geodetic" = dontDistribute super."geodetic";
+  "geodetics" = dontDistribute super."geodetics";
+  "geohash" = dontDistribute super."geohash";
+  "geoip2" = dontDistribute super."geoip2";
+  "geojson" = dontDistribute super."geojson";
+  "geom2d" = dontDistribute super."geom2d";
+  "getemx" = dontDistribute super."getemx";
+  "getflag" = dontDistribute super."getflag";
+  "getopt-simple" = dontDistribute super."getopt-simple";
+  "gf" = dontDistribute super."gf";
+  "ggtsTC" = dontDistribute super."ggtsTC";
+  "ghc-core" = dontDistribute super."ghc-core";
+  "ghc-core-html" = dontDistribute super."ghc-core-html";
+  "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dup" = dontDistribute super."ghc-dup";
+  "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
+  "ghc-events-parallel" = dontDistribute super."ghc-events-parallel";
+  "ghc-gc-tune" = dontDistribute super."ghc-gc-tune";
+  "ghc-generic-instances" = dontDistribute super."ghc-generic-instances";
+  "ghc-imported-from" = dontDistribute super."ghc-imported-from";
+  "ghc-make" = dontDistribute super."ghc-make";
+  "ghc-man-completion" = dontDistribute super."ghc-man-completion";
+  "ghc-options" = dontDistribute super."ghc-options";
+  "ghc-parmake" = dontDistribute super."ghc-parmake";
+  "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix";
+  "ghc-pkg-lib" = dontDistribute super."ghc-pkg-lib";
+  "ghc-prof-flamegraph" = dontDistribute super."ghc-prof-flamegraph";
+  "ghc-server" = dontDistribute super."ghc-server";
+  "ghc-simple" = dontDistribute super."ghc-simple";
+  "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin";
+  "ghc-syb" = dontDistribute super."ghc-syb";
+  "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
+  "ghc-vis" = dontDistribute super."ghc-vis";
+  "ghci-diagrams" = dontDistribute super."ghci-diagrams";
+  "ghci-haskeline" = dontDistribute super."ghci-haskeline";
+  "ghci-lib" = dontDistribute super."ghci-lib";
+  "ghci-ng" = dontDistribute super."ghci-ng";
+  "ghci-pretty" = dontDistribute super."ghci-pretty";
+  "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
+  "ghcjs-dom" = dontDistribute super."ghcjs-dom";
+  "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
+  "ghcjs-websockets" = dontDistribute super."ghcjs-websockets";
+  "ghclive" = dontDistribute super."ghclive";
+  "ghczdecode" = dontDistribute super."ghczdecode";
+  "ght" = dontDistribute super."ght";
+  "gi-atk" = dontDistribute super."gi-atk";
+  "gi-cairo" = dontDistribute super."gi-cairo";
+  "gi-gdk" = dontDistribute super."gi-gdk";
+  "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
+  "gi-gio" = dontDistribute super."gi-gio";
+  "gi-glib" = dontDistribute super."gi-glib";
+  "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gtk" = dontDistribute super."gi-gtk";
+  "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
+  "gi-notify" = dontDistribute super."gi-notify";
+  "gi-pango" = dontDistribute super."gi-pango";
+  "gi-soup" = dontDistribute super."gi-soup";
+  "gi-vte" = dontDistribute super."gi-vte";
+  "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gimlh" = dontDistribute super."gimlh";
+  "ginger" = dontDistribute super."ginger";
+  "ginsu" = dontDistribute super."ginsu";
+  "gist" = dontDistribute super."gist";
+  "git-all" = dontDistribute super."git-all";
+  "git-checklist" = dontDistribute super."git-checklist";
+  "git-date" = dontDistribute super."git-date";
+  "git-embed" = dontDistribute super."git-embed";
+  "git-freq" = dontDistribute super."git-freq";
+  "git-gpush" = dontDistribute super."git-gpush";
+  "git-jump" = dontDistribute super."git-jump";
+  "git-monitor" = dontDistribute super."git-monitor";
+  "git-object" = dontDistribute super."git-object";
+  "git-repair" = dontDistribute super."git-repair";
+  "git-sanity" = dontDistribute super."git-sanity";
+  "git-vogue" = dontDistribute super."git-vogue";
+  "gitHUD" = dontDistribute super."gitHUD";
+  "gitcache" = dontDistribute super."gitcache";
+  "gitdo" = dontDistribute super."gitdo";
+  "github" = dontDistribute super."github";
+  "github-backup" = dontDistribute super."github-backup";
+  "github-post-receive" = dontDistribute super."github-post-receive";
+  "github-utils" = dontDistribute super."github-utils";
+  "gitignore" = dontDistribute super."gitignore";
+  "gitit" = dontDistribute super."gitit";
+  "gitlib-cmdline" = dontDistribute super."gitlib-cmdline";
+  "gitlib-cross" = dontDistribute super."gitlib-cross";
+  "gitlib-s3" = dontDistribute super."gitlib-s3";
+  "gitlib-sample" = dontDistribute super."gitlib-sample";
+  "gitlib-utils" = dontDistribute super."gitlib-utils";
+  "gitter" = dontDistribute super."gitter";
+  "gl-capture" = dontDistribute super."gl-capture";
+  "glade" = dontDistribute super."glade";
+  "gladexml-accessor" = dontDistribute super."gladexml-accessor";
+  "glambda" = dontDistribute super."glambda";
+  "glapp" = dontDistribute super."glapp";
+  "glasso" = dontDistribute super."glasso";
+  "glicko" = dontDistribute super."glicko";
+  "glider-nlp" = dontDistribute super."glider-nlp";
+  "glintcollider" = dontDistribute super."glintcollider";
+  "gll" = dontDistribute super."gll";
+  "global" = dontDistribute super."global";
+  "global-config" = dontDistribute super."global-config";
+  "global-lock" = dontDistribute super."global-lock";
+  "global-variables" = dontDistribute super."global-variables";
+  "glome-hs" = dontDistribute super."glome-hs";
+  "gloss" = dontDistribute super."gloss";
+  "gloss-accelerate" = dontDistribute super."gloss-accelerate";
+  "gloss-algorithms" = dontDistribute super."gloss-algorithms";
+  "gloss-banana" = dontDistribute super."gloss-banana";
+  "gloss-devil" = dontDistribute super."gloss-devil";
+  "gloss-examples" = dontDistribute super."gloss-examples";
+  "gloss-game" = dontDistribute super."gloss-game";
+  "gloss-juicy" = dontDistribute super."gloss-juicy";
+  "gloss-raster" = dontDistribute super."gloss-raster";
+  "gloss-raster-accelerate" = dontDistribute super."gloss-raster-accelerate";
+  "gloss-rendering" = dontDistribute super."gloss-rendering";
+  "gloss-sodium" = dontDistribute super."gloss-sodium";
+  "glpk-hs" = dontDistribute super."glpk-hs";
+  "glue" = dontDistribute super."glue";
+  "glue-common" = dontDistribute super."glue-common";
+  "glue-core" = dontDistribute super."glue-core";
+  "glue-ekg" = dontDistribute super."glue-ekg";
+  "glue-example" = dontDistribute super."glue-example";
+  "gluturtle" = dontDistribute super."gluturtle";
+  "gmap" = dontDistribute super."gmap";
+  "gmndl" = dontDistribute super."gmndl";
+  "gnome-desktop" = dontDistribute super."gnome-desktop";
+  "gnome-keyring" = dontDistribute super."gnome-keyring";
+  "gnomevfs" = dontDistribute super."gnomevfs";
+  "gnss-converters" = dontDistribute super."gnss-converters";
+  "gnuplot" = dontDistribute super."gnuplot";
+  "goa" = dontDistribute super."goa";
+  "goal-core" = dontDistribute super."goal-core";
+  "goal-geometry" = dontDistribute super."goal-geometry";
+  "goal-probability" = dontDistribute super."goal-probability";
+  "goal-simulation" = dontDistribute super."goal-simulation";
+  "goatee" = dontDistribute super."goatee";
+  "goatee-gtk" = dontDistribute super."goatee-gtk";
+  "gofer-prelude" = dontDistribute super."gofer-prelude";
+  "gogol" = dontDistribute super."gogol";
+  "gogol-adexchange-buyer" = dontDistribute super."gogol-adexchange-buyer";
+  "gogol-adexchange-seller" = dontDistribute super."gogol-adexchange-seller";
+  "gogol-admin-datatransfer" = dontDistribute super."gogol-admin-datatransfer";
+  "gogol-admin-directory" = dontDistribute super."gogol-admin-directory";
+  "gogol-admin-emailmigration" = dontDistribute super."gogol-admin-emailmigration";
+  "gogol-admin-reports" = dontDistribute super."gogol-admin-reports";
+  "gogol-adsense" = dontDistribute super."gogol-adsense";
+  "gogol-adsense-host" = dontDistribute super."gogol-adsense-host";
+  "gogol-affiliates" = dontDistribute super."gogol-affiliates";
+  "gogol-analytics" = dontDistribute super."gogol-analytics";
+  "gogol-android-enterprise" = dontDistribute super."gogol-android-enterprise";
+  "gogol-android-publisher" = dontDistribute super."gogol-android-publisher";
+  "gogol-appengine" = dontDistribute super."gogol-appengine";
+  "gogol-apps-activity" = dontDistribute super."gogol-apps-activity";
+  "gogol-apps-calendar" = dontDistribute super."gogol-apps-calendar";
+  "gogol-apps-licensing" = dontDistribute super."gogol-apps-licensing";
+  "gogol-apps-reseller" = dontDistribute super."gogol-apps-reseller";
+  "gogol-apps-tasks" = dontDistribute super."gogol-apps-tasks";
+  "gogol-appstate" = dontDistribute super."gogol-appstate";
+  "gogol-autoscaler" = dontDistribute super."gogol-autoscaler";
+  "gogol-bigquery" = dontDistribute super."gogol-bigquery";
+  "gogol-billing" = dontDistribute super."gogol-billing";
+  "gogol-blogger" = dontDistribute super."gogol-blogger";
+  "gogol-books" = dontDistribute super."gogol-books";
+  "gogol-civicinfo" = dontDistribute super."gogol-civicinfo";
+  "gogol-classroom" = dontDistribute super."gogol-classroom";
+  "gogol-cloudtrace" = dontDistribute super."gogol-cloudtrace";
+  "gogol-compute" = dontDistribute super."gogol-compute";
+  "gogol-container" = dontDistribute super."gogol-container";
+  "gogol-core" = dontDistribute super."gogol-core";
+  "gogol-customsearch" = dontDistribute super."gogol-customsearch";
+  "gogol-dataflow" = dontDistribute super."gogol-dataflow";
+  "gogol-datastore" = dontDistribute super."gogol-datastore";
+  "gogol-debugger" = dontDistribute super."gogol-debugger";
+  "gogol-deploymentmanager" = dontDistribute super."gogol-deploymentmanager";
+  "gogol-dfareporting" = dontDistribute super."gogol-dfareporting";
+  "gogol-discovery" = dontDistribute super."gogol-discovery";
+  "gogol-dns" = dontDistribute super."gogol-dns";
+  "gogol-doubleclick-bids" = dontDistribute super."gogol-doubleclick-bids";
+  "gogol-doubleclick-search" = dontDistribute super."gogol-doubleclick-search";
+  "gogol-drive" = dontDistribute super."gogol-drive";
+  "gogol-fitness" = dontDistribute super."gogol-fitness";
+  "gogol-fonts" = dontDistribute super."gogol-fonts";
+  "gogol-freebasesearch" = dontDistribute super."gogol-freebasesearch";
+  "gogol-fusiontables" = dontDistribute super."gogol-fusiontables";
+  "gogol-games" = dontDistribute super."gogol-games";
+  "gogol-games-configuration" = dontDistribute super."gogol-games-configuration";
+  "gogol-games-management" = dontDistribute super."gogol-games-management";
+  "gogol-genomics" = dontDistribute super."gogol-genomics";
+  "gogol-gmail" = dontDistribute super."gogol-gmail";
+  "gogol-groups-migration" = dontDistribute super."gogol-groups-migration";
+  "gogol-groups-settings" = dontDistribute super."gogol-groups-settings";
+  "gogol-identity-toolkit" = dontDistribute super."gogol-identity-toolkit";
+  "gogol-latencytest" = dontDistribute super."gogol-latencytest";
+  "gogol-logging" = dontDistribute super."gogol-logging";
+  "gogol-maps-coordinate" = dontDistribute super."gogol-maps-coordinate";
+  "gogol-maps-engine" = dontDistribute super."gogol-maps-engine";
+  "gogol-mirror" = dontDistribute super."gogol-mirror";
+  "gogol-monitoring" = dontDistribute super."gogol-monitoring";
+  "gogol-oauth2" = dontDistribute super."gogol-oauth2";
+  "gogol-pagespeed" = dontDistribute super."gogol-pagespeed";
+  "gogol-partners" = dontDistribute super."gogol-partners";
+  "gogol-play-moviespartner" = dontDistribute super."gogol-play-moviespartner";
+  "gogol-plus" = dontDistribute super."gogol-plus";
+  "gogol-plus-domains" = dontDistribute super."gogol-plus-domains";
+  "gogol-prediction" = dontDistribute super."gogol-prediction";
+  "gogol-proximitybeacon" = dontDistribute super."gogol-proximitybeacon";
+  "gogol-pubsub" = dontDistribute super."gogol-pubsub";
+  "gogol-qpxexpress" = dontDistribute super."gogol-qpxexpress";
+  "gogol-replicapool" = dontDistribute super."gogol-replicapool";
+  "gogol-replicapool-updater" = dontDistribute super."gogol-replicapool-updater";
+  "gogol-resourcemanager" = dontDistribute super."gogol-resourcemanager";
+  "gogol-resourceviews" = dontDistribute super."gogol-resourceviews";
+  "gogol-shopping-content" = dontDistribute super."gogol-shopping-content";
+  "gogol-siteverification" = dontDistribute super."gogol-siteverification";
+  "gogol-spectrum" = dontDistribute super."gogol-spectrum";
+  "gogol-sqladmin" = dontDistribute super."gogol-sqladmin";
+  "gogol-storage" = dontDistribute super."gogol-storage";
+  "gogol-storage-transfer" = dontDistribute super."gogol-storage-transfer";
+  "gogol-tagmanager" = dontDistribute super."gogol-tagmanager";
+  "gogol-taskqueue" = dontDistribute super."gogol-taskqueue";
+  "gogol-translate" = dontDistribute super."gogol-translate";
+  "gogol-urlshortener" = dontDistribute super."gogol-urlshortener";
+  "gogol-useraccounts" = dontDistribute super."gogol-useraccounts";
+  "gogol-webmaster-tools" = dontDistribute super."gogol-webmaster-tools";
+  "gogol-youtube" = dontDistribute super."gogol-youtube";
+  "gogol-youtube-analytics" = dontDistribute super."gogol-youtube-analytics";
+  "gogol-youtube-reporting" = dontDistribute super."gogol-youtube-reporting";
+  "gooey" = dontDistribute super."gooey";
+  "google-dictionary" = dontDistribute super."google-dictionary";
+  "google-drive" = dontDistribute super."google-drive";
+  "google-html5-slide" = dontDistribute super."google-html5-slide";
+  "google-mail-filters" = dontDistribute super."google-mail-filters";
+  "google-oauth2" = dontDistribute super."google-oauth2";
+  "google-search" = dontDistribute super."google-search";
+  "google-translate" = dontDistribute super."google-translate";
+  "googleplus" = dontDistribute super."googleplus";
+  "googlepolyline" = dontDistribute super."googlepolyline";
+  "gopherbot" = dontDistribute super."gopherbot";
+  "gpah" = dontDistribute super."gpah";
+  "gpcsets" = dontDistribute super."gpcsets";
+  "gpolyline" = dontDistribute super."gpolyline";
+  "gps" = dontDistribute super."gps";
+  "gps2htmlReport" = dontDistribute super."gps2htmlReport";
+  "gpx-conduit" = dontDistribute super."gpx-conduit";
+  "graceful" = dontDistribute super."graceful";
+  "grammar-combinators" = dontDistribute super."grammar-combinators";
+  "grapefruit-examples" = dontDistribute super."grapefruit-examples";
+  "grapefruit-frp" = dontDistribute super."grapefruit-frp";
+  "grapefruit-records" = dontDistribute super."grapefruit-records";
+  "grapefruit-ui" = dontDistribute super."grapefruit-ui";
+  "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-generators" = dontDistribute super."graph-generators";
+  "graph-matchings" = dontDistribute super."graph-matchings";
+  "graph-rewriting" = dontDistribute super."graph-rewriting";
+  "graph-rewriting-cl" = dontDistribute super."graph-rewriting-cl";
+  "graph-rewriting-gl" = dontDistribute super."graph-rewriting-gl";
+  "graph-rewriting-lambdascope" = dontDistribute super."graph-rewriting-lambdascope";
+  "graph-rewriting-layout" = dontDistribute super."graph-rewriting-layout";
+  "graph-rewriting-ski" = dontDistribute super."graph-rewriting-ski";
+  "graph-rewriting-strategies" = dontDistribute super."graph-rewriting-strategies";
+  "graph-rewriting-trs" = dontDistribute super."graph-rewriting-trs";
+  "graph-rewriting-ww" = dontDistribute super."graph-rewriting-ww";
+  "graph-serialize" = dontDistribute super."graph-serialize";
+  "graph-utils" = dontDistribute super."graph-utils";
+  "graph-visit" = dontDistribute super."graph-visit";
+  "graphbuilder" = dontDistribute super."graphbuilder";
+  "graphene" = dontDistribute super."graphene";
+  "graphics-drawingcombinators" = dontDistribute super."graphics-drawingcombinators";
+  "graphics-formats-collada" = dontDistribute super."graphics-formats-collada";
+  "graphicsFormats" = dontDistribute super."graphicsFormats";
+  "graphicstools" = dontDistribute super."graphicstools";
+  "graphmod" = dontDistribute super."graphmod";
+  "graphql" = dontDistribute super."graphql";
+  "graphtype" = dontDistribute super."graphtype";
+  "gray-code" = dontDistribute super."gray-code";
+  "gray-extended" = dontDistribute super."gray-extended";
+  "greencard" = dontDistribute super."greencard";
+  "greencard-lib" = dontDistribute super."greencard-lib";
+  "greg-client" = dontDistribute super."greg-client";
+  "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "grid" = dontDistribute super."grid";
+  "gridland" = dontDistribute super."gridland";
+  "grm" = dontDistribute super."grm";
+  "groundhog-inspector" = dontDistribute super."groundhog-inspector";
+  "group-with" = dontDistribute super."group-with";
+  "groupoid" = dontDistribute super."groupoid";
+  "growler" = dontDistribute super."growler";
+  "gruff" = dontDistribute super."gruff";
+  "gruff-examples" = dontDistribute super."gruff-examples";
+  "gsc-weighting" = dontDistribute super."gsc-weighting";
+  "gsl-random" = dontDistribute super."gsl-random";
+  "gsl-random-fu" = dontDistribute super."gsl-random-fu";
+  "gsmenu" = dontDistribute super."gsmenu";
+  "gstreamer" = dontDistribute super."gstreamer";
+  "gt-tools" = dontDistribute super."gt-tools";
+  "gtfs" = dontDistribute super."gtfs";
+  "gtk-helpers" = dontDistribute super."gtk-helpers";
+  "gtk-jsinput" = dontDistribute super."gtk-jsinput";
+  "gtk-largeTreeStore" = dontDistribute super."gtk-largeTreeStore";
+  "gtk-mac-integration" = dontDistribute super."gtk-mac-integration";
+  "gtk-serialized-event" = dontDistribute super."gtk-serialized-event";
+  "gtk-simple-list-view" = dontDistribute super."gtk-simple-list-view";
+  "gtk-toggle-button-list" = dontDistribute super."gtk-toggle-button-list";
+  "gtk-toy" = dontDistribute super."gtk-toy";
+  "gtk-traymanager" = dontDistribute super."gtk-traymanager";
+  "gtk2hs-cast-glade" = dontDistribute super."gtk2hs-cast-glade";
+  "gtk2hs-cast-glib" = dontDistribute super."gtk2hs-cast-glib";
+  "gtk2hs-cast-gnomevfs" = dontDistribute super."gtk2hs-cast-gnomevfs";
+  "gtk2hs-cast-gtk" = dontDistribute super."gtk2hs-cast-gtk";
+  "gtk2hs-cast-gtkglext" = dontDistribute super."gtk2hs-cast-gtkglext";
+  "gtk2hs-cast-gtksourceview2" = dontDistribute super."gtk2hs-cast-gtksourceview2";
+  "gtk2hs-cast-th" = dontDistribute super."gtk2hs-cast-th";
+  "gtk2hs-hello" = dontDistribute super."gtk2hs-hello";
+  "gtk2hs-rpn" = dontDistribute super."gtk2hs-rpn";
+  "gtk3-mac-integration" = dontDistribute super."gtk3-mac-integration";
+  "gtkglext" = dontDistribute super."gtkglext";
+  "gtkimageview" = dontDistribute super."gtkimageview";
+  "gtkrsync" = dontDistribute super."gtkrsync";
+  "gtksourceview2" = dontDistribute super."gtksourceview2";
+  "gtksourceview3" = dontDistribute super."gtksourceview3";
+  "guarded-rewriting" = dontDistribute super."guarded-rewriting";
+  "guess-combinator" = dontDistribute super."guess-combinator";
+  "gulcii" = dontDistribute super."gulcii";
+  "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis";
+  "gyah-bin" = dontDistribute super."gyah-bin";
+  "h-booru" = dontDistribute super."h-booru";
+  "h-gpgme" = dontDistribute super."h-gpgme";
+  "h2048" = dontDistribute super."h2048";
+  "hArduino" = dontDistribute super."hArduino";
+  "hBDD" = dontDistribute super."hBDD";
+  "hBDD-CMUBDD" = dontDistribute super."hBDD-CMUBDD";
+  "hBDD-CUDD" = dontDistribute super."hBDD-CUDD";
+  "hCsound" = dontDistribute super."hCsound";
+  "hDFA" = dontDistribute super."hDFA";
+  "hF2" = dontDistribute super."hF2";
+  "hGelf" = dontDistribute super."hGelf";
+  "hLLVM" = dontDistribute super."hLLVM";
+  "hMollom" = dontDistribute super."hMollom";
+  "hPDB-examples" = dontDistribute super."hPDB-examples";
+  "hPushover" = dontDistribute super."hPushover";
+  "hR" = dontDistribute super."hR";
+  "hRESP" = dontDistribute super."hRESP";
+  "hS3" = dontDistribute super."hS3";
+  "hScraper" = dontDistribute super."hScraper";
+  "hSimpleDB" = dontDistribute super."hSimpleDB";
+  "hTalos" = dontDistribute super."hTalos";
+  "hTensor" = dontDistribute super."hTensor";
+  "hVOIDP" = dontDistribute super."hVOIDP";
+  "hXmixer" = dontDistribute super."hXmixer";
+  "haar" = dontDistribute super."haar";
+  "hacanon-light" = dontDistribute super."hacanon-light";
+  "hack" = dontDistribute super."hack";
+  "hack-contrib" = dontDistribute super."hack-contrib";
+  "hack-contrib-press" = dontDistribute super."hack-contrib-press";
+  "hack-frontend-happstack" = dontDistribute super."hack-frontend-happstack";
+  "hack-frontend-monadcgi" = dontDistribute super."hack-frontend-monadcgi";
+  "hack-handler-cgi" = dontDistribute super."hack-handler-cgi";
+  "hack-handler-epoll" = dontDistribute super."hack-handler-epoll";
+  "hack-handler-evhttp" = dontDistribute super."hack-handler-evhttp";
+  "hack-handler-fastcgi" = dontDistribute super."hack-handler-fastcgi";
+  "hack-handler-happstack" = dontDistribute super."hack-handler-happstack";
+  "hack-handler-hyena" = dontDistribute super."hack-handler-hyena";
+  "hack-handler-kibro" = dontDistribute super."hack-handler-kibro";
+  "hack-handler-simpleserver" = dontDistribute super."hack-handler-simpleserver";
+  "hack-middleware-cleanpath" = dontDistribute super."hack-middleware-cleanpath";
+  "hack-middleware-clientsession" = dontDistribute super."hack-middleware-clientsession";
+  "hack-middleware-gzip" = dontDistribute super."hack-middleware-gzip";
+  "hack-middleware-jsonp" = dontDistribute super."hack-middleware-jsonp";
+  "hack2" = dontDistribute super."hack2";
+  "hack2-contrib" = dontDistribute super."hack2-contrib";
+  "hack2-contrib-extra" = dontDistribute super."hack2-contrib-extra";
+  "hack2-handler-happstack-server" = dontDistribute super."hack2-handler-happstack-server";
+  "hack2-handler-mongrel2-http" = dontDistribute super."hack2-handler-mongrel2-http";
+  "hack2-handler-snap-server" = dontDistribute super."hack2-handler-snap-server";
+  "hack2-handler-warp" = dontDistribute super."hack2-handler-warp";
+  "hack2-interface-wai" = dontDistribute super."hack2-interface-wai";
+  "hackage-diff" = dontDistribute super."hackage-diff";
+  "hackage-plot" = dontDistribute super."hackage-plot";
+  "hackage-proxy" = dontDistribute super."hackage-proxy";
+  "hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
+  "hackage-security" = dontDistribute super."hackage-security";
+  "hackage-security-HTTP" = dontDistribute super."hackage-security-HTTP";
+  "hackage-server" = dontDistribute super."hackage-server";
+  "hackage-sparks" = dontDistribute super."hackage-sparks";
+  "hackage2hwn" = dontDistribute super."hackage2hwn";
+  "hackage2twitter" = dontDistribute super."hackage2twitter";
+  "hackager" = dontDistribute super."hackager";
+  "hackernews" = dontDistribute super."hackernews";
+  "hackertyper" = dontDistribute super."hackertyper";
+  "hackport" = dontDistribute super."hackport";
+  "hactor" = dontDistribute super."hactor";
+  "hactors" = dontDistribute super."hactors";
+  "haddock" = dontDistribute super."haddock";
+  "haddock-leksah" = dontDistribute super."haddock-leksah";
+  "haddocset" = dontDistribute super."haddocset";
+  "hadoop-formats" = dontDistribute super."hadoop-formats";
+  "hadoop-rpc" = dontDistribute super."hadoop-rpc";
+  "hadoop-tools" = dontDistribute super."hadoop-tools";
+  "haeredes" = dontDistribute super."haeredes";
+  "haggis" = dontDistribute super."haggis";
+  "haha" = dontDistribute super."haha";
+  "hailgun" = dontDistribute super."hailgun";
+  "hailgun-send" = dontDistribute super."hailgun-send";
+  "hails" = dontDistribute super."hails";
+  "hails-bin" = dontDistribute super."hails-bin";
+  "hairy" = dontDistribute super."hairy";
+  "hakaru" = dontDistribute super."hakaru";
+  "hake" = dontDistribute super."hake";
+  "hakismet" = dontDistribute super."hakismet";
+  "hako" = dontDistribute super."hako";
+  "hakyll-R" = dontDistribute super."hakyll-R";
+  "hakyll-agda" = dontDistribute super."hakyll-agda";
+  "hakyll-blaze-templates" = dontDistribute super."hakyll-blaze-templates";
+  "hakyll-contrib" = dontDistribute super."hakyll-contrib";
+  "hakyll-contrib-hyphenation" = dontDistribute super."hakyll-contrib-hyphenation";
+  "hakyll-contrib-links" = dontDistribute super."hakyll-contrib-links";
+  "hakyll-convert" = dontDistribute super."hakyll-convert";
+  "hakyll-elm" = dontDistribute super."hakyll-elm";
+  "hakyll-sass" = dontDistribute super."hakyll-sass";
+  "halberd" = dontDistribute super."halberd";
+  "halfs" = dontDistribute super."halfs";
+  "halipeto" = dontDistribute super."halipeto";
+  "halive" = dontDistribute super."halive";
+  "halma" = dontDistribute super."halma";
+  "haltavista" = dontDistribute super."haltavista";
+  "hamid" = dontDistribute super."hamid";
+  "hampp" = dontDistribute super."hampp";
+  "hamtmap" = dontDistribute super."hamtmap";
+  "hamusic" = dontDistribute super."hamusic";
+  "handa-gdata" = dontDistribute super."handa-gdata";
+  "handa-geodata" = dontDistribute super."handa-geodata";
+  "handa-opengl" = dontDistribute super."handa-opengl";
+  "handle-like" = dontDistribute super."handle-like";
+  "handsy" = dontDistribute super."handsy";
+  "hangman" = dontDistribute super."hangman";
+  "hannahci" = dontDistribute super."hannahci";
+  "hans" = dontDistribute super."hans";
+  "hans-pcap" = dontDistribute super."hans-pcap";
+  "hans-pfq" = dontDistribute super."hans-pfq";
+  "haphviz" = dontDistribute super."haphviz";
+  "happindicator" = dontDistribute super."happindicator";
+  "happindicator3" = dontDistribute super."happindicator3";
+  "happraise" = dontDistribute super."happraise";
+  "happs-hsp" = dontDistribute super."happs-hsp";
+  "happs-hsp-template" = dontDistribute super."happs-hsp-template";
+  "happs-tutorial" = dontDistribute super."happs-tutorial";
+  "happstack" = dontDistribute super."happstack";
+  "happstack-auth" = dontDistribute super."happstack-auth";
+  "happstack-contrib" = dontDistribute super."happstack-contrib";
+  "happstack-data" = dontDistribute super."happstack-data";
+  "happstack-dlg" = dontDistribute super."happstack-dlg";
+  "happstack-facebook" = dontDistribute super."happstack-facebook";
+  "happstack-fastcgi" = dontDistribute super."happstack-fastcgi";
+  "happstack-fay" = dontDistribute super."happstack-fay";
+  "happstack-fay-ajax" = dontDistribute super."happstack-fay-ajax";
+  "happstack-foundation" = dontDistribute super."happstack-foundation";
+  "happstack-hamlet" = dontDistribute super."happstack-hamlet";
+  "happstack-heist" = dontDistribute super."happstack-heist";
+  "happstack-helpers" = dontDistribute super."happstack-helpers";
+  "happstack-hstringtemplate" = dontDistribute super."happstack-hstringtemplate";
+  "happstack-ixset" = dontDistribute super."happstack-ixset";
+  "happstack-lite" = dontDistribute super."happstack-lite";
+  "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
+  "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
+  "happstack-state" = dontDistribute super."happstack-state";
+  "happstack-static-routing" = dontDistribute super."happstack-static-routing";
+  "happstack-util" = dontDistribute super."happstack-util";
+  "happstack-yui" = dontDistribute super."happstack-yui";
+  "happy-meta" = dontDistribute super."happy-meta";
+  "happybara" = dontDistribute super."happybara";
+  "happybara-webkit" = dontDistribute super."happybara-webkit";
+  "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "har" = dontDistribute super."har";
+  "harchive" = dontDistribute super."harchive";
+  "hark" = dontDistribute super."hark";
+  "harmony" = dontDistribute super."harmony";
+  "haroonga" = dontDistribute super."haroonga";
+  "haroonga-httpd" = dontDistribute super."haroonga-httpd";
+  "harpy" = dontDistribute super."harpy";
+  "has" = dontDistribute super."has";
+  "has-th" = dontDistribute super."has-th";
+  "hascal" = dontDistribute super."hascal";
+  "hascat" = dontDistribute super."hascat";
+  "hascat-lib" = dontDistribute super."hascat-lib";
+  "hascat-setup" = dontDistribute super."hascat-setup";
+  "hascat-system" = dontDistribute super."hascat-system";
+  "hash" = dontDistribute super."hash";
+  "hashable-generics" = dontDistribute super."hashable-generics";
+  "hashabler" = dontDistribute super."hashabler";
+  "hashed-storage" = dontDistribute super."hashed-storage";
+  "hashids" = dontDistribute super."hashids";
+  "hashring" = dontDistribute super."hashring";
+  "hashtables-plus" = dontDistribute super."hashtables-plus";
+  "hasim" = dontDistribute super."hasim";
+  "hask" = dontDistribute super."hask";
+  "hask-home" = dontDistribute super."hask-home";
+  "haskades" = dontDistribute super."haskades";
+  "haskakafka" = dontDistribute super."haskakafka";
+  "haskanoid" = dontDistribute super."haskanoid";
+  "haskarrow" = dontDistribute super."haskarrow";
+  "haskbot-core" = dontDistribute super."haskbot-core";
+  "haskdeep" = dontDistribute super."haskdeep";
+  "haskdogs" = dontDistribute super."haskdogs";
+  "haskeem" = dontDistribute super."haskeem";
+  "haskeline" = doDistribute super."haskeline_0_7_2_2";
+  "haskeline-class" = dontDistribute super."haskeline-class";
+  "haskell-aliyun" = dontDistribute super."haskell-aliyun";
+  "haskell-awk" = dontDistribute super."haskell-awk";
+  "haskell-bcrypt" = dontDistribute super."haskell-bcrypt";
+  "haskell-brainfuck" = dontDistribute super."haskell-brainfuck";
+  "haskell-cnc" = dontDistribute super."haskell-cnc";
+  "haskell-coffee" = dontDistribute super."haskell-coffee";
+  "haskell-compression" = dontDistribute super."haskell-compression";
+  "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
+  "haskell-docs" = dontDistribute super."haskell-docs";
+  "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-formatter" = dontDistribute super."haskell-formatter";
+  "haskell-ftp" = dontDistribute super."haskell-ftp";
+  "haskell-generate" = dontDistribute super."haskell-generate";
+  "haskell-gi" = dontDistribute super."haskell-gi";
+  "haskell-gi-base" = dontDistribute super."haskell-gi-base";
+  "haskell-import-graph" = dontDistribute super."haskell-import-graph";
+  "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpi" = dontDistribute super."haskell-mpi";
+  "haskell-names" = dontDistribute super."haskell-names";
+  "haskell-openflow" = dontDistribute super."haskell-openflow";
+  "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
+  "haskell-platform-test" = dontDistribute super."haskell-platform-test";
+  "haskell-plot" = dontDistribute super."haskell-plot";
+  "haskell-qrencode" = dontDistribute super."haskell-qrencode";
+  "haskell-read-editor" = dontDistribute super."haskell-read-editor";
+  "haskell-reflect" = dontDistribute super."haskell-reflect";
+  "haskell-rules" = dontDistribute super."haskell-rules";
+  "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq";
+  "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton";
+  "haskell-token-utils" = dontDistribute super."haskell-token-utils";
+  "haskell-tor" = dontDistribute super."haskell-tor";
+  "haskell-type-exts" = dontDistribute super."haskell-type-exts";
+  "haskell-typescript" = dontDistribute super."haskell-typescript";
+  "haskell-tyrant" = dontDistribute super."haskell-tyrant";
+  "haskell-updater" = dontDistribute super."haskell-updater";
+  "haskell-xmpp" = dontDistribute super."haskell-xmpp";
+  "haskell2010" = dontDistribute super."haskell2010";
+  "haskell98" = dontDistribute super."haskell98";
+  "haskell98libraries" = dontDistribute super."haskell98libraries";
+  "haskelldb" = dontDistribute super."haskelldb";
+  "haskelldb-connect-hdbc" = dontDistribute super."haskelldb-connect-hdbc";
+  "haskelldb-connect-hdbc-catchio-mtl" = dontDistribute super."haskelldb-connect-hdbc-catchio-mtl";
+  "haskelldb-connect-hdbc-catchio-tf" = dontDistribute super."haskelldb-connect-hdbc-catchio-tf";
+  "haskelldb-connect-hdbc-catchio-transformers" = dontDistribute super."haskelldb-connect-hdbc-catchio-transformers";
+  "haskelldb-connect-hdbc-lifted" = dontDistribute super."haskelldb-connect-hdbc-lifted";
+  "haskelldb-dynamic" = dontDistribute super."haskelldb-dynamic";
+  "haskelldb-flat" = dontDistribute super."haskelldb-flat";
+  "haskelldb-hdbc" = dontDistribute super."haskelldb-hdbc";
+  "haskelldb-hdbc-mysql" = dontDistribute super."haskelldb-hdbc-mysql";
+  "haskelldb-hdbc-odbc" = dontDistribute super."haskelldb-hdbc-odbc";
+  "haskelldb-hdbc-postgresql" = dontDistribute super."haskelldb-hdbc-postgresql";
+  "haskelldb-hdbc-sqlite3" = dontDistribute super."haskelldb-hdbc-sqlite3";
+  "haskelldb-hsql" = dontDistribute super."haskelldb-hsql";
+  "haskelldb-hsql-mysql" = dontDistribute super."haskelldb-hsql-mysql";
+  "haskelldb-hsql-odbc" = dontDistribute super."haskelldb-hsql-odbc";
+  "haskelldb-hsql-oracle" = dontDistribute super."haskelldb-hsql-oracle";
+  "haskelldb-hsql-postgresql" = dontDistribute super."haskelldb-hsql-postgresql";
+  "haskelldb-hsql-sqlite" = dontDistribute super."haskelldb-hsql-sqlite";
+  "haskelldb-hsql-sqlite3" = dontDistribute super."haskelldb-hsql-sqlite3";
+  "haskelldb-th" = dontDistribute super."haskelldb-th";
+  "haskelldb-wx" = dontDistribute super."haskelldb-wx";
+  "haskellscrabble" = dontDistribute super."haskellscrabble";
+  "haskellscript" = dontDistribute super."haskellscript";
+  "haskelm" = dontDistribute super."haskelm";
+  "haskgame" = dontDistribute super."haskgame";
+  "haskheap" = dontDistribute super."haskheap";
+  "haskhol-core" = dontDistribute super."haskhol-core";
+  "haskmon" = dontDistribute super."haskmon";
+  "haskoin" = dontDistribute super."haskoin";
+  "haskoin-core" = dontDistribute super."haskoin-core";
+  "haskoin-crypto" = dontDistribute super."haskoin-crypto";
+  "haskoin-node" = dontDistribute super."haskoin-node";
+  "haskoin-protocol" = dontDistribute super."haskoin-protocol";
+  "haskoin-script" = dontDistribute super."haskoin-script";
+  "haskoin-util" = dontDistribute super."haskoin-util";
+  "haskoin-wallet" = dontDistribute super."haskoin-wallet";
+  "haskoon" = dontDistribute super."haskoon";
+  "haskoon-httpspec" = dontDistribute super."haskoon-httpspec";
+  "haskoon-salvia" = dontDistribute super."haskoon-salvia";
+  "haskore" = dontDistribute super."haskore";
+  "haskore-realtime" = dontDistribute super."haskore-realtime";
+  "haskore-supercollider" = dontDistribute super."haskore-supercollider";
+  "haskore-synthesizer" = dontDistribute super."haskore-synthesizer";
+  "haskore-vintage" = dontDistribute super."haskore-vintage";
+  "hasktags" = dontDistribute super."hasktags";
+  "haslo" = dontDistribute super."haslo";
+  "hasloGUI" = dontDistribute super."hasloGUI";
+  "hasparql-client" = dontDistribute super."hasparql-client";
+  "haspell" = dontDistribute super."haspell";
+  "hasql-pool" = dontDistribute super."hasql-pool";
+  "hasql-postgres" = dontDistribute super."hasql-postgres";
+  "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
+  "hasql-th" = dontDistribute super."hasql-th";
+  "hasql-transaction" = dontDistribute super."hasql-transaction";
+  "hastache-aeson" = dontDistribute super."hastache-aeson";
+  "haste" = dontDistribute super."haste";
+  "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-markup" = dontDistribute super."haste-markup";
+  "haste-perch" = dontDistribute super."haste-perch";
+  "hastily" = dontDistribute super."hastily";
+  "hat" = dontDistribute super."hat";
+  "hatex-guide" = dontDistribute super."hatex-guide";
+  "hath" = dontDistribute super."hath";
+  "hatt" = dontDistribute super."hatt";
+  "haverer" = dontDistribute super."haverer";
+  "hawitter" = dontDistribute super."hawitter";
+  "haxl-amazonka" = dontDistribute super."haxl-amazonka";
+  "haxl-facebook" = dontDistribute super."haxl-facebook";
+  "haxparse" = dontDistribute super."haxparse";
+  "haxr-th" = dontDistribute super."haxr-th";
+  "haxy" = dontDistribute super."haxy";
+  "hayland" = dontDistribute super."hayland";
+  "hayoo-cli" = dontDistribute super."hayoo-cli";
+  "hback" = dontDistribute super."hback";
+  "hbayes" = dontDistribute super."hbayes";
+  "hbb" = dontDistribute super."hbb";
+  "hbcd" = dontDistribute super."hbcd";
+  "hbeat" = dontDistribute super."hbeat";
+  "hblas" = dontDistribute super."hblas";
+  "hblock" = dontDistribute super."hblock";
+  "hbro" = dontDistribute super."hbro";
+  "hbro-contrib" = dontDistribute super."hbro-contrib";
+  "hburg" = dontDistribute super."hburg";
+  "hcc" = dontDistribute super."hcc";
+  "hcg-minus" = dontDistribute super."hcg-minus";
+  "hcg-minus-cairo" = dontDistribute super."hcg-minus-cairo";
+  "hcheat" = dontDistribute super."hcheat";
+  "hchesslib" = dontDistribute super."hchesslib";
+  "hcltest" = dontDistribute super."hcltest";
+  "hcron" = dontDistribute super."hcron";
+  "hcube" = dontDistribute super."hcube";
+  "hcwiid" = dontDistribute super."hcwiid";
+  "hdaemonize-buildfix" = dontDistribute super."hdaemonize-buildfix";
+  "hdbc-aeson" = dontDistribute super."hdbc-aeson";
+  "hdbc-postgresql-hstore" = dontDistribute super."hdbc-postgresql-hstore";
+  "hdbc-tuple" = dontDistribute super."hdbc-tuple";
+  "hdbi" = dontDistribute super."hdbi";
+  "hdbi-conduit" = dontDistribute super."hdbi-conduit";
+  "hdbi-postgresql" = dontDistribute super."hdbi-postgresql";
+  "hdbi-sqlite" = dontDistribute super."hdbi-sqlite";
+  "hdbi-tests" = dontDistribute super."hdbi-tests";
+  "hdf" = dontDistribute super."hdf";
+  "hdigest" = dontDistribute super."hdigest";
+  "hdirect" = dontDistribute super."hdirect";
+  "hdis86" = dontDistribute super."hdis86";
+  "hdiscount" = dontDistribute super."hdiscount";
+  "hdm" = dontDistribute super."hdm";
+  "hdph" = dontDistribute super."hdph";
+  "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
+  "headergen" = dontDistribute super."headergen";
+  "heapsort" = dontDistribute super."heapsort";
+  "hecc" = dontDistribute super."hecc";
+  "hedis-config" = dontDistribute super."hedis-config";
+  "hedis-monadic" = dontDistribute super."hedis-monadic";
+  "hedis-pile" = dontDistribute super."hedis-pile";
+  "hedis-simple" = dontDistribute super."hedis-simple";
+  "hedis-tags" = dontDistribute super."hedis-tags";
+  "hedn" = dontDistribute super."hedn";
+  "hein" = dontDistribute super."hein";
+  "heist-aeson" = dontDistribute super."heist-aeson";
+  "heist-async" = dontDistribute super."heist-async";
+  "helics" = dontDistribute super."helics";
+  "helics-wai" = dontDistribute super."helics-wai";
+  "helisp" = dontDistribute super."helisp";
+  "helium" = dontDistribute super."helium";
+  "hell" = dontDistribute super."hell";
+  "hellage" = dontDistribute super."hellage";
+  "hellnet" = dontDistribute super."hellnet";
+  "hello" = dontDistribute super."hello";
+  "helm" = dontDistribute super."helm";
+  "help-esb" = dontDistribute super."help-esb";
+  "hemkay" = dontDistribute super."hemkay";
+  "hemkay-core" = dontDistribute super."hemkay-core";
+  "hemokit" = dontDistribute super."hemokit";
+  "hen" = dontDistribute super."hen";
+  "henet" = dontDistribute super."henet";
+  "hepevt" = dontDistribute super."hepevt";
+  "her-lexer" = dontDistribute super."her-lexer";
+  "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
+  "herbalizer" = dontDistribute super."herbalizer";
+  "hermit" = dontDistribute super."hermit";
+  "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
+  "heroku" = dontDistribute super."heroku";
+  "heroku-persistent" = dontDistribute super."heroku-persistent";
+  "herringbone" = dontDistribute super."herringbone";
+  "herringbone-embed" = dontDistribute super."herringbone-embed";
+  "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesql" = dontDistribute super."hesql";
+  "hetero-map" = dontDistribute super."hetero-map";
+  "hetris" = dontDistribute super."hetris";
+  "heukarya" = dontDistribute super."heukarya";
+  "hevolisa" = dontDistribute super."hevolisa";
+  "hevolisa-dph" = dontDistribute super."hevolisa-dph";
+  "hexdump" = dontDistribute super."hexdump";
+  "hexif" = dontDistribute super."hexif";
+  "hexpat-iteratee" = dontDistribute super."hexpat-iteratee";
+  "hexpat-lens" = dontDistribute super."hexpat-lens";
+  "hexpat-pickle" = dontDistribute super."hexpat-pickle";
+  "hexpat-pickle-generic" = dontDistribute super."hexpat-pickle-generic";
+  "hexpat-tagsoup" = dontDistribute super."hexpat-tagsoup";
+  "hexpr" = dontDistribute super."hexpr";
+  "hexquote" = dontDistribute super."hexquote";
+  "heyefi" = dontDistribute super."heyefi";
+  "hfann" = dontDistribute super."hfann";
+  "hfd" = dontDistribute super."hfd";
+  "hfiar" = dontDistribute super."hfiar";
+  "hfmt" = dontDistribute super."hfmt";
+  "hfoil" = dontDistribute super."hfoil";
+  "hfov" = dontDistribute super."hfov";
+  "hfractal" = dontDistribute super."hfractal";
+  "hfusion" = dontDistribute super."hfusion";
+  "hg-buildpackage" = dontDistribute super."hg-buildpackage";
+  "hgal" = dontDistribute super."hgal";
+  "hgalib" = dontDistribute super."hgalib";
+  "hgdbmi" = dontDistribute super."hgdbmi";
+  "hgearman" = dontDistribute super."hgearman";
+  "hgen" = dontDistribute super."hgen";
+  "hgeometric" = dontDistribute super."hgeometric";
+  "hgeometry" = dontDistribute super."hgeometry";
+  "hgithub" = dontDistribute super."hgithub";
+  "hgl-example" = dontDistribute super."hgl-example";
+  "hgom" = dontDistribute super."hgom";
+  "hgopher" = dontDistribute super."hgopher";
+  "hgrev" = dontDistribute super."hgrev";
+  "hgrib" = dontDistribute super."hgrib";
+  "hharp" = dontDistribute super."hharp";
+  "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
+  "hiccup" = dontDistribute super."hiccup";
+  "hichi" = dontDistribute super."hichi";
+  "hieraclus" = dontDistribute super."hieraclus";
+  "hierarchical-clustering-diagrams" = dontDistribute super."hierarchical-clustering-diagrams";
+  "hierarchical-exceptions" = dontDistribute super."hierarchical-exceptions";
+  "hierarchy" = dontDistribute super."hierarchy";
+  "hiernotify" = dontDistribute super."hiernotify";
+  "highWaterMark" = dontDistribute super."highWaterMark";
+  "higher-leveldb" = dontDistribute super."higher-leveldb";
+  "higherorder" = dontDistribute super."higherorder";
+  "highlight-versions" = dontDistribute super."highlight-versions";
+  "highlighter" = dontDistribute super."highlighter";
+  "highlighter2" = dontDistribute super."highlighter2";
+  "hills" = dontDistribute super."hills";
+  "himerge" = dontDistribute super."himerge";
+  "himg" = dontDistribute super."himg";
+  "himpy" = dontDistribute super."himpy";
+  "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
+  "hinduce-classifier" = dontDistribute super."hinduce-classifier";
+  "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
+  "hinduce-examples" = dontDistribute super."hinduce-examples";
+  "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinquire" = dontDistribute super."hinquire";
+  "hinstaller" = dontDistribute super."hinstaller";
+  "hint-server" = dontDistribute super."hint-server";
+  "hinvaders" = dontDistribute super."hinvaders";
+  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hipbot" = dontDistribute super."hipbot";
+  "hipe" = dontDistribute super."hipe";
+  "hips" = dontDistribute super."hips";
+  "hircules" = dontDistribute super."hircules";
+  "hirt" = dontDistribute super."hirt";
+  "hissmetrics" = dontDistribute super."hissmetrics";
+  "hist-pl" = dontDistribute super."hist-pl";
+  "hist-pl-dawg" = dontDistribute super."hist-pl-dawg";
+  "hist-pl-fusion" = dontDistribute super."hist-pl-fusion";
+  "hist-pl-lexicon" = dontDistribute super."hist-pl-lexicon";
+  "hist-pl-lmf" = dontDistribute super."hist-pl-lmf";
+  "hist-pl-transliter" = dontDistribute super."hist-pl-transliter";
+  "hist-pl-types" = dontDistribute super."hist-pl-types";
+  "histogram-fill-binary" = dontDistribute super."histogram-fill-binary";
+  "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal";
+  "historian" = dontDistribute super."historian";
+  "hjcase" = dontDistribute super."hjcase";
+  "hjpath" = dontDistribute super."hjpath";
+  "hjs" = dontDistribute super."hjs";
+  "hjson" = dontDistribute super."hjson";
+  "hjson-query" = dontDistribute super."hjson-query";
+  "hjsonpointer" = dontDistribute super."hjsonpointer";
+  "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
+  "hlatex" = dontDistribute super."hlatex";
+  "hlbfgsb" = dontDistribute super."hlbfgsb";
+  "hlcm" = dontDistribute super."hlcm";
+  "hledger-chart" = dontDistribute super."hledger-chart";
+  "hledger-diff" = dontDistribute super."hledger-diff";
+  "hledger-irr" = dontDistribute super."hledger-irr";
+  "hledger-ui" = dontDistribute super."hledger-ui";
+  "hledger-vty" = dontDistribute super."hledger-vty";
+  "hlibBladeRF" = dontDistribute super."hlibBladeRF";
+  "hlibev" = dontDistribute super."hlibev";
+  "hlibfam" = dontDistribute super."hlibfam";
+  "hlogger" = dontDistribute super."hlogger";
+  "hlongurl" = dontDistribute super."hlongurl";
+  "hls" = dontDistribute super."hls";
+  "hlwm" = dontDistribute super."hlwm";
+  "hly" = dontDistribute super."hly";
+  "hmark" = dontDistribute super."hmark";
+  "hmarkup" = dontDistribute super."hmarkup";
+  "hmatrix-banded" = dontDistribute super."hmatrix-banded";
+  "hmatrix-csv" = dontDistribute super."hmatrix-csv";
+  "hmatrix-glpk" = dontDistribute super."hmatrix-glpk";
+  "hmatrix-mmap" = dontDistribute super."hmatrix-mmap";
+  "hmatrix-nipals" = dontDistribute super."hmatrix-nipals";
+  "hmatrix-quadprogpp" = dontDistribute super."hmatrix-quadprogpp";
+  "hmatrix-repa" = dontDistribute super."hmatrix-repa";
+  "hmatrix-special" = dontDistribute super."hmatrix-special";
+  "hmatrix-static" = dontDistribute super."hmatrix-static";
+  "hmatrix-svdlibc" = dontDistribute super."hmatrix-svdlibc";
+  "hmatrix-syntax" = dontDistribute super."hmatrix-syntax";
+  "hmatrix-tests" = dontDistribute super."hmatrix-tests";
+  "hmeap" = dontDistribute super."hmeap";
+  "hmeap-utils" = dontDistribute super."hmeap-utils";
+  "hmemdb" = dontDistribute super."hmemdb";
+  "hmenu" = dontDistribute super."hmenu";
+  "hmidi" = dontDistribute super."hmidi";
+  "hmk" = dontDistribute super."hmk";
+  "hmm" = dontDistribute super."hmm";
+  "hmm-hmatrix" = dontDistribute super."hmm-hmatrix";
+  "hmp3" = dontDistribute super."hmp3";
+  "hmpfr" = dontDistribute super."hmpfr";
+  "hmt" = dontDistribute super."hmt";
+  "hmt-diagrams" = dontDistribute super."hmt-diagrams";
+  "hmumps" = dontDistribute super."hmumps";
+  "hnetcdf" = dontDistribute super."hnetcdf";
+  "hnix" = dontDistribute super."hnix";
+  "hnn" = dontDistribute super."hnn";
+  "hnop" = dontDistribute super."hnop";
+  "ho-rewriting" = dontDistribute super."ho-rewriting";
+  "hoauth" = dontDistribute super."hoauth";
+  "hob" = dontDistribute super."hob";
+  "hobbes" = dontDistribute super."hobbes";
+  "hobbits" = dontDistribute super."hobbits";
+  "hoe" = dontDistribute super."hoe";
+  "hofix-mtl" = dontDistribute super."hofix-mtl";
+  "hog" = dontDistribute super."hog";
+  "hogg" = dontDistribute super."hogg";
+  "hogre" = dontDistribute super."hogre";
+  "hogre-examples" = dontDistribute super."hogre-examples";
+  "hois" = dontDistribute super."hois";
+  "hoist-error" = dontDistribute super."hoist-error";
+  "hold-em" = dontDistribute super."hold-em";
+  "hole" = dontDistribute super."hole";
+  "holey-format" = dontDistribute super."holey-format";
+  "homeomorphic" = dontDistribute super."homeomorphic";
+  "hommage" = dontDistribute super."hommage";
+  "hommage-ds" = dontDistribute super."hommage-ds";
+  "homplexity" = dontDistribute super."homplexity";
+  "honi" = dontDistribute super."honi";
+  "honk" = dontDistribute super."honk";
+  "hoobuddy" = dontDistribute super."hoobuddy";
+  "hood" = dontDistribute super."hood";
+  "hood-off" = dontDistribute super."hood-off";
+  "hood2" = dontDistribute super."hood2";
+  "hoodie" = dontDistribute super."hoodie";
+  "hoodle" = dontDistribute super."hoodle";
+  "hoodle-builder" = dontDistribute super."hoodle-builder";
+  "hoodle-core" = dontDistribute super."hoodle-core";
+  "hoodle-extra" = dontDistribute super."hoodle-extra";
+  "hoodle-parser" = dontDistribute super."hoodle-parser";
+  "hoodle-publish" = dontDistribute super."hoodle-publish";
+  "hoodle-render" = dontDistribute super."hoodle-render";
+  "hoodle-types" = dontDistribute super."hoodle-types";
+  "hoogle-index" = dontDistribute super."hoogle-index";
+  "hooks-dir" = dontDistribute super."hooks-dir";
+  "hoovie" = dontDistribute super."hoovie";
+  "hopencc" = dontDistribute super."hopencc";
+  "hopencl" = dontDistribute super."hopencl";
+  "hopfield" = dontDistribute super."hopfield";
+  "hopfield-networks" = dontDistribute super."hopfield-networks";
+  "hopfli" = dontDistribute super."hopfli";
+  "hops" = dontDistribute super."hops";
+  "hoq" = dontDistribute super."hoq";
+  "horizon" = dontDistribute super."horizon";
+  "hosc" = dontDistribute super."hosc";
+  "hosc-json" = dontDistribute super."hosc-json";
+  "hosc-utils" = dontDistribute super."hosc-utils";
+  "hosts-server" = dontDistribute super."hosts-server";
+  "hothasktags" = dontDistribute super."hothasktags";
+  "hotswap" = dontDistribute super."hotswap";
+  "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
+  "hp2any-core" = dontDistribute super."hp2any-core";
+  "hp2any-graph" = dontDistribute super."hp2any-graph";
+  "hp2any-manager" = dontDistribute super."hp2any-manager";
+  "hp2html" = dontDistribute super."hp2html";
+  "hp2pretty" = dontDistribute super."hp2pretty";
+  "hpack" = dontDistribute super."hpack";
+  "hpaco" = dontDistribute super."hpaco";
+  "hpaco-lib" = dontDistribute super."hpaco-lib";
+  "hpage" = dontDistribute super."hpage";
+  "hpapi" = dontDistribute super."hpapi";
+  "hpaste" = dontDistribute super."hpaste";
+  "hpasteit" = dontDistribute super."hpasteit";
+  "hpc-strobe" = dontDistribute super."hpc-strobe";
+  "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hplayground" = dontDistribute super."hplayground";
+  "hplaylist" = dontDistribute super."hplaylist";
+  "hpodder" = dontDistribute super."hpodder";
+  "hpp" = dontDistribute super."hpp";
+  "hpqtypes" = dontDistribute super."hpqtypes";
+  "hprotoc-fork" = dontDistribute super."hprotoc-fork";
+  "hps" = dontDistribute super."hps";
+  "hps-cairo" = dontDistribute super."hps-cairo";
+  "hps-kmeans" = dontDistribute super."hps-kmeans";
+  "hpuz" = dontDistribute super."hpuz";
+  "hpygments" = dontDistribute super."hpygments";
+  "hpylos" = dontDistribute super."hpylos";
+  "hpyrg" = dontDistribute super."hpyrg";
+  "hquantlib" = dontDistribute super."hquantlib";
+  "hquery" = dontDistribute super."hquery";
+  "hranker" = dontDistribute super."hranker";
+  "hreader" = dontDistribute super."hreader";
+  "hricket" = dontDistribute super."hricket";
+  "hruby" = dontDistribute super."hruby";
+  "hs-GeoIP" = dontDistribute super."hs-GeoIP";
+  "hs-blake2" = dontDistribute super."hs-blake2";
+  "hs-captcha" = dontDistribute super."hs-captcha";
+  "hs-carbon" = dontDistribute super."hs-carbon";
+  "hs-carbon-examples" = dontDistribute super."hs-carbon-examples";
+  "hs-cdb" = dontDistribute super."hs-cdb";
+  "hs-dotnet" = dontDistribute super."hs-dotnet";
+  "hs-duktape" = dontDistribute super."hs-duktape";
+  "hs-excelx" = dontDistribute super."hs-excelx";
+  "hs-ffmpeg" = dontDistribute super."hs-ffmpeg";
+  "hs-fltk" = dontDistribute super."hs-fltk";
+  "hs-gchart" = dontDistribute super."hs-gchart";
+  "hs-gen-iface" = dontDistribute super."hs-gen-iface";
+  "hs-gizapp" = dontDistribute super."hs-gizapp";
+  "hs-inspector" = dontDistribute super."hs-inspector";
+  "hs-java" = dontDistribute super."hs-java";
+  "hs-json-rpc" = dontDistribute super."hs-json-rpc";
+  "hs-logo" = dontDistribute super."hs-logo";
+  "hs-mesos" = dontDistribute super."hs-mesos";
+  "hs-nombre-generator" = dontDistribute super."hs-nombre-generator";
+  "hs-pgms" = dontDistribute super."hs-pgms";
+  "hs-php-session" = dontDistribute super."hs-php-session";
+  "hs-pkg-config" = dontDistribute super."hs-pkg-config";
+  "hs-pkpass" = dontDistribute super."hs-pkpass";
+  "hs-re" = dontDistribute super."hs-re";
+  "hs-scrape" = dontDistribute super."hs-scrape";
+  "hs-twitter" = dontDistribute super."hs-twitter";
+  "hs-twitterarchiver" = dontDistribute super."hs-twitterarchiver";
+  "hs-vcard" = dontDistribute super."hs-vcard";
+  "hs2048" = dontDistribute super."hs2048";
+  "hs2bf" = dontDistribute super."hs2bf";
+  "hs2dot" = dontDistribute super."hs2dot";
+  "hsConfigure" = dontDistribute super."hsConfigure";
+  "hsSqlite3" = dontDistribute super."hsSqlite3";
+  "hsXenCtrl" = dontDistribute super."hsXenCtrl";
+  "hsay" = dontDistribute super."hsay";
+  "hsb2hs" = dontDistribute super."hsb2hs";
+  "hsbackup" = dontDistribute super."hsbackup";
+  "hsbencher" = dontDistribute super."hsbencher";
+  "hsbencher-codespeed" = dontDistribute super."hsbencher-codespeed";
+  "hsbencher-fusion" = dontDistribute super."hsbencher-fusion";
+  "hsc2hs" = dontDistribute super."hsc2hs";
+  "hsc3" = dontDistribute super."hsc3";
+  "hsc3-auditor" = dontDistribute super."hsc3-auditor";
+  "hsc3-cairo" = dontDistribute super."hsc3-cairo";
+  "hsc3-data" = dontDistribute super."hsc3-data";
+  "hsc3-db" = dontDistribute super."hsc3-db";
+  "hsc3-dot" = dontDistribute super."hsc3-dot";
+  "hsc3-forth" = dontDistribute super."hsc3-forth";
+  "hsc3-graphs" = dontDistribute super."hsc3-graphs";
+  "hsc3-lang" = dontDistribute super."hsc3-lang";
+  "hsc3-lisp" = dontDistribute super."hsc3-lisp";
+  "hsc3-plot" = dontDistribute super."hsc3-plot";
+  "hsc3-process" = dontDistribute super."hsc3-process";
+  "hsc3-rec" = dontDistribute super."hsc3-rec";
+  "hsc3-rw" = dontDistribute super."hsc3-rw";
+  "hsc3-server" = dontDistribute super."hsc3-server";
+  "hsc3-sf" = dontDistribute super."hsc3-sf";
+  "hsc3-sf-hsndfile" = dontDistribute super."hsc3-sf-hsndfile";
+  "hsc3-unsafe" = dontDistribute super."hsc3-unsafe";
+  "hsc3-utils" = dontDistribute super."hsc3-utils";
+  "hscamwire" = dontDistribute super."hscamwire";
+  "hscassandra" = dontDistribute super."hscassandra";
+  "hscd" = dontDistribute super."hscd";
+  "hsclock" = dontDistribute super."hsclock";
+  "hscope" = dontDistribute super."hscope";
+  "hscrtmpl" = dontDistribute super."hscrtmpl";
+  "hscuid" = dontDistribute super."hscuid";
+  "hscurses" = dontDistribute super."hscurses";
+  "hscurses-fish-ex" = dontDistribute super."hscurses-fish-ex";
+  "hsdev" = dontDistribute super."hsdev";
+  "hsdif" = dontDistribute super."hsdif";
+  "hsdip" = dontDistribute super."hsdip";
+  "hsdns" = dontDistribute super."hsdns";
+  "hsdns-cache" = dontDistribute super."hsdns-cache";
+  "hsemail-ns" = dontDistribute super."hsemail-ns";
+  "hsenv" = dontDistribute super."hsenv";
+  "hserv" = dontDistribute super."hserv";
+  "hset" = dontDistribute super."hset";
+  "hsfacter" = dontDistribute super."hsfacter";
+  "hsfcsh" = dontDistribute super."hsfcsh";
+  "hsfilt" = dontDistribute super."hsfilt";
+  "hsgnutls" = dontDistribute super."hsgnutls";
+  "hsgnutls-yj" = dontDistribute super."hsgnutls-yj";
+  "hsgsom" = dontDistribute super."hsgsom";
+  "hsgtd" = dontDistribute super."hsgtd";
+  "hsharc" = dontDistribute super."hsharc";
+  "hsilop" = dontDistribute super."hsilop";
+  "hsimport" = dontDistribute super."hsimport";
+  "hsini" = dontDistribute super."hsini";
+  "hskeleton" = dontDistribute super."hskeleton";
+  "hslackbuilder" = dontDistribute super."hslackbuilder";
+  "hslibsvm" = dontDistribute super."hslibsvm";
+  "hslinks" = dontDistribute super."hslinks";
+  "hslogger-reader" = dontDistribute super."hslogger-reader";
+  "hslogger-template" = dontDistribute super."hslogger-template";
+  "hslogger4j" = dontDistribute super."hslogger4j";
+  "hslogstash" = dontDistribute super."hslogstash";
+  "hsmagick" = dontDistribute super."hsmagick";
+  "hsmisc" = dontDistribute super."hsmisc";
+  "hsmtpclient" = dontDistribute super."hsmtpclient";
+  "hsndfile-storablevector" = dontDistribute super."hsndfile-storablevector";
+  "hsnock" = dontDistribute super."hsnock";
+  "hsnoise" = dontDistribute super."hsnoise";
+  "hsns" = dontDistribute super."hsns";
+  "hsnsq" = dontDistribute super."hsnsq";
+  "hsntp" = dontDistribute super."hsntp";
+  "hsoptions" = dontDistribute super."hsoptions";
+  "hsp-cgi" = dontDistribute super."hsp-cgi";
+  "hsparklines" = dontDistribute super."hsparklines";
+  "hsparql" = dontDistribute super."hsparql";
+  "hspear" = dontDistribute super."hspear";
+  "hspec-checkers" = dontDistribute super."hspec-checkers";
+  "hspec-expectations-lens" = dontDistribute super."hspec-expectations-lens";
+  "hspec-expectations-lifted" = dontDistribute super."hspec-expectations-lifted";
+  "hspec-expectations-pretty" = dontDistribute super."hspec-expectations-pretty";
+  "hspec-experimental" = dontDistribute super."hspec-experimental";
+  "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-monad-control" = dontDistribute super."hspec-monad-control";
+  "hspec-server" = dontDistribute super."hspec-server";
+  "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
+  "hspec-test-framework" = dontDistribute super."hspec-test-framework";
+  "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th";
+  "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox";
+  "hspec2" = dontDistribute super."hspec2";
+  "hspr-sh" = dontDistribute super."hspr-sh";
+  "hspread" = dontDistribute super."hspread";
+  "hspresent" = dontDistribute super."hspresent";
+  "hsprocess" = dontDistribute super."hsprocess";
+  "hsql" = dontDistribute super."hsql";
+  "hsql-mysql" = dontDistribute super."hsql-mysql";
+  "hsql-odbc" = dontDistribute super."hsql-odbc";
+  "hsql-postgresql" = dontDistribute super."hsql-postgresql";
+  "hsql-sqlite3" = dontDistribute super."hsql-sqlite3";
+  "hsqml" = dontDistribute super."hsqml";
+  "hsqml-datamodel" = dontDistribute super."hsqml-datamodel";
+  "hsqml-datamodel-vinyl" = dontDistribute super."hsqml-datamodel-vinyl";
+  "hsqml-demo-morris" = dontDistribute super."hsqml-demo-morris";
+  "hsqml-demo-notes" = dontDistribute super."hsqml-demo-notes";
+  "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples";
+  "hsqml-morris" = dontDistribute super."hsqml-morris";
+  "hsreadability" = dontDistribute super."hsreadability";
+  "hsseccomp" = dontDistribute super."hsseccomp";
+  "hsshellscript" = dontDistribute super."hsshellscript";
+  "hssourceinfo" = dontDistribute super."hssourceinfo";
+  "hssqlppp" = dontDistribute super."hssqlppp";
+  "hstats" = dontDistribute super."hstats";
+  "hstest" = dontDistribute super."hstest";
+  "hstidy" = dontDistribute super."hstidy";
+  "hstorchat" = dontDistribute super."hstorchat";
+  "hstradeking" = dontDistribute super."hstradeking";
+  "hstyle" = dontDistribute super."hstyle";
+  "hstzaar" = dontDistribute super."hstzaar";
+  "hsubconvert" = dontDistribute super."hsubconvert";
+  "hsverilog" = dontDistribute super."hsverilog";
+  "hswip" = dontDistribute super."hswip";
+  "hsx" = dontDistribute super."hsx";
+  "hsx-xhtml" = dontDistribute super."hsx-xhtml";
+  "hsyscall" = dontDistribute super."hsyscall";
+  "hszephyr" = dontDistribute super."hszephyr";
+  "htags" = dontDistribute super."htags";
+  "htar" = dontDistribute super."htar";
+  "htiled" = dontDistribute super."htiled";
+  "htime" = dontDistribute super."htime";
+  "html-email-validate" = dontDistribute super."html-email-validate";
+  "html-entities" = dontDistribute super."html-entities";
+  "html-kure" = dontDistribute super."html-kure";
+  "html-minimalist" = dontDistribute super."html-minimalist";
+  "html-rules" = dontDistribute super."html-rules";
+  "html-tokenizer" = dontDistribute super."html-tokenizer";
+  "html-truncate" = dontDistribute super."html-truncate";
+  "html2hamlet" = dontDistribute super."html2hamlet";
+  "html5-entity" = dontDistribute super."html5-entity";
+  "htodo" = dontDistribute super."htodo";
+  "htoml" = dontDistribute super."htoml";
+  "htrace" = dontDistribute super."htrace";
+  "hts" = dontDistribute super."hts";
+  "htsn" = dontDistribute super."htsn";
+  "htsn-common" = dontDistribute super."htsn-common";
+  "htsn-import" = dontDistribute super."htsn-import";
+  "http-attoparsec" = dontDistribute super."http-attoparsec";
+  "http-client-auth" = dontDistribute super."http-client-auth";
+  "http-client-conduit" = dontDistribute super."http-client-conduit";
+  "http-client-lens" = dontDistribute super."http-client-lens";
+  "http-client-multipart" = dontDistribute super."http-client-multipart";
+  "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers";
+  "http-client-streams" = dontDistribute super."http-client-streams";
+  "http-conduit-browser" = dontDistribute super."http-conduit-browser";
+  "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-encodings" = dontDistribute super."http-encodings";
+  "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kit" = dontDistribute super."http-kit";
+  "http-listen" = dontDistribute super."http-listen";
+  "http-monad" = dontDistribute super."http-monad";
+  "http-proxy" = dontDistribute super."http-proxy";
+  "http-querystring" = dontDistribute super."http-querystring";
+  "http-server" = dontDistribute super."http-server";
+  "http-shed" = dontDistribute super."http-shed";
+  "http-test" = dontDistribute super."http-test";
+  "http-wget" = dontDistribute super."http-wget";
+  "httpd-shed" = dontDistribute super."httpd-shed";
+  "https-everywhere-rules" = dontDistribute super."https-everywhere-rules";
+  "https-everywhere-rules-raw" = dontDistribute super."https-everywhere-rules-raw";
+  "httpspec" = dontDistribute super."httpspec";
+  "htune" = dontDistribute super."htune";
+  "htzaar" = dontDistribute super."htzaar";
+  "hub" = dontDistribute super."hub";
+  "hubigraph" = dontDistribute super."hubigraph";
+  "hubris" = dontDistribute super."hubris";
+  "huckleberry" = dontDistribute super."huckleberry";
+  "huffman" = dontDistribute super."huffman";
+  "hugs2yc" = dontDistribute super."hugs2yc";
+  "hulk" = dontDistribute super."hulk";
+  "hums" = dontDistribute super."hums";
+  "hunch" = dontDistribute super."hunch";
+  "hunit-gui" = dontDistribute super."hunit-gui";
+  "hunit-parsec" = dontDistribute super."hunit-parsec";
+  "hunit-rematch" = dontDistribute super."hunit-rematch";
+  "hunp" = dontDistribute super."hunp";
+  "hunt-searchengine" = dontDistribute super."hunt-searchengine";
+  "hunt-server" = dontDistribute super."hunt-server";
+  "hunt-server-cli" = dontDistribute super."hunt-server-cli";
+  "hurdle" = dontDistribute super."hurdle";
+  "husk-scheme" = dontDistribute super."husk-scheme";
+  "husk-scheme-libs" = dontDistribute super."husk-scheme-libs";
+  "husky" = dontDistribute super."husky";
+  "hutton" = dontDistribute super."hutton";
+  "huttons-razor" = dontDistribute super."huttons-razor";
+  "huzzy" = dontDistribute super."huzzy";
+  "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
+  "hws" = dontDistribute super."hws";
+  "hwsl2" = dontDistribute super."hwsl2";
+  "hwsl2-bytevector" = dontDistribute super."hwsl2-bytevector";
+  "hwsl2-reducers" = dontDistribute super."hwsl2-reducers";
+  "hx" = dontDistribute super."hx";
+  "hxmppc" = dontDistribute super."hxmppc";
+  "hxournal" = dontDistribute super."hxournal";
+  "hxt-binary" = dontDistribute super."hxt-binary";
+  "hxt-cache" = dontDistribute super."hxt-cache";
+  "hxt-extras" = dontDistribute super."hxt-extras";
+  "hxt-filter" = dontDistribute super."hxt-filter";
+  "hxt-xpath" = dontDistribute super."hxt-xpath";
+  "hxt-xslt" = dontDistribute super."hxt-xslt";
+  "hxthelper" = dontDistribute super."hxthelper";
+  "hxweb" = dontDistribute super."hxweb";
+  "hyahtzee" = dontDistribute super."hyahtzee";
+  "hyakko" = dontDistribute super."hyakko";
+  "hybrid" = dontDistribute super."hybrid";
+  "hydra-hs" = dontDistribute super."hydra-hs";
+  "hydra-print" = dontDistribute super."hydra-print";
+  "hydrogen" = dontDistribute super."hydrogen";
+  "hydrogen-cli" = dontDistribute super."hydrogen-cli";
+  "hydrogen-cli-args" = dontDistribute super."hydrogen-cli-args";
+  "hydrogen-data" = dontDistribute super."hydrogen-data";
+  "hydrogen-multimap" = dontDistribute super."hydrogen-multimap";
+  "hydrogen-parsing" = dontDistribute super."hydrogen-parsing";
+  "hydrogen-prelude" = dontDistribute super."hydrogen-prelude";
+  "hydrogen-prelude-parsec" = dontDistribute super."hydrogen-prelude-parsec";
+  "hydrogen-syntax" = dontDistribute super."hydrogen-syntax";
+  "hydrogen-util" = dontDistribute super."hydrogen-util";
+  "hydrogen-version" = dontDistribute super."hydrogen-version";
+  "hyena" = dontDistribute super."hyena";
+  "hylolib" = dontDistribute super."hylolib";
+  "hylotab" = dontDistribute super."hylotab";
+  "hyloutils" = dontDistribute super."hyloutils";
+  "hyperdrive" = dontDistribute super."hyperdrive";
+  "hyperfunctions" = dontDistribute super."hyperfunctions";
+  "hyperpublic" = dontDistribute super."hyperpublic";
+  "hyphenate" = dontDistribute super."hyphenate";
+  "hypher" = dontDistribute super."hypher";
+  "hzk" = dontDistribute super."hzk";
+  "i18n" = dontDistribute super."i18n";
+  "iCalendar" = dontDistribute super."iCalendar";
+  "iException" = dontDistribute super."iException";
+  "iap-verifier" = dontDistribute super."iap-verifier";
+  "ib-api" = dontDistribute super."ib-api";
+  "iban" = dontDistribute super."iban";
+  "ide-backend" = doDistribute super."ide-backend_0_10_0";
+  "ide-backend-common" = doDistribute super."ide-backend-common_0_10_1_1";
+  "ide-backend-server" = doDistribute super."ide-backend-server_0_10_0";
+  "ideas" = dontDistribute super."ideas";
+  "ideas-math" = dontDistribute super."ideas-math";
+  "idempotent" = dontDistribute super."idempotent";
+  "identifiers" = dontDistribute super."identifiers";
+  "idiii" = dontDistribute super."idiii";
+  "idna" = dontDistribute super."idna";
+  "idna2008" = dontDistribute super."idna2008";
+  "idris" = dontDistribute super."idris";
+  "ieee" = dontDistribute super."ieee";
+  "ieee-utils" = dontDistribute super."ieee-utils";
+  "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754-parser" = dontDistribute super."ieee754-parser";
+  "ifcxt" = dontDistribute super."ifcxt";
+  "iff" = dontDistribute super."iff";
+  "ifscs" = dontDistribute super."ifscs";
+  "ige-mac-integration" = dontDistribute super."ige-mac-integration";
+  "igraph" = dontDistribute super."igraph";
+  "igrf" = dontDistribute super."igrf";
+  "ihaskell-display" = dontDistribute super."ihaskell-display";
+  "ihaskell-inline-r" = dontDistribute super."ihaskell-inline-r";
+  "ihaskell-parsec" = dontDistribute super."ihaskell-parsec";
+  "ihaskell-plot" = dontDistribute super."ihaskell-plot";
+  "ihaskell-widgets" = dontDistribute super."ihaskell-widgets";
+  "ihttp" = dontDistribute super."ihttp";
+  "illuminate" = dontDistribute super."illuminate";
+  "image-type" = dontDistribute super."image-type";
+  "imagefilters" = dontDistribute super."imagefilters";
+  "imagemagick" = dontDistribute super."imagemagick";
+  "imagepaste" = dontDistribute super."imagepaste";
+  "imapget" = dontDistribute super."imapget";
+  "imbib" = dontDistribute super."imbib";
+  "imgurder" = dontDistribute super."imgurder";
+  "imm" = dontDistribute super."imm";
+  "imparse" = dontDistribute super."imparse";
+  "imperative-edsl" = dontDistribute super."imperative-edsl";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
+  "implicit" = dontDistribute super."implicit";
+  "implicit-params" = dontDistribute super."implicit-params";
+  "imports" = dontDistribute super."imports";
+  "improve" = dontDistribute super."improve";
+  "inc-ref" = dontDistribute super."inc-ref";
+  "inch" = dontDistribute super."inch";
+  "incremental-computing" = dontDistribute super."incremental-computing";
+  "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
+  "increments" = dontDistribute super."increments";
+  "indentation" = dontDistribute super."indentation";
+  "indentparser" = dontDistribute super."indentparser";
+  "index-core" = dontDistribute super."index-core";
+  "indexed" = dontDistribute super."indexed";
+  "indexed-do-notation" = dontDistribute super."indexed-do-notation";
+  "indexed-extras" = dontDistribute super."indexed-extras";
+  "indexed-free" = dontDistribute super."indexed-free";
+  "indian-language-font-converter" = dontDistribute super."indian-language-font-converter";
+  "indices" = dontDistribute super."indices";
+  "indieweb-algorithms" = dontDistribute super."indieweb-algorithms";
+  "inf-interval" = dontDistribute super."inf-interval";
+  "infer-upstream" = dontDistribute super."infer-upstream";
+  "infernu" = dontDistribute super."infernu";
+  "infinite-search" = dontDistribute super."infinite-search";
+  "infinity" = dontDistribute super."infinity";
+  "infix" = dontDistribute super."infix";
+  "inflist" = dontDistribute super."inflist";
+  "influxdb" = dontDistribute super."influxdb";
+  "informative" = dontDistribute super."informative";
+  "inilist" = dontDistribute super."inilist";
+  "inject" = dontDistribute super."inject";
+  "inject-function" = dontDistribute super."inject-function";
+  "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-r" = dontDistribute super."inline-r";
+  "inquire" = dontDistribute super."inquire";
+  "inserts" = dontDistribute super."inserts";
+  "inspection-proxy" = dontDistribute super."inspection-proxy";
+  "instant-aeson" = dontDistribute super."instant-aeson";
+  "instant-bytes" = dontDistribute super."instant-bytes";
+  "instant-deepseq" = dontDistribute super."instant-deepseq";
+  "instant-generics" = dontDistribute super."instant-generics";
+  "instant-hashable" = dontDistribute super."instant-hashable";
+  "instant-zipper" = dontDistribute super."instant-zipper";
+  "instinct" = dontDistribute super."instinct";
+  "instrument-chord" = dontDistribute super."instrument-chord";
+  "int-cast" = dontDistribute super."int-cast";
+  "integer-pure" = dontDistribute super."integer-pure";
+  "intel-aes" = dontDistribute super."intel-aes";
+  "interchangeable" = dontDistribute super."interchangeable";
+  "interleavableGen" = dontDistribute super."interleavableGen";
+  "interleavableIO" = dontDistribute super."interleavableIO";
+  "interleave" = dontDistribute super."interleave";
+  "interlude" = dontDistribute super."interlude";
+  "intern" = dontDistribute super."intern";
+  "internetmarke" = dontDistribute super."internetmarke";
+  "interpol" = dontDistribute super."interpol";
+  "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
+  "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
+  "interpolation" = dontDistribute super."interpolation";
+  "intricacy" = dontDistribute super."intricacy";
+  "intset" = dontDistribute super."intset";
+  "invertible-syntax" = dontDistribute super."invertible-syntax";
+  "io-capture" = dontDistribute super."io-capture";
+  "io-reactive" = dontDistribute super."io-reactive";
+  "io-streams-http" = dontDistribute super."io-streams-http";
+  "io-throttle" = dontDistribute super."io-throttle";
+  "ioctl" = dontDistribute super."ioctl";
+  "ioref-stable" = dontDistribute super."ioref-stable";
+  "iothread" = dontDistribute super."iothread";
+  "iotransaction" = dontDistribute super."iotransaction";
+  "ip-quoter" = dontDistribute super."ip-quoter";
+  "ipatch" = dontDistribute super."ipatch";
+  "ipc" = dontDistribute super."ipc";
+  "ipcvar" = dontDistribute super."ipcvar";
+  "ipopt-hs" = dontDistribute super."ipopt-hs";
+  "ipprint" = dontDistribute super."ipprint";
+  "iptables-helpers" = dontDistribute super."iptables-helpers";
+  "iptadmin" = dontDistribute super."iptadmin";
+  "irc-bytestring" = dontDistribute super."irc-bytestring";
+  "irc-colors" = dontDistribute super."irc-colors";
+  "irc-core" = dontDistribute super."irc-core";
+  "irc-fun-bot" = dontDistribute super."irc-fun-bot";
+  "irc-fun-client" = dontDistribute super."irc-fun-client";
+  "irc-fun-color" = dontDistribute super."irc-fun-color";
+  "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "ircbot" = dontDistribute super."ircbot";
+  "ircbouncer" = dontDistribute super."ircbouncer";
+  "ireal" = dontDistribute super."ireal";
+  "iron-mq" = dontDistribute super."iron-mq";
+  "ironforge" = dontDistribute super."ironforge";
+  "is" = dontDistribute super."is";
+  "isdicom" = dontDistribute super."isdicom";
+  "isevaluated" = dontDistribute super."isevaluated";
+  "isiz" = dontDistribute super."isiz";
+  "ismtp" = dontDistribute super."ismtp";
+  "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
+  "isohunt" = dontDistribute super."isohunt";
+  "itanium-abi" = dontDistribute super."itanium-abi";
+  "iter-stats" = dontDistribute super."iter-stats";
+  "iterIO" = dontDistribute super."iterIO";
+  "iteratee" = dontDistribute super."iteratee";
+  "iteratee-compress" = dontDistribute super."iteratee-compress";
+  "iteratee-mtl" = dontDistribute super."iteratee-mtl";
+  "iteratee-parsec" = dontDistribute super."iteratee-parsec";
+  "iteratee-stm" = dontDistribute super."iteratee-stm";
+  "iterio-server" = dontDistribute super."iterio-server";
+  "ivar-simple" = dontDistribute super."ivar-simple";
+  "ivor" = dontDistribute super."ivor";
+  "ivory" = dontDistribute super."ivory";
+  "ivory-backend-c" = dontDistribute super."ivory-backend-c";
+  "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-examples" = dontDistribute super."ivory-examples";
+  "ivory-hw" = dontDistribute super."ivory-hw";
+  "ivory-opts" = dontDistribute super."ivory-opts";
+  "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-stdlib" = dontDistribute super."ivory-stdlib";
+  "ivy-web" = dontDistribute super."ivy-web";
+  "ixdopp" = dontDistribute super."ixdopp";
+  "ixmonad" = dontDistribute super."ixmonad";
+  "iyql" = dontDistribute super."iyql";
+  "j2hs" = dontDistribute super."j2hs";
+  "ja-base-extra" = dontDistribute super."ja-base-extra";
+  "jack" = dontDistribute super."jack";
+  "jack-bindings" = dontDistribute super."jack-bindings";
+  "jackminimix" = dontDistribute super."jackminimix";
+  "jacobi-roots" = dontDistribute super."jacobi-roots";
+  "jail" = dontDistribute super."jail";
+  "jailbreak-cabal" = dontDistribute super."jailbreak-cabal";
+  "jalaali" = dontDistribute super."jalaali";
+  "jalla" = dontDistribute super."jalla";
+  "jammittools" = dontDistribute super."jammittools";
+  "jarfind" = dontDistribute super."jarfind";
+  "java-bridge" = dontDistribute super."java-bridge";
+  "java-bridge-extras" = dontDistribute super."java-bridge-extras";
+  "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
+  "java-reflect" = dontDistribute super."java-reflect";
+  "javasf" = dontDistribute super."javasf";
+  "javav" = dontDistribute super."javav";
+  "jcdecaux-vls" = dontDistribute super."jcdecaux-vls";
+  "jdi" = dontDistribute super."jdi";
+  "jespresso" = dontDistribute super."jespresso";
+  "jobqueue" = dontDistribute super."jobqueue";
+  "join" = dontDistribute super."join";
+  "joinlist" = dontDistribute super."joinlist";
+  "jonathanscard" = dontDistribute super."jonathanscard";
+  "jort" = dontDistribute super."jort";
+  "jose" = dontDistribute super."jose";
+  "jpeg" = dontDistribute super."jpeg";
+  "js-good-parts" = dontDistribute super."js-good-parts";
+  "jsaddle" = dontDistribute super."jsaddle";
+  "jsaddle-hello" = dontDistribute super."jsaddle-hello";
+  "jsc" = dontDistribute super."jsc";
+  "jsmw" = dontDistribute super."jsmw";
+  "json-assertions" = dontDistribute super."json-assertions";
+  "json-b" = dontDistribute super."json-b";
+  "json-encoder" = dontDistribute super."json-encoder";
+  "json-enumerator" = dontDistribute super."json-enumerator";
+  "json-extra" = dontDistribute super."json-extra";
+  "json-fu" = dontDistribute super."json-fu";
+  "json-litobj" = dontDistribute super."json-litobj";
+  "json-python" = dontDistribute super."json-python";
+  "json-qq" = dontDistribute super."json-qq";
+  "json-rpc" = dontDistribute super."json-rpc";
+  "json-rpc-client" = dontDistribute super."json-rpc-client";
+  "json-rpc-server" = dontDistribute super."json-rpc-server";
+  "json-sop" = dontDistribute super."json-sop";
+  "json-state" = dontDistribute super."json-state";
+  "json-stream" = dontDistribute super."json-stream";
+  "json-togo" = dontDistribute super."json-togo";
+  "json-tools" = dontDistribute super."json-tools";
+  "json-types" = dontDistribute super."json-types";
+  "json2" = dontDistribute super."json2";
+  "json2-hdbc" = dontDistribute super."json2-hdbc";
+  "json2-types" = dontDistribute super."json2-types";
+  "json2yaml" = dontDistribute super."json2yaml";
+  "jsonresume" = dontDistribute super."jsonresume";
+  "jsonrpc-conduit" = dontDistribute super."jsonrpc-conduit";
+  "jsonschema-gen" = dontDistribute super."jsonschema-gen";
+  "jsonsql" = dontDistribute super."jsonsql";
+  "jsontsv" = dontDistribute super."jsontsv";
+  "jspath" = dontDistribute super."jspath";
+  "judy" = dontDistribute super."judy";
+  "jukebox" = dontDistribute super."jukebox";
+  "jumpthefive" = dontDistribute super."jumpthefive";
+  "jvm-parser" = dontDistribute super."jvm-parser";
+  "kademlia" = dontDistribute super."kademlia";
+  "kafka-client" = dontDistribute super."kafka-client";
+  "kangaroo" = dontDistribute super."kangaroo";
+  "kansas-comet" = dontDistribute super."kansas-comet";
+  "kansas-lava" = dontDistribute super."kansas-lava";
+  "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
+  "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio";
+  "kansas-lava-shake" = dontDistribute super."kansas-lava-shake";
+  "karakuri" = dontDistribute super."karakuri";
+  "karver" = dontDistribute super."karver";
+  "katt" = dontDistribute super."katt";
+  "kbq-gu" = dontDistribute super."kbq-gu";
+  "kd-tree" = dontDistribute super."kd-tree";
+  "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
+  "keera-callbacks" = dontDistribute super."keera-callbacks";
+  "keera-hails-i18n" = dontDistribute super."keera-hails-i18n";
+  "keera-hails-mvc-controller" = dontDistribute super."keera-hails-mvc-controller";
+  "keera-hails-mvc-environment-gtk" = dontDistribute super."keera-hails-mvc-environment-gtk";
+  "keera-hails-mvc-model-lightmodel" = dontDistribute super."keera-hails-mvc-model-lightmodel";
+  "keera-hails-mvc-model-protectedmodel" = dontDistribute super."keera-hails-mvc-model-protectedmodel";
+  "keera-hails-mvc-solutions-config" = dontDistribute super."keera-hails-mvc-solutions-config";
+  "keera-hails-mvc-solutions-gtk" = dontDistribute super."keera-hails-mvc-solutions-gtk";
+  "keera-hails-mvc-view" = dontDistribute super."keera-hails-mvc-view";
+  "keera-hails-mvc-view-gtk" = dontDistribute super."keera-hails-mvc-view-gtk";
+  "keera-hails-reactive-fs" = dontDistribute super."keera-hails-reactive-fs";
+  "keera-hails-reactive-gtk" = dontDistribute super."keera-hails-reactive-gtk";
+  "keera-hails-reactive-network" = dontDistribute super."keera-hails-reactive-network";
+  "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling";
+  "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx";
+  "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa";
+  "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses";
+  "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues";
+  "keera-posture" = dontDistribute super."keera-posture";
+  "keiretsu" = dontDistribute super."keiretsu";
+  "kevin" = dontDistribute super."kevin";
+  "keyed" = dontDistribute super."keyed";
+  "keyring" = dontDistribute super."keyring";
+  "keystore" = dontDistribute super."keystore";
+  "keyvaluehash" = dontDistribute super."keyvaluehash";
+  "keyword-args" = dontDistribute super."keyword-args";
+  "kibro" = dontDistribute super."kibro";
+  "kicad-data" = dontDistribute super."kicad-data";
+  "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
+  "kickchan" = dontDistribute super."kickchan";
+  "kif-parser" = dontDistribute super."kif-parser";
+  "kinds" = dontDistribute super."kinds";
+  "kit" = dontDistribute super."kit";
+  "kmeans-par" = dontDistribute super."kmeans-par";
+  "kmeans-vector" = dontDistribute super."kmeans-vector";
+  "knots" = dontDistribute super."knots";
+  "koellner-phonetic" = dontDistribute super."koellner-phonetic";
+  "kontrakcja-templates" = dontDistribute super."kontrakcja-templates";
+  "korfu" = dontDistribute super."korfu";
+  "kqueue" = dontDistribute super."kqueue";
+  "krpc" = dontDistribute super."krpc";
+  "ks-test" = dontDistribute super."ks-test";
+  "ktx" = dontDistribute super."ktx";
+  "kure-your-boilerplate" = dontDistribute super."kure-your-boilerplate";
+  "kyotocabinet" = dontDistribute super."kyotocabinet";
+  "l-bfgs-b" = dontDistribute super."l-bfgs-b";
+  "labeled-graph" = dontDistribute super."labeled-graph";
+  "labeled-tree" = dontDistribute super."labeled-tree";
+  "laborantin-hs" = dontDistribute super."laborantin-hs";
+  "labyrinth" = dontDistribute super."labyrinth";
+  "labyrinth-server" = dontDistribute super."labyrinth-server";
+  "lackey" = dontDistribute super."lackey";
+  "lagrangian" = dontDistribute super."lagrangian";
+  "laika" = dontDistribute super."laika";
+  "lambda-ast" = dontDistribute super."lambda-ast";
+  "lambda-bridge" = dontDistribute super."lambda-bridge";
+  "lambda-canvas" = dontDistribute super."lambda-canvas";
+  "lambda-devs" = dontDistribute super."lambda-devs";
+  "lambda-options" = dontDistribute super."lambda-options";
+  "lambda-placeholders" = dontDistribute super."lambda-placeholders";
+  "lambda-toolbox" = dontDistribute super."lambda-toolbox";
+  "lambda2js" = dontDistribute super."lambda2js";
+  "lambdaBase" = dontDistribute super."lambdaBase";
+  "lambdaFeed" = dontDistribute super."lambdaFeed";
+  "lambdaLit" = dontDistribute super."lambdaLit";
+  "lambdabot" = dontDistribute super."lambdabot";
+  "lambdabot-core" = dontDistribute super."lambdabot-core";
+  "lambdabot-haskell-plugins" = dontDistribute super."lambdabot-haskell-plugins";
+  "lambdabot-irc-plugins" = dontDistribute super."lambdabot-irc-plugins";
+  "lambdabot-misc-plugins" = dontDistribute super."lambdabot-misc-plugins";
+  "lambdabot-novelty-plugins" = dontDistribute super."lambdabot-novelty-plugins";
+  "lambdabot-reference-plugins" = dontDistribute super."lambdabot-reference-plugins";
+  "lambdabot-social-plugins" = dontDistribute super."lambdabot-social-plugins";
+  "lambdabot-trusted" = dontDistribute super."lambdabot-trusted";
+  "lambdabot-utils" = dontDistribute super."lambdabot-utils";
+  "lambdacat" = dontDistribute super."lambdacat";
+  "lambdacms-core" = dontDistribute super."lambdacms-core";
+  "lambdacms-media" = dontDistribute super."lambdacms-media";
+  "lambdacube" = dontDistribute super."lambdacube";
+  "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-core" = dontDistribute super."lambdacube-core";
+  "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
+  "lambdacube-engine" = dontDistribute super."lambdacube-engine";
+  "lambdacube-examples" = dontDistribute super."lambdacube-examples";
+  "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-samples" = dontDistribute super."lambdacube-samples";
+  "lambdatex" = dontDistribute super."lambdatex";
+  "lambdatwit" = dontDistribute super."lambdatwit";
+  "lambdiff" = dontDistribute super."lambdiff";
+  "lame-tester" = dontDistribute super."lame-tester";
+  "language-asn1" = dontDistribute super."language-asn1";
+  "language-bash" = dontDistribute super."language-bash";
+  "language-boogie" = dontDistribute super."language-boogie";
+  "language-c-comments" = dontDistribute super."language-c-comments";
+  "language-c-inline" = dontDistribute super."language-c-inline";
+  "language-c-quote" = dontDistribute super."language-c-quote";
+  "language-cil" = dontDistribute super."language-cil";
+  "language-css" = dontDistribute super."language-css";
+  "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
+  "language-eiffel" = dontDistribute super."language-eiffel";
+  "language-fortran" = dontDistribute super."language-fortran";
+  "language-gcl" = dontDistribute super."language-gcl";
+  "language-go" = dontDistribute super."language-go";
+  "language-guess" = dontDistribute super."language-guess";
+  "language-java-classfile" = dontDistribute super."language-java-classfile";
+  "language-kort" = dontDistribute super."language-kort";
+  "language-lua" = dontDistribute super."language-lua";
+  "language-lua-qq" = dontDistribute super."language-lua-qq";
+  "language-mixal" = dontDistribute super."language-mixal";
+  "language-objc" = dontDistribute super."language-objc";
+  "language-openscad" = dontDistribute super."language-openscad";
+  "language-pig" = dontDistribute super."language-pig";
+  "language-puppet" = dontDistribute super."language-puppet";
+  "language-python" = dontDistribute super."language-python";
+  "language-python-colour" = dontDistribute super."language-python-colour";
+  "language-python-test" = dontDistribute super."language-python-test";
+  "language-qux" = dontDistribute super."language-qux";
+  "language-sh" = dontDistribute super."language-sh";
+  "language-slice" = dontDistribute super."language-slice";
+  "language-spelling" = dontDistribute super."language-spelling";
+  "language-sqlite" = dontDistribute super."language-sqlite";
+  "language-typescript" = dontDistribute super."language-typescript";
+  "language-vhdl" = dontDistribute super."language-vhdl";
+  "lat" = dontDistribute super."lat";
+  "latest-npm-version" = dontDistribute super."latest-npm-version";
+  "latex" = dontDistribute super."latex";
+  "latex-formulae-hakyll" = doDistribute super."latex-formulae-hakyll_0_2_0_0";
+  "latex-formulae-pandoc" = doDistribute super."latex-formulae-pandoc_0_2_0_2";
+  "launchpad-control" = dontDistribute super."launchpad-control";
+  "lax" = dontDistribute super."lax";
+  "layers" = dontDistribute super."layers";
+  "layers-game" = dontDistribute super."layers-game";
+  "layout" = dontDistribute super."layout";
+  "layout-bootstrap" = dontDistribute super."layout-bootstrap";
+  "lazy-io" = dontDistribute super."lazy-io";
+  "lazyarray" = dontDistribute super."lazyarray";
+  "lazyio" = dontDistribute super."lazyio";
+  "lazysmallcheck" = dontDistribute super."lazysmallcheck";
+  "lazysplines" = dontDistribute super."lazysplines";
+  "lbfgs" = dontDistribute super."lbfgs";
+  "lcs" = dontDistribute super."lcs";
+  "lda" = dontDistribute super."lda";
+  "ldap-client" = dontDistribute super."ldap-client";
+  "ldif" = dontDistribute super."ldif";
+  "leaf" = dontDistribute super."leaf";
+  "leaky" = dontDistribute super."leaky";
+  "leankit-api" = dontDistribute super."leankit-api";
+  "leapseconds-announced" = dontDistribute super."leapseconds-announced";
+  "learn" = dontDistribute super."learn";
+  "learn-physics" = dontDistribute super."learn-physics";
+  "learn-physics-examples" = dontDistribute super."learn-physics-examples";
+  "learning-hmm" = dontDistribute super."learning-hmm";
+  "leetify" = dontDistribute super."leetify";
+  "leksah" = dontDistribute super."leksah";
+  "leksah-server" = dontDistribute super."leksah-server";
+  "lendingclub" = dontDistribute super."lendingclub";
+  "lens-datetime" = dontDistribute super."lens-datetime";
+  "lens-prelude" = dontDistribute super."lens-prelude";
+  "lens-properties" = dontDistribute super."lens-properties";
+  "lens-sop" = dontDistribute super."lens-sop";
+  "lens-text-encoding" = dontDistribute super."lens-text-encoding";
+  "lens-time" = dontDistribute super."lens-time";
+  "lens-tutorial" = dontDistribute super."lens-tutorial";
+  "lens-utils" = dontDistribute super."lens-utils";
+  "lenses" = dontDistribute super."lenses";
+  "lensref" = dontDistribute super."lensref";
+  "lentil" = dontDistribute super."lentil";
+  "lenz" = dontDistribute super."lenz";
+  "lenz-template" = dontDistribute super."lenz-template";
+  "level-monad" = dontDistribute super."level-monad";
+  "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
+  "levmar" = dontDistribute super."levmar";
+  "levmar-chart" = dontDistribute super."levmar-chart";
+  "lgtk" = dontDistribute super."lgtk";
+  "lha" = dontDistribute super."lha";
+  "lhae" = dontDistribute super."lhae";
+  "lhc" = dontDistribute super."lhc";
+  "lhe" = dontDistribute super."lhe";
+  "lhs2TeX-hl" = dontDistribute super."lhs2TeX-hl";
+  "lhs2html" = dontDistribute super."lhs2html";
+  "lhslatex" = dontDistribute super."lhslatex";
+  "libGenI" = dontDistribute super."libGenI";
+  "libarchive-conduit" = dontDistribute super."libarchive-conduit";
+  "libconfig" = dontDistribute super."libconfig";
+  "libcspm" = dontDistribute super."libcspm";
+  "libexpect" = dontDistribute super."libexpect";
+  "libffi" = dontDistribute super."libffi";
+  "libgraph" = dontDistribute super."libgraph";
+  "libhbb" = dontDistribute super."libhbb";
+  "libjenkins" = dontDistribute super."libjenkins";
+  "liblastfm" = dontDistribute super."liblastfm";
+  "liblinear-enumerator" = dontDistribute super."liblinear-enumerator";
+  "libltdl" = dontDistribute super."libltdl";
+  "libmpd" = dontDistribute super."libmpd";
+  "libnvvm" = dontDistribute super."libnvvm";
+  "liboleg" = dontDistribute super."liboleg";
+  "libpafe" = dontDistribute super."libpafe";
+  "libpq" = dontDistribute super."libpq";
+  "librandomorg" = dontDistribute super."librandomorg";
+  "libravatar" = dontDistribute super."libravatar";
+  "libssh2" = dontDistribute super."libssh2";
+  "libssh2-conduit" = dontDistribute super."libssh2-conduit";
+  "libstackexchange" = dontDistribute super."libstackexchange";
+  "libsystemd-daemon" = dontDistribute super."libsystemd-daemon";
+  "libtagc" = dontDistribute super."libtagc";
+  "libvirt-hs" = dontDistribute super."libvirt-hs";
+  "libvorbis" = dontDistribute super."libvorbis";
+  "libxml" = dontDistribute super."libxml";
+  "libxml-enumerator" = dontDistribute super."libxml-enumerator";
+  "libxslt" = dontDistribute super."libxslt";
+  "life" = dontDistribute super."life";
+  "lift-generics" = dontDistribute super."lift-generics";
+  "lifted-threads" = dontDistribute super."lifted-threads";
+  "lifter" = dontDistribute super."lifter";
+  "ligature" = dontDistribute super."ligature";
+  "ligd" = dontDistribute super."ligd";
+  "lighttpd-conf" = dontDistribute super."lighttpd-conf";
+  "lighttpd-conf-qq" = dontDistribute super."lighttpd-conf-qq";
+  "lilypond" = dontDistribute super."lilypond";
+  "limp" = dontDistribute super."limp";
+  "limp-cbc" = dontDistribute super."limp-cbc";
+  "lin-alg" = dontDistribute super."lin-alg";
+  "linda" = dontDistribute super."linda";
+  "lindenmayer" = dontDistribute super."lindenmayer";
+  "line-break" = dontDistribute super."line-break";
+  "line2pdf" = dontDistribute super."line2pdf";
+  "linear-algebra-cblas" = dontDistribute super."linear-algebra-cblas";
+  "linear-circuit" = dontDistribute super."linear-circuit";
+  "linear-grammar" = dontDistribute super."linear-grammar";
+  "linear-maps" = dontDistribute super."linear-maps";
+  "linear-opengl" = dontDistribute super."linear-opengl";
+  "linear-vect" = dontDistribute super."linear-vect";
+  "linearEqSolver" = dontDistribute super."linearEqSolver";
+  "linearscan" = dontDistribute super."linearscan";
+  "linearscan-hoopl" = dontDistribute super."linearscan-hoopl";
+  "linebreak" = dontDistribute super."linebreak";
+  "linguistic-ordinals" = dontDistribute super."linguistic-ordinals";
+  "link-relations" = dontDistribute super."link-relations";
+  "linkchk" = dontDistribute super."linkchk";
+  "linkcore" = dontDistribute super."linkcore";
+  "linkedhashmap" = dontDistribute super."linkedhashmap";
+  "linklater" = dontDistribute super."linklater";
+  "linode" = dontDistribute super."linode";
+  "linux-blkid" = dontDistribute super."linux-blkid";
+  "linux-cgroup" = dontDistribute super."linux-cgroup";
+  "linux-evdev" = dontDistribute super."linux-evdev";
+  "linux-inotify" = dontDistribute super."linux-inotify";
+  "linux-kmod" = dontDistribute super."linux-kmod";
+  "linux-mount" = dontDistribute super."linux-mount";
+  "linux-perf" = dontDistribute super."linux-perf";
+  "linux-ptrace" = dontDistribute super."linux-ptrace";
+  "linux-xattr" = dontDistribute super."linux-xattr";
+  "linx-gateway" = dontDistribute super."linx-gateway";
+  "lio" = dontDistribute super."lio";
+  "lio-eci11" = dontDistribute super."lio-eci11";
+  "lio-fs" = dontDistribute super."lio-fs";
+  "lio-simple" = dontDistribute super."lio-simple";
+  "lipsum-gen" = dontDistribute super."lipsum-gen";
+  "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
+  "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "lispparser" = dontDistribute super."lispparser";
+  "list-extras" = dontDistribute super."list-extras";
+  "list-grouping" = dontDistribute super."list-grouping";
+  "list-mux" = dontDistribute super."list-mux";
+  "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t-attoparsec" = dontDistribute super."list-t-attoparsec";
+  "list-t-html-parser" = dontDistribute super."list-t-html-parser";
+  "list-t-http-client" = dontDistribute super."list-t-http-client";
+  "list-t-libcurl" = dontDistribute super."list-t-libcurl";
+  "list-t-text" = dontDistribute super."list-t-text";
+  "list-tries" = dontDistribute super."list-tries";
+  "list-zip-def" = dontDistribute super."list-zip-def";
+  "listlike-instances" = dontDistribute super."listlike-instances";
+  "lists" = dontDistribute super."lists";
+  "listsafe" = dontDistribute super."listsafe";
+  "lit" = dontDistribute super."lit";
+  "literals" = dontDistribute super."literals";
+  "live-sequencer" = dontDistribute super."live-sequencer";
+  "ll-picosat" = dontDistribute super."ll-picosat";
+  "llrbtree" = dontDistribute super."llrbtree";
+  "llsd" = dontDistribute super."llsd";
+  "llvm" = dontDistribute super."llvm";
+  "llvm-analysis" = dontDistribute super."llvm-analysis";
+  "llvm-base" = dontDistribute super."llvm-base";
+  "llvm-base-types" = dontDistribute super."llvm-base-types";
+  "llvm-base-util" = dontDistribute super."llvm-base-util";
+  "llvm-data-interop" = dontDistribute super."llvm-data-interop";
+  "llvm-extra" = dontDistribute super."llvm-extra";
+  "llvm-ffi" = dontDistribute super."llvm-ffi";
+  "llvm-general" = dontDistribute super."llvm-general";
+  "llvm-general-pure" = dontDistribute super."llvm-general-pure";
+  "llvm-general-quote" = dontDistribute super."llvm-general-quote";
+  "llvm-ht" = dontDistribute super."llvm-ht";
+  "llvm-pkg-config" = dontDistribute super."llvm-pkg-config";
+  "llvm-pretty" = dontDistribute super."llvm-pretty";
+  "llvm-pretty-bc-parser" = dontDistribute super."llvm-pretty-bc-parser";
+  "llvm-tf" = dontDistribute super."llvm-tf";
+  "llvm-tools" = dontDistribute super."llvm-tools";
+  "lmdb" = dontDistribute super."lmdb";
+  "load-env" = dontDistribute super."load-env";
+  "loadavg" = dontDistribute super."loadavg";
+  "local-address" = dontDistribute super."local-address";
+  "local-search" = dontDistribute super."local-search";
+  "located-base" = dontDistribute super."located-base";
+  "locators" = dontDistribute super."locators";
+  "loch" = dontDistribute super."loch";
+  "lock-file" = dontDistribute super."lock-file";
+  "locked-poll" = dontDistribute super."locked-poll";
+  "lockfree-queue" = dontDistribute super."lockfree-queue";
+  "log" = dontDistribute super."log";
+  "log-effect" = dontDistribute super."log-effect";
+  "log2json" = dontDistribute super."log2json";
+  "logfloat" = dontDistribute super."logfloat";
+  "logger" = dontDistribute super."logger";
+  "logging" = dontDistribute super."logging";
+  "logging-facade-journald" = dontDistribute super."logging-facade-journald";
+  "logic-TPTP" = dontDistribute super."logic-TPTP";
+  "logic-classes" = dontDistribute super."logic-classes";
+  "logicst" = dontDistribute super."logicst";
+  "logplex-parse" = dontDistribute super."logplex-parse";
+  "logsink" = dontDistribute super."logsink";
+  "lojban" = dontDistribute super."lojban";
+  "lojbanParser" = dontDistribute super."lojbanParser";
+  "lojbanXiragan" = dontDistribute super."lojbanXiragan";
+  "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
+  "loli" = dontDistribute super."loli";
+  "lookup-tables" = dontDistribute super."lookup-tables";
+  "loop-effin" = dontDistribute super."loop-effin";
+  "loop-while" = dontDistribute super."loop-while";
+  "loops" = dontDistribute super."loops";
+  "loopy" = dontDistribute super."loopy";
+  "lord" = dontDistribute super."lord";
+  "lorem" = dontDistribute super."lorem";
+  "loris" = dontDistribute super."loris";
+  "loshadka" = dontDistribute super."loshadka";
+  "lostcities" = dontDistribute super."lostcities";
+  "lowgl" = dontDistribute super."lowgl";
+  "ls-usb" = dontDistribute super."ls-usb";
+  "lscabal" = dontDistribute super."lscabal";
+  "lss" = dontDistribute super."lss";
+  "lsystem" = dontDistribute super."lsystem";
+  "ltk" = dontDistribute super."ltk";
+  "ltl" = dontDistribute super."ltl";
+  "lua-bytecode" = dontDistribute super."lua-bytecode";
+  "luachunk" = dontDistribute super."luachunk";
+  "luautils" = dontDistribute super."luautils";
+  "lub" = dontDistribute super."lub";
+  "lucid-foundation" = dontDistribute super."lucid-foundation";
+  "lucienne" = dontDistribute super."lucienne";
+  "luhn" = dontDistribute super."luhn";
+  "lui" = dontDistribute super."lui";
+  "luka" = dontDistribute super."luka";
+  "lushtags" = dontDistribute super."lushtags";
+  "luthor" = dontDistribute super."luthor";
+  "lvish" = dontDistribute super."lvish";
+  "lvmlib" = dontDistribute super."lvmlib";
+  "lvmrun" = dontDistribute super."lvmrun";
+  "lxc" = dontDistribute super."lxc";
+  "lye" = dontDistribute super."lye";
+  "lz4" = dontDistribute super."lz4";
+  "lzma" = dontDistribute super."lzma";
+  "lzma-clib" = dontDistribute super."lzma-clib";
+  "lzma-enumerator" = dontDistribute super."lzma-enumerator";
+  "lzma-streams" = dontDistribute super."lzma-streams";
+  "maam" = dontDistribute super."maam";
+  "mac" = dontDistribute super."mac";
+  "maccatcher" = dontDistribute super."maccatcher";
+  "machinecell" = dontDistribute super."machinecell";
+  "machines-binary" = dontDistribute super."machines-binary";
+  "machines-zlib" = dontDistribute super."machines-zlib";
+  "macho" = dontDistribute super."macho";
+  "maclight" = dontDistribute super."maclight";
+  "macosx-make-standalone" = dontDistribute super."macosx-make-standalone";
+  "mage" = dontDistribute super."mage";
+  "magico" = dontDistribute super."magico";
+  "magma" = dontDistribute super."magma";
+  "mahoro" = dontDistribute super."mahoro";
+  "maid" = dontDistribute super."maid";
+  "mailbox-count" = dontDistribute super."mailbox-count";
+  "mailchimp-subscribe" = dontDistribute super."mailchimp-subscribe";
+  "mailgun" = dontDistribute super."mailgun";
+  "mainland-pretty" = dontDistribute super."mainland-pretty";
+  "majordomo" = dontDistribute super."majordomo";
+  "majority" = dontDistribute super."majority";
+  "make-hard-links" = dontDistribute super."make-hard-links";
+  "make-package" = dontDistribute super."make-package";
+  "makedo" = dontDistribute super."makedo";
+  "manatee" = dontDistribute super."manatee";
+  "manatee-all" = dontDistribute super."manatee-all";
+  "manatee-anything" = dontDistribute super."manatee-anything";
+  "manatee-browser" = dontDistribute super."manatee-browser";
+  "manatee-core" = dontDistribute super."manatee-core";
+  "manatee-curl" = dontDistribute super."manatee-curl";
+  "manatee-editor" = dontDistribute super."manatee-editor";
+  "manatee-filemanager" = dontDistribute super."manatee-filemanager";
+  "manatee-imageviewer" = dontDistribute super."manatee-imageviewer";
+  "manatee-ircclient" = dontDistribute super."manatee-ircclient";
+  "manatee-mplayer" = dontDistribute super."manatee-mplayer";
+  "manatee-pdfviewer" = dontDistribute super."manatee-pdfviewer";
+  "manatee-processmanager" = dontDistribute super."manatee-processmanager";
+  "manatee-reader" = dontDistribute super."manatee-reader";
+  "manatee-template" = dontDistribute super."manatee-template";
+  "manatee-terminal" = dontDistribute super."manatee-terminal";
+  "manatee-welcome" = dontDistribute super."manatee-welcome";
+  "mancala" = dontDistribute super."mancala";
+  "mandulia" = dontDistribute super."mandulia";
+  "manifold-random" = dontDistribute super."manifold-random";
+  "manifolds" = dontDistribute super."manifolds";
+  "marionetta" = dontDistribute super."marionetta";
+  "markdown-kate" = dontDistribute super."markdown-kate";
+  "markdown-pap" = dontDistribute super."markdown-pap";
+  "markdown2svg" = dontDistribute super."markdown2svg";
+  "marked-pretty" = dontDistribute super."marked-pretty";
+  "markov" = dontDistribute super."markov";
+  "markov-chain" = dontDistribute super."markov-chain";
+  "markov-processes" = dontDistribute super."markov-processes";
+  "markup-preview" = dontDistribute super."markup-preview";
+  "marmalade-upload" = dontDistribute super."marmalade-upload";
+  "marquise" = dontDistribute super."marquise";
+  "marxup" = dontDistribute super."marxup";
+  "masakazu-bot" = dontDistribute super."masakazu-bot";
+  "mastermind" = dontDistribute super."mastermind";
+  "matchers" = dontDistribute super."matchers";
+  "mathblog" = dontDistribute super."mathblog";
+  "mathgenealogy" = dontDistribute super."mathgenealogy";
+  "mathista" = dontDistribute super."mathista";
+  "mathlink" = dontDistribute super."mathlink";
+  "matlab" = dontDistribute super."matlab";
+  "matrix-market" = dontDistribute super."matrix-market";
+  "matrix-market-pure" = dontDistribute super."matrix-market-pure";
+  "matsuri" = dontDistribute super."matsuri";
+  "maude" = dontDistribute super."maude";
+  "maxent" = dontDistribute super."maxent";
+  "maxsharing" = dontDistribute super."maxsharing";
+  "maybe-justify" = dontDistribute super."maybe-justify";
+  "maybench" = dontDistribute super."maybench";
+  "mbox-tools" = dontDistribute super."mbox-tools";
+  "mcmaster-gloss-examples" = dontDistribute super."mcmaster-gloss-examples";
+  "mcmc-samplers" = dontDistribute super."mcmc-samplers";
+  "mcmc-synthesis" = dontDistribute super."mcmc-synthesis";
+  "mcpi" = dontDistribute super."mcpi";
+  "mdapi" = dontDistribute super."mdapi";
+  "mdcat" = dontDistribute super."mdcat";
+  "mdo" = dontDistribute super."mdo";
+  "mecab" = dontDistribute super."mecab";
+  "mecha" = dontDistribute super."mecha";
+  "mediawiki" = dontDistribute super."mediawiki";
+  "mediawiki2latex" = dontDistribute super."mediawiki2latex";
+  "medium-sdk-haskell" = dontDistribute super."medium-sdk-haskell";
+  "meep" = dontDistribute super."meep";
+  "mega-sdist" = dontDistribute super."mega-sdist";
+  "meldable-heap" = dontDistribute super."meldable-heap";
+  "melody" = dontDistribute super."melody";
+  "memcache" = dontDistribute super."memcache";
+  "memcache-conduit" = dontDistribute super."memcache-conduit";
+  "memcache-haskell" = dontDistribute super."memcache-haskell";
+  "memcached" = dontDistribute super."memcached";
+  "memexml" = dontDistribute super."memexml";
+  "memo-ptr" = dontDistribute super."memo-ptr";
+  "memo-sqlite" = dontDistribute super."memo-sqlite";
+  "memscript" = dontDistribute super."memscript";
+  "mersenne-random" = dontDistribute super."mersenne-random";
+  "messente" = dontDistribute super."messente";
+  "meta-misc" = dontDistribute super."meta-misc";
+  "meta-par" = dontDistribute super."meta-par";
+  "meta-par-accelerate" = dontDistribute super."meta-par-accelerate";
+  "metadata" = dontDistribute super."metadata";
+  "metamorphic" = dontDistribute super."metamorphic";
+  "metaplug" = dontDistribute super."metaplug";
+  "metric" = dontDistribute super."metric";
+  "metricsd-client" = dontDistribute super."metricsd-client";
+  "metronome" = dontDistribute super."metronome";
+  "mezzolens" = dontDistribute super."mezzolens";
+  "mfsolve" = dontDistribute super."mfsolve";
+  "mgeneric" = dontDistribute super."mgeneric";
+  "mi" = dontDistribute super."mi";
+  "microbench" = dontDistribute super."microbench";
+  "microformats2-types" = dontDistribute super."microformats2-types";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
+  "microlens-each" = dontDistribute super."microlens-each";
+  "microtimer" = dontDistribute super."microtimer";
+  "mida" = dontDistribute super."mida";
+  "midi" = dontDistribute super."midi";
+  "midi-alsa" = dontDistribute super."midi-alsa";
+  "midi-music-box" = dontDistribute super."midi-music-box";
+  "midi-util" = dontDistribute super."midi-util";
+  "midimory" = dontDistribute super."midimory";
+  "midisurface" = dontDistribute super."midisurface";
+  "mighttpd" = dontDistribute super."mighttpd";
+  "mighttpd2" = dontDistribute super."mighttpd2";
+  "mikmod" = dontDistribute super."mikmod";
+  "miku" = dontDistribute super."miku";
+  "milena" = dontDistribute super."milena";
+  "mime" = dontDistribute super."mime";
+  "mime-directory" = dontDistribute super."mime-directory";
+  "mime-string" = dontDistribute super."mime-string";
+  "mines" = dontDistribute super."mines";
+  "minesweeper" = dontDistribute super."minesweeper";
+  "miniball" = dontDistribute super."miniball";
+  "miniforth" = dontDistribute super."miniforth";
+  "minilens" = dontDistribute super."minilens";
+  "minimal-configuration" = dontDistribute super."minimal-configuration";
+  "minimorph" = dontDistribute super."minimorph";
+  "minimung" = dontDistribute super."minimung";
+  "minions" = dontDistribute super."minions";
+  "minioperational" = dontDistribute super."minioperational";
+  "miniplex" = dontDistribute super."miniplex";
+  "minirotate" = dontDistribute super."minirotate";
+  "minisat" = dontDistribute super."minisat";
+  "ministg" = dontDistribute super."ministg";
+  "miniutter" = dontDistribute super."miniutter";
+  "minst-idx" = dontDistribute super."minst-idx";
+  "mirror-tweet" = dontDistribute super."mirror-tweet";
+  "missing-py2" = dontDistribute super."missing-py2";
+  "mix-arrows" = dontDistribute super."mix-arrows";
+  "mixed-strategies" = dontDistribute super."mixed-strategies";
+  "mkbndl" = dontDistribute super."mkbndl";
+  "mkcabal" = dontDistribute super."mkcabal";
+  "ml-w" = dontDistribute super."ml-w";
+  "mlist" = dontDistribute super."mlist";
+  "mmtl" = dontDistribute super."mmtl";
+  "mmtl-base" = dontDistribute super."mmtl-base";
+  "moan" = dontDistribute super."moan";
+  "modbus-tcp" = dontDistribute super."modbus-tcp";
+  "modelicaparser" = dontDistribute super."modelicaparser";
+  "modsplit" = dontDistribute super."modsplit";
+  "modular-arithmetic" = dontDistribute super."modular-arithmetic";
+  "modular-prelude" = dontDistribute super."modular-prelude";
+  "modular-prelude-classy" = dontDistribute super."modular-prelude-classy";
+  "module-management" = dontDistribute super."module-management";
+  "modulespection" = dontDistribute super."modulespection";
+  "modulo" = dontDistribute super."modulo";
+  "moe" = dontDistribute super."moe";
+  "mohws" = dontDistribute super."mohws";
+  "monad-abort-fd" = dontDistribute super."monad-abort-fd";
+  "monad-atom" = dontDistribute super."monad-atom";
+  "monad-atom-simple" = dontDistribute super."monad-atom-simple";
+  "monad-bool" = dontDistribute super."monad-bool";
+  "monad-classes" = dontDistribute super."monad-classes";
+  "monad-codec" = dontDistribute super."monad-codec";
+  "monad-exception" = dontDistribute super."monad-exception";
+  "monad-fork" = dontDistribute super."monad-fork";
+  "monad-gen" = dontDistribute super."monad-gen";
+  "monad-interleave" = dontDistribute super."monad-interleave";
+  "monad-levels" = dontDistribute super."monad-levels";
+  "monad-loops-stm" = dontDistribute super."monad-loops-stm";
+  "monad-lrs" = dontDistribute super."monad-lrs";
+  "monad-memo" = dontDistribute super."monad-memo";
+  "monad-mersenne-random" = dontDistribute super."monad-mersenne-random";
+  "monad-open" = dontDistribute super."monad-open";
+  "monad-ox" = dontDistribute super."monad-ox";
+  "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
+  "monad-param" = dontDistribute super."monad-param";
+  "monad-ran" = dontDistribute super."monad-ran";
+  "monad-resumption" = dontDistribute super."monad-resumption";
+  "monad-state" = dontDistribute super."monad-state";
+  "monad-statevar" = dontDistribute super."monad-statevar";
+  "monad-stlike-io" = dontDistribute super."monad-stlike-io";
+  "monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
+  "monad-supply" = dontDistribute super."monad-supply";
+  "monad-task" = dontDistribute super."monad-task";
+  "monad-tx" = dontDistribute super."monad-tx";
+  "monad-unify" = dontDistribute super."monad-unify";
+  "monad-wrap" = dontDistribute super."monad-wrap";
+  "monadIO" = dontDistribute super."monadIO";
+  "monadLib-compose" = dontDistribute super."monadLib-compose";
+  "monadacme" = dontDistribute super."monadacme";
+  "monadbi" = dontDistribute super."monadbi";
+  "monadfibre" = dontDistribute super."monadfibre";
+  "monadiccp" = dontDistribute super."monadiccp";
+  "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
+  "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
+  "monadlist" = dontDistribute super."monadlist";
+  "monadloc-pp" = dontDistribute super."monadloc-pp";
+  "monadplus" = dontDistribute super."monadplus";
+  "monads-fd" = dontDistribute super."monads-fd";
+  "monadtransform" = dontDistribute super."monadtransform";
+  "monarch" = dontDistribute super."monarch";
+  "mongodb-queue" = dontDistribute super."mongodb-queue";
+  "mongrel2-handler" = dontDistribute super."mongrel2-handler";
+  "monitor" = dontDistribute super."monitor";
+  "mono-foldable" = dontDistribute super."mono-foldable";
+  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-owns" = dontDistribute super."monoid-owns";
+  "monoid-record" = dontDistribute super."monoid-record";
+  "monoid-statistics" = dontDistribute super."monoid-statistics";
+  "monoid-transformer" = dontDistribute super."monoid-transformer";
+  "monoidplus" = dontDistribute super."monoidplus";
+  "monoids" = dontDistribute super."monoids";
+  "monomorphic" = dontDistribute super."monomorphic";
+  "montage" = dontDistribute super."montage";
+  "montage-client" = dontDistribute super."montage-client";
+  "monte-carlo" = dontDistribute super."monte-carlo";
+  "moo" = dontDistribute super."moo";
+  "moonshine" = dontDistribute super."moonshine";
+  "morfette" = dontDistribute super."morfette";
+  "morfeusz" = dontDistribute super."morfeusz";
+  "mosaico-lib" = dontDistribute super."mosaico-lib";
+  "mount" = dontDistribute super."mount";
+  "mp" = dontDistribute super."mp";
+  "mp3decoder" = dontDistribute super."mp3decoder";
+  "mpdmate" = dontDistribute super."mpdmate";
+  "mpppc" = dontDistribute super."mpppc";
+  "mpretty" = dontDistribute super."mpretty";
+  "mpris" = dontDistribute super."mpris";
+  "mprover" = dontDistribute super."mprover";
+  "mps" = dontDistribute super."mps";
+  "mpvguihs" = dontDistribute super."mpvguihs";
+  "mqtt-hs" = dontDistribute super."mqtt-hs";
+  "ms" = dontDistribute super."ms";
+  "msgpack" = dontDistribute super."msgpack";
+  "msgpack-aeson" = dontDistribute super."msgpack-aeson";
+  "msgpack-idl" = dontDistribute super."msgpack-idl";
+  "msgpack-rpc" = dontDistribute super."msgpack-rpc";
+  "msh" = dontDistribute super."msh";
+  "msu" = dontDistribute super."msu";
+  "mtgoxapi" = dontDistribute super."mtgoxapi";
+  "mtl-c" = dontDistribute super."mtl-c";
+  "mtl-evil-instances" = dontDistribute super."mtl-evil-instances";
+  "mtl-tf" = dontDistribute super."mtl-tf";
+  "mtl-unleashed" = dontDistribute super."mtl-unleashed";
+  "mtlparse" = dontDistribute super."mtlparse";
+  "mtlx" = dontDistribute super."mtlx";
+  "mtp" = dontDistribute super."mtp";
+  "mtree" = dontDistribute super."mtree";
+  "mucipher" = dontDistribute super."mucipher";
+  "mudbath" = dontDistribute super."mudbath";
+  "muesli" = dontDistribute super."muesli";
+  "mueval" = dontDistribute super."mueval";
+  "multext-east-msd" = dontDistribute super."multext-east-msd";
+  "multi-cabal" = dontDistribute super."multi-cabal";
+  "multifocal" = dontDistribute super."multifocal";
+  "multihash" = dontDistribute super."multihash";
+  "multipart-names" = dontDistribute super."multipart-names";
+  "multipass" = dontDistribute super."multipass";
+  "multiplate-simplified" = dontDistribute super."multiplate-simplified";
+  "multiplicity" = dontDistribute super."multiplicity";
+  "multirec" = dontDistribute super."multirec";
+  "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver";
+  "multirec-binary" = dontDistribute super."multirec-binary";
+  "multiset-comb" = dontDistribute super."multiset-comb";
+  "multisetrewrite" = dontDistribute super."multisetrewrite";
+  "multistate" = dontDistribute super."multistate";
+  "muon" = dontDistribute super."muon";
+  "murder" = dontDistribute super."murder";
+  "murmur3" = dontDistribute super."murmur3";
+  "murmurhash3" = dontDistribute super."murmurhash3";
+  "music-articulation" = dontDistribute super."music-articulation";
+  "music-diatonic" = dontDistribute super."music-diatonic";
+  "music-dynamics" = dontDistribute super."music-dynamics";
+  "music-dynamics-literal" = dontDistribute super."music-dynamics-literal";
+  "music-graphics" = dontDistribute super."music-graphics";
+  "music-parts" = dontDistribute super."music-parts";
+  "music-pitch" = dontDistribute super."music-pitch";
+  "music-pitch-literal" = dontDistribute super."music-pitch-literal";
+  "music-preludes" = dontDistribute super."music-preludes";
+  "music-score" = dontDistribute super."music-score";
+  "music-sibelius" = dontDistribute super."music-sibelius";
+  "music-suite" = dontDistribute super."music-suite";
+  "music-util" = dontDistribute super."music-util";
+  "musicbrainz-email" = dontDistribute super."musicbrainz-email";
+  "musicxml" = dontDistribute super."musicxml";
+  "musicxml2" = dontDistribute super."musicxml2";
+  "mustache" = dontDistribute super."mustache";
+  "mustache-haskell" = dontDistribute super."mustache-haskell";
+  "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-iter" = dontDistribute super."mutable-iter";
+  "mute-unmute" = dontDistribute super."mute-unmute";
+  "mvc" = dontDistribute super."mvc";
+  "mvc-updates" = dontDistribute super."mvc-updates";
+  "mvclient" = dontDistribute super."mvclient";
+  "mwc-random-monad" = dontDistribute super."mwc-random-monad";
+  "myTestlll" = dontDistribute super."myTestlll";
+  "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
+  "myo" = dontDistribute super."myo";
+  "mysnapsession" = dontDistribute super."mysnapsession";
+  "mysnapsession-example" = dontDistribute super."mysnapsession-example";
+  "mysql-effect" = dontDistribute super."mysql-effect";
+  "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi";
+  "mysql-simple-typed" = dontDistribute super."mysql-simple-typed";
+  "mzv" = dontDistribute super."mzv";
+  "n-m" = dontDistribute super."n-m";
+  "nagios-perfdata" = dontDistribute super."nagios-perfdata";
+  "nagios-plugin-ekg" = dontDistribute super."nagios-plugin-ekg";
+  "named-formlet" = dontDistribute super."named-formlet";
+  "named-lock" = dontDistribute super."named-lock";
+  "named-records" = dontDistribute super."named-records";
+  "namelist" = dontDistribute super."namelist";
+  "names" = dontDistribute super."names";
+  "names-th" = dontDistribute super."names-th";
+  "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-hmac" = dontDistribute super."nano-hmac";
+  "nano-md5" = dontDistribute super."nano-md5";
+  "nanoAgda" = dontDistribute super."nanoAgda";
+  "nanocurses" = dontDistribute super."nanocurses";
+  "nanomsg" = dontDistribute super."nanomsg";
+  "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
+  "nanoparsec" = dontDistribute super."nanoparsec";
+  "nanq" = dontDistribute super."nanq";
+  "narc" = dontDistribute super."narc";
+  "nat" = dontDistribute super."nat";
+  "nats-queue" = dontDistribute super."nats-queue";
+  "natural-number" = dontDistribute super."natural-number";
+  "natural-numbers" = dontDistribute super."natural-numbers";
+  "natural-transformation" = dontDistribute super."natural-transformation";
+  "naturalcomp" = dontDistribute super."naturalcomp";
+  "naturals" = dontDistribute super."naturals";
+  "naver-translate" = dontDistribute super."naver-translate";
+  "nbt" = dontDistribute super."nbt";
+  "nc-indicators" = dontDistribute super."nc-indicators";
+  "ncurses" = dontDistribute super."ncurses";
+  "neat" = dontDistribute super."neat";
+  "needle" = dontDistribute super."needle";
+  "neet" = dontDistribute super."neet";
+  "nehe-tuts" = dontDistribute super."nehe-tuts";
+  "neil" = dontDistribute super."neil";
+  "neither" = dontDistribute super."neither";
+  "nemesis" = dontDistribute super."nemesis";
+  "nemesis-titan" = dontDistribute super."nemesis-titan";
+  "nerf" = dontDistribute super."nerf";
+  "nero" = dontDistribute super."nero";
+  "nero-wai" = dontDistribute super."nero-wai";
+  "nero-warp" = dontDistribute super."nero-warp";
+  "nested-routes" = dontDistribute super."nested-routes";
+  "nested-sets" = dontDistribute super."nested-sets";
+  "nestedmap" = dontDistribute super."nestedmap";
+  "net-concurrent" = dontDistribute super."net-concurrent";
+  "netclock" = dontDistribute super."netclock";
+  "netcore" = dontDistribute super."netcore";
+  "netlines" = dontDistribute super."netlines";
+  "netlink" = dontDistribute super."netlink";
+  "netlist" = dontDistribute super."netlist";
+  "netlist-to-vhdl" = dontDistribute super."netlist-to-vhdl";
+  "netpbm" = dontDistribute super."netpbm";
+  "netrc" = dontDistribute super."netrc";
+  "netspec" = dontDistribute super."netspec";
+  "netstring-enumerator" = dontDistribute super."netstring-enumerator";
+  "nettle-frp" = dontDistribute super."nettle-frp";
+  "nettle-netkit" = dontDistribute super."nettle-netkit";
+  "nettle-openflow" = dontDistribute super."nettle-openflow";
+  "netwire" = dontDistribute super."netwire";
+  "netwire-input" = dontDistribute super."netwire-input";
+  "netwire-input-glfw" = dontDistribute super."netwire-input-glfw";
+  "network-address" = dontDistribute super."network-address";
+  "network-api-support" = dontDistribute super."network-api-support";
+  "network-bitcoin" = dontDistribute super."network-bitcoin";
+  "network-builder" = dontDistribute super."network-builder";
+  "network-bytestring" = dontDistribute super."network-bytestring";
+  "network-conduit" = dontDistribute super."network-conduit";
+  "network-connection" = dontDistribute super."network-connection";
+  "network-data" = dontDistribute super."network-data";
+  "network-dbus" = dontDistribute super."network-dbus";
+  "network-dns" = dontDistribute super."network-dns";
+  "network-enumerator" = dontDistribute super."network-enumerator";
+  "network-fancy" = dontDistribute super."network-fancy";
+  "network-interfacerequest" = dontDistribute super."network-interfacerequest";
+  "network-ip" = dontDistribute super."network-ip";
+  "network-metrics" = dontDistribute super."network-metrics";
+  "network-minihttp" = dontDistribute super."network-minihttp";
+  "network-msg" = dontDistribute super."network-msg";
+  "network-netpacket" = dontDistribute super."network-netpacket";
+  "network-pgi" = dontDistribute super."network-pgi";
+  "network-rpca" = dontDistribute super."network-rpca";
+  "network-server" = dontDistribute super."network-server";
+  "network-service" = dontDistribute super."network-service";
+  "network-simple-sockaddr" = dontDistribute super."network-simple-sockaddr";
+  "network-simple-tls" = dontDistribute super."network-simple-tls";
+  "network-socket-options" = dontDistribute super."network-socket-options";
+  "network-stream" = dontDistribute super."network-stream";
+  "network-topic-models" = dontDistribute super."network-topic-models";
+  "network-transport-amqp" = dontDistribute super."network-transport-amqp";
+  "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
+  "network-uri-static" = dontDistribute super."network-uri-static";
+  "network-wai-router" = dontDistribute super."network-wai-router";
+  "network-websocket" = dontDistribute super."network-websocket";
+  "networked-game" = dontDistribute super."networked-game";
+  "newports" = dontDistribute super."newports";
+  "newsynth" = dontDistribute super."newsynth";
+  "newt" = dontDistribute super."newt";
+  "newtype-deriving" = dontDistribute super."newtype-deriving";
+  "newtype-th" = dontDistribute super."newtype-th";
+  "newtyper" = dontDistribute super."newtyper";
+  "nextstep-plist" = dontDistribute super."nextstep-plist";
+  "nf" = dontDistribute super."nf";
+  "ngrams-loader" = dontDistribute super."ngrams-loader";
+  "niagra" = dontDistribute super."niagra";
+  "nibblestring" = dontDistribute super."nibblestring";
+  "nicify" = dontDistribute super."nicify";
+  "nicify-lib" = dontDistribute super."nicify-lib";
+  "nicovideo-translator" = dontDistribute super."nicovideo-translator";
+  "nikepub" = dontDistribute super."nikepub";
+  "nimber" = dontDistribute super."nimber";
+  "nitro" = dontDistribute super."nitro";
+  "nix-eval" = dontDistribute super."nix-eval";
+  "nixfromnpm" = dontDistribute super."nixfromnpm";
+  "nixos-types" = dontDistribute super."nixos-types";
+  "nkjp" = dontDistribute super."nkjp";
+  "nlp-scores" = dontDistribute super."nlp-scores";
+  "nlp-scores-scripts" = dontDistribute super."nlp-scores-scripts";
+  "nm" = dontDistribute super."nm";
+  "nme" = dontDistribute super."nme";
+  "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
+  "no-role-annots" = dontDistribute super."no-role-annots";
+  "nofib-analyse" = dontDistribute super."nofib-analyse";
+  "nofib-analyze" = dontDistribute super."nofib-analyze";
+  "noise" = dontDistribute super."noise";
+  "non-empty" = dontDistribute super."non-empty";
+  "non-negative" = dontDistribute super."non-negative";
+  "nondeterminism" = dontDistribute super."nondeterminism";
+  "nonfree" = dontDistribute super."nonfree";
+  "nonlinear-optimization" = dontDistribute super."nonlinear-optimization";
+  "nonlinear-optimization-ad" = dontDistribute super."nonlinear-optimization-ad";
+  "noodle" = dontDistribute super."noodle";
+  "normaldistribution" = dontDistribute super."normaldistribution";
+  "not-gloss" = dontDistribute super."not-gloss";
+  "not-gloss-examples" = dontDistribute super."not-gloss-examples";
+  "not-in-base" = dontDistribute super."not-in-base";
+  "notcpp" = dontDistribute super."notcpp";
+  "notmuch-haskell" = dontDistribute super."notmuch-haskell";
+  "notmuch-web" = dontDistribute super."notmuch-web";
+  "notzero" = dontDistribute super."notzero";
+  "np-extras" = dontDistribute super."np-extras";
+  "np-linear" = dontDistribute super."np-linear";
+  "nptools" = dontDistribute super."nptools";
+  "nth-prime" = dontDistribute super."nth-prime";
+  "nthable" = dontDistribute super."nthable";
+  "ntp-control" = dontDistribute super."ntp-control";
+  "null-canvas" = dontDistribute super."null-canvas";
+  "nullary" = dontDistribute super."nullary";
+  "number" = dontDistribute super."number";
+  "numbering" = dontDistribute super."numbering";
+  "numerals" = dontDistribute super."numerals";
+  "numerals-base" = dontDistribute super."numerals-base";
+  "numeric-limits" = dontDistribute super."numeric-limits";
+  "numeric-prelude" = dontDistribute super."numeric-prelude";
+  "numeric-qq" = dontDistribute super."numeric-qq";
+  "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
+  "numeric-tools" = dontDistribute super."numeric-tools";
+  "numericpeano" = dontDistribute super."numericpeano";
+  "nums" = dontDistribute super."nums";
+  "numtype" = dontDistribute super."numtype";
+  "numtype-tf" = dontDistribute super."numtype-tf";
+  "nurbs" = dontDistribute super."nurbs";
+  "nvim-hs" = dontDistribute super."nvim-hs";
+  "nvim-hs-contrib" = dontDistribute super."nvim-hs-contrib";
+  "nyan" = dontDistribute super."nyan";
+  "nylas" = dontDistribute super."nylas";
+  "nymphaea" = dontDistribute super."nymphaea";
+  "oauthenticated" = dontDistribute super."oauthenticated";
+  "obdd" = dontDistribute super."obdd";
+  "oberon0" = dontDistribute super."oberon0";
+  "obj" = dontDistribute super."obj";
+  "objectid" = dontDistribute super."objectid";
+  "observable-sharing" = dontDistribute super."observable-sharing";
+  "octohat" = dontDistribute super."octohat";
+  "octopus" = dontDistribute super."octopus";
+  "oculus" = dontDistribute super."oculus";
+  "oeis" = dontDistribute super."oeis";
+  "off-simple" = dontDistribute super."off-simple";
+  "ohloh-hs" = dontDistribute super."ohloh-hs";
+  "oi" = dontDistribute super."oi";
+  "oidc-client" = dontDistribute super."oidc-client";
+  "ois-input-manager" = dontDistribute super."ois-input-manager";
+  "old-version" = dontDistribute super."old-version";
+  "olwrapper" = dontDistribute super."olwrapper";
+  "omaketex" = dontDistribute super."omaketex";
+  "omega" = dontDistribute super."omega";
+  "omnicodec" = dontDistribute super."omnicodec";
+  "on-a-horse" = dontDistribute super."on-a-horse";
+  "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel";
+  "one-liner" = dontDistribute super."one-liner";
+  "one-time-password" = dontDistribute super."one-time-password";
+  "oneOfN" = dontDistribute super."oneOfN";
+  "oneormore" = dontDistribute super."oneormore";
+  "only" = dontDistribute super."only";
+  "onu-course" = dontDistribute super."onu-course";
+  "opaleye-classy" = dontDistribute super."opaleye-classy";
+  "opaleye-sqlite" = dontDistribute super."opaleye-sqlite";
+  "opaleye-trans" = dontDistribute super."opaleye-trans";
+  "open-haddock" = dontDistribute super."open-haddock";
+  "open-pandoc" = dontDistribute super."open-pandoc";
+  "open-symbology" = dontDistribute super."open-symbology";
+  "open-typerep" = dontDistribute super."open-typerep";
+  "open-union" = dontDistribute super."open-union";
+  "open-witness" = dontDistribute super."open-witness";
+  "opencog-atomspace" = dontDistribute super."opencog-atomspace";
+  "opencv-raw" = dontDistribute super."opencv-raw";
+  "opendatatable" = dontDistribute super."opendatatable";
+  "openexchangerates" = dontDistribute super."openexchangerates";
+  "openflow" = dontDistribute super."openflow";
+  "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
+  "opengles" = dontDistribute super."opengles";
+  "openid" = dontDistribute super."openid";
+  "openpgp" = dontDistribute super."openpgp";
+  "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
+  "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
+  "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "openssh-github-keys" = dontDistribute super."openssh-github-keys";
+  "openssl-createkey" = dontDistribute super."openssl-createkey";
+  "opentheory" = dontDistribute super."opentheory";
+  "opentheory-bits" = dontDistribute super."opentheory-bits";
+  "opentheory-byte" = dontDistribute super."opentheory-byte";
+  "opentheory-char" = dontDistribute super."opentheory-char";
+  "opentheory-divides" = dontDistribute super."opentheory-divides";
+  "opentheory-fibonacci" = dontDistribute super."opentheory-fibonacci";
+  "opentheory-parser" = dontDistribute super."opentheory-parser";
+  "opentheory-prime" = dontDistribute super."opentheory-prime";
+  "opentheory-primitive" = dontDistribute super."opentheory-primitive";
+  "opentheory-probability" = dontDistribute super."opentheory-probability";
+  "opentheory-stream" = dontDistribute super."opentheory-stream";
+  "opentheory-unicode" = dontDistribute super."opentheory-unicode";
+  "operational-alacarte" = dontDistribute super."operational-alacarte";
+  "opml" = dontDistribute super."opml";
+  "opn" = dontDistribute super."opn";
+  "optimal-blocks" = dontDistribute super."optimal-blocks";
+  "optimization" = dontDistribute super."optimization";
+  "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
+  "optional" = dontDistribute super."optional";
+  "options-time" = dontDistribute super."options-time";
+  "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "orc" = dontDistribute super."orc";
+  "orchestrate" = dontDistribute super."orchestrate";
+  "orchid" = dontDistribute super."orchid";
+  "orchid-demo" = dontDistribute super."orchid-demo";
+  "ord-adhoc" = dontDistribute super."ord-adhoc";
+  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistics" = dontDistribute super."order-statistics";
+  "ordered" = dontDistribute super."ordered";
+  "orders" = dontDistribute super."orders";
+  "ordrea" = dontDistribute super."ordrea";
+  "organize-imports" = dontDistribute super."organize-imports";
+  "orgmode" = dontDistribute super."orgmode";
+  "orgmode-parse" = dontDistribute super."orgmode-parse";
+  "origami" = dontDistribute super."origami";
+  "os-release" = dontDistribute super."os-release";
+  "osc" = dontDistribute super."osc";
+  "osm-download" = dontDistribute super."osm-download";
+  "oso2pdf" = dontDistribute super."oso2pdf";
+  "osx-ar" = dontDistribute super."osx-ar";
+  "ot" = dontDistribute super."ot";
+  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overture" = dontDistribute super."overture";
+  "pack" = dontDistribute super."pack";
+  "package-o-tron" = dontDistribute super."package-o-tron";
+  "package-vt" = dontDistribute super."package-vt";
+  "packdeps" = dontDistribute super."packdeps";
+  "packed-dawg" = dontDistribute super."packed-dawg";
+  "packedstring" = dontDistribute super."packedstring";
+  "packer" = dontDistribute super."packer";
+  "packman" = dontDistribute super."packman";
+  "packunused" = dontDistribute super."packunused";
+  "pacman-memcache" = dontDistribute super."pacman-memcache";
+  "padKONTROL" = dontDistribute super."padKONTROL";
+  "pagarme" = dontDistribute super."pagarme";
+  "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palindromes" = dontDistribute super."palindromes";
+  "pam" = dontDistribute super."pam";
+  "panda" = dontDistribute super."panda";
+  "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble";
+  "pandoc-crossref" = dontDistribute super."pandoc-crossref";
+  "pandoc-csv2table" = dontDistribute super."pandoc-csv2table";
+  "pandoc-include" = dontDistribute super."pandoc-include";
+  "pandoc-lens" = dontDistribute super."pandoc-lens";
+  "pandoc-placetable" = dontDistribute super."pandoc-placetable";
+  "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams";
+  "pandoc-unlit" = dontDistribute super."pandoc-unlit";
+  "papillon" = dontDistribute super."papillon";
+  "pappy" = dontDistribute super."pappy";
+  "para" = dontDistribute super."para";
+  "paragon" = dontDistribute super."paragon";
+  "parallel-tasks" = dontDistribute super."parallel-tasks";
+  "parallel-tree-search" = dontDistribute super."parallel-tree-search";
+  "parameterized-data" = dontDistribute super."parameterized-data";
+  "parco" = dontDistribute super."parco";
+  "parco-attoparsec" = dontDistribute super."parco-attoparsec";
+  "parco-parsec" = dontDistribute super."parco-parsec";
+  "parcom-lib" = dontDistribute super."parcom-lib";
+  "parconc-examples" = dontDistribute super."parconc-examples";
+  "parport" = dontDistribute super."parport";
+  "parse-dimacs" = dontDistribute super."parse-dimacs";
+  "parse-help" = dontDistribute super."parse-help";
+  "parsec-extra" = dontDistribute super."parsec-extra";
+  "parsec-numbers" = dontDistribute super."parsec-numbers";
+  "parsec-parsers" = dontDistribute super."parsec-parsers";
+  "parsec-permutation" = dontDistribute super."parsec-permutation";
+  "parsec-tagsoup" = dontDistribute super."parsec-tagsoup";
+  "parsec-trace" = dontDistribute super."parsec-trace";
+  "parsec-utils" = dontDistribute super."parsec-utils";
+  "parsec1" = dontDistribute super."parsec1";
+  "parsec2" = dontDistribute super."parsec2";
+  "parsec3" = dontDistribute super."parsec3";
+  "parsec3-numbers" = dontDistribute super."parsec3-numbers";
+  "parsedate" = dontDistribute super."parsedate";
+  "parseerror-eq" = dontDistribute super."parseerror-eq";
+  "parsek" = dontDistribute super."parsek";
+  "parsely" = dontDistribute super."parsely";
+  "parser-helper" = dontDistribute super."parser-helper";
+  "parser241" = dontDistribute super."parser241";
+  "parsergen" = dontDistribute super."parsergen";
+  "parsestar" = dontDistribute super."parsestar";
+  "parsimony" = dontDistribute super."parsimony";
+  "partial" = dontDistribute super."partial";
+  "partial-lens" = dontDistribute super."partial-lens";
+  "partial-uri" = dontDistribute super."partial-uri";
+  "partly" = dontDistribute super."partly";
+  "passage" = dontDistribute super."passage";
+  "passwords" = dontDistribute super."passwords";
+  "pastis" = dontDistribute super."pastis";
+  "pasty" = dontDistribute super."pasty";
+  "patch-combinators" = dontDistribute super."patch-combinators";
+  "patch-image" = dontDistribute super."patch-image";
+  "patches-vector" = doDistribute super."patches-vector_0_1_5_0";
+  "pathfinding" = dontDistribute super."pathfinding";
+  "pathfindingcore" = dontDistribute super."pathfindingcore";
+  "pathtype" = dontDistribute super."pathtype";
+  "patronscraper" = dontDistribute super."patronscraper";
+  "patterns" = dontDistribute super."patterns";
+  "paymill" = dontDistribute super."paymill";
+  "paypal-adaptive-hoops" = dontDistribute super."paypal-adaptive-hoops";
+  "paypal-api" = dontDistribute super."paypal-api";
+  "pb" = dontDistribute super."pb";
+  "pbc4hs" = dontDistribute super."pbc4hs";
+  "pbkdf" = dontDistribute super."pbkdf";
+  "pcap-conduit" = dontDistribute super."pcap-conduit";
+  "pcap-enumerator" = dontDistribute super."pcap-enumerator";
+  "pcd-loader" = dontDistribute super."pcd-loader";
+  "pcf" = dontDistribute super."pcf";
+  "pcg-random" = dontDistribute super."pcg-random";
+  "pcre-less" = dontDistribute super."pcre-less";
+  "pcre-light-extra" = dontDistribute super."pcre-light-extra";
+  "pdf-toolbox-viewer" = dontDistribute super."pdf-toolbox-viewer";
+  "pdf2line" = dontDistribute super."pdf2line";
+  "pdfsplit" = dontDistribute super."pdfsplit";
+  "pdynload" = dontDistribute super."pdynload";
+  "peakachu" = dontDistribute super."peakachu";
+  "peano" = dontDistribute super."peano";
+  "peano-inf" = dontDistribute super."peano-inf";
+  "pec" = dontDistribute super."pec";
+  "pecoff" = dontDistribute super."pecoff";
+  "peg" = dontDistribute super."peg";
+  "peggy" = dontDistribute super."peggy";
+  "pell" = dontDistribute super."pell";
+  "penn-treebank" = dontDistribute super."penn-treebank";
+  "penny" = dontDistribute super."penny";
+  "penny-bin" = dontDistribute super."penny-bin";
+  "penny-lib" = dontDistribute super."penny-lib";
+  "peparser" = dontDistribute super."peparser";
+  "perceptron" = dontDistribute super."perceptron";
+  "perdure" = dontDistribute super."perdure";
+  "period" = dontDistribute super."period";
+  "perm" = dontDistribute super."perm";
+  "permutation" = dontDistribute super."permutation";
+  "permute" = dontDistribute super."permute";
+  "persist2er" = dontDistribute super."persist2er";
+  "persistable-record" = dontDistribute super."persistable-record";
+  "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
+  "persistent-cereal" = dontDistribute super."persistent-cereal";
+  "persistent-equivalence" = dontDistribute super."persistent-equivalence";
+  "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
+  "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
+  "persistent-map" = dontDistribute super."persistent-map";
+  "persistent-odbc" = dontDistribute super."persistent-odbc";
+  "persistent-protobuf" = dontDistribute super."persistent-protobuf";
+  "persistent-ratelimit" = dontDistribute super."persistent-ratelimit";
+  "persistent-redis" = dontDistribute super."persistent-redis";
+  "persistent-vector" = dontDistribute super."persistent-vector";
+  "persistent-zookeeper" = dontDistribute super."persistent-zookeeper";
+  "persona" = dontDistribute super."persona";
+  "persona-idp" = dontDistribute super."persona-idp";
+  "pesca" = dontDistribute super."pesca";
+  "peyotls" = dontDistribute super."peyotls";
+  "peyotls-codec" = dontDistribute super."peyotls-codec";
+  "pez" = dontDistribute super."pez";
+  "pg-harness" = dontDistribute super."pg-harness";
+  "pg-harness-client" = dontDistribute super."pg-harness-client";
+  "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pgdl" = dontDistribute super."pgdl";
+  "pgm" = dontDistribute super."pgm";
+  "pgsql-simple" = dontDistribute super."pgsql-simple";
+  "pgstream" = dontDistribute super."pgstream";
+  "phasechange" = dontDistribute super."phasechange";
+  "phizzle" = dontDistribute super."phizzle";
+  "phoityne" = dontDistribute super."phoityne";
+  "phone-numbers" = dontDistribute super."phone-numbers";
+  "phone-push" = dontDistribute super."phone-push";
+  "phonetic-code" = dontDistribute super."phonetic-code";
+  "phooey" = dontDistribute super."phooey";
+  "photoname" = dontDistribute super."photoname";
+  "phraskell" = dontDistribute super."phraskell";
+  "phybin" = dontDistribute super."phybin";
+  "pi-calculus" = dontDistribute super."pi-calculus";
+  "pia-forward" = dontDistribute super."pia-forward";
+  "pianola" = dontDistribute super."pianola";
+  "picologic" = dontDistribute super."picologic";
+  "picosat" = dontDistribute super."picosat";
+  "piet" = dontDistribute super."piet";
+  "piki" = dontDistribute super."piki";
+  "pinboard" = dontDistribute super."pinboard";
+  "pipe-enumerator" = dontDistribute super."pipe-enumerator";
+  "pipeclip" = dontDistribute super."pipeclip";
+  "pipes-async" = dontDistribute super."pipes-async";
+  "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
+  "pipes-cellular" = dontDistribute super."pipes-cellular";
+  "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
+  "pipes-cereal" = dontDistribute super."pipes-cereal";
+  "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus";
+  "pipes-conduit" = dontDistribute super."pipes-conduit";
+  "pipes-core" = dontDistribute super."pipes-core";
+  "pipes-courier" = dontDistribute super."pipes-courier";
+  "pipes-errors" = dontDistribute super."pipes-errors";
+  "pipes-extra" = dontDistribute super."pipes-extra";
+  "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-http" = dontDistribute super."pipes-http";
+  "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-network-tls" = dontDistribute super."pipes-network-tls";
+  "pipes-p2p" = dontDistribute super."pipes-p2p";
+  "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
+  "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple";
+  "pipes-rt" = dontDistribute super."pipes-rt";
+  "pipes-shell" = dontDistribute super."pipes-shell";
+  "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
+  "pipes-transduce" = dontDistribute super."pipes-transduce";
+  "pipes-vector" = dontDistribute super."pipes-vector";
+  "pipes-websockets" = dontDistribute super."pipes-websockets";
+  "pipes-zeromq4" = dontDistribute super."pipes-zeromq4";
+  "pipes-zlib" = dontDistribute super."pipes-zlib";
+  "pisigma" = dontDistribute super."pisigma";
+  "pit" = dontDistribute super."pit";
+  "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
+  "pkcs1" = dontDistribute super."pkcs1";
+  "pkcs7" = dontDistribute super."pkcs7";
+  "pkggraph" = dontDistribute super."pkggraph";
+  "pktree" = dontDistribute super."pktree";
+  "plailude" = dontDistribute super."plailude";
+  "planar-graph" = dontDistribute super."planar-graph";
+  "plat" = dontDistribute super."plat";
+  "playlists" = dontDistribute super."playlists";
+  "plist" = dontDistribute super."plist";
+  "plist-buddy" = dontDistribute super."plist-buddy";
+  "plivo" = dontDistribute super."plivo";
+  "plot-lab" = dontDistribute super."plot-lab";
+  "plotfont" = dontDistribute super."plotfont";
+  "plotserver-api" = dontDistribute super."plotserver-api";
+  "plugins" = dontDistribute super."plugins";
+  "plugins-auto" = dontDistribute super."plugins-auto";
+  "plugins-multistage" = dontDistribute super."plugins-multistage";
+  "plumbers" = dontDistribute super."plumbers";
+  "ply-loader" = dontDistribute super."ply-loader";
+  "png-file" = dontDistribute super."png-file";
+  "pngload" = dontDistribute super."pngload";
+  "pngload-fixed" = dontDistribute super."pngload-fixed";
+  "pnm" = dontDistribute super."pnm";
+  "pocket-dns" = dontDistribute super."pocket-dns";
+  "pointfree" = dontDistribute super."pointfree";
+  "pointful" = dontDistribute super."pointful";
+  "pointless-fun" = dontDistribute super."pointless-fun";
+  "pointless-haskell" = dontDistribute super."pointless-haskell";
+  "pointless-lenses" = dontDistribute super."pointless-lenses";
+  "pointless-rewrite" = dontDistribute super."pointless-rewrite";
+  "poker-eval" = dontDistribute super."poker-eval";
+  "pokitdok" = dontDistribute super."pokitdok";
+  "polar" = dontDistribute super."polar";
+  "polar-configfile" = dontDistribute super."polar-configfile";
+  "polar-shader" = dontDistribute super."polar-shader";
+  "polh-lexicon" = dontDistribute super."polh-lexicon";
+  "polimorf" = dontDistribute super."polimorf";
+  "poll" = dontDistribute super."poll";
+  "polyToMonoid" = dontDistribute super."polyToMonoid";
+  "polymap" = dontDistribute super."polymap";
+  "polynomial" = dontDistribute super."polynomial";
+  "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
+  "polyseq" = dontDistribute super."polyseq";
+  "polysoup" = dontDistribute super."polysoup";
+  "polytypeable" = dontDistribute super."polytypeable";
+  "polytypeable-utils" = dontDistribute super."polytypeable-utils";
+  "ponder" = dontDistribute super."ponder";
+  "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
+  "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
+  "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
+  "pony" = dontDistribute super."pony";
+  "pool" = dontDistribute super."pool";
+  "pool-conduit" = dontDistribute super."pool-conduit";
+  "pooled-io" = dontDistribute super."pooled-io";
+  "pop3-client" = dontDistribute super."pop3-client";
+  "popenhs" = dontDistribute super."popenhs";
+  "poppler" = dontDistribute super."poppler";
+  "populate-setup-exe-cache" = dontDistribute super."populate-setup-exe-cache";
+  "portable-lines" = dontDistribute super."portable-lines";
+  "portaudio" = dontDistribute super."portaudio";
+  "porte" = dontDistribute super."porte";
+  "porter" = dontDistribute super."porter";
+  "ports" = dontDistribute super."ports";
+  "ports-tools" = dontDistribute super."ports-tools";
+  "positive" = dontDistribute super."positive";
+  "posix-acl" = dontDistribute super."posix-acl";
+  "posix-escape" = dontDistribute super."posix-escape";
+  "posix-filelock" = dontDistribute super."posix-filelock";
+  "posix-paths" = dontDistribute super."posix-paths";
+  "posix-pty" = dontDistribute super."posix-pty";
+  "posix-timer" = dontDistribute super."posix-timer";
+  "posix-waitpid" = dontDistribute super."posix-waitpid";
+  "possible" = dontDistribute super."possible";
+  "postcodes" = dontDistribute super."postcodes";
+  "postgresql-config" = dontDistribute super."postgresql-config";
+  "postgresql-connector" = dontDistribute super."postgresql-connector";
+  "postgresql-copy-escape" = dontDistribute super."postgresql-copy-escape";
+  "postgresql-cube" = dontDistribute super."postgresql-cube";
+  "postgresql-error-codes" = dontDistribute super."postgresql-error-codes";
+  "postgresql-orm" = dontDistribute super."postgresql-orm";
+  "postgresql-query" = dontDistribute super."postgresql-query";
+  "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
+  "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
+  "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-typed" = dontDistribute super."postgresql-typed";
+  "postgrest" = dontDistribute super."postgrest";
+  "postie" = dontDistribute super."postie";
+  "postmark" = dontDistribute super."postmark";
+  "postmaster" = dontDistribute super."postmaster";
+  "potato-tool" = dontDistribute super."potato-tool";
+  "potrace" = dontDistribute super."potrace";
+  "potrace-diagrams" = dontDistribute super."potrace-diagrams";
+  "powermate" = dontDistribute super."powermate";
+  "powerpc" = dontDistribute super."powerpc";
+  "ppm" = dontDistribute super."ppm";
+  "pqc" = dontDistribute super."pqc";
+  "pqueue-mtl" = dontDistribute super."pqueue-mtl";
+  "practice-room" = dontDistribute super."practice-room";
+  "precis" = dontDistribute super."precis";
+  "pred-trie" = dontDistribute super."pred-trie";
+  "predicates" = dontDistribute super."predicates";
+  "prednote-test" = dontDistribute super."prednote-test";
+  "prefork" = dontDistribute super."prefork";
+  "pregame" = dontDistribute super."pregame";
+  "prelude-edsl" = dontDistribute super."prelude-edsl";
+  "prelude-generalize" = dontDistribute super."prelude-generalize";
+  "prelude-plus" = dontDistribute super."prelude-plus";
+  "prelude-prime" = dontDistribute super."prelude-prime";
+  "prelude-safeenum" = dontDistribute super."prelude-safeenum";
+  "preprocess-haskell" = dontDistribute super."preprocess-haskell";
+  "preprocessor-tools" = dontDistribute super."preprocessor-tools";
+  "present" = dontDistribute super."present";
+  "press" = dontDistribute super."press";
+  "presto-hdbc" = dontDistribute super."presto-hdbc";
+  "prettify" = dontDistribute super."prettify";
+  "pretty-compact" = dontDistribute super."pretty-compact";
+  "pretty-error" = dontDistribute super."pretty-error";
+  "pretty-hex" = dontDistribute super."pretty-hex";
+  "pretty-ncols" = dontDistribute super."pretty-ncols";
+  "pretty-sop" = dontDistribute super."pretty-sop";
+  "pretty-tree" = dontDistribute super."pretty-tree";
+  "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-uniq" = dontDistribute super."prim-uniq";
+  "primula-board" = dontDistribute super."primula-board";
+  "primula-bot" = dontDistribute super."primula-bot";
+  "printf-mauke" = dontDistribute super."printf-mauke";
+  "printxosd" = dontDistribute super."printxosd";
+  "priority-queue" = dontDistribute super."priority-queue";
+  "priority-sync" = dontDistribute super."priority-sync";
+  "privileged-concurrency" = dontDistribute super."privileged-concurrency";
+  "prizm" = dontDistribute super."prizm";
+  "probability" = dontDistribute super."probability";
+  "probable" = dontDistribute super."probable";
+  "proc" = dontDistribute super."proc";
+  "process-conduit" = dontDistribute super."process-conduit";
+  "process-iterio" = dontDistribute super."process-iterio";
+  "process-leksah" = dontDistribute super."process-leksah";
+  "process-listlike" = dontDistribute super."process-listlike";
+  "process-progress" = dontDistribute super."process-progress";
+  "process-qq" = dontDistribute super."process-qq";
+  "process-streaming" = dontDistribute super."process-streaming";
+  "processing" = dontDistribute super."processing";
+  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
+  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
+  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
+  "procstat" = dontDistribute super."procstat";
+  "proctest" = dontDistribute super."proctest";
+  "prof2dot" = dontDistribute super."prof2dot";
+  "prof2pretty" = dontDistribute super."prof2pretty";
+  "profiteur" = dontDistribute super."profiteur";
+  "progress" = dontDistribute super."progress";
+  "progressbar" = dontDistribute super."progressbar";
+  "progression" = dontDistribute super."progression";
+  "progressive" = dontDistribute super."progressive";
+  "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings";
+  "projection" = dontDistribute super."projection";
+  "prolog" = dontDistribute super."prolog";
+  "prolog-graph" = dontDistribute super."prolog-graph";
+  "prolog-graph-lib" = dontDistribute super."prolog-graph-lib";
+  "prologue" = dontDistribute super."prologue";
+  "promise" = dontDistribute super."promise";
+  "promises" = dontDistribute super."promises";
+  "prompt" = dontDistribute super."prompt";
+  "propane" = dontDistribute super."propane";
+  "propellor" = dontDistribute super."propellor";
+  "properties" = dontDistribute super."properties";
+  "property-list" = dontDistribute super."property-list";
+  "proplang" = dontDistribute super."proplang";
+  "props" = dontDistribute super."props";
+  "prosper" = dontDistribute super."prosper";
+  "proteaaudio" = dontDistribute super."proteaaudio";
+  "protobuf-native" = dontDistribute super."protobuf-native";
+  "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork";
+  "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork";
+  "proton-haskell" = dontDistribute super."proton-haskell";
+  "prototype" = dontDistribute super."prototype";
+  "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxy-kindness" = dontDistribute super."proxy-kindness";
+  "pseudo-boolean" = dontDistribute super."pseudo-boolean";
+  "pseudo-trie" = dontDistribute super."pseudo-trie";
+  "pseudomacros" = dontDistribute super."pseudomacros";
+  "pub" = dontDistribute super."pub";
+  "publicsuffixlist" = dontDistribute super."publicsuffixlist";
+  "publicsuffixlistcreate" = dontDistribute super."publicsuffixlistcreate";
+  "pubnub" = dontDistribute super."pubnub";
+  "pubsub" = dontDistribute super."pubsub";
+  "puffytools" = dontDistribute super."puffytools";
+  "pugixml" = dontDistribute super."pugixml";
+  "pugs-DrIFT" = dontDistribute super."pugs-DrIFT";
+  "pugs-HsSyck" = dontDistribute super."pugs-HsSyck";
+  "pugs-compat" = dontDistribute super."pugs-compat";
+  "pugs-hsregex" = dontDistribute super."pugs-hsregex";
+  "pulse-simple" = dontDistribute super."pulse-simple";
+  "punkt" = dontDistribute super."punkt";
+  "punycode" = dontDistribute super."punycode";
+  "puppetresources" = dontDistribute super."puppetresources";
+  "pure-cdb" = dontDistribute super."pure-cdb";
+  "pure-fft" = dontDistribute super."pure-fft";
+  "pure-priority-queue" = dontDistribute super."pure-priority-queue";
+  "pure-priority-queue-tests" = dontDistribute super."pure-priority-queue-tests";
+  "pure-zlib" = dontDistribute super."pure-zlib";
+  "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "push-notify" = dontDistribute super."push-notify";
+  "push-notify-ccs" = dontDistribute super."push-notify-ccs";
+  "push-notify-general" = dontDistribute super."push-notify-general";
+  "pusher-haskell" = dontDistribute super."pusher-haskell";
+  "pusher-http-haskell" = dontDistribute super."pusher-http-haskell";
+  "pushme" = dontDistribute super."pushme";
+  "putlenses" = dontDistribute super."putlenses";
+  "puzzle-draw" = dontDistribute super."puzzle-draw";
+  "puzzle-draw-cmdline" = dontDistribute super."puzzle-draw-cmdline";
+  "pvd" = dontDistribute super."pvd";
+  "pwstore-cli" = dontDistribute super."pwstore-cli";
+  "pxsl-tools" = dontDistribute super."pxsl-tools";
+  "pyffi" = dontDistribute super."pyffi";
+  "pyfi" = dontDistribute super."pyfi";
+  "python-pickle" = dontDistribute super."python-pickle";
+  "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator";
+  "qd" = dontDistribute super."qd";
+  "qd-vec" = dontDistribute super."qd-vec";
+  "qed" = dontDistribute super."qed";
+  "qhull-simple" = dontDistribute super."qhull-simple";
+  "qrcode" = dontDistribute super."qrcode";
+  "qt" = dontDistribute super."qt";
+  "quadratic-irrational" = dontDistribute super."quadratic-irrational";
+  "quantfin" = dontDistribute super."quantfin";
+  "quantities" = dontDistribute super."quantities";
+  "quantum-arrow" = dontDistribute super."quantum-arrow";
+  "qudb" = dontDistribute super."qudb";
+  "quenya-verb" = dontDistribute super."quenya-verb";
+  "querystring-pickle" = dontDistribute super."querystring-pickle";
+  "queue" = dontDistribute super."queue";
+  "queuelike" = dontDistribute super."queuelike";
+  "quick-generator" = dontDistribute super."quick-generator";
+  "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-poly" = dontDistribute super."quickcheck-poly";
+  "quickcheck-properties" = dontDistribute super."quickcheck-properties";
+  "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
+  "quickcheck-property-monad" = dontDistribute super."quickcheck-property-monad";
+  "quickcheck-regex" = dontDistribute super."quickcheck-regex";
+  "quickcheck-relaxng" = dontDistribute super."quickcheck-relaxng";
+  "quickcheck-rematch" = dontDistribute super."quickcheck-rematch";
+  "quickcheck-script" = dontDistribute super."quickcheck-script";
+  "quickcheck-simple" = dontDistribute super."quickcheck-simple";
+  "quickcheck-webdriver" = dontDistribute super."quickcheck-webdriver";
+  "quicklz" = dontDistribute super."quicklz";
+  "quickpull" = dontDistribute super."quickpull";
+  "quickset" = dontDistribute super."quickset";
+  "quickspec" = dontDistribute super."quickspec";
+  "quicktest" = dontDistribute super."quicktest";
+  "quickwebapp" = dontDistribute super."quickwebapp";
+  "quiver" = dontDistribute super."quiver";
+  "quiver-bytestring" = dontDistribute super."quiver-bytestring";
+  "quiver-cell" = dontDistribute super."quiver-cell";
+  "quiver-csv" = dontDistribute super."quiver-csv";
+  "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-http" = dontDistribute super."quiver-http";
+  "quoridor-hs" = dontDistribute super."quoridor-hs";
+  "qux" = dontDistribute super."qux";
+  "rabocsv2qif" = dontDistribute super."rabocsv2qif";
+  "rad" = dontDistribute super."rad";
+  "radian" = dontDistribute super."radian";
+  "radium" = dontDistribute super."radium";
+  "radium-formula-parser" = dontDistribute super."radium-formula-parser";
+  "radix" = dontDistribute super."radix";
+  "rados-haskell" = dontDistribute super."rados-haskell";
+  "rail-compiler-editor" = dontDistribute super."rail-compiler-editor";
+  "rainbow-tests" = dontDistribute super."rainbow-tests";
+  "rake" = dontDistribute super."rake";
+  "rakhana" = dontDistribute super."rakhana";
+  "ralist" = dontDistribute super."ralist";
+  "rallod" = dontDistribute super."rallod";
+  "raml" = dontDistribute super."raml";
+  "rand-vars" = dontDistribute super."rand-vars";
+  "randfile" = dontDistribute super."randfile";
+  "random-access-list" = dontDistribute super."random-access-list";
+  "random-derive" = dontDistribute super."random-derive";
+  "random-eff" = dontDistribute super."random-eff";
+  "random-effin" = dontDistribute super."random-effin";
+  "random-extras" = dontDistribute super."random-extras";
+  "random-hypergeometric" = dontDistribute super."random-hypergeometric";
+  "random-stream" = dontDistribute super."random-stream";
+  "random-variates" = dontDistribute super."random-variates";
+  "randomgen" = dontDistribute super."randomgen";
+  "randproc" = dontDistribute super."randproc";
+  "randsolid" = dontDistribute super."randsolid";
+  "range-set-list" = dontDistribute super."range-set-list";
+  "range-space" = dontDistribute super."range-space";
+  "rangemin" = dontDistribute super."rangemin";
+  "ranges" = dontDistribute super."ranges";
+  "rascal" = dontDistribute super."rascal";
+  "rate-limit" = dontDistribute super."rate-limit";
+  "ratio-int" = dontDistribute super."ratio-int";
+  "raven-haskell" = dontDistribute super."raven-haskell";
+  "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
+  "rawstring-qm" = dontDistribute super."rawstring-qm";
+  "razom-text-util" = dontDistribute super."razom-text-util";
+  "rbr" = dontDistribute super."rbr";
+  "rclient" = dontDistribute super."rclient";
+  "rcu" = dontDistribute super."rcu";
+  "rdf4h" = dontDistribute super."rdf4h";
+  "rdioh" = dontDistribute super."rdioh";
+  "rdtsc" = dontDistribute super."rdtsc";
+  "rdtsc-enolan" = dontDistribute super."rdtsc-enolan";
+  "re2" = dontDistribute super."re2";
+  "react-flux" = dontDistribute super."react-flux";
+  "react-haskell" = dontDistribute super."react-haskell";
+  "reaction-logic" = dontDistribute super."reaction-logic";
+  "reactive" = dontDistribute super."reactive";
+  "reactive-bacon" = dontDistribute super."reactive-bacon";
+  "reactive-balsa" = dontDistribute super."reactive-balsa";
+  "reactive-banana" = dontDistribute super."reactive-banana";
+  "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
+  "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
+  "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
+  "reactive-glut" = dontDistribute super."reactive-glut";
+  "reactive-haskell" = dontDistribute super."reactive-haskell";
+  "reactive-io" = dontDistribute super."reactive-io";
+  "reactive-thread" = dontDistribute super."reactive-thread";
+  "reactor" = dontDistribute super."reactor";
+  "read-bounded" = dontDistribute super."read-bounded";
+  "readable" = dontDistribute super."readable";
+  "readline-statevar" = dontDistribute super."readline-statevar";
+  "readpyc" = dontDistribute super."readpyc";
+  "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
+  "reasonable-lens" = dontDistribute super."reasonable-lens";
+  "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "recaptcha" = dontDistribute super."recaptcha";
+  "record" = dontDistribute super."record";
+  "record-aeson" = dontDistribute super."record-aeson";
+  "record-gl" = dontDistribute super."record-gl";
+  "record-preprocessor" = dontDistribute super."record-preprocessor";
+  "record-syntax" = dontDistribute super."record-syntax";
+  "records" = dontDistribute super."records";
+  "records-th" = dontDistribute super."records-th";
+  "recursion-schemes" = dontDistribute super."recursion-schemes";
+  "recursive-line-count" = dontDistribute super."recursive-line-count";
+  "redHandlers" = dontDistribute super."redHandlers";
+  "reddit" = dontDistribute super."reddit";
+  "redis" = dontDistribute super."redis";
+  "redis-hs" = dontDistribute super."redis-hs";
+  "redis-job-queue" = dontDistribute super."redis-job-queue";
+  "redis-simple" = dontDistribute super."redis-simple";
+  "redo" = dontDistribute super."redo";
+  "reedsolomon" = dontDistribute super."reedsolomon";
+  "reenact" = dontDistribute super."reenact";
+  "reexport-crypto-random" = dontDistribute super."reexport-crypto-random";
+  "ref" = dontDistribute super."ref";
+  "ref-mtl" = dontDistribute super."ref-mtl";
+  "ref-tf" = dontDistribute super."ref-tf";
+  "refcount" = dontDistribute super."refcount";
+  "reference" = dontDistribute super."reference";
+  "references" = dontDistribute super."references";
+  "refh" = dontDistribute super."refh";
+  "refined" = dontDistribute super."refined";
+  "reflection-extras" = dontDistribute super."reflection-extras";
+  "reflection-without-remorse" = dontDistribute super."reflection-without-remorse";
+  "reflex" = dontDistribute super."reflex";
+  "reflex-animation" = dontDistribute super."reflex-animation";
+  "reflex-dom" = dontDistribute super."reflex-dom";
+  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
+  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
+  "regex-compat-tdfa" = dontDistribute super."regex-compat-tdfa";
+  "regex-deriv" = dontDistribute super."regex-deriv";
+  "regex-dfa" = dontDistribute super."regex-dfa";
+  "regex-easy" = dontDistribute super."regex-easy";
+  "regex-genex" = dontDistribute super."regex-genex";
+  "regex-parsec" = dontDistribute super."regex-parsec";
+  "regex-pderiv" = dontDistribute super."regex-pderiv";
+  "regex-posix-unittest" = dontDistribute super."regex-posix-unittest";
+  "regex-tdfa-pipes" = dontDistribute super."regex-tdfa-pipes";
+  "regex-tdfa-quasiquoter" = dontDistribute super."regex-tdfa-quasiquoter";
+  "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
+  "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
+  "regex-tre" = dontDistribute super."regex-tre";
+  "regex-xmlschema" = dontDistribute super."regex-xmlschema";
+  "regexchar" = dontDistribute super."regexchar";
+  "regexdot" = dontDistribute super."regexdot";
+  "regexp-tries" = dontDistribute super."regexp-tries";
+  "regexpr" = dontDistribute super."regexpr";
+  "regexpr-symbolic" = dontDistribute super."regexpr-symbolic";
+  "regexqq" = dontDistribute super."regexqq";
+  "regional-pointers" = dontDistribute super."regional-pointers";
+  "regions" = dontDistribute super."regions";
+  "regions-monadsfd" = dontDistribute super."regions-monadsfd";
+  "regions-monadstf" = dontDistribute super."regions-monadstf";
+  "regions-mtl" = dontDistribute super."regions-mtl";
+  "regress" = dontDistribute super."regress";
+  "regular" = dontDistribute super."regular";
+  "regular-extras" = dontDistribute super."regular-extras";
+  "regular-web" = dontDistribute super."regular-web";
+  "regular-xmlpickler" = dontDistribute super."regular-xmlpickler";
+  "reheat" = dontDistribute super."reheat";
+  "rehoo" = dontDistribute super."rehoo";
+  "rei" = dontDistribute super."rei";
+  "reified-records" = dontDistribute super."reified-records";
+  "reify" = dontDistribute super."reify";
+  "relacion" = dontDistribute super."relacion";
+  "relation" = dontDistribute super."relation";
+  "relational-postgresql8" = dontDistribute super."relational-postgresql8";
+  "relational-query" = dontDistribute super."relational-query";
+  "relational-query-HDBC" = dontDistribute super."relational-query-HDBC";
+  "relational-record" = dontDistribute super."relational-record";
+  "relational-record-examples" = dontDistribute super."relational-record-examples";
+  "relational-schemas" = dontDistribute super."relational-schemas";
+  "relative-date" = dontDistribute super."relative-date";
+  "relit" = dontDistribute super."relit";
+  "rematch" = dontDistribute super."rematch";
+  "rematch-text" = dontDistribute super."rematch-text";
+  "remote" = dontDistribute super."remote";
+  "remote-debugger" = dontDistribute super."remote-debugger";
+  "remotion" = dontDistribute super."remotion";
+  "renderable" = dontDistribute super."renderable";
+  "reord" = dontDistribute super."reord";
+  "reorderable" = dontDistribute super."reorderable";
+  "repa-array" = dontDistribute super."repa-array";
+  "repa-bytestring" = dontDistribute super."repa-bytestring";
+  "repa-convert" = dontDistribute super."repa-convert";
+  "repa-eval" = dontDistribute super."repa-eval";
+  "repa-examples" = dontDistribute super."repa-examples";
+  "repa-fftw" = dontDistribute super."repa-fftw";
+  "repa-flow" = dontDistribute super."repa-flow";
+  "repa-linear-algebra" = dontDistribute super."repa-linear-algebra";
+  "repa-plugin" = dontDistribute super."repa-plugin";
+  "repa-scalar" = dontDistribute super."repa-scalar";
+  "repa-series" = dontDistribute super."repa-series";
+  "repa-sndfile" = dontDistribute super."repa-sndfile";
+  "repa-stream" = dontDistribute super."repa-stream";
+  "repa-v4l2" = dontDistribute super."repa-v4l2";
+  "repl" = dontDistribute super."repl";
+  "repl-toolkit" = dontDistribute super."repl-toolkit";
+  "repline" = dontDistribute super."repline";
+  "repo-based-blog" = dontDistribute super."repo-based-blog";
+  "repr" = dontDistribute super."repr";
+  "repr-tree-syb" = dontDistribute super."repr-tree-syb";
+  "representable-functors" = dontDistribute super."representable-functors";
+  "representable-profunctors" = dontDistribute super."representable-profunctors";
+  "representable-tries" = dontDistribute super."representable-tries";
+  "request-monad" = dontDistribute super."request-monad";
+  "reserve" = dontDistribute super."reserve";
+  "resistor-cube" = dontDistribute super."resistor-cube";
+  "resource-effect" = dontDistribute super."resource-effect";
+  "resource-embed" = dontDistribute super."resource-embed";
+  "resource-pool-catchio" = dontDistribute super."resource-pool-catchio";
+  "resource-pool-monad" = dontDistribute super."resource-pool-monad";
+  "resource-simple" = dontDistribute super."resource-simple";
+  "respond" = dontDistribute super."respond";
+  "rest-example" = dontDistribute super."rest-example";
+  "restful-snap" = dontDistribute super."restful-snap";
+  "restricted-workers" = dontDistribute super."restricted-workers";
+  "restyle" = dontDistribute super."restyle";
+  "resumable-exceptions" = dontDistribute super."resumable-exceptions";
+  "rethinkdb-model" = dontDistribute super."rethinkdb-model";
+  "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
+  "retryer" = dontDistribute super."retryer";
+  "revdectime" = dontDistribute super."revdectime";
+  "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-geocoding" = dontDistribute super."reverse-geocoding";
+  "reversi" = dontDistribute super."reversi";
+  "rewrite" = dontDistribute super."rewrite";
+  "rewriting" = dontDistribute super."rewriting";
+  "rex" = dontDistribute super."rex";
+  "rezoom" = dontDistribute super."rezoom";
+  "rfc3339" = dontDistribute super."rfc3339";
+  "rhythm-game-tutorial" = dontDistribute super."rhythm-game-tutorial";
+  "richreports" = dontDistribute super."richreports";
+  "riemann" = dontDistribute super."riemann";
+  "riff" = dontDistribute super."riff";
+  "ring-buffer" = dontDistribute super."ring-buffer";
+  "riot" = dontDistribute super."riot";
+  "ripple" = dontDistribute super."ripple";
+  "ripple-federation" = dontDistribute super."ripple-federation";
+  "risc386" = dontDistribute super."risc386";
+  "rivers" = dontDistribute super."rivers";
+  "rivet" = dontDistribute super."rivet";
+  "rivet-core" = dontDistribute super."rivet-core";
+  "rivet-migration" = dontDistribute super."rivet-migration";
+  "rivet-simple-deploy" = dontDistribute super."rivet-simple-deploy";
+  "rlglue" = dontDistribute super."rlglue";
+  "rmonad" = dontDistribute super."rmonad";
+  "rncryptor" = dontDistribute super."rncryptor";
+  "rng-utils" = dontDistribute super."rng-utils";
+  "robin" = dontDistribute super."robin";
+  "robot" = dontDistribute super."robot";
+  "robots-txt" = dontDistribute super."robots-txt";
+  "rocksdb-haskell" = dontDistribute super."rocksdb-haskell";
+  "roguestar" = dontDistribute super."roguestar";
+  "roguestar-engine" = dontDistribute super."roguestar-engine";
+  "roguestar-gl" = dontDistribute super."roguestar-gl";
+  "roguestar-glut" = dontDistribute super."roguestar-glut";
+  "rollbar" = dontDistribute super."rollbar";
+  "roller" = dontDistribute super."roller";
+  "rolling-queue" = dontDistribute super."rolling-queue";
+  "roman-numerals" = dontDistribute super."roman-numerals";
+  "romkan" = dontDistribute super."romkan";
+  "roots" = dontDistribute super."roots";
+  "rope" = dontDistribute super."rope";
+  "rosa" = dontDistribute super."rosa";
+  "rose-trie" = dontDistribute super."rose-trie";
+  "roshask" = dontDistribute super."roshask";
+  "rosso" = dontDistribute super."rosso";
+  "rot13" = dontDistribute super."rot13";
+  "rotating-log" = dontDistribute super."rotating-log";
+  "rounding" = dontDistribute super."rounding";
+  "roundtrip" = dontDistribute super."roundtrip";
+  "roundtrip-aeson" = dontDistribute super."roundtrip-aeson";
+  "roundtrip-string" = dontDistribute super."roundtrip-string";
+  "roundtrip-xml" = dontDistribute super."roundtrip-xml";
+  "route-generator" = dontDistribute super."route-generator";
+  "route-planning" = dontDistribute super."route-planning";
+  "rowrecord" = dontDistribute super."rowrecord";
+  "rpc" = dontDistribute super."rpc";
+  "rpc-framework" = dontDistribute super."rpc-framework";
+  "rpf" = dontDistribute super."rpf";
+  "rpm" = dontDistribute super."rpm";
+  "rsagl" = dontDistribute super."rsagl";
+  "rsagl-frp" = dontDistribute super."rsagl-frp";
+  "rsagl-math" = dontDistribute super."rsagl-math";
+  "rspp" = dontDistribute super."rspp";
+  "rss" = dontDistribute super."rss";
+  "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
+  "rtld" = dontDistribute super."rtld";
+  "rtlsdr" = dontDistribute super."rtlsdr";
+  "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";
+  "rtorrent-state" = dontDistribute super."rtorrent-state";
+  "rubberband" = dontDistribute super."rubberband";
+  "ruby-marshal" = dontDistribute super."ruby-marshal";
+  "ruby-qq" = dontDistribute super."ruby-qq";
+  "ruff" = dontDistribute super."ruff";
+  "ruler" = dontDistribute super."ruler";
+  "ruler-core" = dontDistribute super."ruler-core";
+  "rungekutta" = dontDistribute super."rungekutta";
+  "runghc" = dontDistribute super."runghc";
+  "rwlock" = dontDistribute super."rwlock";
+  "rws" = dontDistribute super."rws";
+  "s-cargot" = dontDistribute super."s-cargot";
+  "s3-signer" = dontDistribute super."s3-signer";
+  "safe-access" = dontDistribute super."safe-access";
+  "safe-failure" = dontDistribute super."safe-failure";
+  "safe-failure-cme" = dontDistribute super."safe-failure-cme";
+  "safe-freeze" = dontDistribute super."safe-freeze";
+  "safe-globals" = dontDistribute super."safe-globals";
+  "safe-lazy-io" = dontDistribute super."safe-lazy-io";
+  "safe-length" = dontDistribute super."safe-length";
+  "safe-plugins" = dontDistribute super."safe-plugins";
+  "safe-printf" = dontDistribute super."safe-printf";
+  "safeint" = dontDistribute super."safeint";
+  "safer-file-handles" = dontDistribute super."safer-file-handles";
+  "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring";
+  "safer-file-handles-text" = dontDistribute super."safer-file-handles-text";
+  "saferoute" = dontDistribute super."saferoute";
+  "sai-shape-syb" = dontDistribute super."sai-shape-syb";
+  "saltine" = dontDistribute super."saltine";
+  "saltine-quickcheck" = dontDistribute super."saltine-quickcheck";
+  "salvia" = dontDistribute super."salvia";
+  "salvia-demo" = dontDistribute super."salvia-demo";
+  "salvia-extras" = dontDistribute super."salvia-extras";
+  "salvia-protocol" = dontDistribute super."salvia-protocol";
+  "salvia-sessions" = dontDistribute super."salvia-sessions";
+  "salvia-websocket" = dontDistribute super."salvia-websocket";
+  "sample-frame" = dontDistribute super."sample-frame";
+  "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "samtools" = dontDistribute super."samtools";
+  "samtools-conduit" = dontDistribute super."samtools-conduit";
+  "samtools-enumerator" = dontDistribute super."samtools-enumerator";
+  "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandlib" = dontDistribute super."sandlib";
+  "sarasvati" = dontDistribute super."sarasvati";
+  "sasl" = dontDistribute super."sasl";
+  "sat" = dontDistribute super."sat";
+  "sat-micro-hs" = dontDistribute super."sat-micro-hs";
+  "satchmo" = dontDistribute super."satchmo";
+  "satchmo-backends" = dontDistribute super."satchmo-backends";
+  "satchmo-examples" = dontDistribute super."satchmo-examples";
+  "satchmo-funsat" = dontDistribute super."satchmo-funsat";
+  "satchmo-minisat" = dontDistribute super."satchmo-minisat";
+  "satchmo-toysat" = dontDistribute super."satchmo-toysat";
+  "sbp" = dontDistribute super."sbp";
+  "sbvPlugin" = dontDistribute super."sbvPlugin";
+  "sc3-rdu" = dontDistribute super."sc3-rdu";
+  "scalable-server" = dontDistribute super."scalable-server";
+  "scaleimage" = dontDistribute super."scaleimage";
+  "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scan" = dontDistribute super."scan";
+  "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scat" = dontDistribute super."scat";
+  "scc" = dontDistribute super."scc";
+  "scenegraph" = dontDistribute super."scenegraph";
+  "scgi" = dontDistribute super."scgi";
+  "schedevr" = dontDistribute super."schedevr";
+  "schedule-planner" = dontDistribute super."schedule-planner";
+  "schedyield" = dontDistribute super."schedyield";
+  "scholdoc" = dontDistribute super."scholdoc";
+  "scholdoc-citeproc" = dontDistribute super."scholdoc-citeproc";
+  "scholdoc-texmath" = dontDistribute super."scholdoc-texmath";
+  "scholdoc-types" = dontDistribute super."scholdoc-types";
+  "schonfinkeling" = dontDistribute super."schonfinkeling";
+  "sci-ratio" = dontDistribute super."sci-ratio";
+  "science-constants" = dontDistribute super."science-constants";
+  "science-constants-dimensional" = dontDistribute super."science-constants-dimensional";
+  "scion" = dontDistribute super."scion";
+  "scion-browser" = dontDistribute super."scion-browser";
+  "scons2dot" = dontDistribute super."scons2dot";
+  "scope" = dontDistribute super."scope";
+  "scope-cairo" = dontDistribute super."scope-cairo";
+  "scottish" = dontDistribute super."scottish";
+  "scotty-binding-play" = dontDistribute super."scotty-binding-play";
+  "scotty-blaze" = dontDistribute super."scotty-blaze";
+  "scotty-cookie" = dontDistribute super."scotty-cookie";
+  "scotty-fay" = dontDistribute super."scotty-fay";
+  "scotty-hastache" = dontDistribute super."scotty-hastache";
+  "scotty-rest" = dontDistribute super."scotty-rest";
+  "scotty-session" = dontDistribute super."scotty-session";
+  "scotty-tls" = dontDistribute super."scotty-tls";
+  "scp-streams" = dontDistribute super."scp-streams";
+  "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrobble" = dontDistribute super."scrobble";
+  "scroll" = dontDistribute super."scroll";
+  "scrypt" = dontDistribute super."scrypt";
+  "scrz" = dontDistribute super."scrz";
+  "scyther-proof" = dontDistribute super."scyther-proof";
+  "sde-solver" = dontDistribute super."sde-solver";
+  "sdf2p1-parser" = dontDistribute super."sdf2p1-parser";
+  "sdl2-cairo" = dontDistribute super."sdl2-cairo";
+  "sdl2-cairo-image" = dontDistribute super."sdl2-cairo-image";
+  "sdl2-compositor" = dontDistribute super."sdl2-compositor";
+  "sdl2-image" = dontDistribute super."sdl2-image";
+  "sdl2-ttf" = dontDistribute super."sdl2-ttf";
+  "sdnv" = dontDistribute super."sdnv";
+  "sdr" = dontDistribute super."sdr";
+  "seacat" = dontDistribute super."seacat";
+  "seal-module" = dontDistribute super."seal-module";
+  "search" = dontDistribute super."search";
+  "sec" = dontDistribute super."sec";
+  "secdh" = dontDistribute super."secdh";
+  "seclib" = dontDistribute super."seclib";
+  "secp256k1" = dontDistribute super."secp256k1";
+  "secret-santa" = dontDistribute super."secret-santa";
+  "secret-sharing" = dontDistribute super."secret-sharing";
+  "secrm" = dontDistribute super."secrm";
+  "secure-sockets" = dontDistribute super."secure-sockets";
+  "sednaDBXML" = dontDistribute super."sednaDBXML";
+  "select" = dontDistribute super."select";
+  "selectors" = dontDistribute super."selectors";
+  "selenium" = dontDistribute super."selenium";
+  "selenium-server" = dontDistribute super."selenium-server";
+  "selfrestart" = dontDistribute super."selfrestart";
+  "selinux" = dontDistribute super."selinux";
+  "semaphore-plus" = dontDistribute super."semaphore-plus";
+  "semi-iso" = dontDistribute super."semi-iso";
+  "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax";
+  "semigroups-actions" = dontDistribute super."semigroups-actions";
+  "semiring" = dontDistribute super."semiring";
+  "semiring-simple" = dontDistribute super."semiring-simple";
+  "semver-range" = dontDistribute super."semver-range";
+  "sendgrid-haskell" = dontDistribute super."sendgrid-haskell";
+  "sensenet" = dontDistribute super."sensenet";
+  "sentry" = dontDistribute super."sentry";
+  "senza" = dontDistribute super."senza";
+  "separated" = dontDistribute super."separated";
+  "seqaid" = dontDistribute super."seqaid";
+  "seqid" = dontDistribute super."seqid";
+  "seqid-streams" = dontDistribute super."seqid-streams";
+  "seqloc-datafiles" = dontDistribute super."seqloc-datafiles";
+  "sequence" = dontDistribute super."sequence";
+  "sequent-core" = dontDistribute super."sequent-core";
+  "sequential-index" = dontDistribute super."sequential-index";
+  "sequor" = dontDistribute super."sequor";
+  "serial" = dontDistribute super."serial";
+  "serial-test-generators" = dontDistribute super."serial-test-generators";
+  "serialport" = dontDistribute super."serialport";
+  "serv" = dontDistribute super."serv";
+  "servant-cassava" = dontDistribute super."servant-cassava";
+  "servant-ede" = dontDistribute super."servant-ede";
+  "servant-examples" = dontDistribute super."servant-examples";
+  "servant-github" = dontDistribute super."servant-github";
+  "servant-lucid" = dontDistribute super."servant-lucid";
+  "servant-mock" = dontDistribute super."servant-mock";
+  "servant-pool" = dontDistribute super."servant-pool";
+  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-response" = dontDistribute super."servant-response";
+  "servant-scotty" = dontDistribute super."servant-scotty";
+  "servant-swagger" = dontDistribute super."servant-swagger";
+  "ses-html" = dontDistribute super."ses-html";
+  "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
+  "sessions" = dontDistribute super."sessions";
+  "set-cover" = dontDistribute super."set-cover";
+  "set-with" = dontDistribute super."set-with";
+  "setdown" = dontDistribute super."setdown";
+  "setgame" = dontDistribute super."setgame";
+  "setops" = dontDistribute super."setops";
+  "setters" = dontDistribute super."setters";
+  "settings" = dontDistribute super."settings";
+  "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
+  "sexp-show" = dontDistribute super."sexp-show";
+  "sexpr" = dontDistribute super."sexpr";
+  "sext" = dontDistribute super."sext";
+  "sfml-audio" = dontDistribute super."sfml-audio";
+  "sfmt" = dontDistribute super."sfmt";
+  "sgd" = dontDistribute super."sgd";
+  "sgf" = dontDistribute super."sgf";
+  "sgrep" = dontDistribute super."sgrep";
+  "sha-streams" = dontDistribute super."sha-streams";
+  "shadower" = dontDistribute super."shadower";
+  "shadowsocks" = dontDistribute super."shadowsocks";
+  "shady-gen" = dontDistribute super."shady-gen";
+  "shady-graphics" = dontDistribute super."shady-graphics";
+  "shake-cabal-build" = dontDistribute super."shake-cabal-build";
+  "shake-extras" = dontDistribute super."shake-extras";
+  "shake-minify" = dontDistribute super."shake-minify";
+  "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
+  "shaker" = dontDistribute super."shaker";
+  "shakespeare-css" = dontDistribute super."shakespeare-css";
+  "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
+  "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-text" = dontDistribute super."shakespeare-text";
+  "shana" = dontDistribute super."shana";
+  "shapefile" = dontDistribute super."shapefile";
+  "shapely-data" = dontDistribute super."shapely-data";
+  "sharc-timbre" = dontDistribute super."sharc-timbre";
+  "shared-buffer" = dontDistribute super."shared-buffer";
+  "shared-fields" = dontDistribute super."shared-fields";
+  "shared-memory" = dontDistribute super."shared-memory";
+  "sharedio" = dontDistribute super."sharedio";
+  "she" = dontDistribute super."she";
+  "shelduck" = dontDistribute super."shelduck";
+  "shell-escape" = dontDistribute super."shell-escape";
+  "shell-monad" = dontDistribute super."shell-monad";
+  "shell-pipe" = dontDistribute super."shell-pipe";
+  "shellish" = dontDistribute super."shellish";
+  "shellmate" = dontDistribute super."shellmate";
+  "shelltestrunner" = dontDistribute super."shelltestrunner";
+  "shelly-extra" = dontDistribute super."shelly-extra";
+  "shivers-cfg" = dontDistribute super."shivers-cfg";
+  "shoap" = dontDistribute super."shoap";
+  "shortcircuit" = dontDistribute super."shortcircuit";
+  "shorten-strings" = dontDistribute super."shorten-strings";
+  "show" = dontDistribute super."show";
+  "show-type" = dontDistribute super."show-type";
+  "showdown" = dontDistribute super."showdown";
+  "shpider" = dontDistribute super."shpider";
+  "shplit" = dontDistribute super."shplit";
+  "shqq" = dontDistribute super."shqq";
+  "shuffle" = dontDistribute super."shuffle";
+  "sieve" = dontDistribute super."sieve";
+  "sifflet" = dontDistribute super."sifflet";
+  "sifflet-lib" = dontDistribute super."sifflet-lib";
+  "sign" = dontDistribute super."sign";
+  "signals" = dontDistribute super."signals";
+  "signed-multiset" = dontDistribute super."signed-multiset";
+  "simd" = dontDistribute super."simd";
+  "simgi" = dontDistribute super."simgi";
+  "simple" = dontDistribute super."simple";
+  "simple-actors" = dontDistribute super."simple-actors";
+  "simple-atom" = dontDistribute super."simple-atom";
+  "simple-bluetooth" = dontDistribute super."simple-bluetooth";
+  "simple-c-value" = dontDistribute super."simple-c-value";
+  "simple-conduit" = dontDistribute super."simple-conduit";
+  "simple-config" = dontDistribute super."simple-config";
+  "simple-css" = dontDistribute super."simple-css";
+  "simple-eval" = dontDistribute super."simple-eval";
+  "simple-firewire" = dontDistribute super."simple-firewire";
+  "simple-form" = dontDistribute super."simple-form";
+  "simple-genetic-algorithm" = dontDistribute super."simple-genetic-algorithm";
+  "simple-genetic-algorithm-mr" = dontDistribute super."simple-genetic-algorithm-mr";
+  "simple-get-opt" = dontDistribute super."simple-get-opt";
+  "simple-index" = dontDistribute super."simple-index";
+  "simple-log" = dontDistribute super."simple-log";
+  "simple-log-syslog" = dontDistribute super."simple-log-syslog";
+  "simple-neural-networks" = dontDistribute super."simple-neural-networks";
+  "simple-nix" = dontDistribute super."simple-nix";
+  "simple-observer" = dontDistribute super."simple-observer";
+  "simple-pascal" = dontDistribute super."simple-pascal";
+  "simple-pipe" = dontDistribute super."simple-pipe";
+  "simple-postgresql-orm" = dontDistribute super."simple-postgresql-orm";
+  "simple-rope" = dontDistribute super."simple-rope";
+  "simple-server" = dontDistribute super."simple-server";
+  "simple-session" = dontDistribute super."simple-session";
+  "simple-sessions" = dontDistribute super."simple-sessions";
+  "simple-smt" = dontDistribute super."simple-smt";
+  "simple-sql-parser" = dontDistribute super."simple-sql-parser";
+  "simple-stacked-vm" = dontDistribute super."simple-stacked-vm";
+  "simple-tabular" = dontDistribute super."simple-tabular";
+  "simple-templates" = dontDistribute super."simple-templates";
+  "simple-vec3" = dontDistribute super."simple-vec3";
+  "simpleargs" = dontDistribute super."simpleargs";
+  "simpleirc" = dontDistribute super."simpleirc";
+  "simpleirc-lens" = dontDistribute super."simpleirc-lens";
+  "simplenote" = dontDistribute super."simplenote";
+  "simpleprelude" = dontDistribute super."simpleprelude";
+  "simplesmtpclient" = dontDistribute super."simplesmtpclient";
+  "simplessh" = dontDistribute super."simplessh";
+  "simplest-sqlite" = dontDistribute super."simplest-sqlite";
+  "simplex" = dontDistribute super."simplex";
+  "simplex-basic" = dontDistribute super."simplex-basic";
+  "simseq" = dontDistribute super."simseq";
+  "simtreelo" = dontDistribute super."simtreelo";
+  "sindre" = dontDistribute super."sindre";
+  "singleton-nats" = dontDistribute super."singleton-nats";
+  "sink" = dontDistribute super."sink";
+  "sirkel" = dontDistribute super."sirkel";
+  "sitemap" = dontDistribute super."sitemap";
+  "sized" = dontDistribute super."sized";
+  "sized-types" = dontDistribute super."sized-types";
+  "sized-vector" = dontDistribute super."sized-vector";
+  "sizes" = dontDistribute super."sizes";
+  "sjsp" = dontDistribute super."sjsp";
+  "skeleton" = dontDistribute super."skeleton";
+  "skell" = dontDistribute super."skell";
+  "skemmtun" = dontDistribute super."skemmtun";
+  "skype4hs" = dontDistribute super."skype4hs";
+  "skypelogexport" = dontDistribute super."skypelogexport";
+  "slack" = dontDistribute super."slack";
+  "slack-api" = dontDistribute super."slack-api";
+  "slack-notify-haskell" = dontDistribute super."slack-notify-haskell";
+  "slice-cpp-gen" = dontDistribute super."slice-cpp-gen";
+  "slidemews" = dontDistribute super."slidemews";
+  "sloane" = dontDistribute super."sloane";
+  "slot-lambda" = dontDistribute super."slot-lambda";
+  "sloth" = dontDistribute super."sloth";
+  "smallarray" = dontDistribute super."smallarray";
+  "smallcheck-laws" = dontDistribute super."smallcheck-laws";
+  "smallcheck-lens" = dontDistribute super."smallcheck-lens";
+  "smallcheck-series" = dontDistribute super."smallcheck-series";
+  "smallpt-hs" = dontDistribute super."smallpt-hs";
+  "smallstring" = dontDistribute super."smallstring";
+  "smaoin" = dontDistribute super."smaoin";
+  "smartGroup" = dontDistribute super."smartGroup";
+  "smartcheck" = dontDistribute super."smartcheck";
+  "smartconstructor" = dontDistribute super."smartconstructor";
+  "smartword" = dontDistribute super."smartword";
+  "sme" = dontDistribute super."sme";
+  "smt-lib" = dontDistribute super."smt-lib";
+  "smtlib2" = dontDistribute super."smtlib2";
+  "smtp-mail-ng" = dontDistribute super."smtp-mail-ng";
+  "smtp2mta" = dontDistribute super."smtp2mta";
+  "smtps-gmail" = dontDistribute super."smtps-gmail";
+  "snake-game" = dontDistribute super."snake-game";
+  "snap-accept" = dontDistribute super."snap-accept";
+  "snap-app" = dontDistribute super."snap-app";
+  "snap-auth-cli" = dontDistribute super."snap-auth-cli";
+  "snap-blaze" = dontDistribute super."snap-blaze";
+  "snap-blaze-clay" = dontDistribute super."snap-blaze-clay";
+  "snap-configuration-utilities" = dontDistribute super."snap-configuration-utilities";
+  "snap-cors" = dontDistribute super."snap-cors";
+  "snap-elm" = dontDistribute super."snap-elm";
+  "snap-error-collector" = dontDistribute super."snap-error-collector";
+  "snap-extras" = dontDistribute super."snap-extras";
+  "snap-language" = dontDistribute super."snap-language";
+  "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic";
+  "snap-loader-static" = dontDistribute super."snap-loader-static";
+  "snap-predicates" = dontDistribute super."snap-predicates";
+  "snap-testing" = dontDistribute super."snap-testing";
+  "snap-utils" = dontDistribute super."snap-utils";
+  "snap-web-routes" = dontDistribute super."snap-web-routes";
+  "snaplet-acid-state" = dontDistribute super."snaplet-acid-state";
+  "snaplet-actionlog" = dontDistribute super."snaplet-actionlog";
+  "snaplet-amqp" = dontDistribute super."snaplet-amqp";
+  "snaplet-auth-acid" = dontDistribute super."snaplet-auth-acid";
+  "snaplet-coffee" = dontDistribute super."snaplet-coffee";
+  "snaplet-css-min" = dontDistribute super."snaplet-css-min";
+  "snaplet-environments" = dontDistribute super."snaplet-environments";
+  "snaplet-ghcjs" = dontDistribute super."snaplet-ghcjs";
+  "snaplet-hasql" = dontDistribute super."snaplet-hasql";
+  "snaplet-haxl" = dontDistribute super."snaplet-haxl";
+  "snaplet-hdbc" = dontDistribute super."snaplet-hdbc";
+  "snaplet-hslogger" = dontDistribute super."snaplet-hslogger";
+  "snaplet-i18n" = dontDistribute super."snaplet-i18n";
+  "snaplet-influxdb" = dontDistribute super."snaplet-influxdb";
+  "snaplet-lss" = dontDistribute super."snaplet-lss";
+  "snaplet-mandrill" = dontDistribute super."snaplet-mandrill";
+  "snaplet-mongoDB" = dontDistribute super."snaplet-mongoDB";
+  "snaplet-mongodb-minimalistic" = dontDistribute super."snaplet-mongodb-minimalistic";
+  "snaplet-mysql-simple" = dontDistribute super."snaplet-mysql-simple";
+  "snaplet-oauth" = dontDistribute super."snaplet-oauth";
+  "snaplet-persistent" = dontDistribute super."snaplet-persistent";
+  "snaplet-postgresql-simple" = dontDistribute super."snaplet-postgresql-simple";
+  "snaplet-postmark" = dontDistribute super."snaplet-postmark";
+  "snaplet-purescript" = dontDistribute super."snaplet-purescript";
+  "snaplet-recaptcha" = dontDistribute super."snaplet-recaptcha";
+  "snaplet-redis" = dontDistribute super."snaplet-redis";
+  "snaplet-redson" = dontDistribute super."snaplet-redson";
+  "snaplet-rest" = dontDistribute super."snaplet-rest";
+  "snaplet-riak" = dontDistribute super."snaplet-riak";
+  "snaplet-sass" = dontDistribute super."snaplet-sass";
+  "snaplet-sedna" = dontDistribute super."snaplet-sedna";
+  "snaplet-ses-html" = dontDistribute super."snaplet-ses-html";
+  "snaplet-sqlite-simple" = dontDistribute super."snaplet-sqlite-simple";
+  "snaplet-stripe" = dontDistribute super."snaplet-stripe";
+  "snaplet-tasks" = dontDistribute super."snaplet-tasks";
+  "snaplet-typed-sessions" = dontDistribute super."snaplet-typed-sessions";
+  "snaplet-wordpress" = dontDistribute super."snaplet-wordpress";
+  "snappy" = dontDistribute super."snappy";
+  "snappy-conduit" = dontDistribute super."snappy-conduit";
+  "snappy-framing" = dontDistribute super."snappy-framing";
+  "snappy-iteratee" = dontDistribute super."snappy-iteratee";
+  "sndfile-enumerators" = dontDistribute super."sndfile-enumerators";
+  "sneakyterm" = dontDistribute super."sneakyterm";
+  "sneathlane-haste" = dontDistribute super."sneathlane-haste";
+  "snippet-extractor" = dontDistribute super."snippet-extractor";
+  "snm" = dontDistribute super."snm";
+  "snow-white" = dontDistribute super."snow-white";
+  "snowball" = dontDistribute super."snowball";
+  "snowglobe" = dontDistribute super."snowglobe";
+  "sock2stream" = dontDistribute super."sock2stream";
+  "sockaddr" = dontDistribute super."sockaddr";
+  "socket-activation" = dontDistribute super."socket-activation";
+  "socket-sctp" = dontDistribute super."socket-sctp";
+  "socketio" = dontDistribute super."socketio";
+  "soegtk" = dontDistribute super."soegtk";
+  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
+  "sophia" = dontDistribute super."sophia";
+  "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
+  "sorted" = dontDistribute super."sorted";
+  "sorting" = dontDistribute super."sorting";
+  "sorty" = dontDistribute super."sorty";
+  "sound-collage" = dontDistribute super."sound-collage";
+  "sounddelay" = dontDistribute super."sounddelay";
+  "source-code-server" = dontDistribute super."source-code-server";
+  "sousit" = dontDistribute super."sousit";
+  "sox" = dontDistribute super."sox";
+  "soxlib" = dontDistribute super."soxlib";
+  "soyuz" = dontDistribute super."soyuz";
+  "spacefill" = dontDistribute super."spacefill";
+  "spacepart" = dontDistribute super."spacepart";
+  "spaceprobe" = dontDistribute super."spaceprobe";
+  "spanout" = dontDistribute super."spanout";
+  "sparse" = dontDistribute super."sparse";
+  "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
+  "sparsebit" = dontDistribute super."sparsebit";
+  "sparsecheck" = dontDistribute super."sparsecheck";
+  "sparser" = dontDistribute super."sparser";
+  "spata" = dontDistribute super."spata";
+  "spatial-math" = dontDistribute super."spatial-math";
+  "spawn" = dontDistribute super."spawn";
+  "spe" = dontDistribute super."spe";
+  "special-functors" = dontDistribute super."special-functors";
+  "special-keys" = dontDistribute super."special-keys";
+  "specialize-th" = dontDistribute super."specialize-th";
+  "species" = dontDistribute super."species";
+  "speculation-transformers" = dontDistribute super."speculation-transformers";
+  "spelling-suggest" = dontDistribute super."spelling-suggest";
+  "sphero" = dontDistribute super."sphero";
+  "sphinx-cli" = dontDistribute super."sphinx-cli";
+  "spice" = dontDistribute super."spice";
+  "spike" = dontDistribute super."spike";
+  "spine" = dontDistribute super."spine";
+  "spir-v" = dontDistribute super."spir-v";
+  "splay" = dontDistribute super."splay";
+  "splaytree" = dontDistribute super."splaytree";
+  "spline3" = dontDistribute super."spline3";
+  "splines" = dontDistribute super."splines";
+  "split-channel" = dontDistribute super."split-channel";
+  "split-record" = dontDistribute super."split-record";
+  "split-tchan" = dontDistribute super."split-tchan";
+  "splitter" = dontDistribute super."splitter";
+  "splot" = dontDistribute super."splot";
+  "spool" = dontDistribute super."spool";
+  "spoonutil" = dontDistribute super."spoonutil";
+  "spoty" = dontDistribute super."spoty";
+  "spreadsheet" = dontDistribute super."spreadsheet";
+  "spritz" = dontDistribute super."spritz";
+  "spsa" = dontDistribute super."spsa";
+  "spy" = dontDistribute super."spy";
+  "sql-simple" = dontDistribute super."sql-simple";
+  "sql-simple-mysql" = dontDistribute super."sql-simple-mysql";
+  "sql-simple-pool" = dontDistribute super."sql-simple-pool";
+  "sql-simple-postgresql" = dontDistribute super."sql-simple-postgresql";
+  "sql-simple-sqlite" = dontDistribute super."sql-simple-sqlite";
+  "sql-words" = dontDistribute super."sql-words";
+  "sqlite" = dontDistribute super."sqlite";
+  "sqlite-simple-typed" = dontDistribute super."sqlite-simple-typed";
+  "sqlvalue-list" = dontDistribute super."sqlvalue-list";
+  "squeeze" = dontDistribute super."squeeze";
+  "sr-extra" = dontDistribute super."sr-extra";
+  "srcinst" = dontDistribute super."srcinst";
+  "srec" = dontDistribute super."srec";
+  "sscgi" = dontDistribute super."sscgi";
+  "ssh" = dontDistribute super."ssh";
+  "sshd-lint" = dontDistribute super."sshd-lint";
+  "sshtun" = dontDistribute super."sshtun";
+  "sssp" = dontDistribute super."sssp";
+  "sstable" = dontDistribute super."sstable";
+  "ssv" = dontDistribute super."ssv";
+  "stable-heap" = dontDistribute super."stable-heap";
+  "stable-maps" = dontDistribute super."stable-maps";
+  "stable-marriage" = dontDistribute super."stable-marriage";
+  "stable-memo" = dontDistribute super."stable-memo";
+  "stable-tree" = dontDistribute super."stable-tree";
+  "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
+  "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
+  "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
+  "standalone-haddock" = dontDistribute super."standalone-haddock";
+  "star-to-star" = dontDistribute super."star-to-star";
+  "star-to-star-contra" = dontDistribute super."star-to-star-contra";
+  "starling" = dontDistribute super."starling";
+  "starrover2" = dontDistribute super."starrover2";
+  "stash" = dontDistribute super."stash";
+  "state" = dontDistribute super."state";
+  "state-plus" = dontDistribute super."state-plus";
+  "state-record" = dontDistribute super."state-record";
+  "statechart" = dontDistribute super."statechart";
+  "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statethread" = dontDistribute super."statethread";
+  "statgrab" = dontDistribute super."statgrab";
+  "static-hash" = dontDistribute super."static-hash";
+  "static-resources" = dontDistribute super."static-resources";
+  "staticanalysis" = dontDistribute super."staticanalysis";
+  "statistics-dirichlet" = dontDistribute super."statistics-dirichlet";
+  "statistics-fusion" = dontDistribute super."statistics-fusion";
+  "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar";
+  "stats" = dontDistribute super."stats";
+  "statsd" = dontDistribute super."statsd";
+  "statsd-client" = dontDistribute super."statsd-client";
+  "statsd-datadog" = dontDistribute super."statsd-datadog";
+  "statvfs" = dontDistribute super."statvfs";
+  "stb-image" = dontDistribute super."stb-image";
+  "stb-truetype" = dontDistribute super."stb-truetype";
+  "stdata" = dontDistribute super."stdata";
+  "stdf" = dontDistribute super."stdf";
+  "steambrowser" = dontDistribute super."steambrowser";
+  "steeloverseer" = dontDistribute super."steeloverseer";
+  "stemmer" = dontDistribute super."stemmer";
+  "step-function" = dontDistribute super."step-function";
+  "stepwise" = dontDistribute super."stepwise";
+  "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
+  "stitch" = dontDistribute super."stitch";
+  "stm-channelize" = dontDistribute super."stm-channelize";
+  "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
+  "stm-firehose" = dontDistribute super."stm-firehose";
+  "stm-io-hooks" = dontDistribute super."stm-io-hooks";
+  "stm-lifted" = dontDistribute super."stm-lifted";
+  "stm-linkedlist" = dontDistribute super."stm-linkedlist";
+  "stm-orelse-io" = dontDistribute super."stm-orelse-io";
+  "stm-promise" = dontDistribute super."stm-promise";
+  "stm-queue-extras" = dontDistribute super."stm-queue-extras";
+  "stm-sbchan" = dontDistribute super."stm-sbchan";
+  "stm-split" = dontDistribute super."stm-split";
+  "stm-tlist" = dontDistribute super."stm-tlist";
+  "stmcontrol" = dontDistribute super."stmcontrol";
+  "stomp-conduit" = dontDistribute super."stomp-conduit";
+  "stomp-patterns" = dontDistribute super."stomp-patterns";
+  "stomp-queue" = dontDistribute super."stomp-queue";
+  "stompl" = dontDistribute super."stompl";
+  "stopwatch" = dontDistribute super."stopwatch";
+  "storable" = dontDistribute super."storable";
+  "storable-record" = dontDistribute super."storable-record";
+  "storable-static-array" = dontDistribute super."storable-static-array";
+  "storable-tuple" = dontDistribute super."storable-tuple";
+  "storablevector" = dontDistribute super."storablevector";
+  "storablevector-carray" = dontDistribute super."storablevector-carray";
+  "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
+  "str" = dontDistribute super."str";
+  "stratum-tool" = dontDistribute super."stratum-tool";
+  "stream-fusion" = dontDistribute super."stream-fusion";
+  "stream-monad" = dontDistribute super."stream-monad";
+  "streamed" = dontDistribute super."streamed";
+  "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-utils" = dontDistribute super."streaming-utils";
+  "streaming-wai" = dontDistribute super."streaming-wai";
+  "strict-concurrency" = dontDistribute super."strict-concurrency";
+  "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin";
+  "strict-identity" = dontDistribute super."strict-identity";
+  "strict-io" = dontDistribute super."strict-io";
+  "strictify" = dontDistribute super."strictify";
+  "strictly" = dontDistribute super."strictly";
+  "string" = dontDistribute super."string";
+  "string-conv" = dontDistribute super."string-conv";
+  "string-convert" = dontDistribute super."string-convert";
+  "string-quote" = dontDistribute super."string-quote";
+  "string-similarity" = dontDistribute super."string-similarity";
+  "stringlike" = dontDistribute super."stringlike";
+  "stringprep" = dontDistribute super."stringprep";
+  "strings" = dontDistribute super."strings";
+  "stringtable-atom" = dontDistribute super."stringtable-atom";
+  "strio" = dontDistribute super."strio";
+  "stripe" = dontDistribute super."stripe";
+  "stripe-core" = dontDistribute super."stripe-core";
+  "stripe-haskell" = dontDistribute super."stripe-haskell";
+  "stripe-http-streams" = dontDistribute super."stripe-http-streams";
+  "strive" = dontDistribute super."strive";
+  "strptime" = dontDistribute super."strptime";
+  "structs" = dontDistribute super."structs";
+  "structural-induction" = dontDistribute super."structural-induction";
+  "structured-haskell-mode" = dontDistribute super."structured-haskell-mode";
+  "structured-mongoDB" = dontDistribute super."structured-mongoDB";
+  "structures" = dontDistribute super."structures";
+  "stunclient" = dontDistribute super."stunclient";
+  "stunts" = dontDistribute super."stunts";
+  "stylized" = dontDistribute super."stylized";
+  "sub-state" = dontDistribute super."sub-state";
+  "subhask" = dontDistribute super."subhask";
+  "subleq-toolchain" = dontDistribute super."subleq-toolchain";
+  "subnet" = dontDistribute super."subnet";
+  "subtitleParser" = dontDistribute super."subtitleParser";
+  "subtitles" = dontDistribute super."subtitles";
+  "suffixarray" = dontDistribute super."suffixarray";
+  "suffixtree" = dontDistribute super."suffixtree";
+  "sugarhaskell" = dontDistribute super."sugarhaskell";
+  "suitable" = dontDistribute super."suitable";
+  "sump" = dontDistribute super."sump";
+  "sundown" = dontDistribute super."sundown";
+  "sunlight" = dontDistribute super."sunlight";
+  "sunroof-compiler" = dontDistribute super."sunroof-compiler";
+  "sunroof-examples" = dontDistribute super."sunroof-examples";
+  "sunroof-server" = dontDistribute super."sunroof-server";
+  "super-user-spark" = dontDistribute super."super-user-spark";
+  "supercollider-ht" = dontDistribute super."supercollider-ht";
+  "supercollider-midi" = dontDistribute super."supercollider-midi";
+  "superdoc" = dontDistribute super."superdoc";
+  "supero" = dontDistribute super."supero";
+  "supervisor" = dontDistribute super."supervisor";
+  "suspend" = dontDistribute super."suspend";
+  "svg2q" = dontDistribute super."svg2q";
+  "svgcairo" = dontDistribute super."svgcairo";
+  "svgutils" = dontDistribute super."svgutils";
+  "svm" = dontDistribute super."svm";
+  "svm-light-utils" = dontDistribute super."svm-light-utils";
+  "svm-simple" = dontDistribute super."svm-simple";
+  "svndump" = dontDistribute super."svndump";
+  "swapper" = dontDistribute super."swapper";
+  "swearjure" = dontDistribute super."swearjure";
+  "swf" = dontDistribute super."swf";
+  "swift-lda" = dontDistribute super."swift-lda";
+  "swish" = dontDistribute super."swish";
+  "sws" = dontDistribute super."sws";
+  "syb-extras" = dontDistribute super."syb-extras";
+  "syb-with-class-instances-text" = dontDistribute super."syb-with-class-instances-text";
+  "sylvia" = dontDistribute super."sylvia";
+  "sym" = dontDistribute super."sym";
+  "sym-plot" = dontDistribute super."sym-plot";
+  "symbol" = dontDistribute super."symbol";
+  "sync" = dontDistribute super."sync";
+  "synchronous-channels" = dontDistribute super."synchronous-channels";
+  "syncthing-hs" = dontDistribute super."syncthing-hs";
+  "synt" = dontDistribute super."synt";
+  "syntactic" = dontDistribute super."syntactic";
+  "syntactical" = dontDistribute super."syntactical";
+  "syntax" = dontDistribute super."syntax";
+  "syntax-attoparsec" = dontDistribute super."syntax-attoparsec";
+  "syntax-example" = dontDistribute super."syntax-example";
+  "syntax-example-json" = dontDistribute super."syntax-example-json";
+  "syntax-pretty" = dontDistribute super."syntax-pretty";
+  "syntax-printer" = dontDistribute super."syntax-printer";
+  "syntax-trees" = dontDistribute super."syntax-trees";
+  "syntax-trees-fork-bairyn" = dontDistribute super."syntax-trees-fork-bairyn";
+  "synthesizer" = dontDistribute super."synthesizer";
+  "synthesizer-alsa" = dontDistribute super."synthesizer-alsa";
+  "synthesizer-core" = dontDistribute super."synthesizer-core";
+  "synthesizer-dimensional" = dontDistribute super."synthesizer-dimensional";
+  "synthesizer-filter" = dontDistribute super."synthesizer-filter";
+  "synthesizer-inference" = dontDistribute super."synthesizer-inference";
+  "synthesizer-llvm" = dontDistribute super."synthesizer-llvm";
+  "synthesizer-midi" = dontDistribute super."synthesizer-midi";
+  "sys-auth-smbclient" = dontDistribute super."sys-auth-smbclient";
+  "sys-process" = dontDistribute super."sys-process";
+  "system-canonicalpath" = dontDistribute super."system-canonicalpath";
+  "system-command" = dontDistribute super."system-command";
+  "system-gpio" = dontDistribute super."system-gpio";
+  "system-inotify" = dontDistribute super."system-inotify";
+  "system-lifted" = dontDistribute super."system-lifted";
+  "system-random-effect" = dontDistribute super."system-random-effect";
+  "system-time-monotonic" = dontDistribute super."system-time-monotonic";
+  "system-util" = dontDistribute super."system-util";
+  "system-uuid" = dontDistribute super."system-uuid";
+  "systemd" = dontDistribute super."systemd";
+  "t-regex" = dontDistribute super."t-regex";
+  "ta" = dontDistribute super."ta";
+  "table" = dontDistribute super."table";
+  "table-tennis" = dontDistribute super."table-tennis";
+  "tableaux" = dontDistribute super."tableaux";
+  "tables" = dontDistribute super."tables";
+  "tablestorage" = dontDistribute super."tablestorage";
+  "tabloid" = dontDistribute super."tabloid";
+  "taffybar" = dontDistribute super."taffybar";
+  "tag-bits" = dontDistribute super."tag-bits";
+  "tag-stream" = dontDistribute super."tag-stream";
+  "tagchup" = dontDistribute super."tagchup";
+  "tagged-exception-core" = dontDistribute super."tagged-exception-core";
+  "tagged-list" = dontDistribute super."tagged-list";
+  "tagged-th" = dontDistribute super."tagged-th";
+  "tagged-transformer" = dontDistribute super."tagged-transformer";
+  "tagging" = dontDistribute super."tagging";
+  "taggy" = dontDistribute super."taggy";
+  "taggy-lens" = dontDistribute super."taggy-lens";
+  "taglib" = dontDistribute super."taglib";
+  "taglib-api" = dontDistribute super."taglib-api";
+  "tagset-positional" = dontDistribute super."tagset-positional";
+  "tagsoup-ht" = dontDistribute super."tagsoup-ht";
+  "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "takahashi" = dontDistribute super."takahashi";
+  "takusen-oracle" = dontDistribute super."takusen-oracle";
+  "tamarin-prover" = dontDistribute super."tamarin-prover";
+  "tamarin-prover-term" = dontDistribute super."tamarin-prover-term";
+  "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory";
+  "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
+  "tamper" = dontDistribute super."tamper";
+  "target" = dontDistribute super."target";
+  "task" = dontDistribute super."task";
+  "taskpool" = dontDistribute super."taskpool";
+  "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
+  "tasty-integrate" = dontDistribute super."tasty-integrate";
+  "tasty-laws" = dontDistribute super."tasty-laws";
+  "tasty-lens" = dontDistribute super."tasty-lens";
+  "tasty-program" = dontDistribute super."tasty-program";
+  "tateti-tateti" = dontDistribute super."tateti-tateti";
+  "tau" = dontDistribute super."tau";
+  "tbox" = dontDistribute super."tbox";
+  "tcache-AWS" = dontDistribute super."tcache-AWS";
+  "tccli" = dontDistribute super."tccli";
+  "tce-conf" = dontDistribute super."tce-conf";
+  "tconfig" = dontDistribute super."tconfig";
+  "tcp" = dontDistribute super."tcp";
+  "tdd-util" = dontDistribute super."tdd-util";
+  "tdoc" = dontDistribute super."tdoc";
+  "teams" = dontDistribute super."teams";
+  "teeth" = dontDistribute super."teeth";
+  "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
+  "template-default" = dontDistribute super."template-default";
+  "template-haskell-util" = dontDistribute super."template-haskell-util";
+  "template-hsml" = dontDistribute super."template-hsml";
+  "template-yj" = dontDistribute super."template-yj";
+  "templatepg" = dontDistribute super."templatepg";
+  "templater" = dontDistribute super."templater";
+  "tempodb" = dontDistribute super."tempodb";
+  "temporal-csound" = dontDistribute super."temporal-csound";
+  "temporal-media" = dontDistribute super."temporal-media";
+  "temporal-music-notation" = dontDistribute super."temporal-music-notation";
+  "temporal-music-notation-demo" = dontDistribute super."temporal-music-notation-demo";
+  "temporal-music-notation-western" = dontDistribute super."temporal-music-notation-western";
+  "temporary-resourcet" = dontDistribute super."temporary-resourcet";
+  "tempus" = dontDistribute super."tempus";
+  "tempus-fugit" = dontDistribute super."tempus-fugit";
+  "tensor" = dontDistribute super."tensor";
+  "term-rewriting" = dontDistribute super."term-rewriting";
+  "termbox-bindings" = dontDistribute super."termbox-bindings";
+  "termination-combinators" = dontDistribute super."termination-combinators";
+  "terminfo" = doDistribute super."terminfo_0_4_0_2";
+  "terminfo-hs" = dontDistribute super."terminfo-hs";
+  "termplot" = dontDistribute super."termplot";
+  "terrahs" = dontDistribute super."terrahs";
+  "tersmu" = dontDistribute super."tersmu";
+  "test-framework-doctest" = dontDistribute super."test-framework-doctest";
+  "test-framework-golden" = dontDistribute super."test-framework-golden";
+  "test-framework-program" = dontDistribute super."test-framework-program";
+  "test-framework-quickcheck" = dontDistribute super."test-framework-quickcheck";
+  "test-framework-sandbox" = dontDistribute super."test-framework-sandbox";
+  "test-framework-skip" = dontDistribute super."test-framework-skip";
+  "test-framework-testing-feat" = dontDistribute super."test-framework-testing-feat";
+  "test-framework-th-prime" = dontDistribute super."test-framework-th-prime";
+  "test-invariant" = dontDistribute super."test-invariant";
+  "test-pkg" = dontDistribute super."test-pkg";
+  "test-sandbox" = dontDistribute super."test-sandbox";
+  "test-sandbox-compose" = dontDistribute super."test-sandbox-compose";
+  "test-sandbox-hunit" = dontDistribute super."test-sandbox-hunit";
+  "test-sandbox-quickcheck" = dontDistribute super."test-sandbox-quickcheck";
+  "test-shouldbe" = dontDistribute super."test-shouldbe";
+  "test-simple" = dontDistribute super."test-simple";
+  "testPkg" = dontDistribute super."testPkg";
+  "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
+  "testloop" = dontDistribute super."testloop";
+  "testpack" = dontDistribute super."testpack";
+  "testpattern" = dontDistribute super."testpattern";
+  "testrunner" = dontDistribute super."testrunner";
+  "tetris" = dontDistribute super."tetris";
+  "tex2txt" = dontDistribute super."tex2txt";
+  "texrunner" = dontDistribute super."texrunner";
+  "text-and-plots" = dontDistribute super."text-and-plots";
+  "text-format-simple" = dontDistribute super."text-format-simple";
+  "text-icu-translit" = dontDistribute super."text-icu-translit";
+  "text-json-qq" = dontDistribute super."text-json-qq";
+  "text-latin1" = dontDistribute super."text-latin1";
+  "text-ldap" = dontDistribute super."text-ldap";
+  "text-locale-encoding" = dontDistribute super."text-locale-encoding";
+  "text-normal" = dontDistribute super."text-normal";
+  "text-position" = dontDistribute super."text-position";
+  "text-postgresql" = dontDistribute super."text-postgresql";
+  "text-printer" = dontDistribute super."text-printer";
+  "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-register-machine" = dontDistribute super."text-register-machine";
+  "text-render" = dontDistribute super."text-render";
+  "text-show-instances" = dontDistribute super."text-show-instances";
+  "text-stream-decode" = dontDistribute super."text-stream-decode";
+  "text-utf7" = dontDistribute super."text-utf7";
+  "text-xml-generic" = dontDistribute super."text-xml-generic";
+  "text-xml-qq" = dontDistribute super."text-xml-qq";
+  "text1" = dontDistribute super."text1";
+  "textPlot" = dontDistribute super."textPlot";
+  "textmatetags" = dontDistribute super."textmatetags";
+  "textocat-api" = dontDistribute super."textocat-api";
+  "texts" = dontDistribute super."texts";
+  "tfp" = dontDistribute super."tfp";
+  "tfp-th" = dontDistribute super."tfp-th";
+  "tftp" = dontDistribute super."tftp";
+  "tga" = dontDistribute super."tga";
+  "th-alpha" = dontDistribute super."th-alpha";
+  "th-build" = dontDistribute super."th-build";
+  "th-cas" = dontDistribute super."th-cas";
+  "th-context" = dontDistribute super."th-context";
+  "th-fold" = dontDistribute super."th-fold";
+  "th-inline-io-action" = dontDistribute super."th-inline-io-action";
+  "th-instance-reification" = dontDistribute super."th-instance-reification";
+  "th-instances" = dontDistribute super."th-instances";
+  "th-kinds" = dontDistribute super."th-kinds";
+  "th-kinds-fork" = dontDistribute super."th-kinds-fork";
+  "th-lift-instances" = dontDistribute super."th-lift-instances";
+  "th-printf" = dontDistribute super."th-printf";
+  "th-sccs" = dontDistribute super."th-sccs";
+  "th-traced" = dontDistribute super."th-traced";
+  "th-typegraph" = dontDistribute super."th-typegraph";
+  "themoviedb" = dontDistribute super."themoviedb";
+  "themplate" = dontDistribute super."themplate";
+  "theoremquest" = dontDistribute super."theoremquest";
+  "theoremquest-client" = dontDistribute super."theoremquest-client";
+  "thespian" = dontDistribute super."thespian";
+  "theta-functions" = dontDistribute super."theta-functions";
+  "thih" = dontDistribute super."thih";
+  "thimk" = dontDistribute super."thimk";
+  "thorn" = dontDistribute super."thorn";
+  "thread-local-storage" = dontDistribute super."thread-local-storage";
+  "threadPool" = dontDistribute super."threadPool";
+  "threadmanager" = dontDistribute super."threadmanager";
+  "threads-pool" = dontDistribute super."threads-pool";
+  "threads-supervisor" = dontDistribute super."threads-supervisor";
+  "threadscope" = dontDistribute super."threadscope";
+  "threefish" = dontDistribute super."threefish";
+  "threepenny-gui" = dontDistribute super."threepenny-gui";
+  "thrift" = dontDistribute super."thrift";
+  "thrist" = dontDistribute super."thrist";
+  "throttle" = dontDistribute super."throttle";
+  "thumbnail" = dontDistribute super."thumbnail";
+  "tianbar" = dontDistribute super."tianbar";
+  "tic-tac-toe" = dontDistribute super."tic-tac-toe";
+  "tickle" = dontDistribute super."tickle";
+  "tictactoe3d" = dontDistribute super."tictactoe3d";
+  "tidal" = dontDistribute super."tidal";
+  "tidal-midi" = dontDistribute super."tidal-midi";
+  "tidal-vis" = dontDistribute super."tidal-vis";
+  "tie-knot" = dontDistribute super."tie-knot";
+  "tiempo" = dontDistribute super."tiempo";
+  "tiger" = dontDistribute super."tiger";
+  "tight-apply" = dontDistribute super."tight-apply";
+  "tightrope" = dontDistribute super."tightrope";
+  "tighttp" = dontDistribute super."tighttp";
+  "tilings" = dontDistribute super."tilings";
+  "timberc" = dontDistribute super."timberc";
+  "time-extras" = dontDistribute super."time-extras";
+  "time-exts" = dontDistribute super."time-exts";
+  "time-http" = dontDistribute super."time-http";
+  "time-interval" = dontDistribute super."time-interval";
+  "time-io-access" = dontDistribute super."time-io-access";
+  "time-patterns" = dontDistribute super."time-patterns";
+  "time-qq" = dontDistribute super."time-qq";
+  "time-recurrence" = dontDistribute super."time-recurrence";
+  "time-series" = dontDistribute super."time-series";
+  "time-w3c" = dontDistribute super."time-w3c";
+  "timecalc" = dontDistribute super."timecalc";
+  "timeconsole" = dontDistribute super."timeconsole";
+  "timeless" = dontDistribute super."timeless";
+  "timelike" = dontDistribute super."timelike";
+  "timelike-time" = dontDistribute super."timelike-time";
+  "timemap" = dontDistribute super."timemap";
+  "timeout" = dontDistribute super."timeout";
+  "timeout-control" = dontDistribute super."timeout-control";
+  "timeout-with-results" = dontDistribute super."timeout-with-results";
+  "timeparsers" = dontDistribute super."timeparsers";
+  "timeplot" = dontDistribute super."timeplot";
+  "timers" = dontDistribute super."timers";
+  "timers-updatable" = dontDistribute super."timers-updatable";
+  "timestamp-subprocess-lines" = dontDistribute super."timestamp-subprocess-lines";
+  "timestamper" = dontDistribute super."timestamper";
+  "timezone-olson-th" = dontDistribute super."timezone-olson-th";
+  "timing-convenience" = dontDistribute super."timing-convenience";
+  "tinyMesh" = dontDistribute super."tinyMesh";
+  "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
+  "tip-lib" = dontDistribute super."tip-lib";
+  "titlecase" = dontDistribute super."titlecase";
+  "tkhs" = dontDistribute super."tkhs";
+  "tkyprof" = dontDistribute super."tkyprof";
+  "tld" = dontDistribute super."tld";
+  "tls-extra" = dontDistribute super."tls-extra";
+  "tmpl" = dontDistribute super."tmpl";
+  "tn" = dontDistribute super."tn";
+  "tnet" = dontDistribute super."tnet";
+  "to-haskell" = dontDistribute super."to-haskell";
+  "to-string-class" = dontDistribute super."to-string-class";
+  "to-string-instances" = dontDistribute super."to-string-instances";
+  "todos" = dontDistribute super."todos";
+  "tofromxml" = dontDistribute super."tofromxml";
+  "toilet" = dontDistribute super."toilet";
+  "tokenify" = dontDistribute super."tokenify";
+  "tokenize" = dontDistribute super."tokenize";
+  "toktok" = dontDistribute super."toktok";
+  "tokyocabinet-haskell" = dontDistribute super."tokyocabinet-haskell";
+  "tokyotyrant-haskell" = dontDistribute super."tokyotyrant-haskell";
+  "tomato-rubato-openal" = dontDistribute super."tomato-rubato-openal";
+  "toml" = dontDistribute super."toml";
+  "toolshed" = dontDistribute super."toolshed";
+  "topkata" = dontDistribute super."topkata";
+  "torch" = dontDistribute super."torch";
+  "total" = dontDistribute super."total";
+  "total-map" = dontDistribute super."total-map";
+  "total-maps" = dontDistribute super."total-maps";
+  "touched" = dontDistribute super."touched";
+  "toysolver" = dontDistribute super."toysolver";
+  "tpdb" = dontDistribute super."tpdb";
+  "trace" = dontDistribute super."trace";
+  "trace-call" = dontDistribute super."trace-call";
+  "trace-function-call" = dontDistribute super."trace-function-call";
+  "traced" = dontDistribute super."traced";
+  "tracer" = dontDistribute super."tracer";
+  "tracker" = dontDistribute super."tracker";
+  "trajectory" = dontDistribute super."trajectory";
+  "transactional-events" = dontDistribute super."transactional-events";
+  "transf" = dontDistribute super."transf";
+  "transformations" = dontDistribute super."transformations";
+  "transformers-abort" = dontDistribute super."transformers-abort";
+  "transformers-compose" = dontDistribute super."transformers-compose";
+  "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-runnable" = dontDistribute super."transformers-runnable";
+  "transformers-supply" = dontDistribute super."transformers-supply";
+  "transient" = dontDistribute super."transient";
+  "translatable-intset" = dontDistribute super."translatable-intset";
+  "translate" = dontDistribute super."translate";
+  "travis" = dontDistribute super."travis";
+  "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
+  "trawl" = dontDistribute super."trawl";
+  "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-monad" = dontDistribute super."tree-monad";
+  "treemap-html" = dontDistribute super."treemap-html";
+  "treemap-html-tools" = dontDistribute super."treemap-html-tools";
+  "treersec" = dontDistribute super."treersec";
+  "treeviz" = dontDistribute super."treeviz";
+  "tremulous-query" = dontDistribute super."tremulous-query";
+  "trhsx" = dontDistribute super."trhsx";
+  "triangulation" = dontDistribute super."triangulation";
+  "trimpolya" = dontDistribute super."trimpolya";
+  "tripLL" = dontDistribute super."tripLL";
+  "trivia" = dontDistribute super."trivia";
+  "trivial-constraint" = dontDistribute super."trivial-constraint";
+  "tropical" = dontDistribute super."tropical";
+  "truelevel" = dontDistribute super."truelevel";
+  "trurl" = dontDistribute super."trurl";
+  "truthful" = dontDistribute super."truthful";
+  "tsession" = dontDistribute super."tsession";
+  "tsession-happstack" = dontDistribute super."tsession-happstack";
+  "tskiplist" = dontDistribute super."tskiplist";
+  "tslogger" = dontDistribute super."tslogger";
+  "tsp-viz" = dontDistribute super."tsp-viz";
+  "tsparse" = dontDistribute super."tsparse";
+  "tst" = dontDistribute super."tst";
+  "tsvsql" = dontDistribute super."tsvsql";
+  "tubes" = dontDistribute super."tubes";
+  "tuntap" = dontDistribute super."tuntap";
+  "tup-functor" = dontDistribute super."tup-functor";
+  "tuple" = dontDistribute super."tuple";
+  "tuple-gen" = dontDistribute super."tuple-gen";
+  "tuple-generic" = dontDistribute super."tuple-generic";
+  "tuple-hlist" = dontDistribute super."tuple-hlist";
+  "tuple-lenses" = dontDistribute super."tuple-lenses";
+  "tuple-morph" = dontDistribute super."tuple-morph";
+  "tupleinstances" = dontDistribute super."tupleinstances";
+  "turing" = dontDistribute super."turing";
+  "turing-music" = dontDistribute super."turing-music";
+  "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
+  "turni" = dontDistribute super."turni";
+  "tweak" = dontDistribute super."tweak";
+  "twentefp" = dontDistribute super."twentefp";
+  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
+  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
+  "twentefp-graphs" = dontDistribute super."twentefp-graphs";
+  "twentefp-number" = dontDistribute super."twentefp-number";
+  "twentefp-rosetree" = dontDistribute super."twentefp-rosetree";
+  "twentefp-trees" = dontDistribute super."twentefp-trees";
+  "twentefp-websockets" = dontDistribute super."twentefp-websockets";
+  "twhs" = dontDistribute super."twhs";
+  "twidge" = dontDistribute super."twidge";
+  "twilight-stm" = dontDistribute super."twilight-stm";
+  "twilio" = dontDistribute super."twilio";
+  "twill" = dontDistribute super."twill";
+  "twiml" = dontDistribute super."twiml";
+  "twine" = dontDistribute super."twine";
+  "twisty" = dontDistribute super."twisty";
+  "twitch" = dontDistribute super."twitch";
+  "twitter" = dontDistribute super."twitter";
+  "twitter-conduit" = dontDistribute super."twitter-conduit";
+  "twitter-enumerator" = dontDistribute super."twitter-enumerator";
+  "twitter-types" = dontDistribute super."twitter-types";
+  "twitter-types-lens" = dontDistribute super."twitter-types-lens";
+  "tx" = dontDistribute super."tx";
+  "txt-sushi" = dontDistribute super."txt-sushi";
+  "txt2rtf" = dontDistribute super."txt2rtf";
+  "txtblk" = dontDistribute super."txtblk";
+  "ty" = dontDistribute super."ty";
+  "typalyze" = dontDistribute super."typalyze";
+  "type-aligned" = dontDistribute super."type-aligned";
+  "type-booleans" = dontDistribute super."type-booleans";
+  "type-cereal" = dontDistribute super."type-cereal";
+  "type-combinators" = dontDistribute super."type-combinators";
+  "type-combinators-quote" = dontDistribute super."type-combinators-quote";
+  "type-digits" = dontDistribute super."type-digits";
+  "type-equality" = dontDistribute super."type-equality";
+  "type-equality-check" = dontDistribute super."type-equality-check";
+  "type-fun" = dontDistribute super."type-fun";
+  "type-functions" = dontDistribute super."type-functions";
+  "type-hint" = dontDistribute super."type-hint";
+  "type-int" = dontDistribute super."type-int";
+  "type-iso" = dontDistribute super."type-iso";
+  "type-level" = dontDistribute super."type-level";
+  "type-level-bst" = dontDistribute super."type-level-bst";
+  "type-level-natural-number" = dontDistribute super."type-level-natural-number";
+  "type-level-natural-number-induction" = dontDistribute super."type-level-natural-number-induction";
+  "type-level-natural-number-operations" = dontDistribute super."type-level-natural-number-operations";
+  "type-level-sets" = dontDistribute super."type-level-sets";
+  "type-level-tf" = dontDistribute super."type-level-tf";
+  "type-natural" = dontDistribute super."type-natural";
+  "type-ord" = dontDistribute super."type-ord";
+  "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
+  "type-prelude" = dontDistribute super."type-prelude";
+  "type-settheory" = dontDistribute super."type-settheory";
+  "type-spine" = dontDistribute super."type-spine";
+  "type-structure" = dontDistribute super."type-structure";
+  "type-sub-th" = dontDistribute super."type-sub-th";
+  "type-unary" = dontDistribute super."type-unary";
+  "typeable-th" = dontDistribute super."typeable-th";
+  "typed-spreadsheet" = dontDistribute super."typed-spreadsheet";
+  "typed-wire" = dontDistribute super."typed-wire";
+  "typed-wire-utils" = dontDistribute super."typed-wire-utils";
+  "typedquery" = dontDistribute super."typedquery";
+  "typehash" = dontDistribute super."typehash";
+  "typelevel" = dontDistribute super."typelevel";
+  "typelevel-tensor" = dontDistribute super."typelevel-tensor";
+  "typeof" = dontDistribute super."typeof";
+  "typeparams" = dontDistribute super."typeparams";
+  "typesafe-endian" = dontDistribute super."typesafe-endian";
+  "typescript-docs" = dontDistribute super."typescript-docs";
+  "typical" = dontDistribute super."typical";
+  "typography-geometry" = dontDistribute super."typography-geometry";
+  "uAgda" = dontDistribute super."uAgda";
+  "ua-parser" = dontDistribute super."ua-parser";
+  "uacpid" = dontDistribute super."uacpid";
+  "uberlast" = dontDistribute super."uberlast";
+  "uconv" = dontDistribute super."uconv";
+  "udbus" = dontDistribute super."udbus";
+  "udbus-model" = dontDistribute super."udbus-model";
+  "udcode" = dontDistribute super."udcode";
+  "udev" = dontDistribute super."udev";
+  "uhc-light" = dontDistribute super."uhc-light";
+  "uhc-util" = dontDistribute super."uhc-util";
+  "uhexdump" = dontDistribute super."uhexdump";
+  "uhttpc" = dontDistribute super."uhttpc";
+  "ui-command" = dontDistribute super."ui-command";
+  "uid" = dontDistribute super."uid";
+  "una" = dontDistribute super."una";
+  "unagi-chan" = dontDistribute super."unagi-chan";
+  "unagi-streams" = dontDistribute super."unagi-streams";
+  "unamb" = dontDistribute super."unamb";
+  "unamb-custom" = dontDistribute super."unamb-custom";
+  "unbound" = dontDistribute super."unbound";
+  "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
+  "unboxed-containers" = dontDistribute super."unboxed-containers";
+  "unbreak" = dontDistribute super."unbreak";
+  "unexceptionalio" = dontDistribute super."unexceptionalio";
+  "unfoldable" = dontDistribute super."unfoldable";
+  "ungadtagger" = dontDistribute super."ungadtagger";
+  "uni-events" = dontDistribute super."uni-events";
+  "uni-graphs" = dontDistribute super."uni-graphs";
+  "uni-htk" = dontDistribute super."uni-htk";
+  "uni-posixutil" = dontDistribute super."uni-posixutil";
+  "uni-reactor" = dontDistribute super."uni-reactor";
+  "uni-uDrawGraph" = dontDistribute super."uni-uDrawGraph";
+  "uni-util" = dontDistribute super."uni-util";
+  "unicode" = dontDistribute super."unicode";
+  "unicode-names" = dontDistribute super."unicode-names";
+  "unicode-normalization" = dontDistribute super."unicode-normalization";
+  "unicode-prelude" = dontDistribute super."unicode-prelude";
+  "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-symbols" = dontDistribute super."unicode-symbols";
+  "unicoder" = dontDistribute super."unicoder";
+  "uniform-io" = dontDistribute super."uniform-io";
+  "uniform-pair" = dontDistribute super."uniform-pair";
+  "union-find-array" = dontDistribute super."union-find-array";
+  "union-map" = dontDistribute super."union-map";
+  "unique" = dontDistribute super."unique";
+  "unique-logic" = dontDistribute super."unique-logic";
+  "unique-logic-tf" = dontDistribute super."unique-logic-tf";
+  "uniqueid" = dontDistribute super."uniqueid";
+  "unit" = dontDistribute super."unit";
+  "units" = dontDistribute super."units";
+  "units-attoparsec" = dontDistribute super."units-attoparsec";
+  "units-defs" = dontDistribute super."units-defs";
+  "units-parser" = dontDistribute super."units-parser";
+  "unittyped" = dontDistribute super."unittyped";
+  "universal-binary" = dontDistribute super."universal-binary";
+  "universe-th" = dontDistribute super."universe-th";
+  "unix-fcntl" = dontDistribute super."unix-fcntl";
+  "unix-handle" = dontDistribute super."unix-handle";
+  "unix-io-extra" = dontDistribute super."unix-io-extra";
+  "unix-memory" = dontDistribute super."unix-memory";
+  "unix-process-conduit" = dontDistribute super."unix-process-conduit";
+  "unix-pty-light" = dontDistribute super."unix-pty-light";
+  "unlambda" = dontDistribute super."unlambda";
+  "unlit" = dontDistribute super."unlit";
+  "unm-hip" = dontDistribute super."unm-hip";
+  "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
+  "unordered-graphs" = dontDistribute super."unordered-graphs";
+  "unpack-funcs" = dontDistribute super."unpack-funcs";
+  "unroll-ghc-plugin" = dontDistribute super."unroll-ghc-plugin";
+  "unsafe" = dontDistribute super."unsafe";
+  "unsafe-promises" = dontDistribute super."unsafe-promises";
+  "unsafely" = dontDistribute super."unsafely";
+  "unsafeperformst" = dontDistribute super."unsafeperformst";
+  "unscramble" = dontDistribute super."unscramble";
+  "unusable-pkg" = dontDistribute super."unusable-pkg";
+  "uom-plugin" = dontDistribute super."uom-plugin";
+  "up" = dontDistribute super."up";
+  "up-grade" = dontDistribute super."up-grade";
+  "uploadcare" = dontDistribute super."uploadcare";
+  "upskirt" = dontDistribute super."upskirt";
+  "ureader" = dontDistribute super."ureader";
+  "urembed" = dontDistribute super."urembed";
+  "uri" = dontDistribute super."uri";
+  "uri-conduit" = dontDistribute super."uri-conduit";
+  "uri-enumerator" = dontDistribute super."uri-enumerator";
+  "uri-enumerator-file" = dontDistribute super."uri-enumerator-file";
+  "uri-template" = dontDistribute super."uri-template";
+  "url-generic" = dontDistribute super."url-generic";
+  "urlcheck" = dontDistribute super."urlcheck";
+  "urldecode" = dontDistribute super."urldecode";
+  "urldisp-happstack" = dontDistribute super."urldisp-happstack";
+  "urlencoded" = dontDistribute super."urlencoded";
+  "urn" = dontDistribute super."urn";
+  "urxml" = dontDistribute super."urxml";
+  "usb" = dontDistribute super."usb";
+  "usb-enumerator" = dontDistribute super."usb-enumerator";
+  "usb-hid" = dontDistribute super."usb-hid";
+  "usb-id-database" = dontDistribute super."usb-id-database";
+  "usb-iteratee" = dontDistribute super."usb-iteratee";
+  "usb-safe" = dontDistribute super."usb-safe";
+  "utc" = dontDistribute super."utc";
+  "utf8-env" = dontDistribute super."utf8-env";
+  "utf8-prelude" = dontDistribute super."utf8-prelude";
+  "uu-cco" = dontDistribute super."uu-cco";
+  "uu-cco-examples" = dontDistribute super."uu-cco-examples";
+  "uu-cco-hut-parsing" = dontDistribute super."uu-cco-hut-parsing";
+  "uu-cco-uu-parsinglib" = dontDistribute super."uu-cco-uu-parsinglib";
+  "uu-options" = dontDistribute super."uu-options";
+  "uu-tc" = dontDistribute super."uu-tc";
+  "uuagc" = dontDistribute super."uuagc";
+  "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap";
+  "uuagc-cabal" = dontDistribute super."uuagc-cabal";
+  "uuagc-diagrams" = dontDistribute super."uuagc-diagrams";
+  "uuagd" = dontDistribute super."uuagd";
+  "uuid-aeson" = dontDistribute super."uuid-aeson";
+  "uuid-le" = dontDistribute super."uuid-le";
+  "uuid-quasi" = dontDistribute super."uuid-quasi";
+  "uulib" = dontDistribute super."uulib";
+  "uvector" = dontDistribute super."uvector";
+  "uvector-algorithms" = dontDistribute super."uvector-algorithms";
+  "uxadt" = dontDistribute super."uxadt";
+  "uzbl-with-source" = dontDistribute super."uzbl-with-source";
+  "v4l2" = dontDistribute super."v4l2";
+  "v4l2-examples" = dontDistribute super."v4l2-examples";
+  "vacuum" = dontDistribute super."vacuum";
+  "vacuum-cairo" = dontDistribute super."vacuum-cairo";
+  "vacuum-graphviz" = dontDistribute super."vacuum-graphviz";
+  "vacuum-opengl" = dontDistribute super."vacuum-opengl";
+  "vacuum-ubigraph" = dontDistribute super."vacuum-ubigraph";
+  "vado" = dontDistribute super."vado";
+  "valid-names" = dontDistribute super."valid-names";
+  "validate" = dontDistribute super."validate";
+  "validated-literals" = dontDistribute super."validated-literals";
+  "validation" = dontDistribute super."validation";
+  "validations" = dontDistribute super."validations";
+  "value-supply" = dontDistribute super."value-supply";
+  "vampire" = dontDistribute super."vampire";
+  "var" = dontDistribute super."var";
+  "varan" = dontDistribute super."varan";
+  "variable-precision" = dontDistribute super."variable-precision";
+  "variables" = dontDistribute super."variables";
+  "varying" = dontDistribute super."varying";
+  "vaultaire-common" = dontDistribute super."vaultaire-common";
+  "vcache" = dontDistribute super."vcache";
+  "vcache-trie" = dontDistribute super."vcache-trie";
+  "vcard" = dontDistribute super."vcard";
+  "vcd" = dontDistribute super."vcd";
+  "vcs-revision" = dontDistribute super."vcs-revision";
+  "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
+  "vcsgui" = dontDistribute super."vcsgui";
+  "vcswrapper" = dontDistribute super."vcswrapper";
+  "vect" = dontDistribute super."vect";
+  "vect-floating" = dontDistribute super."vect-floating";
+  "vect-floating-accelerate" = dontDistribute super."vect-floating-accelerate";
+  "vect-opengl" = dontDistribute super."vect-opengl";
+  "vector-binary" = dontDistribute super."vector-binary";
+  "vector-bytestring" = dontDistribute super."vector-bytestring";
+  "vector-clock" = dontDistribute super."vector-clock";
+  "vector-conduit" = dontDistribute super."vector-conduit";
+  "vector-functorlazy" = dontDistribute super."vector-functorlazy";
+  "vector-heterogenous" = dontDistribute super."vector-heterogenous";
+  "vector-instances-collections" = dontDistribute super."vector-instances-collections";
+  "vector-mmap" = dontDistribute super."vector-mmap";
+  "vector-random" = dontDistribute super."vector-random";
+  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space-map" = dontDistribute super."vector-space-map";
+  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
+  "vector-static" = dontDistribute super."vector-static";
+  "vector-strategies" = dontDistribute super."vector-strategies";
+  "verbalexpressions" = dontDistribute super."verbalexpressions";
+  "verbosity" = dontDistribute super."verbosity";
+  "verdict" = dontDistribute super."verdict";
+  "verdict-json" = dontDistribute super."verdict-json";
+  "verilog" = dontDistribute super."verilog";
+  "versions" = dontDistribute super."versions";
+  "vhdl" = dontDistribute super."vhdl";
+  "views" = dontDistribute super."views";
+  "vigilance" = dontDistribute super."vigilance";
+  "vimeta" = dontDistribute super."vimeta";
+  "vimus" = dontDistribute super."vimus";
+  "vintage-basic" = dontDistribute super."vintage-basic";
+  "vinyl-gl" = dontDistribute super."vinyl-gl";
+  "vinyl-json" = dontDistribute super."vinyl-json";
+  "vinyl-utils" = dontDistribute super."vinyl-utils";
+  "vinyl-vectors" = dontDistribute super."vinyl-vectors";
+  "virthualenv" = dontDistribute super."virthualenv";
+  "visibility" = dontDistribute super."visibility";
+  "vision" = dontDistribute super."vision";
+  "visual-graphrewrite" = dontDistribute super."visual-graphrewrite";
+  "visual-prof" = dontDistribute super."visual-prof";
+  "vivid" = dontDistribute super."vivid";
+  "vk-aws-route53" = dontDistribute super."vk-aws-route53";
+  "vk-posix-pty" = dontDistribute super."vk-posix-pty";
+  "vocabulary-kadma" = dontDistribute super."vocabulary-kadma";
+  "vorbiscomment" = dontDistribute super."vorbiscomment";
+  "vowpal-utils" = dontDistribute super."vowpal-utils";
+  "voyeur" = dontDistribute super."voyeur";
+  "vrpn" = dontDistribute super."vrpn";
+  "vte" = dontDistribute super."vte";
+  "vtegtk3" = dontDistribute super."vtegtk3";
+  "vty-examples" = dontDistribute super."vty-examples";
+  "vty-menu" = dontDistribute super."vty-menu";
+  "vty-ui" = dontDistribute super."vty-ui";
+  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "waddle" = dontDistribute super."waddle";
+  "wai-accept-language" = dontDistribute super."wai-accept-language";
+  "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-devel" = dontDistribute super."wai-devel";
+  "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
+  "wai-dispatch" = dontDistribute super."wai-dispatch";
+  "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi";
+  "wai-graceful" = dontDistribute super."wai-graceful";
+  "wai-handler-devel" = dontDistribute super."wai-handler-devel";
+  "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
+  "wai-handler-snap" = dontDistribute super."wai-handler-snap";
+  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
+  "wai-hastache" = dontDistribute super."wai-hastache";
+  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-lens" = dontDistribute super."wai-lens";
+  "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
+  "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
+  "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
+  "wai-middleware-catch" = dontDistribute super."wai-middleware-catch";
+  "wai-middleware-etag" = dontDistribute super."wai-middleware-etag";
+  "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip";
+  "wai-middleware-headers" = dontDistribute super."wai-middleware-headers";
+  "wai-middleware-hmac" = dontDistribute super."wai-middleware-hmac";
+  "wai-middleware-hmac-client" = dontDistribute super."wai-middleware-hmac-client";
+  "wai-middleware-preprocessor" = dontDistribute super."wai-middleware-preprocessor";
+  "wai-middleware-route" = dontDistribute super."wai-middleware-route";
+  "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching";
+  "wai-request-spec" = dontDistribute super."wai-request-spec";
+  "wai-responsible" = dontDistribute super."wai-responsible";
+  "wai-router" = dontDistribute super."wai-router";
+  "wai-session-alt" = dontDistribute super."wai-session-alt";
+  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
+  "wai-static-cache" = dontDistribute super."wai-static-cache";
+  "wai-static-pages" = dontDistribute super."wai-static-pages";
+  "wai-test" = dontDistribute super."wai-test";
+  "wai-thrift" = dontDistribute super."wai-thrift";
+  "wai-throttler" = dontDistribute super."wai-throttler";
+  "wait-handle" = dontDistribute super."wait-handle";
+  "waitfree" = dontDistribute super."waitfree";
+  "warc" = dontDistribute super."warc";
+  "warp-dynamic" = dontDistribute super."warp-dynamic";
+  "warp-static" = dontDistribute super."warp-static";
+  "warp-tls-uid" = dontDistribute super."warp-tls-uid";
+  "watchdog" = dontDistribute super."watchdog";
+  "watcher" = dontDistribute super."watcher";
+  "watchit" = dontDistribute super."watchit";
+  "wavconvert" = dontDistribute super."wavconvert";
+  "wavefront" = dontDistribute super."wavefront";
+  "wavesurfer" = dontDistribute super."wavesurfer";
+  "wavy" = dontDistribute super."wavy";
+  "wcwidth" = dontDistribute super."wcwidth";
+  "weather-api" = dontDistribute super."weather-api";
+  "web-browser-in-haskell" = dontDistribute super."web-browser-in-haskell";
+  "web-css" = dontDistribute super."web-css";
+  "web-encodings" = dontDistribute super."web-encodings";
+  "web-mongrel2" = dontDistribute super."web-mongrel2";
+  "web-page" = dontDistribute super."web-page";
+  "web-routes-mtl" = dontDistribute super."web-routes-mtl";
+  "web-routes-quasi" = dontDistribute super."web-routes-quasi";
+  "web-routes-regular" = dontDistribute super."web-routes-regular";
+  "web-routes-transformers" = dontDistribute super."web-routes-transformers";
+  "webapi" = dontDistribute super."webapi";
+  "webapp" = dontDistribute super."webapp";
+  "webcrank" = dontDistribute super."webcrank";
+  "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
+  "webcrank-wai" = dontDistribute super."webcrank-wai";
+  "webdriver-snoy" = dontDistribute super."webdriver-snoy";
+  "webfinger-client" = dontDistribute super."webfinger-client";
+  "webidl" = dontDistribute super."webidl";
+  "webify" = dontDistribute super."webify";
+  "webkit" = dontDistribute super."webkit";
+  "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore";
+  "webkitgtk3" = dontDistribute super."webkitgtk3";
+  "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore";
+  "webrtc-vad" = dontDistribute super."webrtc-vad";
+  "webserver" = dontDistribute super."webserver";
+  "websnap" = dontDistribute super."websnap";
+  "websockets-snap" = dontDistribute super."websockets-snap";
+  "webwire" = dontDistribute super."webwire";
+  "wedding-announcement" = dontDistribute super."wedding-announcement";
+  "wedged" = dontDistribute super."wedged";
+  "weighted-regexp" = dontDistribute super."weighted-regexp";
+  "weighted-search" = dontDistribute super."weighted-search";
+  "welshy" = dontDistribute super."welshy";
+  "wheb-mongo" = dontDistribute super."wheb-mongo";
+  "wheb-redis" = dontDistribute super."wheb-redis";
+  "wheb-strapped" = dontDistribute super."wheb-strapped";
+  "while-lang-parser" = dontDistribute super."while-lang-parser";
+  "whim" = dontDistribute super."whim";
+  "whiskers" = dontDistribute super."whiskers";
+  "whitespace" = dontDistribute super."whitespace";
+  "whois" = dontDistribute super."whois";
+  "why3" = dontDistribute super."why3";
+  "wigner-symbols" = dontDistribute super."wigner-symbols";
+  "wikipedia4epub" = dontDistribute super."wikipedia4epub";
+  "win-hp-path" = dontDistribute super."win-hp-path";
+  "windowslive" = dontDistribute super."windowslive";
+  "winerror" = dontDistribute super."winerror";
+  "winio" = dontDistribute super."winio";
+  "wiring" = dontDistribute super."wiring";
+  "witness" = dontDistribute super."witness";
+  "witty" = dontDistribute super."witty";
+  "wkt" = dontDistribute super."wkt";
+  "wl-pprint-ansiterm" = dontDistribute super."wl-pprint-ansiterm";
+  "wlc-hs" = dontDistribute super."wlc-hs";
+  "wobsurv" = dontDistribute super."wobsurv";
+  "woffex" = dontDistribute super."woffex";
+  "wol" = dontDistribute super."wol";
+  "wolf" = dontDistribute super."wolf";
+  "woot" = dontDistribute super."woot";
+  "word24" = dontDistribute super."word24";
+  "wordcloud" = dontDistribute super."wordcloud";
+  "wordexp" = dontDistribute super."wordexp";
+  "words" = dontDistribute super."words";
+  "wordsearch" = dontDistribute super."wordsearch";
+  "wordsetdiff" = dontDistribute super."wordsetdiff";
+  "workflow-osx" = dontDistribute super."workflow-osx";
+  "wp-archivebot" = dontDistribute super."wp-archivebot";
+  "wraparound" = dontDistribute super."wraparound";
+  "wraxml" = dontDistribute super."wraxml";
+  "wreq-sb" = dontDistribute super."wreq-sb";
+  "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
+  "wsedit" = dontDistribute super."wsedit";
+  "wtk" = dontDistribute super."wtk";
+  "wtk-gtk" = dontDistribute super."wtk-gtk";
+  "wumpus-basic" = dontDistribute super."wumpus-basic";
+  "wumpus-core" = dontDistribute super."wumpus-core";
+  "wumpus-drawing" = dontDistribute super."wumpus-drawing";
+  "wumpus-microprint" = dontDistribute super."wumpus-microprint";
+  "wumpus-tree" = dontDistribute super."wumpus-tree";
+  "wuss" = dontDistribute super."wuss";
+  "wx" = dontDistribute super."wx";
+  "wxAsteroids" = dontDistribute super."wxAsteroids";
+  "wxFruit" = dontDistribute super."wxFruit";
+  "wxc" = dontDistribute super."wxc";
+  "wxcore" = dontDistribute super."wxcore";
+  "wxdirect" = dontDistribute super."wxdirect";
+  "wxhnotepad" = dontDistribute super."wxhnotepad";
+  "wxturtle" = dontDistribute super."wxturtle";
+  "wybor" = dontDistribute super."wybor";
+  "wyvern" = dontDistribute super."wyvern";
+  "x-dsp" = dontDistribute super."x-dsp";
+  "x11-xim" = dontDistribute super."x11-xim";
+  "x11-xinput" = dontDistribute super."x11-xinput";
+  "x509-util" = dontDistribute super."x509-util";
+  "xattr" = dontDistribute super."xattr";
+  "xbattbar" = dontDistribute super."xbattbar";
+  "xcb-types" = dontDistribute super."xcb-types";
+  "xcffib" = dontDistribute super."xcffib";
+  "xchat-plugin" = dontDistribute super."xchat-plugin";
+  "xcp" = dontDistribute super."xcp";
+  "xdg-userdirs" = dontDistribute super."xdg-userdirs";
+  "xdot" = dontDistribute super."xdot";
+  "xfconf" = dontDistribute super."xfconf";
+  "xhaskell-library" = dontDistribute super."xhaskell-library";
+  "xhb" = dontDistribute super."xhb";
+  "xhb-atom-cache" = dontDistribute super."xhb-atom-cache";
+  "xhb-ewmh" = dontDistribute super."xhb-ewmh";
+  "xhtml" = doDistribute super."xhtml_3000_2_1";
+  "xhtml-combinators" = dontDistribute super."xhtml-combinators";
+  "xilinx-lava" = dontDistribute super."xilinx-lava";
+  "xine" = dontDistribute super."xine";
+  "xing-api" = dontDistribute super."xing-api";
+  "xinput-conduit" = dontDistribute super."xinput-conduit";
+  "xkbcommon" = dontDistribute super."xkbcommon";
+  "xkcd" = dontDistribute super."xkcd";
+  "xlsx-templater" = dontDistribute super."xlsx-templater";
+  "xml-basic" = dontDistribute super."xml-basic";
+  "xml-catalog" = dontDistribute super."xml-catalog";
+  "xml-enumerator" = dontDistribute super."xml-enumerator";
+  "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
+  "xml-extractors" = dontDistribute super."xml-extractors";
+  "xml-helpers" = dontDistribute super."xml-helpers";
+  "xml-html-conduit-lens" = dontDistribute super."xml-html-conduit-lens";
+  "xml-monad" = dontDistribute super."xml-monad";
+  "xml-parsec" = dontDistribute super."xml-parsec";
+  "xml-picklers" = dontDistribute super."xml-picklers";
+  "xml-pipe" = dontDistribute super."xml-pipe";
+  "xml-prettify" = dontDistribute super."xml-prettify";
+  "xml-push" = dontDistribute super."xml-push";
+  "xml-query" = dontDistribute super."xml-query";
+  "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit";
+  "xml-query-xml-types" = dontDistribute super."xml-query-xml-types";
+  "xml2html" = dontDistribute super."xml2html";
+  "xml2json" = dontDistribute super."xml2json";
+  "xml2x" = dontDistribute super."xml2x";
+  "xmltv" = dontDistribute super."xmltv";
+  "xmms2-client" = dontDistribute super."xmms2-client";
+  "xmms2-client-glib" = dontDistribute super."xmms2-client-glib";
+  "xmobar" = dontDistribute super."xmobar";
+  "xmonad-bluetilebranch" = dontDistribute super."xmonad-bluetilebranch";
+  "xmonad-contrib" = dontDistribute super."xmonad-contrib";
+  "xmonad-contrib-bluetilebranch" = dontDistribute super."xmonad-contrib-bluetilebranch";
+  "xmonad-contrib-gpl" = dontDistribute super."xmonad-contrib-gpl";
+  "xmonad-entryhelper" = dontDistribute super."xmonad-entryhelper";
+  "xmonad-eval" = dontDistribute super."xmonad-eval";
+  "xmonad-extras" = dontDistribute super."xmonad-extras";
+  "xmonad-screenshot" = dontDistribute super."xmonad-screenshot";
+  "xmonad-utils" = dontDistribute super."xmonad-utils";
+  "xmonad-wallpaper" = dontDistribute super."xmonad-wallpaper";
+  "xmonad-windownames" = dontDistribute super."xmonad-windownames";
+  "xmpipe" = dontDistribute super."xmpipe";
+  "xorshift" = dontDistribute super."xorshift";
+  "xosd" = dontDistribute super."xosd";
+  "xournal-builder" = dontDistribute super."xournal-builder";
+  "xournal-convert" = dontDistribute super."xournal-convert";
+  "xournal-parser" = dontDistribute super."xournal-parser";
+  "xournal-render" = dontDistribute super."xournal-render";
+  "xournal-types" = dontDistribute super."xournal-types";
+  "xsact" = dontDistribute super."xsact";
+  "xsd" = dontDistribute super."xsd";
+  "xsha1" = dontDistribute super."xsha1";
+  "xslt" = dontDistribute super."xslt";
+  "xtc" = dontDistribute super."xtc";
+  "xtest" = dontDistribute super."xtest";
+  "xturtle" = dontDistribute super."xturtle";
+  "xxhash" = dontDistribute super."xxhash";
+  "y0l0bot" = dontDistribute super."y0l0bot";
+  "yabi" = dontDistribute super."yabi";
+  "yabi-muno" = dontDistribute super."yabi-muno";
+  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
+  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
+  "yajl" = dontDistribute super."yajl";
+  "yajl-enumerator" = dontDistribute super."yajl-enumerator";
+  "yall" = dontDistribute super."yall";
+  "yamemo" = dontDistribute super."yamemo";
+  "yaml-config" = dontDistribute super."yaml-config";
+  "yaml-light-lens" = dontDistribute super."yaml-light-lens";
+  "yaml-rpc" = dontDistribute super."yaml-rpc";
+  "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
+  "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
+  "yaml2owl" = dontDistribute super."yaml2owl";
+  "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
+  "yampa-canvas" = dontDistribute super."yampa-canvas";
+  "yampa-glfw" = dontDistribute super."yampa-glfw";
+  "yampa-glut" = dontDistribute super."yampa-glut";
+  "yampa2048" = dontDistribute super."yampa2048";
+  "yaop" = dontDistribute super."yaop";
+  "yap" = dontDistribute super."yap";
+  "yarr" = dontDistribute super."yarr";
+  "yarr-image-io" = dontDistribute super."yarr-image-io";
+  "yate" = dontDistribute super."yate";
+  "yavie" = dontDistribute super."yavie";
+  "ycextra" = dontDistribute super."ycextra";
+  "yeganesh" = dontDistribute super."yeganesh";
+  "yeller" = dontDistribute super."yeller";
+  "yesod-angular" = dontDistribute super."yesod-angular";
+  "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
+  "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
+  "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos";
+  "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
+  "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
+  "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = dontDistribute super."yesod-auth-oauth";
+  "yesod-auth-oauth2" = dontDistribute super."yesod-auth-oauth2";
+  "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
+  "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
+  "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
+  "yesod-bootstrap" = dontDistribute super."yesod-bootstrap";
+  "yesod-comments" = dontDistribute super."yesod-comments";
+  "yesod-content-pdf" = dontDistribute super."yesod-content-pdf";
+  "yesod-continuations" = dontDistribute super."yesod-continuations";
+  "yesod-crud" = dontDistribute super."yesod-crud";
+  "yesod-crud-persist" = dontDistribute super."yesod-crud-persist";
+  "yesod-csp" = dontDistribute super."yesod-csp";
+  "yesod-datatables" = dontDistribute super."yesod-datatables";
+  "yesod-dsl" = dontDistribute super."yesod-dsl";
+  "yesod-examples" = dontDistribute super."yesod-examples";
+  "yesod-form-json" = dontDistribute super."yesod-form-json";
+  "yesod-goodies" = dontDistribute super."yesod-goodies";
+  "yesod-json" = dontDistribute super."yesod-json";
+  "yesod-links" = dontDistribute super."yesod-links";
+  "yesod-lucid" = dontDistribute super."yesod-lucid";
+  "yesod-markdown" = dontDistribute super."yesod-markdown";
+  "yesod-media-simple" = dontDistribute super."yesod-media-simple";
+  "yesod-paginate" = dontDistribute super."yesod-paginate";
+  "yesod-pagination" = dontDistribute super."yesod-pagination";
+  "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-platform" = dontDistribute super."yesod-platform";
+  "yesod-pnotify" = dontDistribute super."yesod-pnotify";
+  "yesod-pure" = dontDistribute super."yesod-pure";
+  "yesod-purescript" = dontDistribute super."yesod-purescript";
+  "yesod-raml" = dontDistribute super."yesod-raml";
+  "yesod-raml-bin" = dontDistribute super."yesod-raml-bin";
+  "yesod-raml-docs" = dontDistribute super."yesod-raml-docs";
+  "yesod-raml-mock" = dontDistribute super."yesod-raml-mock";
+  "yesod-recaptcha" = dontDistribute super."yesod-recaptcha";
+  "yesod-routes" = dontDistribute super."yesod-routes";
+  "yesod-routes-flow" = dontDistribute super."yesod-routes-flow";
+  "yesod-routes-typescript" = dontDistribute super."yesod-routes-typescript";
+  "yesod-rst" = dontDistribute super."yesod-rst";
+  "yesod-s3" = dontDistribute super."yesod-s3";
+  "yesod-sass" = dontDistribute super."yesod-sass";
+  "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-tableview" = dontDistribute super."yesod-tableview";
+  "yesod-test-json" = dontDistribute super."yesod-test-json";
+  "yesod-tls" = dontDistribute super."yesod-tls";
+  "yesod-transloadit" = dontDistribute super."yesod-transloadit";
+  "yesod-vend" = dontDistribute super."yesod-vend";
+  "yesod-websockets-extra" = dontDistribute super."yesod-websockets-extra";
+  "yesod-worker" = dontDistribute super."yesod-worker";
+  "yet-another-logger" = dontDistribute super."yet-another-logger";
+  "yhccore" = dontDistribute super."yhccore";
+  "yi-contrib" = dontDistribute super."yi-contrib";
+  "yi-emacs-colours" = dontDistribute super."yi-emacs-colours";
+  "yi-gtk" = dontDistribute super."yi-gtk";
+  "yi-monokai" = dontDistribute super."yi-monokai";
+  "yi-snippet" = dontDistribute super."yi-snippet";
+  "yi-solarized" = dontDistribute super."yi-solarized";
+  "yi-spolsky" = dontDistribute super."yi-spolsky";
+  "yi-vty" = dontDistribute super."yi-vty";
+  "yices" = dontDistribute super."yices";
+  "yices-easy" = dontDistribute super."yices-easy";
+  "yices-painless" = dontDistribute super."yices-painless";
+  "yjftp" = dontDistribute super."yjftp";
+  "yjftp-libs" = dontDistribute super."yjftp-libs";
+  "yjsvg" = dontDistribute super."yjsvg";
+  "yjtools" = dontDistribute super."yjtools";
+  "yocto" = dontDistribute super."yocto";
+  "yoko" = dontDistribute super."yoko";
+  "york-lava" = dontDistribute super."york-lava";
+  "youtube" = dontDistribute super."youtube";
+  "yql" = dontDistribute super."yql";
+  "yst" = dontDistribute super."yst";
+  "yuiGrid" = dontDistribute super."yuiGrid";
+  "yuuko" = dontDistribute super."yuuko";
+  "yxdb-utils" = dontDistribute super."yxdb-utils";
+  "z3" = dontDistribute super."z3";
+  "zalgo" = dontDistribute super."zalgo";
+  "zampolit" = dontDistribute super."zampolit";
+  "zasni-gerna" = dontDistribute super."zasni-gerna";
+  "zcache" = dontDistribute super."zcache";
+  "zenc" = dontDistribute super."zenc";
+  "zendesk-api" = dontDistribute super."zendesk-api";
+  "zeno" = dontDistribute super."zeno";
+  "zerobin" = dontDistribute super."zerobin";
+  "zeromq-haskell" = dontDistribute super."zeromq-haskell";
+  "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
+  "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeroth" = dontDistribute super."zeroth";
+  "zigbee-znet25" = dontDistribute super."zigbee-znet25";
+  "zip-conduit" = dontDistribute super."zip-conduit";
+  "zipedit" = dontDistribute super."zipedit";
+  "zipkin" = dontDistribute super."zipkin";
+  "zipper" = dontDistribute super."zipper";
+  "zippers" = dontDistribute super."zippers";
+  "zippo" = dontDistribute super."zippo";
+  "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zmcat" = dontDistribute super."zmcat";
+  "zmidi-core" = dontDistribute super."zmidi-core";
+  "zmidi-score" = dontDistribute super."zmidi-score";
+  "zmqat" = dontDistribute super."zmqat";
+  "zoneinfo" = dontDistribute super."zoneinfo";
+  "zoom" = dontDistribute super."zoom";
+  "zoom-cache" = dontDistribute super."zoom-cache";
+  "zoom-cache-pcm" = dontDistribute super."zoom-cache-pcm";
+  "zoom-cache-sndfile" = dontDistribute super."zoom-cache-sndfile";
+  "zoom-refs" = dontDistribute super."zoom-refs";
+  "zot" = dontDistribute super."zot";
+  "zsh-battery" = dontDistribute super."zsh-battery";
+  "ztail" = dontDistribute super."ztail";
+
+}
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 87e2bd68c81d..2db6458cac6b 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1824,6 +1824,33 @@ self: {
        license = "GPL";
      }) {};
 
+  "BlogLiterately_0_8_1_4" = callPackage
+    ({ mkDerivation, base, blaze-html, bool-extras, bytestring, cmdargs
+     , containers, data-default, directory, filepath, HaXml, haxr
+     , highlighting-kate, hscolour, lens, mtl, pandoc, pandoc-citeproc
+     , pandoc-types, parsec, process, split, strict, temporary
+     , transformers
+     }:
+     mkDerivation {
+       pname = "BlogLiterately";
+       version = "0.8.1.4";
+       sha256 = "f5771035d39ae6230d694e5b9a3391d12efa4f4e776564a7a7415611c65e20a0";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base blaze-html bool-extras bytestring cmdargs containers
+         data-default directory filepath HaXml haxr highlighting-kate
+         hscolour lens mtl pandoc pandoc-citeproc pandoc-types parsec
+         process split strict temporary transformers
+       ];
+       executableHaskellDepends = [ base cmdargs ];
+       jailbreak = true;
+       homepage = "http://byorgey.wordpress.com/blogliterately/";
+       description = "A tool for posting Haskelly articles to blogs";
+       license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "BlogLiterately-diagrams_0_1_4_3" = callPackage
     ({ mkDerivation, base, BlogLiterately, containers, diagrams-builder
      , diagrams-cairo, diagrams-lib, directory, filepath, pandoc, safe
@@ -1867,6 +1894,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "BlogLiterately-diagrams_0_2_0_2" = callPackage
+    ({ mkDerivation, base, BlogLiterately, containers, diagrams-builder
+     , diagrams-lib, diagrams-rasterific, directory, filepath
+     , JuicyPixels, pandoc, safe
+     }:
+     mkDerivation {
+       pname = "BlogLiterately-diagrams";
+       version = "0.2.0.2";
+       sha256 = "9ec7f26cbbd527e1ec1005ec0aa0c3d8edde8cf11ccbde0af6b109f1b254c11a";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base BlogLiterately containers diagrams-builder diagrams-lib
+         diagrams-rasterific directory filepath JuicyPixels pandoc safe
+       ];
+       executableHaskellDepends = [ base BlogLiterately ];
+       jailbreak = true;
+       description = "Include images in blog posts with inline diagrams code";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "BluePrintCSS" = callPackage
     ({ mkDerivation, base, mtl }:
      mkDerivation {
@@ -2633,10 +2682,9 @@ self: {
     ({ mkDerivation, base, lens, template-haskell }:
      mkDerivation {
        pname = "Cartesian";
-       version = "0.2.0.0";
-       sha256 = "8b0484241f389a9b83225f97ca0d903b7e5d3b0d98c34f5a526a0c7c3b934b45";
+       version = "0.2.1.0";
+       sha256 = "b9a611298eab7e2da27a300124d4522c7dae77dd1c19ad73f4b5c781dab718d6";
        libraryHaskellDepends = [ base lens template-haskell ];
-       jailbreak = true;
        description = "Coordinate systems";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -5057,8 +5105,8 @@ self: {
      }:
      mkDerivation {
        pname = "EntrezHTTP";
-       version = "1.0.0";
-       sha256 = "4455e40a08375d5810a38ca5e519e2038893aece17eb17b3809cc11d14ca652a";
+       version = "1.0.1";
+       sha256 = "54461cb1bd772129cc9e5d725ed6997b133bc7725ec1720de511918d07cdc01f";
        libraryHaskellDepends = [
          base biocore bytestring conduit HTTP http-conduit hxt mtl network
          Taxonomy transformers
@@ -11967,8 +12015,8 @@ self: {
      }:
      mkDerivation {
        pname = "Lambdaya";
-       version = "0.2.0.0";
-       sha256 = "f2fa4c293546715dff97b41f33ab5125455497f32a4a528c821a35baba64c63e";
+       version = "0.2.0.0.1";
+       sha256 = "ecb9d7490da6f3b11aaa118f271121fa3f3a940a7914e7551b8b078650ea4dcf";
        libraryHaskellDepends = [
          base binary mtl network pipes pipes-binary pipes-network
          pipes-parse
@@ -12797,13 +12845,12 @@ self: {
      }:
      mkDerivation {
        pname = "Michelangelo";
-       version = "0.2.3.0";
-       sha256 = "f18c2a8594ba45fdde295156f10b19e19218a771c1073407034c12157ae29b3d";
+       version = "0.2.4.0";
+       sha256 = "fe8645825ceda5943c474ed5440eb2f945e8f74b00ace7ba01a339fa60cac93b";
        libraryHaskellDepends = [
          base bytestring containers GLUtil lens linear OpenGL OpenGLRaw
          WaveFront
        ];
-       jailbreak = true;
        description = "OpenGL for dummies";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -15052,8 +15099,8 @@ self: {
      }:
      mkDerivation {
        pname = "Plot-ho-matic";
-       version = "0.7.0.1";
-       sha256 = "ff670da50a981cc665d1c17a813b94850fd1080e5b8db5e1602a1bc0ae86be32";
+       version = "0.8.0.0";
+       sha256 = "2c2e2d1f793140df25afdd73965b42f3010b5060030c564cc7afcff9f3c711a2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -19216,17 +19263,16 @@ self: {
      }) {};
 
   "WaveFront" = callPackage
-    ({ mkDerivation, base, containers, filepath, GLUtil, lens, linear
-     , OpenGL
+    ({ mkDerivation, base, Cartesian, containers, filepath, GLUtil
+     , lens, linear, OpenGL
      }:
      mkDerivation {
        pname = "WaveFront";
-       version = "0.1.0.2";
-       sha256 = "f18c307609ea324aab8c208e556cee679686bcae794380e05d8f43fdae1b03de";
+       version = "0.1.2.0";
+       sha256 = "7a169c00d1c008904ca827ddcf99db1026e3af9b3b4f48cf62486b269339bb80";
        libraryHaskellDepends = [
-         base containers filepath GLUtil lens linear OpenGL
+         base Cartesian containers filepath GLUtil lens linear OpenGL
        ];
-       jailbreak = true;
        description = "Parsers and utilities for the OBJ WaveFront 3D model format";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -23568,8 +23614,8 @@ self: {
     ({ mkDerivation, alsa-core, alsaLib, base, c2hs, unix }:
      mkDerivation {
        pname = "alsa-mixer";
-       version = "0.2.0.2";
-       sha256 = "139e837a47c31c7b6e41c7ffead7558fde8cde468b91f27d5a19a97490154c87";
+       version = "0.2.0.3";
+       sha256 = "f76deb4081a2ce4a765e78a017b2e13c073d2aaa5a2d2652fd5e635dd169cf8d";
        libraryHaskellDepends = [ alsa-core base unix ];
        librarySystemDepends = [ alsaLib ];
        libraryToolDepends = [ c2hs ];
@@ -29947,6 +29993,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "async_2_1_0" = callPackage
+    ({ mkDerivation, base, HUnit, stm, test-framework
+     , test-framework-hunit
+     }:
+     mkDerivation {
+       pname = "async";
+       version = "2.1.0";
+       sha256 = "93c37611f9c68b5cdc8cd9960ae77a7fbc25da83cae90137ef1378d857f22c2f";
+       libraryHaskellDepends = [ base stm ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit
+       ];
+       homepage = "https://github.com/simonmar/async";
+       description = "Run IO operations asynchronously and wait for their results";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "async-dejafu" = callPackage
     ({ mkDerivation, base, dejafu, exceptions, HUnit, hunit-dejafu }:
      mkDerivation {
@@ -32928,7 +32992,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "base-prelude" = callPackage
+  "base-prelude_0_1_20" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "base-prelude";
@@ -32939,19 +33003,20 @@ self: {
        homepage = "https://github.com/nikita-volkov/base-prelude";
        description = "The most complete prelude formed from only the \"base\" package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "base-prelude_0_1_21" = callPackage
+  "base-prelude" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "base-prelude";
        version = "0.1.21";
        sha256 = "72650e69fd615191be08bed82e07c623b0c17b0b52113b418bc3b2093d74a3a5";
        libraryHaskellDepends = [ base ];
+       doCheck = false;
        homepage = "https://github.com/nikita-volkov/base-prelude";
        description = "The most complete prelude formed from only the \"base\" package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "base-unicode-symbols" = callPackage
@@ -35450,18 +35515,18 @@ self: {
      }) {};
 
   "bindings-sane" = callPackage
-    ({ mkDerivation, base, bindings-DSL, sane-backends }:
+    ({ mkDerivation, base, bindings-DSL, saneBackends }:
      mkDerivation {
        pname = "bindings-sane";
        version = "0.0.1";
        sha256 = "a27eb00e69a804e65f39246611a747f3a833a87dab536c7f3cde60583a60b04b";
        libraryHaskellDepends = [ base bindings-DSL ];
-       libraryPkgconfigDepends = [ sane-backends ];
+       libraryPkgconfigDepends = [ saneBackends ];
        homepage = "http://floss.scru.org/bindings-sane";
        description = "FFI bindings to libsane";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
-     }) {sane-backends = null;};
+     }) {saneBackends = null;};
 
   "bindings-sc3" = callPackage
     ({ mkDerivation, base, bindings-DSL, scsynth }:
@@ -48617,8 +48682,8 @@ self: {
      }:
      mkDerivation {
        pname = "concurrent-output";
-       version = "1.7.2";
-       sha256 = "a69a41502e640eb6afc87e8420001dadbbe22cd18580792995f73d2029c30169";
+       version = "1.7.3";
+       sha256 = "9a510e7378ba9c6c637027074fa127fad832f9321144fdbe9ae3b1955cf40620";
        libraryHaskellDepends = [
          ansi-terminal async base directory exceptions process stm
          terminal-size text transformers unix
@@ -51982,7 +52047,7 @@ self: {
        license = stdenv.lib.licenses.mpl20;
      }) {};
 
-  "cql-io" = callPackage
+  "cql-io_0_14_5" = callPackage
     ({ mkDerivation, async, auto-update, base, bytestring, containers
      , cql, cryptohash, data-default-class, exceptions, hashable
      , iproute, lens, monad-control, mtl, mwc-random, network
@@ -52002,6 +52067,29 @@ self: {
        homepage = "https://github.com/twittner/cql-io/";
        description = "Cassandra CQL client";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "cql-io" = callPackage
+    ({ mkDerivation, async, auto-update, base, bytestring, containers
+     , cql, cryptohash, data-default-class, exceptions, hashable
+     , HsOpenSSL, iproute, lens, monad-control, mtl, mwc-random, network
+     , retry, semigroups, stm, text, time, tinylog, transformers
+     , transformers-base, uuid, vector
+     }:
+     mkDerivation {
+       pname = "cql-io";
+       version = "0.15.2";
+       sha256 = "cba9bdaae9056151a413760e5d9dea10604a7ef90867fd2c834ddc1a5b6d5669";
+       libraryHaskellDepends = [
+         async auto-update base bytestring containers cql cryptohash
+         data-default-class exceptions hashable HsOpenSSL iproute lens
+         monad-control mtl mwc-random network retry semigroups stm text time
+         tinylog transformers transformers-base uuid vector
+       ];
+       homepage = "https://github.com/twittner/cql-io/";
+       description = "Cassandra CQL client";
+       license = stdenv.lib.licenses.mpl20;
      }) {};
 
   "cqrs" = callPackage
@@ -61940,6 +62028,42 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dixi_0_6_0_3" = callPackage
+    ({ mkDerivation, acid-state, aeson, aeson-pretty, attoparsec, base
+     , blaze-html, blaze-markup, bytestring, composition-tree
+     , containers, data-default, directory, either, filepath, heredoc
+     , lens, network-uri, pandoc, pandoc-types, patches-vector, safecopy
+     , servant, servant-blaze, servant-docs, servant-server, shakespeare
+     , template-haskell, text, time, time-locale-compat, timezone-olson
+     , timezone-series, transformers, vector, warp, yaml
+     }:
+     mkDerivation {
+       pname = "dixi";
+       version = "0.6.0.3";
+       sha256 = "20321780dd63d08ee7c09d6eb15704870351205bf85751f8ac49ea1a9811dc52";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         acid-state aeson base blaze-html blaze-markup bytestring
+         composition-tree containers data-default either heredoc lens
+         network-uri pandoc pandoc-types patches-vector safecopy servant
+         servant-blaze servant-server shakespeare template-haskell text time
+         time-locale-compat timezone-olson timezone-series transformers
+         vector
+       ];
+       executableHaskellDepends = [
+         acid-state base directory filepath servant-server text warp yaml
+       ];
+       testHaskellDepends = [
+         aeson aeson-pretty attoparsec base bytestring lens patches-vector
+         servant servant-blaze servant-docs shakespeare text time vector
+       ];
+       homepage = "https://github.com/liamoc/dixi";
+       description = "A wiki implemented with a firm theoretical foundation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "djinn" = callPackage
     ({ mkDerivation, array, base, containers, haskeline, mtl, pretty }:
      mkDerivation {
@@ -67472,8 +67596,8 @@ self: {
      }:
      mkDerivation {
        pname = "eventstore";
-       version = "0.10.0.0";
-       sha256 = "1800b181c0228090597d63db7fd99dc0ba434d34d5da290b1b0e22aa39510f99";
+       version = "0.10.0.1";
+       sha256 = "feb924dddfa68f75c2513725c1f5b7e7035ac21fdf5c8903b0cf486ddf8f3867";
        libraryHaskellDepends = [
          aeson async base bytestring cereal containers network protobuf
          random stm text time unordered-containers uuid
@@ -70106,7 +70230,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "feed" = callPackage
+  "feed_0_3_10_3" = callPackage
     ({ mkDerivation, base, HUnit, old-locale, old-time, test-framework
      , test-framework-hunit, time, time-locale-compat, utf8-string, xml
      }:
@@ -70124,6 +70248,27 @@ self: {
        homepage = "https://github.com/bergmark/feed";
        description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "feed" = callPackage
+    ({ mkDerivation, base, HUnit, old-locale, old-time, test-framework
+     , test-framework-hunit, time, time-locale-compat, utf8-string, xml
+     }:
+     mkDerivation {
+       pname = "feed";
+       version = "0.3.10.4";
+       sha256 = "7dd14b46330b8026ae6dabddddf881abbd0465e59bda53bfe0315b6954607a63";
+       libraryHaskellDepends = [
+         base old-locale old-time time time-locale-compat utf8-string xml
+       ];
+       testHaskellDepends = [
+         base HUnit old-locale old-time test-framework test-framework-hunit
+         time time-locale-compat utf8-string xml
+       ];
+       homepage = "https://github.com/bergmark/feed";
+       description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "feed-cli" = callPackage
@@ -78462,8 +78607,8 @@ self: {
      }:
      mkDerivation {
        pname = "gitHUD";
-       version = "1.1.0";
-       sha256 = "da4494d601fde664dd90d30ab5431e9648599f561a956d54408b3bacce6032e7";
+       version = "1.3.0";
+       sha256 = "b186502251e38f439a907eb54284ebb453b63003d91ec83c0c3b455f0da48568";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base mtl parsec process unix ];
@@ -85277,16 +85422,15 @@ self: {
      }:
      mkDerivation {
        pname = "hackage-repo-tool";
-       version = "0.1.0.1";
-       sha256 = "fc8863c28ca2cba3e7ae96bac4cc20376666eeb803b8911749a983f762c325f2";
+       version = "0.1.1";
+       sha256 = "23f6c2719d42ce51ae8fe9dc6c8d9c8585265486df81d4ca483b28cc917064f4";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          base bytestring Cabal directory filepath hackage-security network
          network-uri optparse-applicative tar time unix zlib
        ];
-       jailbreak = true;
-       homepage = "http://github.com/well-typed/hackage-security/";
+       homepage = "https://github.com/well-typed/hackage-security";
        description = "Utility to manage secure file-based package repositories";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85295,18 +85439,24 @@ self: {
   "hackage-security" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, Cabal
      , containers, cryptohash, directory, ed25519, filepath, ghc-prim
-     , mtl, network, network-uri, parsec, tar, template-haskell, time
-     , transformers, zlib
+     , HUnit, mtl, network, network-uri, parsec, tar, tasty, tasty-hunit
+     , template-haskell, temporary, time, transformers, zlib
      }:
      mkDerivation {
        pname = "hackage-security";
-       version = "0.3.0.0";
-       sha256 = "7cbc4e0d7338af2d8cec5235c60270df487ef56bb2cd653a7987b1bc672a2fb6";
+       version = "0.5.0.1";
+       sha256 = "84cafa85d8b29eac0fac51f6f03903d217e3f0686b9badea64decb19046cfe9c";
        libraryHaskellDepends = [
          base base64-bytestring bytestring Cabal containers cryptohash
          directory ed25519 filepath ghc-prim mtl network network-uri parsec
          tar template-haskell time transformers zlib
        ];
+       testHaskellDepends = [
+         base bytestring Cabal containers HUnit network-uri tar tasty
+         tasty-hunit temporary time zlib
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/well-typed/hackage-security";
        description = "Hackage security library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85318,12 +85468,12 @@ self: {
      }:
      mkDerivation {
        pname = "hackage-security-HTTP";
-       version = "0.1.0.2";
-       sha256 = "094cc357668437e5a2ac86168fdfdd5f1784d779a706929d676d8e4d430244dc";
+       version = "0.1.1";
+       sha256 = "cd22ac26027df4a6f9c32f57c18a2fad6b69249e79aeeb4081128fd188cd1332";
        libraryHaskellDepends = [
          base bytestring hackage-security HTTP mtl network network-uri zlib
        ];
-       homepage = "http://github.com/well-typed/hackage-security/";
+       homepage = "https://github.com/well-typed/hackage-security";
        description = "Hackage security bindings against the HTTP library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -86479,6 +86629,7 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2 text
          time time-locale-compat
        ];
+       doCheck = false;
        homepage = "http://jaspervdj.be/hakyll";
        description = "A static website compiler library";
        license = stdenv.lib.licenses.bsd3;
@@ -90505,8 +90656,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskellscrabble";
-       version = "1.3.2";
-       sha256 = "aeeeef106ca3bef50fa0882562b1fdca3b2037e6adb274fedde3dc1450d6185c";
+       version = "1.3.3";
+       sha256 = "3de776ff49e739f760ac37d296e4f0f5e9857624a454ca0cc18f85ae4ddbd01f";
        libraryHaskellDepends = [
          array arrows base containers errors listsafe mtl parsec QuickCheck
          random safe semigroups split transformers unordered-containers
@@ -94246,6 +94397,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hero-club-five-tenets" = callPackage
+    ({ mkDerivation, base, random, text }:
+     mkDerivation {
+       pname = "hero-club-five-tenets";
+       version = "0.3.0.0";
+       sha256 = "3bb65ed20ec40faa37f05477b5901961facdf58d386dfebe38626683ccb48aec";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base random text ];
+       executableHaskellDepends = [ base random text ];
+       homepage = "http://github.com/i-amd3/hero-club-five-tenets#README";
+       description = "Remember the five tenets of hero club";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "heroku" = callPackage
     ({ mkDerivation, base, hspec, network-uri, text }:
      mkDerivation {
@@ -100591,6 +100757,8 @@ self: {
        pname = "hpp";
        version = "0.3.0.0";
        sha256 = "315ae6e38a713c1ba914416cd22f271508e981c763ed52701aa71f1be262aae4";
+       revision = "1";
+       editedCabalFile = "5ef421d204fc6528ed11e44bb4c507fd7f25e5afc33f80b6a78275af909aa0de";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -105246,6 +105414,8 @@ self: {
        pname = "hsx";
        version = "0.10.5";
        sha256 = "9b8cf0a88719607de4e11dfd2811ffe43487ed2d77624e0351df40133c12c410";
+       revision = "1";
+       editedCabalFile = "994fc0bb4928745f31c6c50279271b3463e2d5a8ce88cf2ede1edaf8d71e75ec";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base haskell-src-exts mtl utf8-string ];
@@ -110031,7 +110201,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ide-backend" = callPackage
+  "ide-backend_0_10_0" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring
      , bytestring-trie, Cabal-ide-backend, containers, crypto-api
      , data-accessor, data-accessor-mtl, deepseq, directory
@@ -110075,6 +110245,52 @@ self: {
        doCheck = false;
        description = "An IDE backend library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "ide-backend" = callPackage
+    ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring
+     , bytestring-trie, Cabal-ide-backend, containers, crypto-api
+     , data-accessor, data-accessor-mtl, deepseq, directory
+     , executable-path, filemanip, filepath, fingertree, ghc-prim, HUnit
+     , ide-backend-common, monads-tf, mtl, network, parallel
+     , pretty-show, process, pureMD5, random, regex-compat, stm, tagged
+     , tasty, template-haskell, temporary, test-framework
+     , test-framework-hunit, text, time, transformers, unix, unix-compat
+     , unordered-containers, utf8-string
+     }:
+     mkDerivation {
+       pname = "ide-backend";
+       version = "0.10.0.1";
+       sha256 = "07186ec1d8135e94fac39c16fc10145c3a6cee957b96fa739f240afd0ae5faf0";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         async attoparsec base binary bytestring Cabal-ide-backend
+         containers data-accessor data-accessor-mtl directory filemanip
+         filepath ghc-prim ide-backend-common mtl network pretty-show
+         process pureMD5 template-haskell temporary text time transformers
+         unix utf8-string
+       ];
+       executableHaskellDepends = [
+         aeson async attoparsec base binary bytestring bytestring-trie
+         Cabal-ide-backend containers crypto-api data-accessor
+         data-accessor-mtl directory executable-path filemanip filepath
+         fingertree ghc-prim ide-backend-common mtl network pretty-show
+         process pureMD5 random tagged template-haskell temporary text time
+         transformers unix unix-compat unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson async base binary bytestring Cabal-ide-backend containers
+         deepseq directory executable-path filemanip filepath HUnit
+         ide-backend-common monads-tf network parallel process random
+         regex-compat stm tagged tasty template-haskell temporary
+         test-framework test-framework-hunit text unix utf8-string
+       ];
+       jailbreak = true;
+       doCheck = false;
+       description = "An IDE backend library";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "ide-backend-common_0_9_0" = callPackage
@@ -110217,7 +110433,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ide-backend-common" = callPackage
+  "ide-backend-common_0_10_1_1" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring
      , bytestring-trie, containers, crypto-api, data-accessor, directory
      , filepath, fingertree, monad-logger, mtl, pretty-show, pureMD5
@@ -110237,6 +110453,29 @@ self: {
        ];
        description = "Shared library used be ide-backend and ide-backend-server";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "ide-backend-common" = callPackage
+    ({ mkDerivation, aeson, async, attoparsec, base, base64-bytestring
+     , binary, bytestring, bytestring-trie, containers, crypto-api
+     , data-accessor, directory, filepath, fingertree, monad-logger, mtl
+     , network, pretty-show, process, pureMD5, tagged, template-haskell
+     , temporary, text, transformers, unix, unix-compat
+     }:
+     mkDerivation {
+       pname = "ide-backend-common";
+       version = "0.10.1.2";
+       sha256 = "031028f38e1a6174a58665cecd882356c6ca7579c6c21a9e2461f13d81a5915b";
+       libraryHaskellDepends = [
+         aeson async attoparsec base base64-bytestring binary bytestring
+         bytestring-trie containers crypto-api data-accessor directory
+         filepath fingertree monad-logger mtl network pretty-show process
+         pureMD5 tagged template-haskell temporary text transformers unix
+         unix-compat
+       ];
+       description = "Shared library used be ide-backend and ide-backend-server";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "ide-backend-rts" = callPackage
@@ -110250,7 +110489,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "ide-backend-server" = callPackage
+  "ide-backend-server_0_10_0" = callPackage
     ({ mkDerivation, array, async, base, bytestring, Cabal, containers
      , data-accessor, data-accessor-mtl, directory, file-embed
      , filemanip, filepath, ghc, haddock-api, ide-backend-common, mtl
@@ -110271,6 +110510,30 @@ self: {
        ];
        description = "An IDE backend server";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "ide-backend-server" = callPackage
+    ({ mkDerivation, array, async, base, bytestring, Cabal, containers
+     , data-accessor, data-accessor-mtl, directory, file-embed
+     , filemanip, filepath, ghc, haddock-api, ide-backend-common, mtl
+     , network, process, tar, temporary, text, time, transformers, unix
+     , unordered-containers, zlib
+     }:
+     mkDerivation {
+       pname = "ide-backend-server";
+       version = "0.10.0.1";
+       sha256 = "e9adc5133af1025d0f011184f2beb6189927620f7557410b6e0043f126be49a0";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         array async base bytestring Cabal containers data-accessor
+         data-accessor-mtl directory file-embed filemanip filepath ghc
+         haddock-api ide-backend-common mtl network process tar temporary
+         text time transformers unix unordered-containers zlib
+       ];
+       description = "An IDE backend server";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "ideas" = callPackage
@@ -111998,6 +112261,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ini_0_3_3" = callPackage
+    ({ mkDerivation, attoparsec, base, text, unordered-containers }:
+     mkDerivation {
+       pname = "ini";
+       version = "0.3.3";
+       sha256 = "2a995405f80e6827db214e3d6ff0ca0cca6a468d1363007ce220b8e327409284";
+       libraryHaskellDepends = [
+         attoparsec base text unordered-containers
+       ];
+       homepage = "http://github.com/chrisdone/ini";
+       description = "Quick and easy configuration files in the INI format";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "inilist" = callPackage
     ({ mkDerivation, base, bifunctors, containers, deepseq, HUnit, safe
      , tasty, tasty-hunit, testpack, trifecta
@@ -112854,7 +113132,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "io-streams" = callPackage
+  "io-streams_1_3_3_1" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder
      , deepseq, directory, filepath, HUnit, mtl, network, primitive
      , process, QuickCheck, test-framework, test-framework-hunit
@@ -112878,9 +113156,10 @@ self: {
        ];
        description = "Simple, composable, and easy-to-use stream I/O";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "io-streams_1_3_4_0" = callPackage
+  "io-streams" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder
      , deepseq, directory, filepath, HUnit, mtl, network, primitive
      , process, QuickCheck, test-framework, test-framework-hunit
@@ -112904,7 +113183,6 @@ self: {
        ];
        description = "Simple, composable, and easy-to-use stream I/O";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "io-streams-http" = callPackage
@@ -119979,28 +120257,6 @@ self: {
      }) {};
 
   "language-thrift" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, hspec, hspec-discover, lens
-     , parsers, QuickCheck, text, transformers, trifecta, wl-pprint
-     }:
-     mkDerivation {
-       pname = "language-thrift";
-       version = "0.6.1.0";
-       sha256 = "a3c42400a6d0ca72a131d5d4b63b9e8d05724a9f18b04966b41893293e6553f2";
-       libraryHaskellDepends = [
-         ansi-wl-pprint base lens parsers text transformers trifecta
-         wl-pprint
-       ];
-       testHaskellDepends = [
-         ansi-wl-pprint base hspec hspec-discover parsers QuickCheck text
-         trifecta wl-pprint
-       ];
-       homepage = "https://github.com/abhinav/language-thrift";
-       description = "Parser and pretty printer for the Thrift IDL format";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "language-thrift_0_6_2_0" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, hspec, hspec-discover, lens
      , parsers, QuickCheck, template-haskell, text, transformers
      , trifecta, wl-pprint
@@ -120151,7 +120407,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "latex-formulae-hakyll" = callPackage
+  "latex-formulae-hakyll_0_2_0_0" = callPackage
     ({ mkDerivation, base, hakyll, latex-formulae-image
      , latex-formulae-pandoc, lrucache, pandoc-types
      }:
@@ -120166,6 +120422,24 @@ self: {
        homepage = "https://github.com/liamoc/latex-formulae#readme";
        description = "Use actual LaTeX to render formulae inside Hakyll pages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "latex-formulae-hakyll" = callPackage
+    ({ mkDerivation, base, hakyll, latex-formulae-image
+     , latex-formulae-pandoc, lrucache, pandoc-types
+     }:
+     mkDerivation {
+       pname = "latex-formulae-hakyll";
+       version = "0.2.0.1";
+       sha256 = "cf1e0cc594866b0b835ba8ac035f66c25b0f555157b10a1771acb9a9c2450a93";
+       libraryHaskellDepends = [
+         base hakyll latex-formulae-image latex-formulae-pandoc lrucache
+         pandoc-types
+       ];
+       homepage = "https://github.com/liamoc/latex-formulae#readme";
+       description = "Use actual LaTeX to render formulae inside Hakyll pages";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "latex-formulae-image" = callPackage
@@ -120185,7 +120459,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "latex-formulae-pandoc" = callPackage
+  "latex-formulae-pandoc_0_2_0_2" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, directory
      , filepath, JuicyPixels, latex-formulae-image, pandoc-types
      }:
@@ -120205,6 +120479,29 @@ self: {
        homepage = "http://github.com/liamoc/latex-formulae#readme";
        description = "Render LaTeX formulae in pandoc documents to images with an actual LaTeX installation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "latex-formulae-pandoc" = callPackage
+    ({ mkDerivation, base, base64-bytestring, bytestring, directory
+     , filepath, JuicyPixels, latex-formulae-image, pandoc-types
+     }:
+     mkDerivation {
+       pname = "latex-formulae-pandoc";
+       version = "0.2.0.3";
+       sha256 = "289720149572814da30b9854b8a7b0798125c3fa3508b28ca53c9d382f65d12d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base base64-bytestring bytestring directory filepath JuicyPixels
+         latex-formulae-image pandoc-types
+       ];
+       executableHaskellDepends = [
+         base latex-formulae-image pandoc-types
+       ];
+       homepage = "http://github.com/liamoc/latex-formulae#readme";
+       description = "Render LaTeX formulae in pandoc documents to images with an actual LaTeX installation";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "lattices_1_2_1_1" = callPackage
@@ -132726,6 +133023,7 @@ self: {
          transformers-base
        ];
        testHaskellDepends = [ base hspec mtl old-locale text time ];
+       doHaddock = false;
        homepage = "https://github.com/mongodb-haskell/mongodb";
        description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS";
        license = "unknown";
@@ -135680,6 +135978,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "nanq" = callPackage
+    ({ mkDerivation, base, bytestring, containers, microlens, text }:
+     mkDerivation {
+       pname = "nanq";
+       version = "1.1.1";
+       sha256 = "bdb90d5d32773f77401e89de6736ffb26d8c747a6eb3094c75629a9bc2386745";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring containers microlens text
+       ];
+       executableHaskellDepends = [
+         base bytestring containers microlens text
+       ];
+       homepage = "https://github.com/fosskers/nanq";
+       description = "Performs 漢字検定 (National Kanji Exam) level analysis on given Kanji";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "narc" = callPackage
     ({ mkDerivation, base, HDBC, HUnit, mtl, QuickCheck, random }:
      mkDerivation {
@@ -138735,12 +139052,13 @@ self: {
      }:
      mkDerivation {
        pname = "not-gloss";
-       version = "0.7.6.1";
-       sha256 = "d46b0ba1b6e7ef39130f14462a823302fb8216fca1d5d9a13e49cd0bb126527e";
+       version = "0.7.6.2";
+       sha256 = "b9b467e85efe2c0a2270fb0ceb64debf88b7147e4b3b21dbc8332cb1cd2a496e";
        libraryHaskellDepends = [
          base binary bmp bytestring cereal GLUT OpenGL OpenGLRaw
          spatial-math time vector vector-binary-instances
        ];
+       jailbreak = true;
        description = "Painless 3D graphics, no affiliation with gloss";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
@@ -139218,6 +139536,22 @@ self: {
        license = "GPL";
      }) {};
 
+  "numeric-ranges" = callPackage
+    ({ mkDerivation, base, hspec, HUnit, QuickCheck }:
+     mkDerivation {
+       pname = "numeric-ranges";
+       version = "0.1.0.0";
+       sha256 = "0085294502dc6673fc6ca5525fa014f56f73b2bfa92d841b9d61a8c119b53982";
+       revision = "1";
+       editedCabalFile = "68b2a84c67b84bfe3cc3e7f4f2b0fafcd8e0741d4a3c57359f4437bb8824ea07";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec HUnit QuickCheck ];
+       jailbreak = true;
+       homepage = "http://github.com/nicodelpiano/numeric-ranges";
+       description = "A framework for numeric ranges";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "numeric-tools" = callPackage
     ({ mkDerivation, base, HUnit, ieee754, primitive, vector }:
      mkDerivation {
@@ -140301,20 +140635,6 @@ self: {
      }) {};
 
   "open-browser" = callPackage
-    ({ mkDerivation, base, process }:
-     mkDerivation {
-       pname = "open-browser";
-       version = "0.2.0.0";
-       sha256 = "434f36a3f0aeb93d3ee675659a0b29550adec26fce5431bd2ccbbf44cb217124";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base process ];
-       executableHaskellDepends = [ base ];
-       description = "Open a web browser from Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "open-browser_0_2_1_0" = callPackage
     ({ mkDerivation, base, process }:
      mkDerivation {
        pname = "open-browser";
@@ -140327,7 +140647,6 @@ self: {
        homepage = "https://github.com/rightfold/open-browser";
        description = "Open a web browser from Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "open-haddock" = callPackage
@@ -143081,16 +143400,16 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "pandoc-types_1_16" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers
-     , deepseq-generics, ghc-prim, syb
+  "pandoc-types_1_16_0_1" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, deepseq
+     , ghc-prim, syb
      }:
      mkDerivation {
        pname = "pandoc-types";
-       version = "1.16";
-       sha256 = "5879ba2b292950029e60ce458859ae35a33766acfb2f1ac162a4d3c07c75c8a2";
+       version = "1.16.0.1";
+       sha256 = "3e61dff33d104ffdac9920bf7bf9c28f566cb3da237715ad05bd40b4d4e8beb6";
        libraryHaskellDepends = [
-         aeson base bytestring containers deepseq-generics ghc-prim syb
+         aeson base bytestring containers deepseq ghc-prim syb
        ];
        homepage = "http://johnmacfarlane.net/pandoc";
        description = "Types for representing a structured document";
@@ -144152,7 +144471,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "patches-vector" = callPackage
+  "patches-vector_0_1_5_0" = callPackage
     ({ mkDerivation, base, criterion, doctest, edit-distance-vector
      , microlens, QuickCheck, vector
      }:
@@ -144167,6 +144486,26 @@ self: {
        homepage = "https://github.com/liamoc/patches-vector";
        description = "Patches (diffs) on vectors: composable, mergeable, and invertible";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "patches-vector" = callPackage
+    ({ mkDerivation, base, criterion, doctest, edit-distance-vector
+     , hspec, microlens, QuickCheck, vector
+     }:
+     mkDerivation {
+       pname = "patches-vector";
+       version = "0.1.5.1";
+       sha256 = "9de35bf7cb4d5a4d10ad44a43a67a6310b4c5543248f43984fc4ee6689ca0db1";
+       libraryHaskellDepends = [
+         base edit-distance-vector microlens vector
+       ];
+       testHaskellDepends = [
+         base criterion doctest hspec QuickCheck vector
+       ];
+       homepage = "https://github.com/liamoc/patches-vector";
+       description = "Patches (diffs) on vectors: composable, mergeable, and invertible";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "path_0_5_2" = callPackage
@@ -148279,6 +148618,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pipes-concurrency_2_0_5" = callPackage
+    ({ mkDerivation, async, base, pipes, stm }:
+     mkDerivation {
+       pname = "pipes-concurrency";
+       version = "2.0.5";
+       sha256 = "da7cfd1817f60bba99b28b485ad8341131202512532cafdd2e81945e01ab2b6c";
+       libraryHaskellDepends = [ base pipes stm ];
+       testHaskellDepends = [ async base pipes stm ];
+       description = "Concurrency for the pipes ecosystem";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pipes-conduit" = callPackage
     ({ mkDerivation, base, conduit, mtl, pipes-core }:
      mkDerivation {
@@ -155585,18 +155937,18 @@ self: {
 
   "radian" = callPackage
     ({ mkDerivation, base, directory, doctest, filepath, lens
-     , QuickCheck, template-haskell
+     , profunctors, QuickCheck, template-haskell
      }:
      mkDerivation {
        pname = "radian";
-       version = "0.0.4";
-       sha256 = "ca20054273b578a885e271c4876f916c45ed5540ff18066751cfd5c55e82a3b8";
-       libraryHaskellDepends = [ base lens ];
+       version = "0.0.6";
+       sha256 = "f7dbf6d15669d9bda2f7c54969bcb8cf39a7dfd28e27355955f553bb1157cc5c";
+       libraryHaskellDepends = [ base profunctors ];
        testHaskellDepends = [
-         base directory doctest filepath QuickCheck template-haskell
+         base directory doctest filepath lens QuickCheck template-haskell
        ];
        homepage = "https://github.com/NICTA/radian";
-       description = "A floating-point wrapper for measurements that use radians";
+       description = "Isomorphisms for measurements that use radians";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -156094,15 +156446,18 @@ self: {
      }) {};
 
   "random-variates" = callPackage
-    ({ mkDerivation, base, containers, lens, random, reinterpret-cast
+    ({ mkDerivation, base, containers, directory, erf, HUnit, lens, mtl
+     , random, reinterpret-cast
      }:
      mkDerivation {
        pname = "random-variates";
-       version = "0.1.0.0";
-       sha256 = "e7fd6b27efc856a7eed4eaa55cb5b96e43f76b0b2af3936e8fbbc48e1736f604";
+       version = "0.1.1.0";
+       sha256 = "9f2107e834a7c66e1e2fe37097d0a8e839221a86b03d2eab355a6b7bfeb3573b";
        libraryHaskellDepends = [
-         base containers lens random reinterpret-cast
+         base containers erf lens mtl random reinterpret-cast
        ];
+       testHaskellDepends = [ base directory HUnit ];
+       jailbreak = true;
        homepage = "https://bitbucket.org/kpratt/random-variate";
        description = "\"Uniform RNG => Non-Uniform RNGs\"";
        license = stdenv.lib.licenses.mit;
@@ -157290,7 +157645,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "redis-io" = callPackage
+  "redis-io_0_5_1" = callPackage
     ({ mkDerivation, async, attoparsec, auto-update, base, bytestring
      , bytestring-conversion, containers, exceptions, iproute
      , monad-control, mtl, network, operational, redis-resp
@@ -157315,6 +157670,34 @@ self: {
        homepage = "https://github.com/twittner/redis-io/";
        description = "Yet another redis client";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "redis-io" = callPackage
+    ({ mkDerivation, async, attoparsec, auto-update, base, bytestring
+     , bytestring-conversion, containers, exceptions, iproute
+     , monad-control, mtl, network, operational, redis-resp
+     , resource-pool, semigroups, stm, tasty, tasty-hunit, time, tinylog
+     , transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "redis-io";
+       version = "0.5.2";
+       sha256 = "ad33020d6aae50b1ab67630a9b63ff4fdb61b1514a84f44d98e7e764f912efdb";
+       libraryHaskellDepends = [
+         attoparsec auto-update base bytestring containers exceptions
+         iproute monad-control mtl network operational redis-resp
+         resource-pool semigroups stm time tinylog transformers
+         transformers-base
+       ];
+       testHaskellDepends = [
+         async base bytestring bytestring-conversion containers redis-resp
+         tasty tasty-hunit tinylog transformers
+       ];
+       doCheck = false;
+       homepage = "https://github.com/twittner/redis-io/";
+       description = "Yet another redis client";
+       license = stdenv.lib.licenses.mpl20;
      }) {};
 
   "redis-job-queue" = callPackage
@@ -164068,8 +164451,8 @@ self: {
      }:
      mkDerivation {
        pname = "sbv";
-       version = "5.8";
-       sha256 = "202fe6dcf80d2843df21bfa1d74b228729883063fa7d2dc540e440c92f9bf5b3";
+       version = "5.9";
+       sha256 = "d515d54203862c936f0395aec042e7bdc8779bc4342ce921622694d6ff92f3b9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -164933,8 +165316,8 @@ self: {
        pname = "scotty";
        version = "0.10.2";
        sha256 = "86ce314927412b8eb38a8e999ecd1fcb66623b1eb801cdef62846d9b97409c4a";
-       revision = "3";
-       editedCabalFile = "ef0b6e3b45bfb35f8fff883561d093eb4a3cafad169e2e0b410bf20fbdb299f8";
+       revision = "4";
+       editedCabalFile = "61ca65b6ea23012d483c01bfcadcad72674011b81b180da6787e619a653e2a98";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring case-insensitive
          data-default-class http-types monad-control mtl nats network
@@ -169048,6 +169431,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "shake-persist" = callPackage
+    ({ mkDerivation, base, binary, directory, shake, template-haskell
+     }:
+     mkDerivation {
+       pname = "shake-persist";
+       version = "0.1.0.0";
+       sha256 = "2404cd39d67a8bbd36afb3e658375faae1d6f54941a2de06abf85155ef87986a";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary directory shake template-haskell
+       ];
+       executableHaskellDepends = [ base shake ];
+       homepage = "https://anonscm.debian.org/cgit/users/kaction-guest/haskell-shake-persist.git";
+       description = "Shake build system on-disk caching";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "shaker" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, directory
      , filepath, ghc, ghc-paths, haskeline, haskell-src, HUnit, mtl
@@ -169486,10 +169887,13 @@ self: {
        pname = "she";
        version = "0.6";
        sha256 = "6cff306f22d7d8d99a1e61dfc0f9fb09ad3f8e21129eabb6ea68014998607274";
+       revision = "1";
+       editedCabalFile = "a81a091b54a4da7f992291e8985919456775776078d3bf1e5e5a81eca66b7a38";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base filepath mtl ];
        executableHaskellDepends = [ base filepath mtl ];
+       jailbreak = true;
        homepage = "http://personal.cis.strath.ac.uk/~conor/pub/she";
        description = "A Haskell preprocessor adding miscellaneous features";
        license = stdenv.lib.licenses.publicDomain;
@@ -173328,6 +173732,8 @@ self: {
        pname = "snaplet-fay";
        version = "0.3.3.12";
        sha256 = "fac218332df80f9c109aa1a0479c3956d286487769840b229d9faa1fda8733c9";
+       revision = "1";
+       editedCabalFile = "9986472ebb3e6f8761004d4d2d3da8e937b786428ffaf39a338eabd364c4a974";
        libraryHaskellDepends = [
          aeson base bytestring configurator directory fay filepath mtl snap
          snap-core transformers
@@ -173347,6 +173753,8 @@ self: {
        pname = "snaplet-fay";
        version = "0.3.3.13";
        sha256 = "39810748b7177b45a0fab785e48ac497d81587e48dde9dc8ad75e8d704bdda3f";
+       revision = "1";
+       editedCabalFile = "7e46253eccd3c819ebf3700a5398e9405ce21069bc5b8f92a29550cf8119e47a";
        libraryHaskellDepends = [
          aeson base bytestring configurator directory fay filepath mtl snap
          snap-core transformers
@@ -176701,6 +177109,8 @@ self: {
        pname = "stack";
        version = "1.0.0";
        sha256 = "cd2f606d390fe521b6ba0794de87edcba64c4af66856af09594907c2b4f4751d";
+       revision = "1";
+       editedCabalFile = "84e631220c35a7563414b2a2c96b7fde9269cce8bd7569e7bccb2ed8d44c5f16";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -183049,15 +183459,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "tar_0_4_4_0" = callPackage
+  "tar_0_4_5_0" = callPackage
     ({ mkDerivation, array, base, bytestring, bytestring-handle
      , containers, deepseq, directory, filepath, old-time, QuickCheck
      , tasty, tasty-quickcheck, time
      }:
      mkDerivation {
        pname = "tar";
-       version = "0.4.4.0";
-       sha256 = "65d12941471e21442f85ef2658a270891df97e0570f71aa0d53a86e8d8647bfe";
+       version = "0.4.5.0";
+       sha256 = "2959d7bb5e941969f023ba558e38f1723e72c6883e6eeca459472f42be33f32a";
        libraryHaskellDepends = [
          array base bytestring containers deepseq directory filepath time
        ];
@@ -183994,6 +184404,46 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "telegram-api" = callPackage
+    ({ mkDerivation, aeson, base, either, hspec, http-types, servant
+     , servant-client, text
+     }:
+     mkDerivation {
+       pname = "telegram-api";
+       version = "0.1.0.0";
+       sha256 = "d013a0dda590c89bc861ab4db28da2e66bf259d2fd2e07f1b1d5ba013a555988";
+       libraryHaskellDepends = [
+         aeson base either servant servant-client text
+       ];
+       testHaskellDepends = [
+         base hspec http-types servant servant-client text
+       ];
+       homepage = "http://github.com/klappvisor/telegram-api#readme";
+       description = "Telegram Bot API bindings";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "teleport" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, base, bytestring
+     , configurator, optparse-applicative, system-filepath, text, turtle
+     }:
+     mkDerivation {
+       pname = "teleport";
+       version = "0.0.0.10";
+       sha256 = "cb39562f0e1fd428f072e2f2e2440f6ac6c2ff8077e767d2fced0e402f575f66";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [
+         aeson ansi-terminal base bytestring configurator
+         optparse-applicative system-filepath text turtle
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/bollu/teleport#readme";
+       description = "A tool to quickly switch between directories";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "tellbot" = callPackage
     ({ mkDerivation, base, bifunctors, bytestring, containers
      , http-conduit, mtl, network, regex-pcre, split, tagsoup, text
@@ -190517,6 +190967,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "turtle_1_2_5" = callPackage
+    ({ mkDerivation, async, base, clock, directory, doctest, foldl
+     , hostname, managed, optional-args, optparse-applicative, process
+     , stm, system-fileio, system-filepath, temporary, text, time
+     , transformers, unix
+     }:
+     mkDerivation {
+       pname = "turtle";
+       version = "1.2.5";
+       sha256 = "006566b6d1060c576ad10db068381ff433598bffac0e49847c6aff522ad9c5c7";
+       libraryHaskellDepends = [
+         async base clock directory foldl hostname managed optional-args
+         optparse-applicative process stm system-fileio system-filepath
+         temporary text time transformers unix
+       ];
+       testHaskellDepends = [ base doctest ];
+       description = "Shell programming, Haskell-style";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tweak" = callPackage
     ({ mkDerivation, base, containers, lens, stm, transformers }:
      mkDerivation {
@@ -191387,10 +191858,10 @@ self: {
     ({ mkDerivation, base, ghc-prim }:
      mkDerivation {
        pname = "type-level-sets";
-       version = "0.5";
-       sha256 = "72f54fb5b3fc69d9921de0761ffbdad2ea6f3798ffdbd0b6d8967b79b7e739d7";
+       version = "0.6.1";
+       sha256 = "08bb523150e2ad8fb3028303ac354f2329da220f4b214e7a18ba7731adbbf926";
        libraryHaskellDepends = [ base ghc-prim ];
-       description = "Type-level sets (with value-level counterparts and various operations)";
+       description = "Type-level sets and finite maps (with value-level counterparts)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -194870,10 +195341,8 @@ self: {
     ({ mkDerivation, base, ghc-prim }:
      mkDerivation {
        pname = "uulib";
-       version = "0.9.21";
-       sha256 = "d0bc9e607a5c9b0144994a70d0f95b93c5a3adfa832fcdea66b7b7d121fbf829";
-       revision = "1";
-       editedCabalFile = "8f6cd3a9143ec45a82a5c5c8e228fadb798b483c1b6d03718d6159f495f89518";
+       version = "0.9.22";
+       sha256 = "cdd0a15d33834e367e2b9d9a6b78cb17e1947e31c7d2d26344a144bf3ab131ad";
        libraryHaskellDepends = [ base ghc-prim ];
        homepage = "https://github.com/UU-ComputerScience/uulib";
        description = "Haskell Utrecht Tools Library";
@@ -195290,8 +195759,8 @@ self: {
     ({ mkDerivation, base, time, transformers }:
      mkDerivation {
        pname = "varying";
-       version = "0.2.0.0";
-       sha256 = "67389aa73d8968809ef4431a898131128f2ef89f9d15ca408ac8871f5857bcea";
+       version = "0.3.0.1";
+       sha256 = "1678e5e71eb18228acba06d7b62220edd3102af620ca19107896ef65855c2aec";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base time transformers ];
@@ -198671,45 +199140,6 @@ self: {
      }) {};
 
   "wai-middleware-content-type" = callPackage
-    ({ mkDerivation, aeson, base, blaze-builder, blaze-html, bytestring
-     , clay, exceptions, hashable, hspec, hspec-wai, http-media
-     , http-types, lucid, mmorph, monad-control, monad-logger, mtl
-     , pandoc, pandoc-types, resourcet, shakespeare, tasty, tasty-hspec
-     , text, transformers, transformers-base, unordered-containers
-     , urlpath, wai, wai-transformers, wai-util, warp
-     }:
-     mkDerivation {
-       pname = "wai-middleware-content-type";
-       version = "0.1.1.1";
-       sha256 = "a2b7855f48904918133311c1498e0b028d4cf8b6c0c45d660872198fbcd50b40";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base blaze-builder blaze-html bytestring clay exceptions
-         hashable http-media http-types lucid mmorph monad-control
-         monad-logger mtl pandoc resourcet shakespeare text transformers
-         transformers-base unordered-containers urlpath wai wai-transformers
-         wai-util
-       ];
-       executableHaskellDepends = [
-         aeson base blaze-builder blaze-html bytestring clay exceptions
-         hashable http-media http-types lucid mmorph monad-control
-         monad-logger mtl pandoc resourcet shakespeare text transformers
-         transformers-base unordered-containers urlpath wai wai-transformers
-         wai-util warp
-       ];
-       testHaskellDepends = [
-         aeson base blaze-builder blaze-html bytestring clay exceptions
-         hashable hspec hspec-wai http-media http-types lucid mmorph
-         monad-control monad-logger mtl pandoc pandoc-types resourcet
-         shakespeare tasty tasty-hspec text transformers transformers-base
-         unordered-containers urlpath wai wai-transformers wai-util warp
-       ];
-       description = "Route to different middlewares based on the incoming Accept header";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "wai-middleware-content-type_0_2_0" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, blaze-html, bytestring
      , clay, exceptions, hashable, hspec, hspec-wai, http-media
      , http-types, lucid, mmorph, monad-control, monad-logger, mtl
@@ -198736,7 +199166,6 @@ self: {
        ];
        description = "Route to different middlewares based on the incoming Accept header";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-middleware-crowd_0_1_1_2" = callPackage
@@ -199139,14 +199568,13 @@ self: {
      }:
      mkDerivation {
        pname = "wai-middleware-verbs";
-       version = "0.1.1";
-       sha256 = "cc1e6be505f4c23f45467d55d55497d844f8c79cd2d855a23d191351e1126184";
+       version = "0.2.0";
+       sha256 = "5e88a38e8e838be9334b72a4dcec70874fe02c8b128dc7a64e682cacfb6ffbf3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base errors exceptions hashable http-types mmorph monad-logger mtl
          resourcet transformers transformers-base unordered-containers wai
-         wai-transformers
        ];
        executableHaskellDepends = [
          base errors exceptions hashable http-types mmorph monad-logger mtl
@@ -201044,16 +201472,15 @@ self: {
      }) {};
 
   "wavefront" = callPackage
-    ({ mkDerivation, attoparsec, base, dlist, filepath, mtl, semigroups
-     , text, transformers, vector
+    ({ mkDerivation, attoparsec, base, dlist, filepath, mtl, text
+     , transformers, vector
      }:
      mkDerivation {
        pname = "wavefront";
-       version = "0.5.1";
-       sha256 = "aab7e9924060c99cfd80576be9f46f337c986570fec49bd6d76ec68557c20033";
+       version = "0.6";
+       sha256 = "572bfde27b7b8a12c148114d3735475c486c6a33da7322c6c18fa5b3bf1199ec";
        libraryHaskellDepends = [
-         attoparsec base dlist filepath mtl semigroups text transformers
-         vector
+         attoparsec base dlist filepath mtl text transformers vector
        ];
        homepage = "https://github.com/phaazon/wavefront";
        description = "Wavefront OBJ loader";
@@ -201381,8 +201808,8 @@ self: {
      }:
      mkDerivation {
        pname = "web-routes-wai";
-       version = "0.24.2";
-       sha256 = "66708017753ab953a34e944a9f90c7f26a24a7eefda2363746a3abde2e2358dd";
+       version = "0.24.3";
+       sha256 = "0737b8f1b0324b2c5aa5f90ee14263a391fc62e2d61ca3d5be4f944d67a30f1c";
        libraryHaskellDepends = [
          base bytestring http-types text wai web-routes
        ];
@@ -206927,6 +207354,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yaml-union" = callPackage
+    ({ mkDerivation, base, bytestring, optparse-applicative
+     , unordered-containers, yaml
+     }:
+     mkDerivation {
+       pname = "yaml-union";
+       version = "0.0.1";
+       sha256 = "b3af25a1e50aa778e5628bce31a4abd5a6c1749a191d9f38549f2e949f8ebd85";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base unordered-containers yaml ];
+       executableHaskellDepends = [
+         base bytestring optparse-applicative yaml
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/michelk/yaml-overrides.hs";
+       description = "Read multiple yaml-files and override fields recursively";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "yaml2owl" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, network
      , swish, text, xml, yaml
@@ -213125,7 +213572,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) zeromq;};
 
-  "zeromq4-haskell" = callPackage
+  "zeromq4-haskell_0_6_3" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, exceptions
      , QuickCheck, semigroups, tasty, tasty-hunit, tasty-quickcheck
      , transformers, zeromq
@@ -213144,6 +213591,28 @@ self: {
        homepage = "http://github.com/twittner/zeromq-haskell/";
        description = "Bindings to ZeroMQ 4.x";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) zeromq;};
+
+  "zeromq4-haskell" = callPackage
+    ({ mkDerivation, async, base, bytestring, containers, exceptions
+     , QuickCheck, semigroups, tasty, tasty-hunit, tasty-quickcheck
+     , transformers, zeromq
+     }:
+     mkDerivation {
+       pname = "zeromq4-haskell";
+       version = "0.6.4";
+       sha256 = "b4ea358c669ccbacf6654ff5437623db3c9ee3161630bc83737a47f430e7746e";
+       libraryHaskellDepends = [
+         async base bytestring containers exceptions semigroups transformers
+       ];
+       libraryPkgconfigDepends = [ zeromq ];
+       testHaskellDepends = [
+         async base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck
+       ];
+       homepage = "http://github.com/twittner/zeromq-haskell/";
+       description = "Bindings to ZeroMQ 4.x";
+       license = stdenv.lib.licenses.mit;
      }) {inherit (pkgs) zeromq;};
 
   "zeroth" = callPackage

From 48e66c39257526a94986ea24c1baa2b7e00835ee Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 6 Jan 2016 23:30:13 +0100
Subject: [PATCH 405/884] Add LTS Haskell 4.0.

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

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 7a44d9303bd8..5e7a54e580a0 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -317,5 +317,9 @@ rec {
       packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-3.20.nix { };
     };
 
+    lts-4_0 = packages.ghc7102.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-4.0.nix { };
+    };
+
   };
 }

From ec70f64ecd3030192a4c31573da8f6e883621700 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 7 Jan 2016 04:53:32 -0600
Subject: [PATCH 406/884] nixos: tarsnap - separate archive cachedirs

Tarsnap locks the cachedir during backup, meaning if you specify
multiple backups with a shared cache that might overlap (for example,
one backup may take an hour), secondary backups will fail. This isn't
very nice behavior for the obvious reasons.

This splits the cache dirs for each archive appropriately. Note that
this will require a rebuild of your archive caches (although if you were
only using one archive for your whole system, you can just move the
directory).

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 nixos/modules/services/backup/tarsnap.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/backup/tarsnap.nix b/nixos/modules/services/backup/tarsnap.nix
index 3a51e6b7aa6c..d9a57eedc9ba 100644
--- a/nixos/modules/services/backup/tarsnap.nix
+++ b/nixos/modules/services/backup/tarsnap.nix
@@ -5,8 +5,8 @@ with lib;
 let
   cfg = config.services.tarsnap;
 
-  configFile = cfg: ''
-    cachedir ${config.services.tarsnap.cachedir}
+  configFile = name: cfg: ''
+    cachedir ${config.services.tarsnap.cachedir}/${name}
     keyfile  ${config.services.tarsnap.keyfile}
     ${optionalString cfg.nodump "nodump"}
     ${optionalString cfg.printStats "print-stats"}
@@ -57,6 +57,12 @@ in
           will refuse to run until you manually rebuild the cache with
           <command>tarsnap --fsck</command>.
 
+          Note that each individual archive (specified below) has its own cache
+          directory specified under <literal>cachedir</literal>; this is because
+          tarsnap locks the cache during backups, meaning multiple services
+          archives cannot be backed up concurrently or overlap with a shared
+          cache.
+
           Set to <literal>null</literal> to disable caching.
         '';
       };
@@ -258,6 +264,7 @@ in
         mkdir -p -m 0700 ${cfg.cachedir}
         chown root:root ${cfg.cachedir}
         chmod 0700 ${cfg.cachedir}
+        mkdir -p -m 0700 ${cfg.cachedir}/$1
         DIRS=`cat /etc/tarsnap/$1.dirs`
         exec tarsnap --configfile /etc/tarsnap/$1.conf -c -f $1-$(date +"%Y%m%d%H%M%S") $DIRS
       '';
@@ -280,7 +287,7 @@ in
 
     environment.etc =
       (mapAttrs' (name: cfg: nameValuePair "tarsnap/${name}.conf"
-        { text = configFile cfg;
+        { text = configFile name cfg;
         }) cfg.archives) //
       (mapAttrs' (name: cfg: nameValuePair "tarsnap/${name}.dirs"
         { text = concatStringsSep " " cfg.directories;

From 7a01badef58ae91cbfa140df7f9f62f6bec5761e Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 7 Jan 2016 05:47:04 -0600
Subject: [PATCH 407/884] nixos: tarsnap - allow keys for individual archives

Two concurrent tarsnap backups cannot be run at the same time with the
same keys - completely separate sets of keys must be generated for each
archive in this case, if you want backups to overlap.

This extends the archives attrset to support a 'keyfile' option, which
defaults to /root/tarsnap.key like the top-level attribute.

With this change, if you generate two keys with tarsnap-keygen(1) and
use each of those separately for each archive, you can backup
concurrently.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 nixos/modules/services/backup/tarsnap.nix | 38 ++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/backup/tarsnap.nix b/nixos/modules/services/backup/tarsnap.nix
index d9a57eedc9ba..78776786468b 100644
--- a/nixos/modules/services/backup/tarsnap.nix
+++ b/nixos/modules/services/backup/tarsnap.nix
@@ -7,7 +7,7 @@ let
 
   configFile = name: cfg: ''
     cachedir ${config.services.tarsnap.cachedir}/${name}
-    keyfile  ${config.services.tarsnap.keyfile}
+    keyfile  ${cfg.keyfile}
     ${optionalString cfg.nodump "nodump"}
     ${optionalString cfg.printStats "print-stats"}
     ${optionalString cfg.printStats "humanize-numbers"}
@@ -41,6 +41,20 @@ in
           account.
           Create the keyfile with <command>tarsnap-keygen</command>.
 
+          Note that each individual archive (specified below) may also have its
+          own individual keyfile specified. Tarsnap does not allow multiple
+          concurrent backups with the same cache directory and key (starting a
+          new backup will cause another one to fail). If you have multiple
+          archives specified, you should either spread out your backups to be
+          far apart, or specify a separate key for each archive. By default
+          every archive defaults to using
+          <literal>"/root/tarsnap.key"</literal>.
+
+          It's recommended for backups that you generate a key for every archive
+          using <literal>tarsnap-keygen(1)</literal>, and then generate a
+          write-only tarsnap key using <literal>tarsnap-keymgmt(1)</literal>,
+          and keep your master key(s) for a particular machine off-site.
+
           The keyfile name should be given as a string and not a path, to
           avoid the key being copied into the Nix store.
         '';
@@ -71,6 +85,28 @@ in
         type = types.attrsOf (types.submodule (
           {
             options = {
+              keyfile = mkOption {
+                type = types.str;
+                default = config.services.tarsnap.keyfile;
+                description = ''
+                  Set a specific keyfile for this archive. This defaults to
+                  <literal>"/root/tarsnap.key"</literal> if left unspecified.
+
+                  Use this option if you want to run multiple backups
+                  concurrently - each archive must have a unique key. You can
+                  generate a write-only key derived from your master key (which
+                  is recommended) using <literal>tarsnap-keymgmt(1)</literal>.
+
+                  Note: every archive must have an individual master key. You
+                  must generate multiple keys with
+                  <literal>tarsnap-keygen(1)</literal>, and then generate write
+                  only keys from those.
+
+                  The keyfile name should be given as a string and not a path, to
+                  avoid the key being copied into the Nix store.
+                '';
+              };
+
               nodump = mkOption {
                 type = types.bool;
                 default = true;

From 2c4fccc244fad79d91b1df7124598cc3f691a49d Mon Sep 17 00:00:00 2001
From: Oliver Dunkl <oliver.dunkl@gmail.com>
Date: Thu, 7 Jan 2016 12:57:22 +0100
Subject: [PATCH 408/884] python-packages: pafy 0.4.2 -> 0.4.3

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c805c7dd6831..d8feeb811a00 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22917,11 +22917,11 @@ in modules // {
 
   pafy = buildPythonPackage rec {
     name = "pafy-${version}";
-    version = "0.4.2";
+    version = "0.4.3";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/p/pafy/${name}.tar.gz";
-      sha256 = "140nacvyv1a2frvgygbpbsdpxjh82ysfmgp7jf2apn4x2gnkip59";
+      sha256 = "1la4nn4n66p6dmcf1dyxw7i5j0xprmq82gwmxjv1jjis7vsnk254";
     };
 
     propagatedBuildInputs = with self; [ youtube-dl ];

From 3f02fd68de98abc2e2692a8d53c714c15d41b917 Mon Sep 17 00:00:00 2001
From: Oliver Dunkl <oliver.dunkl@gmail.com>
Date: Thu, 7 Jan 2016 13:00:43 +0100
Subject: [PATCH 409/884] python-packages: mps-youtube 0.2.5 -> 0.2.6

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d8feeb811a00..105c85a7a7bc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22999,15 +22999,15 @@ in modules // {
 
   mps-youtube = buildPythonPackage rec {
     name = "mps-youtube-${version}";
-    version = "0.2.5";
+    version = "0.2.6";
 
     disabled = (!isPy3k);
 
     src = pkgs.fetchFromGitHub {
       owner = "mps-youtube";
       repo = "mps-youtube";
-      rev = "7e457d2b4700387b88a3c96579e13cb76ca1f06b";
-      sha256 = "1811vlhgfi4rasjfsfdl7x174s75zk3x08p2z05wfcvinflfgxly";
+      rev = "v${version}";
+      sha256 = "1vbf60z2birbm7wc9irxy0jf5x3y32ncl8fw52v19xyx7fq10jrm";
     };
 
     propagatedBuildInputs = with self; [ pafy ];

From e4b4e9b9866758d7843cafe941cb7b59132bd673 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 7 Jan 2016 12:48:12 +0100
Subject: [PATCH 410/884] linux: Make Unix domain sockets builtin

This hopefully fixes intermittent initrd failures where udevd cannot
create a Unix domain socket:

  machine# running udev...
  machine# error getting socket: Address family not supported by protocol
  machine# error initializing udev control socket
  machine# error getting socket: Address family not supported by protocol

The "unix" kernel module is supposed to be loaded automatically, and
clearly that works most of the time, but maybe there is a race
somewhere. In any case, no sane person would run a kernel without Unix
domain sockets, so we may as well make it builtin.

http://hydra.nixos.org/build/30001448
---
 nixos/modules/system/boot/kernel.nix            | 3 ---
 pkgs/os-specific/linux/kernel/common-config.nix | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index 17e3a038221c..bef18fc8771b 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -197,9 +197,6 @@ in
         "hid_generic" "hid_lenovo"
         "hid_apple" "hid_logitech_dj" "hid_lenovo_tpkbd" "hid_roccat"
 
-        # Unix domain sockets (needed by udev).
-        "unix"
-
         # Misc. stuff.
         "pcips2" "atkbd"
 
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index ef38043b8d65..14e28170e6f9 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -36,6 +36,9 @@ with stdenv.lib;
   SCHEDSTATS n
   DETECT_HUNG_TASK y
 
+  # Unix domain sockets.
+  UNIX y
+
   # Power management.
   ${optionalString (versionOlder version "3.19") ''
     PM_RUNTIME y

From 64bc8a84a4c93d7a4732e7aff87a2d804893cc44 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 31 Dec 2015 22:14:44 +0100
Subject: [PATCH 411/884] Force another rebuild

Unfortunately, yesterday Nix got reverted to a version with broken
passAsFile implementation on some Hydra machines, so we have corrupted
files again. (E.g. http://hydra.nixos.org/build/29777678.) Forcing
another gratuitous rebuild to get rid of them.

(cherry picked from commit 75974d9220b8397c736ada76fb24eb934fa62f6c)
---
 pkgs/build-support/trivial-builders.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
index 1350e36940b3..13ed5b3e9961 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -28,11 +28,13 @@ rec {
       ''
         n=$out${destination}
         mkdir -p "$(dirname "$n")"
+
         if [ -e "$textPath" ]; then
           mv "$textPath" "$n"
         else
           echo -n "$text" > "$n"
         fi
+
         (test -n "$executable" && chmod +x "$n") || true
       '';
 

From a9abdc842676a9bc6b593dfa319e36ac6047af38 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Thu, 7 Jan 2016 22:10:44 +0900
Subject: [PATCH 412/884] firefox-bin: 43.0.3 -> 43.0.4

---
 .../browsers/firefox-bin/sources.nix          | 358 +++++++++---------
 1 file changed, 179 insertions(+), 179 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
index e1895e3bbe22..14806cef25a1 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
@@ -4,185 +4,185 @@
 # ruby generate_sources.rb > sources.nix
 
 {
-  version = "43.0.3";
+  version = "43.0.4";
   sources = [
-    { locale = "ach"; arch = "linux-i686"; sha256 = "1274cb4148d115ab4d8bc5b5c6826e80863e2bf0f76f0165521beb5da2fb5d22"; }
-    { locale = "ach"; arch = "linux-x86_64"; sha256 = "2184a0a1b3bcb833369959cb1fb641ac9501dad40828d7260022dc3492f4444b"; }
-    { locale = "af"; arch = "linux-i686"; sha256 = "807efe3a2277494f04e957b60f033c31d58145b5dd1e13fac3c027e811849932"; }
-    { locale = "af"; arch = "linux-x86_64"; sha256 = "53f654dca168125a1c55842125c3480f41d3f66b5ea2b0978912f5602d7a317b"; }
-    { locale = "an"; arch = "linux-i686"; sha256 = "ad97be84a2c59570919939ad72542d140a7c46c45ae2747c24f5cbebbf201222"; }
-    { locale = "an"; arch = "linux-x86_64"; sha256 = "1608d249fb454be2d241f512d74662d0089f85a1d7ff8888d43aa3efcd6c2f73"; }
-    { locale = "ar"; arch = "linux-i686"; sha256 = "d464251e1734271cf5854d2b9dcc7bb391205f78f6f80263b5648e0e03e841b8"; }
-    { locale = "ar"; arch = "linux-x86_64"; sha256 = "0cfb84665d40bc40f3a2bf77f58fd499ec9a33aec3c82aa384edda9fb64756eb"; }
-    { locale = "as"; arch = "linux-i686"; sha256 = "d20fe776c5a036016a89754e30a773082ec018112d7f8848b532f56aa3f91bd6"; }
-    { locale = "as"; arch = "linux-x86_64"; sha256 = "4eec5f44fa188e84376cb87249410decd7662271782f347d7f9cda40a52b40ad"; }
-    { locale = "ast"; arch = "linux-i686"; sha256 = "2c75f6b6cc9202d090eb349f9fc4f5995724d6c5675149dfdfb0476475e964d6"; }
-    { locale = "ast"; arch = "linux-x86_64"; sha256 = "39b23638d5e2aea613ec0f32b7ad71b7084dd333146413c82d5f91c42d7bc099"; }
-    { locale = "az"; arch = "linux-i686"; sha256 = "b07d6481777a4b9bf1f06a00c820e4cad6e7ae414099afb1619bb1ae71fc8b5d"; }
-    { locale = "az"; arch = "linux-x86_64"; sha256 = "da5852870bda9c27ec1a16893d990180e08031565c54390828c0ae2d38cedc89"; }
-    { locale = "be"; arch = "linux-i686"; sha256 = "a04ee5c4521e46675919aa9cac9a56277cd741195248ffcf260eaf875e992afb"; }
-    { locale = "be"; arch = "linux-x86_64"; sha256 = "41d8a66b2f39575c7fd5164464c0c8430255e86a2c56eaaef1283107fe92832d"; }
-    { locale = "bg"; arch = "linux-i686"; sha256 = "edf94d80e1a9641569123f6a711699f840919398e5e7230fa4fde9d35b0ad09c"; }
-    { locale = "bg"; arch = "linux-x86_64"; sha256 = "8e1fc0d661c3b54ecc2848fb9309040c4250e0eb9be206e515474dc0cf893ed4"; }
-    { locale = "bn-BD"; arch = "linux-i686"; sha256 = "76237b91fd2efe99f07c11d6a0080e85dd7ea6c0414e917a74da6d1361297439"; }
-    { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "c6cc9b00423124879b4900918ff791531c7b3b3f11866ad16fb27630aba6a1a8"; }
-    { locale = "bn-IN"; arch = "linux-i686"; sha256 = "ea378725ca575e30f42dabff703acfc7246498fd765dcd3fc2922f0fbb0cda31"; }
-    { locale = "bn-IN"; arch = "linux-x86_64"; sha256 = "fbf01a2b84d8aa35a388baaf56b2034207a12f4a2a9b79faaccf772f8a23d705"; }
-    { locale = "br"; arch = "linux-i686"; sha256 = "adbbcfd6cff2e0dc5fbcaa91dd6b2dfc13d04a80be35ea365907d8aa2f17256a"; }
-    { locale = "br"; arch = "linux-x86_64"; sha256 = "7b557210b559f920dd3b9e69371d98f08ce2fe0d929e04a1b88fd56fcc793122"; }
-    { locale = "bs"; arch = "linux-i686"; sha256 = "32508d4c75f5e23e1082513ebc4a20f5f6d98277c5121abde475eaf48a762b81"; }
-    { locale = "bs"; arch = "linux-x86_64"; sha256 = "a2c6354582d8dd42b8e180a705c158d4b85ba3ff68d97863129dc71b05a83612"; }
-    { locale = "ca"; arch = "linux-i686"; sha256 = "e8155974306fd84d7fc3330ed7a8da5b234f1790dc6792c9e59648c93660866a"; }
-    { locale = "ca"; arch = "linux-x86_64"; sha256 = "46cd90407fe839356b63eecdee839dbde68651ebb631419273b6c4d7d31d84ce"; }
-    { locale = "cs"; arch = "linux-i686"; sha256 = "50cdc07a438ef44ff6a7585583c38c604a71081770f38add190079300afe3b54"; }
-    { locale = "cs"; arch = "linux-x86_64"; sha256 = "1e4bf0b42a263a99b16bf083d0152e667fdd534c0a2cdcd6557f6b85506aa0e4"; }
-    { locale = "cy"; arch = "linux-i686"; sha256 = "95c184685fa32bfa8999a953b1b1001d5d8a73ae82bd2b70d70e6feb990f5b77"; }
-    { locale = "cy"; arch = "linux-x86_64"; sha256 = "7117b1067f753c7d692b73c6aab610fa0eabf423e24444f7ac8893339264414f"; }
-    { locale = "da"; arch = "linux-i686"; sha256 = "46d179f893df3e7af77da5f3355d2418b0fcffd3060d0c9aebc62087075177b8"; }
-    { locale = "da"; arch = "linux-x86_64"; sha256 = "0514a6f88470681b93a9d8202f48159d031387e5e42d14923cfa1cea2113d753"; }
-    { locale = "de"; arch = "linux-i686"; sha256 = "4d30e8a59ba3ac04e387df7df6be1edf88b08ca37463fd9ccf301def3542cc35"; }
-    { locale = "de"; arch = "linux-x86_64"; sha256 = "ae6f94e6a782103efd18515a6596a5ee06943b2d1321f03127d54ae7ed147131"; }
-    { locale = "dsb"; arch = "linux-i686"; sha256 = "62880a87963abf9e36e820644a8165f980f7b48634b1a1f825f5aee0d2e19e74"; }
-    { locale = "dsb"; arch = "linux-x86_64"; sha256 = "ff2a596f46b02bea98fa36defa0afd96c064912a79ea8b4f98aae46901624f22"; }
-    { locale = "el"; arch = "linux-i686"; sha256 = "5fb00e56adfd520d114208ba72b9a3fb5306903e0b2b3669bb109549b0b4ef6e"; }
-    { locale = "el"; arch = "linux-x86_64"; sha256 = "df3fd6d2206918c324182ada0a3bce912726a48383537be69a695e678a0cbeb5"; }
-    { locale = "en-GB"; arch = "linux-i686"; sha256 = "d3e21c467cf25b5629cb9bfa5c18daba024e3665e5c69830f472dfc93b062e04"; }
-    { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "210d41c4e9861713dba228d34781b05850b9839606a975580b0dedca556e8e53"; }
-    { locale = "en-US"; arch = "linux-i686"; sha256 = "78b95a47e73d2ef7d436f59fb1e7f300c6075bae4ab41d3557b6b17520416d57"; }
-    { locale = "en-US"; arch = "linux-x86_64"; sha256 = "6f27b0499ee599b6dae1e7ef5a79e935fb186b6fdfb2f09274cdf40bcbf2006f"; }
-    { locale = "en-ZA"; arch = "linux-i686"; sha256 = "f16af1ead4c5ba73ec2b137764cac5e610574f107763c20667f9d565f10b4ca6"; }
-    { locale = "en-ZA"; arch = "linux-x86_64"; sha256 = "de561c70c19a8e921fe8035af4513a0b1c3fc184739f42e4d6e76051278a0e75"; }
-    { locale = "eo"; arch = "linux-i686"; sha256 = "78670d675bff447c654717763157e4726e0fe3612568e993c2eb7cfd9b893ef7"; }
-    { locale = "eo"; arch = "linux-x86_64"; sha256 = "fa8d9ddc8113a33c2c9776cee0eeeccf46b00aa2f099e9ebda3aef370104212c"; }
-    { locale = "es-AR"; arch = "linux-i686"; sha256 = "77366f398047143357cf250903cc0ccc99c58bbf882e8de7f106237632a5c944"; }
-    { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "453245f940832fd4f3e3d3509d83e0e6d900d0154623b779a830d3d990652027"; }
-    { locale = "es-CL"; arch = "linux-i686"; sha256 = "ff985d60ce0ae316c7b9452bd3f385d80a1ab5e1671119a859450e2a930edd65"; }
-    { locale = "es-CL"; arch = "linux-x86_64"; sha256 = "992ae0721558d042041d46da1f8ed3763a2c9dbd2c54063e3ce074ef7a49329a"; }
-    { locale = "es-ES"; arch = "linux-i686"; sha256 = "2195599d5d196903b21a27e3447524a31fc69845af2a02cd7e4e5ebc8d1695b2"; }
-    { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "9e7cafa1a4b9712c58812acaadd49f41c027dd41af569df326b9668d64fedfc3"; }
-    { locale = "es-MX"; arch = "linux-i686"; sha256 = "63ed5abc352b5eb16e0f91c7da69cb9121363607c312674c6d9c9d2c45211bda"; }
-    { locale = "es-MX"; arch = "linux-x86_64"; sha256 = "063c73c0285ec2761e7483d21f6e43769fc9cb7aeb7a93803e63fffb7c4245c4"; }
-    { locale = "et"; arch = "linux-i686"; sha256 = "b331149411d855616857bd4eca5911f570deb601b203ce21ddf11b854de363e5"; }
-    { locale = "et"; arch = "linux-x86_64"; sha256 = "a482ce4d21251a5757dafaf86d5afc708989db0a367357a34c3b5fba0a05f8ef"; }
-    { locale = "eu"; arch = "linux-i686"; sha256 = "3ec3222f06b468a3d94b68c2dccbc21d9b63de765be90fdcb594be4146885786"; }
-    { locale = "eu"; arch = "linux-x86_64"; sha256 = "411490db2e9acd6cc6170b8a6c90d7e2a9beb83f4437d087e755b0845aac8c4a"; }
-    { locale = "fa"; arch = "linux-i686"; sha256 = "b7804d3f0c8c43ef256b44b0bd9e32caa2aab5c7a7ef3b072cd14adfc5b24e0e"; }
-    { locale = "fa"; arch = "linux-x86_64"; sha256 = "91601b52dc9557e17eb80db60a0c9a023ea9ef5d06f8355b077b9e7ffd3800b3"; }
-    { locale = "ff"; arch = "linux-i686"; sha256 = "2143e1d2629b4b1aa6f35f4dfbfaaece09711b65a9da80d6a7303d70362ca8a2"; }
-    { locale = "ff"; arch = "linux-x86_64"; sha256 = "20fd859ea943e3d0a3bfd0427b07117233ac6c980aedf1c4461dc71f2f132ee4"; }
-    { locale = "fi"; arch = "linux-i686"; sha256 = "6bea2d99cd49e3ddadecec22d4832abfd037b7e4a7036b2638f8dd61ba33e227"; }
-    { locale = "fi"; arch = "linux-x86_64"; sha256 = "0eb961fd7512d0223dac43c4895a69404c1d533224d880e619ec91809ae476cc"; }
-    { locale = "fr"; arch = "linux-i686"; sha256 = "86f07727d64fa4122291d9de053b8654d190833f89d3b4d382786c697ee47bf0"; }
-    { locale = "fr"; arch = "linux-x86_64"; sha256 = "63b23116db3c464d6a7bd3e72f9fe82aa236c4e542994621194736fa76c16451"; }
-    { locale = "fy-NL"; arch = "linux-i686"; sha256 = "de6ba7ee545d59c4d60380bc21a68e00cf88f6ce598d326cc04c57b104267610"; }
-    { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "48a1e32a6f110119d729584cd0c5002bdbff2d67e3ed58e777e6eaf443449295"; }
-    { locale = "ga-IE"; arch = "linux-i686"; sha256 = "42d784a229b674016e51ddd71d634fc20a39c6f6c3c9b98f8f52c1be2146a447"; }
-    { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "7b8c257448701a7f252da43a6fd466bb80326405d81683525feefb1d1947856c"; }
-    { locale = "gd"; arch = "linux-i686"; sha256 = "f192ee509e71d58dc8cdca8cfdae4d103bb9542b6c9a807f2b8e9e1b81f0309b"; }
-    { locale = "gd"; arch = "linux-x86_64"; sha256 = "03135f6eb67046aee154040c1d089504ff307bc3fcbacc55c6266827e3675d6e"; }
-    { locale = "gl"; arch = "linux-i686"; sha256 = "73fb03a71ccf7d6bd1dcb0fa28c21745f3944c28e51e700b190f1b872b38c2a0"; }
-    { locale = "gl"; arch = "linux-x86_64"; sha256 = "33832cee5dabd5e9114b9848cebe505b59bbf9a0151f6ac9f3229edcf9462e6e"; }
-    { locale = "gu-IN"; arch = "linux-i686"; sha256 = "8f2a45c81547a2b89194bdbc9e52f22d7d1b3bd356960433c970d59b2ce3b4d4"; }
-    { locale = "gu-IN"; arch = "linux-x86_64"; sha256 = "4be14ca66c881c81f525d997cadc291632159722b5b9baabb430c9dfba6218e5"; }
-    { locale = "he"; arch = "linux-i686"; sha256 = "452a9742ac4fc7ed3daa436bebe16a7d9530fe9c1587591e2a2a5247adcd4ce4"; }
-    { locale = "he"; arch = "linux-x86_64"; sha256 = "57a347dccb36b7f53af06e850ea8170364fe4c50b2164fa6b51231eb834f777a"; }
-    { locale = "hi-IN"; arch = "linux-i686"; sha256 = "8a4b1d09f715742fd9465d2fdd525d271b94ed1d0face088b8d1ae10b5ee00c6"; }
-    { locale = "hi-IN"; arch = "linux-x86_64"; sha256 = "7a5f1dee1cd04118c366c315ed5d7228829e097e39405dd7115d85d0c4791517"; }
-    { locale = "hr"; arch = "linux-i686"; sha256 = "05e80b6d007cd3cdfe2f993c5194ce84b9d111b500378f8da675b7c478a6ab51"; }
-    { locale = "hr"; arch = "linux-x86_64"; sha256 = "570b5eb8072f39af37fa0f9bf3eb51ef538862c6488295ec8d193d84b8ed8206"; }
-    { locale = "hsb"; arch = "linux-i686"; sha256 = "2b6a3c03d2f4c8e59503c896bb3654452cb75115aeec24c3b10f4a528c4c0322"; }
-    { locale = "hsb"; arch = "linux-x86_64"; sha256 = "c94b2af1158abb85e0883c6cd8f6f361debfa99d2291f62c47fc7a2413c33758"; }
-    { locale = "hu"; arch = "linux-i686"; sha256 = "0082c743077a1e50575b96e6e4ce4bd65c4fe6830b112d87fc0157556aa4d38d"; }
-    { locale = "hu"; arch = "linux-x86_64"; sha256 = "3dba1ec3efed6f27429ddb7fb3cef5f5061783f6ca7ce3fc64de40e22159c1bd"; }
-    { locale = "hy-AM"; arch = "linux-i686"; sha256 = "4ccb6b342a9a914392fa3a242136b39cba32f0d6029c5f5c4cb9c5c2658a9813"; }
-    { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "632b713c29d84da3e3e800e7b520a84e3647b5717e08710fc32047270f037de5"; }
-    { locale = "id"; arch = "linux-i686"; sha256 = "6bf6556a9ea92d2dfa3e49bb8563e2de5cc53b264c2e43fed08183717babeee8"; }
-    { locale = "id"; arch = "linux-x86_64"; sha256 = "9d321c03c2392f590288c6f928838e2d5dffd27a7cd7b047199b8170a99619bc"; }
-    { locale = "is"; arch = "linux-i686"; sha256 = "cb6f3d253b4f3bc010a3ea5be449c68050f893d7af912a7b161ef09af881774d"; }
-    { locale = "is"; arch = "linux-x86_64"; sha256 = "edab26c92c2e5e3590775adfca72cddc876e0974cc4101ffe0554c79cec79f51"; }
-    { locale = "it"; arch = "linux-i686"; sha256 = "7e09f9e10f216659afc0e4395e5914c99914dc62742b47091ffe104c70c5158d"; }
-    { locale = "it"; arch = "linux-x86_64"; sha256 = "e1d362fea0f3abed1e9894d5c5ceb9648d4d29e908a99b0b31725d2fbd2f97d0"; }
-    { locale = "ja"; arch = "linux-i686"; sha256 = "db2f20165e5f9d940e409694f10e045855a8dcbdc08004f637827348cea8d760"; }
-    { locale = "ja"; arch = "linux-x86_64"; sha256 = "425784e5502ca41ec131fbb71a0f8390468d08a80848cbf8e8c27de752755646"; }
-    { locale = "kk"; arch = "linux-i686"; sha256 = "c7faf20960a5882f61173974c62ce4f57e6d65f210a608c4ad29c6135f3f9de2"; }
-    { locale = "kk"; arch = "linux-x86_64"; sha256 = "56849c7caa7b8058e65438a090e8d1c9465548afc8413ed9b62846147573649b"; }
-    { locale = "km"; arch = "linux-i686"; sha256 = "1df201969617dd64f9532128216305780130871c2bd7b52632e9d6759efa633f"; }
-    { locale = "km"; arch = "linux-x86_64"; sha256 = "5445cc000d95bf43a822d9f95581a75aee4ed267aa291a377c8bbd6e10d99bae"; }
-    { locale = "kn"; arch = "linux-i686"; sha256 = "d6388df75df201b0d876fd2da6d4865fe9803a81ad385e3ec51cd0f1e23ee581"; }
-    { locale = "kn"; arch = "linux-x86_64"; sha256 = "6fa81e2c9077ace3215de6583e860887209ef68d4cc15243a585771453a6e98f"; }
-    { locale = "ko"; arch = "linux-i686"; sha256 = "2c7d2fa3727b5befdf8e538b0f31ea43a9f1ce4cd164ead8cddd231525f6d523"; }
-    { locale = "ko"; arch = "linux-x86_64"; sha256 = "91f89a54979bd625ad5ff840bf876205a151e023b7fcfbd3a917fb2d9e586ce0"; }
-    { locale = "lij"; arch = "linux-i686"; sha256 = "3bab33ddca338da11b75b34f2db6c78ac89ceec4b0936c1a0e54f71b00926da6"; }
-    { locale = "lij"; arch = "linux-x86_64"; sha256 = "ad470c6c38adee3ba65098dd69a358176d8fc750b9e4062a4adffbd9d610a4cf"; }
-    { locale = "lt"; arch = "linux-i686"; sha256 = "a2e50a5330a18ea49edbcc45f7cd0c6daf8044bb8e4393569bf937a03ea44be7"; }
-    { locale = "lt"; arch = "linux-x86_64"; sha256 = "761ab112b43a21553bee96a845a0300b492f4189e49cf3952a5f2abb3ef3da98"; }
-    { locale = "lv"; arch = "linux-i686"; sha256 = "08ee4150abdf8f6a5e609e7c7a86ad0624b65b6750df7f7e89fdcaeb2af3ab58"; }
-    { locale = "lv"; arch = "linux-x86_64"; sha256 = "32e2ccb0b162c7b48a1b331547fb4449470833397662e37cad054885ddc22a1f"; }
-    { locale = "mai"; arch = "linux-i686"; sha256 = "33733010e364be12ce023ae890afe14a95426a904429c422875d5cd0fbbbdd05"; }
-    { locale = "mai"; arch = "linux-x86_64"; sha256 = "621886c515627faa305c3029b880d88f88671e2bf1dee55c07f29adeb7b3b07b"; }
-    { locale = "mk"; arch = "linux-i686"; sha256 = "64833dae9d93818289edae4b3964dd6abcfe7b1a35751e6b4836d635ed383262"; }
-    { locale = "mk"; arch = "linux-x86_64"; sha256 = "344f82fa85ba3ec1fc945aaf7e185b2fb7b6077ae9d178ba0bd31e381096b0da"; }
-    { locale = "ml"; arch = "linux-i686"; sha256 = "7f659b446ead282c12be202510f42b0b286cf4667399ce891f2e412b23b9c39c"; }
-    { locale = "ml"; arch = "linux-x86_64"; sha256 = "9277acf9c4836fbeef17482f87343cc14c81adaf0939b12dc943e28cdb42dbda"; }
-    { locale = "mr"; arch = "linux-i686"; sha256 = "ab8a5d5282c43ba3e7b3007f9c85a8bb90f981a9eaaaaa2825b4767791a98aaf"; }
-    { locale = "mr"; arch = "linux-x86_64"; sha256 = "032aa9462b189faee85aa41da633c44d91962ccf7e0f58ba332ef039d8c909f0"; }
-    { locale = "ms"; arch = "linux-i686"; sha256 = "05446c324dd379bddb4adf457c8b889512383f97f3402fff915a331977fbad19"; }
-    { locale = "ms"; arch = "linux-x86_64"; sha256 = "92f9ab50f8f6acc962408fccf2d04a431689a8b3ebfb7267b5354f3fd45f2ee1"; }
-    { locale = "nb-NO"; arch = "linux-i686"; sha256 = "5f17aa376b3b427be78149330f39d7551c0662c96e3748353aaff66a0678d76a"; }
-    { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "c80518adfb3297e9b86b6e756543af0c00b93b94a582ae0d2ea9ae09e492aa39"; }
-    { locale = "nl"; arch = "linux-i686"; sha256 = "3742c55f29df607949a022c58198047c85bca9cce92bcac2ad3edd1d59369d3e"; }
-    { locale = "nl"; arch = "linux-x86_64"; sha256 = "821242ff332f747a7e64e191821d5ef364ce60e81bc6469b578f418f6247138c"; }
-    { locale = "nn-NO"; arch = "linux-i686"; sha256 = "666fde211cb7bafbc16d225a06717f12f3bc00b4bb1a1c370ae36013037ce8df"; }
-    { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "0b552296bd154d78fb615f60feb63442ad9790c31101ede4bdb8dc101d163a26"; }
-    { locale = "or"; arch = "linux-i686"; sha256 = "28453ca9c48bc0c06bd5f57f110d4a9d4d8418dd7175b353664eea3547dd2f94"; }
-    { locale = "or"; arch = "linux-x86_64"; sha256 = "dc273e392c654be0160ee60c2db2ef90acff7771ed0aeade38dd96051df9ee29"; }
-    { locale = "pa-IN"; arch = "linux-i686"; sha256 = "e690cf215c693ef3e934a5d4a2b06c98e4da3b205bf44b3392b6fbfaee464167"; }
-    { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "b399037e89c83872238489ec82d6683f0383bd9efd559f497ca4c60f6b32d6b0"; }
-    { locale = "pl"; arch = "linux-i686"; sha256 = "f455c411b3c46155bb37086f16878e18cbf493d6845ff5c9731ce86bf8743f1b"; }
-    { locale = "pl"; arch = "linux-x86_64"; sha256 = "37561debefd6e7cc0790517bc0afa8e924b65abebee654390f1e175797b98eea"; }
-    { locale = "pt-BR"; arch = "linux-i686"; sha256 = "f98e9944ae43b739f44743392e5aedf8eb968a1cdee85ee9e458225c2e250305"; }
-    { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "b10a4c8ce4be229a384c48663fe1391b2a6ae276bacf0475660989fc795c9494"; }
-    { locale = "pt-PT"; arch = "linux-i686"; sha256 = "9bbe3af6bad4f052332621e2cd2fbeefed70bdb1726045c49db23b2e5ccd116a"; }
-    { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "b1b5df4587b7706e8f2ef95978cd1e8ff3d13e57f003a82918005a358175e87d"; }
-    { locale = "rm"; arch = "linux-i686"; sha256 = "0e36c1f71249c93c2d7ed4e950f05e6879a57e5c2bd95da53ce7ebb5ce7b0264"; }
-    { locale = "rm"; arch = "linux-x86_64"; sha256 = "91b165b2703605bf3fd53f610c1362b54ae4814eaeee4ee79e3dbca76c29f3f5"; }
-    { locale = "ro"; arch = "linux-i686"; sha256 = "ec74d573c28236eee3e0db9f4f618666816598becca2547e6532d2c9ba49af59"; }
-    { locale = "ro"; arch = "linux-x86_64"; sha256 = "da44dd696ecfa24ac80edd7b3270f960c35235e8be5c315a21a34305858fb14a"; }
-    { locale = "ru"; arch = "linux-i686"; sha256 = "4c6a0778715f18eeebe377cb097c8871c30e704674ec28c96a239f24d7104256"; }
-    { locale = "ru"; arch = "linux-x86_64"; sha256 = "be1f22e43c9bccc89dfe03bd5888fff08e7e15c9660d381435d86e0e9b55467c"; }
-    { locale = "si"; arch = "linux-i686"; sha256 = "d4f78ac52a4457a8e28d7b87d1c9a58224f4b30f3b70178b721eef4207014ae2"; }
-    { locale = "si"; arch = "linux-x86_64"; sha256 = "246c553262c646a5065c684b752f7e410973c3c7354b051ce404188efdd7393c"; }
-    { locale = "sk"; arch = "linux-i686"; sha256 = "629fff240304c8e45854ec3d9d9e66b67430663484f17e93eb109738cf5c7d8b"; }
-    { locale = "sk"; arch = "linux-x86_64"; sha256 = "804c9b3a7377ad0863e510e4a07166bcbe3fc89ba0704983e1b44122e0d1c6b4"; }
-    { locale = "sl"; arch = "linux-i686"; sha256 = "546882ca19cc9b764264df9565ae13f0a72c167b641bfde2c5f040f1a62445a3"; }
-    { locale = "sl"; arch = "linux-x86_64"; sha256 = "e6981343cdf05ac4e8f0b5f8477e3dbfaf852415089485e95dca74168a720489"; }
-    { locale = "son"; arch = "linux-i686"; sha256 = "77d7c08293b29e773fdcd5bf3e9adab80b6bc838cb7557436b43cfd5db3b4247"; }
-    { locale = "son"; arch = "linux-x86_64"; sha256 = "8853c8b5b650a1ec898c2819e3d185662fc2c1823a5c2c3db90154c023280a1d"; }
-    { locale = "sq"; arch = "linux-i686"; sha256 = "1a9c4879b63973a02d6f4b9d7d07f0cfbcd1da2da5af82f0dba167d651f22126"; }
-    { locale = "sq"; arch = "linux-x86_64"; sha256 = "6f713b8fdd256c0062bcd1f653a852cd2fb0d63c8bd5016d6bb72a70184b7fac"; }
-    { locale = "sr"; arch = "linux-i686"; sha256 = "79efab1a2d6597ffbeef32b969febe70cf589695e0142208df1f4fdc8018d791"; }
-    { locale = "sr"; arch = "linux-x86_64"; sha256 = "e2ae5c1b10e70c729c263f9950d3d20d1ecd011a76e3919c6b67cd410ac214b9"; }
-    { locale = "sv-SE"; arch = "linux-i686"; sha256 = "79e75bf8894b5102373c58c19fbcf3bcc3c2c59bfdf3cf76c97306bd6def34da"; }
-    { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "3dfbf13fefa507d6975de0e92ce5d32da1e0b7c1d6deb4fe7551b305cc818a51"; }
-    { locale = "ta"; arch = "linux-i686"; sha256 = "9f3b56250f344da8bbb3fb23dda1c7bd5bd6dcb8997df27af3b92a259d0102cd"; }
-    { locale = "ta"; arch = "linux-x86_64"; sha256 = "9ec347d26885049750c3a0d17c75557bcf67d3a28048920a6d7aafee5805e8f8"; }
-    { locale = "te"; arch = "linux-i686"; sha256 = "b25bab31e21ff3fbb0eea10d1b127837c73e8e4bada958385c21482dafc1a7e4"; }
-    { locale = "te"; arch = "linux-x86_64"; sha256 = "1c1e6b3dfa8ee24e40f05d41cf0da97c92108d7ca97645b4c4ce671c3fed641d"; }
-    { locale = "th"; arch = "linux-i686"; sha256 = "350caf486c89265b61bfd91cc9df4a20d7ff1071fdf995e7aa03b8c27d83c702"; }
-    { locale = "th"; arch = "linux-x86_64"; sha256 = "7a8784265237951140b62a219da144e2f5091cb1d75d8af3e5a4d3ebdc4a2d0e"; }
-    { locale = "tr"; arch = "linux-i686"; sha256 = "b623db840358f2275143f0748fb988c7088799ab55ce4570ce8e47fa891b2c98"; }
-    { locale = "tr"; arch = "linux-x86_64"; sha256 = "65f7883a2f03881949196c90ca2b3c13c374ccf51b749348a92040361671ace7"; }
-    { locale = "uk"; arch = "linux-i686"; sha256 = "8ce4cae2d1fd912b9fd4e440012fa4dad7a912f6c78d3349cfa2a4764f609a94"; }
-    { locale = "uk"; arch = "linux-x86_64"; sha256 = "53ac6bae5e8efbfc819df8f16eb9ebba2bce886db423743ac760c89dc48739a2"; }
-    { locale = "uz"; arch = "linux-i686"; sha256 = "22a5e05529c6a4fb6488bfcc1e0c2b2297e72e18a47464e8e8148f1dc94c639e"; }
-    { locale = "uz"; arch = "linux-x86_64"; sha256 = "8a3fa76e01715c602238bf0a5d31b8acb733d0efe9fbad390f6c2aa5d9e6ebb1"; }
-    { locale = "vi"; arch = "linux-i686"; sha256 = "453f93b065b5e4f66d549c8482ef31edbbef5d9a77fefb87b25808540d368dd0"; }
-    { locale = "vi"; arch = "linux-x86_64"; sha256 = "2965dbde06aa9207236b33636bec971dbd01f71f9b0d13681d991befec931242"; }
-    { locale = "xh"; arch = "linux-i686"; sha256 = "edfffe8ab6f446760f13d5351be2c8f4cb2db28e9f1d6b9bb80b1e8fca191b42"; }
-    { locale = "xh"; arch = "linux-x86_64"; sha256 = "ac3308380a60489a5965968215f7134fdb5e1f8586925fbb0c4d42cff940b794"; }
-    { locale = "zh-CN"; arch = "linux-i686"; sha256 = "8058ee0f3a6ab3d229ce1f34ed4c38cbdc53e05cf1bb1a06535b7c12e7d5570d"; }
-    { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "ea91bbd7af46d63996260a32737d55e191a2dce4827561ab1c60ade26ed4ca91"; }
-    { locale = "zh-TW"; arch = "linux-i686"; sha256 = "18e9090333dd6a174feb0bc98dc849e933dd806205ea62d7cf292d8a6b65a2ca"; }
-    { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "9dc786ddb1b87245c1fcc5e88e601a1b2680141c363336ae099d953405c2d6cb"; }
+    { locale = "ach"; arch = "linux-i686"; sha256 = "88e62cbc7a46a4bdc9822a7155a7a92fd856472323fe93c2c6684262b8e71056"; }
+    { locale = "ach"; arch = "linux-x86_64"; sha256 = "e0eb56995f078a72c0bcf8a38a68e3087ca6c229181d0ca75052d2b784acd6f3"; }
+    { locale = "af"; arch = "linux-i686"; sha256 = "826a7c46b08813698c6fc6cfa3faf8d8fb3c6bfa2d9126d2668f91f34fa5874a"; }
+    { locale = "af"; arch = "linux-x86_64"; sha256 = "74efde0018f1c0a0d8afab8a069c7dc2ace12a9c2e8ccc5021601aa472581ea1"; }
+    { locale = "an"; arch = "linux-i686"; sha256 = "bd7c8cd1473fa7b15905fc2a9aa5595a7ffe4e6a53a4c832dfbe3393236a2706"; }
+    { locale = "an"; arch = "linux-x86_64"; sha256 = "73e97be9965dea6416d88b7edb609ed1c7cecbb48c363370dec68854ebcc2b05"; }
+    { locale = "ar"; arch = "linux-i686"; sha256 = "30fbc1adfda1487093ed3ca3571bc4c02132b8fd65a67c937e10d5a53fffe2c5"; }
+    { locale = "ar"; arch = "linux-x86_64"; sha256 = "5c7b899f37cd894b79c74e95c03e131e8809fd147316d21ac5d9e0165840bdbb"; }
+    { locale = "as"; arch = "linux-i686"; sha256 = "2dc43867cd934830c79050e2080570e86fe63ab9ce80252599a7ac29ef21408a"; }
+    { locale = "as"; arch = "linux-x86_64"; sha256 = "73c6712729087bbebc335e631505dca89fbfc9eedf6fcec220f66f50e013f938"; }
+    { locale = "ast"; arch = "linux-i686"; sha256 = "3b76e984e74737f0bd22e10c017bbfc3ff9346a9bf83ec09d959cdc0c5b4c36c"; }
+    { locale = "ast"; arch = "linux-x86_64"; sha256 = "2b9b732d19498b78c72d8f0bcf0852c7d209c3a3e0c891fbef6be753e39bc9a3"; }
+    { locale = "az"; arch = "linux-i686"; sha256 = "8889cf66294a788b59754a4331c6fe4ceccf5d4efedb402d144f27384e491b46"; }
+    { locale = "az"; arch = "linux-x86_64"; sha256 = "cca620118720374edf45b8dba81ffa5086f640bb1c10b67cfe6286aa2afc3a6f"; }
+    { locale = "be"; arch = "linux-i686"; sha256 = "33543ed7c2f68457573729fa95fb306a3c509d8ecda937d5d638d6d158979ced"; }
+    { locale = "be"; arch = "linux-x86_64"; sha256 = "58c567f2b6657f533bcc20d39f29715a503a0a9d59e05ccf9b4f3f3ba64280ca"; }
+    { locale = "bg"; arch = "linux-i686"; sha256 = "5b87663b5887a8eeceee3c0e54c99c66ca673bbf78b434cdcac659891c1f3333"; }
+    { locale = "bg"; arch = "linux-x86_64"; sha256 = "ebcf93c8b5ae952f244426988defbfe0638cf81a8dc4c372613be08f9e0d8f45"; }
+    { locale = "bn-BD"; arch = "linux-i686"; sha256 = "30af81108a6f9ea31a623666ebfb68d99ec256e27cc8d18921bfe2780753ba4c"; }
+    { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "082ddb0fce87e1399dc95cb94fcc71ebe334f7e611497c0b0bb8186edf46e8e5"; }
+    { locale = "bn-IN"; arch = "linux-i686"; sha256 = "3e8af6555a65ee403b8fdd3a78842ec4f7c16fb3c590f77d9ddd76e9631d564c"; }
+    { locale = "bn-IN"; arch = "linux-x86_64"; sha256 = "78bf008a03318c1d58788433a07b71b63bd52cd2befcc68f8c6320d5ff5dc387"; }
+    { locale = "br"; arch = "linux-i686"; sha256 = "77ff1b40b9cc81b1c6bc63d74e68687ad92f5eb0cee265cd5d9528c38a36bd12"; }
+    { locale = "br"; arch = "linux-x86_64"; sha256 = "a4784a6b2d356f633deefefbc237f5aa662334765a334f968d60afc0aa76ccab"; }
+    { locale = "bs"; arch = "linux-i686"; sha256 = "5fc7d9cbd892c83f40e0cda6b8e6b4e993948530bef355457015a6976ce097f6"; }
+    { locale = "bs"; arch = "linux-x86_64"; sha256 = "4fc83306fca0a6458e66fa082eb8afe6d07ecbf5a3b309d3906ca16f00fc5d31"; }
+    { locale = "ca"; arch = "linux-i686"; sha256 = "c72b7f343e62f479dd2fc37f22af3c462890a886727a2b5a1f140992e3069c92"; }
+    { locale = "ca"; arch = "linux-x86_64"; sha256 = "81d44ab8e493816180ce46d86a0b061ddada85b820c21b91d18f62b3fdfa455e"; }
+    { locale = "cs"; arch = "linux-i686"; sha256 = "c2fb062c3fce0c4c174bcf3987108176d9cbe8da19a06b5db46e0b6d65b244ec"; }
+    { locale = "cs"; arch = "linux-x86_64"; sha256 = "81afcae57081c20a7a1e03c28a4d8dd26b3c89608591b7a7171be91bd24789d6"; }
+    { locale = "cy"; arch = "linux-i686"; sha256 = "bf5f4bdb6fbaea7d0de662921d5e6096d413f799fd3ca1876d42146f14667e5d"; }
+    { locale = "cy"; arch = "linux-x86_64"; sha256 = "cc4057fb04da6db0d2ba315fe9ff015a0e0fc1542843adb4a65621936f849d98"; }
+    { locale = "da"; arch = "linux-i686"; sha256 = "10468470db91eccc1234b34fc4f933b909df68284f9cee8125fbdb5c5802a45a"; }
+    { locale = "da"; arch = "linux-x86_64"; sha256 = "34e29284e753686f00e4019902b75aa071d0eb87bafec8c31cc4029989ec210f"; }
+    { locale = "de"; arch = "linux-i686"; sha256 = "f5b2e2c7fdbd0f91e0ce581dfcbbb253d627a4aac45a914eab763de6b2fb6750"; }
+    { locale = "de"; arch = "linux-x86_64"; sha256 = "7366de80f3717f62768055613bb6767a39716808e394d623cff18e649b1a5a02"; }
+    { locale = "dsb"; arch = "linux-i686"; sha256 = "1a69cb59bd213323ddf5576f2f060def74735b50576c5048f030170a8e4a54d1"; }
+    { locale = "dsb"; arch = "linux-x86_64"; sha256 = "89c431dc58a91ff9c7b31b9a5f988aabd7265a23697e870cd746320c0dde9760"; }
+    { locale = "el"; arch = "linux-i686"; sha256 = "cb6c72d842895714a7ce5f0acc7e2de721befd8605ce567811f5e626f9349a50"; }
+    { locale = "el"; arch = "linux-x86_64"; sha256 = "8b33af54b8e00acba75446a5921ebf41e570f66cf86d38bf46b9238d2b2b57ef"; }
+    { locale = "en-GB"; arch = "linux-i686"; sha256 = "17685f4d47efa9ca8a2ca220960d7819e11c728516d4c0f67f789f5dc29e9606"; }
+    { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "702f8da239eadcbf92cc8e286716836ec889a64276a92e51ee26cc5338e4398e"; }
+    { locale = "en-US"; arch = "linux-i686"; sha256 = "be03a282b7da67899c988f89423594b91e017ce5f4569d55ea23f6ba28f59414"; }
+    { locale = "en-US"; arch = "linux-x86_64"; sha256 = "0ba5a1868386c715ea1f48393b035305d4bef67ed1838b7bfacf5bff8b36716f"; }
+    { locale = "en-ZA"; arch = "linux-i686"; sha256 = "790462e745744b05a5fc27d9518f02e88f678bc1f95140dad970abdff0ec7aaf"; }
+    { locale = "en-ZA"; arch = "linux-x86_64"; sha256 = "ab1ff49b84beb7a5a02a70cbaba9d3110cdd76653486799038fd05936b9db499"; }
+    { locale = "eo"; arch = "linux-i686"; sha256 = "d6be5d333050ca0d1ecd78082b9daf7955a068915af6ef2694b3f6d60595cd94"; }
+    { locale = "eo"; arch = "linux-x86_64"; sha256 = "6ea5dd2bd55bd0211ce67f398b24a37f26b012250b8e7b1b4a9d5ef619e19051"; }
+    { locale = "es-AR"; arch = "linux-i686"; sha256 = "1b16ed83eed980b0ea8b99e989bab1882b6d2a497fd643f109f0610425c693d8"; }
+    { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "3aad55c9d10012c5b22154e8562a034e30ce6ef0b579047649a43afd0645d6e2"; }
+    { locale = "es-CL"; arch = "linux-i686"; sha256 = "f22705f5dee51be7bdced48c6c8f48780529f22a566d9d8784a10c2fe8427b92"; }
+    { locale = "es-CL"; arch = "linux-x86_64"; sha256 = "8dc4c8854169db3c22c09b723002852c452cdcf8d0bde94b089af9fcf0ae0f28"; }
+    { locale = "es-ES"; arch = "linux-i686"; sha256 = "7bd24886bc72db5479c1aa2c8a48359858c1e87e8444a5cc8f0ef3e141744806"; }
+    { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "c69a6be864d1c865013b00a1b8fb748da96be2ddc65cb178eeca6e165aa1ccff"; }
+    { locale = "es-MX"; arch = "linux-i686"; sha256 = "a52775fe1038fbef208d760c4069187943387b0717076b32a54647d9e319890b"; }
+    { locale = "es-MX"; arch = "linux-x86_64"; sha256 = "56c2e14770c2c6d40213f159715a3c269bf3b6c5985ddb4851b6f50f2ca93a39"; }
+    { locale = "et"; arch = "linux-i686"; sha256 = "648fbeb1dc15d76685d80afdad2b6a797eb25f30b27bb405e11725ccc53ef164"; }
+    { locale = "et"; arch = "linux-x86_64"; sha256 = "400f9cd73854034edd7b392367a7961638c921e78885064bdbc567ed3c508d38"; }
+    { locale = "eu"; arch = "linux-i686"; sha256 = "727e0d1d692be4f472f1172d8901d94d58e201ab9c2e30b80684564b3ecaf325"; }
+    { locale = "eu"; arch = "linux-x86_64"; sha256 = "476f207657fb9a5c3bc89493b06900b4fe46a06aca7854e4f37bbe8c8d98c064"; }
+    { locale = "fa"; arch = "linux-i686"; sha256 = "2de4b2b0f02918c8ff538db66272196479ad95cf8e239ccf9e1a244d5553456e"; }
+    { locale = "fa"; arch = "linux-x86_64"; sha256 = "3c04ec5ebd27b815a215ff815dcc86ec05f81a5a0d606e60ed14135b76679fe2"; }
+    { locale = "ff"; arch = "linux-i686"; sha256 = "07b19ce6be53c16c6f299a2640a3a597475644fef63edf702242e245001b1eb0"; }
+    { locale = "ff"; arch = "linux-x86_64"; sha256 = "d0a4e2d3b155c0fd5fa12162dd73d6077be30a9cdd3ccdf5566748a7af4fe2c6"; }
+    { locale = "fi"; arch = "linux-i686"; sha256 = "f5e9e4222bfc1c34d58befaccf501d741cdcf3ee9bfda034ea8600a906c9a912"; }
+    { locale = "fi"; arch = "linux-x86_64"; sha256 = "d48f0673a768b6265119a3097061ae437711a81fbf7f665b8fec079f0516b1ca"; }
+    { locale = "fr"; arch = "linux-i686"; sha256 = "67eb797623354f037b49745c9ef7ddfa3a0cfce03f984add560a33ab2955fc97"; }
+    { locale = "fr"; arch = "linux-x86_64"; sha256 = "6bcba534539f9b5f42397c82e2c1a6affa6eec473c09e6d71c5315f9acef35b0"; }
+    { locale = "fy-NL"; arch = "linux-i686"; sha256 = "fe4b44c9b50abc001bb4bcf6e046a9b18f30a42170b4662daf5d35c17089f4ad"; }
+    { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "8238342ac06af2d4e0b7ef8ea26d1960af996ac7d401f0e11b3b666ebafe0df8"; }
+    { locale = "ga-IE"; arch = "linux-i686"; sha256 = "9f59d32123141d624b9fa16f885ff9e1cc989628e33074bb2a546d9c54be07eb"; }
+    { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "29785a5a2cc09750c8ea391ca6b2d8812e5a68185807d76ec295c3ca86c21da9"; }
+    { locale = "gd"; arch = "linux-i686"; sha256 = "bd4dcb330e8733c3443e763a2fcd49085b5027ec032ee6f641ac1211534fdb6a"; }
+    { locale = "gd"; arch = "linux-x86_64"; sha256 = "5508260caa85a450a2496a7e261aebff847301d4f981bd0caf0208aa65c0bc10"; }
+    { locale = "gl"; arch = "linux-i686"; sha256 = "7e6df6be5937c01d8bbf65cd6d107fba76f1c59794f7e2ed81ac9db1384abe34"; }
+    { locale = "gl"; arch = "linux-x86_64"; sha256 = "b5370fd005569fa1544099fb4629ea344f81b43fc10188dbb3cbc5926b5df53a"; }
+    { locale = "gu-IN"; arch = "linux-i686"; sha256 = "5256e889efd097decc2b55f4d928c9847f6e9499b25947de068d357db4d70c59"; }
+    { locale = "gu-IN"; arch = "linux-x86_64"; sha256 = "2b51d50b49965c766081d35b1a426e1c3a858038bb88807522a7dcbc8c97b815"; }
+    { locale = "he"; arch = "linux-i686"; sha256 = "b71d83c274d82f63ab175978bd661e047ad73586249f6e24d33d17c1e9ba4ec6"; }
+    { locale = "he"; arch = "linux-x86_64"; sha256 = "4c3dd5066a9b5ca04ab222af8d7009419fe34d0bc41bf5f78e6370d6e975c4e5"; }
+    { locale = "hi-IN"; arch = "linux-i686"; sha256 = "33f3591e2d75bcc539cc57e68e865183b307a8eb8153c0b48bacc0bc62ea48f4"; }
+    { locale = "hi-IN"; arch = "linux-x86_64"; sha256 = "25eef40150db99b56dc46deaf78525951d8ae838886427838c9d78bab41c6b7e"; }
+    { locale = "hr"; arch = "linux-i686"; sha256 = "d83ab7b48cd7fc4637fbb4c19edd0974db121186289b04da01414fbdc78ad7e9"; }
+    { locale = "hr"; arch = "linux-x86_64"; sha256 = "8a1d3055aedc504cf0f34e41931464752148dd1859c807f689978fb80504a5ab"; }
+    { locale = "hsb"; arch = "linux-i686"; sha256 = "d9dfc43216b0c6281a311edc6c0fed79344cbb4f4cfdcf153f3ba37a4221199b"; }
+    { locale = "hsb"; arch = "linux-x86_64"; sha256 = "2ec46b326249e0049de0a110896672191edf0837d4f224ff3b0f88a21edf1a22"; }
+    { locale = "hu"; arch = "linux-i686"; sha256 = "6c7cecaf0865bd80eceefe2541b5cbdbdc457a367b66a3cb7f8f3d73cf3118f4"; }
+    { locale = "hu"; arch = "linux-x86_64"; sha256 = "d33903cda04f3be9e147dd69c55a58fa76f1bfc0abdb8346c641b76c5f20aacf"; }
+    { locale = "hy-AM"; arch = "linux-i686"; sha256 = "a7006e239fc119c1af332e1fdcd3ed42aed59deb6e22a092c9d3ed5c7eafa11e"; }
+    { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "89b0def0f9d9177fa0c0f1f7630d52bf3d6380ab27c475019fc6b1dddeca32b6"; }
+    { locale = "id"; arch = "linux-i686"; sha256 = "15fd16ebb3c82755a1ff70a172658c3928ad495194b975de8270b0dadf8fd10b"; }
+    { locale = "id"; arch = "linux-x86_64"; sha256 = "7cfe30a94db8722d0cf3c5f68f636c76e7e98c8f34f67f95724c80499c89ec64"; }
+    { locale = "is"; arch = "linux-i686"; sha256 = "0a066fed6ed9ca4a1514166c8b1ac5e097b5d32522dc39bee3a644f241f7448a"; }
+    { locale = "is"; arch = "linux-x86_64"; sha256 = "4fbef4c8c25690e3c23f3fcd27196714c691c9ea023d81b82763867a7547deab"; }
+    { locale = "it"; arch = "linux-i686"; sha256 = "451b17760fd2f3b99cda0f1711fc3e74320ef0e86b41ea89205c00395b1ac46a"; }
+    { locale = "it"; arch = "linux-x86_64"; sha256 = "e12206fd4993e75ecd3398130758cb1cc4f103c5792a9b59956766d975840653"; }
+    { locale = "ja"; arch = "linux-i686"; sha256 = "ef954070ef7f3eafb9727ee848627145dfc884fc46445374d5b618d344359432"; }
+    { locale = "ja"; arch = "linux-x86_64"; sha256 = "6795c8d63e2cbad65d347bb07503725f85ef464767020df605bdc5dfbdd4cf60"; }
+    { locale = "kk"; arch = "linux-i686"; sha256 = "752594014a72770d33784a99782b24bebaadeb83bda57880f3d0bdb94c2ef56e"; }
+    { locale = "kk"; arch = "linux-x86_64"; sha256 = "a5b26f9f5b9194592e4749770e85cfe35d308ce5cffceea00e9aea5a90a5ef95"; }
+    { locale = "km"; arch = "linux-i686"; sha256 = "57c6072b4dd026daa11b7877fc05ff8aea383eb1d0a8cd1798bd26246f013145"; }
+    { locale = "km"; arch = "linux-x86_64"; sha256 = "fe5a4aae238d74a26614014547294226b49155a7c7fe5fe8a4d2955ee9bfc457"; }
+    { locale = "kn"; arch = "linux-i686"; sha256 = "53b5a81b33115e6892dc6d98a275d675a576eb721290af271262314f33a8a5d3"; }
+    { locale = "kn"; arch = "linux-x86_64"; sha256 = "7a73aea8c228b3491c12735240fbdb8715d8236e89b8634f8b8eae435a6b33f2"; }
+    { locale = "ko"; arch = "linux-i686"; sha256 = "7060ad8b0e78eaebcb6ef7b4976866ddbcca8123daca4ebd7e0ace9792c55a00"; }
+    { locale = "ko"; arch = "linux-x86_64"; sha256 = "b3858ed759dc5c3bf383bff0620d28e939e2a906b266bf9ad28409c45835da82"; }
+    { locale = "lij"; arch = "linux-i686"; sha256 = "efda293d3583806b80695c0f102151574623180a192826e66e90c34599e13444"; }
+    { locale = "lij"; arch = "linux-x86_64"; sha256 = "235138d5b83242a50e194c09d687edfad8a4f912d8434c749dec15a271a38d8e"; }
+    { locale = "lt"; arch = "linux-i686"; sha256 = "0fccd7402f84ef47bc14cd91da4c9aecfceda90588293e47c3473ba5849e8ba2"; }
+    { locale = "lt"; arch = "linux-x86_64"; sha256 = "de27a346f47ad06ade89b4da1809b7ab8aff10e491352b88185d4fab1aaa5613"; }
+    { locale = "lv"; arch = "linux-i686"; sha256 = "e4daced301792d86a7d5bb194da1ff4b9fb1ab7e8583ff3810ed5dca2c57c2c2"; }
+    { locale = "lv"; arch = "linux-x86_64"; sha256 = "e6f6b914d0b8e1a349087c893cd91807e6d8159f4f8db27c2c89b8304a21aca8"; }
+    { locale = "mai"; arch = "linux-i686"; sha256 = "f61a475f0646b6935abf6ca4b07d88a65e782ad6a5fbd17ab2c7cbc0e386f9b0"; }
+    { locale = "mai"; arch = "linux-x86_64"; sha256 = "091597ef122a51e27e69aa02d84c0de37b3bcc4aab38326a160d8836f82d9235"; }
+    { locale = "mk"; arch = "linux-i686"; sha256 = "336f74b4f6f0fc0ca24af1b287bb049ba37aedd760c60b71560c32aa21d902a4"; }
+    { locale = "mk"; arch = "linux-x86_64"; sha256 = "7026aaee3d615fd5401881728fce02d69a74dd08bcf4ad32cdbde6e48e9750fa"; }
+    { locale = "ml"; arch = "linux-i686"; sha256 = "412212198a4bfb35964baa84d55bdec89a30ad47be0e54c7be64e3bbaa8166f9"; }
+    { locale = "ml"; arch = "linux-x86_64"; sha256 = "50c0c3f6931e6a1a498d075847dec4796db804d296b0bcb7254576d910c88f51"; }
+    { locale = "mr"; arch = "linux-i686"; sha256 = "f457de6b5e6692cdac57f9cc8b5bace0f3c678cb40848963f91dad36aa53e7cb"; }
+    { locale = "mr"; arch = "linux-x86_64"; sha256 = "9a88a56a56d5448e6ffdcc2aa15b70bc6300750dae11c25047036873bd0f1bf7"; }
+    { locale = "ms"; arch = "linux-i686"; sha256 = "1254482bd8d0c2fef0a728415e0053b1e68951c1a4de32ea38e3a8435ef8be11"; }
+    { locale = "ms"; arch = "linux-x86_64"; sha256 = "6daecbd8ab6eaeab01139037a950e5e48766f20290bd13daa9f2177a0bed7a37"; }
+    { locale = "nb-NO"; arch = "linux-i686"; sha256 = "ae92dcc94f43a80e335b9dcbc82a1831ede646e173eb1a6b76a3a5c076f70598"; }
+    { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "813d1965cd6b15e8bd1b40f77e787086ff38dfbafbfdb6ef3d958543ec566d9e"; }
+    { locale = "nl"; arch = "linux-i686"; sha256 = "bfe3bd48305674bc3e7f9edc318585e605e31e59bf55c1095ba08f82f1e92fe6"; }
+    { locale = "nl"; arch = "linux-x86_64"; sha256 = "d9f6062d09d4c505656e4f1c3fe098b896beffb9ee299ba5d544a91d97288d8c"; }
+    { locale = "nn-NO"; arch = "linux-i686"; sha256 = "9c5b3343070f2f986aa13cd6f03a184643cfa5a0214fe2d3696cfd5f81efa4cb"; }
+    { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "bb128791f7f9dc18b282aec0892987b2d315103bd56d646b22113f74e379db0f"; }
+    { locale = "or"; arch = "linux-i686"; sha256 = "2a5e0a25d654015bec541cca26491312746552b052a6ff1e93daa7e83d5c5539"; }
+    { locale = "or"; arch = "linux-x86_64"; sha256 = "97f524aa830ebbbe80396db69b798463c1bb973a57edb3bf04350cf343b9f345"; }
+    { locale = "pa-IN"; arch = "linux-i686"; sha256 = "f4e38e9124fc916766c1b7d3b1eb5612e5358d5ff7cb60127f6c9ef00360ca2f"; }
+    { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "415b0f6e0c9ca0c9a415d96c821ab72c15b5d2863109c6411d1d35f3835fc92a"; }
+    { locale = "pl"; arch = "linux-i686"; sha256 = "d001a0047d2ef866ae2ad7675b3e45a7055ceaf84e031a24c72b239b42fdd98e"; }
+    { locale = "pl"; arch = "linux-x86_64"; sha256 = "cbea32c4b8989fc5f0bf948ab5d80ab715fac7fcc179dee169ac9d725ab2b43a"; }
+    { locale = "pt-BR"; arch = "linux-i686"; sha256 = "ea9073faecd9cb850dae9c69a85368f9ad8ec9e00c9aba988205aedfc2e63bd3"; }
+    { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "c3c57dcc4a5790b36668b8e255674945e61ee9d6ef69704f39d499ad57510a79"; }
+    { locale = "pt-PT"; arch = "linux-i686"; sha256 = "854692a0be4be1b34e958c34a7318dd818e310439d01ee552910a067cf6f6624"; }
+    { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "0143d2dc4cf2979f8744dd282f937f9e8084393e4c7836219eb182618062d1cc"; }
+    { locale = "rm"; arch = "linux-i686"; sha256 = "81f96f818ce68ee25fe1ed7b1c831ed95d26a3fb034bac836707bf93ffaa140a"; }
+    { locale = "rm"; arch = "linux-x86_64"; sha256 = "3824d40ecbebc2df46f865e0375119c9fe5dd1dd5a0f4c193de984134ee6e7c7"; }
+    { locale = "ro"; arch = "linux-i686"; sha256 = "218b36a99038e08dde7677bc8e89f1b74b5456da2f5e5e1a081eea7ab19bb7e5"; }
+    { locale = "ro"; arch = "linux-x86_64"; sha256 = "2007623afeacb1b11ed4e93dafad6f47d1365ff8505282c858168ef95d31b724"; }
+    { locale = "ru"; arch = "linux-i686"; sha256 = "708780c7f96b0f48f177780fe48c4613b3548eb5b08ba37d1471781de2fe5653"; }
+    { locale = "ru"; arch = "linux-x86_64"; sha256 = "589e950adc3258ad2064233ecfc5e385d301096e0fc08b3a5cc9eebc0454ac6e"; }
+    { locale = "si"; arch = "linux-i686"; sha256 = "eec26f6c23c5e58913387264ad9cd52d5571ad95b1047490530c2c7cecee4584"; }
+    { locale = "si"; arch = "linux-x86_64"; sha256 = "3c71e67434e42be6ef9970c948030c58198cb941ee39d50845afc2a96c85abe0"; }
+    { locale = "sk"; arch = "linux-i686"; sha256 = "558f5ab75ade19ac57fc939c4314233004fbafb2232e9d4bdc6ee938cf0d0e2c"; }
+    { locale = "sk"; arch = "linux-x86_64"; sha256 = "d8a19e75930a0e902b261b6a4872f47daa16baa736fcf4b6e86ba3e947a05fb2"; }
+    { locale = "sl"; arch = "linux-i686"; sha256 = "c69f8782bdfddc06e4fcce994ce8bf79031c47fd60132fbdab42083d7645fbac"; }
+    { locale = "sl"; arch = "linux-x86_64"; sha256 = "ed1da31169d61b4eb6f3f7858dfd5ab7bb436a9c3ae66882d00a19929d48ded0"; }
+    { locale = "son"; arch = "linux-i686"; sha256 = "e1e4b663f699ed623ccf4d91966d1d0b6f17aa831a14b86316898590b559790f"; }
+    { locale = "son"; arch = "linux-x86_64"; sha256 = "5c51bfb471b8870aa04d3e66bb1cc465a7e3d7f36badb91bb0cdd56789ba9657"; }
+    { locale = "sq"; arch = "linux-i686"; sha256 = "7523bdbc44826267f710d1758c3d64fc5b2711ea26559e8eee8d803174a5f801"; }
+    { locale = "sq"; arch = "linux-x86_64"; sha256 = "929bca0a3d2eb67d02c1af5df073fca04db1e70ec95cae622f87c70c5138559c"; }
+    { locale = "sr"; arch = "linux-i686"; sha256 = "464da5be343009f180d829cc88e01cc7eaef953195f4b3396156a019fd17a36e"; }
+    { locale = "sr"; arch = "linux-x86_64"; sha256 = "f84234ba1c6c0eaaf9b73d40546e482dd024bad6bc1aa9b0f19351af064abacf"; }
+    { locale = "sv-SE"; arch = "linux-i686"; sha256 = "c1c25d2226f47102969272777fa985694430e227a6e58c1a3fc3da479ed6a69f"; }
+    { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "10ae8036fc64d7bd0226ec9b8e9614b5bb24d995d0701d23b471f65767de81cf"; }
+    { locale = "ta"; arch = "linux-i686"; sha256 = "ca3fb46ad1d80fb9d37bc0b3844b8d3972640772edba1ab6485eaf10d257654f"; }
+    { locale = "ta"; arch = "linux-x86_64"; sha256 = "f8d229cb8257262adac057831f7080f431e356eb4ffdd512e8ea8b6ba8e6d702"; }
+    { locale = "te"; arch = "linux-i686"; sha256 = "78d326fc7baed0aee612b542fda5333a83d2874c20a396a4cea0ae4d4c9b45e3"; }
+    { locale = "te"; arch = "linux-x86_64"; sha256 = "fc827807c3793c15fa7650614da558773fd884d5aabf8e181c8822e4109a6832"; }
+    { locale = "th"; arch = "linux-i686"; sha256 = "37681476c04f02dd5fe3e815da3c6569cfedf1d1627826122c934caab8bca74c"; }
+    { locale = "th"; arch = "linux-x86_64"; sha256 = "d63640093f26d53257b5f1b6ea3c8b620498a21cd7ad1144bb3b5d85d63967ac"; }
+    { locale = "tr"; arch = "linux-i686"; sha256 = "a37e2833f4ad4e9c13d4da88f22f8a9cf7ad77b238f2d00f914a27f276ba99da"; }
+    { locale = "tr"; arch = "linux-x86_64"; sha256 = "869fc9c719a7a619e15b98007f60b3f92dd8f7c46fd27e4fc864a8b829e13da0"; }
+    { locale = "uk"; arch = "linux-i686"; sha256 = "c832506a00c22cbc2589814642340bbb1067fd31e414db4f426a8a451991083e"; }
+    { locale = "uk"; arch = "linux-x86_64"; sha256 = "9597216b353369221867741de9f9fcd030adccf1d9ffe2b127c7b858b51e04f4"; }
+    { locale = "uz"; arch = "linux-i686"; sha256 = "d67274f1e39b479674b4909b0e072dff712db0146577f4ea36736ac0d94e3dae"; }
+    { locale = "uz"; arch = "linux-x86_64"; sha256 = "95477afad170df8efcedb493e5ffa9366f1abc8d451860b899457c8a296afbe0"; }
+    { locale = "vi"; arch = "linux-i686"; sha256 = "d453f7cb7f1fd662d1a1fecc701880a3d45c223d842d91061ab5f815333b8680"; }
+    { locale = "vi"; arch = "linux-x86_64"; sha256 = "f19bf0b83a4389aa4bb1e1f7d434be12c266c0575b13cabed541a4ac38c2d810"; }
+    { locale = "xh"; arch = "linux-i686"; sha256 = "4d1c8c365511b195da7e18c10cda8f6599d840598e4623bffb445a67a42590cf"; }
+    { locale = "xh"; arch = "linux-x86_64"; sha256 = "607a62d71718fb2ba89c2a3b75acc13fde048f5d05a692783da955af344a16d1"; }
+    { locale = "zh-CN"; arch = "linux-i686"; sha256 = "635a980f48bd8c0f93ff2666ad7f761e80a255fb54647704e2514c6ba7b9bf60"; }
+    { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "3eb083c8de026db0727b4fd206fc9045981c5672af7ebf6e0653ee28f5aa8bc0"; }
+    { locale = "zh-TW"; arch = "linux-i686"; sha256 = "515749c690b64a7d047df00291aed071dc90e5582e9ab0e4bc560635ef7d888a"; }
+    { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "256316348c9d5cf525f0b2f2c09db968714135e21677d122b6bca6e87471a9f3"; }
   ];
 }

From d1fdc3e0cc63ca35899f7953563d67e52a9dda09 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 7 Jan 2016 14:23:38 +0100
Subject: [PATCH 413/884] LTS Haskell 4.x uses GHC 7.10.3.

---
 pkgs/top-level/haskell-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 5e7a54e580a0..2b30c15932a0 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -317,7 +317,7 @@ rec {
       packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-3.20.nix { };
     };
 
-    lts-4_0 = packages.ghc7102.override {
+    lts-4_0 = packages.ghc7103.override {
       packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-4.0.nix { };
     };
 

From d3de3db07769c5a6c6d57db7e86b128a494e645e Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Thu, 7 Jan 2016 14:23:04 +0100
Subject: [PATCH 414/884] emacs-packages: init evil-mc, evil-jumper and
 evil-visualstar at 20151017

---
 pkgs/top-level/emacs-packages.nix | 54 +++++++++++++++++++++++++++++--
 1 file changed, 51 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 8c407ac50954..26c85f0fffa2 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -561,6 +561,22 @@ let
     };
   };
 
+  evil-jumper = melpaBuild rec {
+    pname   = "evil-jumper";
+    version = "20151017";
+    src = fetchFromGitHub {
+      owner  = "bling";
+      repo   = pname;
+      rev    = "fcadf2d93aaea3ba88a2ae63a860b9c1f0568167";
+      sha256 = "0axx6cc9z9c1wh7qgm6ya54dsp3bn82bnb0cwj1rpv509qqmwgsj";
+    };
+    packageRequires = [ evil ];
+    meta = {
+      description = "Jump across buffer boundaries and revive dead buffers if necessary";
+      license = gpl3Plus;
+    };
+  };
+
   evil-leader = melpaBuild rec {
     pname   = "evil-leader";
     version = "0.4.3";
@@ -577,6 +593,22 @@ let
     };
   };
 
+  evil-mc = melpaBuild rec {
+    pname   = "evil-mc";
+    version = "20150117";
+    src = fetchFromGitHub {
+      owner  = "gabesoft";
+      repo   = "evil-mc";
+      rev    = "80471ba1173775e706c2043afd7d20ace652df7d";
+      sha256 = "1j23avcxj79plba99yfpmj9rfpdb527d7qfp4mx658y837vji1zm";
+    };
+    packageRequires = [ evil ];
+    meta = {
+      description = "Multiple cursors implementation for evil-mode";
+      license = gpl3plus;
+    };
+  };
+
   evil-surround = melpaBuild rec {
     pname   = "evil-surround";
     version = "20140616";
@@ -593,13 +625,29 @@ let
     };
   };
 
+  evil-visualstar = melpaBuild rec {
+    pname   = "evil-visualstar";
+    version = "20151017";
+    src = fetchFromGitHub {
+      owner  = "bling";
+      repo   = pname;
+      rev    = "bd9e1b50c03b37c57355d387f291c2ec8ce51eec";
+      sha256 = "17m4kdz1is4ipnyiv9n3vss49faswbbd6v57df9npzsbn5jyydd0";
+    };
+    packageRequires = [ evil ];
+    meta = {
+      description = "Start a * or # search from the visual selection";
+      license = gpl3Plus;
+    };
+  };
+
   evil = melpaBuild {
     pname   = "evil";
-    version = "1.2.3";
+    version = "1.2.5";
     src = fetchhg {
       url = "https://bitbucket.org/lyro/evil";
-      rev = "e5588e50c0e40a66c099868ea825755e348311fb";
-      sha256 = "0185vrzfdz6iwhmc22rjy0n7ppfppp2ddc8xl0vvbda79q6w3bp8";
+      rev = "72593d8e83a3";
+      sha256 = "1pv055qlc3vawzdik29d6zbbv8fa2ygwylm04wa46qr5sj53v0i8";
     };
     packageRequires = [ goto-chg undo-tree ];
     meta = {

From d268fa7676ac17193abd014c3c21ec4614513244 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Thu, 7 Jan 2016 13:47:26 +0000
Subject: [PATCH 415/884] titaniumsdk: add SDK version 5.1 and remove older
 versions

---
 .../mobile/titaniumenv/build-app.nix          |   71 +-
 .../mobile/titaniumenv/cli/cli.json           |    3 +
 .../mobile/titaniumenv/cli/default.nix        |   15 +
 .../mobile/titaniumenv/cli/node-env.nix       |  309 +++
 .../mobile/titaniumenv/cli/registry.nix       | 2393 +++++++++++++++++
 .../mobile/titaniumenv/default.nix            |   35 +-
 .../mobile/titaniumenv/examples/default.nix   |    6 +-
 .../examples/kitchensink/default.nix          |   10 +-
 .../mobile/titaniumenv/fixnativelibs.sed      |    1 -
 pkgs/development/mobile/titaniumenv/fixso.sed |    1 -
 .../mobile/titaniumenv/fixtiprofiler.sed      |    1 -
 .../mobile/titaniumenv/fixtiverify.sed        |    1 -
 .../mobile/titaniumenv/titaniumsdk-3.1.nix    |   80 -
 .../mobile/titaniumenv/titaniumsdk-3.2.nix    |   77 -
 .../mobile/titaniumenv/titaniumsdk-3.3.nix    |   77 -
 .../mobile/titaniumenv/titaniumsdk-3.4.nix    |   77 -
 .../mobile/titaniumenv/titaniumsdk-3.5.nix    |   77 -
 .../mobile/titaniumenv/titaniumsdk-5.1.nix    |   42 +
 18 files changed, 2814 insertions(+), 462 deletions(-)
 create mode 100644 pkgs/development/mobile/titaniumenv/cli/cli.json
 create mode 100644 pkgs/development/mobile/titaniumenv/cli/default.nix
 create mode 100644 pkgs/development/mobile/titaniumenv/cli/node-env.nix
 create mode 100644 pkgs/development/mobile/titaniumenv/cli/registry.nix
 delete mode 100644 pkgs/development/mobile/titaniumenv/fixnativelibs.sed
 delete mode 100644 pkgs/development/mobile/titaniumenv/fixso.sed
 delete mode 100644 pkgs/development/mobile/titaniumenv/fixtiprofiler.sed
 delete mode 100644 pkgs/development/mobile/titaniumenv/fixtiverify.sed
 delete mode 100644 pkgs/development/mobile/titaniumenv/titaniumsdk-3.1.nix
 delete mode 100644 pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix
 delete mode 100644 pkgs/development/mobile/titaniumenv/titaniumsdk-3.3.nix
 delete mode 100644 pkgs/development/mobile/titaniumenv/titaniumsdk-3.4.nix
 delete mode 100644 pkgs/development/mobile/titaniumenv/titaniumsdk-3.5.nix
 create mode 100644 pkgs/development/mobile/titaniumenv/titaniumsdk-5.1.nix

diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix
index 046918487794..0de6c58e7267 100644
--- a/pkgs/development/mobile/titaniumenv/build-app.nix
+++ b/pkgs/development/mobile/titaniumenv/build-app.nix
@@ -1,7 +1,7 @@
 {stdenv, androidsdk, titaniumsdk, titanium, xcodewrapper, jdk, python, which, xcodeBaseDir}:
-{ name, src, target, androidPlatformVersions ? [ "8" ], androidAbiVersions ? [ "armeabi" "armeabi-v7a" ], tiVersion ? null
+{ name, src, target, androidPlatformVersions ? [ "23" ], androidAbiVersions ? [ "armeabi" "armeabi-v7a" ], tiVersion ? null
 , release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null
-, iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosVersion ? "8.1", iosWwdrCertificate ? null
+, iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosVersion ? "9.2"
 , enableWirelessDistribution ? false, installURL ? null
 }:
 
@@ -43,31 +43,29 @@ stdenv.mkDerivation {
     
     echo "{}" > $TMPDIR/config.json
     titanium --config-file $TMPDIR/config.json --no-colors config sdk.defaultInstallLocation ${titaniumsdk}
-    
     titanium --config-file $TMPDIR/config.json --no-colors config paths.modules ${titaniumsdk}
     
     mkdir -p $out
     
     ${if target == "android" then
         ''
-          titanium config --config-file $TMPDIR/config.json --no-colors android.sdkPath ${androidsdkComposition}/libexec/android-sdk-*
+          titanium config --config-file $TMPDIR/config.json --no-colors android.sdk ${androidsdkComposition}/libexec/android-sdk-*
+          titanium config --config-file $TMPDIR/config.json --no-colors android.buildTools.selectedVersion 23.0.1
+          titanium config --config-file $TMPDIR/config.json --no-colors android.buildTools.path ${androidsdkComposition}/libexec/android-sdk-*/build-tools/android-*
+          titanium config --config-file $TMPDIR/config.json android.executables.zipalign ${androidsdkComposition}/libexec/android-sdk-*/build-tools/android-*/zipalign
+          titanium config --config-file $TMPDIR/config.json android.executables.aapt ${androidsdkComposition}/libexec/android-sdk-*/build-tools/android-*/aapt
+          titanium config --config-file $TMPDIR/config.json android.executables.aidl ${androidsdkComposition}/libexec/android-sdk-*/build-tools/android-*/aidl
+          titanium config --config-file $TMPDIR/config.json android.executables.dx ${androidsdkComposition}/libexec/android-sdk-*/build-tools/android-*/dx
           
-          # Add zipalign to PATH to make Ti 3.1 builds still work
-          for i in $(find -L ${androidsdkComposition}/libexec/android-sdk-*/build-tools -name zipalign)
-          do
-              export PATH=$(dirname $i):$PATH
-              break
-          done
+          export PATH=$(echo ${androidsdkComposition}/libexec/android-sdk-*/tools):$(echo ${androidsdkComposition}/libexec/android-sdk-*/build-tools/android-*):$PATH
           
           ${if release then
-            ''titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target dist-playstore --keystore ${androidKeyStore} --alias ${androidKeyAlias} --password ${androidKeyStorePassword} --output-dir $out''
+            ''titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target dist-playstore --keystore ${androidKeyStore} --alias ${androidKeyAlias} --store-password ${androidKeyStorePassword} --output-dir $out''
           else
             ''titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target emulator --build-only -B foo --output $out''}
         ''
       else if target == "iphone" then
         ''
-          export NIX_TITANIUM_WORKAROUND="--config-file $TMPDIR/config.json"
-          
           ${if release then
             ''
               export HOME=/Users/$(whoami)
@@ -78,9 +76,6 @@ stdenv.mkDerivation {
               security default-keychain -s $keychainName
               security unlock-keychain -p "" $keychainName
               security import ${iosCertificate} -k $keychainName -P "${iosCertificatePassword}" -A
-              ${stdenv.lib.optionalString (iosWwdrCertificate != null) ''
-                security import ${iosWwdrCertificate} -k $keychainName
-              ''}
               provisioningId=$(grep UUID -A1 -a ${iosMobileProvisioningProfile} | grep -o "[-A-Za-z0-9]\{36\}")
    
               # Ensure that the requested provisioning profile can be found
@@ -91,16 +86,6 @@ stdenv.mkDerivation {
                   cp ${iosMobileProvisioningProfile} "$HOME/Library/MobileDevice/Provisioning Profiles/$provisioningId.mobileprovision"
               fi
             
-              # Make a copy of the Titanium SDK and fix its permissions. Without it,
-              # builds using the facebook module fail, because it needs to be writable
-            
-              cp -av ${titaniumsdk} $TMPDIR/titaniumsdk
-            
-              find $TMPDIR/titaniumsdk | while read i
-              do
-                  chmod 755 "$i"
-              done
-              
               # Simulate a login
               mkdir -p $HOME/.titanium
               cat > $HOME/.titanium/auth_session.json <<EOF
@@ -110,14 +95,21 @@ stdenv.mkDerivation {
               # Configure the path to Xcode
               titanium --config-file $TMPDIR/config.json --no-colors config paths.xcode ${xcodeBaseDir}
               
-              # Set the SDK to our copy
-              titanium --config-file $TMPDIR/config.json --no-colors config sdk.defaultInstallLocation $TMPDIR/titaniumsdk
-            
+              # Make plutil available
+              mkdir -p $TMPDIR/bin
+              ln -s /usr/bin/plutil $TMPDIR/bin
+              export PATH=$TMPDIR/bin:$PATH
+              
+              # Link the modules folder
+              if [ ! -e modules ]
+              then
+                  ln -s ${titaniumsdk}/modules modules
+              fi
+              
               # Do the actual build
               titanium build --config-file $TMPDIR/config.json --force --no-colors --platform ios --target dist-adhoc --pp-uuid $provisioningId --distribution-name "${iosCertificateName}" --keychain $HOME/Library/Keychains/$keychainName --device-family universal --ios-version ${iosVersion} --output-dir $out
             
               # Remove our generated keychain
-            
               ${deleteKeychain}
             ''
           else
@@ -129,11 +121,28 @@ stdenv.mkDerivation {
             
               cp -av * $out
               cd $out
-            
+              
+              # We need to consult a real home directory to find the available simulators
+              export HOME=/Users/$(whoami)
+              
               # Configure the path to Xcode
               titanium --config-file $TMPDIR/config.json --no-colors config paths.xcode ${xcodeBaseDir}
               
+              # Link the modules folder
+              if [ ! -e modules ]
+              then
+                  ln -s ${titaniumsdk}/modules modules
+                  createdModulesSymlink=1
+              fi
+              
+              # Execute the build
               titanium build --config-file $TMPDIR/config.json --force --no-colors --platform ios --target simulator --build-only --device-family universal --ios-version ${iosVersion} --output-dir $out
+              
+              # Remove the modules symlink
+              if [ "$createdModulesSymlink" = "1" ]
+              then
+                  rm $out/modules
+              fi
           ''}
         ''
 
diff --git a/pkgs/development/mobile/titaniumenv/cli/cli.json b/pkgs/development/mobile/titaniumenv/cli/cli.json
new file mode 100644
index 000000000000..df2c0af5d93a
--- /dev/null
+++ b/pkgs/development/mobile/titaniumenv/cli/cli.json
@@ -0,0 +1,3 @@
+[
+  "titanium"
+]
diff --git a/pkgs/development/mobile/titaniumenv/cli/default.nix b/pkgs/development/mobile/titaniumenv/cli/default.nix
new file mode 100644
index 000000000000..fa98bb3b76ad
--- /dev/null
+++ b/pkgs/development/mobile/titaniumenv/cli/default.nix
@@ -0,0 +1,15 @@
+{system ? builtins.currentSystem, pkgs ? import <nixpkgs> {
+    inherit system;
+  }, overrides ? {}}:
+
+let
+  nodeEnv = import ./node-env.nix {
+    inherit (pkgs) stdenv fetchurl nodejs python utillinux runCommand;
+  };
+  registry = (import ./registry.nix {
+    inherit (nodeEnv) buildNodePackage;
+    inherit (pkgs) fetchurl fetchgit;
+    self = registry;
+  }) // overrides;
+in
+registry
\ No newline at end of file
diff --git a/pkgs/development/mobile/titaniumenv/cli/node-env.nix b/pkgs/development/mobile/titaniumenv/cli/node-env.nix
new file mode 100644
index 000000000000..7af18c034f24
--- /dev/null
+++ b/pkgs/development/mobile/titaniumenv/cli/node-env.nix
@@ -0,0 +1,309 @@
+{ stdenv, fetchurl, nodejs, python, utillinux, runCommand }:
+
+let
+  # Function that generates a TGZ file from a NPM project
+  buildNodeSourceDist =
+    { name, version, src }:
+    
+    stdenv.mkDerivation {
+      name = "node-tarball-${name}-${version}";
+      inherit src;
+      buildInputs = [ nodejs ];
+      buildPhase = ''
+        export HOME=$TMPDIR
+        tgzFile=$(npm pack)
+      '';
+      installPhase = ''
+        mkdir -p $out/tarballs
+        mv $tgzFile $out/tarballs
+        mkdir -p $out/nix-support
+        echo "file source-dist $out/tarballs/$tgzFile" >> $out/nix-support/hydra-build-products
+      '';
+    };
+
+  # We must run semver to determine whether a provided dependency conforms to a certain version range
+  semver = buildNodePackage {
+    name = "semver";
+    version = "5.0.3";
+    src = fetchurl {
+      url = http://registry.npmjs.org/semver/-/semver-5.0.3.tgz;
+      sha1 = "77466de589cd5d3c95f138aa78bc569a3cb5d27a";
+    };
+  } {};
+  
+  # Function that produces a deployed NPM package in the Nix store
+  buildNodePackage =
+    { name, version, src, dependencies ? {}, buildInputs ? [], production ? true, npmFlags ? "", meta ? {}, linkDependencies ? false }:
+    { providedDependencies ? {} }:
+
+    let
+      # Generate and import a Nix expression that determines which dependencies
+      # are required and which are not required (and must be shimmed).
+      #
+      # It uses the semver utility to check whether a version range matches any
+      # of the provided dependencies.
+  
+      analysedDependencies = 
+        if dependencies == {} then {}
+        else
+          import (stdenv.mkDerivation {
+            name = "${name}-${version}-analysedDependencies.nix";
+            buildInputs = [ semver ];
+            buildCommand = ''
+              cat > $out <<EOF
+              {
+              ${stdenv.lib.concatMapStrings (dependencyName:
+                let
+                  dependency = builtins.getAttr dependencyName dependencies;
+                  versionSpecs = builtins.attrNames dependency;
+                in
+                stdenv.lib.concatMapStrings (versionSpec:
+                  if builtins.hasAttr dependencyName providedDependencies # Search for any provided dependencies that match the required version spec. If one matches, the dependency should not be included
+                  then
+                    let
+                      providedDependency = builtins.getAttr dependencyName providedDependencies;
+                      versions = builtins.attrNames providedDependency;
+                      
+                      # If there is a version range match, add the dependency to
+                      # the set of shimmed dependencies.
+                      # Otherwise, it is a required dependency.
+                    in
+                    ''
+                      $(latestVersion=$(semver -r '${versionSpec}' ${stdenv.lib.concatMapStrings (version: " '${version}'") versions} | tail -1 | tr -d '\n')
+                      
+                      if semver -r '${versionSpec}' ${stdenv.lib.concatMapStrings (version: " '${version}'") versions} >/dev/null
+                      then
+                          echo "shimmedDependencies.\"${dependencyName}\".\"$latestVersion\" = true;"
+                      else
+                          echo 'requiredDependencies."${dependencyName}"."${versionSpec}" = true;'
+                      fi)
+                    ''
+                  else # If a dependency is not provided by an includer, we must always include it ourselves
+                    "requiredDependencies.\"${dependencyName}\".\"${versionSpec}\" = true;\n"
+                ) versionSpecs
+              ) (builtins.attrNames dependencies)}
+              }
+              EOF
+            '';
+          });
+    
+      requiredDependencies = analysedDependencies.requiredDependencies or {};
+      shimmedDependencies = analysedDependencies.shimmedDependencies or {};
+
+      # Extract the Node.js source code which is used to compile packages with native bindings
+      nodeSources = runCommand "node-sources" {} ''
+        tar --no-same-owner --no-same-permissions -xf ${nodejs.src}
+        mv node-* $out
+      '';
+  
+      # Compose dependency information that this package must propagate to its
+      # dependencies, so that provided dependencies are not included a second time.
+      # This prevents cycles and wildcard version mismatches.
+  
+      propagatedProvidedDependencies =
+        (stdenv.lib.mapAttrs (dependencyName: dependency:
+          builtins.listToAttrs (map (versionSpec:
+            { name = dependency."${versionSpec}".version;
+              value = true;
+            }
+          ) (builtins.attrNames dependency))
+        ) dependencies) //
+        providedDependencies //
+        { "${name}"."${version}" = true; };
+        
+      # Create a node_modules folder containing all required dependencies of the
+      # package
+      
+      nodeDependencies = stdenv.mkDerivation {
+        name = "node-dependencies-${name}-${version}";
+        inherit src;
+        buildCommand = ''
+          mkdir -p $out/lib/node_modules
+          cd $out/lib/node_modules
+          
+          # Create copies of (or symlinks to) the dependencies that must be deployed in this package's private node_modules folder.
+          # This package's private dependencies are NPM packages that have not been provided by any of the includers.
+          
+          ${stdenv.lib.concatMapStrings (requiredDependencyName:
+            stdenv.lib.concatMapStrings (versionSpec:
+              let
+                dependency = dependencies."${requiredDependencyName}"."${versionSpec}".pkg {
+                  providedDependencies = propagatedProvidedDependencies;
+                };
+              in
+              ''
+                depPath=$(echo ${dependency}/lib/node_modules/*)
+                
+                ${if linkDependencies then ''
+                  ln -s $depPath .
+                '' else ''
+                  cp -r $depPath .
+                ''}
+              ''
+            ) (builtins.attrNames (requiredDependencies."${requiredDependencyName}"))
+          ) (builtins.attrNames requiredDependencies)}
+        '';
+      };
+    
+      # Deploy the Node package with some tricks
+      self = stdenv.lib.makeOverridable stdenv.mkDerivation {
+        inherit src meta;
+        dontStrip = true;
+      
+        name = "node-${name}-${version}";
+        buildInputs = [ nodejs python ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
+        buildPhase = "true";
+    
+        installPhase = ''
+          # Move the contents of the tarball into the output folder
+          mkdir -p "$out/lib/node_modules/${name}"
+          mv * "$out/lib/node_modules/${name}"
+          
+          # Enter the target directory
+          cd "$out/lib/node_modules/${name}"
+          
+          # Patch the shebangs of the bundled modules. For "regular" dependencies
+          # this is step is not required, because it has already been done by the generic builder.
+          
+          if [ -d node_modules ]
+          then
+              patchShebangs node_modules
+          fi
+          
+          # Copy the required dependencies
+          mkdir -p node_modules
+          
+          ${stdenv.lib.optionalString (requiredDependencies != {}) ''
+            for i in ${nodeDependencies}/lib/node_modules/*
+            do
+                if [ ! -d "node_modules/$(basename $i)" ]
+                then
+                    cp -a $i node_modules
+                fi
+            done
+          ''}
+          
+          # Create shims for the packages that have been provided by earlier includers to allow the NPM install operation to still succeed
+          
+          ${stdenv.lib.concatMapStrings (shimmedDependencyName:
+            stdenv.lib.concatMapStrings (versionSpec:
+              ''
+                mkdir -p node_modules/${shimmedDependencyName}
+                cat > node_modules/${shimmedDependencyName}/package.json <<EOF
+                {
+                    "name": "${shimmedDependencyName}",
+                    "version": "${versionSpec}"
+                }
+                EOF
+              ''
+            ) (builtins.attrNames (shimmedDependencies."${shimmedDependencyName}"))
+          ) (builtins.attrNames shimmedDependencies)}
+          
+          # Ignore npm-shrinkwrap.json for now. Ideally, it should be supported as well
+          rm -f npm-shrinkwrap.json
+          
+          # Some version specifiers (latest, unstable, URLs, file paths) force NPM to make remote connections or consult paths outside the Nix store.
+          # The following JavaScript replaces these by * to prevent that:
+          
+          (
+          cat <<EOF
+          var fs = require('fs');
+          var url = require('url');
+          
+          /*
+           * Replaces an impure version specification by *
+           */
+          function replaceImpureVersionSpec(versionSpec) {
+              var parsedUrl = url.parse(versionSpec);
+              
+              if(versionSpec == "latest" || versionSpec == "unstable" ||
+                  versionSpec.substr(0, 2) == ".." || dependency.substr(0, 2) == "./" || dependency.substr(0, 2) == "~/" || dependency.substr(0, 1) == '/')
+                  return '*';
+              else if(parsedUrl.protocol == "git:" || parsedUrl.protocol == "git+ssh:" || parsedUrl.protocol == "git+http:" || parsedUrl.protocol == "git+https:" ||
+                  parsedUrl.protocol == "http:" || parsedUrl.protocol == "https:")
+                  return '*';
+              else
+                  return versionSpec;
+          }
+          
+          var packageObj = JSON.parse(fs.readFileSync('./package.json'));
+          
+          /* Replace dependencies */
+          if(packageObj.dependencies !== undefined) {
+              for(var dependency in packageObj.dependencies) {
+                  var versionSpec = packageObj.dependencies[dependency];
+                  packageObj.dependencies[dependency] = replaceImpureVersionSpec(versionSpec);
+              }
+          }
+          
+          /* Replace development dependencies */
+          if(packageObj.devDependencies !== undefined) {
+              for(var dependency in packageObj.devDependencies) {
+                  var versionSpec = packageObj.devDependencies[dependency];
+                  packageObj.devDependencies[dependency] = replaceImpureVersionSpec(versionSpec);
+              }
+          }
+          
+          /* Replace optional dependencies */
+          if(packageObj.optionalDependencies !== undefined) {
+              for(var dependency in packageObj.optionalDependencies) {
+                  var versionSpec = packageObj.optionalDependencies[dependency];
+                  packageObj.optionalDependencies[dependency] = replaceImpureVersionSpec(versionSpec);
+              }
+          }
+          
+          /* Write the fixed JSON file */
+          fs.writeFileSync("package.json", JSON.stringify(packageObj));
+          EOF
+          ) | node
+          
+          # Deploy the Node.js package by running npm install. Since the dependencies have been symlinked, it should not attempt to install them again,
+          # which is good, because we want to make it Nix's responsibility. If it needs to install any dependencies anyway (e.g. because the dependency
+          # parameters are incomplete/incorrect), it fails.
+          
+          export HOME=$TMPDIR
+          npm --registry http://www.example.com --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install
+          
+          # After deployment of the NPM package, we must remove the shims again
+          ${stdenv.lib.concatMapStrings (shimmedDependencyName:
+            ''
+              rm node_modules/${shimmedDependencyName}/package.json
+              rmdir node_modules/${shimmedDependencyName}
+            ''
+          ) (builtins.attrNames shimmedDependencies)}
+          
+          # It makes no sense to keep an empty node_modules folder around, so delete it if this is the case
+          if [ -d node_modules ]
+          then
+              rmdir --ignore-fail-on-non-empty node_modules
+          fi
+          
+          # Create symlink to the deployed executable folder, if applicable
+          if [ -d "$out/lib/node_modules/.bin" ]
+          then
+              ln -s $out/lib/node_modules/.bin $out/bin
+          fi
+          
+          # Create symlinks to the deployed manual page folders, if applicable
+          if [ -d "$out/lib/node_modules/${name}/man" ]
+          then
+              mkdir -p $out/share
+              for dir in "$out/lib/node_modules/${name}/man/"*
+              do
+                  mkdir -p $out/share/man/$(basename "$dir")
+                  for page in "$dir"/*
+                  do
+                      ln -s $page $out/share/man/$(basename "$dir")
+                  done
+              done
+          fi
+        '';
+        
+        shellHook = stdenv.lib.optionalString (requiredDependencies != {}) ''
+          export NODE_PATH=${nodeDependencies}/lib/node_modules
+        '';
+      };
+    in
+    self;
+in
+{ inherit buildNodeSourceDist buildNodePackage; }
diff --git a/pkgs/development/mobile/titaniumenv/cli/registry.nix b/pkgs/development/mobile/titaniumenv/cli/registry.nix
new file mode 100644
index 000000000000..b5bb23a836ca
--- /dev/null
+++ b/pkgs/development/mobile/titaniumenv/cli/registry.nix
@@ -0,0 +1,2393 @@
+{buildNodePackage, fetchurl, fetchgit, self}:
+
+let
+  registry = {
+    "titanium-5.0.5" = buildNodePackage {
+      name = "titanium";
+      version = "5.0.5";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/titanium/-/titanium-5.0.5.tgz";
+        sha1 = "38a466deaeee9a8b346973d70a8baaeb4c3af281";
+      };
+      dependencies = {
+        async = {
+          "1.4.2" = {
+            version = "1.4.2";
+            pkg = self."async-1.4.2";
+          };
+        };
+        colors = {
+          "1.1.2" = {
+            version = "1.1.2";
+            pkg = self."colors-1.1.2";
+          };
+        };
+        fields = {
+          "0.1.24" = {
+            version = "0.1.24";
+            pkg = self."fields-0.1.24";
+          };
+        };
+        humanize = {
+          "0.0.9" = {
+            version = "0.0.9";
+            pkg = self."humanize-0.0.9";
+          };
+        };
+        longjohn = {
+          "0.2.9" = {
+            version = "0.2.9";
+            pkg = self."longjohn-0.2.9";
+          };
+        };
+        moment = {
+          "2.10.6" = {
+            version = "2.10.6";
+            pkg = self."moment-2.10.6";
+          };
+        };
+        node-appc = {
+          "0.2.31" = {
+            version = "0.2.31";
+            pkg = self."node-appc-0.2.31";
+          };
+        };
+        request = {
+          "2.62.0" = {
+            version = "2.62.0";
+            pkg = self."request-2.62.0";
+          };
+        };
+        semver = {
+          "5.0.3" = {
+            version = "5.0.3";
+            pkg = self."semver-5.0.3";
+          };
+        };
+        sprintf = {
+          "0.1.5" = {
+            version = "0.1.5";
+            pkg = self."sprintf-0.1.5";
+          };
+        };
+        temp = {
+          "0.8.3" = {
+            version = "0.8.3";
+            pkg = self."temp-0.8.3";
+          };
+        };
+        winston = {
+          "1.0.x" = {
+            version = "1.0.2";
+            pkg = self."winston-1.0.2";
+          };
+        };
+        wrench = {
+          "1.5.8" = {
+            version = "1.5.8";
+            pkg = self."wrench-1.5.8";
+          };
+        };
+      };
+      meta = {
+        description = "Appcelerator Titanium Command line";
+        homepage = "https://github.com/appcelerator/titanium#readme";
+        license = "Apache-2.0";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "async-1.4.2" = buildNodePackage {
+      name = "async";
+      version = "1.4.2";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/async/-/async-1.4.2.tgz";
+        sha1 = "6c9edcb11ced4f0dd2f2d40db0d49a109c088aab";
+      };
+      meta = {
+        description = "Higher-order functions and common patterns for asynchronous code";
+        homepage = "https://github.com/caolan/async#readme";
+        license = "MIT";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "colors-1.1.2" = buildNodePackage {
+      name = "colors";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/colors/-/colors-1.1.2.tgz";
+        sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63";
+      };
+      meta = {
+        description = "get colors in your node.js console";
+        homepage = https://github.com/Marak/colors.js;
+        license = "MIT";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "fields-0.1.24" = buildNodePackage {
+      name = "fields";
+      version = "0.1.24";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/fields/-/fields-0.1.24.tgz";
+        sha1 = "bed93b1c2521f4705fe764f4209267fdfd89f5d3";
+      };
+      dependencies = {
+        colors = {
+          "~0.6.2" = {
+            version = "0.6.2";
+            pkg = self."colors-0.6.2";
+          };
+        };
+        keypress = {
+          "~0.2.1" = {
+            version = "0.2.1";
+            pkg = self."keypress-0.2.1";
+          };
+        };
+        sprintf = {
+          "~0.1.4" = {
+            version = "0.1.5";
+            pkg = self."sprintf-0.1.5";
+          };
+        };
+      };
+      meta = {
+        description = "Creates fields to prompt for input at the command line";
+        homepage = https://github.com/cb1kenobi/fields;
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "colors-0.6.2" = buildNodePackage {
+      name = "colors";
+      version = "0.6.2";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/colors/-/colors-0.6.2.tgz";
+        sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc";
+      };
+      meta = {
+        description = "get colors in your node.js console like what";
+        homepage = https://github.com/Marak/colors.js;
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "colors-~0.6.2" = self."colors-0.6.2";
+    "keypress-0.2.1" = buildNodePackage {
+      name = "keypress";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/keypress/-/keypress-0.2.1.tgz";
+        sha1 = "1e80454250018dbad4c3fe94497d6e67b6269c77";
+      };
+      meta = {
+        description = "Make any Node ReadableStream emit \"keypress\" events";
+        license = "MIT";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "keypress-~0.2.1" = self."keypress-0.2.1";
+    "sprintf-0.1.5" = buildNodePackage {
+      name = "sprintf";
+      version = "0.1.5";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/sprintf/-/sprintf-0.1.5.tgz";
+        sha1 = "8f83e39a9317c1a502cb7db8050e51c679f6edcf";
+      };
+      meta = {
+        description = "Sprintf() for node.js";
+        homepage = https://github.com/maritz/node-sprintf;
+        license = "BSD-3-Clause";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "sprintf-~0.1.4" = self."sprintf-0.1.5";
+    "humanize-0.0.9" = buildNodePackage {
+      name = "humanize";
+      version = "0.0.9";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/humanize/-/humanize-0.0.9.tgz";
+        sha1 = "1994ffaecdfe9c441ed2bdac7452b7bb4c9e41a4";
+      };
+      dependencies = {};
+      meta = {
+        description = "Javascript string formatter for human readability";
+        homepage = https://github.com/taijinlee/humanize;
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "longjohn-0.2.9" = buildNodePackage {
+      name = "longjohn";
+      version = "0.2.9";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/longjohn/-/longjohn-0.2.9.tgz";
+        sha1 = "db1bf175fcfffcfce099132d1470f52f41a31519";
+      };
+      dependencies = {
+        source-map-support = {
+          "0.3.2" = {
+            version = "0.3.2";
+            pkg = self."source-map-support-0.3.2";
+          };
+        };
+      };
+      meta = {
+        description = "Long stack traces for node.js inspired by https://github.com/tlrobinson/long-stack-traces";
+        homepage = https://github.com/mattinsler/longjohn;
+        license = "MIT";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "source-map-support-0.3.2" = buildNodePackage {
+      name = "source-map-support";
+      version = "0.3.2";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/source-map-support/-/source-map-support-0.3.2.tgz";
+        sha1 = "737d5c901e0b78fdb53aca713d24f23ccbb10be1";
+      };
+      dependencies = {
+        source-map = {
+          "0.1.32" = {
+            version = "0.1.32";
+            pkg = self."source-map-0.1.32";
+          };
+        };
+      };
+      meta = {
+        description = "Fixes stack traces for files with source maps";
+        homepage = https://github.com/evanw/node-source-map-support;
+        license = "MIT";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "source-map-0.1.32" = buildNodePackage {
+      name = "source-map";
+      version = "0.1.32";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz";
+        sha1 = "c8b6c167797ba4740a8ea33252162ff08591b266";
+      };
+      dependencies = {
+        amdefine = {
+          ">=0.0.4" = {
+            version = "1.0.0";
+            pkg = self."amdefine-1.0.0";
+          };
+        };
+      };
+      meta = {
+        description = "Generates and consumes source maps";
+        homepage = https://github.com/mozilla/source-map;
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "amdefine-1.0.0" = buildNodePackage {
+      name = "amdefine";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz";
+        sha1 = "fd17474700cb5cc9c2b709f0be9d23ce3c198c33";
+      };
+      meta = {
+        description = "Provide AMD's define() API for declaring modules in the AMD format";
+        homepage = http://github.com/jrburke/amdefine;
+        license = "BSD-3-Clause AND MIT";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "amdefine->=0.0.4" = self."amdefine-1.0.0";
+    "moment-2.10.6" = buildNodePackage {
+      name = "moment";
+      version = "2.10.6";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/moment/-/moment-2.10.6.tgz";
+        sha1 = "6cb21967c79cba7b0ca5e66644f173662b3efa77";
+      };
+      meta = {
+        description = "Parse, validate, manipulate, and display dates";
+        homepage = http://momentjs.com/;
+        license = "MIT";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "node-appc-0.2.31" = buildNodePackage {
+      name = "node-appc";
+      version = "0.2.31";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/node-appc/-/node-appc-0.2.31.tgz";
+        sha1 = "8d8d0052fd8b8ce4bc44f06883009f7c950bc8c2";
+      };
+      dependencies = {
+        adm-zip = {
+          "0.4.7" = {
+            version = "0.4.7";
+            pkg = self."adm-zip-0.4.7";
+          };
+        };
+        async = {
+          "1.4.2" = {
+            version = "1.4.2";
+            pkg = self."async-1.4.2";
+          };
+        };
+        colors = {
+          "1.1.2" = {
+            version = "1.1.2";
+            pkg = self."colors-1.1.2";
+          };
+        };
+        diff = {
+          "2.1.0" = {
+            version = "2.1.0";
+            pkg = self."diff-2.1.0";
+          };
+        };
+        node-uuid = {
+          "1.4.3" = {
+            version = "1.4.3";
+            pkg = self."node-uuid-1.4.3";
+          };
+        };
+        optimist = {
+          "0.6.1" = {
+            version = "0.6.1";
+            pkg = self."optimist-0.6.1";
+          };
+        };
+        request = {
+          "2.61.0" = {
+            version = "2.61.0";
+            pkg = self."request-2.61.0";
+          };
+        };
+        semver = {
+          "5.0.1" = {
+            version = "5.0.1";
+            pkg = self."semver-5.0.1";
+          };
+        };
+        sprintf = {
+          "0.1.5" = {
+            version = "0.1.5";
+            pkg = self."sprintf-0.1.5";
+          };
+        };
+        temp = {
+          "0.8.3" = {
+            version = "0.8.3";
+            pkg = self."temp-0.8.3";
+          };
+        };
+        wrench = {
+          "1.5.8" = {
+            version = "1.5.8";
+            pkg = self."wrench-1.5.8";
+          };
+        };
+        uglify-js = {
+          "2.4.24" = {
+            version = "2.4.24";
+            pkg = self."uglify-js-2.4.24";
+          };
+        };
+        xmldom = {
+          "0.1.19" = {
+            version = "0.1.19";
+            pkg = self."xmldom-0.1.19";
+          };
+        };
+      };
+      meta = {
+        description = "Appcelerator Common Node Library";
+        homepage = http://github.com/appcelerator/node-appc;
+        license = "Apache Public License v2";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "adm-zip-0.4.7" = buildNodePackage {
+      name = "adm-zip";
+      version = "0.4.7";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz";
+        sha1 = "8606c2cbf1c426ce8c8ec00174447fd49b6eafc1";
+      };
+      meta = {
+        description = "A Javascript implementation of zip for nodejs. Allows user to create or extract zip files both in memory or to/from disk";
+        homepage = http://github.com/cthackers/adm-zip;
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "diff-2.1.0" = buildNodePackage {
+      name = "diff";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/diff/-/diff-2.1.0.tgz";
+        sha1 = "39b5aa97f0d1600b428ad0a91dc8efcc9b29e288";
+      };
+      dependencies = {};
+      meta = {
+        description = "A javascript text diff implementation.";
+        homepage = "https://github.com/kpdecker/jsdiff#readme";
+        license = "BSD-3-Clause";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "node-uuid-1.4.3" = buildNodePackage {
+      name = "node-uuid";
+      version = "1.4.3";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz";
+        sha1 = "319bb7a56e7cb63f00b5c0cd7851cd4b4ddf1df9";
+      };
+      meta = {
+        description = "Rigorous implementation of RFC4122 (v1 and v4) UUIDs.";
+        homepage = https://github.com/broofa/node-uuid;
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "optimist-0.6.1" = buildNodePackage {
+      name = "optimist";
+      version = "0.6.1";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz";
+        sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686";
+      };
+      dependencies = {
+        wordwrap = {
+          "~0.0.2" = {
+            version = "0.0.3";
+            pkg = self."wordwrap-0.0.3";
+          };
+        };
+        minimist = {
+          "~0.0.1" = {
+            version = "0.0.10";
+            pkg = self."minimist-0.0.10";
+          };
+        };
+      };
+      meta = {
+        description = "Light-weight option parsing with an argv hash. No optstrings attached.";
+        homepage = https://github.com/substack/node-optimist;
+        license = "MIT/X11";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "wordwrap-0.0.3" = buildNodePackage {
+      name = "wordwrap";
+      version = "0.0.3";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz";
+        sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107";
+      };
+      meta = {
+        description = "Wrap those words. Show them at what columns to start and stop.";
+        homepage = "https://github.com/substack/node-wordwrap#readme";
+        license = "MIT";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "wordwrap-~0.0.2" = self."wordwrap-0.0.3";
+    "minimist-0.0.10" = buildNodePackage {
+      name = "minimist";
+      version = "0.0.10";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz";
+        sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf";
+      };
+      meta = {
+        description = "parse argument options";
+        homepage = https://github.com/substack/minimist;
+        license = "MIT";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "minimist-~0.0.1" = self."minimist-0.0.10";
+    "request-2.61.0" = buildNodePackage {
+      name = "request";
+      version = "2.61.0";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/request/-/request-2.61.0.tgz";
+        sha1 = "6973cb2ac94885f02693f554eec64481d6013f9f";
+      };
+      dependencies = {
+        bl = {
+          "~1.0.0" = {
+            version = "1.0.0";
+            pkg = self."bl-1.0.0";
+          };
+        };
+        caseless = {
+          "~0.11.0" = {
+            version = "0.11.0";
+            pkg = self."caseless-0.11.0";
+          };
+        };
+        extend = {
+          "~3.0.0" = {
+            version = "3.0.0";
+            pkg = self."extend-3.0.0";
+          };
+        };
+        forever-agent = {
+          "~0.6.0" = {
+            version = "0.6.1";
+            pkg = self."forever-agent-0.6.1";
+          };
+        };
+        form-data = {
+          "~1.0.0-rc1" = {
+            version = "1.0.0-rc3";
+            pkg = self."form-data-1.0.0-rc3";
+          };
+        };
+        json-stringify-safe = {
+          "~5.0.0" = {
+            version = "5.0.1";
+            pkg = self."json-stringify-safe-5.0.1";
+          };
+        };
+        mime-types = {
+          "~2.1.2" = {
+            version = "2.1.8";
+            pkg = self."mime-types-2.1.8";
+          };
+        };
+        node-uuid = {
+          "~1.4.0" = {
+            version = "1.4.7";
+            pkg = self."node-uuid-1.4.7";
+          };
+        };
+        qs = {
+          "~4.0.0" = {
+            version = "4.0.0";
+            pkg = self."qs-4.0.0";
+          };
+        };
+        tunnel-agent = {
+          "~0.4.0" = {
+            version = "0.4.2";
+            pkg = self."tunnel-agent-0.4.2";
+          };
+        };
+        tough-cookie = {
+          ">=0.12.0" = {
+            version = "2.2.1";
+            pkg = self."tough-cookie-2.2.1";
+          };
+        };
+        http-signature = {
+          "~0.11.0" = {
+            version = "0.11.0";
+            pkg = self."http-signature-0.11.0";
+          };
+        };
+        oauth-sign = {
+          "~0.8.0" = {
+            version = "0.8.0";
+            pkg = self."oauth-sign-0.8.0";
+          };
+        };
+        hawk = {
+          "~3.1.0" = {
+            version = "3.1.2";
+            pkg = self."hawk-3.1.2";
+          };
+        };
+        aws-sign2 = {
+          "~0.5.0" = {
+            version = "0.5.0";
+            pkg = self."aws-sign2-0.5.0";
+          };
+        };
+        stringstream = {
+          "~0.0.4" = {
+            version = "0.0.5";
+            pkg = self."stringstream-0.0.5";
+          };
+        };
+        combined-stream = {
+          "~1.0.1" = {
+            version = "1.0.5";
+            pkg = self."combined-stream-1.0.5";
+          };
+        };
+        isstream = {
+          "~0.1.1" = {
+            version = "0.1.2";
+            pkg = self."isstream-0.1.2";
+          };
+        };
+        har-validator = {
+          "^1.6.1" = {
+            version = "1.8.0";
+            pkg = self."har-validator-1.8.0";
+          };
+        };
+      };
+      meta = {
+        description = "Simplified HTTP request client.";
+        homepage = "https://github.com/request/request#readme";
+        license = "Apache-2.0";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "bl-1.0.0" = buildNodePackage {
+      name = "bl";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/bl/-/bl-1.0.0.tgz";
+        sha1 = "ada9a8a89a6d7ac60862f7dec7db207873e0c3f5";
+      };
+      dependencies = {
+        readable-stream = {
+          "~2.0.0" = {
+            version = "2.0.5";
+            pkg = self."readable-stream-2.0.5";
+          };
+        };
+      };
+      meta = {
+        description = "Buffer List: collect buffers and access with a standard readable Buffer interface, streamable too!";
+        homepage = https://github.com/rvagg/bl;
+        license = "MIT";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "readable-stream-2.0.5" = buildNodePackage {
+      name = "readable-stream";
+      version = "2.0.5";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/readable-stream/-/readable-stream-2.0.5.tgz";
+        sha1 = "a2426f8dcd4551c77a33f96edf2886a23c829669";
+      };
+      dependencies = {
+        core-util-is = {
+          "~1.0.0" = {
+            version = "1.0.2";
+            pkg = self."core-util-is-1.0.2";
+          };
+        };
+        inherits = {
+          "~2.0.1" = {
+            version = "2.0.1";
+            pkg = self."inherits-2.0.1";
+          };
+        };
+        isarray = {
+          "0.0.1" = {
+            version = "0.0.1";
+            pkg = self."isarray-0.0.1";
+          };
+        };
+        process-nextick-args = {
+          "~1.0.6" = {
+            version = "1.0.6";
+            pkg = self."process-nextick-args-1.0.6";
+          };
+        };
+        string_decoder = {
+          "~0.10.x" = {
+            version = "0.10.31";
+            pkg = self."string_decoder-0.10.31";
+          };
+        };
+        util-deprecate = {
+          "~1.0.1" = {
+            version = "1.0.2";
+            pkg = self."util-deprecate-1.0.2";
+          };
+        };
+      };
+      meta = {
+        description = "Streams3, a user-land copy of the stream library from iojs v2.x";
+        homepage = "https://github.com/nodejs/readable-stream#readme";
+        license = "MIT";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "core-util-is-1.0.2" = buildNodePackage {
+      name = "core-util-is";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz";
+        sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
+      };
+      meta = {
+        description = "The `util.is*` functions introduced in Node v0.12.";
+        homepage = "https://github.com/isaacs/core-util-is#readme";
+        license = "MIT";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "core-util-is-~1.0.0" = self."core-util-is-1.0.2";
+    "inherits-2.0.1" = buildNodePackage {
+      name = "inherits";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz";
+        sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1";
+      };
+      meta = {
+        description = "Browser-friendly inheritance fully compatible with standard node.js inherits()";
+        license = "ISC";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "inherits-~2.0.1" = self."inherits-2.0.1";
+    "isarray-0.0.1" = buildNodePackage {
+      name = "isarray";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";
+        sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf";
+      };
+      dependencies = {};
+      meta = {
+        description = "Array#isArray for older browsers";
+        homepage = https://github.com/juliangruber/isarray;
+        license = "MIT";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "process-nextick-args-1.0.6" = buildNodePackage {
+      name = "process-nextick-args";
+      version = "1.0.6";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz";
+        sha1 = "0f96b001cea90b12592ce566edb97ec11e69bd05";
+      };
+      meta = {
+        description = "process.nextTick but always with args";
+        homepage = https://github.com/calvinmetcalf/process-nextick-args;
+        license = "MIT";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "process-nextick-args-~1.0.6" = self."process-nextick-args-1.0.6";
+    "string_decoder-0.10.31" = buildNodePackage {
+      name = "string_decoder";
+      version = "0.10.31";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz";
+        sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94";
+      };
+      dependencies = {};
+      meta = {
+        description = "The string_decoder module from Node core";
+        homepage = https://github.com/rvagg/string_decoder;
+        license = "MIT";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "string_decoder-~0.10.x" = self."string_decoder-0.10.31";
+    "util-deprecate-1.0.2" = buildNodePackage {
+      name = "util-deprecate";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz";
+        sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
+      };
+      meta = {
+        description = "The Node.js `util.deprecate()` function with browser support";
+        homepage = https://github.com/TooTallNate/util-deprecate;
+        license = "MIT";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "util-deprecate-~1.0.1" = self."util-deprecate-1.0.2";
+    "readable-stream-~2.0.0" = self."readable-stream-2.0.5";
+    "bl-~1.0.0" = self."bl-1.0.0";
+    "caseless-0.11.0" = buildNodePackage {
+      name = "caseless";
+      version = "0.11.0";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz";
+        sha1 = "715b96ea9841593cc33067923f5ec60ebda4f7d7";
+      };
+      meta = {
+        description = "Caseless object set/get/has, very useful when working with HTTP headers.";
+        homepage = "https://github.com/mikeal/caseless#readme";
+        license = "Apache-2.0";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "caseless-~0.11.0" = self."caseless-0.11.0";
+    "extend-3.0.0" = buildNodePackage {
+      name = "extend";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/extend/-/extend-3.0.0.tgz";
+        sha1 = "5a474353b9f3353ddd8176dfd37b91c83a46f1d4";
+      };
+      dependencies = {};
+      meta = {
+        description = "Port of jQuery.extend for node.js and the browser";
+        homepage = "https://github.com/justmoon/node-extend#readme";
+        license = "MIT";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "extend-~3.0.0" = self."extend-3.0.0";
+    "forever-agent-0.6.1" = buildNodePackage {
+      name = "forever-agent";
+      version = "0.6.1";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz";
+        sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91";
+      };
+      dependencies = {};
+      meta = {
+        description = "HTTP Agent that keeps socket connections alive between keep-alive requests. Formerly part of mikeal/request, now a standalone module.";
+        homepage = https://github.com/mikeal/forever-agent;
+        license = "Apache-2.0";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "forever-agent-~0.6.0" = self."forever-agent-0.6.1";
+    "form-data-1.0.0-rc3" = buildNodePackage {
+      name = "form-data";
+      version = "1.0.0-rc3";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz";
+        sha1 = "d35bc62e7fbc2937ae78f948aaa0d38d90607577";
+      };
+      dependencies = {
+        async = {
+          "^1.4.0" = {
+            version = "1.5.1";
+            pkg = self."async-1.5.1";
+          };
+        };
+        combined-stream = {
+          "^1.0.5" = {
+            version = "1.0.5";
+            pkg = self."combined-stream-1.0.5";
+          };
+        };
+        mime-types = {
+          "^2.1.3" = {
+            version = "2.1.8";
+            pkg = self."mime-types-2.1.8";
+          };
+        };
+      };
+      meta = {
+        description = "A library to create readable \"multipart/form-data\" streams. Can be used to submit forms and file uploads to other web applications.";
+        homepage = "https://github.com/form-data/form-data#readme";
+        license = "MIT";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "async-1.5.1" = buildNodePackage {
+      name = "async";
+      version = "1.5.1";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/async/-/async-1.5.1.tgz";
+        sha1 = "b05714f4b11b357bf79adaffdd06da42d0766c10";
+      };
+      meta = {
+        description = "Higher-order functions and common patterns for asynchronous code";
+        homepage = "https://github.com/caolan/async#readme";
+        license = "MIT";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "async-^1.4.0" = self."async-1.5.1";
+    "combined-stream-1.0.5" = buildNodePackage {
+      name = "combined-stream";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz";
+        sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009";
+      };
+      dependencies = {
+        delayed-stream = {
+          "~1.0.0" = {
+            version = "1.0.0";
+            pkg = self."delayed-stream-1.0.0";
+          };
+        };
+      };
+      meta = {
+        description = "A stream that emits multiple other streams one after another.";
+        homepage = https://github.com/felixge/node-combined-stream;
+        license = "MIT";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "delayed-stream-1.0.0" = buildNodePackage {
+      name = "delayed-stream";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz";
+        sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
+      };
+      dependencies = {};
+      meta = {
+        description = "Buffers events from a stream until you are ready to handle them.";
+        homepage = https://github.com/felixge/node-delayed-stream;
+        license = "MIT";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "delayed-stream-~1.0.0" = self."delayed-stream-1.0.0";
+    "combined-stream-^1.0.5" = self."combined-stream-1.0.5";
+    "mime-types-2.1.8" = buildNodePackage {
+      name = "mime-types";
+      version = "2.1.8";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/mime-types/-/mime-types-2.1.8.tgz";
+        sha1 = "faf57823de04bc7cbff4ee82c6b63946e812ae72";
+      };
+      dependencies = {
+        mime-db = {
+          "~1.20.0" = {
+            version = "1.20.0";
+            pkg = self."mime-db-1.20.0";
+          };
+        };
+      };
+      meta = {
+        description = "The ultimate javascript content-type utility.";
+        homepage = https://github.com/jshttp/mime-types;
+        license = "MIT";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "mime-db-1.20.0" = buildNodePackage {
+      name = "mime-db";
+      version = "1.20.0";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/mime-db/-/mime-db-1.20.0.tgz";
+        sha1 = "496f90fd01fe0e031c8823ec3aa9450ffda18ed8";
+      };
+      meta = {
+        description = "Media Type Database";
+        homepage = https://github.com/jshttp/mime-db;
+        license = "MIT";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "mime-db-~1.20.0" = self."mime-db-1.20.0";
+    "mime-types-^2.1.3" = self."mime-types-2.1.8";
+    "form-data-~1.0.0-rc1" = self."form-data-1.0.0-rc3";
+    "json-stringify-safe-5.0.1" = buildNodePackage {
+      name = "json-stringify-safe";
+      version = "5.0.1";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz";
+        sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
+      };
+      meta = {
+        description = "Like JSON.stringify, but doesn't blow up on circular refs.";
+        homepage = https://github.com/isaacs/json-stringify-safe;
+        license = "ISC";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "json-stringify-safe-~5.0.0" = self."json-stringify-safe-5.0.1";
+    "mime-types-~2.1.2" = self."mime-types-2.1.8";
+    "node-uuid-1.4.7" = buildNodePackage {
+      name = "node-uuid";
+      version = "1.4.7";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz";
+        sha1 = "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f";
+      };
+      dependencies = {};
+      meta = {
+        description = "Rigorous implementation of RFC4122 (v1 and v4) UUIDs.";
+        homepage = https://github.com/broofa/node-uuid;
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "node-uuid-~1.4.0" = self."node-uuid-1.4.7";
+    "qs-4.0.0" = buildNodePackage {
+      name = "qs";
+      version = "4.0.0";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/qs/-/qs-4.0.0.tgz";
+        sha1 = "c31d9b74ec27df75e543a86c78728ed8d4623607";
+      };
+      dependencies = {};
+      meta = {
+        description = "A querystring parser that supports nesting and arrays, with a depth limit";
+        homepage = https://github.com/hapijs/qs;
+        license = "BSD-3-Clause";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "qs-~4.0.0" = self."qs-4.0.0";
+    "tunnel-agent-0.4.2" = buildNodePackage {
+      name = "tunnel-agent";
+      version = "0.4.2";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.2.tgz";
+        sha1 = "1104e3f36ac87125c287270067d582d18133bfee";
+      };
+      dependencies = {};
+      meta = {
+        description = "HTTP proxy tunneling agent. Formerly part of mikeal/request, now a standalone module.";
+        homepage = "https://github.com/mikeal/tunnel-agent#readme";
+        license = "Apache-2.0";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "tunnel-agent-~0.4.0" = self."tunnel-agent-0.4.2";
+    "tough-cookie-2.2.1" = buildNodePackage {
+      name = "tough-cookie";
+      version = "2.2.1";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.1.tgz";
+        sha1 = "3b0516b799e70e8164436a1446e7e5877fda118e";
+      };
+      meta = {
+        description = "RFC6265 Cookies and Cookie Jar for node.js";
+        homepage = https://github.com/SalesforceEng/tough-cookie;
+        license = "BSD-3-Clause";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "tough-cookie->=0.12.0" = self."tough-cookie-2.2.1";
+    "http-signature-0.11.0" = buildNodePackage {
+      name = "http-signature";
+      version = "0.11.0";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz";
+        sha1 = "1796cf67a001ad5cd6849dca0991485f09089fe6";
+      };
+      dependencies = {
+        assert-plus = {
+          "^0.1.5" = {
+            version = "0.1.5";
+            pkg = self."assert-plus-0.1.5";
+          };
+        };
+        asn1 = {
+          "0.1.11" = {
+            version = "0.1.11";
+            pkg = self."asn1-0.1.11";
+          };
+        };
+        ctype = {
+          "0.5.3" = {
+            version = "0.5.3";
+            pkg = self."ctype-0.5.3";
+          };
+        };
+      };
+      meta = {
+        description = "Reference implementation of Joyent's HTTP Signature scheme.";
+        homepage = https://github.com/joyent/node-http-signature/;
+        license = "MIT";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "assert-plus-0.1.5" = buildNodePackage {
+      name = "assert-plus";
+      version = "0.1.5";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz";
+        sha1 = "ee74009413002d84cec7219c6ac811812e723160";
+      };
+      dependencies = {};
+      meta = {
+        description = "Extra assertions on top of node's assert module";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "assert-plus-^0.1.5" = self."assert-plus-0.1.5";
+    "asn1-0.1.11" = buildNodePackage {
+      name = "asn1";
+      version = "0.1.11";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz";
+        sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7";
+      };
+      dependencies = {};
+      meta = {
+        description = "Contains parsers and serializers for ASN.1 (currently BER only)";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "ctype-0.5.3" = buildNodePackage {
+      name = "ctype";
+      version = "0.5.3";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz";
+        sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f";
+      };
+      meta = {
+        description = "read and write binary structures and data types";
+        homepage = https://github.com/rmustacc/node-ctype;
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "http-signature-~0.11.0" = self."http-signature-0.11.0";
+    "oauth-sign-0.8.0" = buildNodePackage {
+      name = "oauth-sign";
+      version = "0.8.0";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz";
+        sha1 = "938fdc875765ba527137d8aec9d178e24debc553";
+      };
+      dependencies = {};
+      meta = {
+        description = "OAuth 1 signing. Formerly a vendor lib in mikeal/request, now a standalone module.";
+        homepage = "https://github.com/mikeal/oauth-sign#readme";
+        license = "Apache-2.0";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "oauth-sign-~0.8.0" = self."oauth-sign-0.8.0";
+    "hawk-3.1.2" = buildNodePackage {
+      name = "hawk";
+      version = "3.1.2";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/hawk/-/hawk-3.1.2.tgz";
+        sha1 = "90c90118886e21975d1ad4ae9b3e284ed19a2de8";
+      };
+      dependencies = {
+        hoek = {
+          "2.x.x" = {
+            version = "2.16.3";
+            pkg = self."hoek-2.16.3";
+          };
+        };
+        boom = {
+          "2.x.x" = {
+            version = "2.10.1";
+            pkg = self."boom-2.10.1";
+          };
+        };
+        cryptiles = {
+          "2.x.x" = {
+            version = "2.0.5";
+            pkg = self."cryptiles-2.0.5";
+          };
+        };
+        sntp = {
+          "1.x.x" = {
+            version = "1.0.9";
+            pkg = self."sntp-1.0.9";
+          };
+        };
+      };
+      meta = {
+        description = "HTTP Hawk Authentication Scheme";
+        homepage = "https://github.com/hueniverse/hawk#readme";
+        license = "BSD-3-Clause";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "hoek-2.16.3" = buildNodePackage {
+      name = "hoek";
+      version = "2.16.3";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz";
+        sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed";
+      };
+      dependencies = {};
+      meta = {
+        description = "General purpose node utilities";
+        homepage = "https://github.com/hapijs/hoek#readme";
+        license = "BSD-3-Clause";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "hoek-2.x.x" = self."hoek-2.16.3";
+    "boom-2.10.1" = buildNodePackage {
+      name = "boom";
+      version = "2.10.1";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/boom/-/boom-2.10.1.tgz";
+        sha1 = "39c8918ceff5799f83f9492a848f625add0c766f";
+      };
+      dependencies = {
+        hoek = {
+          "2.x.x" = {
+            version = "2.16.3";
+            pkg = self."hoek-2.16.3";
+          };
+        };
+      };
+      meta = {
+        description = "HTTP-friendly error objects";
+        homepage = "https://github.com/hapijs/boom#readme";
+        license = "BSD-3-Clause";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "boom-2.x.x" = self."boom-2.10.1";
+    "cryptiles-2.0.5" = buildNodePackage {
+      name = "cryptiles";
+      version = "2.0.5";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz";
+        sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8";
+      };
+      dependencies = {
+        boom = {
+          "2.x.x" = {
+            version = "2.10.1";
+            pkg = self."boom-2.10.1";
+          };
+        };
+      };
+      meta = {
+        description = "General purpose crypto utilities";
+        homepage = "https://github.com/hapijs/cryptiles#readme";
+        license = "BSD-3-Clause";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "cryptiles-2.x.x" = self."cryptiles-2.0.5";
+    "sntp-1.0.9" = buildNodePackage {
+      name = "sntp";
+      version = "1.0.9";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz";
+        sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198";
+      };
+      dependencies = {
+        hoek = {
+          "2.x.x" = {
+            version = "2.16.3";
+            pkg = self."hoek-2.16.3";
+          };
+        };
+      };
+      meta = {
+        description = "SNTP Client";
+        homepage = https://github.com/hueniverse/sntp;
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "sntp-1.x.x" = self."sntp-1.0.9";
+    "hawk-~3.1.0" = self."hawk-3.1.2";
+    "aws-sign2-0.5.0" = buildNodePackage {
+      name = "aws-sign2";
+      version = "0.5.0";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz";
+        sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63";
+      };
+      dependencies = {};
+      meta = {
+        description = "AWS signing. Originally pulled from LearnBoost/knox, maintained as vendor in request, now a standalone module.";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "aws-sign2-~0.5.0" = self."aws-sign2-0.5.0";
+    "stringstream-0.0.5" = buildNodePackage {
+      name = "stringstream";
+      version = "0.0.5";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz";
+        sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878";
+      };
+      meta = {
+        description = "Encode and decode streams into string streams";
+        homepage = "https://github.com/mhart/StringStream#readme";
+        license = "MIT";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "stringstream-~0.0.4" = self."stringstream-0.0.5";
+    "combined-stream-~1.0.1" = self."combined-stream-1.0.5";
+    "isstream-0.1.2" = buildNodePackage {
+      name = "isstream";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz";
+        sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a";
+      };
+      meta = {
+        description = "Determine if an object is a Stream";
+        homepage = https://github.com/rvagg/isstream;
+        license = "MIT";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "isstream-~0.1.1" = self."isstream-0.1.2";
+    "har-validator-1.8.0" = buildNodePackage {
+      name = "har-validator";
+      version = "1.8.0";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz";
+        sha1 = "d83842b0eb4c435960aeb108a067a3aa94c0eeb2";
+      };
+      dependencies = {
+        bluebird = {
+          "^2.9.30" = {
+            version = "2.10.2";
+            pkg = self."bluebird-2.10.2";
+          };
+        };
+        chalk = {
+          "^1.0.0" = {
+            version = "1.1.1";
+            pkg = self."chalk-1.1.1";
+          };
+        };
+        commander = {
+          "^2.8.1" = {
+            version = "2.9.0";
+            pkg = self."commander-2.9.0";
+          };
+        };
+        is-my-json-valid = {
+          "^2.12.0" = {
+            version = "2.12.3";
+            pkg = self."is-my-json-valid-2.12.3";
+          };
+        };
+      };
+      meta = {
+        description = "Extremely fast HTTP Archive (HAR) validator using JSON Schema";
+        homepage = https://github.com/ahmadnassri/har-validator;
+        license = "ISC";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "bluebird-2.10.2" = buildNodePackage {
+      name = "bluebird";
+      version = "2.10.2";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/bluebird/-/bluebird-2.10.2.tgz";
+        sha1 = "024a5517295308857f14f91f1106fc3b555f446b";
+      };
+      meta = {
+        description = "Full featured Promises/A+ implementation with exceptionally good performance";
+        homepage = https://github.com/petkaantonov/bluebird;
+        license = "MIT";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "bluebird-^2.9.30" = self."bluebird-2.10.2";
+    "chalk-1.1.1" = buildNodePackage {
+      name = "chalk";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz";
+        sha1 = "509afb67066e7499f7eb3535c77445772ae2d019";
+      };
+      dependencies = {
+        ansi-styles = {
+          "^2.1.0" = {
+            version = "2.1.0";
+            pkg = self."ansi-styles-2.1.0";
+          };
+        };
+        escape-string-regexp = {
+          "^1.0.2" = {
+            version = "1.0.4";
+            pkg = self."escape-string-regexp-1.0.4";
+          };
+        };
+        has-ansi = {
+          "^2.0.0" = {
+            version = "2.0.0";
+            pkg = self."has-ansi-2.0.0";
+          };
+        };
+        strip-ansi = {
+          "^3.0.0" = {
+            version = "3.0.0";
+            pkg = self."strip-ansi-3.0.0";
+          };
+        };
+        supports-color = {
+          "^2.0.0" = {
+            version = "2.0.0";
+            pkg = self."supports-color-2.0.0";
+          };
+        };
+      };
+      meta = {
+        description = "Terminal string styling done right. Much color.";
+        homepage = "https://github.com/chalk/chalk#readme";
+        license = "MIT";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "ansi-styles-2.1.0" = buildNodePackage {
+      name = "ansi-styles";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz";
+        sha1 = "990f747146927b559a932bf92959163d60c0d0e2";
+      };
+      meta = {
+        description = "ANSI escape codes for styling strings in the terminal";
+        homepage = https://github.com/chalk/ansi-styles;
+        license = "MIT";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "ansi-styles-^2.1.0" = self."ansi-styles-2.1.0";
+    "escape-string-regexp-1.0.4" = buildNodePackage {
+      name = "escape-string-regexp";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.4.tgz";
+        sha1 = "b85e679b46f72d03fbbe8a3bf7259d535c21b62f";
+      };
+      meta = {
+        description = "Escape RegExp special characters";
+        homepage = https://github.com/sindresorhus/escape-string-regexp;
+        license = "MIT";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "escape-string-regexp-^1.0.2" = self."escape-string-regexp-1.0.4";
+    "has-ansi-2.0.0" = buildNodePackage {
+      name = "has-ansi";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz";
+        sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91";
+      };
+      dependencies = {
+        ansi-regex = {
+          "^2.0.0" = {
+            version = "2.0.0";
+            pkg = self."ansi-regex-2.0.0";
+          };
+        };
+      };
+      meta = {
+        description = "Check if a string has ANSI escape codes";
+        homepage = https://github.com/sindresorhus/has-ansi;
+        license = "MIT";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "ansi-regex-2.0.0" = buildNodePackage {
+      name = "ansi-regex";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz";
+        sha1 = "c5061b6e0ef8a81775e50f5d66151bf6bf371107";
+      };
+      meta = {
+        description = "Regular expression for matching ANSI escape codes";
+        homepage = https://github.com/sindresorhus/ansi-regex;
+        license = "MIT";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "ansi-regex-^2.0.0" = self."ansi-regex-2.0.0";
+    "has-ansi-^2.0.0" = self."has-ansi-2.0.0";
+    "strip-ansi-3.0.0" = buildNodePackage {
+      name = "strip-ansi";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz";
+        sha1 = "7510b665567ca914ccb5d7e072763ac968be3724";
+      };
+      dependencies = {
+        ansi-regex = {
+          "^2.0.0" = {
+            version = "2.0.0";
+            pkg = self."ansi-regex-2.0.0";
+          };
+        };
+      };
+      meta = {
+        description = "Strip ANSI escape codes";
+        homepage = https://github.com/sindresorhus/strip-ansi;
+        license = "MIT";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "strip-ansi-^3.0.0" = self."strip-ansi-3.0.0";
+    "supports-color-2.0.0" = buildNodePackage {
+      name = "supports-color";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz";
+        sha1 = "535d045ce6b6363fa40117084629995e9df324c7";
+      };
+      meta = {
+        description = "Detect whether a terminal supports color";
+        homepage = https://github.com/chalk/supports-color;
+        license = "MIT";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "supports-color-^2.0.0" = self."supports-color-2.0.0";
+    "chalk-^1.0.0" = self."chalk-1.1.1";
+    "commander-2.9.0" = buildNodePackage {
+      name = "commander";
+      version = "2.9.0";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/commander/-/commander-2.9.0.tgz";
+        sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4";
+      };
+      dependencies = {
+        graceful-readlink = {
+          ">= 1.0.0" = {
+            version = "1.0.1";
+            pkg = self."graceful-readlink-1.0.1";
+          };
+        };
+      };
+      meta = {
+        description = "the complete solution for node.js command-line programs";
+        homepage = "https://github.com/tj/commander.js#readme";
+        license = "MIT";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "graceful-readlink-1.0.1" = buildNodePackage {
+      name = "graceful-readlink";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz";
+        sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725";
+      };
+      meta = {
+        description = "graceful fs.readlink";
+        homepage = https://github.com/zhiyelee/graceful-readlink;
+        license = "MIT";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "graceful-readlink->= 1.0.0" = self."graceful-readlink-1.0.1";
+    "commander-^2.8.1" = self."commander-2.9.0";
+    "is-my-json-valid-2.12.3" = buildNodePackage {
+      name = "is-my-json-valid";
+      version = "2.12.3";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.3.tgz";
+        sha1 = "5a39d1d76b2dbb83140bbd157b1d5ee4bdc85ad6";
+      };
+      dependencies = {
+        generate-function = {
+          "^2.0.0" = {
+            version = "2.0.0";
+            pkg = self."generate-function-2.0.0";
+          };
+        };
+        generate-object-property = {
+          "^1.1.0" = {
+            version = "1.2.0";
+            pkg = self."generate-object-property-1.2.0";
+          };
+        };
+        jsonpointer = {
+          "2.0.0" = {
+            version = "2.0.0";
+            pkg = self."jsonpointer-2.0.0";
+          };
+        };
+        xtend = {
+          "^4.0.0" = {
+            version = "4.0.1";
+            pkg = self."xtend-4.0.1";
+          };
+        };
+      };
+      meta = {
+        description = "A JSONSchema validator that uses code generation to be extremely fast";
+        homepage = https://github.com/mafintosh/is-my-json-valid;
+        license = "MIT";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "generate-function-2.0.0" = buildNodePackage {
+      name = "generate-function";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz";
+        sha1 = "6858fe7c0969b7d4e9093337647ac79f60dfbe74";
+      };
+      meta = {
+        description = "Module that helps you write generated functions in Node";
+        homepage = https://github.com/mafintosh/generate-function;
+        license = "MIT";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "generate-function-^2.0.0" = self."generate-function-2.0.0";
+    "generate-object-property-1.2.0" = buildNodePackage {
+      name = "generate-object-property";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz";
+        sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0";
+      };
+      dependencies = {
+        is-property = {
+          "^1.0.0" = {
+            version = "1.0.2";
+            pkg = self."is-property-1.0.2";
+          };
+        };
+      };
+      meta = {
+        description = "Generate safe JS code that can used to reference a object property";
+        homepage = https://github.com/mafintosh/generate-object-property;
+        license = "MIT";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "is-property-1.0.2" = buildNodePackage {
+      name = "is-property";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz";
+        sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84";
+      };
+      dependencies = {};
+      meta = {
+        description = "Tests if a JSON property can be accessed using . syntax";
+        homepage = https://github.com/mikolalysenko/is-property;
+        license = "MIT";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "is-property-^1.0.0" = self."is-property-1.0.2";
+    "generate-object-property-^1.1.0" = self."generate-object-property-1.2.0";
+    "jsonpointer-2.0.0" = buildNodePackage {
+      name = "jsonpointer";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz";
+        sha1 = "3af1dd20fe85463910d469a385e33017d2a030d9";
+      };
+      meta = {
+        description = "Simple JSON Addressing.";
+        homepage = "https://github.com/janl/node-jsonpointer#readme";
+        license = "MIT";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "xtend-4.0.1" = buildNodePackage {
+      name = "xtend";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz";
+        sha1 = "a5c6d532be656e23db820efb943a1f04998d63af";
+      };
+      dependencies = {};
+      meta = {
+        description = "extend like a boss";
+        homepage = https://github.com/Raynos/xtend;
+        license = "MIT";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "xtend-^4.0.0" = self."xtend-4.0.1";
+    "is-my-json-valid-^2.12.0" = self."is-my-json-valid-2.12.3";
+    "har-validator-^1.6.1" = self."har-validator-1.8.0";
+    "semver-5.0.1" = buildNodePackage {
+      name = "semver";
+      version = "5.0.1";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/semver/-/semver-5.0.1.tgz";
+        sha1 = "9fb3f4004f900d83c47968fe42f7583e05832cc9";
+      };
+      meta = {
+        description = "The semantic version parser used by npm.";
+        homepage = "https://github.com/npm/node-semver#readme";
+        license = "ISC";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "temp-0.8.3" = buildNodePackage {
+      name = "temp";
+      version = "0.8.3";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/temp/-/temp-0.8.3.tgz";
+        sha1 = "e0c6bc4d26b903124410e4fed81103014dfc1f59";
+      };
+      dependencies = {
+        os-tmpdir = {
+          "^1.0.0" = {
+            version = "1.0.1";
+            pkg = self."os-tmpdir-1.0.1";
+          };
+        };
+        rimraf = {
+          "~2.2.6" = {
+            version = "2.2.8";
+            pkg = self."rimraf-2.2.8";
+          };
+        };
+      };
+      meta = {
+        description = "Temporary files and directories";
+        homepage = https://github.com/bruce/node-temp;
+        license = "MIT";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "os-tmpdir-1.0.1" = buildNodePackage {
+      name = "os-tmpdir";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz";
+        sha1 = "e9b423a1edaf479882562e92ed71d7743a071b6e";
+      };
+      meta = {
+        description = "Node.js os.tmpdir() ponyfill";
+        homepage = https://github.com/sindresorhus/os-tmpdir;
+        license = "MIT";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "os-tmpdir-^1.0.0" = self."os-tmpdir-1.0.1";
+    "rimraf-2.2.8" = buildNodePackage {
+      name = "rimraf";
+      version = "2.2.8";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz";
+        sha1 = "e439be2aaee327321952730f99a8929e4fc50582";
+      };
+      meta = {
+        description = "A deep deletion module for node (like `rm -rf`)";
+        homepage = https://github.com/isaacs/rimraf;
+        license = {
+          type = "MIT";
+          url = "https://github.com/isaacs/rimraf/raw/master/LICENSE";
+        };
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "rimraf-~2.2.6" = self."rimraf-2.2.8";
+    "wrench-1.5.8" = buildNodePackage {
+      name = "wrench";
+      version = "1.5.8";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/wrench/-/wrench-1.5.8.tgz";
+        sha1 = "7a31c97f7869246d76c5cf2f5c977a1c4c8e5ab5";
+      };
+      dependencies = {};
+      meta = {
+        description = "Recursive filesystem (and other) operations that Node *should* have.";
+        homepage = https://github.com/ryanmcgrath/wrench-js;
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "uglify-js-2.4.24" = buildNodePackage {
+      name = "uglify-js";
+      version = "2.4.24";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.24.tgz";
+        sha1 = "fad5755c1e1577658bb06ff9ab6e548c95bebd6e";
+      };
+      dependencies = {
+        async = {
+          "~0.2.6" = {
+            version = "0.2.10";
+            pkg = self."async-0.2.10";
+          };
+        };
+        source-map = {
+          "0.1.34" = {
+            version = "0.1.34";
+            pkg = self."source-map-0.1.34";
+          };
+        };
+        uglify-to-browserify = {
+          "~1.0.0" = {
+            version = "1.0.2";
+            pkg = self."uglify-to-browserify-1.0.2";
+          };
+        };
+        yargs = {
+          "~3.5.4" = {
+            version = "3.5.4";
+            pkg = self."yargs-3.5.4";
+          };
+        };
+      };
+      meta = {
+        description = "JavaScript parser, mangler/compressor and beautifier toolkit";
+        homepage = http://lisperator.net/uglifyjs;
+        license = "BSD";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "async-0.2.10" = buildNodePackage {
+      name = "async";
+      version = "0.2.10";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/async/-/async-0.2.10.tgz";
+        sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1";
+      };
+      meta = {
+        description = "Higher-order functions and common patterns for asynchronous code";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "async-~0.2.6" = self."async-0.2.10";
+    "source-map-0.1.34" = buildNodePackage {
+      name = "source-map";
+      version = "0.1.34";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz";
+        sha1 = "a7cfe89aec7b1682c3b198d0acfb47d7d090566b";
+      };
+      dependencies = {
+        amdefine = {
+          ">=0.0.4" = {
+            version = "1.0.0";
+            pkg = self."amdefine-1.0.0";
+          };
+        };
+      };
+      meta = {
+        description = "Generates and consumes source maps";
+        homepage = https://github.com/mozilla/source-map;
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "uglify-to-browserify-1.0.2" = buildNodePackage {
+      name = "uglify-to-browserify";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz";
+        sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7";
+      };
+      dependencies = {};
+      meta = {
+        description = "A transform to make UglifyJS work in browserify.";
+        homepage = https://github.com/ForbesLindesay/uglify-to-browserify;
+        license = "MIT";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "uglify-to-browserify-~1.0.0" = self."uglify-to-browserify-1.0.2";
+    "yargs-3.5.4" = buildNodePackage {
+      name = "yargs";
+      version = "3.5.4";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz";
+        sha1 = "d8aff8f665e94c34bd259bdebd1bfaf0ddd35361";
+      };
+      dependencies = {
+        camelcase = {
+          "^1.0.2" = {
+            version = "1.2.1";
+            pkg = self."camelcase-1.2.1";
+          };
+        };
+        decamelize = {
+          "^1.0.0" = {
+            version = "1.1.2";
+            pkg = self."decamelize-1.1.2";
+          };
+        };
+        window-size = {
+          "0.1.0" = {
+            version = "0.1.0";
+            pkg = self."window-size-0.1.0";
+          };
+        };
+        wordwrap = {
+          "0.0.2" = {
+            version = "0.0.2";
+            pkg = self."wordwrap-0.0.2";
+          };
+        };
+      };
+      meta = {
+        description = "Light-weight option parsing with an argv hash. No optstrings attached.";
+        homepage = https://github.com/bcoe/yargs;
+        license = "MIT/X11";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "camelcase-1.2.1" = buildNodePackage {
+      name = "camelcase";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz";
+        sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39";
+      };
+      meta = {
+        description = "Convert a dash/dot/underscore/space separated string to camelCase: foo-bar → fooBar";
+        homepage = https://github.com/sindresorhus/camelcase;
+        license = "MIT";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "camelcase-^1.0.2" = self."camelcase-1.2.1";
+    "decamelize-1.1.2" = buildNodePackage {
+      name = "decamelize";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/decamelize/-/decamelize-1.1.2.tgz";
+        sha1 = "dcc93727be209632e98b02718ef4cb79602322f2";
+      };
+      dependencies = {
+        escape-string-regexp = {
+          "^1.0.4" = {
+            version = "1.0.4";
+            pkg = self."escape-string-regexp-1.0.4";
+          };
+        };
+      };
+      meta = {
+        description = "Convert a camelized string into a lowercased one with a custom separator: unicornRainbow → unicorn_rainbow";
+        homepage = https://github.com/sindresorhus/decamelize;
+        license = "MIT";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "escape-string-regexp-^1.0.4" = self."escape-string-regexp-1.0.4";
+    "decamelize-^1.0.0" = self."decamelize-1.1.2";
+    "window-size-0.1.0" = buildNodePackage {
+      name = "window-size";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz";
+        sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d";
+      };
+      meta = {
+        description = "Reliable way to to get the height and width of the terminal/console in a node.js environment.";
+        homepage = https://github.com/jonschlinkert/window-size;
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "wordwrap-0.0.2" = buildNodePackage {
+      name = "wordwrap";
+      version = "0.0.2";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz";
+        sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f";
+      };
+      dependencies = {};
+      meta = {
+        description = "Wrap those words. Show them at what columns to start and stop.";
+        license = "MIT/X11";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "yargs-~3.5.4" = self."yargs-3.5.4";
+    "xmldom-0.1.19" = buildNodePackage {
+      name = "xmldom";
+      version = "0.1.19";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/xmldom/-/xmldom-0.1.19.tgz";
+        sha1 = "631fc07776efd84118bf25171b37ed4d075a0abc";
+      };
+      dependencies = {};
+      meta = {
+        description = "A W3C Standard XML DOM(Level2 CORE) implementation and parser(DOMParser/XMLSerializer).";
+        homepage = https://github.com/jindw/xmldom;
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "request-2.62.0" = buildNodePackage {
+      name = "request";
+      version = "2.62.0";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/request/-/request-2.62.0.tgz";
+        sha1 = "55c165f702a146f1e21e0725c0b75e1136487b0f";
+      };
+      dependencies = {
+        bl = {
+          "~1.0.0" = {
+            version = "1.0.0";
+            pkg = self."bl-1.0.0";
+          };
+        };
+        caseless = {
+          "~0.11.0" = {
+            version = "0.11.0";
+            pkg = self."caseless-0.11.0";
+          };
+        };
+        extend = {
+          "~3.0.0" = {
+            version = "3.0.0";
+            pkg = self."extend-3.0.0";
+          };
+        };
+        forever-agent = {
+          "~0.6.0" = {
+            version = "0.6.1";
+            pkg = self."forever-agent-0.6.1";
+          };
+        };
+        form-data = {
+          "~1.0.0-rc1" = {
+            version = "1.0.0-rc3";
+            pkg = self."form-data-1.0.0-rc3";
+          };
+        };
+        json-stringify-safe = {
+          "~5.0.0" = {
+            version = "5.0.1";
+            pkg = self."json-stringify-safe-5.0.1";
+          };
+        };
+        mime-types = {
+          "~2.1.2" = {
+            version = "2.1.8";
+            pkg = self."mime-types-2.1.8";
+          };
+        };
+        node-uuid = {
+          "~1.4.0" = {
+            version = "1.4.7";
+            pkg = self."node-uuid-1.4.7";
+          };
+        };
+        qs = {
+          "~5.1.0" = {
+            version = "5.1.0";
+            pkg = self."qs-5.1.0";
+          };
+        };
+        tunnel-agent = {
+          "~0.4.0" = {
+            version = "0.4.2";
+            pkg = self."tunnel-agent-0.4.2";
+          };
+        };
+        tough-cookie = {
+          ">=0.12.0" = {
+            version = "2.2.1";
+            pkg = self."tough-cookie-2.2.1";
+          };
+        };
+        http-signature = {
+          "~0.11.0" = {
+            version = "0.11.0";
+            pkg = self."http-signature-0.11.0";
+          };
+        };
+        oauth-sign = {
+          "~0.8.0" = {
+            version = "0.8.0";
+            pkg = self."oauth-sign-0.8.0";
+          };
+        };
+        hawk = {
+          "~3.1.0" = {
+            version = "3.1.2";
+            pkg = self."hawk-3.1.2";
+          };
+        };
+        aws-sign2 = {
+          "~0.5.0" = {
+            version = "0.5.0";
+            pkg = self."aws-sign2-0.5.0";
+          };
+        };
+        stringstream = {
+          "~0.0.4" = {
+            version = "0.0.5";
+            pkg = self."stringstream-0.0.5";
+          };
+        };
+        combined-stream = {
+          "~1.0.1" = {
+            version = "1.0.5";
+            pkg = self."combined-stream-1.0.5";
+          };
+        };
+        isstream = {
+          "~0.1.1" = {
+            version = "0.1.2";
+            pkg = self."isstream-0.1.2";
+          };
+        };
+        har-validator = {
+          "^1.6.1" = {
+            version = "1.8.0";
+            pkg = self."har-validator-1.8.0";
+          };
+        };
+      };
+      meta = {
+        description = "Simplified HTTP request client.";
+        homepage = "https://github.com/request/request#readme";
+        license = "Apache-2.0";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "qs-5.1.0" = buildNodePackage {
+      name = "qs";
+      version = "5.1.0";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/qs/-/qs-5.1.0.tgz";
+        sha1 = "4d932e5c7ea411cca76a312d39a606200fd50cd9";
+      };
+      dependencies = {};
+      meta = {
+        description = "A querystring parser that supports nesting and arrays, with a depth limit";
+        homepage = https://github.com/hapijs/qs;
+        license = "BSD-3-Clause";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "qs-~5.1.0" = self."qs-5.1.0";
+    "semver-5.0.3" = buildNodePackage {
+      name = "semver";
+      version = "5.0.3";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/semver/-/semver-5.0.3.tgz";
+        sha1 = "77466de589cd5d3c95f138aa78bc569a3cb5d27a";
+      };
+      meta = {
+        description = "The semantic version parser used by npm.";
+        homepage = "https://github.com/npm/node-semver#readme";
+        license = "ISC";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "winston-1.0.2" = buildNodePackage {
+      name = "winston";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/winston/-/winston-1.0.2.tgz";
+        sha1 = "351c58e2323f8a4ca29a45195aa9aa3b4c35d76f";
+      };
+      dependencies = {
+        async = {
+          "~1.0.0" = {
+            version = "1.0.0";
+            pkg = self."async-1.0.0";
+          };
+        };
+        colors = {
+          "1.0.x" = {
+            version = "1.0.3";
+            pkg = self."colors-1.0.3";
+          };
+        };
+        cycle = {
+          "1.0.x" = {
+            version = "1.0.3";
+            pkg = self."cycle-1.0.3";
+          };
+        };
+        eyes = {
+          "0.1.x" = {
+            version = "0.1.8";
+            pkg = self."eyes-0.1.8";
+          };
+        };
+        isstream = {
+          "0.1.x" = {
+            version = "0.1.2";
+            pkg = self."isstream-0.1.2";
+          };
+        };
+        pkginfo = {
+          "0.3.x" = {
+            version = "0.3.1";
+            pkg = self."pkginfo-0.3.1";
+          };
+        };
+        stack-trace = {
+          "0.0.x" = {
+            version = "0.0.9";
+            pkg = self."stack-trace-0.0.9";
+          };
+        };
+      };
+      meta = {
+        description = "A multi-transport async logging library for Node.js";
+        homepage = "https://github.com/winstonjs/winston#readme";
+        license = "MIT";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "async-1.0.0" = buildNodePackage {
+      name = "async";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/async/-/async-1.0.0.tgz";
+        sha1 = "f8fc04ca3a13784ade9e1641af98578cfbd647a9";
+      };
+      meta = {
+        description = "Higher-order functions and common patterns for asynchronous code";
+        homepage = "https://github.com/caolan/async#readme";
+        license = "MIT";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "async-~1.0.0" = self."async-1.0.0";
+    "colors-1.0.3" = buildNodePackage {
+      name = "colors";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/colors/-/colors-1.0.3.tgz";
+        sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b";
+      };
+      meta = {
+        description = "get colors in your node.js console";
+        homepage = https://github.com/Marak/colors.js;
+        license = "MIT";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "colors-1.0.x" = self."colors-1.0.3";
+    "cycle-1.0.3" = buildNodePackage {
+      name = "cycle";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz";
+        sha1 = "21e80b2be8580f98b468f379430662b046c34ad2";
+      };
+      meta = {
+        description = "decycle your json";
+        homepage = https://github.com/douglascrockford/JSON-js;
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "cycle-1.0.x" = self."cycle-1.0.3";
+    "eyes-0.1.8" = buildNodePackage {
+      name = "eyes";
+      version = "0.1.8";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz";
+        sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0";
+      };
+      meta = {
+        description = "a customizable value inspector";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "eyes-0.1.x" = self."eyes-0.1.8";
+    "isstream-0.1.x" = self."isstream-0.1.2";
+    "pkginfo-0.3.1" = buildNodePackage {
+      name = "pkginfo";
+      version = "0.3.1";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz";
+        sha1 = "5b29f6a81f70717142e09e765bbeab97b4f81e21";
+      };
+      meta = {
+        description = "An easy way to expose properties on a module from a package.json";
+        homepage = "https://github.com/indexzero/node-pkginfo#readme";
+        license = "MIT";
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "pkginfo-0.3.x" = self."pkginfo-0.3.1";
+    "stack-trace-0.0.9" = buildNodePackage {
+      name = "stack-trace";
+      version = "0.0.9";
+      src = fetchurl {
+        url = "http://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz";
+        sha1 = "a8f6eaeca90674c333e7c43953f275b451510695";
+      };
+      dependencies = {};
+      meta = {
+        description = "Get v8 stack traces as an array of CallSite objects.";
+        homepage = https://github.com/felixge/node-stack-trace;
+      };
+      production = true;
+      linkDependencies = false;
+    };
+    "stack-trace-0.0.x" = self."stack-trace-0.0.9";
+    "winston-1.0.x" = self."winston-1.0.2";
+    titanium = self."titanium-5.0.5";
+  };
+in
+registry
\ No newline at end of file
diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix
index cc3f607c0c32..f1ea4dc2342b 100644
--- a/pkgs/development/mobile/titaniumenv/default.nix
+++ b/pkgs/development/mobile/titaniumenv/default.nix
@@ -1,25 +1,5 @@
-{pkgs, pkgs_i686, xcodeVersion ? "6.1.1", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "3.5.1.GA"}:
+{pkgs, pkgs_i686, xcodeVersion ? "7.2", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "5.1.1.GA"}:
 
-let
-  # We have to use Oracle's JDK. On Darwin, just simply expose the host system's
-  # JDK. According to their docs, OpenJDK is not supported.
-  
-  jdkWrapper = pkgs.stdenv.mkDerivation {
-    name = "jdk-wrapper";
-    buildCommand = ''
-      mkdir -p $out/bin
-      cd $out/bin
-      ln -s /usr/bin/javac
-      ln -s /usr/bin/java
-      ln -s /usr/bin/jarsigner
-      ln -s /usr/bin/jar
-      ln -s /usr/bin/keytool
-    '';
-    setupHook = ''
-      export JAVA_HOME=/usr
-    '';
-  };
-in
 rec {
   androidenv = pkgs.androidenv;
 
@@ -29,11 +9,7 @@ rec {
   } else null;
   
   titaniumsdk = let
-    titaniumSdkFile = if tiVersion == "3.1.4.GA" then ./titaniumsdk-3.1.nix
-      else if tiVersion == "3.2.3.GA" then ./titaniumsdk-3.2.nix
-      else if tiVersion == "3.3.0.GA" then ./titaniumsdk-3.3.nix
-      else if tiVersion == "3.4.0.GA" then ./titaniumsdk-3.4.nix
-      else if tiVersion == "3.5.1.GA" then ./titaniumsdk-3.5.nix
+    titaniumSdkFile = if tiVersion == "5.1.1.GA" then ./titaniumsdk-5.1.nix
       else throw "Titanium version not supported: "+tiVersion;
     in
     import titaniumSdkFile {
@@ -41,11 +17,8 @@ rec {
     };
   
   buildApp = import ./build-app.nix {
-    inherit (pkgs) stdenv python which;
-    jdk = if pkgs.stdenv.isLinux then pkgs.oraclejdk7
-      else if pkgs.stdenv.isDarwin then jdkWrapper
-      else throw "Platform not supported: ${pkgs.stdenv.system}";
-    inherit (pkgs.nodePackages) titanium;
+    inherit (pkgs) stdenv python which jdk;
+    titanium = (import ./cli { inherit (pkgs.stdenv) system; }).titanium {};
     inherit (androidenv) androidsdk;
     inherit (xcodeenv) xcodewrapper;
     inherit titaniumsdk xcodeBaseDir;
diff --git a/pkgs/development/mobile/titaniumenv/examples/default.nix b/pkgs/development/mobile/titaniumenv/examples/default.nix
index 13345f5dedd6..be2ee419ff4c 100644
--- a/pkgs/development/mobile/titaniumenv/examples/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/default.nix
@@ -1,10 +1,10 @@
 { nixpkgs ? <nixpkgs>
 , systems ? [ "x86_64-linux" "x86_64-darwin" ]
-, xcodeVersion ? "6.1.1"
+, xcodeVersion ? "7.2"
 , xcodeBaseDir ? "/Applications/Xcode.app"
-, tiVersion ? "3.5.1.GA"
+, tiVersion ? "5.1.1.GA"
 , rename ? false
-, newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "", iosVersion ? "8.1", iosWwdrCertificate ? null
+, newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "", iosVersion ? "9.2", iosWwdrCertificate ? null
 , allowUnfree ? false
 , enableWirelessDistribution ? false, installURL ? null
 }:
diff --git a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
index 91c4901479ba..b6c012a77ef0 100644
--- a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
@@ -1,5 +1,5 @@
-{ titaniumenv, fetchgit, target, androidPlatformVersions ? [ "14" ], tiVersion ? "3.2.3.GA", release ? false
-, rename ? false, stdenv ? null, newBundleId ? null, iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? null, iosCertificatePassword ? null, iosVersion ? "8.1", iosWwdrCertificate ? null
+{ titaniumenv, fetchgit, target, androidPlatformVersions ? [ "23" ], tiVersion ? "5.1.1.GA", release ? false
+, rename ? false, stdenv ? null, newBundleId ? null, iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? null, iosCertificatePassword ? null, iosVersion ? "8.1"
 , enableWirelessDistribution ? false, installURL ? null
 }:
 
@@ -8,8 +8,8 @@ assert rename -> (stdenv != null && newBundleId != null && iosMobileProvisioning
 let
   src = fetchgit {
     url = https://github.com/appcelerator/KitchenSink.git;
-    rev = "37d766ef9cba6a2d0b22634d3edc1fa8402109a0";
-    sha256 = "1d4x9zwq92p1krds52bd41qqsnsnb3a7x74bysbiphrvrphz80kk";
+    rev = "6e9f509069fafdebfa78e15b2d14f20a27a485cc";
+    sha256 = "0370dc0ca78b96a7e0befbff9cb1c248695e1aff66aceea98043bbb16c5121e6";
   };
   
   # Rename the bundle id to something else
@@ -37,6 +37,6 @@ titaniumenv.buildApp {
   androidKeyAlias = "myfirstapp";
   androidKeyStorePassword = "mykeystore";
   
-  inherit iosMobileProvisioningProfile iosCertificate iosCertificateName iosCertificatePassword iosVersion iosWwdrCertificate;
+  inherit iosMobileProvisioningProfile iosCertificate iosCertificateName iosCertificatePassword iosVersion;
   inherit enableWirelessDistribution installURL;
 }
diff --git a/pkgs/development/mobile/titaniumenv/fixnativelibs.sed b/pkgs/development/mobile/titaniumenv/fixnativelibs.sed
deleted file mode 100644
index 76b330136b66..000000000000
--- a/pkgs/development/mobile/titaniumenv/fixnativelibs.sed
+++ /dev/null
@@ -1 +0,0 @@
-s|\t\t\t\t\t\t\t\tapk_zip.write(native_lib, path_in_zip)|\t\t\t\t\t\t\t\tinfo = zipfile.ZipInfo(path_in_zip)\n\t\t\t\t\t\t\t\tinfo.compress_type = zipfile.ZIP_DEFLATED\n\t\t\t\t\t\t\t\tinfo.create_system = 3\n\t\t\t\t\t\t\t\tf = open(native_lib)\n\t\t\t\t\t\t\t\tapk_zip.writestr(info, f.read())\n\t\t\t\t\t\t\t\tf.close()|
diff --git a/pkgs/development/mobile/titaniumenv/fixso.sed b/pkgs/development/mobile/titaniumenv/fixso.sed
deleted file mode 100644
index 9a3bb0389a77..000000000000
--- a/pkgs/development/mobile/titaniumenv/fixso.sed
+++ /dev/null
@@ -1 +0,0 @@
-s|apk_zip.write(os.path.join(lib_source_dir, fname), lib_dest_dir + fname)|info = zipfile.ZipInfo(lib_dest_dir + fname)\n\t\t\t\tinfo.compress_type = zipfile.ZIP_DEFLATED\n\t\t\t\tinfo.create_system = 3\n\t\t\t\tf = open(os.path.join(lib_source_dir, fname))\n\t\t\t\tapk_zip.writestr(info, f.read())\n\t\t\t\tf.close()|
diff --git a/pkgs/development/mobile/titaniumenv/fixtiprofiler.sed b/pkgs/development/mobile/titaniumenv/fixtiprofiler.sed
deleted file mode 100644
index e9a8f5b5baa7..000000000000
--- a/pkgs/development/mobile/titaniumenv/fixtiprofiler.sed
+++ /dev/null
@@ -1 +0,0 @@
-s|apk_zip.write(os.path.join(lib_source_dir, 'libtiprofiler.so'), lib_dest_dir + 'libtiprofiler.so')|info = zipfile.ZipInfo(lib_dest_dir + 'libtiprofiler.so')\n\t\t\tinfo.compress_type = zipfile.ZIP_DEFLATED\n\t\t\tinfo.create_system = 3\n\t\t\tf = open(os.path.join(lib_source_dir, 'libtiprofiler.so'))\n\t\t\tapk_zip.writestr(info, f.read())\n\t\t\tf.close()\n|
diff --git a/pkgs/development/mobile/titaniumenv/fixtiverify.sed b/pkgs/development/mobile/titaniumenv/fixtiverify.sed
deleted file mode 100644
index 8e1114769c89..000000000000
--- a/pkgs/development/mobile/titaniumenv/fixtiverify.sed
+++ /dev/null
@@ -1 +0,0 @@
-s|apk_zip.write(os.path.join(lib_source_dir, 'libtiverify.so'), lib_dest_dir + 'libtiverify.so')|info = zipfile.ZipInfo(lib_dest_dir + 'libtiverify.so')\n\t\t\tinfo.compress_type = zipfile.ZIP_DEFLATED\n\t\t\tinfo.create_system = 3\n\t\t\tf = open(os.path.join(lib_source_dir, 'libtiverify.so'))\n\t\t\tapk_zip.writestr(info, f.read())\n\t\t\tf.close()|
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.1.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.1.nix
deleted file mode 100644
index 60cab19ecbdf..000000000000
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.1.nix
+++ /dev/null
@@ -1,80 +0,0 @@
-{stdenv, fetchurl, unzip, makeWrapper, python, jdk}:
-
-stdenv.mkDerivation {
-  name = "mobilesdk-3.1.4.v20130926144546";
-  src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl {
-    url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/3_1_X/mobilesdk-3.1.4.v20130926144546-linux.zip;
-    sha1 = "da4a03ced67f0e8f442d551bbd41ea01fceeee00";
-  }
-  else if stdenv.system == "x86_64-darwin" then fetchurl {
-    url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/3_1_X/mobilesdk-3.1.4.v20130926144546-osx.zip;
-    sha1 = "55f604c8edb989ba214c8ed7538d1b416df0419e";
-  }
-  else throw "Platform: ${stdenv.system} not supported!";
-  
-  buildInputs = [ unzip makeWrapper ];
-  
-  buildCommand = ''
-    mkdir -p $out
-    cd $out
-    unzip $src
-    
-    # Fix shebang header for python scripts
-    
-    find . -name \*.py | while read i
-    do
-        sed -i -e "s|#!/usr/bin/env python|#!${python}/bin/python|" $i
-    done
-   
-    # Rename ugly version number
-    cd mobilesdk/*
-    mv 3.1.4.v20130926144546 3.1.4.GA
-    cd 3.1.4.GA
-    
-    # Zip files do not support timestamps lower than 1980. We have to apply a few work-arounds to cope with that
-    # Yes, I know it's nasty :-)
-    
-    cd android
-    
-    sed -i -f ${./fixtiverify.sed} builder.py
-    sed -i -f ${./fixtiprofiler.sed} builder.py
-    sed -i -f ${./fixso.sed} builder.py
-    sed -i -f ${./fixnativelibs.sed} builder.py
-    
-    # Patch some executables
-    
-    ${if stdenv.system == "i686-linux" then
-      ''
-        patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 titanium_prep.linux32
-      ''
-      else if stdenv.system == "x86_64-linux" then
-      ''
-        patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64
-      ''
-      else ""}
-    
-    # Fix zipalign compatibility issue with newer Android SDKs
-    sed -i -e 's|zipalign = self.sdk.get_zipalign()|zipalign = "zipalign"|' builder.py
-    
-    # Wrap builder script
-    mv builder.py .builder.py
-    cat > builder.py <<EOF
-    #!${python}/bin/python
-    
-    import os, sys
-    
-    os.environ['PYTHONPATH'] = '$(echo ${python.modules.sqlite3}/lib/python*/site-packages)'
-    os.environ['JAVA_HOME'] = '${jdk.home}'
-    
-    os.execv('$(pwd)/.builder.py', sys.argv)
-    EOF
-    
-    chmod +x builder.py
-    
-  '' + stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") ''
-    # 'ditto' utility is needed to copy stuff to the Xcode organizer. Dirty, but this allows it to work.
-    sed -i -e "s|ditto|/usr/bin/ditto|g" $out/mobilesdk/osx/*/iphone/builder.py
-    
-    sed -i -e "s|--xcode|--xcode '+process.env['NIX_TITANIUM_WORKAROUND']+'|" $out/mobilesdk/osx/*/iphone/cli/commands/_build.js
-  '';
-}
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix
deleted file mode 100644
index 47414e205a06..000000000000
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix
+++ /dev/null
@@ -1,77 +0,0 @@
-{stdenv, fetchurl, unzip, makeWrapper, python, jdk}:
-
-stdenv.mkDerivation {
-  name = "mobilesdk-3.2.3.GA";
-  src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl {
-    url = http://builds.appcelerator.com/mobile/3.2.3/mobilesdk-3.2.3.GA-linux.zip;
-    sha1 = "303e6d19a0ca099d47f6862c00b261c6d0206cea";
-  }
-  else if stdenv.system == "x86_64-darwin" then fetchurl {
-    url = http://builds.appcelerator.com/mobile/3.2.3/mobilesdk-3.2.3.GA-osx.zip;
-    sha1 = "8c358cbd8624ffe3dfbd0283738105157067e0fb";
-  }
-  else throw "Platform: ${stdenv.system} not supported!";
-  
-  buildInputs = [ unzip makeWrapper ];
-  
-  buildCommand = ''
-    mkdir -p $out
-    cd $out
-    unzip $src
-    
-    # Fix shebang header for python scripts
-    
-    find . -name \*.py | while read i
-    do
-        sed -i -e "s|#!/usr/bin/env python|#!${python}/bin/python|" $i
-    done
-   
-    # Rename ugly version number
-    cd mobilesdk/*
-    cd 3.2.3.GA
-    
-    # Zip files do not support timestamps lower than 1980. We have to apply a few work-arounds to cope with that
-    # Yes, I know it's nasty :-)
-    
-    cd android
-    
-    sed -i -f ${./fixtiverify.sed} builder.py
-    sed -i -f ${./fixtiprofiler.sed} builder.py
-    sed -i -f ${./fixso.sed} builder.py
-    sed -i -f ${./fixnativelibs.sed} builder.py
-    
-    # Patch some executables
-    
-    ${if stdenv.system == "i686-linux" then
-      ''
-        patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 titanium_prep.linux32
-      ''
-      else if stdenv.system == "x86_64-linux" then
-      ''
-        patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64
-      ''
-      else ""}
-    
-    # Wrap builder script
-    
-    mv builder.py .builder.py
-    cat > builder.py <<EOF
-    #!${python}/bin/python
-    
-    import os, sys
-    
-    os.environ['PYTHONPATH'] = '$(echo ${python.modules.sqlite3}/lib/python*/site-packages)'
-    os.environ['JAVA_HOME'] = '${jdk.home}'
-    
-    os.execv('$(pwd)/.builder.py', sys.argv)
-    EOF
-    
-    chmod +x builder.py
-    
-  '' + stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") ''
-    # 'ditto' utility is needed to copy stuff to the Xcode organizer. Dirty, but this allows it to work.
-    sed -i -e "s|ditto|/usr/bin/ditto|g" $out/mobilesdk/osx/*/iphone/builder.py
-    
-    sed -i -e "s|--xcode|--xcode '+process.env['NIX_TITANIUM_WORKAROUND']+'|" $out/mobilesdk/osx/*/iphone/cli/commands/_build.js
-  '';
-}
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.3.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.3.nix
deleted file mode 100644
index 59a405f61fab..000000000000
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.3.nix
+++ /dev/null
@@ -1,77 +0,0 @@
-{stdenv, fetchurl, unzip, makeWrapper, python, jdk}:
-
-stdenv.mkDerivation {
-  name = "mobilesdk-3.3.0.GA";
-  src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl {
-    url = http://builds.appcelerator.com/mobile/3.3.0/mobilesdk-3.3.0.GA-linux.zip;
-    sha1 = "9a9cca05a4cf8700df60b7e9d9cd969ecb70d81e";
-  }
-  else if stdenv.system == "x86_64-darwin" then fetchurl {
-    url = http://builds.appcelerator.com/mobile/3.3.0/mobilesdk-3.3.0.GA-osx.zip;
-    sha1 = "c6333e4da2564b9c51b865c1db49a062fbc743af";
-  }
-  else throw "Platform: ${stdenv.system} not supported!";
-  
-  buildInputs = [ unzip makeWrapper ];
-  
-  buildCommand = ''
-    mkdir -p $out
-    cd $out
-    unzip $src
-    
-    # Fix shebang header for python scripts
-    
-    find . -name \*.py | while read i
-    do
-        sed -i -e "s|#!/usr/bin/env python|#!${python}/bin/python|" $i
-    done
-   
-    # Rename ugly version number
-    cd mobilesdk/*
-    cd 3.3.0.GA
-    
-    # Zip files do not support timestamps lower than 1980. We have to apply a few work-arounds to cope with that
-    # Yes, I know it's nasty :-)
-    
-    cd android
-    
-    sed -i -f ${./fixtiverify.sed} builder.py
-    sed -i -f ${./fixtiprofiler.sed} builder.py
-    sed -i -f ${./fixso.sed} builder.py
-    sed -i -f ${./fixnativelibs.sed} builder.py
-    
-    # Patch some executables
-    
-    ${if stdenv.system == "i686-linux" then
-      ''
-        patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 titanium_prep.linux32
-      ''
-      else if stdenv.system == "x86_64-linux" then
-      ''
-        patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64
-      ''
-      else ""}
-    
-    # Wrap builder script
-    
-    mv builder.py .builder.py
-    cat > builder.py <<EOF
-    #!${python}/bin/python
-    
-    import os, sys
-    
-    os.environ['PYTHONPATH'] = '$(echo ${python.modules.sqlite3}/lib/python*/site-packages)'
-    os.environ['JAVA_HOME'] = '${jdk.home}'
-    
-    os.execv('$(pwd)/.builder.py', sys.argv)
-    EOF
-    
-    chmod +x builder.py
-    
-  '' + stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") ''
-    # 'ditto' utility is needed to copy stuff to the Xcode organizer. Dirty, but this allows it to work.
-    sed -i -e "s|ditto|/usr/bin/ditto|g" $out/mobilesdk/osx/*/iphone/builder.py
-    
-    sed -i -e "s|--xcode|--xcode '+process.env['NIX_TITANIUM_WORKAROUND']+'|" $out/mobilesdk/osx/*/iphone/cli/commands/_build.js
-  '';
-}
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.4.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.4.nix
deleted file mode 100644
index 041ba0d4a6cf..000000000000
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.4.nix
+++ /dev/null
@@ -1,77 +0,0 @@
-{stdenv, fetchurl, unzip, makeWrapper, python, jdk}:
-
-stdenv.mkDerivation {
-  name = "mobilesdk-3.4.0.GA";
-  src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl {
-    url = http://builds.appcelerator.com/mobile/3.4.0/mobilesdk-3.4.0.GA-linux.zip;
-    sha1 = "c281a3a3f3af35adc95fc00dcd525b84516c2083";
-  }
-  else if stdenv.system == "x86_64-darwin" then fetchurl {
-    url = http://builds.appcelerator.com/mobile/3.4.0/mobilesdk-3.4.0.GA-osx.zip;
-    sha1 = "2f10426462e5f8e487be83c8038f2934d5079f0d";
-  }
-  else throw "Platform: ${stdenv.system} not supported!";
-  
-  buildInputs = [ unzip makeWrapper ];
-  
-  buildCommand = ''
-    mkdir -p $out
-    cd $out
-    unzip $src
-    
-    # Fix shebang header for python scripts
-    
-    find . -name \*.py | while read i
-    do
-        sed -i -e "s|#!/usr/bin/env python|#!${python}/bin/python|" $i
-    done
-   
-    # Rename ugly version number
-    cd mobilesdk/*
-    cd 3.4.0.GA
-    
-    # Zip files do not support timestamps lower than 1980. We have to apply a few work-arounds to cope with that
-    # Yes, I know it's nasty :-)
-    
-    cd android
-    
-    sed -i -f ${./fixtiverify.sed} builder.py
-    sed -i -f ${./fixtiprofiler.sed} builder.py
-    sed -i -f ${./fixso.sed} builder.py
-    sed -i -f ${./fixnativelibs.sed} builder.py
-    
-    # Patch some executables
-    
-    ${if stdenv.system == "i686-linux" then
-      ''
-        patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 titanium_prep.linux32
-      ''
-      else if stdenv.system == "x86_64-linux" then
-      ''
-        patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64
-      ''
-      else ""}
-    
-    # Wrap builder script
-    
-    mv builder.py .builder.py
-    cat > builder.py <<EOF
-    #!${python}/bin/python
-    
-    import os, sys
-    
-    os.environ['PYTHONPATH'] = '$(echo ${python.modules.sqlite3}/lib/python*/site-packages)'
-    os.environ['JAVA_HOME'] = '${jdk.home}'
-    
-    os.execv('$(pwd)/.builder.py', sys.argv)
-    EOF
-    
-    chmod +x builder.py
-    
-  '' + stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") ''
-    # 'ditto' utility is needed to copy stuff to the Xcode organizer. Dirty, but this allows it to work.
-    sed -i -e "s|ditto|/usr/bin/ditto|g" $out/mobilesdk/osx/*/iphone/builder.py
-    
-    sed -i -e "s|--xcode|--xcode '+process.env['NIX_TITANIUM_WORKAROUND']+'|" $out/mobilesdk/osx/*/iphone/cli/commands/_build.js
-  '';
-}
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.5.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.5.nix
deleted file mode 100644
index f9c5ce8812f3..000000000000
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.5.nix
+++ /dev/null
@@ -1,77 +0,0 @@
-{stdenv, fetchurl, unzip, makeWrapper, python, jdk}:
-
-stdenv.mkDerivation {
-  name = "mobilesdk-3.5.1.GA";
-  src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl {
-    url = http://builds.appcelerator.com/mobile/3.5.1/mobilesdk-3.5.1.GA-linux.zip;
-    sha1 = "2fd8c50081af9d03b65ffaf824e2e417832efd92";
-  }
-  else if stdenv.system == "x86_64-darwin" then fetchurl {
-    url = http://builds.appcelerator.com/mobile/3.5.1/mobilesdk-3.5.1.GA-osx.zip;
-    sha1 = "f000e66980c2c3a40b6a6fd40a0bd0554fcb0424";
-  }
-  else throw "Platform: ${stdenv.system} not supported!";
-  
-  buildInputs = [ unzip makeWrapper ];
-  
-  buildCommand = ''
-    mkdir -p $out
-    cd $out
-    unzip $src
-    
-    # Fix shebang header for python scripts
-    
-    find . -name \*.py | while read i
-    do
-        sed -i -e "s|#!/usr/bin/env python|#!${python}/bin/python|" $i
-    done
-    
-    # Rename ugly version number
-    cd mobilesdk/*
-    cd 3.5.1.GA
-    
-    # Zip files do not support timestamps lower than 1980. We have to apply a few work-arounds to cope with that
-    # Yes, I know it's nasty :-)
-    
-    cd android
-    
-    sed -i -f ${./fixtiverify.sed} builder.py
-    sed -i -f ${./fixtiprofiler.sed} builder.py
-    sed -i -f ${./fixso.sed} builder.py
-    sed -i -f ${./fixnativelibs.sed} builder.py
-    
-    # Patch some executables
-    
-    ${if stdenv.system == "i686-linux" then
-      ''
-        patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 titanium_prep.linux32
-      ''
-      else if stdenv.system == "x86_64-linux" then
-      ''
-        patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64
-      ''
-      else ""}
-    
-    # Wrap builder script
-    
-    mv builder.py .builder.py
-    cat > builder.py <<EOF
-    #!${python}/bin/python
-    
-    import os, sys
-    
-    os.environ['PYTHONPATH'] = '$(echo ${python.modules.sqlite3}/lib/python*/site-packages)'
-    os.environ['JAVA_HOME'] = '${jdk.home}'
-    
-    os.execv('$(pwd)/.builder.py', sys.argv)
-    EOF
-    
-    chmod +x builder.py
-    
-  '' + stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") ''
-    # 'ditto' utility is needed to copy stuff to the Xcode organizer. Dirty, but this allows it to work.
-    sed -i -e "s|ditto|/usr/bin/ditto|g" $out/mobilesdk/osx/*/iphone/builder.py
-    
-    sed -i -e "s|--xcode|--xcode '+process.env['NIX_TITANIUM_WORKAROUND']+'|" $out/mobilesdk/osx/*/iphone/cli/commands/_build.js
-  '';
-}
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-5.1.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-5.1.nix
new file mode 100644
index 000000000000..fce14c383c13
--- /dev/null
+++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-5.1.nix
@@ -0,0 +1,42 @@
+{stdenv, fetchurl, unzip, makeWrapper, python, jdk}:
+
+stdenv.mkDerivation {
+  name = "mobilesdk-5.1.1.GA";
+  src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl {
+    url = http://builds.appcelerator.com/mobile/5_1_1/mobilesdk-5.1.1.v20151203123251-linux.zip;
+    sha256 = "197pia5a0bacwwyi0s7s69iyx4i2jdrgjc3ybiahaqv27dhw9zr2";
+  }
+  else if stdenv.system == "x86_64-darwin" then fetchurl {
+    url = http://builds.appcelerator.com/mobile/5_1_1/mobilesdk-5.1.1.v20151203123251-osx.zip;
+    sha256 = "1ij2zc5450fnl13w8ia1z6pa12vja6ks1ssvlb73n2rx52krgvxr";
+  }
+  else throw "Platform: ${stdenv.system} not supported!";
+  
+  buildInputs = [ unzip makeWrapper ];
+  
+  buildCommand = ''
+    mkdir -p $out
+    cd $out
+    (yes y | unzip $src) || true
+    
+    # Rename ugly version number
+    cd mobilesdk/*
+    mv * 5.1.1.GA
+    cd *
+    
+    # Hack to make dx.jar work with new build-tools
+    sed -i -e "s|path.join(dir, 'platform-tools', 'lib', 'dx.jar')|path.join(dir, 'build-tools', 'android-6.0', 'lib', 'dx.jar')|" $out/mobilesdk/*/*/node_modules/titanium-sdk/lib/android.js
+    
+    # Patch some executables
+    
+    ${if stdenv.system == "i686-linux" then
+      ''
+        patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 android/titanium_prep.linux32
+      ''
+      else if stdenv.system == "x86_64-linux" then
+      ''
+        patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 android/titanium_prep.linux64
+      ''
+      else ""}
+  '';
+}

From b6d84748b913c9ffc9937ec64ca868cffa8797b4 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Thu, 7 Jan 2016 14:43:17 +0000
Subject: [PATCH 416/884] xcodeenv: make it work with xcode 7.2

---
 pkgs/development/mobile/xcodeenv/build-app.nix    | 4 ++--
 pkgs/development/mobile/xcodeenv/default.nix      | 2 +-
 pkgs/development/mobile/xcodeenv/simulate-app.nix | 2 +-
 pkgs/development/mobile/xcodeenv/xcodewrapper.nix | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix
index 6af32ba41981..b2e6f84bb000 100644
--- a/pkgs/development/mobile/xcodeenv/build-app.nix
+++ b/pkgs/development/mobile/xcodeenv/build-app.nix
@@ -37,7 +37,7 @@ let
     
   _arch = if arch == null
     then
-      if release then "armv7" else "i386"
+      if release then "armv7" else "x86_64"
     else arch;
 
   _sdk = if sdk == null
@@ -83,7 +83,7 @@ stdenv.mkDerivation {
       ''}
 
     # Do the building
-    xcodebuild -target ${_target} -configuration ${_configuration} ${stdenv.lib.optionalString (scheme != null) "-scheme ${scheme}"} -sdk ${_sdk} -arch ${_arch} ONLY_ACTIVE_ARCH=NO CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${if generateXCArchive then "archive" else ""} ${xcodeFlags} ${if release then ''"CODE_SIGN_IDENTITY=${codeSignIdentity}" PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName"'' else ""}
+    xcodebuild -target ${_target} -configuration ${_configuration} ${stdenv.lib.optionalString (scheme != null) "-scheme ${scheme}"} -sdk ${_sdk} -arch ${_arch} ONLY_ACTIVE_ARCH=NO VALID_ARCHS="${_arch}" CONFIGURATION_TEMP_DIR=$TMPDIR CONFIGURATION_BUILD_DIR=$out ${if generateXCArchive then "archive" else ""} ${xcodeFlags} ${if release then ''"CODE_SIGN_IDENTITY=${codeSignIdentity}" PROVISIONING_PROFILE=$PROVISIONING_PROFILE OTHER_CODE_SIGN_FLAGS="--keychain $HOME/Library/Keychains/$keychainName"'' else ""}
     
     ${stdenv.lib.optionalString release ''
       ${stdenv.lib.optionalString generateIPA ''
diff --git a/pkgs/development/mobile/xcodeenv/default.nix b/pkgs/development/mobile/xcodeenv/default.nix
index d16473248650..d7e35142be4c 100644
--- a/pkgs/development/mobile/xcodeenv/default.nix
+++ b/pkgs/development/mobile/xcodeenv/default.nix
@@ -1,4 +1,4 @@
-{stdenv, version ? "6.1.1", xcodeBaseDir ? "/Applications/Xcode.app"}:
+{stdenv, version ? "7.2", xcodeBaseDir ? "/Applications/Xcode.app"}:
 
 rec {
   xcodewrapper = import ./xcodewrapper.nix {
diff --git a/pkgs/development/mobile/xcodeenv/simulate-app.nix b/pkgs/development/mobile/xcodeenv/simulate-app.nix
index 645bcd69da0c..ecfdbe2a6e39 100644
--- a/pkgs/development/mobile/xcodeenv/simulate-app.nix
+++ b/pkgs/development/mobile/xcodeenv/simulate-app.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
     fi
     
     # Open the simulator instance
-    open -a "$(readlink "${xcodewrapper}/bin/iOS Simulator")" --args -CurrentDeviceUDID $udid
+    open -a "$(readlink "${xcodewrapper}/bin/Simulator")" --args -CurrentDeviceUDID $udid
     
     # Copy the app and restore the write permissions
     appTmpDir=$(mktemp -d -t appTmpDir)
diff --git a/pkgs/development/mobile/xcodeenv/xcodewrapper.nix b/pkgs/development/mobile/xcodeenv/xcodewrapper.nix
index 4be204d5dc52..26b0197b2e13 100644
--- a/pkgs/development/mobile/xcodeenv/xcodewrapper.nix
+++ b/pkgs/development/mobile/xcodeenv/xcodewrapper.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     ln -s /usr/bin/codesign
     ln -s "${xcodeBaseDir}/Contents/Developer/usr/bin/xcodebuild"
     ln -s "${xcodeBaseDir}/Contents/Developer/usr/bin/xcrun"
-    ln -s "${xcodeBaseDir}/Contents/Developer/Applications/iOS Simulator.app/Contents/MacOS/iOS Simulator"
+    ln -s "${xcodeBaseDir}/Contents/Developer/Applications/Simulator.app/Contents/MacOS/Simulator"
 
     cd ..
     ln -s "${xcodeBaseDir}/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs"

From e7c9d7c7785ca30c9b00a3f4d217f45e6ac16a4c Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 7 Jan 2016 15:46:02 +0100
Subject: [PATCH 417/884] mopidy-soundcloud: 2.0.1 -> 2.0.2

---
 pkgs/applications/audio/mopidy-soundcloud/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/mopidy-soundcloud/default.nix b/pkgs/applications/audio/mopidy-soundcloud/default.nix
index c10bb00909a2..c81de3e0d062 100644
--- a/pkgs/applications/audio/mopidy-soundcloud/default.nix
+++ b/pkgs/applications/audio/mopidy-soundcloud/default.nix
@@ -3,13 +3,13 @@
 pythonPackages.buildPythonPackage rec {
   name = "mopidy-soundcloud-${version}";
 
-  version = "2.0.1";
+  version = "2.0.2";
 
   src = fetchFromGitHub {
     owner = "mopidy";
     repo = "mopidy-soundcloud";
     rev = "v${version}";
-    sha256 = "05yvjnivj26wjish7x1xrd9l5z8i14b610a8pbifnq3cq7y2m22r";
+    sha256 = "13n44975n1wwcf7qg1c7drc2bavhjnr9hnq1v0n5hdgyx8ji67gi";
   };
 
   propagatedBuildInputs = [ mopidy ];

From 89ad5c515fbb605307bad4ddf0d8d2d2060872d9 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 7 Jan 2016 15:58:50 +0100
Subject: [PATCH 418/884] mopidy-spotify: 1.4.0 -> 2.2.0

---
 pkgs/applications/audio/mopidy-spotify/default.nix | 4 ++--
 pkgs/top-level/python-packages.nix                 | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/audio/mopidy-spotify/default.nix b/pkgs/applications/audio/mopidy-spotify/default.nix
index 8b67f38390e8..f1243b47b693 100644
--- a/pkgs/applications/audio/mopidy-spotify/default.nix
+++ b/pkgs/applications/audio/mopidy-spotify/default.nix
@@ -2,11 +2,11 @@
 
 pythonPackages.buildPythonPackage rec {
   name = "mopidy-spotify-${version}";
-  version = "1.4.0";
+  version = "2.2.0";
 
   src = fetchurl {
     url = "https://github.com/mopidy/mopidy-spotify/archive/v${version}.tar.gz";
-    sha256 = "0cf97z9vnnp5l77xhwvmkbkqgpj5gwnm1pipiy66lbk4gn6va4z4";
+    sha256 = "0wrrkkrin92ad9k1rwgjbyv2whwrb5b66nmmykxxp6bqcdgdyl5i";
   };
 
   propagatedBuildInputs = [ mopidy pythonPackages.pyspotify ];
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d15e0fcc8280..2f2f61359978 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21612,14 +21612,15 @@ in modules // {
   pyspotify = buildPythonPackage rec {
     name = "pyspotify-${version}";
 
-    version = "1.12";
+    version = "2.0.5";
 
     src = pkgs.fetchurl {
       url = "https://github.com/mopidy/pyspotify/archive/v${version}.tar.gz";
-      sha256 = "0bj6p4hafj1yp0j5n1rxww39nvi3w6y3azadz8a8nxb3b4a8f1xn";
+      sha256 = "1ilbz2w1gw3f1bpapfa09p84dwh08bf7qcrkmd3aj0psz57p2rls";
     };
 
-    buildInputs = with self; [ pkgs.libspotify ]
+    propagatedBuildInputs = with self; [ cffi ];
+    buildInputs = [ pkgs.libspotify ]
       ++ stdenv.lib.optional stdenv.isDarwin pkgs.install_name_tool;
 
     # python zip complains about old timestamps

From 435b1ec43d6f7bd3456fe03feb434a9d96553f2a Mon Sep 17 00:00:00 2001
From: Aycan iRiCAN <iricanaycan@gmail.com>
Date: Thu, 7 Jan 2016 17:04:17 +0200
Subject: [PATCH 419/884] emacs-packages: remove obsolete dash package

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

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 26c85f0fffa2..05539bea287b 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -409,21 +409,6 @@ let
     };
   };
 
-  dash = melpaBuild rec {
-    pname   = "dash";
-    version = "2.12.1";
-    src = fetchFromGitHub {
-      owner  = "magnars";
-      repo   = "${pname}.el";
-      rev    = version;
-      sha256 = "1njv5adcm96kdch0jb941l8pm51yfdx7mlz83y0pq6jlzjs9mwaa";
-    };
-    meta = {
-      description = "A modern list library for Emacs (think Haskell's Prelude in elisp)";
-      license = gpl3Plus;
-    };
-  };
-
   dash-functional = melpaBuild rec {
     pname = "dash-functional";
       version = "2.11.0";

From 094723f0bc5046b396630619815bb1d839622d5d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 7 Jan 2016 16:14:51 +0100
Subject: [PATCH 420/884] firefox: 43.0.3 -> 43.0.4

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

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 0c7df04db15d..80f5e7212c8c 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -133,8 +133,8 @@ in {
 
   firefox = common {
     pname = "firefox";
-    version = "43.0.3";
-    sha256 = "129f8vmsam498j0s4rbi31a88j9ibkzm4m0w19ppcsha7cp25i8m";
+    version = "43.0.4";
+    sha256 = "0xjs4j26h8fyy8izrcc482vfvgg4gqzap5kh17jfv7flhn9akkvn";
   };
 
   firefox-esr = common {

From bcd31489a1a9cb56faaee133b0273f110244070d Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 7 Jan 2016 10:06:40 +0100
Subject: [PATCH 421/884] netatop: 0.3 -> 0.7

---
 pkgs/os-specific/linux/netatop/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/netatop/default.nix b/pkgs/os-specific/linux/netatop/default.nix
index 3d6b6faccca1..1e74cd94c55b 100644
--- a/pkgs/os-specific/linux/netatop/default.nix
+++ b/pkgs/os-specific/linux/netatop/default.nix
@@ -1,13 +1,15 @@
 { stdenv, fetchurl, kernel, zlib }:
 
-assert stdenv.lib.versionOlder kernel.version "3.17";
+let
+  version = "0.7";
+in
 
 stdenv.mkDerivation {
-  name = "netatop-${kernel.version}-0.3";
+  name = "netatop-${kernel.version}-${version}";
 
   src = fetchurl {
-    url = http://www.atoptool.nl/download/netatop-0.3.tar.gz;
-    sha256 = "0rk873nb1hgfnz040plmv6rm9mcm813n0clfjs53fsqbn8y1lhvv";
+    url = "http://www.atoptool.nl/download/netatop-${version}.tar.gz";
+    sha256 = "11v9lvlshn7mwsbr69xrm7gfhxbgdczcf3cf9fssbd9qgv9abifl";
   };
 
   buildInputs = [ zlib ];
@@ -27,7 +29,7 @@ stdenv.mkDerivation {
     mkdir -p $out/bin $out/sbin $out/share/man/man{4,8}
     mkdir -p $out/lib/modules/${kernel.modDirVersion}/extra
   '';
-      
+
   meta = {
     description = "Network monitoring module for atop";
     homepage = http://www.atoptool.nl/downloadnetatop.php;

From 7f144d8f09c548ea0cd24969d53e76757f74592d Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 7 Jan 2016 10:06:07 +0100
Subject: [PATCH 422/884] batman-adv: 2014.4.0 -> 2015.2

---
 pkgs/os-specific/linux/batman-adv/alfred.nix  |  9 +++++----
 pkgs/os-specific/linux/batman-adv/batctl.nix  | 11 +++++++----
 pkgs/os-specific/linux/batman-adv/default.nix |  6 +++---
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix
index 2d9f5079586c..a42194d71932 100644
--- a/pkgs/os-specific/linux/batman-adv/alfred.nix
+++ b/pkgs/os-specific/linux/batman-adv/alfred.nix
@@ -1,17 +1,18 @@
-{ stdenv, fetchurl, pkgconfig, gpsd }:
+{ stdenv, fetchurl, pkgconfig, gpsd, libcap }:
 
 let
-  ver = "2014.4.0";
+  ver = "2015.2";
 in
 stdenv.mkDerivation rec {
   name = "alfred-${ver}";
 
   src = fetchurl {
     url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz";
-    sha256 = "99e6c64e7069b0b7cb861369d5c198bfc7d74d41509b8edd8a17ba78e7c8d034";
+    sha256 = "0cyr3bxwypddifg18yi3i5mcdam8izlq3ayrbkjir2b4vqhixs3s";
   };
 
-  buildInputs = [ pkgconfig gpsd ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gpsd libcap ];
 
   preBuild = ''
     makeFlags="PREFIX=$out PKG_CONFIG=${pkgconfig}/bin/pkg-config"
diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix
index 5ac3e6b4117f..3ea4fc5f96ec 100644
--- a/pkgs/os-specific/linux/batman-adv/batctl.nix
+++ b/pkgs/os-specific/linux/batman-adv/batctl.nix
@@ -1,18 +1,21 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl, pkgconfig, libnl }:
 
 let
-  ver = "2014.4.0";
+  ver = "2015.2";
 in
 stdenv.mkDerivation rec {
   name = "batctl-${ver}";
 
   src = fetchurl {
     url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz";
-    sha256 = "4deae3b6664d0d13acf7a8ece74175a31a72fe58fb15cb9112a9a2014b32cb4c";
+    sha256 = "1yv9i304bicm34mgl387c21ynv711yr2m5ycx9hjbxprkyzjlkdi";
   };
 
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libnl ];
+
   preBuild = ''
-    makeFlags=PREFIX=$out
+    makeFlags="PREFIX=$out PKG_CONFIG=${pkgconfig}/bin/pkg-config"
   '';
 
   meta = {
diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix
index 341b6f3af1d5..e50d613624d0 100644
--- a/pkgs/os-specific/linux/batman-adv/default.nix
+++ b/pkgs/os-specific/linux/batman-adv/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, kernel }:
 
-assert stdenv.lib.versionOlder kernel.version "3.17";
+#assert stdenv.lib.versionOlder kernel.version "3.17";
 
-let base = "batman-adv-2014.4.0"; in
+let base = "batman-adv-2015.2"; in
 
 stdenv.mkDerivation rec {
   name = "${base}-${kernel.version}";
 
   src = fetchurl {
     url = "http://downloads.open-mesh.org/batman/releases/${base}/${base}.tar.gz";
-    sha256 = "757b9ddd346680f6fd87dc28fde6da0ddc0423a65fbc88fdbaa7b247fed2c1a8";
+    sha256 = "0lj8q9fnrf9n434h9wb2385z65skmq8q64svx5hbnlcj0bjhyxw6";
   };
 
   preBuild = ''

From be9ad574f717ac2816dc803e6214aa2d8b1fb5ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Thu, 7 Jan 2016 16:47:50 +0100
Subject: [PATCH 423/884] Adding framebuffer console rotation to kernels.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This helps in some weird screens that otherwise show the console 90° turned.
---
 pkgs/os-specific/linux/kernel/common-config.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 14e28170e6f9..cb6e45e52c8b 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -140,6 +140,7 @@ with stdenv.lib;
   FB_3DFX_ACCEL y
   FB_VESA y
   FRAMEBUFFER_CONSOLE y
+  FRAMEBUFFER_CONSOLE_ROTATION y
   ${optionalString (versionOlder version "3.9" || stdenv.system == "i686-linux") ''
     FB_GEODE y
   ''}

From 4f3fc3614410e8bdfd858ebe515485e1ec7d0ecc Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <PascalWittmann@gmx.net>
Date: Thu, 7 Jan 2016 17:29:52 +0100
Subject: [PATCH 424/884] emacsPackages.evil-mc: fix evaluation

---
 pkgs/top-level/emacs-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 26c85f0fffa2..3eff50bd4e0b 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -605,7 +605,7 @@ let
     packageRequires = [ evil ];
     meta = {
       description = "Multiple cursors implementation for evil-mode";
-      license = gpl3plus;
+      license = gpl3Plus;
     };
   };
 

From 7c2845128749d1f4a4bf5644695e876193c5932b Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Thu, 7 Jan 2016 18:46:50 +0100
Subject: [PATCH 425/884] pyqt5: 5.4.2 -> 5.5.1

---
 pkgs/development/python-modules/pyqt/5.x.nix | 4 ++--
 pkgs/top-level/python-packages.nix           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix
index c2e5cb1a763e..2cc1a82ca09e 100644
--- a/pkgs/development/python-modules/pyqt/5.x.nix
+++ b/pkgs/development/python-modules/pyqt/5.x.nix
@@ -2,7 +2,7 @@
 , lndir, makeWrapper }:
 
 let
-  version = "5.4.2";
+  version = "5.5.1";
 in stdenv.mkDerivation {
   name = "${python.libPrefix}-PyQt-${version}";
 
@@ -16,7 +16,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://sourceforge/pyqt/PyQt5/PyQt-${version}/PyQt-gpl-${version}.tar.gz";
-    sha256 = "1402n5kwzd973b65avxk1j9js96wzfm0yw4rshjfy8l7an00bnac";
+    sha256 = "11l3pm0wkwkxzw4n3022iid3yyia5ap4l0ny1m5ngkzzzfafyw0a";
   };
 
   buildInputs = [
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2f2f61359978..662ff4d83860 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -166,7 +166,7 @@ in modules // {
   pyqt5 = callPackage ../development/python-modules/pyqt/5.x.nix {
     sip = self.sip_4_16;
     pythonDBus = self.dbus;
-    inherit (pkgs.qt5) qtbase qtsvg qtwebkit;
+    inherit (pkgs.qt55) qtbase qtsvg qtwebkit;
   };
 
   pyside = callPackage ../development/python-modules/pyside { };

From 972c5641e404767df6cc47d290275d9d9b00bcbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 7 Jan 2016 18:37:18 +0100
Subject: [PATCH 426/884] thrift: 0.9.2 -> 0.9.3

Add Twisted as build input so that we can continue to have Python
support. (./configure disables Python support unless it finds the
'trial' program, from Twisted.) I don't know whether upstream intended
that, because it seems perfectly fine to run thrift + Python without
Twisted. (Only the TTwisted transport uses Twisted...)

Ah, Thrift use Twisted in its unit tests. Even when we pass
--enable-tests=no to ./configure :-D
---
 pkgs/development/libraries/thrift/default.nix | 8 ++++----
 pkgs/top-level/all-packages.nix               | 4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix
index a09a8a530a5f..e48ce2315908 100644
--- a/pkgs/development/libraries/thrift/default.nix
+++ b/pkgs/development/libraries/thrift/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, boost, zlib, libevent, openssl, python, pkgconfig, bison
-, flex
+, flex, twisted
 }:
 
 stdenv.mkDerivation rec {
   name = "thrift-${version}";
-  version = "0.9.2";
+  version = "0.9.3";
 
   src = fetchurl {
     url = "http://archive.apache.org/dist/thrift/${version}/${name}.tar.gz";
-    sha256 = "0w4m6hjmgr1wqac9p5zyfxx2wwqay730qi14fzxba7f46hwhvxff";
+    sha256 = "17lnchan9q3qdg222rgjjai6819j9k755s239phdv6n0183hlx5h";
   };
 
   #enableParallelBuilding = true; problems on hydra
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   pythonPath = [];
 
   buildInputs = [
-    boost zlib libevent openssl python pkgconfig bison flex
+    boost zlib libevent openssl python pkgconfig bison flex twisted
   ];
 
   preConfigure = "export PY_PREFIX=$out";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5601fb7ca7e1..24e67321959c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8527,7 +8527,9 @@ let
     python = python2;
   };
 
-  thrift = callPackage ../development/libraries/thrift { };
+  thrift = callPackage ../development/libraries/thrift {
+    inherit (pythonPackages) twisted;
+  };
 
   tidyp = callPackage ../development/libraries/tidyp { };
 

From 53588bac9655ec66b67a4bbba959f6029abc260c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 7 Jan 2016 14:39:33 -0600
Subject: [PATCH 427/884] kde5: build kdenetwork-filesharing

---
 pkgs/applications/kde-apps-15.12/default.nix  |  1 +
 .../kde-apps-15.12/kdenetwork-filesharing.nix | 29 +++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/applications/kde-apps-15.12/kdenetwork-filesharing.nix

diff --git a/pkgs/applications/kde-apps-15.12/default.nix b/pkgs/applications/kde-apps-15.12/default.nix
index e96c0c2af331..459ba52dac90 100644
--- a/pkgs/applications/kde-apps-15.12/default.nix
+++ b/pkgs/applications/kde-apps-15.12/default.nix
@@ -39,6 +39,7 @@ let
     gwenview = callPackage ./gwenview.nix {};
     kate = callPackage ./kate.nix {};
     kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {};
+    kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {};
     kgpg = callPackage ./kgpg.nix { inherit (pkgs.kde4) kdepimlibs; };
     konsole = callPackage ./konsole.nix {};
     libkdcraw = callPackage ./libkdcraw.nix {};
diff --git a/pkgs/applications/kde-apps-15.12/kdenetwork-filesharing.nix b/pkgs/applications/kde-apps-15.12/kdenetwork-filesharing.nix
new file mode 100644
index 000000000000..4e99a43b3913
--- /dev/null
+++ b/pkgs/applications/kde-apps-15.12/kdenetwork-filesharing.nix
@@ -0,0 +1,29 @@
+{ kdeApp
+, lib
+, extra-cmake-modules
+, kdoctools
+, kcoreaddons
+, ki18n
+, kio
+, kwidgetsaddons
+, samba
+}:
+
+kdeApp {
+  name = "kdenetwork-filesharing";
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+  ];
+  buildInputs = [
+    kcoreaddons
+    ki18n
+    kio
+    kwidgetsaddons
+    samba
+  ];
+  meta = {
+    license = [ lib.licenses.gpl2 lib.licenses.lgpl21 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}

From 0f8fe820966b310ad983048a25557a708935d950 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 7 Jan 2016 21:38:16 +0100
Subject: [PATCH 428/884] gmpc: Fix icon loading

gmpc wouldn't start because the icons aren't found.
---
 pkgs/applications/audio/gmpc/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix
index 4da235dd8a9c..345e98e6989a 100644
--- a/pkgs/applications/audio/gmpc/default.nix
+++ b/pkgs/applications/audio/gmpc/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, libtool, intltool, pkgconfig, glib
 , gtk, curl, mpd_clientlib, libsoup, gob2, vala, libunique
-, libSM, libICE, sqlite, hicolor_icon_theme
+, libSM, libICE, sqlite, hicolor_icon_theme, wrapGAppsHook
 }:
 
 stdenv.mkDerivation rec {
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libtool intltool pkgconfig glib gtk curl mpd_clientlib libsoup
     libunique libmpd gob2 vala libSM libICE sqlite hicolor_icon_theme
+    wrapGAppsHook
   ];
 
   meta = with stdenv.lib; {

From 6acad9ea0443d39b1dc9a0df7c33b4d67709cfd8 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Thu, 7 Jan 2016 22:05:13 +0100
Subject: [PATCH 429/884] mozjpeg: init at 3.1

---
 .../applications/graphics/mozjpeg/default.nix | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/applications/graphics/mozjpeg/default.nix

diff --git a/pkgs/applications/graphics/mozjpeg/default.nix b/pkgs/applications/graphics/mozjpeg/default.nix
new file mode 100644
index 000000000000..2845bfd3e27b
--- /dev/null
+++ b/pkgs/applications/graphics/mozjpeg/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, file, libpng, nasm }:
+
+stdenv.mkDerivation rec {
+  version = "3.1";
+  name = "mozjpeg-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/mozilla/mozjpeg/releases/download/v${version}/mozjpeg-${version}-release-source.tar.gz";
+    sha256 = "07vs0xq9di7bv3y68daig8dvxvjqrn8a5na702gj3nn58a1xivfy";
+  };
+
+  postPatch = ''
+
+    sed -i -e "s!/usr/bin/file!${file}/bin/file!g" configure
+  '';
+
+  buildInputs = [ libpng nasm ];
+
+  meta = {
+    description = "Mozilla JPEG Encoder Project";
+    longDescription = ''
+      This project's goal is to reduce the size of JPEG files without reducing quality or compatibility with the
+      vast majority of the world's deployed decoders.
+
+      The idea is to reduce transfer times for JPEGs on the Web, thus reducing page load times.
+    '';
+    homepage = https://github.com/mozilla/mozjpeg ;
+    license = stdenv.lib.licenses.bsd3;
+    maintainers = [ stdenv.lib.maintainers.aristid ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 33d304d43ea3..f3d7c9be3688 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12514,6 +12514,8 @@ let
 
   mozplugger = callPackage ../applications/networking/browsers/mozilla-plugins/mozplugger {};
 
+  mozjpeg = callPackage ../applications/graphics/mozjpeg { };
+
   easytag = callPackage ../applications/audio/easytag { };
 
   mp3gain = callPackage ../applications/audio/mp3gain { };

From fa6ec6b057d69f9d07ce4418aa45757b9a3abe82 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Thu, 7 Jan 2016 22:55:20 +0100
Subject: [PATCH 430/884] mozjpeg: fix libpng dependency

---
 pkgs/applications/graphics/mozjpeg/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/mozjpeg/default.nix b/pkgs/applications/graphics/mozjpeg/default.nix
index 2845bfd3e27b..1b082de98bc7 100644
--- a/pkgs/applications/graphics/mozjpeg/default.nix
+++ b/pkgs/applications/graphics/mozjpeg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, file, libpng, nasm }:
+{ stdenv, fetchurl, file, pkgconfig, libpng, nasm }:
 
 stdenv.mkDerivation rec {
   version = "3.1";
@@ -10,11 +10,10 @@ stdenv.mkDerivation rec {
   };
 
   postPatch = ''
-
     sed -i -e "s!/usr/bin/file!${file}/bin/file!g" configure
   '';
 
-  buildInputs = [ libpng nasm ];
+  buildInputs = [ libpng pkgconfig nasm ];
 
   meta = {
     description = "Mozilla JPEG Encoder Project";

From 440444d69da20f4bb2c5e27df9fc5e02cf7cc04e Mon Sep 17 00:00:00 2001
From: Avery Glitch <averymeath@gmail.com>
Date: Fri, 8 Jan 2016 10:57:32 +1100
Subject: [PATCH 431/884] vimb: 2.9 -> 2.11

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

diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix
index 84a2870b6d0a..cfbaa908902d 100644
--- a/pkgs/applications/networking/browsers/vimb/default.nix
+++ b/pkgs/applications/networking/browsers/vimb/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "vimb-${version}";
-  version = "2.9";
+  version = "2.11";
 
   src = fetchurl {
     url = "https://github.com/fanglingsu/vimb/archive/${version}.tar.gz";
-    sha256 = "0h9m5qfs09lb0dz8a79yccmm3a5rv6z8gi5pkyfh8fqkgkh2940p";
+    sha256 = "0d9rankzgmnx5423pyfkbxy0qxw3ck2vrdjdnlhddy15wkk87i9f";
   };
 
   buildInputs = [ makeWrapper gtk libsoup pkgconfig webkit gsettings_desktop_schemas ];

From 69e7948ffe120981417894e51ae311cbdaaafae4 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 7 Jan 2016 12:16:20 +0100
Subject: [PATCH 432/884] rigsofrods: remove dead package

Last bumped Feb 2012. Broken since 2013. Upstream conflicted about whether
it's dead or not. Visited the (read-only) forums which are 93% teenagers
yelling how something called BeamNG is(n't) better so I regret that now.
---
 pkgs/games/rigsofrods/default.nix       | 60 -------------------------
 pkgs/games/rigsofrods/doubleslash.patch | 13 ------
 pkgs/games/rigsofrods/paths.patch       | 12 -----
 pkgs/top-level/all-packages.nix         |  4 --
 4 files changed, 89 deletions(-)
 delete mode 100644 pkgs/games/rigsofrods/default.nix
 delete mode 100644 pkgs/games/rigsofrods/doubleslash.patch
 delete mode 100644 pkgs/games/rigsofrods/paths.patch

diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix
deleted file mode 100644
index 26c7e0a36677..000000000000
--- a/pkgs/games/rigsofrods/default.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{ fetchsvn, fetchurl, stdenv, wxGTK29, freeimage, cmake, zziplib, mesa, boost,
-  pkgconfig, libuuid, openal, ogre, ois, curl, gtk, pixman, mygui, unzip,
-  angelscript, caelum, ogrepaged, mysocketw, libxcb
-  }:
-
-stdenv.mkDerivation rec {
-  version = "0.39.4";
-  name = "rigsofrods-${version}";
-
-  src = fetchurl {
-    url = mirror://sourceforge/rigsofrods/rigsofrods-source-0.39.4.tar.bz2;
-    sha256 = "1kpjkski0yllwzdki0rjpqvifjs0fwpgs513y4dv4s9wfwan1qcx";
-  };
-
-  contentPackSrc = fetchurl {
-    url = mirror://sourceforge/rigsofrods/rigsofrods/0.37/content-pack-0.37.zip;
-    sha256 = "0prvn8lxqazadad4mv0nilax9i4vqb9s7dp7mqzvqc0ycmcnf4ps";
-  };
-
-  enableParallelBuilding = true;
-
-  cmakeFlags = [
-    "-DROR_USE_CURL=TRUE"
-    "-DROR_USE_MYGUI=TRUE"
-    "-DROR_USE_OPNEAL=TRUE"
-    "-DROR_USE_CAELUM=TRUE"
-    "-DROR_USE_PAGED=TRUE"
-    "-DROR_USE_ANGELSCRIPT=TRUE"
-    "-DROR_USE_SOCKETW=TRUE"
-    "-DCMAKE_BUILD_TYPE=Release"
-  ];
-
-  installPhase = ''
-    sed -e "s@/usr/local/lib/OGRE@${ogre}/lib/OGRE@" -i ../tools/linux/binaries/plugins.cfg
-    mkdir -p $out/share/rigsofrods
-    cp -r ../bin/* $out/share/rigsofrods
-    cp ../tools/linux/binaries/plugins.cfg $out/share/rigsofrods
-    mkdir -p $out/bin
-    ln -s $out/share/rigsofrods/{RoR,rorconfig} $out/bin
-    cd $out/share/rigsofrods
-    mkdir packs
-    cd packs
-    unzip "${contentPackSrc}"
-  '';
-
-  patches = [ ./doubleslash.patch ./paths.patch ];
-
-  buildInputs = [ wxGTK29 freeimage cmake zziplib mesa boost pkgconfig
-    libuuid openal ogre ois curl gtk mygui unzip angelscript
-    caelum ogrepaged mysocketw libxcb ];
-
-  meta = {
-    description = "3D simulator game where you can drive, fly and sail various vehicles";
-    homepage = http://rigsofrods.sourceforge.net/;
-    license = stdenv.lib.licenses.gpl3;
-    maintainers = with stdenv.lib.maintainers; [viric raskin];
-    platforms = stdenv.lib.platforms.linux;
-    hydraPlatforms = [];
-  };
-}
diff --git a/pkgs/games/rigsofrods/doubleslash.patch b/pkgs/games/rigsofrods/doubleslash.patch
deleted file mode 100644
index c62c5470dfc7..000000000000
--- a/pkgs/games/rigsofrods/doubleslash.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeDependenciesConfig.txt b/CMakeDependenciesConfig.txt
-index 447a440..e2562de 100644
---- a/CMakeDependenciesConfig.txt
-+++ b/CMakeDependenciesConfig.txt
-@@ -228,7 +228,7 @@ ELSEIF(UNIX)
-    # Paged Geometry
-    find_path(PAGED_INCLUDE_DIRS "PagedGeometry/PagedGeometry.h")
-    if(PAGED_INCLUDE_DIRS)
--      set(PAGED_INCLUDE_DIRS "${PAGED_INCLUDE_DIRS};/${PAGED_INCLUDE_DIRS}/PagedGeometry")
-+      set(PAGED_INCLUDE_DIRS "${PAGED_INCLUDE_DIRS};${PAGED_INCLUDE_DIRS}/PagedGeometry")
-       find_library(PAGED_LIBRARIES "PagedGeometry")
-       set(ROR_USE_PAGED ON)
-    else()
diff --git a/pkgs/games/rigsofrods/paths.patch b/pkgs/games/rigsofrods/paths.patch
deleted file mode 100644
index e20b00a76935..000000000000
--- a/pkgs/games/rigsofrods/paths.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/source/main/framework/ContentManager.cpp b/source/main/framework/ContentManager.cpp
-index 0bfea8c..82cdab9 100644
---- a/source/main/framework/ContentManager.cpp
-+++ b/source/main/framework/ContentManager.cpp
-@@ -238,6 +238,7 @@ bool ContentManager::init(void)
- #endif // USE_OPENAL
- 
- 	// and the content
-+	ResourceGroupManager::getSingleton().addResourceLocation(SSETTING("Program Path")+"packs", "FileSystem", "Packs", true);
- 	ResourceGroupManager::getSingleton().addResourceLocation(SSETTING("User Path")+"packs", "FileSystem", "Packs", true);
- 	ResourceGroupManager::getSingleton().addResourceLocation(SSETTING("User Path")+"mods",  "FileSystem", "Packs", true);
- 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f3d7c9be3688..9af59c719d51 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14251,10 +14251,6 @@ let
     openglSupport = mesaSupported;
   };
 
-  rigsofrods = callPackage ../games/rigsofrods {
-    mygui = myguiSvn;
-  };
-
   rili = callPackage ../games/rili { };
 
   rogue = callPackage ../games/rogue { };

From 777f254ce33dd054a8d137b418472295ba30c245 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 7 Jan 2016 11:48:35 +0100
Subject: [PATCH 433/884] caelum: remove dead package

Last updated Jan 2012, upstream dead. Broken since 2013.
Only dependent was Rigs of Rods.
---
 pkgs/development/libraries/caelum/default.nix | 22 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 24 deletions(-)
 delete mode 100644 pkgs/development/libraries/caelum/default.nix

diff --git a/pkgs/development/libraries/caelum/default.nix b/pkgs/development/libraries/caelum/default.nix
deleted file mode 100644
index 823eac145485..000000000000
--- a/pkgs/development/libraries/caelum/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, cmake, pkgconfig, ois, ogre, boost }:
-
-stdenv.mkDerivation rec {
-  name = "caelum-0.6.1";
-
-  src = fetchurl {
-    url = "http://caelum.googlecode.com/files/${name}.tar.gz";
-    sha256 = "1j995q1a88cikqrxdqsrwzm2asid51xbmkl7vn1grfrdadb15303";
-  };
-
-  buildInputs = [ ois ogre boost ];
-  nativeBuildInputs = [ cmake pkgconfig ];
-
-  enableParallelBuilding = true;
-
-  meta = {
-    description = "Add-on for the OGRE, aimed to render atmospheric effects";
-    homepage = http://code.google.com/p/caelum/;
-    license = stdenv.lib.licenses.lgpl21Plus;
-    broken = true;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9af59c719d51..d4ff09019843 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6172,8 +6172,6 @@ let
     fetchurl = fetchurlBoot;
   };
 
-  caelum = callPackage ../development/libraries/caelum { };
-
   capnproto = callPackage ../development/libraries/capnproto { };
 
   ccnx = callPackage ../development/libraries/ccnx { };

From 3d3ccd4a1500c9e7acc3e3c377edcc5bbd0618f3 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 7 Jan 2016 12:21:23 +0100
Subject: [PATCH 434/884] myguiSvn: remove dead package

Subversion snapshot from 2011. Only dependent was Rigs of Rods.
---
 pkgs/development/libraries/mygui/svn.nix | 27 ------------------------
 pkgs/top-level/all-packages.nix          |  2 --
 2 files changed, 29 deletions(-)
 delete mode 100644 pkgs/development/libraries/mygui/svn.nix

diff --git a/pkgs/development/libraries/mygui/svn.nix b/pkgs/development/libraries/mygui/svn.nix
deleted file mode 100644
index 15da5054291e..000000000000
--- a/pkgs/development/libraries/mygui/svn.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{stdenv, fetchsvn, unzip, ogre, cmake, ois, freetype, libuuid, boost}:
-
-stdenv.mkDerivation rec {
-  name = "mygui-svn-4141";
-  
-  src = fetchsvn {
-    url = https://my-gui.svn.sourceforge.net/svnroot/my-gui/trunk;
-    rev = 4141;
-    sha256 = "0xfm4b16ksqd1cwq45kl01wi4pmj244dpn11xln8ns7wz0sffjwn";
-  };
-
-  enableParallelBuilding = true;
-
-  cmakeFlags = [
-    "-DOGRE_LIB_DIR=${ogre}/lib"
-    "-DOGRE_INCLUDE_DIR=${ogre}/include/OGRE"
-    "-DOGRE_LIBRARIES=OgreMain"
-  ];
-
-  buildInputs = [ unzip ogre cmake ois freetype libuuid boost ];
-
-  meta = {
-    homepage = http://mygui.info/;
-    description = "Library for creating GUIs for games and 3D applications";
-    license = stdenv.lib.licenses.lgpl3Plus;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d4ff09019843..b9abcd7fec4d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7885,8 +7885,6 @@ let
 
   mygui = callPackage ../development/libraries/mygui {};
 
-  myguiSvn = callPackage ../development/libraries/mygui/svn.nix {};
-
   mysocketw = callPackage ../development/libraries/mysocketw { };
 
   mythes = callPackage ../development/libraries/mythes { };

From f036c069ed56db36f22a9ba01fd4042a1dc2373a Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 7 Jan 2016 23:43:52 +0100
Subject: [PATCH 435/884] borgbackup: 0.27.0 -> 0.29.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

‘When upgrading to 0.29.0 you need to upgrade client as well as server
installations due to the locking and commandline interface changes
otherwise you’ll get an error msg about a RPC protocol mismatch or a
wrong commandline option. if you run a server that needs to support both
old and new clients, it is suggested that you have a “borg-0.28.2” and a
“borg-0.29.0” command. clients then can choose via e.g. “borg
–remote-path=borg-0.29.0 ...”.’

‘The default waiting time for a lock changed from infinity to 1 second
for a better interactive user experience. if the repo you want to access
is currently locked, borg will now terminate after 1s with an error
message. if you have scripts that shall wait for the lock for a longer
time, use –lock-wait N (with N being the maximum wait time in seconds).’

All changes: http://borgbackup.readthedocs.org/en/stable/changes.html
---
 pkgs/tools/backup/borg/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix
index df3523322e86..a68a5a7313e5 100644
--- a/pkgs/tools/backup/borg/default.nix
+++ b/pkgs/tools/backup/borg/default.nix
@@ -2,12 +2,12 @@
 
 python3Packages.buildPythonPackage rec {
   name = "borgbackup-${version}";
-  version = "0.27.0";
+  version = "0.29.0";
   namePrefix = "";
 
   src = fetchurl {
     url = "https://pypi.python.org/packages/source/b/borgbackup/borgbackup-${version}.tar.gz";
-    sha256 = "04iizidag4fwy6kx1747d633s1amr81slgk743qsfbwixaxfjq9b";
+    sha256 = "1gvx036a7j16hd5rg8cr3ibiig7gwqhmddrilsakcw4wnfimjy5m";
   };
 
   propagatedBuildInputs = with python3Packages;
@@ -16,8 +16,6 @@ python3Packages.buildPythonPackage rec {
   preConfigure = ''
     export BORG_OPENSSL_PREFIX="${openssl}"
     export BORG_LZ4_PREFIX="${lz4}"
-    # note: fix for this issue already upstream and probably in 0.27.1 (or whatever the next release is called)
-    substituteInPlace setup.py --replace "possible_openssl_prefixes.insert(0, os.environ.get('BORG_LZ4_PREFIX'))" "possible_lz4_prefixes.insert(0, os.environ.get('BORG_LZ4_PREFIX'))"
   '';
 
   meta = with stdenv.lib; {
@@ -25,5 +23,6 @@ python3Packages.buildPythonPackage rec {
     homepage = https://borgbackup.github.io/;
     license = licenses.bsd3;
     platforms = platforms.unix; # Darwin and FreeBSD mentioned on homepage
+    maintainers = with maintainers; [ nckx ];
   };
 }

From 8cb22c0a63b6f0f77376d3ea0d3d3d90d983e47d Mon Sep 17 00:00:00 2001
From: Nathan Zadoks <nathan@nathan7.eu>
Date: Fri, 8 Jan 2016 00:54:43 +0100
Subject: [PATCH 436/884] consul service: add package option

---
 nixos/modules/services/networking/consul.nix | 21 ++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/networking/consul.nix b/nixos/modules/services/networking/consul.nix
index 66838735c4da..7337eb873c77 100644
--- a/nixos/modules/services/networking/consul.nix
+++ b/nixos/modules/services/networking/consul.nix
@@ -7,7 +7,7 @@ let
   cfg = config.services.consul;
 
   configOptions = { data_dir = dataDir; } //
-    (if cfg.webUi then { ui_dir = "${pkgs.consul.ui}"; } else { }) //
+    (if cfg.webUi then { ui_dir = "${cfg.package.ui}"; } else { }) //
     cfg.extraConfig;
 
   configFiles = [ "/etc/consul.json" "/etc/consul-addrs.json" ]
@@ -30,6 +30,15 @@ in
         '';
       };
 
+      package = mkOption {
+        type = types.package;
+        default = pkgs.consul;
+        description = ''
+          The package used for the Consul agent and CLI.
+        '';
+      };
+
+
       webUi = mkOption {
         type = types.bool;
         default = false;
@@ -155,7 +164,7 @@ in
         etc."consul.json".text = builtins.toJSON configOptions;
         # We need consul.d to exist for consul to start
         etc."consul.d/dummy.json".text = "{ }";
-        systemPackages = with pkgs; [ consul ];
+        systemPackages = [ cfg.package ];
       };
 
       systemd.services.consul = {
@@ -167,14 +176,14 @@ in
             (filterAttrs (n: _: hasPrefix "consul.d/" n) config.environment.etc);
 
         serviceConfig = {
-          ExecStart = "@${pkgs.consul}/bin/consul consul agent -config-dir /etc/consul.d"
+          ExecStart = "@${cfg.package}/bin/consul consul agent -config-dir /etc/consul.d"
             + concatMapStrings (n: " -config-file ${n}") configFiles;
-          ExecReload = "${pkgs.consul}/bin/consul reload";
+          ExecReload = "${cfg.package}/bin/consul reload";
           PermissionsStartOnly = true;
           User = if cfg.dropPrivileges then "consul" else null;
           TimeoutStartSec = "0";
         } // (optionalAttrs (cfg.leaveOnStop) {
-          ExecStop = "${pkgs.consul}/bin/consul leave";
+          ExecStop = "${cfg.package}/bin/consul leave";
         });
 
         path = with pkgs; [ iproute gnugrep gawk consul ];
@@ -221,7 +230,7 @@ in
         wantedBy = [ "multi-user.target" ];
         after = [ "consul.service" ];
 
-        path = [ pkgs.consul ];
+        path = [ cfg.package ];
 
         serviceConfig = {
           ExecStart = ''

From 64702f92bd81dd5f0b8d3fc7934eecc5df4bb89e Mon Sep 17 00:00:00 2001
From: Matthew O'Gorman <mog@rldn.net>
Date: Thu, 7 Jan 2016 22:32:06 -0500
Subject: [PATCH 437/884] jekyll: added rouge for highlighting.

---
 pkgs/applications/misc/jekyll/Gemfile      |  1 +
 pkgs/applications/misc/jekyll/Gemfile.lock |  2 ++
 pkgs/applications/misc/jekyll/gemset.nix   | 10 +++++++++-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/jekyll/Gemfile b/pkgs/applications/misc/jekyll/Gemfile
index 0a5688503cac..460495515a5c 100644
--- a/pkgs/applications/misc/jekyll/Gemfile
+++ b/pkgs/applications/misc/jekyll/Gemfile
@@ -3,3 +3,4 @@ source "https://rubygems.org"
 gem 'jekyll'
 gem 'rdiscount'
 gem 'RedCloth'
+gem 'rouge'
diff --git a/pkgs/applications/misc/jekyll/Gemfile.lock b/pkgs/applications/misc/jekyll/Gemfile.lock
index ec81bc703c68..234b567711e8 100644
--- a/pkgs/applications/misc/jekyll/Gemfile.lock
+++ b/pkgs/applications/misc/jekyll/Gemfile.lock
@@ -1,6 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    rouge (1.10.1)
     RedCloth (4.2.9)
     blankslate (2.1.2.4)
     celluloid (0.16.0)
@@ -71,6 +72,7 @@ PLATFORMS
 DEPENDENCIES
   RedCloth
   jekyll
+  rouge
   rdiscount
 
 BUNDLED WITH
diff --git a/pkgs/applications/misc/jekyll/gemset.nix b/pkgs/applications/misc/jekyll/gemset.nix
index f6ad34fcad98..99dc7b31eab2 100644
--- a/pkgs/applications/misc/jekyll/gemset.nix
+++ b/pkgs/applications/misc/jekyll/gemset.nix
@@ -6,6 +6,13 @@
       sha256 = "06pahxyrckhgb7alsxwhhlx1ib2xsx33793finj01jk8i054bkxl";
     };
   };
+  "rouge" = {
+    version = "1.10.1";
+    source = {
+      type = "gem";
+      sha256 = "0wp8as9ypdy18kdj9h70kny1rdfq71mr8cj2bpahr9vxjjvjasqz";
+    };
+  };
   "blankslate" = {
     version = "2.1.2.4";
     source = {
@@ -95,6 +102,7 @@
     dependencies = [
       "classifier-reborn"
       "colorator"
+      "rogue"
       "jekyll-coffeescript"
       "jekyll-gist"
       "jekyll-paginate"
@@ -286,4 +294,4 @@
       sha256 = "0zvvb7i1bl98k3zkdrnx9vasq0rp2cyy5n7p9804dqs4fz9xh9vf";
     };
   };
-}
\ No newline at end of file
+}

From 732495017b9ec6e0105c0c31aa20c9b397ef16cb Mon Sep 17 00:00:00 2001
From: Dan Peebles <dev.peebles.dan@dev.bwater.com>
Date: Thu, 7 Jan 2016 22:57:41 -0500
Subject: [PATCH 438/884] perl-5.20: break dependency on the compiler that
 built it

This is a major closure size reduction on Darwin, and probably a less
significant one on Linux. On darwin, retaining the compiler means adding
clang and its dependency llvm to the perl closure, which gives us ~400MB
of extra stuff. Considering that Nix itself depends on this version of
perl, that makes cutting a new Nix release rather unpleasaont Darwin.

After this patch, I was able to get the `nixUnstable` closure down to
21MB after feeding it into a .tar.xz (123MB before compression). There's
still room for improvement but this should carry us over until we split
outputs.
---
 pkgs/development/interpreters/perl/5.20/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/interpreters/perl/5.20/default.nix b/pkgs/development/interpreters/perl/5.20/default.nix
index 9cc8af5f427d..c91a43963d49 100644
--- a/pkgs/development/interpreters/perl/5.20/default.nix
+++ b/pkgs/development/interpreters/perl/5.20/default.nix
@@ -93,6 +93,14 @@ stdenv.mkDerivation rec {
       substituteInPlace dist/PathTools/Cwd.pm --replace "'/bin/pwd'" "'$(type -tP pwd)'"
     '';
 
+  # Inspired by nuke-references, which I can't depend on because it uses perl. Perhaps it should just use sed :)
+  postInstall = ''
+    self=$(echo $out | sed -n "s|^$NIX_STORE/\\([a-z0-9]\{32\}\\)-.*|\1|p")
+
+    sed -i "/$self/b; s|$NIX_STORE/[a-z0-9]\{32\}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" "$out"/lib/perl5/*/*/Config.pm
+    sed -i "/$self/b; s|$NIX_STORE/[a-z0-9]\{32\}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" "$out"/lib/perl5/*/*/Config_heavy.pl
+  '';
+
   setupHook = ./setup-hook.sh;
 
   passthru.libPrefix = "lib/perl5/site_perl";

From 08c081309b4e024bc49463dba1e2d198b33c4f1d Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Sat, 2 Jan 2016 19:59:46 -0800
Subject: [PATCH 439/884] Revert "gnustep-make: fix installation path"

This reverts commit 4f1559a75190c8e702d8c0d88c4c3791e47fcd4b.
---
 .../tools/build-managers/gnustep/make/default.nix          | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/gnustep/make/default.nix b/pkgs/development/tools/build-managers/gnustep/make/default.nix
index 68af0c114c4c..a58273e6086e 100644
--- a/pkgs/development/tools/build-managers/gnustep/make/default.nix
+++ b/pkgs/development/tools/build-managers/gnustep/make/default.nix
@@ -11,7 +11,10 @@ stdenv.mkDerivation rec {
 
   patchPhase = ''
     substituteInPlace GNUmakefile.in \
-      --replace which type
+      --replace which type \
+      --replace 'tooldir = $(DESTDIR)' 'tooldir = ' \
+      --replace 'makedir = $(DESTDIR)' 'makedir = ' \
+      --replace 'mandir  = $(DESTDIR)' 'mandir  = '
 
     substituteInPlace FilesystemLayouts/apple \
       --replace /usr/local ""
@@ -20,7 +23,7 @@ stdenv.mkDerivation rec {
       --replace /Library/GNUstep "$out"
   '';
 
-  installFlags = [ "PREFIX=$(out)" ];
+  installFlags = "DESTDIR=$(out)";
 
   postInstall = ''
     mkdir -p $out/nix-support

From 81710923bd8bc6bf38e817160152be65ec6ba472 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Thu, 7 Jan 2016 21:51:58 -0800
Subject: [PATCH 440/884] add gyp fix to node v4.x

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

diff --git a/pkgs/development/web/nodejs/v4.nix b/pkgs/development/web/nodejs/v4.nix
index b3958fc8529f..ad13d108803f 100644
--- a/pkgs/development/web/nodejs/v4.nix
+++ b/pkgs/development/web/nodejs/v4.nix
@@ -43,6 +43,10 @@ in stdenv.mkDerivation {
 
   patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode.patch ./pkg-libpath.patch ];
 
+  postFixup = ''
+    sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' $out/lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py
+  '';
+
   buildInputs = [ python which zlib libuv openssl python ]
     ++ optionals stdenv.isLinux [ utillinux http-parser ]
     ++ optionals stdenv.isDarwin [ pkgconfig openssl libtool ];

From 83bf145075b74f85b47f899cc5f4a79660e267cd Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 7 Jan 2016 19:54:14 +0100
Subject: [PATCH 441/884] pythonPackages.numpy: 1.10.2 -> 1.10.4

---
 .../python-modules/numpy-no-large-files.patch | 35 -------------------
 pkgs/top-level/python-packages.nix            | 17 +++++----
 2 files changed, 11 insertions(+), 41 deletions(-)
 delete mode 100644 pkgs/development/python-modules/numpy-no-large-files.patch

diff --git a/pkgs/development/python-modules/numpy-no-large-files.patch b/pkgs/development/python-modules/numpy-no-large-files.patch
deleted file mode 100644
index 0eb415606d3e..000000000000
--- a/pkgs/development/python-modules/numpy-no-large-files.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- numpy/lib/tests/test_format.py	2015-08-11 12:03:43.000000000 -0500
-+++ numpy/lib/tests/test_format_no_large_files.py	2015-11-03 16:03:30.328084827 -0600
-@@ -810,32 +810,5 @@
-     format.write_array_header_1_0(s, d)
-     assert_raises(ValueError, format.read_array_header_1_0, s)
- 
--
--def test_large_file_support():
--    from nose import SkipTest
--    if (sys.platform == 'win32' or sys.platform == 'cygwin'):
--        raise SkipTest("Unknown if Windows has sparse filesystems")
--    # try creating a large sparse file
--    tf_name = os.path.join(tempdir, 'sparse_file')
--    try:
--        # seek past end would work too, but linux truncate somewhat
--        # increases the chances that we have a sparse filesystem and can
--        # avoid actually writing 5GB
--        import subprocess as sp
--        sp.check_call(["truncate", "-s", "5368709120", tf_name])
--    except:
--        raise SkipTest("Could not create 5GB large file")
--    # write a small array to the end
--    with open(tf_name, "wb") as f:
--        f.seek(5368709120)
--        d = np.arange(5)
--        np.save(f, d)
--    # read it back
--    with open(tf_name, "rb") as f:
--        f.seek(5368709120)
--        r = np.load(f)
--    assert_array_equal(r, d)
--
--
- if __name__ == "__main__":
-     run_module_suite()
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 061f2683dc7e..2f0d638e26f4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11548,11 +11548,11 @@ in modules // {
     };
   in buildPythonPackage ( rec {
     name = "numpy-${version}";
-    version = "1.10.2";
+    version = "1.10.4";
 
     src = pkgs.fetchurl {
-      url = "mirror://sourceforge/numpy/${name}.tar.gz";
-      sha256 = "23a3befdf955db4d616f8bb77b324680a80a323e0c42a7e8d7388ef578d8ffa9";
+      url = "https://pypi.python.org/packages/source/n/numpy/${name}.tar.gz";
+      sha256 = "7356e98fbcc529e8d540666f5a919912752e569150e9a4f8d869c686f14c720b";
     };
 
     disabled = isPyPy;  # WIP
@@ -11566,10 +11566,15 @@ in modules // {
     buildInputs = [ pkgs.gfortran self.nose ];
     propagatedBuildInputs = [ support.openblas ];
 
-    # This patch removes the test of large file support, which takes forever
+    # Disable failing test_f2py test.
+    # f2py couldn't be found by test,
+    # even though it was used successfully to build numpy
+    
+    # The large file support test is disabled because it takes forever
     # and can cause the machine to run out of disk space when run.
-    patchPhase = ''
-      patch -p0 < ${../development/python-modules/numpy-no-large-files.patch}
+    prePatch = ''
+      sed -i 's/test_f2py/donttest/' numpy/tests/test_scripts.py
+      sed -i 's/test_large_file_support/donttest/' numpy/lib/tests/test_format.py
     '';
 
     meta = {

From 7c54bca1277345476a6d0cc363daeaa82c266792 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Steve=20M=C3=BCller?= <st.mueller@dzh-online.de>
Date: Fri, 8 Jan 2016 10:42:32 +0100
Subject: [PATCH 442/884] php: 5.6.16 -> 5.6.17

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

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 6760b88dac60..a2c2ba9d9312 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -298,8 +298,8 @@ in {
   };
 
   php56 = generic {
-    version = "5.6.16";
-    sha256 = "1bnjpj5vjj2sx80z3x452vhk7bfdl8hbli61byhapgy1ch4z9rjg";
+    version = "5.6.17";
+    sha256 = "0fyxg95m918ngi6lnxyfb4y0ii4f8f5znb5l4axpagp6l5b5zd3p";
   };
 
   php70 = generic {

From 52503264743b15210d458290b117ebb5c0979eec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Steve=20M=C3=BCller?= <st.mueller@dzh-online.de>
Date: Fri, 8 Jan 2016 10:49:04 +0100
Subject: [PATCH 443/884] php: 5.5.30 -> 5.5.31

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

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 6760b88dac60..d498a922b4cd 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -293,8 +293,8 @@ in {
   };
 
   php55 = generic {
-    version = "5.5.30";
-    sha256 = "0a9v7jq8mr15dcim23rzcfgpijc5k1rkc4qv9as1rpgc7iqjlcz7";
+    version = "5.5.31";
+    sha256 = "0xx23gb70jsgbd772hy8f79wh2rja617s17gnx4vgklxk8mkhjpv";
   };
 
   php56 = generic {

From 4341df2f70b2b83c8a24e58d97d4621b6d799de9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Steve=20M=C3=BCller?= <st.mueller@dzh-online.de>
Date: Fri, 8 Jan 2016 10:51:35 +0100
Subject: [PATCH 444/884] php: 7.0.1 -> 7.0.2

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

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 6760b88dac60..e82ef54ac655 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -303,8 +303,8 @@ in {
   };
 
   php70 = generic {
-    version = "7.0.1";
-    sha256 = "0hiyv71ysbzcl3kf28phjyycp7myjd89l8f28arrf4q0vb8kpkh4";
+    version = "7.0.2";
+    sha256 = "0di2vallv5kry85l67za25nq4f2hjr8fad5j0c06nb69v7xpa6wv";
   };
 
 }

From 7636359c8990cd1d9cb4f7d190e0613480b43cfd Mon Sep 17 00:00:00 2001
From: Marcin Falkiewicz <avalatron@gmail.com>
Date: Sun, 3 Jan 2016 18:05:18 +0100
Subject: [PATCH 445/884] irqbalance: init at 1.1.0

---
 nixos/modules/module-list.nix                 |  1 +
 .../modules/services/hardware/irqbalance.nix  | 30 +++++++++++++++++++
 pkgs/os-specific/linux/irqbalance/default.nix | 25 ++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 4 files changed, 58 insertions(+)
 create mode 100644 nixos/modules/services/hardware/irqbalance.nix
 create mode 100644 pkgs/os-specific/linux/irqbalance/default.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 81daad099a8b..08dd57704e7c 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -164,6 +164,7 @@
   ./services/hardware/bluetooth.nix
   ./services/hardware/brltty.nix
   ./services/hardware/freefall.nix
+  ./services/hardware/irqbalance.nix
   ./services/hardware/nvidia-optimus.nix
   ./services/hardware/pcscd.nix
   ./services/hardware/pommed.nix
diff --git a/nixos/modules/services/hardware/irqbalance.nix b/nixos/modules/services/hardware/irqbalance.nix
new file mode 100644
index 000000000000..b139154432cf
--- /dev/null
+++ b/nixos/modules/services/hardware/irqbalance.nix
@@ -0,0 +1,30 @@
+#
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.irqbalance;
+
+in
+{
+  options.services.irqbalance.enable = mkEnableOption "irqbalance daemon";
+
+  config = mkIf cfg.enable {
+
+    systemd.services = {
+      irqbalance = {
+        description = "irqbalance daemon";
+        path = [ pkgs.irqbalance ];
+        serviceConfig =
+          { ExecStart = "${pkgs.irqbalance}/bin/irqbalance --foreground"; };
+        wantedBy = [ "multi-user.target" ];
+      };
+    };
+
+    environment.systemPackages = [ pkgs.irqbalance ];
+
+  };
+
+}
diff --git a/pkgs/os-specific/linux/irqbalance/default.nix b/pkgs/os-specific/linux/irqbalance/default.nix
new file mode 100644
index 000000000000..7c3947539029
--- /dev/null
+++ b/pkgs/os-specific/linux/irqbalance/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig}:
+
+stdenv.mkDerivation rec {
+  name = "irqbalance-1.1.0";
+
+  src = fetchFromGitHub {
+    owner = "irqbalance";
+    repo = "irqbalance";
+    rev = "a23de3c455b88060620d102f6946b1d8be9e2680";
+    sha256 = "06yq5k5v9wiwajqcjkbkk46g212qx78x323bygnyqshc5s25mp2x";
+  };
+
+  nativeBuildInputs = [ autoconf automake libtool pkgconfig ];
+
+  preConfigure = ''
+    ./autogen.sh
+  '';
+
+  meta = {
+    homepage = https://github.com/Irqbalance/irqbalance;
+    description = "A daemon to help balance the cpu load generated by interrupts across all of a systems cpus";
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5601fb7ca7e1..84a928753994 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9919,6 +9919,8 @@ let
 
   ipset = callPackage ../os-specific/linux/ipset { };
 
+  irqbalance = callPackage ../os-specific/linux/irqbalance { };
+
   iw = callPackage ../os-specific/linux/iw { };
 
   jfbview = callPackage ../os-specific/linux/jfbview { };

From 7550ddaf91720031c182b45e59e98e2976bcdf30 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 7 Jan 2016 14:30:51 +0100
Subject: [PATCH 446/884] hackage-packages.nix: update Haskell package set

This update was generated by hackage2nix v20151217-6-g3c230ba using the following inputs:

  - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/b05b64ed59947482233397c8765de70ef24cd8e9
  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/ce76547c846d763441b8ba4a2effa54ca17f8443
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/87e2d54643d6d6e4f8a3c7edffce9fa06eb9f0a0
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/392791fc318eec52ea38a8e15ff690da9a58af36
---
 .../haskell-modules/configuration-lts-0.0.nix |   6 +
 .../haskell-modules/configuration-lts-0.1.nix |   6 +
 .../haskell-modules/configuration-lts-0.2.nix |   6 +
 .../haskell-modules/configuration-lts-0.3.nix |   6 +
 .../haskell-modules/configuration-lts-0.4.nix |   6 +
 .../haskell-modules/configuration-lts-0.5.nix |   6 +
 .../haskell-modules/configuration-lts-0.6.nix |   6 +
 .../haskell-modules/configuration-lts-0.7.nix |   6 +
 .../haskell-modules/configuration-lts-1.0.nix |   6 +
 .../haskell-modules/configuration-lts-1.1.nix |   6 +
 .../configuration-lts-1.10.nix                |   6 +
 .../configuration-lts-1.11.nix                |   6 +
 .../configuration-lts-1.12.nix                |   6 +
 .../configuration-lts-1.13.nix                |   6 +
 .../configuration-lts-1.14.nix                |   6 +
 .../configuration-lts-1.15.nix                |   6 +
 .../haskell-modules/configuration-lts-1.2.nix |   6 +
 .../haskell-modules/configuration-lts-1.4.nix |   6 +
 .../haskell-modules/configuration-lts-1.5.nix |   6 +
 .../haskell-modules/configuration-lts-1.7.nix |   6 +
 .../haskell-modules/configuration-lts-1.8.nix |   6 +
 .../haskell-modules/configuration-lts-1.9.nix |   6 +
 .../haskell-modules/configuration-lts-2.0.nix |   6 +
 .../haskell-modules/configuration-lts-2.1.nix |   6 +
 .../configuration-lts-2.10.nix                |   6 +
 .../configuration-lts-2.11.nix                |   6 +
 .../configuration-lts-2.12.nix                |   6 +
 .../configuration-lts-2.13.nix                |   6 +
 .../configuration-lts-2.14.nix                |   6 +
 .../configuration-lts-2.15.nix                |   6 +
 .../configuration-lts-2.16.nix                |   6 +
 .../configuration-lts-2.17.nix                |   6 +
 .../configuration-lts-2.18.nix                |   6 +
 .../configuration-lts-2.19.nix                |   6 +
 .../haskell-modules/configuration-lts-2.2.nix |   6 +
 .../configuration-lts-2.20.nix                |   6 +
 .../configuration-lts-2.21.nix                |   6 +
 .../configuration-lts-2.22.nix                |   6 +
 .../haskell-modules/configuration-lts-2.3.nix |   6 +
 .../haskell-modules/configuration-lts-2.4.nix |   6 +
 .../haskell-modules/configuration-lts-2.5.nix |   6 +
 .../haskell-modules/configuration-lts-2.6.nix |   6 +
 .../haskell-modules/configuration-lts-2.7.nix |   6 +
 .../haskell-modules/configuration-lts-2.8.nix |   6 +
 .../haskell-modules/configuration-lts-2.9.nix |   6 +
 .../haskell-modules/configuration-lts-3.0.nix |   6 +
 .../haskell-modules/configuration-lts-3.1.nix |   6 +
 .../configuration-lts-3.10.nix                |   8 +
 .../configuration-lts-3.11.nix                |   8 +
 .../configuration-lts-3.12.nix                |   8 +
 .../configuration-lts-3.13.nix                |   8 +
 .../configuration-lts-3.14.nix                |   8 +
 .../configuration-lts-3.15.nix                |   8 +
 .../configuration-lts-3.16.nix                |   8 +
 .../configuration-lts-3.17.nix                |   8 +
 .../configuration-lts-3.18.nix                |   8 +
 .../configuration-lts-3.19.nix                |  10 +
 .../haskell-modules/configuration-lts-3.2.nix |   6 +
 .../configuration-lts-3.20.nix                |  10 +
 .../configuration-lts-3.21.nix                |  10 +-
 .../haskell-modules/configuration-lts-3.3.nix |   6 +
 .../haskell-modules/configuration-lts-3.4.nix |   6 +
 .../haskell-modules/configuration-lts-3.5.nix |   7 +
 .../haskell-modules/configuration-lts-3.6.nix |   8 +
 .../haskell-modules/configuration-lts-3.7.nix |   8 +
 .../haskell-modules/configuration-lts-3.8.nix |   8 +
 .../haskell-modules/configuration-lts-3.9.nix |   8 +
 .../haskell-modules/configuration-lts-4.0.nix |  21 +
 .../haskell-modules/hackage-packages.nix      | 634 ++++++++++++++----
 69 files changed, 955 insertions(+), 141 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
index b68ec942dbc8..52764ef9f8f6 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
@@ -919,6 +919,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_7_5_1";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = dontDistribute super."Spock-digestive";
@@ -1007,6 +1008,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1378,6 +1380,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2527,6 +2530,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -3339,6 +3343,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3837,6 +3842,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
index eb4efb80d5de..0afcb4fe66b2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
@@ -919,6 +919,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_7_5_1";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = dontDistribute super."Spock-digestive";
@@ -1007,6 +1008,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1378,6 +1380,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2527,6 +2530,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -3339,6 +3343,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3837,6 +3842,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
index ecb5a1b74bb9..f00cf541bab8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
@@ -919,6 +919,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_7_5_1";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = dontDistribute super."Spock-digestive";
@@ -1007,6 +1008,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1378,6 +1380,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2527,6 +2530,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -3339,6 +3343,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3837,6 +3842,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
index 2d600fd95e0a..a411776d7ac9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
@@ -919,6 +919,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_7_5_1";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = dontDistribute super."Spock-digestive";
@@ -1007,6 +1008,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1378,6 +1380,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2527,6 +2530,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -3339,6 +3343,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3837,6 +3842,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
index 838aa0b1a139..6fcb1181a935 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
@@ -919,6 +919,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_7_5_1";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = dontDistribute super."Spock-digestive";
@@ -1007,6 +1008,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1378,6 +1380,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2527,6 +2530,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -3338,6 +3342,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3834,6 +3839,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
index 6881b910cbbc..224e691cd088 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
@@ -919,6 +919,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_7_5_1";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = dontDistribute super."Spock-digestive";
@@ -1007,6 +1008,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1378,6 +1380,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2527,6 +2530,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -3338,6 +3342,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3834,6 +3839,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
index dceed3e9f1c5..1bd986368826 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
@@ -918,6 +918,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_7_5_2";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = dontDistribute super."Spock-digestive";
@@ -1006,6 +1007,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1377,6 +1379,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2524,6 +2527,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -3335,6 +3339,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3831,6 +3836,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
index f561547f7b87..a66c711c92e4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
@@ -918,6 +918,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_7_5_2";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = dontDistribute super."Spock-digestive";
@@ -1006,6 +1007,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1377,6 +1379,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2524,6 +2527,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -3335,6 +3339,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3831,6 +3836,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
index 8c229e353e7c..af34d8088c03 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
@@ -915,6 +915,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_7_6_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0";
@@ -1002,6 +1003,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1373,6 +1375,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2515,6 +2518,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -3325,6 +3329,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3820,6 +3825,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
index 036525771f8f..59f1e79efe5d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
@@ -915,6 +915,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_7_6_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0";
@@ -1002,6 +1003,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1373,6 +1375,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2512,6 +2515,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -3321,6 +3325,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3816,6 +3821,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
index 0acdf21c5d0c..8b9d4ff915ba 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
@@ -914,6 +914,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_7_7_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0";
@@ -1001,6 +1002,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1372,6 +1374,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2508,6 +2511,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -3313,6 +3317,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3806,6 +3811,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
index 247a81038b00..9f3e82d2970e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
@@ -914,6 +914,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_7_7_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0";
@@ -1001,6 +1002,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1372,6 +1374,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2508,6 +2511,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -3312,6 +3316,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3805,6 +3810,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
index e4777fed04ab..61bd4b84864a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
@@ -914,6 +914,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_7_7_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0";
@@ -1001,6 +1002,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1372,6 +1374,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2508,6 +2511,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -3312,6 +3316,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3805,6 +3810,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
index ee061b36df03..01b40ce89c62 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
@@ -914,6 +914,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_7_7_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0";
@@ -1001,6 +1002,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1372,6 +1374,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2508,6 +2511,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -3312,6 +3316,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3804,6 +3809,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
index 0ed1162a0c6d..fd35c6a57ea1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
@@ -913,6 +913,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_7_7_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0";
@@ -1000,6 +1001,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1371,6 +1373,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2505,6 +2508,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -3309,6 +3313,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3801,6 +3806,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
index 7875d9c2d011..f4261bb3a781 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
@@ -912,6 +912,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_7_7_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0";
@@ -999,6 +1000,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1370,6 +1372,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2501,6 +2504,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -3304,6 +3308,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3796,6 +3801,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
index 434ab825afc7..2d628242f976 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
@@ -915,6 +915,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_7_7_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0";
@@ -1002,6 +1003,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1373,6 +1375,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2510,6 +2513,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -3319,6 +3323,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3813,6 +3818,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
index 7b1bc7bd66f0..a17ec49c7332 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
@@ -914,6 +914,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_7_7_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0";
@@ -1001,6 +1002,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1372,6 +1374,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2509,6 +2512,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -3317,6 +3321,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3811,6 +3816,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
index c33af0630394..3a26cb35dccd 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
@@ -914,6 +914,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_7_7_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0";
@@ -1001,6 +1002,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1372,6 +1374,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2508,6 +2511,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -3316,6 +3320,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3810,6 +3815,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
index cc6f270828ac..6723b3b29b03 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
@@ -914,6 +914,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_7_7_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0";
@@ -1001,6 +1002,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1372,6 +1374,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2508,6 +2511,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -3316,6 +3320,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3810,6 +3815,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
index 4730ae44b72f..ea6192009c91 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
@@ -914,6 +914,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_7_7_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0";
@@ -1001,6 +1002,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1372,6 +1374,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2508,6 +2511,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -3314,6 +3318,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3807,6 +3812,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
index ad6b11963c52..656a42670b58 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
@@ -914,6 +914,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_7_7_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0";
@@ -1001,6 +1002,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1372,6 +1374,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2508,6 +2511,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -3313,6 +3317,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3806,6 +3811,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
index 4f5c63d1d67e..ba596459fd8a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
@@ -905,6 +905,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_7_7_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0";
@@ -991,6 +992,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1361,6 +1363,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2485,6 +2488,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -3284,6 +3288,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3772,6 +3777,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
index 0a85ad40ee6e..b426b2cad868 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
@@ -905,6 +905,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_7_7_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0";
@@ -991,6 +992,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1361,6 +1363,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2484,6 +2487,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -3283,6 +3287,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3771,6 +3776,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
index bee495f96a14..52db16ccfed3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
@@ -902,6 +902,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_7_9_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0";
@@ -988,6 +989,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1356,6 +1358,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2469,6 +2472,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -3264,6 +3268,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3749,6 +3754,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
index bd33d70414f7..cb3cd57e7fbe 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
@@ -902,6 +902,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_7_9_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0";
@@ -988,6 +989,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1355,6 +1357,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2468,6 +2471,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -3263,6 +3267,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3747,6 +3752,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
index a894c489103f..885c13740374 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
@@ -902,6 +902,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_7_9_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0";
@@ -988,6 +989,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1355,6 +1357,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2468,6 +2471,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -3263,6 +3267,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3747,6 +3752,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
index ab240f3c3ec2..e6b2ee578017 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
@@ -902,6 +902,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_7_9_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0";
@@ -988,6 +989,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1355,6 +1357,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2468,6 +2471,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -3263,6 +3267,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3746,6 +3751,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
index 73f83460ba21..1b515c4fb6c8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
@@ -902,6 +902,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_7_9_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0";
@@ -988,6 +989,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1354,6 +1356,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2467,6 +2470,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -3261,6 +3265,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3744,6 +3749,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
index 9c1593ada07d..4239d3839210 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
@@ -902,6 +902,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_7_9_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0";
@@ -988,6 +989,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1354,6 +1356,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2467,6 +2470,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -3260,6 +3264,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3743,6 +3748,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
index 7c44628aab7e..f311c69e581f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
@@ -901,6 +901,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_7_9_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0";
@@ -987,6 +988,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1353,6 +1355,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2464,6 +2467,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -3255,6 +3259,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3738,6 +3743,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
index ad7b129ba9c7..2e49b6ac2237 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
@@ -901,6 +901,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_7_10_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0";
@@ -987,6 +988,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1353,6 +1355,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2462,6 +2465,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -3251,6 +3255,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3733,6 +3738,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
index 5cd4bf38b8fc..4ea63a5eb54f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
@@ -901,6 +901,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_7_10_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0";
@@ -987,6 +988,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1353,6 +1355,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2461,6 +2464,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -3249,6 +3253,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3731,6 +3736,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
index 8cd773650dfa..3d1e8d022a38 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
@@ -901,6 +901,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_7_10_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1";
@@ -987,6 +988,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1353,6 +1355,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2461,6 +2464,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -3248,6 +3252,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3730,6 +3735,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
index 11ae6e2ebd7e..7130e689c7eb 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
@@ -904,6 +904,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_7_7_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0";
@@ -990,6 +991,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1360,6 +1362,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2481,6 +2484,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -3280,6 +3284,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3768,6 +3773,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
index 8f0646e0c7e8..aba171225f2e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
@@ -901,6 +901,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_7_10_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1";
@@ -987,6 +988,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1353,6 +1355,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2460,6 +2463,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -3247,6 +3251,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3729,6 +3734,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
index 465745d0e54e..e7d37e3a1ad1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
@@ -901,6 +901,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_7_10_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1";
@@ -987,6 +988,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1353,6 +1355,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2460,6 +2463,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -3247,6 +3251,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3729,6 +3734,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
index f3ac43514e85..71fd5ab45ef6 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
@@ -901,6 +901,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_7_10_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1";
@@ -987,6 +988,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1353,6 +1355,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2460,6 +2463,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -3247,6 +3251,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3729,6 +3734,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
index 240c70b0cfb8..8ffc524a2511 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
@@ -904,6 +904,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_7_7_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0";
@@ -990,6 +991,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1360,6 +1362,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2481,6 +2484,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -3279,6 +3283,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3767,6 +3772,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
index d59628a35f77..230a903c5244 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
@@ -904,6 +904,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_7_9_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0";
@@ -990,6 +991,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1360,6 +1362,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2480,6 +2483,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -3278,6 +3282,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3766,6 +3771,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
index 32d9eeb7fb56..302b2924f12c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
@@ -904,6 +904,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_7_9_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0";
@@ -990,6 +991,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1360,6 +1362,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2479,6 +2482,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -3277,6 +3281,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3765,6 +3770,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
index bb0b738d8150..a592871599d2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
@@ -904,6 +904,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_7_9_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0";
@@ -990,6 +991,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1358,6 +1360,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2476,6 +2479,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -3274,6 +3278,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3760,6 +3765,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
index ed84976e0fb7..efa81299bb78 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
@@ -903,6 +903,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_7_9_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0";
@@ -989,6 +990,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1357,6 +1359,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2475,6 +2478,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -3273,6 +3277,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3759,6 +3764,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
index b4abbeddb86d..d44eb15a7968 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
@@ -902,6 +902,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_7_9_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0";
@@ -988,6 +989,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1356,6 +1358,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2474,6 +2477,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -3271,6 +3275,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3757,6 +3762,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
index ea77ce3e80f7..40552297c79c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
@@ -902,6 +902,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_7_9_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0";
@@ -988,6 +989,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1356,6 +1358,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2471,6 +2474,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -3266,6 +3270,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3751,6 +3756,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
index 182a082f39b9..0af7c3b969a4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
@@ -881,6 +881,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_8_0_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1";
@@ -965,6 +966,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1314,6 +1316,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2384,6 +2387,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -3143,6 +3147,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3615,6 +3620,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
index 31e57a21d4eb..4bd6d567ec80 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
@@ -881,6 +881,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_8_1_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1";
@@ -965,6 +966,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1313,6 +1315,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2383,6 +2386,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -3139,6 +3143,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3611,6 +3616,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
index c0a0fa14bae7..4cef54bf6469 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
@@ -874,6 +874,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_8_1_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1";
@@ -958,6 +959,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1301,6 +1303,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2355,6 +2358,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -2811,6 +2815,7 @@ self: super: {
   "extensible-data" = dontDistribute super."extensible-data";
   "extensible-effects" = dontDistribute super."extensible-effects";
   "external-sort" = dontDistribute super."external-sort";
+  "extra" = doDistribute super."extra_1_4_2";
   "extract-dependencies" = dontDistribute super."extract-dependencies";
   "extractelf" = dontDistribute super."extractelf";
   "ez-couch" = dontDistribute super."ez-couch";
@@ -3090,6 +3095,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3559,6 +3565,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
@@ -4506,6 +4513,7 @@ self: super: {
   "inflist" = dontDistribute super."inflist";
   "influxdb" = dontDistribute super."influxdb";
   "informative" = dontDistribute super."informative";
+  "ini" = doDistribute super."ini_0_3_2";
   "inilist" = dontDistribute super."inilist";
   "inject" = dontDistribute super."inject";
   "inject-function" = dontDistribute super."inject-function";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
index b33d8d00e572..4e201da38c34 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
@@ -874,6 +874,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_8_1_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1";
@@ -958,6 +959,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1301,6 +1303,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2353,6 +2356,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -2808,6 +2812,7 @@ self: super: {
   "extensible-data" = dontDistribute super."extensible-data";
   "extensible-effects" = dontDistribute super."extensible-effects";
   "external-sort" = dontDistribute super."external-sort";
+  "extra" = doDistribute super."extra_1_4_2";
   "extract-dependencies" = dontDistribute super."extract-dependencies";
   "extractelf" = dontDistribute super."extractelf";
   "ez-couch" = dontDistribute super."ez-couch";
@@ -3087,6 +3092,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3555,6 +3561,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
@@ -4502,6 +4509,7 @@ self: super: {
   "inflist" = dontDistribute super."inflist";
   "influxdb" = dontDistribute super."influxdb";
   "informative" = dontDistribute super."informative";
+  "ini" = doDistribute super."ini_0_3_2";
   "inilist" = dontDistribute super."inilist";
   "inject" = dontDistribute super."inject";
   "inject-function" = dontDistribute super."inject-function";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
index 54dadd125cab..d95b6917e149 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
@@ -873,6 +873,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_8_1_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1";
@@ -957,6 +958,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1300,6 +1302,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2348,6 +2351,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -2803,6 +2807,7 @@ self: super: {
   "extensible-data" = dontDistribute super."extensible-data";
   "extensible-effects" = dontDistribute super."extensible-effects";
   "external-sort" = dontDistribute super."external-sort";
+  "extra" = doDistribute super."extra_1_4_2";
   "extract-dependencies" = dontDistribute super."extract-dependencies";
   "extractelf" = dontDistribute super."extractelf";
   "ez-couch" = dontDistribute super."ez-couch";
@@ -3082,6 +3087,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3549,6 +3555,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
@@ -4496,6 +4503,7 @@ self: super: {
   "inflist" = dontDistribute super."inflist";
   "influxdb" = dontDistribute super."influxdb";
   "informative" = dontDistribute super."informative";
+  "ini" = doDistribute super."ini_0_3_2";
   "inilist" = dontDistribute super."inilist";
   "inject" = dontDistribute super."inject";
   "inject-function" = dontDistribute super."inject-function";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
index 52a7f28c2430..64200489735d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
@@ -873,6 +873,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_8_1_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1";
@@ -957,6 +958,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1300,6 +1302,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2348,6 +2351,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -2803,6 +2807,7 @@ self: super: {
   "extensible-data" = dontDistribute super."extensible-data";
   "extensible-effects" = dontDistribute super."extensible-effects";
   "external-sort" = dontDistribute super."external-sort";
+  "extra" = doDistribute super."extra_1_4_2";
   "extract-dependencies" = dontDistribute super."extract-dependencies";
   "extractelf" = dontDistribute super."extractelf";
   "ez-couch" = dontDistribute super."ez-couch";
@@ -3082,6 +3087,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3549,6 +3555,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
@@ -4495,6 +4502,7 @@ self: super: {
   "inflist" = dontDistribute super."inflist";
   "influxdb" = dontDistribute super."influxdb";
   "informative" = dontDistribute super."informative";
+  "ini" = doDistribute super."ini_0_3_2";
   "inilist" = dontDistribute super."inilist";
   "inject" = dontDistribute super."inject";
   "inject-function" = dontDistribute super."inject-function";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.14.nix b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
index a4ea40b61bde..f16bb4416569 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
@@ -873,6 +873,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_8_1_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1";
@@ -957,6 +958,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1298,6 +1300,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2344,6 +2347,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -2795,6 +2799,7 @@ self: super: {
   "extensible-data" = dontDistribute super."extensible-data";
   "extensible-effects" = dontDistribute super."extensible-effects";
   "external-sort" = dontDistribute super."external-sort";
+  "extra" = doDistribute super."extra_1_4_2";
   "extract-dependencies" = dontDistribute super."extract-dependencies";
   "extractelf" = dontDistribute super."extractelf";
   "ez-couch" = dontDistribute super."ez-couch";
@@ -3074,6 +3079,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3541,6 +3547,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
@@ -4486,6 +4493,7 @@ self: super: {
   "inflist" = dontDistribute super."inflist";
   "influxdb" = dontDistribute super."influxdb";
   "informative" = dontDistribute super."informative";
+  "ini" = doDistribute super."ini_0_3_2";
   "inilist" = dontDistribute super."inilist";
   "inject" = dontDistribute super."inject";
   "inject-function" = dontDistribute super."inject-function";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.15.nix b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
index b50a2b8052f1..ef81b538f7aa 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
@@ -872,6 +872,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_8_1_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1";
@@ -956,6 +957,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1297,6 +1299,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2343,6 +2346,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -2794,6 +2798,7 @@ self: super: {
   "extensible-data" = dontDistribute super."extensible-data";
   "extensible-effects" = dontDistribute super."extensible-effects";
   "external-sort" = dontDistribute super."external-sort";
+  "extra" = doDistribute super."extra_1_4_2";
   "extract-dependencies" = dontDistribute super."extract-dependencies";
   "extractelf" = dontDistribute super."extractelf";
   "ez-couch" = dontDistribute super."ez-couch";
@@ -3073,6 +3078,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3539,6 +3545,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
@@ -4481,6 +4488,7 @@ self: super: {
   "inflist" = dontDistribute super."inflist";
   "influxdb" = dontDistribute super."influxdb";
   "informative" = dontDistribute super."informative";
+  "ini" = doDistribute super."ini_0_3_2";
   "inilist" = dontDistribute super."inilist";
   "inject" = dontDistribute super."inject";
   "inject-function" = dontDistribute super."inject-function";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.16.nix b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
index e9b603bd5bbe..6107d70bea98 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
@@ -871,6 +871,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_8_1_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1";
@@ -955,6 +956,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1296,6 +1298,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2341,6 +2344,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -2791,6 +2795,7 @@ self: super: {
   "extensible-data" = dontDistribute super."extensible-data";
   "extensible-effects" = dontDistribute super."extensible-effects";
   "external-sort" = dontDistribute super."external-sort";
+  "extra" = doDistribute super."extra_1_4_2";
   "extract-dependencies" = dontDistribute super."extract-dependencies";
   "extractelf" = dontDistribute super."extractelf";
   "ez-couch" = dontDistribute super."ez-couch";
@@ -3070,6 +3075,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3535,6 +3541,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
@@ -4477,6 +4484,7 @@ self: super: {
   "inflist" = dontDistribute super."inflist";
   "influxdb" = dontDistribute super."influxdb";
   "informative" = dontDistribute super."informative";
+  "ini" = doDistribute super."ini_0_3_2";
   "inilist" = dontDistribute super."inilist";
   "inject" = dontDistribute super."inject";
   "inject-function" = dontDistribute super."inject-function";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.17.nix b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
index 36c6b1130704..09c90d440592 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
@@ -870,6 +870,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_8_1_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1";
@@ -954,6 +955,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1293,6 +1295,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2335,6 +2338,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -2784,6 +2788,7 @@ self: super: {
   "extensible-data" = dontDistribute super."extensible-data";
   "extensible-effects" = dontDistribute super."extensible-effects";
   "external-sort" = dontDistribute super."external-sort";
+  "extra" = doDistribute super."extra_1_4_2";
   "extract-dependencies" = dontDistribute super."extract-dependencies";
   "extractelf" = dontDistribute super."extractelf";
   "ez-couch" = dontDistribute super."ez-couch";
@@ -3063,6 +3068,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3527,6 +3533,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
@@ -4468,6 +4475,7 @@ self: super: {
   "inflist" = dontDistribute super."inflist";
   "influxdb" = dontDistribute super."influxdb";
   "informative" = dontDistribute super."informative";
+  "ini" = doDistribute super."ini_0_3_2";
   "inilist" = dontDistribute super."inilist";
   "inject" = dontDistribute super."inject";
   "inject-function" = dontDistribute super."inject-function";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.18.nix b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
index 0338135e6d42..66c56d550d64 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
@@ -870,6 +870,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_8_1_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1";
@@ -954,6 +955,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1294,6 +1296,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2335,6 +2338,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -2784,6 +2788,7 @@ self: super: {
   "extensible-data" = dontDistribute super."extensible-data";
   "extensible-effects" = dontDistribute super."extensible-effects";
   "external-sort" = dontDistribute super."external-sort";
+  "extra" = doDistribute super."extra_1_4_2";
   "extract-dependencies" = dontDistribute super."extract-dependencies";
   "extractelf" = dontDistribute super."extractelf";
   "ez-couch" = dontDistribute super."ez-couch";
@@ -3063,6 +3068,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3524,6 +3530,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
@@ -4459,6 +4466,7 @@ self: super: {
   "inflist" = dontDistribute super."inflist";
   "influxdb" = dontDistribute super."influxdb";
   "informative" = dontDistribute super."informative";
+  "ini" = doDistribute super."ini_0_3_2";
   "inilist" = dontDistribute super."inilist";
   "inject" = dontDistribute super."inject";
   "inject-function" = dontDistribute super."inject-function";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.19.nix b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
index f675cf4ef18a..9cacb96449be 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
@@ -869,6 +869,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_8_1_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1";
@@ -953,6 +954,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1293,6 +1295,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2328,6 +2331,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -2777,6 +2781,7 @@ self: super: {
   "extensible-data" = dontDistribute super."extensible-data";
   "extensible-effects" = dontDistribute super."extensible-effects";
   "external-sort" = dontDistribute super."external-sort";
+  "extra" = doDistribute super."extra_1_4_2";
   "extract-dependencies" = dontDistribute super."extract-dependencies";
   "extractelf" = dontDistribute super."extractelf";
   "ez-couch" = dontDistribute super."ez-couch";
@@ -3056,6 +3061,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3517,6 +3523,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
@@ -4449,6 +4456,7 @@ self: super: {
   "inflist" = dontDistribute super."inflist";
   "influxdb" = dontDistribute super."influxdb";
   "informative" = dontDistribute super."informative";
+  "ini" = doDistribute super."ini_0_3_2";
   "inilist" = dontDistribute super."inilist";
   "inject" = dontDistribute super."inject";
   "inject-function" = dontDistribute super."inject-function";
@@ -5823,6 +5831,7 @@ self: super: {
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
   "pipes-cereal" = dontDistribute super."pipes-cereal";
   "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus";
+  "pipes-concurrency" = doDistribute super."pipes-concurrency_2_0_4";
   "pipes-conduit" = dontDistribute super."pipes-conduit";
   "pipes-core" = dontDistribute super."pipes-core";
   "pipes-courier" = dontDistribute super."pipes-courier";
@@ -7448,6 +7457,7 @@ self: super: {
   "turing-music" = dontDistribute super."turing-music";
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
+  "turtle" = doDistribute super."turtle_1_2_4";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
index 642160eba469..96733e42ddbf 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
@@ -879,6 +879,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_8_1_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1";
@@ -963,6 +964,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1310,6 +1312,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2380,6 +2383,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -3135,6 +3139,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3606,6 +3611,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.20.nix b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
index 235f301fc191..18f0928f74e3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
@@ -868,6 +868,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_8_1_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1";
@@ -951,6 +952,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1290,6 +1292,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2323,6 +2326,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -2772,6 +2776,7 @@ self: super: {
   "extensible-data" = dontDistribute super."extensible-data";
   "extensible-effects" = dontDistribute super."extensible-effects";
   "external-sort" = dontDistribute super."external-sort";
+  "extra" = doDistribute super."extra_1_4_2";
   "extract-dependencies" = dontDistribute super."extract-dependencies";
   "extractelf" = dontDistribute super."extractelf";
   "ez-couch" = dontDistribute super."ez-couch";
@@ -3051,6 +3056,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3512,6 +3518,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
@@ -4443,6 +4450,7 @@ self: super: {
   "inflist" = dontDistribute super."inflist";
   "influxdb" = dontDistribute super."influxdb";
   "informative" = dontDistribute super."informative";
+  "ini" = doDistribute super."ini_0_3_2";
   "inilist" = dontDistribute super."inilist";
   "inject" = dontDistribute super."inject";
   "inject-function" = dontDistribute super."inject-function";
@@ -5815,6 +5823,7 @@ self: super: {
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
   "pipes-cereal" = dontDistribute super."pipes-cereal";
   "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus";
+  "pipes-concurrency" = doDistribute super."pipes-concurrency_2_0_4";
   "pipes-conduit" = dontDistribute super."pipes-conduit";
   "pipes-core" = dontDistribute super."pipes-core";
   "pipes-courier" = dontDistribute super."pipes-courier";
@@ -7436,6 +7445,7 @@ self: super: {
   "turing-music" = dontDistribute super."turing-music";
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
+  "turtle" = doDistribute super."turtle_1_2_4";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.21.nix b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
index 26b4ec38f29b..2ceacb6ee4e4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
@@ -867,6 +867,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_8_1_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1";
@@ -950,6 +951,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1289,6 +1291,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2318,6 +2321,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -2767,6 +2771,7 @@ self: super: {
   "extensible-data" = dontDistribute super."extensible-data";
   "extensible-effects" = dontDistribute super."extensible-effects";
   "external-sort" = dontDistribute super."external-sort";
+  "extra" = doDistribute super."extra_1_4_2";
   "extract-dependencies" = dontDistribute super."extract-dependencies";
   "extractelf" = dontDistribute super."extractelf";
   "ez-couch" = dontDistribute super."ez-couch";
@@ -3043,6 +3048,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3504,6 +3510,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
@@ -4431,7 +4438,6 @@ self: super: {
   "inflist" = dontDistribute super."inflist";
   "influxdb" = dontDistribute super."influxdb";
   "informative" = dontDistribute super."informative";
-  "ini" = doDistribute super."ini_0_3_3";
   "inilist" = dontDistribute super."inilist";
   "inject" = dontDistribute super."inject";
   "inject-function" = dontDistribute super."inject-function";
@@ -5801,7 +5807,6 @@ self: super: {
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
   "pipes-cereal" = dontDistribute super."pipes-cereal";
   "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus";
-  "pipes-concurrency" = doDistribute super."pipes-concurrency_2_0_5";
   "pipes-conduit" = dontDistribute super."pipes-conduit";
   "pipes-core" = dontDistribute super."pipes-core";
   "pipes-courier" = dontDistribute super."pipes-courier";
@@ -7411,7 +7416,6 @@ self: super: {
   "turing-music" = dontDistribute super."turing-music";
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
-  "turtle" = doDistribute super."turtle_1_2_5";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
index 350c15183447..ec21faca0894 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
@@ -879,6 +879,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_8_1_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1";
@@ -963,6 +964,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1309,6 +1311,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2376,6 +2379,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -3130,6 +3134,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3601,6 +3606,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
index a99d3e7bd44c..82abaf317c37 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
@@ -879,6 +879,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_8_1_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1";
@@ -963,6 +964,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1309,6 +1311,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2375,6 +2378,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -3129,6 +3133,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3600,6 +3605,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
index ddaa62371983..c2308392f3d8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
@@ -879,6 +879,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_8_1_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1";
@@ -963,6 +964,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1308,6 +1310,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2372,6 +2375,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -3124,6 +3128,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3595,6 +3600,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
@@ -4545,6 +4551,7 @@ self: super: {
   "inflist" = dontDistribute super."inflist";
   "influxdb" = dontDistribute super."influxdb";
   "informative" = dontDistribute super."informative";
+  "ini" = doDistribute super."ini_0_3_2";
   "inilist" = dontDistribute super."inilist";
   "inject" = dontDistribute super."inject";
   "inject-function" = dontDistribute super."inject-function";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
index 97b18eac90a0..f1fb95a4a202 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
@@ -879,6 +879,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_8_1_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1";
@@ -963,6 +964,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1307,6 +1309,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2370,6 +2373,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -2838,6 +2842,7 @@ self: super: {
   "extensible-data" = dontDistribute super."extensible-data";
   "extensible-effects" = dontDistribute super."extensible-effects";
   "external-sort" = dontDistribute super."external-sort";
+  "extra" = doDistribute super."extra_1_4_2";
   "extract-dependencies" = dontDistribute super."extract-dependencies";
   "extractelf" = dontDistribute super."extractelf";
   "ez-couch" = dontDistribute super."ez-couch";
@@ -3119,6 +3124,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3588,6 +3594,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
@@ -4538,6 +4545,7 @@ self: super: {
   "inflist" = dontDistribute super."inflist";
   "influxdb" = dontDistribute super."influxdb";
   "informative" = dontDistribute super."informative";
+  "ini" = doDistribute super."ini_0_3_2";
   "inilist" = dontDistribute super."inilist";
   "inject" = dontDistribute super."inject";
   "inject-function" = dontDistribute super."inject-function";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
index fc34b8c560cd..a57561a9311c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
@@ -879,6 +879,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_8_1_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1";
@@ -963,6 +964,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1306,6 +1308,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2366,6 +2369,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -2833,6 +2837,7 @@ self: super: {
   "extensible-data" = dontDistribute super."extensible-data";
   "extensible-effects" = dontDistribute super."extensible-effects";
   "external-sort" = dontDistribute super."external-sort";
+  "extra" = doDistribute super."extra_1_4_2";
   "extract-dependencies" = dontDistribute super."extract-dependencies";
   "extractelf" = dontDistribute super."extractelf";
   "ez-couch" = dontDistribute super."ez-couch";
@@ -3113,6 +3118,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3582,6 +3588,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
@@ -4530,6 +4537,7 @@ self: super: {
   "inflist" = dontDistribute super."inflist";
   "influxdb" = dontDistribute super."influxdb";
   "informative" = dontDistribute super."informative";
+  "ini" = doDistribute super."ini_0_3_2";
   "inilist" = dontDistribute super."inilist";
   "inject" = dontDistribute super."inject";
   "inject-function" = dontDistribute super."inject-function";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
index 456cad5611d2..a41d9423a34e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
@@ -879,6 +879,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_8_1_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1";
@@ -963,6 +964,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1306,6 +1308,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2363,6 +2366,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -2825,6 +2829,7 @@ self: super: {
   "extensible-data" = dontDistribute super."extensible-data";
   "extensible-effects" = dontDistribute super."extensible-effects";
   "external-sort" = dontDistribute super."external-sort";
+  "extra" = doDistribute super."extra_1_4_2";
   "extract-dependencies" = dontDistribute super."extract-dependencies";
   "extractelf" = dontDistribute super."extractelf";
   "ez-couch" = dontDistribute super."ez-couch";
@@ -3105,6 +3110,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3574,6 +3580,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
@@ -4522,6 +4529,7 @@ self: super: {
   "inflist" = dontDistribute super."inflist";
   "influxdb" = dontDistribute super."influxdb";
   "informative" = dontDistribute super."informative";
+  "ini" = doDistribute super."ini_0_3_2";
   "inilist" = dontDistribute super."inilist";
   "inject" = dontDistribute super."inject";
   "inject-function" = dontDistribute super."inject-function";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
index df3387872670..5ea1c8955076 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
@@ -877,6 +877,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock" = doDistribute super."Spock_0_8_1_0";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1";
@@ -961,6 +962,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
   "WAVE" = dontDistribute super."WAVE";
@@ -1304,6 +1306,7 @@ self: super: {
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
   "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2359,6 +2362,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -2818,6 +2822,7 @@ self: super: {
   "extensible-data" = dontDistribute super."extensible-data";
   "extensible-effects" = dontDistribute super."extensible-effects";
   "external-sort" = dontDistribute super."external-sort";
+  "extra" = doDistribute super."extra_1_4_2";
   "extract-dependencies" = dontDistribute super."extract-dependencies";
   "extractelf" = dontDistribute super."extractelf";
   "ez-couch" = dontDistribute super."ez-couch";
@@ -3097,6 +3102,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3566,6 +3572,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
@@ -4514,6 +4521,7 @@ self: super: {
   "inflist" = dontDistribute super."inflist";
   "influxdb" = dontDistribute super."influxdb";
   "informative" = dontDistribute super."informative";
+  "ini" = doDistribute super."ini_0_3_2";
   "inilist" = dontDistribute super."inilist";
   "inject" = dontDistribute super."inject";
   "inject-function" = dontDistribute super."inject-function";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.0.nix b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
index 0bcf67fb7013..edf6637ee053 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
@@ -457,6 +457,7 @@ self: super: {
   "HaLeX" = dontDistribute super."HaLeX";
   "HaMinitel" = dontDistribute super."HaMinitel";
   "HaPy" = dontDistribute super."HaPy";
+  "HaRe" = doDistribute super."HaRe_0_8_2_1";
   "HaTeX-meta" = dontDistribute super."HaTeX-meta";
   "HaTeX-qq" = dontDistribute super."HaTeX-qq";
   "HaVSA" = dontDistribute super."HaVSA";
@@ -840,6 +841,7 @@ self: super: {
   "SpaceInvaders" = dontDistribute super."SpaceInvaders";
   "SpacePrivateers" = dontDistribute super."SpacePrivateers";
   "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
   "Spock-auth" = dontDistribute super."Spock-auth";
   "SpreadsheetML" = dontDistribute super."SpreadsheetML";
   "Sprig" = dontDistribute super."Sprig";
@@ -919,6 +921,7 @@ self: super: {
   "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
   "Vec-Transform" = dontDistribute super."Vec-Transform";
   "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
@@ -1046,6 +1049,7 @@ self: super: {
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
   "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_3_1";
   "adaptive-containers" = dontDistribute super."adaptive-containers";
   "adaptive-tuple" = dontDistribute super."adaptive-tuple";
   "adb" = dontDistribute super."adb";
@@ -1085,6 +1089,7 @@ self: super: {
   "air-spec" = dontDistribute super."air-spec";
   "air-th" = dontDistribute super."air-th";
   "airbrake" = dontDistribute super."airbrake";
+  "airship" = doDistribute super."airship_0_4_1_0";
   "aivika" = dontDistribute super."aivika";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
@@ -1182,6 +1187,7 @@ self: super: {
   "archnews" = dontDistribute super."archnews";
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
+  "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
   "ariadne" = dontDistribute super."ariadne";
@@ -2151,6 +2157,7 @@ self: super: {
   "datetime-sb" = dontDistribute super."datetime-sb";
   "dawdle" = dontDistribute super."dawdle";
   "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
@@ -2308,6 +2315,8 @@ self: super: {
   "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "diversity" = doDistribute super."diversity_0_7_1_1";
+  "dixi" = doDistribute super."dixi_0_6_0_2";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dnscache" = dontDistribute super."dnscache";
@@ -2569,6 +2578,7 @@ self: super: {
   "extensible-data" = dontDistribute super."extensible-data";
   "extensible-effects" = dontDistribute super."extensible-effects";
   "external-sort" = dontDistribute super."external-sort";
+  "extra" = doDistribute super."extra_1_4_2";
   "extractelf" = dontDistribute super."extractelf";
   "ez-couch" = dontDistribute super."ez-couch";
   "faceted" = dontDistribute super."faceted";
@@ -2832,6 +2842,7 @@ self: super: {
   "gdiff" = dontDistribute super."gdiff";
   "gdiff-ig" = dontDistribute super."gdiff-ig";
   "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
   "gearbox" = dontDistribute super."gearbox";
   "geek" = dontDistribute super."geek";
   "geek-server" = dontDistribute super."geek-server";
@@ -3272,6 +3283,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
   "hails" = dontDistribute super."hails";
@@ -4138,6 +4150,7 @@ self: super: {
   "inflist" = dontDistribute super."inflist";
   "influxdb" = dontDistribute super."influxdb";
   "informative" = dontDistribute super."informative";
+  "ini" = doDistribute super."ini_0_3_2";
   "inilist" = dontDistribute super."inilist";
   "inject" = dontDistribute super."inject";
   "inject-function" = dontDistribute super."inject-function";
@@ -4789,9 +4802,14 @@ self: super: {
   "mi" = dontDistribute super."mi";
   "microbench" = dontDistribute super."microbench";
   "microformats2-types" = dontDistribute super."microformats2-types";
+  "microlens" = doDistribute super."microlens_0_3_5_1";
   "microlens-aeson" = dontDistribute super."microlens-aeson";
   "microlens-contra" = dontDistribute super."microlens-contra";
   "microlens-each" = dontDistribute super."microlens-each";
+  "microlens-ghc" = doDistribute super."microlens-ghc_0_3_1_0";
+  "microlens-mtl" = doDistribute super."microlens-mtl_0_1_6_0";
+  "microlens-platform" = doDistribute super."microlens-platform_0_1_7_0";
+  "microlens-th" = doDistribute super."microlens-th_0_2_2_0";
   "microtimer" = dontDistribute super."microtimer";
   "mida" = dontDistribute super."mida";
   "midi" = dontDistribute super."midi";
@@ -5424,6 +5442,7 @@ self: super: {
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
   "pipes-cereal" = dontDistribute super."pipes-cereal";
   "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus";
+  "pipes-concurrency" = doDistribute super."pipes-concurrency_2_0_4";
   "pipes-conduit" = dontDistribute super."pipes-conduit";
   "pipes-core" = dontDistribute super."pipes-core";
   "pipes-courier" = dontDistribute super."pipes-courier";
@@ -5804,6 +5823,7 @@ self: super: {
   "references" = dontDistribute super."references";
   "refh" = dontDistribute super."refh";
   "refined" = dontDistribute super."refined";
+  "reflection" = doDistribute super."reflection_2_1";
   "reflection-extras" = dontDistribute super."reflection-extras";
   "reflection-without-remorse" = dontDistribute super."reflection-without-remorse";
   "reflex" = dontDistribute super."reflex";
@@ -6924,6 +6944,7 @@ self: super: {
   "turing-music" = dontDistribute super."turing-music";
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
+  "turtle" = doDistribute super."turtle_1_2_4";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 2db6458cac6b..385a24d5a237 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -9243,15 +9243,15 @@ self: {
      }) {};
 
   "HXQ" = callPackage
-    ({ mkDerivation, array, base, haskeline, haskell98, HTTP, mtl
-     , regex-base, regex-compat, template-haskell
+    ({ mkDerivation, array, base, haskeline, HTTP, mtl, regex-base
+     , regex-compat, template-haskell
      }:
      mkDerivation {
        pname = "HXQ";
-       version = "0.19.0";
-       sha256 = "f41cf8cfa3d9cc1c87fd3843e235e2b1155c0494751edc35dfc63b8bbce254cc";
+       version = "0.20.1";
+       sha256 = "b7c385aff2e6f1c048eeffcae86b08e7ea5d432a9ca5975e6138c090d45943ad";
        libraryHaskellDepends = [
-         array base haskeline haskell98 HTTP mtl regex-base regex-compat
+         array base haskeline HTTP mtl regex-base regex-compat
          template-haskell
        ];
        homepage = "http://lambda.uta.edu/HXQ/";
@@ -9300,7 +9300,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "HaRe" = callPackage
+  "HaRe_0_8_2_1" = callPackage
     ({ mkDerivation, array, base, Cabal, cabal-helper, containers
      , deepseq, Diff, directory, filepath, ghc, ghc-exactprint, ghc-mod
      , ghc-paths, ghc-prim, ghc-syb-utils, hslogger, hspec, HUnit
@@ -9344,6 +9344,50 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "HaRe" = callPackage
+    ({ mkDerivation, array, base, Cabal, cabal-helper, containers
+     , deepseq, Diff, directory, filepath, ghc, ghc-exactprint, ghc-mod
+     , ghc-paths, ghc-prim, ghc-syb-utils, hslogger, hspec, HUnit
+     , monad-control, monoid-extras, mtl, old-time, parsec, pretty
+     , process, QuickCheck, rosezipper, semigroups, silently
+     , Strafunski-StrategyLib, stringbuilder, syb, syz, time
+     , transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "HaRe";
+       version = "0.8.2.2";
+       sha256 = "27027032f71c8c9f24f64b22655012a3306be60526ee2abff191670cc75d817b";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base Cabal cabal-helper containers directory filepath ghc
+         ghc-exactprint ghc-mod ghc-paths ghc-prim ghc-syb-utils hslogger
+         monad-control monoid-extras mtl old-time pretty rosezipper
+         semigroups Strafunski-StrategyLib syb syz time transformers
+         transformers-base
+       ];
+       executableHaskellDepends = [
+         array base Cabal cabal-helper containers directory filepath ghc
+         ghc-exactprint ghc-mod ghc-paths ghc-prim ghc-syb-utils hslogger
+         monad-control monoid-extras mtl old-time parsec pretty rosezipper
+         semigroups Strafunski-StrategyLib syb syz time transformers
+         transformers-base
+       ];
+       testHaskellDepends = [
+         base Cabal cabal-helper containers deepseq Diff directory filepath
+         ghc ghc-exactprint ghc-mod ghc-paths ghc-prim ghc-syb-utils
+         hslogger hspec HUnit monad-control monoid-extras mtl old-time
+         process QuickCheck rosezipper semigroups silently
+         Strafunski-StrategyLib stringbuilder syb syz time transformers
+         transformers-base
+       ];
+       doCheck = false;
+       homepage = "https://github.com/RefactoringTools/HaRe/wiki";
+       description = "the Haskell Refactorer";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "HaTeX_3_15_0_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, matrix, parsec
      , QuickCheck, tasty, tasty-quickcheck, text, transformers
@@ -10302,15 +10346,15 @@ self: {
      }:
      mkDerivation {
        pname = "Hoed";
-       version = "0.3.3";
-       sha256 = "2ae2eed3c528a0c8ae9a797cddb66d64ddb5443d43181b00c90ab2ee9e0ef88d";
+       version = "0.3.4";
+       sha256 = "c82359deccc4de43e1e5215f2c28f2fc659e701d9e18bad70f9f5c54853e5f90";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          array base containers directory filepath FPretty libgraph mtl
          process RBTree regex-posix template-haskell threepenny-gui
        ];
-       homepage = "http://maartenfaddegon.nl";
+       homepage = "https://wiki.haskell.org/Hoed";
        description = "Lightweight algorithmic debugging";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -17498,6 +17542,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Spintax" = callPackage
+    ({ mkDerivation, attoparsec, base, extra, mwc-random, text }:
+     mkDerivation {
+       pname = "Spintax";
+       version = "0.1.0.0";
+       sha256 = "d9d115f107f3b9a8e44a605d4b44727ff385974f3fd2d1d5b5a40a380467feec";
+       libraryHaskellDepends = [ attoparsec base extra mwc-random text ];
+       homepage = "https://github.com/MichelBoucey/spintax";
+       description = "Random text generation based on spintax";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "Spock_0_7_5_1" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, blaze-html
      , bytestring, case-insensitive, containers, digestive-functors
@@ -19120,6 +19176,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Verba" = callPackage
+    ({ mkDerivation, base, containers, matrix }:
+     mkDerivation {
+       pname = "Verba";
+       version = "0.1.0.0";
+       sha256 = "28d93cc4f585229cb8d666863b74910c81e176fb2281d088f9cdd9de553d619e";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base containers matrix ];
+       description = "A solver for the WordBrain game";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "ViennaRNA-bindings" = callPackage
     ({ mkDerivation, array, base, c2hs }:
      mkDerivation {
@@ -21688,7 +21757,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ad" = callPackage
+  "ad_4_3_1" = callPackage
     ({ mkDerivation, array, base, comonad, containers, data-reify
      , directory, doctest, erf, filepath, free, nats, reflection
      , transformers
@@ -21705,6 +21774,26 @@ self: {
        homepage = "http://github.com/ekmett/ad";
        description = "Automatic Differentiation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "ad" = callPackage
+    ({ mkDerivation, array, base, comonad, containers, data-reify
+     , directory, doctest, erf, filepath, free, nats, reflection
+     , transformers
+     }:
+     mkDerivation {
+       pname = "ad";
+       version = "4.3.2";
+       sha256 = "04ed3648d14b2af0a385abfe7819f3704c499b43a1dd48ce5858f020b873d5ed";
+       libraryHaskellDepends = [
+         array base comonad containers data-reify erf free nats reflection
+         transformers
+       ];
+       testHaskellDepends = [ base directory doctest filepath ];
+       homepage = "http://github.com/ekmett/ad";
+       description = "Automatic Differentiation";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "adaptive-containers" = callPackage
@@ -22907,7 +22996,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "airship" = callPackage
+  "airship_0_4_1_0" = callPackage
     ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder
      , bytestring, bytestring-trie, case-insensitive, cryptohash
      , directory, either, filepath, http-date, http-media, http-types
@@ -22935,6 +23024,37 @@ self: {
        homepage = "https://github.com/helium/airship/";
        description = "A Webmachine-inspired HTTP library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "airship" = callPackage
+    ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder
+     , bytestring, bytestring-trie, case-insensitive, cryptohash
+     , directory, either, filepath, http-date, http-media, http-types
+     , lifted-base, microlens, mime-types, mmorph, monad-control, mtl
+     , network, old-locale, random, tasty, tasty-hunit, tasty-quickcheck
+     , text, time, transformers, transformers-base, unix
+     , unordered-containers, wai, wai-extra
+     }:
+     mkDerivation {
+       pname = "airship";
+       version = "0.4.2.0";
+       sha256 = "d8638e31ee1087c33e6592488d8dc33642ba3d3a14f78f3a077a4dc27bbd1597";
+       libraryHaskellDepends = [
+         attoparsec base base64-bytestring blaze-builder bytestring
+         bytestring-trie case-insensitive cryptohash directory either
+         filepath http-date http-media http-types lifted-base microlens
+         mime-types mmorph monad-control mtl network old-locale random text
+         time transformers transformers-base unix unordered-containers wai
+         wai-extra
+       ];
+       testHaskellDepends = [
+         base bytestring tasty tasty-hunit tasty-quickcheck text
+         transformers wai
+       ];
+       homepage = "https://github.com/helium/airship/";
+       description = "A Webmachine-inspired HTTP library";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "aivika" = callPackage
@@ -23229,6 +23349,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "alex_3_1_7" = callPackage
+    ({ mkDerivation, array, base, containers, directory, happy, process
+     , QuickCheck
+     }:
+     mkDerivation {
+       pname = "alex";
+       version = "3.1.7";
+       sha256 = "89a1a13da6ccbeb006488d9574382e891cf7c0567752b330cc8616d748bf28d1";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         array base containers directory QuickCheck
+       ];
+       executableToolDepends = [ happy ];
+       testHaskellDepends = [ base process ];
+       homepage = "http://www.haskell.org/alex/";
+       description = "Alex is a tool for generating lexical analysers in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "alex-meta" = callPackage
     ({ mkDerivation, alex, array, base, containers, happy
      , haskell-src-meta, QuickCheck, template-haskell
@@ -29035,6 +29176,18 @@ self: {
        license = stdenv.lib.licenses.isc;
      }) {};
 
+  "argon2" = callPackage
+    ({ mkDerivation, base, bytestring, text, transformers }:
+     mkDerivation {
+       pname = "argon2";
+       version = "1.0.0";
+       sha256 = "29691e8019104b724466766b5031335e9dea185a84b886e2f9d895f4fe01eae3";
+       libraryHaskellDepends = [ base bytestring text transformers ];
+       homepage = "https://github.com/ocharles/argon2.git";
+       description = "Haskell bindings to libargon2 - the reference implementation of the Argon2 password-hashing function";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "argparser" = callPackage
     ({ mkDerivation, base, containers, HTF, HUnit }:
      mkDerivation {
@@ -48762,8 +48915,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "concurrent-utilities";
-       version = "0.1.0.0";
-       sha256 = "78036871043af2e00342cc4c31d40664433c57fb1c9ccd50b8d680c24ae59e40";
+       version = "0.2.0.0";
+       sha256 = "d108b831e0631c1d3d9b5e2dbfb335b63997206384b7a069978c95a2a1af918a";
        libraryHaskellDepends = [ base ];
        homepage = "-";
        description = "More utilities and broad-used datastructures for concurrency";
@@ -49089,8 +49242,8 @@ self: {
      }:
      mkDerivation {
        pname = "conduit-audio-lame";
-       version = "0.1.0.1";
-       sha256 = "03e81140f67a773dcc383536eafedbc6cd1ee42531c57fdb5b9f4528c88c5abe";
+       version = "0.1.1";
+       sha256 = "aac3760ea6325219903e0726b4a8e0b9662699ed34a77a0d2a09a5bef67c8d7f";
        libraryHaskellDepends = [
          base bytestring conduit conduit-audio resourcet transformers vector
        ];
@@ -49127,10 +49280,8 @@ self: {
      }:
      mkDerivation {
        pname = "conduit-audio-sndfile";
-       version = "0.1";
-       sha256 = "6d35ed7b38479ce2b6946d661abe11aa69c1db6821b14b52618e273604fb1b6c";
-       revision = "2";
-       editedCabalFile = "2a067b3ffad200da8d993ba8c57f53580b3505d912b9c9dfb160674e642f749a";
+       version = "0.1.1";
+       sha256 = "2c4288d60fa0ea8a629ab3e3e77ee813e849f4454b006ab75ebc33bf707be4cc";
        libraryHaskellDepends = [
          base conduit conduit-audio hsndfile hsndfile-vector resourcet
          transformers
@@ -56260,6 +56411,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dawg-ord" = callPackage
+    ({ mkDerivation, base, binary, containers, mtl, transformers
+     , vector
+     }:
+     mkDerivation {
+       pname = "dawg-ord";
+       version = "0.2";
+       sha256 = "e64f7c448b694073c2dc70f18cad77e5fbcf46055432cc9c391532373f05d267";
+       libraryHaskellDepends = [
+         base binary containers mtl transformers vector
+       ];
+       homepage = "https://github.com/kawu/dawg-ord";
+       description = "Directed acyclic word graphs";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "dbcleaner" = callPackage
     ({ mkDerivation, base, hspec, postgresql-simple, text }:
      mkDerivation {
@@ -61970,7 +62137,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "diversity" = callPackage
+  "diversity_0_7_1_1" = callPackage
     ({ mkDerivation, base, containers, data-ordlist, fasta
      , math-functions, MonadRandom, optparse-applicative, parsec, pipes
      , random-shuffle, scientific, split
@@ -61991,9 +62158,33 @@ self: {
        homepage = "https://github.com/GregorySchwartz/diversity";
        description = "Return the diversity at each position by default for all sequences in a fasta file";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "dixi" = callPackage
+  "diversity" = callPackage
+    ({ mkDerivation, base, containers, data-ordlist, fasta
+     , math-functions, MonadRandom, optparse-applicative, parsec, pipes
+     , random-shuffle, scientific, split
+     }:
+     mkDerivation {
+       pname = "diversity";
+       version = "0.8.0.0";
+       sha256 = "0ebba59c35fdc1b1fe54255fe18b7d1f808b3750cc6b2a5425456b622277e51d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers data-ordlist fasta math-functions MonadRandom
+         parsec random-shuffle scientific split
+       ];
+       executableHaskellDepends = [
+         base containers fasta optparse-applicative pipes
+       ];
+       homepage = "https://github.com/GregorySchwartz/diversity";
+       description = "Quantify the diversity of a population";
+       license = stdenv.lib.licenses.gpl2;
+     }) {};
+
+  "dixi_0_6_0_2" = callPackage
     ({ mkDerivation, acid-state, aeson, aeson-pretty, attoparsec, base
      , blaze-html, blaze-markup, bytestring, composition-tree
      , containers, data-default, directory, either, filepath, heredoc
@@ -62026,9 +62217,10 @@ self: {
        homepage = "https://github.com/liamoc/dixi";
        description = "A wiki implemented with a firm theoretical foundation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "dixi_0_6_0_3" = callPackage
+  "dixi" = callPackage
     ({ mkDerivation, acid-state, aeson, aeson-pretty, attoparsec, base
      , blaze-html, blaze-markup, bytestring, composition-tree
      , containers, data-default, directory, either, filepath, heredoc
@@ -62061,7 +62253,6 @@ self: {
        homepage = "https://github.com/liamoc/dixi";
        description = "A wiki implemented with a firm theoretical foundation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "djinn" = callPackage
@@ -67572,14 +67763,14 @@ self: {
 
   "eventloop" = callPackage
     ({ mkDerivation, aeson, base, bytestring, concurrent-utilities
-     , network, suspend, text, timers, websockets
+     , network, stm, suspend, text, timers, websockets
      }:
      mkDerivation {
        pname = "eventloop";
-       version = "0.5.1.0";
-       sha256 = "512651a08b3677d68854c9a3a2dd723ec8a9b6075924ae7f33019d3d1bbfb7d8";
+       version = "0.6.0.0";
+       sha256 = "2ec1e143de18418e3c031df78965b27710fd6195c19d348f959393d0ea054d6c";
        libraryHaskellDepends = [
-         aeson base bytestring concurrent-utilities network suspend text
+         aeson base bytestring concurrent-utilities network stm suspend text
          timers websockets
        ];
        jailbreak = true;
@@ -68611,7 +68802,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "extra" = callPackage
+  "extra_1_4_2" = callPackage
     ({ mkDerivation, base, directory, filepath, process, QuickCheck
      , time, unix
      }:
@@ -68628,6 +68819,26 @@ self: {
        homepage = "https://github.com/ndmitchell/extra#readme";
        description = "Extra functions I use";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "extra" = callPackage
+    ({ mkDerivation, base, directory, filepath, process, QuickCheck
+     , time, unix
+     }:
+     mkDerivation {
+       pname = "extra";
+       version = "1.4.3";
+       sha256 = "905325626869958eeb1660469df79d75165f932b2f8b6e80798ebec8c570e1f8";
+       libraryHaskellDepends = [
+         base directory filepath process time unix
+       ];
+       testHaskellDepends = [
+         base directory filepath QuickCheck time unix
+       ];
+       homepage = "https://github.com/ndmitchell/extra#readme";
+       description = "Extra functions I use";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "extract-dependencies" = callPackage
@@ -70271,6 +70482,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "feed_0_3_11_0" = callPackage
+    ({ mkDerivation, base, HUnit, old-locale, old-time, test-framework
+     , test-framework-hunit, time, time-locale-compat, utf8-string, xml
+     }:
+     mkDerivation {
+       pname = "feed";
+       version = "0.3.11.0";
+       sha256 = "39ca3bd23d4ff7d6b4ce2129ac4453ad789c9454ddd7c1629451933e1eb3f884";
+       libraryHaskellDepends = [
+         base old-locale old-time time time-locale-compat utf8-string xml
+       ];
+       testHaskellDepends = [
+         base HUnit old-locale old-time test-framework test-framework-hunit
+         time time-locale-compat utf8-string xml
+       ];
+       homepage = "https://github.com/bergmark/feed";
+       description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "feed-cli" = callPackage
     ({ mkDerivation, base, directory, feed, old-locale, old-time, time
      , xml
@@ -75453,6 +75685,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "gdo" = callPackage
+    ({ mkDerivation, base, bytestring, containers, cryptohash
+     , directory, filepath, process, transformers
+     }:
+     mkDerivation {
+       pname = "gdo";
+       version = "0.1.0";
+       sha256 = "762ef322a3702b0ae67cdfa80b56088ab988b3067fcf11255ec434d74152b0fc";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bytestring containers cryptohash directory filepath process
+         transformers
+       ];
+       description = "recursive atomic build system";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "gearbox" = callPackage
     ({ mkDerivation, base, GLUT, OpenGLRaw, Vec }:
      mkDerivation {
@@ -85880,6 +86130,8 @@ self: {
        pname = "haddocset";
        version = "0.4.1";
        sha256 = "b2e17cb5fc695b28cb036e524e1f58fce30953cf4f3de6fdac88e61142ae9c3e";
+       revision = "1";
+       editedCabalFile = "8d1369b8ba3da5fcb6661f5fc34ec23de02b79c96ed268f0db946a9ff8b5951b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -85887,7 +86139,6 @@ self: {
          haddock-api http-types mtl optparse-applicative process resourcet
          sqlite-simple tagsoup text transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/philopon/haddocset";
        description = "Generate docset of Dash by Haddock haskell documentation tool";
        license = stdenv.lib.licenses.bsd3;
@@ -86020,6 +86271,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "haiji" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, data-default, doctest
+     , filepath, mtl, process-extras, scientific, tagged, tasty
+     , tasty-hunit, tasty-th, template-haskell, text, transformers
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "haiji";
+       version = "0.1.0.0";
+       sha256 = "cb67c5869e5c389808379e681cdd8549ccc2842dba082ed2dbd18bed4a1f7bb8";
+       libraryHaskellDepends = [
+         aeson attoparsec base data-default mtl scientific tagged
+         template-haskell text transformers unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base data-default doctest filepath process-extras tasty
+         tasty-hunit tasty-th text
+       ];
+       description = "A typed template engine, subset of jinja2";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hailgun" = callPackage
     ({ mkDerivation, aeson, base, bytestring, email-validate
      , exceptions, filepath, http-client, http-client-tls, http-types
@@ -93712,6 +93985,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hedis_0_6_10" = callPackage
+    ({ mkDerivation, attoparsec, base, BoundedChan, bytestring
+     , bytestring-lexing, HUnit, mtl, network, resource-pool
+     , test-framework, test-framework-hunit, time, vector
+     }:
+     mkDerivation {
+       pname = "hedis";
+       version = "0.6.10";
+       sha256 = "31974bfd8e891a4b54a444dcc86dfdac83875e0c3c5933648884230db72a895d";
+       libraryHaskellDepends = [
+         attoparsec base BoundedChan bytestring bytestring-lexing mtl
+         network resource-pool time vector
+       ];
+       testHaskellDepends = [
+         base bytestring HUnit mtl test-framework test-framework-hunit time
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/informatikr/hedis";
+       description = "Client library for the Redis datastore: supports full command set, pipelining";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hedis-config" = callPackage
     ({ mkDerivation, aeson, base, hedis, scientific, text, time }:
      mkDerivation {
@@ -101075,8 +101371,8 @@ self: {
      }:
      mkDerivation {
        pname = "hpygments";
-       version = "0.1.3";
-       sha256 = "8a628ac6c56dc77f1af1182622335d1dff438a23115c0d2ffdd693b4a8f669c1";
+       version = "0.2.0";
+       sha256 = "92c55c9217b261fd9bbd041acc0907234740c49e3b304d31ea54c64df5dc2c38";
        libraryHaskellDepends = [
          aeson base bytestring process process-extras
        ];
@@ -101214,8 +101510,8 @@ self: {
      }:
      mkDerivation {
        pname = "hruby";
-       version = "0.3.1.6";
-       sha256 = "f1ca9df8c55a7b97749d1252ccb236d93432d125a55a2b4b26f5812f86dc22a8";
+       version = "0.3.2";
+       sha256 = "bac4446634deb4acb91217b016c2be04dc8006df7ba4245c2c03dd686bf64fd8";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring scientific stm text
          unordered-containers vector
@@ -101224,7 +101520,6 @@ self: {
        testHaskellDepends = [
          aeson attoparsec base QuickCheck text vector
        ];
-       jailbreak = true;
        description = "Embed a Ruby intepreter in your Haskell program !";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
@@ -110771,6 +111066,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ieee754_0_7_8" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "ieee754";
+       version = "0.7.8";
+       sha256 = "de4aefce42d903a3016cba4c7ebfc70d4fa0a76f8c04014c7eb3545b9ab56eff";
+       libraryHaskellDepends = [ base ];
+       homepage = "http://github.com/patperry/hs-ieee754";
+       description = "Utilities for dealing with IEEE floating point numbers";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ieee754-parser" = callPackage
     ({ mkDerivation, base, binary, bytestring }:
      mkDerivation {
@@ -111355,10 +111663,8 @@ self: {
      }:
      mkDerivation {
        pname = "imagemagick";
-       version = "0.0.3.5";
-       sha256 = "b8d6a047bbd73bebee5d06e32625a879359256de17539e657121f7cb0dea956f";
-       revision = "1";
-       editedCabalFile = "9666a02ba8aef32515f97734c86453b3b9759c46c6a9306be9f20dbdb6b98203";
+       version = "0.0.3.7";
+       sha256 = "e33b0437468e785465852e244c0ec5a1dcebb989d7873e3ddec47167a1fec0f7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -112247,7 +112553,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ini" = callPackage
+  "ini_0_3_2" = callPackage
     ({ mkDerivation, attoparsec, base, text, unordered-containers }:
      mkDerivation {
        pname = "ini";
@@ -112259,9 +112565,10 @@ self: {
        homepage = "http://github.com/chrisdone/ini";
        description = "Quick and easy configuration files in the INI format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ini_0_3_3" = callPackage
+  "ini" = callPackage
     ({ mkDerivation, attoparsec, base, text, unordered-containers }:
      mkDerivation {
        pname = "ini";
@@ -112273,6 +112580,20 @@ self: {
        homepage = "http://github.com/chrisdone/ini";
        description = "Quick and easy configuration files in the INI format";
        license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "ini_0_3_4" = callPackage
+    ({ mkDerivation, attoparsec, base, text, unordered-containers }:
+     mkDerivation {
+       pname = "ini";
+       version = "0.3.4";
+       sha256 = "98427ece1d1f361df76e59f2d22863b53756327d8c7f6229f2dbee4e05a570dc";
+       libraryHaskellDepends = [
+         attoparsec base text unordered-containers
+       ];
+       homepage = "http://github.com/chrisdone/ini";
+       description = "Quick and easy configuration files in the INI format";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -129777,7 +130098,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "microlens" = callPackage
+  "microlens_0_3_5_1" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "microlens";
@@ -129787,19 +130108,19 @@ self: {
        homepage = "http://github.com/aelve/microlens";
        description = "A tiny part of the lens library with no dependencies";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "microlens_0_4_0_1" = callPackage
+  "microlens" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "microlens";
-       version = "0.4.0.1";
-       sha256 = "7ebb20642369da49ce3b656aa6893fccccdf95d2dbe68acad35c29c6fad93c14";
+       version = "0.4.1.0";
+       sha256 = "bce08742930f858a6fc4d122ecc7849c3087c7bdacdcdb0cb2638493fe605905";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/aelve/microlens";
        description = "A tiny part of the lens library with no dependencies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "microlens-aeson" = callPackage
@@ -129831,7 +130152,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "27d58e82c94efa174507d30b3cd98cbb30591eed8f37fb772ba6915e66fd2567";
        libraryHaskellDepends = [ base contravariant microlens ];
-       jailbreak = true;
        homepage = "http://github.com/aelve/microlens";
        description = "True folds and getters for microlens";
        license = stdenv.lib.licenses.bsd3;
@@ -129867,7 +130187,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "microlens-ghc" = callPackage
+  "microlens-ghc_0_3_1_0" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, microlens }:
      mkDerivation {
        pname = "microlens-ghc";
@@ -129876,20 +130196,6 @@ self: {
        libraryHaskellDepends = [
          array base bytestring containers microlens
        ];
-       homepage = "http://github.com/aelve/microlens";
-       description = "microlens + all features depending on packages coming with GHC (array, bytestring, containers)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "microlens-ghc_0_4_0_0" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, microlens }:
-     mkDerivation {
-       pname = "microlens-ghc";
-       version = "0.4.0.0";
-       sha256 = "d910ea55820f8a9175df750c2dec3ba09ce8f16005c970c396010350de66933c";
-       libraryHaskellDepends = [
-         array base bytestring containers microlens
-       ];
        jailbreak = true;
        homepage = "http://github.com/aelve/microlens";
        description = "microlens + all features depending on packages coming with GHC (array, bytestring, containers)";
@@ -129897,6 +130203,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "microlens-ghc" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, microlens
+     , transformers
+     }:
+     mkDerivation {
+       pname = "microlens-ghc";
+       version = "0.4.1.0";
+       sha256 = "e461fd96383d0edb198fb7e2ca650fbfd089e4601a1a19537a44918a455aea7d";
+       libraryHaskellDepends = [
+         array base bytestring containers microlens transformers
+       ];
+       homepage = "http://github.com/aelve/microlens";
+       description = "microlens + array, bytestring, containers, transformers";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "microlens-mtl_0_1_3_1" = callPackage
     ({ mkDerivation, base, microlens, mtl, transformers
      , transformers-compat
@@ -129926,6 +130248,25 @@ self: {
        libraryHaskellDepends = [
          base microlens mtl transformers transformers-compat
        ];
+       jailbreak = true;
+       homepage = "http://github.com/aelve/microlens";
+       description = "microlens support for Reader/Writer/State from mtl";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "microlens-mtl_0_1_6_0" = callPackage
+    ({ mkDerivation, base, microlens, mtl, transformers
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "microlens-mtl";
+       version = "0.1.6.0";
+       sha256 = "8594cf0eb10ad1a247c87f16b1afd860e55d91dca999bd3fcfb4b4af062b8362";
+       libraryHaskellDepends = [
+         base microlens mtl transformers transformers-compat
+       ];
+       jailbreak = true;
        homepage = "http://github.com/aelve/microlens";
        description = "microlens support for Reader/Writer/State from mtl";
        license = stdenv.lib.licenses.bsd3;
@@ -129933,22 +130274,6 @@ self: {
      }) {};
 
   "microlens-mtl" = callPackage
-    ({ mkDerivation, base, microlens, mtl, transformers
-     , transformers-compat
-     }:
-     mkDerivation {
-       pname = "microlens-mtl";
-       version = "0.1.6.0";
-       sha256 = "8594cf0eb10ad1a247c87f16b1afd860e55d91dca999bd3fcfb4b4af062b8362";
-       libraryHaskellDepends = [
-         base microlens mtl transformers transformers-compat
-       ];
-       homepage = "http://github.com/aelve/microlens";
-       description = "microlens support for Reader/Writer/State from mtl";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "microlens-mtl_0_1_6_1" = callPackage
     ({ mkDerivation, base, microlens, mtl, transformers
      , transformers-compat
      }:
@@ -129959,14 +130284,12 @@ self: {
        libraryHaskellDepends = [
          base microlens mtl transformers transformers-compat
        ];
-       jailbreak = true;
        homepage = "http://github.com/aelve/microlens";
        description = "microlens support for Reader/Writer/State from mtl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "microlens-platform" = callPackage
+  "microlens-platform_0_1_7_0" = callPackage
     ({ mkDerivation, base, hashable, microlens, microlens-ghc
      , microlens-mtl, microlens-th, text, unordered-containers, vector
      }:
@@ -129978,23 +130301,6 @@ self: {
          base hashable microlens microlens-ghc microlens-mtl microlens-th
          text unordered-containers vector
        ];
-       homepage = "http://github.com/aelve/microlens";
-       description = "Feature-complete microlens";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "microlens-platform_0_2_0_0" = callPackage
-    ({ mkDerivation, base, hashable, microlens, microlens-ghc
-     , microlens-mtl, microlens-th, text, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "microlens-platform";
-       version = "0.2.0.0";
-       sha256 = "70554347be8b059376860a45f411c89fbd30c1e542a81cea763f0495ecc8823f";
-       libraryHaskellDepends = [
-         base hashable microlens microlens-ghc microlens-mtl microlens-th
-         text unordered-containers vector
-       ];
        jailbreak = true;
        homepage = "http://github.com/aelve/microlens";
        description = "Feature-complete microlens";
@@ -130002,6 +130308,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "microlens-platform" = callPackage
+    ({ mkDerivation, base, hashable, microlens, microlens-ghc
+     , microlens-mtl, microlens-th, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "microlens-platform";
+       version = "0.2.1.0";
+       sha256 = "2afd1e023a4bbbdd88e22d2cb706831af2809a099f183cbf04d24b19b6b32326";
+       libraryHaskellDepends = [
+         base hashable microlens microlens-ghc microlens-mtl microlens-th
+         text unordered-containers vector
+       ];
+       homepage = "http://github.com/aelve/microlens";
+       description = "Feature-complete microlens";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "microlens-th_0_2_1_0" = callPackage
     ({ mkDerivation, base, containers, microlens, template-haskell }:
      mkDerivation {
@@ -130027,6 +130350,23 @@ self: {
        libraryHaskellDepends = [
          base containers microlens template-haskell
        ];
+       jailbreak = true;
+       homepage = "http://github.com/aelve/microlens";
+       description = "Automatic generation of record lenses for microlens";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "microlens-th_0_2_2_0" = callPackage
+    ({ mkDerivation, base, containers, microlens, template-haskell }:
+     mkDerivation {
+       pname = "microlens-th";
+       version = "0.2.2.0";
+       sha256 = "bf52318c0898294ab356ba75f72b880b9453cbc9df809b71aeac8081105596f9";
+       libraryHaskellDepends = [
+         base containers microlens template-haskell
+       ];
+       jailbreak = true;
        homepage = "http://github.com/aelve/microlens";
        description = "Automatic generation of record lenses for microlens";
        license = stdenv.lib.licenses.bsd3;
@@ -130034,20 +130374,6 @@ self: {
      }) {};
 
   "microlens-th" = callPackage
-    ({ mkDerivation, base, containers, microlens, template-haskell }:
-     mkDerivation {
-       pname = "microlens-th";
-       version = "0.2.2.0";
-       sha256 = "bf52318c0898294ab356ba75f72b880b9453cbc9df809b71aeac8081105596f9";
-       libraryHaskellDepends = [
-         base containers microlens template-haskell
-       ];
-       homepage = "http://github.com/aelve/microlens";
-       description = "Automatic generation of record lenses for microlens";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "microlens-th_0_3_0_0" = callPackage
     ({ mkDerivation, base, containers, microlens, template-haskell }:
      mkDerivation {
        pname = "microlens-th";
@@ -130056,11 +130382,9 @@ self: {
        libraryHaskellDepends = [
          base containers microlens template-haskell
        ];
-       jailbreak = true;
        homepage = "http://github.com/aelve/microlens";
        description = "Automatic generation of record lenses for microlens";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "microtimer" = callPackage
@@ -139070,8 +139394,8 @@ self: {
      }:
      mkDerivation {
        pname = "not-gloss-examples";
-       version = "0.5.0";
-       sha256 = "3e915767920ea016b28f3a7fa3657e006b0b29f2b188eb7e600a9dc5778d5f37";
+       version = "0.5.1.1";
+       sha256 = "596165d84f1f5d28f6a4710c424e7c76a20e5151bb5a880fb415fa59f083fd21";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -144483,6 +144807,7 @@ self: {
          base edit-distance-vector microlens vector
        ];
        testHaskellDepends = [ base criterion doctest QuickCheck vector ];
+       jailbreak = true;
        homepage = "https://github.com/liamoc/patches-vector";
        description = "Patches (diffs) on vectors: composable, mergeable, and invertible";
        license = stdenv.lib.licenses.bsd3;
@@ -148606,7 +148931,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "pipes-concurrency" = callPackage
+  "pipes-concurrency_2_0_4" = callPackage
     ({ mkDerivation, async, base, pipes, stm }:
      mkDerivation {
        pname = "pipes-concurrency";
@@ -148616,9 +148941,10 @@ self: {
        testHaskellDepends = [ async base pipes stm ];
        description = "Concurrency for the pipes ecosystem";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "pipes-concurrency_2_0_5" = callPackage
+  "pipes-concurrency" = callPackage
     ({ mkDerivation, async, base, pipes, stm }:
      mkDerivation {
        pname = "pipes-concurrency";
@@ -148628,7 +148954,6 @@ self: {
        testHaskellDepends = [ async base pipes stm ];
        description = "Concurrency for the pipes ecosystem";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-conduit" = callPackage
@@ -149171,6 +149496,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "pipes-wai_3_2_0" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring, http-types, pipes
+     , transformers, wai
+     }:
+     mkDerivation {
+       pname = "pipes-wai";
+       version = "3.2.0";
+       sha256 = "04a670df140c12b64f6f0d04b3c5571527f144ee429e7030bb62ec8785056d2a";
+       libraryHaskellDepends = [
+         base blaze-builder bytestring http-types pipes transformers wai
+       ];
+       homepage = "http://github.com/iand675/pipes-wai";
+       description = "A port of wai-conduit for the pipes ecosystem";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pipes-websockets" = callPackage
     ({ mkDerivation, base, QuickCheck, test-framework
      , test-framework-hunit, test-framework-quickcheck2
@@ -151033,8 +151375,8 @@ self: {
      }:
      mkDerivation {
        pname = "postgresql-connector";
-       version = "0.2.2";
-       sha256 = "72bf8bc38120fa1e45ab8820238741512818b96b614bb542e051b9f74695baac";
+       version = "0.2.3";
+       sha256 = "a313e76b55f8ca08db74e84f8c4676ec42fecd5480060d4644bffc9582081c99";
        libraryHaskellDepends = [
          base bytestring exceptions lens mtl postgresql-simple resource-pool
          resourcet time transformers-base
@@ -158130,7 +158472,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "reflection" = callPackage
+  "reflection_2_1" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "reflection";
@@ -158142,6 +158484,19 @@ self: {
        homepage = "http://github.com/ekmett/reflection";
        description = "Reifies arbitrary terms into types that can be reflected back into terms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "reflection" = callPackage
+    ({ mkDerivation, base, template-haskell }:
+     mkDerivation {
+       pname = "reflection";
+       version = "2.1.1.1";
+       sha256 = "e816cad511e720faa28a958210f48c0e9264ee9f6fd23eb20dcf71c6fc1c832e";
+       libraryHaskellDepends = [ base template-haskell ];
+       homepage = "http://github.com/ekmett/reflection";
+       description = "Reifies arbitrary terms into types that can be reflected back into terms";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "reflection-extras" = callPackage
@@ -168696,6 +169051,8 @@ self: {
        pname = "setlocale";
        version = "1.0.0.3";
        sha256 = "4d638b5906ed83eb9a0a4d97aaca832b8a73ce94efdb8a2b2b1329e6d738c19e";
+       revision = "1";
+       editedCabalFile = "9180b0e49613d699ec136db7db2befdb5874dc7df32393cc6196be03a7fa34f4";
        libraryHaskellDepends = [ base ];
        homepage = "https://bitbucket.org/IchUndNichtDu/haskell-setlocale";
        description = "Haskell bindings to setlocale";
@@ -175780,8 +176137,8 @@ self: {
        pname = "split";
        version = "0.2.2";
        sha256 = "f9cf9e571357f227aed5be9a78f5bbf78ef55c99df2edf7fdc659acc1f904375";
-       revision = "1";
-       editedCabalFile = "9098e40414e8491b0a400f5874408e577a444c4eadf1e03fb4ea6dfcc32e30c4";
+       revision = "2";
+       editedCabalFile = "066b3484a1880627f3abc187557709b8947d928e82cd9add5812587b2df295c1";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Combinator library for splitting lists";
@@ -180209,14 +180566,13 @@ self: {
      }:
      mkDerivation {
        pname = "strive";
-       version = "2.1.0";
-       sha256 = "42a7375f3178bda26b7ebb9c0dcb038bdb647501e6b3f9a89dd7594e44cf5122";
+       version = "2.2.0";
+       sha256 = "558042448e7694f893cba63b1191a8868b2d819fce3a1a54ac5309f6d9e0878a";
        libraryHaskellDepends = [
          aeson base bytestring data-default gpolyline http-conduit
          http-types template-haskell text time transformers
        ];
        testHaskellDepends = [ base bytestring hlint markdown-unlit time ];
-       jailbreak = true;
        homepage = "http://taylor.fausak.me/strive/";
        description = "A Haskell client for the Strava V3 API";
        license = stdenv.lib.licenses.mit;
@@ -184410,15 +184766,15 @@ self: {
      }:
      mkDerivation {
        pname = "telegram-api";
-       version = "0.1.0.0";
-       sha256 = "d013a0dda590c89bc861ab4db28da2e66bf259d2fd2e07f1b1d5ba013a555988";
+       version = "0.1.0.1";
+       sha256 = "fe6ef3a3095be721784a2c669f34aefda121bf3f507c4da5a8f029af2b9523b8";
        libraryHaskellDepends = [
          aeson base either servant servant-client text
        ];
        testHaskellDepends = [
          base hspec http-types servant servant-client text
        ];
-       homepage = "http://github.com/klappvisor/telegram-api#readme";
+       homepage = "http://github.com/klappvisor/haskell-telegram-api#readme";
        description = "Telegram Bot API bindings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -190947,7 +191303,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "turtle" = callPackage
+  "turtle_1_2_4" = callPackage
     ({ mkDerivation, async, base, clock, directory, doctest, foldl
      , hostname, managed, optional-args, optparse-applicative, process
      , stm, system-fileio, system-filepath, temporary, text, time
@@ -190965,9 +191321,10 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Shell programming, Haskell-style";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "turtle_1_2_5" = callPackage
+  "turtle" = callPackage
     ({ mkDerivation, async, base, clock, directory, doctest, foldl
      , hostname, managed, optional-args, optparse-applicative, process
      , stm, system-fileio, system-filepath, temporary, text, time
@@ -190985,7 +191342,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Shell programming, Haskell-style";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tweak" = callPackage
@@ -191035,8 +191391,8 @@ self: {
     ({ mkDerivation, base, eventloop }:
      mkDerivation {
        pname = "twentefp-eventloop-trees";
-       version = "0.1.2.0";
-       sha256 = "7216b138ba0a5e28852674428ad9f4d1ccc03335408fe4b2b5b572fa46a541ef";
+       version = "0.1.2.1";
+       sha256 = "be748f0f9678027b28808461ed8b69d2dea6bee67354c5f696ed843c1eaf7b3b";
        libraryHaskellDepends = [ base eventloop ];
        description = "Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and RedBlackTree";
        license = stdenv.lib.licenses.bsd3;
@@ -192914,8 +193270,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "unexceptionalio";
-       version = "0.2.0";
-       sha256 = "56086049333348cc751a28f6236d541352cc6f761933d0596ac61e018c5530dc";
+       version = "0.3.0";
+       sha256 = "927e2be6bb9ced73c1c17d79c981cadef4039d9ee45d2d3d6b4c133ff93ff0b8";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/singpolyma/unexceptionalio";
        description = "IO without any non-error, synchronous exceptions";
@@ -194849,6 +195205,8 @@ self: {
        pname = "utf8-string";
        version = "1.0.1.1";
        sha256 = "fb0b9e3acbe0605bcd1c63e51f290a7bbbe6628dfa3294ff453e4235fbaef140";
+       revision = "1";
+       editedCabalFile = "a351111265dd7d3a76113c938d4d3b0b2ba5b17e071f77e5a29fc86e91ee8396";
        libraryHaskellDepends = [ base bytestring ];
        homepage = "http://github.com/glguy/utf8-string/";
        description = "Support for reading and writing UTF8 Strings";
@@ -201477,8 +201835,8 @@ self: {
      }:
      mkDerivation {
        pname = "wavefront";
-       version = "0.6";
-       sha256 = "572bfde27b7b8a12c148114d3735475c486c6a33da7322c6c18fa5b3bf1199ec";
+       version = "0.7";
+       sha256 = "4ccdfd6b8c22a24bdcc91f067b6234e9fe69cef1864dcda4c9b134c7cdfa416c";
        libraryHaskellDepends = [
          attoparsec base dlist filepath mtl text transformers vector
        ];

From ba443da270a8f7eb6174134c54c2d56a184a9561 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 8 Jan 2016 09:03:50 -0600
Subject: [PATCH 447/884] kde5.kio: fix Samba detection

---
 .../libraries/kde-frameworks-5.17/default.nix |  2 +-
 .../{kio.nix => kio/default.nix}              |  4 ++-
 .../kio/samba-search-path.patch               | 28 +++++++++++++++++++
 .../libraries/kde-frameworks-5.17/kio/series  |  1 +
 4 files changed, 33 insertions(+), 2 deletions(-)
 rename pkgs/development/libraries/kde-frameworks-5.17/{kio.nix => kio/default.nix} (87%)
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kio/samba-search-path.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kio/series

diff --git a/pkgs/development/libraries/kde-frameworks-5.17/default.nix b/pkgs/development/libraries/kde-frameworks-5.17/default.nix
index 828faaa631f6..f41aebcb59d3 100644
--- a/pkgs/development/libraries/kde-frameworks-5.17/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.17/default.nix
@@ -74,7 +74,7 @@ let
     kidletime = callPackage ./kidletime.nix {};
     kimageformats = callPackage ./kimageformats.nix {};
     kinit = callPackage ./kinit {};
-    kio = callPackage ./kio.nix {};
+    kio = callPackage ./kio {};
     kitemmodels = callPackage ./kitemmodels.nix {};
     kitemviews = callPackage ./kitemviews.nix {};
     kjobwidgets = callPackage ./kjobwidgets.nix {};
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kio.nix b/pkgs/development/libraries/kde-frameworks-5.17/kio/default.nix
similarity index 87%
rename from pkgs/development/libraries/kde-frameworks-5.17/kio.nix
rename to pkgs/development/libraries/kde-frameworks-5.17/kio/default.nix
index 199565e24185..a2131ff33850 100644
--- a/pkgs/development/libraries/kde-frameworks-5.17/kio.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.17/kio/default.nix
@@ -1,4 +1,5 @@
-{ kdeFramework, lib, extra-cmake-modules, acl, karchive
+{ kdeFramework, lib, copyPathsToStore
+, extra-cmake-modules, acl, karchive
 , kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons
 , kdbusaddons, kdoctools, ki18n, kiconthemes, kitemviews
 , kjobwidgets, knotifications, kservice, ktextwidgets, kwallet
@@ -8,6 +9,7 @@
 
 kdeFramework {
   name = "kio";
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
   buildInputs = [
     acl karchive kconfig kcoreaddons kdbusaddons kiconthemes
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kio/samba-search-path.patch b/pkgs/development/libraries/kde-frameworks-5.17/kio/samba-search-path.patch
new file mode 100644
index 000000000000..c9ad46b41bb7
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.17/kio/samba-search-path.patch
@@ -0,0 +1,28 @@
+Index: kio-5.17.0/src/core/ksambashare.cpp
+===================================================================
+--- kio-5.17.0.orig/src/core/ksambashare.cpp
++++ kio-5.17.0/src/core/ksambashare.cpp
+@@ -67,13 +67,18 @@ KSambaSharePrivate::~KSambaSharePrivate(
+ 
+ bool KSambaSharePrivate::isSambaInstalled()
+ {
+-    if (QFile::exists(QStringLiteral("/usr/sbin/smbd"))
+-            || QFile::exists(QStringLiteral("/usr/local/sbin/smbd"))) {
+-        return true;
++    const QByteArray pathEnv = qgetenv("PATH");
++    if (!pathEnv.isEmpty()) {
++        QLatin1Char pathSep(':');
++        QStringList paths = QFile::decodeName(pathEnv).split(pathSep, QString::SkipEmptyParts);
++        for (QStringList::iterator it = paths.begin(); it != paths.end(); ++it) {
++            it->append("/smbd");
++            if (QFile::exists(*it)) {
++                return true;
++            }
++        }
+     }
+ 
+-    //qDebug() << "Samba is not installed!";
+-
+     return false;
+ }
+ 
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kio/series b/pkgs/development/libraries/kde-frameworks-5.17/kio/series
new file mode 100644
index 000000000000..77ca15450047
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.17/kio/series
@@ -0,0 +1 @@
+samba-search-path.patch

From a14c867d624f2f3a77852f4e19f416209b20f1ff Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@univ-orleans.fr>
Date: Wed, 6 Jan 2016 15:13:56 +0100
Subject: [PATCH 448/884] js_of_ocaml: Allow caml >= 4.02 to find camlp4

---
 pkgs/development/tools/ocaml/js_of_ocaml/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
index 0c57ae47c2c8..ca5230d1e086 100644
--- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
+++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix
@@ -1,18 +1,24 @@
 {stdenv, fetchurl, ocaml, findlib, ocaml_lwt, menhir, ocsigen_deriving, camlp4,
  cmdliner, tyxml, reactivedata, cppo, which, base64}:
 
+let camlp4_patch = fetchurl {
+    url = "https://github.com/FlorentBecker/js_of_ocaml/commit/3b511c5bb777d5049c49d7a04c01f142de7096b9.patch";
+    sha256 = "c92eda8be504cd41eb242166fc815af496243b63d4d21b169f5b62ec5ace2d39";
+    };
+in
+ 
 stdenv.mkDerivation {
   name = "js_of_ocaml-2.6";
   src = fetchurl {
     url = https://github.com/ocsigen/js_of_ocaml/archive/2.6.tar.gz;
     sha256 = "0q34lrn70dvz41m78bwgriyq6dxk97g8gcyg80nvxii4jp86dw61";
     };
-  
+
   buildInputs = [ocaml findlib menhir ocsigen_deriving
                  cmdliner tyxml reactivedata cppo which base64];
   propagatedBuildInputs = [ ocaml_lwt camlp4 ];
 
-  patches = [ ./Makefile.conf.diff ];  
+  patches = [ ./Makefile.conf.diff camlp4_patch ];
 
   createFindlibDestdir = true;
 

From 2c23a311cd8c83fa35413efc20e2ea6585bb0b89 Mon Sep 17 00:00:00 2001
From: Tom Burdick <thomas.burdick@gmail.com>
Date: Fri, 8 Jan 2016 09:47:03 -0600
Subject: [PATCH 449/884] postgresql: (94 -> 95)

Updates postgresql to its latest versions
---
 nixos/modules/services/databases/postgresql.nix | 4 ++--
 pkgs/servers/sql/postgresql/default.nix         | 7 +++++++
 pkgs/top-level/all-packages.nix                 | 3 ++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index 16e3235eb2c8..c2045a5859c5 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -122,8 +122,8 @@ in
         example = literalExample "[ (pkgs.postgis.override { postgresql = pkgs.postgresql94; }).v_2_1_4 ]";
         description = ''
           When this list contains elements a new store path is created.
-          PostgreSQL and the elments are symlinked into it. Then pg_config,
-          postgres and pc_ctl are copied to make them use the new
+          PostgreSQL and the elements are symlinked into it. Then pg_config,
+          postgres and pg_ctl are copied to make them use the new
           $out/lib directory as pkglibdir. This makes it possible to use postgis
           without patching the .sql files which reference $libdir/postgis-1.5.
         '';
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 7a0ecdfd9528..9a5b07e9f89a 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -88,4 +88,11 @@ in {
     sha256 = "0faav7k3nlhh1z7j1r3adrhx1fpsji3jixmm2abjm93fdg350z5q";
   };
 
+  postgresql95 = common {
+    version = "9.5.0";
+    psqlSchema = "9.5";
+    sha256 = "f1c0d3a1a8aa8c92738cab0153fbfffcc4d4158b3fee84f7aa6bfea8283978bc";
+  };
+
+
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d6bb0070912b..458939770062 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9444,7 +9444,8 @@ let
     postgresql91
     postgresql92
     postgresql93
-    postgresql94;
+    postgresql94
+    postgresql95;
 
   postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { };
 

From 70e47ab981c0f464dac67494b84df6aeacccd80f Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 8 Jan 2016 17:17:56 +0100
Subject: [PATCH 450/884] grafana: 2.5.0 -> 2.6.0

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

diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index 1ec789b5578a..e9ba8aa7aa83 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -1,7 +1,7 @@
 { lib, goPackages, fetchurl, fetchFromGitHub }:
 
 goPackages.buildGoPackage rec {
-  version = "2.5.0";
+  version = "2.6.0";
   name = "grafana-v${version}";
   goPackagePath = "github.com/grafana/grafana";
   subPackages = [ "./" ];
@@ -10,12 +10,12 @@ goPackages.buildGoPackage rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "grafana";
-    sha256 = "11m6jvls3gm9z8g27vxmfx84f22vyjff8bllz5lvpdizydry6zar";
+    sha256 = "160jarvmfvrzpk8agbl44761qz4rw273d59jg6kzd0ghls03wipr";
   };
 
   srcStatic = fetchurl {
     url = "https://grafanarel.s3.amazonaws.com/builds/grafana-${version}.linux-x64.tar.gz";
-    sha256 = "1zih0nzlx1sszgc4b5gll4jvsq43ikx782vv991fgy79bb2a5snk";
+    sha256 = "1i4aw5jvamgqfaanxlh3l83sn8xx10wpihciihvf7s3846s623ab";
   };
 
   preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace";

From 3769692a38ccaefec89e7172c35ed806a907563e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 8 Jan 2016 18:32:48 +0100
Subject: [PATCH 451/884] iptables: add in-code warning about updates

/cc #12178.
---
 pkgs/os-specific/linux/iptables/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix
index 2221250d57c0..ba3ee64f08ba 100644
--- a/pkgs/os-specific/linux/iptables/default.nix
+++ b/pkgs/os-specific/linux/iptables/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "iptables-${version}";
-  version = "1.4.21";
+  version = "1.4.21"; # before updating check #12178
 
   src = fetchurl {
     url = "http://www.netfilter.org/projects/iptables/files/${name}.tar.bz2";

From 288df4e4d5b3fe3622e1edc71881c603cde403c0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 4 Jan 2016 10:06:27 +0100
Subject: [PATCH 452/884] pythonPackages.notebook: 4.0.6 -> 4.1.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 71980a33e2dc..bc9023177575 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11371,12 +11371,12 @@ in modules // {
   };
 
   notebook = buildPythonPackage rec {
-    version = "4.0.6";
+    version = "4.1.0";
     name = "notebook-${version}";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/n/notebook/${name}.tar.gz";
-      sha256 = "f62e7a6afbc00bab3615b927595d27b1874cff3218bddcbab62f97f6dae567c3";
+      sha256 = "b597437ba33538221008e21fea71cd01eda9da1515ca3963d7c74e44f4b03d90";
     };
 
     buildInputs = with self; [nose]  ++ optionals isPy27 [mock];

From 9948d44b4046823264983055a93cc09cad029f55 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 8 Jan 2016 20:01:36 +0100
Subject: [PATCH 453/884] emacsPackages.org: use new texlive infrastructure

---
 pkgs/applications/editors/emacs-modes/org/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix
index f7289a3b400c..416c0fd8a629 100644
--- a/pkgs/applications/editors/emacs-modes/org/default.nix
+++ b/pkgs/applications/editors/emacs-modes/org/default.nix
@@ -1,5 +1,4 @@
-{ fetchurl, stdenv, emacs, texinfo, which, texLive, texLiveCMSuper
-, texLiveAggregationFun }:
+{ fetchurl, stdenv, emacs, texinfo, which, texlive }:
 
 stdenv.mkDerivation rec {
   name = "org-8.3.2";
@@ -10,7 +9,9 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ emacs ];
-  nativeBuildInputs = [ (texLiveAggregationFun { paths=[ texinfo texLive texLiveCMSuper ]; }) ];
+  nativeBuildInputs = [ (texlive.combine {
+    inherit (texlive) scheme-small cm-super;
+  }) texinfo ];
 
   configurePhase =
     '' sed -i mk/default.mk \

From b84718c8ded75c7277d927548d00de8926727cb5 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 8 Jan 2016 20:03:55 +0100
Subject: [PATCH 454/884] emacsPackages.org: 8.3.2 -> 8.3.3

---
 pkgs/applications/editors/emacs-modes/org/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix
index 416c0fd8a629..1189fd1d6d15 100644
--- a/pkgs/applications/editors/emacs-modes/org/default.nix
+++ b/pkgs/applications/editors/emacs-modes/org/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, emacs, texinfo, which, texlive }:
 
 stdenv.mkDerivation rec {
-  name = "org-8.3.2";
+  name = "org-8.3.3";
 
   src = fetchurl {
     url = "http://orgmode.org/${name}.tar.gz";
-    sha256 = "1f3mi1g4s8psfzq8mfbq3sccj7hsxvcfww0gf4337xs6jp8i3s4a";
+    sha256 = "1vhymmd41v7an457xdjhk5zfc4q1x7z64b25rs1ccam5p550cq65";
   };
 
   buildInputs = [ emacs ];

From 5d53d3282cb41f58fa29df11e4f9702595cf5e64 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 8 Jan 2016 20:22:07 +0100
Subject: [PATCH 455/884] farbfeld: init at 1

---
 .../libraries/farbfeld/default.nix            | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/libraries/farbfeld/default.nix

diff --git a/pkgs/development/libraries/farbfeld/default.nix b/pkgs/development/libraries/farbfeld/default.nix
new file mode 100644
index 000000000000..2301dbac368a
--- /dev/null
+++ b/pkgs/development/libraries/farbfeld/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchgit, libpng, libjpeg }:
+
+stdenv.mkDerivation rec {
+  name = "farbfeld-${version}";
+  version = "1";
+
+  src = fetchgit {
+    url = "http://git.suckless.org/farbfeld";
+    rev = "refs/tags/${version}";
+    sha256 = "1mgk46lpqqvn4qx37r0jxz2jjsd4nvl6zjl04y4bfyzf4wkkmmln";
+  };
+
+  buildInputs = [ libpng libjpeg ];
+
+  installFlags = "PREFIX=/ DESTDIR=$(out)";
+
+  meta = with stdenv.lib; {
+    description = "Suckless image format with conversion tools";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ pSub ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d6bb0070912b..224449a7dff7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6360,6 +6360,8 @@ let
 
   faad2 = callPackage ../development/libraries/faad2 { };
 
+  farbfeld = callPackage ../development/libraries/farbfeld { };
+
   farsight2 = callPackage ../development/libraries/farsight2 { };
 
   farstream = callPackage ../development/libraries/farstream {

From d81538ff49d63774684cc1f83cf44a4a061fb38d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 8 Jan 2016 20:41:38 +0100
Subject: [PATCH 456/884] djview: minor update 4.10.3 -> 4.10.5

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

diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix
index e5c49846b23c..2276b868b59a 100644
--- a/pkgs/applications/graphics/djview/default.nix
+++ b/pkgs/applications/graphics/djview/default.nix
@@ -5,10 +5,10 @@ let
   # TODO: qt = qt5.base; # should work but there's a mysterious "-silent" error
 in
 stdenv.mkDerivation rec {
-  name = "djview-4.10.3";
+  name = "djview-4.10.5";
   src = fetchurl {
     url = "mirror://sourceforge/djvu/${name}.tar.gz";
-    sha256 = "09dbws0k8giizc0xqpad8plbyaply8x1pjc2k3207v2svk6hxf2h";
+    sha256 = "0gbvbly7w3cr8wgpyh76nf9w7cf7740vp7k5hccks186f6005cx0";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From fa0057be3988d61c08ca7a84668e71e1c97abc50 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 8 Jan 2016 09:04:04 -0600
Subject: [PATCH 457/884] nixos/kde5: install kdenetwork-filesharing if Samba
 enabled

---
 nixos/modules/services/x11/desktop-managers/kde5.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix
index 2aeb4f67d771..10ca2825ee1a 100644
--- a/nixos/modules/services/x11/desktop-managers/kde5.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde5.nix
@@ -125,6 +125,7 @@ in
       ++ lib.optional config.networking.networkmanager.enable kde5.plasma-nm
       ++ lib.optional config.hardware.pulseaudio.enable kde5.plasma-pa
       ++ lib.optional config.powerManagement.enable kde5.powerdevil
+      ++ lib.optionals config.services.samba.enable [ kde5.kdenetwork-filesharing pkgs.samba ]
 
       ++ lib.optionals cfg.phonon.gstreamer.enable
         [

From e44af9ed42a464b1067b42b56940683e66b6a31f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 8 Jan 2016 13:12:18 -0600
Subject: [PATCH 458/884] openslp: init at 2.0.0

---
 .../development/libraries/openslp/default.nix | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/libraries/openslp/default.nix

diff --git a/pkgs/development/libraries/openslp/default.nix b/pkgs/development/libraries/openslp/default.nix
new file mode 100644
index 000000000000..a77296b4895c
--- /dev/null
+++ b/pkgs/development/libraries/openslp/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
+  name = "openslp-2.0.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/openslp/2.0.0/2.0.0/openslp-2.0.0.tar.gz";
+    sha256 = "16splwmqp0400w56297fkipaq9vlbhv7hapap8z09gp5m2i3fhwj";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = "http://openslp.org/";
+    description = "An open-source implementation of the IETF Service Location Protocol";
+    maintainers = with maintainers; [ ttuegel ];
+    license = licenses.bsd3;
+    platforms = platforms.all;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 33d304d43ea3..9c9a32f3eda4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8003,6 +8003,8 @@ let
     ffmpeg = ffmpeg_0;
   };
 
+  openslp = callPackage ../development/libraries/openslp {};
+
   # 2.3 breaks some backward-compability
   libressl = libressl_2_2;
   libressl_2_2 = callPackage ../development/libraries/libressl/2.2.nix {

From 38ef49bacdad1b75dbcf0c46764e355456f44614 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 8 Jan 2016 13:12:29 -0600
Subject: [PATCH 459/884] kde5.kio-extras: init at 15.12.0

---
 pkgs/applications/kde-apps-15.12/default.nix  |  1 +
 .../kde-apps-15.12/kio-extras.nix             | 58 +++++++++++++++++++
 2 files changed, 59 insertions(+)
 create mode 100644 pkgs/applications/kde-apps-15.12/kio-extras.nix

diff --git a/pkgs/applications/kde-apps-15.12/default.nix b/pkgs/applications/kde-apps-15.12/default.nix
index 459ba52dac90..15982cb5d64c 100644
--- a/pkgs/applications/kde-apps-15.12/default.nix
+++ b/pkgs/applications/kde-apps-15.12/default.nix
@@ -41,6 +41,7 @@ let
     kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {};
     kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {};
     kgpg = callPackage ./kgpg.nix { inherit (pkgs.kde4) kdepimlibs; };
+    kio-extras = callPackage ./kio-extras.nix {};
     konsole = callPackage ./konsole.nix {};
     libkdcraw = callPackage ./libkdcraw.nix {};
     libkexiv2 = callPackage ./libkexiv2.nix {};
diff --git a/pkgs/applications/kde-apps-15.12/kio-extras.nix b/pkgs/applications/kde-apps-15.12/kio-extras.nix
new file mode 100644
index 000000000000..77b42f1fc586
--- /dev/null
+++ b/pkgs/applications/kde-apps-15.12/kio-extras.nix
@@ -0,0 +1,58 @@
+{ kdeApp, lib
+, extra-cmake-modules, kdoctools
+, shared_mime_info
+, exiv2
+, karchive
+, kbookmarks
+, kconfig, kconfigwidgets
+, kcoreaddons, kdbusaddons, kguiaddons
+, kdnssd
+, kiconthemes
+, ki18n
+, kio
+, khtml
+, kdelibs4support
+, kpty
+, libmtp
+, libssh
+, openexr
+, openslp
+, phonon
+, qtsvg
+, samba
+, solid
+}:
+
+kdeApp {
+  name = "kio-extras";
+  nativeBuildInputs = [
+    extra-cmake-modules kdoctools
+    shared_mime_info
+  ];
+  buildInputs = [
+    exiv2
+    karchive
+    kbookmarks
+    kconfig kconfigwidgets
+    kcoreaddons kdbusaddons kguiaddons
+    kdnssd
+    kiconthemes
+    ki18n
+    kio
+    khtml
+    kdelibs4support
+    kpty
+    libmtp
+    libssh
+    openexr
+    openslp
+    phonon
+    qtsvg
+    samba
+    solid
+  ];
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}

From 049357bb3083930750a3f01d36b42dae55f9bb2e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 8 Jan 2016 13:12:43 -0600
Subject: [PATCH 460/884] nixos/kde5: install kio-extras

---
 nixos/modules/services/x11/desktop-managers/kde5.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix
index 10ca2825ee1a..e8c768e41fad 100644
--- a/nixos/modules/services/x11/desktop-managers/kde5.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde5.nix
@@ -102,6 +102,7 @@ in
         kde5.gwenview
         kde5.kate
         kde5.kdegraphics-thumbnailers
+        kde5.kio-extras
         kde5.konsole
         kde5.okular
         kde5.print-manager

From 0b7de904ccee9b73effb1b86dbe131bffbcbcb43 Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tom@logand.com>
Date: Fri, 8 Jan 2016 21:47:33 +0100
Subject: [PATCH 461/884] paredit: remove obsolete expression

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

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 3eff50bd4e0b..cbcca3c5060b 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -1433,21 +1433,6 @@ let
     };
   };
 
-  paredit = trivialBuild rec {
-    pname = "paredit-${version}";
-    version = "25";
-    src = fetchgit {
-      url = http://mumble.net/~campbell/git/paredit.git/;
-      rev = "9a696fdcce87c9d9eec4569a9929d0300ac6ae5c";
-      sha256 = "13wjqimp2s6pwcqix8pmsrk76bq1cxlnwmj3m57bb5y60y67vp9l";
-    };
-    meta = {
-      homepage = http://www.emacswiki.org/emacs/ParEdit;
-      description = "Minor Emacs mode for structured editing of S-expression data";
-      license = gpl3Plus;
-    };
-  };
-
   parsebib = melpaBuild rec {
     pname = "parsebib";
     version = "20151006";

From 534605e2ebbe0454e2c95f4125aac30731d4daa7 Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tom@logand.com>
Date: Fri, 8 Jan 2016 21:50:30 +0100
Subject: [PATCH 462/884] slime: remove obsolete expression

---
 .../editors/emacs-modes/slime/default.nix     | 22 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 24 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-modes/slime/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/slime/default.nix b/pkgs/applications/editors/emacs-modes/slime/default.nix
deleted file mode 100644
index 4c6326425369..000000000000
--- a/pkgs/applications/editors/emacs-modes/slime/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{stdenv, fetchFromGitHub, emacs}:
-
-stdenv.mkDerivation rec {
-  name = "slime";
-  src = fetchFromGitHub {
-    owner = "slime";
-    repo = "slime";
-    rev = "f80c997ee9408a73637057759120c5b37b55d781";
-    sha256 = "06ncqxzidmis6d7xsyi5pamg4pvifmc8l854xaa847rhagsvw7ax";
-  };
-  buildInputs = [emacs];
-  installPhase = ''
-    rm -rf CVS
-    mkdir -p $out/share/emacs/site-lisp
-    cp -r . $out/share/emacs/site-lisp
-  '';
-  meta = {
-    homepage = "https://common-lisp.net/project/slime/";
-    description = "The Superior Lisp Interaction Mode for Emacs";
-    license = "GPL";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d1af379810e6..50c876031e1a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11653,8 +11653,6 @@ let
     xmlRpc = callPackage ../applications/editors/emacs-modes/xml-rpc { };
 
     cask = callPackage ../applications/editors/emacs-modes/cask { };
-
-    slime = callPackage ../applications/editors/emacs-modes/slime { };
   };
 
   emacs24Packages = recurseIntoAttrs (emacsPackagesGen emacs24 pkgs.emacs24Packages);

From de18e600147cbb7f44f43ff7fdc77b01c14adcdc Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Fri, 8 Jan 2016 21:56:44 +0100
Subject: [PATCH 463/884] vim-plugins: added build inputs for
 jagajaga/vim-addon-vim2nix #2

---
 pkgs/misc/vim-plugins/default.nix | 7 ++++---
 pkgs/top-level/all-packages.nix   | 4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 853a2dc5ea4b..e7ca89c0322f 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1,7 +1,8 @@
 # TODO check that no license information gets lost
-{ fetchurl, bash, stdenv, python, cmake, vim, vimUtils, perl, ruby, unzip,
-  which, fetchgit, fetchFromGitHub, fetchhg, fetchzip, llvmPackages, zip,
-  vim_configurable, vimPlugins, xkb_switch, git
+{ fetchurl, bash, stdenv, python, go, cmake, vim, vimUtils, perl, ruby, unzip
+, which, fetchgit, fetchFromGitHub, fetchhg, fetchzip, llvmPackages, zip
+, vim_configurable, vimPlugins, xkb_switch, git
+, Cocoa
 }:
 
 let
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f3d7c9be3688..cbdc949ac714 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15687,7 +15687,9 @@ let
 
   vimUtils = callPackage ../misc/vim-plugins/vim-utils.nix { };
 
-  vimPlugins = recurseIntoAttrs (callPackage ../misc/vim-plugins { });
+  vimPlugins = recurseIntoAttrs (callPackage ../misc/vim-plugins {
+    inherit (darwin.apple_sdk.frameworks) Cocoa;
+  });
 
   vimprobable2 = callPackage ../applications/networking/browsers/vimprobable2 {
     webkit = webkitgtk2;

From 174b9be8c162d4484252e09adbab8837ca7559b8 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Fri, 8 Jan 2016 22:29:48 +0100
Subject: [PATCH 464/884] josm: 9229 -> 9329

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

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

From cc51d6bc8777f6946df8219bad40f1b184f7bab5 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Sat, 9 Jan 2016 00:38:23 +0300
Subject: [PATCH 465/884] vimPlugins: update 2016-01-09

---
 pkgs/misc/vim-plugins/default.nix | 106 +++++++++++++-----------------
 1 file changed, 47 insertions(+), 59 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index e7ca89c0322f..a2ceb9d1df89 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -155,11 +155,11 @@ rec {
   };
 
   Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Syntastic-2016-01-04";
+    name = "Syntastic-2016-01-08";
     src = fetchgit {
       url = "git://github.com/scrooloose/syntastic";
-      rev = "189be0ae74372c13d5a87c72753a86e796812b58";
-      sha256 = "dbca5a1fbc632922856d8e5468f5ed52edeaf1ae5a1c0f3ff3eb0f5dcf19af73";
+      rev = "c57ba0da9f0e935ecc87363c1ac3339b1e1cb75f";
+      sha256 = "0f4d73b024bd6e43f7b27bee629f1ff46bcb5f773eebdcda09652f101ab70504";
     };
     dependencies = [];
 
@@ -325,11 +325,11 @@ rec {
   };
 
   vim-addon-vim2nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-vim2nix-2015-09-01";
+    name = "vim-addon-vim2nix-2016-01-09";
     src = fetchgit {
       url = "git://github.com/JagaJaga/vim-addon-vim2nix";
-      rev = "ce9ddf99983c00adbd41e0d53ad8cead9712069c";
-      sha256 = "c4b3b4832684bebbf890741b30b1364ca7240b5348cd0c0ee93d6ba477e8f77d";
+      rev = "9146b942f51d2682bf0ca00ad74c324340a61b60";
+      sha256 = "2e35baf96ae172d2dac8b86b299ff2c87c14a5b4a4a6864dcce17e7e9ed04861";
     };
     dependencies = ["vim-addon-manager"];
 
@@ -391,11 +391,11 @@ rec {
   };
 
   ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ctrlp-vim-2015-12-30";
+    name = "ctrlp-vim-2016-01-06";
     src = fetchgit {
       url = "git://github.com/ctrlpvim/ctrlp.vim";
-      rev = "97490deda3326182281133454b8813850db4c444";
-      sha256 = "1671dffe85dfc2655c06784b783b08f8553f5b90e04b7e9a861d7054c695adbc";
+      rev = "0fb2c58353ee041500eb67fb5bde2377bf486417";
+      sha256 = "5731f5fb2ac024ca3b53fdb56ff6ad5809db166f91dccf5494343ff490fe80e9";
     };
     dependencies = [];
 
@@ -622,11 +622,11 @@ rec {
   };
 
   vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimtex-2016-01-05";
+    name = "vimtex-2016-01-07";
     src = fetchgit {
       url = "git://github.com/lervag/vimtex";
-      rev = "12481a9891c0a2cf04018afb555b8ca426988e89";
-      sha256 = "50ddc6de684915d5470d668eb977827162fcdc8ee763c8b26705aa1e8d5dd8ec";
+      rev = "db137566d540ac01a6013263069463a95f64a61d";
+      sha256 = "352436cd29aba8919f05d0e5e544c9d9addd62d850572d06bcbb58d15e9f8f8a";
     };
     dependencies = [];
 
@@ -644,11 +644,11 @@ rec {
   };
 
   vim-xkbswitch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-xkbswitch-2015-09-04";
+    name = "vim-xkbswitch-2016-01-08";
     src = fetchgit {
       url = "git://github.com/lyokha/vim-xkbswitch";
-      rev = "0d94b5dde9ddfeb6b064e30293b6fb7a4c54b907";
-      sha256 = "d303a6099e684084dfd71bdb08ae2c6dc33ec9c6f68b1115e2be257d7c83ef11";
+      rev = "89d7719ca1b69d4d18eda271b8fa75af2eec0aa9";
+      sha256 = "afb8bdba422cc176f18ee3d23cdd9c208bf7f87c488f0b230071806c45c71d0f";
     };
     dependencies = [];
     patchPhase = ''
@@ -659,11 +659,11 @@ rec {
   };
 
   vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-startify-2015-12-28";
+    name = "vim-startify-2016-01-05";
     src = fetchgit {
       url = "git://github.com/mhinz/vim-startify";
-      rev = "84fb86e5dab808dd99f10565f1aac066292a1289";
-      sha256 = "bb05abdd59e38dcb1985438ddfad7cd23f514a6bc2fe84b5e114872e1ca82dc0";
+      rev = "e3fb0cd845f9726d30d92ac6293a84bece687c64";
+      sha256 = "42c77cca362aa8b40345d3296689fc1df564362ea3bd781d114315e64fc9a380";
     };
     dependencies = [];
 
@@ -761,22 +761,22 @@ rec {
   };
 
   unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "unite-vim-2015-12-29";
+    name = "unite-vim-2016-01-06";
     src = fetchgit {
       url = "git://github.com/shougo/unite.vim";
-      rev = "da791c335135fbd460caa8c8e4671e324ef1f328";
-      sha256 = "93a892a9acfcf47953e234b69f80249cc2c1d7cc6d097f173cf6f721fd59068f";
+      rev = "98e9f3922b058145a0de08c5eb47990d34175252";
+      sha256 = "eebec7f7c292ecbcc84219f79f1b74fa4183b1147fa577e9f1035f9c553fc95e";
     };
     dependencies = [];
 
   };
 
   vimproc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimproc-vim-2015-12-11";
+    name = "vimproc-vim-2016-01-06";
     src = fetchgit {
       url = "git://github.com/shougo/vimproc.vim";
-      rev = "f96e476e41ab4cdb9c37242c8cf76f1e5aa5b91d";
-      sha256 = "da5de329b567d72fec8dc49d13006f19eca09282c57304dfa8d22bfbf8a9ace4";
+      rev = "aa075b9b56839e1adb08421d2e9837f90e59acad";
+      sha256 = "bc587f1cca4dfe8f22af5eecf290a624cbebfdb989906cc02d5471325464b301";
     };
     dependencies = [];
     buildInputs = [ which ];
@@ -886,34 +886,22 @@ rec {
     };
     dependencies = [];
     buildInputs = [
-      python cmake
+      python go cmake
       (if stdenv.isDarwin then llvmPackages.clang else llvmPackages.clang-unwrapped)
       llvmPackages.llvm
-    ];
-
-    configurePhase = ":";
+    ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa;
 
     buildPhase = ''
       patchShebangs .
 
-      target=$out/${rtpPath}/youcompleteme
-      mkdir -p $target
-      cp -a ./ $target
-
-      mkdir $target/build
-      cd $target/build
-      cmake -G "Unix Makefiles" . $target/third_party/ycmd/cpp -DPYTHON_LIBRARIES:PATH=${python}/lib/libpython2.7.so -DPYTHON_INCLUDE_DIR:PATH=${python}/include/python2.7 -DUSE_CLANG_COMPLETER=ON -DUSE_SYSTEM_LIBCLANG=ON
+      mkdir build
+      pushd build
+      cmake -G "Unix Makefiles" . ../third_party/ycmd/cpp -DPYTHON_LIBRARIES:PATH=${python}/lib/libpython2.7.so -DPYTHON_INCLUDE_DIR:PATH=${python}/include/python2.7 -DUSE_CLANG_COMPLETER=ON -DUSE_SYSTEM_LIBCLANG=ON
       make ycm_support_libs -j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}}
-      ${python}/bin/python $target/third_party/ycmd/build.py --clang-completer --system-libclang
-
-      ${vimHelpTags}
-      vimHelpTags $target
+      ${python}/bin/python ../third_party/ycmd/build.py --gocode-completer --clang-completer --system-libclang
+      popd
     '';
 
-    # TODO: implement proper install phase rather than keeping everything in store
-    # TODO: support llvm based C completion, See README of git repository
-    installPhase = ":";
-
     meta = {
       description = "Fastest non utf-8 aware word and C completion engine for Vim";
       homepage = http://github.com/Valloric/YouCompleteMe;
@@ -1023,11 +1011,11 @@ rec {
   };
 
   vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-wakatime-2015-12-29";
+    name = "vim-wakatime-2016-01-06";
     src = fetchgit {
       url = "git://github.com/wakatime/vim-wakatime";
-      rev = "6cf829f08d72ffe56a794a2e4ada5689e7d68237";
-      sha256 = "4913a63dd238bb14c04043e492b3d9f283ea821db86fad559b88ac9f65cf87d8";
+      rev = "044b2138fb536df7e90fc4b3b2257eda43e76378";
+      sha256 = "2a9589bdf89471c090394bfb4001e673d1da9064dfe3d100e1f9ac3672d7250b";
     };
     dependencies = [];
     buildInputs = [ python ];
@@ -1215,11 +1203,11 @@ rec {
   };
 
   tlib = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "tlib-2015-12-12";
+    name = "tlib-2016-01-06";
     src = fetchgit {
       url = "git://github.com/tomtom/tlib_vim";
-      rev = "599934acbbcf1637616878fc6e8f5aba1b301a29";
-      sha256 = "2401a623363bf31fa9f152faae90268d06ed5cef8352163c19b0c7b013e5c0b7";
+      rev = "e8b53d80f73d98a9accd8b33344fd8821c8e71f7";
+      sha256 = "5269b8949170443ebfccd8ce21238ef3c5cb2aeb857b1ea4aa5733298a75a382";
     };
     dependencies = [];
 
@@ -1332,7 +1320,7 @@ rec {
       sha256 = "a3b5da9bcc01c6f0fb0a5e13a6f9efb58471339ed32c480fde96856bb9e1e7be";
     };
     dependencies = [];
-
+    buildInputs = stdenv.lib.optional stdenv.isDarwin Cocoa;
   };
 
   vim-addon-mru = buildVimPluginFrom2Nix { # created by nix#NixDerivation
@@ -1446,11 +1434,11 @@ rec {
   };
 
   vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-2015-12-28";
+    name = "vim-airline-2016-01-05";
     src = fetchgit {
       url = "git://github.com/bling/vim-airline";
-      rev = "01383136565840a63aa056b82c74be40afcb8ba3";
-      sha256 = "bc9dfb3a0fa15c1149bb8ca5e6e745ca66e141862bbc08e071afec86b8bf9da9";
+      rev = "ca6ab34e3ce2d25e5625fe56ef31d5032c69dbec";
+      sha256 = "0a4352d8d1602c8eba62ab5c97c418c14eee9be142eb949d49c7b2866892e259";
     };
     dependencies = [];
 
@@ -1545,22 +1533,22 @@ rec {
   };
 
   vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-signify-2015-12-27";
+    name = "vim-signify-2016-01-07";
     src = fetchgit {
       url = "git://github.com/mhinz/vim-signify";
-      rev = "812b305b795144617cb44d5f4f6cf1c92e5366eb";
-      sha256 = "34eaaa24e6caf07d0e942f482861a6328578a524d76b630ca41d2fc650084225";
+      rev = "e134c152e05ec750091349629f048fe3d5d49962";
+      sha256 = "68615d43c4d8a2573c19011a77409d8de62eede252759d84f6318409009e15d3";
     };
     dependencies = [];
 
   };
 
   vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-snippets-2016-01-04";
+    name = "vim-snippets-2016-01-08";
     src = fetchgit {
       url = "git://github.com/honza/vim-snippets";
-      rev = "40bcbf8a34a53d54e34fae9e4122ce25b7225144";
-      sha256 = "ef88a33110115b611ed2d707d052c3a4969ff57d8c44d480dd3fc28c9a44fcec";
+      rev = "ac2c763c05fa5ff27ed66b3a0f22f0f41c22192d";
+      sha256 = "52ccca1e588a15745754651c3cbc57ae706d42d2dff8d4401374502b02787d60";
     };
     dependencies = [];
 

From 762d55211a729cb2e07157390c158085d278e228 Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Sat, 9 Jan 2016 06:02:00 +0800
Subject: [PATCH 466/884] docs: kernelPackagesFor -> linuxPackagesFor

---
 doc/package-notes.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/package-notes.xml b/doc/package-notes.xml
index 9d8217d60bc8..4148e87e0189 100644
--- a/doc/package-notes.xml
+++ b/doc/package-notes.xml
@@ -125,7 +125,7 @@ $ make menuconfig ARCH=<replaceable>arch</replaceable></screen>
   <listitem>
     <para>It may be that the new kernel requires updating the external
     kernel modules and kernel-dependent packages listed in the
-    <varname>kernelPackagesFor</varname> function in
+    <varname>linuxPackagesFor</varname> function in
     <filename>all-packages.nix</filename> (such as the NVIDIA drivers,
     AUFS, etc.).  If the updated packages aren’t backwards compatible
     with older kernels, you may need to keep the older versions

From 5e775696d0e2d097b365162d855a0271239b75bd Mon Sep 17 00:00:00 2001
From: Svend Sorensen <svend@ciffer.net>
Date: Fri, 8 Jan 2016 14:11:06 -0800
Subject: [PATCH 467/884] emacs-pdf-tools: Move packages to packageRequires

Move the Emacs packages to packageRequires so that they get installed.
---
 pkgs/top-level/emacs-packages.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 3eff50bd4e0b..141f11754ce5 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -103,9 +103,10 @@ let
       rev = "v${version}";
       sha256 = "19sy49r3ijh36m7hl4vspw5c4i8pnfqdn4ldm2sqchxigkw56ayl";
     };
-    buildInputs = with external; [ autoconf automake libpng zlib poppler pkgconfig ] ++ [ tablist let-alist ];
+    buildInputs = with external; [ autoconf automake libpng zlib poppler pkgconfig ];
     preBuild = "make server/epdfinfo";
     fileSpecs = [ "lisp/pdf-*.el" "server/epdfinfo" ];
+    packageRequires = [ tablist let-alist ];
     meta = {
       description = "Emacs support library for PDF files";
       license = gpl3;

From 76bf3ab961cc3e0c63bbde9c0d20bcd0e2d86bfd Mon Sep 17 00:00:00 2001
From: Tomas Vestelind <tomas.vestelind@gmail.com>
Date: Fri, 8 Jan 2016 22:54:08 +0100
Subject: [PATCH 468/884] bird: 1.4.5 -> 1.5.0

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

diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix
index c13ad64fca3f..b73457293126 100644
--- a/pkgs/servers/bird/default.nix
+++ b/pkgs/servers/bird/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, flex, bison, readline }:
 
 stdenv.mkDerivation rec {
-  name = "bird-1.4.5";
+  name = "bird-1.5.0";
 
   src = fetchurl {
     url = "ftp://bird.network.cz/pub/bird/${name}.tar.gz";
-    sha256 = "1z4z7zmx3054zxi4q6a7095s267mw8ky628gir2n5xy5ch65yj7z";
+    sha256 = "0pbvq6rx4ww46vcdslpiplb5fwq3mqma83434q38kx959qjw9mbr";
   };
 
   buildInputs = [ flex bison readline ];

From 119c8f91e7f17d2cb95f42985816820600c389cf Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Fri, 18 Sep 2015 16:50:48 +0000
Subject: [PATCH 469/884] nixos: introduce system.nixosLabel option and use it
 where appropriate

Setting nixosVersion to something custom is useful for meaningful GRUB
menus and /nix/store paths, but actuallly changing it rebulids the
whole system path (because of `nixos-version` script and manual
pages). Also, changing it is not a particularly good idea because you
can then be differentitated from other NixOS users by a lot of
programs that read /etc/os-release.

This patch introduces an alternative option that does all you want
from nixosVersion, but rebuilds only the very top system level and
/etc while using your label in the names of system /nix/store paths,
GRUB and other boot loaders' menus, getty greetings and so on.
---
 .../installer/cd-dvd/installation-cd-base.nix |  2 +-
 nixos/modules/installer/cd-dvd/iso-image.nix  |  2 +-
 nixos/modules/misc/version.nix                | 28 +++++++++++++++++--
 nixos/modules/services/ttys/agetty.nix        | 20 +++++++++----
 nixos/modules/system/activation/top-level.nix |  6 ++--
 .../extlinux-conf-builder.sh                  |  4 +--
 nixos/modules/virtualisation/azure-image.nix  |  2 +-
 .../virtualisation/brightbox-image.nix        |  2 +-
 .../virtualisation/google-compute-image.nix   |  2 +-
 .../virtualisation/virtualbox-image.nix       |  4 +--
 10 files changed, 52 insertions(+), 20 deletions(-)

diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix
index bc3bd872d2a5..2569860a098f 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix
@@ -16,7 +16,7 @@ with lib;
     ];
 
   # ISO naming.
-  isoImage.isoName = "${config.isoImage.isoBaseName}-${config.system.nixosVersion}-${pkgs.stdenv.system}.iso";
+  isoImage.isoName = "${config.isoImage.isoBaseName}-${config.system.nixosLabel}-${pkgs.stdenv.system}.iso";
 
   isoImage.volumeID = substring 0 11 "NIXOS_ISO";
 
diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index fa9cc6fa20b9..b79191e0fd4b 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -39,7 +39,7 @@ let
     DEFAULT boot
 
     LABEL boot
-    MENU LABEL NixOS ${config.system.nixosVersion}${config.isoImage.appendToMenuLabel}
+    MENU LABEL NixOS ${config.system.nixosLabel}${config.isoImage.appendToMenuLabel}
     LINUX /boot/bzImage
     APPEND init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}
     INITRD /boot/initrd
diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index ee6948db3d3a..18f270cd531b 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -30,6 +30,29 @@ in
       '';
     };
 
+    nixosLabel = mkOption {
+      type = types.str;
+      description = ''
+        NixOS version name to be used in the names of generated
+        outputs and boot labels.
+
+        If you ever wanted to influence the labels in your GRUB menu,
+        this is option is for you.
+
+        Can be set directly or with <envar>NIXOS_LABEL</envar>
+        environment variable for <command>nixos-rebuild</command>,
+        e.g.:
+
+        <screen>
+        #!/bin/sh
+        today=`date +%Y%m%d`
+        branch=`(cd nixpkgs ; git branch 2>/dev/null | sed -n '/^\* / { s|^\* ||; p; }')`
+        revision=`(cd nixpkgs ; git rev-parse HEAD)`
+        export NIXOS_LABEL="$today.$branch-''${revision:0:7}"
+        nixos-rebuild switch</screen>
+      '';
+    };
+
     nixosVersion = mkOption {
       internal = true;
       type = types.str;
@@ -75,8 +98,9 @@ in
   config = {
 
     system = {
-      # This is set here rather than up there so that changing this
-      # env variable will not rebuild the manual
+      # These defaults are set here rather than up there so that
+      # changing them would not rebuild the manual
+      nixosLabel   = mkDefault (maybeEnv "NIXOS_LABEL" cfg.nixosVersion);
       nixosVersion = mkDefault (maybeEnv "NIXOS_VERSION" (cfg.nixosRelease + cfg.nixosVersionSuffix));
 
       # Note: code names must only increase in alphabetical order.
diff --git a/nixos/modules/services/ttys/agetty.nix b/nixos/modules/services/ttys/agetty.nix
index 85ee23c1a3dd..ea7196fc8733 100644
--- a/nixos/modules/services/ttys/agetty.nix
+++ b/nixos/modules/services/ttys/agetty.nix
@@ -2,6 +2,13 @@
 
 with lib;
 
+let
+
+  autologinArg = optionalString (config.services.mingetty.autologinUser != null) "--autologin ${config.services.mingetty.autologinUser}";
+  gettyCmd = extraArgs: "@${pkgs.utillinux}/sbin/agetty agetty --login-program ${pkgs.shadow}/bin/login ${autologinArg} ${extraArgs}";
+
+in
+
 {
 
   ###### interface
@@ -21,9 +28,9 @@ with lib;
 
       greetingLine = mkOption {
         type = types.str;
-        default = ''<<< Welcome to NixOS ${config.system.nixosVersion} (\m) - \l >>>'';
         description = ''
           Welcome line printed by mingetty.
+          The default shows current NixOS version label, machine type and tty.
         '';
       };
 
@@ -55,10 +62,11 @@ with lib;
 
   ###### implementation
 
-  config = let
-    autologinArg = optionalString (config.services.mingetty.autologinUser != null) "--autologin ${config.services.mingetty.autologinUser}";
-    gettyCmd = extraArgs: "@${pkgs.utillinux}/sbin/agetty agetty --login-program ${pkgs.shadow}/bin/login ${autologinArg} ${extraArgs}";
-  in {
+  config = {
+    # Note: this is set here rather than up there so that changing
+    # nixosLabel would not rebuild manual pages
+    services.mingetty.greetingLine = mkDefault ''<<< Welcome to NixOS ${config.system.nixosLabel} (\m) - \l >>>'';
+
     systemd.services."getty@" =
       { serviceConfig.ExecStart = gettyCmd "--noclear --keep-baud %I 115200,38400,9600 $TERM";
         restartIfChanged = false;
@@ -81,7 +89,7 @@ with lib;
       { serviceConfig.ExecStart = gettyCmd "--noclear --keep-baud console 115200,38400,9600 $TERM";
         serviceConfig.Restart = "always";
         restartIfChanged = false;
-	enable = mkDefault config.boot.isContainer;
+        enable = mkDefault config.boot.isContainer;
       };
 
     environment.etc = singleton
diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index 81088a56fb12..1c242c88863d 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -67,7 +67,7 @@ let
 
       echo -n "$configurationName" > $out/configuration-name
       echo -n "systemd ${toString config.systemd.package.interfaceVersion}" > $out/init-interface-version
-      echo -n "$nixosVersion" > $out/nixos-version
+      echo -n "$nixosLabel" > $out/nixos-version
       echo -n "$system" > $out/system
 
       mkdir $out/fine-tune
@@ -101,7 +101,7 @@ let
     if [] == failed then pkgs.stdenv.mkDerivation {
       name = let hn = config.networking.hostName;
                  nn = if (hn != "") then hn else "unnamed";
-          in "nixos-system-${nn}-${config.system.nixosVersion}";
+          in "nixos-system-${nn}-${config.system.nixosLabel}";
       preferLocalBuild = true;
       allowSubstitutes = false;
       buildCommand = systemBuilder;
@@ -115,7 +115,7 @@ let
         config.system.build.installBootLoader
         or "echo 'Warning: do not know how to make this configuration bootable; please enable a boot loader.' 1>&2; true";
       activationScript = config.system.activationScripts.script;
-      nixosVersion = config.system.nixosVersion;
+      nixosLabel = config.system.nixosLabel;
 
       configurationName = config.boot.loader.grub.configurationName;
 
diff --git a/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh b/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh
index b9a42b2a196d..78a8e8fd658c 100644
--- a/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh
+++ b/nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh
@@ -83,7 +83,7 @@ addEntry() {
     timestampEpoch=$(stat -L -c '%Z' $path)
 
     timestamp=$(date "+%Y-%m-%d %H:%M" -d @$timestampEpoch)
-    nixosVersion="$(cat $path/nixos-version)"
+    nixosLabel="$(cat $path/nixos-version)"
     extraParams="$(cat $path/kernel-params)"
 
     echo
@@ -91,7 +91,7 @@ addEntry() {
     if [ "$tag" = "default" ]; then
         echo "  MENU LABEL NixOS - Default"
     else
-        echo "  MENU LABEL NixOS - Configuration $tag ($timestamp - $nixosVersion)"
+        echo "  MENU LABEL NixOS - Configuration $tag ($timestamp - $nixosLabel)"
     fi
     echo "  LINUX ../nixos/$(basename $kernel)"
     echo "  INITRD ../nixos/$(basename $initrd)"
diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix
index 1013396c0498..7c4db45a859b 100644
--- a/nixos/modules/virtualisation/azure-image.nix
+++ b/nixos/modules/virtualisation/azure-image.nix
@@ -26,7 +26,7 @@ in
               ${pkgs.vmTools.qemu}/bin/qemu-img convert -f raw -O vpc $diskImage $out/disk.vhd
               rm $diskImage
             '';
-          diskImageBase = "nixos-image-${config.system.nixosVersion}-${pkgs.stdenv.system}.raw";
+          diskImageBase = "nixos-image-${config.system.nixosLabel}-${pkgs.stdenv.system}.raw";
           buildInputs = [ pkgs.utillinux pkgs.perl ];
           exportReferencesGraph =
             [ "closure" config.system.build.toplevel ];
diff --git a/nixos/modules/virtualisation/brightbox-image.nix b/nixos/modules/virtualisation/brightbox-image.nix
index 0eb46d39b521..b6b2bd4f69be 100644
--- a/nixos/modules/virtualisation/brightbox-image.nix
+++ b/nixos/modules/virtualisation/brightbox-image.nix
@@ -26,7 +26,7 @@ in
               rm $diskImageBase
               popd
             '';
-          diskImageBase = "nixos-image-${config.system.nixosVersion}-${pkgs.stdenv.system}.raw";
+          diskImageBase = "nixos-image-${config.system.nixosLabel}-${pkgs.stdenv.system}.raw";
           buildInputs = [ pkgs.utillinux pkgs.perl ];
           exportReferencesGraph =
             [ "closure" config.system.build.toplevel ];
diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix
index f21ddc12ca5a..77074b882468 100644
--- a/nixos/modules/virtualisation/google-compute-image.nix
+++ b/nixos/modules/virtualisation/google-compute-image.nix
@@ -30,7 +30,7 @@ in
               rm $out/disk.raw
               popd
             '';
-          diskImageBase = "nixos-image-${config.system.nixosVersion}-${pkgs.stdenv.system}.raw";
+          diskImageBase = "nixos-image-${config.system.nixosLabel}-${pkgs.stdenv.system}.raw";
           buildInputs = [ pkgs.utillinux pkgs.perl ];
           exportReferencesGraph =
             [ "closure" config.system.build.toplevel ];
diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix
index 425726333c40..da9e75a003ad 100644
--- a/nixos/modules/virtualisation/virtualbox-image.nix
+++ b/nixos/modules/virtualisation/virtualbox-image.nix
@@ -44,8 +44,8 @@ in {
 
     system.build.virtualBoxOVA = pkgs.runCommand "virtualbox-ova"
       { buildInputs = [ pkgs.linuxPackages.virtualbox ];
-        vmName = "NixOS ${config.system.nixosVersion} (${pkgs.stdenv.system})";
-        fileName = "nixos-image-${config.system.nixosVersion}-${pkgs.stdenv.system}.ova";
+        vmName = "NixOS ${config.system.nixosLabel} (${pkgs.stdenv.system})";
+        fileName = "nixos-image-${config.system.nixosLabel}-${pkgs.stdenv.system}.ova";
       }
       ''
         echo "creating VirtualBox VM..."

From 154040ab1c7a854c11e2a92e7c2991f12fd6fcf1 Mon Sep 17 00:00:00 2001
From: Svend Sorensen <svend@ciffer.net>
Date: Fri, 8 Jan 2016 17:06:24 -0800
Subject: [PATCH 470/884] pinentry-mac: init at 0.9.4

---
 pkgs/tools/security/pinentry-mac/default.nix | 26 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/tools/security/pinentry-mac/default.nix

diff --git a/pkgs/tools/security/pinentry-mac/default.nix b/pkgs/tools/security/pinentry-mac/default.nix
new file mode 100644
index 000000000000..faf8c613ea83
--- /dev/null
+++ b/pkgs/tools/security/pinentry-mac/default.nix
@@ -0,0 +1,26 @@
+{ fetchurl, stdenv }:
+
+stdenv.mkDerivation rec {
+  name = "pinentry-mac-0.9.4";
+
+  src = fetchurl {
+    url = "https://github.com/GPGTools/pinentry-mac/archive/v0.9.4.tar.gz";
+    sha256 = "037ebb010377d3a3879ae2a832cefc4513f5c397d7d887d7b86b4e5d9a628271";
+  };
+
+  postPatch = ''
+    substituteInPlace ./Makefile --replace "xcodebuild" "/usr/bin/xcodebuild"
+  '';
+
+  installPhase = ''
+    mkdir -p $out/Applications
+    mv build/Release/pinentry-mac.app $out/Applications
+  '';
+
+  meta = {
+    description = "Pinentry for GPG on Mac";
+    license = stdenv.lib.licenses.gpl2Plus;
+    homepage = "https://github.com/GPGTools/pinentry-mac";
+    platforms = stdenv.lib.platforms.darwin;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7b3e99fcd12f..ee377b17aadf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2741,6 +2741,8 @@ let
     libcap = if stdenv.isDarwin then null else libcap;
   };
 
+  pinentry_mac = callPackage ../tools/security/pinentry-mac { };
+
   pingtcp = callPackage ../tools/networking/pingtcp { };
 
   pius = callPackage ../tools/security/pius { };

From 5db5a0daf4ff143460b65aca8ce32287707a2ece Mon Sep 17 00:00:00 2001
From: Yann Hodique <hodiquey@vmware.com>
Date: Fri, 8 Jan 2016 15:20:30 -0800
Subject: [PATCH 471/884] tmate: 1.8.10 -> 2.2.0

additional changes:
- tmate now depends on external libmsgpack and libssh
- postPatch is no longer useful as it applied to embedded msgpack
- regular automake can now be used
---
 pkgs/tools/misc/tmate/default.nix | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/misc/tmate/default.nix b/pkgs/tools/misc/tmate/default.nix
index 881c9f1c54f8..b50091657995 100644
--- a/pkgs/tools/misc/tmate/default.nix
+++ b/pkgs/tools/misc/tmate/default.nix
@@ -1,26 +1,22 @@
-{ stdenv, fetchFromGitHub, autoconf, automake110x, libtool, pkgconfig, zlib, openssl, libevent, ncurses, cmake, ruby }:
+{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, zlib, openssl, libevent, ncurses, cmake, ruby, libmsgpack, libssh }:
 
 stdenv.mkDerivation rec {
   name = "tmate-${version}";
-  version = "1.8.10";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner  = "nviennot";
     repo   = "tmate";
     rev    = version;
-    sha256 = "1bd9mi8fx40608zlady9dbv21kbdwc3kqrgz012m529f6cbysmzc";
+    sha256 = "1w3a7na0yj1y0x24qckc7s2y9xfak5iv6vyqrd0iibn3b7dxarli";
   };
 
-  buildInputs = [ autoconf automake110x pkgconfig libtool zlib openssl libevent ncurses cmake ruby ];
+  buildInputs = [ autoconf automake pkgconfig libtool zlib openssl libevent ncurses cmake ruby libmsgpack libssh ];
 
   dontUseCmakeConfigure=true;
 
   preConfigure = "./autogen.sh";
 
-  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
-    substituteInPlace msgpack/bootstrap --replace glibtoolize libtoolize
-  '';
-
   meta = {
     homepage = http://tmate.io/;
     description = "Instant Terminal Sharing";

From 073a5e9e412bf83aaae8ae8d4519ba12dc307b51 Mon Sep 17 00:00:00 2001
From: Jakob Gillich <jakob@gillich.me>
Date: Fri, 8 Jan 2016 04:32:39 +0100
Subject: [PATCH 472/884] jekyll: 2.5.3 -> 3.0.1

---
 pkgs/applications/misc/jekyll/Gemfile      |   4 +-
 pkgs/applications/misc/jekyll/Gemfile.lock |  64 ++-----
 pkgs/applications/misc/jekyll/default.nix  |   9 +-
 pkgs/applications/misc/jekyll/gemset.nix   | 204 +++------------------
 4 files changed, 42 insertions(+), 239 deletions(-)

diff --git a/pkgs/applications/misc/jekyll/Gemfile b/pkgs/applications/misc/jekyll/Gemfile
index 460495515a5c..060f7e6a1ff0 100644
--- a/pkgs/applications/misc/jekyll/Gemfile
+++ b/pkgs/applications/misc/jekyll/Gemfile
@@ -1,6 +1,4 @@
-source "https://rubygems.org"
-
+source 'https://rubygems.org'
 gem 'jekyll'
 gem 'rdiscount'
 gem 'RedCloth'
-gem 'rouge'
diff --git a/pkgs/applications/misc/jekyll/Gemfile.lock b/pkgs/applications/misc/jekyll/Gemfile.lock
index 234b567711e8..7bd270732dab 100644
--- a/pkgs/applications/misc/jekyll/Gemfile.lock
+++ b/pkgs/applications/misc/jekyll/Gemfile.lock
@@ -1,70 +1,35 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    rouge (1.10.1)
     RedCloth (4.2.9)
-    blankslate (2.1.2.4)
-    celluloid (0.16.0)
-      timers (~> 4.0.0)
-    classifier-reborn (2.0.3)
-      fast-stemmer (~> 1.0)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.9.1.1)
     colorator (0.1)
-    execjs (2.5.2)
-    fast-stemmer (1.0.2)
-    ffi (1.9.8)
-    hitimes (1.2.2)
-    jekyll (2.5.3)
-      classifier-reborn (~> 2.0)
+    ffi (1.9.10)
+    jekyll (3.0.1)
       colorator (~> 0.1)
-      jekyll-coffeescript (~> 1.0)
-      jekyll-gist (~> 1.0)
-      jekyll-paginate (~> 1.0)
       jekyll-sass-converter (~> 1.0)
       jekyll-watch (~> 1.1)
       kramdown (~> 1.3)
-      liquid (~> 2.6.1)
+      liquid (~> 3.0)
       mercenary (~> 0.3.3)
-      pygments.rb (~> 0.6.0)
-      redcarpet (~> 3.1)
+      rouge (~> 1.7)
       safe_yaml (~> 1.0)
-      toml (~> 0.1.0)
-    jekyll-coffeescript (1.0.1)
-      coffee-script (~> 2.2)
-    jekyll-gist (1.2.1)
-    jekyll-paginate (1.1.0)
-    jekyll-sass-converter (1.3.0)
-      sass (~> 3.2)
-    jekyll-watch (1.2.1)
-      listen (~> 2.7)
-    kramdown (1.7.0)
-    liquid (2.6.2)
-    listen (2.10.0)
-      celluloid (~> 0.16.0)
+    jekyll-sass-converter (1.4.0)
+      sass (~> 3.4)
+    jekyll-watch (1.3.0)
+      listen (~> 3.0)
+    kramdown (1.9.0)
+    liquid (3.0.6)
+    listen (3.0.5)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     mercenary (0.3.5)
-    parslet (1.5.0)
-      blankslate (~> 2.0)
-    posix-spawn (0.3.11)
-    pygments.rb (0.6.3)
-      posix-spawn (~> 0.3.6)
-      yajl-ruby (~> 1.2.0)
-    rb-fsevent (0.9.4)
+    rb-fsevent (0.9.7)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
     rdiscount (2.1.8)
-    redcarpet (3.2.3)
+    rouge (1.10.1)
     safe_yaml (1.0.4)
-    sass (3.4.13)
-    timers (4.0.1)
-      hitimes
-    toml (0.1.2)
-      parslet (~> 1.5.0)
-    yajl-ruby (1.2.1)
+    sass (3.4.20)
 
 PLATFORMS
   ruby
@@ -72,7 +37,6 @@ PLATFORMS
 DEPENDENCIES
   RedCloth
   jekyll
-  rouge
   rdiscount
 
 BUNDLED WITH
diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/applications/misc/jekyll/default.nix
index 5e9505e9f320..bca43398f6ff 100644
--- a/pkgs/applications/misc/jekyll/default.nix
+++ b/pkgs/applications/misc/jekyll/default.nix
@@ -1,9 +1,10 @@
-{ stdenv, lib, bundlerEnv, ruby_2_1, curl }:
+{ stdenv, lib, bundlerEnv, ruby_2_2, curl }:
 
-bundlerEnv {
-  name = "jekyll-2.5.3";
+bundlerEnv rec {
+  name = "jekyll-${version}";
+  version = "3.0.1";
 
-  ruby = ruby_2_1;
+  ruby = ruby_2_2;
   gemfile = ./Gemfile;
   lockfile = ./Gemfile.lock;
   gemset = ./gemset.nix;
diff --git a/pkgs/applications/misc/jekyll/gemset.nix b/pkgs/applications/misc/jekyll/gemset.nix
index 99dc7b31eab2..6d45aef5e545 100644
--- a/pkgs/applications/misc/jekyll/gemset.nix
+++ b/pkgs/applications/misc/jekyll/gemset.nix
@@ -6,58 +6,6 @@
       sha256 = "06pahxyrckhgb7alsxwhhlx1ib2xsx33793finj01jk8i054bkxl";
     };
   };
-  "rouge" = {
-    version = "1.10.1";
-    source = {
-      type = "gem";
-      sha256 = "0wp8as9ypdy18kdj9h70kny1rdfq71mr8cj2bpahr9vxjjvjasqz";
-    };
-  };
-  "blankslate" = {
-    version = "2.1.2.4";
-    source = {
-      type = "gem";
-      sha256 = "0jnnq5q5dwy2rbfcl769vd9bk1yn0242f6yjlb9mnqdm9627cdcx";
-    };
-  };
-  "celluloid" = {
-    version = "0.16.0";
-    source = {
-      type = "gem";
-      sha256 = "044xk0y7i1xjafzv7blzj5r56s7zr8nzb619arkrl390mf19jxv3";
-    };
-    dependencies = [
-      "timers"
-    ];
-  };
-  "classifier-reborn" = {
-    version = "2.0.3";
-    source = {
-      type = "gem";
-      sha256 = "0vca8jl7nbgzyb7zlvnq9cqgabwjdl59jqlpfkwzv6znkri7cpby";
-    };
-    dependencies = [
-      "fast-stemmer"
-    ];
-  };
-  "coffee-script" = {
-    version = "2.4.1";
-    source = {
-      type = "gem";
-      sha256 = "0rc7scyk7mnpfxqv5yy4y5q1hx3i7q3ahplcp4bq2g5r24g2izl2";
-    };
-    dependencies = [
-      "coffee-script-source"
-      "execjs"
-    ];
-  };
-  "coffee-script-source" = {
-    version = "1.9.1.1";
-    source = {
-      type = "gem";
-      sha256 = "1arfrwyzw4sn7nnaq8jji5sv855rp4c5pvmzkabbdgca0w1cxfq5";
-    };
-  };
   "colorator" = {
     version = "0.1";
     source = {
@@ -65,124 +13,71 @@
       sha256 = "09zp15hyd9wlbgf1kmrf4rnry8cpvh1h9fj7afarlqcy4hrfdpvs";
     };
   };
-  "execjs" = {
-    version = "2.5.2";
-    source = {
-      type = "gem";
-      sha256 = "0y2193yhcyz9f97m7g3wanvwzdjb08sllrj1g84sgn848j12vyl0";
-    };
-  };
-  "fast-stemmer" = {
-    version = "1.0.2";
-    source = {
-      type = "gem";
-      sha256 = "0688clyk4xxh3kdb18vi089k90mca8ji5fwaknh3da5wrzcrzanh";
-    };
-  };
   "ffi" = {
-    version = "1.9.8";
+    version = "1.9.10";
     source = {
       type = "gem";
-      sha256 = "0ph098bv92rn5wl6rn2hwb4ng24v4187sz8pa0bpi9jfh50im879";
-    };
-  };
-  "hitimes" = {
-    version = "1.2.2";
-    source = {
-      type = "gem";
-      sha256 = "17y3ggqxl3m6x9gqpgdn39z0pxpmw666d40r39bs7ngdmy680jn4";
+      sha256 = "1m5mprppw0xcrv2mkim5zsk70v089ajzqiq5hpyb0xg96fcyzyxj";
     };
   };
   "jekyll" = {
-    version = "2.5.3";
+    version = "3.0.1";
     source = {
       type = "gem";
-      sha256 = "1ad3d62yd5rxkvn3xls3xmr2wnk8fiickjy27g098hs842wmw22n";
+      sha256 = "107svn6r7pvkg9wwfi4r44d2rqppysjf9zf09h7z1ajsy8k2s65a";
     };
     dependencies = [
-      "classifier-reborn"
       "colorator"
-      "rogue"
-      "jekyll-coffeescript"
-      "jekyll-gist"
-      "jekyll-paginate"
       "jekyll-sass-converter"
       "jekyll-watch"
       "kramdown"
       "liquid"
       "mercenary"
-      "pygments.rb"
-      "redcarpet"
+      "rouge"
       "safe_yaml"
-      "toml"
     ];
   };
-  "jekyll-coffeescript" = {
-    version = "1.0.1";
-    source = {
-      type = "gem";
-      sha256 = "19nkqbaxqbzqbfbi7sgshshj2krp9ap88m9fc5pa6mglb2ypk3hg";
-    };
-    dependencies = [
-      "coffee-script"
-    ];
-  };
-  "jekyll-gist" = {
-    version = "1.2.1";
-    source = {
-      type = "gem";
-      sha256 = "10hywgdwqafa21nwa5br54wvp4wsr3wnx64v8d81glj5cs17f9bv";
-    };
-  };
-  "jekyll-paginate" = {
-    version = "1.1.0";
-    source = {
-      type = "gem";
-      sha256 = "0r7bcs8fq98zldih4787zk5i9w24nz5wa26m84ssja95n3sas2l8";
-    };
-  };
   "jekyll-sass-converter" = {
-    version = "1.3.0";
+    version = "1.4.0";
     source = {
       type = "gem";
-      sha256 = "1xqmlr87xmzpalf846gybkbfqkj48y3fva81r7c7175my9p4ykl1";
+      sha256 = "095757w0pg6qh3wlfg1j1mw4fsz7s89ia4zai5f2rhx9yxsvk1d8";
     };
     dependencies = [
       "sass"
     ];
   };
   "jekyll-watch" = {
-    version = "1.2.1";
+    version = "1.3.0";
     source = {
       type = "gem";
-      sha256 = "0p9mc8m4bggsqlq567g1g67z5fvzlm7yyv4l8717l46nq0d52gja";
+      sha256 = "1mqwvrd2hm6ah5zsxqsv2xdp31wl94pl8ybb1q324j79z8pvyarg";
     };
     dependencies = [
       "listen"
     ];
   };
   "kramdown" = {
-    version = "1.7.0";
+    version = "1.9.0";
     source = {
       type = "gem";
-      sha256 = "070r81kz88zw28c8bs5p0p92ymn1nldci2fm1arkas0bnqrd3rna";
+      sha256 = "12sral2xli39mnr4b9m2sxdlgam4ni0a1mkxawc5311z107zj3p0";
     };
   };
   "liquid" = {
-    version = "2.6.2";
+    version = "3.0.6";
     source = {
       type = "gem";
-      sha256 = "1k7lx7szwnz7vv3hqpdb6bgw8p73sa1ss9m1m5h0jaqb9xkqnfzb";
+      sha256 = "033png37ym4jrjz5bi7zb4ic4yxacwvnllm1xxmrnr4swgyyygc2";
     };
   };
   "listen" = {
-    version = "2.10.0";
+    version = "3.0.5";
     source = {
       type = "gem";
-      sha256 = "131pgi5bsqln2kfkp72wpi0dfz5i124758xcl1h3c5gz75j0vg2i";
+      sha256 = "182wd2pkf690ll19lx6zbk01a3rqkk5lwsyin6kwydl7lqxj5z3g";
     };
     dependencies = [
-      "celluloid"
       "rb-fsevent"
       "rb-inotify"
     ];
@@ -194,39 +89,11 @@
       sha256 = "0ls7z086v4xl02g4ia5jhl9s76d22crgmplpmj0c383liwbqi9pb";
     };
   };
-  "parslet" = {
-    version = "1.5.0";
-    source = {
-      type = "gem";
-      sha256 = "0qp1m8n3m6k6g22nn1ivcfkvccq5jmbkw53vvcjw5xssq179l9z3";
-    };
-    dependencies = [
-      "blankslate"
-    ];
-  };
-  "posix-spawn" = {
-    version = "0.3.11";
-    source = {
-      type = "gem";
-      sha256 = "052lnxbkvlnwfjw4qd7vn2xrlaaqiav6f5x5bcjin97bsrfq6cmr";
-    };
-  };
-  "pygments.rb" = {
-    version = "0.6.3";
-    source = {
-      type = "gem";
-      sha256 = "160i761q2z8kandcikf2r5318glgi3pf6b45wa407wacjvz2966i";
-    };
-    dependencies = [
-      "posix-spawn"
-      "yajl-ruby"
-    ];
-  };
   "rb-fsevent" = {
-    version = "0.9.4";
+    version = "0.9.7";
     source = {
       type = "gem";
-      sha256 = "12if5xsik64kihxf5awsyavlp595y47g9qz77vfp2zvkxgglaka7";
+      sha256 = "1xlkflgxngwkd4nyybccgd1japrba4v3kwnp00alikj404clqx4v";
     };
   };
   "rb-inotify" = {
@@ -246,11 +113,11 @@
       sha256 = "0vcyy90r6wfg0b0y5wqp3d25bdyqjbwjhkm1xy9jkz9a7j72n70v";
     };
   };
-  "redcarpet" = {
-    version = "3.2.3";
+  "rouge" = {
+    version = "1.10.1";
     source = {
       type = "gem";
-      sha256 = "0l6zr8wlqb648z202kzi7l9p89b6v4ivdhif5w803l1rrwyzvj0m";
+      sha256 = "0wp8as9ypdy18kdj9h70kny1rdfq71mr8cj2bpahr9vxjjvjasqz";
     };
   };
   "safe_yaml" = {
@@ -261,37 +128,10 @@
     };
   };
   "sass" = {
-    version = "3.4.13";
+    version = "3.4.20";
     source = {
       type = "gem";
-      sha256 = "0wxkjm41xr77pnfi06cbwv6vq0ypbni03jpbpskd7rj5b0zr27ig";
-    };
-  };
-  "timers" = {
-    version = "4.0.1";
-    source = {
-      type = "gem";
-      sha256 = "03ahv07wn1f2g3c5843q7sf03a81518lq5624s9f49kbrswa2p7l";
-    };
-    dependencies = [
-      "hitimes"
-    ];
-  };
-  "toml" = {
-    version = "0.1.2";
-    source = {
-      type = "gem";
-      sha256 = "1wnvi1g8id1sg6776fvzf98lhfbscchgiy1fp5pvd58a8ds2fq9v";
-    };
-    dependencies = [
-      "parslet"
-    ];
-  };
-  "yajl-ruby" = {
-    version = "1.2.1";
-    source = {
-      type = "gem";
-      sha256 = "0zvvb7i1bl98k3zkdrnx9vasq0rp2cyy5n7p9804dqs4fz9xh9vf";
+      sha256 = "04rpdcp258arh2wgdk9shbqnzd6cbbbpi3wpi9a0wby8awgpxmyf";
     };
   };
 }

From e11004cdf357cd63dd4fe99305a8e990e968855c Mon Sep 17 00:00:00 2001
From: Matthew O'Gorman <mog@rldn.net>
Date: Fri, 8 Jan 2016 23:00:29 -0500
Subject: [PATCH 473/884] zap: init at 2.4.3

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

diff --git a/pkgs/tools/networking/zap/default.nix b/pkgs/tools/networking/zap/default.nix
new file mode 100644
index 000000000000..896f260f2e9d
--- /dev/null
+++ b/pkgs/tools/networking/zap/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, jre, jdk, ant }:
+
+stdenv.mkDerivation rec {
+  name = "zap-${version}";
+  version = "2.4.3";
+  src = fetchFromGitHub {
+    owner = "zaproxy";
+    repo = "zaproxy";
+    rev ="${version}";
+    sha256 = "1np9jxy09j8wzqcxw3c71x9hwrrbkjlz7qw903kv43wr74mv2snd";
+  };
+
+  buildInputs = [ jdk ant ];
+
+  buildPhase = ''
+    cd build
+    ant -f build.xml setup init  compile dist copy-source-to-build package-linux
+  '';
+
+  installPhase = ''
+    mkdir -p "$out/share"
+    tar xvf  "ZAP_${version}_Linux.tar.gz" -C "$out/share/"
+    mkdir -p "$out/bin"
+    echo "#!/bin/sh" > "$out/bin/zap"
+    echo \"$out/share/ZAP_${version}/zap.sh\" >> "$out/bin/zap"
+    chmod +x "$out/bin/zap"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://www.owasp.org/index.php/ZAP";
+    description = "Java application for web penetration testing";
+    maintainers = with maintainers; [ mog ]; 
+    platforms = platforms.linux;
+    license = licenses.asl20;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d6bb0070912b..55e2ad529555 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15765,6 +15765,8 @@ let
 
   yara = callPackage ../tools/security/yara { };
 
+  zap = callPackage ../tools/networking/zap { };
+
   zdfmediathk = callPackage ../applications/video/zdfmediathk { };
 
   zopfli = callPackage ../tools/compression/zopfli { };

From 4e9729298e57fb98c7ee9e8e47d4c4704147beb0 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sat, 9 Jan 2016 15:08:30 +0900
Subject: [PATCH 474/884] thunderbird-bin: 38.5.0 -> 38.5.1

---
 .../mailreaders/thunderbird-bin/sources.nix   | 234 +++++++++---------
 1 file changed, 117 insertions(+), 117 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
index 8b06d083dc0e..b758bf996d26 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
@@ -4,123 +4,123 @@
 # ruby generate_sources.rb > sources.nix
 
 {
-  version = "38.5.0";
+  version = "38.5.1";
   sources = [
-    { locale = "ar"; arch = "linux-i686"; sha256 = "29237bd1fff3790d891fcfa18959b808afa88c35b9c7036cc3cf79737560c3a5"; }
-    { locale = "ar"; arch = "linux-x86_64"; sha256 = "480120055452c284eef26329419faa176cc5abff90c3dd986ea1d3478b869984"; }
-    { locale = "ast"; arch = "linux-i686"; sha256 = "e659e19bc053a95bb4d753ff452637a29f792e61247fd1b70f70e90f62e8a268"; }
-    { locale = "ast"; arch = "linux-x86_64"; sha256 = "1755ad5c097b92342224f7d659fc1c0db899b15f6874fcd256f76fac1bf27488"; }
-    { locale = "be"; arch = "linux-i686"; sha256 = "3682652d2aae978ceef32b4dccb2e20c4dc5584b6840df823664c214495e89bd"; }
-    { locale = "be"; arch = "linux-x86_64"; sha256 = "99a5e05ea1cd5a302b24b0bf8a87e495de1bd044d7335609016fbae49786a6b0"; }
-    { locale = "bg"; arch = "linux-i686"; sha256 = "cd0b6cf8b620d619040a64f8692f78fcacf5500b5c092a6a40552397f56e2757"; }
-    { locale = "bg"; arch = "linux-x86_64"; sha256 = "4001a26df6cee9182b85370e51d9e54284a066e8f8002c6dafc2ca872153ca36"; }
-    { locale = "bn-BD"; arch = "linux-i686"; sha256 = "bcdc5791b3a95c12e8cb19f92d57191360fff12ddf116d92b8ca1b32aa977827"; }
-    { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "037459abe2bf39d0ca05b0abfb18d112b9e56b4888b64ae956a6317800cc0047"; }
-    { locale = "br"; arch = "linux-i686"; sha256 = "1c907debf9f9c9a949bd1c7e7329ebc2fbdd6ff19ecf9411a67ce27079dae1ee"; }
-    { locale = "br"; arch = "linux-x86_64"; sha256 = "ace19a987e0a5fb10cf73d1b031e96c9333054083ab380e9a602f00b3347f334"; }
-    { locale = "ca"; arch = "linux-i686"; sha256 = "5553dcde7e432643516405f465a981f52d5eaf3e53f7cec7d179034778d74122"; }
-    { locale = "ca"; arch = "linux-x86_64"; sha256 = "1d3ee5b1487ff62243147aaaa1ba984976a969ddc0c7697b1f361db6a5d66023"; }
-    { locale = "cs"; arch = "linux-i686"; sha256 = "d22a52c3e5d66a4cb8d084e7127f0acf79a36fbc1e96cccbb66adb205a4eb7a6"; }
-    { locale = "cs"; arch = "linux-x86_64"; sha256 = "f75b81a8a984ef52bd5a11fbd98f00b16a1696c5dca9b2315ca35d23ed6ad4b9"; }
-    { locale = "cy"; arch = "linux-i686"; sha256 = "0cae8f5bcff66cea0ea7a92f4503039078402eb149bca9a1bbbb170423a9625f"; }
-    { locale = "cy"; arch = "linux-x86_64"; sha256 = "e4d5c5d920489ad73ceb2a0582285d35bc9fdf2e817a14a20d563b3f36dca71b"; }
-    { locale = "da"; arch = "linux-i686"; sha256 = "7cdbc0622b71ead86d7d180fab328b4346bba324f43381680cb9e4cad026667d"; }
-    { locale = "da"; arch = "linux-x86_64"; sha256 = "95cb578a1b9d271c7597852be14c18bd057eae01ef62429197ea47cb97f367b7"; }
-    { locale = "de"; arch = "linux-i686"; sha256 = "5e7a7d84bba7e3ce06a31678e2b97439597b5185866586c69f61d3eeaead7bf8"; }
-    { locale = "de"; arch = "linux-x86_64"; sha256 = "6d221dc885188ae683eb0c103b8551d25f2c26a82456abfcaea695b4555c83e1"; }
-    { locale = "dsb"; arch = "linux-i686"; sha256 = "d5cc9990acc678c483bc19649d67af96dda0308f66eea61f5917fcb40db13a4f"; }
-    { locale = "dsb"; arch = "linux-x86_64"; sha256 = "01ad8dbd1b9fac2dfe269ed171ab6fe32751892147f136f9ab8c8d023ed0fe11"; }
-    { locale = "el"; arch = "linux-i686"; sha256 = "7040a9d0c51ce310e74e9d3b1c04f5088ba688212100700f78e1c7b4f8722739"; }
-    { locale = "el"; arch = "linux-x86_64"; sha256 = "e2a3b0f3b022c320b0b7b372442cb85ac716f85e757cdf107246a6b7d4715835"; }
-    { locale = "en-GB"; arch = "linux-i686"; sha256 = "c7258c7864087eb90d59f763ed0b23ee99f2a6a45c433d97e89583ea37ccdb32"; }
-    { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "af32ae7ba6d7b61d46c074ec0086fce4150b5b6255eb43c3c17c97f597b688d1"; }
-    { locale = "en-US"; arch = "linux-i686"; sha256 = "c7794f3e1d51fa7e0935d689078b348114d3abf010a0525b22e5375950b6098e"; }
-    { locale = "en-US"; arch = "linux-x86_64"; sha256 = "01bb4a3bd43aa5dde30197178cb50ac35ac62cde637227aca8bdd410c9f62546"; }
-    { locale = "es-AR"; arch = "linux-i686"; sha256 = "f89e5f28d792161cd5b791ad68eb64c6a55a5de15dc00d5b042153b8fe549ab4"; }
-    { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "a7c3102c5c5c6999723fa889af88f1d14630867334db8703ca9b5f5368359127"; }
-    { locale = "es-ES"; arch = "linux-i686"; sha256 = "a01fc84e9ce676f9b163e882cee5b6ca70b98a43b2937c6f5298f800b7ee3d78"; }
-    { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "030840e14241776d60cbd1ce9d0790df4e4f7b1fd5f554df9a3a51c9421af573"; }
-    { locale = "et"; arch = "linux-i686"; sha256 = "f6da6a171f4a00afaf5af2fbcc6cdd7504e00cc38f62baad1f9aad51467ef191"; }
-    { locale = "et"; arch = "linux-x86_64"; sha256 = "8fed1407c48e0f7f39c888f08001ec0705c09b587a6921b2644e91020e8f2763"; }
-    { locale = "eu"; arch = "linux-i686"; sha256 = "0f1c30b2e5c6d1a2359a1714605ab382c617a00fb2a3ab9aa0570c27df6bc1a6"; }
-    { locale = "eu"; arch = "linux-x86_64"; sha256 = "5192b9230659a8ec35abf4353201d6f2ac66c1ffce33d0dd68c38dbb1302029c"; }
-    { locale = "fi"; arch = "linux-i686"; sha256 = "5812be19808c789c6f36484aad72ead4a5b75ce52d91047794da0c5919a4f68f"; }
-    { locale = "fi"; arch = "linux-x86_64"; sha256 = "64243724356329e81f8754f4bc1d3e848a6544f598ceec44ac63a69d52003944"; }
-    { locale = "fr"; arch = "linux-i686"; sha256 = "63117d10a3fa00b86eaf9023d562ca817ea44b89788de190d7870c22df6ee5b1"; }
-    { locale = "fr"; arch = "linux-x86_64"; sha256 = "22715532882458ff60ccf52c5502eddb5f7a9ef646a22915c3928ff6ca244bdf"; }
-    { locale = "fy-NL"; arch = "linux-i686"; sha256 = "9be2f10d9f5dcddc7b5119609ac9b864aa61b2e1839e3bdce3f4e742f5e94c12"; }
-    { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "a71900daca5ac832240fa27c15ad76afca75b8b86c101899c58f6ee20bd33fc2"; }
-    { locale = "ga-IE"; arch = "linux-i686"; sha256 = "4426fcb698d40fc796a3affafda1f142e4f252e3861354915a8ba4db41e28754"; }
-    { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "a7533879eda14dd1b6e8ce4e68006fd1d1fff9b7fec12c14f30871084625581c"; }
-    { locale = "gd"; arch = "linux-i686"; sha256 = "82593c88c14b6ac518d0da17aced0ffe4a78e06faf4275508218fd09da535f4b"; }
-    { locale = "gd"; arch = "linux-x86_64"; sha256 = "3ec0a23d6ac098dd97dec52778202d6dc24cd76d7f142a452b4309be32d9cc29"; }
-    { locale = "gl"; arch = "linux-i686"; sha256 = "64cd467c054da7506b5e72e159c0829a6d41db1482d9343a8cdd5b0bf7166d0f"; }
-    { locale = "gl"; arch = "linux-x86_64"; sha256 = "a9ec09c8cbc54f071f80226bb203f4f5823f71cf376978d0e69cefc5562cd5bf"; }
-    { locale = "he"; arch = "linux-i686"; sha256 = "bb21099de57446c1a9284fa54ed491bbd1d104b64f9c479b8d0ded607fb79c7d"; }
-    { locale = "he"; arch = "linux-x86_64"; sha256 = "4397b52af2d90e0642b7e66fc39b60987dbba94737666e205df8b1b0b4c280de"; }
-    { locale = "hr"; arch = "linux-i686"; sha256 = "65164ae7e551458bcb8afef5da13d1a632c7ddb181e112833b1fe0a0ab391c17"; }
-    { locale = "hr"; arch = "linux-x86_64"; sha256 = "e026eae7e0eb85558ad58616a90240e14bd9011bbe6ed5bcf68788ad21d182eb"; }
-    { locale = "hsb"; arch = "linux-i686"; sha256 = "c2bd24db8c46a11108241a3aa6f57f234aa52e982af013e081c4b45621878b7b"; }
-    { locale = "hsb"; arch = "linux-x86_64"; sha256 = "b01690e94a2f8b5d8049ac62061206fc296b6a7e2c609d3368facefa246f06e5"; }
-    { locale = "hu"; arch = "linux-i686"; sha256 = "7ea9be32fc7b198e300273a973162364a4dbe17bfa6b7e5fe39bd01fbd93c79e"; }
-    { locale = "hu"; arch = "linux-x86_64"; sha256 = "d9ca99cb52265fe8cf89c9b48469479dcb9e251f8c3f3527540c19f44439234b"; }
-    { locale = "hy-AM"; arch = "linux-i686"; sha256 = "899906072114caaab0e7f48a7b67f77dbeca7d2130171a2277c98116479951ea"; }
-    { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "6a636b312c1a38474cd26700b0419e2cb174c440e4ac652a6d29bf6837a2bdd1"; }
-    { locale = "id"; arch = "linux-i686"; sha256 = "9827c378de89d3eed6bd297233c934fa7a84796efb02d82a4be1f8235c2dbe6c"; }
-    { locale = "id"; arch = "linux-x86_64"; sha256 = "23075b98ac7a1674cd1189806680062eb0eb35cbe08d7d0592242295184932bc"; }
-    { locale = "is"; arch = "linux-i686"; sha256 = "e64f2b7dfa4654bb681bfa5c34adc9d64400c3c7dfb1f9dd7ab0c04d998c6784"; }
-    { locale = "is"; arch = "linux-x86_64"; sha256 = "2049e8c19e3a58f1f0f08926e786c3a2d81292d94eb0346b54ae86edba35bf3b"; }
-    { locale = "it"; arch = "linux-i686"; sha256 = "12941cb1feec8beacc8cf62b94f902ddacadc424abe511226be2e85248496a60"; }
-    { locale = "it"; arch = "linux-x86_64"; sha256 = "9da22cef1e8b5d92c048c8bee59ca88b9801f95073083c218412de0406af6dc4"; }
-    { locale = "ja"; arch = "linux-i686"; sha256 = "bdd5fee3bc2d807b1b6329f0f8f14bed85f8eacfc1210f4a5204687b7c0e250b"; }
-    { locale = "ja"; arch = "linux-x86_64"; sha256 = "c48477523b11d7ec6314f54c2d0d62b35c6474b06bbd7c0bd0317971303a1073"; }
-    { locale = "ko"; arch = "linux-i686"; sha256 = "d887a32f4073231856522ba034c4e952eb56d7ed06895e0d26dfc3d3a7488b0f"; }
-    { locale = "ko"; arch = "linux-x86_64"; sha256 = "c02ff12289d32d5d3ad5f88a5c851f46f8d31c66ce8013622959f537cae1101b"; }
-    { locale = "lt"; arch = "linux-i686"; sha256 = "99095f5f55c3ce6d0bb485d25eff1afdadb63e8f41caaddacceced71a92bbb9e"; }
-    { locale = "lt"; arch = "linux-x86_64"; sha256 = "a4de32255d7334bf1eabda06332f8665a9d60bdf667a43c219ba2de08865f1e8"; }
-    { locale = "nb-NO"; arch = "linux-i686"; sha256 = "8b547faa6f76d1aa1f0f33235380e5379663c5d6e66e55ea0baa61a62f37e272"; }
-    { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "17873b2664d665d1d53fe69c4041aa6474f58a18cf5dc0f86b739d95d193bb48"; }
-    { locale = "nl"; arch = "linux-i686"; sha256 = "ba36cb5c4b008f878b181ed3ff56198cd83739fb9d2018d6710288daafa6df7a"; }
-    { locale = "nl"; arch = "linux-x86_64"; sha256 = "04afe1c59bfdfb9573623e9e84165863465356ec7872f1afc448c841c4e9392d"; }
-    { locale = "nn-NO"; arch = "linux-i686"; sha256 = "2fa6cc0e585574d3460597b25c6549b2aebd2b2af203edef960dea2b81bae954"; }
-    { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "ca8bdb92d16a89f7baca59e0c11662d2dfead62eb209746d738fbccbea8d00c5"; }
-    { locale = "pa-IN"; arch = "linux-i686"; sha256 = "79575806b00f77adae3b2ad794c2e268436e2b4b2904186ea88caa2bbcc5e232"; }
-    { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "2220b6bc45f98f088c653ee255718613b43e93691173441f0825c39e3ea8c263"; }
-    { locale = "pl"; arch = "linux-i686"; sha256 = "829788db6afdb0f09b23d0230abf176153a252a76964ae4ad6df161568e03b6b"; }
-    { locale = "pl"; arch = "linux-x86_64"; sha256 = "89792685c6ff26bae9d42326dbe0ca77b6a651df51ba02bd76a85692c83aba5a"; }
-    { locale = "pt-BR"; arch = "linux-i686"; sha256 = "b7898b8fde2c32c8d7fe105ab88751fb9acaa756f3826dfaab3fa33fa7bfd5a4"; }
-    { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "691e722d24695960574fb5423d2d5713d3729a0cf3bbffdbe3f550b1b0a8a91b"; }
-    { locale = "pt-PT"; arch = "linux-i686"; sha256 = "06e9c005c45b6d71e4f4957ae0d92578baf2b0ff783f38dca4a5018f84319bfd"; }
-    { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "5422bf1e694a462864759374bc3afdf9f0033121b879413a3edc18a20d406b4e"; }
-    { locale = "rm"; arch = "linux-i686"; sha256 = "54c0f6dfc40b748f74ab9fd79dd4b0987ce17eced23b293cf83b1867f38d7c53"; }
-    { locale = "rm"; arch = "linux-x86_64"; sha256 = "a164dfa18736b3f84ce2a80fea1f6441bbd3de113c26eab503ab7710866f7555"; }
-    { locale = "ro"; arch = "linux-i686"; sha256 = "3135adfb8c2b674545d3e80a8f3d77a89332dbe4cdff0f05817d5ae2edac8025"; }
-    { locale = "ro"; arch = "linux-x86_64"; sha256 = "7a95f8853d5776267ab62fcc208214a7a4f2a7d82350ac7967ca90ab2178e737"; }
-    { locale = "ru"; arch = "linux-i686"; sha256 = "df9cb429c6fe10e7aeae06d49329fed27cf9cd84b3b28e7fef82008399dfe453"; }
-    { locale = "ru"; arch = "linux-x86_64"; sha256 = "aa97b360bd5cfd0686b0d75df21500249e0f7ab1586e37774d60040abdd2ecd8"; }
-    { locale = "si"; arch = "linux-i686"; sha256 = "ba1ef9b8576589a9bf8523f26fe42416f14f4c38b74b4519792aff6896a4c34b"; }
-    { locale = "si"; arch = "linux-x86_64"; sha256 = "bcd73d4a1187d8e43dcbfd7bb4df3c0f7893175785d633113b0a5b526bb718d8"; }
-    { locale = "sk"; arch = "linux-i686"; sha256 = "004423ed395fcc4cba02e703f5086f9255758edd2bd3125adeb8fb006a4f769e"; }
-    { locale = "sk"; arch = "linux-x86_64"; sha256 = "9abb27a35c2076fc3c85e18b20f909ba41b4618afda51f2adbb0ef960b67483f"; }
-    { locale = "sl"; arch = "linux-i686"; sha256 = "ff2dca954720bcb1947c18b1013666c6568f6638b204adf5a0277e6bff64f468"; }
-    { locale = "sl"; arch = "linux-x86_64"; sha256 = "a334a65d54efaacdafcddad336f313d24b594c14bfc874159cd9a4ca9ded2b03"; }
-    { locale = "sq"; arch = "linux-i686"; sha256 = "b5e53cd682a8b4494074c1c0c7e4d4fb94a36a06e81522cb4b7289b4ed6bd486"; }
-    { locale = "sq"; arch = "linux-x86_64"; sha256 = "747174de108fcf0a7201e22df90f613846a0b66384b007ccddeb51b6dc651aca"; }
-    { locale = "sr"; arch = "linux-i686"; sha256 = "fa53bfe3c00878b462e6aa3a0bf76a6e1e4dc6d9095f2104a355ac5b773e936c"; }
-    { locale = "sr"; arch = "linux-x86_64"; sha256 = "308965f1b97405e7c6db95e7cffae69fe6a899539782c06b1446ab97ddb19d45"; }
-    { locale = "sv-SE"; arch = "linux-i686"; sha256 = "0b2e6e13cd30b46b81c8fb9fd195d27ce96c40f03d17ba0f8095d4ddd226ff45"; }
-    { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "dc47f9c38a845461db14a08d67f143c8b5ba04aa441aeecae8bd8f3cbf79fca6"; }
-    { locale = "ta-LK"; arch = "linux-i686"; sha256 = "3f5afc0975aebe8981202927fe5507065c47ccd64f1ddd8adb426c0032ee267e"; }
-    { locale = "ta-LK"; arch = "linux-x86_64"; sha256 = "8a9b241836c0b495865e9d64d2e89cb054a01e8e3fb55ee8a1cbbd0def7d5a93"; }
-    { locale = "tr"; arch = "linux-i686"; sha256 = "c104cbdfaee89946ab11b3bc0de6cfaf5d88f5e18a6be400dc573e7b1c10319d"; }
-    { locale = "tr"; arch = "linux-x86_64"; sha256 = "717c460478cdb986fbfcd5fcd16f7fb66af930e3ca2826176b7158ff865d51a5"; }
-    { locale = "uk"; arch = "linux-i686"; sha256 = "dcfbdd8ba1897bdfcb26b0ec1c50a88808c2ca988418cca56eab74e1f870ba1c"; }
-    { locale = "uk"; arch = "linux-x86_64"; sha256 = "648764a8aad2ea954416f2293023598cd26d4bae1bb44da1406868d1286c3f58"; }
-    { locale = "vi"; arch = "linux-i686"; sha256 = "2b938e4c4614de013b9e0f7d4bdde0353cea42c7651491f2d92323a25d9157d6"; }
-    { locale = "vi"; arch = "linux-x86_64"; sha256 = "82571f95eaf3a88c7cc7fc056779ed4f4ea5664333c5e015ccd4995fc48ca0a7"; }
-    { locale = "zh-CN"; arch = "linux-i686"; sha256 = "db6a5619c7fcd9487ecd5518590a7ad28ee4a9fd12348c950ce1b12de5232dfe"; }
-    { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "36ac3599d3bba4a4e982df6cbb355becc0e0e237b127c3b2afea3618754fafbe"; }
-    { locale = "zh-TW"; arch = "linux-i686"; sha256 = "269dccd617074567654a053186d6830fff38503431156db5a00d70bef093bf0e"; }
-    { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "c78e2ad7df58f86a26bb81c13a27a8722884573278a1dd179ffba577902c92e5"; }
+    { locale = "ar"; arch = "linux-i686"; sha256 = "428fb92fe6a30f528c13f59d321eb479638133b98692e9abb2821550312027ed"; }
+    { locale = "ar"; arch = "linux-x86_64"; sha256 = "aaa65b171336d8fac42d94f2b7e41ea286415ee0337afcff2c8dc55ea4d01d09"; }
+    { locale = "ast"; arch = "linux-i686"; sha256 = "432e71e48a46bc7e90bfac8820b470346fe6b95e8545a7b6a8b5e799c7658fb6"; }
+    { locale = "ast"; arch = "linux-x86_64"; sha256 = "d8ee8d92f9635396cfe8a27dc57b407a428a0fb210c849b5faa9d7a1458328db"; }
+    { locale = "be"; arch = "linux-i686"; sha256 = "19b33c2683b5ee20264533d64c717320fb82187074c1b4d42e902b3021ac8907"; }
+    { locale = "be"; arch = "linux-x86_64"; sha256 = "8b7659c5327cd6552c4a743cd92100bbdc10b6623021eab79265027b9a0f1550"; }
+    { locale = "bg"; arch = "linux-i686"; sha256 = "02a0d0858de83abb9c732787522b45e8cfad419b765a0922426197c9f9a00f9f"; }
+    { locale = "bg"; arch = "linux-x86_64"; sha256 = "dd0ae9d067365b66a55e337c6b294d672c997c88024b17223583d9ccfb667488"; }
+    { locale = "bn-BD"; arch = "linux-i686"; sha256 = "422b42cc56b3fda6aecece1e0d934f43970fa7a8dfed0bbe859bf0e7daf6f8fd"; }
+    { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "f4edee91b6101aa4b8c308cf02d1cb926cff4beb44f840b86e0d01232dc5b88f"; }
+    { locale = "br"; arch = "linux-i686"; sha256 = "d64078fe9092e9288cb270b0d35be25a5d8d225f70d4a902d8a5c89b36b0a1a2"; }
+    { locale = "br"; arch = "linux-x86_64"; sha256 = "68b3234560f9678f3b9b1f11ccdfa2109026ca3dce321bb2732b024fbd77ce0e"; }
+    { locale = "ca"; arch = "linux-i686"; sha256 = "a7082da8adf2098449ecaf6750607e394fb03e3e1ba974852bf596c4dc961531"; }
+    { locale = "ca"; arch = "linux-x86_64"; sha256 = "6a81e6713b0b4e01d575c4709137eb8b50811f3ce4fb7222c3466e5dcedcd244"; }
+    { locale = "cs"; arch = "linux-i686"; sha256 = "512a02a544c522b59fd86705668264b2fa85fc738dd93878289230e05f38bd71"; }
+    { locale = "cs"; arch = "linux-x86_64"; sha256 = "809ff680e80ffc8b5aaa631b346d8a34df4b99362e048d16e4d415f32d721710"; }
+    { locale = "cy"; arch = "linux-i686"; sha256 = "c0a3b6f3e8b78e624a7b8f3d68185063fcc2cfb4b8f06942586a384de738eabb"; }
+    { locale = "cy"; arch = "linux-x86_64"; sha256 = "bba5556ed1f3873b9111d47ff978a2ca5fd43a48e7e32bf25cc7ad4650d5b37b"; }
+    { locale = "da"; arch = "linux-i686"; sha256 = "4b296fdd61f2cdf2d644503befafed114f5d18fd8e8bbd37d3f6a06275e8d11d"; }
+    { locale = "da"; arch = "linux-x86_64"; sha256 = "30fd49c129cee05a86a60147ea706286c0dd9a48fe6b43178d80b2a2726fcc48"; }
+    { locale = "de"; arch = "linux-i686"; sha256 = "814d073fc127b74d9edcace83c38ad2e80c74bafa327d2eac44de7673e0b2958"; }
+    { locale = "de"; arch = "linux-x86_64"; sha256 = "00dfd1ed1b981ba5bb66dc86ded8a7aee25e1a67d0c5e739a5ec252e4b4f0764"; }
+    { locale = "dsb"; arch = "linux-i686"; sha256 = "97473204548f40f6b806c1de5835477998f58ad4e9be8a1eb2bc7097def7ceb6"; }
+    { locale = "dsb"; arch = "linux-x86_64"; sha256 = "42042946079e486c24ff5e76c2e572d81a4e996dfb9ca37a9b19417933defd32"; }
+    { locale = "el"; arch = "linux-i686"; sha256 = "9056a466e7e99efa10b30be00d7f0ff2c64c077725a57397ea7462fa2de6bac0"; }
+    { locale = "el"; arch = "linux-x86_64"; sha256 = "06b223ca8ec5e47b2876c7261b94fbb82fefec50527a777802c74ebbc71c6256"; }
+    { locale = "en-GB"; arch = "linux-i686"; sha256 = "8f74bee700e9d6414d379e723e5be952725a96fc4155f1652701327fe36b493c"; }
+    { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "dccdf5e29b19852895eccfd479c2d04d7ae3d7847af050028a6cada9700ef948"; }
+    { locale = "en-US"; arch = "linux-i686"; sha256 = "d2d564f048a9cbc9a956fb1b937c0d43758c97315fd19bde79d63bb0bdd7b9a5"; }
+    { locale = "en-US"; arch = "linux-x86_64"; sha256 = "70a8bdd408cea0d015a560969083445046c3a8e02c7777b2b22eedf6b46888b6"; }
+    { locale = "es-AR"; arch = "linux-i686"; sha256 = "c03ca2ea86db9dc6428e96f50cf8fc86343faa539b5ebff0e476f0e0bcb2c6c3"; }
+    { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "eedc718bc25219803666e95870ce4a0ddfec7443392aa0f3840b2689bb09ab55"; }
+    { locale = "es-ES"; arch = "linux-i686"; sha256 = "962de04ebaa81296a04c84e1dd3574ec1ed5fe1784f1b0345b30fdf6de214301"; }
+    { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "3821a77b83cfe174b10a9b472d8a4a29dc069a8e1c82b536923d90761fa31a4d"; }
+    { locale = "et"; arch = "linux-i686"; sha256 = "17ee3d2c863d7e8c0562a1ba75d7b1b6e469e93d3665aa2de662e98eaff1d921"; }
+    { locale = "et"; arch = "linux-x86_64"; sha256 = "84ffe20179728d1ab3dffd93428b330c6958b3c825ffdca6c8cf63dc831a7519"; }
+    { locale = "eu"; arch = "linux-i686"; sha256 = "424de9056f295b710be3db287a9ee48759efed25e311881750a49c1b30c33fe1"; }
+    { locale = "eu"; arch = "linux-x86_64"; sha256 = "5fdaafd1b691d29df5d1056555a052a0feeaa6d7b01a0383241bbc8b988da7d2"; }
+    { locale = "fi"; arch = "linux-i686"; sha256 = "1037c3d031d00eb4fea5aab50215108d0fcce6668d7226e594f47784a8aa3edb"; }
+    { locale = "fi"; arch = "linux-x86_64"; sha256 = "71f6a24995b16b1e5dfcdd5b3758940a69bf348430d71f800522bc1c0eeb6341"; }
+    { locale = "fr"; arch = "linux-i686"; sha256 = "095f6a9c8876aabbd890a97724060a704336605655a7b1feb890b05e051ae810"; }
+    { locale = "fr"; arch = "linux-x86_64"; sha256 = "97f3b49f91724608520202384d82accd3705290cb6c295dfd88d49ec33dd76c4"; }
+    { locale = "fy-NL"; arch = "linux-i686"; sha256 = "59be75d317a2ebef649adf7eff64a8e9706d5e6f58971e12ab3de3e9da306fe7"; }
+    { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "b5c4dc6e07d17fb4150d04e5c377e4c2ec18fe6304fb84a2bb19bdf554113b4a"; }
+    { locale = "ga-IE"; arch = "linux-i686"; sha256 = "59afa36ca0b31e9f0cfdaedb5e49889ef1d5d1f9c08b6fb9e6cd21a282ecacae"; }
+    { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "6e9c48d531cc65f08e08f54170721ce0cecde785978cbca0bffad6847433a5e3"; }
+    { locale = "gd"; arch = "linux-i686"; sha256 = "2c6e63a2c89f74df52d06c8bb6bd46871c04b4c91506c166acd28de1aeba8d8a"; }
+    { locale = "gd"; arch = "linux-x86_64"; sha256 = "73c4923a5a425e2b96cf1e1b05584e282f5802b76337a5180b9c89c0163fb47f"; }
+    { locale = "gl"; arch = "linux-i686"; sha256 = "4ca2c0ab487eb79272fcfe253cef93838eb57925bb2631c29de36f2510fedc1d"; }
+    { locale = "gl"; arch = "linux-x86_64"; sha256 = "7b731eb0ece93a1944ffd8dd7b0f91cad1292955e967a511ab72080b3dc66fdf"; }
+    { locale = "he"; arch = "linux-i686"; sha256 = "056cff554994ef984356b7fb27759548ac546c10b918c727e130adb970430018"; }
+    { locale = "he"; arch = "linux-x86_64"; sha256 = "5592613852a34b7b5990a06ba31b1713bb9b277a5472e153a26e780f0620f2c4"; }
+    { locale = "hr"; arch = "linux-i686"; sha256 = "abe18e183a2b26315dbad115c187eb56fe70daffd8eac3465e1ee2c3b2f364b6"; }
+    { locale = "hr"; arch = "linux-x86_64"; sha256 = "d657795e84fe1ca238e986438d5501e4baf628a890835258bcbd3a32040fef4c"; }
+    { locale = "hsb"; arch = "linux-i686"; sha256 = "806e9da32095fbb5dd6610f715006a3cf0732b69759e8b88d6c3f39617a9fd2c"; }
+    { locale = "hsb"; arch = "linux-x86_64"; sha256 = "3c0c1cdd739d1d82aef6ce864e0a65c735591acdb127a50ebdb8e5999a524b17"; }
+    { locale = "hu"; arch = "linux-i686"; sha256 = "a052932572784bdc90e8a16ffafa855a5817ea28bdd3365fa18f40685bb2f77e"; }
+    { locale = "hu"; arch = "linux-x86_64"; sha256 = "1f98b63f900ab64989ee8860ce3580394dad438078e574e4c7d997bf5a840fd9"; }
+    { locale = "hy-AM"; arch = "linux-i686"; sha256 = "b7148002a1f1790bbc52c1c3fbab837acc9a7681077aad115cc81bd05f1e1a33"; }
+    { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "cc18eaa5b72c57438c11b8fd5a77f677218d1323ad844f8eb8d294132e40d86c"; }
+    { locale = "id"; arch = "linux-i686"; sha256 = "a1c7fadbb96293391e99ee0abe16b20331a9ee274e5c56d5972a339ccf62b1da"; }
+    { locale = "id"; arch = "linux-x86_64"; sha256 = "7ac143a557c5f913966c81235f6dd398516c3e153e667442297cef82024f2af9"; }
+    { locale = "is"; arch = "linux-i686"; sha256 = "f884769780d273d7e921a236ad6fc21b1749ae8c1c483b9b57943e42bc23206e"; }
+    { locale = "is"; arch = "linux-x86_64"; sha256 = "b10fd3af349285bcecbf0334ec22b93b6811abb9c580f5a38e84b5dede4264d1"; }
+    { locale = "it"; arch = "linux-i686"; sha256 = "1ac48c611c6ae2163ae27970dcef5c20e1ba932a2210eec659ea31cb4967dfd1"; }
+    { locale = "it"; arch = "linux-x86_64"; sha256 = "23930f00a7b9b47d43a23611d4f804025d11aa489101c120449428d866179517"; }
+    { locale = "ja"; arch = "linux-i686"; sha256 = "148df7f75b69757a64427bb96bcb9a2a0d8f885b907130c1d7c519bf6e7a1718"; }
+    { locale = "ja"; arch = "linux-x86_64"; sha256 = "4992ae5d3f348648a9febadb058f558dce7659d18065e352a1d560e552d27e6e"; }
+    { locale = "ko"; arch = "linux-i686"; sha256 = "b4f9668d9d56b15c6af69d7a23716c70074adbb90100725c951d913682003789"; }
+    { locale = "ko"; arch = "linux-x86_64"; sha256 = "43f134ad246b5896a003cb75c73339cc27cc7bdf02584d5b5455a4606112a7a3"; }
+    { locale = "lt"; arch = "linux-i686"; sha256 = "b3e48defce4416d32c968056f07498c268428746c2e99f68c91c08cd623f2741"; }
+    { locale = "lt"; arch = "linux-x86_64"; sha256 = "f8cb85d3f033e6a7c6ea8d7af7e31604a3f67e2435557d108d8bff18a5612785"; }
+    { locale = "nb-NO"; arch = "linux-i686"; sha256 = "ebe6134f09bcd52b7da5461247372b5e352aa78b882039993f0f7e6d08e19047"; }
+    { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "c2137e014c37c149dfe847dd4516af45307f1ee7ae9f915b48c78b882f7e4b0b"; }
+    { locale = "nl"; arch = "linux-i686"; sha256 = "d2edd221ef00a02a38b037f961671a8f82595ea6796556bbc5cb94041a2e131c"; }
+    { locale = "nl"; arch = "linux-x86_64"; sha256 = "af2110f44b303d5182140771001d3d10b9ed7b44c31261f740b15ea4caa21545"; }
+    { locale = "nn-NO"; arch = "linux-i686"; sha256 = "c0db7cd88d5f0e38e6683181729a2de5ba63abdc4d0af17fbd72de723c909426"; }
+    { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "040da2abe7aaef427386e31aa24e67aeb389f8294f14f445ab68fb8714f74094"; }
+    { locale = "pa-IN"; arch = "linux-i686"; sha256 = "ca2e02b0ac8f4b5ab6b4af3e905a1c65274dd17bea6c4b84bfa0afa99f5bb6d3"; }
+    { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "3324461c1d47872b96d6fcfdfe10971e70b7698789fa8a7b439d5d226f87d0fb"; }
+    { locale = "pl"; arch = "linux-i686"; sha256 = "2094e2136ccdac7572203772b0a2cfed2f78116e2ee72c7038137ca198b0f404"; }
+    { locale = "pl"; arch = "linux-x86_64"; sha256 = "59f9d72974f84c2b349a7fd7c614b7473b6dba4fdaf0c57b267369624b13f2b6"; }
+    { locale = "pt-BR"; arch = "linux-i686"; sha256 = "beeb965afb626565155ca1f882ed27fc5489ab650f3eee94064227c213aa9100"; }
+    { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "a72296d59a7971aaba395fa058b8ecfa4889ccbede3ee0161744b70e848436df"; }
+    { locale = "pt-PT"; arch = "linux-i686"; sha256 = "b8e0925a64aab9e23bf13bd9b2afd1baab7d964e6c1c3af3973201fc6b7a71c9"; }
+    { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "bd12cfcb485b85bc0444111f7bf7f1e9ecff42a1bf03515e46aeff668da690a8"; }
+    { locale = "rm"; arch = "linux-i686"; sha256 = "220767594e50de01d636d29d38ef87d0ad4871c718ba2f5e9c8f8bdc13023408"; }
+    { locale = "rm"; arch = "linux-x86_64"; sha256 = "298f69008f20a23eda68a92912fbd050eff73f806e0cb8ce0c40f1fc53b76fc2"; }
+    { locale = "ro"; arch = "linux-i686"; sha256 = "3be80143bb1affa8df3c94bcb048bcd2f22f39f60db02d2f9afeeb44b45c67ae"; }
+    { locale = "ro"; arch = "linux-x86_64"; sha256 = "715963ac282e8f972e22f3fcc5b51e03346f011b8848f16b8a8cb9b6a23c864c"; }
+    { locale = "ru"; arch = "linux-i686"; sha256 = "0c793708c8501df82582f5d820c65ee11a46819f012b7d616c7fd4b1424e7eef"; }
+    { locale = "ru"; arch = "linux-x86_64"; sha256 = "5f4fbfaa52b4eca748dd12da12c6bc38286e5fdee2fd81d337d926ea4e0df378"; }
+    { locale = "si"; arch = "linux-i686"; sha256 = "ede99dd26481f9864dbd0ad276f3b10a1bea8a2267a3f0055f10de4c185a3e3d"; }
+    { locale = "si"; arch = "linux-x86_64"; sha256 = "15ca9bb30fe45879bfaac936187951f36af45a134cdf756314e7c1b1d508db22"; }
+    { locale = "sk"; arch = "linux-i686"; sha256 = "9ac426f0148d232de2c11fb0404bfd317aa26d0fecca710c63dda52eb73841d5"; }
+    { locale = "sk"; arch = "linux-x86_64"; sha256 = "8f67b9449e4b0759b82d748c1c0aab3ba42da1c3643e1579f3f0e1cda00cf61f"; }
+    { locale = "sl"; arch = "linux-i686"; sha256 = "12d52efd990e472230cbee546b544f01b2aa7bf8e1812cc561102e9cba58bfa0"; }
+    { locale = "sl"; arch = "linux-x86_64"; sha256 = "432071992c94ae8964db97f02d7c26d1584ab6ba43a3bb87bb605d9933f37673"; }
+    { locale = "sq"; arch = "linux-i686"; sha256 = "b070ecb797dae27d66c449feb34c57d383f64ddbe6dc37cd836658e3e8c28e54"; }
+    { locale = "sq"; arch = "linux-x86_64"; sha256 = "065eebd594fa00315bd017f76eb35ff64e371347b346ec54eef6edbc738476b4"; }
+    { locale = "sr"; arch = "linux-i686"; sha256 = "a76a9b519fbfa5e3ac305522fe313c3f1c52c2bdb1c44878341a0ff5f50c5a36"; }
+    { locale = "sr"; arch = "linux-x86_64"; sha256 = "e90a8c3dd54d69de3e092d1e63288365807238ec3ab01383778bb10aa9799309"; }
+    { locale = "sv-SE"; arch = "linux-i686"; sha256 = "da60ffb3131d7ff150d9a2f70b1071d0399cfaf671003c5b5b598911561eddb8"; }
+    { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "686162ef37b00757ff49784fb6c2fd04ea55103c78af6f97bf5e7e6be34cb46a"; }
+    { locale = "ta-LK"; arch = "linux-i686"; sha256 = "ad8702ca5223fd9a17dce9e71360299938f53548e357d93a5bc23d24cbec8039"; }
+    { locale = "ta-LK"; arch = "linux-x86_64"; sha256 = "f6178474338c75f1b216176ae40a9e09df68697d9cc1ccdc661293b51ae133ed"; }
+    { locale = "tr"; arch = "linux-i686"; sha256 = "54c88fd15417a271368a981b79467064a968993e7076e2f4a87f0cb280b4954f"; }
+    { locale = "tr"; arch = "linux-x86_64"; sha256 = "d1943ef072cfc40ab90d0b008527d6e4607db2299eb536573db5a7e832babb9c"; }
+    { locale = "uk"; arch = "linux-i686"; sha256 = "276ed6dac2090fdd53c967daadda3d39c8f05b70f6d91779af2998b446a831dd"; }
+    { locale = "uk"; arch = "linux-x86_64"; sha256 = "f18455e1df20364ff0c4e2f44397b068faf387f7efa25941f167750f349f93a5"; }
+    { locale = "vi"; arch = "linux-i686"; sha256 = "3a72f5935f32de88a0bf88eb5252864b19b8bdd1f01fa49b14d54021a88fb2cf"; }
+    { locale = "vi"; arch = "linux-x86_64"; sha256 = "3f53c378fce2c5a7245103510714b2d99b8915ef78452d469cbd4f0343a3767d"; }
+    { locale = "zh-CN"; arch = "linux-i686"; sha256 = "6ac29a8081a339f334ea0b22ac49b81d79d26a22995ea592f1a78fe9c66a4edc"; }
+    { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "82733b4f96f42fe3d0fd7e429e8f23bd1aa059890a6403cc991b3236f31399c6"; }
+    { locale = "zh-TW"; arch = "linux-i686"; sha256 = "4d376644e762630bd7e9077d616cd4b4c0175ea3fd3df04c4c76ac489d87cecf"; }
+    { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "0044c3e78014df76fd09009142d75858fd8ac5abea54920d52870bf2d6599310"; }
   ];
 }

From b8b67468b299ff897e93b53f244190c56b714d06 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 9 Jan 2016 10:36:31 +0000
Subject: [PATCH 475/884] i3cat: init at 2015-03-21

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7b3e99fcd12f..890fb9000df1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12114,6 +12114,8 @@ let
 
   i3blocks = callPackage ../applications/window-managers/i3/blocks.nix { };
 
+  i3cat = goPackages.i3cat.bin // { outputs = [ "bin" ]; };
+
   i3lock = callPackage ../applications/window-managers/i3/lock.nix {
     cairo = cairo.override { xcbSupport = true; };
   };
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 93eb04e54429..579e8a6f2c0a 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1735,6 +1735,15 @@ let
     ];
   };
 
+  i3cat = buildFromGitHub {
+    rev    = "b9ba886a7c769994ccd8d4627978ef4b51fcf576";
+    date   = "2015-03-21";
+    owner  = "vincent-petithory";
+    repo   = "i3cat";
+    sha256 = "1xlm5c9ajdb71985nq7hcsaraq2z06przbl6r4ykvzi8w2lwgv72";
+    buildInputs = [ structfield ];
+  };
+
   inf = buildFromGitHub {
     rev    = "c85f1217d51339c0fa3a498cc8b2075de695dae6";
     owner  = "go-inf";
@@ -3076,6 +3085,14 @@ let
     };
   };
 
+  structfield = buildFromGitHub {
+    rev    = "01a738558a47fbf16712994d1737fb31c77e7d11";
+    date   = "2014-08-01";
+    owner  = "vincent-petithory";
+    repo   = "structfield";
+    sha256 = "1kyx71z13mf6hc8ly0j0b9zblgvj5lzzvgnc3fqh61wgxrsw24dw";
+  };
+
   structs = buildFromGitHub {
     rev    = "a9f7daa9c2729e97450c2da2feda19130a367d8f";
     owner  = "fatih";

From 0c7bf8309ce4fb9b9f18ce9f4ebbb7f009dc98bd Mon Sep 17 00:00:00 2001
From: Niclas Thall <niclas.thall@gmail.com>
Date: Sat, 9 Jan 2016 14:09:35 +0100
Subject: [PATCH 476/884] ums: 5.3.1 -> 5.4.0

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

diff --git a/pkgs/servers/ums/default.nix b/pkgs/servers/ums/default.nix
index 4151144e3ab7..15d9d90f7cc3 100644
--- a/pkgs/servers/ums/default.nix
+++ b/pkgs/servers/ums/default.nix
@@ -4,12 +4,12 @@
 
 stdenv.mkDerivation rec {
   name = "ums-${version}";
-  version = "5.3.1";
+  version = "5.4.0";
   
   src = fetchurl {
     url = "http://downloads.sourceforge.net/project/unimediaserver/Official%20Releases/Linux/" + stdenv.lib.toUpper "${name}" + "-Java8.tgz";
-    sha256 = "197lrfqk4n6fffrabj0607a9a5wc1j662s46anc0mkyqbb4r3avh";
-    name = "${name}-${version}.tgz";
+    sha256 = "0ryp26h7pyqing8pyg0xjrp1wm77wwgya4a7d00wczh885pk16kq";
+    name = "${name}.tgz";
   };
 
   buildInputs = [ makeWrapper ];

From e1873ade382294a4e49acfe68ab811c119f12766 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sat, 9 Jan 2016 16:33:54 +0000
Subject: [PATCH 477/884] pngcrush: 1.7.85 -> 1.7.92

also fixes a compilation issue on OSX
---
 pkgs/tools/graphics/pngcrush/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix
index cc086da5a132..d4383e363491 100644
--- a/pkgs/tools/graphics/pngcrush/default.nix
+++ b/pkgs/tools/graphics/pngcrush/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libpng }:
 
 stdenv.mkDerivation rec {
-  name = "pngcrush-1.7.85";
+  name = "pngcrush-1.7.92";
 
   src = fetchurl {
     url = "mirror://sourceforge/pmt/${name}-nolib.tar.xz";
-    sha256 = "1hvcync32x2ign694scafkj7xc73gzyy8n2l5z026yxckilyyv19";
+    sha256 = "0dlwbqckv90cpvg8qhkl3nk5yb75ddi61vbpmmp9n0j6qq9lp6y4";
   };
 
   configurePhase = ''

From b898959fc7b560bd175bfd4f36d703d238e8b685 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sat, 9 Jan 2016 16:46:03 +0000
Subject: [PATCH 478/884] dos2unix: 7.3 -> 7.3.2

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

diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/tools/text/dos2unix/default.nix
index f215c635de5b..c4bb077ef233 100644
--- a/pkgs/tools/text/dos2unix/default.nix
+++ b/pkgs/tools/text/dos2unix/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, perl, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "dos2unix-7.3";
+  name = "dos2unix-7.3.2";
   
   src = fetchurl {
     url = "http://waterlan.home.xs4all.nl/dos2unix/${name}.tar.gz";
-    sha256 = "1la496gpc7b1vka36bs54pf85jfbwa6fdplgj6lamvbj59azfxc1";
+    sha256 = "12c68c6wjnwrkyjj99fn6d0i4bf53aldj259lhjwq0g0nc5yxs67";
   };
 
   configurePhase = ''

From a4c3b433ee67de556f8840dd1971e010c0237b09 Mon Sep 17 00:00:00 2001
From: Yann Hodique <hodiquey@vmware.com>
Date: Sat, 9 Jan 2016 09:02:54 -0800
Subject: [PATCH 479/884] stunnel: 5.26 -> 5.29

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

diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix
index ecd98d8155fa..e8b56ed7d966 100644
--- a/pkgs/tools/networking/stunnel/default.nix
+++ b/pkgs/tools/networking/stunnel/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "stunnel-${version}";
-  version = "5.26";
+  version = "5.29";
 
   src = fetchurl {
     url    = "http://www.stunnel.org/downloads/${name}.tar.gz";
-    sha256 = "09i7gizisa04l0gygwbyd3dnzpjmq3ii6c009z4qvv8y05lx941c";
+    sha256 = "0lgmdpsm36a6j5s0jabv3cfg3rzqz9c9sfdqgkx399iy80jrd423";
   };
 
   buildInputs = [ openssl ];

From f8b303662985a3dbe551907fccf57343674ffd70 Mon Sep 17 00:00:00 2001
From: "Rommel M. Martinez" <ebzzry@gmail.com>
Date: Sun, 10 Jan 2016 02:00:54 +0800
Subject: [PATCH 480/884] pt: init at 0.7.3

---
 pkgs/applications/misc/pt/.bundle/config |   2 +
 pkgs/applications/misc/pt/Gemfile        |   3 +
 pkgs/applications/misc/pt/Gemfile.lock   |  45 +++++++
 pkgs/applications/misc/pt/default.nix    |  18 +++
 pkgs/applications/misc/pt/gemset.nix     | 164 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |   2 +
 6 files changed, 234 insertions(+)
 create mode 100644 pkgs/applications/misc/pt/.bundle/config
 create mode 100644 pkgs/applications/misc/pt/Gemfile
 create mode 100644 pkgs/applications/misc/pt/Gemfile.lock
 create mode 100644 pkgs/applications/misc/pt/default.nix
 create mode 100644 pkgs/applications/misc/pt/gemset.nix

diff --git a/pkgs/applications/misc/pt/.bundle/config b/pkgs/applications/misc/pt/.bundle/config
new file mode 100644
index 000000000000..88cb2d529351
--- /dev/null
+++ b/pkgs/applications/misc/pt/.bundle/config
@@ -0,0 +1,2 @@
+---
+BUNDLE_NO_INSTALL: true
diff --git a/pkgs/applications/misc/pt/Gemfile b/pkgs/applications/misc/pt/Gemfile
new file mode 100644
index 000000000000..ed2136ea5b85
--- /dev/null
+++ b/pkgs/applications/misc/pt/Gemfile
@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem 'pt'
diff --git a/pkgs/applications/misc/pt/Gemfile.lock b/pkgs/applications/misc/pt/Gemfile.lock
new file mode 100644
index 000000000000..db023c59d7fd
--- /dev/null
+++ b/pkgs/applications/misc/pt/Gemfile.lock
@@ -0,0 +1,45 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    builder (3.2.2)
+    colored (1.2)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
+    domain_name (0.5.25)
+      unf (>= 0.0.5, < 1.0.0)
+    highline (1.7.8)
+    hirb (0.7.3)
+    http-cookie (1.0.2)
+      domain_name (~> 0.5)
+    mime-types (2.99)
+    mini_portile2 (2.0.0)
+    netrc (0.11.0)
+    nokogiri (1.6.7.1)
+      mini_portile2 (~> 2.0.0.rc2)
+    nokogiri-happymapper (0.5.9)
+      nokogiri (~> 1.5)
+    pivotal-tracker (0.5.13)
+      builder
+      crack
+      nokogiri (>= 1.5.5)
+      nokogiri-happymapper (>= 0.5.4)
+      rest-client (>= 1.8.0)
+    pt (0.7.3)
+      colored (>= 1.2)
+      highline (>= 1.6.1)
+      hirb (>= 0.4.5)
+      pivotal-tracker (>= 0.4.1)
+    rest-client (1.8.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
+    safe_yaml (1.0.4)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  pt
diff --git a/pkgs/applications/misc/pt/default.nix b/pkgs/applications/misc/pt/default.nix
new file mode 100644
index 000000000000..d85a3266bdf8
--- /dev/null
+++ b/pkgs/applications/misc/pt/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, lib, bundlerEnv, ruby }:
+
+bundlerEnv {
+  name = "pt-0.7.3";
+
+  inherit ruby;
+  gemfile = ./Gemfile;
+  lockfile = ./Gemfile.lock;
+  gemset = ./gemset.nix;
+
+  meta = with lib; {
+    description = "Minimalist command-line Pivotal Tracker client";
+    homepage    = http://www.github.com/raul/pt;
+    license     = licenses.mit;
+    maintainers = with maintainers; [ ebzzry ];
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/applications/misc/pt/gemset.nix b/pkgs/applications/misc/pt/gemset.nix
new file mode 100644
index 000000000000..cde3c386fb5c
--- /dev/null
+++ b/pkgs/applications/misc/pt/gemset.nix
@@ -0,0 +1,164 @@
+{
+  "builder" = {
+    version = "3.2.2";
+    source = {
+      type = "gem";
+      sha256 = "14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2";
+    };
+  };
+  "colored" = {
+    version = "1.2";
+    source = {
+      type = "gem";
+      sha256 = "0b0x5jmsyi0z69bm6sij1k89z7h0laag3cb4mdn7zkl9qmxb90lx";
+    };
+  };
+  "crack" = {
+    version = "0.4.3";
+    source = {
+      type = "gem";
+      sha256 = "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k";
+    };
+    dependencies = [
+      "safe_yaml"
+    ];
+  };
+  "domain_name" = {
+    version = "0.5.25";
+    source = {
+      type = "gem";
+      sha256 = "16qvfrmcwlzz073aas55mpw2nhyhjcn96s524w0g1wlml242hjav";
+    };
+    dependencies = [
+      "unf"
+    ];
+  };
+  "highline" = {
+    version = "1.7.8";
+    source = {
+      type = "gem";
+      sha256 = "1nf5lgdn6ni2lpfdn4gk3gi47fmnca2bdirabbjbz1fk9w4p8lkr";
+    };
+  };
+  "hirb" = {
+    version = "0.7.3";
+    source = {
+      type = "gem";
+      sha256 = "0mzch3c2lvmf8gskgzlx6j53d10j42ir6ik2dkrl27sblhy76cji";
+    };
+  };
+  "http-cookie" = {
+    version = "1.0.2";
+    source = {
+      type = "gem";
+      sha256 = "0cz2fdkngs3jc5w32a6xcl511hy03a7zdiy988jk1sf3bf5v3hdw";
+    };
+    dependencies = [
+      "domain_name"
+    ];
+  };
+  "mime-types" = {
+    version = "2.99";
+    source = {
+      type = "gem";
+      sha256 = "1hravghdnk9qbibxb3ggzv7mysl97djh8n0rsswy3ssjaw7cbvf2";
+    };
+  };
+  "mini_portile2" = {
+    version = "2.0.0";
+    source = {
+      type = "gem";
+      sha256 = "056drbn5m4khdxly1asmiik14nyllswr6sh3wallvsywwdiryz8l";
+    };
+  };
+  "netrc" = {
+    version = "0.11.0";
+    source = {
+      type = "gem";
+      sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y";
+    };
+  };
+  "nokogiri" = {
+    version = "1.6.7.1";
+    source = {
+      type = "gem";
+      sha256 = "12nwv3lad5k2k73aa1d1xy4x577c143ixks6rs70yp78sinbglk2";
+    };
+    dependencies = [
+      "mini_portile2"
+    ];
+  };
+  "nokogiri-happymapper" = {
+    version = "0.5.9";
+    source = {
+      type = "gem";
+      sha256 = "0xv5crnzxdbd0ykx1ikfg1h0yw0h70lk607x1g45acsb1da97mkq";
+    };
+    dependencies = [
+      "nokogiri"
+    ];
+  };
+  "pivotal-tracker" = {
+    version = "0.5.13";
+    source = {
+      type = "gem";
+      sha256 = "0vxs69qb0k4g62250zbf5x78wpkhpj98clg2j09ncy3s8yklr0pd";
+    };
+    dependencies = [
+      "builder"
+      "crack"
+      "nokogiri"
+      "nokogiri-happymapper"
+      "rest-client"
+    ];
+  };
+  "pt" = {
+    version = "0.7.3";
+    source = {
+      type = "gem";
+      sha256 = "0bf821yf0zq5bhs65wmx339bm771lcnd6dlsljj3dnisjj068dk8";
+    };
+    dependencies = [
+      "colored"
+      "highline"
+      "hirb"
+      "pivotal-tracker"
+    ];
+  };
+  "rest-client" = {
+    version = "1.8.0";
+    source = {
+      type = "gem";
+      sha256 = "1m8z0c4yf6w47iqz6j2p7x1ip4qnnzvhdph9d5fgx081cvjly3p7";
+    };
+    dependencies = [
+      "http-cookie"
+      "mime-types"
+      "netrc"
+    ];
+  };
+  "safe_yaml" = {
+    version = "1.0.4";
+    source = {
+      type = "gem";
+      sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094";
+    };
+  };
+  "unf" = {
+    version = "0.1.4";
+    source = {
+      type = "gem";
+      sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9";
+    };
+    dependencies = [
+      "unf_ext"
+    ];
+  };
+  "unf_ext" = {
+    version = "0.0.7.1";
+    source = {
+      type = "gem";
+      sha256 = "0ly2ms6c3irmbr1575ldyh52bz2v0lzzr2gagf0p526k12ld2n5b";
+    };
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fd72495703e0..751ad0a8a6a7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15534,6 +15534,8 @@ let
 
   PPSSPP = callPackage ../misc/emulators/ppsspp { SDL = SDL2; };
 
+  pt = callPackage ../applications/misc/pt { };
+
   uae = callPackage ../misc/emulators/uae { };
 
   fsuae = callPackage ../misc/emulators/fs-uae { };

From d0e1ee6e55e3aca90a1763b7325586385eda69ee Mon Sep 17 00:00:00 2001
From: Allan Espinosa <allan.espinosa@outlook.com>
Date: Sat, 9 Jan 2016 12:37:16 -0600
Subject: [PATCH 481/884] axel: mark as buildable on darwin

---
 pkgs/tools/networking/axel/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/axel/default.nix b/pkgs/tools/networking/axel/default.nix
index 017492f28b5b..3fb04c16ee76 100644
--- a/pkgs/tools/networking/axel/default.nix
+++ b/pkgs/tools/networking/axel/default.nix
@@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
     description = "Console downloading program with some features for parallel connections for faster downloading";
     homepage = http://axel.alioth.debian.org/;
     maintainers = with maintainers; [ pSub ];
-    platforms = platforms.linux;
+    platforms = with platforms; linux ++ darwin;
   };
 }

From 1d947ed4bf1bdec59c85263c414af1af2c3dbd88 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 9 Jan 2016 20:04:32 +0100
Subject: [PATCH 482/884] icmake: 7.23.02 -> 8.00.05

---
 .../tools/build-managers/icmake/default.nix         | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix
index c0a886e3e48d..08e6a3b6559b 100644
--- a/pkgs/development/tools/build-managers/icmake/default.nix
+++ b/pkgs/development/tools/build-managers/icmake/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub, gcc5 }:
 
-let version = "7.23.02"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "icmake-${version}";
+  version = "8.00.05";
 
   src = fetchFromGitHub {
-    sha256 = "0gp2f8bw9i7vccsbz878mri0k6fls2x8hklbbr6mayag397gr928";
+    sha256 = "06bfz9awi2vh2mzikw4sp7wqrp0nlcg89b9br43awz2801k15hpf";
     rev = version;
     repo = "icmake";
     owner = "fbb-git";
@@ -13,13 +13,16 @@ stdenv.mkDerivation {
 
   sourceRoot = "icmake-${version}-src/icmake";
 
+  buildInputs = [ gcc5 ];
+
   preConfigure = ''
     patchShebangs ./
     substituteInPlace INSTALL.im --replace "usr/" ""
   '';
 
   buildPhase = ''
-    ./icm_bootstrap $out
+    ./icm_prepare $out
+    ./icm_bootstrap x
   '';
 
   installPhase = ''

From 26a6b4b58d64963e0bf73410beb641316bb7b8d6 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 9 Jan 2016 20:07:20 +0100
Subject: [PATCH 483/884] yodl: 3.05.01 -> 3.06.00

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

diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix
index 529e18417c79..aa76d991966b 100644
--- a/pkgs/development/tools/misc/yodl/default.nix
+++ b/pkgs/development/tools/misc/yodl/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, perl, icmake, utillinux }:
 
-let version = "3.05.01"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "yodl-${version}";
+  version = "3.06.00";
 
   buildInputs = [ perl icmake ];
 
   src = fetchFromGitHub {
-    sha256 = "02vbayvnz5p0055456i8kc8qxywkhn7agfrx1kwxaalbsnrd4g9h";
+    sha256 = "03n03bxc5lh3v9yzdikqrzzdvrna8zf98mlg2dhnn5z5sb5jhyzc";
     rev = version;
     repo = "yodl";
     owner = "fbb-git";

From 38c7c7b09ec6951030a3c5179ae6287e0b153f70 Mon Sep 17 00:00:00 2001
From: Yann Hodique <hodiquey@vmware.com>
Date: Sat, 9 Jan 2016 11:22:56 -0800
Subject: [PATCH 484/884] silver-searcher: 0.30.0 -> 0.31.0

---
 pkgs/tools/text/silver-searcher/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/tools/text/silver-searcher/default.nix
index fbd33ce68da6..0d6d424fa7c4 100644
--- a/pkgs/tools/text/silver-searcher/default.nix
+++ b/pkgs/tools/text/silver-searcher/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "silver-searcher-${version}";
-  version = "0.30.0";
+  version = "0.31.0";
 
   src = fetchFromGitHub {
     owner = "ggreer";
     repo = "the_silver_searcher";
     rev = "${version}";
-    sha256 = "07fz0hyisy3kisisxy558lfmmjdxq03x5ljdfxfkpw0xbfwgz14j";
+    sha256 = "1xmvdi2nbmwkmrdwkqm3zm596dz1zx87bn8i0ylkmy8rvb8ybgdv";
   };
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";

From 1a6016825eb3c9c761cde711d166b465d2002997 Mon Sep 17 00:00:00 2001
From: Leroy Hopson <git@leroy.geek.nz>
Date: Sun, 10 Jan 2016 10:06:00 +1300
Subject: [PATCH 485/884] txtw: init at 0.4

---
 pkgs/tools/misc/txtw/default.nix | 25 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix  |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/tools/misc/txtw/default.nix

diff --git a/pkgs/tools/misc/txtw/default.nix b/pkgs/tools/misc/txtw/default.nix
new file mode 100644
index 000000000000..90a9e0fa66ff
--- /dev/null
+++ b/pkgs/tools/misc/txtw/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, cairo }:
+
+stdenv.mkDerivation rec {
+  version = "0.4";
+  name = "txtw-${version}";
+
+  src = fetchFromGitHub {
+    owner = "baskerville";
+    repo = "txtw";
+    rev = "${version}";
+    sha256 = "17yjdgdd080fsf5r1wzgk6vvzwsa15gcwc9z64v7x588jm1ryy3k";
+  };
+
+  buildInputs = [ cairo ];
+
+  prePatch = ''sed -i "s@/usr/local@$out@" Makefile'';
+
+  meta = with stdenv.lib; {
+    description = "Compute text widths";
+    homepage = https://github.com/baskerville/txtw;
+    maintainers = with maintainers; [ lihop ];
+    license = licenses.unlicense;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3af2c29f034b..0c79d8280598 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3338,6 +3338,8 @@ let
 
   txt2tags = callPackage ../tools/text/txt2tags { };
 
+  txtw = callPackage ../tools/misc/txtw { };
+
   u9fs = callPackage ../servers/u9fs { };
 
   ucl = callPackage ../development/libraries/ucl { };

From 800f513c50b2c7643d3744bfbf44b414357935f3 Mon Sep 17 00:00:00 2001
From: Matthew O'Gorman <mog@rldn.net>
Date: Sat, 9 Jan 2016 17:08:17 -0500
Subject: [PATCH 486/884] notmuch-addrlookup: init at 7

---
 .../notmuch-addrlookup/default.nix            | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix

diff --git a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix
new file mode 100644
index 000000000000..3b90bc9f0ac1
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, pkgconfig, glib, notmuch }:
+
+stdenv.mkDerivation rec {
+  name = "notmuch-addrlookup-${version}";
+  version = "7";
+
+  src = fetchFromGitHub {
+    owner = "aperezdc";
+    repo = "notmuch-addrlookup-c";
+    rev ="v${version}";
+    sha256 = "0mz0llf1ggl1k46brgrqj3i8qlg1ycmkc5a3a0kg8fg4s1c1m6xk";
+  };
+
+
+  buildInputs = [ pkgconfig glib notmuch ];
+
+  installPhase = ''
+    mkdir -p "$out/bin"
+    cp notmuch-addrlookup "$out/bin"
+  '';
+
+
+
+  meta = with stdenv.lib; {
+    description = "Address lookup tool for Notmuch in C";
+    homepage = https://github.com/aperezdc/notmuch-addrlookup-c;
+    maintainers = with maintainers; [ mog ];
+    platforms = platforms.linux;
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d6bb0070912b..4256dc1b2125 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11593,6 +11593,8 @@ let
 
     notmuch = lowPrio (pkgs.notmuch.override { inherit emacs; });
 
+    notmuch-addrlookup = callPackage ../applications/networking/mailreaders/notmuch-addrlookup { };
+
     ocamlMode = callPackage ../applications/editors/emacs-modes/ocaml { };
 
     offlineimap = callPackage ../applications/editors/emacs-modes/offlineimap {};

From 5ddf2bf856b6cacff3e6ef5dbd379b79d835db22 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 9 Jan 2016 17:26:01 +0100
Subject: [PATCH 487/884] sane-backends-git -> 2016-01-09

---
 pkgs/applications/graphics/sane/backends/git.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/sane/backends/git.nix b/pkgs/applications/graphics/sane/backends/git.nix
index ff59b59d4014..1b1ccf4e5892 100644
--- a/pkgs/applications/graphics/sane/backends/git.nix
+++ b/pkgs/applications/graphics/sane/backends/git.nix
@@ -1,10 +1,10 @@
 { callPackage, fetchgit, ... } @ args:
 
 callPackage ./generic.nix (args // {
-  version = "2016-01-01";
+  version = "2016-01-09";
   src = fetchgit {
-    sha256 = "412c88b2b2b699b5a2ab28c7696c715e46b600398391ae038840c6b8674aea7c";
-    rev = "3f0c3df2fcde8d0cf30ab68c70cb5cad984dda6f";
+    sha256 = "440f88a4126841cfd139b17902ceb940bbf189defe21b208e93bfd474cfb16e8";
+    rev = "f78e85cad666492fadd5612af77fa7c84e270a12";
     url = "git://alioth.debian.org/git/sane/sane-backends.git";
   };
 })

From 994fd1ec12899d3b1fceeeafd857ff7ed66f32fb Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 7 Jan 2016 11:12:59 +0100
Subject: [PATCH 488/884] VisualBoyAdvance: remove dead package
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Last updated in 2011. Broken since 2013. Upstream ‘stopped’, sez $homepage.
---
 .../emulators/VisualBoyAdvance/default.nix    | 24 --------------
 pkgs/misc/emulators/VisualBoyAdvance/fix.diff | 31 -------------------
 .../emulators/VisualBoyAdvance/libpng15.patch | 13 --------
 pkgs/top-level/all-packages.nix               |  2 --
 4 files changed, 70 deletions(-)
 delete mode 100644 pkgs/misc/emulators/VisualBoyAdvance/default.nix
 delete mode 100644 pkgs/misc/emulators/VisualBoyAdvance/fix.diff
 delete mode 100644 pkgs/misc/emulators/VisualBoyAdvance/libpng15.patch

diff --git a/pkgs/misc/emulators/VisualBoyAdvance/default.nix b/pkgs/misc/emulators/VisualBoyAdvance/default.nix
deleted file mode 100644
index 015c61e461e6..000000000000
--- a/pkgs/misc/emulators/VisualBoyAdvance/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{stdenv, fetchurl, zlib, libpng, SDL, nasm}:
-
-stdenv.mkDerivation {
-  name = "VisualBoyAdvance-1.7.2";
-  src = fetchurl {
-    url = mirror://sourceforge/vba/VisualBoyAdvance-src-1.7.2.tar.gz;
-    sha256 = "1dr9w5i296dyq2gbx7sijk6p375aqnwld2n6rwnbzm2g3a94y4gl";
-  };
-  patches = [ ./libpng15.patch ./fix.diff ]; # patch to shut up lost of precision errors
-  preConfigure = ''
-    # Fix errors with invalid conversion from 'const char*' to 'char*'
-    sed -i -e "s|char \* p = strrchr|const char * p = strrchr|g" src/GBA.cpp
-    sed -i -e "s|char \* p = strrchr|const char * p = strrchr|g" src/Util.cpp
-  '';
-  buildInputs = [ zlib libpng SDL ] ++ stdenv.lib.optional (stdenv.system == "i686-linux") nasm;
-
-  meta = {
-    description = "A Game Boy/Game Boy Color/Game Boy Advance Emulator";
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = [ stdenv.lib.maintainers.sander ];
-    homepage = http://vba.ngemu.com;
-    broken = true;
-  };
-}
diff --git a/pkgs/misc/emulators/VisualBoyAdvance/fix.diff b/pkgs/misc/emulators/VisualBoyAdvance/fix.diff
deleted file mode 100644
index 646db9c45e66..000000000000
--- a/pkgs/misc/emulators/VisualBoyAdvance/fix.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -urN ../tmp-orig/visualboyadvance-1.7.2/src/sdl/debugger.cpp 
-./src/sdl/debugger.cpp
---- ../tmp-orig/visualboyadvance-1.7.2/src/sdl/debugger.cpp     2004-05-13 
-16:13:14.000000000 +0200
-+++ ./src/sdl/debugger.cpp      2005-03-21 21:57:06.000000000 +0100
-@@ -950,9 +950,9 @@
- {
-   u32 address = 0;
-   if(mem >= (u32*)&workRAM[0] && mem <= (u32*)&workRAM[0x3ffff])
--    address = 0x2000000 + ((u32)mem - (u32)&workRAM[0]);
-+    address = 0x2000000 + ((unsigned long)mem - (unsigned long)&workRAM[0]);
-   else
--    address = 0x3000000 + ((u32)mem - (u32)&internalRAM[0]);
-+    address = 0x3000000 + ((unsigned long)mem - (unsigned long)&internalRAM[0]);
- 
-   if(size == 2)
-     printf("Breakpoint (on write) address %08x old:%08x new:%08x\n", 
-diff -urN ../tmp-orig/visualboyadvance-1.7.2/src/prof/prof.cpp 
-./src/prof/prof.cpp
---- ../tmp-orig/visualboyadvance-1.7.2/src/prof/prof.cpp        2004-05-13 
-16:31:58.000000000 +0200
-+++ ./src/prof/prof.cpp 2005-03-21 21:56:27.000000000 +0100
-@@ -266,7 +266,7 @@
-     for (toindex=froms[fromindex]; toindex!=0; toindex=tos[toindex].link) {
-       if(profWrite8(fd, GMON_TAG_CG_ARC) ||
-          profWrite32(fd, (u32)frompc) ||
--         profWrite32(fd, (u32)tos[toindex].selfpc) ||
-+         profWrite32(fd, (unsigned long)tos[toindex].selfpc) ||
-          profWrite32(fd, tos[toindex].count)) {
-         systemMessage(0, "mcount: arc");
-         fclose(fd);
diff --git a/pkgs/misc/emulators/VisualBoyAdvance/libpng15.patch b/pkgs/misc/emulators/VisualBoyAdvance/libpng15.patch
deleted file mode 100644
index b6f8872ce2bb..000000000000
--- a/pkgs/misc/emulators/VisualBoyAdvance/libpng15.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-From Gentoo. Fixes compilation with libpng-1.5
-
---- a/src/Util.cpp
-+++ b/src/Util.cpp
-@@ -79,7 +79,7 @@
-     return false;
-   }
- 
--  if(setjmp(png_ptr->jmpbuf)) {
-+  if(setjmp(png_jmpbuf(png_ptr))) {
-     png_destroy_write_struct(&png_ptr,NULL);
-     fclose(fp);
-     return false;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0c79d8280598..6b07bccda784 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15722,8 +15722,6 @@ let
   vips = callPackage ../tools/graphics/vips { };
   nip2 = callPackage ../tools/graphics/nip2 { };
 
-  VisualBoyAdvance = callPackage ../misc/emulators/VisualBoyAdvance { };
-
   wavegain = callPackage ../applications/audio/wavegain { };
 
   wcalc = callPackage ../applications/misc/wcalc { };

From b466dab8b2d765f29c7be59bcdcc3e84e08d0f76 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 9 Jan 2016 18:08:27 +0100
Subject: [PATCH 489/884] veracity: remove dead package
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Last updated in 2012, broken since 2013. (OK, fine, but—)
Homepage abandoned, mailing list dead. (Hm. Spooky)
Uses builderDefsPackage. (Eek)
---
 .../version-management/veracity/default.nix   | 108 ------------------
 .../veracity/src-for-default.nix              |   9 --
 .../veracity/src-info-for-default.nix         |   5 -
 pkgs/top-level/all-packages.nix               |   2 -
 4 files changed, 124 deletions(-)
 delete mode 100644 pkgs/applications/version-management/veracity/default.nix
 delete mode 100644 pkgs/applications/version-management/veracity/src-for-default.nix
 delete mode 100644 pkgs/applications/version-management/veracity/src-info-for-default.nix

diff --git a/pkgs/applications/version-management/veracity/default.nix b/pkgs/applications/version-management/veracity/default.nix
deleted file mode 100644
index 4c69f41106b8..000000000000
--- a/pkgs/applications/version-management/veracity/default.nix
+++ /dev/null
@@ -1,108 +0,0 @@
-x@{builderDefsPackage
-  , cmake, curl, patch, zlib, icu, sqlite, libuuid
-  , readline, openssl, spidermonkey_1_8_0rc1
-  , nspr, nss
-  , unzip, glibcLocales
-  , runTests ? false
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  s = import ./src-for-default.nix;
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    ["runTests"];
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-    
-in
-rec {
-  src = a.fetchUrlFromSrcInfo s;
-
-  inherit (s) name;
-  inherit buildInputs;
-
-  phaseNames = ["prepare_sgneeds" "dump0" "prepareMakefiles" "fixPaths" "doMake" "doTest" "doDeploy"];
-
-  dump0 = (a.doDump "0");
-
-  runTests = a.stdenv.lib.attrByPath ["runTests"] false a;
-
-  doTest = a.fullDepEntry (if runTests then ''
-    mkdir pseudo-home
-    export HOME=$PWD/pseudo-home
-    export LC_ALL=en_US.UTF-8
-    export LANG=en_US.UTF-8
-    ${if a.stdenv.isLinux then "export LOCALE_ARCHIVE=${a.glibcLocales}/lib/locale/locale-archive;" else ""}
-    make test || true
-  '' else "") ["doMake" "minInit"];
-
-  prepare_sgneeds = a.fullDepEntry (''
-    mkdir -p "$out/sgneeds/include/spidermonkey"
-    for d in bin include lib; do 
-      mkdir -p "$out/sgneeds/$d"
-      mkdir -p "$out/sgneeds/$d"
-      for p in "${spidermonkey_1_8_0rc1}"; do
-        for f in "$p"/"$d"/*; do
-	  ln -sf "$f" "$out"/sgneeds/"$d"
-	done
-      done
-    done
-      for p in  "${spidermonkey_1_8_0rc1}/include" "${spidermonkey_1_8_0rc1}/include/js"; do
-        for f in "$p"/*; do
-	  ln -sf "$f" "$out"/sgneeds/include/spidermonkey/
-	done
-      done
-
-    mkdir -p "$out/sgneeds/include/sgbrings"
-    ln -s "$out/sgneeds/include/js" "$out/sgneeds/include/sgbrings/js"
-    for f in "$out/sgneeds/lib/"libjs*; do
-      bn="$(basename "$f")"
-      ln -s "$f" "$out/sgneeds/lib/''${bn/libjs/libsgbrings_js}"
-    done
-
-    export SGNEEDS_DIR="$out"/sgneeds/
-    export VVTHIRDPARTY="$out"/sgneeds/
-
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I"$out/sgneeds/include" -Wno-error"
-  '') ["minInit" "defEnsureDir"];
-
-  prepareMakefiles = a.fullDepEntry ''
-    sed -e 's@ /bin/uname @ uname @g' -i CMakeLists.txt
-    sed -e 's@ /bin/uname @ uname @g' -i common-CMakeLists.txt
-    cd ..
-    mkdir build
-    cd build
-    export NIX_LDFLAGS="$NIX_LDFLAGS -lssl"
-    cmake -G "Unix Makefiles" -D SGNEEDS_DIR="$SGNEEDS_DIR" -D VVTHIRDPARTY="$VVTHIRDPARTY" -D SPIDERMONKEY_INCDIR="${a.spidermonkey_1_8_0rc1}/include" -D SPIDERMONKEY_LIB="${a.spidermonkey_1_8_0rc1}/lib/libjs.so" ../veracity*
-  '' ["minInit" "addInputs" "doUnpack"];
-
-  fixPaths = a.fullDepEntry ''
-    sed -e "s@/bin/bash@${a.stdenv.shell}@" -i $(find .. -type f)
-    sed -e 's@/bin/ln@#{a.coreutils}/bin/ln@g' -i ../veracity/src/js_tests/*.js
-    sed -e 's@/usr/bin/gdb@#{a.gdb}/bin/gdb@g' -i ../veracity/testsuite/c_test.sh
-    sed -e 's@"/bin/@"@g' -i ../veracity/testsuite/u*.c
-  '' ["minInit"];
-
-  doDeploy = a.fullDepEntry ''
-    mkdir -p "$out/bin" "$out/share/veracity/"
-    cp -r .. "$out/share/veracity/build-dir"
-    ln -s "$out/share/veracity/build-dir/build/src/cmd/vv" "$out/bin"
-    ln -s "$out/share/veracity/build-dir/build/src/script/vscript" "$out/bin"
-    ${if runTests then "" else '' 
-      rm -rf  "$out/share/veracity/build-dir/veracity/testsuite" 
-      rm -rf  "$out/share/veracity/build-dir/build/testsuite" 
-    ''}
-  '' ["doMake" "minInit" "defEnsureDir"];
-
-  meta = {
-    description = "A distributed version control system with template-based merging";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux ;
-    broken = true;
-  };
-}) x
-
diff --git a/pkgs/applications/version-management/veracity/src-for-default.nix b/pkgs/applications/version-management/veracity/src-for-default.nix
deleted file mode 100644
index 5a514e8728d4..000000000000
--- a/pkgs/applications/version-management/veracity/src-for-default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-rec {
-   version="2.1.0.10979";
-   name="veracity-2.1.0.10979";
-   hash="15x3cwwjv9b0cbjx6insqk190wpnhwcm1z4b570hvw3lix3xnxhl";
-   url="http://download.sourcegear.com/Veracity/release/2.1.0.10979/veracity-source-${version}.tar.gz";
-   advertisedUrl="http://download.sourcegear.com/Veracity/release/2.1.0.10979/veracity-source-2.1.0.10979.tar.gz";
-  
-  
-}
diff --git a/pkgs/applications/version-management/veracity/src-info-for-default.nix b/pkgs/applications/version-management/veracity/src-info-for-default.nix
deleted file mode 100644
index cf4936ffc554..000000000000
--- a/pkgs/applications/version-management/veracity/src-info-for-default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  downloadPage = "http://veracity-scm.org/downloads.html";
-  #downloadPage = "http://download-us.sourcegear.com/Veracity/nightly/index.html";
-  baseName = "veracity";
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6b07bccda784..d76fec2ef00e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13427,8 +13427,6 @@ let
 
   vdpauinfo = callPackage ../tools/X11/vdpauinfo { };
 
-  veracity = callPackage ../applications/version-management/veracity {};
-
   viewMtn = builderDefsPackage (callPackage ../applications/version-management/viewmtn/0.10.nix)
   {
     flup = pythonPackages.flup;

From 36ebae29ce2c1cd3cb401018fccfdf719febbd3a Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Sat, 9 Jan 2016 14:38:27 -0800
Subject: [PATCH 490/884] update xcode patches for node v0.10.41

---
 .../development/web/nodejs/default-arch.patch | 10 ++++----
 pkgs/development/web/nodejs/no-xcode.patch    | 23 ++++++++-----------
 pkgs/development/web/nodejs/v0_10.nix         |  3 ++-
 3 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/web/nodejs/default-arch.patch b/pkgs/development/web/nodejs/default-arch.patch
index 3c7eb1014dee..e6d5b5428d77 100644
--- a/pkgs/development/web/nodejs/default-arch.patch
+++ b/pkgs/development/web/nodejs/default-arch.patch
@@ -1,12 +1,12 @@
-diff -Naur a/tools/gyp/pylib/gyp/xcode_emulation.py b/tools/gyp/pylib/gyp/xcode_emulation.py
---- a/tools/gyp/pylib/gyp/xcode_emulation.py	2014-01-23 06:05:51.000000000 +0100
-+++ b/tools/gyp/pylib/gyp/xcode_emulation.py	2014-02-04 17:49:48.000000000 +0100
-@@ -1018,12 +1033,16 @@
+diff --git a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py
+index 30f27d5..eb178a5 100644
+--- a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py
++++ b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py
+@@ -1018,12 +1018,15 @@ class XcodeSettings(object):
      # Since the value returned by this function is only used when ARCHS is not
      # set, then on iOS we return "i386", as the default xcode project generator
      # does not set ARCHS if it is not set in the .gyp file.
 -    if self.isIOS:
-+    
 +    try:
 +      if self.isIOS:
 +        return 'i386'
diff --git a/pkgs/development/web/nodejs/no-xcode.patch b/pkgs/development/web/nodejs/no-xcode.patch
index 244a55e9aebb..4754432ba4ab 100644
--- a/pkgs/development/web/nodejs/no-xcode.patch
+++ b/pkgs/development/web/nodejs/no-xcode.patch
@@ -1,7 +1,8 @@
-diff -Naur a/tools/gyp/pylib/gyp/xcode_emulation.py b/tools/gyp/pylib/gyp/xcode_emulation.py
---- a/tools/gyp/pylib/gyp/xcode_emulation.py	2014-01-23 06:05:51.000000000 +0100
-+++ b/tools/gyp/pylib/gyp/xcode_emulation.py	2014-02-04 17:49:48.000000000 +0100
-@@ -302,10 +302,17 @@
+diff --git a/tools/gyp/pylib/gyp/xcode_emulation.py b/tools/gyp/pylib/gyp/xcode_emulation.py
+index c002b11..eeb0400 100644
+--- a/tools/gyp/pylib/gyp/xcode_emulation.py
++++ b/tools/gyp/pylib/gyp/xcode_emulation.py
+@@ -446,10 +446,16 @@ class XcodeSettings(object):
  
    def _XcodeSdkPath(self, sdk_root):
      if sdk_root not in XcodeSettings._sdk_path_cache:
@@ -19,11 +20,10 @@ diff -Naur a/tools/gyp/pylib/gyp/xcode_emulation.py b/tools/gyp/pylib/gyp/xcode_
 +        # the user is probably on a CLT-only system, where there
 +        # is no valid SDK root
 +        XcodeSettings._sdk_path_cache[sdk_root] = None
-+        
      return XcodeSettings._sdk_path_cache[sdk_root]
  
    def _AppendPlatformVersionMinFlags(self, lst):
-@@ -420,10 +427,12 @@
+@@ -572,10 +578,11 @@ class XcodeSettings(object):
        framework_root = sdk_root
      else:
        framework_root = ''
@@ -31,7 +31,6 @@ diff -Naur a/tools/gyp/pylib/gyp/xcode_emulation.py b/tools/gyp/pylib/gyp/xcode_
 -    framework_dirs = config.get('mac_framework_dirs', [])
 -    for directory in framework_dirs:
 -      cflags.append('-F' + directory.replace('$(SDKROOT)', framework_root))
-+    
 +    if 'SDKROOT' in self._Settings():
 +      config = self.spec['configurations'][self.configname]
 +      framework_dirs = config.get('mac_framework_dirs', [])
@@ -40,7 +39,7 @@ diff -Naur a/tools/gyp/pylib/gyp/xcode_emulation.py b/tools/gyp/pylib/gyp/xcode_
  
      self.configname = None
      return cflags
-@@ -673,10 +682,12 @@
+@@ -826,10 +833,11 @@ class XcodeSettings(object):
      sdk_root = self._SdkPath()
      if not sdk_root:
        sdk_root = ''
@@ -48,21 +47,19 @@ diff -Naur a/tools/gyp/pylib/gyp/xcode_emulation.py b/tools/gyp/pylib/gyp/xcode_
 -    framework_dirs = config.get('mac_framework_dirs', [])
 -    for directory in framework_dirs:
 -      ldflags.append('-F' + directory.replace('$(SDKROOT)', sdk_root))
-+    
 +    if 'SDKROOT' in self._Settings():
 +      config = self.spec['configurations'][self.configname]
 +      framework_dirs = config.get('mac_framework_dirs', [])
 +      for directory in framework_dirs:
 +        ldflags.append('-F' + directory.replace('$(SDKROOT)', sdk_root))
  
-     self.configname = None
-     return ldflags
-@@ -863,7 +874,11 @@
+     is_extension = self._IsIosAppExtension() or self._IsIosWatchKitExtension()
+     if sdk_root and is_extension:
+@@ -1032,7 +1040,10 @@ class XcodeSettings(object):
      sdk_root = self._SdkPath(config_name)
      if not sdk_root:
        sdk_root = ''
 -    return l.replace('$(SDKROOT)', sdk_root)
-+    
 +    if self._SdkPath():
 +      return l.replace('$(SDKROOT)', sdk_root)
 +    else:
diff --git a/pkgs/development/web/nodejs/v0_10.nix b/pkgs/development/web/nodejs/v0_10.nix
index 5d292a340783..bef89da4f8f1 100644
--- a/pkgs/development/web/nodejs/v0_10.nix
+++ b/pkgs/development/web/nodejs/v0_10.nix
@@ -40,6 +40,8 @@ in stdenv.mkDerivation {
 
   prePatch = ''
     patchShebangs .
+    sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py
+    sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' tools/gyp/pylib/gyp/xcode_emulation.py
   '';
 
   patches = stdenv.lib.optionals stdenv.isDarwin [ ./default-arch.patch ./no-xcode.patch ];
@@ -60,7 +62,6 @@ in stdenv.mkDerivation {
     pushd $out/lib/node_modules/npm/node_modules/node-gyp
     patch -p2 < ${./no-xcode.patch}
     popd
-    sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' $out/lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py
   '';
 
   passthru.interpreterName = "nodejs-0.10";

From 0b0e9e924e331bb581651684dcf200fcd975d666 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 2 Nov 2015 00:47:56 +0300
Subject: [PATCH 491/884] pyspf: init at 2.0.12

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 384b40356008..b49cd875e4e9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6202,6 +6202,24 @@ in modules // {
     propagatedBuildInputs = with self; [ pyramid hawkauthlib tokenlib webtest ];
   };
 
+  pyspf = buildPythonPackage rec {
+    name = "pyspf-${version}";
+    version = "2.0.12";
+
+    src = pkgs.fetchurl {
+      url = "mirror://sourceforge/pymilter/pyspf/${name}/${name}.tar.gz";
+      sha256 = "18j1rmbmhih7q6y12grcj169q7sx1986qn4gmpla9y5gwfh1p8la";
+    };
+
+    meta = {
+      homepage = http://bmsi.com/python/milter.html;
+      description = "Python API for Sendmail Milters (SPF)";
+      maintainers = with maintainers; [ abbradar ];
+      license = licenses.gpl2;
+      platform = platforms.all;
+    };
+  };
+
   radicale = buildPythonPackage rec {
     name = "radicale-${version}";
     namePrefix = "";

From 2d714e52272402a7f60649eec1ddc788e6c4e1de Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 2 Nov 2015 00:48:09 +0300
Subject: [PATCH 492/884] pypolicyd-spf: init at 1.3.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b49cd875e4e9..b86dffa74798 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6013,6 +6013,31 @@ in modules // {
     };
   };
 
+  pypolicyd-spf = buildPythonPackage rec {
+    name = "pypolicyd-spf-${version}";
+    majorVersion = "1.3";
+    version = "${majorVersion}.2";
+
+    src = pkgs.fetchurl {
+      url = "https://launchpad.net/pypolicyd-spf/${majorVersion}/${version}/+download/${name}.tar.gz";
+      sha256 = "0ri9bdwn1k8xlyfhrgzns7wjvp5h08dq5fnxcq6mphy94rmc8x3i";
+    };
+
+    propagatedBuildInputs = with self; [ pyspf pydns ipaddr ];
+
+    preBuild = ''
+      substituteInPlace setup.py --replace "'/etc'" "'$out/etc'"
+    '';
+
+    meta = {
+      homepage = https://launchpad.net/pypolicyd-spf/;
+      description = "Postfix policy engine for Sender Policy Framework (SPF) checking.";
+      maintainers = with maintainers; [ abbradar ];
+      license = licenses.asl20;
+      platform = platforms.all;
+    };
+  };
+
   pyramid = buildPythonPackage rec {
     name = "pyramid-1.5.7";
 

From fb6b4a43c58b020f1392dd65235d037fcb72c62c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 24 Dec 2015 13:58:09 +0300
Subject: [PATCH 493/884] lgogdownloader: 2.24 -> 2.26

---
 pkgs/games/lgogdownloader/default.nix | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/pkgs/games/lgogdownloader/default.nix b/pkgs/games/lgogdownloader/default.nix
index 4ef3e533772d..e4f802337be1 100644
--- a/pkgs/games/lgogdownloader/default.nix
+++ b/pkgs/games/lgogdownloader/default.nix
@@ -1,24 +1,19 @@
-{ stdenv, fetchgit, curl, boost, jsoncpp, liboauth, rhash, tinyxml, htmlcxx, help2man }:
+{ stdenv, fetchFromGitHub, curl, boost, jsoncpp, liboauth, rhash, tinyxml, htmlcxx, help2man }:
 
 stdenv.mkDerivation rec {
   name = "lgogdownloader-${version}";
-  version = "2.24";
+  version = "2.26";
 
-  src = fetchgit {
-    url = "https://github.com/Sude-/lgogdownloader.git";
-    rev = "refs/tags/v${version}";
-    sha256 = "1h5l4zc22hj4all2w0vfby1rmhpca33g3bhdnqw11w2ligk8j14r";
+  src = fetchFromGitHub {
+    owner = "Sude-";
+    repo = "lgogdownloader";
+    rev = "v${version}";
+    sha256 = "0277g70nvq7bh42gnry7lz7wqhw8wl2hq6sfxwhn8x4ybkalj2gx";
   };
 
   buildInputs = [ curl boost jsoncpp liboauth rhash tinyxml htmlcxx help2man ];
 
-  buildPhase = ''
-    make release
-  '';
-
-  installPhase = ''
-    make install PREFIX=$out
-  '';
+  makeFlags = [ "release" "PREFIX=$(out)" ];
 
   meta = {
     homepage = https://github.com/Sude-/lgogdownloader;

From 16308a0cb32d90b1f0c5e3ca1fa35498cfb58d9e Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 29 Dec 2015 02:24:37 +0300
Subject: [PATCH 494/884] all-packages: sort several packages

---
 pkgs/top-level/all-packages.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d76fec2ef00e..31ca94bed172 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11145,7 +11145,6 @@ let
     jack = jack1;
   };
 
-  cbatticon = callPackage ../applications/misc/cbatticon { };
 
   bazaar = callPackage ../applications/version-management/bazaar { };
 
@@ -11180,6 +11179,11 @@ let
 
   bluejeans = callPackage ../applications/networking/browsers/mozilla-plugins/bluejeans { };
 
+  bomi = qt5.callPackage ../applications/video/bomi {
+    youtube-dl = pythonPackages.youtube-dl;
+    pulseSupport = config.pulseaudio or true;
+  };
+
   brackets = callPackage ../applications/editors/brackets { gconf = gnome3.gconf; };
 
   bristol = callPackage ../applications/audio/bristol { };
@@ -11217,6 +11221,8 @@ let
 
   cava = callPackage ../applications/audio/cava { };
 
+  cbatticon = callPackage ../applications/misc/cbatticon { };
+
   cbc = callPackage ../applications/science/math/cbc { };
 
   cddiscid = callPackage ../applications/audio/cd-discid { };
@@ -11274,11 +11280,6 @@ let
 
   cmatrix = callPackage ../applications/misc/cmatrix { };
 
-  bomi = qt5.callPackage ../applications/video/bomi {
-    youtube-dl = pythonPackages.youtube-dl;
-    pulseSupport = config.pulseaudio or true;
-  };
-
   cmus = callPackage ../applications/audio/cmus {
     libjack = libjack2;
     libcdio = libcdio082;

From c0f72cfe3321b08b659f716f9bb277553f089d2f Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 4 Jan 2016 15:25:14 +0300
Subject: [PATCH 495/884] opusfile: add platforms, cleanup

---
 pkgs/applications/audio/opusfile/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/opusfile/default.nix b/pkgs/applications/audio/opusfile/default.nix
index 314ecc95c3f7..b55ea30bae05 100644
--- a/pkgs/applications/audio/opusfile/default.nix
+++ b/pkgs/applications/audio/opusfile/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, openssl, libogg, libopus}:
+{ stdenv, fetchurl, pkgconfig, openssl, libogg, libopus }:
 
 stdenv.mkDerivation rec {
   name = "opusfile-0.6";
@@ -7,12 +7,14 @@ stdenv.mkDerivation rec {
     sha256 = "19iys2kld75k0210b807i4illrdmj3cmmnrgxlc9y4vf6mxp2a14";
   };
 
-  buildInputs = [ pkgconfig openssl libogg libopus ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ openssl libogg libopus ];
 
   meta = {
     description = "High-level API for decoding and seeking in .opus files";
     homepage = http://www.opus-codec.org/;
     license = stdenv.lib.licenses.bsd3;
+    platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
   };
 }

From ba56bbf08d78cd6eb022f61d1e0a9bb90c30209c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 6 Jan 2016 19:58:36 +0300
Subject: [PATCH 496/884] pythonPackages.requests_oauthlib: fix version

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b86dffa74798..5c33925a4442 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16420,11 +16420,11 @@ in modules // {
 
 
   requests_oauthlib = buildPythonPackage rec {
-    version = "v0.4.1";
+    version = "0.4.1";
     name = "requests-oauthlib-${version}";
 
     src = pkgs.fetchurl {
-      url = "http://github.com/requests/requests-oauthlib/archive/${version}.tar.gz";
+      url = "http://github.com/requests/requests-oauthlib/archive/v${version}.tar.gz";
       sha256 = "0vx252nzq5h9m9brwnw2ph8aj526y26jr2dqcafzzcdx6z4l8vj4";
     };
 

From 828a7f99fdb0c28fc9782a955930eb1403a77829 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 9 Jan 2016 19:23:56 +0300
Subject: [PATCH 497/884] pamtester: init at 0.1.2

---
 pkgs/tools/security/pamtester/default.nix | 20 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/tools/security/pamtester/default.nix

diff --git a/pkgs/tools/security/pamtester/default.nix b/pkgs/tools/security/pamtester/default.nix
new file mode 100644
index 000000000000..cdafed534085
--- /dev/null
+++ b/pkgs/tools/security/pamtester/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pam }:
+
+stdenv.mkDerivation rec {
+  name = "pamtester-0.1.2";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/pamtester/${name}.tar.gz";
+    sha256 = "1mdj1wj0adcnx354fs17928yn2xfr1hj5mfraq282dagi873sqw3";
+  };
+
+  buildInputs = [ pam ];
+
+  meta = with stdenv.lib; {
+    description = "Utility program to test the PAM facility.";
+    homepage = http://pamtester.sourceforge.net/;
+    license = licenses.bsd3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 31ca94bed172..bb2f0e4f10d9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2628,6 +2628,8 @@ let
 
   panomatic = callPackage ../tools/graphics/panomatic { };
 
+  pamtester = callPackage ../tools/security/pamtester { };
+
   paper-gtk-theme = callPackage ../misc/themes/gtk3/paper-gtk-theme { };
 
   par2cmdline = callPackage ../tools/networking/par2cmdline {

From ded1a55b8dd42ff08870ca60e0cf45e25209971a Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 9 Jan 2016 21:24:26 +0300
Subject: [PATCH 498/884] substituteAllFiles: support postInstall

---
 pkgs/build-support/substitute-files/substitute-all-files.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/substitute-files/substitute-all-files.nix b/pkgs/build-support/substitute-files/substitute-all-files.nix
index 642919016037..aa600a76650c 100644
--- a/pkgs/build-support/substitute-files/substitute-all-files.nix
+++ b/pkgs/build-support/substitute-files/substitute-all-files.nix
@@ -12,11 +12,14 @@ stdenv.mkDerivation ({
 
     args=
 
-    cd "$src"
+    pushd "$src"
     echo -ne "${concatStringsSep "\\0" args.files}" | xargs -0 -n1 -I {} -- find {} -type f -print0 | while read -d "" line; do
       mkdir -p "$out/$(dirname "$line")"
       substituteAll "$line" "$out/$line"
     done
+    popd
+
+    eval "$postInstall"
   '';
   preferLocalBuild = true;
 } // args)

From 3891d3e6541fe588ee2430e7b1bdb8d87d787a53 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 2 Nov 2015 04:13:17 +0300
Subject: [PATCH 499/884] nixos/postfix: add types

---
 nixos/modules/services/mail/postfix.nix | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index 2b9175036bea..9090fbdaa1ea 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -158,6 +158,7 @@ in
     services.postfix = {
 
       enable = mkOption {
+        type = types.bool;
         default = false;
         description = "Whether to run the Postfix mail server.";
       };
@@ -168,21 +169,25 @@ in
       };
 
       setSendmail = mkOption {
+        type = types.bool;
         default = true;
         description = "Whether to set the system sendmail to postfix's.";
       };
 
       user = mkOption {
+        type = types.str;
         default = "postfix";
         description = "What to call the Postfix user (must be used only for postfix).";
       };
 
       group = mkOption {
+        type = types.str;
         default = "postfix";
         description = "What to call the Postfix group (must be used only for postfix).";
       };
 
       setgidGroup = mkOption {
+        type = types.str;
         default = "postdrop";
         description = "
           How to call postfix setgid group (for postdrop). Should
@@ -191,6 +196,7 @@ in
       };
 
       networks = mkOption {
+        type = types.nullOr (types.listOf types.str);
         default = null;
         example = ["192.168.0.1/24"];
         description = "
@@ -201,6 +207,7 @@ in
       };
 
       networksStyle = mkOption {
+        type = types.str;
         default = "";
         description = "
           Name of standard way of trusted network specification to use,
@@ -210,6 +217,7 @@ in
       };
 
       hostname = mkOption {
+        type = types.str;
         default = "";
         description ="
           Hostname to use. Leave blank to use just the hostname of machine.
@@ -218,6 +226,7 @@ in
       };
 
       domain = mkOption {
+        type = types.str;
         default = "";
         description ="
           Domain to use. Leave blank to use hostname minus first component.
@@ -225,6 +234,7 @@ in
       };
 
       origin = mkOption {
+        type = types.str;
         default = "";
         description ="
           Origin to use in outgoing e-mail. Leave blank to use hostname.
@@ -232,6 +242,7 @@ in
       };
 
       destination = mkOption {
+        type = types.nullOr (types.listOf types.str);
         default = null;
         example = ["localhost"];
         description = "
@@ -241,6 +252,7 @@ in
       };
 
       relayDomains = mkOption {
+        type = types.nullOr (types.listOf types.str);
         default = null;
         example = ["localdomain"];
         description = "
@@ -249,6 +261,7 @@ in
       };
 
       relayHost = mkOption {
+        type = types.str;
         default = "";
         description = "
           Mail relay for outbound mail.
@@ -256,6 +269,7 @@ in
       };
 
       lookupMX = mkOption {
+        type = types.bool;
         default = false;
         description = "
           Whether relay specified is just domain whose MX must be used.
@@ -263,11 +277,13 @@ in
       };
 
       postmasterAlias = mkOption {
+        type = types.str;
         default = "root";
         description = "Who should receive postmaster e-mail.";
       };
 
       rootAlias = mkOption {
+        type = types.str;
         default = "";
         description = "
           Who should receive root e-mail. Blank for no redirection.
@@ -275,6 +291,7 @@ in
       };
 
       extraAliases = mkOption {
+        type = types.lines;
         default = "";
         description = "
           Additional entries to put verbatim into aliases file, cf. man-page aliases(8).
@@ -282,6 +299,7 @@ in
       };
 
       extraConfig = mkOption {
+        type = types.str;
         default = "";
         description = "
           Extra lines to be added verbatim to the main.cf configuration file.
@@ -289,21 +307,25 @@ in
       };
 
       sslCert = mkOption {
+        type = types.str;
         default = "";
         description = "SSL certificate to use.";
       };
 
       sslCACert = mkOption {
+        type = types.str;
         default = "";
         description = "SSL certificate of CA.";
       };
 
       sslKey = mkOption {
+        type = types.str;
         default = "";
         description = "SSL key to use.";
       };
 
       recipientDelimiter = mkOption {
+        type = types.str;
         default = "";
         example = "+";
         description = "
@@ -312,6 +334,7 @@ in
       };
 
       virtual = mkOption {
+        type = types.lines;
         default = "";
         description = "
           Entries for the virtual alias map, cf. man-page virtual(8).
@@ -326,6 +349,7 @@ in
       };
 
       extraMasterConf = mkOption {
+        type = types.lines;
         default = "";
         example = "submission inet n - n - - smtpd";
         description = "Extra lines to append to the generated master.cf file.";

From b38db9c18d2818ac18bec1ff4e98271a7faf3484 Mon Sep 17 00:00:00 2001
From: Louis Taylor <louis@kragniz.eu>
Date: Sun, 10 Jan 2016 04:03:27 +0000
Subject: [PATCH 500/884] ipfs: 0.3.9 -> 0.3.10

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

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 93eb04e54429..bf72df6892ec 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1789,11 +1789,11 @@ let
   };
 
   ipfs = buildFromGitHub{
-    rev = "43622bd5eed1f62d53d364dc771bbb500939d9e6";
-    date   = "2015-10-30";
+    rev = "f9dc4c726b770199f4ee64d97775d5fe8122814e";
+    date   = "2015-12-07";
     owner  = "ipfs";
     repo   = "go-ipfs";
-    sha256 = "0g80b65ysj995dj3mkh3lp4v616fzjl7bx2wf14mkxfri4gr5icb";
+    sha256 = "00p7kv6000bk6lbqqnnf4xy5pmd93fv6fihji3vn7br53645blaa";
     disabled = isGo14;
   };
 

From f92cec4c1bf6406cb26f420e57f8ab77e3351752 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 6 Jan 2016 04:59:14 +0300
Subject: [PATCH 501/884] nixos/acme: add allowKeysForGroup

---
 nixos/modules/security/acme.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix
index 2de57dd68cba..a2806973a35d 100644
--- a/nixos/modules/security/acme.nix
+++ b/nixos/modules/security/acme.nix
@@ -37,6 +37,12 @@ let
         description = "Group running the ACME client.";
       };
 
+      allowKeysForGroup = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Give read permissions to the specified group to read SSL private certificates.";
+      };
+
       postRun = mkOption {
         type = types.lines;
         default = "";
@@ -137,6 +143,7 @@ in
       systemd.services = flip mapAttrs' cfg.certs (cert: data:
         let
           cpath = "${cfg.directory}/${cert}";
+          rights = if cfg.allowKeysForGroup then "750" else "700";
           cmdline = [ "-v" "-d" cert "--default_root" data.webroot "--valid_min" cfg.validMin ]
                     ++ optionals (data.email != null) [ "--email" data.email ]
                     ++ concatMap (p: [ "-f" p ]) data.plugins
@@ -159,9 +166,10 @@ in
           preStart = ''
             mkdir -p '${cfg.directory}'
             if [ ! -d '${cpath}' ]; then
-              mkdir -m 700 '${cpath}'
-              chown '${data.user}:${data.group}' '${cpath}'
+              mkdir '${cpath}'
             fi
+            chmod ${rights} '${cpath}'
+            chown -R '${data.user}:${data.group}' '${cpath}'
           '';
           script = ''
             cd '${cpath}'

From c2b70e6147320093a0d850c6a5c3d8e3a1b28101 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 5 Jan 2016 21:55:33 +0300
Subject: [PATCH 502/884] easyrsa: 2.2.0 -> 3.0.0

---
 pkgs/tools/networking/easyrsa/default.nix     | 54 +++++++++----------
 pkgs/tools/networking/easyrsa/fix-paths.patch | 33 ++++++++++++
 2 files changed, 57 insertions(+), 30 deletions(-)
 create mode 100644 pkgs/tools/networking/easyrsa/fix-paths.patch

diff --git a/pkgs/tools/networking/easyrsa/default.nix b/pkgs/tools/networking/easyrsa/default.nix
index e49c32aac704..2b41f8ca1d3c 100644
--- a/pkgs/tools/networking/easyrsa/default.nix
+++ b/pkgs/tools/networking/easyrsa/default.nix
@@ -1,39 +1,33 @@
-{ stdenv, fetchurl, autoconf, automake111x, makeWrapper
-, gnugrep, openssl}:
+{ stdenv, fetchFromGitHub, openssl }:
 
-stdenv.mkDerivation rec {
-  name = "easyrsa-2.2.0";
+let
+  version = "3.0.0";
+in stdenv.mkDerivation rec {
+  name = "easyrsa-${version}";
 
-  src = fetchurl {
-    url = "https://github.com/OpenVPN/easy-rsa/archive/v2.2.0.tar.gz";
-    sha256 = "1xq4by5frb6ikn53ss3y8v7ss639dccxfq8jfrbk07ynkmk668qk";
+  src = fetchFromGitHub {
+    owner = "OpenVPN";
+    repo = "easy-rsa";
+    rev = "v${version}";
+    sha256 = "0wbdv3wmqwm5680rpb971l56xiw49adpicqshk3vhfmpvqzl4dbs";
   };
 
-  # Copy missing files and autoreconf
-  preConfigure = ''
-    cp ${automake111x}/share/automake/install-sh .
-    cp ${automake111x}/share/automake/missing .
+  patches = [ ./fix-paths.patch ];
 
-    autoreconf
-  '';
+  installPhase = ''
+    mkdir -p $out/share/easyrsa
+    cp -r easyrsa3/{openssl*.cnf,x509-types,vars.example} $out/share/easyrsa
+    install -D -m755 easyrsa3/easyrsa $out/bin/easyrsa
+    substituteInPlace $out/bin/easyrsa \
+      --subst-var out \
+      --subst-var-by openssl ${openssl}/bin/openssl
 
-  preBuild = ''
-    mkdir -p $out/share/easy-rsa
-  '';
-
-  nativeBuildInputs = [ autoconf makeWrapper automake111x ];
-  buildInputs = [ gnugrep openssl];
-
-  # Make sane defaults and patch default config vars
-  postInstall = ''
-    cp $out/share/easy-rsa/openssl-1.0.0.cnf $out/share/easy-rsa/openssl.cnf
-    for prog in $(find "$out/share/easy-rsa" -executable -type f); do
-      makeWrapper "$prog" "$out/bin/$(basename $prog)" \
-        --set EASY_RSA "$out/share/easy-rsa" \
-        --set OPENSSL "${openssl}/bin/openssl" \
-        --set GREP "${gnugrep}/bin/grep"
-    done
-    sed -i "/EASY_RSA=\|OPENSSL=\|GREP=/d" $out/share/easy-rsa/vars
+    # Helper utility
+    cat > $out/bin/easyrsa-init <<EOF
+    #!${stdenv.shell} -e
+    cp -r $out/share/easyrsa/* .
+    EOF
+    chmod +x $out/bin/easyrsa-init
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/networking/easyrsa/fix-paths.patch b/pkgs/tools/networking/easyrsa/fix-paths.patch
new file mode 100644
index 000000000000..82688fa79460
--- /dev/null
+++ b/pkgs/tools/networking/easyrsa/fix-paths.patch
@@ -0,0 +1,33 @@
+diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa
+index 6fec288..210648a 100755
+--- a/easyrsa3/easyrsa
++++ b/easyrsa3/easyrsa
+@@ -1003,7 +1003,7 @@ Note: using Easy-RSA configuration from: $vars"
+ 	
+ 	# Set defaults, preferring existing env-vars if present
+ 	set_var EASYRSA		"$PWD"
+-	set_var EASYRSA_OPENSSL	openssl
++	set_var EASYRSA_OPENSSL	"@openssl@"
+ 	set_var EASYRSA_PKI	"$EASYRSA/pki"
+ 	set_var EASYRSA_DN	cn_only
+ 	set_var EASYRSA_REQ_COUNTRY	"US"
+@@ -1030,13 +1030,17 @@ Note: using Easy-RSA configuration from: $vars"
+ 	# Detect openssl config, preferring EASYRSA_PKI over EASYRSA
+ 	if [ -f "$EASYRSA_PKI/openssl-1.0.cnf" ]; then
+ 		set_var EASYRSA_SSL_CONF	"$EASYRSA_PKI/openssl-1.0.cnf"
+-	else	set_var EASYRSA_SSL_CONF	"$EASYRSA/openssl-1.0.cnf"
++	elif [ -f "$EASYRSA/openssl-1.0.cnf" ]; then
++		set_var EASYRSA_SSL_CONF	"$EASYRSA/openssl-1.0.cnf"
++	else	set_var EASYRSA_SSL_CONF	"@out@/share/easyrsa/openssl-1.0.cnf"
+ 	fi
+ 
+ 	# Same as above for the x509-types extensions dir
+ 	if [ -d "$EASYRSA_PKI/x509-types" ]; then
+ 		set_var EASYRSA_EXT_DIR		"$EASYRSA_PKI/x509-types"
+-	else	set_var EASYRSA_EXT_DIR		"$EASYRSA/x509-types"
++	elif [ -d "$EASYRSA/x509-types" ]; then
++		set_var EASYRSA_EXT_DIR		"$EASYRSA/x509-types"
++	else	set_var EASYRSA_EXT_DIR		"@out@/share/easyrsa/x509-types"
+ 	fi
+ 
+ 	# EASYRSA_ALGO_PARAMS must be set depending on selected algo

From fea89d6bc3c78a272ee9cfac18213772ba8833e3 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 29 Dec 2015 02:24:51 +0300
Subject: [PATCH 503/884] openmpi: 1.6.5 -> 1.10.1

---
 .../development/libraries/openmpi/default.nix | 29 +++++++++++++++----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix
index 7fe57af5710a..194a794235ab 100644
--- a/pkgs/development/libraries/openmpi/default.nix
+++ b/pkgs/development/libraries/openmpi/default.nix
@@ -1,25 +1,44 @@
-{stdenv, fetchurl, gfortran
+{stdenv, fetchurl, gfortran, perl
 
 # Enable the Sun Grid Engine bindings
 , enableSGE ? false
 
 # Pass PATH/LD_LIBRARY_PATH to point to current mpirun by default
 , enablePrefix ? false
+
+# Build static libraries
+, enableStatic ? false
 }:
 
 with stdenv.lib;
 
-stdenv.mkDerivation {
-  name = "openmpi-1.6.5";
+let
+  majorVersion = "1.10";
+
+in stdenv.mkDerivation rec {
+  name = "openmpi-${majorVersion}.1";
+
   src = fetchurl {
-    url = http://www.open-mpi.org/software/ompi/v1.6/downloads/openmpi-1.6.5.tar.bz2 ;
-    sha256 = "11gws4d3z7934zna2r7m1f80iay2ha17kp42mkh39wjykfwbldzy";
+    url = "http://www.open-mpi.org/software/ompi/v${majorVersion}/downloads/${name}.tar.bz2";
+    sha256 = "14p4px9a3qzjc22lnl6braxrcrmd9rgmy7fh4qpanawn2pgfq6br";
   };
+
   buildInputs = [ gfortran ];
+
+  nativeBuildInputs = [ perl ];
+
   configureFlags = []
     ++ optional enableSGE "--with-sge"
     ++ optional enablePrefix "--enable-mpirun-prefix-by-default"
+    ++ optional enableStatic "--enable-static"
     ;
+
+  enableParallelBuilding = true;
+
+  preBuild = ''
+    patchShebangs ompi/mpi/fortran/base/gen-mpi-sizeof.pl
+  '';
+
   meta = {
     homepage = http://www.open-mpi.org/;
     description = "Open source MPI-2 implementation";

From 513994da9d7a4fe74afa7e1be4f36fb468833d40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 3 Jan 2016 11:55:25 +0100
Subject: [PATCH 504/884] cyrus-sasl: only apply patch on FreeBSD to fix #12279

I noticed the breakage but forgot this patch in another branch.
https://github.com/NixOS/nixpkgs/pull/10816#issuecomment-168486249
---
 pkgs/development/libraries/cyrus-sasl/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix
index 71cfc626bac1..059b0ab0042a 100644
--- a/pkgs/development/libraries/cyrus-sasl/default.nix
+++ b/pkgs/development/libraries/cyrus-sasl/default.nix
@@ -10,19 +10,19 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ openssl db gettext kerberos autoreconfHook ]
+    [ openssl db gettext kerberos ]
+    ++ lib.optional stdenv.isFreeBSD autoreconfHook
     ++ lib.optional stdenv.isLinux pam
     ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
   patches = [
     ./missing-size_t.patch # https://bugzilla.redhat.com/show_bug.cgi?id=906519
-    (
+  ] ++ lib.optional stdenv.isFreeBSD (
       fetchurl {
         url = "http://www.linuxfromscratch.org/patches/blfs/svn/cyrus-sasl-2.1.26-fixes-3.patch";
         sha256 = "1vh4pc2rxxm6yvykx0b7kg09jbcwcxwv5rs6yq2ag3y8p6a9x86w";
       }
-    )
-  ];
+    );
 
   configureFlags = [
     "--with-openssl=${openssl}"

From 22184c4cfa6456fef1dafed33df7abad48b93d2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 10 Jan 2016 10:14:40 +0100
Subject: [PATCH 505/884] release-notes: document $NIX_AUTO_RUN from #12000

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

diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index f74fff83b48b..9853e7f9d703 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -130,4 +130,17 @@ nginx.override {
   </listitem>
 </itemizedlist>
 
+
+<para>Other notable improvements:
+<itemizedlist>
+  <listitem>
+    <para>The <command>command-not-found</command> hook was extended.
+    Apart from <literal>$NIX_AUTO_INSTALL</literal> variable,
+    it newly also checks for <literal>$NIX_AUTO_RUN</literal>
+    which causes it to directly run the missing commands via
+    <command>nix-shell</command> (without installing anything). </para>
+  </listitem>
+
+</itemizedlist></para>
+
 </section>

From 3ea6982859282de43d81cdc4dd6e441d6a2f3c19 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sun, 20 Dec 2015 01:57:29 +0200
Subject: [PATCH 506/884] python.adal: init at 0.1.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5c33925a4442..dc78a26f492e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -286,6 +286,24 @@ in modules // {
     };
   };
 
+  adal = buildPythonPackage rec {
+    version = "0.1.0";
+    name = "adal-${version}";
+
+    src = pkgs.fetchurl {
+      url = https://pypi.python.org/packages/source/a/adal/adal-0.1.0.tar.gz;
+      sha256 = "1f32k18ck54adqlgvh6fjhy4yavcyrwy813prjyqppqqq4bn1a09";
+    };
+
+    propagatedBuildInputs = with self; [ requests2 pyjwt ];
+
+    meta = {
+      description = "Library to make it easy for python application to authenticate to Azure Active Directory (AAD) in order to access AAD protected web resources";
+      homepage = https://github.com/AzureAD/azure-activedirectory-library-for-python;
+      license = licenses.mit;
+      maintainers = with maintainers; [ phreedom ];
+    };
+  };
 
   afew = buildPythonPackage rec {
     rev = "9744c18c4d6b0a3e7f57b01e5fe145a60fc82a47";

From c6340022ba1c2d47a1d32b15265346a17153c6fd Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Fri, 25 Dec 2015 09:33:34 +0200
Subject: [PATCH 507/884] pythonPackages.azure-*: package the 1.* branch

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index dc78a26f492e..19f666fa7a4c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1145,6 +1145,122 @@ in modules // {
     };
   };
 
+  azure-mgmt-common = buildPythonPackage rec {
+    version = "0.20.0";
+    name = "azure-mgmt-common-${version}";
+    src = pkgs.fetchurl {
+      url = https://pypi.python.org/packages/source/a/azure-mgmt-common/azure-mgmt-common-0.20.0.zip;
+      sha256 = "1rmzpz3733wv31rsnqpdy4bbafvk5dhbqx7q0xf62dlz7p0i4f66";
+    };
+    propagatedBuildInputs = with self; [ azure-common azure-mgmt-nspkg requests2 ];
+    postInstall = ''
+      echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
+      echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py
+    '';
+    meta = {
+      description = "Microsoft Azure SDK for Python";
+      homepage = "http://azure.microsoft.com/en-us/develop/python/";
+      license = licenses.asl20;
+      maintainers = with maintainers; [ olcai ];
+    };
+  };
+
+  azure-mgmt-compute = buildPythonPackage rec {
+    version = "0.20.0";
+    name = "azure-mgmt-compute-${version}";
+    src = pkgs.fetchurl {
+      url = https://pypi.python.org/packages/source/a/azure-mgmt-compute/azure-mgmt-compute-0.20.0.zip;
+      sha256 = "12hr5vxdg2sk2fzr608a37f4i8nbchca7dgdmly2w5fc7x88jx2v";
+    };
+    postInstall = ''
+      echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
+      echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py
+    '';
+    propagatedBuildInputs = with self; [ azure-mgmt-common ];
+    meta = {
+      description = "Microsoft Azure SDK for Python";
+      homepage = "http://azure.microsoft.com/en-us/develop/python/";
+      license = licenses.asl20;
+      maintainers = with maintainers; [ olcai ];
+    };
+  };
+
+  azure-mgmt-network = buildPythonPackage rec {
+    version = "0.20.1";
+    name = "azure-mgmt-network-${version}";
+    src = pkgs.fetchurl {
+      url = https://pypi.python.org/packages/source/a/azure-mgmt-network/azure-mgmt-network-0.20.1.zip;
+      sha256 = "10vj22h6nxpw0qpvib5x2g6qs5j8z31142icvh4qk8k40fcrs9hx";
+    };
+    postInstall = ''
+      echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
+      echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py
+    '';
+    propagatedBuildInputs = with self; [ azure-mgmt-common ];
+    meta = {
+      description = "Microsoft Azure SDK for Python";
+      homepage = "http://azure.microsoft.com/en-us/develop/python/";
+      license = licenses.asl20;
+      maintainers = with maintainers; [ olcai ];
+    };
+  };
+
+  azure-mgmt-nspkg = buildPythonPackage rec {
+    version = "1.0.0";
+    name = "azure-mgmt-nspkg-${version}";
+    src = pkgs.fetchurl {
+      url = https://pypi.python.org/packages/source/a/azure-mgmt-nspkg/azure-mgmt-nspkg-1.0.0.zip;
+      sha256 = "1rq92fj3kvnqkk18596dybw0kvhgscvc6cd8hp1dhy3wrkqnhwmq";
+    };
+    propagatedBuildInputs = with self; [ azure-nspkg ];
+    meta = {
+      description = "Microsoft Azure SDK for Python";
+      homepage = "http://azure.microsoft.com/en-us/develop/python/";
+      license = licenses.asl20;
+      maintainers = with maintainers; [ olcai ];
+    };
+  };
+
+  azure-mgmt-resource = buildPythonPackage rec {
+    version = "0.20.1";
+    name = "azure-mgmt-resource-${version}";
+    src = pkgs.fetchurl {
+      url = https://pypi.python.org/packages/source/a/azure-mgmt-resource/azure-mgmt-resource-0.20.1.zip;
+      sha256 = "0slh9qfm5nfacrdm3lid0sr8kwqzgxvrwf27laf9v38kylkfqvml";
+    };
+    postInstall = ''
+      echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
+      echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py
+    '';
+    propagatedBuildInputs = with self; [ azure-mgmt-common ];
+    meta = {
+      description = "Microsoft Azure SDK for Python";
+      homepage = "http://azure.microsoft.com/en-us/develop/python/";
+      license = licenses.asl20;
+      maintainers = with maintainers; [ olcai ];
+    };
+  };
+
+  azure-mgmt-storage = buildPythonPackage rec {
+    version = "0.20.0";
+    name = "azure-mgmt-storage-${version}";
+    src = pkgs.fetchurl {
+      url = https://pypi.python.org/packages/source/a/azure-mgmt-storage/azure-mgmt-storage-0.20.0.zip;
+      sha256 = "16iw7hqhq97vlzfwixarfnirc60l5mz951p57brpcwyylphl3yim";
+    };
+    postInstall = ''
+      echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
+      echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py
+    '';
+    propagatedBuildInputs = with self; [ azure-mgmt-common ];
+    meta = {
+      description = "Microsoft Azure SDK for Python";
+      homepage = "http://azure.microsoft.com/en-us/develop/python/";
+      license = licenses.asl20;
+      maintainers = with maintainers; [ olcai ];
+    };
+  };
+
   azure-storage = buildPythonPackage rec {
     version = "0.20.3";
     name = "azure-storage-${version}";

From 01130e502a60665ffa2cc78888eec74811ff7c1b Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 31 Dec 2015 09:50:58 +0200
Subject: [PATCH 508/884] systemd: backslashes are no longer allowed in script
 names

---
 nixos/modules/system/boot/systemd.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 826368e711ad..0fc8491cdf8f 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -179,8 +179,9 @@ let
     ];
 
   makeJobScript = name: text:
-    let x = pkgs.writeTextFile { name = "unit-script"; executable = true; destination = "/bin/${shellEscape name}"; inherit text; };
-    in "${x}/bin/${shellEscape name}";
+    let mkScriptName =  s: (replaceChars [ "\\" ] [ "-" ] (shellEscape s) );
+        x = pkgs.writeTextFile { name = "unit-script"; executable = true; destination = "/bin/${mkScriptName name}"; inherit text; };
+    in "${x}/bin/${mkScriptName name}";
 
   unitConfig = { name, config, ... }: {
     config = {

From ada9b3b666e58158223686be37d8641c42748575 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sun, 10 Jan 2016 11:35:44 +0200
Subject: [PATCH 509/884] azure-image: azure resource manager doesn't
 base64-encode custom data, unlike azure service manager

---
 nixos/modules/virtualisation/azure-image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix
index 1ab869cd6a88..08944e641d76 100644
--- a/nixos/modules/virtualisation/azure-image.nix
+++ b/nixos/modules/virtualisation/azure-image.nix
@@ -105,7 +105,7 @@ in
       path  = [ pkgs.coreutils ];
       script =
         ''
-          eval "$(base64 --decode /metadata/CustomData.bin)"
+          eval "$(cat /metadata/CustomData.bin)"
           if ! [ -z "$ssh_host_ecdsa_key" ]; then
             echo "downloaded ssh_host_ecdsa_key"
             echo "$ssh_host_ecdsa_key" > /etc/ssh/ssh_host_ed25519_key

From 4a0a0592db45584b61a10ee2a801969f9a6f35ed Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Sun, 10 Jan 2016 13:19:06 +0300
Subject: [PATCH 510/884] vimPlugins: move vim2nix into nixpkgs repo

---
 pkgs/misc/vim-plugins/default.nix             |  25 +-
 pkgs/misc/vim-plugins/vim-plugin-names        |   1 -
 pkgs/misc/vim-plugins/vim-utils.nix           |   4 +-
 pkgs/misc/vim-plugins/vim2nix/README.txt      |   3 +
 .../vim2nix/additional-nix-code/command-t     |   7 +
 .../vim2nix/additional-nix-code/matchit.zip   |   7 +
 .../vim2nix/additional-nix-code/racer         |   4 +
 .../vim2nix/additional-nix-code/taglist       |   6 +
 .../additional-nix-code/vim-addon-manager     |   1 +
 .../vim2nix/additional-nix-code/vim-hier      |   1 +
 .../vim2nix/additional-nix-code/vim-wakatime  |   1 +
 .../vim2nix/additional-nix-code/vim-xdebug    |   1 +
 .../vim2nix/additional-nix-code/vim-xkbswitch |   5 +
 .../vim2nix/additional-nix-code/vimproc.vim   |   9 +
 .../vim2nix/additional-nix-code/vimshell.vim  |   1 +
 .../vim2nix/additional-nix-code/youcompleteme |  24 ++
 pkgs/misc/vim-plugins/vim2nix/addon-info.json |   1 +
 .../misc/vim-plugins/vim2nix/autoload/nix.vim | 307 ++++++++++++++++++
 18 files changed, 391 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/misc/vim-plugins/vim2nix/README.txt
 create mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/command-t
 create mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/matchit.zip
 create mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/racer
 create mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/taglist
 create mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-addon-manager
 create mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-hier
 create mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-wakatime
 create mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-xdebug
 create mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-xkbswitch
 create mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vimproc.vim
 create mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vimshell.vim
 create mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme
 create mode 100644 pkgs/misc/vim-plugins/vim2nix/addon-info.json
 create mode 100644 pkgs/misc/vim-plugins/vim2nix/autoload/nix.vim

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index a2ceb9d1df89..14be330b79bc 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -14,8 +14,7 @@ in
 # TL;DR
 # Add your plugin to ./vim-plugin-names
 # Generate via `vim-plugin-names-to-nix`
-# If plugin is complicated then create a PR to
-# https://github.com/jagajaga/vim-addon-vim2nix/tree/master/additional-nix-code
+# If plugin is complicated then make changes to ./vim2nix/additional-nix-code
 
 # This attrs contains two sections:
 # The first contains plugins added manually, the second contains plugins
@@ -28,9 +27,18 @@ rec {
   # which recreates this the following derivations based on ./vim-plugin-names
   pluginnames2nix = vimUtils.pluginnames2Nix {
     name = "vim-plugin-names-to-nix";
-    namefiles = [./vim-plugin-names];  };
+    namefiles = [./vim-plugin-names];
+  };
 
   # Section I
+  vim-addon-vim2nix = vim2nix;
+
+  vim2nix = buildVimPluginFrom2Nix { # use it to update plugins
+    name = "vim2nix";
+    src = ./vim2nix;
+    dependencies = ["vim-addon-manager"];
+  };
+
 
   # Section II
   # Update with vimUtils.vimPlugins.pluginnames2Nix command
@@ -324,17 +332,6 @@ rec {
 
   };
 
-  vim-addon-vim2nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-vim2nix-2016-01-09";
-    src = fetchgit {
-      url = "git://github.com/JagaJaga/vim-addon-vim2nix";
-      rev = "9146b942f51d2682bf0ca00ad74c324340a61b60";
-      sha256 = "2e35baf96ae172d2dac8b86b299ff2c87c14a5b4a4a6864dcce17e7e9ed04861";
-    };
-    dependencies = ["vim-addon-manager"];
-
-  };
-
   vim-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-nix-2015-12-10";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 7195064a20d3..207eed69160c 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -20,7 +20,6 @@
 "extradite"
 "fugitive"
 "ghcmod"
-"github:JagaJaga/vim-addon-vim2nix"
 "github:ap/vim-css-color"
 "github:benekastah/neomake"
 "github:bitc/vim-hdevtools"
diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix
index adb938900663..f39d7093c73b 100644
--- a/pkgs/misc/vim-plugins/vim-utils.nix
+++ b/pkgs/misc/vim-plugins/vim-utils.nix
@@ -103,7 +103,7 @@ Then create a temp vim file and insert:
 
 Then ":source %" it.
 
-nix#ExportPluginsForNix is provided by github.com/JagaJaga/vim-addon-vim2nix
+nix#ExportPluginsForNix is provided by ./vim2nix
 
 A buffer will open containing the plugin derivation lines as well list 
 fitting the vimrcConfig.vam.pluginDictionaries option.
@@ -297,7 +297,7 @@ rec {
   pluginnames2Nix = {name, namefiles} : vim_configurable.customize {
     inherit name;
     vimrcConfig.vam.knownPlugins = vimPlugins;
-    vimrcConfig.vam.pluginDictionaries = ["vim-addon-vim2nix"]; # Using fork until patch is accepted by upstream
+    vimrcConfig.vam.pluginDictionaries = ["vim2nix"];
     vimrcConfig.customRC = ''
       " Yes - this is impure and will create the cache file and checkout vim-pi
       " into ~/.vim/vim-addons
diff --git a/pkgs/misc/vim-plugins/vim2nix/README.txt b/pkgs/misc/vim-plugins/vim2nix/README.txt
new file mode 100644
index 000000000000..4263481461f1
--- /dev/null
+++ b/pkgs/misc/vim-plugins/vim2nix/README.txt
@@ -0,0 +1,3 @@
+Usage see vim-utils.nix in nixpkgs
+
+This code depends on vim-addon-manager
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/command-t b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/command-t
new file mode 100644
index 000000000000..a29c602b5d7e
--- /dev/null
+++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/command-t
@@ -0,0 +1,7 @@
+    buildInputs = [ perl ruby ];
+    buildPhase = ''
+      pushd ruby/command-t
+      ruby extconf.rb
+      make
+      popd
+    '';
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/matchit.zip b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/matchit.zip
new file mode 100644
index 000000000000..cc9d3fb72640
--- /dev/null
+++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/matchit.zip
@@ -0,0 +1,7 @@
+    unpackPhase = ''
+      (
+       sourceRoot=d
+       mkdir $sourceRoot; cd $sourceRoot;
+       unzip $src
+      )
+    '';
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/racer b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/racer
new file mode 100644
index 000000000000..57000b870645
--- /dev/null
+++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/racer
@@ -0,0 +1,4 @@
+    buildPhase = ''
+      find . -type f -not -name 'racer.vim' -exec rm -rf {} \;
+      rm -rf editors images src
+    '';
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/taglist b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/taglist
new file mode 100644
index 000000000000..90f6e3367a3b
--- /dev/null
+++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/taglist
@@ -0,0 +1,6 @@
+    setSourceRoot = ''
+      export sourceRoot=taglist
+      mkdir taglist
+      mv doc taglist
+      mv plugin taglist
+    '';
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-addon-manager b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-addon-manager
new file mode 100644
index 000000000000..e3d8dfb69210
--- /dev/null
+++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-addon-manager
@@ -0,0 +1 @@
+    buildInputs = stdenv.lib.optional stdenv.isDarwin Cocoa;
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-hier b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-hier
new file mode 100644
index 000000000000..d1f756a99d3b
--- /dev/null
+++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-hier
@@ -0,0 +1 @@
+    buildInputs = [ vim ];
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-wakatime b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-wakatime
new file mode 100644
index 000000000000..31ffa7f8ff97
--- /dev/null
+++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-wakatime
@@ -0,0 +1 @@
+    buildInputs = [ python ];
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-xdebug b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-xdebug
new file mode 100644
index 000000000000..62a3c22c0369
--- /dev/null
+++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-xdebug
@@ -0,0 +1 @@
+    postInstall = false;
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-xkbswitch b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-xkbswitch
new file mode 100644
index 000000000000..4e73ac9a73b3
--- /dev/null
+++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vim-xkbswitch
@@ -0,0 +1,5 @@
+    patchPhase = ''
+      substituteInPlace plugin/xkbswitch.vim \
+              --replace /usr/local/lib/libxkbswitch.so ${xkb_switch}/lib/libxkbswitch.so
+    '';
+    buildInputs = [ xkb_switch ];
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vimproc.vim b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vimproc.vim
new file mode 100644
index 000000000000..e720559fa3d6
--- /dev/null
+++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vimproc.vim
@@ -0,0 +1,9 @@
+    buildInputs = [ which ];
+
+    buildPhase = ''
+      substituteInPlace autoload/vimproc.vim \
+        --replace vimproc_mac.so vimproc_unix.so \
+        --replace vimproc_linux64.so vimproc_unix.so \
+        --replace vimproc_linux32.so vimproc_unix.so
+      make -f make_unix.mak
+    '';
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vimshell.vim b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vimshell.vim
new file mode 100644
index 000000000000..5be233050793
--- /dev/null
+++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/vimshell.vim
@@ -0,0 +1 @@
+    dependencies = [ "vimproc-vim" ];
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme
new file mode 100644
index 000000000000..625dfcb4f3ee
--- /dev/null
+++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme
@@ -0,0 +1,24 @@
+    buildInputs = [
+      python go cmake
+      (if stdenv.isDarwin then llvmPackages.clang else llvmPackages.clang-unwrapped)
+      llvmPackages.llvm
+    ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa;
+
+    buildPhase = ''
+      patchShebangs .
+
+      mkdir build
+      pushd build
+      cmake -G "Unix Makefiles" . ../third_party/ycmd/cpp -DPYTHON_LIBRARIES:PATH=${python}/lib/libpython2.7.so -DPYTHON_INCLUDE_DIR:PATH=${python}/include/python2.7 -DUSE_CLANG_COMPLETER=ON -DUSE_SYSTEM_LIBCLANG=ON
+      make ycm_support_libs -j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}}
+      ${python}/bin/python ../third_party/ycmd/build.py --gocode-completer --clang-completer --system-libclang
+      popd
+    '';
+
+    meta = {
+      description = "Fastest non utf-8 aware word and C completion engine for Vim";
+      homepage = http://github.com/Valloric/YouCompleteMe;
+      license = stdenv.lib.licenses.gpl3;
+      maintainers = with stdenv.lib.maintainers; [marcweber jagajaga];
+      platforms = stdenv.lib.platforms.linux;
+    };
diff --git a/pkgs/misc/vim-plugins/vim2nix/addon-info.json b/pkgs/misc/vim-plugins/vim2nix/addon-info.json
new file mode 100644
index 000000000000..93ca9bc129b5
--- /dev/null
+++ b/pkgs/misc/vim-plugins/vim2nix/addon-info.json
@@ -0,0 +1 @@
+{'dependencies': {'vim-addon-manager': {}}}
diff --git a/pkgs/misc/vim-plugins/vim2nix/autoload/nix.vim b/pkgs/misc/vim-plugins/vim2nix/autoload/nix.vim
new file mode 100644
index 000000000000..376b7c674d6c
--- /dev/null
+++ b/pkgs/misc/vim-plugins/vim2nix/autoload/nix.vim
@@ -0,0 +1,307 @@
+" usage example:
+"
+" call nix#ExportPluginsForNix({'path_to_nixpkgs': '/etc/nixos/nixpkgs', 'names': ["vim-addon-manager", "vim-addon-nix"], 'cache_file': 'cache'})
+let s:plugin_root = expand('<sfile>:h:h')
+
+fun! nix#ToNixAttrName(s) abort
+    return nix#ToNixName(a:s)
+endf
+
+fun! nix#ToNixName(s) abort
+  return substitute(substitute(a:s, '[:/.]', '-', 'g'), 'github-', '', 'g')
+endf
+
+fun! s:System(...)
+  let args = a:000
+  let r = call('vam#utils#System', args)
+  if r is 0
+    throw "command ".join(args, '').' failed'
+  else
+    return r
+  endif
+endf
+
+fun! nix#DependenciesFromCheckout(opts, name, repository, dir)
+  " check for dependencies
+  " vam#PluginDirFromName(a:name)
+  let info = vam#ReadAddonInfo(vam#AddonInfoFile(a:dir, a:name))
+  return keys(get(info, 'dependencies', {}))
+endf
+
+
+" without deps
+fun! nix#NixDerivation(opts, name, repository) abort
+  let n_a_name = nix#ToNixAttrName(a:name)
+  let n_n_name = nix#ToNixName(a:name)
+  let type = get(a:repository, 'type', '')
+  let created_notice = " # created by nix#NixDerivation"
+
+  let ancf = s:plugin_root.'/additional-nix-code/'.a:name
+  let additional_nix_code = file_readable(ancf) ? join(readfile(ancf), "\n") : ""
+
+  if type == 'git'
+    " should be using shell abstraction ..
+    echo 'fetching '. a:repository.url
+    let s = s:System('$ --fetch-submodules $ 2>&1',a:opts.nix_prefetch_git, a:repository.url)
+    let rev = matchstr(s, 'git revision is \zs[^\n\r]\+\ze')
+    let sha256 = matchstr(s, 'hash is \zs[^\n\r]\+\ze')
+    let dir = matchstr(s, 'path is \zs[^\n\r]\+\ze')
+    let date = matchstr(s, 'Commit date is \zs[0-9-]\+\ze')
+
+    let dependencies = nix#DependenciesFromCheckout(a:opts, a:name, a:repository, dir)
+    return {'n_a_name': n_a_name, 'n_n_name': n_n_name, 'dependencies': dependencies, 'derivation': join([
+          \ '  '.n_a_name.' = buildVimPluginFrom2Nix {'.created_notice,
+          \ '    name = "'.n_n_name.'-'.date.'";',
+          \ '    src = fetchgit {',
+          \ '      url = "'. a:repository.url .'";',
+          \ '      rev = "'.rev.'";',
+          \ '      sha256 = "'.sha256.'";',
+          \ '    };',
+          \ '    dependencies = ['.join(map(copy(dependencies), "'\"'.nix#ToNixAttrName(v:val).'\"'")).'];',
+          \ additional_nix_code,
+          \ '  };',
+          \ '',
+          \ '',
+          \ ], "\n")}
+
+  elseif type == 'hg'
+    " should be using shell abstraction ..
+    echo 'fetching '. a:repository.url
+    let s = s:System('$ $ 2>&1',a:opts.nix_prefetch_hg, a:repository.url)
+    let rev = matchstr(s, 'hg revision is \zs[^\n\r]\+\ze')
+    let sha256 = matchstr(s, 'hash is \zs[^\n\r]\+\ze')
+    let dir = matchstr(s, 'path is \zs[^\n\r]\+\ze')
+
+    let dependencies = nix#DependenciesFromCheckout(a:opts, a:name, a:repository, dir)
+    return {'n_a_name': n_a_name, 'n_n_name': n_n_name, 'dependencies': dependencies, 'derivation':  join([
+          \ '  '.n_a_name.' = buildVimPluginFrom2Nix {'.created_notice,
+          \ '    name = "'.n_n_name.'";',
+          \ '    src = fetchhg {',
+          \ '      url = "'. a:repository.url .'";',
+          \ '      rev = "'.rev.'";',
+          \ '      sha256 = "'.sha256.'";',
+          \ '    };',
+          \ '    dependencies = ['.join(map(copy(dependencies), "'\"'.nix#ToNixAttrName(v:val).'\"'")).'];',
+          \ additional_nix_code,
+          \ '  };',
+          \ '',
+          \ '',
+          \ ], "\n")}
+
+  elseif type == 'archive'
+    let sha256 = split(s:System('nix-prefetch-url $ 2>/dev/null', a:repository.url), "\n")[0]
+    " we should unpack the sources, look for the addon-info.json file ..
+    " however most packages who have the addon-info.json file also are on
+    " github thus will be of type "git" instead. The dependency information
+    " from vim-pi is encoded in the reposiotry. Thus this is likely to do the
+    " right thing most of the time.
+    let addon_info = get(a:repository, 'addon-info', {})
+    let dependencies = keys(get(addon_info, 'dependencies', {}))
+
+    return {'n_a_name': n_a_name, 'n_n_name': n_n_name, 'dependencies': dependencies, 'derivation':  join([
+          \ '  '.n_a_name.' = buildVimPluginFrom2Nix {'.created_notice,
+          \ '    name = "'.n_n_name.'";',
+          \ '    src = fetchurl {',
+          \ '      url = "'. a:repository.url .'";',
+          \ '      name = "'. a:repository.archive_name .'";',
+          \ '      sha256 = "'.sha256.'";',
+          \ '    };',
+          \ '    buildInputs = [ unzip ];',
+          \ '    dependencies = ['.join(map(copy(dependencies), "'\"'.nix#ToNixAttrName(v:val).'\"'")).'];',
+          \ '    meta = {',
+          \ '       url = "http://www.vim.org/scripts/script.php?script_id='.a:repository.vim_script_nr.'";',
+          \ '    };',
+          \ addon_info == {} ? '' : ('    addon_info = '.nix#ToNix(string(addon_info), [], "").';'),
+          \ additional_nix_code,
+          \ '  };',
+          \ '',
+          \ '',
+          \ ], "\n")}
+  else
+    throw a:name.' TODO: implement source '.string(a:repository)
+  endif
+endf
+
+" also tries to handle dependencies
+fun! nix#AddNixDerivation(opts, cache, name, ...) abort
+  if has_key(a:cache, a:name) | return | endif
+  let repository = a:0 > 0 ? a:1 : {}
+  let name = a:name
+
+  if repository == {}
+    call vam#install#LoadPool()
+    let list = matchlist(a:name, 'github:\([^/]*\)\%(\/\(.*\)\)\?$')
+    if len(list) > 0
+      if '' != list[2]
+        let name = list[2]
+        let repository = { 'type': 'git', 'owner': list[1], 'repo': list[2], 'url': 'git://github.com/'.list[1].'/'.list[2] }
+      else
+        let name = list[1]
+        let repository = { 'type': 'git', 'owner': list[1], 'repo': 'vim-addon-'.list[1], 'url': 'git://github.com/'.list[1].'/vim-addon-'.list[1] }
+      endif
+    else
+      let repository = get(g:vim_addon_manager.plugin_sources, a:name, {})
+      if repository == {}
+        throw "repository ".a:name." unkown!"
+      else
+          if repository.url =~ 'github'
+            let owner = matchstr(repository.url, 'github.com/\zs.\+\ze/')
+            let repo = matchstr(repository.url, '\/\zs[^\/]\+\ze$')
+            let url = repository.url
+            let repository = { 'type': 'git', 'owner': owner, 'repo': repo, 'url': url }
+          endif
+      endif
+    endif
+  endif
+
+  let a:cache[a:name] = nix#NixDerivation(a:opts, name, repository)
+
+  " take known dependencies into account:
+  let deps = get(a:cache[a:name], 'dependencies', [])
+  call extend(a:opts.names_to_process, deps)
+  call extend(a:opts.names_to_export,  deps)
+endfun
+
+fun! nix#TopNixOptsByParent(parents)
+  if (a:parents == [])
+    return {'ind': '  ', 'next_ind': '    ', 'sep': "\n"}
+  else
+    return {'ind': '', 'next_ind': '', 'sep': ' '}
+  endif
+endf
+
+fun! nix#ToNix(x, parents, opts_fun) abort
+  let opts = a:opts_fun == "" ? "" : call(a:opts_fun, [a:parents])
+  let next_parents = [a:x] + a:parents
+  let seps = a:0 > 1 ? a:2 : []
+
+  let ind = get(opts, 'ind', '')
+  let next_ind = get(opts, 'next_ind', ind.'  ')
+  let sep = get(opts, 'sep', ind.'  ')
+
+  if type(a:x) == type("")
+    return "''". substitute(a:x, '[$]', '$$', 'g')."''"
+  elseif type(a:x) == type({})
+    let s = ind."{".sep
+    for [k,v] in items(a:x)
+      let s .= '"'.k.'" = '.nix#ToNix(v, next_parents, a:opts_fun).";".sep
+      unlet k v
+    endfor
+    return  s.ind."}"
+
+    " let s = ind."{\n"
+    " for [k,v] in items(a:x)
+    "   let s .= next_ind . nix#ToNix(k).' = '.nix#ToNix(v, next_ind)."\n"
+    "   unlet k v
+    " endfor
+    " return  s.ind."}\n"
+  elseif type(a:x) == type([])
+    let s = ind."[".sep
+    for v in a:x
+      let s .= next_ind . nix#ToNix(v, next_parents, a:opts_fun)."".sep
+      unlet v
+    endfor
+    return s.ind."]"
+  endif
+endf
+
+
+" with dependencies
+" opts.cache_file (caches the checkout and dependency information
+" opts.path_to_nixpkgs or  opts.nix_prefetch_{git,hg}
+" opts.plugin_dictionaries: list of any
+"     - string
+"     - dictionary having key name or names
+" This is so that plugin script files can be loaded/ merged
+fun! nix#ExportPluginsForNix(opts) abort
+  let cache_file = get(a:opts, 'cache_file', '')
+
+  let opts = a:opts
+
+  " set nix_prefetch_* scripts
+  for scm in ['git', 'hg']
+    if !has_key(opts, 'nix_prefetch_'.scm)
+      let opts['nix_prefetch_'.scm] = a:opts.path_to_nixpkgs.'/pkgs/build-support/fetch'.scm.'/nix-prefetch-'.scm
+    endif
+  endfor
+
+  " create list of names from dictionaries
+  let a:opts.names_to_process = []
+  for x in a:opts.plugin_dictionaries
+    if type(x) == type('')
+      call add(opts.names_to_process, x)
+    elseif type(x) == type({}) && has_key(x, 'name')
+      call add(opts.names_to_process, x.name)
+    elseif type(x) == type({}) && has_key(x, 'names')
+      call extend(opts.names_to_process, x.names)
+    else
+      throw "unexpected"
+    endif
+    unlet x
+  endfor
+  let a:opts.names_to_export = a:opts.names_to_process
+
+  let cache = (cache_file == '' || !filereadable(cache_file)) ? {} : eval(readfile(cache_file)[0])
+  let failed = {}
+  while len(opts.names_to_process) > 0
+    let name = opts.names_to_process[0]
+    if get(opts, 'try_catch', 1)
+      try
+        call nix#AddNixDerivation(opts, cache, name)
+      catch /.*/
+        echom 'failed : '.name.' '.v:exception
+        let failed[name] = v:exception
+      endtry
+    else
+      call nix#AddNixDerivation(opts, cache, name)
+    endif
+    let opts.names_to_process = opts.names_to_process[1:]
+  endwhile
+  echom join(keys(failed), ", ")
+  echom string(failed)
+
+  if cache_file != ''
+    call writefile([string(cache)], cache_file)
+  endif
+
+  enew
+
+  let uniq = {}
+  for x in a:opts.names_to_export
+    let uniq[x] = 1
+  endfor
+
+  for k in sort(keys(uniq))
+    call append('$', split(cache[k].derivation,"\n"))
+  endfor
+
+  " for VAM users output vam.pluginDictionaries which can be fed to
+  " vim_customizable.customize.vimrc.vam.pluginDictionaries
+  call append('$', ["", "", "", '# vam.pluginDictionaries'])
+
+  let ns = []
+  for x in a:opts.plugin_dictionaries
+    if type(x) == type("")
+      call add(ns, nix#ToNixAttrName(x))
+    elseif type(x) == type({})
+      if has_key(x, 'name')
+        call add(ns, extend({'name': nix#ToNixAttrName(x.name)}, x, "keep"))
+      elseif has_key(x, 'names')
+        call add(ns, extend({'names': map(copy(x.names), 'nix#ToNixAttrName(v:val)')}, x, "keep"))
+      else
+        throw "unexpected"
+      endif
+    else
+      throw "unexpected"
+    endif
+    unlet x
+  endfor
+
+  call append('$', split(nix#ToNix(ns, [], 'nix#TopNixOptsByParent'), "\n"))
+
+  " failures:
+  for [k,v] in items(failed)
+    call append('$', ['# '.k.', failure: '.v])
+    unlet k v
+  endfor
+endf

From 521ed1802fdf66ad46e27eaad55057a7e645c581 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 10 Jan 2016 12:15:39 +0100
Subject: [PATCH 511/884] gst_all: add dashed-named aliases

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bb2f0e4f10d9..e214487a3e3f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6624,6 +6624,14 @@ let
     gstPluginsGood = pkgs.gst_plugins_good;
     gstPluginsUgly = pkgs.gst_plugins_ugly;
     gstFfmpeg = pkgs.gst_ffmpeg;
+
+    # aliases with the dashed naming, same as in gst_all_1
+    gst-plugins-base = pkgs.gst_plugins_base;
+    gst-plugins-bad = pkgs.gst_plugins_bad;
+    gst-plugins-good = pkgs.gst_plugins_good;
+    gst-plugins-ugly = pkgs.gst_plugins_ugly;
+    gst-ffmpeg = pkgs.gst_ffmpeg;
+    gst-python = pkgs.gst_python;
   };
 
   gstreamer = callPackage ../development/libraries/gstreamer/legacy/gstreamer {

From 258b3322af109fdbaecd13cd53f295179c808add Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sat, 9 Jan 2016 22:20:44 +0000
Subject: [PATCH 512/884] acme_tiny: init at 20151229

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

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

From 4ad12e038ad361bfbb81d2e48794f7f125a6a951 Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Sun, 10 Jan 2016 12:01:05 +0100
Subject: [PATCH 513/884] libcommuni: init at 2016-01-02

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

diff --git a/pkgs/development/libraries/libcommuni/default.nix b/pkgs/development/libraries/libcommuni/default.nix
new file mode 100644
index 000000000000..e8debfda1de5
--- /dev/null
+++ b/pkgs/development/libraries/libcommuni/default.nix
@@ -0,0 +1,30 @@
+{ fetchgit, qt5, stdenv
+}:
+
+stdenv.mkDerivation rec {
+  name = "libcommuni-${version}";
+  version = "2016-01-02";
+
+  src = fetchgit {
+    url = "https://github.com/communi/libcommuni.git";
+    rev = "779b0c774428669235d44d2db8e762558e2f4b79";
+    sha256 = "15sb7vinaaz1v5nclxpnp5p9a0kmfmlgiqibkipnyydizclidpfx";
+  };
+
+  buildInputs = [ qt5.qtbase ];
+
+  enableParallelBuild = true;
+
+  configurePhase = ''
+    sed -i -e 's|/bin/pwd|pwd|g' configure
+    ./configure -config release -prefix $out -qmake ${qt5.qtbase}/bin/qmake
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A cross-platform IRC framework written with Qt";
+    homepage = https://communi.github.io;
+    license = licenses.bsd3;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ hrdinka ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d76fec2ef00e..b03357dcc5b7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7040,6 +7040,8 @@ let
 
   libcm = callPackage ../development/libraries/libcm { };
 
+  libcommuni = callPackage ../development/libraries/libcommuni { };
+
   inherit (gnome3) libcroco;
 
   libcangjie = callPackage ../development/libraries/libcangjie { };

From 5e380189596515cdad191ca1a0c883f52f47c4ac Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Sun, 10 Jan 2016 12:01:48 +0100
Subject: [PATCH 514/884] communi: init at 2016-01-03

---
 .../networking/irc/communi/default.nix        | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/applications/networking/irc/communi/default.nix

diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/applications/networking/irc/communi/default.nix
new file mode 100644
index 000000000000..05a597199025
--- /dev/null
+++ b/pkgs/applications/networking/irc/communi/default.nix
@@ -0,0 +1,30 @@
+{ fetchgit, libcommuni, qt5, stdenv
+}:
+
+stdenv.mkDerivation rec {
+  name = "communi-${version}";
+  version = "2016-01-03";
+
+  src = fetchgit {
+    url = "https://github.com/communi/communi-desktop.git";
+    rev = "ad1b9a30ed6c51940c0d2714b126a32b5d68c876";
+    sha256 = "0gk6gck09zb44qfsal7bs4ln2vl9s9x3vfxh7jvfc7mmf7l3sspd";
+  };
+
+  buildInputs = [ libcommuni qt5.qtbase ];
+
+  enableParallelBuild = true;
+
+  configurePhase = ''
+    export QMAKEFEATURES=${libcommuni}/features
+    qmake -r COMMUNI_INSTALL_PREFIX=$out
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A simple and elegant cross-platform IRC client";
+    homepage = https://github.com/communi/communi-desktop;
+    license = licenses.bsd3;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ hrdinka ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b03357dcc5b7..adbc8b0c1183 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11288,6 +11288,8 @@ let
     pulseaudioSupport = config.pulseaudio or false;
   };
 
+  communi = callPackage ../applications/networking/irc/communi { };
+
   CompBus = callPackage ../applications/audio/CompBus { };
 
   compiz = callPackage ../applications/window-managers/compiz {

From 1237b165d83c1844617915ed5635f731a7a6bc74 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 10 Jan 2016 13:50:25 +0100
Subject: [PATCH 515/884] pythonPackages.tqdm: disable tests because of to
 transient failures

Many transient failures in performance tests and due to use of sleep.
---
 pkgs/top-level/python-packages.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7b4726cd55f3..249b000f44e9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19383,15 +19383,12 @@ in modules // {
     buildInputs = with self; [ nose coverage pkgs.glibcLocales flake8 ];
     propagatedBuildInputs = with self; [ matplotlib pandas ];
 
-    # Performance test fails
-    prePatch = ''
-      rm tqdm/tests/tests_perf.py
-    '';
-
     preBuild = ''
       export LC_ALL="en_US.UTF-8"
     '';
 
+    doCheck = false; # Many transient failures in performance tests and due to use of sleep
+
     meta = {
       description = "A Fast, Extensible Progress Meter";
       homepage = https://github.com/tqdm/tqdm;

From 95c1429e624f3ff85a301102511a2483cfdf61fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 10 Jan 2016 10:35:45 +0100
Subject: [PATCH 516/884] wrapFirefox: move out of all-packages.nix, change
 defaults

- I don't think that amount of code belonged into all-packages.nix.
- Now the default name of the wrapped package is identical
  with the command that runs the browser.
- Other defaults were changed according to how the wrapper is
  (almost always) used.
- `meta` is improved: mostly inherited with priority above
  the unwrapped package.
---
 .../networking/browsers/firefox/wrapper.nix   | 63 +++++++++++++++++--
 pkgs/top-level/all-packages.nix               | 38 +----------
 2 files changed, 58 insertions(+), 43 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index db51dc8b148b..8c805b0bf5fe 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -1,11 +1,58 @@
-{ stdenv, lib, browser, makeDesktopItem, makeWrapper, plugins, gst_plugins, libs, gtk_modules
-, browserName, desktopName, nameSuffix, icon, libtrick ? true
+{ stdenv, lib, makeDesktopItem, makeWrapper, config
+
+## various stuff that can be plugged in
+, gnash, flashplayer, hal-flash
+, MPlayerPlugin, gecko_mediaplayer, gst_all, xorg, libpulseaudio, libcanberra
+, supportsJDK, jrePlugin, icedtea_web
+, trezor-bridge, bluejeans, djview4
+, google_talk_plugin, fribid, gnome3/*.gnome_shell*/
 }:
 
-let p = builtins.parseDrvName browser.name; in
+## configurability of the wrapper itself
+browser :
+{ browserName ? (lib.head (lib.splitString "-" browser.name))  # name of the executable
+, name ? (browserName + "-" + (builtins.parseDrvName browser.name).version)
+, desktopName ? # browserName with first letter capitalized
+  (lib.toUpper (lib.substring 0 1 browserName) + lib.substring 1 (-1) browserName)
+, nameSuffix ? ""
+, icon ? browserName, libtrick ? true
+}:
 
+let
+  cfg = stdenv.lib.attrByPath [ browserName ] {} config;
+  enableAdobeFlash = cfg.enableAdobeFlash or false;
+  enableGnash = cfg.enableGnash or false;
+  jre = cfg.jre or false;
+  icedtea = cfg.icedtea or false;
+
+  plugins =
+     assert !(enableGnash && enableAdobeFlash);
+     assert !(jre && icedtea);
+     ([ ]
+      ++ lib.optional enableGnash gnash
+      ++ lib.optional enableAdobeFlash flashplayer
+      ++ lib.optional (cfg.enableDjvu or false) (djview4)
+      ++ lib.optional (cfg.enableMPlayer or false) (MPlayerPlugin browser)
+      ++ lib.optional (cfg.enableGeckoMediaPlayer or false) gecko_mediaplayer
+      ++ lib.optional (supportsJDK && jre && jrePlugin ? mozillaPlugin) jrePlugin
+      ++ lib.optional icedtea icedtea_web
+      ++ lib.optional (cfg.enableGoogleTalkPlugin or false) google_talk_plugin
+      ++ lib.optional (cfg.enableFriBIDPlugin or false) fribid
+      ++ lib.optional (cfg.enableGnomeExtensions or false) gnome3.gnome_shell
+      ++ lib.optional (cfg.enableTrezor or false) trezor-bridge
+      ++ lib.optional (cfg.enableBluejeans or false) bluejeans
+     );
+  libs = [ gst_all.gstreamer gst_all.gst-plugins-base ]
+         ++ lib.optionals (cfg.enableQuakeLive or false)
+         (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ])
+         ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash
+         ++ lib.optional (config.pulseaudio or false) libpulseaudio;
+  gst-plugins = with gst_all; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-ffmpeg ];
+  gtk_modules = [ libcanberra ];
+
+in
 stdenv.mkDerivation {
-  name = "${p.name}-with-plugins-${p.version}";
+  inherit name;
 
   desktopItem = makeDesktopItem {
     name = browserName;
@@ -26,7 +73,7 @@ stdenv.mkDerivation {
     ];
   };
 
-  buildInputs = [makeWrapper] ++ gst_plugins;
+  buildInputs = [makeWrapper] ++ gst-plugins;
 
   buildCommand = ''
     if [ ! -x "${browser}/bin/${browserName}" ]
@@ -82,11 +129,15 @@ stdenv.mkDerivation {
   libs = map (x: x + "/lib") libs ++ map (x: x + "/lib64") libs;
   gtk_modules = map (x: x + x.gtkModule) gtk_modules;
 
-  meta = {
+  passthru = { unwrapped = browser; };
+
+  meta = browser.meta // {
     description =
       browser.meta.description
       + " (with plugins: "
       + lib.concatStrings (lib.intersperse ", " (map (x: x.name) plugins))
       + ")";
+    hydraPlatforms = [];
+    priority = (browser.meta.priority or 0) - 1; # prefer wrapper over the package
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e214487a3e3f..0b7771251bd6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13621,43 +13621,7 @@ let
     inherit (python27Packages) cheetah;
   };
 
-  wrapFirefox =
-    { browser, browserName ? "firefox", desktopName ? "Firefox", nameSuffix ? ""
-    , icon ? browserName }:
-    let
-      cfg = stdenv.lib.attrByPath [ browserName ] {} config;
-      enableAdobeFlash = cfg.enableAdobeFlash or false;
-      enableGnash = cfg.enableGnash or false;
-      jre = cfg.jre or false;
-      icedtea = cfg.icedtea or false;
-    in
-    callPackage ../applications/networking/browsers/firefox/wrapper.nix {
-      inherit browser browserName desktopName nameSuffix icon;
-      libtrick = true;
-      plugins =
-         assert !(enableGnash && enableAdobeFlash);
-         assert !(jre && icedtea);
-         ([ ]
-          ++ lib.optional enableGnash gnash
-          ++ lib.optional enableAdobeFlash flashplayer
-          ++ lib.optional (cfg.enableDjvu or false) (djview4)
-          ++ lib.optional (cfg.enableMPlayer or false) (MPlayerPlugin browser)
-          ++ lib.optional (cfg.enableGeckoMediaPlayer or false) gecko_mediaplayer
-          ++ lib.optional (supportsJDK && jre && jrePlugin ? mozillaPlugin) jrePlugin
-          ++ lib.optional icedtea icedtea_web
-          ++ lib.optional (cfg.enableGoogleTalkPlugin or false) google_talk_plugin
-          ++ lib.optional (cfg.enableFriBIDPlugin or false) fribid
-          ++ lib.optional (cfg.enableGnomeExtensions or false) gnome3.gnome_shell
-          ++ lib.optional (cfg.enableTrezor or false) trezor-bridge
-          ++ lib.optional (cfg.enableBluejeans or false) bluejeans
-         );
-      libs = [ gstreamer gst_plugins_base ] ++ lib.optionals (cfg.enableQuakeLive or false)
-             (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ])
-             ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash
-             ++ lib.optional (config.pulseaudio or false) libpulseaudio;
-      gst_plugins = [ gst_plugins_base gst_plugins_good gst_plugins_bad gst_plugins_ugly gst_ffmpeg ];
-      gtk_modules = [ libcanberra ];
-    };
+  wrapFirefox = callPackage ../applications/networking/browsers/firefox/wrapper.nix { };
 
   retroArchCores =
     let

From 727a9ddea8675caf07a59ca274c773ea6cc8a97f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 9 Jan 2016 16:03:03 -0600
Subject: [PATCH 517/884] elpaPackages: remove outdated `dash`

---
 pkgs/applications/editors/emacs-modes/elpa-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-packages.nix b/pkgs/applications/editors/emacs-modes/elpa-packages.nix
index aa30d62c60a9..2337f45c4ad6 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-packages.nix
@@ -50,7 +50,7 @@ in
 self:
 
   let
-    super = mapAttrs (mkPackage self) manifest;
+    super = removeAttrs (mapAttrs (mkPackage self) manifest) [ "dash" ];
 
     elpaBuild = import ../../../build-support/emacs/melpa.nix {
       inherit fetchurl lib stdenv texinfo;

From aaaf23f1e813656f68af6565fc3d38c5c318b8eb Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 10 Jan 2016 09:08:06 -0600
Subject: [PATCH 518/884] kde5_latest.frameworks: 5.17.0 -> 5.18.0

---
 .../libraries/kde-frameworks-5.18/attica.nix  |  11 +
 .../libraries/kde-frameworks-5.18/baloo.nix   |  25 +
 .../kde-frameworks-5.18/bluez-qt.nix          |  17 +
 .../kde-frameworks-5.18/breeze-icons.nix      |  10 +
 .../libraries/kde-frameworks-5.18/default.nix | 112 ++++
 .../0001-extra-cmake-modules-paths.patch      |  74 +++
 .../extra-cmake-modules/default.nix           |  18 +
 .../extra-cmake-modules/setup-hook.sh         |  27 +
 .../kde-frameworks-5.18/fetchsrcs.sh          |  57 ++
 .../frameworkintegration.nix                  |  17 +
 .../kde-frameworks-5.18/kactivities.nix       |  22 +
 .../libraries/kde-frameworks-5.18/kapidox.nix |  12 +
 .../kde-frameworks-5.18/karchive.nix          |  11 +
 .../kde-frameworks-5.18/kauth/default.nix     |  16 +
 .../kauth/kauth-policy-install.patch          |  13 +
 .../kde-frameworks-5.18/kbookmarks.nix        |  25 +
 .../0001-qdiriterator-follow-symlinks.patch   |  25 +
 .../kde-frameworks-5.18/kcmutils/default.nix  |  17 +
 .../libraries/kde-frameworks-5.18/kcodecs.nix |  11 +
 .../kde-frameworks-5.18/kcompletion.nix       |  14 +
 .../libraries/kde-frameworks-5.18/kconfig.nix |  16 +
 .../0001-qdiriterator-follow-symlinks.patch   |  25 +
 .../kconfigwidgets/default.nix                |  17 +
 .../kde-frameworks-5.18/kcoreaddons.nix       |  16 +
 .../libraries/kde-frameworks-5.18/kcrash.nix  |  16 +
 .../kde-frameworks-5.18/kdbusaddons.nix       |  17 +
 .../kde-frameworks-5.18/kdeclarative.nix      |  22 +
 .../libraries/kde-frameworks-5.18/kded.nix    |  19 +
 .../kde-frameworks-5.18/kdelibs4support.nix   |  32 +
 .../kde-frameworks-5.18/kdesignerplugin.nix   |  34 ++
 .../libraries/kde-frameworks-5.18/kdesu.nix   |  13 +
 .../kde-frameworks-5.18/kdewebkit.nix         |  13 +
 .../libraries/kde-frameworks-5.18/kdnssd.nix  |  13 +
 .../kde-frameworks-5.18/kdoctools/default.nix |  20 +
 .../kdoctools-no-find-docbook-xml.patch       |  12 +
 .../kdoctools/setup-hook.sh                   |   5 +
 .../kde-frameworks-5.18/kemoticons.nix        |  17 +
 .../kde-frameworks-5.18/kfilemetadata.nix     |  13 +
 .../kde-frameworks-5.18/kglobalaccel.nix      |  23 +
 .../kde-frameworks-5.18/kguiaddons.nix        |  13 +
 .../libraries/kde-frameworks-5.18/khtml.nix   |  21 +
 .../libraries/kde-frameworks-5.18/ki18n.nix   |  17 +
 .../kiconthemes/default-theme-breeze.patch    |  13 +
 .../kiconthemes/default.nix                   |  18 +
 .../kde-frameworks-5.18/kiconthemes/series    |   1 +
 .../kde-frameworks-5.18/kidletime.nix         |  15 +
 .../kde-frameworks-5.18/kimageformats.nix     |  13 +
 .../kinit/0001-kinit-libpath.patch            |  42 ++
 .../kde-frameworks-5.18/kinit/default.nix     |  17 +
 .../kde-frameworks-5.18/kio/default.nix       |  33 +
 .../kio/samba-search-path.patch               |  28 +
 .../libraries/kde-frameworks-5.18/kio/series  |   1 +
 .../kde-frameworks-5.18/kitemmodels.nix       |  11 +
 .../kde-frameworks-5.18/kitemviews.nix        |  11 +
 .../kde-frameworks-5.18/kjobwidgets.nix       |  16 +
 .../libraries/kde-frameworks-5.18/kjs.nix     |  16 +
 .../kde-frameworks-5.18/kjsembed.nix          |  17 +
 .../kde-frameworks-5.18/kmediaplayer.nix      |  15 +
 .../kde-frameworks-5.18/knewstuff.nix         |  17 +
 .../kde-frameworks-5.18/knotifications.nix    |  21 +
 .../kde-frameworks-5.18/knotifyconfig.nix     |  13 +
 .../kpackage/0001-allow-external-paths.patch  |  25 +
 .../0002-qdiriterator-follow-symlinks.patch   |  39 ++
 .../kde-frameworks-5.18/kpackage/default.nix  |  26 +
 .../libraries/kde-frameworks-5.18/kparts.nix  |  17 +
 .../libraries/kde-frameworks-5.18/kpeople.nix |  15 +
 .../kde-frameworks-5.18/kplotting.nix         |  11 +
 .../libraries/kde-frameworks-5.18/kpty.nix    |  10 +
 .../libraries/kde-frameworks-5.18/kross.nix   |  14 +
 .../libraries/kde-frameworks-5.18/krunner.nix |  16 +
 .../0001-qdiriterator-follow-symlinks.patch   |  25 +
 .../kservice/0002-no-canonicalize-path.patch  |  25 +
 .../kde-frameworks-5.18/kservice/default.nix  |  19 +
 .../kservice/setup-hook.sh                    |  43 ++
 .../0001-no-qcoreapplication.patch            |  48 ++
 .../ktexteditor/default.nix                   |  18 +
 .../kde-frameworks-5.18/ktextwidgets.nix      |  16 +
 .../kde-frameworks-5.18/kunitconversion.nix   |  10 +
 .../libraries/kde-frameworks-5.18/kwallet.nix |  21 +
 .../kde-frameworks-5.18/kwidgetsaddons.nix    |  11 +
 .../kde-frameworks-5.18/kwindowsystem.nix     |  13 +
 .../libraries/kde-frameworks-5.18/kxmlgui.nix |  18 +
 .../kde-frameworks-5.18/kxmlrpcclient.nix     |  10 +
 .../kde-frameworks-5.18/modemmanager-qt.nix   |  13 +
 .../kde-frameworks-5.18/networkmanager-qt.nix |  13 +
 .../kde-frameworks-5.18/oxygen-icons5.nix     |  13 +
 .../plasma-framework/default.nix              |  25 +
 .../libraries/kde-frameworks-5.18/solid.nix   |  17 +
 .../libraries/kde-frameworks-5.18/sonnet.nix  |  13 +
 .../libraries/kde-frameworks-5.18/srcs.nix    | 565 ++++++++++++++++++
 .../kde-frameworks-5.18/threadweaver.nix      |  11 +
 pkgs/top-level/all-packages.nix               |   2 +-
 92 files changed, 2367 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/attica.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/baloo.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/bluez-qt.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/breeze-icons.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/default.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/default.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/setup-hook.sh
 create mode 100755 pkgs/development/libraries/kde-frameworks-5.18/fetchsrcs.sh
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/frameworkintegration.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kactivities.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kapidox.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/karchive.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kauth/default.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kauth/kauth-policy-install.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kbookmarks.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kcmutils/0001-qdiriterator-follow-symlinks.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kcmutils/default.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kcodecs.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kcompletion.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kconfig.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kconfigwidgets/default.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kcoreaddons.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kcrash.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kdbusaddons.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kdeclarative.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kded.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kdesignerplugin.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kdesu.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kdewebkit.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kdnssd.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kdoctools/default.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kdoctools/kdoctools-no-find-docbook-xml.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kdoctools/setup-hook.sh
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kemoticons.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kglobalaccel.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kguiaddons.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/khtml.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/ki18n.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kiconthemes/default-theme-breeze.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kiconthemes/default.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kiconthemes/series
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kidletime.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kimageformats.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kinit/0001-kinit-libpath.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kinit/default.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kio/default.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kio/samba-search-path.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kio/series
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kitemmodels.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kitemviews.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kjobwidgets.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kjs.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kjsembed.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kmediaplayer.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/knewstuff.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/knotifications.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/knotifyconfig.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kpackage/0001-allow-external-paths.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kpackage/0002-qdiriterator-follow-symlinks.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kpackage/default.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kparts.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kpeople.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kplotting.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kpty.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kross.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/krunner.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kservice/0001-qdiriterator-follow-symlinks.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kservice/0002-no-canonicalize-path.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kservice/default.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kservice/setup-hook.sh
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/0001-no-qcoreapplication.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/default.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/ktextwidgets.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kunitconversion.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kwallet.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kwidgetsaddons.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kwindowsystem.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kxmlgui.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kxmlrpcclient.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/modemmanager-qt.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/networkmanager-qt.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/oxygen-icons5.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/plasma-framework/default.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/solid.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/sonnet.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/srcs.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/threadweaver.nix

diff --git a/pkgs/development/libraries/kde-frameworks-5.18/attica.nix b/pkgs/development/libraries/kde-frameworks-5.18/attica.nix
new file mode 100644
index 000000000000..98721876c120
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/attica.nix
@@ -0,0 +1,11 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+}:
+
+kdeFramework {
+  name = "attica";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/baloo.nix b/pkgs/development/libraries/kde-frameworks-5.18/baloo.nix
new file mode 100644
index 000000000000..38c41d9271d8
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/baloo.nix
@@ -0,0 +1,25 @@
+{ kdeFramework, lib, extra-cmake-modules, kauth, kconfig
+, kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n, kidletime
+, kio, lmdb, makeQtWrapper, qtbase, qtquick1, solid
+}:
+
+kdeFramework {
+  name = "baloo";
+  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
+  buildInputs = [
+    kconfig kcrash kdbusaddons lmdb qtquick1 solid
+  ];
+  propagatedBuildInputs = [
+    kauth kcoreaddons kfilemetadata ki18n kio kidletime qtbase
+  ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/baloo_file"
+    wrapQtProgram "$out/bin/baloo_file_extractor"
+    wrapQtProgram "$out/bin/balooctl"
+    wrapQtProgram "$out/bin/baloosearch"
+    wrapQtProgram "$out/bin/balooshow"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/bluez-qt.nix b/pkgs/development/libraries/kde-frameworks-5.18/bluez-qt.nix
new file mode 100644
index 000000000000..f981b0516f72
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/bluez-qt.nix
@@ -0,0 +1,17 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, qtdeclarative
+}:
+
+kdeFramework {
+  name = "bluez-qt";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qtdeclarative ];
+  preConfigure = ''
+    substituteInPlace CMakeLists.txt \
+      --replace /lib/udev/rules.d "$out/lib/udev/rules.d"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/breeze-icons.nix b/pkgs/development/libraries/kde-frameworks-5.18/breeze-icons.nix
new file mode 100644
index 000000000000..879262c56a41
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/breeze-icons.nix
@@ -0,0 +1,10 @@
+{ kdeFramework
+, extra-cmake-modules
+, qtsvg
+}:
+
+kdeFramework {
+  name = "breeze-icons";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  propagatedUserEnvPkgs = [ qtsvg ];
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/default.nix
new file mode 100644
index 000000000000..f41aebcb59d3
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/default.nix
@@ -0,0 +1,112 @@
+# Maintainer's Notes:
+#
+# How To Update
+#  1. Edit the URL in ./manifest.sh
+#  2. Run ./manifest.sh
+#  3. Fix build errors.
+
+{ pkgs, debug ? false }:
+
+let
+
+  inherit (pkgs) lib makeSetupHook stdenv;
+
+  mirror = "mirror://kde";
+  srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
+
+  packages = self: with self; {
+    kdeFramework = args:
+      let
+        inherit (args) name;
+        inherit (srcs."${name}") src version;
+      in stdenv.mkDerivation (args // {
+        name = "${name}-${version}";
+        inherit src;
+
+        cmakeFlags =
+          (args.cmakeFlags or [])
+          ++ [ "-DBUILD_TESTING=OFF" ]
+          ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
+
+        meta = {
+          license = with lib.licenses; [
+            lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
+          ];
+          platforms = lib.platforms.linux;
+          homepage = "http://www.kde.org";
+        } // (args.meta or {});
+      });
+
+    attica = callPackage ./attica.nix {};
+    baloo = callPackage ./baloo.nix {};
+    bluez-qt = callPackage ./bluez-qt.nix {};
+    breeze-icons = callPackage ./breeze-icons.nix {};
+    extra-cmake-modules = callPackage ./extra-cmake-modules {};
+    frameworkintegration = callPackage ./frameworkintegration.nix {};
+    kactivities = callPackage ./kactivities.nix {};
+    kapidox = callPackage ./kapidox.nix {};
+    karchive = callPackage ./karchive.nix {};
+    kauth = callPackage ./kauth {};
+    kbookmarks = callPackage ./kbookmarks.nix {};
+    kcmutils = callPackage ./kcmutils {};
+    kcodecs = callPackage ./kcodecs.nix {};
+    kcompletion = callPackage ./kcompletion.nix {};
+    kconfig = callPackage ./kconfig.nix {};
+    kconfigwidgets = callPackage ./kconfigwidgets {};
+    kcoreaddons = callPackage ./kcoreaddons.nix {};
+    kcrash = callPackage ./kcrash.nix {};
+    kdbusaddons = callPackage ./kdbusaddons.nix {};
+    kdeclarative = callPackage ./kdeclarative.nix {};
+    kded = callPackage ./kded.nix {};
+    kdelibs4support = callPackage ./kdelibs4support.nix {};
+    kdesignerplugin = callPackage ./kdesignerplugin.nix {};
+    kdewebkit = callPackage ./kdewebkit.nix {};
+    kdesu = callPackage ./kdesu.nix {};
+    kdnssd = callPackage ./kdnssd.nix {};
+    kdoctools = callPackage ./kdoctools {};
+    kemoticons = callPackage ./kemoticons.nix {};
+    kfilemetadata = callPackage ./kfilemetadata.nix {};
+    kglobalaccel = callPackage ./kglobalaccel.nix {};
+    kguiaddons = callPackage ./kguiaddons.nix {};
+    khtml = callPackage ./khtml.nix {};
+    ki18n = callPackage ./ki18n.nix {};
+    kiconthemes = callPackage ./kiconthemes {};
+    kidletime = callPackage ./kidletime.nix {};
+    kimageformats = callPackage ./kimageformats.nix {};
+    kinit = callPackage ./kinit {};
+    kio = callPackage ./kio {};
+    kitemmodels = callPackage ./kitemmodels.nix {};
+    kitemviews = callPackage ./kitemviews.nix {};
+    kjobwidgets = callPackage ./kjobwidgets.nix {};
+    kjs = callPackage ./kjs.nix {};
+    kjsembed = callPackage ./kjsembed.nix {};
+    kmediaplayer = callPackage ./kmediaplayer.nix {};
+    knewstuff = callPackage ./knewstuff.nix {};
+    knotifications = callPackage ./knotifications.nix {};
+    knotifyconfig = callPackage ./knotifyconfig.nix {};
+    kpackage = callPackage ./kpackage {};
+    kparts = callPackage ./kparts.nix {};
+    kpeople = callPackage ./kpeople.nix {};
+    kplotting = callPackage ./kplotting.nix {};
+    kpty = callPackage ./kpty.nix {};
+    kross = callPackage ./kross.nix {};
+    krunner = callPackage ./krunner.nix {};
+    kservice = callPackage ./kservice {};
+    ktexteditor = callPackage ./ktexteditor {};
+    ktextwidgets = callPackage ./ktextwidgets.nix {};
+    kunitconversion = callPackage ./kunitconversion.nix {};
+    kwallet = callPackage ./kwallet.nix {};
+    kwidgetsaddons = callPackage ./kwidgetsaddons.nix {};
+    kwindowsystem = callPackage ./kwindowsystem.nix {};
+    kxmlgui = callPackage ./kxmlgui.nix {};
+    kxmlrpcclient = callPackage ./kxmlrpcclient.nix {};
+    modemmanager-qt = callPackage ./modemmanager-qt.nix {};
+    networkmanager-qt = callPackage ./networkmanager-qt.nix {};
+    oxygen-icons5 = callPackage ./oxygen-icons5.nix {};
+    plasma-framework = callPackage ./plasma-framework {};
+    solid = callPackage ./solid.nix {};
+    sonnet = callPackage ./sonnet.nix {};
+    threadweaver = callPackage ./threadweaver.nix {};
+  };
+
+in packages
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/0001-extra-cmake-modules-paths.patch b/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
new file mode 100644
index 000000000000..9717716faf5b
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
@@ -0,0 +1,74 @@
+From 3cc148e878b69fc3e0228f3e3bf1bbe689dad87c Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Fri, 20 Feb 2015 23:17:39 -0600
+Subject: [PATCH] extra-cmake-modules paths
+
+---
+ kde-modules/KDEInstallDirs.cmake | 37 ++++---------------------------------
+ 1 file changed, 4 insertions(+), 33 deletions(-)
+
+diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake
+index b7cd34d..2f868ac 100644
+--- a/kde-modules/KDEInstallDirs.cmake
++++ b/kde-modules/KDEInstallDirs.cmake
+@@ -193,37 +193,8 @@
+ # (To distribute this file outside of extra-cmake-modules, substitute the full
+ #  License text for the above reference.)
+ 
+-# Figure out what the default install directory for libraries should be.
+-# This is based on the logic in GNUInstallDirs, but simplified (the
+-# GNUInstallDirs code deals with re-configuring, but that is dealt with
+-# by the _define_* macros in this module).
++# The default library directory on NixOS is *always* /lib.
+ set(_LIBDIR_DEFAULT "lib")
+-# Override this default 'lib' with 'lib64' iff:
+-#  - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling
+-#  - we are NOT on debian
+-#  - we are on a 64 bits system
+-# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
+-# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
+-# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
+-# See http://wiki.debian.org/Multiarch
+-if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU")
+-   AND NOT CMAKE_CROSSCOMPILING)
+-  if (EXISTS "/etc/debian_version") # is this a debian system ?
+-    if(CMAKE_LIBRARY_ARCHITECTURE)
+-      set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
+-    endif()
+-  else() # not debian, rely on CMAKE_SIZEOF_VOID_P:
+-    if(NOT DEFINED CMAKE_SIZEOF_VOID_P)
+-      message(AUTHOR_WARNING
+-        "Unable to determine default LIB_INSTALL_LIBDIR directory because no target architecture is known. "
+-        "Please enable at least one language before including KDEInstallDirs.")
+-    else()
+-      if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+-        set(_LIBDIR_DEFAULT "lib64")
+-      endif()
+-    endif()
+-  endif()
+-endif()
+ 
+ set(_gnu_install_dirs_vars
+     BINDIR
+@@ -445,15 +416,15 @@ if(KDE_INSTALL_USE_QT_SYS_PATHS)
+         "QtQuick2 imports"
+         QML_INSTALL_DIR)
+ else()
+-    _define_relative(QTPLUGINDIR LIBDIR "plugins"
++    _define_relative(QTPLUGINDIR LIBDIR "qt5/plugins"
+         "Qt plugins"
+         QT_PLUGIN_INSTALL_DIR)
+ 
+-    _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "imports"
++    _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "qt5/imports"
+         "QtQuick1 imports"
+         IMPORTS_INSTALL_DIR)
+ 
+-    _define_relative(QMLDIR LIBDIR "qml"
++    _define_relative(QMLDIR LIBDIR "qt5/qml"
+         "QtQuick2 imports"
+         QML_INSTALL_DIR)
+ endif()
+-- 
+2.3.0
+
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/default.nix
new file mode 100644
index 000000000000..4e1b1aff3bd1
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/default.nix
@@ -0,0 +1,18 @@
+{ kdeFramework, lib, stdenv, cmake, pkgconfig, qttools }:
+
+kdeFramework {
+  name = "extra-cmake-modules";
+  patches = [ ./0001-extra-cmake-modules-paths.patch ];
+
+  setupHook = ./setup-hook.sh;
+
+  # It is OK to propagate these inputs as long as
+  # extra-cmake-modules is never a propagated input
+  # of some other derivation.
+  propagatedNativeBuildInputs = [ cmake pkgconfig qttools ];
+
+  meta = {
+    license = stdenv.lib.licenses.bsd2;
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/setup-hook.sh
new file mode 100644
index 000000000000..a6fa6189240b
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/setup-hook.sh
@@ -0,0 +1,27 @@
+addMimePkg() {
+    local propagated
+
+    if [[ -d "$1/share/mime" ]]; then
+        propagated=
+        for pkg in $propagatedBuildInputs; do
+            if [[ "z$pkg" == "z$1" ]]; then
+                propagated=1
+            fi
+        done
+        if [[ -z $propagated ]]; then
+            propagatedBuildInputs="$propagatedBuildInputs $1"
+        fi
+
+        propagated=
+        for pkg in $propagatedUserEnvPkgs; do
+            if [[ "z$pkg" == "z$1" ]]; then
+                propagated=1
+            fi
+        done
+        if [[ -z $propagated ]]; then
+            propagatedUserEnvPkgs="$propagatedUserEnvPkgs $1"
+        fi
+    fi
+}
+
+envHooks+=(addMimePkg)
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/fetchsrcs.sh b/pkgs/development/libraries/kde-frameworks-5.18/fetchsrcs.sh
new file mode 100755
index 000000000000..84b882a0a075
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/fetchsrcs.sh
@@ -0,0 +1,57 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -i bash -p coreutils findutils gnused nix wget
+
+set -x
+
+# The trailing slash at the end is necessary!
+RELEASE_URL="http://download.kde.org/stable/frameworks/5.18/"
+EXTRA_WGET_ARGS='-A *.tar.xz'
+
+mkdir tmp; cd tmp
+
+rm -f ../srcs.csv
+
+wget -nH -r -c --no-parent $RELEASE_URL $EXTRA_WGET_ARGS
+
+find . | while read src; do
+    if [[ -f "${src}" ]]; then
+        # Sanitize file name
+        filename=$(basename "$src" | tr '@' '_')
+        nameVersion="${filename%.tar.*}"
+        name=$(echo "$nameVersion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,')
+        version=$(echo "$nameVersion" | sed -e 's,^\([[:alpha:]][[:alnum:]]*-\)\+,,')
+        echo "$name,$version,$src,$filename" >>../srcs.csv
+    fi
+done
+
+cat >../srcs.nix <<EOF
+# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
+{ fetchurl, mirror }:
+
+{
+EOF
+
+gawk -F , "{ print \$1 }" ../srcs.csv | sort | uniq | while read name; do
+    versions=$(gawk -F , "/^$name,/ { print \$2 }" ../srcs.csv)
+    latestVersion=$(echo "$versions" | sort -rV | head -n 1)
+    src=$(gawk -F , "/^$name,$latestVersion,/ { print \$3 }" ../srcs.csv)
+    filename=$(gawk -F , "/^$name,$latestVersion,/ { print \$4 }" ../srcs.csv)
+    url="${src:2}"
+    sha256=$(nix-hash --type sha256 --base32 --flat "$src")
+    cat >>../srcs.nix <<EOF
+  $name = {
+    version = "$latestVersion";
+    src = fetchurl {
+      url = "\${mirror}/$url";
+      sha256 = "$sha256";
+      name = "$filename";
+    };
+  };
+EOF
+done
+
+echo "}" >>../srcs.nix
+
+rm -f ../srcs.csv
+
+cd ..
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks-5.18/frameworkintegration.nix
new file mode 100644
index 000000000000..26987c385ad5
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/frameworkintegration.nix
@@ -0,0 +1,17 @@
+{ kdeFramework, lib, extra-cmake-modules, kbookmarks, kcompletion
+, kconfig, kconfigwidgets, ki18n, kiconthemes, kio, knotifications
+, kwidgetsaddons, libXcursor, qtx11extras
+}:
+
+kdeFramework {
+  name = "frameworkintegration";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    kbookmarks kcompletion kconfig knotifications kwidgetsaddons
+    libXcursor
+  ];
+  propagatedBuildInputs = [ kconfigwidgets ki18n kio kiconthemes qtx11extras ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kactivities.nix b/pkgs/development/libraries/kde-frameworks-5.18/kactivities.nix
new file mode 100644
index 000000000000..3225098f4398
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kactivities.nix
@@ -0,0 +1,22 @@
+{ kdeFramework, lib, extra-cmake-modules, boost, kcmutils, kconfig
+, kcoreaddons, kdbusaddons, kdeclarative, kglobalaccel, ki18n
+, kio, kservice, kwindowsystem, kxmlgui, makeQtWrapper, qtdeclarative
+}:
+
+kdeFramework {
+  name = "kactivities";
+  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
+  buildInputs = [
+    boost kcmutils kconfig kcoreaddons kdbusaddons kservice
+    kxmlgui
+  ];
+  propagatedBuildInputs = [
+    kdeclarative kglobalaccel ki18n kio kwindowsystem qtdeclarative
+  ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/kactivitymanagerd"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kapidox.nix b/pkgs/development/libraries/kde-frameworks-5.18/kapidox.nix
new file mode 100644
index 000000000000..647be8f052c3
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kapidox.nix
@@ -0,0 +1,12 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, python
+}:
+
+kdeFramework {
+  name = "kapidox";
+  nativeBuildInputs = [ extra-cmake-modules python ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/karchive.nix b/pkgs/development/libraries/kde-frameworks-5.18/karchive.nix
new file mode 100644
index 000000000000..a8d9a0003c3b
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/karchive.nix
@@ -0,0 +1,11 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+}:
+
+kdeFramework {
+  name = "karchive";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kauth/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/kauth/default.nix
new file mode 100644
index 000000000000..2b000ff3c041
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kauth/default.nix
@@ -0,0 +1,16 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kcoreaddons
+, polkit-qt
+}:
+
+kdeFramework {
+  name = "kauth";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ polkit-qt ];
+  propagatedBuildInputs = [ kcoreaddons ];
+  patches = [ ./kauth-policy-install.patch ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kauth/kauth-policy-install.patch b/pkgs/development/libraries/kde-frameworks-5.18/kauth/kauth-policy-install.patch
new file mode 100644
index 000000000000..340155256f28
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kauth/kauth-policy-install.patch
@@ -0,0 +1,13 @@
+diff --git a/KF5AuthConfig.cmake.in b/KF5AuthConfig.cmake.in
+index e859ec7..9a8ab18 100644
+--- a/KF5AuthConfig.cmake.in
++++ b/KF5AuthConfig.cmake.in
+@@ -4,7 +4,7 @@ set(KAUTH_STUB_FILES_DIR "${PACKAGE_PREFIX_DIR}/@KF5_DATA_INSTALL_DIR@/kauth/")
+ 
+ set(KAUTH_BACKEND_NAME "@KAUTH_BACKEND_NAME@")
+ set(KAUTH_HELPER_BACKEND_NAME "@KAUTH_HELPER_BACKEND_NAME@")
+-set(KAUTH_POLICY_FILES_INSTALL_DIR "@KAUTH_POLICY_FILES_INSTALL_DIR@")
++set(KAUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions")
+ set(KAUTH_HELPER_INSTALL_DIR "@KAUTH_HELPER_INSTALL_DIR@")
+ 
+ find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@")
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kbookmarks.nix b/pkgs/development/libraries/kde-frameworks-5.18/kbookmarks.nix
new file mode 100644
index 000000000000..1a469ab4db6d
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kbookmarks.nix
@@ -0,0 +1,25 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kcodecs
+, kconfig
+, kconfigwidgets
+, kcoreaddons
+, kiconthemes
+, kxmlgui
+}:
+
+kdeFramework {
+  name = "kbookmarks";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    kcodecs
+    kconfig
+    kconfigwidgets
+    kcoreaddons
+    kiconthemes
+    kxmlgui
+  ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kcmutils/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.18/kcmutils/0001-qdiriterator-follow-symlinks.patch
new file mode 100644
index 000000000000..0d861fa95012
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kcmutils/0001-qdiriterator-follow-symlinks.patch
@@ -0,0 +1,25 @@
+From f14d2a275323a47104b33eb61c5b6910ae1a9f59 Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Wed, 14 Oct 2015 06:43:53 -0500
+Subject: [PATCH] qdiriterator follow symlinks
+
+---
+ src/kpluginselector.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp
+index 9c3431d..d6b1ee2 100644
+--- a/src/kpluginselector.cpp
++++ b/src/kpluginselector.cpp
+@@ -305,7 +305,7 @@ void KPluginSelector::addPlugins(const QString &componentName,
+     QStringList desktopFileNames;
+     const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory);
+     Q_FOREACH (const QString &dir, dirs) {
+-        QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
++      QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
+         while (it.hasNext()) {
+             desktopFileNames.append(it.next());
+         }
+-- 
+2.5.2
+
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kcmutils/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/kcmutils/default.nix
new file mode 100644
index 000000000000..dbbb783ac615
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kcmutils/default.nix
@@ -0,0 +1,17 @@
+{ kdeFramework, lib, extra-cmake-modules, kconfigwidgets
+, kcoreaddons, kdeclarative, ki18n, kiconthemes, kitemviews
+, kpackage, kservice, kxmlgui
+}:
+
+kdeFramework {
+  name = "kcmutils";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    kcoreaddons kiconthemes kitemviews kpackage kxmlgui
+  ];
+  propagatedBuildInputs = [ kconfigwidgets kdeclarative ki18n kservice ];
+  patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kcodecs.nix b/pkgs/development/libraries/kde-frameworks-5.18/kcodecs.nix
new file mode 100644
index 000000000000..53a69a69b69c
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kcodecs.nix
@@ -0,0 +1,11 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+}:
+
+kdeFramework {
+  name = "kcodecs";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kcompletion.nix b/pkgs/development/libraries/kde-frameworks-5.18/kcompletion.nix
new file mode 100644
index 000000000000..e393774f16a5
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kcompletion.nix
@@ -0,0 +1,14 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kconfig
+, kwidgetsaddons
+}:
+
+kdeFramework {
+  name = "kcompletion";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ kconfig kwidgetsaddons ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kconfig.nix b/pkgs/development/libraries/kde-frameworks-5.18/kconfig.nix
new file mode 100644
index 000000000000..e132afe59886
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kconfig.nix
@@ -0,0 +1,16 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, makeQtWrapper
+}:
+
+kdeFramework {
+  name = "kconfig";
+  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/kreadconfig5"
+    wrapQtProgram "$out/bin/kwriteconfig5"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.18/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
new file mode 100644
index 000000000000..7a6c0ee90534
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
@@ -0,0 +1,25 @@
+From 4f84780893d505b2d62a14633dd983baa8ec6e28 Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Wed, 14 Oct 2015 06:47:01 -0500
+Subject: [PATCH] qdiriterator follow symlinks
+
+---
+ src/khelpclient.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/khelpclient.cpp b/src/khelpclient.cpp
+index 53a331e..80fbb01 100644
+--- a/src/khelpclient.cpp
++++ b/src/khelpclient.cpp
+@@ -48,7 +48,7 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname)
+     QString docPath;
+     const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation);
+     Q_FOREACH (const QString &dir, desktopDirs) {
+-        QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
++        QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
+         while (it.hasNext()) {
+             const QString desktopPath(it.next());
+             KDesktopFile desktopFile(desktopPath);
+-- 
+2.5.2
+
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/kconfigwidgets/default.nix
new file mode 100644
index 000000000000..0e14d06edd36
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kconfigwidgets/default.nix
@@ -0,0 +1,17 @@
+{ kdeFramework, lib, extra-cmake-modules, kauth, kcodecs, kconfig
+, kdoctools, kguiaddons, ki18n, kwidgetsaddons, makeQtWrapper
+}:
+
+kdeFramework {
+  name = "kconfigwidgets";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
+  buildInputs = [ kguiaddons ];
+  propagatedBuildInputs = [ kauth kconfig kcodecs ki18n kwidgetsaddons ];
+  patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/preparetips5"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks-5.18/kcoreaddons.nix
new file mode 100644
index 000000000000..f3a1db7bd484
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kcoreaddons.nix
@@ -0,0 +1,16 @@
+{ kdeFramework, lib, makeQtWrapper
+, extra-cmake-modules
+, shared_mime_info
+}:
+
+kdeFramework {
+  name = "kcoreaddons";
+  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
+  buildInputs = [ shared_mime_info ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/desktoptojson"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kcrash.nix b/pkgs/development/libraries/kde-frameworks-5.18/kcrash.nix
new file mode 100644
index 000000000000..bbab78ccb409
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kcrash.nix
@@ -0,0 +1,16 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kcoreaddons
+, kwindowsystem
+, qtx11extras
+}:
+
+kdeFramework {
+  name = "kcrash";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ kcoreaddons ];
+  propagatedBuildInputs = [ kwindowsystem qtx11extras ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks-5.18/kdbusaddons.nix
new file mode 100644
index 000000000000..d2ceab31d14b
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kdbusaddons.nix
@@ -0,0 +1,17 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, makeQtWrapper
+, qtx11extras
+}:
+
+kdeFramework {
+  name = "kdbusaddons";
+  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
+  propagatedBuildInputs = [ qtx11extras ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/kquitapp5"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks-5.18/kdeclarative.nix
new file mode 100644
index 000000000000..74d107466cfc
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kdeclarative.nix
@@ -0,0 +1,22 @@
+{ kdeFramework, lib, extra-cmake-modules, epoxy, kconfig
+, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage
+, kwidgetsaddons, kwindowsystem, makeQtWrapper, pkgconfig
+, qtdeclarative
+}:
+
+kdeFramework {
+  name = "kdeclarative";
+  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
+  buildInputs = [
+    epoxy kguiaddons kiconthemes kwidgetsaddons
+  ];
+  propagatedBuildInputs = [
+    kconfig kglobalaccel ki18n kio kpackage kwindowsystem qtdeclarative
+  ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/kpackagelauncherqml"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kded.nix b/pkgs/development/libraries/kde-frameworks-5.18/kded.nix
new file mode 100644
index 000000000000..47ae2d68c68e
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kded.nix
@@ -0,0 +1,19 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kconfig
+, kcoreaddons
+, kcrash
+, kdbusaddons
+, kdoctools
+, kinit
+, kservice
+}:
+
+kdeFramework {
+  name = "kded";
+  buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons kinit kservice ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support.nix b/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support.nix
new file mode 100644
index 000000000000..0dd5c4157612
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support.nix
@@ -0,0 +1,32 @@
+{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45, kauth
+, karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons
+, kcrash, kdbusaddons, kdesignerplugin, kdoctools, kemoticons
+, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kitemmodels
+, kinit, knotifications, kparts, kservice, ktextwidgets
+, kunitconversion, kwidgetsaddons, kwindowsystem, kxmlgui
+, networkmanager, qtsvg, qtx11extras, xlibs
+}:
+
+# TODO: debug docbook detection
+
+kdeFramework {
+  name = "kdelibs4support";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [
+    kcompletion kconfig kservice kwidgetsaddons
+    kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM
+  ];
+  propagatedBuildInputs = [
+    kauth karchive kconfigwidgets kcoreaddons kcrash kdbusaddons
+    kdesignerplugin kemoticons kglobalaccel kguiaddons ki18n kio
+    kiconthemes kitemmodels kinit knotifications kparts ktextwidgets
+    kunitconversion kwindowsystem
+  ];
+  cmakeFlags = [
+    "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
+    "-DDocBookXML4_DTD_VERSION=4.5"
+  ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdesignerplugin.nix b/pkgs/development/libraries/kde-frameworks-5.18/kdesignerplugin.nix
new file mode 100644
index 000000000000..cbc114ccca03
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kdesignerplugin.nix
@@ -0,0 +1,34 @@
+{ kdeFramework, lib, makeQtWrapper
+, extra-cmake-modules
+, kcompletion
+, kconfig
+, kconfigwidgets
+, kcoreaddons
+, kdewebkit
+, kdoctools
+, kiconthemes
+, kio
+, kitemviews
+, kplotting
+, ktextwidgets
+, kwidgetsaddons
+, kxmlgui
+, sonnet
+}:
+
+kdeFramework {
+  name = "kdesignerplugin";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
+  buildInputs = [
+    kcompletion kconfig kconfigwidgets kcoreaddons kdewebkit
+    kiconthemes kitemviews kplotting ktextwidgets kwidgetsaddons
+    kxmlgui
+  ];
+  propagatedBuildInputs = [ kio sonnet ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/kgendesignerplugin"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdesu.nix b/pkgs/development/libraries/kde-frameworks-5.18/kdesu.nix
new file mode 100644
index 000000000000..364fbd6a720b
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kdesu.nix
@@ -0,0 +1,13 @@
+{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n, kpty
+, kservice
+}:
+
+kdeFramework {
+  name = "kdesu";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ kcoreaddons kservice ];
+  propagatedBuildInputs = [ ki18n kpty ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdewebkit.nix b/pkgs/development/libraries/kde-frameworks-5.18/kdewebkit.nix
new file mode 100644
index 000000000000..d361313d1d49
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kdewebkit.nix
@@ -0,0 +1,13 @@
+{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
+, ki18n, kio, kjobwidgets, kparts, kservice, kwallet, qtwebkit
+}:
+
+kdeFramework {
+  name = "kdewebkit";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ kconfig kcoreaddons kjobwidgets kparts kservice kwallet ];
+  propagatedBuildInputs = [ ki18n kio qtwebkit ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdnssd.nix b/pkgs/development/libraries/kde-frameworks-5.18/kdnssd.nix
new file mode 100644
index 000000000000..f00432b0c9ce
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kdnssd.nix
@@ -0,0 +1,13 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, avahi
+}:
+
+kdeFramework {
+  name = "kdnssd";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ avahi ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/kdoctools/default.nix
new file mode 100644
index 000000000000..138c3fc33b94
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kdoctools/default.nix
@@ -0,0 +1,20 @@
+{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45
+, docbook5_xsl, karchive, ki18n, makeQtWrapper, perl, perlPackages
+}:
+
+kdeFramework {
+  name = "kdoctools";
+  setupHook = ./setup-hook.sh;
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ karchive ];
+  propagatedBuildInputs = [ ki18n ];
+  propagatedNativeBuildInputs = [ makeQtWrapper perl perlPackages.URI ];
+  cmakeFlags = [
+    "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
+    "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook"
+  ];
+  patches = [ ./kdoctools-no-find-docbook-xml.patch ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/development/libraries/kde-frameworks-5.18/kdoctools/kdoctools-no-find-docbook-xml.patch
new file mode 100644
index 000000000000..4e3a33efab32
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kdoctools/kdoctools-no-find-docbook-xml.patch
@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5c4863c..f731775 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -46,7 +46,6 @@ set_package_properties(LibXml2 PROPERTIES
+                       )
+ 
+ 
+-find_package(DocBookXML4 "4.5")
+ 
+ set_package_properties(DocBookXML4 PROPERTIES
+                        TYPE REQUIRED
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdoctools/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.18/kdoctools/setup-hook.sh
new file mode 100644
index 000000000000..5cfffbd622d1
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kdoctools/setup-hook.sh
@@ -0,0 +1,5 @@
+addXdgData() {
+    addToSearchPath XDG_DATA_DIRS "$1/share"
+}
+
+envHooks+=(addXdgData)
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kemoticons.nix b/pkgs/development/libraries/kde-frameworks-5.18/kemoticons.nix
new file mode 100644
index 000000000000..d165f84e3a2d
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kemoticons.nix
@@ -0,0 +1,17 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, karchive
+, kconfig
+, kcoreaddons
+, kservice
+}:
+
+kdeFramework {
+  name = "kemoticons";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ karchive kconfig kcoreaddons ];
+  propagatedBuildInputs = [ kservice ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata.nix b/pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata.nix
new file mode 100644
index 000000000000..be99c58d5504
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata.nix
@@ -0,0 +1,13 @@
+{ kdeFramework, lib, extra-cmake-modules, attr, ebook_tools, exiv2
+, ffmpeg, karchive, ki18n, poppler, qtbase, taglib
+}:
+
+kdeFramework {
+  name = "kfilemetadata";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ attr ebook_tools exiv2 ffmpeg karchive poppler taglib ];
+  propagatedBuildInputs = [ qtbase ki18n ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks-5.18/kglobalaccel.nix
new file mode 100644
index 000000000000..c535b3590a38
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kglobalaccel.nix
@@ -0,0 +1,23 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kconfig
+, kcoreaddons
+, kcrash
+, kdbusaddons
+, kwindowsystem
+, makeQtWrapper
+, qtx11extras
+}:
+
+kdeFramework {
+  name = "kglobalaccel";
+  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
+  buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons ];
+  propagatedBuildInputs = [ kwindowsystem qtx11extras ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/kglobalaccel5"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks-5.18/kguiaddons.nix
new file mode 100644
index 000000000000..bc4e9ab11843
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kguiaddons.nix
@@ -0,0 +1,13 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, qtx11extras
+}:
+
+kdeFramework {
+  name = "kguiaddons";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qtx11extras ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/khtml.nix b/pkgs/development/libraries/kde-frameworks-5.18/khtml.nix
new file mode 100644
index 000000000000..d40df466ebbd
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/khtml.nix
@@ -0,0 +1,21 @@
+{ kdeFramework, lib, extra-cmake-modules, giflib, karchive
+, kcodecs, kglobalaccel, ki18n, kiconthemes, kio, kjs
+, knotifications, kparts, ktextwidgets, kwallet, kwidgetsaddons
+, kwindowsystem, kxmlgui, perl, phonon, qtx11extras, sonnet
+}:
+
+kdeFramework {
+  name = "khtml";
+  nativeBuildInputs = [ extra-cmake-modules perl ];
+  buildInputs = [
+    giflib karchive kiconthemes knotifications kwallet kwidgetsaddons
+    kxmlgui phonon
+  ];
+  propagatedBuildInputs = [
+    kcodecs kglobalaccel ki18n kio kjs kparts ktextwidgets
+    kwindowsystem qtx11extras sonnet
+  ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/ki18n.nix b/pkgs/development/libraries/kde-frameworks-5.18/ki18n.nix
new file mode 100644
index 000000000000..268006512e7c
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/ki18n.nix
@@ -0,0 +1,17 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, gettext
+, python
+, qtdeclarative
+, qtscript
+}:
+
+kdeFramework {
+  name = "ki18n";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qtdeclarative qtscript ];
+  propagatedNativeBuildInputs = [ gettext python ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kiconthemes/default-theme-breeze.patch b/pkgs/development/libraries/kde-frameworks-5.18/kiconthemes/default-theme-breeze.patch
new file mode 100644
index 000000000000..5b3b15d5d5b5
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kiconthemes/default-theme-breeze.patch
@@ -0,0 +1,13 @@
+Index: kiconthemes-5.17.0/src/kicontheme.cpp
+===================================================================
+--- kiconthemes-5.17.0.orig/src/kicontheme.cpp
++++ kiconthemes-5.17.0/src/kicontheme.cpp
+@@ -557,7 +557,7 @@ void KIconTheme::reconfigure()
+ // static
+ QString KIconTheme::defaultThemeName()
+ {
+-    return QStringLiteral("oxygen");
++    return QStringLiteral("breeze");
+ }
+ 
+ void KIconTheme::assignIconsToContextMenu(ContextMenus type,
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kiconthemes/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/kiconthemes/default.nix
new file mode 100644
index 000000000000..b78b25582beb
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kiconthemes/default.nix
@@ -0,0 +1,18 @@
+{ kdeFramework, lib, copyPathsToStore
+, extra-cmake-modules, makeQtWrapper
+, kconfigwidgets, ki18n, breeze-icons, kitemviews, qtsvg
+}:
+
+kdeFramework {
+  name = "kiconthemes";
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
+  buildInputs = [ kconfigwidgets kitemviews qtsvg ];
+  propagatedBuildInputs = [ breeze-icons ki18n ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/kiconfinder5"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kiconthemes/series b/pkgs/development/libraries/kde-frameworks-5.18/kiconthemes/series
new file mode 100644
index 000000000000..ab5cc8a3edb2
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kiconthemes/series
@@ -0,0 +1 @@
+default-theme-breeze.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kidletime.nix b/pkgs/development/libraries/kde-frameworks-5.18/kidletime.nix
new file mode 100644
index 000000000000..fc0865600239
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kidletime.nix
@@ -0,0 +1,15 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, qtbase
+, qtx11extras
+}:
+
+kdeFramework {
+  name = "kidletime";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qtx11extras ];
+  propagatedBuildInputs = [ qtbase ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kimageformats.nix b/pkgs/development/libraries/kde-frameworks-5.18/kimageformats.nix
new file mode 100644
index 000000000000..49d66bbcc2c6
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kimageformats.nix
@@ -0,0 +1,13 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, ilmbase
+}:
+
+kdeFramework {
+  name = "kimageformats";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kinit/0001-kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks-5.18/kinit/0001-kinit-libpath.patch
new file mode 100644
index 000000000000..9c76079a382a
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kinit/0001-kinit-libpath.patch
@@ -0,0 +1,42 @@
+From 723c9b1268a04127647a1c20eebe9804150566dd Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Sat, 13 Jun 2015 08:57:55 -0500
+Subject: [PATCH] kinit libpath
+
+---
+ src/kdeinit/kinit.cpp | 18 ++++++++++--------
+ 1 file changed, 10 insertions(+), 8 deletions(-)
+
+diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp
+index 9e775b6..0ac5646 100644
+--- a/src/kdeinit/kinit.cpp
++++ b/src/kdeinit/kinit.cpp
+@@ -660,15 +660,17 @@ static pid_t launch(int argc, const char *_name, const char *args,
+         if (!libpath.isEmpty()) {
+             if (!l.load()) {
+                 if (libpath_relative) {
+-                    // NB: Because Qt makes the actual dlopen() call, the
+-                    //     RUNPATH of kdeinit is *not* respected - see
+-                    //     https://sourceware.org/bugzilla/show_bug.cgi?id=13945
+-                    //     - so we try hacking it in ourselves
+-                    QString install_lib_dir = QFile::decodeName(
+-                            CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/");
+-                    libpath = install_lib_dir + libpath;
+-                    l.setFileName(libpath);
++                  // Use QT_PLUGIN_PATH to find shared library directories
++                  // For KF5, the plugin path is /lib/qt5/plugins/, so kdeinit5
++                  // shared libraries should be in /lib/qt5/plugins/../../
++                  const QRegExp pathSepRegExp(QString::fromLatin1("[:\b]"));
++                  const QString up = QString::fromLocal8Bit("/../../");
++                  const QStringList paths = QString::fromLocal8Bit(qgetenv("QT_PLUGIN_PATH")).split(pathSepRegExp, QString::KeepEmptyParts);
++                  Q_FOREACH (const QString &path, paths) {
++                    l.setFileName(path + up + libpath);
+                     l.load();
++                    if (l.isLoaded()) break;
++                  }
+                 }
+             }
+             if (!l.isLoaded()) {
+-- 
+2.4.2
+
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kinit/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/kinit/default.nix
new file mode 100644
index 000000000000..5f644d7c424e
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kinit/default.nix
@@ -0,0 +1,17 @@
+{ kdeFramework, lib, extra-cmake-modules, kconfig, kcrash
+, kdoctools, ki18n, kio, kservice, kwindowsystem, libcap
+, libcap_progs
+}:
+
+# TODO: setuid wrapper
+
+kdeFramework {
+  name = "kinit";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools libcap_progs ];
+  buildInputs = [ kconfig kcrash kservice libcap ];
+  propagatedBuildInputs = [ ki18n kio kwindowsystem ];
+  patches = [ ./0001-kinit-libpath.patch ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kio/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/kio/default.nix
new file mode 100644
index 000000000000..a2131ff33850
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kio/default.nix
@@ -0,0 +1,33 @@
+{ kdeFramework, lib, copyPathsToStore
+, extra-cmake-modules, acl, karchive
+, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons
+, kdbusaddons, kdoctools, ki18n, kiconthemes, kitemviews
+, kjobwidgets, knotifications, kservice, ktextwidgets, kwallet
+, kwidgetsaddons, kwindowsystem, kxmlgui, makeQtWrapper
+, qtscript, qtx11extras, solid
+}:
+
+kdeFramework {
+  name = "kio";
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
+  buildInputs = [
+    acl karchive kconfig kcoreaddons kdbusaddons kiconthemes
+    knotifications ktextwidgets kwallet kwidgetsaddons
+    qtscript
+  ];
+  propagatedBuildInputs = [
+    kbookmarks kcompletion kconfigwidgets ki18n kitemviews kjobwidgets
+    kservice kwindowsystem kxmlgui solid qtx11extras
+  ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/kcookiejar5"
+    wrapQtProgram "$out/bin/ktelnetservice5"
+    wrapQtProgram "$out/bin/ktrash5"
+    wrapQtProgram "$out/bin/kmailservice5"
+    wrapQtProgram "$out/bin/protocoltojson"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kio/samba-search-path.patch b/pkgs/development/libraries/kde-frameworks-5.18/kio/samba-search-path.patch
new file mode 100644
index 000000000000..c9ad46b41bb7
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kio/samba-search-path.patch
@@ -0,0 +1,28 @@
+Index: kio-5.17.0/src/core/ksambashare.cpp
+===================================================================
+--- kio-5.17.0.orig/src/core/ksambashare.cpp
++++ kio-5.17.0/src/core/ksambashare.cpp
+@@ -67,13 +67,18 @@ KSambaSharePrivate::~KSambaSharePrivate(
+ 
+ bool KSambaSharePrivate::isSambaInstalled()
+ {
+-    if (QFile::exists(QStringLiteral("/usr/sbin/smbd"))
+-            || QFile::exists(QStringLiteral("/usr/local/sbin/smbd"))) {
+-        return true;
++    const QByteArray pathEnv = qgetenv("PATH");
++    if (!pathEnv.isEmpty()) {
++        QLatin1Char pathSep(':');
++        QStringList paths = QFile::decodeName(pathEnv).split(pathSep, QString::SkipEmptyParts);
++        for (QStringList::iterator it = paths.begin(); it != paths.end(); ++it) {
++            it->append("/smbd");
++            if (QFile::exists(*it)) {
++                return true;
++            }
++        }
+     }
+ 
+-    //qDebug() << "Samba is not installed!";
+-
+     return false;
+ }
+ 
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kio/series b/pkgs/development/libraries/kde-frameworks-5.18/kio/series
new file mode 100644
index 000000000000..77ca15450047
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kio/series
@@ -0,0 +1 @@
+samba-search-path.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kitemmodels.nix b/pkgs/development/libraries/kde-frameworks-5.18/kitemmodels.nix
new file mode 100644
index 000000000000..a9024d771cc3
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kitemmodels.nix
@@ -0,0 +1,11 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+}:
+
+kdeFramework {
+  name = "kitemmodels";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kitemviews.nix b/pkgs/development/libraries/kde-frameworks-5.18/kitemviews.nix
new file mode 100644
index 000000000000..931019ce495d
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kitemviews.nix
@@ -0,0 +1,11 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+}:
+
+kdeFramework {
+  name = "kitemviews";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kjobwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.18/kjobwidgets.nix
new file mode 100644
index 000000000000..746edf12eea0
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kjobwidgets.nix
@@ -0,0 +1,16 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kcoreaddons
+, kwidgetsaddons
+, qtx11extras
+}:
+
+kdeFramework {
+  name = "kjobwidgets";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ kcoreaddons kwidgetsaddons ];
+  propagatedBuildInputs = [ qtx11extras ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kjs.nix b/pkgs/development/libraries/kde-frameworks-5.18/kjs.nix
new file mode 100644
index 000000000000..768720f178c8
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kjs.nix
@@ -0,0 +1,16 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kdoctools
+, makeQtWrapper
+}:
+
+kdeFramework {
+  name = "kjs";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/kjs5"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kjsembed.nix b/pkgs/development/libraries/kde-frameworks-5.18/kjsembed.nix
new file mode 100644
index 000000000000..22eef2d47bde
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kjsembed.nix
@@ -0,0 +1,17 @@
+{ kdeFramework, lib, extra-cmake-modules, kdoctools, ki18n, kjs
+, makeQtWrapper, qtsvg
+}:
+
+kdeFramework {
+  name = "kjsembed";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
+  buildInputs = [ qtsvg ];
+  propagatedBuildInputs = [ ki18n kjs ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/kjscmd5"
+    wrapQtProgram "$out/bin/kjsconsole"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kmediaplayer.nix b/pkgs/development/libraries/kde-frameworks-5.18/kmediaplayer.nix
new file mode 100644
index 000000000000..460458b22323
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kmediaplayer.nix
@@ -0,0 +1,15 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kparts
+, kxmlgui
+}:
+
+kdeFramework {
+  name = "kmediaplayer";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ kxmlgui ];
+  propagatedBuildInputs = [ kparts ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/knewstuff.nix b/pkgs/development/libraries/kde-frameworks-5.18/knewstuff.nix
new file mode 100644
index 000000000000..5bcd6f301462
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/knewstuff.nix
@@ -0,0 +1,17 @@
+{ kdeFramework, lib, extra-cmake-modules, attica, karchive
+, kcompletion, kconfig, kcoreaddons, ki18n, kiconthemes, kio
+, kitemviews, kservice, ktextwidgets, kwidgetsaddons, kxmlgui
+}:
+
+kdeFramework {
+  name = "knewstuff";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    karchive kcompletion kconfig kcoreaddons kiconthemes
+    kitemviews ktextwidgets kwidgetsaddons
+  ];
+  propagatedBuildInputs = [ attica ki18n kio kservice kxmlgui ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/knotifications.nix b/pkgs/development/libraries/kde-frameworks-5.18/knotifications.nix
new file mode 100644
index 000000000000..7e301dd0f268
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/knotifications.nix
@@ -0,0 +1,21 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kcodecs
+, kconfig
+, kcoreaddons
+, kwindowsystem
+, phonon
+, qtx11extras
+}:
+
+kdeFramework {
+  name = "knotifications";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    kcodecs kconfig kcoreaddons phonon
+  ];
+  propagatedBuildInputs = [ kwindowsystem qtx11extras ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/knotifyconfig.nix b/pkgs/development/libraries/kde-frameworks-5.18/knotifyconfig.nix
new file mode 100644
index 000000000000..dd99d2d4f1e5
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/knotifyconfig.nix
@@ -0,0 +1,13 @@
+{ kdeFramework, lib, extra-cmake-modules, kcompletion, kconfig
+, ki18n, kio, phonon
+}:
+
+kdeFramework {
+  name = "knotifyconfig";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ kcompletion kconfig phonon ];
+  propagatedBuildInputs = [ ki18n kio ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kpackage/0001-allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.18/kpackage/0001-allow-external-paths.patch
new file mode 100644
index 000000000000..beede4d7ccb5
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kpackage/0001-allow-external-paths.patch
@@ -0,0 +1,25 @@
+From a92ac391b4e6ca335bd7fa78f1addd23c9467931 Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Wed, 28 Jan 2015 07:15:30 -0600
+Subject: [PATCH 1/2] allow external paths
+
+---
+ src/kpackage/package.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/kpackage/package.cpp b/src/kpackage/package.cpp
+index 539b21a..977a026 100644
+--- a/src/kpackage/package.cpp
++++ b/src/kpackage/package.cpp
+@@ -789,7 +789,7 @@ PackagePrivate::PackagePrivate()
+     : QSharedData(),
+       fallbackPackage(0),
+       metadata(0),
+-      externalPaths(false),
++      externalPaths(true),
+       valid(false),
+       checkedValid(false)
+ {
+-- 
+2.5.2
+
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kpackage/0002-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.18/kpackage/0002-qdiriterator-follow-symlinks.patch
new file mode 100644
index 000000000000..6e93fca9b21d
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kpackage/0002-qdiriterator-follow-symlinks.patch
@@ -0,0 +1,39 @@
+From 9fc26c3c0478eb7cb0a531836ba2e3a85d820c88 Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Wed, 14 Oct 2015 06:50:28 -0500
+Subject: [PATCH 2/2] qdiriterator follow symlinks
+
+---
+ src/kpackage/packageloader.cpp            | 2 +-
+ src/kpackage/private/packagejobthread.cpp | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/kpackage/packageloader.cpp b/src/kpackage/packageloader.cpp
+index eb5ed47..94217f6 100644
+--- a/src/kpackage/packageloader.cpp
++++ b/src/kpackage/packageloader.cpp
+@@ -241,7 +241,7 @@ QList<KPluginMetaData> PackageLoader::listPackages(const QString &packageFormat,
+         } else {
+             //qDebug() << "Not cached";
+             // If there's no cache file, fall back to listing the directory
+-            const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories;
++            const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories | QDirIterator::FollowSymlinks;
+             const QStringList nameFilters = QStringList(QStringLiteral("metadata.desktop"));
+ 
+             QDirIterator it(plugindir, nameFilters, QDir::Files, flags);
+diff --git a/src/kpackage/private/packagejobthread.cpp b/src/kpackage/private/packagejobthread.cpp
+index ca523b3..1cfa792 100644
+--- a/src/kpackage/private/packagejobthread.cpp
++++ b/src/kpackage/private/packagejobthread.cpp
+@@ -145,7 +145,7 @@ bool indexDirectory(const QString& dir, const QString& dest)
+     QJsonArray plugins;
+ 
+     int i = 0;
+-    QDirIterator it(dir, QStringList()<<QStringLiteral("*.desktop"), QDir::Files, QDirIterator::Subdirectories);
++    QDirIterator it(dir, QStringList()<<QStringLiteral("*.desktop"), QDir::Files, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
+     while (it.hasNext()) {
+         it.next();
+         const QString path = it.fileInfo().absoluteFilePath();
+-- 
+2.5.2
+
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/kpackage/default.nix
new file mode 100644
index 000000000000..d2dc262bf1ac
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kpackage/default.nix
@@ -0,0 +1,26 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, karchive
+, kconfig
+, kcoreaddons
+, kdoctools
+, ki18n
+, makeQtWrapper
+}:
+
+kdeFramework {
+  name = "kpackage";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
+  buildInputs = [ karchive kconfig ];
+  propagatedBuildInputs = [ kcoreaddons ki18n ];
+  patches = [
+    ./0001-allow-external-paths.patch
+    ./0002-qdiriterator-follow-symlinks.patch
+  ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/kpackagetool5"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kparts.nix b/pkgs/development/libraries/kde-frameworks-5.18/kparts.nix
new file mode 100644
index 000000000000..1c3e0b2cbc51
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kparts.nix
@@ -0,0 +1,17 @@
+{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
+, ki18n, kiconthemes, kio, kjobwidgets, knotifications, kservice
+, ktextwidgets, kwidgetsaddons, kxmlgui
+}:
+
+kdeFramework {
+  name = "kparts";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    kconfig kcoreaddons kiconthemes kjobwidgets knotifications
+    kservice kwidgetsaddons
+  ];
+  propagatedBuildInputs = [ ki18n kio ktextwidgets kxmlgui ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kpeople.nix b/pkgs/development/libraries/kde-frameworks-5.18/kpeople.nix
new file mode 100644
index 000000000000..4c3877e7efd2
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kpeople.nix
@@ -0,0 +1,15 @@
+{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n
+, kitemviews, kservice, kwidgetsaddons, qtdeclarative
+}:
+
+kdeFramework {
+  name = "kpeople";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    kcoreaddons kitemviews kservice kwidgetsaddons
+  ];
+  propagatedBuildInputs = [ ki18n qtdeclarative ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kplotting.nix b/pkgs/development/libraries/kde-frameworks-5.18/kplotting.nix
new file mode 100644
index 000000000000..c16f51b5ac3c
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kplotting.nix
@@ -0,0 +1,11 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+}:
+
+kdeFramework {
+  name = "kplotting";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kpty.nix b/pkgs/development/libraries/kde-frameworks-5.18/kpty.nix
new file mode 100644
index 000000000000..2e34e6f674ce
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kpty.nix
@@ -0,0 +1,10 @@
+{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n }:
+
+kdeFramework {
+  name = "kpty";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  propagatedBuildInputs = [ kcoreaddons ki18n ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kross.nix b/pkgs/development/libraries/kde-frameworks-5.18/kross.nix
new file mode 100644
index 000000000000..7c6f079feaa7
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kross.nix
@@ -0,0 +1,14 @@
+{ kdeFramework, lib, extra-cmake-modules, kcompletion, kcoreaddons
+, kdoctools, ki18n, kiconthemes, kio, kparts, kwidgetsaddons
+, kxmlgui, qtscript
+}:
+
+kdeFramework {
+  name = "kross";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [ kcompletion kcoreaddons kxmlgui ];
+  propagatedBuildInputs = [ ki18n kiconthemes kio kparts kwidgetsaddons qtscript ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/krunner.nix b/pkgs/development/libraries/kde-frameworks-5.18/krunner.nix
new file mode 100644
index 000000000000..12d2b54d0eb3
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/krunner.nix
@@ -0,0 +1,16 @@
+{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
+, ki18n, kio, kservice, plasma-framework, qtquick1, solid
+, threadweaver
+}:
+
+kdeFramework {
+  name = "krunner";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    kconfig kcoreaddons kservice qtquick1 solid threadweaver
+  ];
+  propagatedBuildInputs = [ ki18n kio plasma-framework ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kservice/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.18/kservice/0001-qdiriterator-follow-symlinks.patch
new file mode 100644
index 000000000000..3d8397d8ee2d
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kservice/0001-qdiriterator-follow-symlinks.patch
@@ -0,0 +1,25 @@
+From ae8919eb81abad369e4a26ffcd845b140983398d Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Wed, 14 Oct 2015 06:28:57 -0500
+Subject: [PATCH 1/2] qdiriterator follow symlinks
+
+---
+ src/sycoca/kbuildsycoca.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/sycoca/kbuildsycoca.cpp b/src/sycoca/kbuildsycoca.cpp
+index 1deae14..250baa8 100644
+--- a/src/sycoca/kbuildsycoca.cpp
++++ b/src/sycoca/kbuildsycoca.cpp
+@@ -208,7 +208,7 @@ bool KBuildSycoca::build()
+         QStringList relFiles;
+         const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, m_resourceSubdir, QStandardPaths::LocateDirectory);
+         Q_FOREACH (const QString &dir, dirs) {
+-            QDirIterator it(dir, QDirIterator::Subdirectories);
++            QDirIterator it(dir, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
+             while (it.hasNext()) {
+                 const QString filePath = it.next();
+                 Q_ASSERT(filePath.startsWith(dir)); // due to the line below...
+-- 
+2.5.2
+
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kservice/0002-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.18/kservice/0002-no-canonicalize-path.patch
new file mode 100644
index 000000000000..685c68526119
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kservice/0002-no-canonicalize-path.patch
@@ -0,0 +1,25 @@
+From 46d124da602d84b7611a7ff0ac0862168d451cdb Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Wed, 14 Oct 2015 06:31:29 -0500
+Subject: [PATCH 2/2] no canonicalize path
+
+---
+ src/sycoca/vfolder_menu.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/sycoca/vfolder_menu.cpp b/src/sycoca/vfolder_menu.cpp
+index d3e31c3..d15d743 100644
+--- a/src/sycoca/vfolder_menu.cpp
++++ b/src/sycoca/vfolder_menu.cpp
+@@ -415,7 +415,7 @@ VFolderMenu::absoluteDir(const QString &_dir, const QString &baseDir, bool keepR
+     }
+ 
+     if (!relative) {
+-        QString resolved = QDir(dir).canonicalPath();
++      QString resolved = QDir::cleanPath(dir);
+         if (!resolved.isEmpty()) {
+             dir = resolved;
+         }
+-- 
+2.5.2
+
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kservice/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/kservice/default.nix
new file mode 100644
index 000000000000..03b7c7c2f51d
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kservice/default.nix
@@ -0,0 +1,19 @@
+{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
+, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem
+}:
+
+kdeFramework {
+  name = "kservice";
+  setupHook = ./setup-hook.sh;
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [ kcrash kdbusaddons ];
+  propagatedBuildInputs = [ kconfig kcoreaddons ki18n kwindowsystem ];
+  propagatedUserEnvPkgs = [ kcoreaddons ];
+  patches = [
+    ./0001-qdiriterator-follow-symlinks.patch
+    ./0002-no-canonicalize-path.patch
+  ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kservice/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.18/kservice/setup-hook.sh
new file mode 100644
index 000000000000..c28e862ff8ae
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kservice/setup-hook.sh
@@ -0,0 +1,43 @@
+addServicePkg() {
+    local propagated
+    for dir in "share/kservices5" "share/kservicetypes5"; do
+        if [[ -d "$1/$dir" ]]; then
+            propagated=
+            for pkg in $propagatedBuildInputs; do
+                if [[ "z$pkg" == "z$1" ]]; then
+                    propagated=1
+                    break
+                fi
+            done
+            if [[ -z $propagated ]]; then
+                propagatedBuildInputs="$propagatedBuildInputs $1"
+            fi
+
+            propagated=
+            for pkg in $propagatedUserEnvPkgs; do
+                if [[ "z$pkg" == "z$1" ]]; then
+                    propagated=1
+                    break
+                fi
+            done
+            if [[ -z $propagated ]]; then
+                propagatedUserEnvPkgs="$propagatedUserEnvPkgs $1"
+            fi
+
+            break
+        fi
+    done
+}
+
+envHooks+=(addServicePkg)
+
+local propagated
+for pkg in $propagatedBuildInputs; do
+    if [[ "z$pkg" == "z@out@" ]]; then
+        propagated=1
+        break
+    fi
+done
+if [[ -z $propagated ]]; then
+    propagatedBuildInputs="$propagatedBuildInputs @out@"
+fi
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/0001-no-qcoreapplication.patch b/pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/0001-no-qcoreapplication.patch
new file mode 100644
index 000000000000..def55bff9b23
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/0001-no-qcoreapplication.patch
@@ -0,0 +1,48 @@
+From dc50fffdc72b76498384ce2f9065c3757b786d71 Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Wed, 14 Oct 2015 09:08:59 -0500
+Subject: [PATCH] no qcoreapplication
+
+---
+ src/syntax/data/katehighlightingindexer.cpp | 11 ++++-------
+ 1 file changed, 4 insertions(+), 7 deletions(-)
+
+diff --git a/src/syntax/data/katehighlightingindexer.cpp b/src/syntax/data/katehighlightingindexer.cpp
+index 3c63140..e3d5efe 100644
+--- a/src/syntax/data/katehighlightingindexer.cpp
++++ b/src/syntax/data/katehighlightingindexer.cpp
+@@ -51,19 +51,16 @@ QStringList readListing(const QString &fileName)
+ 
+ int main(int argc, char *argv[])
+ {
+-    // get app instance
+-    QCoreApplication app(argc, argv);
+-
+     // ensure enough arguments are passed
+-    if (app.arguments().size() < 3)
++    if (argc < 3)
+         return 1;
+ 
+     // open schema
+     QXmlSchema schema;
+-    if (!schema.load(QUrl::fromLocalFile(app.arguments().at(2))))
++    if (!schema.load(QUrl::fromLocalFile(QString::fromLocal8Bit(argv[2]))))
+         return 2;
+ 
+-    const QString hlFilenamesListing = app.arguments().value(3);
++    const QString hlFilenamesListing = QString::fromLocal8Bit(argv[3]);
+     if (hlFilenamesListing.isEmpty()) {
+         return 1;
+     }
+@@ -147,7 +144,7 @@ int main(int argc, char *argv[])
+         return anyError;
+ 
+     // create outfile, after all has worked!
+-    QFile outFile(app.arguments().at(1));
++    QFile outFile(QString::fromLocal8Bit(argv[1]));
+     if (!outFile.open(QIODevice::WriteOnly | QIODevice::Truncate))
+         return 7;
+ 
+-- 
+2.5.2
+
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/default.nix
new file mode 100644
index 000000000000..39092fbb2784
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/default.nix
@@ -0,0 +1,18 @@
+{ kdeFramework, lib, extra-cmake-modules, karchive, kconfig
+, kguiaddons, ki18n, kio, kiconthemes, kparts, perl, qtscript
+, qtxmlpatterns, sonnet
+}:
+
+kdeFramework {
+  name = "ktexteditor";
+  nativeBuildInputs = [ extra-cmake-modules perl ];
+  buildInputs = [
+    karchive kconfig kguiaddons kiconthemes kparts qtscript
+    qtxmlpatterns
+  ];
+  propagatedBuildInputs = [ ki18n kio sonnet ];
+  patches = [ ./0001-no-qcoreapplication.patch ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/ktextwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.18/ktextwidgets.nix
new file mode 100644
index 000000000000..e332d4ff9a83
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/ktextwidgets.nix
@@ -0,0 +1,16 @@
+{ kdeFramework, lib, extra-cmake-modules, kcompletion, kconfig
+, kconfigwidgets, ki18n, kiconthemes, kservice, kwindowsystem
+, sonnet
+}:
+
+kdeFramework {
+  name = "ktextwidgets";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    kcompletion kconfig kconfigwidgets kiconthemes kservice
+  ];
+  propagatedBuildInputs = [ ki18n kwindowsystem sonnet ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kunitconversion.nix b/pkgs/development/libraries/kde-frameworks-5.18/kunitconversion.nix
new file mode 100644
index 000000000000..3cf0f847d83d
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kunitconversion.nix
@@ -0,0 +1,10 @@
+{ kdeFramework, lib, extra-cmake-modules, ki18n }:
+
+kdeFramework {
+  name = "kunitconversion";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  propagatedBuildInputs = [ ki18n ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kwallet.nix b/pkgs/development/libraries/kde-frameworks-5.18/kwallet.nix
new file mode 100644
index 000000000000..7c4177e009d2
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kwallet.nix
@@ -0,0 +1,21 @@
+{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
+, kdbusaddons, kdoctools, ki18n, kiconthemes, knotifications
+, kservice, kwidgetsaddons, kwindowsystem, libgcrypt, makeQtWrapper
+}:
+
+kdeFramework {
+  name = "kwallet";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
+  buildInputs = [
+    kconfig kcoreaddons kdbusaddons kiconthemes knotifications
+    kservice kwidgetsaddons libgcrypt
+  ];
+  propagatedBuildInputs = [ ki18n kwindowsystem ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/kwalletd5"
+    wrapQtProgram "$out/bin/kwallet-query"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kwidgetsaddons.nix b/pkgs/development/libraries/kde-frameworks-5.18/kwidgetsaddons.nix
new file mode 100644
index 000000000000..d95f44d3fecf
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kwidgetsaddons.nix
@@ -0,0 +1,11 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+}:
+
+kdeFramework {
+  name = "kwidgetsaddons";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kwindowsystem.nix b/pkgs/development/libraries/kde-frameworks-5.18/kwindowsystem.nix
new file mode 100644
index 000000000000..09ab1f2200de
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kwindowsystem.nix
@@ -0,0 +1,13 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, qtx11extras
+}:
+
+kdeFramework {
+  name = "kwindowsystem";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qtx11extras ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks-5.18/kxmlgui.nix
new file mode 100644
index 000000000000..f081d5f9170e
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kxmlgui.nix
@@ -0,0 +1,18 @@
+{ kdeFramework, lib, extra-cmake-modules, attica, kconfig
+, kconfigwidgets, kglobalaccel, ki18n, kiconthemes, kitemviews
+, ktextwidgets, kwindowsystem, sonnet
+}:
+
+kdeFramework {
+  name = "kxmlgui";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    attica kconfig kiconthemes kitemviews ktextwidgets
+  ];
+  propagatedBuildInputs = [
+    kconfigwidgets kglobalaccel ki18n kwindowsystem sonnet
+  ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kxmlrpcclient.nix b/pkgs/development/libraries/kde-frameworks-5.18/kxmlrpcclient.nix
new file mode 100644
index 000000000000..20a300b68bc8
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kxmlrpcclient.nix
@@ -0,0 +1,10 @@
+{ kdeFramework, lib, extra-cmake-modules, ki18n, kio }:
+
+kdeFramework {
+  name = "kxmlrpcclient";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  propagatedBuildInputs = [ ki18n kio ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/modemmanager-qt.nix b/pkgs/development/libraries/kde-frameworks-5.18/modemmanager-qt.nix
new file mode 100644
index 000000000000..7d7f769d6a9b
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/modemmanager-qt.nix
@@ -0,0 +1,13 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, modemmanager
+}:
+
+kdeFramework {
+  name = "modemmanager-qt";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  propagatedBuildInputs = [ modemmanager ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks-5.18/networkmanager-qt.nix
new file mode 100644
index 000000000000..333378bd1431
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/networkmanager-qt.nix
@@ -0,0 +1,13 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, networkmanager
+}:
+
+kdeFramework {
+  name = "networkmanager-qt";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  propagatedBuildInputs = [ networkmanager ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/oxygen-icons5.nix b/pkgs/development/libraries/kde-frameworks-5.18/oxygen-icons5.nix
new file mode 100644
index 000000000000..ee350f8e1536
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/oxygen-icons5.nix
@@ -0,0 +1,13 @@
+{ kdeFramework
+, lib
+, extra-cmake-modules
+}:
+
+kdeFramework {
+  name = "oxygen-icons5";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  meta = {
+    license = lib.licenses.lgpl3Plus;
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/plasma-framework/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/plasma-framework/default.nix
new file mode 100644
index 000000000000..d8846f777231
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/plasma-framework/default.nix
@@ -0,0 +1,25 @@
+{ kdeFramework, lib, extra-cmake-modules, kactivities, karchive
+, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative
+, kdoctools, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio
+, knotifications, kpackage, kservice, kwindowsystem, kxmlgui
+, makeQtWrapper, qtscript, qtx11extras
+}:
+
+kdeFramework {
+  name = "plasma-framework";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
+  buildInputs = [
+    karchive kconfig kconfigwidgets kcoreaddons kdbusaddons kguiaddons
+    kiconthemes knotifications kxmlgui qtscript
+  ];
+  propagatedBuildInputs = [
+    kactivities kdeclarative kglobalaccel ki18n kio kpackage kservice kwindowsystem
+    qtx11extras
+  ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/plasmapkg2"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/solid.nix b/pkgs/development/libraries/kde-frameworks-5.18/solid.nix
new file mode 100644
index 000000000000..afd125e3c597
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/solid.nix
@@ -0,0 +1,17 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, makeQtWrapper
+, qtdeclarative
+}:
+
+kdeFramework {
+  name = "solid";
+  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
+  buildInputs = [ qtdeclarative ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/solid-hardware5"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/sonnet.nix b/pkgs/development/libraries/kde-frameworks-5.18/sonnet.nix
new file mode 100644
index 000000000000..943fe04a1c92
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/sonnet.nix
@@ -0,0 +1,13 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, hunspell
+}:
+
+kdeFramework {
+  name = "sonnet";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ hunspell ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/srcs.nix b/pkgs/development/libraries/kde-frameworks-5.18/srcs.nix
new file mode 100644
index 000000000000..12c5c30a2471
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/srcs.nix
@@ -0,0 +1,565 @@
+# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
+{ fetchurl, mirror }:
+
+{
+  attica = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/attica-5.18.0.tar.xz";
+      sha256 = "1n6pkaak9xf7nyi0b1wr8fm5qkv7mgpsws9igd7g2xqvvqzyp5xw";
+      name = "attica-5.18.0.tar.xz";
+    };
+  };
+  baloo = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/baloo-5.18.0.tar.xz";
+      sha256 = "0sdnd6v01rcgq7v2jny0655jrghfamwyj0win7xfhx1622dfi8l8";
+      name = "baloo-5.18.0.tar.xz";
+    };
+  };
+  bluez-qt = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/bluez-qt-5.18.0.tar.xz";
+      sha256 = "17vx77w4fwdi7y394s2pqph2vmfs8n0107rmz4q7aa62q9iwdrbr";
+      name = "bluez-qt-5.18.0.tar.xz";
+    };
+  };
+  breeze-icons = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/breeze-icons-5.18.0.tar.xz";
+      sha256 = "0a4iqr5zrb56aln5hdsk5zrl23w8w8y5nmrxb093h205r36hfw4z";
+      name = "breeze-icons-5.18.0.tar.xz";
+    };
+  };
+  extra-cmake-modules = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/extra-cmake-modules-5.18.0.tar.xz";
+      sha256 = "1kp0pysa154cbp1ysgyqk03w8s335v3wmfrx4pshyfpg1s24k83y";
+      name = "extra-cmake-modules-5.18.0.tar.xz";
+    };
+  };
+  frameworkintegration = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/frameworkintegration-5.18.0.tar.xz";
+      sha256 = "06hw885mk0i2173lfdqz3hyp1fx2bndpj00hk32s3i2ggnn2y1rv";
+      name = "frameworkintegration-5.18.0.tar.xz";
+    };
+  };
+  kactivities = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/kactivities-5.18.0.tar.xz";
+      sha256 = "0nqa63ds7vj87zg2gz1mx42c30l3ypfk4ghhgxwziab315bpcpmr";
+      name = "kactivities-5.18.0.tar.xz";
+    };
+  };
+  kapidox = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/kapidox-5.18.0.tar.xz";
+      sha256 = "1hackjnpxijqqpn9cvnwcn9yc0jni21qgjccj74025ihdgigp70s";
+      name = "kapidox-5.18.0.tar.xz";
+    };
+  };
+  karchive = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/karchive-5.18.0.tar.xz";
+      sha256 = "0ph59w8y49b3znaj9c1qk0zwkg0pmjjcyr4jlv5w56mh0zkq37h5";
+      name = "karchive-5.18.0.tar.xz";
+    };
+  };
+  kauth = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/kauth-5.18.0.tar.xz";
+      sha256 = "14kvy7cbw31sc48f0aldpi52wxhwd69prwadvjhqwy912s8kr04n";
+      name = "kauth-5.18.0.tar.xz";
+    };
+  };
+  kbookmarks = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/kbookmarks-5.18.0.tar.xz";
+      sha256 = "0qi2f612s756qh5ldibscfhcq8q802vgr2497fm9xl95kfqmcg1n";
+      name = "kbookmarks-5.18.0.tar.xz";
+    };
+  };
+  kcmutils = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/kcmutils-5.18.0.tar.xz";
+      sha256 = "1m53308icq1x1877afcxlhygl56dsl50fiwmfjf0g5pfmnql3qfp";
+      name = "kcmutils-5.18.0.tar.xz";
+    };
+  };
+  kcodecs = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/kcodecs-5.18.0.tar.xz";
+      sha256 = "1injdpz7kdf2j6is2w3v3xgd9ahgls0j632q03q7qa48xp4wx64h";
+      name = "kcodecs-5.18.0.tar.xz";
+    };
+  };
+  kcompletion = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/kcompletion-5.18.0.tar.xz";
+      sha256 = "0gkj4gplm7qwx4nqhhph5h3jp4h8b22ssmw0vvv6bpsnq7idk76b";
+      name = "kcompletion-5.18.0.tar.xz";
+    };
+  };
+  kconfig = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/kconfig-5.18.0.tar.xz";
+      sha256 = "1s7fvhflsvv8zwb9cr50m3hxh0d4z5grh0nkri5ngzqb123wi91n";
+      name = "kconfig-5.18.0.tar.xz";
+    };
+  };
+  kconfigwidgets = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/kconfigwidgets-5.18.0.tar.xz";
+      sha256 = "08i12040prs2nxybxbbf3w0n91c9p0c64j8fz18axi4yszrmv8im";
+      name = "kconfigwidgets-5.18.0.tar.xz";
+    };
+  };
+  kcoreaddons = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/kcoreaddons-5.18.0.tar.xz";
+      sha256 = "05y8pan8hdn6qj2si9v9igjrx00l7bqzhdm2qq9vbjrv5xj8axzf";
+      name = "kcoreaddons-5.18.0.tar.xz";
+    };
+  };
+  kcrash = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/kcrash-5.18.0.tar.xz";
+      sha256 = "0rk27zr0mb4jlicm1s175x139avzi0q4jk3mlczfg4rkrxzgbx5w";
+      name = "kcrash-5.18.0.tar.xz";
+    };
+  };
+  kdbusaddons = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/kdbusaddons-5.18.0.tar.xz";
+      sha256 = "0l9ww3zaz1x6bk9axmm6zlj1dcn0gr0z61v9lw5y31rypxclhza8";
+      name = "kdbusaddons-5.18.0.tar.xz";
+    };
+  };
+  kdeclarative = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/kdeclarative-5.18.0.tar.xz";
+      sha256 = "0mpvwn26msg3sc9z1r1vnw32rkl842jxpvpx2vg8kwcd9snwx9a6";
+      name = "kdeclarative-5.18.0.tar.xz";
+    };
+  };
+  kded = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/kded-5.18.0.tar.xz";
+      sha256 = "0y5sn7yxalylcwcz2j4h349lll2vkf44bw3n6w2cbqqf5wnr2za5";
+      name = "kded-5.18.0.tar.xz";
+    };
+  };
+  kdelibs4support = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/portingAids/kdelibs4support-5.18.0.tar.xz";
+      sha256 = "0flhhjnnm2wh6869q8gxk45wlpq0679xlklzqlxvqx7a4kxdl8d8";
+      name = "kdelibs4support-5.18.0.tar.xz";
+    };
+  };
+  kdesignerplugin = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/kdesignerplugin-5.18.0.tar.xz";
+      sha256 = "163lfx8vxxdhxbn090k5r4m9vy940kfwvsyjsi8v0pp9ww49g13n";
+      name = "kdesignerplugin-5.18.0.tar.xz";
+    };
+  };
+  kdesu = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/kdesu-5.18.0.tar.xz";
+      sha256 = "0dqjmvi440p4n62w9y3qw4n7fcivyg3d54fv9nrf1sx87vdw7r83";
+      name = "kdesu-5.18.0.tar.xz";
+    };
+  };
+  kdewebkit = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/kdewebkit-5.18.0.tar.xz";
+      sha256 = "1ahr62xfk085kb9p2axx04gf7bpnr0vv2d4kpc4s0xrj3xi0alnl";
+      name = "kdewebkit-5.18.0.tar.xz";
+    };
+  };
+  kdnssd = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/kdnssd-5.18.0.tar.xz";
+      sha256 = "12vplqfsc3zks1grmb5i4hdww0g51lv54nb1drpj42mzyi1q1v1l";
+      name = "kdnssd-5.18.0.tar.xz";
+    };
+  };
+  kdoctools = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/kdoctools-5.18.0.tar.xz";
+      sha256 = "10h74lb4597fs1h88x60ykpkz47pgfa4k04h4i5l0qb5vb1jlw7d";
+      name = "kdoctools-5.18.0.tar.xz";
+    };
+  };
+  kemoticons = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/kemoticons-5.18.0.tar.xz";
+      sha256 = "0lba6rzmij20ndkq0vw9zkxbjq6g98may3ypyj0kc82d3sw9hkhs";
+      name = "kemoticons-5.18.0.tar.xz";
+    };
+  };
+  kfilemetadata = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/kfilemetadata-5.18.0.tar.xz";
+      sha256 = "19b8nh5x8c0w516afh8ln72vi5dk91wl8bcsqd84h3s6gw55rsm4";
+      name = "kfilemetadata-5.18.0.tar.xz";
+    };
+  };
+  kglobalaccel = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/kglobalaccel-5.18.0.tar.xz";
+      sha256 = "1v22rh8c103zl63cgg4gx430qw29f9yn9k5219pcw5n57jx0n5c1";
+      name = "kglobalaccel-5.18.0.tar.xz";
+    };
+  };
+  kguiaddons = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/kguiaddons-5.18.0.tar.xz";
+      sha256 = "153mjbiwg4p65c2msj8j3pycn5gys39ahg9ik7jqg7w4cjcl2jxz";
+      name = "kguiaddons-5.18.0.tar.xz";
+    };
+  };
+  khtml = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/portingAids/khtml-5.18.0.tar.xz";
+      sha256 = "0kgin1bhbx95kypsg1k318qjxz3258x3a6kkdbky3cvfmq8r5ka5";
+      name = "khtml-5.18.0.tar.xz";
+    };
+  };
+  ki18n = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/ki18n-5.18.0.tar.xz";
+      sha256 = "14vlq49a0bp1vpjb2zxkgqsd5yjmb0azri2iq9sgxxx1v6gyy9h9";
+      name = "ki18n-5.18.0.tar.xz";
+    };
+  };
+  kiconthemes = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/kiconthemes-5.18.0.tar.xz";
+      sha256 = "10pj2q28y57ng26xg2211v9vy91hqqmcyxh90q1qj89clykimwid";
+      name = "kiconthemes-5.18.0.tar.xz";
+    };
+  };
+  kidletime = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/kidletime-5.18.0.tar.xz";
+      sha256 = "0726nq508rpzjxvfp354jd8n14m49grv6nfv09q2zyw02cf6n9bi";
+      name = "kidletime-5.18.0.tar.xz";
+    };
+  };
+  kimageformats = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/kimageformats-5.18.0.tar.xz";
+      sha256 = "1y6zc04sx4sqyfavr8nf05a1p4kyb8ic335iy5s869r6zrvljpnc";
+      name = "kimageformats-5.18.0.tar.xz";
+    };
+  };
+  kinit = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/kinit-5.18.0.tar.xz";
+      sha256 = "142xm7yglssw771340bs0lk1xgsr53218zh87v6n9hchrd34zg08";
+      name = "kinit-5.18.0.tar.xz";
+    };
+  };
+  kio = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/kio-5.18.0.tar.xz";
+      sha256 = "020gvxs5xp9v4pra814200nv79c9b9j59skbrxq9cazhnywnnlns";
+      name = "kio-5.18.0.tar.xz";
+    };
+  };
+  kitemmodels = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/kitemmodels-5.18.0.tar.xz";
+      sha256 = "0r5r7ia1lwqll6bz92k4qgj737hsg6pfhxmycr6g88b9fiab1qw4";
+      name = "kitemmodels-5.18.0.tar.xz";
+    };
+  };
+  kitemviews = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/kitemviews-5.18.0.tar.xz";
+      sha256 = "10pbh0fpzrh0ijbadjx81690p9iw34rs2waks99fc0jy3hamny3b";
+      name = "kitemviews-5.18.0.tar.xz";
+    };
+  };
+  kjobwidgets = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/kjobwidgets-5.18.0.tar.xz";
+      sha256 = "0gxvh9wxnfkrxm9zc7yx579vlxs3xmihfyqs92fpkjhy2shfd2sg";
+      name = "kjobwidgets-5.18.0.tar.xz";
+    };
+  };
+  kjs = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/portingAids/kjs-5.18.0.tar.xz";
+      sha256 = "0z89l2yhs3vld1qbd6v506lksmxvwrzgdq77aghy3mbkfgz3jd62";
+      name = "kjs-5.18.0.tar.xz";
+    };
+  };
+  kjsembed = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/portingAids/kjsembed-5.18.0.tar.xz";
+      sha256 = "0mpq7aywspm6l13afrr2dis8ygyld5il21g90ij0fc1jwp95zk3d";
+      name = "kjsembed-5.18.0.tar.xz";
+    };
+  };
+  kmediaplayer = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/portingAids/kmediaplayer-5.18.0.tar.xz";
+      sha256 = "07m3agz73yzmfn8ykg0f6a2c39rkzchzqc1iam2zfydqxyvh4bxb";
+      name = "kmediaplayer-5.18.0.tar.xz";
+    };
+  };
+  knewstuff = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/knewstuff-5.18.0.tar.xz";
+      sha256 = "0mda1n0py6nm9wp89z5hkhhk9ah5sjrkzl1dshd4lq77f7p7i1g4";
+      name = "knewstuff-5.18.0.tar.xz";
+    };
+  };
+  knotifications = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/knotifications-5.18.0.tar.xz";
+      sha256 = "1npir2v4irhm6xmzf60aj5388slq6fw7jbcwjjscldrwk2ca06hz";
+      name = "knotifications-5.18.0.tar.xz";
+    };
+  };
+  knotifyconfig = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/knotifyconfig-5.18.0.tar.xz";
+      sha256 = "0q2735m2m1wrnp7g4ycnbjy7qgpjxc5fvx9zrwnd0jl5rmdw4sbb";
+      name = "knotifyconfig-5.18.0.tar.xz";
+    };
+  };
+  kpackage = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/kpackage-5.18.0.tar.xz";
+      sha256 = "14q2ssf3g7ljakzpq7q9q2zbm8jqk01ybjx4s16qpw9gakcrbli9";
+      name = "kpackage-5.18.0.tar.xz";
+    };
+  };
+  kparts = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/kparts-5.18.0.tar.xz";
+      sha256 = "1q4xd4dy40mh4a8vgpvdamy1242isjy9ma94cf95qqc6qgjnqxhy";
+      name = "kparts-5.18.0.tar.xz";
+    };
+  };
+  kpeople = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/kpeople-5.18.0.tar.xz";
+      sha256 = "0d0mp2qz3f1bki6rfw8x6zc0rmv4n43mi06k3vh30qpiaj7crl5k";
+      name = "kpeople-5.18.0.tar.xz";
+    };
+  };
+  kplotting = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/kplotting-5.18.0.tar.xz";
+      sha256 = "1jiqx9gdv69frfh8vanphp6lzc3vxn2q1lhibi7v03qkc2qaw5cc";
+      name = "kplotting-5.18.0.tar.xz";
+    };
+  };
+  kpty = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/kpty-5.18.0.tar.xz";
+      sha256 = "1baz1xs22r4qli74sqwpcjmxnfrd0iqyyzg1fmljr8fvs4pdy1x1";
+      name = "kpty-5.18.0.tar.xz";
+    };
+  };
+  kross = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/portingAids/kross-5.18.0.tar.xz";
+      sha256 = "1ky13yqxhkghxqd21jrnrpjfnrkgspv0p3dfij994rkaqq8rm1r6";
+      name = "kross-5.18.0.tar.xz";
+    };
+  };
+  krunner = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/portingAids/krunner-5.18.0.tar.xz";
+      sha256 = "14c51kiwr49dbdxg8y6ivmmfr9h6p8jjd32k35pi4gpi2vlh29pf";
+      name = "krunner-5.18.0.tar.xz";
+    };
+  };
+  kservice = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/kservice-5.18.0.tar.xz";
+      sha256 = "0pbs1n2i7vjgjh7j87ps8gkzmj5igw1aib1aq089m4hfrl8pbrq8";
+      name = "kservice-5.18.0.tar.xz";
+    };
+  };
+  ktexteditor = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/ktexteditor-5.18.0.tar.xz";
+      sha256 = "0fx82s5y1wya3v36qq3agmfrnff9a7v94fhifvfiwmhk2ddwwg3v";
+      name = "ktexteditor-5.18.0.tar.xz";
+    };
+  };
+  ktextwidgets = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/ktextwidgets-5.18.0.tar.xz";
+      sha256 = "1wflqfmgqa3lh3apf22sami6caclvyv7li6qiskwfkzkb0a6x373";
+      name = "ktextwidgets-5.18.0.tar.xz";
+    };
+  };
+  kunitconversion = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/kunitconversion-5.18.0.tar.xz";
+      sha256 = "0gpmndyly977dzfyfhrd0q434c0qr1sinh75dwf9clmqw576jl6i";
+      name = "kunitconversion-5.18.0.tar.xz";
+    };
+  };
+  kwallet = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/kwallet-5.18.0.tar.xz";
+      sha256 = "0w69y0xdvvrvcydv160z7s03y1n5vxjj3sfk530zc6bjszplvxis";
+      name = "kwallet-5.18.0.tar.xz";
+    };
+  };
+  kwidgetsaddons = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/kwidgetsaddons-5.18.0.tar.xz";
+      sha256 = "06fqz7cwczp5sahg54zi46rf9jf2si88w5yizp61z8yv57kvpvk1";
+      name = "kwidgetsaddons-5.18.0.tar.xz";
+    };
+  };
+  kwindowsystem = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/kwindowsystem-5.18.0.tar.xz";
+      sha256 = "01hzd4r8y4hdpynnh32qf418hxzbd67fkdq6a4vabl384aipnmk7";
+      name = "kwindowsystem-5.18.0.tar.xz";
+    };
+  };
+  kxmlgui = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/kxmlgui-5.18.0.tar.xz";
+      sha256 = "0yimy0r73sv8z4wq0mkdx24icjrzmy5bciblwlnzagd61f8j8qri";
+      name = "kxmlgui-5.18.0.tar.xz";
+    };
+  };
+  kxmlrpcclient = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/kxmlrpcclient-5.18.0.tar.xz";
+      sha256 = "0h88pc3h5z3q58b7qxdn69klwr0p9ffbirzncyvxjrhr7dq36nv9";
+      name = "kxmlrpcclient-5.18.0.tar.xz";
+    };
+  };
+  modemmanager-qt = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/modemmanager-qt-5.18.0.tar.xz";
+      sha256 = "09k07wxkn511sa4hwmrs6jfx4lnnw3zcac5dzz43hhsmw74yj9az";
+      name = "modemmanager-qt-5.18.0.tar.xz";
+    };
+  };
+  networkmanager-qt = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/networkmanager-qt-5.18.0.tar.xz";
+      sha256 = "11j818ws5jz23hyilfpf3npk893hs388v1xpwhh0lkjwm60wkzln";
+      name = "networkmanager-qt-5.18.0.tar.xz";
+    };
+  };
+  oxygen-icons5 = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/oxygen-icons5-5.18.0.tar.xz";
+      sha256 = "11zmxc9n7x6iwdckwxwjji0497yjcsjli7pzr8d049lbc7xsjvi8";
+      name = "oxygen-icons5-5.18.0.tar.xz";
+    };
+  };
+  plasma-framework = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/plasma-framework-5.18.0.tar.xz";
+      sha256 = "1lxhlzx3jcqzx90kjl8w8p53nrgrkjiz1xf92ah3mygjyvi5rlh8";
+      name = "plasma-framework-5.18.0.tar.xz";
+    };
+  };
+  solid = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/solid-5.18.0.tar.xz";
+      sha256 = "0ilki4s3f3gjsdj6z41a8k4h2b52w8xrh2api0sqj0ifk2yhx6wh";
+      name = "solid-5.18.0.tar.xz";
+    };
+  };
+  sonnet = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/sonnet-5.18.0.tar.xz";
+      sha256 = "1780jvsfkasabdbk9xjhjcihcc6mxxipi2rsq2001flxnnx4kykg";
+      name = "sonnet-5.18.0.tar.xz";
+    };
+  };
+  threadweaver = {
+    version = "5.18.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.18/threadweaver-5.18.0.tar.xz";
+      sha256 = "00c9vvyhyysg0cdlmvpls0h3pdbbhhwfxlm9l9i9r3j8x6rigm54";
+      name = "threadweaver-5.18.0.tar.xz";
+    };
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/threadweaver.nix b/pkgs/development/libraries/kde-frameworks-5.18/threadweaver.nix
new file mode 100644
index 000000000000..52817921cc72
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/threadweaver.nix
@@ -0,0 +1,11 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+}:
+
+kdeFramework {
+  name = "threadweaver";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 036628a020a9..94062f06d7d7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14822,7 +14822,7 @@ let
 
   kde5_latest =
     let
-      frameworks = import ../development/libraries/kde-frameworks-5.17 { inherit pkgs; };
+      frameworks = import ../development/libraries/kde-frameworks-5.18 { inherit pkgs; };
       plasma = import ../desktops/plasma-5.5 { inherit pkgs; };
       apps = import ../applications/kde-apps-15.12 { inherit pkgs; };
       named = self: { plasma = plasma self; frameworks = frameworks self; apps = apps self; };

From 7dba3bafba219ec6dc2c3a1b44f9d574837b5fe5 Mon Sep 17 00:00:00 2001
From: Mate Kovacs <mkovaxx@gmail.com>
Date: Sun, 3 Jan 2016 20:26:19 -0800
Subject: [PATCH 519/884] pythonPackages.pyopengl: 3.0.2 -> 3.1.0 (close
 #12124)

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7b4726cd55f3..8f51b3f827dd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15983,11 +15983,11 @@ in modules // {
 
   pyopengl = buildPythonPackage rec {
     name = "pyopengl-${version}";
-    version = "3.0.2";
+    version = "3.1.0";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/P/PyOpenGL/PyOpenGL-${version}.tar.gz";
-      sha256 = "9ef93bbea2c193898341f574e281c3ca0dfe87c53aa25fbec4b03581f6d1ba03";
+      sha256 = "9b47c5c3a094fa518ca88aeed35ae75834d53e4285512c61879f67a48c94ddaf";
     };
     propagatedBuildInputs = [ pkgs.mesa pkgs.freeglut self.pillow ];
     patchPhase = ''

From d03a25c5ea5bc33d6c7f7619986201d0a202ed8b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 10 Jan 2016 09:43:23 -0600
Subject: [PATCH 520/884] kde5_latest.kpackage: update patches for 5.18.0

---
 .../kpackage/0001-allow-external-paths.patch  | 25 ------------
 .../0002-qdiriterator-follow-symlinks.patch   | 39 -------------------
 .../kpackage/allow-external-paths.patch       | 13 +++++++
 .../kde-frameworks-5.18/kpackage/default.nix  |  7 +---
 .../qdiriterator-follow-symlinks.patch        | 26 +++++++++++++
 .../kde-frameworks-5.18/kpackage/series       |  2 +
 6 files changed, 43 insertions(+), 69 deletions(-)
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kpackage/0001-allow-external-paths.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kpackage/0002-qdiriterator-follow-symlinks.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kpackage/allow-external-paths.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kpackage/qdiriterator-follow-symlinks.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kpackage/series

diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kpackage/0001-allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.18/kpackage/0001-allow-external-paths.patch
deleted file mode 100644
index beede4d7ccb5..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kpackage/0001-allow-external-paths.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a92ac391b4e6ca335bd7fa78f1addd23c9467931 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Wed, 28 Jan 2015 07:15:30 -0600
-Subject: [PATCH 1/2] allow external paths
-
----
- src/kpackage/package.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/kpackage/package.cpp b/src/kpackage/package.cpp
-index 539b21a..977a026 100644
---- a/src/kpackage/package.cpp
-+++ b/src/kpackage/package.cpp
-@@ -789,7 +789,7 @@ PackagePrivate::PackagePrivate()
-     : QSharedData(),
-       fallbackPackage(0),
-       metadata(0),
--      externalPaths(false),
-+      externalPaths(true),
-       valid(false),
-       checkedValid(false)
- {
--- 
-2.5.2
-
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kpackage/0002-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.18/kpackage/0002-qdiriterator-follow-symlinks.patch
deleted file mode 100644
index 6e93fca9b21d..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kpackage/0002-qdiriterator-follow-symlinks.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 9fc26c3c0478eb7cb0a531836ba2e3a85d820c88 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Wed, 14 Oct 2015 06:50:28 -0500
-Subject: [PATCH 2/2] qdiriterator follow symlinks
-
----
- src/kpackage/packageloader.cpp            | 2 +-
- src/kpackage/private/packagejobthread.cpp | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/kpackage/packageloader.cpp b/src/kpackage/packageloader.cpp
-index eb5ed47..94217f6 100644
---- a/src/kpackage/packageloader.cpp
-+++ b/src/kpackage/packageloader.cpp
-@@ -241,7 +241,7 @@ QList<KPluginMetaData> PackageLoader::listPackages(const QString &packageFormat,
-         } else {
-             //qDebug() << "Not cached";
-             // If there's no cache file, fall back to listing the directory
--            const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories;
-+            const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories | QDirIterator::FollowSymlinks;
-             const QStringList nameFilters = QStringList(QStringLiteral("metadata.desktop"));
- 
-             QDirIterator it(plugindir, nameFilters, QDir::Files, flags);
-diff --git a/src/kpackage/private/packagejobthread.cpp b/src/kpackage/private/packagejobthread.cpp
-index ca523b3..1cfa792 100644
---- a/src/kpackage/private/packagejobthread.cpp
-+++ b/src/kpackage/private/packagejobthread.cpp
-@@ -145,7 +145,7 @@ bool indexDirectory(const QString& dir, const QString& dest)
-     QJsonArray plugins;
- 
-     int i = 0;
--    QDirIterator it(dir, QStringList()<<QStringLiteral("*.desktop"), QDir::Files, QDirIterator::Subdirectories);
-+    QDirIterator it(dir, QStringList()<<QStringLiteral("*.desktop"), QDir::Files, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-     while (it.hasNext()) {
-         it.next();
-         const QString path = it.fileInfo().absoluteFilePath();
--- 
-2.5.2
-
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kpackage/allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.18/kpackage/allow-external-paths.patch
new file mode 100644
index 000000000000..e9d744448148
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kpackage/allow-external-paths.patch
@@ -0,0 +1,13 @@
+Index: kpackage-5.18.0/src/kpackage/package.cpp
+===================================================================
+--- kpackage-5.18.0.orig/src/kpackage/package.cpp
++++ kpackage-5.18.0/src/kpackage/package.cpp
+@@ -808,7 +808,7 @@ PackagePrivate::PackagePrivate()
+     : QSharedData(),
+       fallbackPackage(0),
+       metadata(0),
+-      externalPaths(false),
++      externalPaths(true),
+       valid(false),
+       checkedValid(false)
+ {
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/kpackage/default.nix
index d2dc262bf1ac..aea1b0d31a0d 100644
--- a/pkgs/development/libraries/kde-frameworks-5.18/kpackage/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kpackage/default.nix
@@ -1,4 +1,4 @@
-{ kdeFramework, lib
+{ kdeFramework, lib, copyPathsToStore
 , extra-cmake-modules
 , karchive
 , kconfig
@@ -13,10 +13,7 @@ kdeFramework {
   nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
   buildInputs = [ karchive kconfig ];
   propagatedBuildInputs = [ kcoreaddons ki18n ];
-  patches = [
-    ./0001-allow-external-paths.patch
-    ./0002-qdiriterator-follow-symlinks.patch
-  ];
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   postInstall = ''
     wrapQtProgram "$out/bin/kpackagetool5"
   '';
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kpackage/qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.18/kpackage/qdiriterator-follow-symlinks.patch
new file mode 100644
index 000000000000..ddbf17d00064
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kpackage/qdiriterator-follow-symlinks.patch
@@ -0,0 +1,26 @@
+Index: kpackage-5.18.0/src/kpackage/packageloader.cpp
+===================================================================
+--- kpackage-5.18.0.orig/src/kpackage/packageloader.cpp
++++ kpackage-5.18.0/src/kpackage/packageloader.cpp
+@@ -241,7 +241,7 @@ QList<KPluginMetaData> PackageLoader::li
+         } else {
+             //qDebug() << "Not cached";
+             // If there's no cache file, fall back to listing the directory
+-            const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories;
++            const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories | QDirIterator::FollowSymlinks;
+             const QStringList nameFilters = QStringList(QStringLiteral("metadata.desktop")) << QStringLiteral("metadata.json");
+ 
+             QDirIterator it(plugindir, nameFilters, QDir::Files, flags);
+Index: kpackage-5.18.0/src/kpackage/private/packagejobthread.cpp
+===================================================================
+--- kpackage-5.18.0.orig/src/kpackage/private/packagejobthread.cpp
++++ kpackage-5.18.0/src/kpackage/private/packagejobthread.cpp
+@@ -146,7 +146,7 @@ bool indexDirectory(const QString& dir,
+ 
+     QJsonArray plugins;
+ 
+-    QDirIterator it(dir, *metaDataFiles, QDir::Files, QDirIterator::Subdirectories);
++    QDirIterator it(dir, *metaDataFiles, QDir::Files, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
+     while (it.hasNext()) {
+         it.next();
+         const QString path = it.fileInfo().absoluteFilePath();
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kpackage/series b/pkgs/development/libraries/kde-frameworks-5.18/kpackage/series
new file mode 100644
index 000000000000..9b7f076efc70
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kpackage/series
@@ -0,0 +1,2 @@
+allow-external-paths.patch
+qdiriterator-follow-symlinks.patch

From 67d63d24e01b662783b1dd454dd092ed2ecc16c8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 10 Jan 2016 10:16:55 -0600
Subject: [PATCH 521/884] kde5_latest.kdelibs4support: add missing kded
 dependency

---
 .../libraries/kde-frameworks-5.18/kdelibs4support.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support.nix b/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support.nix
index 0dd5c4157612..e61c4bb86e7c 100644
--- a/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support.nix
@@ -1,6 +1,6 @@
 { kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45, kauth
 , karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons
-, kcrash, kdbusaddons, kdesignerplugin, kdoctools, kemoticons
+, kcrash, kdbusaddons, kded, kdesignerplugin, kdoctools, kemoticons
 , kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kitemmodels
 , kinit, knotifications, kparts, kservice, ktextwidgets
 , kunitconversion, kwidgetsaddons, kwindowsystem, kxmlgui
@@ -13,7 +13,7 @@ kdeFramework {
   name = "kdelibs4support";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
-    kcompletion kconfig kservice kwidgetsaddons
+    kcompletion kconfig kded kservice kwidgetsaddons
     kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM
   ];
   propagatedBuildInputs = [

From 313fa2ebc69aa9b49055c6242ae6d4b78e9f0467 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 10 Jan 2016 17:48:17 +0100
Subject: [PATCH 522/884] nixos installer tests: use -A nix-env flag to prevent
 out of memory

---
 nixos/tests/installer.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index c59b97a66e4d..d71ab23c71b6 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -108,7 +108,7 @@ let
       $machine->waitUntilSucceeds("cat /proc/swaps | grep -q /dev");
 
       # Check whether the channel works.
-      $machine->succeed("nix-env -i coreutils >&2");
+      $machine->succeed("nix-env -iA coreutils >&2");
       $machine->succeed("type -tP ls | tee /dev/stderr") =~ /.nix-profile/
           or die "nix-env failed";
 

From 78be7f5a53e3945b72482a99c639f5fe8cc75fd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 10 Jan 2016 17:50:50 +0100
Subject: [PATCH 523/884] Revert "nixos-rebuild: Add option for building and/or
 deploying on a remote host"

This reverts commit ca0c46040649ab4a6d5d7bc838b393fdcbcae10c.

All the installer tests are failing due to this change. cc @rickynils
---
 .../modules/installer/tools/nixos-rebuild.sh  | 187 +++---------------
 1 file changed, 27 insertions(+), 160 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh
index 1071460097e8..6792690b4c3b 100644
--- a/nixos/modules/installer/tools/nixos-rebuild.sh
+++ b/nixos/modules/installer/tools/nixos-rebuild.sh
@@ -19,8 +19,6 @@ rollback=
 upgrade=
 repair=
 profile=/nix/var/nix/profiles/system
-buildHost=
-targetHost=
 
 while [ "$#" -gt 0 ]; do
     i="$1"; shift 1
@@ -75,14 +73,6 @@ while [ "$#" -gt 0 ]; do
         fi
         shift 1
         ;;
-      --build-host|h)
-        buildHost="$1"
-        shift 1
-        ;;
-      --target-host|t)
-        targetHost="$1"
-        shift 1
-        ;;
       *)
         echo "$0: unknown option \`$i'"
         exit 1
@@ -90,90 +80,6 @@ while [ "$#" -gt 0 ]; do
     esac
 done
 
-
-if [ -z "$buildHost" -a -n "$targetHost" ]; then
-    buildHost="$targetHost"
-fi
-if [ "$targetHost" = localhost ]; then
-    targetHost=
-fi
-if [ "$buildHost" = localhost ]; then
-    buildHost=
-fi
-
-buildHostCmd() {
-    if [ -z "$buildHost" ]; then
-        "$@"
-    elif [ -n "$remoteNix" ]; then
-        ssh $SSHOPTS "$buildHost" PATH="$remoteNix:$PATH" "$@"
-    else
-        ssh $SSHOPTS "$buildHost" "$@"
-    fi
-}
-
-targetHostCmd() {
-    if [ -z "$targetHost" ]; then
-        "$@"
-    else
-        ssh $SSHOPTS "$targetHost" "$@"
-    fi
-}
-
-copyToTarget() {
-    if ! [ "$targetHost" = "$buildHost" ]; then
-        if [ -z "$targetHost" ]; then
-            NIX_SSHOPTS=$SSH_OPTS nix-copy-closure --from "$buildHost" "$1"
-        elif [ -z "$buildHost" ]; then
-            NIX_SSHOPTS=$SSH_OPTS nix-copy-closure --to "$targetHost" "$1"
-        else
-            buildHostCmd nix-copy-closure --to "$targetHost" "$1"
-        fi
-    fi
-}
-
-nixBuild() {
-    if [ -z "$buildHost" ]; then
-        nix-build "$@"
-    else
-        local instArgs=()
-        local buildArgs=()
-
-        while [ "$#" -gt 0 ]; do
-            local i="$1"; shift 1
-            case "$i" in
-              -o)
-                local out="$1"; shift 1
-                buildArgs+=("--add-root" "$out" "--indirect")
-                ;;
-              -A)
-                local j="$1"; shift 1
-                instArgs+=("$i" "$j")
-                ;;
-              -I)
-                # We don't want this in buildArgs
-                shift 1
-                ;;
-              "<"*) # nix paths
-                instArgs+=("$i")
-                ;;
-              *)
-                buildArgs+=("$i")
-                ;;
-            esac
-        done
-
-        local drv="$(nix-instantiate "${instArgs[@]}" "${extraBuildFlags[@]}")"
-        if [ -a "$drv" ]; then
-            NIX_SSHOPTS=$SSH_OPTS nix-copy-closure --to "$buildHost" "$drv"
-            buildHostCmd nix-store -r "$drv" "${buildArgs[@]}"
-        else
-            echo "nix-instantiate failed"
-            exit 1
-        fi
-  fi
-}
-
-
 if [ -z "$action" ]; then showSyntax; fi
 
 # Only run shell scripts from the Nixpkgs tree if the action is
@@ -222,16 +128,7 @@ fi
 
 
 tmpDir=$(mktemp -t -d nixos-rebuild.XXXXXX)
-SSHOPTS="$NIX_SSHOPTS -o ControlMaster=auto -o ControlPath=$tmpDir/ssh-%n -o ControlPersist=60"
-
-cleanup() {
-    for ctrl in "$tmpDir"/ssh-*; do
-        ssh -o ControlPath="$ctrl" -O exit dummyhost 2>/dev/null || true
-    done
-    rm -rf "$tmpDir"
-}
-trap cleanup EXIT
-
+trap 'rm -rf "$tmpDir"' EXIT
 
 
 # If the Nix daemon is running, then use it.  This allows us to use
@@ -253,56 +150,30 @@ if [ -n "$rollback" -o "$action" = dry-build ]; then
     buildNix=
 fi
 
-prebuiltNix() {
-    machine="$1"
-    if [ "$machine" = x86_64 ]; then
-        return /nix/store/xryr9g56h8yjddp89d6dw12anyb4ch7c-nix-1.10
-    elif [[ "$machine" =~ i.86 ]]; then
-        return /nix/store/2w92k5wlpspf0q2k9mnf2z42prx3bwmv-nix-1.10
-    else
-        echo "$0: unsupported platform"
-        exit 1
-    fi
-}
-
-remotePATH=
-
 if [ -n "$buildNix" ]; then
     echo "building Nix..." >&2
-    nixDrv=
-    if ! nixDrv="$(nix-instantiate '<nixpkgs/nixos>' --add-root $tmpDir/nixdrv --indirect -A config.nix.package "${extraBuildFlags[@]}")"; then
-        if ! nixDrv="$(nix-instantiate '<nixpkgs/nixos>' --add-root $tmpDir/nixdrv --indirect -A nixFallback "${extraBuildFlags[@]}")"; then
-            if ! nixDrv="$(nix-instantiate '<nixpkgs>' --add-root $tmpDir/nixdrv --indirect -A nix "${extraBuildFlags[@]}")"; then
-                nixStorePath="$(prebuiltNix "$(uname -m)")"
+    if ! nix-build '<nixpkgs/nixos>' -A config.nix.package -o $tmpDir/nix "${extraBuildFlags[@]}" > /dev/null; then
+        if ! nix-build '<nixpkgs/nixos>' -A nixFallback -o $tmpDir/nix "${extraBuildFlags[@]}" > /dev/null; then
+            if ! nix-build '<nixpkgs>' -A nix -o $tmpDir/nix "${extraBuildFlags[@]}" > /dev/null; then
+                machine="$(uname -m)"
+                if [ "$machine" = x86_64 ]; then
+                    nixStorePath=/nix/store/xryr9g56h8yjddp89d6dw12anyb4ch7c-nix-1.10
+                elif [[ "$machine" =~ i.86 ]]; then
+                    nixStorePath=/nix/store/2w92k5wlpspf0q2k9mnf2z42prx3bwmv-nix-1.10
+                else
+                    echo "$0: unsupported platform"
+                    exit 1
+                fi
                 if ! nix-store -r $nixStorePath --add-root $tmpDir/nix --indirect \
                     --option extra-binary-caches https://cache.nixos.org/; then
                     echo "warning: don't know how to get latest Nix" >&2
                 fi
                 # Older version of nix-store -r don't support --add-root.
                 [ -e $tmpDir/nix ] || ln -sf $nixStorePath $tmpDir/nix
-                if [ -n "$buildHost" ]; then
-                    remoteNixStorePath="$(prebuiltNix "$(buildHostCmd uname -m)")"
-                    remoteNix="$remoteNixStorePath/bin"
-                    if ! buildHostCmd nix-store -r $remoteNixStorePath \
-                      --option extra-binary-caches https://cache.nixos.org/ >/dev/null; then
-                        remoteNix=
-                        echo "warning: don't know how to get latest Nix" >&2
-                    fi
-                fi
             fi
         fi
     fi
-    if [ -a "$nixDrv" ]; then
-        nix-store -r "$nixDrv" --add-root $tmpDir/nix --indirect >/dev/null
-        if [ -n "$buildHost" ]; then
-            nix-copy-closure --to "$buildHost" "$nixDrv"
-            # The nix build produces multiple outputs, we add them all to the remote path
-            for p in $(buildHostCmd nix-store -r "$(readlink "$nixDrv")" "${buildArgs[@]}"); do
-                remoteNix="$remoteNix${remoteNix:+:}$p/bin"
-            done
-        fi
-    fi
-    PATH="$tmpDir/nix/bin:$PATH"
+    PATH=$tmpDir/nix/bin:$PATH
 fi
 
 
@@ -329,35 +200,31 @@ fi
 if [ -z "$rollback" ]; then
     echo "building the system configuration..." >&2
     if [ "$action" = switch -o "$action" = boot ]; then
-        pathToConfig="$(nixBuild '<nixpkgs/nixos>' -A system "${extraBuildFlags[@]}")"
-        copyToTarget "$pathToConfig"
-        targetHostCmd nix-env -p "$profile" --set "$pathToConfig"
+        nix-env "${extraBuildFlags[@]}" -p "$profile" -f '<nixpkgs/nixos>' --set -A system
+        pathToConfig="$profile"
     elif [ "$action" = test -o "$action" = build -o "$action" = dry-build -o "$action" = dry-activate ]; then
-        pathToConfig="$(nixBuild '<nixpkgs/nixos>' -A system -k "${extraBuildFlags[@]}")"
+        nix-build '<nixpkgs/nixos>' -A system -k "${extraBuildFlags[@]}" > /dev/null
+        pathToConfig=./result
     elif [ "$action" = build-vm ]; then
-        pathToConfig="$(nixBuild '<nixpkgs/nixos>' -A vm -k "${extraBuildFlags[@]}")"
+        nix-build '<nixpkgs/nixos>' -A vm -k "${extraBuildFlags[@]}" > /dev/null
+        pathToConfig=./result
     elif [ "$action" = build-vm-with-bootloader ]; then
-        pathToConfig="$(nixBuild '<nixpkgs/nixos>' -A vmWithBootLoader -k "${extraBuildFlags[@]}")"
+        nix-build '<nixpkgs/nixos>' -A vmWithBootLoader -k "${extraBuildFlags[@]}" > /dev/null
+        pathToConfig=./result
     else
         showSyntax
     fi
-    # Copy build to target host if we haven't already done it
-    if ! [ "$action" = switch -o "$action" = boot ]; then
-        copyToTarget "$pathToConfig"
-    fi
 else # [ -n "$rollback" ]
     if [ "$action" = switch -o "$action" = boot ]; then
-        targetHostCmd nix-env --rollback -p "$profile"
+        nix-env --rollback -p "$profile"
         pathToConfig="$profile"
     elif [ "$action" = test -o "$action" = build ]; then
         systemNumber=$(
-            targetHostCmd nix-env -p "$profile" --list-generations |
+            nix-env -p "$profile" --list-generations |
             sed -n '/current/ {g; p;}; s/ *\([0-9]*\).*/\1/; h'
         )
-        pathToConfig="$profile"-${systemNumber}-link
-        if [ -z "$targetHost" ]; then
-            ln -sT "$pathToConfig" ./result
-        fi
+        ln -sT "$profile"-${systemNumber}-link ./result
+        pathToConfig=./result
     else
         showSyntax
     fi
@@ -367,7 +234,7 @@ fi
 # If we're not just building, then make the new configuration the boot
 # default and/or activate it now.
 if [ "$action" = switch -o "$action" = boot -o "$action" = test -o "$action" = dry-activate ]; then
-    if ! targetHostCmd $pathToConfig/bin/switch-to-configuration "$action"; then
+    if ! $pathToConfig/bin/switch-to-configuration "$action"; then
         echo "warning: error(s) occurred while switching to the new configuration" >&2
         exit 1
     fi

From ab16bbd0a4bd385aef5c00069548b8813d4981f2 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 10 Jan 2016 10:58:03 -0600
Subject: [PATCH 524/884] kde5_latest.ktexteditor: update patches and
 dependencies

ktexteditor-5.18.0 needs its patches updated. An optional dependency on
`libgit2` was also added. `makeQtWrapper` was added to
`nativeBuildInputs` to set `XDG_DATA_DIRS` correctly.
---
 .../ktexteditor/default.nix                   | 18 ++++++++------
 ...cation.patch => no-qcoreapplication.patch} | 24 +++++--------------
 .../kde-frameworks-5.18/ktexteditor/series    |  1 +
 3 files changed, 18 insertions(+), 25 deletions(-)
 rename pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/{0001-no-qcoreapplication.patch => no-qcoreapplication.patch} (57%)
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/series

diff --git a/pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/default.nix
index 39092fbb2784..b8df6a5f4c0d 100644
--- a/pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/default.nix
@@ -1,17 +1,21 @@
-{ kdeFramework, lib, extra-cmake-modules, karchive, kconfig
-, kguiaddons, ki18n, kio, kiconthemes, kparts, perl, qtscript
-, qtxmlpatterns, sonnet
+{ kdeFramework, lib, copyPathsToStore
+, extra-cmake-modules, makeQtWrapper, perl
+, karchive, kconfig, kguiaddons, kiconthemes, kparts
+, libgit2
+, qtscript, qtxmlpatterns
+, ki18n, kio, sonnet
 }:
 
 kdeFramework {
   name = "ktexteditor";
-  nativeBuildInputs = [ extra-cmake-modules perl ];
+  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper perl ];
   buildInputs = [
-    karchive kconfig kguiaddons kiconthemes kparts qtscript
-    qtxmlpatterns
+    karchive kconfig kguiaddons kiconthemes kparts
+    libgit2
+    qtscript qtxmlpatterns
   ];
   propagatedBuildInputs = [ ki18n kio sonnet ];
-  patches = [ ./0001-no-qcoreapplication.patch ];
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
   };
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/0001-no-qcoreapplication.patch b/pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/no-qcoreapplication.patch
similarity index 57%
rename from pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/0001-no-qcoreapplication.patch
rename to pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/no-qcoreapplication.patch
index def55bff9b23..19ab1e1e5513 100644
--- a/pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/0001-no-qcoreapplication.patch
+++ b/pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/no-qcoreapplication.patch
@@ -1,17 +1,8 @@
-From dc50fffdc72b76498384ce2f9065c3757b786d71 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Wed, 14 Oct 2015 09:08:59 -0500
-Subject: [PATCH] no qcoreapplication
-
----
- src/syntax/data/katehighlightingindexer.cpp | 11 ++++-------
- 1 file changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/src/syntax/data/katehighlightingindexer.cpp b/src/syntax/data/katehighlightingindexer.cpp
-index 3c63140..e3d5efe 100644
---- a/src/syntax/data/katehighlightingindexer.cpp
-+++ b/src/syntax/data/katehighlightingindexer.cpp
-@@ -51,19 +51,16 @@ QStringList readListing(const QString &fileName)
+Index: ktexteditor-5.18.0/src/syntax/data/katehighlightingindexer.cpp
+===================================================================
+--- ktexteditor-5.18.0.orig/src/syntax/data/katehighlightingindexer.cpp
++++ ktexteditor-5.18.0/src/syntax/data/katehighlightingindexer.cpp
+@@ -55,19 +55,16 @@ QStringList readListing(const QString &f
  
  int main(int argc, char *argv[])
  {
@@ -34,7 +25,7 @@ index 3c63140..e3d5efe 100644
      if (hlFilenamesListing.isEmpty()) {
          return 1;
      }
-@@ -147,7 +144,7 @@ int main(int argc, char *argv[])
+@@ -152,7 +149,7 @@ int main(int argc, char *argv[])
          return anyError;
  
      // create outfile, after all has worked!
@@ -43,6 +34,3 @@ index 3c63140..e3d5efe 100644
      if (!outFile.open(QIODevice::WriteOnly | QIODevice::Truncate))
          return 7;
  
--- 
-2.5.2
-
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/series b/pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/series
new file mode 100644
index 000000000000..46cd23829a2f
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/series
@@ -0,0 +1 @@
+no-qcoreapplication.patch

From a63fa339a546a79abe99eb3f0c358fecba7c4c70 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sun, 10 Jan 2016 12:16:43 -0500
Subject: [PATCH 525/884] cctools-port: bump to 877.5

---
 pkgs/os-specific/darwin/cctools/port.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix
index e7165875aa4e..bc6492f243fa 100644
--- a/pkgs/os-specific/darwin/cctools/port.nix
+++ b/pkgs/os-specific/darwin/cctools/port.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoconf, automake, libtool_2
+{ stdenv, fetchFromGitHub, autoconf, automake, libtool_2
 , llvm, libcxx, libcxxabi, clang, openssl, libuuid
 , libobjc ? null
 }:
@@ -6,16 +6,13 @@
 let
   baseParams = rec {
     name = "cctools-port-${version}";
-    version = "862";
+    version = "877.5";
 
-    src = let
-      # Should be fetchFromGitHub but it was whining so this will do for now
+    src = fetchFromGitHub {
       owner  = "tpoechtrager";
       repo   = "cctools-port";
-      rev    = "59d21d2c793c51d205c8b4ab14b9b28e63c72445";
-    in fetchurl {
-      url    = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz";
-      sha256 = "01f31ijpnplbiyp7ldwzy8vbkn3j3m56n5blsvsav5nlp4lp2g71";
+      rev    = "7d405492b09fa27546caaa989b8493829365deab";
+      sha256 = "0nj1q5bqdx5jm68dispybxc7wnkb6p8p2igpnap9q6qyv2r9p07w";
     };
 
     buildInputs = [ autoconf automake libtool_2 openssl libuuid ] ++
@@ -59,6 +56,8 @@ let
       sed -i -e 's|clang++|& -I${libcxx}/include/c++/v1|' cctools/autogen.sh
     '';
 
+    # TODO: this builds an ld without support for LLVM's LTO. We need to teach it, but that's rather
+    # hairy to handle during bootstrap. Perhaps it could be optional?
     preConfigure = ''
       cd cctools
       sh autogen.sh

From 82af770fa6d3a6aa83eaf4fc5ef3b083401921f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 10 Jan 2016 18:24:29 +0100
Subject: [PATCH 526/884] correctly fix
 313fa2ebc69aa9b49055c6242ae6d4b78e9f0467

---
 nixos/tests/installer.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index d71ab23c71b6..84fdb027ed85 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -108,7 +108,7 @@ let
       $machine->waitUntilSucceeds("cat /proc/swaps | grep -q /dev");
 
       # Check whether the channel works.
-      $machine->succeed("nix-env -iA coreutils >&2");
+      $machine->succeed("nix-env -iA nixos.coreutils >&2");
       $machine->succeed("type -tP ls | tee /dev/stderr") =~ /.nix-profile/
           or die "nix-env failed";
 

From 7f885c82c3145bce03c9421b34ce603d27afb261 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 10 Jan 2016 18:37:50 +0100
Subject: [PATCH 527/884] go-ipfs: add a minimum of metadata

From go-packages.nix, one would think descriptions frowned-upon :-(
Licences should be mandatory as well.
---
 pkgs/top-level/go-packages.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index ee50dddcdee7..f3a1b62fc187 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1804,6 +1804,10 @@ let
     repo   = "go-ipfs";
     sha256 = "00p7kv6000bk6lbqqnnf4xy5pmd93fv6fihji3vn7br53645blaa";
     disabled = isGo14;
+    meta = with stdenv.lib; {
+      description = "A global, versioned, peer-to-peer filesystem";
+      license = licenses.mit;
+    };
   };
 
   json2csv = buildFromGitHub{

From 4e6630041188ce69b145e4ea1dba2a5e7c2cfca0 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 10 Jan 2016 18:48:06 +0100
Subject: [PATCH 528/884] radius: remove dead package

Broken since 2013. Untouched since its addition in 2010 (final
release was in 2008). Mailing list abandoned by upstream.
---
 pkgs/servers/radius/default.nix | 35 ---------------------------------
 pkgs/top-level/all-packages.nix |  2 --
 2 files changed, 37 deletions(-)
 delete mode 100644 pkgs/servers/radius/default.nix

diff --git a/pkgs/servers/radius/default.nix b/pkgs/servers/radius/default.nix
deleted file mode 100644
index a8c991e12d3e..000000000000
--- a/pkgs/servers/radius/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ fetchurl, stdenv, m4, groff, readline }:
-
-stdenv.mkDerivation rec {
-  name = "radius-1.6.1";
-
-  src = fetchurl {
-    url = "mirror://gnu/radius/${name}.tar.gz";
-    sha256 = "1l4k17zkbjsmk8mqrjjymagq8a8kwgrain9mcb5zp8jaf1qbclrh";
-  };
-
-  buildInputs = [ m4 groff readline ] ;
-
-  doCheck = true;
-
-  meta = {
-    description = "GNU Radius remote authentication and accounting system";
-
-    longDescription =
-      '' Radius is a server for remote user authentication and
-         accounting.  Its primary use is for Internet Service
-         Providers, though it may as well be used on any network that
-         needs a centralized authentication and/or accounting service
-         for its workstations.  The package includes an authentication
-         and accounting server and administrator tools.
-      '';
-
-    homepage = http://www.gnu.org/software/radius/;
-    license = stdenv.lib.licenses.gpl3Plus;
-
-    maintainers = [ stdenv.lib.maintainers.bjg ];
-    platforms = stdenv.lib.platforms.all;
-
-    broken = true;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 036628a020a9..abefc3594ef3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9489,8 +9489,6 @@ let
     inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa;
   };
 
-  radius = callPackage ../servers/radius { };
-
   redis = callPackage ../servers/nosql/redis { };
 
   redstore = callPackage ../servers/http/redstore { };

From 757857613a267ff425292fb30025aaba94e6519a Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 11 Sep 2015 23:39:21 +0300
Subject: [PATCH 529/884] ejabberd: 2.1.13 -> 15.11

---
 pkgs/servers/xmpp/ejabberd/default.nix | 278 +++++++++++++++++++++++--
 pkgs/top-level/all-packages.nix        |   4 +-
 2 files changed, 266 insertions(+), 16 deletions(-)

diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix
index 3a77c5cd15c6..2fb6f7a4b2df 100644
--- a/pkgs/servers/xmpp/ejabberd/default.nix
+++ b/pkgs/servers/xmpp/ejabberd/default.nix
@@ -1,23 +1,275 @@
-{stdenv, fetchurl, expat, erlang, zlib, openssl, pam, lib}:
+{ stdenv, writeScriptBin, lib, fetchurl, fetchFromGitHub
+, erlang, openssl, expat, libyaml, bash, gnused, gnugrep, coreutils, utillinux, procps
+, withMysql ? false
+, withPgsql ? false
+, withSqlite ? false, sqlite
+, withPam ? false, pam
+, withZlib ? true, zlib
+, withRiak ? false
+, withElixir ? false, elixir
+, withIconv ? true
+, withLager ? true
+, withTools ? false
+, withRedis ? false
+}:
 
-stdenv.mkDerivation rec {
-  version = "2.1.13";
+let
+  ctlpath = lib.makeSearchPath "bin" [ bash gnused gnugrep coreutils utillinux procps ];
+
+  fakegit = writeScriptBin "git" ''
+    #! ${stdenv.shell}
+    exit 0
+  '';
+
+  # These can be extracted from `rebar.config.script`
+  # Some dependencies are from another packages. Try commenting them out; then during build
+  # you'll get necessary revision information.
+  ejdeps = {
+    p1_cache_tab = fetchFromGitHub {
+      owner = "processone";
+      repo = "cache_tab";
+      rev = "f7ea12b0ba962a3d2f9a406d2954cf7de4e27230";
+      sha256 = "043rz66s6vhcbk02qjhn1r8jv8yyy4gk0gsknmk7ya6wq2v1farw";
+    };
+    p1_tls = fetchFromGitHub {
+      owner = "processone";
+      repo = "tls";
+      rev = "e56321afd974e9da33da913cd31beebc8e73e75f";
+      sha256 = "0k8dx8mww2ilr4y5m2llhqh673l0z7r73f0lh7klyf57wfqy7hzk";
+    };
+    p1_stringprep = fetchFromGitHub {
+      owner = "processone";
+      repo = "stringprep";
+      rev = "3c640237a3a7831dc39de6a6d329d3a9af25c579";
+      sha256 = "0mwlkivkfj16bdv80jr8kqa0vcqglxkq90m9qn0m6zp4bjc3jm3n";
+    };
+    p1_xml = fetchFromGitHub {
+      owner = "processone";
+      repo = "xml";
+      rev = "1c8b016b0ac7986efb823baf1682a43565449e65";
+      sha256 = "192jhj0cwwypbiass3rm2449410pqyk3mgrdg7yyvqwmjzzkmh87";
+    };
+    esip = fetchFromGitHub {
+      owner = "processone";
+      repo = "p1_sip";
+      rev = "d662d3fe7f6288b444ea321d854de0bd6d40e022";
+      sha256 = "1mwzkkv01vr9n13h6h3100jrrlgb683ncq9jymnbxqxk6rn7xjd1";
+    };
+    p1_stun = fetchFromGitHub {
+      owner = "processone";
+      repo = "stun";
+      rev = "061bdae484268cbf0457ad4797e74b8516df3ad1";
+      sha256 = "0zaw8yq4sk7x4ybibcq93k9b6rb7fn03i0k8gb2dnlipmbcdd8cf";
+    };
+    p1_yaml = fetchFromGitHub {
+      owner = "processone";
+      repo = "p1_yaml";
+      rev = "79f756ba73a235c4d3836ec07b5f7f2b55f49638";
+      sha256 = "05jjw02ay8v34izwgi5zizqp1mj68ypjilxn59c262xj7c169pzh";
+    };
+    p1_utils = fetchFromGitHub {
+      owner = "processone";
+      repo = "p1_utils";
+      rev = "d7800881e6702723ce58b7646b60c9e4cd25d563";
+      sha256 = "07p47ccrdjymjmn6rn9jlcyg515bs9l0iwfbc75qsk10ddnmbvdi";
+    };
+    jiffy = fetchFromGitHub {
+      owner = "davisp";
+      repo = "jiffy";
+      rev = "cfc61a2e952dc3182e0f9b1473467563699992e2";
+      sha256 = "1c2x71x90jlx4585znxz8fg46q3jxm80nk7v184lf4pqa1snk8kk";
+    };
+    oauth2 = fetchFromGitHub {
+      owner = "prefiks";
+      repo = "oauth2";
+      rev = "e6da9912e5d8f658e7e868f41a102d085bdbef59";
+      sha256 = "0di33bkj8xc7h17z1fs4birp8a88c1ds72jc4xz2qmz8kh7q9m3k";
+    };
+    xmlrpc = fetchFromGitHub {
+      owner = "rds13";
+      repo = "xmlrpc";
+      rev = "42e6e96a0fe7106830274feed915125feb1056f3";
+      sha256 = "10dk480s6z653lr5sap4rcx3zsfmg68hgapvc4jvcyf7vgg12d3s";
+    };
+
+    p1_mysql = fetchFromGitHub {
+      owner = "processone";
+      repo = "mysql";
+      rev = "dfa87da95f8fdb92e270741c2a53f796b682f918";
+      sha256 = "1nw7n1xvid4yqp57s94drdjf6ffap8zpy8hkrz9yffzkhk9biz5y";
+    };
+    p1_pgsql = fetchFromGitHub {
+      owner = "processone";
+      repo = "pgsql";
+      rev = "e72c03c60bfcb56bbb5d259342021d9cb3581dac";
+      sha256 = "0y89995h7g8bi12qi1m4cdzcswsljbv7y8zb43rjg5ss2bcq7kb6";
+    };
+    sqlite3 = fetchFromGitHub {
+      owner = "alexeyr";
+      repo = "erlang-sqlite3";
+      rev = "8350dc603804c503f99c92bfd2eab1dd6885758e";
+      sha256 = "0d0pbqmi3hsvzjp4vjp7a6bq3pjvkfv0spszh6485x9cmxsbwfpc";
+    };
+    p1_pam = fetchFromGitHub {
+      owner = "processone";
+      repo = "epam";
+      rev = "d3ce290b7da75d780a03e86e7a8198a80e9826a6";
+      sha256 = "0s0czrgjvc1nw7j66x8b9rlajcap0yfnv6zqd4gs76ky6096qpb0";
+    };
+    p1_zlib = fetchFromGitHub {
+      owner = "processone";
+      repo = "zlib";
+      rev = "e3d4222b7aae616d7ef2e7e2fa0bbf451516c602";
+      sha256 = "0z960nwva8x4lw1k91i53kpn2bjbf1v1amslkyp8sx2gc5zf0gbn";
+    };
+    riakc = fetchFromGitHub {
+      owner = "basho";
+      repo = "riak-erlang-client";
+      rev = "1.4.2";
+      sha256 = "128jz83n1990m9c2fzwsif6hyapmq46720nzfyyb4z2j75vn85zz";
+    };
+    # dependency of riakc
+    riak_pb = fetchFromGitHub {
+      owner = "basho";
+      repo = "riak_pb";
+      rev = "1.4.4.0";
+      sha256 = "054fg9gaxk4n0id0qs6k8i919qvxsvmh76m6fgfbmixyfxh5jp3w";
+    };
+    # dependency of riak_pb
+    protobuffs = fetchFromGitHub {
+      owner = "basho";
+      repo = "erlang_protobuffs";
+      rev = "0.8.1p1";
+      sha256 = "1x75a26y1gx6pzr829i4sx2mxm5w40kb6hfd5y511him56jcczna";
+    };
+    rebar_elixir_plugin = fetchFromGitHub {
+      owner = "yrashk";
+      repo = "rebar_elixir_plugin";
+      rev = "7058379b7c7e017555647f6b9cecfd87cd50f884";
+      sha256 = "1s5bvbrhal866gbp72lgp0jzphs2cmgmafmka0pylwj30im41c71";
+    };
+    elixir = fetchFromGitHub {
+      owner = "elixir-lang";
+      repo = "elixir";
+      rev = "1d9548fd285d243721b7eba71912bde2ffd1f6c3";
+      sha256 = "1lxn9ly73rm797p6slfx7grsq32nn6bz15qhkbra834rj01fqzh8";
+    };
+    p1_iconv = fetchFromGitHub {
+      owner = "processone";
+      repo = "eiconv";
+      rev = "8b7542b1aaf0a851f335e464956956985af6d9a2";
+      sha256 = "1w3k41fpynqylc2vnirz0fymlidpz0nnym0070f1f1s3pd6g5906";
+    };
+    lager = fetchFromGitHub {
+      owner = "basho";
+      repo = "lager";
+      rev = "4d2ec8c701e1fa2d386f92f2b83b23faf8608ac3";
+      sha256 = "03aav3cid0qpl1n8dn83hk0p70rw05nqvhq1abdh219nrlk9gfmx";
+    };
+    # dependency of lager
+    goldrush = fetchFromGitHub {
+      owner = "DeadZen";
+      repo = "goldrush";
+      rev = "0.1.7";
+      sha256 = "1104j8v86hdavxf08yjyjkpi5vf95rfvsywdx29c69x3z33i4z3m";
+    };
+    p1_logger = fetchFromGitHub {
+      owner = "processone";
+      repo = "p1_logger";
+      rev = "3e19507fd5606a73694917158767ecb3f5704e3f";
+      sha256 = "0mq86gh8x3bgqcpwdjkdn7m3bj2006gbarnj7cn5dfs21m2h2mdn";
+    };
+    meck = fetchFromGitHub {
+      owner = "eproxus";
+      repo = "meck";
+      rev = "fc362e037f424250130bca32d6bf701f2f49dc75";
+      sha256 = "056yca394f8mbg8vwxxlq47dbjx48ykdrg4lvnbi5gfijl786i3s";
+    };
+    eredis = fetchFromGitHub {
+      owner = "wooga";
+      repo = "eredis";
+      rev = "770f828918db710d0c0958c6df63e90a4d341ed7";
+      sha256 = "0qv8hldn5972328pa1qz2lbblw1p2283js5y98dc8papldkicvmm";
+    };
+
+  };
+
+in stdenv.mkDerivation rec {
+  version = "15.11";
   name = "ejabberd-${version}";
+
   src = fetchurl {
     url = "http://www.process-one.net/downloads/ejabberd/${version}/${name}.tgz";
-    sha256 = "0vf8mfrx7vr3c5h3nfp3qcgwf2kmzq20rjv1h9sk3nimwir1q3d8";
+    sha256 = "0sll1si9pd4v7yibzr8hp18hfrbxsa5nj9h7qsldvy7r4md4n101";
   };
-  buildInputs = [ expat erlang zlib openssl pam ];
-  patchPhase = ''
+
+  nativeBuildInputs = [ fakegit ];
+
+  buildInputs = [ erlang openssl expat libyaml ]
+    ++ lib.optional withSqlite sqlite
+    ++ lib.optional withPam pam
+    ++ lib.optional withZlib zlib
+    ++ lib.optional withElixir elixir
+    ;
+
+  # Apparently needed for Elixir
+  LANG = "en_US.UTF-8";
+
+  depsNames =
+    [ "p1_cache_tab" "p1_tls" "p1_stringprep" "p1_xml" "esip" "p1_stun" "p1_yaml" "p1_utils" "jiffy" "oauth2" "xmlrpc" ]
+    ++ lib.optional withMysql "p1_mysql"
+    ++ lib.optional withPgsql "p1_pgsql"
+    ++ lib.optional withSqlite "sqlite3"
+    ++ lib.optional withPam "p1_pam"
+    ++ lib.optional withZlib "p1_zlib"
+    ++ lib.optionals withRiak [ "riakc" "riak_pb" "protobuffs" ]
+    ++ lib.optionals withElixir [ "rebar_elixir_plugin" "elixir" ]
+    ++ lib.optional withIconv "p1_iconv"
+    ++ lib.optionals withLager [ "lager" "goldrush" ]
+    ++ lib.optional (!withLager) "p1_logger"
+    ++ lib.optional withTools "meck"
+    ++ lib.optional withRedis "eredis"
+  ;
+
+  configureFlags =
+    [ "--enable-nif"
+      (lib.enableFeature withMysql "mysql")
+      (lib.enableFeature withPgsql "pgsql")
+      (lib.enableFeature withSqlite "sqlite")
+      (lib.enableFeature withPam "pam")
+      (lib.enableFeature withZlib "zlib")
+      (lib.enableFeature withRiak "riak")
+      (lib.enableFeature withElixir "elixir")
+      (lib.enableFeature withIconv "iconv")
+      (lib.enableFeature withLager "lager")
+      (lib.enableFeature withTools "tools")
+      (lib.enableFeature withRedis "redis")
+    ] ++ lib.optional withSqlite "--with-sqlite3=${sqlite}";
+
+  depsPaths = map (x: builtins.getAttr x ejdeps) depsNames;
+
+  enableParallelBuilding = true;
+
+  preBuild = ''
+    mkdir deps
+    depsPathsA=( $depsPaths )
+    depsNamesA=( $depsNames )
+    for i in {0..${toString (builtins.length depsNames - 1)}}; do
+      cp -R ''${depsPathsA[$i]} deps/''${depsNamesA[$i]}
+    done
+    chmod -R +w deps
+    touch deps/.got
+    patchShebangs .
+  '';
+
+  postInstall = ''
     sed -i \
-      -e "s|erl \\\|${erlang}/bin/erl \\\|" \
-      -e 's|EXEC_CMD=\"sh -c\"|EXEC_CMD=\"${stdenv.shell} -c\"|' \
-      src/ejabberdctl.template
+      -e '2iexport PATH=${ctlpath}:$PATH' \
+      -e 's,\(^ *FLOCK=\).*,\1${utillinux}/bin/flock,' \
+      -e 's,\(^ *JOT=\).*,\1,' \
+      -e 's,\(^ *CONNLOCKDIR=\).*,\1/var/lock/ejabberdctl,' \
+      $out/sbin/ejabberdctl
   '';
-  preConfigure = ''
-    cd src
-  '';
-  configureFlags = ["--enable-pam"];
 
   meta = {
     description = "Open-source XMPP application server written in Erlang";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bb2f0e4f10d9..46a14fc46e82 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9202,9 +9202,7 @@ let
 
   etcd = goPackages.etcd.bin // { outputs = [ "bin" ]; };
 
-  ejabberd = callPackage ../servers/xmpp/ejabberd {
-    erlang = erlangR16;
-  };
+  ejabberd = callPackage ../servers/xmpp/ejabberd { };
 
   prosody = callPackage ../servers/xmpp/prosody {
     lua5 = lua5_1;

From d0510febe1c08906550ea7fcc7a5e322ce59ad64 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 3 Jan 2016 05:36:19 +0300
Subject: [PATCH 530/884] nixos/ejabberd: update service

---
 nixos/modules/misc/ids.nix                    |   2 +
 .../modules/services/networking/ejabberd.nix  | 163 +++++++++++-------
 2 files changed, 98 insertions(+), 67 deletions(-)

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 01d2dd2996da..c9247815a35c 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -240,6 +240,7 @@
       pumpio = 216;
       nm-openvpn = 217;
       mathics = 218;
+      ejabberd = 219;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -457,6 +458,7 @@
       pumpio = 216;
       nm-openvpn = 217;
       mathics = 218;
+      ejabberd = 219;
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/services/networking/ejabberd.nix b/nixos/modules/services/networking/ejabberd.nix
index 97360396c79e..a990200f44c6 100644
--- a/nixos/modules/services/networking/ejabberd.nix
+++ b/nixos/modules/services/networking/ejabberd.nix
@@ -6,9 +6,16 @@ let
 
   cfg = config.services.ejabberd;
 
-in
+  ctlcfg = pkgs.writeText "ejabberdctl.cfg" ''
+    ERL_EPMD_ADDRESS=127.0.0.1
+    ${cfg.ctlConfig}
+  '';
 
-{
+  ectl = ''${cfg.package}/bin/ejabberdctl --config "${cfg.configFile}" --ctl-config "${ctlcfg}" --spool "${cfg.spoolDir}" --logs "${cfg.logsDir}"'';
+
+  dumps = lib.concatMapStringsSep " " lib.escapeShellArg cfg.loadDumps;
+
+in {
 
   ###### interface
 
@@ -17,33 +24,56 @@ in
     services.ejabberd = {
 
       enable = mkOption {
+        type = types.bool;
         default = false;
         description = "Whether to enable ejabberd server";
       };
 
+      package = mkOption {
+        type = types.package;
+        default = pkgs.ejabberd;
+        description = "ejabberd server package to use";
+      };
+
+      user = mkOption {
+        type = types.str;
+        default = "ejabberd";
+        description = "User under which ejabberd is ran";
+      };
+
+      group = mkOption {
+        type = types.str;
+        default = "ejabberd";
+        description = "Group under which ejabberd is ran";
+      };
+
       spoolDir = mkOption {
+        type = types.path;
         default = "/var/lib/ejabberd";
         description = "Location of the spooldir of ejabberd";
       };
 
       logsDir = mkOption {
+        type = types.path;
         default = "/var/log/ejabberd";
         description = "Location of the logfile directory of ejabberd";
       };
 
-      confDir = mkOption {
-        default = "/var/ejabberd";
-        description = "Location of the config directory of ejabberd";
+      configFile = mkOption {
+        type = types.path;
+        description = "Configuration file for ejabberd in YAML format";
       };
 
-      virtualHosts = mkOption {
-        default = "\"localhost\"";
-        description = "Virtualhosts that ejabberd should host. Hostnames are surrounded with doublequotes and separated by commas";
+      ctlConfig = mkOption {
+        type = types.lines;
+        default = "";
+        description = "Configuration of ejabberdctl";
       };
 
       loadDumps = mkOption {
+        type = types.listOf types.path;
         default = [];
-        description = "Configuration dump that should be loaded on the first startup";
+        description = "Configuration dumps that should be loaded on the first startup";
         example = literalExample "[ ./myejabberd.dump ]";
       };
     };
@@ -54,73 +84,72 @@ in
   ###### implementation
 
   config = mkIf cfg.enable {
-    environment.systemPackages = [ pkgs.ejabberd ];
+    environment.systemPackages = [ cfg.package ];
+
+    users.extraUsers = optionalAttrs (cfg.user == "ejabberd") (singleton
+      { name = "ejabberd";
+        group = cfg.group;
+        home = cfg.spoolDir;
+        createHome = true;
+        uid = config.ids.uids.ejabberd;
+      });
+
+    users.extraGroups = optionalAttrs (cfg.group == "ejabberd") (singleton
+      { name = "ejabberd";
+        gid = config.ids.gids.ejabberd;
+      });
 
     systemd.services.ejabberd = {
-      description = "EJabberd server";
-      after = [ "network-interfaces.target" ];
+      description = "ejabberd server";
       wantedBy = [ "multi-user.target" ];
-      path = with pkgs; [ ejabberd coreutils bash gnused ];
+      after = [ "network.target" ];
+      path = [ pkgs.findutils pkgs.coreutils ];
+
+      serviceConfig = {
+        Type = "forking";
+        # FIXME: runit is used for `chpst` -- can we get rid of this?
+        ExecStop = ''${pkgs.runit}/bin/chpst -u "${cfg.user}:${cfg.group}" ${ectl} stop'';
+        ExecReload = ''${pkgs.runit}/bin/chpst -u "${cfg.user}:${cfg.group}" ${ectl} reload_config'';
+        User = cfg.user;
+        Group = cfg.group;
+        PermissionsStartOnly = true;
+      };
 
       preStart = ''
-        # Initialise state data
-        mkdir -p ${cfg.logsDir}
+        mkdir -p -m750 "${cfg.logsDir}"
+        chown "${cfg.user}:${cfg.group}" "${cfg.logsDir}"
 
-        if ! test -d ${cfg.spoolDir}
-        then
-            initialize=1
-            cp -av ${pkgs.ejabberd}/var/lib/ejabberd /var/lib
-        fi
+        mkdir -p -m750 "/var/lock/ejabberdctl"
+        chown "${cfg.user}:${cfg.group}" "/var/lock/ejabberdctl"
 
-        if ! test -d ${cfg.confDir}
-        then
-            mkdir -p ${cfg.confDir}
-            cp ${pkgs.ejabberd}/etc/ejabberd/* ${cfg.confDir}
-            sed -e 's|{hosts, \["localhost"\]}.|{hosts, \[${cfg.virtualHosts}\]}.|' ${pkgs.ejabberd}/etc/ejabberd/ejabberd.cfg > ${cfg.confDir}/ejabberd.cfg
-        fi
-
-        ejabberdctl --config-dir ${cfg.confDir} --logs ${cfg.logsDir} --spool ${cfg.spoolDir} start
-
-        ${if cfg.loadDumps == [] then "" else
-          ''
-            if [ "$initialize" = "1" ]
-            then
-                # Wait until the ejabberd server is available for use
-                count=0
-                while ! ejabberdctl --config-dir ${cfg.confDir} --logs ${cfg.logsDir} --spool ${cfg.spoolDir} status
-                do
-                    if [ $count -eq 30 ]
-                    then
-                        echo "Tried 30 times, giving up..."
-                        exit 1
-                    fi
-
-                    echo "Ejabberd daemon not yet started. Waiting for 1 second..."
-                    count=$((count++))
-                    sleep 1
-                done
-
-                ${concatMapStrings (dump:
-                  ''
-                    echo "Importing dump: ${dump}"
-
-                    if [ -f ${dump} ]
-                    then
-                        ejabberdctl --config-dir ${cfg.confDir} --logs ${cfg.logsDir} --spool ${cfg.spoolDir} load ${dump}
-                    elif [ -d ${dump} ]
-                    then
-                        for i in ${dump}/ejabberd-dump/*
-                        do
-                            ejabberdctl --config-dir ${cfg.confDir} --logs ${cfg.logsDir} --spool ${cfg.spoolDir} load $i
-                        done
-                    fi
-                  '') cfg.loadDumps}
-            fi
-          ''}
+        mkdir -p -m750 "${cfg.spoolDir}"
+        chown -R "${cfg.user}:${cfg.group}" "${cfg.spoolDir}"
       '';
 
-      postStop = ''
-        ejabberdctl --config-dir ${cfg.confDir} --logs ${cfg.logsDir} --spool ${cfg.spoolDir} stop
+      script = ''
+        [ -z "$(ls -A '${cfg.spoolDir}')" ] && firstRun=1
+
+        ${ectl} start
+
+        count=0
+        while ! ${ectl} status >/dev/null 2>&1; do
+          if [ $count -eq 30 ]; then
+            echo "ejabberd server hasn't started in 30 seconds, giving up"
+            exit 1
+          fi
+
+          count=$((count++))
+          sleep 1
+        done
+
+        if [ -n "$firstRun" ]; then
+          for src in ${dumps}; do
+            find "$src" -type f | while read dump; do
+              echo "Loading configuration dump at $dump"
+              ${ectl} load "$dump"
+            done
+          done
+        fi
       '';
     };
 

From 7fb70c2db9d2300ea1e076874e632695cc52cd81 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 8 Jan 2016 20:31:30 +0100
Subject: [PATCH 531/884] hackage-packages.nix: update Haskell package set

This update was generated by hackage2nix v20151217-6-g3c230ba using the following inputs:

  - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/fbf35cf17d1a8f9b521ddf6011f3840859fdfb32
  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/3e0920b42557eddff8f9980c833550736ff77e98
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/e72964a5535ea93cb5ce89d4f3bfb39e18b4e1b7
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/c0de8ca462c66b960b5c6885f7613345ad4ac5ca
---
 .../haskell-modules/configuration-lts-0.0.nix |    7 +
 .../haskell-modules/configuration-lts-0.1.nix |    7 +
 .../haskell-modules/configuration-lts-0.2.nix |    7 +
 .../haskell-modules/configuration-lts-0.3.nix |    7 +
 .../haskell-modules/configuration-lts-0.4.nix |    7 +
 .../haskell-modules/configuration-lts-0.5.nix |    7 +
 .../haskell-modules/configuration-lts-0.6.nix |    7 +
 .../haskell-modules/configuration-lts-0.7.nix |    7 +
 .../haskell-modules/configuration-lts-1.0.nix |    7 +
 .../haskell-modules/configuration-lts-1.1.nix |    7 +
 .../configuration-lts-1.10.nix                |    8 +
 .../configuration-lts-1.11.nix                |    8 +
 .../configuration-lts-1.12.nix                |    8 +
 .../configuration-lts-1.13.nix                |    8 +
 .../configuration-lts-1.14.nix                |    8 +
 .../configuration-lts-1.15.nix                |    8 +
 .../haskell-modules/configuration-lts-1.2.nix |    7 +
 .../haskell-modules/configuration-lts-1.4.nix |    7 +
 .../haskell-modules/configuration-lts-1.5.nix |    8 +
 .../haskell-modules/configuration-lts-1.7.nix |    8 +
 .../haskell-modules/configuration-lts-1.8.nix |    8 +
 .../haskell-modules/configuration-lts-1.9.nix |    8 +
 .../haskell-modules/configuration-lts-2.0.nix |    8 +
 .../haskell-modules/configuration-lts-2.1.nix |    8 +
 .../configuration-lts-2.10.nix                |    8 +
 .../configuration-lts-2.11.nix                |    8 +
 .../configuration-lts-2.12.nix                |    8 +
 .../configuration-lts-2.13.nix                |    8 +
 .../configuration-lts-2.14.nix                |    8 +
 .../configuration-lts-2.15.nix                |    8 +
 .../configuration-lts-2.16.nix                |    8 +
 .../configuration-lts-2.17.nix                |    8 +
 .../configuration-lts-2.18.nix                |    8 +
 .../configuration-lts-2.19.nix                |    8 +
 .../haskell-modules/configuration-lts-2.2.nix |    8 +
 .../configuration-lts-2.20.nix                |    8 +
 .../configuration-lts-2.21.nix                |    8 +
 .../configuration-lts-2.22.nix                |    8 +
 .../haskell-modules/configuration-lts-2.3.nix |    8 +
 .../haskell-modules/configuration-lts-2.4.nix |    8 +
 .../haskell-modules/configuration-lts-2.5.nix |    8 +
 .../haskell-modules/configuration-lts-2.6.nix |    8 +
 .../haskell-modules/configuration-lts-2.7.nix |    8 +
 .../haskell-modules/configuration-lts-2.8.nix |    8 +
 .../haskell-modules/configuration-lts-2.9.nix |    8 +
 .../haskell-modules/configuration-lts-3.0.nix |   10 +
 .../haskell-modules/configuration-lts-3.1.nix |   10 +
 .../configuration-lts-3.10.nix                |   10 +
 .../configuration-lts-3.11.nix                |   10 +
 .../configuration-lts-3.12.nix                |   10 +
 .../configuration-lts-3.13.nix                |   10 +
 .../configuration-lts-3.14.nix                |   10 +
 .../configuration-lts-3.15.nix                |   10 +
 .../configuration-lts-3.16.nix                |   10 +
 .../configuration-lts-3.17.nix                |   12 +
 .../configuration-lts-3.18.nix                |   11 +
 .../configuration-lts-3.19.nix                |   11 +
 .../haskell-modules/configuration-lts-3.2.nix |   10 +
 .../configuration-lts-3.20.nix                |   12 +
 .../configuration-lts-3.21.nix                |   15 +
 .../configuration-lts-3.22.nix                | 8131 +++++++++++++++++
 .../haskell-modules/configuration-lts-3.3.nix |   10 +
 .../haskell-modules/configuration-lts-3.4.nix |   10 +
 .../haskell-modules/configuration-lts-3.5.nix |   10 +
 .../haskell-modules/configuration-lts-3.6.nix |   10 +
 .../haskell-modules/configuration-lts-3.7.nix |   10 +
 .../haskell-modules/configuration-lts-3.8.nix |   10 +
 .../haskell-modules/configuration-lts-3.9.nix |   10 +
 .../haskell-modules/configuration-lts-4.0.nix |   18 +
 .../haskell-modules/configuration-lts-4.1.nix | 7585 +++++++++++++++
 .../haskell-modules/hackage-packages.nix      |  645 +-
 71 files changed, 16885 insertions(+), 73 deletions(-)
 create mode 100644 pkgs/development/haskell-modules/configuration-lts-3.22.nix
 create mode 100644 pkgs/development/haskell-modules/configuration-lts-4.1.nix

diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
index 52764ef9f8f6..f9c43556f34d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
@@ -1729,6 +1729,7 @@ self: super: {
   "blank-canvas" = dontDistribute super."blank-canvas";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder" = doDistribute super."blaze-builder_0_3_3_4";
@@ -2564,6 +2565,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2712,6 +2714,7 @@ self: super: {
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -4776,6 +4779,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
   "ide-backend" = dontDistribute super."ide-backend";
@@ -5414,6 +5418,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -8086,6 +8092,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
index 0afcb4fe66b2..0d4159090c77 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
@@ -1729,6 +1729,7 @@ self: super: {
   "blank-canvas" = dontDistribute super."blank-canvas";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder" = doDistribute super."blaze-builder_0_3_3_4";
@@ -2564,6 +2565,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2712,6 +2714,7 @@ self: super: {
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -4776,6 +4779,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
   "ide-backend" = dontDistribute super."ide-backend";
@@ -5414,6 +5418,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -8086,6 +8092,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
index f00cf541bab8..0f8ebefd7628 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
@@ -1729,6 +1729,7 @@ self: super: {
   "blank-canvas" = dontDistribute super."blank-canvas";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder" = doDistribute super."blaze-builder_0_3_3_4";
@@ -2564,6 +2565,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2712,6 +2714,7 @@ self: super: {
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -4776,6 +4779,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
   "ide-backend" = dontDistribute super."ide-backend";
@@ -5414,6 +5418,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -8086,6 +8092,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
index a411776d7ac9..b503f2e97158 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
@@ -1729,6 +1729,7 @@ self: super: {
   "blank-canvas" = dontDistribute super."blank-canvas";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder" = doDistribute super."blaze-builder_0_3_3_4";
@@ -2564,6 +2565,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2712,6 +2714,7 @@ self: super: {
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -4776,6 +4779,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
   "ide-backend" = dontDistribute super."ide-backend";
@@ -5414,6 +5418,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -8086,6 +8092,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
index 6fcb1181a935..e6fec6b11549 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
@@ -1729,6 +1729,7 @@ self: super: {
   "blank-canvas" = dontDistribute super."blank-canvas";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder" = doDistribute super."blaze-builder_0_3_3_4";
@@ -2564,6 +2565,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2711,6 +2713,7 @@ self: super: {
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -4773,6 +4776,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
   "ide-backend" = dontDistribute super."ide-backend";
@@ -5411,6 +5415,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -8082,6 +8088,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
index 224e691cd088..e4fabc4a7ee3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
@@ -1729,6 +1729,7 @@ self: super: {
   "blank-canvas" = dontDistribute super."blank-canvas";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder" = doDistribute super."blaze-builder_0_3_3_4";
@@ -2564,6 +2565,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2711,6 +2713,7 @@ self: super: {
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -4773,6 +4776,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
   "ide-backend" = dontDistribute super."ide-backend";
@@ -5411,6 +5415,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -8082,6 +8088,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
index 1bd986368826..74309d6b7afc 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
@@ -1726,6 +1726,7 @@ self: super: {
   "blank-canvas" = dontDistribute super."blank-canvas";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder" = doDistribute super."blaze-builder_0_3_3_4";
@@ -2561,6 +2562,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2708,6 +2710,7 @@ self: super: {
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -4769,6 +4772,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
   "ide-backend" = dontDistribute super."ide-backend";
@@ -5407,6 +5411,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -8076,6 +8082,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
index a66c711c92e4..47bd4677eb59 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
@@ -1726,6 +1726,7 @@ self: super: {
   "blank-canvas" = dontDistribute super."blank-canvas";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder" = doDistribute super."blaze-builder_0_3_3_4";
@@ -2561,6 +2562,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2708,6 +2710,7 @@ self: super: {
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -4769,6 +4772,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
   "ide-backend" = dontDistribute super."ide-backend";
@@ -5407,6 +5411,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -8076,6 +8082,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
index af34d8088c03..9907c42fb522 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
@@ -1721,6 +1721,7 @@ self: super: {
   "blank-canvas" = dontDistribute super."blank-canvas";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder" = doDistribute super."blaze-builder_0_3_3_4";
@@ -2552,6 +2553,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2699,6 +2701,7 @@ self: super: {
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -4757,6 +4760,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
   "ide-backend" = dontDistribute super."ide-backend";
@@ -5395,6 +5399,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -8062,6 +8068,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
index 59f1e79efe5d..225255a40d98 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
@@ -1721,6 +1721,7 @@ self: super: {
   "blank-canvas" = dontDistribute super."blank-canvas";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder" = doDistribute super."blaze-builder_0_3_3_4";
@@ -2549,6 +2550,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2696,6 +2698,7 @@ self: super: {
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -4750,6 +4753,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
   "ide-backend" = dontDistribute super."ide-backend";
@@ -5388,6 +5392,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -8049,6 +8055,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
index 8b9d4ff915ba..a05ce9aee47d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
@@ -1720,6 +1720,7 @@ self: super: {
   "blank-canvas" = dontDistribute super."blank-canvas";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder" = doDistribute super."blaze-builder_0_3_3_4";
@@ -2545,6 +2546,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2692,6 +2694,7 @@ self: super: {
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -4734,6 +4737,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
   "ide-backend" = dontDistribute super."ide-backend";
@@ -4750,6 +4754,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -5369,6 +5374,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -8021,6 +8028,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
index 9f3e82d2970e..b565f56278bd 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
@@ -1720,6 +1720,7 @@ self: super: {
   "blank-canvas" = dontDistribute super."blank-canvas";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder" = doDistribute super."blaze-builder_0_3_3_4";
@@ -2545,6 +2546,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2692,6 +2694,7 @@ self: super: {
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -4732,6 +4735,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
   "ide-backend" = dontDistribute super."ide-backend";
@@ -4748,6 +4752,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -5365,6 +5370,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -8017,6 +8024,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
index 61bd4b84864a..06d802c27b74 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
@@ -1720,6 +1720,7 @@ self: super: {
   "blank-canvas" = dontDistribute super."blank-canvas";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder" = doDistribute super."blaze-builder_0_3_3_4";
@@ -2545,6 +2546,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2692,6 +2694,7 @@ self: super: {
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -4731,6 +4734,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
   "ide-backend" = dontDistribute super."ide-backend";
@@ -4747,6 +4751,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -5364,6 +5369,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -8014,6 +8021,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
index 01b40ce89c62..d3895d30de69 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
@@ -1720,6 +1720,7 @@ self: super: {
   "blank-canvas" = dontDistribute super."blank-canvas";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder" = doDistribute super."blaze-builder_0_3_3_4";
@@ -2545,6 +2546,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2692,6 +2694,7 @@ self: super: {
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -4730,6 +4733,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
   "ide-backend" = dontDistribute super."ide-backend";
@@ -4746,6 +4750,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -5363,6 +5368,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -8012,6 +8019,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
index fd35c6a57ea1..530de7f8b32e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
@@ -1718,6 +1718,7 @@ self: super: {
   "blank-canvas" = dontDistribute super."blank-canvas";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder" = doDistribute super."blaze-builder_0_3_3_4";
@@ -2542,6 +2543,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2689,6 +2691,7 @@ self: super: {
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -4726,6 +4729,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
   "ide-backend" = dontDistribute super."ide-backend";
@@ -4742,6 +4746,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -5358,6 +5363,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -8004,6 +8011,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
index f4261bb3a781..3abf18303fc8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
@@ -1717,6 +1717,7 @@ self: super: {
   "blank-canvas" = dontDistribute super."blank-canvas";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder" = doDistribute super."blaze-builder_0_3_3_4";
@@ -2538,6 +2539,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2685,6 +2687,7 @@ self: super: {
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -4721,6 +4724,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
   "ide-backend" = dontDistribute super."ide-backend";
@@ -4737,6 +4741,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -5353,6 +5358,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -7993,6 +8000,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
index 2d628242f976..cc495247e7f0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
@@ -1721,6 +1721,7 @@ self: super: {
   "blank-canvas" = dontDistribute super."blank-canvas";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder" = doDistribute super."blaze-builder_0_3_3_4";
@@ -2547,6 +2548,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2694,6 +2696,7 @@ self: super: {
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -4747,6 +4750,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
   "ide-backend" = dontDistribute super."ide-backend";
@@ -5385,6 +5389,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -8043,6 +8049,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
index a17ec49c7332..8f9b01775bd3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
@@ -1720,6 +1720,7 @@ self: super: {
   "blank-canvas" = dontDistribute super."blank-canvas";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder" = doDistribute super."blaze-builder_0_3_3_4";
@@ -2546,6 +2547,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2693,6 +2695,7 @@ self: super: {
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -4744,6 +4747,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
   "ide-backend" = dontDistribute super."ide-backend";
@@ -5382,6 +5386,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -8038,6 +8044,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
index 3a26cb35dccd..cfb73bafd7ff 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
@@ -1720,6 +1720,7 @@ self: super: {
   "blank-canvas" = dontDistribute super."blank-canvas";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder" = doDistribute super."blaze-builder_0_3_3_4";
@@ -2545,6 +2546,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2692,6 +2694,7 @@ self: super: {
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -4743,6 +4746,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
   "ide-backend" = dontDistribute super."ide-backend";
@@ -4759,6 +4763,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -5380,6 +5385,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -8036,6 +8043,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
index 6723b3b29b03..98a17cd7b979 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
@@ -1720,6 +1720,7 @@ self: super: {
   "blank-canvas" = dontDistribute super."blank-canvas";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder" = doDistribute super."blaze-builder_0_3_3_4";
@@ -2545,6 +2546,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2692,6 +2694,7 @@ self: super: {
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -4738,6 +4741,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
   "ide-backend" = dontDistribute super."ide-backend";
@@ -4754,6 +4758,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -5374,6 +5379,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -8030,6 +8037,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
index ea6192009c91..c49352a84a62 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
@@ -1720,6 +1720,7 @@ self: super: {
   "blank-canvas" = dontDistribute super."blank-canvas";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder" = doDistribute super."blaze-builder_0_3_3_4";
@@ -2545,6 +2546,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2692,6 +2694,7 @@ self: super: {
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -4735,6 +4738,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
   "ide-backend" = dontDistribute super."ide-backend";
@@ -4751,6 +4755,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -5370,6 +5375,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -8026,6 +8033,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
index 656a42670b58..3b61493cadf3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
@@ -1720,6 +1720,7 @@ self: super: {
   "blank-canvas" = dontDistribute super."blank-canvas";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder" = doDistribute super."blaze-builder_0_3_3_4";
@@ -2545,6 +2546,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2692,6 +2694,7 @@ self: super: {
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -4734,6 +4737,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
   "ide-backend" = dontDistribute super."ide-backend";
@@ -4750,6 +4754,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -5369,6 +5374,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -8025,6 +8032,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
index ba596459fd8a..9021d0eeffee 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
@@ -1707,6 +1707,7 @@ self: super: {
   "blank-canvas" = doDistribute super."blank-canvas_0_5";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
@@ -2522,6 +2523,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2669,6 +2671,7 @@ self: super: {
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -4690,6 +4693,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = doDistribute super."iconv_0_4_1_2";
   "ide-backend" = doDistribute super."ide-backend_0_9_0_4";
@@ -4705,6 +4709,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -5312,6 +5317,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -7929,6 +7936,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
index b426b2cad868..0a9cdc1c9277 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
@@ -1707,6 +1707,7 @@ self: super: {
   "blank-canvas" = doDistribute super."blank-canvas_0_5";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
@@ -2521,6 +2522,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2668,6 +2670,7 @@ self: super: {
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -4688,6 +4691,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = doDistribute super."iconv_0_4_1_2";
   "ide-backend" = doDistribute super."ide-backend_0_9_0_6";
@@ -4703,6 +4707,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -5310,6 +5315,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -7927,6 +7934,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
index 52db16ccfed3..c9a3d2cdd3f7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
@@ -1698,6 +1698,7 @@ self: super: {
   "blank-canvas" = doDistribute super."blank-canvas_0_5";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
@@ -2506,6 +2507,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2653,6 +2655,7 @@ self: super: {
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -4661,6 +4664,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = doDistribute super."iconv_0_4_1_2";
   "ide-backend" = doDistribute super."ide-backend_0_9_0_9";
@@ -4676,6 +4680,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -5277,6 +5282,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -7870,6 +7877,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
index cb3cd57e7fbe..96be05851d78 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
@@ -1697,6 +1697,7 @@ self: super: {
   "blank-canvas" = doDistribute super."blank-canvas_0_5";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
@@ -2505,6 +2506,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2652,6 +2654,7 @@ self: super: {
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -4658,6 +4661,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = doDistribute super."iconv_0_4_1_2";
   "ide-backend" = doDistribute super."ide-backend_0_9_0_9";
@@ -4673,6 +4677,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -5273,6 +5278,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -7861,6 +7868,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
index 885c13740374..b214ee9552c1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
@@ -1697,6 +1697,7 @@ self: super: {
   "blank-canvas" = doDistribute super."blank-canvas_0_5";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
@@ -2505,6 +2506,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2652,6 +2654,7 @@ self: super: {
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -4658,6 +4661,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = doDistribute super."iconv_0_4_1_2";
   "ide-backend" = doDistribute super."ide-backend_0_9_0_9";
@@ -4673,6 +4677,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -5273,6 +5278,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -7860,6 +7867,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
index e6b2ee578017..217e6cca37cc 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
@@ -1697,6 +1697,7 @@ self: super: {
   "blank-canvas" = doDistribute super."blank-canvas_0_5";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
@@ -2505,6 +2506,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2652,6 +2654,7 @@ self: super: {
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -4657,6 +4660,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "ide-backend" = doDistribute super."ide-backend_0_9_0_9";
   "ide-backend-common" = doDistribute super."ide-backend-common_0_9_1_2";
@@ -4671,6 +4675,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -5271,6 +5276,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -7857,6 +7864,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
index 1b515c4fb6c8..529fdf3a9af8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
@@ -1696,6 +1696,7 @@ self: super: {
   "blank-canvas" = doDistribute super."blank-canvas_0_5";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
@@ -2504,6 +2505,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2651,6 +2653,7 @@ self: super: {
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -4654,6 +4657,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "ide-backend" = doDistribute super."ide-backend_0_9_0_9";
   "ide-backend-common" = doDistribute super."ide-backend-common_0_9_1_2";
@@ -4668,6 +4672,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -5268,6 +5273,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -7852,6 +7859,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
index 4239d3839210..b3ee5b2175f8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
@@ -1696,6 +1696,7 @@ self: super: {
   "blank-canvas" = doDistribute super."blank-canvas_0_5";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
@@ -2504,6 +2505,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2651,6 +2653,7 @@ self: super: {
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -4653,6 +4656,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "ide-backend" = doDistribute super."ide-backend_0_9_0_9";
   "ide-backend-common" = doDistribute super."ide-backend-common_0_9_1_2";
@@ -4667,6 +4671,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -5267,6 +5272,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -7847,6 +7854,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
index f311c69e581f..dde146a4c693 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
@@ -1695,6 +1695,7 @@ self: super: {
   "blank-canvas" = doDistribute super."blank-canvas_0_5";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
@@ -2501,6 +2502,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2647,6 +2649,7 @@ self: super: {
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -4647,6 +4650,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "ide-backend" = doDistribute super."ide-backend_0_9_0_11";
   "ide-backend-common" = doDistribute super."ide-backend-common_0_9_1_3";
@@ -4661,6 +4665,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -5260,6 +5265,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -7840,6 +7847,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
index 2e49b6ac2237..9326e2788fee 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
@@ -1694,6 +1694,7 @@ self: super: {
   "blank-canvas" = doDistribute super."blank-canvas_0_5";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
@@ -2499,6 +2500,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2645,6 +2647,7 @@ self: super: {
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -4642,6 +4645,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "ide-backend" = doDistribute super."ide-backend_0_9_0_11";
   "ide-backend-common" = doDistribute super."ide-backend-common_0_9_1_3";
@@ -4656,6 +4660,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -5255,6 +5260,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -7834,6 +7841,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
index 4ea63a5eb54f..a2a7e8ff95d1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
@@ -1694,6 +1694,7 @@ self: super: {
   "blank-canvas" = doDistribute super."blank-canvas_0_5";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
@@ -2498,6 +2499,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2644,6 +2646,7 @@ self: super: {
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -4639,6 +4642,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "ide-backend" = doDistribute super."ide-backend_0_9_0_11";
   "ide-backend-common" = doDistribute super."ide-backend-common_0_9_1_3";
@@ -4653,6 +4657,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -5252,6 +5257,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -7828,6 +7835,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
index 3d1e8d022a38..92787cdb0a3d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
@@ -1694,6 +1694,7 @@ self: super: {
   "blank-canvas" = doDistribute super."blank-canvas_0_5";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
@@ -2498,6 +2499,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2644,6 +2646,7 @@ self: super: {
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -4638,6 +4641,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "ide-backend" = doDistribute super."ide-backend_0_9_0_11";
   "ide-backend-common" = doDistribute super."ide-backend-common_0_9_1_3";
@@ -4652,6 +4656,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -5251,6 +5256,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -7823,6 +7830,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
index 7130e689c7eb..ea3757006c40 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
@@ -1706,6 +1706,7 @@ self: super: {
   "blank-canvas" = doDistribute super."blank-canvas_0_5";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
@@ -2518,6 +2519,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2665,6 +2667,7 @@ self: super: {
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -4685,6 +4688,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = doDistribute super."iconv_0_4_1_2";
   "ide-backend" = doDistribute super."ide-backend_0_9_0_7";
@@ -4700,6 +4704,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -5307,6 +5312,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -7924,6 +7931,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
index aba171225f2e..241a54c88491 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
@@ -1694,6 +1694,7 @@ self: super: {
   "blank-canvas" = doDistribute super."blank-canvas_0_5";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
@@ -2497,6 +2498,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2643,6 +2645,7 @@ self: super: {
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -4636,6 +4639,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "ide-backend" = doDistribute super."ide-backend_0_9_0_11";
   "ide-backend-common" = doDistribute super."ide-backend-common_0_9_1_3";
@@ -4650,6 +4654,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -5249,6 +5254,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -7819,6 +7826,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
index e7d37e3a1ad1..f1817bcf582b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
@@ -1694,6 +1694,7 @@ self: super: {
   "blank-canvas" = doDistribute super."blank-canvas_0_5";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
@@ -2497,6 +2498,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2643,6 +2645,7 @@ self: super: {
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -4636,6 +4639,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "ide-backend" = doDistribute super."ide-backend_0_9_0_11";
   "ide-backend-common" = doDistribute super."ide-backend-common_0_9_1_3";
@@ -4650,6 +4654,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -5248,6 +5253,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -7817,6 +7824,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
index 71fd5ab45ef6..a7100dbced8b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
@@ -1694,6 +1694,7 @@ self: super: {
   "blank-canvas" = doDistribute super."blank-canvas_0_5";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
@@ -2497,6 +2498,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2643,6 +2645,7 @@ self: super: {
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -4635,6 +4638,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "ide-backend" = doDistribute super."ide-backend_0_9_0_11";
   "ide-backend-common" = doDistribute super."ide-backend-common_0_9_1_3";
@@ -4649,6 +4653,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -5247,6 +5252,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -7815,6 +7822,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
index 8ffc524a2511..a8635180afb0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
@@ -1706,6 +1706,7 @@ self: super: {
   "blank-canvas" = doDistribute super."blank-canvas_0_5";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
@@ -2518,6 +2519,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2665,6 +2667,7 @@ self: super: {
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -4683,6 +4686,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = doDistribute super."iconv_0_4_1_2";
   "ide-backend" = doDistribute super."ide-backend_0_9_0_7";
@@ -4698,6 +4702,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -5305,6 +5310,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -7922,6 +7929,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
index 230a903c5244..568a559f6678 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
@@ -1705,6 +1705,7 @@ self: super: {
   "blank-canvas" = doDistribute super."blank-canvas_0_5";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
@@ -2517,6 +2518,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2664,6 +2666,7 @@ self: super: {
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -4682,6 +4685,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = doDistribute super."iconv_0_4_1_2";
   "ide-backend" = doDistribute super."ide-backend_0_9_0_7";
@@ -4697,6 +4701,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -5304,6 +5309,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -7917,6 +7924,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
index 302b2924f12c..654773b38a8e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
@@ -1705,6 +1705,7 @@ self: super: {
   "blank-canvas" = doDistribute super."blank-canvas_0_5";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
@@ -2516,6 +2517,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2663,6 +2665,7 @@ self: super: {
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -4681,6 +4684,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = doDistribute super."iconv_0_4_1_2";
   "ide-backend" = doDistribute super."ide-backend_0_9_0_7";
@@ -4696,6 +4700,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -5302,6 +5307,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -7914,6 +7921,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
index a592871599d2..d1232893e9fe 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
@@ -1702,6 +1702,7 @@ self: super: {
   "blank-canvas" = doDistribute super."blank-canvas_0_5";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
@@ -2513,6 +2514,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2660,6 +2662,7 @@ self: super: {
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -4676,6 +4679,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = doDistribute super."iconv_0_4_1_2";
   "ide-backend" = doDistribute super."ide-backend_0_9_0_7";
@@ -4691,6 +4695,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -5297,6 +5302,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -7906,6 +7913,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
index efa81299bb78..7d95a486a30f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
@@ -1701,6 +1701,7 @@ self: super: {
   "blank-canvas" = doDistribute super."blank-canvas_0_5";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
@@ -2512,6 +2513,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2659,6 +2661,7 @@ self: super: {
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -4675,6 +4678,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = doDistribute super."iconv_0_4_1_2";
   "ide-backend" = doDistribute super."ide-backend_0_9_0_7";
@@ -4690,6 +4694,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -5296,6 +5301,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -7905,6 +7912,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
index d44eb15a7968..83bf0d3bf1a0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
@@ -1700,6 +1700,7 @@ self: super: {
   "blank-canvas" = doDistribute super."blank-canvas_0_5";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
@@ -2511,6 +2512,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2658,6 +2660,7 @@ self: super: {
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -4672,6 +4675,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = doDistribute super."iconv_0_4_1_2";
   "ide-backend" = doDistribute super."ide-backend_0_9_0_8";
@@ -4687,6 +4691,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -5292,6 +5297,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -7897,6 +7904,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
index 40552297c79c..4216ef6fd628 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
@@ -1698,6 +1698,7 @@ self: super: {
   "blank-canvas" = doDistribute super."blank-canvas_0_5";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
@@ -2508,6 +2509,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2655,6 +2657,7 @@ self: super: {
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -4664,6 +4667,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = doDistribute super."iconv_0_4_1_2";
   "ide-backend" = doDistribute super."ide-backend_0_9_0_9";
@@ -4679,6 +4683,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -5283,6 +5288,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -7882,6 +7889,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
index 0af7c3b969a4..62bfee2192c1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
@@ -1639,6 +1639,7 @@ self: super: {
   "blank-canvas" = dontDistribute super."blank-canvas";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
@@ -2421,6 +2422,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2559,6 +2561,7 @@ self: super: {
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -3902,6 +3905,7 @@ self: super: {
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
+  "hedis" = doDistribute super."hedis_0_6_9";
   "hedis-config" = dontDistribute super."hedis-config";
   "hedis-monadic" = dontDistribute super."hedis-monadic";
   "hedis-pile" = dontDistribute super."hedis-pile";
@@ -4505,6 +4509,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
   "ide-backend" = doDistribute super."ide-backend_0_10_0";
@@ -4521,6 +4526,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -5083,6 +5089,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -6020,6 +6028,7 @@ self: super: {
   "pipes-text" = doDistribute super."pipes-text_0_0_0_16";
   "pipes-transduce" = dontDistribute super."pipes-transduce";
   "pipes-vector" = dontDistribute super."pipes-vector";
+  "pipes-wai" = doDistribute super."pipes-wai_3_0_2";
   "pipes-websockets" = dontDistribute super."pipes-websockets";
   "pipes-zeromq4" = dontDistribute super."pipes-zeromq4";
   "pipes-zlib" = dontDistribute super."pipes-zlib";
@@ -7583,6 +7592,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
index 4bd6d567ec80..49437d99d37c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
@@ -1638,6 +1638,7 @@ self: super: {
   "blank-canvas" = dontDistribute super."blank-canvas";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
@@ -2420,6 +2421,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2558,6 +2560,7 @@ self: super: {
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -3897,6 +3900,7 @@ self: super: {
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
+  "hedis" = doDistribute super."hedis_0_6_9";
   "hedis-config" = dontDistribute super."hedis-config";
   "hedis-monadic" = dontDistribute super."hedis-monadic";
   "hedis-pile" = dontDistribute super."hedis-pile";
@@ -4500,6 +4504,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
   "ide-backend" = doDistribute super."ide-backend_0_10_0";
@@ -4516,6 +4521,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -5078,6 +5084,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -6012,6 +6020,7 @@ self: super: {
   "pipes-text" = doDistribute super."pipes-text_0_0_0_16";
   "pipes-transduce" = dontDistribute super."pipes-transduce";
   "pipes-vector" = dontDistribute super."pipes-vector";
+  "pipes-wai" = doDistribute super."pipes-wai_3_0_2";
   "pipes-websockets" = dontDistribute super."pipes-websockets";
   "pipes-zeromq4" = dontDistribute super."pipes-zeromq4";
   "pipes-zlib" = dontDistribute super."pipes-zlib";
@@ -7574,6 +7583,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
index 4cef54bf6469..7d4b5306be2e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
@@ -1622,6 +1622,7 @@ self: super: {
   "blank-canvas" = dontDistribute super."blank-canvas";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
@@ -2391,6 +2392,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2523,6 +2525,7 @@ self: super: {
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -3842,6 +3845,7 @@ self: super: {
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
+  "hedis" = doDistribute super."hedis_0_6_9";
   "hedis-config" = dontDistribute super."hedis-config";
   "hedis-monadic" = dontDistribute super."hedis-monadic";
   "hedis-pile" = dontDistribute super."hedis-pile";
@@ -4441,6 +4445,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
   "ide-backend" = doDistribute super."ide-backend_0_10_0";
@@ -4457,6 +4462,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -5010,6 +5016,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -5930,6 +5938,7 @@ self: super: {
   "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
   "pipes-transduce" = dontDistribute super."pipes-transduce";
   "pipes-vector" = dontDistribute super."pipes-vector";
+  "pipes-wai" = doDistribute super."pipes-wai_3_0_2";
   "pipes-websockets" = dontDistribute super."pipes-websockets";
   "pipes-zeromq4" = dontDistribute super."pipes-zeromq4";
   "pipes-zlib" = dontDistribute super."pipes-zlib";
@@ -7463,6 +7472,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
index 4e201da38c34..da6193236e10 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
@@ -1621,6 +1621,7 @@ self: super: {
   "blank-canvas" = dontDistribute super."blank-canvas";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
@@ -2389,6 +2390,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2521,6 +2523,7 @@ self: super: {
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -3838,6 +3841,7 @@ self: super: {
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
+  "hedis" = doDistribute super."hedis_0_6_9";
   "hedis-config" = dontDistribute super."hedis-config";
   "hedis-monadic" = dontDistribute super."hedis-monadic";
   "hedis-pile" = dontDistribute super."hedis-pile";
@@ -4437,6 +4441,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
   "ide-backend" = doDistribute super."ide-backend_0_10_0";
@@ -4453,6 +4458,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -5006,6 +5012,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -5925,6 +5933,7 @@ self: super: {
   "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
   "pipes-transduce" = dontDistribute super."pipes-transduce";
   "pipes-vector" = dontDistribute super."pipes-vector";
+  "pipes-wai" = doDistribute super."pipes-wai_3_0_2";
   "pipes-websockets" = dontDistribute super."pipes-websockets";
   "pipes-zeromq4" = dontDistribute super."pipes-zeromq4";
   "pipes-zlib" = dontDistribute super."pipes-zlib";
@@ -7455,6 +7464,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
index d95b6917e149..93f1abf97d7f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
@@ -1620,6 +1620,7 @@ self: super: {
   "blank-canvas" = dontDistribute super."blank-canvas";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
@@ -2384,6 +2385,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2516,6 +2518,7 @@ self: super: {
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -3832,6 +3835,7 @@ self: super: {
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
+  "hedis" = doDistribute super."hedis_0_6_9";
   "hedis-config" = dontDistribute super."hedis-config";
   "hedis-monadic" = dontDistribute super."hedis-monadic";
   "hedis-pile" = dontDistribute super."hedis-pile";
@@ -4431,6 +4435,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
   "ide-backend" = doDistribute super."ide-backend_0_10_0";
@@ -4447,6 +4452,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -5000,6 +5006,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -5918,6 +5926,7 @@ self: super: {
   "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
   "pipes-transduce" = dontDistribute super."pipes-transduce";
   "pipes-vector" = dontDistribute super."pipes-vector";
+  "pipes-wai" = doDistribute super."pipes-wai_3_0_2";
   "pipes-websockets" = dontDistribute super."pipes-websockets";
   "pipes-zeromq4" = dontDistribute super."pipes-zeromq4";
   "pipes-zlib" = dontDistribute super."pipes-zlib";
@@ -7446,6 +7455,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
index 64200489735d..e5fc2efb7aab 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
@@ -1620,6 +1620,7 @@ self: super: {
   "blank-canvas" = dontDistribute super."blank-canvas";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
@@ -2384,6 +2385,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2516,6 +2518,7 @@ self: super: {
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -3832,6 +3835,7 @@ self: super: {
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
+  "hedis" = doDistribute super."hedis_0_6_9";
   "hedis-config" = dontDistribute super."hedis-config";
   "hedis-monadic" = dontDistribute super."hedis-monadic";
   "hedis-pile" = dontDistribute super."hedis-pile";
@@ -4430,6 +4434,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
   "ide-backend" = doDistribute super."ide-backend_0_10_0";
@@ -4446,6 +4451,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -4998,6 +5004,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -5915,6 +5923,7 @@ self: super: {
   "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
   "pipes-transduce" = dontDistribute super."pipes-transduce";
   "pipes-vector" = dontDistribute super."pipes-vector";
+  "pipes-wai" = doDistribute super."pipes-wai_3_0_2";
   "pipes-websockets" = dontDistribute super."pipes-websockets";
   "pipes-zeromq4" = dontDistribute super."pipes-zeromq4";
   "pipes-zlib" = dontDistribute super."pipes-zlib";
@@ -7442,6 +7451,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.14.nix b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
index f16bb4416569..57f2843d7e91 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
@@ -1618,6 +1618,7 @@ self: super: {
   "blank-canvas" = dontDistribute super."blank-canvas";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
@@ -2380,6 +2381,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2509,6 +2511,7 @@ self: super: {
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -3824,6 +3827,7 @@ self: super: {
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
+  "hedis" = doDistribute super."hedis_0_6_9";
   "hedis-config" = dontDistribute super."hedis-config";
   "hedis-monadic" = dontDistribute super."hedis-monadic";
   "hedis-pile" = dontDistribute super."hedis-pile";
@@ -4421,6 +4425,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
   "ide-backend" = doDistribute super."ide-backend_0_10_0";
@@ -4437,6 +4442,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -4989,6 +4995,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -5903,6 +5911,7 @@ self: super: {
   "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
   "pipes-transduce" = dontDistribute super."pipes-transduce";
   "pipes-vector" = dontDistribute super."pipes-vector";
+  "pipes-wai" = doDistribute super."pipes-wai_3_0_2";
   "pipes-websockets" = dontDistribute super."pipes-websockets";
   "pipes-zeromq4" = dontDistribute super."pipes-zeromq4";
   "pipes-zlib" = dontDistribute super."pipes-zlib";
@@ -7429,6 +7438,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.15.nix b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
index ef81b538f7aa..08599d5ebe15 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
@@ -1617,6 +1617,7 @@ self: super: {
   "blank-canvas" = dontDistribute super."blank-canvas";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
@@ -2379,6 +2380,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2508,6 +2510,7 @@ self: super: {
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -3821,6 +3824,7 @@ self: super: {
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
+  "hedis" = doDistribute super."hedis_0_6_9";
   "hedis-config" = dontDistribute super."hedis-config";
   "hedis-monadic" = dontDistribute super."hedis-monadic";
   "hedis-pile" = dontDistribute super."hedis-pile";
@@ -4416,6 +4420,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
   "ide-backend" = doDistribute super."ide-backend_0_10_0";
@@ -4432,6 +4437,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -4984,6 +4990,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -5897,6 +5905,7 @@ self: super: {
   "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
   "pipes-transduce" = dontDistribute super."pipes-transduce";
   "pipes-vector" = dontDistribute super."pipes-vector";
+  "pipes-wai" = doDistribute super."pipes-wai_3_0_2";
   "pipes-websockets" = dontDistribute super."pipes-websockets";
   "pipes-zeromq4" = dontDistribute super."pipes-zeromq4";
   "pipes-zlib" = dontDistribute super."pipes-zlib";
@@ -7420,6 +7429,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.16.nix b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
index 6107d70bea98..d827948f546d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
@@ -1615,6 +1615,7 @@ self: super: {
   "blank-canvas" = dontDistribute super."blank-canvas";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
@@ -2377,6 +2378,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2506,6 +2508,7 @@ self: super: {
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -3817,6 +3820,7 @@ self: super: {
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
+  "hedis" = doDistribute super."hedis_0_6_9";
   "hedis-config" = dontDistribute super."hedis-config";
   "hedis-monadic" = dontDistribute super."hedis-monadic";
   "hedis-pile" = dontDistribute super."hedis-pile";
@@ -4412,6 +4416,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
   "ide-backend" = doDistribute super."ide-backend_0_10_0";
@@ -4428,6 +4433,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -4978,6 +4984,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -5889,6 +5897,7 @@ self: super: {
   "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
   "pipes-transduce" = dontDistribute super."pipes-transduce";
   "pipes-vector" = dontDistribute super."pipes-vector";
+  "pipes-wai" = doDistribute super."pipes-wai_3_0_2";
   "pipes-websockets" = dontDistribute super."pipes-websockets";
   "pipes-zeromq4" = dontDistribute super."pipes-zeromq4";
   "pipes-zlib" = dontDistribute super."pipes-zlib";
@@ -7405,6 +7414,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.17.nix b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
index 09c90d440592..55953cce45aa 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
@@ -1141,6 +1141,7 @@ self: super: {
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
   "alea" = dontDistribute super."alea";
+  "alex" = doDistribute super."alex_3_1_6";
   "alex-meta" = dontDistribute super."alex-meta";
   "alfred" = dontDistribute super."alfred";
   "alga" = dontDistribute super."alga";
@@ -1612,6 +1613,7 @@ self: super: {
   "blank-canvas" = dontDistribute super."blank-canvas";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
@@ -2371,6 +2373,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2499,6 +2502,7 @@ self: super: {
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -3809,6 +3813,7 @@ self: super: {
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
+  "hedis" = doDistribute super."hedis_0_6_9";
   "hedis-config" = dontDistribute super."hedis-config";
   "hedis-monadic" = dontDistribute super."hedis-monadic";
   "hedis-pile" = dontDistribute super."hedis-pile";
@@ -4404,6 +4409,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
   "ide-backend" = doDistribute super."ide-backend_0_10_0";
@@ -4420,6 +4426,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -4969,6 +4976,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -5877,6 +5886,7 @@ self: super: {
   "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
   "pipes-transduce" = dontDistribute super."pipes-transduce";
   "pipes-vector" = dontDistribute super."pipes-vector";
+  "pipes-wai" = doDistribute super."pipes-wai_3_0_2";
   "pipes-websockets" = dontDistribute super."pipes-websockets";
   "pipes-zeromq4" = dontDistribute super."pipes-zeromq4";
   "pipes-zlib" = dontDistribute super."pipes-zlib";
@@ -7391,6 +7401,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
@@ -8090,6 +8101,7 @@ self: super: {
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_5";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
   "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.18.nix b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
index 66c56d550d64..c669e7f0dffa 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
@@ -1613,6 +1613,7 @@ self: super: {
   "blank-canvas" = dontDistribute super."blank-canvas";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
@@ -2371,6 +2372,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2499,6 +2501,7 @@ self: super: {
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -3804,6 +3807,7 @@ self: super: {
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
+  "hedis" = doDistribute super."hedis_0_6_9";
   "hedis-config" = dontDistribute super."hedis-config";
   "hedis-monadic" = dontDistribute super."hedis-monadic";
   "hedis-pile" = dontDistribute super."hedis-pile";
@@ -4395,6 +4399,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
   "ide-backend" = doDistribute super."ide-backend_0_10_0";
@@ -4411,6 +4416,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -4960,6 +4966,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -5866,6 +5874,7 @@ self: super: {
   "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
   "pipes-transduce" = dontDistribute super."pipes-transduce";
   "pipes-vector" = dontDistribute super."pipes-vector";
+  "pipes-wai" = doDistribute super."pipes-wai_3_0_2";
   "pipes-websockets" = dontDistribute super."pipes-websockets";
   "pipes-zeromq4" = dontDistribute super."pipes-zeromq4";
   "pipes-zlib" = dontDistribute super."pipes-zlib";
@@ -7376,6 +7385,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
@@ -8072,6 +8082,7 @@ self: super: {
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_5";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
   "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.19.nix b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
index 9cacb96449be..356ff9ca35f8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
@@ -1609,6 +1609,7 @@ self: super: {
   "blank-canvas" = dontDistribute super."blank-canvas";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
@@ -2364,6 +2365,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2492,6 +2494,7 @@ self: super: {
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -3797,6 +3800,7 @@ self: super: {
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
+  "hedis" = doDistribute super."hedis_0_6_9";
   "hedis-config" = dontDistribute super."hedis-config";
   "hedis-monadic" = dontDistribute super."hedis-monadic";
   "hedis-pile" = dontDistribute super."hedis-pile";
@@ -4385,6 +4389,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
   "ide-backend" = doDistribute super."ide-backend_0_10_0";
@@ -4401,6 +4406,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -4948,6 +4954,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -5851,6 +5859,7 @@ self: super: {
   "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
   "pipes-transduce" = dontDistribute super."pipes-transduce";
   "pipes-vector" = dontDistribute super."pipes-vector";
+  "pipes-wai" = doDistribute super."pipes-wai_3_0_2";
   "pipes-websockets" = dontDistribute super."pipes-websockets";
   "pipes-zeromq4" = dontDistribute super."pipes-zeromq4";
   "pipes-zlib" = dontDistribute super."pipes-zlib";
@@ -7359,6 +7368,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
@@ -8054,6 +8064,7 @@ self: super: {
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_5";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
   "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
index 96733e42ddbf..1306fd9aff69 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
@@ -1635,6 +1635,7 @@ self: super: {
   "blank-canvas" = dontDistribute super."blank-canvas";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
@@ -2417,6 +2418,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2555,6 +2557,7 @@ self: super: {
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -3892,6 +3895,7 @@ self: super: {
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
+  "hedis" = doDistribute super."hedis_0_6_9";
   "hedis-config" = dontDistribute super."hedis-config";
   "hedis-monadic" = dontDistribute super."hedis-monadic";
   "hedis-pile" = dontDistribute super."hedis-pile";
@@ -4495,6 +4499,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
   "ide-backend" = doDistribute super."ide-backend_0_10_0";
@@ -4511,6 +4516,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -5071,6 +5077,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -6004,6 +6012,7 @@ self: super: {
   "pipes-text" = doDistribute super."pipes-text_0_0_0_16";
   "pipes-transduce" = dontDistribute super."pipes-transduce";
   "pipes-vector" = dontDistribute super."pipes-vector";
+  "pipes-wai" = doDistribute super."pipes-wai_3_0_2";
   "pipes-websockets" = dontDistribute super."pipes-websockets";
   "pipes-zeromq4" = dontDistribute super."pipes-zeromq4";
   "pipes-zlib" = dontDistribute super."pipes-zlib";
@@ -7560,6 +7569,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.20.nix b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
index 18f0928f74e3..e0593aaee47d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
@@ -1605,6 +1605,7 @@ self: super: {
   "blank-canvas" = dontDistribute super."blank-canvas";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
@@ -2359,6 +2360,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2487,6 +2489,7 @@ self: super: {
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -3792,6 +3795,7 @@ self: super: {
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
+  "hedis" = doDistribute super."hedis_0_6_9";
   "hedis-config" = dontDistribute super."hedis-config";
   "hedis-monadic" = dontDistribute super."hedis-monadic";
   "hedis-pile" = dontDistribute super."hedis-pile";
@@ -4379,6 +4383,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
   "ide-backend" = doDistribute super."ide-backend_0_10_0";
@@ -4395,6 +4400,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -4941,6 +4947,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -5843,6 +5851,7 @@ self: super: {
   "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
   "pipes-transduce" = dontDistribute super."pipes-transduce";
   "pipes-vector" = dontDistribute super."pipes-vector";
+  "pipes-wai" = doDistribute super."pipes-wai_3_0_2";
   "pipes-websockets" = dontDistribute super."pipes-websockets";
   "pipes-zeromq4" = dontDistribute super."pipes-zeromq4";
   "pipes-zlib" = dontDistribute super."pipes-zlib";
@@ -7142,6 +7151,7 @@ self: super: {
   "taglib" = dontDistribute super."taglib";
   "taglib-api" = dontDistribute super."taglib-api";
   "tagset-positional" = dontDistribute super."tagset-positional";
+  "tagsoup" = doDistribute super."tagsoup_0_13_6";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "takahashi" = dontDistribute super."takahashi";
@@ -7347,6 +7357,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
@@ -8040,6 +8051,7 @@ self: super: {
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_5";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
   "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.21.nix b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
index 2ceacb6ee4e4..fb139d4980c9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
@@ -1603,6 +1603,7 @@ self: super: {
   "blank-canvas" = dontDistribute super."blank-canvas";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
@@ -2354,6 +2355,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2482,6 +2484,7 @@ self: super: {
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -2811,6 +2814,7 @@ self: super: {
   "fdo-trash" = dontDistribute super."fdo-trash";
   "fec" = dontDistribute super."fec";
   "fedora-packages" = dontDistribute super."fedora-packages";
+  "feed" = doDistribute super."feed_0_3_10_4";
   "feed-cli" = dontDistribute super."feed-cli";
   "feed-collect" = dontDistribute super."feed-collect";
   "feed-crawl" = dontDistribute super."feed-crawl";
@@ -3783,6 +3787,7 @@ self: super: {
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
+  "hedis" = doDistribute super."hedis_0_6_9";
   "hedis-config" = dontDistribute super."hedis-config";
   "hedis-monadic" = dontDistribute super."hedis-monadic";
   "hedis-pile" = dontDistribute super."hedis-pile";
@@ -4370,6 +4375,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
   "ideas" = dontDistribute super."ideas";
@@ -4383,6 +4389,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -4438,6 +4445,7 @@ self: super: {
   "inflist" = dontDistribute super."inflist";
   "influxdb" = dontDistribute super."influxdb";
   "informative" = dontDistribute super."informative";
+  "ini" = doDistribute super."ini_0_3_3";
   "inilist" = dontDistribute super."inilist";
   "inject" = dontDistribute super."inject";
   "inject-function" = dontDistribute super."inject-function";
@@ -4477,6 +4485,7 @@ self: super: {
   "io-reactive" = dontDistribute super."io-reactive";
   "io-region" = dontDistribute super."io-region";
   "io-storage" = dontDistribute super."io-storage";
+  "io-streams" = doDistribute super."io-streams_1_3_4_0";
   "io-streams-http" = dontDistribute super."io-streams-http";
   "io-throttle" = dontDistribute super."io-throttle";
   "ioctl" = dontDistribute super."ioctl";
@@ -4927,6 +4936,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -5826,6 +5837,7 @@ self: super: {
   "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
   "pipes-transduce" = dontDistribute super."pipes-transduce";
   "pipes-vector" = dontDistribute super."pipes-vector";
+  "pipes-wai" = doDistribute super."pipes-wai_3_0_2";
   "pipes-websockets" = dontDistribute super."pipes-websockets";
   "pipes-zeromq4" = dontDistribute super."pipes-zeromq4";
   "pipes-zlib" = dontDistribute super."pipes-zlib";
@@ -7113,6 +7125,7 @@ self: super: {
   "taglib" = dontDistribute super."taglib";
   "taglib-api" = dontDistribute super."taglib-api";
   "tagset-positional" = dontDistribute super."tagset-positional";
+  "tagsoup" = doDistribute super."tagsoup_0_13_6";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "takahashi" = dontDistribute super."takahashi";
@@ -7318,6 +7331,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
@@ -8004,6 +8018,7 @@ self: super: {
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
   "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
   "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_5";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
   "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.22.nix b/pkgs/development/haskell-modules/configuration-lts-3.22.nix
new file mode 100644
index 000000000000..44851fd0f8be
--- /dev/null
+++ b/pkgs/development/haskell-modules/configuration-lts-3.22.nix
@@ -0,0 +1,8131 @@
+{ pkgs }:
+
+with import ./lib.nix { inherit pkgs; };
+
+self: super: {
+
+  # core libraries provided by the compiler
+  Cabal = null;
+  array = null;
+  base = null;
+  bin-package-db = null;
+  binary = null;
+  bytestring = null;
+  containers = null;
+  deepseq = null;
+  directory = null;
+  filepath = null;
+  ghc-prim = null;
+  hoopl = null;
+  hpc = null;
+  integer-gmp = null;
+  pretty = null;
+  process = null;
+  rts = null;
+  template-haskell = null;
+  time = null;
+  transformers = null;
+  unix = null;
+
+  # lts-3.22 packages
+  "3d-graphics-examples" = dontDistribute super."3d-graphics-examples";
+  "3dmodels" = dontDistribute super."3dmodels";
+  "4Blocks" = dontDistribute super."4Blocks";
+  "AAI" = dontDistribute super."AAI";
+  "ABList" = dontDistribute super."ABList";
+  "AC-Angle" = dontDistribute super."AC-Angle";
+  "AC-Boolean" = dontDistribute super."AC-Boolean";
+  "AC-BuildPlatform" = dontDistribute super."AC-BuildPlatform";
+  "AC-Colour" = dontDistribute super."AC-Colour";
+  "AC-EasyRaster-GTK" = dontDistribute super."AC-EasyRaster-GTK";
+  "AC-HalfInteger" = dontDistribute super."AC-HalfInteger";
+  "AC-MiniTest" = dontDistribute super."AC-MiniTest";
+  "AC-PPM" = dontDistribute super."AC-PPM";
+  "AC-Random" = dontDistribute super."AC-Random";
+  "AC-Terminal" = dontDistribute super."AC-Terminal";
+  "AC-VanillaArray" = dontDistribute super."AC-VanillaArray";
+  "AC-Vector-Fancy" = dontDistribute super."AC-Vector-Fancy";
+  "ACME" = dontDistribute super."ACME";
+  "ADPfusion" = dontDistribute super."ADPfusion";
+  "AERN-Basics" = dontDistribute super."AERN-Basics";
+  "AERN-Net" = dontDistribute super."AERN-Net";
+  "AERN-Real" = dontDistribute super."AERN-Real";
+  "AERN-Real-Double" = dontDistribute super."AERN-Real-Double";
+  "AERN-Real-Interval" = dontDistribute super."AERN-Real-Interval";
+  "AERN-RnToRm" = dontDistribute super."AERN-RnToRm";
+  "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot";
+  "AES" = dontDistribute super."AES";
+  "AGI" = dontDistribute super."AGI";
+  "ALUT" = dontDistribute super."ALUT";
+  "AMI" = dontDistribute super."AMI";
+  "ANum" = dontDistribute super."ANum";
+  "ASN1" = dontDistribute super."ASN1";
+  "AVar" = dontDistribute super."AVar";
+  "AWin32Console" = dontDistribute super."AWin32Console";
+  "AbortT-monadstf" = dontDistribute super."AbortT-monadstf";
+  "AbortT-mtl" = dontDistribute super."AbortT-mtl";
+  "AbortT-transformers" = dontDistribute super."AbortT-transformers";
+  "ActionKid" = dontDistribute super."ActionKid";
+  "Adaptive" = dontDistribute super."Adaptive";
+  "Adaptive-Blaisorblade" = dontDistribute super."Adaptive-Blaisorblade";
+  "Advgame" = dontDistribute super."Advgame";
+  "AesonBson" = dontDistribute super."AesonBson";
+  "Agata" = dontDistribute super."Agata";
+  "Agda-executable" = dontDistribute super."Agda-executable";
+  "AhoCorasick" = dontDistribute super."AhoCorasick";
+  "AlgorithmW" = dontDistribute super."AlgorithmW";
+  "AlignmentAlgorithms" = dontDistribute super."AlignmentAlgorithms";
+  "Allure" = dontDistribute super."Allure";
+  "AndroidViewHierarchyImporter" = dontDistribute super."AndroidViewHierarchyImporter";
+  "Animas" = dontDistribute super."Animas";
+  "Annotations" = dontDistribute super."Annotations";
+  "Ansi2Html" = dontDistribute super."Ansi2Html";
+  "ApplePush" = dontDistribute super."ApplePush";
+  "AppleScript" = dontDistribute super."AppleScript";
+  "ApproxFun-hs" = dontDistribute super."ApproxFun-hs";
+  "ArrayRef" = dontDistribute super."ArrayRef";
+  "ArrowVHDL" = dontDistribute super."ArrowVHDL";
+  "AspectAG" = dontDistribute super."AspectAG";
+  "AttoBencode" = dontDistribute super."AttoBencode";
+  "AttoJson" = dontDistribute super."AttoJson";
+  "Attrac" = dontDistribute super."Attrac";
+  "Aurochs" = dontDistribute super."Aurochs";
+  "AutoForms" = dontDistribute super."AutoForms";
+  "AvlTree" = dontDistribute super."AvlTree";
+  "BASIC" = dontDistribute super."BASIC";
+  "BCMtools" = dontDistribute super."BCMtools";
+  "BNFC" = dontDistribute super."BNFC";
+  "BNFC-meta" = dontDistribute super."BNFC-meta";
+  "Baggins" = dontDistribute super."Baggins";
+  "Bang" = dontDistribute super."Bang";
+  "Barracuda" = dontDistribute super."Barracuda";
+  "Befunge93" = dontDistribute super."Befunge93";
+  "BenchmarkHistory" = dontDistribute super."BenchmarkHistory";
+  "BerkeleyDB" = dontDistribute super."BerkeleyDB";
+  "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML";
+  "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm";
+  "BigPixel" = dontDistribute super."BigPixel";
+  "Binpack" = dontDistribute super."Binpack";
+  "Biobase" = dontDistribute super."Biobase";
+  "BiobaseBlast" = dontDistribute super."BiobaseBlast";
+  "BiobaseDotP" = dontDistribute super."BiobaseDotP";
+  "BiobaseFR3D" = dontDistribute super."BiobaseFR3D";
+  "BiobaseFasta" = dontDistribute super."BiobaseFasta";
+  "BiobaseInfernal" = dontDistribute super."BiobaseInfernal";
+  "BiobaseMAF" = dontDistribute super."BiobaseMAF";
+  "BiobaseTrainingData" = dontDistribute super."BiobaseTrainingData";
+  "BiobaseTurner" = dontDistribute super."BiobaseTurner";
+  "BiobaseTypes" = dontDistribute super."BiobaseTypes";
+  "BiobaseVienna" = dontDistribute super."BiobaseVienna";
+  "BiobaseXNA" = dontDistribute super."BiobaseXNA";
+  "BirdPP" = dontDistribute super."BirdPP";
+  "BitSyntax" = dontDistribute super."BitSyntax";
+  "Bitly" = dontDistribute super."Bitly";
+  "Blobs" = dontDistribute super."Blobs";
+  "BluePrintCSS" = dontDistribute super."BluePrintCSS";
+  "Blueprint" = dontDistribute super."Blueprint";
+  "Bookshelf" = dontDistribute super."Bookshelf";
+  "Bravo" = dontDistribute super."Bravo";
+  "BufferedSocket" = dontDistribute super."BufferedSocket";
+  "Buster" = dontDistribute super."Buster";
+  "CBOR" = dontDistribute super."CBOR";
+  "CC-delcont" = dontDistribute super."CC-delcont";
+  "CC-delcont-alt" = dontDistribute super."CC-delcont-alt";
+  "CC-delcont-cxe" = dontDistribute super."CC-delcont-cxe";
+  "CC-delcont-exc" = dontDistribute super."CC-delcont-exc";
+  "CC-delcont-ref" = dontDistribute super."CC-delcont-ref";
+  "CC-delcont-ref-tf" = dontDistribute super."CC-delcont-ref-tf";
+  "CCA" = dontDistribute super."CCA";
+  "CHXHtml" = dontDistribute super."CHXHtml";
+  "CLASE" = dontDistribute super."CLASE";
+  "CLI" = dontDistribute super."CLI";
+  "CMCompare" = dontDistribute super."CMCompare";
+  "CMQ" = dontDistribute super."CMQ";
+  "COrdering" = dontDistribute super."COrdering";
+  "CPBrainfuck" = dontDistribute super."CPBrainfuck";
+  "CPL" = dontDistribute super."CPL";
+  "CSPM-CoreLanguage" = dontDistribute super."CSPM-CoreLanguage";
+  "CSPM-FiringRules" = dontDistribute super."CSPM-FiringRules";
+  "CSPM-Frontend" = dontDistribute super."CSPM-Frontend";
+  "CSPM-Interpreter" = dontDistribute super."CSPM-Interpreter";
+  "CSPM-ToProlog" = dontDistribute super."CSPM-ToProlog";
+  "CSPM-cspm" = dontDistribute super."CSPM-cspm";
+  "CTRex" = dontDistribute super."CTRex";
+  "CV" = dontDistribute super."CV";
+  "CabalSearch" = dontDistribute super."CabalSearch";
+  "Capabilities" = dontDistribute super."Capabilities";
+  "Cardinality" = dontDistribute super."Cardinality";
+  "CarneadesDSL" = dontDistribute super."CarneadesDSL";
+  "CarneadesIntoDung" = dontDistribute super."CarneadesIntoDung";
+  "Cartesian" = dontDistribute super."Cartesian";
+  "Cascade" = dontDistribute super."Cascade";
+  "Catana" = dontDistribute super."Catana";
+  "Chart-gtk" = dontDistribute super."Chart-gtk";
+  "Chart-simple" = dontDistribute super."Chart-simple";
+  "CheatSheet" = dontDistribute super."CheatSheet";
+  "Checked" = dontDistribute super."Checked";
+  "Chitra" = dontDistribute super."Chitra";
+  "ChristmasTree" = dontDistribute super."ChristmasTree";
+  "CirruParser" = dontDistribute super."CirruParser";
+  "ClassLaws" = dontDistribute super."ClassLaws";
+  "ClassyPrelude" = dontDistribute super."ClassyPrelude";
+  "Clean" = dontDistribute super."Clean";
+  "Clipboard" = dontDistribute super."Clipboard";
+  "ClustalParser" = dontDistribute super."ClustalParser";
+  "Coadjute" = dontDistribute super."Coadjute";
+  "Codec-Compression-LZF" = dontDistribute super."Codec-Compression-LZF";
+  "Codec-Image-DevIL" = dontDistribute super."Codec-Image-DevIL";
+  "Combinatorrent" = dontDistribute super."Combinatorrent";
+  "Command" = dontDistribute super."Command";
+  "Commando" = dontDistribute super."Commando";
+  "ComonadSheet" = dontDistribute super."ComonadSheet";
+  "ConcurrentUtils" = dontDistribute super."ConcurrentUtils";
+  "Concurrential" = dontDistribute super."Concurrential";
+  "Condor" = dontDistribute super."Condor";
+  "ConfigFileTH" = dontDistribute super."ConfigFileTH";
+  "Configger" = dontDistribute super."Configger";
+  "Configurable" = dontDistribute super."Configurable";
+  "ConsStream" = dontDistribute super."ConsStream";
+  "Conscript" = dontDistribute super."Conscript";
+  "ConstraintKinds" = dontDistribute super."ConstraintKinds";
+  "Consumer" = dontDistribute super."Consumer";
+  "ContArrow" = dontDistribute super."ContArrow";
+  "ContextAlgebra" = dontDistribute super."ContextAlgebra";
+  "Contract" = dontDistribute super."Contract";
+  "Control-Engine" = dontDistribute super."Control-Engine";
+  "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass";
+  "Control-Monad-ST2" = dontDistribute super."Control-Monad-ST2";
+  "CoreDump" = dontDistribute super."CoreDump";
+  "CoreErlang" = dontDistribute super."CoreErlang";
+  "CoreFoundation" = dontDistribute super."CoreFoundation";
+  "Coroutine" = dontDistribute super."Coroutine";
+  "CouchDB" = dontDistribute super."CouchDB";
+  "Craft3e" = dontDistribute super."Craft3e";
+  "Crypto" = dontDistribute super."Crypto";
+  "CurryDB" = dontDistribute super."CurryDB";
+  "DAG-Tournament" = dontDistribute super."DAG-Tournament";
+  "DAV" = doDistribute super."DAV_1_0_7";
+  "DBlimited" = dontDistribute super."DBlimited";
+  "DBus" = dontDistribute super."DBus";
+  "DCFL" = dontDistribute super."DCFL";
+  "DMuCheck" = dontDistribute super."DMuCheck";
+  "DOM" = dontDistribute super."DOM";
+  "DP" = dontDistribute super."DP";
+  "DPM" = dontDistribute super."DPM";
+  "DSA" = dontDistribute super."DSA";
+  "DSH" = dontDistribute super."DSH";
+  "DSTM" = dontDistribute super."DSTM";
+  "DTC" = dontDistribute super."DTC";
+  "Dangerous" = dontDistribute super."Dangerous";
+  "Dao" = dontDistribute super."Dao";
+  "DarcsHelpers" = dontDistribute super."DarcsHelpers";
+  "Data-Hash-Consistent" = dontDistribute super."Data-Hash-Consistent";
+  "Data-Rope" = dontDistribute super."Data-Rope";
+  "DataTreeView" = dontDistribute super."DataTreeView";
+  "Deadpan-DDP" = dontDistribute super."Deadpan-DDP";
+  "DebugTraceHelpers" = dontDistribute super."DebugTraceHelpers";
+  "DecisionTree" = dontDistribute super."DecisionTree";
+  "DeepArrow" = dontDistribute super."DeepArrow";
+  "DefendTheKing" = dontDistribute super."DefendTheKing";
+  "DescriptiveKeys" = dontDistribute super."DescriptiveKeys";
+  "Dflow" = dontDistribute super."Dflow";
+  "DifferenceLogic" = dontDistribute super."DifferenceLogic";
+  "DifferentialEvolution" = dontDistribute super."DifferentialEvolution";
+  "Digit" = dontDistribute super."Digit";
+  "DigitalOcean" = dontDistribute super."DigitalOcean";
+  "DimensionalHash" = dontDistribute super."DimensionalHash";
+  "DirectSound" = dontDistribute super."DirectSound";
+  "DisTract" = dontDistribute super."DisTract";
+  "DiscussionSupportSystem" = dontDistribute super."DiscussionSupportSystem";
+  "Dish" = dontDistribute super."Dish";
+  "Dist" = dontDistribute super."Dist";
+  "DistanceTransform" = dontDistribute super."DistanceTransform";
+  "DistanceUnits" = dontDistribute super."DistanceUnits";
+  "DnaProteinAlignment" = dontDistribute super."DnaProteinAlignment";
+  "DocTest" = dontDistribute super."DocTest";
+  "Docs" = dontDistribute super."Docs";
+  "DrHylo" = dontDistribute super."DrHylo";
+  "DrIFT" = dontDistribute super."DrIFT";
+  "DrIFT-cabalized" = dontDistribute super."DrIFT-cabalized";
+  "Dung" = dontDistribute super."Dung";
+  "Dust" = dontDistribute super."Dust";
+  "Dust-crypto" = dontDistribute super."Dust-crypto";
+  "Dust-tools" = dontDistribute super."Dust-tools";
+  "Dust-tools-pcap" = dontDistribute super."Dust-tools-pcap";
+  "DynamicTimeWarp" = dontDistribute super."DynamicTimeWarp";
+  "DysFRP" = dontDistribute super."DysFRP";
+  "DysFRP-Cairo" = dontDistribute super."DysFRP-Cairo";
+  "DysFRP-Craftwerk" = dontDistribute super."DysFRP-Craftwerk";
+  "EEConfig" = dontDistribute super."EEConfig";
+  "Earley" = doDistribute super."Earley_0_9_0";
+  "Ebnf2ps" = dontDistribute super."Ebnf2ps";
+  "EdisonAPI" = dontDistribute super."EdisonAPI";
+  "EdisonCore" = dontDistribute super."EdisonCore";
+  "EditTimeReport" = dontDistribute super."EditTimeReport";
+  "EitherT" = dontDistribute super."EitherT";
+  "Elm" = dontDistribute super."Elm";
+  "Emping" = dontDistribute super."Emping";
+  "Encode" = dontDistribute super."Encode";
+  "EntrezHTTP" = dontDistribute super."EntrezHTTP";
+  "EnumContainers" = dontDistribute super."EnumContainers";
+  "EnumMap" = dontDistribute super."EnumMap";
+  "Eq" = dontDistribute super."Eq";
+  "EqualitySolver" = dontDistribute super."EqualitySolver";
+  "EsounD" = dontDistribute super."EsounD";
+  "EstProgress" = dontDistribute super."EstProgress";
+  "EtaMOO" = dontDistribute super."EtaMOO";
+  "Etage" = dontDistribute super."Etage";
+  "Etage-Graph" = dontDistribute super."Etage-Graph";
+  "Eternal10Seconds" = dontDistribute super."Eternal10Seconds";
+  "Etherbunny" = dontDistribute super."Etherbunny";
+  "EuroIT" = dontDistribute super."EuroIT";
+  "Euterpea" = dontDistribute super."Euterpea";
+  "EventSocket" = dontDistribute super."EventSocket";
+  "Extra" = dontDistribute super."Extra";
+  "FComp" = dontDistribute super."FComp";
+  "FM-SBLEX" = dontDistribute super."FM-SBLEX";
+  "FModExRaw" = dontDistribute super."FModExRaw";
+  "FPretty" = dontDistribute super."FPretty";
+  "FTGL" = dontDistribute super."FTGL";
+  "FTGL-bytestring" = dontDistribute super."FTGL-bytestring";
+  "FTPLine" = dontDistribute super."FTPLine";
+  "Facts" = dontDistribute super."Facts";
+  "FailureT" = dontDistribute super."FailureT";
+  "FastxPipe" = dontDistribute super."FastxPipe";
+  "FermatsLastMargin" = dontDistribute super."FermatsLastMargin";
+  "FerryCore" = dontDistribute super."FerryCore";
+  "Feval" = dontDistribute super."Feval";
+  "FieldTrip" = dontDistribute super."FieldTrip";
+  "FileManip" = dontDistribute super."FileManip";
+  "FileManipCompat" = dontDistribute super."FileManipCompat";
+  "FilePather" = dontDistribute super."FilePather";
+  "FileSystem" = dontDistribute super."FileSystem";
+  "Finance-Quote-Yahoo" = dontDistribute super."Finance-Quote-Yahoo";
+  "Finance-Treasury" = dontDistribute super."Finance-Treasury";
+  "FindBin" = dontDistribute super."FindBin";
+  "FiniteMap" = dontDistribute super."FiniteMap";
+  "FirstOrderTheory" = dontDistribute super."FirstOrderTheory";
+  "FixedPoint-simple" = dontDistribute super."FixedPoint-simple";
+  "Flippi" = dontDistribute super."Flippi";
+  "Focus" = dontDistribute super."Focus";
+  "Folly" = dontDistribute super."Folly";
+  "ForSyDe" = dontDistribute super."ForSyDe";
+  "ForkableT" = dontDistribute super."ForkableT";
+  "FormalGrammars" = dontDistribute super."FormalGrammars";
+  "Foster" = dontDistribute super."Foster";
+  "FpMLv53" = dontDistribute super."FpMLv53";
+  "FractalArt" = dontDistribute super."FractalArt";
+  "Fractaler" = dontDistribute super."Fractaler";
+  "Frames" = dontDistribute super."Frames";
+  "Frank" = dontDistribute super."Frank";
+  "FreeTypeGL" = dontDistribute super."FreeTypeGL";
+  "FunGEn" = dontDistribute super."FunGEn";
+  "Fungi" = dontDistribute super."Fungi";
+  "GA" = dontDistribute super."GA";
+  "GGg" = dontDistribute super."GGg";
+  "GHood" = dontDistribute super."GHood";
+  "GLFW" = dontDistribute super."GLFW";
+  "GLFW-OGL" = dontDistribute super."GLFW-OGL";
+  "GLFW-b" = dontDistribute super."GLFW-b";
+  "GLFW-b-demo" = dontDistribute super."GLFW-b-demo";
+  "GLFW-task" = dontDistribute super."GLFW-task";
+  "GLHUI" = dontDistribute super."GLHUI";
+  "GLM" = dontDistribute super."GLM";
+  "GLMatrix" = dontDistribute super."GLMatrix";
+  "GLURaw" = dontDistribute super."GLURaw";
+  "GLUT" = dontDistribute super."GLUT";
+  "GLUtil" = dontDistribute super."GLUtil";
+  "GPX" = dontDistribute super."GPX";
+  "GPipe" = dontDistribute super."GPipe";
+  "GPipe-Collada" = dontDistribute super."GPipe-Collada";
+  "GPipe-Examples" = dontDistribute super."GPipe-Examples";
+  "GPipe-GLFW" = dontDistribute super."GPipe-GLFW";
+  "GPipe-TextureLoad" = dontDistribute super."GPipe-TextureLoad";
+  "GTALib" = dontDistribute super."GTALib";
+  "Gamgine" = dontDistribute super."Gamgine";
+  "Ganymede" = dontDistribute super."Ganymede";
+  "GaussQuadIntegration" = dontDistribute super."GaussQuadIntegration";
+  "GeBoP" = dontDistribute super."GeBoP";
+  "GenI" = dontDistribute super."GenI";
+  "GenSmsPdu" = dontDistribute super."GenSmsPdu";
+  "Genbank" = dontDistribute super."Genbank";
+  "GeneralTicTacToe" = dontDistribute super."GeneralTicTacToe";
+  "GenussFold" = dontDistribute super."GenussFold";
+  "GeoIp" = dontDistribute super."GeoIp";
+  "GeocoderOpenCage" = dontDistribute super."GeocoderOpenCage";
+  "Geodetic" = dontDistribute super."Geodetic";
+  "GeomPredicates" = dontDistribute super."GeomPredicates";
+  "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE";
+  "GiST" = dontDistribute super."GiST";
+  "GiveYouAHead" = dontDistribute super."GiveYouAHead";
+  "GlomeTrace" = dontDistribute super."GlomeTrace";
+  "GlomeVec" = dontDistribute super."GlomeVec";
+  "GlomeView" = dontDistribute super."GlomeView";
+  "GoogleChart" = dontDistribute super."GoogleChart";
+  "GoogleDirections" = dontDistribute super."GoogleDirections";
+  "GoogleSB" = dontDistribute super."GoogleSB";
+  "GoogleSuggest" = dontDistribute super."GoogleSuggest";
+  "GoogleTranslate" = dontDistribute super."GoogleTranslate";
+  "GotoT-transformers" = dontDistribute super."GotoT-transformers";
+  "GrammarProducts" = dontDistribute super."GrammarProducts";
+  "Graph500" = dontDistribute super."Graph500";
+  "GraphHammer" = dontDistribute super."GraphHammer";
+  "GraphHammer-examples" = dontDistribute super."GraphHammer-examples";
+  "Graphalyze" = dontDistribute super."Graphalyze";
+  "Grempa" = dontDistribute super."Grempa";
+  "GroteTrap" = dontDistribute super."GroteTrap";
+  "Grow" = dontDistribute super."Grow";
+  "GrowlNotify" = dontDistribute super."GrowlNotify";
+  "Gtk2hsGenerics" = dontDistribute super."Gtk2hsGenerics";
+  "GtkGLTV" = dontDistribute super."GtkGLTV";
+  "GtkTV" = dontDistribute super."GtkTV";
+  "GuiHaskell" = dontDistribute super."GuiHaskell";
+  "GuiTV" = dontDistribute super."GuiTV";
+  "H" = dontDistribute super."H";
+  "HARM" = dontDistribute super."HARM";
+  "HAppS-Data" = dontDistribute super."HAppS-Data";
+  "HAppS-IxSet" = dontDistribute super."HAppS-IxSet";
+  "HAppS-Server" = dontDistribute super."HAppS-Server";
+  "HAppS-State" = dontDistribute super."HAppS-State";
+  "HAppS-Util" = dontDistribute super."HAppS-Util";
+  "HAppSHelpers" = dontDistribute super."HAppSHelpers";
+  "HCL" = dontDistribute super."HCL";
+  "HCard" = dontDistribute super."HCard";
+  "HDBC" = dontDistribute super."HDBC";
+  "HDBC-mysql" = dontDistribute super."HDBC-mysql";
+  "HDBC-odbc" = dontDistribute super."HDBC-odbc";
+  "HDBC-postgresql" = dontDistribute super."HDBC-postgresql";
+  "HDBC-postgresql-hstore" = dontDistribute super."HDBC-postgresql-hstore";
+  "HDBC-session" = dontDistribute super."HDBC-session";
+  "HDBC-sqlite3" = dontDistribute super."HDBC-sqlite3";
+  "HDRUtils" = dontDistribute super."HDRUtils";
+  "HERA" = dontDistribute super."HERA";
+  "HFrequencyQueue" = dontDistribute super."HFrequencyQueue";
+  "HFuse" = dontDistribute super."HFuse";
+  "HGL" = dontDistribute super."HGL";
+  "HGamer3D" = dontDistribute super."HGamer3D";
+  "HGamer3D-API" = dontDistribute super."HGamer3D-API";
+  "HGamer3D-Audio" = dontDistribute super."HGamer3D-Audio";
+  "HGamer3D-Bullet-Binding" = dontDistribute super."HGamer3D-Bullet-Binding";
+  "HGamer3D-CAudio-Binding" = dontDistribute super."HGamer3D-CAudio-Binding";
+  "HGamer3D-CEGUI-Binding" = dontDistribute super."HGamer3D-CEGUI-Binding";
+  "HGamer3D-Common" = dontDistribute super."HGamer3D-Common";
+  "HGamer3D-Data" = dontDistribute super."HGamer3D-Data";
+  "HGamer3D-Enet-Binding" = dontDistribute super."HGamer3D-Enet-Binding";
+  "HGamer3D-GUI" = dontDistribute super."HGamer3D-GUI";
+  "HGamer3D-Graphics3D" = dontDistribute super."HGamer3D-Graphics3D";
+  "HGamer3D-InputSystem" = dontDistribute super."HGamer3D-InputSystem";
+  "HGamer3D-Network" = dontDistribute super."HGamer3D-Network";
+  "HGamer3D-OIS-Binding" = dontDistribute super."HGamer3D-OIS-Binding";
+  "HGamer3D-Ogre-Binding" = dontDistribute super."HGamer3D-Ogre-Binding";
+  "HGamer3D-SDL2-Binding" = dontDistribute super."HGamer3D-SDL2-Binding";
+  "HGamer3D-SFML-Binding" = dontDistribute super."HGamer3D-SFML-Binding";
+  "HGamer3D-WinEvent" = dontDistribute super."HGamer3D-WinEvent";
+  "HGamer3D-Wire" = dontDistribute super."HGamer3D-Wire";
+  "HGraphStorage" = dontDistribute super."HGraphStorage";
+  "HHDL" = dontDistribute super."HHDL";
+  "HJScript" = dontDistribute super."HJScript";
+  "HJVM" = dontDistribute super."HJVM";
+  "HJavaScript" = dontDistribute super."HJavaScript";
+  "HLearn-algebra" = dontDistribute super."HLearn-algebra";
+  "HLearn-approximation" = dontDistribute super."HLearn-approximation";
+  "HLearn-classification" = dontDistribute super."HLearn-classification";
+  "HLearn-datastructures" = dontDistribute super."HLearn-datastructures";
+  "HLearn-distributions" = dontDistribute super."HLearn-distributions";
+  "HListPP" = dontDistribute super."HListPP";
+  "HLogger" = dontDistribute super."HLogger";
+  "HMM" = dontDistribute super."HMM";
+  "HMap" = dontDistribute super."HMap";
+  "HNM" = dontDistribute super."HNM";
+  "HODE" = dontDistribute super."HODE";
+  "HOpenCV" = dontDistribute super."HOpenCV";
+  "HPDF" = dontDistribute super."HPDF";
+  "HPath" = dontDistribute super."HPath";
+  "HPi" = dontDistribute super."HPi";
+  "HPlot" = dontDistribute super."HPlot";
+  "HPong" = dontDistribute super."HPong";
+  "HROOT" = dontDistribute super."HROOT";
+  "HROOT-core" = dontDistribute super."HROOT-core";
+  "HROOT-graf" = dontDistribute super."HROOT-graf";
+  "HROOT-hist" = dontDistribute super."HROOT-hist";
+  "HROOT-io" = dontDistribute super."HROOT-io";
+  "HROOT-math" = dontDistribute super."HROOT-math";
+  "HRay" = dontDistribute super."HRay";
+  "HSFFIG" = dontDistribute super."HSFFIG";
+  "HSGEP" = dontDistribute super."HSGEP";
+  "HSH" = dontDistribute super."HSH";
+  "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSlippyMap" = dontDistribute super."HSlippyMap";
+  "HSmarty" = dontDistribute super."HSmarty";
+  "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
+  "HSvm" = dontDistribute super."HSvm";
+  "HTTP-Simple" = dontDistribute super."HTTP-Simple";
+  "HTab" = dontDistribute super."HTab";
+  "HTicTacToe" = dontDistribute super."HTicTacToe";
+  "HUnit" = doDistribute super."HUnit_1_2_5_2";
+  "HUnit-Diff" = dontDistribute super."HUnit-Diff";
+  "HUnit-Plus" = dontDistribute super."HUnit-Plus";
+  "HUnit-approx" = dontDistribute super."HUnit-approx";
+  "HXMPP" = dontDistribute super."HXMPP";
+  "HXQ" = dontDistribute super."HXQ";
+  "HaLeX" = dontDistribute super."HaLeX";
+  "HaMinitel" = dontDistribute super."HaMinitel";
+  "HaPy" = dontDistribute super."HaPy";
+  "HaRe" = dontDistribute super."HaRe";
+  "HaTeX-meta" = dontDistribute super."HaTeX-meta";
+  "HaTeX-qq" = dontDistribute super."HaTeX-qq";
+  "HaVSA" = dontDistribute super."HaVSA";
+  "Hach" = dontDistribute super."Hach";
+  "HackMail" = dontDistribute super."HackMail";
+  "Haggressive" = dontDistribute super."Haggressive";
+  "HandlerSocketClient" = dontDistribute super."HandlerSocketClient";
+  "Hangman" = dontDistribute super."Hangman";
+  "HarmTrace" = dontDistribute super."HarmTrace";
+  "HarmTrace-Base" = dontDistribute super."HarmTrace-Base";
+  "HasGP" = dontDistribute super."HasGP";
+  "Haschoo" = dontDistribute super."Haschoo";
+  "Hashell" = dontDistribute super."Hashell";
+  "HaskRel" = dontDistribute super."HaskRel";
+  "HaskellForMaths" = dontDistribute super."HaskellForMaths";
+  "HaskellLM" = dontDistribute super."HaskellLM";
+  "HaskellNN" = dontDistribute super."HaskellNN";
+  "HaskellNet" = doDistribute super."HaskellNet_0_4_5";
+  "HaskellNet-SSL" = dontDistribute super."HaskellNet-SSL";
+  "HaskellTorrent" = dontDistribute super."HaskellTorrent";
+  "HaskellTutorials" = dontDistribute super."HaskellTutorials";
+  "Haskelloids" = dontDistribute super."Haskelloids";
+  "Hate" = dontDistribute super."Hate";
+  "Hawk" = dontDistribute super."Hawk";
+  "Hayoo" = dontDistribute super."Hayoo";
+  "Hclip" = dontDistribute super."Hclip";
+  "Hedi" = dontDistribute super."Hedi";
+  "HerbiePlugin" = dontDistribute super."HerbiePlugin";
+  "Hermes" = dontDistribute super."Hermes";
+  "Hieroglyph" = dontDistribute super."Hieroglyph";
+  "HiggsSet" = dontDistribute super."HiggsSet";
+  "Hipmunk" = dontDistribute super."Hipmunk";
+  "HipmunkPlayground" = dontDistribute super."HipmunkPlayground";
+  "Hish" = dontDistribute super."Hish";
+  "Histogram" = dontDistribute super."Histogram";
+  "Hmpf" = dontDistribute super."Hmpf";
+  "Hoed" = dontDistribute super."Hoed";
+  "HoleyMonoid" = dontDistribute super."HoleyMonoid";
+  "Holumbus-Distribution" = dontDistribute super."Holumbus-Distribution";
+  "Holumbus-MapReduce" = dontDistribute super."Holumbus-MapReduce";
+  "Holumbus-Searchengine" = dontDistribute super."Holumbus-Searchengine";
+  "Holumbus-Storage" = dontDistribute super."Holumbus-Storage";
+  "Homology" = dontDistribute super."Homology";
+  "HongoDB" = dontDistribute super."HongoDB";
+  "HostAndPort" = dontDistribute super."HostAndPort";
+  "Hricket" = dontDistribute super."Hricket";
+  "Hs2lib" = dontDistribute super."Hs2lib";
+  "HsASA" = dontDistribute super."HsASA";
+  "HsHaruPDF" = dontDistribute super."HsHaruPDF";
+  "HsHyperEstraier" = dontDistribute super."HsHyperEstraier";
+  "HsJudy" = dontDistribute super."HsJudy";
+  "HsOpenSSL-x509-system" = dontDistribute super."HsOpenSSL-x509-system";
+  "HsParrot" = dontDistribute super."HsParrot";
+  "HsPerl5" = dontDistribute super."HsPerl5";
+  "HsSVN" = dontDistribute super."HsSVN";
+  "HsSyck" = dontDistribute super."HsSyck";
+  "HsTools" = dontDistribute super."HsTools";
+  "Hsed" = dontDistribute super."Hsed";
+  "Hsmtlib" = dontDistribute super."Hsmtlib";
+  "HueAPI" = dontDistribute super."HueAPI";
+  "HulkImport" = dontDistribute super."HulkImport";
+  "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres";
+  "IDynamic" = dontDistribute super."IDynamic";
+  "IFS" = dontDistribute super."IFS";
+  "INblobs" = dontDistribute super."INblobs";
+  "IOR" = dontDistribute super."IOR";
+  "IORefCAS" = dontDistribute super."IORefCAS";
+  "IcoGrid" = dontDistribute super."IcoGrid";
+  "Imlib" = dontDistribute super."Imlib";
+  "ImperativeHaskell" = dontDistribute super."ImperativeHaskell";
+  "IndentParser" = dontDistribute super."IndentParser";
+  "IndexedList" = dontDistribute super."IndexedList";
+  "InfixApplicative" = dontDistribute super."InfixApplicative";
+  "Interpolation" = dontDistribute super."Interpolation";
+  "Interpolation-maxs" = dontDistribute super."Interpolation-maxs";
+  "IntervalMap" = dontDistribute super."IntervalMap";
+  "Irc" = dontDistribute super."Irc";
+  "IrrHaskell" = dontDistribute super."IrrHaskell";
+  "IsNull" = dontDistribute super."IsNull";
+  "JSON-Combinator" = dontDistribute super."JSON-Combinator";
+  "JSON-Combinator-Examples" = dontDistribute super."JSON-Combinator-Examples";
+  "JSONb" = dontDistribute super."JSONb";
+  "JYU-Utils" = dontDistribute super."JYU-Utils";
+  "JackMiniMix" = dontDistribute super."JackMiniMix";
+  "Javasf" = dontDistribute super."Javasf";
+  "Javav" = dontDistribute super."Javav";
+  "JsContracts" = dontDistribute super."JsContracts";
+  "JsonGrammar" = dontDistribute super."JsonGrammar";
+  "JuicyPixels-canvas" = dontDistribute super."JuicyPixels-canvas";
+  "JuicyPixels-repa" = dontDistribute super."JuicyPixels-repa";
+  "JuicyPixels-scale-dct" = dontDistribute super."JuicyPixels-scale-dct";
+  "JuicyPixels-util" = dontDistribute super."JuicyPixels-util";
+  "JunkDB" = dontDistribute super."JunkDB";
+  "JunkDB-driver-gdbm" = dontDistribute super."JunkDB-driver-gdbm";
+  "JunkDB-driver-hashtables" = dontDistribute super."JunkDB-driver-hashtables";
+  "JustParse" = dontDistribute super."JustParse";
+  "KMP" = dontDistribute super."KMP";
+  "KSP" = dontDistribute super."KSP";
+  "Kalman" = dontDistribute super."Kalman";
+  "KdTree" = dontDistribute super."KdTree";
+  "Ketchup" = dontDistribute super."Ketchup";
+  "KiCS" = dontDistribute super."KiCS";
+  "KiCS-debugger" = dontDistribute super."KiCS-debugger";
+  "KiCS-prophecy" = dontDistribute super."KiCS-prophecy";
+  "Kleislify" = dontDistribute super."Kleislify";
+  "Konf" = dontDistribute super."Konf";
+  "Kriens" = dontDistribute super."Kriens";
+  "KyotoCabinet" = dontDistribute super."KyotoCabinet";
+  "L-seed" = dontDistribute super."L-seed";
+  "LDAP" = dontDistribute super."LDAP";
+  "LRU" = dontDistribute super."LRU";
+  "LTree" = dontDistribute super."LTree";
+  "LambdaCalculator" = dontDistribute super."LambdaCalculator";
+  "LambdaHack" = dontDistribute super."LambdaHack";
+  "LambdaINet" = dontDistribute super."LambdaINet";
+  "LambdaNet" = dontDistribute super."LambdaNet";
+  "LambdaPrettyQuote" = dontDistribute super."LambdaPrettyQuote";
+  "LambdaShell" = dontDistribute super."LambdaShell";
+  "Lambdajudge" = dontDistribute super."Lambdajudge";
+  "Lambdaya" = dontDistribute super."Lambdaya";
+  "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
+  "Lastik" = dontDistribute super."Lastik";
+  "Lattices" = dontDistribute super."Lattices";
+  "LazyVault" = dontDistribute super."LazyVault";
+  "Level0" = dontDistribute super."Level0";
+  "LibClang" = dontDistribute super."LibClang";
+  "LibZip" = dontDistribute super."LibZip";
+  "Limit" = dontDistribute super."Limit";
+  "LinearSplit" = dontDistribute super."LinearSplit";
+  "LinguisticsTypes" = dontDistribute super."LinguisticsTypes";
+  "LinkChecker" = dontDistribute super."LinkChecker";
+  "ListTree" = dontDistribute super."ListTree";
+  "ListWriter" = dontDistribute super."ListWriter";
+  "ListZipper" = dontDistribute super."ListZipper";
+  "Logic" = dontDistribute super."Logic";
+  "LogicGrowsOnTrees" = dontDistribute super."LogicGrowsOnTrees";
+  "LogicGrowsOnTrees-MPI" = dontDistribute super."LogicGrowsOnTrees-MPI";
+  "LogicGrowsOnTrees-network" = dontDistribute super."LogicGrowsOnTrees-network";
+  "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
+  "LslPlus" = dontDistribute super."LslPlus";
+  "Lucu" = dontDistribute super."Lucu";
+  "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
+  "MFlow" = dontDistribute super."MFlow";
+  "MHask" = dontDistribute super."MHask";
+  "MSQueue" = dontDistribute super."MSQueue";
+  "MTGBuilder" = dontDistribute super."MTGBuilder";
+  "MagicHaskeller" = dontDistribute super."MagicHaskeller";
+  "MailchimpSimple" = dontDistribute super."MailchimpSimple";
+  "MaybeT" = dontDistribute super."MaybeT";
+  "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf";
+  "MaybeT-transformers" = dontDistribute super."MaybeT-transformers";
+  "MazesOfMonad" = dontDistribute super."MazesOfMonad";
+  "MeanShift" = dontDistribute super."MeanShift";
+  "Measure" = dontDistribute super."Measure";
+  "MetaHDBC" = dontDistribute super."MetaHDBC";
+  "MetaObject" = dontDistribute super."MetaObject";
+  "Metrics" = dontDistribute super."Metrics";
+  "Mhailist" = dontDistribute super."Mhailist";
+  "Michelangelo" = dontDistribute super."Michelangelo";
+  "MicrosoftTranslator" = dontDistribute super."MicrosoftTranslator";
+  "MiniAgda" = dontDistribute super."MiniAgda";
+  "MissingK" = dontDistribute super."MissingK";
+  "MissingM" = dontDistribute super."MissingM";
+  "MissingPy" = dontDistribute super."MissingPy";
+  "Modulo" = dontDistribute super."Modulo";
+  "Moe" = dontDistribute super."Moe";
+  "MoeDict" = dontDistribute super."MoeDict";
+  "MonadCatchIO-mtl" = dontDistribute super."MonadCatchIO-mtl";
+  "MonadCatchIO-mtl-foreign" = dontDistribute super."MonadCatchIO-mtl-foreign";
+  "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign";
+  "MonadCompose" = dontDistribute super."MonadCompose";
+  "MonadLab" = dontDistribute super."MonadLab";
+  "MonadRandomLazy" = dontDistribute super."MonadRandomLazy";
+  "MonadStack" = dontDistribute super."MonadStack";
+  "Monadius" = dontDistribute super."Monadius";
+  "Monaris" = dontDistribute super."Monaris";
+  "Monatron" = dontDistribute super."Monatron";
+  "Monatron-IO" = dontDistribute super."Monatron-IO";
+  "Monocle" = dontDistribute super."Monocle";
+  "MorseCode" = dontDistribute super."MorseCode";
+  "MuCheck" = dontDistribute super."MuCheck";
+  "MuCheck-HUnit" = dontDistribute super."MuCheck-HUnit";
+  "MuCheck-Hspec" = dontDistribute super."MuCheck-Hspec";
+  "MuCheck-QuickCheck" = dontDistribute super."MuCheck-QuickCheck";
+  "MuCheck-SmallCheck" = dontDistribute super."MuCheck-SmallCheck";
+  "Munkres" = dontDistribute super."Munkres";
+  "Munkres-simple" = dontDistribute super."Munkres-simple";
+  "MusicBrainz" = dontDistribute super."MusicBrainz";
+  "MusicBrainz-libdiscid" = dontDistribute super."MusicBrainz-libdiscid";
+  "MyPrimes" = dontDistribute super."MyPrimes";
+  "NGrams" = dontDistribute super."NGrams";
+  "NTRU" = dontDistribute super."NTRU";
+  "NXT" = dontDistribute super."NXT";
+  "NXTDSL" = dontDistribute super."NXTDSL";
+  "NanoProlog" = dontDistribute super."NanoProlog";
+  "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets";
+  "NaturalSort" = dontDistribute super."NaturalSort";
+  "NearContextAlgebra" = dontDistribute super."NearContextAlgebra";
+  "Neks" = dontDistribute super."Neks";
+  "NestedFunctor" = dontDistribute super."NestedFunctor";
+  "NestedSampling" = dontDistribute super."NestedSampling";
+  "NetSNMP" = dontDistribute super."NetSNMP";
+  "NewBinary" = dontDistribute super."NewBinary";
+  "Ninjas" = dontDistribute super."Ninjas";
+  "NoSlow" = dontDistribute super."NoSlow";
+  "NoTrace" = dontDistribute super."NoTrace";
+  "Noise" = dontDistribute super."Noise";
+  "Nomyx" = dontDistribute super."Nomyx";
+  "Nomyx-Core" = dontDistribute super."Nomyx-Core";
+  "Nomyx-Language" = dontDistribute super."Nomyx-Language";
+  "Nomyx-Rules" = dontDistribute super."Nomyx-Rules";
+  "Nomyx-Web" = dontDistribute super."Nomyx-Web";
+  "NonEmpty" = dontDistribute super."NonEmpty";
+  "NonEmptyList" = dontDistribute super."NonEmptyList";
+  "NumLazyByteString" = dontDistribute super."NumLazyByteString";
+  "NumberSieves" = dontDistribute super."NumberSieves";
+  "Numbers" = dontDistribute super."Numbers";
+  "Nussinov78" = dontDistribute super."Nussinov78";
+  "Nutri" = dontDistribute super."Nutri";
+  "OGL" = dontDistribute super."OGL";
+  "OSM" = dontDistribute super."OSM";
+  "OTP" = dontDistribute super."OTP";
+  "Object" = dontDistribute super."Object";
+  "ObjectIO" = dontDistribute super."ObjectIO";
+  "ObjectName" = dontDistribute super."ObjectName";
+  "Obsidian" = dontDistribute super."Obsidian";
+  "OddWord" = dontDistribute super."OddWord";
+  "Omega" = dontDistribute super."Omega";
+  "OpenAFP" = dontDistribute super."OpenAFP";
+  "OpenAFP-Utils" = dontDistribute super."OpenAFP-Utils";
+  "OpenAL" = dontDistribute super."OpenAL";
+  "OpenCL" = dontDistribute super."OpenCL";
+  "OpenCLRaw" = dontDistribute super."OpenCLRaw";
+  "OpenCLWrappers" = dontDistribute super."OpenCLWrappers";
+  "OpenGL" = dontDistribute super."OpenGL";
+  "OpenGLCheck" = dontDistribute super."OpenGLCheck";
+  "OpenGLRaw" = dontDistribute super."OpenGLRaw";
+  "OpenGLRaw21" = dontDistribute super."OpenGLRaw21";
+  "OpenSCAD" = dontDistribute super."OpenSCAD";
+  "OpenVG" = dontDistribute super."OpenVG";
+  "OpenVGRaw" = dontDistribute super."OpenVGRaw";
+  "Operads" = dontDistribute super."Operads";
+  "OptDir" = dontDistribute super."OptDir";
+  "OrPatterns" = dontDistribute super."OrPatterns";
+  "OrchestrateDB" = dontDistribute super."OrchestrateDB";
+  "OrderedBits" = dontDistribute super."OrderedBits";
+  "Ordinals" = dontDistribute super."Ordinals";
+  "PArrows" = dontDistribute super."PArrows";
+  "PBKDF2" = dontDistribute super."PBKDF2";
+  "PCLT" = dontDistribute super."PCLT";
+  "PCLT-DB" = dontDistribute super."PCLT-DB";
+  "PDBtools" = dontDistribute super."PDBtools";
+  "PTQ" = dontDistribute super."PTQ";
+  "PageIO" = dontDistribute super."PageIO";
+  "Paillier" = dontDistribute super."Paillier";
+  "PandocAgda" = dontDistribute super."PandocAgda";
+  "Paraiso" = dontDistribute super."Paraiso";
+  "Parry" = dontDistribute super."Parry";
+  "ParsecTools" = dontDistribute super."ParsecTools";
+  "ParserFunction" = dontDistribute super."ParserFunction";
+  "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures";
+  "PasswordGenerator" = dontDistribute super."PasswordGenerator";
+  "PastePipe" = dontDistribute super."PastePipe";
+  "Pathfinder" = dontDistribute super."Pathfinder";
+  "Peano" = dontDistribute super."Peano";
+  "PeanoWitnesses" = dontDistribute super."PeanoWitnesses";
+  "PerfectHash" = dontDistribute super."PerfectHash";
+  "PermuteEffects" = dontDistribute super."PermuteEffects";
+  "Phsu" = dontDistribute super."Phsu";
+  "Pipe" = dontDistribute super."Pipe";
+  "Piso" = dontDistribute super."Piso";
+  "PlayHangmanGame" = dontDistribute super."PlayHangmanGame";
+  "PlayingCards" = dontDistribute super."PlayingCards";
+  "Plot-ho-matic" = dontDistribute super."Plot-ho-matic";
+  "PlslTools" = dontDistribute super."PlslTools";
+  "Plural" = dontDistribute super."Plural";
+  "Pollutocracy" = dontDistribute super."Pollutocracy";
+  "PortFusion" = dontDistribute super."PortFusion";
+  "PortMidi" = dontDistribute super."PortMidi";
+  "PostgreSQL" = dontDistribute super."PostgreSQL";
+  "PrimitiveArray" = dontDistribute super."PrimitiveArray";
+  "Printf-TH" = dontDistribute super."Printf-TH";
+  "PriorityChansConverger" = dontDistribute super."PriorityChansConverger";
+  "ProbabilityMonads" = dontDistribute super."ProbabilityMonads";
+  "PropLogic" = dontDistribute super."PropLogic";
+  "Proper" = dontDistribute super."Proper";
+  "ProxN" = dontDistribute super."ProxN";
+  "Pugs" = dontDistribute super."Pugs";
+  "Pup-Events" = dontDistribute super."Pup-Events";
+  "Pup-Events-Client" = dontDistribute super."Pup-Events-Client";
+  "Pup-Events-Demo" = dontDistribute super."Pup-Events-Demo";
+  "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
+  "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
+  "QIO" = dontDistribute super."QIO";
+  "QuadEdge" = dontDistribute super."QuadEdge";
+  "QuadTree" = dontDistribute super."QuadTree";
+  "Quelea" = dontDistribute super."Quelea";
+  "QuickAnnotate" = dontDistribute super."QuickAnnotate";
+  "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT";
+  "Quickson" = dontDistribute super."Quickson";
+  "R-pandoc" = dontDistribute super."R-pandoc";
+  "RANSAC" = dontDistribute super."RANSAC";
+  "RBTree" = dontDistribute super."RBTree";
+  "RESTng" = dontDistribute super."RESTng";
+  "RFC1751" = dontDistribute super."RFC1751";
+  "RJson" = dontDistribute super."RJson";
+  "RMP" = dontDistribute super."RMP";
+  "RNAFold" = dontDistribute super."RNAFold";
+  "RNAFoldProgs" = dontDistribute super."RNAFoldProgs";
+  "RNAdesign" = dontDistribute super."RNAdesign";
+  "RNAdraw" = dontDistribute super."RNAdraw";
+  "RNAlien" = dontDistribute super."RNAlien";
+  "RNAwolf" = dontDistribute super."RNAwolf";
+  "RSA" = doDistribute super."RSA_2_1_0_3";
+  "Raincat" = dontDistribute super."Raincat";
+  "Random123" = dontDistribute super."Random123";
+  "RandomDotOrg" = dontDistribute super."RandomDotOrg";
+  "Randometer" = dontDistribute super."Randometer";
+  "Range" = dontDistribute super."Range";
+  "Ranged-sets" = dontDistribute super."Ranged-sets";
+  "Ranka" = dontDistribute super."Ranka";
+  "Rasenschach" = dontDistribute super."Rasenschach";
+  "Redmine" = dontDistribute super."Redmine";
+  "Ref" = dontDistribute super."Ref";
+  "Referees" = dontDistribute super."Referees";
+  "RepLib" = dontDistribute super."RepLib";
+  "ReplicateEffects" = dontDistribute super."ReplicateEffects";
+  "ReviewBoard" = dontDistribute super."ReviewBoard";
+  "RichConditional" = dontDistribute super."RichConditional";
+  "RollingDirectory" = dontDistribute super."RollingDirectory";
+  "RoyalMonad" = dontDistribute super."RoyalMonad";
+  "RxHaskell" = dontDistribute super."RxHaskell";
+  "SBench" = dontDistribute super."SBench";
+  "SConfig" = dontDistribute super."SConfig";
+  "SDL" = dontDistribute super."SDL";
+  "SDL-gfx" = dontDistribute super."SDL-gfx";
+  "SDL-image" = dontDistribute super."SDL-image";
+  "SDL-mixer" = dontDistribute super."SDL-mixer";
+  "SDL-mpeg" = dontDistribute super."SDL-mpeg";
+  "SDL-ttf" = dontDistribute super."SDL-ttf";
+  "SDL2-ttf" = dontDistribute super."SDL2-ttf";
+  "SFML" = dontDistribute super."SFML";
+  "SFML-control" = dontDistribute super."SFML-control";
+  "SFont" = dontDistribute super."SFont";
+  "SG" = dontDistribute super."SG";
+  "SGdemo" = dontDistribute super."SGdemo";
+  "SHA2" = dontDistribute super."SHA2";
+  "SMTPClient" = dontDistribute super."SMTPClient";
+  "SNet" = dontDistribute super."SNet";
+  "SQLDeps" = dontDistribute super."SQLDeps";
+  "STL" = dontDistribute super."STL";
+  "SVG2Q" = dontDistribute super."SVG2Q";
+  "SVGPath" = dontDistribute super."SVGPath";
+  "SWMMoutGetMB" = dontDistribute super."SWMMoutGetMB";
+  "SableCC2Hs" = dontDistribute super."SableCC2Hs";
+  "Safe" = dontDistribute super."Safe";
+  "Salsa" = dontDistribute super."Salsa";
+  "Saturnin" = dontDistribute super."Saturnin";
+  "SciFlow" = dontDistribute super."SciFlow";
+  "ScratchFs" = dontDistribute super."ScratchFs";
+  "Scurry" = dontDistribute super."Scurry";
+  "SegmentTree" = dontDistribute super."SegmentTree";
+  "Semantique" = dontDistribute super."Semantique";
+  "Semigroup" = dontDistribute super."Semigroup";
+  "SeqAlign" = dontDistribute super."SeqAlign";
+  "SessionLogger" = dontDistribute super."SessionLogger";
+  "ShellCheck" = dontDistribute super."ShellCheck";
+  "Shellac" = dontDistribute super."Shellac";
+  "Shellac-compatline" = dontDistribute super."Shellac-compatline";
+  "Shellac-editline" = dontDistribute super."Shellac-editline";
+  "Shellac-haskeline" = dontDistribute super."Shellac-haskeline";
+  "Shellac-readline" = dontDistribute super."Shellac-readline";
+  "ShowF" = dontDistribute super."ShowF";
+  "Shrub" = dontDistribute super."Shrub";
+  "Shu-thing" = dontDistribute super."Shu-thing";
+  "SimpleAES" = dontDistribute super."SimpleAES";
+  "SimpleEA" = dontDistribute super."SimpleEA";
+  "SimpleGL" = dontDistribute super."SimpleGL";
+  "SimpleH" = dontDistribute super."SimpleH";
+  "SimpleLog" = dontDistribute super."SimpleLog";
+  "SizeCompare" = dontDistribute super."SizeCompare";
+  "Slides" = dontDistribute super."Slides";
+  "Smooth" = dontDistribute super."Smooth";
+  "SmtLib" = dontDistribute super."SmtLib";
+  "Snusmumrik" = dontDistribute super."Snusmumrik";
+  "SoOSiM" = dontDistribute super."SoOSiM";
+  "SoccerFun" = dontDistribute super."SoccerFun";
+  "SoccerFunGL" = dontDistribute super."SoccerFunGL";
+  "Sonnex" = dontDistribute super."Sonnex";
+  "SourceGraph" = dontDistribute super."SourceGraph";
+  "Southpaw" = dontDistribute super."Southpaw";
+  "SpaceInvaders" = dontDistribute super."SpaceInvaders";
+  "SpacePrivateers" = dontDistribute super."SpacePrivateers";
+  "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
+  "Spock" = doDistribute super."Spock_0_8_1_0";
+  "Spock-auth" = dontDistribute super."Spock-auth";
+  "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1";
+  "SpreadsheetML" = dontDistribute super."SpreadsheetML";
+  "Sprig" = dontDistribute super."Sprig";
+  "Stasis" = dontDistribute super."Stasis";
+  "StateVar-transformer" = dontDistribute super."StateVar-transformer";
+  "StatisticalMethods" = dontDistribute super."StatisticalMethods";
+  "Stomp" = dontDistribute super."Stomp";
+  "Strafunski-ATermLib" = dontDistribute super."Strafunski-ATermLib";
+  "Strafunski-Sdf2Haskell" = dontDistribute super."Strafunski-Sdf2Haskell";
+  "Strafunski-StrategyLib" = dontDistribute super."Strafunski-StrategyLib";
+  "StrappedTemplates" = dontDistribute super."StrappedTemplates";
+  "StrategyLib" = dontDistribute super."StrategyLib";
+  "StrictBench" = dontDistribute super."StrictBench";
+  "SuffixStructures" = dontDistribute super."SuffixStructures";
+  "SybWidget" = dontDistribute super."SybWidget";
+  "SyntaxMacros" = dontDistribute super."SyntaxMacros";
+  "Sysmon" = dontDistribute super."Sysmon";
+  "TBC" = dontDistribute super."TBC";
+  "TBit" = dontDistribute super."TBit";
+  "THEff" = dontDistribute super."THEff";
+  "TTTAS" = dontDistribute super."TTTAS";
+  "TV" = dontDistribute super."TV";
+  "TYB" = dontDistribute super."TYB";
+  "TableAlgebra" = dontDistribute super."TableAlgebra";
+  "Tables" = dontDistribute super."Tables";
+  "Tablify" = dontDistribute super."Tablify";
+  "Tainted" = dontDistribute super."Tainted";
+  "Takusen" = dontDistribute super."Takusen";
+  "Tape" = dontDistribute super."Tape";
+  "Taxonomy" = dontDistribute super."Taxonomy";
+  "TaxonomyTools" = dontDistribute super."TaxonomyTools";
+  "TeaHS" = dontDistribute super."TeaHS";
+  "Tensor" = dontDistribute super."Tensor";
+  "TernaryTrees" = dontDistribute super."TernaryTrees";
+  "TestExplode" = dontDistribute super."TestExplode";
+  "Theora" = dontDistribute super."Theora";
+  "Thingie" = dontDistribute super."Thingie";
+  "ThreadObjects" = dontDistribute super."ThreadObjects";
+  "Thrift" = dontDistribute super."Thrift";
+  "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe";
+  "TicTacToe" = dontDistribute super."TicTacToe";
+  "TigerHash" = dontDistribute super."TigerHash";
+  "TimePiece" = dontDistribute super."TimePiece";
+  "TinyLaunchbury" = dontDistribute super."TinyLaunchbury";
+  "TinyURL" = dontDistribute super."TinyURL";
+  "Titim" = dontDistribute super."Titim";
+  "Top" = dontDistribute super."Top";
+  "Tournament" = dontDistribute super."Tournament";
+  "TraceUtils" = dontDistribute super."TraceUtils";
+  "TransformersStepByStep" = dontDistribute super."TransformersStepByStep";
+  "Transhare" = dontDistribute super."Transhare";
+  "TreeCounter" = dontDistribute super."TreeCounter";
+  "TreeStructures" = dontDistribute super."TreeStructures";
+  "TreeT" = dontDistribute super."TreeT";
+  "Treiber" = dontDistribute super."Treiber";
+  "TrendGraph" = dontDistribute super."TrendGraph";
+  "TrieMap" = dontDistribute super."TrieMap";
+  "Twofish" = dontDistribute super."Twofish";
+  "TypeClass" = dontDistribute super."TypeClass";
+  "TypeCompose" = dontDistribute super."TypeCompose";
+  "TypeIlluminator" = dontDistribute super."TypeIlluminator";
+  "TypeNat" = dontDistribute super."TypeNat";
+  "TypingTester" = dontDistribute super."TypingTester";
+  "UISF" = dontDistribute super."UISF";
+  "UMM" = dontDistribute super."UMM";
+  "URLT" = dontDistribute super."URLT";
+  "URLb" = dontDistribute super."URLb";
+  "UTFTConverter" = dontDistribute super."UTFTConverter";
+  "Unique" = dontDistribute super."Unique";
+  "Unixutils-shadow" = dontDistribute super."Unixutils-shadow";
+  "Updater" = dontDistribute super."Updater";
+  "UrlDisp" = dontDistribute super."UrlDisp";
+  "Useful" = dontDistribute super."Useful";
+  "UtilityTM" = dontDistribute super."UtilityTM";
+  "VKHS" = dontDistribute super."VKHS";
+  "Validation" = dontDistribute super."Validation";
+  "Vec" = dontDistribute super."Vec";
+  "Vec-Boolean" = dontDistribute super."Vec-Boolean";
+  "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
+  "Vec-Transform" = dontDistribute super."Vec-Transform";
+  "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
+  "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
+  "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "WAVE" = dontDistribute super."WAVE";
+  "WL500gPControl" = dontDistribute super."WL500gPControl";
+  "WL500gPLib" = dontDistribute super."WL500gPLib";
+  "WMSigner" = dontDistribute super."WMSigner";
+  "WURFL" = dontDistribute super."WURFL";
+  "WXDiffCtrl" = dontDistribute super."WXDiffCtrl";
+  "WashNGo" = dontDistribute super."WashNGo";
+  "WaveFront" = dontDistribute super."WaveFront";
+  "Weather" = dontDistribute super."Weather";
+  "WebBits" = dontDistribute super."WebBits";
+  "WebBits-Html" = dontDistribute super."WebBits-Html";
+  "WebBits-multiplate" = dontDistribute super."WebBits-multiplate";
+  "WebCont" = dontDistribute super."WebCont";
+  "WeberLogic" = dontDistribute super."WeberLogic";
+  "Webrexp" = dontDistribute super."Webrexp";
+  "Wheb" = dontDistribute super."Wheb";
+  "WikimediaParser" = dontDistribute super."WikimediaParser";
+  "Win32-dhcp-server" = dontDistribute super."Win32-dhcp-server";
+  "Win32-errors" = dontDistribute super."Win32-errors";
+  "Win32-extras" = dontDistribute super."Win32-extras";
+  "Win32-junction-point" = dontDistribute super."Win32-junction-point";
+  "Win32-security" = dontDistribute super."Win32-security";
+  "Win32-services" = dontDistribute super."Win32-services";
+  "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper";
+  "Wired" = dontDistribute super."Wired";
+  "WordAlignment" = dontDistribute super."WordAlignment";
+  "WordNet" = dontDistribute super."WordNet";
+  "WordNet-ghc74" = dontDistribute super."WordNet-ghc74";
+  "Wordlint" = dontDistribute super."Wordlint";
+  "WxGeneric" = dontDistribute super."WxGeneric";
+  "X11-extras" = dontDistribute super."X11-extras";
+  "X11-rm" = dontDistribute super."X11-rm";
+  "X11-xdamage" = dontDistribute super."X11-xdamage";
+  "X11-xfixes" = dontDistribute super."X11-xfixes";
+  "X11-xft" = dontDistribute super."X11-xft";
+  "X11-xshape" = dontDistribute super."X11-xshape";
+  "XAttr" = dontDistribute super."XAttr";
+  "XInput" = dontDistribute super."XInput";
+  "XMMS" = dontDistribute super."XMMS";
+  "XMPP" = dontDistribute super."XMPP";
+  "XSaiga" = dontDistribute super."XSaiga";
+  "Xauth" = dontDistribute super."Xauth";
+  "Xec" = dontDistribute super."Xec";
+  "XmlHtmlWriter" = dontDistribute super."XmlHtmlWriter";
+  "Xorshift128Plus" = dontDistribute super."Xorshift128Plus";
+  "YACPong" = dontDistribute super."YACPong";
+  "YFrob" = dontDistribute super."YFrob";
+  "Yablog" = dontDistribute super."Yablog";
+  "YamlReference" = dontDistribute super."YamlReference";
+  "Yampa-core" = dontDistribute super."Yampa-core";
+  "Yocto" = dontDistribute super."Yocto";
+  "Yogurt" = dontDistribute super."Yogurt";
+  "Yogurt-Standalone" = dontDistribute super."Yogurt-Standalone";
+  "ZEBEDDE" = dontDistribute super."ZEBEDDE";
+  "ZFS" = dontDistribute super."ZFS";
+  "ZMachine" = dontDistribute super."ZMachine";
+  "ZipFold" = dontDistribute super."ZipFold";
+  "ZipperAG" = dontDistribute super."ZipperAG";
+  "Zora" = dontDistribute super."Zora";
+  "Zwaluw" = dontDistribute super."Zwaluw";
+  "a50" = dontDistribute super."a50";
+  "abacate" = dontDistribute super."abacate";
+  "abc-puzzle" = dontDistribute super."abc-puzzle";
+  "abcBridge" = dontDistribute super."abcBridge";
+  "abcnotation" = dontDistribute super."abcnotation";
+  "abeson" = dontDistribute super."abeson";
+  "abstract-deque-tests" = dontDistribute super."abstract-deque-tests";
+  "abstract-par-accelerate" = dontDistribute super."abstract-par-accelerate";
+  "abt" = dontDistribute super."abt";
+  "ac-machine" = dontDistribute super."ac-machine";
+  "ac-machine-conduit" = dontDistribute super."ac-machine-conduit";
+  "accelerate-arithmetic" = dontDistribute super."accelerate-arithmetic";
+  "accelerate-cublas" = dontDistribute super."accelerate-cublas";
+  "accelerate-cuda" = dontDistribute super."accelerate-cuda";
+  "accelerate-cufft" = dontDistribute super."accelerate-cufft";
+  "accelerate-examples" = dontDistribute super."accelerate-examples";
+  "accelerate-fft" = dontDistribute super."accelerate-fft";
+  "accelerate-fftw" = dontDistribute super."accelerate-fftw";
+  "accelerate-fourier" = dontDistribute super."accelerate-fourier";
+  "accelerate-fourier-benchmark" = dontDistribute super."accelerate-fourier-benchmark";
+  "accelerate-io" = dontDistribute super."accelerate-io";
+  "accelerate-random" = dontDistribute super."accelerate-random";
+  "accelerate-utility" = dontDistribute super."accelerate-utility";
+  "accentuateus" = dontDistribute super."accentuateus";
+  "access-time" = dontDistribute super."access-time";
+  "acid-state" = doDistribute super."acid-state_0_12_4";
+  "acid-state-dist" = dontDistribute super."acid-state-dist";
+  "acid-state-tls" = dontDistribute super."acid-state-tls";
+  "acl2" = dontDistribute super."acl2";
+  "acme-all-monad" = dontDistribute super."acme-all-monad";
+  "acme-box" = dontDistribute super."acme-box";
+  "acme-cadre" = dontDistribute super."acme-cadre";
+  "acme-cofunctor" = dontDistribute super."acme-cofunctor";
+  "acme-colosson" = dontDistribute super."acme-colosson";
+  "acme-comonad" = dontDistribute super."acme-comonad";
+  "acme-cutegirl" = dontDistribute super."acme-cutegirl";
+  "acme-dont" = dontDistribute super."acme-dont";
+  "acme-flipping-tables" = dontDistribute super."acme-flipping-tables";
+  "acme-grawlix" = dontDistribute super."acme-grawlix";
+  "acme-hq9plus" = dontDistribute super."acme-hq9plus";
+  "acme-http" = dontDistribute super."acme-http";
+  "acme-inator" = dontDistribute super."acme-inator";
+  "acme-io" = dontDistribute super."acme-io";
+  "acme-lolcat" = dontDistribute super."acme-lolcat";
+  "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
+  "acme-memorandom" = dontDistribute super."acme-memorandom";
+  "acme-microwave" = dontDistribute super."acme-microwave";
+  "acme-miscorder" = dontDistribute super."acme-miscorder";
+  "acme-missiles" = dontDistribute super."acme-missiles";
+  "acme-now" = dontDistribute super."acme-now";
+  "acme-numbersystem" = dontDistribute super."acme-numbersystem";
+  "acme-omitted" = dontDistribute super."acme-omitted";
+  "acme-one" = dontDistribute super."acme-one";
+  "acme-operators" = dontDistribute super."acme-operators";
+  "acme-php" = dontDistribute super."acme-php";
+  "acme-pointful-numbers" = dontDistribute super."acme-pointful-numbers";
+  "acme-realworld" = dontDistribute super."acme-realworld";
+  "acme-safe" = dontDistribute super."acme-safe";
+  "acme-schoenfinkel" = dontDistribute super."acme-schoenfinkel";
+  "acme-strfry" = dontDistribute super."acme-strfry";
+  "acme-stringly-typed" = dontDistribute super."acme-stringly-typed";
+  "acme-strtok" = dontDistribute super."acme-strtok";
+  "acme-timemachine" = dontDistribute super."acme-timemachine";
+  "acme-year" = dontDistribute super."acme-year";
+  "acme-zero" = dontDistribute super."acme-zero";
+  "activehs" = dontDistribute super."activehs";
+  "activehs-base" = dontDistribute super."activehs-base";
+  "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
+  "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_2_4";
+  "adaptive-containers" = dontDistribute super."adaptive-containers";
+  "adaptive-tuple" = dontDistribute super."adaptive-tuple";
+  "adb" = dontDistribute super."adb";
+  "adblock2privoxy" = dontDistribute super."adblock2privoxy";
+  "addLicenseInfo" = dontDistribute super."addLicenseInfo";
+  "adhoc-network" = dontDistribute super."adhoc-network";
+  "adict" = dontDistribute super."adict";
+  "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange";
+  "adp-multi" = dontDistribute super."adp-multi";
+  "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp";
+  "aeson" = doDistribute super."aeson_0_8_0_2";
+  "aeson-applicative" = dontDistribute super."aeson-applicative";
+  "aeson-bson" = dontDistribute super."aeson-bson";
+  "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-diff" = dontDistribute super."aeson-diff";
+  "aeson-extra" = doDistribute super."aeson-extra_0_2_3_0";
+  "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-lens" = dontDistribute super."aeson-lens";
+  "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
+  "aeson-schema" = doDistribute super."aeson-schema_0_3_0_7";
+  "aeson-serialize" = dontDistribute super."aeson-serialize";
+  "aeson-smart" = dontDistribute super."aeson-smart";
+  "aeson-streams" = dontDistribute super."aeson-streams";
+  "aeson-t" = dontDistribute super."aeson-t";
+  "aeson-toolkit" = dontDistribute super."aeson-toolkit";
+  "aeson-value-parser" = dontDistribute super."aeson-value-parser";
+  "aeson-yak" = dontDistribute super."aeson-yak";
+  "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
+  "afis" = dontDistribute super."afis";
+  "afv" = dontDistribute super."afv";
+  "agda-server" = dontDistribute super."agda-server";
+  "agda-snippets" = dontDistribute super."agda-snippets";
+  "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
+  "agum" = dontDistribute super."agum";
+  "aig" = dontDistribute super."aig";
+  "air" = dontDistribute super."air";
+  "air-extra" = dontDistribute super."air-extra";
+  "air-spec" = dontDistribute super."air-spec";
+  "air-th" = dontDistribute super."air-th";
+  "airbrake" = dontDistribute super."airbrake";
+  "airship" = dontDistribute super."airship";
+  "aivika" = dontDistribute super."aivika";
+  "aivika-experiment" = dontDistribute super."aivika-experiment";
+  "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
+  "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
+  "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-transformers" = dontDistribute super."aivika-transformers";
+  "ajhc" = dontDistribute super."ajhc";
+  "al" = dontDistribute super."al";
+  "alea" = dontDistribute super."alea";
+  "alex" = doDistribute super."alex_3_1_4";
+  "alex-meta" = dontDistribute super."alex-meta";
+  "alfred" = dontDistribute super."alfred";
+  "alga" = dontDistribute super."alga";
+  "algebra" = dontDistribute super."algebra";
+  "algebra-dag" = dontDistribute super."algebra-dag";
+  "algebra-sql" = dontDistribute super."algebra-sql";
+  "algebraic" = dontDistribute super."algebraic";
+  "algebraic-classes" = dontDistribute super."algebraic-classes";
+  "align" = dontDistribute super."align";
+  "align-text" = dontDistribute super."align-text";
+  "aligned-foreignptr" = dontDistribute super."aligned-foreignptr";
+  "allocated-processor" = dontDistribute super."allocated-processor";
+  "alloy" = dontDistribute super."alloy";
+  "alloy-proxy-fd" = dontDistribute super."alloy-proxy-fd";
+  "almost-fix" = dontDistribute super."almost-fix";
+  "alms" = dontDistribute super."alms";
+  "alpha" = dontDistribute super."alpha";
+  "alpino-tools" = dontDistribute super."alpino-tools";
+  "alsa" = dontDistribute super."alsa";
+  "alsa-core" = dontDistribute super."alsa-core";
+  "alsa-gui" = dontDistribute super."alsa-gui";
+  "alsa-midi" = dontDistribute super."alsa-midi";
+  "alsa-mixer" = dontDistribute super."alsa-mixer";
+  "alsa-pcm" = dontDistribute super."alsa-pcm";
+  "alsa-pcm-tests" = dontDistribute super."alsa-pcm-tests";
+  "alsa-seq" = dontDistribute super."alsa-seq";
+  "alsa-seq-tests" = dontDistribute super."alsa-seq-tests";
+  "altcomposition" = dontDistribute super."altcomposition";
+  "alternative-io" = dontDistribute super."alternative-io";
+  "altfloat" = dontDistribute super."altfloat";
+  "alure" = dontDistribute super."alure";
+  "amazon-emailer" = dontDistribute super."amazon-emailer";
+  "amazon-emailer-client-snap" = dontDistribute super."amazon-emailer-client-snap";
+  "amazon-products" = dontDistribute super."amazon-products";
+  "amazonka" = doDistribute super."amazonka_0_3_6";
+  "amazonka-apigateway" = dontDistribute super."amazonka-apigateway";
+  "amazonka-autoscaling" = doDistribute super."amazonka-autoscaling_0_3_6";
+  "amazonka-cloudformation" = doDistribute super."amazonka-cloudformation_0_3_6";
+  "amazonka-cloudfront" = doDistribute super."amazonka-cloudfront_0_3_6";
+  "amazonka-cloudhsm" = doDistribute super."amazonka-cloudhsm_0_3_6";
+  "amazonka-cloudsearch" = doDistribute super."amazonka-cloudsearch_0_3_6";
+  "amazonka-cloudsearch-domains" = doDistribute super."amazonka-cloudsearch-domains_0_3_6";
+  "amazonka-cloudtrail" = doDistribute super."amazonka-cloudtrail_0_3_6";
+  "amazonka-cloudwatch" = doDistribute super."amazonka-cloudwatch_0_3_6";
+  "amazonka-cloudwatch-logs" = doDistribute super."amazonka-cloudwatch-logs_0_3_6";
+  "amazonka-codecommit" = dontDistribute super."amazonka-codecommit";
+  "amazonka-codedeploy" = doDistribute super."amazonka-codedeploy_0_3_6";
+  "amazonka-codepipeline" = dontDistribute super."amazonka-codepipeline";
+  "amazonka-cognito-identity" = doDistribute super."amazonka-cognito-identity_0_3_6";
+  "amazonka-cognito-sync" = doDistribute super."amazonka-cognito-sync_0_3_6";
+  "amazonka-config" = doDistribute super."amazonka-config_0_3_6";
+  "amazonka-core" = doDistribute super."amazonka-core_0_3_6";
+  "amazonka-datapipeline" = doDistribute super."amazonka-datapipeline_0_3_6";
+  "amazonka-devicefarm" = dontDistribute super."amazonka-devicefarm";
+  "amazonka-directconnect" = doDistribute super."amazonka-directconnect_0_3_6";
+  "amazonka-ds" = dontDistribute super."amazonka-ds";
+  "amazonka-dynamodb" = doDistribute super."amazonka-dynamodb_0_3_6";
+  "amazonka-dynamodb-streams" = dontDistribute super."amazonka-dynamodb-streams";
+  "amazonka-ec2" = doDistribute super."amazonka-ec2_0_3_6_1";
+  "amazonka-ecs" = doDistribute super."amazonka-ecs_0_3_6";
+  "amazonka-efs" = dontDistribute super."amazonka-efs";
+  "amazonka-elasticache" = doDistribute super."amazonka-elasticache_0_3_6";
+  "amazonka-elasticbeanstalk" = doDistribute super."amazonka-elasticbeanstalk_0_3_6";
+  "amazonka-elasticsearch" = dontDistribute super."amazonka-elasticsearch";
+  "amazonka-elastictranscoder" = doDistribute super."amazonka-elastictranscoder_0_3_6";
+  "amazonka-elb" = doDistribute super."amazonka-elb_0_3_6";
+  "amazonka-emr" = doDistribute super."amazonka-emr_0_3_6";
+  "amazonka-glacier" = doDistribute super."amazonka-glacier_0_3_6";
+  "amazonka-iam" = doDistribute super."amazonka-iam_0_3_6";
+  "amazonka-importexport" = doDistribute super."amazonka-importexport_0_3_6";
+  "amazonka-inspector" = dontDistribute super."amazonka-inspector";
+  "amazonka-iot" = dontDistribute super."amazonka-iot";
+  "amazonka-iot-dataplane" = dontDistribute super."amazonka-iot-dataplane";
+  "amazonka-kinesis" = doDistribute super."amazonka-kinesis_0_3_6";
+  "amazonka-kinesis-firehose" = dontDistribute super."amazonka-kinesis-firehose";
+  "amazonka-kms" = doDistribute super."amazonka-kms_0_3_6";
+  "amazonka-lambda" = doDistribute super."amazonka-lambda_0_3_6";
+  "amazonka-marketplace-analytics" = dontDistribute super."amazonka-marketplace-analytics";
+  "amazonka-ml" = doDistribute super."amazonka-ml_0_3_6";
+  "amazonka-opsworks" = doDistribute super."amazonka-opsworks_0_3_6";
+  "amazonka-rds" = doDistribute super."amazonka-rds_0_3_6";
+  "amazonka-redshift" = doDistribute super."amazonka-redshift_0_3_6";
+  "amazonka-route53" = doDistribute super."amazonka-route53_0_3_6_1";
+  "amazonka-route53-domains" = doDistribute super."amazonka-route53-domains_0_3_6";
+  "amazonka-s3" = doDistribute super."amazonka-s3_0_3_6";
+  "amazonka-sdb" = doDistribute super."amazonka-sdb_0_3_6";
+  "amazonka-ses" = doDistribute super."amazonka-ses_0_3_6";
+  "amazonka-sns" = doDistribute super."amazonka-sns_0_3_6";
+  "amazonka-sqs" = doDistribute super."amazonka-sqs_0_3_6";
+  "amazonka-ssm" = doDistribute super."amazonka-ssm_0_3_6";
+  "amazonka-storagegateway" = doDistribute super."amazonka-storagegateway_0_3_6";
+  "amazonka-sts" = doDistribute super."amazonka-sts_0_3_6";
+  "amazonka-support" = doDistribute super."amazonka-support_0_3_6";
+  "amazonka-swf" = doDistribute super."amazonka-swf_0_3_6";
+  "amazonka-test" = dontDistribute super."amazonka-test";
+  "amazonka-waf" = dontDistribute super."amazonka-waf";
+  "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6";
+  "ampersand" = dontDistribute super."ampersand";
+  "amqp-conduit" = dontDistribute super."amqp-conduit";
+  "amrun" = dontDistribute super."amrun";
+  "analyze-client" = dontDistribute super."analyze-client";
+  "anansi" = dontDistribute super."anansi";
+  "anansi-hscolour" = dontDistribute super."anansi-hscolour";
+  "anansi-pandoc" = dontDistribute super."anansi-pandoc";
+  "anatomy" = dontDistribute super."anatomy";
+  "android" = dontDistribute super."android";
+  "android-lint-summary" = dontDistribute super."android-lint-summary";
+  "animalcase" = dontDistribute super."animalcase";
+  "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0";
+  "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
+  "ansi-pretty" = dontDistribute super."ansi-pretty";
+  "ansigraph" = dontDistribute super."ansigraph";
+  "antagonist" = dontDistribute super."antagonist";
+  "antfarm" = dontDistribute super."antfarm";
+  "anticiv" = dontDistribute super."anticiv";
+  "antigate" = dontDistribute super."antigate";
+  "antimirov" = dontDistribute super."antimirov";
+  "antiquoter" = dontDistribute super."antiquoter";
+  "antisplice" = dontDistribute super."antisplice";
+  "antlrc" = dontDistribute super."antlrc";
+  "anydbm" = dontDistribute super."anydbm";
+  "aosd" = dontDistribute super."aosd";
+  "ap-reflect" = dontDistribute super."ap-reflect";
+  "apache-md5" = dontDistribute super."apache-md5";
+  "apelsin" = dontDistribute super."apelsin";
+  "api-builder" = dontDistribute super."api-builder";
+  "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode";
+  "api-tools" = dontDistribute super."api-tools";
+  "apiary-helics" = dontDistribute super."apiary-helics";
+  "apiary-purescript" = dontDistribute super."apiary-purescript";
+  "apis" = dontDistribute super."apis";
+  "apotiki" = dontDistribute super."apotiki";
+  "app-lens" = dontDistribute super."app-lens";
+  "app-settings" = dontDistribute super."app-settings";
+  "appc" = dontDistribute super."appc";
+  "applicative-extras" = dontDistribute super."applicative-extras";
+  "applicative-fail" = dontDistribute super."applicative-fail";
+  "applicative-numbers" = dontDistribute super."applicative-numbers";
+  "applicative-parsec" = dontDistribute super."applicative-parsec";
+  "apply-refact" = dontDistribute super."apply-refact";
+  "apportionment" = dontDistribute super."apportionment";
+  "approx-rand-test" = dontDistribute super."approx-rand-test";
+  "approximate-equality" = dontDistribute super."approximate-equality";
+  "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper";
+  "arb-fft" = dontDistribute super."arb-fft";
+  "arbb-vm" = dontDistribute super."arbb-vm";
+  "archive" = dontDistribute super."archive";
+  "archiver" = dontDistribute super."archiver";
+  "archlinux" = dontDistribute super."archlinux";
+  "archlinux-web" = dontDistribute super."archlinux-web";
+  "archnews" = dontDistribute super."archnews";
+  "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
+  "argon" = dontDistribute super."argon";
+  "argon2" = dontDistribute super."argon2";
+  "argparser" = dontDistribute super."argparser";
+  "arguedit" = dontDistribute super."arguedit";
+  "ariadne" = dontDistribute super."ariadne";
+  "arion" = dontDistribute super."arion";
+  "arith-encode" = dontDistribute super."arith-encode";
+  "arithmatic" = dontDistribute super."arithmatic";
+  "arithmetic" = dontDistribute super."arithmetic";
+  "arithmoi" = dontDistribute super."arithmoi";
+  "armada" = dontDistribute super."armada";
+  "arpa" = dontDistribute super."arpa";
+  "array-forth" = dontDistribute super."array-forth";
+  "array-memoize" = dontDistribute super."array-memoize";
+  "array-primops" = dontDistribute super."array-primops";
+  "array-utils" = dontDistribute super."array-utils";
+  "arrow-improve" = dontDistribute super."arrow-improve";
+  "arrowapply-utils" = dontDistribute super."arrowapply-utils";
+  "arrowp" = dontDistribute super."arrowp";
+  "artery" = dontDistribute super."artery";
+  "arx" = dontDistribute super."arx";
+  "arxiv" = dontDistribute super."arxiv";
+  "ascetic" = dontDistribute super."ascetic";
+  "ascii" = dontDistribute super."ascii";
+  "ascii-progress" = dontDistribute super."ascii-progress";
+  "ascii-vector-avc" = dontDistribute super."ascii-vector-avc";
+  "ascii85-conduit" = dontDistribute super."ascii85-conduit";
+  "asic" = dontDistribute super."asic";
+  "asil" = dontDistribute super."asil";
+  "asn1-data" = dontDistribute super."asn1-data";
+  "asn1dump" = dontDistribute super."asn1dump";
+  "assembler" = dontDistribute super."assembler";
+  "assert" = dontDistribute super."assert";
+  "assert-failure" = dontDistribute super."assert-failure";
+  "assertions" = dontDistribute super."assertions";
+  "assimp" = dontDistribute super."assimp";
+  "astar" = dontDistribute super."astar";
+  "astrds" = dontDistribute super."astrds";
+  "astview" = dontDistribute super."astview";
+  "astview-utils" = dontDistribute super."astview-utils";
+  "async-dejafu" = dontDistribute super."async-dejafu";
+  "async-extras" = dontDistribute super."async-extras";
+  "async-manager" = dontDistribute super."async-manager";
+  "async-pool" = dontDistribute super."async-pool";
+  "asynchronous-exceptions" = dontDistribute super."asynchronous-exceptions";
+  "aterm" = dontDistribute super."aterm";
+  "aterm-utils" = dontDistribute super."aterm-utils";
+  "atl" = dontDistribute super."atl";
+  "atlassian-connect-core" = dontDistribute super."atlassian-connect-core";
+  "atlassian-connect-descriptor" = dontDistribute super."atlassian-connect-descriptor";
+  "atmos" = dontDistribute super."atmos";
+  "atmos-dimensional" = dontDistribute super."atmos-dimensional";
+  "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atom" = dontDistribute super."atom";
+  "atom-basic" = dontDistribute super."atom-basic";
+  "atom-conduit" = dontDistribute super."atom-conduit";
+  "atom-msp430" = dontDistribute super."atom-msp430";
+  "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign";
+  "atomic-primops-vector" = dontDistribute super."atomic-primops-vector";
+  "atomic-write" = dontDistribute super."atomic-write";
+  "atomo" = dontDistribute super."atomo";
+  "atp-haskell" = dontDistribute super."atp-haskell";
+  "attempt" = dontDistribute super."attempt";
+  "atto-lisp" = dontDistribute super."atto-lisp";
+  "attoparsec" = doDistribute super."attoparsec_0_12_1_6";
+  "attoparsec-arff" = dontDistribute super."attoparsec-arff";
+  "attoparsec-binary" = dontDistribute super."attoparsec-binary";
+  "attoparsec-conduit" = dontDistribute super."attoparsec-conduit";
+  "attoparsec-csv" = dontDistribute super."attoparsec-csv";
+  "attoparsec-iteratee" = dontDistribute super."attoparsec-iteratee";
+  "attoparsec-parsec" = dontDistribute super."attoparsec-parsec";
+  "attoparsec-text" = dontDistribute super."attoparsec-text";
+  "attoparsec-text-enumerator" = dontDistribute super."attoparsec-text-enumerator";
+  "attosplit" = dontDistribute super."attosplit";
+  "atuin" = dontDistribute super."atuin";
+  "audacity" = dontDistribute super."audacity";
+  "audiovisual" = dontDistribute super."audiovisual";
+  "augeas" = dontDistribute super."augeas";
+  "augur" = dontDistribute super."augur";
+  "aur" = dontDistribute super."aur";
+  "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
+  "authenticate-ldap" = dontDistribute super."authenticate-ldap";
+  "authinfo-hs" = dontDistribute super."authinfo-hs";
+  "authoring" = dontDistribute super."authoring";
+  "autonix-deps" = dontDistribute super."autonix-deps";
+  "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
+  "autoproc" = dontDistribute super."autoproc";
+  "avahi" = dontDistribute super."avahi";
+  "avatar-generator" = dontDistribute super."avatar-generator";
+  "average" = dontDistribute super."average";
+  "avers" = dontDistribute super."avers";
+  "avl-static" = dontDistribute super."avl-static";
+  "avr-shake" = dontDistribute super."avr-shake";
+  "awesomium" = dontDistribute super."awesomium";
+  "awesomium-glut" = dontDistribute super."awesomium-glut";
+  "awesomium-raw" = dontDistribute super."awesomium-raw";
+  "aws" = doDistribute super."aws_0_12_1";
+  "aws-cloudfront-signer" = dontDistribute super."aws-cloudfront-signer";
+  "aws-configuration-tools" = dontDistribute super."aws-configuration-tools";
+  "aws-dynamodb-conduit" = dontDistribute super."aws-dynamodb-conduit";
+  "aws-dynamodb-streams" = dontDistribute super."aws-dynamodb-streams";
+  "aws-ec2" = dontDistribute super."aws-ec2";
+  "aws-elastic-transcoder" = dontDistribute super."aws-elastic-transcoder";
+  "aws-general" = dontDistribute super."aws-general";
+  "aws-kinesis" = dontDistribute super."aws-kinesis";
+  "aws-kinesis-client" = dontDistribute super."aws-kinesis-client";
+  "aws-kinesis-reshard" = dontDistribute super."aws-kinesis-reshard";
+  "aws-lambda" = dontDistribute super."aws-lambda";
+  "aws-performance-tests" = dontDistribute super."aws-performance-tests";
+  "aws-route53" = dontDistribute super."aws-route53";
+  "aws-sdk" = dontDistribute super."aws-sdk";
+  "aws-sdk-text-converter" = dontDistribute super."aws-sdk-text-converter";
+  "aws-sdk-xml-unordered" = dontDistribute super."aws-sdk-xml-unordered";
+  "aws-sign4" = dontDistribute super."aws-sign4";
+  "aws-sns" = dontDistribute super."aws-sns";
+  "azure-acs" = dontDistribute super."azure-acs";
+  "azure-service-api" = dontDistribute super."azure-service-api";
+  "azure-servicebus" = dontDistribute super."azure-servicebus";
+  "azurify" = dontDistribute super."azurify";
+  "b-tree" = dontDistribute super."b-tree";
+  "babylon" = dontDistribute super."babylon";
+  "backdropper" = dontDistribute super."backdropper";
+  "backtracking-exceptions" = dontDistribute super."backtracking-exceptions";
+  "backward-state" = dontDistribute super."backward-state";
+  "bacteria" = dontDistribute super."bacteria";
+  "bag" = dontDistribute super."bag";
+  "bamboo" = dontDistribute super."bamboo";
+  "bamboo-launcher" = dontDistribute super."bamboo-launcher";
+  "bamboo-plugin-highlight" = dontDistribute super."bamboo-plugin-highlight";
+  "bamboo-plugin-photo" = dontDistribute super."bamboo-plugin-photo";
+  "bamboo-theme-blueprint" = dontDistribute super."bamboo-theme-blueprint";
+  "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
+  "bamse" = dontDistribute super."bamse";
+  "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
+  "banwords" = dontDistribute super."banwords";
+  "barchart" = dontDistribute super."barchart";
+  "barcodes-code128" = dontDistribute super."barcodes-code128";
+  "barecheck" = dontDistribute super."barecheck";
+  "barley" = dontDistribute super."barley";
+  "barrie" = dontDistribute super."barrie";
+  "barrier" = dontDistribute super."barrier";
+  "barrier-monad" = dontDistribute super."barrier-monad";
+  "base-generics" = dontDistribute super."base-generics";
+  "base-io-access" = dontDistribute super."base-io-access";
+  "base-noprelude" = dontDistribute super."base-noprelude";
+  "base32-bytestring" = dontDistribute super."base32-bytestring";
+  "base58-bytestring" = dontDistribute super."base58-bytestring";
+  "base58address" = dontDistribute super."base58address";
+  "base64-conduit" = dontDistribute super."base64-conduit";
+  "base91" = dontDistribute super."base91";
+  "basex-client" = dontDistribute super."basex-client";
+  "bash" = dontDistribute super."bash";
+  "basic-lens" = dontDistribute super."basic-lens";
+  "basic-sop" = dontDistribute super."basic-sop";
+  "baskell" = dontDistribute super."baskell";
+  "battlenet" = dontDistribute super."battlenet";
+  "battlenet-yesod" = dontDistribute super."battlenet-yesod";
+  "battleships" = dontDistribute super."battleships";
+  "bayes-stack" = dontDistribute super."bayes-stack";
+  "bbdb" = dontDistribute super."bbdb";
+  "bbi" = dontDistribute super."bbi";
+  "bcrypt" = doDistribute super."bcrypt_0_0_6";
+  "bdd" = dontDistribute super."bdd";
+  "bdelta" = dontDistribute super."bdelta";
+  "bdo" = dontDistribute super."bdo";
+  "beamable" = dontDistribute super."beamable";
+  "beautifHOL" = dontDistribute super."beautifHOL";
+  "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
+  "bein" = dontDistribute super."bein";
+  "benchmark-function" = dontDistribute super."benchmark-function";
+  "benchpress" = dontDistribute super."benchpress";
+  "bencoding" = dontDistribute super."bencoding";
+  "berkeleydb" = dontDistribute super."berkeleydb";
+  "berp" = dontDistribute super."berp";
+  "bert" = dontDistribute super."bert";
+  "besout" = dontDistribute super."besout";
+  "bet" = dontDistribute super."bet";
+  "betacode" = dontDistribute super."betacode";
+  "between" = dontDistribute super."between";
+  "bf-cata" = dontDistribute super."bf-cata";
+  "bff" = dontDistribute super."bff";
+  "bff-mono" = dontDistribute super."bff-mono";
+  "bgmax" = dontDistribute super."bgmax";
+  "bgzf" = dontDistribute super."bgzf";
+  "bibtex" = dontDistribute super."bibtex";
+  "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
+  "bidispec" = dontDistribute super."bidispec";
+  "bidispec-extras" = dontDistribute super."bidispec-extras";
+  "bifunctors" = doDistribute super."bifunctors_5";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
+  "billboard-parser" = dontDistribute super."billboard-parser";
+  "billeksah-forms" = dontDistribute super."billeksah-forms";
+  "billeksah-main" = dontDistribute super."billeksah-main";
+  "billeksah-main-static" = dontDistribute super."billeksah-main-static";
+  "billeksah-pane" = dontDistribute super."billeksah-pane";
+  "billeksah-services" = dontDistribute super."billeksah-services";
+  "bimap" = dontDistribute super."bimap";
+  "bimap-server" = dontDistribute super."bimap-server";
+  "bimaps" = dontDistribute super."bimaps";
+  "binary-bits" = dontDistribute super."binary-bits";
+  "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-derive" = dontDistribute super."binary-derive";
+  "binary-enum" = dontDistribute super."binary-enum";
+  "binary-file" = dontDistribute super."binary-file";
+  "binary-generic" = dontDistribute super."binary-generic";
+  "binary-indexed-tree" = dontDistribute super."binary-indexed-tree";
+  "binary-literal-qq" = dontDistribute super."binary-literal-qq";
+  "binary-parser" = dontDistribute super."binary-parser";
+  "binary-protocol" = dontDistribute super."binary-protocol";
+  "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
+  "binary-shared" = dontDistribute super."binary-shared";
+  "binary-state" = dontDistribute super."binary-state";
+  "binary-store" = dontDistribute super."binary-store";
+  "binary-streams" = dontDistribute super."binary-streams";
+  "binary-strict" = dontDistribute super."binary-strict";
+  "binary-typed" = dontDistribute super."binary-typed";
+  "binarydefer" = dontDistribute super."binarydefer";
+  "bind-marshal" = dontDistribute super."bind-marshal";
+  "binding-core" = dontDistribute super."binding-core";
+  "binding-gtk" = dontDistribute super."binding-gtk";
+  "binding-wx" = dontDistribute super."binding-wx";
+  "bindings" = dontDistribute super."bindings";
+  "bindings-EsounD" = dontDistribute super."bindings-EsounD";
+  "bindings-GLFW" = dontDistribute super."bindings-GLFW";
+  "bindings-K8055" = dontDistribute super."bindings-K8055";
+  "bindings-apr" = dontDistribute super."bindings-apr";
+  "bindings-apr-util" = dontDistribute super."bindings-apr-util";
+  "bindings-audiofile" = dontDistribute super."bindings-audiofile";
+  "bindings-bfd" = dontDistribute super."bindings-bfd";
+  "bindings-cctools" = dontDistribute super."bindings-cctools";
+  "bindings-codec2" = dontDistribute super."bindings-codec2";
+  "bindings-common" = dontDistribute super."bindings-common";
+  "bindings-dc1394" = dontDistribute super."bindings-dc1394";
+  "bindings-directfb" = dontDistribute super."bindings-directfb";
+  "bindings-eskit" = dontDistribute super."bindings-eskit";
+  "bindings-fann" = dontDistribute super."bindings-fann";
+  "bindings-fluidsynth" = dontDistribute super."bindings-fluidsynth";
+  "bindings-friso" = dontDistribute super."bindings-friso";
+  "bindings-glib" = dontDistribute super."bindings-glib";
+  "bindings-gobject" = dontDistribute super."bindings-gobject";
+  "bindings-gpgme" = dontDistribute super."bindings-gpgme";
+  "bindings-gsl" = dontDistribute super."bindings-gsl";
+  "bindings-gts" = dontDistribute super."bindings-gts";
+  "bindings-hamlib" = dontDistribute super."bindings-hamlib";
+  "bindings-hdf5" = dontDistribute super."bindings-hdf5";
+  "bindings-levmar" = dontDistribute super."bindings-levmar";
+  "bindings-libcddb" = dontDistribute super."bindings-libcddb";
+  "bindings-libffi" = dontDistribute super."bindings-libffi";
+  "bindings-libftdi" = dontDistribute super."bindings-libftdi";
+  "bindings-librrd" = dontDistribute super."bindings-librrd";
+  "bindings-libstemmer" = dontDistribute super."bindings-libstemmer";
+  "bindings-libusb" = dontDistribute super."bindings-libusb";
+  "bindings-libv4l2" = dontDistribute super."bindings-libv4l2";
+  "bindings-libzip" = dontDistribute super."bindings-libzip";
+  "bindings-linux-videodev2" = dontDistribute super."bindings-linux-videodev2";
+  "bindings-lxc" = dontDistribute super."bindings-lxc";
+  "bindings-mmap" = dontDistribute super."bindings-mmap";
+  "bindings-mpdecimal" = dontDistribute super."bindings-mpdecimal";
+  "bindings-nettle" = dontDistribute super."bindings-nettle";
+  "bindings-parport" = dontDistribute super."bindings-parport";
+  "bindings-portaudio" = dontDistribute super."bindings-portaudio";
+  "bindings-posix" = dontDistribute super."bindings-posix";
+  "bindings-potrace" = dontDistribute super."bindings-potrace";
+  "bindings-ppdev" = dontDistribute super."bindings-ppdev";
+  "bindings-saga-cmd" = dontDistribute super."bindings-saga-cmd";
+  "bindings-sane" = dontDistribute super."bindings-sane";
+  "bindings-sc3" = dontDistribute super."bindings-sc3";
+  "bindings-sipc" = dontDistribute super."bindings-sipc";
+  "bindings-sophia" = dontDistribute super."bindings-sophia";
+  "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
+  "bindings-svm" = dontDistribute super."bindings-svm";
+  "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-yices" = dontDistribute super."bindings-yices";
+  "bindynamic" = dontDistribute super."bindynamic";
+  "binembed" = dontDistribute super."binembed";
+  "binembed-example" = dontDistribute super."binembed-example";
+  "bio" = dontDistribute super."bio";
+  "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
+  "biophd" = dontDistribute super."biophd";
+  "biosff" = dontDistribute super."biosff";
+  "biostockholm" = dontDistribute super."biostockholm";
+  "bird" = dontDistribute super."bird";
+  "bit-array" = dontDistribute super."bit-array";
+  "bit-vector" = dontDistribute super."bit-vector";
+  "bitarray" = dontDistribute super."bitarray";
+  "bitcoin-rpc" = dontDistribute super."bitcoin-rpc";
+  "bitly-cli" = dontDistribute super."bitly-cli";
+  "bitmap" = dontDistribute super."bitmap";
+  "bitmap-opengl" = dontDistribute super."bitmap-opengl";
+  "bitmaps" = dontDistribute super."bitmaps";
+  "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-conduit" = dontDistribute super."bits-conduit";
+  "bits-extras" = dontDistribute super."bits-extras";
+  "bitset" = dontDistribute super."bitset";
+  "bitspeak" = dontDistribute super."bitspeak";
+  "bitstream" = dontDistribute super."bitstream";
+  "bitstring" = dontDistribute super."bitstring";
+  "bittorrent" = dontDistribute super."bittorrent";
+  "bitvec" = dontDistribute super."bitvec";
+  "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
+  "bk-tree" = dontDistribute super."bk-tree";
+  "bkr" = dontDistribute super."bkr";
+  "bktrees" = dontDistribute super."bktrees";
+  "bla" = dontDistribute super."bla";
+  "black-jewel" = dontDistribute super."black-jewel";
+  "blacktip" = dontDistribute super."blacktip";
+  "blake2" = dontDistribute super."blake2";
+  "blakesum" = dontDistribute super."blakesum";
+  "blakesum-demo" = dontDistribute super."blakesum-demo";
+  "blank-canvas" = dontDistribute super."blank-canvas";
+  "blas" = dontDistribute super."blas";
+  "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
+  "blaze" = dontDistribute super."blaze";
+  "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
+  "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
+  "blaze-from-html" = dontDistribute super."blaze-from-html";
+  "blaze-html-contrib" = dontDistribute super."blaze-html-contrib";
+  "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat";
+  "blaze-html-truncate" = dontDistribute super."blaze-html-truncate";
+  "blaze-json" = dontDistribute super."blaze-json";
+  "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-textual-native" = dontDistribute super."blaze-textual-native";
+  "blazeMarker" = dontDistribute super."blazeMarker";
+  "blink1" = dontDistribute super."blink1";
+  "blip" = dontDistribute super."blip";
+  "bliplib" = dontDistribute super."bliplib";
+  "blocking-transactions" = dontDistribute super."blocking-transactions";
+  "blogination" = dontDistribute super."blogination";
+  "bloodhound" = doDistribute super."bloodhound_0_7_0_1";
+  "bloxorz" = dontDistribute super."bloxorz";
+  "blubber" = dontDistribute super."blubber";
+  "blubber-server" = dontDistribute super."blubber-server";
+  "bluetile" = dontDistribute super."bluetile";
+  "bluetileutils" = dontDistribute super."bluetileutils";
+  "blunt" = dontDistribute super."blunt";
+  "board-games" = dontDistribute super."board-games";
+  "bogre-banana" = dontDistribute super."bogre-banana";
+  "bond" = dontDistribute super."bond";
+  "boolean-list" = dontDistribute super."boolean-list";
+  "boolean-normal-forms" = dontDistribute super."boolean-normal-forms";
+  "boolexpr" = dontDistribute super."boolexpr";
+  "bools" = dontDistribute super."bools";
+  "boolsimplifier" = dontDistribute super."boolsimplifier";
+  "boomange" = dontDistribute super."boomange";
+  "boomerang" = dontDistribute super."boomerang";
+  "boomslang" = dontDistribute super."boomslang";
+  "borel" = dontDistribute super."borel";
+  "bot" = dontDistribute super."bot";
+  "both" = dontDistribute super."both";
+  "botpp" = dontDistribute super."botpp";
+  "bound-gen" = dontDistribute super."bound-gen";
+  "bounded-tchan" = dontDistribute super."bounded-tchan";
+  "boundingboxes" = dontDistribute super."boundingboxes";
+  "bowntz" = dontDistribute super."bowntz";
+  "bpann" = dontDistribute super."bpann";
+  "brainfuck-monad" = dontDistribute super."brainfuck-monad";
+  "brainfuck-tut" = dontDistribute super."brainfuck-tut";
+  "break" = dontDistribute super."break";
+  "breakout" = dontDistribute super."breakout";
+  "breve" = dontDistribute super."breve";
+  "brians-brain" = dontDistribute super."brians-brain";
+  "brick" = dontDistribute super."brick";
+  "brillig" = dontDistribute super."brillig";
+  "broccoli" = dontDistribute super."broccoli";
+  "broker-haskell" = dontDistribute super."broker-haskell";
+  "bsd-sysctl" = dontDistribute super."bsd-sysctl";
+  "bson-generic" = dontDistribute super."bson-generic";
+  "bson-generics" = dontDistribute super."bson-generics";
+  "bson-lens" = dontDistribute super."bson-lens";
+  "bson-mapping" = dontDistribute super."bson-mapping";
+  "bspack" = dontDistribute super."bspack";
+  "bsparse" = dontDistribute super."bsparse";
+  "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffon" = dontDistribute super."buffon";
+  "bugzilla" = dontDistribute super."bugzilla";
+  "buildable" = dontDistribute super."buildable";
+  "buildbox" = dontDistribute super."buildbox";
+  "buildbox-tools" = dontDistribute super."buildbox-tools";
+  "buildwrapper" = dontDistribute super."buildwrapper";
+  "bullet" = dontDistribute super."bullet";
+  "burst-detection" = dontDistribute super."burst-detection";
+  "bus-pirate" = dontDistribute super."bus-pirate";
+  "buster" = dontDistribute super."buster";
+  "buster-gtk" = dontDistribute super."buster-gtk";
+  "buster-network" = dontDistribute super."buster-network";
+  "bustle" = dontDistribute super."bustle";
+  "butterflies" = dontDistribute super."butterflies";
+  "bv" = dontDistribute super."bv";
+  "byline" = dontDistribute super."byline";
+  "bytable" = dontDistribute super."bytable";
+  "byteset" = dontDistribute super."byteset";
+  "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary";
+  "bytestring-class" = dontDistribute super."bytestring-class";
+  "bytestring-csv" = dontDistribute super."bytestring-csv";
+  "bytestring-delta" = dontDistribute super."bytestring-delta";
+  "bytestring-from" = dontDistribute super."bytestring-from";
+  "bytestring-nums" = dontDistribute super."bytestring-nums";
+  "bytestring-plain" = dontDistribute super."bytestring-plain";
+  "bytestring-rematch" = dontDistribute super."bytestring-rematch";
+  "bytestring-short" = dontDistribute super."bytestring-short";
+  "bytestring-show" = dontDistribute super."bytestring-show";
+  "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder";
+  "bytestringparser" = dontDistribute super."bytestringparser";
+  "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
+  "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "c-dsl" = dontDistribute super."c-dsl";
+  "c-io" = dontDistribute super."c-io";
+  "c-storable-deriving" = dontDistribute super."c-storable-deriving";
+  "c0check" = dontDistribute super."c0check";
+  "c0parser" = dontDistribute super."c0parser";
+  "c10k" = dontDistribute super."c10k";
+  "c2hs" = doDistribute super."c2hs_0_25_2";
+  "c2hsc" = dontDistribute super."c2hsc";
+  "cab" = dontDistribute super."cab";
+  "cabal-audit" = dontDistribute super."cabal-audit";
+  "cabal-bounds" = dontDistribute super."cabal-bounds";
+  "cabal-cargs" = dontDistribute super."cabal-cargs";
+  "cabal-constraints" = dontDistribute super."cabal-constraints";
+  "cabal-db" = dontDistribute super."cabal-db";
+  "cabal-debian" = doDistribute super."cabal-debian_4_30_2";
+  "cabal-dependency-licenses" = dontDistribute super."cabal-dependency-licenses";
+  "cabal-dev" = dontDistribute super."cabal-dev";
+  "cabal-dir" = dontDistribute super."cabal-dir";
+  "cabal-ghc-dynflags" = dontDistribute super."cabal-ghc-dynflags";
+  "cabal-ghci" = dontDistribute super."cabal-ghci";
+  "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
+  "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
+  "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
+  "cabal-install-ghc74" = dontDistribute super."cabal-install-ghc74";
+  "cabal-lenses" = dontDistribute super."cabal-lenses";
+  "cabal-macosx" = dontDistribute super."cabal-macosx";
+  "cabal-meta" = dontDistribute super."cabal-meta";
+  "cabal-mon" = dontDistribute super."cabal-mon";
+  "cabal-nirvana" = dontDistribute super."cabal-nirvana";
+  "cabal-progdeps" = dontDistribute super."cabal-progdeps";
+  "cabal-query" = dontDistribute super."cabal-query";
+  "cabal-scripts" = dontDistribute super."cabal-scripts";
+  "cabal-setup" = dontDistribute super."cabal-setup";
+  "cabal-sign" = dontDistribute super."cabal-sign";
+  "cabal-sort" = dontDistribute super."cabal-sort";
+  "cabal-test" = dontDistribute super."cabal-test";
+  "cabal-test-bin" = dontDistribute super."cabal-test-bin";
+  "cabal-test-compat" = dontDistribute super."cabal-test-compat";
+  "cabal-test-quickcheck" = dontDistribute super."cabal-test-quickcheck";
+  "cabal-uninstall" = dontDistribute super."cabal-uninstall";
+  "cabal-upload" = dontDistribute super."cabal-upload";
+  "cabal2arch" = dontDistribute super."cabal2arch";
+  "cabal2doap" = dontDistribute super."cabal2doap";
+  "cabal2ebuild" = dontDistribute super."cabal2ebuild";
+  "cabal2ghci" = dontDistribute super."cabal2ghci";
+  "cabal2nix" = dontDistribute super."cabal2nix";
+  "cabal2spec" = dontDistribute super."cabal2spec";
+  "cabalQuery" = dontDistribute super."cabalQuery";
+  "cabalg" = dontDistribute super."cabalg";
+  "cabalgraph" = dontDistribute super."cabalgraph";
+  "cabalmdvrpm" = dontDistribute super."cabalmdvrpm";
+  "cabalrpmdeps" = dontDistribute super."cabalrpmdeps";
+  "cabalvchk" = dontDistribute super."cabalvchk";
+  "cabin" = dontDistribute super."cabin";
+  "cabocha" = dontDistribute super."cabocha";
+  "cached-io" = dontDistribute super."cached-io";
+  "cached-traversable" = dontDistribute super."cached-traversable";
+  "cacophony" = dontDistribute super."cacophony";
+  "caf" = dontDistribute super."caf";
+  "cafeteria-prelude" = dontDistribute super."cafeteria-prelude";
+  "caffegraph" = dontDistribute super."caffegraph";
+  "cairo-appbase" = dontDistribute super."cairo-appbase";
+  "cake" = dontDistribute super."cake";
+  "cake3" = dontDistribute super."cake3";
+  "cakyrespa" = dontDistribute super."cakyrespa";
+  "cal3d" = dontDistribute super."cal3d";
+  "cal3d-examples" = dontDistribute super."cal3d-examples";
+  "cal3d-opengl" = dontDistribute super."cal3d-opengl";
+  "calc" = dontDistribute super."calc";
+  "calculator" = dontDistribute super."calculator";
+  "caldims" = dontDistribute super."caldims";
+  "caledon" = dontDistribute super."caledon";
+  "call" = dontDistribute super."call";
+  "call-haskell-from-anything" = dontDistribute super."call-haskell-from-anything";
+  "camh" = dontDistribute super."camh";
+  "campfire" = dontDistribute super."campfire";
+  "canonical-filepath" = dontDistribute super."canonical-filepath";
+  "canteven-config" = dontDistribute super."canteven-config";
+  "canteven-listen-http" = dontDistribute super."canteven-listen-http";
+  "canteven-log" = dontDistribute super."canteven-log";
+  "canteven-template" = dontDistribute super."canteven-template";
+  "cantor" = dontDistribute super."cantor";
+  "cao" = dontDistribute super."cao";
+  "cap" = dontDistribute super."cap";
+  "capped-list" = dontDistribute super."capped-list";
+  "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
+  "caramia" = dontDistribute super."caramia";
+  "carboncopy" = dontDistribute super."carboncopy";
+  "carettah" = dontDistribute super."carettah";
+  "carray" = dontDistribute super."carray";
+  "casadi-bindings" = dontDistribute super."casadi-bindings";
+  "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
+  "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
+  "casadi-bindings-internal" = dontDistribute super."casadi-bindings-internal";
+  "casadi-bindings-ipopt-interface" = dontDistribute super."casadi-bindings-ipopt-interface";
+  "casadi-bindings-snopt-interface" = dontDistribute super."casadi-bindings-snopt-interface";
+  "cascading" = dontDistribute super."cascading";
+  "case-conversion" = dontDistribute super."case-conversion";
+  "cased" = dontDistribute super."cased";
+  "cash" = dontDistribute super."cash";
+  "casing" = dontDistribute super."casing";
+  "cassandra-cql" = dontDistribute super."cassandra-cql";
+  "cassandra-thrift" = dontDistribute super."cassandra-thrift";
+  "cassava-conduit" = dontDistribute super."cassava-conduit";
+  "cassava-streams" = dontDistribute super."cassava-streams";
+  "cassette" = dontDistribute super."cassette";
+  "cassy" = dontDistribute super."cassy";
+  "castle" = dontDistribute super."castle";
+  "casui" = dontDistribute super."casui";
+  "catamorphism" = dontDistribute super."catamorphism";
+  "catch-fd" = dontDistribute super."catch-fd";
+  "categorical-algebra" = dontDistribute super."categorical-algebra";
+  "categories" = dontDistribute super."categories";
+  "category-extras" = dontDistribute super."category-extras";
+  "cayley-dickson" = dontDistribute super."cayley-dickson";
+  "cblrepo" = dontDistribute super."cblrepo";
+  "cci" = dontDistribute super."cci";
+  "ccnx" = dontDistribute super."ccnx";
+  "cctools-workqueue" = dontDistribute super."cctools-workqueue";
+  "cedict" = dontDistribute super."cedict";
+  "cef" = dontDistribute super."cef";
+  "ceilometer-common" = dontDistribute super."ceilometer-common";
+  "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
+  "cerberus" = dontDistribute super."cerberus";
+  "cereal-derive" = dontDistribute super."cereal-derive";
+  "cereal-enumerator" = dontDistribute super."cereal-enumerator";
+  "cereal-ieee754" = dontDistribute super."cereal-ieee754";
+  "cereal-plus" = dontDistribute super."cereal-plus";
+  "cereal-text" = dontDistribute super."cereal-text";
+  "certificate" = dontDistribute super."certificate";
+  "cf" = dontDistribute super."cf";
+  "cfipu" = dontDistribute super."cfipu";
+  "cflp" = dontDistribute super."cflp";
+  "cfopu" = dontDistribute super."cfopu";
+  "cg" = dontDistribute super."cg";
+  "cgen" = dontDistribute super."cgen";
+  "cgi-undecidable" = dontDistribute super."cgi-undecidable";
+  "cgi-utils" = dontDistribute super."cgi-utils";
+  "cgrep" = dontDistribute super."cgrep";
+  "chain-codes" = dontDistribute super."chain-codes";
+  "chalk" = dontDistribute super."chalk";
+  "chalkboard" = dontDistribute super."chalkboard";
+  "chalkboard-viewer" = dontDistribute super."chalkboard-viewer";
+  "chalmers-lava2000" = dontDistribute super."chalmers-lava2000";
+  "chan-split" = dontDistribute super."chan-split";
+  "change-monger" = dontDistribute super."change-monger";
+  "charade" = dontDistribute super."charade";
+  "charsetdetect" = dontDistribute super."charsetdetect";
+  "charsetdetect-ae" = dontDistribute super."charsetdetect-ae";
+  "chart-histogram" = dontDistribute super."chart-histogram";
+  "chaselev-deque" = dontDistribute super."chaselev-deque";
+  "chatter" = dontDistribute super."chatter";
+  "chatty" = dontDistribute super."chatty";
+  "chatty-text" = dontDistribute super."chatty-text";
+  "chatty-utils" = dontDistribute super."chatty-utils";
+  "cheapskate" = dontDistribute super."cheapskate";
+  "check-pvp" = dontDistribute super."check-pvp";
+  "checked" = dontDistribute super."checked";
+  "chell-hunit" = dontDistribute super."chell-hunit";
+  "chesshs" = dontDistribute super."chesshs";
+  "chevalier-common" = dontDistribute super."chevalier-common";
+  "chp" = dontDistribute super."chp";
+  "chp-mtl" = dontDistribute super."chp-mtl";
+  "chp-plus" = dontDistribute super."chp-plus";
+  "chp-spec" = dontDistribute super."chp-spec";
+  "chp-transformers" = dontDistribute super."chp-transformers";
+  "chronograph" = dontDistribute super."chronograph";
+  "chu2" = dontDistribute super."chu2";
+  "chuchu" = dontDistribute super."chuchu";
+  "chunks" = dontDistribute super."chunks";
+  "chunky" = dontDistribute super."chunky";
+  "church-list" = dontDistribute super."church-list";
+  "cil" = dontDistribute super."cil";
+  "cinvoke" = dontDistribute super."cinvoke";
+  "cio" = dontDistribute super."cio";
+  "cipher-rc5" = dontDistribute super."cipher-rc5";
+  "ciphersaber2" = dontDistribute super."ciphersaber2";
+  "circ" = dontDistribute super."circ";
+  "cirru-parser" = dontDistribute super."cirru-parser";
+  "citation-resolve" = dontDistribute super."citation-resolve";
+  "citeproc-hs" = dontDistribute super."citeproc-hs";
+  "citeproc-hs-pandoc-filter" = dontDistribute super."citeproc-hs-pandoc-filter";
+  "cityhash" = dontDistribute super."cityhash";
+  "cjk" = dontDistribute super."cjk";
+  "clac" = dontDistribute super."clac";
+  "clafer" = dontDistribute super."clafer";
+  "claferIG" = dontDistribute super."claferIG";
+  "claferwiki" = dontDistribute super."claferwiki";
+  "clang-pure" = dontDistribute super."clang-pure";
+  "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
+  "clash" = dontDistribute super."clash";
+  "clash-ghc" = doDistribute super."clash-ghc_0_5_15";
+  "clash-lib" = doDistribute super."clash-lib_0_5_13";
+  "clash-prelude" = doDistribute super."clash-prelude_0_9_3";
+  "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck";
+  "clash-systemverilog" = doDistribute super."clash-systemverilog_0_5_10";
+  "clash-verilog" = doDistribute super."clash-verilog_0_5_10";
+  "clash-vhdl" = doDistribute super."clash-vhdl_0_5_12";
+  "classify" = dontDistribute super."classify";
+  "classy-parallel" = dontDistribute super."classy-parallel";
+  "clckwrks" = dontDistribute super."clckwrks";
+  "clckwrks-cli" = dontDistribute super."clckwrks-cli";
+  "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
+  "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
+  "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
+  "clckwrks-plugin-media" = dontDistribute super."clckwrks-plugin-media";
+  "clckwrks-plugin-page" = dontDistribute super."clckwrks-plugin-page";
+  "clckwrks-theme-bootstrap" = dontDistribute super."clckwrks-theme-bootstrap";
+  "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks";
+  "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap";
+  "cld2" = dontDistribute super."cld2";
+  "clean-home" = dontDistribute super."clean-home";
+  "clean-unions" = dontDistribute super."clean-unions";
+  "cless" = dontDistribute super."cless";
+  "clevercss" = dontDistribute super."clevercss";
+  "cli" = dontDistribute super."cli";
+  "click-clack" = dontDistribute super."click-clack";
+  "clifford" = dontDistribute super."clifford";
+  "clippard" = dontDistribute super."clippard";
+  "clipper" = dontDistribute super."clipper";
+  "clippings" = dontDistribute super."clippings";
+  "clist" = dontDistribute super."clist";
+  "clock" = doDistribute super."clock_0_5_1";
+  "clocked" = dontDistribute super."clocked";
+  "clogparse" = dontDistribute super."clogparse";
+  "clone-all" = dontDistribute super."clone-all";
+  "closure" = dontDistribute super."closure";
+  "cloud-haskell" = dontDistribute super."cloud-haskell";
+  "cloudfront-signer" = dontDistribute super."cloudfront-signer";
+  "cloudyfs" = dontDistribute super."cloudyfs";
+  "cltw" = dontDistribute super."cltw";
+  "clua" = dontDistribute super."clua";
+  "cluss" = dontDistribute super."cluss";
+  "clustertools" = dontDistribute super."clustertools";
+  "clutterhs" = dontDistribute super."clutterhs";
+  "cmaes" = dontDistribute super."cmaes";
+  "cmath" = dontDistribute super."cmath";
+  "cmathml3" = dontDistribute super."cmathml3";
+  "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs-browser" = dontDistribute super."cmdargs-browser";
+  "cmdlib" = dontDistribute super."cmdlib";
+  "cmdtheline" = dontDistribute super."cmdtheline";
+  "cml" = dontDistribute super."cml";
+  "cmonad" = dontDistribute super."cmonad";
+  "cmu" = dontDistribute super."cmu";
+  "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
+  "cndict" = dontDistribute super."cndict";
+  "codec" = dontDistribute super."codec";
+  "codec-libevent" = dontDistribute super."codec-libevent";
+  "codec-mbox" = dontDistribute super."codec-mbox";
+  "codecov-haskell" = dontDistribute super."codecov-haskell";
+  "codemonitor" = dontDistribute super."codemonitor";
+  "codepad" = dontDistribute super."codepad";
+  "codex" = doDistribute super."codex_0_3_0_10";
+  "codo-notation" = dontDistribute super."codo-notation";
+  "cofunctor" = dontDistribute super."cofunctor";
+  "cognimeta-utils" = dontDistribute super."cognimeta-utils";
+  "coinbase-exchange" = dontDistribute super."coinbase-exchange";
+  "colada" = dontDistribute super."colada";
+  "colchis" = dontDistribute super."colchis";
+  "collada-output" = dontDistribute super."collada-output";
+  "collada-types" = dontDistribute super."collada-types";
+  "collapse-util" = dontDistribute super."collapse-util";
+  "collection-json" = dontDistribute super."collection-json";
+  "collections" = dontDistribute super."collections";
+  "collections-api" = dontDistribute super."collections-api";
+  "collections-base-instances" = dontDistribute super."collections-base-instances";
+  "colock" = dontDistribute super."colock";
+  "colorize-haskell" = dontDistribute super."colorize-haskell";
+  "colors" = dontDistribute super."colors";
+  "coltrane" = dontDistribute super."coltrane";
+  "com" = dontDistribute super."com";
+  "combinat" = dontDistribute super."combinat";
+  "combinat-diagrams" = dontDistribute super."combinat-diagrams";
+  "combinator-interactive" = dontDistribute super."combinator-interactive";
+  "combinatorial-problems" = dontDistribute super."combinatorial-problems";
+  "combinatorics" = dontDistribute super."combinatorics";
+  "combobuffer" = dontDistribute super."combobuffer";
+  "comfort-graph" = dontDistribute super."comfort-graph";
+  "command" = dontDistribute super."command";
+  "command-qq" = dontDistribute super."command-qq";
+  "commodities" = dontDistribute super."commodities";
+  "commsec" = dontDistribute super."commsec";
+  "commsec-keyexchange" = dontDistribute super."commsec-keyexchange";
+  "commutative" = dontDistribute super."commutative";
+  "comonad-extras" = dontDistribute super."comonad-extras";
+  "comonad-random" = dontDistribute super."comonad-random";
+  "compact-map" = dontDistribute super."compact-map";
+  "compact-socket" = dontDistribute super."compact-socket";
+  "compact-string" = dontDistribute super."compact-string";
+  "compact-string-fix" = dontDistribute super."compact-string-fix";
+  "compactmap" = dontDistribute super."compactmap";
+  "compare-type" = dontDistribute super."compare-type";
+  "compdata-automata" = dontDistribute super."compdata-automata";
+  "compdata-dags" = dontDistribute super."compdata-dags";
+  "compdata-param" = dontDistribute super."compdata-param";
+  "compensated" = dontDistribute super."compensated";
+  "competition" = dontDistribute super."competition";
+  "compilation" = dontDistribute super."compilation";
+  "complex-generic" = dontDistribute super."complex-generic";
+  "complex-integrate" = dontDistribute super."complex-integrate";
+  "complexity" = dontDistribute super."complexity";
+  "compose-ltr" = dontDistribute super."compose-ltr";
+  "compose-trans" = dontDistribute super."compose-trans";
+  "composition-extra" = doDistribute super."composition-extra_1_1_0";
+  "composition-tree" = dontDistribute super."composition-tree";
+  "compression" = dontDistribute super."compression";
+  "compstrat" = dontDistribute super."compstrat";
+  "comptrans" = dontDistribute super."comptrans";
+  "computational-algebra" = dontDistribute super."computational-algebra";
+  "computations" = dontDistribute super."computations";
+  "conceit" = dontDistribute super."conceit";
+  "concorde" = dontDistribute super."concorde";
+  "concraft" = dontDistribute super."concraft";
+  "concraft-hr" = dontDistribute super."concraft-hr";
+  "concraft-pl" = dontDistribute super."concraft-pl";
+  "concrete-relaxng-parser" = dontDistribute super."concrete-relaxng-parser";
+  "concrete-typerep" = dontDistribute super."concrete-typerep";
+  "concurrent-barrier" = dontDistribute super."concurrent-barrier";
+  "concurrent-dns-cache" = dontDistribute super."concurrent-dns-cache";
+  "concurrent-machines" = dontDistribute super."concurrent-machines";
+  "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-sa" = dontDistribute super."concurrent-sa";
+  "concurrent-split" = dontDistribute super."concurrent-split";
+  "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-utilities" = dontDistribute super."concurrent-utilities";
+  "concurrentoutput" = dontDistribute super."concurrentoutput";
+  "condor" = dontDistribute super."condor";
+  "condorcet" = dontDistribute super."condorcet";
+  "conductive-base" = dontDistribute super."conductive-base";
+  "conductive-clock" = dontDistribute super."conductive-clock";
+  "conductive-hsc3" = dontDistribute super."conductive-hsc3";
+  "conductive-song" = dontDistribute super."conductive-song";
+  "conduit-audio" = dontDistribute super."conduit-audio";
+  "conduit-audio-lame" = dontDistribute super."conduit-audio-lame";
+  "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate";
+  "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile";
+  "conduit-connection" = dontDistribute super."conduit-connection";
+  "conduit-iconv" = dontDistribute super."conduit-iconv";
+  "conduit-network-stream" = dontDistribute super."conduit-network-stream";
+  "conduit-parse" = dontDistribute super."conduit-parse";
+  "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conf" = dontDistribute super."conf";
+  "config-select" = dontDistribute super."config-select";
+  "config-value" = dontDistribute super."config-value";
+  "configifier" = dontDistribute super."configifier";
+  "configuration" = dontDistribute super."configuration";
+  "configuration-tools" = dontDistribute super."configuration-tools";
+  "confsolve" = dontDistribute super."confsolve";
+  "congruence-relation" = dontDistribute super."congruence-relation";
+  "conjugateGradient" = dontDistribute super."conjugateGradient";
+  "conjure" = dontDistribute super."conjure";
+  "conlogger" = dontDistribute super."conlogger";
+  "connection-pool" = dontDistribute super."connection-pool";
+  "consistent" = dontDistribute super."consistent";
+  "console-program" = dontDistribute super."console-program";
+  "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin";
+  "constrained-categories" = dontDistribute super."constrained-categories";
+  "constrained-normal" = dontDistribute super."constrained-normal";
+  "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_2_1";
+  "consumers" = dontDistribute super."consumers";
+  "container" = dontDistribute super."container";
+  "container-classes" = dontDistribute super."container-classes";
+  "containers-benchmark" = dontDistribute super."containers-benchmark";
+  "containers-deepseq" = dontDistribute super."containers-deepseq";
+  "context-free-grammar" = dontDistribute super."context-free-grammar";
+  "context-stack" = dontDistribute super."context-stack";
+  "continue" = dontDistribute super."continue";
+  "continued-fractions" = dontDistribute super."continued-fractions";
+  "continuum" = dontDistribute super."continuum";
+  "continuum-client" = dontDistribute super."continuum-client";
+  "contravariant-extras" = dontDistribute super."contravariant-extras";
+  "control-event" = dontDistribute super."control-event";
+  "control-monad-attempt" = dontDistribute super."control-monad-attempt";
+  "control-monad-exception" = dontDistribute super."control-monad-exception";
+  "control-monad-exception-monadsfd" = dontDistribute super."control-monad-exception-monadsfd";
+  "control-monad-exception-monadstf" = dontDistribute super."control-monad-exception-monadstf";
+  "control-monad-exception-mtl" = dontDistribute super."control-monad-exception-mtl";
+  "control-monad-failure" = dontDistribute super."control-monad-failure";
+  "control-monad-failure-mtl" = dontDistribute super."control-monad-failure-mtl";
+  "control-monad-omega" = dontDistribute super."control-monad-omega";
+  "control-monad-queue" = dontDistribute super."control-monad-queue";
+  "control-timeout" = dontDistribute super."control-timeout";
+  "contstuff" = dontDistribute super."contstuff";
+  "contstuff-monads-tf" = dontDistribute super."contstuff-monads-tf";
+  "contstuff-transformers" = dontDistribute super."contstuff-transformers";
+  "converge" = dontDistribute super."converge";
+  "conversion" = dontDistribute super."conversion";
+  "conversion-bytestring" = dontDistribute super."conversion-bytestring";
+  "conversion-case-insensitive" = dontDistribute super."conversion-case-insensitive";
+  "conversion-text" = dontDistribute super."conversion-text";
+  "convert" = dontDistribute super."convert";
+  "convertible-ascii" = dontDistribute super."convertible-ascii";
+  "convertible-text" = dontDistribute super."convertible-text";
+  "cookbook" = dontDistribute super."cookbook";
+  "coordinate" = dontDistribute super."coordinate";
+  "copilot" = dontDistribute super."copilot";
+  "copilot-c99" = dontDistribute super."copilot-c99";
+  "copilot-cbmc" = dontDistribute super."copilot-cbmc";
+  "copilot-core" = dontDistribute super."copilot-core";
+  "copilot-language" = dontDistribute super."copilot-language";
+  "copilot-libraries" = dontDistribute super."copilot-libraries";
+  "copilot-sbv" = dontDistribute super."copilot-sbv";
+  "copilot-theorem" = dontDistribute super."copilot-theorem";
+  "copr" = dontDistribute super."copr";
+  "core" = dontDistribute super."core";
+  "core-haskell" = dontDistribute super."core-haskell";
+  "corebot-bliki" = dontDistribute super."corebot-bliki";
+  "coroutine-enumerator" = dontDistribute super."coroutine-enumerator";
+  "coroutine-iteratee" = dontDistribute super."coroutine-iteratee";
+  "coroutine-object" = dontDistribute super."coroutine-object";
+  "couch-hs" = dontDistribute super."couch-hs";
+  "couch-simple" = dontDistribute super."couch-simple";
+  "couchdb-conduit" = dontDistribute super."couchdb-conduit";
+  "couchdb-enumerator" = dontDistribute super."couchdb-enumerator";
+  "count" = dontDistribute super."count";
+  "countable" = dontDistribute super."countable";
+  "counter" = dontDistribute super."counter";
+  "court" = dontDistribute super."court";
+  "coverage" = dontDistribute super."coverage";
+  "cpio-conduit" = dontDistribute super."cpio-conduit";
+  "cplusplus-th" = dontDistribute super."cplusplus-th";
+  "cprng-aes-effect" = dontDistribute super."cprng-aes-effect";
+  "cpsa" = dontDistribute super."cpsa";
+  "cpuid" = dontDistribute super."cpuid";
+  "cpuperf" = dontDistribute super."cpuperf";
+  "cpython" = dontDistribute super."cpython";
+  "cql-io" = doDistribute super."cql-io_0_14_5";
+  "cqrs" = dontDistribute super."cqrs";
+  "cqrs-core" = dontDistribute super."cqrs-core";
+  "cqrs-example" = dontDistribute super."cqrs-example";
+  "cqrs-memory" = dontDistribute super."cqrs-memory";
+  "cqrs-postgresql" = dontDistribute super."cqrs-postgresql";
+  "cqrs-sqlite3" = dontDistribute super."cqrs-sqlite3";
+  "cqrs-test" = dontDistribute super."cqrs-test";
+  "cqrs-testkit" = dontDistribute super."cqrs-testkit";
+  "cqrs-types" = dontDistribute super."cqrs-types";
+  "cr" = dontDistribute super."cr";
+  "crack" = dontDistribute super."crack";
+  "craftwerk" = dontDistribute super."craftwerk";
+  "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
+  "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "crc16" = dontDistribute super."crc16";
+  "crc16-table" = dontDistribute super."crc16-table";
+  "creatur" = dontDistribute super."creatur";
+  "crf-chain1" = dontDistribute super."crf-chain1";
+  "crf-chain1-constrained" = dontDistribute super."crf-chain1-constrained";
+  "crf-chain2-generic" = dontDistribute super."crf-chain2-generic";
+  "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers";
+  "critbit" = dontDistribute super."critbit";
+  "criterion-plus" = dontDistribute super."criterion-plus";
+  "criterion-to-html" = dontDistribute super."criterion-to-html";
+  "crockford" = dontDistribute super."crockford";
+  "crocodile" = dontDistribute super."crocodile";
+  "cron" = doDistribute super."cron_0_3_0";
+  "cron-compat" = dontDistribute super."cron-compat";
+  "cruncher-types" = dontDistribute super."cruncher-types";
+  "crunghc" = dontDistribute super."crunghc";
+  "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks";
+  "crypto-classical" = dontDistribute super."crypto-classical";
+  "crypto-conduit" = dontDistribute super."crypto-conduit";
+  "crypto-enigma" = dontDistribute super."crypto-enigma";
+  "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh";
+  "crypto-random-effect" = dontDistribute super."crypto-random-effect";
+  "crypto-totp" = dontDistribute super."crypto-totp";
+  "cryptol" = doDistribute super."cryptol_2_2_5";
+  "cryptonite" = doDistribute super."cryptonite_0_6";
+  "cryptsy-api" = dontDistribute super."cryptsy-api";
+  "crystalfontz" = dontDistribute super."crystalfontz";
+  "cse-ghc-plugin" = dontDistribute super."cse-ghc-plugin";
+  "csound-catalog" = dontDistribute super."csound-catalog";
+  "csound-expression" = dontDistribute super."csound-expression";
+  "csound-expression-dynamic" = dontDistribute super."csound-expression-dynamic";
+  "csound-expression-opcodes" = dontDistribute super."csound-expression-opcodes";
+  "csound-expression-typed" = dontDistribute super."csound-expression-typed";
+  "csound-sampler" = dontDistribute super."csound-sampler";
+  "csp" = dontDistribute super."csp";
+  "cspmchecker" = dontDistribute super."cspmchecker";
+  "css" = dontDistribute super."css";
+  "css-syntax" = dontDistribute super."css-syntax";
+  "csv-enumerator" = dontDistribute super."csv-enumerator";
+  "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-to-qif" = dontDistribute super."csv-to-qif";
+  "ctemplate" = dontDistribute super."ctemplate";
+  "ctkl" = dontDistribute super."ctkl";
+  "ctpl" = dontDistribute super."ctpl";
+  "ctrie" = dontDistribute super."ctrie";
+  "cube" = dontDistribute super."cube";
+  "cubical" = dontDistribute super."cubical";
+  "cubicbezier" = dontDistribute super."cubicbezier";
+  "cubicspline" = doDistribute super."cubicspline_0_1_1";
+  "cublas" = dontDistribute super."cublas";
+  "cuboid" = dontDistribute super."cuboid";
+  "cuda" = dontDistribute super."cuda";
+  "cudd" = dontDistribute super."cudd";
+  "cufft" = dontDistribute super."cufft";
+  "curl-aeson" = dontDistribute super."curl-aeson";
+  "curlhs" = dontDistribute super."curlhs";
+  "currency" = dontDistribute super."currency";
+  "current-locale" = dontDistribute super."current-locale";
+  "curry-base" = dontDistribute super."curry-base";
+  "curry-frontend" = dontDistribute super."curry-frontend";
+  "cursedcsv" = dontDistribute super."cursedcsv";
+  "curve25519" = dontDistribute super."curve25519";
+  "curves" = dontDistribute super."curves";
+  "custom-prelude" = dontDistribute super."custom-prelude";
+  "cv-combinators" = dontDistribute super."cv-combinators";
+  "cyclotomic" = dontDistribute super."cyclotomic";
+  "cypher" = dontDistribute super."cypher";
+  "d-bus" = dontDistribute super."d-bus";
+  "d3js" = dontDistribute super."d3js";
+  "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
+  "daemons" = dontDistribute super."daemons";
+  "dag" = dontDistribute super."dag";
+  "damnpacket" = dontDistribute super."damnpacket";
+  "dao" = dontDistribute super."dao";
+  "dapi" = dontDistribute super."dapi";
+  "darcs" = dontDistribute super."darcs";
+  "darcs-benchmark" = dontDistribute super."darcs-benchmark";
+  "darcs-beta" = dontDistribute super."darcs-beta";
+  "darcs-buildpackage" = dontDistribute super."darcs-buildpackage";
+  "darcs-cabalized" = dontDistribute super."darcs-cabalized";
+  "darcs-fastconvert" = dontDistribute super."darcs-fastconvert";
+  "darcs-graph" = dontDistribute super."darcs-graph";
+  "darcs-monitor" = dontDistribute super."darcs-monitor";
+  "darcs-scripts" = dontDistribute super."darcs-scripts";
+  "darcs2dot" = dontDistribute super."darcs2dot";
+  "darcsden" = dontDistribute super."darcsden";
+  "darcswatch" = dontDistribute super."darcswatch";
+  "darkplaces-demo" = dontDistribute super."darkplaces-demo";
+  "darkplaces-rcon" = dontDistribute super."darkplaces-rcon";
+  "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
+  "darkplaces-text" = dontDistribute super."darkplaces-text";
+  "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor-monadLib" = dontDistribute super."data-accessor-monadLib";
+  "data-accessor-monads-fd" = dontDistribute super."data-accessor-monads-fd";
+  "data-accessor-monads-tf" = dontDistribute super."data-accessor-monads-tf";
+  "data-accessor-template" = dontDistribute super."data-accessor-template";
+  "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
+  "data-aviary" = dontDistribute super."data-aviary";
+  "data-bword" = dontDistribute super."data-bword";
+  "data-carousel" = dontDistribute super."data-carousel";
+  "data-category" = dontDistribute super."data-category";
+  "data-cell" = dontDistribute super."data-cell";
+  "data-checked" = dontDistribute super."data-checked";
+  "data-clist" = dontDistribute super."data-clist";
+  "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
+  "data-construction" = dontDistribute super."data-construction";
+  "data-cycle" = dontDistribute super."data-cycle";
+  "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-dispersal" = dontDistribute super."data-dispersal";
+  "data-dword" = dontDistribute super."data-dword";
+  "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
+  "data-endian" = dontDistribute super."data-endian";
+  "data-extend-generic" = dontDistribute super."data-extend-generic";
+  "data-extra" = dontDistribute super."data-extra";
+  "data-filepath" = dontDistribute super."data-filepath";
+  "data-fin" = dontDistribute super."data-fin";
+  "data-fin-simple" = dontDistribute super."data-fin-simple";
+  "data-fix" = dontDistribute super."data-fix";
+  "data-fix-cse" = dontDistribute super."data-fix-cse";
+  "data-flags" = dontDistribute super."data-flags";
+  "data-flagset" = dontDistribute super."data-flagset";
+  "data-fresh" = dontDistribute super."data-fresh";
+  "data-interval" = dontDistribute super."data-interval";
+  "data-ivar" = dontDistribute super."data-ivar";
+  "data-kiln" = dontDistribute super."data-kiln";
+  "data-layer" = dontDistribute super."data-layer";
+  "data-layout" = dontDistribute super."data-layout";
+  "data-lens" = dontDistribute super."data-lens";
+  "data-lens-fd" = dontDistribute super."data-lens-fd";
+  "data-lens-ixset" = dontDistribute super."data-lens-ixset";
+  "data-lens-template" = dontDistribute super."data-lens-template";
+  "data-list-sequences" = dontDistribute super."data-list-sequences";
+  "data-map-multikey" = dontDistribute super."data-map-multikey";
+  "data-named" = dontDistribute super."data-named";
+  "data-nat" = dontDistribute super."data-nat";
+  "data-object" = dontDistribute super."data-object";
+  "data-object-json" = dontDistribute super."data-object-json";
+  "data-object-yaml" = dontDistribute super."data-object-yaml";
+  "data-or" = dontDistribute super."data-or";
+  "data-partition" = dontDistribute super."data-partition";
+  "data-pprint" = dontDistribute super."data-pprint";
+  "data-quotientref" = dontDistribute super."data-quotientref";
+  "data-r-tree" = dontDistribute super."data-r-tree";
+  "data-ref" = dontDistribute super."data-ref";
+  "data-reify-cse" = dontDistribute super."data-reify-cse";
+  "data-repr" = dontDistribute super."data-repr";
+  "data-rev" = dontDistribute super."data-rev";
+  "data-rope" = dontDistribute super."data-rope";
+  "data-rtuple" = dontDistribute super."data-rtuple";
+  "data-size" = dontDistribute super."data-size";
+  "data-spacepart" = dontDistribute super."data-spacepart";
+  "data-store" = dontDistribute super."data-store";
+  "data-stringmap" = dontDistribute super."data-stringmap";
+  "data-structure-inferrer" = dontDistribute super."data-structure-inferrer";
+  "data-tensor" = dontDistribute super."data-tensor";
+  "data-textual" = dontDistribute super."data-textual";
+  "data-timeout" = dontDistribute super."data-timeout";
+  "data-transform" = dontDistribute super."data-transform";
+  "data-treify" = dontDistribute super."data-treify";
+  "data-type" = dontDistribute super."data-type";
+  "data-util" = dontDistribute super."data-util";
+  "data-variant" = dontDistribute super."data-variant";
+  "database-migrate" = dontDistribute super."database-migrate";
+  "database-study" = dontDistribute super."database-study";
+  "dataenc" = dontDistribute super."dataenc";
+  "dataflow" = dontDistribute super."dataflow";
+  "datalog" = dontDistribute super."datalog";
+  "datapacker" = dontDistribute super."datapacker";
+  "dataurl" = dontDistribute super."dataurl";
+  "date-cache" = dontDistribute super."date-cache";
+  "dates" = dontDistribute super."dates";
+  "datetime" = dontDistribute super."datetime";
+  "datetime-sb" = dontDistribute super."datetime-sb";
+  "dawdle" = dontDistribute super."dawdle";
+  "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
+  "dbcleaner" = dontDistribute super."dbcleaner";
+  "dbf" = dontDistribute super."dbf";
+  "dbjava" = dontDistribute super."dbjava";
+  "dbmigrations" = dontDistribute super."dbmigrations";
+  "dbus-client" = dontDistribute super."dbus-client";
+  "dbus-core" = dontDistribute super."dbus-core";
+  "dbus-qq" = dontDistribute super."dbus-qq";
+  "dbus-th" = dontDistribute super."dbus-th";
+  "dclabel" = dontDistribute super."dclabel";
+  "dclabel-eci11" = dontDistribute super."dclabel-eci11";
+  "ddc-base" = dontDistribute super."ddc-base";
+  "ddc-build" = dontDistribute super."ddc-build";
+  "ddc-code" = dontDistribute super."ddc-code";
+  "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-eval" = dontDistribute super."ddc-core-eval";
+  "ddc-core-flow" = dontDistribute super."ddc-core-flow";
+  "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
+  "ddc-core-salt" = dontDistribute super."ddc-core-salt";
+  "ddc-core-simpl" = dontDistribute super."ddc-core-simpl";
+  "ddc-core-tetra" = dontDistribute super."ddc-core-tetra";
+  "ddc-driver" = dontDistribute super."ddc-driver";
+  "ddc-interface" = dontDistribute super."ddc-interface";
+  "ddc-source-tetra" = dontDistribute super."ddc-source-tetra";
+  "ddc-tools" = dontDistribute super."ddc-tools";
+  "ddc-war" = dontDistribute super."ddc-war";
+  "ddci-core" = dontDistribute super."ddci-core";
+  "dead-code-detection" = dontDistribute super."dead-code-detection";
+  "dead-simple-json" = dontDistribute super."dead-simple-json";
+  "debian" = doDistribute super."debian_3_87_2";
+  "debian-binary" = dontDistribute super."debian-binary";
+  "debian-build" = dontDistribute super."debian-build";
+  "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
+  "decepticons" = dontDistribute super."decepticons";
+  "declarative" = dontDistribute super."declarative";
+  "decode-utf8" = dontDistribute super."decode-utf8";
+  "decoder-conduit" = dontDistribute super."decoder-conduit";
+  "dedukti" = dontDistribute super."dedukti";
+  "deepcontrol" = dontDistribute super."deepcontrol";
+  "deeplearning-hs" = dontDistribute super."deeplearning-hs";
+  "deepseq-bounded" = dontDistribute super."deepseq-bounded";
+  "deepseq-magic" = dontDistribute super."deepseq-magic";
+  "deepseq-th" = dontDistribute super."deepseq-th";
+  "deepzoom" = dontDistribute super."deepzoom";
+  "defargs" = dontDistribute super."defargs";
+  "definitive-base" = dontDistribute super."definitive-base";
+  "definitive-filesystem" = dontDistribute super."definitive-filesystem";
+  "definitive-graphics" = dontDistribute super."definitive-graphics";
+  "definitive-parser" = dontDistribute super."definitive-parser";
+  "definitive-reactive" = dontDistribute super."definitive-reactive";
+  "definitive-sound" = dontDistribute super."definitive-sound";
+  "deiko-config" = dontDistribute super."deiko-config";
+  "dejafu" = dontDistribute super."dejafu";
+  "deka" = dontDistribute super."deka";
+  "deka-tests" = dontDistribute super."deka-tests";
+  "delaunay" = dontDistribute super."delaunay";
+  "delicious" = dontDistribute super."delicious";
+  "delimited-text" = dontDistribute super."delimited-text";
+  "delimiter-separated" = dontDistribute super."delimiter-separated";
+  "delta" = dontDistribute super."delta";
+  "delta-h" = dontDistribute super."delta-h";
+  "demarcate" = dontDistribute super."demarcate";
+  "denominate" = dontDistribute super."denominate";
+  "dependent-map" = doDistribute super."dependent-map_0_1_1_3";
+  "dependent-sum" = doDistribute super."dependent-sum_0_2_1_0";
+  "depends" = dontDistribute super."depends";
+  "dephd" = dontDistribute super."dephd";
+  "dequeue" = dontDistribute super."dequeue";
+  "derangement" = dontDistribute super."derangement";
+  "derivation-trees" = dontDistribute super."derivation-trees";
+  "derive" = doDistribute super."derive_2_5_22";
+  "derive-IG" = dontDistribute super."derive-IG";
+  "derive-enumerable" = dontDistribute super."derive-enumerable";
+  "derive-gadt" = dontDistribute super."derive-gadt";
+  "derive-topdown" = dontDistribute super."derive-topdown";
+  "derive-trie" = dontDistribute super."derive-trie";
+  "deriving-compat" = dontDistribute super."deriving-compat";
+  "derp" = dontDistribute super."derp";
+  "derp-lib" = dontDistribute super."derp-lib";
+  "descrilo" = dontDistribute super."descrilo";
+  "despair" = dontDistribute super."despair";
+  "deterministic-game-engine" = dontDistribute super."deterministic-game-engine";
+  "detrospector" = dontDistribute super."detrospector";
+  "deunicode" = dontDistribute super."deunicode";
+  "devil" = dontDistribute super."devil";
+  "dewdrop" = dontDistribute super."dewdrop";
+  "dfrac" = dontDistribute super."dfrac";
+  "dfsbuild" = dontDistribute super."dfsbuild";
+  "dgim" = dontDistribute super."dgim";
+  "dgs" = dontDistribute super."dgs";
+  "dia-base" = dontDistribute super."dia-base";
+  "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams-canvas" = dontDistribute super."diagrams-canvas";
+  "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
+  "diagrams-gtk" = dontDistribute super."diagrams-gtk";
+  "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_7";
+  "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-lib" = doDistribute super."diagrams-lib_1_3_0_3";
+  "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
+  "diagrams-pdf" = dontDistribute super."diagrams-pdf";
+  "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
+  "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
+  "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_7";
+  "diagrams-tikz" = dontDistribute super."diagrams-tikz";
+  "dialog" = dontDistribute super."dialog";
+  "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
+  "dicom" = dontDistribute super."dicom";
+  "dictparser" = dontDistribute super."dictparser";
+  "diet" = dontDistribute super."diet";
+  "diff-gestalt" = dontDistribute super."diff-gestalt";
+  "diff-parse" = dontDistribute super."diff-parse";
+  "diffarray" = dontDistribute super."diffarray";
+  "diffcabal" = dontDistribute super."diffcabal";
+  "diffdump" = dontDistribute super."diffdump";
+  "digamma" = dontDistribute super."digamma";
+  "digest-pure" = dontDistribute super."digest-pure";
+  "digestive-bootstrap" = dontDistribute super."digestive-bootstrap";
+  "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid";
+  "digestive-functors-blaze" = dontDistribute super."digestive-functors-blaze";
+  "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack";
+  "digestive-functors-heist" = dontDistribute super."digestive-functors-heist";
+  "digestive-functors-hsp" = dontDistribute super."digestive-functors-hsp";
+  "digestive-functors-scotty" = dontDistribute super."digestive-functors-scotty";
+  "digestive-functors-snap" = dontDistribute super."digestive-functors-snap";
+  "digit" = dontDistribute super."digit";
+  "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
+  "dimensional" = doDistribute super."dimensional_0_13_0_2";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
+  "dimensional-tf" = dontDistribute super."dimensional-tf";
+  "dingo-core" = dontDistribute super."dingo-core";
+  "dingo-example" = dontDistribute super."dingo-example";
+  "dingo-widgets" = dontDistribute super."dingo-widgets";
+  "diophantine" = dontDistribute super."diophantine";
+  "diplomacy" = dontDistribute super."diplomacy";
+  "diplomacy-server" = dontDistribute super."diplomacy-server";
+  "direct-binary-files" = dontDistribute super."direct-binary-files";
+  "direct-daemonize" = dontDistribute super."direct-daemonize";
+  "direct-fastcgi" = dontDistribute super."direct-fastcgi";
+  "direct-http" = dontDistribute super."direct-http";
+  "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
+  "direct-plugins" = dontDistribute super."direct-plugins";
+  "directed-cubical" = dontDistribute super."directed-cubical";
+  "directory-layout" = dontDistribute super."directory-layout";
+  "dirfiles" = dontDistribute super."dirfiles";
+  "dirstream" = dontDistribute super."dirstream";
+  "disassembler" = dontDistribute super."disassembler";
+  "discordian-calendar" = dontDistribute super."discordian-calendar";
+  "discount" = dontDistribute super."discount";
+  "discrete-space-map" = dontDistribute super."discrete-space-map";
+  "discrimination" = dontDistribute super."discrimination";
+  "disjoint-set" = dontDistribute super."disjoint-set";
+  "disjoint-sets-st" = dontDistribute super."disjoint-sets-st";
+  "dist-upload" = dontDistribute super."dist-upload";
+  "distributed-closure" = dontDistribute super."distributed-closure";
+  "distributed-process" = dontDistribute super."distributed-process";
+  "distributed-process-async" = dontDistribute super."distributed-process-async";
+  "distributed-process-azure" = dontDistribute super."distributed-process-azure";
+  "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-execution" = dontDistribute super."distributed-process-execution";
+  "distributed-process-extras" = dontDistribute super."distributed-process-extras";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
+  "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
+  "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
+  "distributed-process-platform" = dontDistribute super."distributed-process-platform";
+  "distributed-process-registry" = dontDistribute super."distributed-process-registry";
+  "distributed-process-simplelocalnet" = dontDistribute super."distributed-process-simplelocalnet";
+  "distributed-process-supervisor" = dontDistribute super."distributed-process-supervisor";
+  "distributed-process-task" = dontDistribute super."distributed-process-task";
+  "distributed-process-tests" = dontDistribute super."distributed-process-tests";
+  "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper";
+  "distributed-static" = dontDistribute super."distributed-static";
+  "distribution" = dontDistribute super."distribution";
+  "distribution-plot" = dontDistribute super."distribution-plot";
+  "diversity" = dontDistribute super."diversity";
+  "dixi" = dontDistribute super."dixi";
+  "djinn" = dontDistribute super."djinn";
+  "djinn-th" = dontDistribute super."djinn-th";
+  "dnscache" = dontDistribute super."dnscache";
+  "dnsrbl" = dontDistribute super."dnsrbl";
+  "dnssd" = dontDistribute super."dnssd";
+  "doc-review" = dontDistribute super."doc-review";
+  "doccheck" = dontDistribute super."doccheck";
+  "docidx" = dontDistribute super."docidx";
+  "docker" = dontDistribute super."docker";
+  "dockercook" = dontDistribute super."dockercook";
+  "docopt" = dontDistribute super."docopt";
+  "doctest-discover" = dontDistribute super."doctest-discover";
+  "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
+  "doctest-prop" = dontDistribute super."doctest-prop";
+  "dom-lt" = dontDistribute super."dom-lt";
+  "dom-selector" = dontDistribute super."dom-selector";
+  "domain-auth" = dontDistribute super."domain-auth";
+  "dominion" = dontDistribute super."dominion";
+  "domplate" = dontDistribute super."domplate";
+  "dot2graphml" = dontDistribute super."dot2graphml";
+  "dotenv" = dontDistribute super."dotenv";
+  "dotfs" = dontDistribute super."dotfs";
+  "dotgen" = dontDistribute super."dotgen";
+  "double-metaphone" = dontDistribute super."double-metaphone";
+  "dove" = dontDistribute super."dove";
+  "dow" = dontDistribute super."dow";
+  "download" = dontDistribute super."download";
+  "download-curl" = dontDistribute super."download-curl";
+  "download-media-content" = dontDistribute super."download-media-content";
+  "dozenal" = dontDistribute super."dozenal";
+  "dozens" = dontDistribute super."dozens";
+  "dph-base" = dontDistribute super."dph-base";
+  "dph-examples" = dontDistribute super."dph-examples";
+  "dph-lifted-base" = dontDistribute super."dph-lifted-base";
+  "dph-lifted-copy" = dontDistribute super."dph-lifted-copy";
+  "dph-lifted-vseg" = dontDistribute super."dph-lifted-vseg";
+  "dph-par" = dontDistribute super."dph-par";
+  "dph-prim-interface" = dontDistribute super."dph-prim-interface";
+  "dph-prim-par" = dontDistribute super."dph-prim-par";
+  "dph-prim-seq" = dontDistribute super."dph-prim-seq";
+  "dph-seq" = dontDistribute super."dph-seq";
+  "dpkg" = dontDistribute super."dpkg";
+  "drClickOn" = dontDistribute super."drClickOn";
+  "draw-poker" = dontDistribute super."draw-poker";
+  "drawille" = dontDistribute super."drawille";
+  "drifter" = dontDistribute super."drifter";
+  "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "dropbox-sdk" = dontDistribute super."dropbox-sdk";
+  "dropsolve" = dontDistribute super."dropsolve";
+  "ds-kanren" = dontDistribute super."ds-kanren";
+  "dsh-sql" = dontDistribute super."dsh-sql";
+  "dsmc" = dontDistribute super."dsmc";
+  "dsmc-tools" = dontDistribute super."dsmc-tools";
+  "dson" = dontDistribute super."dson";
+  "dson-parsec" = dontDistribute super."dson-parsec";
+  "dsp" = dontDistribute super."dsp";
+  "dstring" = dontDistribute super."dstring";
+  "dtab" = dontDistribute super."dtab";
+  "dtd" = dontDistribute super."dtd";
+  "dtd-text" = dontDistribute super."dtd-text";
+  "dtd-types" = dontDistribute super."dtd-types";
+  "dtrace" = dontDistribute super."dtrace";
+  "dtw" = dontDistribute super."dtw";
+  "dump" = dontDistribute super."dump";
+  "duplo" = dontDistribute super."duplo";
+  "dvda" = dontDistribute super."dvda";
+  "dvdread" = dontDistribute super."dvdread";
+  "dvi-processing" = dontDistribute super."dvi-processing";
+  "dvorak" = dontDistribute super."dvorak";
+  "dwarf" = dontDistribute super."dwarf";
+  "dwarf-el" = dontDistribute super."dwarf-el";
+  "dwarfadt" = dontDistribute super."dwarfadt";
+  "dx9base" = dontDistribute super."dx9base";
+  "dx9d3d" = dontDistribute super."dx9d3d";
+  "dx9d3dx" = dontDistribute super."dx9d3dx";
+  "dynamic-cabal" = dontDistribute super."dynamic-cabal";
+  "dynamic-graph" = dontDistribute super."dynamic-graph";
+  "dynamic-linker-template" = dontDistribute super."dynamic-linker-template";
+  "dynamic-loader" = dontDistribute super."dynamic-loader";
+  "dynamic-mvector" = dontDistribute super."dynamic-mvector";
+  "dynamic-object" = dontDistribute super."dynamic-object";
+  "dynamic-plot" = dontDistribute super."dynamic-plot";
+  "dynamic-pp" = dontDistribute super."dynamic-pp";
+  "dynamic-state" = dontDistribute super."dynamic-state";
+  "dynobud" = dontDistribute super."dynobud";
+  "dyre" = dontDistribute super."dyre";
+  "dywapitchtrack" = dontDistribute super."dywapitchtrack";
+  "dzen-utils" = dontDistribute super."dzen-utils";
+  "eager-sockets" = dontDistribute super."eager-sockets";
+  "easy-api" = dontDistribute super."easy-api";
+  "easy-bitcoin" = dontDistribute super."easy-bitcoin";
+  "easyjson" = dontDistribute super."easyjson";
+  "easyplot" = dontDistribute super."easyplot";
+  "easyrender" = dontDistribute super."easyrender";
+  "ebeats" = dontDistribute super."ebeats";
+  "ebnf-bff" = dontDistribute super."ebnf-bff";
+  "ec2-signature" = dontDistribute super."ec2-signature";
+  "ecdsa" = dontDistribute super."ecdsa";
+  "ecma262" = dontDistribute super."ecma262";
+  "ecu" = dontDistribute super."ecu";
+  "ed25519" = dontDistribute super."ed25519";
+  "ed25519-donna" = dontDistribute super."ed25519-donna";
+  "eddie" = dontDistribute super."eddie";
+  "edenmodules" = dontDistribute super."edenmodules";
+  "edenskel" = dontDistribute super."edenskel";
+  "edentv" = dontDistribute super."edentv";
+  "edge" = dontDistribute super."edge";
+  "edis" = dontDistribute super."edis";
+  "edit-distance-vector" = dontDistribute super."edit-distance-vector";
+  "edit-lenses" = dontDistribute super."edit-lenses";
+  "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
+  "editable" = dontDistribute super."editable";
+  "editline" = dontDistribute super."editline";
+  "effect-monad" = dontDistribute super."effect-monad";
+  "effective-aspects" = dontDistribute super."effective-aspects";
+  "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
+  "effects" = dontDistribute super."effects";
+  "effects-parser" = dontDistribute super."effects-parser";
+  "effin" = dontDistribute super."effin";
+  "egison" = dontDistribute super."egison";
+  "egison-quote" = dontDistribute super."egison-quote";
+  "egison-tutorial" = dontDistribute super."egison-tutorial";
+  "ehaskell" = dontDistribute super."ehaskell";
+  "ehs" = dontDistribute super."ehs";
+  "eibd-client-simple" = dontDistribute super."eibd-client-simple";
+  "eigen" = dontDistribute super."eigen";
+  "either-unwrap" = dontDistribute super."either-unwrap";
+  "eithers" = dontDistribute super."eithers";
+  "ekg" = dontDistribute super."ekg";
+  "ekg-bosun" = dontDistribute super."ekg-bosun";
+  "ekg-carbon" = dontDistribute super."ekg-carbon";
+  "ekg-json" = dontDistribute super."ekg-json";
+  "ekg-log" = dontDistribute super."ekg-log";
+  "ekg-push" = dontDistribute super."ekg-push";
+  "ekg-rrd" = dontDistribute super."ekg-rrd";
+  "ekg-statsd" = dontDistribute super."ekg-statsd";
+  "electrum-mnemonic" = dontDistribute super."electrum-mnemonic";
+  "elerea" = dontDistribute super."elerea";
+  "elerea-examples" = dontDistribute super."elerea-examples";
+  "elerea-sdl" = dontDistribute super."elerea-sdl";
+  "elevator" = dontDistribute super."elevator";
+  "elf" = dontDistribute super."elf";
+  "elm-bridge" = dontDistribute super."elm-bridge";
+  "elm-build-lib" = dontDistribute super."elm-build-lib";
+  "elm-compiler" = dontDistribute super."elm-compiler";
+  "elm-get" = dontDistribute super."elm-get";
+  "elm-init" = dontDistribute super."elm-init";
+  "elm-make" = dontDistribute super."elm-make";
+  "elm-package" = dontDistribute super."elm-package";
+  "elm-reactor" = dontDistribute super."elm-reactor";
+  "elm-repl" = dontDistribute super."elm-repl";
+  "elm-server" = dontDistribute super."elm-server";
+  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
+  "elocrypt" = dontDistribute super."elocrypt";
+  "emacs-keys" = dontDistribute super."emacs-keys";
+  "email" = dontDistribute super."email";
+  "email-header" = dontDistribute super."email-header";
+  "email-postmark" = dontDistribute super."email-postmark";
+  "email-validator" = dontDistribute super."email-validator";
+  "embeddock" = dontDistribute super."embeddock";
+  "embeddock-example" = dontDistribute super."embeddock-example";
+  "embroidery" = dontDistribute super."embroidery";
+  "emgm" = dontDistribute super."emgm";
+  "empty" = dontDistribute super."empty";
+  "encoding" = dontDistribute super."encoding";
+  "endo" = dontDistribute super."endo";
+  "engine-io-snap" = dontDistribute super."engine-io-snap";
+  "engine-io-wai" = dontDistribute super."engine-io-wai";
+  "engine-io-yesod" = dontDistribute super."engine-io-yesod";
+  "engineering-units" = dontDistribute super."engineering-units";
+  "enumerable" = dontDistribute super."enumerable";
+  "enumerate" = dontDistribute super."enumerate";
+  "enumeration" = dontDistribute super."enumeration";
+  "enumerator-fd" = dontDistribute super."enumerator-fd";
+  "enumerator-tf" = dontDistribute super."enumerator-tf";
+  "enumfun" = dontDistribute super."enumfun";
+  "enummapmap" = dontDistribute super."enummapmap";
+  "enummapset" = dontDistribute super."enummapset";
+  "enummapset-th" = dontDistribute super."enummapset-th";
+  "enumset" = dontDistribute super."enumset";
+  "env-parser" = dontDistribute super."env-parser";
+  "envparse" = dontDistribute super."envparse";
+  "envy" = dontDistribute super."envy";
+  "epanet-haskell" = dontDistribute super."epanet-haskell";
+  "epass" = dontDistribute super."epass";
+  "epic" = dontDistribute super."epic";
+  "epoll" = dontDistribute super."epoll";
+  "eprocess" = dontDistribute super."eprocess";
+  "epub" = dontDistribute super."epub";
+  "epub-metadata" = dontDistribute super."epub-metadata";
+  "epub-tools" = dontDistribute super."epub-tools";
+  "epubname" = dontDistribute super."epubname";
+  "equal-files" = dontDistribute super."equal-files";
+  "equational-reasoning" = dontDistribute super."equational-reasoning";
+  "erd" = dontDistribute super."erd";
+  "erf-native" = dontDistribute super."erf-native";
+  "erlang" = dontDistribute super."erlang";
+  "eros" = dontDistribute super."eros";
+  "eros-client" = dontDistribute super."eros-client";
+  "eros-http" = dontDistribute super."eros-http";
+  "errno" = dontDistribute super."errno";
+  "error-analyze" = dontDistribute super."error-analyze";
+  "error-continuations" = dontDistribute super."error-continuations";
+  "error-list" = dontDistribute super."error-list";
+  "error-loc" = dontDistribute super."error-loc";
+  "error-location" = dontDistribute super."error-location";
+  "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
+  "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance";
+  "ersatz" = dontDistribute super."ersatz";
+  "ersatz-toysat" = dontDistribute super."ersatz-toysat";
+  "ert" = dontDistribute super."ert";
+  "esotericbot" = dontDistribute super."esotericbot";
+  "ess" = dontDistribute super."ess";
+  "estimator" = dontDistribute super."estimator";
+  "estimators" = dontDistribute super."estimators";
+  "estreps" = dontDistribute super."estreps";
+  "etcd" = dontDistribute super."etcd";
+  "eternal" = dontDistribute super."eternal";
+  "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell";
+  "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db";
+  "ethereum-rlp" = dontDistribute super."ethereum-rlp";
+  "ety" = dontDistribute super."ety";
+  "euler" = dontDistribute super."euler";
+  "euphoria" = dontDistribute super."euphoria";
+  "eurofxref" = dontDistribute super."eurofxref";
+  "event-driven" = dontDistribute super."event-driven";
+  "event-handlers" = dontDistribute super."event-handlers";
+  "event-list" = dontDistribute super."event-list";
+  "event-monad" = dontDistribute super."event-monad";
+  "eventloop" = dontDistribute super."eventloop";
+  "eventstore" = dontDistribute super."eventstore";
+  "every-bit-counts" = dontDistribute super."every-bit-counts";
+  "ewe" = dontDistribute super."ewe";
+  "ex-pool" = dontDistribute super."ex-pool";
+  "exact-combinatorics" = dontDistribute super."exact-combinatorics";
+  "exact-pi" = dontDistribute super."exact-pi";
+  "exact-real" = dontDistribute super."exact-real";
+  "exception-hierarchy" = dontDistribute super."exception-hierarchy";
+  "exception-mailer" = dontDistribute super."exception-mailer";
+  "exception-monads-fd" = dontDistribute super."exception-monads-fd";
+  "exception-monads-tf" = dontDistribute super."exception-monads-tf";
+  "exherbo-cabal" = dontDistribute super."exherbo-cabal";
+  "exif" = dontDistribute super."exif";
+  "exinst" = dontDistribute super."exinst";
+  "exinst-aeson" = dontDistribute super."exinst-aeson";
+  "exinst-bytes" = dontDistribute super."exinst-bytes";
+  "exinst-deepseq" = dontDistribute super."exinst-deepseq";
+  "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "exists" = dontDistribute super."exists";
+  "exit-codes" = dontDistribute super."exit-codes";
+  "exp-extended" = dontDistribute super."exp-extended";
+  "exp-pairs" = dontDistribute super."exp-pairs";
+  "expand" = dontDistribute super."expand";
+  "expat-enumerator" = dontDistribute super."expat-enumerator";
+  "expiring-mvar" = dontDistribute super."expiring-mvar";
+  "explain" = dontDistribute super."explain";
+  "explicit-determinant" = dontDistribute super."explicit-determinant";
+  "explicit-exception" = dontDistribute super."explicit-exception";
+  "explicit-iomodes" = dontDistribute super."explicit-iomodes";
+  "explicit-iomodes-bytestring" = dontDistribute super."explicit-iomodes-bytestring";
+  "explicit-iomodes-text" = dontDistribute super."explicit-iomodes-text";
+  "explicit-sharing" = dontDistribute super."explicit-sharing";
+  "explore" = dontDistribute super."explore";
+  "exposed-containers" = dontDistribute super."exposed-containers";
+  "expression-parser" = dontDistribute super."expression-parser";
+  "extcore" = dontDistribute super."extcore";
+  "extemp" = dontDistribute super."extemp";
+  "extended-categories" = dontDistribute super."extended-categories";
+  "extended-reals" = dontDistribute super."extended-reals";
+  "extensible" = dontDistribute super."extensible";
+  "extensible-data" = dontDistribute super."extensible-data";
+  "extensible-effects" = dontDistribute super."extensible-effects";
+  "external-sort" = dontDistribute super."external-sort";
+  "extract-dependencies" = dontDistribute super."extract-dependencies";
+  "extractelf" = dontDistribute super."extractelf";
+  "ez-couch" = dontDistribute super."ez-couch";
+  "faceted" = dontDistribute super."faceted";
+  "factory" = dontDistribute super."factory";
+  "factual-api" = dontDistribute super."factual-api";
+  "fad" = dontDistribute super."fad";
+  "failable-list" = dontDistribute super."failable-list";
+  "failure" = dontDistribute super."failure";
+  "fair-predicates" = dontDistribute super."fair-predicates";
+  "fake-type" = dontDistribute super."fake-type";
+  "faker" = dontDistribute super."faker";
+  "falling-turnip" = dontDistribute super."falling-turnip";
+  "fallingblocks" = dontDistribute super."fallingblocks";
+  "family-tree" = dontDistribute super."family-tree";
+  "farmhash" = dontDistribute super."farmhash";
+  "fast-digits" = dontDistribute super."fast-digits";
+  "fast-math" = dontDistribute super."fast-math";
+  "fast-tags" = dontDistribute super."fast-tags";
+  "fast-tagsoup" = dontDistribute super."fast-tagsoup";
+  "fast-tagsoup-utf8-only" = dontDistribute super."fast-tagsoup-utf8-only";
+  "fasta" = dontDistribute super."fasta";
+  "fastbayes" = dontDistribute super."fastbayes";
+  "fastcgi" = dontDistribute super."fastcgi";
+  "fastedit" = dontDistribute super."fastedit";
+  "fastirc" = dontDistribute super."fastirc";
+  "fault-tree" = dontDistribute super."fault-tree";
+  "fay" = doDistribute super."fay_0_23_1_8";
+  "fay-geoposition" = dontDistribute super."fay-geoposition";
+  "fay-hsx" = dontDistribute super."fay-hsx";
+  "fay-ref" = dontDistribute super."fay-ref";
+  "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
+  "fcd" = dontDistribute super."fcd";
+  "fckeditor" = dontDistribute super."fckeditor";
+  "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
+  "fdo-trash" = dontDistribute super."fdo-trash";
+  "fec" = dontDistribute super."fec";
+  "fedora-packages" = dontDistribute super."fedora-packages";
+  "feed-cli" = dontDistribute super."feed-cli";
+  "feed-collect" = dontDistribute super."feed-collect";
+  "feed-crawl" = dontDistribute super."feed-crawl";
+  "feed-translator" = dontDistribute super."feed-translator";
+  "feed2lj" = dontDistribute super."feed2lj";
+  "feed2twitter" = dontDistribute super."feed2twitter";
+  "feldspar-compiler" = dontDistribute super."feldspar-compiler";
+  "feldspar-language" = dontDistribute super."feldspar-language";
+  "feldspar-signal" = dontDistribute super."feldspar-signal";
+  "fen2s" = dontDistribute super."fen2s";
+  "fences" = dontDistribute super."fences";
+  "fenfire" = dontDistribute super."fenfire";
+  "fez-conf" = dontDistribute super."fez-conf";
+  "ffeed" = dontDistribute super."ffeed";
+  "fficxx" = dontDistribute super."fficxx";
+  "fficxx-runtime" = dontDistribute super."fficxx-runtime";
+  "ffmpeg-light" = dontDistribute super."ffmpeg-light";
+  "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials";
+  "fft" = dontDistribute super."fft";
+  "fftwRaw" = dontDistribute super."fftwRaw";
+  "fgl-arbitrary" = dontDistribute super."fgl-arbitrary";
+  "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions";
+  "fgl-visualize" = dontDistribute super."fgl-visualize";
+  "fibon" = dontDistribute super."fibon";
+  "fibonacci" = dontDistribute super."fibonacci";
+  "fields" = dontDistribute super."fields";
+  "fields-json" = dontDistribute super."fields-json";
+  "fieldwise" = dontDistribute super."fieldwise";
+  "fig" = dontDistribute super."fig";
+  "file-collection" = dontDistribute super."file-collection";
+  "file-command-qq" = dontDistribute super."file-command-qq";
+  "file-modules" = dontDistribute super."file-modules";
+  "filecache" = dontDistribute super."filecache";
+  "filediff" = dontDistribute super."filediff";
+  "filepath-io-access" = dontDistribute super."filepath-io-access";
+  "filepather" = dontDistribute super."filepather";
+  "filestore" = dontDistribute super."filestore";
+  "filesystem-conduit" = dontDistribute super."filesystem-conduit";
+  "filesystem-enumerator" = dontDistribute super."filesystem-enumerator";
+  "filesystem-trees" = dontDistribute super."filesystem-trees";
+  "filtrable" = dontDistribute super."filtrable";
+  "final" = dontDistribute super."final";
+  "find-conduit" = dontDistribute super."find-conduit";
+  "fingertree-tf" = dontDistribute super."fingertree-tf";
+  "finite-field" = dontDistribute super."finite-field";
+  "finite-typelits" = dontDistribute super."finite-typelits";
+  "first-and-last" = dontDistribute super."first-and-last";
+  "first-class-patterns" = dontDistribute super."first-class-patterns";
+  "firstify" = dontDistribute super."firstify";
+  "fishfood" = dontDistribute super."fishfood";
+  "fit" = dontDistribute super."fit";
+  "fitsio" = dontDistribute super."fitsio";
+  "fix-imports" = dontDistribute super."fix-imports";
+  "fix-parser-simple" = dontDistribute super."fix-parser-simple";
+  "fix-symbols-gitit" = dontDistribute super."fix-symbols-gitit";
+  "fixed-length" = dontDistribute super."fixed-length";
+  "fixed-point" = dontDistribute super."fixed-point";
+  "fixed-point-vector" = dontDistribute super."fixed-point-vector";
+  "fixed-point-vector-space" = dontDistribute super."fixed-point-vector-space";
+  "fixed-precision" = dontDistribute super."fixed-precision";
+  "fixed-storable-array" = dontDistribute super."fixed-storable-array";
+  "fixed-vector-binary" = dontDistribute super."fixed-vector-binary";
+  "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal";
+  "fixedprec" = dontDistribute super."fixedprec";
+  "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixhs" = dontDistribute super."fixhs";
+  "fixplate" = dontDistribute super."fixplate";
+  "fixpoint" = dontDistribute super."fixpoint";
+  "fixtime" = dontDistribute super."fixtime";
+  "fizz-buzz" = dontDistribute super."fizz-buzz";
+  "flaccuraterip" = dontDistribute super."flaccuraterip";
+  "flamethrower" = dontDistribute super."flamethrower";
+  "flamingra" = dontDistribute super."flamingra";
+  "flat-maybe" = dontDistribute super."flat-maybe";
+  "flat-mcmc" = dontDistribute super."flat-mcmc";
+  "flat-tex" = dontDistribute super."flat-tex";
+  "flexible-time" = dontDistribute super."flexible-time";
+  "flexible-unlit" = dontDistribute super."flexible-unlit";
+  "flexiwrap" = dontDistribute super."flexiwrap";
+  "flexiwrap-smallcheck" = dontDistribute super."flexiwrap-smallcheck";
+  "flickr" = dontDistribute super."flickr";
+  "flippers" = dontDistribute super."flippers";
+  "flite" = dontDistribute super."flite";
+  "flo" = dontDistribute super."flo";
+  "float-binstring" = dontDistribute super."float-binstring";
+  "floating-bits" = dontDistribute super."floating-bits";
+  "floatshow" = dontDistribute super."floatshow";
+  "flow2dot" = dontDistribute super."flow2dot";
+  "flowdock-api" = dontDistribute super."flowdock-api";
+  "flowdock-rest" = dontDistribute super."flowdock-rest";
+  "flower" = dontDistribute super."flower";
+  "flowlocks-framework" = dontDistribute super."flowlocks-framework";
+  "flowsim" = dontDistribute super."flowsim";
+  "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fluent-logger" = dontDistribute super."fluent-logger";
+  "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
+  "fluidsynth" = dontDistribute super."fluidsynth";
+  "fmark" = dontDistribute super."fmark";
+  "fn" = dontDistribute super."fn";
+  "fn-extra" = dontDistribute super."fn-extra";
+  "fold-debounce" = dontDistribute super."fold-debounce";
+  "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit";
+  "foldl-incremental" = dontDistribute super."foldl-incremental";
+  "foldl-transduce" = dontDistribute super."foldl-transduce";
+  "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec";
+  "folds" = dontDistribute super."folds";
+  "folds-common" = dontDistribute super."folds-common";
+  "follower" = dontDistribute super."follower";
+  "foma" = dontDistribute super."foma";
+  "font-opengl-basic4x6" = dontDistribute super."font-opengl-basic4x6";
+  "foo" = dontDistribute super."foo";
+  "for-free" = dontDistribute super."for-free";
+  "forbidden-fruit" = dontDistribute super."forbidden-fruit";
+  "fordo" = dontDistribute super."fordo";
+  "forecast-io" = dontDistribute super."forecast-io";
+  "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric";
+  "foreign-var" = dontDistribute super."foreign-var";
+  "forger" = dontDistribute super."forger";
+  "forkable-monad" = dontDistribute super."forkable-monad";
+  "formal" = dontDistribute super."formal";
+  "format" = dontDistribute super."format";
+  "format-status" = dontDistribute super."format-status";
+  "formattable" = dontDistribute super."formattable";
+  "forml" = dontDistribute super."forml";
+  "formlets" = dontDistribute super."formlets";
+  "formlets-hsp" = dontDistribute super."formlets-hsp";
+  "formura" = dontDistribute super."formura";
+  "forth-hll" = dontDistribute super."forth-hll";
+  "foscam-directory" = dontDistribute super."foscam-directory";
+  "foscam-filename" = dontDistribute super."foscam-filename";
+  "foscam-sort" = dontDistribute super."foscam-sort";
+  "fountain" = dontDistribute super."fountain";
+  "fpco-api" = dontDistribute super."fpco-api";
+  "fpipe" = dontDistribute super."fpipe";
+  "fpnla" = dontDistribute super."fpnla";
+  "fpnla-examples" = dontDistribute super."fpnla-examples";
+  "fptest" = dontDistribute super."fptest";
+  "fquery" = dontDistribute super."fquery";
+  "fractal" = dontDistribute super."fractal";
+  "fractals" = dontDistribute super."fractals";
+  "fraction" = dontDistribute super."fraction";
+  "frag" = dontDistribute super."frag";
+  "frame" = dontDistribute super."frame";
+  "frame-markdown" = dontDistribute super."frame-markdown";
+  "franchise" = dontDistribute super."franchise";
+  "free-concurrent" = dontDistribute super."free-concurrent";
+  "free-functors" = dontDistribute super."free-functors";
+  "free-game" = dontDistribute super."free-game";
+  "free-http" = dontDistribute super."free-http";
+  "free-operational" = dontDistribute super."free-operational";
+  "free-theorems" = dontDistribute super."free-theorems";
+  "free-theorems-counterexamples" = dontDistribute super."free-theorems-counterexamples";
+  "free-theorems-seq" = dontDistribute super."free-theorems-seq";
+  "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
+  "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
+  "freekick2" = dontDistribute super."freekick2";
+  "freenect" = doDistribute super."freenect_1_2";
+  "freer" = dontDistribute super."freer";
+  "freesect" = dontDistribute super."freesect";
+  "freesound" = dontDistribute super."freesound";
+  "freetype-simple" = dontDistribute super."freetype-simple";
+  "freetype2" = dontDistribute super."freetype2";
+  "fresh" = dontDistribute super."fresh";
+  "friday" = dontDistribute super."friday";
+  "friday-devil" = dontDistribute super."friday-devil";
+  "friday-juicypixels" = dontDistribute super."friday-juicypixels";
+  "friday-scale-dct" = dontDistribute super."friday-scale-dct";
+  "friendly-time" = dontDistribute super."friendly-time";
+  "frontmatter" = dontDistribute super."frontmatter";
+  "frp-arduino" = dontDistribute super."frp-arduino";
+  "frpnow" = dontDistribute super."frpnow";
+  "frpnow-gloss" = dontDistribute super."frpnow-gloss";
+  "frpnow-gtk" = dontDistribute super."frpnow-gtk";
+  "frquotes" = dontDistribute super."frquotes";
+  "fs-events" = dontDistribute super."fs-events";
+  "fsharp" = dontDistribute super."fsharp";
+  "fsmActions" = dontDistribute super."fsmActions";
+  "fst" = dontDistribute super."fst";
+  "fsutils" = dontDistribute super."fsutils";
+  "fswatcher" = dontDistribute super."fswatcher";
+  "ftdi" = dontDistribute super."ftdi";
+  "ftp-conduit" = dontDistribute super."ftp-conduit";
+  "ftphs" = dontDistribute super."ftphs";
+  "ftree" = dontDistribute super."ftree";
+  "ftshell" = dontDistribute super."ftshell";
+  "fugue" = dontDistribute super."fugue";
+  "full-sessions" = dontDistribute super."full-sessions";
+  "full-text-search" = dontDistribute super."full-text-search";
+  "fullstop" = dontDistribute super."fullstop";
+  "funbot" = dontDistribute super."funbot";
+  "funbot-client" = dontDistribute super."funbot-client";
+  "funbot-ext-events" = dontDistribute super."funbot-ext-events";
+  "funbot-git-hook" = dontDistribute super."funbot-git-hook";
+  "funcmp" = dontDistribute super."funcmp";
+  "function-combine" = dontDistribute super."function-combine";
+  "function-instances-algebra" = dontDistribute super."function-instances-algebra";
+  "functional-arrow" = dontDistribute super."functional-arrow";
+  "functional-kmp" = dontDistribute super."functional-kmp";
+  "functor-apply" = dontDistribute super."functor-apply";
+  "functor-combo" = dontDistribute super."functor-combo";
+  "functor-infix" = dontDistribute super."functor-infix";
+  "functor-monadic" = dontDistribute super."functor-monadic";
+  "functor-utils" = dontDistribute super."functor-utils";
+  "functorm" = dontDistribute super."functorm";
+  "functors" = dontDistribute super."functors";
+  "funion" = dontDistribute super."funion";
+  "funpat" = dontDistribute super."funpat";
+  "funsat" = dontDistribute super."funsat";
+  "fusion" = dontDistribute super."fusion";
+  "futun" = dontDistribute super."futun";
+  "future" = dontDistribute super."future";
+  "future-resource" = dontDistribute super."future-resource";
+  "fuzzy" = dontDistribute super."fuzzy";
+  "fuzzy-timings" = dontDistribute super."fuzzy-timings";
+  "fuzzytime" = dontDistribute super."fuzzytime";
+  "fwgl" = dontDistribute super."fwgl";
+  "fwgl-glfw" = dontDistribute super."fwgl-glfw";
+  "fwgl-javascript" = dontDistribute super."fwgl-javascript";
+  "g-npm" = dontDistribute super."g-npm";
+  "gact" = dontDistribute super."gact";
+  "game-of-life" = dontDistribute super."game-of-life";
+  "game-probability" = dontDistribute super."game-probability";
+  "game-tree" = dontDistribute super."game-tree";
+  "gameclock" = dontDistribute super."gameclock";
+  "gamma" = dontDistribute super."gamma";
+  "gang-of-threads" = dontDistribute super."gang-of-threads";
+  "garepinoh" = dontDistribute super."garepinoh";
+  "garsia-wachs" = dontDistribute super."garsia-wachs";
+  "gbu" = dontDistribute super."gbu";
+  "gc" = dontDistribute super."gc";
+  "gc-monitoring-wai" = dontDistribute super."gc-monitoring-wai";
+  "gconf" = dontDistribute super."gconf";
+  "gdiff" = dontDistribute super."gdiff";
+  "gdiff-ig" = dontDistribute super."gdiff-ig";
+  "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
+  "gearbox" = dontDistribute super."gearbox";
+  "geek" = dontDistribute super."geek";
+  "geek-server" = dontDistribute super."geek-server";
+  "gelatin" = dontDistribute super."gelatin";
+  "gemstone" = dontDistribute super."gemstone";
+  "gencheck" = dontDistribute super."gencheck";
+  "gender" = dontDistribute super."gender";
+  "genders" = dontDistribute super."genders";
+  "general-prelude" = dontDistribute super."general-prelude";
+  "generator" = dontDistribute super."generator";
+  "generators" = dontDistribute super."generators";
+  "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-binary" = dontDistribute super."generic-binary";
+  "generic-church" = dontDistribute super."generic-church";
+  "generic-deepseq" = dontDistribute super."generic-deepseq";
+  "generic-deriving" = doDistribute super."generic-deriving_1_8_0";
+  "generic-lucid-scaffold" = dontDistribute super."generic-lucid-scaffold";
+  "generic-maybe" = dontDistribute super."generic-maybe";
+  "generic-pretty" = dontDistribute super."generic-pretty";
+  "generic-server" = dontDistribute super."generic-server";
+  "generic-storable" = dontDistribute super."generic-storable";
+  "generic-tree" = dontDistribute super."generic-tree";
+  "generic-trie" = dontDistribute super."generic-trie";
+  "generic-xml" = dontDistribute super."generic-xml";
+  "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
+  "genericserialize" = dontDistribute super."genericserialize";
+  "genetics" = dontDistribute super."genetics";
+  "geni-gui" = dontDistribute super."geni-gui";
+  "geni-util" = dontDistribute super."geni-util";
+  "geniconvert" = dontDistribute super."geniconvert";
+  "genifunctors" = dontDistribute super."genifunctors";
+  "geniplate" = dontDistribute super."geniplate";
+  "geniserver" = dontDistribute super."geniserver";
+  "genprog" = dontDistribute super."genprog";
+  "gentlemark" = dontDistribute super."gentlemark";
+  "geo-resolver" = dontDistribute super."geo-resolver";
+  "geo-uk" = dontDistribute super."geo-uk";
+  "geocalc" = dontDistribute super."geocalc";
+  "geocode-google" = dontDistribute super."geocode-google";
+  "geodetic" = dontDistribute super."geodetic";
+  "geodetics" = dontDistribute super."geodetics";
+  "geohash" = dontDistribute super."geohash";
+  "geoip2" = dontDistribute super."geoip2";
+  "geojson" = dontDistribute super."geojson";
+  "geom2d" = dontDistribute super."geom2d";
+  "getemx" = dontDistribute super."getemx";
+  "getflag" = dontDistribute super."getflag";
+  "getopt-generics" = doDistribute super."getopt-generics_0_10_0_1";
+  "getopt-simple" = dontDistribute super."getopt-simple";
+  "gf" = dontDistribute super."gf";
+  "ggtsTC" = dontDistribute super."ggtsTC";
+  "ghc-core" = dontDistribute super."ghc-core";
+  "ghc-core-html" = dontDistribute super."ghc-core-html";
+  "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dup" = dontDistribute super."ghc-dup";
+  "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
+  "ghc-events-parallel" = dontDistribute super."ghc-events-parallel";
+  "ghc-exactprint" = dontDistribute super."ghc-exactprint";
+  "ghc-gc-tune" = dontDistribute super."ghc-gc-tune";
+  "ghc-generic-instances" = dontDistribute super."ghc-generic-instances";
+  "ghc-heap-view" = dontDistribute super."ghc-heap-view";
+  "ghc-imported-from" = dontDistribute super."ghc-imported-from";
+  "ghc-make" = dontDistribute super."ghc-make";
+  "ghc-man-completion" = dontDistribute super."ghc-man-completion";
+  "ghc-mod" = dontDistribute super."ghc-mod";
+  "ghc-options" = dontDistribute super."ghc-options";
+  "ghc-parmake" = dontDistribute super."ghc-parmake";
+  "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix";
+  "ghc-pkg-lib" = dontDistribute super."ghc-pkg-lib";
+  "ghc-prof-flamegraph" = dontDistribute super."ghc-prof-flamegraph";
+  "ghc-server" = dontDistribute super."ghc-server";
+  "ghc-session" = dontDistribute super."ghc-session";
+  "ghc-simple" = dontDistribute super."ghc-simple";
+  "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin";
+  "ghc-syb" = dontDistribute super."ghc-syb";
+  "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
+  "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra";
+  "ghc-vis" = dontDistribute super."ghc-vis";
+  "ghci-diagrams" = dontDistribute super."ghci-diagrams";
+  "ghci-haskeline" = dontDistribute super."ghci-haskeline";
+  "ghci-lib" = dontDistribute super."ghci-lib";
+  "ghci-ng" = dontDistribute super."ghci-ng";
+  "ghci-pretty" = dontDistribute super."ghci-pretty";
+  "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
+  "ghcjs-dom" = dontDistribute super."ghcjs-dom";
+  "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
+  "ghcjs-websockets" = dontDistribute super."ghcjs-websockets";
+  "ghclive" = dontDistribute super."ghclive";
+  "ghczdecode" = dontDistribute super."ghczdecode";
+  "ght" = dontDistribute super."ght";
+  "gi-atk" = dontDistribute super."gi-atk";
+  "gi-cairo" = dontDistribute super."gi-cairo";
+  "gi-gdk" = dontDistribute super."gi-gdk";
+  "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
+  "gi-gio" = dontDistribute super."gi-gio";
+  "gi-glib" = dontDistribute super."gi-glib";
+  "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gtk" = dontDistribute super."gi-gtk";
+  "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
+  "gi-notify" = dontDistribute super."gi-notify";
+  "gi-pango" = dontDistribute super."gi-pango";
+  "gi-soup" = dontDistribute super."gi-soup";
+  "gi-vte" = dontDistribute super."gi-vte";
+  "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gimlh" = dontDistribute super."gimlh";
+  "ginger" = dontDistribute super."ginger";
+  "ginsu" = dontDistribute super."ginsu";
+  "gipeda" = doDistribute super."gipeda_0_1_2_1";
+  "gist" = dontDistribute super."gist";
+  "git-all" = dontDistribute super."git-all";
+  "git-annex" = doDistribute super."git-annex_5_20150727";
+  "git-checklist" = dontDistribute super."git-checklist";
+  "git-date" = dontDistribute super."git-date";
+  "git-embed" = dontDistribute super."git-embed";
+  "git-fmt" = dontDistribute super."git-fmt";
+  "git-freq" = dontDistribute super."git-freq";
+  "git-gpush" = dontDistribute super."git-gpush";
+  "git-jump" = dontDistribute super."git-jump";
+  "git-monitor" = dontDistribute super."git-monitor";
+  "git-object" = dontDistribute super."git-object";
+  "git-repair" = dontDistribute super."git-repair";
+  "git-sanity" = dontDistribute super."git-sanity";
+  "git-vogue" = dontDistribute super."git-vogue";
+  "gitHUD" = dontDistribute super."gitHUD";
+  "gitcache" = dontDistribute super."gitcache";
+  "gitdo" = dontDistribute super."gitdo";
+  "github" = dontDistribute super."github";
+  "github-backup" = dontDistribute super."github-backup";
+  "github-post-receive" = dontDistribute super."github-post-receive";
+  "github-types" = dontDistribute super."github-types";
+  "github-utils" = dontDistribute super."github-utils";
+  "github-webhook-handler" = dontDistribute super."github-webhook-handler";
+  "github-webhook-handler-snap" = dontDistribute super."github-webhook-handler-snap";
+  "gitignore" = dontDistribute super."gitignore";
+  "gitit" = dontDistribute super."gitit";
+  "gitlib-cmdline" = dontDistribute super."gitlib-cmdline";
+  "gitlib-cross" = dontDistribute super."gitlib-cross";
+  "gitlib-s3" = dontDistribute super."gitlib-s3";
+  "gitlib-sample" = dontDistribute super."gitlib-sample";
+  "gitlib-utils" = dontDistribute super."gitlib-utils";
+  "gitter" = dontDistribute super."gitter";
+  "gl-capture" = dontDistribute super."gl-capture";
+  "glade" = dontDistribute super."glade";
+  "gladexml-accessor" = dontDistribute super."gladexml-accessor";
+  "glambda" = dontDistribute super."glambda";
+  "glapp" = dontDistribute super."glapp";
+  "glasso" = dontDistribute super."glasso";
+  "glicko" = dontDistribute super."glicko";
+  "glider-nlp" = dontDistribute super."glider-nlp";
+  "glintcollider" = dontDistribute super."glintcollider";
+  "gll" = dontDistribute super."gll";
+  "global" = dontDistribute super."global";
+  "global-config" = dontDistribute super."global-config";
+  "global-lock" = dontDistribute super."global-lock";
+  "global-variables" = dontDistribute super."global-variables";
+  "glome-hs" = dontDistribute super."glome-hs";
+  "gloss" = dontDistribute super."gloss";
+  "gloss-accelerate" = dontDistribute super."gloss-accelerate";
+  "gloss-algorithms" = dontDistribute super."gloss-algorithms";
+  "gloss-banana" = dontDistribute super."gloss-banana";
+  "gloss-devil" = dontDistribute super."gloss-devil";
+  "gloss-examples" = dontDistribute super."gloss-examples";
+  "gloss-game" = dontDistribute super."gloss-game";
+  "gloss-juicy" = dontDistribute super."gloss-juicy";
+  "gloss-raster" = dontDistribute super."gloss-raster";
+  "gloss-raster-accelerate" = dontDistribute super."gloss-raster-accelerate";
+  "gloss-rendering" = dontDistribute super."gloss-rendering";
+  "gloss-sodium" = dontDistribute super."gloss-sodium";
+  "glpk-hs" = dontDistribute super."glpk-hs";
+  "glue" = dontDistribute super."glue";
+  "glue-common" = dontDistribute super."glue-common";
+  "glue-core" = dontDistribute super."glue-core";
+  "glue-ekg" = dontDistribute super."glue-ekg";
+  "glue-example" = dontDistribute super."glue-example";
+  "gluturtle" = dontDistribute super."gluturtle";
+  "gmap" = dontDistribute super."gmap";
+  "gmndl" = dontDistribute super."gmndl";
+  "gnome-desktop" = dontDistribute super."gnome-desktop";
+  "gnome-keyring" = dontDistribute super."gnome-keyring";
+  "gnomevfs" = dontDistribute super."gnomevfs";
+  "gnss-converters" = dontDistribute super."gnss-converters";
+  "gnuplot" = dontDistribute super."gnuplot";
+  "goa" = dontDistribute super."goa";
+  "goal-core" = dontDistribute super."goal-core";
+  "goal-geometry" = dontDistribute super."goal-geometry";
+  "goal-probability" = dontDistribute super."goal-probability";
+  "goal-simulation" = dontDistribute super."goal-simulation";
+  "goatee" = dontDistribute super."goatee";
+  "goatee-gtk" = dontDistribute super."goatee-gtk";
+  "gofer-prelude" = dontDistribute super."gofer-prelude";
+  "gogol" = dontDistribute super."gogol";
+  "gogol-adexchange-buyer" = dontDistribute super."gogol-adexchange-buyer";
+  "gogol-adexchange-seller" = dontDistribute super."gogol-adexchange-seller";
+  "gogol-admin-datatransfer" = dontDistribute super."gogol-admin-datatransfer";
+  "gogol-admin-directory" = dontDistribute super."gogol-admin-directory";
+  "gogol-admin-emailmigration" = dontDistribute super."gogol-admin-emailmigration";
+  "gogol-admin-reports" = dontDistribute super."gogol-admin-reports";
+  "gogol-adsense" = dontDistribute super."gogol-adsense";
+  "gogol-adsense-host" = dontDistribute super."gogol-adsense-host";
+  "gogol-affiliates" = dontDistribute super."gogol-affiliates";
+  "gogol-analytics" = dontDistribute super."gogol-analytics";
+  "gogol-android-enterprise" = dontDistribute super."gogol-android-enterprise";
+  "gogol-android-publisher" = dontDistribute super."gogol-android-publisher";
+  "gogol-appengine" = dontDistribute super."gogol-appengine";
+  "gogol-apps-activity" = dontDistribute super."gogol-apps-activity";
+  "gogol-apps-calendar" = dontDistribute super."gogol-apps-calendar";
+  "gogol-apps-licensing" = dontDistribute super."gogol-apps-licensing";
+  "gogol-apps-reseller" = dontDistribute super."gogol-apps-reseller";
+  "gogol-apps-tasks" = dontDistribute super."gogol-apps-tasks";
+  "gogol-appstate" = dontDistribute super."gogol-appstate";
+  "gogol-autoscaler" = dontDistribute super."gogol-autoscaler";
+  "gogol-bigquery" = dontDistribute super."gogol-bigquery";
+  "gogol-billing" = dontDistribute super."gogol-billing";
+  "gogol-blogger" = dontDistribute super."gogol-blogger";
+  "gogol-books" = dontDistribute super."gogol-books";
+  "gogol-civicinfo" = dontDistribute super."gogol-civicinfo";
+  "gogol-classroom" = dontDistribute super."gogol-classroom";
+  "gogol-cloudtrace" = dontDistribute super."gogol-cloudtrace";
+  "gogol-compute" = dontDistribute super."gogol-compute";
+  "gogol-container" = dontDistribute super."gogol-container";
+  "gogol-core" = dontDistribute super."gogol-core";
+  "gogol-customsearch" = dontDistribute super."gogol-customsearch";
+  "gogol-dataflow" = dontDistribute super."gogol-dataflow";
+  "gogol-datastore" = dontDistribute super."gogol-datastore";
+  "gogol-debugger" = dontDistribute super."gogol-debugger";
+  "gogol-deploymentmanager" = dontDistribute super."gogol-deploymentmanager";
+  "gogol-dfareporting" = dontDistribute super."gogol-dfareporting";
+  "gogol-discovery" = dontDistribute super."gogol-discovery";
+  "gogol-dns" = dontDistribute super."gogol-dns";
+  "gogol-doubleclick-bids" = dontDistribute super."gogol-doubleclick-bids";
+  "gogol-doubleclick-search" = dontDistribute super."gogol-doubleclick-search";
+  "gogol-drive" = dontDistribute super."gogol-drive";
+  "gogol-fitness" = dontDistribute super."gogol-fitness";
+  "gogol-fonts" = dontDistribute super."gogol-fonts";
+  "gogol-freebasesearch" = dontDistribute super."gogol-freebasesearch";
+  "gogol-fusiontables" = dontDistribute super."gogol-fusiontables";
+  "gogol-games" = dontDistribute super."gogol-games";
+  "gogol-games-configuration" = dontDistribute super."gogol-games-configuration";
+  "gogol-games-management" = dontDistribute super."gogol-games-management";
+  "gogol-genomics" = dontDistribute super."gogol-genomics";
+  "gogol-gmail" = dontDistribute super."gogol-gmail";
+  "gogol-groups-migration" = dontDistribute super."gogol-groups-migration";
+  "gogol-groups-settings" = dontDistribute super."gogol-groups-settings";
+  "gogol-identity-toolkit" = dontDistribute super."gogol-identity-toolkit";
+  "gogol-latencytest" = dontDistribute super."gogol-latencytest";
+  "gogol-logging" = dontDistribute super."gogol-logging";
+  "gogol-maps-coordinate" = dontDistribute super."gogol-maps-coordinate";
+  "gogol-maps-engine" = dontDistribute super."gogol-maps-engine";
+  "gogol-mirror" = dontDistribute super."gogol-mirror";
+  "gogol-monitoring" = dontDistribute super."gogol-monitoring";
+  "gogol-oauth2" = dontDistribute super."gogol-oauth2";
+  "gogol-pagespeed" = dontDistribute super."gogol-pagespeed";
+  "gogol-partners" = dontDistribute super."gogol-partners";
+  "gogol-play-moviespartner" = dontDistribute super."gogol-play-moviespartner";
+  "gogol-plus" = dontDistribute super."gogol-plus";
+  "gogol-plus-domains" = dontDistribute super."gogol-plus-domains";
+  "gogol-prediction" = dontDistribute super."gogol-prediction";
+  "gogol-proximitybeacon" = dontDistribute super."gogol-proximitybeacon";
+  "gogol-pubsub" = dontDistribute super."gogol-pubsub";
+  "gogol-qpxexpress" = dontDistribute super."gogol-qpxexpress";
+  "gogol-replicapool" = dontDistribute super."gogol-replicapool";
+  "gogol-replicapool-updater" = dontDistribute super."gogol-replicapool-updater";
+  "gogol-resourcemanager" = dontDistribute super."gogol-resourcemanager";
+  "gogol-resourceviews" = dontDistribute super."gogol-resourceviews";
+  "gogol-shopping-content" = dontDistribute super."gogol-shopping-content";
+  "gogol-siteverification" = dontDistribute super."gogol-siteverification";
+  "gogol-spectrum" = dontDistribute super."gogol-spectrum";
+  "gogol-sqladmin" = dontDistribute super."gogol-sqladmin";
+  "gogol-storage" = dontDistribute super."gogol-storage";
+  "gogol-storage-transfer" = dontDistribute super."gogol-storage-transfer";
+  "gogol-tagmanager" = dontDistribute super."gogol-tagmanager";
+  "gogol-taskqueue" = dontDistribute super."gogol-taskqueue";
+  "gogol-translate" = dontDistribute super."gogol-translate";
+  "gogol-urlshortener" = dontDistribute super."gogol-urlshortener";
+  "gogol-useraccounts" = dontDistribute super."gogol-useraccounts";
+  "gogol-webmaster-tools" = dontDistribute super."gogol-webmaster-tools";
+  "gogol-youtube" = dontDistribute super."gogol-youtube";
+  "gogol-youtube-analytics" = dontDistribute super."gogol-youtube-analytics";
+  "gogol-youtube-reporting" = dontDistribute super."gogol-youtube-reporting";
+  "gooey" = dontDistribute super."gooey";
+  "google-cloud" = dontDistribute super."google-cloud";
+  "google-dictionary" = dontDistribute super."google-dictionary";
+  "google-drive" = dontDistribute super."google-drive";
+  "google-html5-slide" = dontDistribute super."google-html5-slide";
+  "google-mail-filters" = dontDistribute super."google-mail-filters";
+  "google-oauth2" = dontDistribute super."google-oauth2";
+  "google-search" = dontDistribute super."google-search";
+  "google-translate" = dontDistribute super."google-translate";
+  "googleplus" = dontDistribute super."googleplus";
+  "googlepolyline" = dontDistribute super."googlepolyline";
+  "gopherbot" = dontDistribute super."gopherbot";
+  "gpah" = dontDistribute super."gpah";
+  "gpcsets" = dontDistribute super."gpcsets";
+  "gpolyline" = dontDistribute super."gpolyline";
+  "gps" = dontDistribute super."gps";
+  "gps2htmlReport" = dontDistribute super."gps2htmlReport";
+  "gpx-conduit" = dontDistribute super."gpx-conduit";
+  "graceful" = dontDistribute super."graceful";
+  "grammar-combinators" = dontDistribute super."grammar-combinators";
+  "grapefruit-examples" = dontDistribute super."grapefruit-examples";
+  "grapefruit-frp" = dontDistribute super."grapefruit-frp";
+  "grapefruit-records" = dontDistribute super."grapefruit-records";
+  "grapefruit-ui" = dontDistribute super."grapefruit-ui";
+  "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-generators" = dontDistribute super."graph-generators";
+  "graph-matchings" = dontDistribute super."graph-matchings";
+  "graph-rewriting" = dontDistribute super."graph-rewriting";
+  "graph-rewriting-cl" = dontDistribute super."graph-rewriting-cl";
+  "graph-rewriting-gl" = dontDistribute super."graph-rewriting-gl";
+  "graph-rewriting-lambdascope" = dontDistribute super."graph-rewriting-lambdascope";
+  "graph-rewriting-layout" = dontDistribute super."graph-rewriting-layout";
+  "graph-rewriting-ski" = dontDistribute super."graph-rewriting-ski";
+  "graph-rewriting-strategies" = dontDistribute super."graph-rewriting-strategies";
+  "graph-rewriting-trs" = dontDistribute super."graph-rewriting-trs";
+  "graph-rewriting-ww" = dontDistribute super."graph-rewriting-ww";
+  "graph-serialize" = dontDistribute super."graph-serialize";
+  "graph-utils" = dontDistribute super."graph-utils";
+  "graph-visit" = dontDistribute super."graph-visit";
+  "graphbuilder" = dontDistribute super."graphbuilder";
+  "graphene" = dontDistribute super."graphene";
+  "graphics-drawingcombinators" = dontDistribute super."graphics-drawingcombinators";
+  "graphics-formats-collada" = dontDistribute super."graphics-formats-collada";
+  "graphicsFormats" = dontDistribute super."graphicsFormats";
+  "graphicstools" = dontDistribute super."graphicstools";
+  "graphmod" = dontDistribute super."graphmod";
+  "graphql" = dontDistribute super."graphql";
+  "graphtype" = dontDistribute super."graphtype";
+  "graphviz" = dontDistribute super."graphviz";
+  "gray-code" = dontDistribute super."gray-code";
+  "gray-extended" = dontDistribute super."gray-extended";
+  "greencard" = dontDistribute super."greencard";
+  "greencard-lib" = dontDistribute super."greencard-lib";
+  "greg-client" = dontDistribute super."greg-client";
+  "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "grid" = dontDistribute super."grid";
+  "gridland" = dontDistribute super."gridland";
+  "grm" = dontDistribute super."grm";
+  "groom" = dontDistribute super."groom";
+  "groundhog-inspector" = dontDistribute super."groundhog-inspector";
+  "group-with" = dontDistribute super."group-with";
+  "grouped-list" = dontDistribute super."grouped-list";
+  "groupoid" = dontDistribute super."groupoid";
+  "gruff" = dontDistribute super."gruff";
+  "gruff-examples" = dontDistribute super."gruff-examples";
+  "gsc-weighting" = dontDistribute super."gsc-weighting";
+  "gsl-random" = dontDistribute super."gsl-random";
+  "gsl-random-fu" = dontDistribute super."gsl-random-fu";
+  "gsmenu" = dontDistribute super."gsmenu";
+  "gstreamer" = dontDistribute super."gstreamer";
+  "gt-tools" = dontDistribute super."gt-tools";
+  "gtfs" = dontDistribute super."gtfs";
+  "gtk" = doDistribute super."gtk_0_13_9";
+  "gtk-helpers" = dontDistribute super."gtk-helpers";
+  "gtk-jsinput" = dontDistribute super."gtk-jsinput";
+  "gtk-largeTreeStore" = dontDistribute super."gtk-largeTreeStore";
+  "gtk-mac-integration" = dontDistribute super."gtk-mac-integration";
+  "gtk-serialized-event" = dontDistribute super."gtk-serialized-event";
+  "gtk-simple-list-view" = dontDistribute super."gtk-simple-list-view";
+  "gtk-toggle-button-list" = dontDistribute super."gtk-toggle-button-list";
+  "gtk-toy" = dontDistribute super."gtk-toy";
+  "gtk-traymanager" = dontDistribute super."gtk-traymanager";
+  "gtk2hs-cast-glade" = dontDistribute super."gtk2hs-cast-glade";
+  "gtk2hs-cast-glib" = dontDistribute super."gtk2hs-cast-glib";
+  "gtk2hs-cast-gnomevfs" = dontDistribute super."gtk2hs-cast-gnomevfs";
+  "gtk2hs-cast-gtk" = dontDistribute super."gtk2hs-cast-gtk";
+  "gtk2hs-cast-gtkglext" = dontDistribute super."gtk2hs-cast-gtkglext";
+  "gtk2hs-cast-gtksourceview2" = dontDistribute super."gtk2hs-cast-gtksourceview2";
+  "gtk2hs-cast-th" = dontDistribute super."gtk2hs-cast-th";
+  "gtk2hs-hello" = dontDistribute super."gtk2hs-hello";
+  "gtk2hs-rpn" = dontDistribute super."gtk2hs-rpn";
+  "gtk3-mac-integration" = dontDistribute super."gtk3-mac-integration";
+  "gtkglext" = dontDistribute super."gtkglext";
+  "gtkimageview" = dontDistribute super."gtkimageview";
+  "gtkrsync" = dontDistribute super."gtkrsync";
+  "gtksourceview2" = dontDistribute super."gtksourceview2";
+  "gtksourceview3" = dontDistribute super."gtksourceview3";
+  "guarded-rewriting" = dontDistribute super."guarded-rewriting";
+  "guess-combinator" = dontDistribute super."guess-combinator";
+  "gulcii" = dontDistribute super."gulcii";
+  "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis";
+  "gyah-bin" = dontDistribute super."gyah-bin";
+  "h-booru" = dontDistribute super."h-booru";
+  "h-gpgme" = dontDistribute super."h-gpgme";
+  "h2048" = dontDistribute super."h2048";
+  "hArduino" = dontDistribute super."hArduino";
+  "hBDD" = dontDistribute super."hBDD";
+  "hBDD-CMUBDD" = dontDistribute super."hBDD-CMUBDD";
+  "hBDD-CUDD" = dontDistribute super."hBDD-CUDD";
+  "hCsound" = dontDistribute super."hCsound";
+  "hDFA" = dontDistribute super."hDFA";
+  "hF2" = dontDistribute super."hF2";
+  "hGelf" = dontDistribute super."hGelf";
+  "hLLVM" = dontDistribute super."hLLVM";
+  "hMollom" = dontDistribute super."hMollom";
+  "hOpenPGP" = dontDistribute super."hOpenPGP";
+  "hPDB-examples" = dontDistribute super."hPDB-examples";
+  "hPushover" = dontDistribute super."hPushover";
+  "hR" = dontDistribute super."hR";
+  "hRESP" = dontDistribute super."hRESP";
+  "hS3" = dontDistribute super."hS3";
+  "hScraper" = dontDistribute super."hScraper";
+  "hSimpleDB" = dontDistribute super."hSimpleDB";
+  "hTalos" = dontDistribute super."hTalos";
+  "hTensor" = dontDistribute super."hTensor";
+  "hVOIDP" = dontDistribute super."hVOIDP";
+  "hXmixer" = dontDistribute super."hXmixer";
+  "haar" = dontDistribute super."haar";
+  "hacanon-light" = dontDistribute super."hacanon-light";
+  "hack" = dontDistribute super."hack";
+  "hack-contrib" = dontDistribute super."hack-contrib";
+  "hack-contrib-press" = dontDistribute super."hack-contrib-press";
+  "hack-frontend-happstack" = dontDistribute super."hack-frontend-happstack";
+  "hack-frontend-monadcgi" = dontDistribute super."hack-frontend-monadcgi";
+  "hack-handler-cgi" = dontDistribute super."hack-handler-cgi";
+  "hack-handler-epoll" = dontDistribute super."hack-handler-epoll";
+  "hack-handler-evhttp" = dontDistribute super."hack-handler-evhttp";
+  "hack-handler-fastcgi" = dontDistribute super."hack-handler-fastcgi";
+  "hack-handler-happstack" = dontDistribute super."hack-handler-happstack";
+  "hack-handler-hyena" = dontDistribute super."hack-handler-hyena";
+  "hack-handler-kibro" = dontDistribute super."hack-handler-kibro";
+  "hack-handler-simpleserver" = dontDistribute super."hack-handler-simpleserver";
+  "hack-middleware-cleanpath" = dontDistribute super."hack-middleware-cleanpath";
+  "hack-middleware-clientsession" = dontDistribute super."hack-middleware-clientsession";
+  "hack-middleware-gzip" = dontDistribute super."hack-middleware-gzip";
+  "hack-middleware-jsonp" = dontDistribute super."hack-middleware-jsonp";
+  "hack2" = dontDistribute super."hack2";
+  "hack2-contrib" = dontDistribute super."hack2-contrib";
+  "hack2-contrib-extra" = dontDistribute super."hack2-contrib-extra";
+  "hack2-handler-happstack-server" = dontDistribute super."hack2-handler-happstack-server";
+  "hack2-handler-mongrel2-http" = dontDistribute super."hack2-handler-mongrel2-http";
+  "hack2-handler-snap-server" = dontDistribute super."hack2-handler-snap-server";
+  "hack2-handler-warp" = dontDistribute super."hack2-handler-warp";
+  "hack2-interface-wai" = dontDistribute super."hack2-interface-wai";
+  "hackage-diff" = dontDistribute super."hackage-diff";
+  "hackage-plot" = dontDistribute super."hackage-plot";
+  "hackage-proxy" = dontDistribute super."hackage-proxy";
+  "hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
+  "hackage-security" = dontDistribute super."hackage-security";
+  "hackage-security-HTTP" = dontDistribute super."hackage-security-HTTP";
+  "hackage-server" = dontDistribute super."hackage-server";
+  "hackage-sparks" = dontDistribute super."hackage-sparks";
+  "hackage-whatsnew" = dontDistribute super."hackage-whatsnew";
+  "hackage2hwn" = dontDistribute super."hackage2hwn";
+  "hackage2twitter" = dontDistribute super."hackage2twitter";
+  "hackager" = dontDistribute super."hackager";
+  "hackernews" = dontDistribute super."hackernews";
+  "hackertyper" = dontDistribute super."hackertyper";
+  "hackmanager" = dontDistribute super."hackmanager";
+  "hackport" = dontDistribute super."hackport";
+  "hactor" = dontDistribute super."hactor";
+  "hactors" = dontDistribute super."hactors";
+  "haddock" = dontDistribute super."haddock";
+  "haddock-leksah" = dontDistribute super."haddock-leksah";
+  "haddocset" = dontDistribute super."haddocset";
+  "hadoop-formats" = dontDistribute super."hadoop-formats";
+  "hadoop-rpc" = dontDistribute super."hadoop-rpc";
+  "hadoop-tools" = dontDistribute super."hadoop-tools";
+  "haeredes" = dontDistribute super."haeredes";
+  "haggis" = dontDistribute super."haggis";
+  "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
+  "hailgun" = dontDistribute super."hailgun";
+  "hailgun-send" = dontDistribute super."hailgun-send";
+  "hails" = dontDistribute super."hails";
+  "hails-bin" = dontDistribute super."hails-bin";
+  "hairy" = dontDistribute super."hairy";
+  "hakaru" = dontDistribute super."hakaru";
+  "hake" = dontDistribute super."hake";
+  "hakismet" = dontDistribute super."hakismet";
+  "hako" = dontDistribute super."hako";
+  "hakyll-R" = dontDistribute super."hakyll-R";
+  "hakyll-agda" = dontDistribute super."hakyll-agda";
+  "hakyll-blaze-templates" = dontDistribute super."hakyll-blaze-templates";
+  "hakyll-contrib" = dontDistribute super."hakyll-contrib";
+  "hakyll-contrib-hyphenation" = dontDistribute super."hakyll-contrib-hyphenation";
+  "hakyll-contrib-links" = dontDistribute super."hakyll-contrib-links";
+  "hakyll-convert" = dontDistribute super."hakyll-convert";
+  "hakyll-elm" = dontDistribute super."hakyll-elm";
+  "hakyll-sass" = dontDistribute super."hakyll-sass";
+  "halberd" = dontDistribute super."halberd";
+  "halfs" = dontDistribute super."halfs";
+  "halipeto" = dontDistribute super."halipeto";
+  "halive" = dontDistribute super."halive";
+  "halma" = dontDistribute super."halma";
+  "haltavista" = dontDistribute super."haltavista";
+  "hamid" = dontDistribute super."hamid";
+  "hampp" = dontDistribute super."hampp";
+  "hamtmap" = dontDistribute super."hamtmap";
+  "hamusic" = dontDistribute super."hamusic";
+  "handa-gdata" = dontDistribute super."handa-gdata";
+  "handa-geodata" = dontDistribute super."handa-geodata";
+  "handa-opengl" = dontDistribute super."handa-opengl";
+  "handle-like" = dontDistribute super."handle-like";
+  "handsy" = dontDistribute super."handsy";
+  "hangman" = dontDistribute super."hangman";
+  "hannahci" = dontDistribute super."hannahci";
+  "hans" = dontDistribute super."hans";
+  "hans-pcap" = dontDistribute super."hans-pcap";
+  "hans-pfq" = dontDistribute super."hans-pfq";
+  "haphviz" = dontDistribute super."haphviz";
+  "hapistrano" = dontDistribute super."hapistrano";
+  "happindicator" = dontDistribute super."happindicator";
+  "happindicator3" = dontDistribute super."happindicator3";
+  "happraise" = dontDistribute super."happraise";
+  "happs-hsp" = dontDistribute super."happs-hsp";
+  "happs-hsp-template" = dontDistribute super."happs-hsp-template";
+  "happs-tutorial" = dontDistribute super."happs-tutorial";
+  "happstack" = dontDistribute super."happstack";
+  "happstack-auth" = dontDistribute super."happstack-auth";
+  "happstack-authenticate" = dontDistribute super."happstack-authenticate";
+  "happstack-clientsession" = dontDistribute super."happstack-clientsession";
+  "happstack-contrib" = dontDistribute super."happstack-contrib";
+  "happstack-data" = dontDistribute super."happstack-data";
+  "happstack-dlg" = dontDistribute super."happstack-dlg";
+  "happstack-facebook" = dontDistribute super."happstack-facebook";
+  "happstack-fastcgi" = dontDistribute super."happstack-fastcgi";
+  "happstack-fay" = dontDistribute super."happstack-fay";
+  "happstack-fay-ajax" = dontDistribute super."happstack-fay-ajax";
+  "happstack-foundation" = dontDistribute super."happstack-foundation";
+  "happstack-hamlet" = dontDistribute super."happstack-hamlet";
+  "happstack-heist" = dontDistribute super."happstack-heist";
+  "happstack-helpers" = dontDistribute super."happstack-helpers";
+  "happstack-hsp" = dontDistribute super."happstack-hsp";
+  "happstack-hstringtemplate" = dontDistribute super."happstack-hstringtemplate";
+  "happstack-ixset" = dontDistribute super."happstack-ixset";
+  "happstack-jmacro" = dontDistribute super."happstack-jmacro";
+  "happstack-lite" = dontDistribute super."happstack-lite";
+  "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
+  "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server-tls" = dontDistribute super."happstack-server-tls";
+  "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
+  "happstack-state" = dontDistribute super."happstack-state";
+  "happstack-static-routing" = dontDistribute super."happstack-static-routing";
+  "happstack-util" = dontDistribute super."happstack-util";
+  "happstack-yui" = dontDistribute super."happstack-yui";
+  "happy-meta" = dontDistribute super."happy-meta";
+  "happybara" = dontDistribute super."happybara";
+  "happybara-webkit" = dontDistribute super."happybara-webkit";
+  "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "har" = dontDistribute super."har";
+  "harchive" = dontDistribute super."harchive";
+  "hark" = dontDistribute super."hark";
+  "harmony" = dontDistribute super."harmony";
+  "haroonga" = dontDistribute super."haroonga";
+  "haroonga-httpd" = dontDistribute super."haroonga-httpd";
+  "harp" = dontDistribute super."harp";
+  "harpy" = dontDistribute super."harpy";
+  "has" = dontDistribute super."has";
+  "has-th" = dontDistribute super."has-th";
+  "hascal" = dontDistribute super."hascal";
+  "hascat" = dontDistribute super."hascat";
+  "hascat-lib" = dontDistribute super."hascat-lib";
+  "hascat-setup" = dontDistribute super."hascat-setup";
+  "hascat-system" = dontDistribute super."hascat-system";
+  "hash" = dontDistribute super."hash";
+  "hashable-generics" = dontDistribute super."hashable-generics";
+  "hashable-time" = dontDistribute super."hashable-time";
+  "hashabler" = dontDistribute super."hashabler";
+  "hashed-storage" = dontDistribute super."hashed-storage";
+  "hashids" = dontDistribute super."hashids";
+  "hashring" = dontDistribute super."hashring";
+  "hashtables-plus" = dontDistribute super."hashtables-plus";
+  "hasim" = dontDistribute super."hasim";
+  "hask" = dontDistribute super."hask";
+  "hask-home" = dontDistribute super."hask-home";
+  "haskades" = dontDistribute super."haskades";
+  "haskakafka" = dontDistribute super."haskakafka";
+  "haskanoid" = dontDistribute super."haskanoid";
+  "haskarrow" = dontDistribute super."haskarrow";
+  "haskbot-core" = dontDistribute super."haskbot-core";
+  "haskdeep" = dontDistribute super."haskdeep";
+  "haskdogs" = dontDistribute super."haskdogs";
+  "haskeem" = dontDistribute super."haskeem";
+  "haskeline" = doDistribute super."haskeline_0_7_2_2";
+  "haskeline-class" = dontDistribute super."haskeline-class";
+  "haskell-aliyun" = dontDistribute super."haskell-aliyun";
+  "haskell-awk" = dontDistribute super."haskell-awk";
+  "haskell-bcrypt" = dontDistribute super."haskell-bcrypt";
+  "haskell-brainfuck" = dontDistribute super."haskell-brainfuck";
+  "haskell-cnc" = dontDistribute super."haskell-cnc";
+  "haskell-coffee" = dontDistribute super."haskell-coffee";
+  "haskell-compression" = dontDistribute super."haskell-compression";
+  "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
+  "haskell-docs" = dontDistribute super."haskell-docs";
+  "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-formatter" = dontDistribute super."haskell-formatter";
+  "haskell-ftp" = dontDistribute super."haskell-ftp";
+  "haskell-generate" = dontDistribute super."haskell-generate";
+  "haskell-gi" = dontDistribute super."haskell-gi";
+  "haskell-gi-base" = dontDistribute super."haskell-gi-base";
+  "haskell-import-graph" = dontDistribute super."haskell-import-graph";
+  "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpi" = dontDistribute super."haskell-mpi";
+  "haskell-names" = doDistribute super."haskell-names_0_5_3";
+  "haskell-openflow" = dontDistribute super."haskell-openflow";
+  "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
+  "haskell-platform-test" = dontDistribute super."haskell-platform-test";
+  "haskell-plot" = dontDistribute super."haskell-plot";
+  "haskell-qrencode" = dontDistribute super."haskell-qrencode";
+  "haskell-read-editor" = dontDistribute super."haskell-read-editor";
+  "haskell-reflect" = dontDistribute super."haskell-reflect";
+  "haskell-rules" = dontDistribute super."haskell-rules";
+  "haskell-src-exts" = doDistribute super."haskell-src-exts_1_16_0_1";
+  "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq";
+  "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton";
+  "haskell-token-utils" = dontDistribute super."haskell-token-utils";
+  "haskell-tor" = dontDistribute super."haskell-tor";
+  "haskell-type-exts" = dontDistribute super."haskell-type-exts";
+  "haskell-typescript" = dontDistribute super."haskell-typescript";
+  "haskell-tyrant" = dontDistribute super."haskell-tyrant";
+  "haskell-updater" = dontDistribute super."haskell-updater";
+  "haskell-xmpp" = dontDistribute super."haskell-xmpp";
+  "haskell2010" = dontDistribute super."haskell2010";
+  "haskell98" = dontDistribute super."haskell98";
+  "haskell98libraries" = dontDistribute super."haskell98libraries";
+  "haskelldb" = dontDistribute super."haskelldb";
+  "haskelldb-connect-hdbc" = dontDistribute super."haskelldb-connect-hdbc";
+  "haskelldb-connect-hdbc-catchio-mtl" = dontDistribute super."haskelldb-connect-hdbc-catchio-mtl";
+  "haskelldb-connect-hdbc-catchio-tf" = dontDistribute super."haskelldb-connect-hdbc-catchio-tf";
+  "haskelldb-connect-hdbc-catchio-transformers" = dontDistribute super."haskelldb-connect-hdbc-catchio-transformers";
+  "haskelldb-connect-hdbc-lifted" = dontDistribute super."haskelldb-connect-hdbc-lifted";
+  "haskelldb-dynamic" = dontDistribute super."haskelldb-dynamic";
+  "haskelldb-flat" = dontDistribute super."haskelldb-flat";
+  "haskelldb-hdbc" = dontDistribute super."haskelldb-hdbc";
+  "haskelldb-hdbc-mysql" = dontDistribute super."haskelldb-hdbc-mysql";
+  "haskelldb-hdbc-odbc" = dontDistribute super."haskelldb-hdbc-odbc";
+  "haskelldb-hdbc-postgresql" = dontDistribute super."haskelldb-hdbc-postgresql";
+  "haskelldb-hdbc-sqlite3" = dontDistribute super."haskelldb-hdbc-sqlite3";
+  "haskelldb-hsql" = dontDistribute super."haskelldb-hsql";
+  "haskelldb-hsql-mysql" = dontDistribute super."haskelldb-hsql-mysql";
+  "haskelldb-hsql-odbc" = dontDistribute super."haskelldb-hsql-odbc";
+  "haskelldb-hsql-oracle" = dontDistribute super."haskelldb-hsql-oracle";
+  "haskelldb-hsql-postgresql" = dontDistribute super."haskelldb-hsql-postgresql";
+  "haskelldb-hsql-sqlite" = dontDistribute super."haskelldb-hsql-sqlite";
+  "haskelldb-hsql-sqlite3" = dontDistribute super."haskelldb-hsql-sqlite3";
+  "haskelldb-th" = dontDistribute super."haskelldb-th";
+  "haskelldb-wx" = dontDistribute super."haskelldb-wx";
+  "haskellscrabble" = dontDistribute super."haskellscrabble";
+  "haskellscript" = dontDistribute super."haskellscript";
+  "haskelm" = dontDistribute super."haskelm";
+  "haskgame" = dontDistribute super."haskgame";
+  "haskheap" = dontDistribute super."haskheap";
+  "haskhol-core" = dontDistribute super."haskhol-core";
+  "haskintex" = doDistribute super."haskintex_0_5_1_0";
+  "haskmon" = dontDistribute super."haskmon";
+  "haskoin" = dontDistribute super."haskoin";
+  "haskoin-core" = dontDistribute super."haskoin-core";
+  "haskoin-crypto" = dontDistribute super."haskoin-crypto";
+  "haskoin-node" = dontDistribute super."haskoin-node";
+  "haskoin-protocol" = dontDistribute super."haskoin-protocol";
+  "haskoin-script" = dontDistribute super."haskoin-script";
+  "haskoin-util" = dontDistribute super."haskoin-util";
+  "haskoin-wallet" = dontDistribute super."haskoin-wallet";
+  "haskoon" = dontDistribute super."haskoon";
+  "haskoon-httpspec" = dontDistribute super."haskoon-httpspec";
+  "haskoon-salvia" = dontDistribute super."haskoon-salvia";
+  "haskore" = dontDistribute super."haskore";
+  "haskore-realtime" = dontDistribute super."haskore-realtime";
+  "haskore-supercollider" = dontDistribute super."haskore-supercollider";
+  "haskore-synthesizer" = dontDistribute super."haskore-synthesizer";
+  "haskore-vintage" = dontDistribute super."haskore-vintage";
+  "hasktags" = dontDistribute super."hasktags";
+  "haslo" = dontDistribute super."haslo";
+  "hasloGUI" = dontDistribute super."hasloGUI";
+  "hasparql-client" = dontDistribute super."hasparql-client";
+  "haspell" = dontDistribute super."haspell";
+  "hasql" = doDistribute super."hasql_0_7_4";
+  "hasql-pool" = dontDistribute super."hasql-pool";
+  "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
+  "hasql-th" = dontDistribute super."hasql-th";
+  "hasql-transaction" = dontDistribute super."hasql-transaction";
+  "hastache-aeson" = dontDistribute super."hastache-aeson";
+  "haste" = dontDistribute super."haste";
+  "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-markup" = dontDistribute super."haste-markup";
+  "haste-perch" = dontDistribute super."haste-perch";
+  "hastily" = dontDistribute super."hastily";
+  "hasty-hamiltonian" = dontDistribute super."hasty-hamiltonian";
+  "hat" = dontDistribute super."hat";
+  "hatex-guide" = dontDistribute super."hatex-guide";
+  "hath" = dontDistribute super."hath";
+  "hatt" = dontDistribute super."hatt";
+  "haverer" = dontDistribute super."haverer";
+  "hawitter" = dontDistribute super."hawitter";
+  "haxl" = dontDistribute super."haxl";
+  "haxl-amazonka" = dontDistribute super."haxl-amazonka";
+  "haxl-facebook" = dontDistribute super."haxl-facebook";
+  "haxparse" = dontDistribute super."haxparse";
+  "haxr-th" = dontDistribute super."haxr-th";
+  "haxy" = dontDistribute super."haxy";
+  "hayland" = dontDistribute super."hayland";
+  "hayoo-cli" = dontDistribute super."hayoo-cli";
+  "hback" = dontDistribute super."hback";
+  "hbayes" = dontDistribute super."hbayes";
+  "hbb" = dontDistribute super."hbb";
+  "hbcd" = dontDistribute super."hbcd";
+  "hbeat" = dontDistribute super."hbeat";
+  "hblas" = dontDistribute super."hblas";
+  "hblock" = dontDistribute super."hblock";
+  "hbro" = dontDistribute super."hbro";
+  "hbro-contrib" = dontDistribute super."hbro-contrib";
+  "hburg" = dontDistribute super."hburg";
+  "hcc" = dontDistribute super."hcc";
+  "hcg-minus" = dontDistribute super."hcg-minus";
+  "hcg-minus-cairo" = dontDistribute super."hcg-minus-cairo";
+  "hcheat" = dontDistribute super."hcheat";
+  "hchesslib" = dontDistribute super."hchesslib";
+  "hcltest" = dontDistribute super."hcltest";
+  "hcron" = dontDistribute super."hcron";
+  "hcube" = dontDistribute super."hcube";
+  "hcwiid" = dontDistribute super."hcwiid";
+  "hdaemonize-buildfix" = dontDistribute super."hdaemonize-buildfix";
+  "hdbc-aeson" = dontDistribute super."hdbc-aeson";
+  "hdbc-postgresql-hstore" = dontDistribute super."hdbc-postgresql-hstore";
+  "hdbc-tuple" = dontDistribute super."hdbc-tuple";
+  "hdbi" = dontDistribute super."hdbi";
+  "hdbi-conduit" = dontDistribute super."hdbi-conduit";
+  "hdbi-postgresql" = dontDistribute super."hdbi-postgresql";
+  "hdbi-sqlite" = dontDistribute super."hdbi-sqlite";
+  "hdbi-tests" = dontDistribute super."hdbi-tests";
+  "hdf" = dontDistribute super."hdf";
+  "hdigest" = dontDistribute super."hdigest";
+  "hdirect" = dontDistribute super."hdirect";
+  "hdis86" = dontDistribute super."hdis86";
+  "hdiscount" = dontDistribute super."hdiscount";
+  "hdm" = dontDistribute super."hdm";
+  "hdph" = dontDistribute super."hdph";
+  "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
+  "headergen" = dontDistribute super."headergen";
+  "heapsort" = dontDistribute super."heapsort";
+  "hecc" = dontDistribute super."hecc";
+  "hedis-config" = dontDistribute super."hedis-config";
+  "hedis-monadic" = dontDistribute super."hedis-monadic";
+  "hedis-pile" = dontDistribute super."hedis-pile";
+  "hedis-simple" = dontDistribute super."hedis-simple";
+  "hedis-tags" = dontDistribute super."hedis-tags";
+  "hedn" = dontDistribute super."hedn";
+  "hein" = dontDistribute super."hein";
+  "heist-aeson" = dontDistribute super."heist-aeson";
+  "heist-async" = dontDistribute super."heist-async";
+  "helics" = dontDistribute super."helics";
+  "helics-wai" = dontDistribute super."helics-wai";
+  "helisp" = dontDistribute super."helisp";
+  "helium" = dontDistribute super."helium";
+  "hell" = dontDistribute super."hell";
+  "hellage" = dontDistribute super."hellage";
+  "hellnet" = dontDistribute super."hellnet";
+  "hello" = dontDistribute super."hello";
+  "helm" = dontDistribute super."helm";
+  "help-esb" = dontDistribute super."help-esb";
+  "hemkay" = dontDistribute super."hemkay";
+  "hemkay-core" = dontDistribute super."hemkay-core";
+  "hemokit" = dontDistribute super."hemokit";
+  "hen" = dontDistribute super."hen";
+  "henet" = dontDistribute super."henet";
+  "hepevt" = dontDistribute super."hepevt";
+  "her-lexer" = dontDistribute super."her-lexer";
+  "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
+  "herbalizer" = dontDistribute super."herbalizer";
+  "hermit" = dontDistribute super."hermit";
+  "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
+  "heroku" = dontDistribute super."heroku";
+  "heroku-persistent" = dontDistribute super."heroku-persistent";
+  "herringbone" = dontDistribute super."herringbone";
+  "herringbone-embed" = dontDistribute super."herringbone-embed";
+  "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesql" = dontDistribute super."hesql";
+  "hetero-map" = dontDistribute super."hetero-map";
+  "hetris" = dontDistribute super."hetris";
+  "heukarya" = dontDistribute super."heukarya";
+  "hevolisa" = dontDistribute super."hevolisa";
+  "hevolisa-dph" = dontDistribute super."hevolisa-dph";
+  "hexdump" = dontDistribute super."hexdump";
+  "hexif" = dontDistribute super."hexif";
+  "hexpat-iteratee" = dontDistribute super."hexpat-iteratee";
+  "hexpat-lens" = dontDistribute super."hexpat-lens";
+  "hexpat-pickle" = dontDistribute super."hexpat-pickle";
+  "hexpat-pickle-generic" = dontDistribute super."hexpat-pickle-generic";
+  "hexpat-tagsoup" = dontDistribute super."hexpat-tagsoup";
+  "hexpr" = dontDistribute super."hexpr";
+  "hexquote" = dontDistribute super."hexquote";
+  "heyefi" = dontDistribute super."heyefi";
+  "hfann" = dontDistribute super."hfann";
+  "hfd" = dontDistribute super."hfd";
+  "hfiar" = dontDistribute super."hfiar";
+  "hfmt" = dontDistribute super."hfmt";
+  "hfoil" = dontDistribute super."hfoil";
+  "hfov" = dontDistribute super."hfov";
+  "hfractal" = dontDistribute super."hfractal";
+  "hfusion" = dontDistribute super."hfusion";
+  "hg-buildpackage" = dontDistribute super."hg-buildpackage";
+  "hgal" = dontDistribute super."hgal";
+  "hgalib" = dontDistribute super."hgalib";
+  "hgdbmi" = dontDistribute super."hgdbmi";
+  "hgearman" = dontDistribute super."hgearman";
+  "hgen" = dontDistribute super."hgen";
+  "hgeometric" = dontDistribute super."hgeometric";
+  "hgeometry" = dontDistribute super."hgeometry";
+  "hgettext" = dontDistribute super."hgettext";
+  "hgithub" = dontDistribute super."hgithub";
+  "hgl-example" = dontDistribute super."hgl-example";
+  "hgom" = dontDistribute super."hgom";
+  "hgopher" = dontDistribute super."hgopher";
+  "hgrev" = dontDistribute super."hgrev";
+  "hgrib" = dontDistribute super."hgrib";
+  "hharp" = dontDistribute super."hharp";
+  "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
+  "hiccup" = dontDistribute super."hiccup";
+  "hichi" = dontDistribute super."hichi";
+  "hidapi" = dontDistribute super."hidapi";
+  "hieraclus" = dontDistribute super."hieraclus";
+  "hierarchical-clustering" = dontDistribute super."hierarchical-clustering";
+  "hierarchical-clustering-diagrams" = dontDistribute super."hierarchical-clustering-diagrams";
+  "hierarchical-exceptions" = dontDistribute super."hierarchical-exceptions";
+  "hierarchy" = dontDistribute super."hierarchy";
+  "hiernotify" = dontDistribute super."hiernotify";
+  "highWaterMark" = dontDistribute super."highWaterMark";
+  "higher-leveldb" = dontDistribute super."higher-leveldb";
+  "higherorder" = dontDistribute super."higherorder";
+  "highlight-versions" = dontDistribute super."highlight-versions";
+  "highlighter" = dontDistribute super."highlighter";
+  "highlighter2" = dontDistribute super."highlighter2";
+  "hills" = dontDistribute super."hills";
+  "himerge" = dontDistribute super."himerge";
+  "himg" = dontDistribute super."himg";
+  "himpy" = dontDistribute super."himpy";
+  "hindent" = doDistribute super."hindent_4_5_5";
+  "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
+  "hinduce-classifier" = dontDistribute super."hinduce-classifier";
+  "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
+  "hinduce-examples" = dontDistribute super."hinduce-examples";
+  "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinquire" = dontDistribute super."hinquire";
+  "hinstaller" = dontDistribute super."hinstaller";
+  "hint-server" = dontDistribute super."hint-server";
+  "hinvaders" = dontDistribute super."hinvaders";
+  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hipbot" = dontDistribute super."hipbot";
+  "hipe" = dontDistribute super."hipe";
+  "hips" = dontDistribute super."hips";
+  "hircules" = dontDistribute super."hircules";
+  "hirt" = dontDistribute super."hirt";
+  "hissmetrics" = dontDistribute super."hissmetrics";
+  "hist-pl" = dontDistribute super."hist-pl";
+  "hist-pl-dawg" = dontDistribute super."hist-pl-dawg";
+  "hist-pl-fusion" = dontDistribute super."hist-pl-fusion";
+  "hist-pl-lexicon" = dontDistribute super."hist-pl-lexicon";
+  "hist-pl-lmf" = dontDistribute super."hist-pl-lmf";
+  "hist-pl-transliter" = dontDistribute super."hist-pl-transliter";
+  "hist-pl-types" = dontDistribute super."hist-pl-types";
+  "histogram-fill-binary" = dontDistribute super."histogram-fill-binary";
+  "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal";
+  "historian" = dontDistribute super."historian";
+  "hjcase" = dontDistribute super."hjcase";
+  "hjpath" = dontDistribute super."hjpath";
+  "hjs" = dontDistribute super."hjs";
+  "hjson" = dontDistribute super."hjson";
+  "hjson-query" = dontDistribute super."hjson-query";
+  "hjsonpointer" = dontDistribute super."hjsonpointer";
+  "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
+  "hlatex" = dontDistribute super."hlatex";
+  "hlbfgsb" = dontDistribute super."hlbfgsb";
+  "hlcm" = dontDistribute super."hlcm";
+  "hledger" = doDistribute super."hledger_0_26";
+  "hledger-chart" = dontDistribute super."hledger-chart";
+  "hledger-diff" = dontDistribute super."hledger-diff";
+  "hledger-interest" = dontDistribute super."hledger-interest";
+  "hledger-irr" = dontDistribute super."hledger-irr";
+  "hledger-lib" = doDistribute super."hledger-lib_0_26";
+  "hledger-ui" = dontDistribute super."hledger-ui";
+  "hledger-vty" = dontDistribute super."hledger-vty";
+  "hledger-web" = doDistribute super."hledger-web_0_26";
+  "hlibBladeRF" = dontDistribute super."hlibBladeRF";
+  "hlibev" = dontDistribute super."hlibev";
+  "hlibfam" = dontDistribute super."hlibfam";
+  "hlint" = doDistribute super."hlint_1_9_22";
+  "hlogger" = dontDistribute super."hlogger";
+  "hlongurl" = dontDistribute super."hlongurl";
+  "hls" = dontDistribute super."hls";
+  "hlwm" = dontDistribute super."hlwm";
+  "hly" = dontDistribute super."hly";
+  "hmark" = dontDistribute super."hmark";
+  "hmarkup" = dontDistribute super."hmarkup";
+  "hmatrix" = doDistribute super."hmatrix_0_16_1_5";
+  "hmatrix-banded" = dontDistribute super."hmatrix-banded";
+  "hmatrix-csv" = dontDistribute super."hmatrix-csv";
+  "hmatrix-glpk" = dontDistribute super."hmatrix-glpk";
+  "hmatrix-gsl" = doDistribute super."hmatrix-gsl_0_16_0_3";
+  "hmatrix-gsl-stats" = doDistribute super."hmatrix-gsl-stats_0_4_1_1";
+  "hmatrix-mmap" = dontDistribute super."hmatrix-mmap";
+  "hmatrix-nipals" = dontDistribute super."hmatrix-nipals";
+  "hmatrix-quadprogpp" = dontDistribute super."hmatrix-quadprogpp";
+  "hmatrix-special" = dontDistribute super."hmatrix-special";
+  "hmatrix-static" = dontDistribute super."hmatrix-static";
+  "hmatrix-svdlibc" = dontDistribute super."hmatrix-svdlibc";
+  "hmatrix-syntax" = dontDistribute super."hmatrix-syntax";
+  "hmatrix-tests" = dontDistribute super."hmatrix-tests";
+  "hmeap" = dontDistribute super."hmeap";
+  "hmeap-utils" = dontDistribute super."hmeap-utils";
+  "hmemdb" = dontDistribute super."hmemdb";
+  "hmenu" = dontDistribute super."hmenu";
+  "hmidi" = dontDistribute super."hmidi";
+  "hmk" = dontDistribute super."hmk";
+  "hmm" = dontDistribute super."hmm";
+  "hmm-hmatrix" = dontDistribute super."hmm-hmatrix";
+  "hmp3" = dontDistribute super."hmp3";
+  "hmpfr" = dontDistribute super."hmpfr";
+  "hmt" = dontDistribute super."hmt";
+  "hmt-diagrams" = dontDistribute super."hmt-diagrams";
+  "hmumps" = dontDistribute super."hmumps";
+  "hnetcdf" = dontDistribute super."hnetcdf";
+  "hnix" = dontDistribute super."hnix";
+  "hnn" = dontDistribute super."hnn";
+  "hnop" = dontDistribute super."hnop";
+  "ho-rewriting" = dontDistribute super."ho-rewriting";
+  "hoauth" = dontDistribute super."hoauth";
+  "hoauth2" = doDistribute super."hoauth2_0_4_8";
+  "hob" = dontDistribute super."hob";
+  "hobbes" = dontDistribute super."hobbes";
+  "hobbits" = dontDistribute super."hobbits";
+  "hoe" = dontDistribute super."hoe";
+  "hofix-mtl" = dontDistribute super."hofix-mtl";
+  "hog" = dontDistribute super."hog";
+  "hogg" = dontDistribute super."hogg";
+  "hogre" = dontDistribute super."hogre";
+  "hogre-examples" = dontDistribute super."hogre-examples";
+  "hois" = dontDistribute super."hois";
+  "hoist-error" = dontDistribute super."hoist-error";
+  "hold-em" = dontDistribute super."hold-em";
+  "hole" = dontDistribute super."hole";
+  "holey-format" = dontDistribute super."holey-format";
+  "homeomorphic" = dontDistribute super."homeomorphic";
+  "hommage" = dontDistribute super."hommage";
+  "hommage-ds" = dontDistribute super."hommage-ds";
+  "homplexity" = dontDistribute super."homplexity";
+  "honi" = dontDistribute super."honi";
+  "honk" = dontDistribute super."honk";
+  "hoobuddy" = dontDistribute super."hoobuddy";
+  "hood" = dontDistribute super."hood";
+  "hood-off" = dontDistribute super."hood-off";
+  "hood2" = dontDistribute super."hood2";
+  "hoodie" = dontDistribute super."hoodie";
+  "hoodle" = dontDistribute super."hoodle";
+  "hoodle-builder" = dontDistribute super."hoodle-builder";
+  "hoodle-core" = dontDistribute super."hoodle-core";
+  "hoodle-extra" = dontDistribute super."hoodle-extra";
+  "hoodle-parser" = dontDistribute super."hoodle-parser";
+  "hoodle-publish" = dontDistribute super."hoodle-publish";
+  "hoodle-render" = dontDistribute super."hoodle-render";
+  "hoodle-types" = dontDistribute super."hoodle-types";
+  "hoogle-index" = dontDistribute super."hoogle-index";
+  "hooks-dir" = dontDistribute super."hooks-dir";
+  "hoovie" = dontDistribute super."hoovie";
+  "hopencc" = dontDistribute super."hopencc";
+  "hopencl" = dontDistribute super."hopencl";
+  "hopenpgp-tools" = dontDistribute super."hopenpgp-tools";
+  "hopenssl" = dontDistribute super."hopenssl";
+  "hopfield" = dontDistribute super."hopfield";
+  "hopfield-networks" = dontDistribute super."hopfield-networks";
+  "hopfli" = dontDistribute super."hopfli";
+  "hops" = dontDistribute super."hops";
+  "hoq" = dontDistribute super."hoq";
+  "horizon" = dontDistribute super."horizon";
+  "hosc" = dontDistribute super."hosc";
+  "hosc-json" = dontDistribute super."hosc-json";
+  "hosc-utils" = dontDistribute super."hosc-utils";
+  "hosts-server" = dontDistribute super."hosts-server";
+  "hothasktags" = dontDistribute super."hothasktags";
+  "hotswap" = dontDistribute super."hotswap";
+  "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
+  "hp2any-core" = dontDistribute super."hp2any-core";
+  "hp2any-graph" = dontDistribute super."hp2any-graph";
+  "hp2any-manager" = dontDistribute super."hp2any-manager";
+  "hp2html" = dontDistribute super."hp2html";
+  "hp2pretty" = dontDistribute super."hp2pretty";
+  "hpack" = dontDistribute super."hpack";
+  "hpaco" = dontDistribute super."hpaco";
+  "hpaco-lib" = dontDistribute super."hpaco-lib";
+  "hpage" = dontDistribute super."hpage";
+  "hpapi" = dontDistribute super."hpapi";
+  "hpaste" = dontDistribute super."hpaste";
+  "hpasteit" = dontDistribute super."hpasteit";
+  "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
+  "hpc-strobe" = dontDistribute super."hpc-strobe";
+  "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hplayground" = dontDistribute super."hplayground";
+  "hplaylist" = dontDistribute super."hplaylist";
+  "hpodder" = dontDistribute super."hpodder";
+  "hpp" = dontDistribute super."hpp";
+  "hpqtypes" = dontDistribute super."hpqtypes";
+  "hprotoc-fork" = dontDistribute super."hprotoc-fork";
+  "hps" = dontDistribute super."hps";
+  "hps-cairo" = dontDistribute super."hps-cairo";
+  "hps-kmeans" = dontDistribute super."hps-kmeans";
+  "hpuz" = dontDistribute super."hpuz";
+  "hpygments" = dontDistribute super."hpygments";
+  "hpylos" = dontDistribute super."hpylos";
+  "hpyrg" = dontDistribute super."hpyrg";
+  "hquantlib" = dontDistribute super."hquantlib";
+  "hquery" = dontDistribute super."hquery";
+  "hranker" = dontDistribute super."hranker";
+  "hreader" = dontDistribute super."hreader";
+  "hricket" = dontDistribute super."hricket";
+  "hruby" = dontDistribute super."hruby";
+  "hs-GeoIP" = dontDistribute super."hs-GeoIP";
+  "hs-blake2" = dontDistribute super."hs-blake2";
+  "hs-captcha" = dontDistribute super."hs-captcha";
+  "hs-carbon" = dontDistribute super."hs-carbon";
+  "hs-carbon-examples" = dontDistribute super."hs-carbon-examples";
+  "hs-cdb" = dontDistribute super."hs-cdb";
+  "hs-dotnet" = dontDistribute super."hs-dotnet";
+  "hs-duktape" = dontDistribute super."hs-duktape";
+  "hs-excelx" = dontDistribute super."hs-excelx";
+  "hs-ffmpeg" = dontDistribute super."hs-ffmpeg";
+  "hs-fltk" = dontDistribute super."hs-fltk";
+  "hs-gchart" = dontDistribute super."hs-gchart";
+  "hs-gen-iface" = dontDistribute super."hs-gen-iface";
+  "hs-gizapp" = dontDistribute super."hs-gizapp";
+  "hs-inspector" = dontDistribute super."hs-inspector";
+  "hs-java" = dontDistribute super."hs-java";
+  "hs-json-rpc" = dontDistribute super."hs-json-rpc";
+  "hs-logo" = dontDistribute super."hs-logo";
+  "hs-mesos" = dontDistribute super."hs-mesos";
+  "hs-nombre-generator" = dontDistribute super."hs-nombre-generator";
+  "hs-pgms" = dontDistribute super."hs-pgms";
+  "hs-php-session" = dontDistribute super."hs-php-session";
+  "hs-pkg-config" = dontDistribute super."hs-pkg-config";
+  "hs-pkpass" = dontDistribute super."hs-pkpass";
+  "hs-re" = dontDistribute super."hs-re";
+  "hs-scrape" = dontDistribute super."hs-scrape";
+  "hs-twitter" = dontDistribute super."hs-twitter";
+  "hs-twitterarchiver" = dontDistribute super."hs-twitterarchiver";
+  "hs-vcard" = dontDistribute super."hs-vcard";
+  "hs2048" = dontDistribute super."hs2048";
+  "hs2bf" = dontDistribute super."hs2bf";
+  "hs2dot" = dontDistribute super."hs2dot";
+  "hsConfigure" = dontDistribute super."hsConfigure";
+  "hsSqlite3" = dontDistribute super."hsSqlite3";
+  "hsXenCtrl" = dontDistribute super."hsXenCtrl";
+  "hsass" = doDistribute super."hsass_0_3_0";
+  "hsay" = dontDistribute super."hsay";
+  "hsb2hs" = dontDistribute super."hsb2hs";
+  "hsbackup" = dontDistribute super."hsbackup";
+  "hsbencher" = dontDistribute super."hsbencher";
+  "hsbencher-codespeed" = dontDistribute super."hsbencher-codespeed";
+  "hsbencher-fusion" = dontDistribute super."hsbencher-fusion";
+  "hsc2hs" = dontDistribute super."hsc2hs";
+  "hsc3" = dontDistribute super."hsc3";
+  "hsc3-auditor" = dontDistribute super."hsc3-auditor";
+  "hsc3-cairo" = dontDistribute super."hsc3-cairo";
+  "hsc3-data" = dontDistribute super."hsc3-data";
+  "hsc3-db" = dontDistribute super."hsc3-db";
+  "hsc3-dot" = dontDistribute super."hsc3-dot";
+  "hsc3-forth" = dontDistribute super."hsc3-forth";
+  "hsc3-graphs" = dontDistribute super."hsc3-graphs";
+  "hsc3-lang" = dontDistribute super."hsc3-lang";
+  "hsc3-lisp" = dontDistribute super."hsc3-lisp";
+  "hsc3-plot" = dontDistribute super."hsc3-plot";
+  "hsc3-process" = dontDistribute super."hsc3-process";
+  "hsc3-rec" = dontDistribute super."hsc3-rec";
+  "hsc3-rw" = dontDistribute super."hsc3-rw";
+  "hsc3-server" = dontDistribute super."hsc3-server";
+  "hsc3-sf" = dontDistribute super."hsc3-sf";
+  "hsc3-sf-hsndfile" = dontDistribute super."hsc3-sf-hsndfile";
+  "hsc3-unsafe" = dontDistribute super."hsc3-unsafe";
+  "hsc3-utils" = dontDistribute super."hsc3-utils";
+  "hscamwire" = dontDistribute super."hscamwire";
+  "hscassandra" = dontDistribute super."hscassandra";
+  "hscd" = dontDistribute super."hscd";
+  "hsclock" = dontDistribute super."hsclock";
+  "hscope" = dontDistribute super."hscope";
+  "hscrtmpl" = dontDistribute super."hscrtmpl";
+  "hscuid" = dontDistribute super."hscuid";
+  "hscurses" = dontDistribute super."hscurses";
+  "hscurses-fish-ex" = dontDistribute super."hscurses-fish-ex";
+  "hsdev" = dontDistribute super."hsdev";
+  "hsdif" = dontDistribute super."hsdif";
+  "hsdip" = dontDistribute super."hsdip";
+  "hsdns" = dontDistribute super."hsdns";
+  "hsdns-cache" = dontDistribute super."hsdns-cache";
+  "hsemail-ns" = dontDistribute super."hsemail-ns";
+  "hsenv" = dontDistribute super."hsenv";
+  "hserv" = dontDistribute super."hserv";
+  "hset" = dontDistribute super."hset";
+  "hsexif" = dontDistribute super."hsexif";
+  "hsfacter" = dontDistribute super."hsfacter";
+  "hsfcsh" = dontDistribute super."hsfcsh";
+  "hsfilt" = dontDistribute super."hsfilt";
+  "hsgnutls" = dontDistribute super."hsgnutls";
+  "hsgnutls-yj" = dontDistribute super."hsgnutls-yj";
+  "hsgsom" = dontDistribute super."hsgsom";
+  "hsgtd" = dontDistribute super."hsgtd";
+  "hsharc" = dontDistribute super."hsharc";
+  "hsignal" = doDistribute super."hsignal_0_2_7_1";
+  "hsilop" = dontDistribute super."hsilop";
+  "hsimport" = dontDistribute super."hsimport";
+  "hsini" = dontDistribute super."hsini";
+  "hskeleton" = dontDistribute super."hskeleton";
+  "hslackbuilder" = dontDistribute super."hslackbuilder";
+  "hslibsvm" = dontDistribute super."hslibsvm";
+  "hslinks" = dontDistribute super."hslinks";
+  "hslogger-reader" = dontDistribute super."hslogger-reader";
+  "hslogger-template" = dontDistribute super."hslogger-template";
+  "hslogger4j" = dontDistribute super."hslogger4j";
+  "hslogstash" = dontDistribute super."hslogstash";
+  "hsmagick" = dontDistribute super."hsmagick";
+  "hsmisc" = dontDistribute super."hsmisc";
+  "hsmtpclient" = dontDistribute super."hsmtpclient";
+  "hsndfile" = dontDistribute super."hsndfile";
+  "hsndfile-storablevector" = dontDistribute super."hsndfile-storablevector";
+  "hsndfile-vector" = dontDistribute super."hsndfile-vector";
+  "hsnock" = dontDistribute super."hsnock";
+  "hsnoise" = dontDistribute super."hsnoise";
+  "hsns" = dontDistribute super."hsns";
+  "hsnsq" = dontDistribute super."hsnsq";
+  "hsntp" = dontDistribute super."hsntp";
+  "hsoptions" = dontDistribute super."hsoptions";
+  "hsp" = dontDistribute super."hsp";
+  "hsp-cgi" = dontDistribute super."hsp-cgi";
+  "hsparklines" = dontDistribute super."hsparklines";
+  "hsparql" = dontDistribute super."hsparql";
+  "hspear" = dontDistribute super."hspear";
+  "hspec" = doDistribute super."hspec_2_1_10";
+  "hspec-checkers" = dontDistribute super."hspec-checkers";
+  "hspec-core" = doDistribute super."hspec-core_2_1_10";
+  "hspec-discover" = doDistribute super."hspec-discover_2_1_10";
+  "hspec-expectations" = doDistribute super."hspec-expectations_0_7_1";
+  "hspec-expectations-lens" = dontDistribute super."hspec-expectations-lens";
+  "hspec-expectations-lifted" = dontDistribute super."hspec-expectations-lifted";
+  "hspec-expectations-pretty" = dontDistribute super."hspec-expectations-pretty";
+  "hspec-expectations-pretty-diff" = dontDistribute super."hspec-expectations-pretty-diff";
+  "hspec-experimental" = dontDistribute super."hspec-experimental";
+  "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-meta" = doDistribute super."hspec-meta_2_1_7";
+  "hspec-monad-control" = dontDistribute super."hspec-monad-control";
+  "hspec-server" = dontDistribute super."hspec-server";
+  "hspec-setup" = dontDistribute super."hspec-setup";
+  "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-smallcheck" = doDistribute super."hspec-smallcheck_0_3_0";
+  "hspec-snap" = doDistribute super."hspec-snap_0_3_3_0";
+  "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
+  "hspec-test-framework" = dontDistribute super."hspec-test-framework";
+  "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th";
+  "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox";
+  "hspec-webdriver" = doDistribute super."hspec-webdriver_1_0_3";
+  "hspec2" = dontDistribute super."hspec2";
+  "hspr-sh" = dontDistribute super."hspr-sh";
+  "hspread" = dontDistribute super."hspread";
+  "hspresent" = dontDistribute super."hspresent";
+  "hsprocess" = dontDistribute super."hsprocess";
+  "hsql" = dontDistribute super."hsql";
+  "hsql-mysql" = dontDistribute super."hsql-mysql";
+  "hsql-odbc" = dontDistribute super."hsql-odbc";
+  "hsql-postgresql" = dontDistribute super."hsql-postgresql";
+  "hsql-sqlite3" = dontDistribute super."hsql-sqlite3";
+  "hsqml" = dontDistribute super."hsqml";
+  "hsqml-datamodel" = dontDistribute super."hsqml-datamodel";
+  "hsqml-datamodel-vinyl" = dontDistribute super."hsqml-datamodel-vinyl";
+  "hsqml-demo-morris" = dontDistribute super."hsqml-demo-morris";
+  "hsqml-demo-notes" = dontDistribute super."hsqml-demo-notes";
+  "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples";
+  "hsqml-morris" = dontDistribute super."hsqml-morris";
+  "hsreadability" = dontDistribute super."hsreadability";
+  "hsseccomp" = dontDistribute super."hsseccomp";
+  "hsshellscript" = dontDistribute super."hsshellscript";
+  "hssourceinfo" = dontDistribute super."hssourceinfo";
+  "hssqlppp" = dontDistribute super."hssqlppp";
+  "hstatistics" = doDistribute super."hstatistics_0_2_5_2";
+  "hstats" = dontDistribute super."hstats";
+  "hstest" = dontDistribute super."hstest";
+  "hstidy" = dontDistribute super."hstidy";
+  "hstorchat" = dontDistribute super."hstorchat";
+  "hstradeking" = dontDistribute super."hstradeking";
+  "hstyle" = dontDistribute super."hstyle";
+  "hstzaar" = dontDistribute super."hstzaar";
+  "hsubconvert" = dontDistribute super."hsubconvert";
+  "hsverilog" = dontDistribute super."hsverilog";
+  "hswip" = dontDistribute super."hswip";
+  "hsx" = dontDistribute super."hsx";
+  "hsx-jmacro" = dontDistribute super."hsx-jmacro";
+  "hsx-xhtml" = dontDistribute super."hsx-xhtml";
+  "hsx2hs" = dontDistribute super."hsx2hs";
+  "hsyscall" = dontDistribute super."hsyscall";
+  "hszephyr" = dontDistribute super."hszephyr";
+  "htaglib" = dontDistribute super."htaglib";
+  "htags" = dontDistribute super."htags";
+  "htar" = dontDistribute super."htar";
+  "htiled" = dontDistribute super."htiled";
+  "htime" = dontDistribute super."htime";
+  "html-email-validate" = dontDistribute super."html-email-validate";
+  "html-entities" = dontDistribute super."html-entities";
+  "html-kure" = dontDistribute super."html-kure";
+  "html-minimalist" = dontDistribute super."html-minimalist";
+  "html-rules" = dontDistribute super."html-rules";
+  "html-tokenizer" = dontDistribute super."html-tokenizer";
+  "html-truncate" = dontDistribute super."html-truncate";
+  "html2hamlet" = dontDistribute super."html2hamlet";
+  "html5-entity" = dontDistribute super."html5-entity";
+  "htodo" = dontDistribute super."htodo";
+  "htoml" = dontDistribute super."htoml";
+  "htrace" = dontDistribute super."htrace";
+  "hts" = dontDistribute super."hts";
+  "htsn" = dontDistribute super."htsn";
+  "htsn-common" = dontDistribute super."htsn-common";
+  "htsn-import" = dontDistribute super."htsn-import";
+  "http-accept" = dontDistribute super."http-accept";
+  "http-attoparsec" = dontDistribute super."http-attoparsec";
+  "http-client-auth" = dontDistribute super."http-client-auth";
+  "http-client-conduit" = dontDistribute super."http-client-conduit";
+  "http-client-lens" = dontDistribute super."http-client-lens";
+  "http-client-multipart" = dontDistribute super."http-client-multipart";
+  "http-client-openssl" = dontDistribute super."http-client-openssl";
+  "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers";
+  "http-client-streams" = dontDistribute super."http-client-streams";
+  "http-conduit-browser" = dontDistribute super."http-conduit-browser";
+  "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-encodings" = dontDistribute super."http-encodings";
+  "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kit" = dontDistribute super."http-kit";
+  "http-link-header" = dontDistribute super."http-link-header";
+  "http-listen" = dontDistribute super."http-listen";
+  "http-monad" = dontDistribute super."http-monad";
+  "http-proxy" = dontDistribute super."http-proxy";
+  "http-querystring" = dontDistribute super."http-querystring";
+  "http-server" = dontDistribute super."http-server";
+  "http-shed" = dontDistribute super."http-shed";
+  "http-test" = dontDistribute super."http-test";
+  "http-types" = doDistribute super."http-types_0_8_6";
+  "http-wget" = dontDistribute super."http-wget";
+  "http2" = doDistribute super."http2_1_0_4";
+  "httpd-shed" = dontDistribute super."httpd-shed";
+  "https-everywhere-rules" = dontDistribute super."https-everywhere-rules";
+  "https-everywhere-rules-raw" = dontDistribute super."https-everywhere-rules-raw";
+  "httpspec" = dontDistribute super."httpspec";
+  "htune" = dontDistribute super."htune";
+  "htzaar" = dontDistribute super."htzaar";
+  "hub" = dontDistribute super."hub";
+  "hubigraph" = dontDistribute super."hubigraph";
+  "hubris" = dontDistribute super."hubris";
+  "huckleberry" = dontDistribute super."huckleberry";
+  "huffman" = dontDistribute super."huffman";
+  "hugs2yc" = dontDistribute super."hugs2yc";
+  "hulk" = dontDistribute super."hulk";
+  "human-readable-duration" = dontDistribute super."human-readable-duration";
+  "hums" = dontDistribute super."hums";
+  "hunch" = dontDistribute super."hunch";
+  "hunit-dejafu" = dontDistribute super."hunit-dejafu";
+  "hunit-gui" = dontDistribute super."hunit-gui";
+  "hunit-parsec" = dontDistribute super."hunit-parsec";
+  "hunit-rematch" = dontDistribute super."hunit-rematch";
+  "hunp" = dontDistribute super."hunp";
+  "hunt-searchengine" = dontDistribute super."hunt-searchengine";
+  "hunt-server" = dontDistribute super."hunt-server";
+  "hunt-server-cli" = dontDistribute super."hunt-server-cli";
+  "hurdle" = dontDistribute super."hurdle";
+  "husk-scheme" = dontDistribute super."husk-scheme";
+  "husk-scheme-libs" = dontDistribute super."husk-scheme-libs";
+  "husky" = dontDistribute super."husky";
+  "hutton" = dontDistribute super."hutton";
+  "huttons-razor" = dontDistribute super."huttons-razor";
+  "huzzy" = dontDistribute super."huzzy";
+  "hvect" = doDistribute super."hvect_0_2_0_0";
+  "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
+  "hworker" = dontDistribute super."hworker";
+  "hworker-ses" = dontDistribute super."hworker-ses";
+  "hws" = dontDistribute super."hws";
+  "hwsl2" = dontDistribute super."hwsl2";
+  "hwsl2-bytevector" = dontDistribute super."hwsl2-bytevector";
+  "hwsl2-reducers" = dontDistribute super."hwsl2-reducers";
+  "hx" = dontDistribute super."hx";
+  "hxmppc" = dontDistribute super."hxmppc";
+  "hxournal" = dontDistribute super."hxournal";
+  "hxt-binary" = dontDistribute super."hxt-binary";
+  "hxt-cache" = dontDistribute super."hxt-cache";
+  "hxt-extras" = dontDistribute super."hxt-extras";
+  "hxt-filter" = dontDistribute super."hxt-filter";
+  "hxt-xpath" = dontDistribute super."hxt-xpath";
+  "hxt-xslt" = dontDistribute super."hxt-xslt";
+  "hxthelper" = dontDistribute super."hxthelper";
+  "hxweb" = dontDistribute super."hxweb";
+  "hyahtzee" = dontDistribute super."hyahtzee";
+  "hyakko" = dontDistribute super."hyakko";
+  "hybrid" = dontDistribute super."hybrid";
+  "hybrid-vectors" = dontDistribute super."hybrid-vectors";
+  "hydra-hs" = dontDistribute super."hydra-hs";
+  "hydra-print" = dontDistribute super."hydra-print";
+  "hydrogen" = dontDistribute super."hydrogen";
+  "hydrogen-cli" = dontDistribute super."hydrogen-cli";
+  "hydrogen-cli-args" = dontDistribute super."hydrogen-cli-args";
+  "hydrogen-data" = dontDistribute super."hydrogen-data";
+  "hydrogen-multimap" = dontDistribute super."hydrogen-multimap";
+  "hydrogen-parsing" = dontDistribute super."hydrogen-parsing";
+  "hydrogen-prelude" = dontDistribute super."hydrogen-prelude";
+  "hydrogen-prelude-parsec" = dontDistribute super."hydrogen-prelude-parsec";
+  "hydrogen-syntax" = dontDistribute super."hydrogen-syntax";
+  "hydrogen-util" = dontDistribute super."hydrogen-util";
+  "hydrogen-version" = dontDistribute super."hydrogen-version";
+  "hyena" = dontDistribute super."hyena";
+  "hylolib" = dontDistribute super."hylolib";
+  "hylotab" = dontDistribute super."hylotab";
+  "hyloutils" = dontDistribute super."hyloutils";
+  "hyperdrive" = dontDistribute super."hyperdrive";
+  "hyperfunctions" = dontDistribute super."hyperfunctions";
+  "hyperloglog" = doDistribute super."hyperloglog_0_3_4";
+  "hyperpublic" = dontDistribute super."hyperpublic";
+  "hyphenate" = dontDistribute super."hyphenate";
+  "hypher" = dontDistribute super."hypher";
+  "hzk" = dontDistribute super."hzk";
+  "hzulip" = dontDistribute super."hzulip";
+  "i18n" = dontDistribute super."i18n";
+  "iCalendar" = dontDistribute super."iCalendar";
+  "iException" = dontDistribute super."iException";
+  "iap-verifier" = dontDistribute super."iap-verifier";
+  "ib-api" = dontDistribute super."ib-api";
+  "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
+  "ical" = dontDistribute super."ical";
+  "iconv" = dontDistribute super."iconv";
+  "ideas" = dontDistribute super."ideas";
+  "ideas-math" = dontDistribute super."ideas-math";
+  "idempotent" = dontDistribute super."idempotent";
+  "identifiers" = dontDistribute super."identifiers";
+  "idiii" = dontDistribute super."idiii";
+  "idna" = dontDistribute super."idna";
+  "idna2008" = dontDistribute super."idna2008";
+  "idris" = dontDistribute super."idris";
+  "ieee" = dontDistribute super."ieee";
+  "ieee-utils" = dontDistribute super."ieee-utils";
+  "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754-parser" = dontDistribute super."ieee754-parser";
+  "ifcxt" = dontDistribute super."ifcxt";
+  "iff" = dontDistribute super."iff";
+  "ifscs" = dontDistribute super."ifscs";
+  "ig" = dontDistribute super."ig";
+  "ige-mac-integration" = dontDistribute super."ige-mac-integration";
+  "igraph" = dontDistribute super."igraph";
+  "igrf" = dontDistribute super."igrf";
+  "ihaskell" = doDistribute super."ihaskell_0_6_5_0";
+  "ihaskell-display" = dontDistribute super."ihaskell-display";
+  "ihaskell-inline-r" = dontDistribute super."ihaskell-inline-r";
+  "ihaskell-parsec" = dontDistribute super."ihaskell-parsec";
+  "ihaskell-plot" = dontDistribute super."ihaskell-plot";
+  "ihaskell-widgets" = dontDistribute super."ihaskell-widgets";
+  "ihttp" = dontDistribute super."ihttp";
+  "illuminate" = dontDistribute super."illuminate";
+  "image-type" = dontDistribute super."image-type";
+  "imagefilters" = dontDistribute super."imagefilters";
+  "imagemagick" = dontDistribute super."imagemagick";
+  "imagepaste" = dontDistribute super."imagepaste";
+  "imapget" = dontDistribute super."imapget";
+  "imbib" = dontDistribute super."imbib";
+  "imgurder" = dontDistribute super."imgurder";
+  "imm" = dontDistribute super."imm";
+  "imparse" = dontDistribute super."imparse";
+  "imperative-edsl" = dontDistribute super."imperative-edsl";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
+  "implicit" = dontDistribute super."implicit";
+  "implicit-params" = dontDistribute super."implicit-params";
+  "imports" = dontDistribute super."imports";
+  "improve" = dontDistribute super."improve";
+  "inc-ref" = dontDistribute super."inc-ref";
+  "inch" = dontDistribute super."inch";
+  "incremental-computing" = dontDistribute super."incremental-computing";
+  "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
+  "increments" = dontDistribute super."increments";
+  "indentation" = dontDistribute super."indentation";
+  "indentparser" = dontDistribute super."indentparser";
+  "index-core" = dontDistribute super."index-core";
+  "indexed" = dontDistribute super."indexed";
+  "indexed-do-notation" = dontDistribute super."indexed-do-notation";
+  "indexed-extras" = dontDistribute super."indexed-extras";
+  "indexed-free" = dontDistribute super."indexed-free";
+  "indian-language-font-converter" = dontDistribute super."indian-language-font-converter";
+  "indices" = dontDistribute super."indices";
+  "indieweb-algorithms" = dontDistribute super."indieweb-algorithms";
+  "inf-interval" = dontDistribute super."inf-interval";
+  "infer-upstream" = dontDistribute super."infer-upstream";
+  "infernu" = dontDistribute super."infernu";
+  "infinite-search" = dontDistribute super."infinite-search";
+  "infinity" = dontDistribute super."infinity";
+  "infix" = dontDistribute super."infix";
+  "inflist" = dontDistribute super."inflist";
+  "influxdb" = dontDistribute super."influxdb";
+  "informative" = dontDistribute super."informative";
+  "inilist" = dontDistribute super."inilist";
+  "inject" = dontDistribute super."inject";
+  "inject-function" = dontDistribute super."inject-function";
+  "inline-c" = dontDistribute super."inline-c";
+  "inline-c-cpp" = dontDistribute super."inline-c-cpp";
+  "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-r" = dontDistribute super."inline-r";
+  "inquire" = dontDistribute super."inquire";
+  "inserts" = dontDistribute super."inserts";
+  "inspection-proxy" = dontDistribute super."inspection-proxy";
+  "instant-aeson" = dontDistribute super."instant-aeson";
+  "instant-bytes" = dontDistribute super."instant-bytes";
+  "instant-deepseq" = dontDistribute super."instant-deepseq";
+  "instant-generics" = dontDistribute super."instant-generics";
+  "instant-hashable" = dontDistribute super."instant-hashable";
+  "instant-zipper" = dontDistribute super."instant-zipper";
+  "instinct" = dontDistribute super."instinct";
+  "instrument-chord" = dontDistribute super."instrument-chord";
+  "int-cast" = dontDistribute super."int-cast";
+  "integer-pure" = dontDistribute super."integer-pure";
+  "intel-aes" = dontDistribute super."intel-aes";
+  "interchangeable" = dontDistribute super."interchangeable";
+  "interleavableGen" = dontDistribute super."interleavableGen";
+  "interleavableIO" = dontDistribute super."interleavableIO";
+  "interleave" = dontDistribute super."interleave";
+  "interlude" = dontDistribute super."interlude";
+  "intern" = dontDistribute super."intern";
+  "internetmarke" = dontDistribute super."internetmarke";
+  "interpol" = dontDistribute super."interpol";
+  "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
+  "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
+  "interpolation" = dontDistribute super."interpolation";
+  "intricacy" = dontDistribute super."intricacy";
+  "intset" = dontDistribute super."intset";
+  "invertible-syntax" = dontDistribute super."invertible-syntax";
+  "io-capture" = dontDistribute super."io-capture";
+  "io-reactive" = dontDistribute super."io-reactive";
+  "io-region" = dontDistribute super."io-region";
+  "io-storage" = dontDistribute super."io-storage";
+  "io-streams-http" = dontDistribute super."io-streams-http";
+  "io-throttle" = dontDistribute super."io-throttle";
+  "ioctl" = dontDistribute super."ioctl";
+  "ioref-stable" = dontDistribute super."ioref-stable";
+  "iothread" = dontDistribute super."iothread";
+  "iotransaction" = dontDistribute super."iotransaction";
+  "ip-quoter" = dontDistribute super."ip-quoter";
+  "ipatch" = dontDistribute super."ipatch";
+  "ipc" = dontDistribute super."ipc";
+  "ipcvar" = dontDistribute super."ipcvar";
+  "ipopt-hs" = dontDistribute super."ipopt-hs";
+  "ipprint" = dontDistribute super."ipprint";
+  "iproute" = doDistribute super."iproute_1_5_0";
+  "iptables-helpers" = dontDistribute super."iptables-helpers";
+  "iptadmin" = dontDistribute super."iptadmin";
+  "ipython-kernel" = doDistribute super."ipython-kernel_0_6_1_3";
+  "irc" = dontDistribute super."irc";
+  "irc-bytestring" = dontDistribute super."irc-bytestring";
+  "irc-client" = dontDistribute super."irc-client";
+  "irc-colors" = dontDistribute super."irc-colors";
+  "irc-conduit" = dontDistribute super."irc-conduit";
+  "irc-core" = dontDistribute super."irc-core";
+  "irc-ctcp" = dontDistribute super."irc-ctcp";
+  "irc-fun-bot" = dontDistribute super."irc-fun-bot";
+  "irc-fun-client" = dontDistribute super."irc-fun-client";
+  "irc-fun-color" = dontDistribute super."irc-fun-color";
+  "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "ircbot" = dontDistribute super."ircbot";
+  "ircbouncer" = dontDistribute super."ircbouncer";
+  "ireal" = dontDistribute super."ireal";
+  "iron-mq" = dontDistribute super."iron-mq";
+  "ironforge" = dontDistribute super."ironforge";
+  "is" = dontDistribute super."is";
+  "isdicom" = dontDistribute super."isdicom";
+  "isevaluated" = dontDistribute super."isevaluated";
+  "isiz" = dontDistribute super."isiz";
+  "ismtp" = dontDistribute super."ismtp";
+  "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
+  "iso8601-time" = dontDistribute super."iso8601-time";
+  "isohunt" = dontDistribute super."isohunt";
+  "itanium-abi" = dontDistribute super."itanium-abi";
+  "iter-stats" = dontDistribute super."iter-stats";
+  "iterIO" = dontDistribute super."iterIO";
+  "iteratee" = dontDistribute super."iteratee";
+  "iteratee-compress" = dontDistribute super."iteratee-compress";
+  "iteratee-mtl" = dontDistribute super."iteratee-mtl";
+  "iteratee-parsec" = dontDistribute super."iteratee-parsec";
+  "iteratee-stm" = dontDistribute super."iteratee-stm";
+  "iterio-server" = dontDistribute super."iterio-server";
+  "ivar-simple" = dontDistribute super."ivar-simple";
+  "ivor" = dontDistribute super."ivor";
+  "ivory" = dontDistribute super."ivory";
+  "ivory-backend-c" = dontDistribute super."ivory-backend-c";
+  "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-examples" = dontDistribute super."ivory-examples";
+  "ivory-hw" = dontDistribute super."ivory-hw";
+  "ivory-opts" = dontDistribute super."ivory-opts";
+  "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-stdlib" = dontDistribute super."ivory-stdlib";
+  "ivy-web" = dontDistribute super."ivy-web";
+  "ix-shapable" = dontDistribute super."ix-shapable";
+  "ixdopp" = dontDistribute super."ixdopp";
+  "ixmonad" = dontDistribute super."ixmonad";
+  "ixset" = dontDistribute super."ixset";
+  "ixset-typed" = dontDistribute super."ixset-typed";
+  "iyql" = dontDistribute super."iyql";
+  "j2hs" = dontDistribute super."j2hs";
+  "ja-base-extra" = dontDistribute super."ja-base-extra";
+  "jack" = dontDistribute super."jack";
+  "jack-bindings" = dontDistribute super."jack-bindings";
+  "jackminimix" = dontDistribute super."jackminimix";
+  "jacobi-roots" = dontDistribute super."jacobi-roots";
+  "jail" = dontDistribute super."jail";
+  "jailbreak-cabal" = dontDistribute super."jailbreak-cabal";
+  "jalaali" = dontDistribute super."jalaali";
+  "jalla" = dontDistribute super."jalla";
+  "jammittools" = dontDistribute super."jammittools";
+  "jarfind" = dontDistribute super."jarfind";
+  "java-bridge" = dontDistribute super."java-bridge";
+  "java-bridge-extras" = dontDistribute super."java-bridge-extras";
+  "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
+  "java-reflect" = dontDistribute super."java-reflect";
+  "javasf" = dontDistribute super."javasf";
+  "javav" = dontDistribute super."javav";
+  "jcdecaux-vls" = dontDistribute super."jcdecaux-vls";
+  "jdi" = dontDistribute super."jdi";
+  "jespresso" = dontDistribute super."jespresso";
+  "jobqueue" = dontDistribute super."jobqueue";
+  "join" = dontDistribute super."join";
+  "joinlist" = dontDistribute super."joinlist";
+  "jonathanscard" = dontDistribute super."jonathanscard";
+  "jort" = dontDistribute super."jort";
+  "jose" = dontDistribute super."jose";
+  "jose-jwt" = doDistribute super."jose-jwt_0_6_2";
+  "jpeg" = dontDistribute super."jpeg";
+  "js-good-parts" = dontDistribute super."js-good-parts";
+  "jsaddle" = dontDistribute super."jsaddle";
+  "jsaddle-hello" = dontDistribute super."jsaddle-hello";
+  "jsc" = dontDistribute super."jsc";
+  "jsmw" = dontDistribute super."jsmw";
+  "json-assertions" = dontDistribute super."json-assertions";
+  "json-b" = dontDistribute super."json-b";
+  "json-encoder" = dontDistribute super."json-encoder";
+  "json-enumerator" = dontDistribute super."json-enumerator";
+  "json-extra" = dontDistribute super."json-extra";
+  "json-fu" = dontDistribute super."json-fu";
+  "json-litobj" = dontDistribute super."json-litobj";
+  "json-python" = dontDistribute super."json-python";
+  "json-qq" = dontDistribute super."json-qq";
+  "json-rpc" = dontDistribute super."json-rpc";
+  "json-rpc-client" = dontDistribute super."json-rpc-client";
+  "json-rpc-server" = dontDistribute super."json-rpc-server";
+  "json-sop" = dontDistribute super."json-sop";
+  "json-state" = dontDistribute super."json-state";
+  "json-stream" = dontDistribute super."json-stream";
+  "json-togo" = dontDistribute super."json-togo";
+  "json-tools" = dontDistribute super."json-tools";
+  "json-types" = dontDistribute super."json-types";
+  "json2" = dontDistribute super."json2";
+  "json2-hdbc" = dontDistribute super."json2-hdbc";
+  "json2-types" = dontDistribute super."json2-types";
+  "json2yaml" = dontDistribute super."json2yaml";
+  "jsonresume" = dontDistribute super."jsonresume";
+  "jsonrpc-conduit" = dontDistribute super."jsonrpc-conduit";
+  "jsonschema-gen" = dontDistribute super."jsonschema-gen";
+  "jsonsql" = dontDistribute super."jsonsql";
+  "jsontsv" = dontDistribute super."jsontsv";
+  "jspath" = dontDistribute super."jspath";
+  "judy" = dontDistribute super."judy";
+  "jukebox" = dontDistribute super."jukebox";
+  "jumpthefive" = dontDistribute super."jumpthefive";
+  "jvm-parser" = dontDistribute super."jvm-parser";
+  "kademlia" = dontDistribute super."kademlia";
+  "kafka-client" = dontDistribute super."kafka-client";
+  "kangaroo" = dontDistribute super."kangaroo";
+  "kansas-comet" = dontDistribute super."kansas-comet";
+  "kansas-lava" = dontDistribute super."kansas-lava";
+  "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
+  "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio";
+  "kansas-lava-shake" = dontDistribute super."kansas-lava-shake";
+  "karakuri" = dontDistribute super."karakuri";
+  "karver" = dontDistribute super."karver";
+  "katt" = dontDistribute super."katt";
+  "kbq-gu" = dontDistribute super."kbq-gu";
+  "kd-tree" = dontDistribute super."kd-tree";
+  "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
+  "keera-callbacks" = dontDistribute super."keera-callbacks";
+  "keera-hails-i18n" = dontDistribute super."keera-hails-i18n";
+  "keera-hails-mvc-controller" = dontDistribute super."keera-hails-mvc-controller";
+  "keera-hails-mvc-environment-gtk" = dontDistribute super."keera-hails-mvc-environment-gtk";
+  "keera-hails-mvc-model-lightmodel" = dontDistribute super."keera-hails-mvc-model-lightmodel";
+  "keera-hails-mvc-model-protectedmodel" = dontDistribute super."keera-hails-mvc-model-protectedmodel";
+  "keera-hails-mvc-solutions-config" = dontDistribute super."keera-hails-mvc-solutions-config";
+  "keera-hails-mvc-solutions-gtk" = dontDistribute super."keera-hails-mvc-solutions-gtk";
+  "keera-hails-mvc-view" = dontDistribute super."keera-hails-mvc-view";
+  "keera-hails-mvc-view-gtk" = dontDistribute super."keera-hails-mvc-view-gtk";
+  "keera-hails-reactive-fs" = dontDistribute super."keera-hails-reactive-fs";
+  "keera-hails-reactive-gtk" = dontDistribute super."keera-hails-reactive-gtk";
+  "keera-hails-reactive-network" = dontDistribute super."keera-hails-reactive-network";
+  "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling";
+  "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx";
+  "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa";
+  "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses";
+  "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues";
+  "keera-posture" = dontDistribute super."keera-posture";
+  "keiretsu" = dontDistribute super."keiretsu";
+  "kevin" = dontDistribute super."kevin";
+  "keyed" = dontDistribute super."keyed";
+  "keyring" = dontDistribute super."keyring";
+  "keystore" = dontDistribute super."keystore";
+  "keyvaluehash" = dontDistribute super."keyvaluehash";
+  "keyword-args" = dontDistribute super."keyword-args";
+  "kibro" = dontDistribute super."kibro";
+  "kicad-data" = dontDistribute super."kicad-data";
+  "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
+  "kickchan" = dontDistribute super."kickchan";
+  "kif-parser" = dontDistribute super."kif-parser";
+  "kinds" = dontDistribute super."kinds";
+  "kit" = dontDistribute super."kit";
+  "kmeans-par" = dontDistribute super."kmeans-par";
+  "kmeans-vector" = dontDistribute super."kmeans-vector";
+  "knots" = dontDistribute super."knots";
+  "koellner-phonetic" = dontDistribute super."koellner-phonetic";
+  "kontrakcja-templates" = dontDistribute super."kontrakcja-templates";
+  "korfu" = dontDistribute super."korfu";
+  "kqueue" = dontDistribute super."kqueue";
+  "kraken" = dontDistribute super."kraken";
+  "krpc" = dontDistribute super."krpc";
+  "ks-test" = dontDistribute super."ks-test";
+  "ktx" = dontDistribute super."ktx";
+  "kure-your-boilerplate" = dontDistribute super."kure-your-boilerplate";
+  "kyotocabinet" = dontDistribute super."kyotocabinet";
+  "l-bfgs-b" = dontDistribute super."l-bfgs-b";
+  "labeled-graph" = dontDistribute super."labeled-graph";
+  "labeled-tree" = dontDistribute super."labeled-tree";
+  "laborantin-hs" = dontDistribute super."laborantin-hs";
+  "labyrinth" = dontDistribute super."labyrinth";
+  "labyrinth-server" = dontDistribute super."labyrinth-server";
+  "lackey" = dontDistribute super."lackey";
+  "lagrangian" = dontDistribute super."lagrangian";
+  "laika" = dontDistribute super."laika";
+  "lambda-ast" = dontDistribute super."lambda-ast";
+  "lambda-bridge" = dontDistribute super."lambda-bridge";
+  "lambda-canvas" = dontDistribute super."lambda-canvas";
+  "lambda-devs" = dontDistribute super."lambda-devs";
+  "lambda-options" = dontDistribute super."lambda-options";
+  "lambda-placeholders" = dontDistribute super."lambda-placeholders";
+  "lambda-toolbox" = dontDistribute super."lambda-toolbox";
+  "lambda2js" = dontDistribute super."lambda2js";
+  "lambdaBase" = dontDistribute super."lambdaBase";
+  "lambdaFeed" = dontDistribute super."lambdaFeed";
+  "lambdaLit" = dontDistribute super."lambdaLit";
+  "lambdabot-utils" = dontDistribute super."lambdabot-utils";
+  "lambdacat" = dontDistribute super."lambdacat";
+  "lambdacms-core" = dontDistribute super."lambdacms-core";
+  "lambdacms-media" = dontDistribute super."lambdacms-media";
+  "lambdacube" = dontDistribute super."lambdacube";
+  "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-core" = dontDistribute super."lambdacube-core";
+  "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
+  "lambdacube-engine" = dontDistribute super."lambdacube-engine";
+  "lambdacube-examples" = dontDistribute super."lambdacube-examples";
+  "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-samples" = dontDistribute super."lambdacube-samples";
+  "lambdatex" = dontDistribute super."lambdatex";
+  "lambdatwit" = dontDistribute super."lambdatwit";
+  "lambdiff" = dontDistribute super."lambdiff";
+  "lame-tester" = dontDistribute super."lame-tester";
+  "language-asn1" = dontDistribute super."language-asn1";
+  "language-bash" = dontDistribute super."language-bash";
+  "language-boogie" = dontDistribute super."language-boogie";
+  "language-c-comments" = dontDistribute super."language-c-comments";
+  "language-c-inline" = dontDistribute super."language-c-inline";
+  "language-cil" = dontDistribute super."language-cil";
+  "language-css" = dontDistribute super."language-css";
+  "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
+  "language-eiffel" = dontDistribute super."language-eiffel";
+  "language-fortran" = dontDistribute super."language-fortran";
+  "language-gcl" = dontDistribute super."language-gcl";
+  "language-go" = dontDistribute super."language-go";
+  "language-guess" = dontDistribute super."language-guess";
+  "language-java-classfile" = dontDistribute super."language-java-classfile";
+  "language-kort" = dontDistribute super."language-kort";
+  "language-lua" = dontDistribute super."language-lua";
+  "language-lua-qq" = dontDistribute super."language-lua-qq";
+  "language-lua2" = dontDistribute super."language-lua2";
+  "language-mixal" = dontDistribute super."language-mixal";
+  "language-nix" = dontDistribute super."language-nix";
+  "language-objc" = dontDistribute super."language-objc";
+  "language-openscad" = dontDistribute super."language-openscad";
+  "language-pig" = dontDistribute super."language-pig";
+  "language-puppet" = dontDistribute super."language-puppet";
+  "language-python" = dontDistribute super."language-python";
+  "language-python-colour" = dontDistribute super."language-python-colour";
+  "language-python-test" = dontDistribute super."language-python-test";
+  "language-qux" = dontDistribute super."language-qux";
+  "language-sh" = dontDistribute super."language-sh";
+  "language-slice" = dontDistribute super."language-slice";
+  "language-spelling" = dontDistribute super."language-spelling";
+  "language-sqlite" = dontDistribute super."language-sqlite";
+  "language-thrift" = dontDistribute super."language-thrift";
+  "language-typescript" = dontDistribute super."language-typescript";
+  "language-vhdl" = dontDistribute super."language-vhdl";
+  "largeword" = doDistribute super."largeword_1_2_3";
+  "lat" = dontDistribute super."lat";
+  "latest-npm-version" = dontDistribute super."latest-npm-version";
+  "latex" = dontDistribute super."latex";
+  "latex-formulae-hakyll" = dontDistribute super."latex-formulae-hakyll";
+  "latex-formulae-image" = dontDistribute super."latex-formulae-image";
+  "latex-formulae-pandoc" = dontDistribute super."latex-formulae-pandoc";
+  "lattices" = doDistribute super."lattices_1_3";
+  "launchpad-control" = dontDistribute super."launchpad-control";
+  "lax" = dontDistribute super."lax";
+  "layers" = dontDistribute super."layers";
+  "layers-game" = dontDistribute super."layers-game";
+  "layout" = dontDistribute super."layout";
+  "layout-bootstrap" = dontDistribute super."layout-bootstrap";
+  "lazy-io" = dontDistribute super."lazy-io";
+  "lazyarray" = dontDistribute super."lazyarray";
+  "lazyio" = dontDistribute super."lazyio";
+  "lazysplines" = dontDistribute super."lazysplines";
+  "lbfgs" = dontDistribute super."lbfgs";
+  "lcs" = dontDistribute super."lcs";
+  "lda" = dontDistribute super."lda";
+  "ldap-client" = dontDistribute super."ldap-client";
+  "ldif" = dontDistribute super."ldif";
+  "leaf" = dontDistribute super."leaf";
+  "leaky" = dontDistribute super."leaky";
+  "leankit-api" = dontDistribute super."leankit-api";
+  "leapseconds-announced" = dontDistribute super."leapseconds-announced";
+  "learn" = dontDistribute super."learn";
+  "learn-physics" = dontDistribute super."learn-physics";
+  "learn-physics-examples" = dontDistribute super."learn-physics-examples";
+  "learning-hmm" = dontDistribute super."learning-hmm";
+  "leetify" = dontDistribute super."leetify";
+  "leksah" = dontDistribute super."leksah";
+  "leksah-server" = dontDistribute super."leksah-server";
+  "lendingclub" = dontDistribute super."lendingclub";
+  "lens" = doDistribute super."lens_4_12_3";
+  "lens-datetime" = dontDistribute super."lens-datetime";
+  "lens-prelude" = dontDistribute super."lens-prelude";
+  "lens-properties" = dontDistribute super."lens-properties";
+  "lens-regex" = dontDistribute super."lens-regex";
+  "lens-sop" = dontDistribute super."lens-sop";
+  "lens-text-encoding" = dontDistribute super."lens-text-encoding";
+  "lens-time" = dontDistribute super."lens-time";
+  "lens-tutorial" = dontDistribute super."lens-tutorial";
+  "lens-utils" = dontDistribute super."lens-utils";
+  "lenses" = dontDistribute super."lenses";
+  "lensref" = dontDistribute super."lensref";
+  "lentil" = dontDistribute super."lentil";
+  "lenz" = dontDistribute super."lenz";
+  "lenz-template" = dontDistribute super."lenz-template";
+  "level-monad" = dontDistribute super."level-monad";
+  "leveldb-haskell" = dontDistribute super."leveldb-haskell";
+  "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
+  "levmar" = dontDistribute super."levmar";
+  "levmar-chart" = dontDistribute super."levmar-chart";
+  "lgtk" = dontDistribute super."lgtk";
+  "lha" = dontDistribute super."lha";
+  "lhae" = dontDistribute super."lhae";
+  "lhc" = dontDistribute super."lhc";
+  "lhe" = dontDistribute super."lhe";
+  "lhs2TeX-hl" = dontDistribute super."lhs2TeX-hl";
+  "lhs2html" = dontDistribute super."lhs2html";
+  "lhslatex" = dontDistribute super."lhslatex";
+  "libGenI" = dontDistribute super."libGenI";
+  "libarchive-conduit" = dontDistribute super."libarchive-conduit";
+  "libconfig" = dontDistribute super."libconfig";
+  "libcspm" = dontDistribute super."libcspm";
+  "libexpect" = dontDistribute super."libexpect";
+  "libffi" = dontDistribute super."libffi";
+  "libgraph" = dontDistribute super."libgraph";
+  "libhbb" = dontDistribute super."libhbb";
+  "libinfluxdb" = dontDistribute super."libinfluxdb";
+  "libjenkins" = dontDistribute super."libjenkins";
+  "liblastfm" = dontDistribute super."liblastfm";
+  "liblinear-enumerator" = dontDistribute super."liblinear-enumerator";
+  "libltdl" = dontDistribute super."libltdl";
+  "libmpd" = dontDistribute super."libmpd";
+  "libnvvm" = dontDistribute super."libnvvm";
+  "liboleg" = dontDistribute super."liboleg";
+  "libpafe" = dontDistribute super."libpafe";
+  "libpq" = dontDistribute super."libpq";
+  "librandomorg" = dontDistribute super."librandomorg";
+  "libravatar" = dontDistribute super."libravatar";
+  "libssh2" = dontDistribute super."libssh2";
+  "libssh2-conduit" = dontDistribute super."libssh2-conduit";
+  "libstackexchange" = dontDistribute super."libstackexchange";
+  "libsystemd-daemon" = dontDistribute super."libsystemd-daemon";
+  "libsystemd-journal" = dontDistribute super."libsystemd-journal";
+  "libtagc" = dontDistribute super."libtagc";
+  "libvirt-hs" = dontDistribute super."libvirt-hs";
+  "libvorbis" = dontDistribute super."libvorbis";
+  "libxml" = dontDistribute super."libxml";
+  "libxml-enumerator" = dontDistribute super."libxml-enumerator";
+  "libxslt" = dontDistribute super."libxslt";
+  "life" = dontDistribute super."life";
+  "lift-generics" = dontDistribute super."lift-generics";
+  "lifted-threads" = dontDistribute super."lifted-threads";
+  "lifter" = dontDistribute super."lifter";
+  "ligature" = dontDistribute super."ligature";
+  "ligd" = dontDistribute super."ligd";
+  "lighttpd-conf" = dontDistribute super."lighttpd-conf";
+  "lighttpd-conf-qq" = dontDistribute super."lighttpd-conf-qq";
+  "lilypond" = dontDistribute super."lilypond";
+  "limp" = dontDistribute super."limp";
+  "limp-cbc" = dontDistribute super."limp-cbc";
+  "lin-alg" = dontDistribute super."lin-alg";
+  "linda" = dontDistribute super."linda";
+  "lindenmayer" = dontDistribute super."lindenmayer";
+  "line-break" = dontDistribute super."line-break";
+  "line2pdf" = dontDistribute super."line2pdf";
+  "linear" = doDistribute super."linear_1_19_1_3";
+  "linear-algebra-cblas" = dontDistribute super."linear-algebra-cblas";
+  "linear-circuit" = dontDistribute super."linear-circuit";
+  "linear-grammar" = dontDistribute super."linear-grammar";
+  "linear-maps" = dontDistribute super."linear-maps";
+  "linear-opengl" = dontDistribute super."linear-opengl";
+  "linear-vect" = dontDistribute super."linear-vect";
+  "linearEqSolver" = dontDistribute super."linearEqSolver";
+  "linearscan" = dontDistribute super."linearscan";
+  "linearscan-hoopl" = dontDistribute super."linearscan-hoopl";
+  "linebreak" = dontDistribute super."linebreak";
+  "linguistic-ordinals" = dontDistribute super."linguistic-ordinals";
+  "link-relations" = dontDistribute super."link-relations";
+  "linkchk" = dontDistribute super."linkchk";
+  "linkcore" = dontDistribute super."linkcore";
+  "linkedhashmap" = dontDistribute super."linkedhashmap";
+  "linklater" = dontDistribute super."linklater";
+  "linode" = dontDistribute super."linode";
+  "linux-blkid" = dontDistribute super."linux-blkid";
+  "linux-cgroup" = dontDistribute super."linux-cgroup";
+  "linux-evdev" = dontDistribute super."linux-evdev";
+  "linux-inotify" = dontDistribute super."linux-inotify";
+  "linux-kmod" = dontDistribute super."linux-kmod";
+  "linux-mount" = dontDistribute super."linux-mount";
+  "linux-perf" = dontDistribute super."linux-perf";
+  "linux-ptrace" = dontDistribute super."linux-ptrace";
+  "linux-xattr" = dontDistribute super."linux-xattr";
+  "linx-gateway" = dontDistribute super."linx-gateway";
+  "lio" = dontDistribute super."lio";
+  "lio-eci11" = dontDistribute super."lio-eci11";
+  "lio-fs" = dontDistribute super."lio-fs";
+  "lio-simple" = dontDistribute super."lio-simple";
+  "lipsum-gen" = dontDistribute super."lipsum-gen";
+  "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
+  "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "lispparser" = dontDistribute super."lispparser";
+  "list-extras" = dontDistribute super."list-extras";
+  "list-grouping" = dontDistribute super."list-grouping";
+  "list-mux" = dontDistribute super."list-mux";
+  "list-prompt" = dontDistribute super."list-prompt";
+  "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t-attoparsec" = dontDistribute super."list-t-attoparsec";
+  "list-t-html-parser" = dontDistribute super."list-t-html-parser";
+  "list-t-http-client" = dontDistribute super."list-t-http-client";
+  "list-t-libcurl" = dontDistribute super."list-t-libcurl";
+  "list-t-text" = dontDistribute super."list-t-text";
+  "list-tries" = dontDistribute super."list-tries";
+  "list-zip-def" = dontDistribute super."list-zip-def";
+  "listlike-instances" = dontDistribute super."listlike-instances";
+  "lists" = dontDistribute super."lists";
+  "listsafe" = dontDistribute super."listsafe";
+  "lit" = dontDistribute super."lit";
+  "literals" = dontDistribute super."literals";
+  "live-sequencer" = dontDistribute super."live-sequencer";
+  "ll-picosat" = dontDistribute super."ll-picosat";
+  "llrbtree" = dontDistribute super."llrbtree";
+  "llsd" = dontDistribute super."llsd";
+  "llvm" = dontDistribute super."llvm";
+  "llvm-analysis" = dontDistribute super."llvm-analysis";
+  "llvm-base" = dontDistribute super."llvm-base";
+  "llvm-base-types" = dontDistribute super."llvm-base-types";
+  "llvm-base-util" = dontDistribute super."llvm-base-util";
+  "llvm-data-interop" = dontDistribute super."llvm-data-interop";
+  "llvm-extra" = dontDistribute super."llvm-extra";
+  "llvm-ffi" = dontDistribute super."llvm-ffi";
+  "llvm-general" = dontDistribute super."llvm-general";
+  "llvm-general-pure" = dontDistribute super."llvm-general-pure";
+  "llvm-general-quote" = dontDistribute super."llvm-general-quote";
+  "llvm-ht" = dontDistribute super."llvm-ht";
+  "llvm-pkg-config" = dontDistribute super."llvm-pkg-config";
+  "llvm-pretty" = dontDistribute super."llvm-pretty";
+  "llvm-pretty-bc-parser" = dontDistribute super."llvm-pretty-bc-parser";
+  "llvm-tf" = dontDistribute super."llvm-tf";
+  "llvm-tools" = dontDistribute super."llvm-tools";
+  "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
+  "load-env" = dontDistribute super."load-env";
+  "loadavg" = dontDistribute super."loadavg";
+  "local-address" = dontDistribute super."local-address";
+  "local-search" = dontDistribute super."local-search";
+  "located-base" = dontDistribute super."located-base";
+  "locators" = dontDistribute super."locators";
+  "loch" = dontDistribute super."loch";
+  "lock-file" = dontDistribute super."lock-file";
+  "locked-poll" = dontDistribute super."locked-poll";
+  "lockfree-queue" = dontDistribute super."lockfree-queue";
+  "log" = dontDistribute super."log";
+  "log-effect" = dontDistribute super."log-effect";
+  "log2json" = dontDistribute super."log2json";
+  "logfloat" = dontDistribute super."logfloat";
+  "logger" = dontDistribute super."logger";
+  "logging" = dontDistribute super."logging";
+  "logging-facade-journald" = dontDistribute super."logging-facade-journald";
+  "logic-TPTP" = dontDistribute super."logic-TPTP";
+  "logic-classes" = dontDistribute super."logic-classes";
+  "logicst" = dontDistribute super."logicst";
+  "logplex-parse" = dontDistribute super."logplex-parse";
+  "logsink" = dontDistribute super."logsink";
+  "lojban" = dontDistribute super."lojban";
+  "lojbanParser" = dontDistribute super."lojbanParser";
+  "lojbanXiragan" = dontDistribute super."lojbanXiragan";
+  "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
+  "loli" = dontDistribute super."loli";
+  "lookup-tables" = dontDistribute super."lookup-tables";
+  "loop" = doDistribute super."loop_0_2_0";
+  "loop-effin" = dontDistribute super."loop-effin";
+  "loop-while" = dontDistribute super."loop-while";
+  "loops" = dontDistribute super."loops";
+  "loopy" = dontDistribute super."loopy";
+  "lord" = dontDistribute super."lord";
+  "lorem" = dontDistribute super."lorem";
+  "loris" = dontDistribute super."loris";
+  "loshadka" = dontDistribute super."loshadka";
+  "lostcities" = dontDistribute super."lostcities";
+  "lowgl" = dontDistribute super."lowgl";
+  "ls-usb" = dontDistribute super."ls-usb";
+  "lscabal" = dontDistribute super."lscabal";
+  "lss" = dontDistribute super."lss";
+  "lsystem" = dontDistribute super."lsystem";
+  "ltk" = dontDistribute super."ltk";
+  "ltl" = dontDistribute super."ltl";
+  "lua-bytecode" = dontDistribute super."lua-bytecode";
+  "luachunk" = dontDistribute super."luachunk";
+  "luautils" = dontDistribute super."luautils";
+  "lub" = dontDistribute super."lub";
+  "lucid-foundation" = dontDistribute super."lucid-foundation";
+  "lucid-svg" = doDistribute super."lucid-svg_0_5_0_0";
+  "lucienne" = dontDistribute super."lucienne";
+  "luhn" = dontDistribute super."luhn";
+  "lui" = dontDistribute super."lui";
+  "luka" = dontDistribute super."luka";
+  "luminance" = dontDistribute super."luminance";
+  "luminance-samples" = dontDistribute super."luminance-samples";
+  "lushtags" = dontDistribute super."lushtags";
+  "luthor" = dontDistribute super."luthor";
+  "lvish" = dontDistribute super."lvish";
+  "lvmlib" = dontDistribute super."lvmlib";
+  "lvmrun" = dontDistribute super."lvmrun";
+  "lxc" = dontDistribute super."lxc";
+  "lye" = dontDistribute super."lye";
+  "lz4" = dontDistribute super."lz4";
+  "lzma" = dontDistribute super."lzma";
+  "lzma-clib" = dontDistribute super."lzma-clib";
+  "lzma-enumerator" = dontDistribute super."lzma-enumerator";
+  "lzma-streams" = dontDistribute super."lzma-streams";
+  "maam" = dontDistribute super."maam";
+  "mac" = dontDistribute super."mac";
+  "maccatcher" = dontDistribute super."maccatcher";
+  "machinecell" = dontDistribute super."machinecell";
+  "machines-binary" = dontDistribute super."machines-binary";
+  "machines-zlib" = dontDistribute super."machines-zlib";
+  "macho" = dontDistribute super."macho";
+  "maclight" = dontDistribute super."maclight";
+  "macosx-make-standalone" = dontDistribute super."macosx-make-standalone";
+  "mage" = dontDistribute super."mage";
+  "magico" = dontDistribute super."magico";
+  "magma" = dontDistribute super."magma";
+  "mahoro" = dontDistribute super."mahoro";
+  "maid" = dontDistribute super."maid";
+  "mailbox-count" = dontDistribute super."mailbox-count";
+  "mailchimp-subscribe" = dontDistribute super."mailchimp-subscribe";
+  "mailgun" = dontDistribute super."mailgun";
+  "majordomo" = dontDistribute super."majordomo";
+  "majority" = dontDistribute super."majority";
+  "make-hard-links" = dontDistribute super."make-hard-links";
+  "make-package" = dontDistribute super."make-package";
+  "makedo" = dontDistribute super."makedo";
+  "manatee" = dontDistribute super."manatee";
+  "manatee-all" = dontDistribute super."manatee-all";
+  "manatee-anything" = dontDistribute super."manatee-anything";
+  "manatee-browser" = dontDistribute super."manatee-browser";
+  "manatee-core" = dontDistribute super."manatee-core";
+  "manatee-curl" = dontDistribute super."manatee-curl";
+  "manatee-editor" = dontDistribute super."manatee-editor";
+  "manatee-filemanager" = dontDistribute super."manatee-filemanager";
+  "manatee-imageviewer" = dontDistribute super."manatee-imageviewer";
+  "manatee-ircclient" = dontDistribute super."manatee-ircclient";
+  "manatee-mplayer" = dontDistribute super."manatee-mplayer";
+  "manatee-pdfviewer" = dontDistribute super."manatee-pdfviewer";
+  "manatee-processmanager" = dontDistribute super."manatee-processmanager";
+  "manatee-reader" = dontDistribute super."manatee-reader";
+  "manatee-template" = dontDistribute super."manatee-template";
+  "manatee-terminal" = dontDistribute super."manatee-terminal";
+  "manatee-welcome" = dontDistribute super."manatee-welcome";
+  "mancala" = dontDistribute super."mancala";
+  "mandrill" = doDistribute super."mandrill_0_3_0_0";
+  "mandulia" = dontDistribute super."mandulia";
+  "mangopay" = doDistribute super."mangopay_1_11_5";
+  "manifold-random" = dontDistribute super."manifold-random";
+  "manifolds" = dontDistribute super."manifolds";
+  "marionetta" = dontDistribute super."marionetta";
+  "markdown-kate" = dontDistribute super."markdown-kate";
+  "markdown-pap" = dontDistribute super."markdown-pap";
+  "markdown-unlit" = dontDistribute super."markdown-unlit";
+  "markdown2svg" = dontDistribute super."markdown2svg";
+  "marked-pretty" = dontDistribute super."marked-pretty";
+  "markov" = dontDistribute super."markov";
+  "markov-chain" = dontDistribute super."markov-chain";
+  "markov-processes" = dontDistribute super."markov-processes";
+  "markup" = doDistribute super."markup_1_1_0";
+  "markup-preview" = dontDistribute super."markup-preview";
+  "marmalade-upload" = dontDistribute super."marmalade-upload";
+  "marquise" = dontDistribute super."marquise";
+  "marxup" = dontDistribute super."marxup";
+  "masakazu-bot" = dontDistribute super."masakazu-bot";
+  "mastermind" = dontDistribute super."mastermind";
+  "matchers" = dontDistribute super."matchers";
+  "mathblog" = dontDistribute super."mathblog";
+  "mathgenealogy" = dontDistribute super."mathgenealogy";
+  "mathista" = dontDistribute super."mathista";
+  "mathlink" = dontDistribute super."mathlink";
+  "matlab" = dontDistribute super."matlab";
+  "matrix-market" = dontDistribute super."matrix-market";
+  "matrix-market-pure" = dontDistribute super."matrix-market-pure";
+  "matsuri" = dontDistribute super."matsuri";
+  "maude" = dontDistribute super."maude";
+  "maxent" = dontDistribute super."maxent";
+  "maxsharing" = dontDistribute super."maxsharing";
+  "maybe-justify" = dontDistribute super."maybe-justify";
+  "maybench" = dontDistribute super."maybench";
+  "mbox-tools" = dontDistribute super."mbox-tools";
+  "mcmaster-gloss-examples" = dontDistribute super."mcmaster-gloss-examples";
+  "mcmc-samplers" = dontDistribute super."mcmc-samplers";
+  "mcmc-synthesis" = dontDistribute super."mcmc-synthesis";
+  "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";
+  "mecha" = dontDistribute super."mecha";
+  "mediawiki" = dontDistribute super."mediawiki";
+  "mediawiki2latex" = dontDistribute super."mediawiki2latex";
+  "medium-sdk-haskell" = dontDistribute super."medium-sdk-haskell";
+  "meep" = dontDistribute super."meep";
+  "mega-sdist" = dontDistribute super."mega-sdist";
+  "megaparsec" = dontDistribute super."megaparsec";
+  "meldable-heap" = dontDistribute super."meldable-heap";
+  "melody" = dontDistribute super."melody";
+  "memcache" = dontDistribute super."memcache";
+  "memcache-conduit" = dontDistribute super."memcache-conduit";
+  "memcache-haskell" = dontDistribute super."memcache-haskell";
+  "memcached" = dontDistribute super."memcached";
+  "memexml" = dontDistribute super."memexml";
+  "memo-ptr" = dontDistribute super."memo-ptr";
+  "memo-sqlite" = dontDistribute super."memo-sqlite";
+  "memoization-utils" = dontDistribute super."memoization-utils";
+  "memory" = doDistribute super."memory_0_7";
+  "memscript" = dontDistribute super."memscript";
+  "mersenne-random" = dontDistribute super."mersenne-random";
+  "messente" = dontDistribute super."messente";
+  "meta-misc" = dontDistribute super."meta-misc";
+  "meta-par" = dontDistribute super."meta-par";
+  "meta-par-accelerate" = dontDistribute super."meta-par-accelerate";
+  "metadata" = dontDistribute super."metadata";
+  "metamorphic" = dontDistribute super."metamorphic";
+  "metaplug" = dontDistribute super."metaplug";
+  "metric" = dontDistribute super."metric";
+  "metricsd-client" = dontDistribute super."metricsd-client";
+  "metronome" = dontDistribute super."metronome";
+  "mezzolens" = dontDistribute super."mezzolens";
+  "mfsolve" = dontDistribute super."mfsolve";
+  "mgeneric" = dontDistribute super."mgeneric";
+  "mi" = dontDistribute super."mi";
+  "microbench" = dontDistribute super."microbench";
+  "microformats2-parser" = dontDistribute super."microformats2-parser";
+  "microformats2-types" = dontDistribute super."microformats2-types";
+  "microlens" = doDistribute super."microlens_0_2_0_0";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
+  "microlens-each" = dontDistribute super."microlens-each";
+  "microlens-ghc" = doDistribute super."microlens-ghc_0_1_0_1";
+  "microlens-mtl" = doDistribute super."microlens-mtl_0_1_4_0";
+  "microlens-platform" = dontDistribute super."microlens-platform";
+  "microlens-th" = doDistribute super."microlens-th_0_2_1_1";
+  "microtimer" = dontDistribute super."microtimer";
+  "mida" = dontDistribute super."mida";
+  "midi" = dontDistribute super."midi";
+  "midi-alsa" = dontDistribute super."midi-alsa";
+  "midi-music-box" = dontDistribute super."midi-music-box";
+  "midi-util" = dontDistribute super."midi-util";
+  "midimory" = dontDistribute super."midimory";
+  "midisurface" = dontDistribute super."midisurface";
+  "mighttpd" = dontDistribute super."mighttpd";
+  "mighttpd2" = dontDistribute super."mighttpd2";
+  "mighty-metropolis" = dontDistribute super."mighty-metropolis";
+  "mikmod" = dontDistribute super."mikmod";
+  "miku" = dontDistribute super."miku";
+  "milena" = dontDistribute super."milena";
+  "mime" = dontDistribute super."mime";
+  "mime-directory" = dontDistribute super."mime-directory";
+  "mime-string" = dontDistribute super."mime-string";
+  "mines" = dontDistribute super."mines";
+  "minesweeper" = dontDistribute super."minesweeper";
+  "miniball" = dontDistribute super."miniball";
+  "miniforth" = dontDistribute super."miniforth";
+  "minilens" = dontDistribute super."minilens";
+  "minimal-configuration" = dontDistribute super."minimal-configuration";
+  "minimorph" = dontDistribute super."minimorph";
+  "minimung" = dontDistribute super."minimung";
+  "minions" = dontDistribute super."minions";
+  "minioperational" = dontDistribute super."minioperational";
+  "miniplex" = dontDistribute super."miniplex";
+  "minirotate" = dontDistribute super."minirotate";
+  "minisat" = dontDistribute super."minisat";
+  "ministg" = dontDistribute super."ministg";
+  "miniutter" = dontDistribute super."miniutter";
+  "minst-idx" = dontDistribute super."minst-idx";
+  "mirror-tweet" = dontDistribute super."mirror-tweet";
+  "missing-py2" = dontDistribute super."missing-py2";
+  "mix-arrows" = dontDistribute super."mix-arrows";
+  "mixed-strategies" = dontDistribute super."mixed-strategies";
+  "mkbndl" = dontDistribute super."mkbndl";
+  "mkcabal" = dontDistribute super."mkcabal";
+  "ml-w" = dontDistribute super."ml-w";
+  "mlist" = dontDistribute super."mlist";
+  "mmtl" = dontDistribute super."mmtl";
+  "mmtl-base" = dontDistribute super."mmtl-base";
+  "moan" = dontDistribute super."moan";
+  "modbus-tcp" = dontDistribute super."modbus-tcp";
+  "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = dontDistribute super."modify-fasta";
+  "modsplit" = dontDistribute super."modsplit";
+  "modular-arithmetic" = dontDistribute super."modular-arithmetic";
+  "modular-prelude" = dontDistribute super."modular-prelude";
+  "modular-prelude-classy" = dontDistribute super."modular-prelude-classy";
+  "module-management" = dontDistribute super."module-management";
+  "modulespection" = dontDistribute super."modulespection";
+  "modulo" = dontDistribute super."modulo";
+  "moe" = dontDistribute super."moe";
+  "moesocks" = dontDistribute super."moesocks";
+  "mohws" = dontDistribute super."mohws";
+  "mole" = dontDistribute super."mole";
+  "monad-abort-fd" = dontDistribute super."monad-abort-fd";
+  "monad-atom" = dontDistribute super."monad-atom";
+  "monad-atom-simple" = dontDistribute super."monad-atom-simple";
+  "monad-bool" = dontDistribute super."monad-bool";
+  "monad-classes" = dontDistribute super."monad-classes";
+  "monad-codec" = dontDistribute super."monad-codec";
+  "monad-exception" = dontDistribute super."monad-exception";
+  "monad-fork" = dontDistribute super."monad-fork";
+  "monad-gen" = dontDistribute super."monad-gen";
+  "monad-http" = dontDistribute super."monad-http";
+  "monad-interleave" = dontDistribute super."monad-interleave";
+  "monad-levels" = dontDistribute super."monad-levels";
+  "monad-loops-stm" = dontDistribute super."monad-loops-stm";
+  "monad-lrs" = dontDistribute super."monad-lrs";
+  "monad-memo" = dontDistribute super."monad-memo";
+  "monad-mersenne-random" = dontDistribute super."monad-mersenne-random";
+  "monad-open" = dontDistribute super."monad-open";
+  "monad-ox" = dontDistribute super."monad-ox";
+  "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
+  "monad-param" = dontDistribute super."monad-param";
+  "monad-ran" = dontDistribute super."monad-ran";
+  "monad-resumption" = dontDistribute super."monad-resumption";
+  "monad-state" = dontDistribute super."monad-state";
+  "monad-statevar" = dontDistribute super."monad-statevar";
+  "monad-stlike-io" = dontDistribute super."monad-stlike-io";
+  "monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
+  "monad-supply" = dontDistribute super."monad-supply";
+  "monad-task" = dontDistribute super."monad-task";
+  "monad-time" = dontDistribute super."monad-time";
+  "monad-tx" = dontDistribute super."monad-tx";
+  "monad-unify" = dontDistribute super."monad-unify";
+  "monad-wrap" = dontDistribute super."monad-wrap";
+  "monadIO" = dontDistribute super."monadIO";
+  "monadLib-compose" = dontDistribute super."monadLib-compose";
+  "monadacme" = dontDistribute super."monadacme";
+  "monadbi" = dontDistribute super."monadbi";
+  "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1";
+  "monadfibre" = dontDistribute super."monadfibre";
+  "monadiccp" = dontDistribute super."monadiccp";
+  "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
+  "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
+  "monadlist" = dontDistribute super."monadlist";
+  "monadloc" = dontDistribute super."monadloc";
+  "monadloc-pp" = dontDistribute super."monadloc-pp";
+  "monadplus" = dontDistribute super."monadplus";
+  "monads-fd" = dontDistribute super."monads-fd";
+  "monadtransform" = dontDistribute super."monadtransform";
+  "monarch" = dontDistribute super."monarch";
+  "mongodb-queue" = dontDistribute super."mongodb-queue";
+  "mongrel2-handler" = dontDistribute super."mongrel2-handler";
+  "monitor" = dontDistribute super."monitor";
+  "mono-foldable" = dontDistribute super."mono-foldable";
+  "mono-traversable" = doDistribute super."mono-traversable_0_9_3";
+  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-owns" = dontDistribute super."monoid-owns";
+  "monoid-record" = dontDistribute super."monoid-record";
+  "monoid-statistics" = dontDistribute super."monoid-statistics";
+  "monoid-transformer" = dontDistribute super."monoid-transformer";
+  "monoidplus" = dontDistribute super."monoidplus";
+  "monoids" = dontDistribute super."monoids";
+  "monomorphic" = dontDistribute super."monomorphic";
+  "montage" = dontDistribute super."montage";
+  "montage-client" = dontDistribute super."montage-client";
+  "monte-carlo" = dontDistribute super."monte-carlo";
+  "moo" = dontDistribute super."moo";
+  "moonshine" = dontDistribute super."moonshine";
+  "morfette" = dontDistribute super."morfette";
+  "morfeusz" = dontDistribute super."morfeusz";
+  "morte" = dontDistribute super."morte";
+  "mosaico-lib" = dontDistribute super."mosaico-lib";
+  "mount" = dontDistribute super."mount";
+  "mp" = dontDistribute super."mp";
+  "mp3decoder" = dontDistribute super."mp3decoder";
+  "mpdmate" = dontDistribute super."mpdmate";
+  "mpppc" = dontDistribute super."mpppc";
+  "mpretty" = dontDistribute super."mpretty";
+  "mpris" = dontDistribute super."mpris";
+  "mprover" = dontDistribute super."mprover";
+  "mps" = dontDistribute super."mps";
+  "mpvguihs" = dontDistribute super."mpvguihs";
+  "mqtt-hs" = dontDistribute super."mqtt-hs";
+  "ms" = dontDistribute super."ms";
+  "msgpack" = dontDistribute super."msgpack";
+  "msgpack-aeson" = dontDistribute super."msgpack-aeson";
+  "msgpack-idl" = dontDistribute super."msgpack-idl";
+  "msgpack-rpc" = dontDistribute super."msgpack-rpc";
+  "msh" = dontDistribute super."msh";
+  "msu" = dontDistribute super."msu";
+  "mtgoxapi" = dontDistribute super."mtgoxapi";
+  "mtl-c" = dontDistribute super."mtl-c";
+  "mtl-evil-instances" = dontDistribute super."mtl-evil-instances";
+  "mtl-tf" = dontDistribute super."mtl-tf";
+  "mtl-unleashed" = dontDistribute super."mtl-unleashed";
+  "mtlparse" = dontDistribute super."mtlparse";
+  "mtlx" = dontDistribute super."mtlx";
+  "mtp" = dontDistribute super."mtp";
+  "mtree" = dontDistribute super."mtree";
+  "mucipher" = dontDistribute super."mucipher";
+  "mudbath" = dontDistribute super."mudbath";
+  "muesli" = dontDistribute super."muesli";
+  "multext-east-msd" = dontDistribute super."multext-east-msd";
+  "multi-cabal" = dontDistribute super."multi-cabal";
+  "multifocal" = dontDistribute super."multifocal";
+  "multihash" = dontDistribute super."multihash";
+  "multipart-names" = dontDistribute super."multipart-names";
+  "multipass" = dontDistribute super."multipass";
+  "multiplate" = dontDistribute super."multiplate";
+  "multiplate-simplified" = dontDistribute super."multiplate-simplified";
+  "multiplicity" = dontDistribute super."multiplicity";
+  "multirec" = dontDistribute super."multirec";
+  "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver";
+  "multirec-binary" = dontDistribute super."multirec-binary";
+  "multiset-comb" = dontDistribute super."multiset-comb";
+  "multisetrewrite" = dontDistribute super."multisetrewrite";
+  "multistate" = dontDistribute super."multistate";
+  "muon" = dontDistribute super."muon";
+  "murder" = dontDistribute super."murder";
+  "murmur3" = dontDistribute super."murmur3";
+  "murmurhash3" = dontDistribute super."murmurhash3";
+  "music-articulation" = dontDistribute super."music-articulation";
+  "music-diatonic" = dontDistribute super."music-diatonic";
+  "music-dynamics" = dontDistribute super."music-dynamics";
+  "music-dynamics-literal" = dontDistribute super."music-dynamics-literal";
+  "music-graphics" = dontDistribute super."music-graphics";
+  "music-parts" = dontDistribute super."music-parts";
+  "music-pitch" = dontDistribute super."music-pitch";
+  "music-pitch-literal" = dontDistribute super."music-pitch-literal";
+  "music-preludes" = dontDistribute super."music-preludes";
+  "music-score" = dontDistribute super."music-score";
+  "music-sibelius" = dontDistribute super."music-sibelius";
+  "music-suite" = dontDistribute super."music-suite";
+  "music-util" = dontDistribute super."music-util";
+  "musicbrainz-email" = dontDistribute super."musicbrainz-email";
+  "musicxml" = dontDistribute super."musicxml";
+  "musicxml2" = dontDistribute super."musicxml2";
+  "mustache" = dontDistribute super."mustache";
+  "mustache-haskell" = dontDistribute super."mustache-haskell";
+  "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-iter" = dontDistribute super."mutable-iter";
+  "mute-unmute" = dontDistribute super."mute-unmute";
+  "mvc" = dontDistribute super."mvc";
+  "mvc-updates" = dontDistribute super."mvc-updates";
+  "mvclient" = dontDistribute super."mvclient";
+  "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random-monad" = dontDistribute super."mwc-random-monad";
+  "myTestlll" = dontDistribute super."myTestlll";
+  "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
+  "myo" = dontDistribute super."myo";
+  "mysnapsession" = dontDistribute super."mysnapsession";
+  "mysnapsession-example" = dontDistribute super."mysnapsession-example";
+  "mysql-effect" = dontDistribute super."mysql-effect";
+  "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi";
+  "mysql-simple-typed" = dontDistribute super."mysql-simple-typed";
+  "mzv" = dontDistribute super."mzv";
+  "n-m" = dontDistribute super."n-m";
+  "nagios-check" = dontDistribute super."nagios-check";
+  "nagios-perfdata" = dontDistribute super."nagios-perfdata";
+  "nagios-plugin-ekg" = dontDistribute super."nagios-plugin-ekg";
+  "named-formlet" = dontDistribute super."named-formlet";
+  "named-lock" = dontDistribute super."named-lock";
+  "named-records" = dontDistribute super."named-records";
+  "namelist" = dontDistribute super."namelist";
+  "names" = dontDistribute super."names";
+  "names-th" = dontDistribute super."names-th";
+  "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-hmac" = dontDistribute super."nano-hmac";
+  "nano-md5" = dontDistribute super."nano-md5";
+  "nanoAgda" = dontDistribute super."nanoAgda";
+  "nanocurses" = dontDistribute super."nanocurses";
+  "nanomsg" = dontDistribute super."nanomsg";
+  "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
+  "nanoparsec" = dontDistribute super."nanoparsec";
+  "nanq" = dontDistribute super."nanq";
+  "narc" = dontDistribute super."narc";
+  "nat" = dontDistribute super."nat";
+  "nationstates" = doDistribute super."nationstates_0_2_0_3";
+  "nats" = doDistribute super."nats_1";
+  "nats-queue" = dontDistribute super."nats-queue";
+  "natural-number" = dontDistribute super."natural-number";
+  "natural-numbers" = dontDistribute super."natural-numbers";
+  "natural-sort" = dontDistribute super."natural-sort";
+  "natural-transformation" = dontDistribute super."natural-transformation";
+  "naturalcomp" = dontDistribute super."naturalcomp";
+  "naturals" = dontDistribute super."naturals";
+  "naver-translate" = dontDistribute super."naver-translate";
+  "nbt" = dontDistribute super."nbt";
+  "nc-indicators" = dontDistribute super."nc-indicators";
+  "ncurses" = dontDistribute super."ncurses";
+  "neat" = dontDistribute super."neat";
+  "neat-interpolation" = doDistribute super."neat-interpolation_0_2_3";
+  "needle" = dontDistribute super."needle";
+  "neet" = dontDistribute super."neet";
+  "nehe-tuts" = dontDistribute super."nehe-tuts";
+  "neil" = dontDistribute super."neil";
+  "neither" = dontDistribute super."neither";
+  "nemesis" = dontDistribute super."nemesis";
+  "nemesis-titan" = dontDistribute super."nemesis-titan";
+  "nerf" = dontDistribute super."nerf";
+  "nero" = dontDistribute super."nero";
+  "nero-wai" = dontDistribute super."nero-wai";
+  "nero-warp" = dontDistribute super."nero-warp";
+  "nested-routes" = dontDistribute super."nested-routes";
+  "nested-sets" = dontDistribute super."nested-sets";
+  "nestedmap" = dontDistribute super."nestedmap";
+  "net-concurrent" = dontDistribute super."net-concurrent";
+  "netclock" = dontDistribute super."netclock";
+  "netcore" = dontDistribute super."netcore";
+  "netlines" = dontDistribute super."netlines";
+  "netlink" = dontDistribute super."netlink";
+  "netlist" = dontDistribute super."netlist";
+  "netlist-to-vhdl" = dontDistribute super."netlist-to-vhdl";
+  "netpbm" = dontDistribute super."netpbm";
+  "netrc" = dontDistribute super."netrc";
+  "netspec" = dontDistribute super."netspec";
+  "netstring-enumerator" = dontDistribute super."netstring-enumerator";
+  "nettle" = dontDistribute super."nettle";
+  "nettle-frp" = dontDistribute super."nettle-frp";
+  "nettle-netkit" = dontDistribute super."nettle-netkit";
+  "nettle-openflow" = dontDistribute super."nettle-openflow";
+  "netwire" = dontDistribute super."netwire";
+  "netwire-input" = dontDistribute super."netwire-input";
+  "netwire-input-glfw" = dontDistribute super."netwire-input-glfw";
+  "network-address" = dontDistribute super."network-address";
+  "network-anonymous-tor" = doDistribute super."network-anonymous-tor_0_9_2";
+  "network-api-support" = dontDistribute super."network-api-support";
+  "network-bitcoin" = dontDistribute super."network-bitcoin";
+  "network-builder" = dontDistribute super."network-builder";
+  "network-bytestring" = dontDistribute super."network-bytestring";
+  "network-conduit" = dontDistribute super."network-conduit";
+  "network-connection" = dontDistribute super."network-connection";
+  "network-data" = dontDistribute super."network-data";
+  "network-dbus" = dontDistribute super."network-dbus";
+  "network-dns" = dontDistribute super."network-dns";
+  "network-enumerator" = dontDistribute super."network-enumerator";
+  "network-fancy" = dontDistribute super."network-fancy";
+  "network-house" = dontDistribute super."network-house";
+  "network-interfacerequest" = dontDistribute super."network-interfacerequest";
+  "network-ip" = dontDistribute super."network-ip";
+  "network-metrics" = dontDistribute super."network-metrics";
+  "network-minihttp" = dontDistribute super."network-minihttp";
+  "network-msg" = dontDistribute super."network-msg";
+  "network-netpacket" = dontDistribute super."network-netpacket";
+  "network-pgi" = dontDistribute super."network-pgi";
+  "network-rpca" = dontDistribute super."network-rpca";
+  "network-server" = dontDistribute super."network-server";
+  "network-service" = dontDistribute super."network-service";
+  "network-simple-sockaddr" = dontDistribute super."network-simple-sockaddr";
+  "network-simple-tls" = dontDistribute super."network-simple-tls";
+  "network-socket-options" = dontDistribute super."network-socket-options";
+  "network-stream" = dontDistribute super."network-stream";
+  "network-topic-models" = dontDistribute super."network-topic-models";
+  "network-transport-amqp" = dontDistribute super."network-transport-amqp";
+  "network-transport-composed" = dontDistribute super."network-transport-composed";
+  "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tcp" = dontDistribute super."network-transport-tcp";
+  "network-transport-tests" = dontDistribute super."network-transport-tests";
+  "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
+  "network-uri-static" = dontDistribute super."network-uri-static";
+  "network-wai-router" = dontDistribute super."network-wai-router";
+  "network-websocket" = dontDistribute super."network-websocket";
+  "networked-game" = dontDistribute super."networked-game";
+  "newports" = dontDistribute super."newports";
+  "newsynth" = dontDistribute super."newsynth";
+  "newt" = dontDistribute super."newt";
+  "newtype-deriving" = dontDistribute super."newtype-deriving";
+  "newtype-th" = dontDistribute super."newtype-th";
+  "newtyper" = dontDistribute super."newtyper";
+  "nextstep-plist" = dontDistribute super."nextstep-plist";
+  "nf" = dontDistribute super."nf";
+  "ngrams-loader" = dontDistribute super."ngrams-loader";
+  "niagra" = dontDistribute super."niagra";
+  "nibblestring" = dontDistribute super."nibblestring";
+  "nicify" = dontDistribute super."nicify";
+  "nicify-lib" = dontDistribute super."nicify-lib";
+  "nicovideo-translator" = dontDistribute super."nicovideo-translator";
+  "nikepub" = dontDistribute super."nikepub";
+  "nimber" = dontDistribute super."nimber";
+  "nitro" = dontDistribute super."nitro";
+  "nix-eval" = dontDistribute super."nix-eval";
+  "nix-paths" = dontDistribute super."nix-paths";
+  "nixfromnpm" = dontDistribute super."nixfromnpm";
+  "nixos-types" = dontDistribute super."nixos-types";
+  "nkjp" = dontDistribute super."nkjp";
+  "nlp-scores" = dontDistribute super."nlp-scores";
+  "nlp-scores-scripts" = dontDistribute super."nlp-scores-scripts";
+  "nm" = dontDistribute super."nm";
+  "nme" = dontDistribute super."nme";
+  "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
+  "no-role-annots" = dontDistribute super."no-role-annots";
+  "nofib-analyse" = dontDistribute super."nofib-analyse";
+  "nofib-analyze" = dontDistribute super."nofib-analyze";
+  "noise" = dontDistribute super."noise";
+  "non-empty" = dontDistribute super."non-empty";
+  "non-negative" = dontDistribute super."non-negative";
+  "nondeterminism" = dontDistribute super."nondeterminism";
+  "nonfree" = dontDistribute super."nonfree";
+  "nonlinear-optimization" = dontDistribute super."nonlinear-optimization";
+  "nonlinear-optimization-ad" = dontDistribute super."nonlinear-optimization-ad";
+  "noodle" = dontDistribute super."noodle";
+  "normaldistribution" = dontDistribute super."normaldistribution";
+  "not-gloss" = dontDistribute super."not-gloss";
+  "not-gloss-examples" = dontDistribute super."not-gloss-examples";
+  "not-in-base" = dontDistribute super."not-in-base";
+  "notcpp" = dontDistribute super."notcpp";
+  "notmuch-haskell" = dontDistribute super."notmuch-haskell";
+  "notmuch-web" = dontDistribute super."notmuch-web";
+  "notzero" = dontDistribute super."notzero";
+  "np-extras" = dontDistribute super."np-extras";
+  "np-linear" = dontDistribute super."np-linear";
+  "nptools" = dontDistribute super."nptools";
+  "nth-prime" = dontDistribute super."nth-prime";
+  "nthable" = dontDistribute super."nthable";
+  "ntp-control" = dontDistribute super."ntp-control";
+  "null-canvas" = dontDistribute super."null-canvas";
+  "nullary" = dontDistribute super."nullary";
+  "number" = dontDistribute super."number";
+  "numbering" = dontDistribute super."numbering";
+  "numerals" = dontDistribute super."numerals";
+  "numerals-base" = dontDistribute super."numerals-base";
+  "numeric-extras" = doDistribute super."numeric-extras_0_0_3";
+  "numeric-limits" = dontDistribute super."numeric-limits";
+  "numeric-prelude" = dontDistribute super."numeric-prelude";
+  "numeric-qq" = dontDistribute super."numeric-qq";
+  "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
+  "numeric-tools" = dontDistribute super."numeric-tools";
+  "numericpeano" = dontDistribute super."numericpeano";
+  "nums" = dontDistribute super."nums";
+  "numtype-dk" = dontDistribute super."numtype-dk";
+  "numtype-tf" = dontDistribute super."numtype-tf";
+  "nurbs" = dontDistribute super."nurbs";
+  "nvim-hs" = dontDistribute super."nvim-hs";
+  "nvim-hs-contrib" = dontDistribute super."nvim-hs-contrib";
+  "nyan" = dontDistribute super."nyan";
+  "nylas" = dontDistribute super."nylas";
+  "nymphaea" = dontDistribute super."nymphaea";
+  "oauthenticated" = dontDistribute super."oauthenticated";
+  "obdd" = dontDistribute super."obdd";
+  "oberon0" = dontDistribute super."oberon0";
+  "obj" = dontDistribute super."obj";
+  "objectid" = dontDistribute super."objectid";
+  "observable-sharing" = dontDistribute super."observable-sharing";
+  "octohat" = dontDistribute super."octohat";
+  "octopus" = dontDistribute super."octopus";
+  "oculus" = dontDistribute super."oculus";
+  "off-simple" = dontDistribute super."off-simple";
+  "ofx" = dontDistribute super."ofx";
+  "ohloh-hs" = dontDistribute super."ohloh-hs";
+  "oi" = dontDistribute super."oi";
+  "oidc-client" = dontDistribute super."oidc-client";
+  "ois-input-manager" = dontDistribute super."ois-input-manager";
+  "old-version" = dontDistribute super."old-version";
+  "olwrapper" = dontDistribute super."olwrapper";
+  "omaketex" = dontDistribute super."omaketex";
+  "omega" = dontDistribute super."omega";
+  "omnicodec" = dontDistribute super."omnicodec";
+  "omnifmt" = dontDistribute super."omnifmt";
+  "on-a-horse" = dontDistribute super."on-a-horse";
+  "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel";
+  "once" = dontDistribute super."once";
+  "one-liner" = dontDistribute super."one-liner";
+  "one-time-password" = dontDistribute super."one-time-password";
+  "oneOfN" = dontDistribute super."oneOfN";
+  "oneormore" = dontDistribute super."oneormore";
+  "only" = dontDistribute super."only";
+  "onu-course" = dontDistribute super."onu-course";
+  "oo-prototypes" = dontDistribute super."oo-prototypes";
+  "opaleye-classy" = dontDistribute super."opaleye-classy";
+  "opaleye-sqlite" = dontDistribute super."opaleye-sqlite";
+  "opaleye-trans" = dontDistribute super."opaleye-trans";
+  "open-browser" = dontDistribute super."open-browser";
+  "open-haddock" = dontDistribute super."open-haddock";
+  "open-pandoc" = dontDistribute super."open-pandoc";
+  "open-symbology" = dontDistribute super."open-symbology";
+  "open-typerep" = dontDistribute super."open-typerep";
+  "open-union" = dontDistribute super."open-union";
+  "open-witness" = dontDistribute super."open-witness";
+  "opencog-atomspace" = dontDistribute super."opencog-atomspace";
+  "opencv-raw" = dontDistribute super."opencv-raw";
+  "opendatatable" = dontDistribute super."opendatatable";
+  "openexchangerates" = dontDistribute super."openexchangerates";
+  "openflow" = dontDistribute super."openflow";
+  "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
+  "opengles" = dontDistribute super."opengles";
+  "openid" = dontDistribute super."openid";
+  "openpgp" = dontDistribute super."openpgp";
+  "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
+  "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
+  "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "openssh-github-keys" = dontDistribute super."openssh-github-keys";
+  "openssl-createkey" = dontDistribute super."openssl-createkey";
+  "opentheory" = dontDistribute super."opentheory";
+  "opentheory-bits" = dontDistribute super."opentheory-bits";
+  "opentheory-byte" = dontDistribute super."opentheory-byte";
+  "opentheory-char" = dontDistribute super."opentheory-char";
+  "opentheory-divides" = dontDistribute super."opentheory-divides";
+  "opentheory-fibonacci" = dontDistribute super."opentheory-fibonacci";
+  "opentheory-parser" = dontDistribute super."opentheory-parser";
+  "opentheory-prime" = dontDistribute super."opentheory-prime";
+  "opentheory-primitive" = dontDistribute super."opentheory-primitive";
+  "opentheory-probability" = dontDistribute super."opentheory-probability";
+  "opentheory-stream" = dontDistribute super."opentheory-stream";
+  "opentheory-unicode" = dontDistribute super."opentheory-unicode";
+  "operational-alacarte" = dontDistribute super."operational-alacarte";
+  "opml" = dontDistribute super."opml";
+  "opml-conduit" = dontDistribute super."opml-conduit";
+  "opn" = dontDistribute super."opn";
+  "optimal-blocks" = dontDistribute super."optimal-blocks";
+  "optimization" = dontDistribute super."optimization";
+  "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
+  "optional" = dontDistribute super."optional";
+  "options-time" = dontDistribute super."options-time";
+  "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
+  "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "orc" = dontDistribute super."orc";
+  "orchestrate" = dontDistribute super."orchestrate";
+  "orchid" = dontDistribute super."orchid";
+  "orchid-demo" = dontDistribute super."orchid-demo";
+  "ord-adhoc" = dontDistribute super."ord-adhoc";
+  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistics" = dontDistribute super."order-statistics";
+  "ordered" = dontDistribute super."ordered";
+  "orders" = dontDistribute super."orders";
+  "ordrea" = dontDistribute super."ordrea";
+  "organize-imports" = dontDistribute super."organize-imports";
+  "orgmode" = dontDistribute super."orgmode";
+  "orgmode-parse" = dontDistribute super."orgmode-parse";
+  "origami" = dontDistribute super."origami";
+  "os-release" = dontDistribute super."os-release";
+  "osc" = dontDistribute super."osc";
+  "osm-download" = dontDistribute super."osm-download";
+  "oso2pdf" = dontDistribute super."oso2pdf";
+  "osx-ar" = dontDistribute super."osx-ar";
+  "ot" = dontDistribute super."ot";
+  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overture" = dontDistribute super."overture";
+  "pack" = dontDistribute super."pack";
+  "package-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";
+  "packed-dawg" = dontDistribute super."packed-dawg";
+  "packedstring" = dontDistribute super."packedstring";
+  "packer" = dontDistribute super."packer";
+  "packman" = dontDistribute super."packman";
+  "packunused" = dontDistribute super."packunused";
+  "pacman-memcache" = dontDistribute super."pacman-memcache";
+  "padKONTROL" = dontDistribute super."padKONTROL";
+  "pagarme" = dontDistribute super."pagarme";
+  "pagerduty" = doDistribute super."pagerduty_0_0_3_3";
+  "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palindromes" = dontDistribute super."palindromes";
+  "pam" = dontDistribute super."pam";
+  "panda" = dontDistribute super."panda";
+  "pandoc-citeproc" = doDistribute super."pandoc-citeproc_0_7_4";
+  "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble";
+  "pandoc-crossref" = dontDistribute super."pandoc-crossref";
+  "pandoc-csv2table" = dontDistribute super."pandoc-csv2table";
+  "pandoc-include" = dontDistribute super."pandoc-include";
+  "pandoc-lens" = dontDistribute super."pandoc-lens";
+  "pandoc-placetable" = dontDistribute super."pandoc-placetable";
+  "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams";
+  "pandoc-unlit" = dontDistribute super."pandoc-unlit";
+  "papillon" = dontDistribute super."papillon";
+  "pappy" = dontDistribute super."pappy";
+  "para" = dontDistribute super."para";
+  "paragon" = dontDistribute super."paragon";
+  "parallel-tasks" = dontDistribute super."parallel-tasks";
+  "parallel-tree-search" = dontDistribute super."parallel-tree-search";
+  "parameterized-data" = dontDistribute super."parameterized-data";
+  "parco" = dontDistribute super."parco";
+  "parco-attoparsec" = dontDistribute super."parco-attoparsec";
+  "parco-parsec" = dontDistribute super."parco-parsec";
+  "parcom-lib" = dontDistribute super."parcom-lib";
+  "parconc-examples" = dontDistribute super."parconc-examples";
+  "parport" = dontDistribute super."parport";
+  "parse-dimacs" = dontDistribute super."parse-dimacs";
+  "parse-help" = dontDistribute super."parse-help";
+  "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";
+  "parsec-permutation" = dontDistribute super."parsec-permutation";
+  "parsec-tagsoup" = dontDistribute super."parsec-tagsoup";
+  "parsec-trace" = dontDistribute super."parsec-trace";
+  "parsec-utils" = dontDistribute super."parsec-utils";
+  "parsec1" = dontDistribute super."parsec1";
+  "parsec2" = dontDistribute super."parsec2";
+  "parsec3" = dontDistribute super."parsec3";
+  "parsec3-numbers" = dontDistribute super."parsec3-numbers";
+  "parsedate" = dontDistribute super."parsedate";
+  "parseerror-eq" = dontDistribute super."parseerror-eq";
+  "parsek" = dontDistribute super."parsek";
+  "parsely" = dontDistribute super."parsely";
+  "parser-helper" = dontDistribute super."parser-helper";
+  "parser241" = dontDistribute super."parser241";
+  "parsergen" = dontDistribute super."parsergen";
+  "parsestar" = dontDistribute super."parsestar";
+  "parsimony" = dontDistribute super."parsimony";
+  "partial" = dontDistribute super."partial";
+  "partial-isomorphisms" = dontDistribute super."partial-isomorphisms";
+  "partial-lens" = dontDistribute super."partial-lens";
+  "partial-uri" = dontDistribute super."partial-uri";
+  "partly" = dontDistribute super."partly";
+  "passage" = dontDistribute super."passage";
+  "passwords" = dontDistribute super."passwords";
+  "pastis" = dontDistribute super."pastis";
+  "pasty" = dontDistribute super."pasty";
+  "patch-combinators" = dontDistribute super."patch-combinators";
+  "patch-image" = dontDistribute super."patch-image";
+  "patches-vector" = dontDistribute super."patches-vector";
+  "path-extra" = dontDistribute super."path-extra";
+  "pathfinding" = dontDistribute super."pathfinding";
+  "pathfindingcore" = dontDistribute super."pathfindingcore";
+  "pathtype" = dontDistribute super."pathtype";
+  "pathwalk" = dontDistribute super."pathwalk";
+  "patronscraper" = dontDistribute super."patronscraper";
+  "patterns" = dontDistribute super."patterns";
+  "paymill" = dontDistribute super."paymill";
+  "paypal-adaptive-hoops" = dontDistribute super."paypal-adaptive-hoops";
+  "paypal-api" = dontDistribute super."paypal-api";
+  "pb" = dontDistribute super."pb";
+  "pbc4hs" = dontDistribute super."pbc4hs";
+  "pbkdf" = dontDistribute super."pbkdf";
+  "pcap" = dontDistribute super."pcap";
+  "pcap-conduit" = dontDistribute super."pcap-conduit";
+  "pcap-enumerator" = dontDistribute super."pcap-enumerator";
+  "pcd-loader" = dontDistribute super."pcd-loader";
+  "pcf" = dontDistribute super."pcf";
+  "pcg-random" = dontDistribute super."pcg-random";
+  "pcre-heavy" = doDistribute super."pcre-heavy_0_2_5";
+  "pcre-less" = dontDistribute super."pcre-less";
+  "pcre-light-extra" = dontDistribute super."pcre-light-extra";
+  "pcre-utils" = dontDistribute super."pcre-utils";
+  "pdf-toolbox-content" = dontDistribute super."pdf-toolbox-content";
+  "pdf-toolbox-core" = dontDistribute super."pdf-toolbox-core";
+  "pdf-toolbox-document" = dontDistribute super."pdf-toolbox-document";
+  "pdf-toolbox-viewer" = dontDistribute super."pdf-toolbox-viewer";
+  "pdf2line" = dontDistribute super."pdf2line";
+  "pdfsplit" = dontDistribute super."pdfsplit";
+  "pdynload" = dontDistribute super."pdynload";
+  "peakachu" = dontDistribute super."peakachu";
+  "peano" = dontDistribute super."peano";
+  "peano-inf" = dontDistribute super."peano-inf";
+  "pec" = dontDistribute super."pec";
+  "pecoff" = dontDistribute super."pecoff";
+  "peg" = dontDistribute super."peg";
+  "peggy" = dontDistribute super."peggy";
+  "pell" = dontDistribute super."pell";
+  "penn-treebank" = dontDistribute super."penn-treebank";
+  "penny" = dontDistribute super."penny";
+  "penny-bin" = dontDistribute super."penny-bin";
+  "penny-lib" = dontDistribute super."penny-lib";
+  "peparser" = dontDistribute super."peparser";
+  "perceptron" = dontDistribute super."perceptron";
+  "perdure" = dontDistribute super."perdure";
+  "period" = dontDistribute super."period";
+  "perm" = dontDistribute super."perm";
+  "permutation" = dontDistribute super."permutation";
+  "permute" = dontDistribute super."permute";
+  "persist2er" = dontDistribute super."persist2er";
+  "persistable-record" = dontDistribute super."persistable-record";
+  "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
+  "persistent-cereal" = dontDistribute super."persistent-cereal";
+  "persistent-equivalence" = dontDistribute super."persistent-equivalence";
+  "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
+  "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
+  "persistent-map" = dontDistribute super."persistent-map";
+  "persistent-mysql" = doDistribute super."persistent-mysql_2_2";
+  "persistent-odbc" = dontDistribute super."persistent-odbc";
+  "persistent-protobuf" = dontDistribute super."persistent-protobuf";
+  "persistent-ratelimit" = dontDistribute super."persistent-ratelimit";
+  "persistent-redis" = dontDistribute super."persistent-redis";
+  "persistent-vector" = dontDistribute super."persistent-vector";
+  "persistent-zookeeper" = dontDistribute super."persistent-zookeeper";
+  "persona" = dontDistribute super."persona";
+  "persona-idp" = dontDistribute super."persona-idp";
+  "pesca" = dontDistribute super."pesca";
+  "peyotls" = dontDistribute super."peyotls";
+  "peyotls-codec" = dontDistribute super."peyotls-codec";
+  "pez" = dontDistribute super."pez";
+  "pg-harness" = dontDistribute super."pg-harness";
+  "pg-harness-client" = dontDistribute super."pg-harness-client";
+  "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pgdl" = dontDistribute super."pgdl";
+  "pgm" = dontDistribute super."pgm";
+  "pgp-wordlist" = dontDistribute super."pgp-wordlist";
+  "pgsql-simple" = dontDistribute super."pgsql-simple";
+  "pgstream" = dontDistribute super."pgstream";
+  "phasechange" = dontDistribute super."phasechange";
+  "phizzle" = dontDistribute super."phizzle";
+  "phoityne" = dontDistribute super."phoityne";
+  "phone-numbers" = dontDistribute super."phone-numbers";
+  "phone-push" = dontDistribute super."phone-push";
+  "phonetic-code" = dontDistribute super."phonetic-code";
+  "phooey" = dontDistribute super."phooey";
+  "photoname" = dontDistribute super."photoname";
+  "phraskell" = dontDistribute super."phraskell";
+  "phybin" = dontDistribute super."phybin";
+  "pi-calculus" = dontDistribute super."pi-calculus";
+  "pia-forward" = dontDistribute super."pia-forward";
+  "pianola" = dontDistribute super."pianola";
+  "picologic" = dontDistribute super."picologic";
+  "picosat" = dontDistribute super."picosat";
+  "piet" = dontDistribute super."piet";
+  "piki" = dontDistribute super."piki";
+  "pinboard" = dontDistribute super."pinboard";
+  "pinch" = dontDistribute super."pinch";
+  "pinchot" = dontDistribute super."pinchot";
+  "pipe-enumerator" = dontDistribute super."pipe-enumerator";
+  "pipeclip" = dontDistribute super."pipeclip";
+  "pipes-async" = dontDistribute super."pipes-async";
+  "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
+  "pipes-cacophony" = dontDistribute super."pipes-cacophony";
+  "pipes-cellular" = dontDistribute super."pipes-cellular";
+  "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
+  "pipes-cereal" = dontDistribute super."pipes-cereal";
+  "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus";
+  "pipes-conduit" = dontDistribute super."pipes-conduit";
+  "pipes-core" = dontDistribute super."pipes-core";
+  "pipes-courier" = dontDistribute super."pipes-courier";
+  "pipes-csv" = dontDistribute super."pipes-csv";
+  "pipes-errors" = dontDistribute super."pipes-errors";
+  "pipes-extra" = dontDistribute super."pipes-extra";
+  "pipes-extras" = dontDistribute super."pipes-extras";
+  "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-mongodb" = dontDistribute super."pipes-mongodb";
+  "pipes-network-tls" = dontDistribute super."pipes-network-tls";
+  "pipes-p2p" = dontDistribute super."pipes-p2p";
+  "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
+  "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple";
+  "pipes-rt" = dontDistribute super."pipes-rt";
+  "pipes-shell" = dontDistribute super."pipes-shell";
+  "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
+  "pipes-transduce" = dontDistribute super."pipes-transduce";
+  "pipes-vector" = dontDistribute super."pipes-vector";
+  "pipes-wai" = doDistribute super."pipes-wai_3_0_2";
+  "pipes-websockets" = dontDistribute super."pipes-websockets";
+  "pipes-zeromq4" = dontDistribute super."pipes-zeromq4";
+  "pipes-zlib" = dontDistribute super."pipes-zlib";
+  "pisigma" = dontDistribute super."pisigma";
+  "pit" = dontDistribute super."pit";
+  "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
+  "pkcs1" = dontDistribute super."pkcs1";
+  "pkcs10" = dontDistribute super."pkcs10";
+  "pkcs7" = dontDistribute super."pkcs7";
+  "pkggraph" = dontDistribute super."pkggraph";
+  "pktree" = dontDistribute super."pktree";
+  "plailude" = dontDistribute super."plailude";
+  "planar-graph" = dontDistribute super."planar-graph";
+  "plat" = dontDistribute super."plat";
+  "playlists" = dontDistribute super."playlists";
+  "plist" = dontDistribute super."plist";
+  "plist-buddy" = dontDistribute super."plist-buddy";
+  "plivo" = dontDistribute super."plivo";
+  "plot" = doDistribute super."plot_0_2_3_4";
+  "plot-gtk" = doDistribute super."plot-gtk_0_2_0_2";
+  "plot-gtk-ui" = dontDistribute super."plot-gtk-ui";
+  "plot-gtk3" = doDistribute super."plot-gtk3_0_1_0_1";
+  "plot-lab" = dontDistribute super."plot-lab";
+  "plotfont" = dontDistribute super."plotfont";
+  "plotserver-api" = dontDistribute super."plotserver-api";
+  "plugins" = dontDistribute super."plugins";
+  "plugins-auto" = dontDistribute super."plugins-auto";
+  "plugins-multistage" = dontDistribute super."plugins-multistage";
+  "plumbers" = dontDistribute super."plumbers";
+  "ply-loader" = dontDistribute super."ply-loader";
+  "png-file" = dontDistribute super."png-file";
+  "pngload" = dontDistribute super."pngload";
+  "pngload-fixed" = dontDistribute super."pngload-fixed";
+  "pnm" = dontDistribute super."pnm";
+  "pocket-dns" = dontDistribute super."pocket-dns";
+  "pointedlist" = dontDistribute super."pointedlist";
+  "pointfree" = dontDistribute super."pointfree";
+  "pointful" = dontDistribute super."pointful";
+  "pointless-fun" = dontDistribute super."pointless-fun";
+  "pointless-haskell" = dontDistribute super."pointless-haskell";
+  "pointless-lenses" = dontDistribute super."pointless-lenses";
+  "pointless-rewrite" = dontDistribute super."pointless-rewrite";
+  "poker-eval" = dontDistribute super."poker-eval";
+  "pokitdok" = dontDistribute super."pokitdok";
+  "polar" = dontDistribute super."polar";
+  "polar-configfile" = dontDistribute super."polar-configfile";
+  "polar-shader" = dontDistribute super."polar-shader";
+  "polh-lexicon" = dontDistribute super."polh-lexicon";
+  "polimorf" = dontDistribute super."polimorf";
+  "poll" = dontDistribute super."poll";
+  "polyToMonoid" = dontDistribute super."polyToMonoid";
+  "polymap" = dontDistribute super."polymap";
+  "polynomial" = dontDistribute super."polynomial";
+  "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
+  "polyseq" = dontDistribute super."polyseq";
+  "polysoup" = dontDistribute super."polysoup";
+  "polytypeable" = dontDistribute super."polytypeable";
+  "polytypeable-utils" = dontDistribute super."polytypeable-utils";
+  "ponder" = dontDistribute super."ponder";
+  "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
+  "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
+  "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
+  "pony" = dontDistribute super."pony";
+  "pool" = dontDistribute super."pool";
+  "pool-conduit" = dontDistribute super."pool-conduit";
+  "pooled-io" = dontDistribute super."pooled-io";
+  "pop3-client" = dontDistribute super."pop3-client";
+  "popenhs" = dontDistribute super."popenhs";
+  "poppler" = dontDistribute super."poppler";
+  "populate-setup-exe-cache" = dontDistribute super."populate-setup-exe-cache";
+  "portable-lines" = dontDistribute super."portable-lines";
+  "portaudio" = dontDistribute super."portaudio";
+  "porte" = dontDistribute super."porte";
+  "porter" = dontDistribute super."porter";
+  "ports" = dontDistribute super."ports";
+  "ports-tools" = dontDistribute super."ports-tools";
+  "positive" = dontDistribute super."positive";
+  "posix-acl" = dontDistribute super."posix-acl";
+  "posix-escape" = dontDistribute super."posix-escape";
+  "posix-filelock" = dontDistribute super."posix-filelock";
+  "posix-paths" = dontDistribute super."posix-paths";
+  "posix-pty" = dontDistribute super."posix-pty";
+  "posix-timer" = dontDistribute super."posix-timer";
+  "posix-waitpid" = dontDistribute super."posix-waitpid";
+  "possible" = dontDistribute super."possible";
+  "post-mess-age" = doDistribute super."post-mess-age_0_1_0_0";
+  "postcodes" = dontDistribute super."postcodes";
+  "postgresql-binary" = doDistribute super."postgresql-binary_0_5_2_1";
+  "postgresql-config" = dontDistribute super."postgresql-config";
+  "postgresql-connector" = dontDistribute super."postgresql-connector";
+  "postgresql-copy-escape" = dontDistribute super."postgresql-copy-escape";
+  "postgresql-cube" = dontDistribute super."postgresql-cube";
+  "postgresql-error-codes" = dontDistribute super."postgresql-error-codes";
+  "postgresql-orm" = dontDistribute super."postgresql-orm";
+  "postgresql-query" = dontDistribute super."postgresql-query";
+  "postgresql-schema" = dontDistribute super."postgresql-schema";
+  "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0";
+  "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
+  "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
+  "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-typed" = dontDistribute super."postgresql-typed";
+  "postgrest" = dontDistribute super."postgrest";
+  "postie" = dontDistribute super."postie";
+  "postmark" = dontDistribute super."postmark";
+  "postmaster" = dontDistribute super."postmaster";
+  "potato-tool" = dontDistribute super."potato-tool";
+  "potrace" = dontDistribute super."potrace";
+  "potrace-diagrams" = dontDistribute super."potrace-diagrams";
+  "powermate" = dontDistribute super."powermate";
+  "powerpc" = dontDistribute super."powerpc";
+  "ppm" = dontDistribute super."ppm";
+  "pqc" = dontDistribute super."pqc";
+  "pqueue-mtl" = dontDistribute super."pqueue-mtl";
+  "practice-room" = dontDistribute super."practice-room";
+  "precis" = dontDistribute super."precis";
+  "pred-trie" = doDistribute super."pred-trie_0_2_0";
+  "predicates" = dontDistribute super."predicates";
+  "prednote-test" = dontDistribute super."prednote-test";
+  "prefix-units" = doDistribute super."prefix-units_0_1_0_2";
+  "prefork" = dontDistribute super."prefork";
+  "pregame" = dontDistribute super."pregame";
+  "prelude-edsl" = dontDistribute super."prelude-edsl";
+  "prelude-generalize" = dontDistribute super."prelude-generalize";
+  "prelude-plus" = dontDistribute super."prelude-plus";
+  "prelude-prime" = dontDistribute super."prelude-prime";
+  "prelude-safeenum" = dontDistribute super."prelude-safeenum";
+  "preprocess-haskell" = dontDistribute super."preprocess-haskell";
+  "preprocessor-tools" = dontDistribute super."preprocessor-tools";
+  "present" = dontDistribute super."present";
+  "press" = dontDistribute super."press";
+  "presto-hdbc" = dontDistribute super."presto-hdbc";
+  "prettify" = dontDistribute super."prettify";
+  "pretty-compact" = dontDistribute super."pretty-compact";
+  "pretty-error" = dontDistribute super."pretty-error";
+  "pretty-hex" = dontDistribute super."pretty-hex";
+  "pretty-ncols" = dontDistribute super."pretty-ncols";
+  "pretty-sop" = dontDistribute super."pretty-sop";
+  "pretty-tree" = dontDistribute super."pretty-tree";
+  "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-uniq" = dontDistribute super."prim-uniq";
+  "primula-board" = dontDistribute super."primula-board";
+  "primula-bot" = dontDistribute super."primula-bot";
+  "printf-mauke" = dontDistribute super."printf-mauke";
+  "printxosd" = dontDistribute super."printxosd";
+  "priority-queue" = dontDistribute super."priority-queue";
+  "priority-sync" = dontDistribute super."priority-sync";
+  "privileged-concurrency" = dontDistribute super."privileged-concurrency";
+  "prizm" = dontDistribute super."prizm";
+  "probability" = dontDistribute super."probability";
+  "probable" = dontDistribute super."probable";
+  "proc" = dontDistribute super."proc";
+  "process-conduit" = dontDistribute super."process-conduit";
+  "process-iterio" = dontDistribute super."process-iterio";
+  "process-leksah" = dontDistribute super."process-leksah";
+  "process-listlike" = dontDistribute super."process-listlike";
+  "process-progress" = dontDistribute super."process-progress";
+  "process-qq" = dontDistribute super."process-qq";
+  "process-streaming" = dontDistribute super."process-streaming";
+  "processing" = dontDistribute super."processing";
+  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
+  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
+  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
+  "procstat" = dontDistribute super."procstat";
+  "proctest" = dontDistribute super."proctest";
+  "prof2dot" = dontDistribute super."prof2dot";
+  "prof2pretty" = dontDistribute super."prof2pretty";
+  "profiteur" = dontDistribute super."profiteur";
+  "progress" = dontDistribute super."progress";
+  "progressbar" = dontDistribute super."progressbar";
+  "progression" = dontDistribute super."progression";
+  "progressive" = dontDistribute super."progressive";
+  "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings";
+  "projection" = dontDistribute super."projection";
+  "projectroot" = dontDistribute super."projectroot";
+  "prolog" = dontDistribute super."prolog";
+  "prolog-graph" = dontDistribute super."prolog-graph";
+  "prolog-graph-lib" = dontDistribute super."prolog-graph-lib";
+  "prologue" = dontDistribute super."prologue";
+  "promise" = dontDistribute super."promise";
+  "promises" = dontDistribute super."promises";
+  "prompt" = dontDistribute super."prompt";
+  "propane" = dontDistribute super."propane";
+  "propellor" = dontDistribute super."propellor";
+  "properties" = dontDistribute super."properties";
+  "property-list" = dontDistribute super."property-list";
+  "proplang" = dontDistribute super."proplang";
+  "props" = dontDistribute super."props";
+  "prosper" = dontDistribute super."prosper";
+  "proteaaudio" = dontDistribute super."proteaaudio";
+  "protobuf" = dontDistribute super."protobuf";
+  "protobuf-native" = dontDistribute super."protobuf-native";
+  "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork";
+  "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork";
+  "proton-haskell" = dontDistribute super."proton-haskell";
+  "prototype" = dontDistribute super."prototype";
+  "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxy-kindness" = dontDistribute super."proxy-kindness";
+  "psc-ide" = dontDistribute super."psc-ide";
+  "pseudo-boolean" = dontDistribute super."pseudo-boolean";
+  "pseudo-trie" = dontDistribute super."pseudo-trie";
+  "pseudomacros" = dontDistribute super."pseudomacros";
+  "pub" = dontDistribute super."pub";
+  "publicsuffix" = dontDistribute super."publicsuffix";
+  "publicsuffixlist" = dontDistribute super."publicsuffixlist";
+  "publicsuffixlistcreate" = dontDistribute super."publicsuffixlistcreate";
+  "pubnub" = dontDistribute super."pubnub";
+  "pubsub" = dontDistribute super."pubsub";
+  "puffytools" = dontDistribute super."puffytools";
+  "pugixml" = dontDistribute super."pugixml";
+  "pugs-DrIFT" = dontDistribute super."pugs-DrIFT";
+  "pugs-HsSyck" = dontDistribute super."pugs-HsSyck";
+  "pugs-compat" = dontDistribute super."pugs-compat";
+  "pugs-hsregex" = dontDistribute super."pugs-hsregex";
+  "pulse-simple" = dontDistribute super."pulse-simple";
+  "punkt" = dontDistribute super."punkt";
+  "punycode" = dontDistribute super."punycode";
+  "puppetresources" = dontDistribute super."puppetresources";
+  "pure-cdb" = dontDistribute super."pure-cdb";
+  "pure-fft" = dontDistribute super."pure-fft";
+  "pure-priority-queue" = dontDistribute super."pure-priority-queue";
+  "pure-priority-queue-tests" = dontDistribute super."pure-priority-queue-tests";
+  "pure-zlib" = dontDistribute super."pure-zlib";
+  "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "push-notify" = dontDistribute super."push-notify";
+  "push-notify-ccs" = dontDistribute super."push-notify-ccs";
+  "push-notify-general" = dontDistribute super."push-notify-general";
+  "pusher-haskell" = dontDistribute super."pusher-haskell";
+  "pusher-http-haskell" = dontDistribute super."pusher-http-haskell";
+  "pushme" = dontDistribute super."pushme";
+  "putlenses" = dontDistribute super."putlenses";
+  "puzzle-draw" = dontDistribute super."puzzle-draw";
+  "puzzle-draw-cmdline" = dontDistribute super."puzzle-draw-cmdline";
+  "pvd" = dontDistribute super."pvd";
+  "pwstore-cli" = dontDistribute super."pwstore-cli";
+  "pwstore-purehaskell" = dontDistribute super."pwstore-purehaskell";
+  "pxsl-tools" = dontDistribute super."pxsl-tools";
+  "pyffi" = dontDistribute super."pyffi";
+  "pyfi" = dontDistribute super."pyfi";
+  "python-pickle" = dontDistribute super."python-pickle";
+  "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator";
+  "qd" = dontDistribute super."qd";
+  "qd-vec" = dontDistribute super."qd-vec";
+  "qed" = dontDistribute super."qed";
+  "qhull-simple" = dontDistribute super."qhull-simple";
+  "qrcode" = dontDistribute super."qrcode";
+  "qt" = dontDistribute super."qt";
+  "quadratic-irrational" = dontDistribute super."quadratic-irrational";
+  "quantfin" = dontDistribute super."quantfin";
+  "quantities" = dontDistribute super."quantities";
+  "quantum-arrow" = dontDistribute super."quantum-arrow";
+  "qudb" = dontDistribute super."qudb";
+  "quenya-verb" = dontDistribute super."quenya-verb";
+  "querystring-pickle" = dontDistribute super."querystring-pickle";
+  "questioner" = dontDistribute super."questioner";
+  "queue" = dontDistribute super."queue";
+  "queuelike" = dontDistribute super."queuelike";
+  "quick-generator" = dontDistribute super."quick-generator";
+  "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-poly" = dontDistribute super."quickcheck-poly";
+  "quickcheck-properties" = dontDistribute super."quickcheck-properties";
+  "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
+  "quickcheck-property-monad" = dontDistribute super."quickcheck-property-monad";
+  "quickcheck-regex" = dontDistribute super."quickcheck-regex";
+  "quickcheck-relaxng" = dontDistribute super."quickcheck-relaxng";
+  "quickcheck-rematch" = dontDistribute super."quickcheck-rematch";
+  "quickcheck-script" = dontDistribute super."quickcheck-script";
+  "quickcheck-simple" = dontDistribute super."quickcheck-simple";
+  "quickcheck-text" = dontDistribute super."quickcheck-text";
+  "quickcheck-webdriver" = dontDistribute super."quickcheck-webdriver";
+  "quicklz" = dontDistribute super."quicklz";
+  "quickpull" = dontDistribute super."quickpull";
+  "quickset" = dontDistribute super."quickset";
+  "quickspec" = dontDistribute super."quickspec";
+  "quicktest" = dontDistribute super."quicktest";
+  "quickwebapp" = dontDistribute super."quickwebapp";
+  "quiver" = dontDistribute super."quiver";
+  "quiver-bytestring" = dontDistribute super."quiver-bytestring";
+  "quiver-cell" = dontDistribute super."quiver-cell";
+  "quiver-csv" = dontDistribute super."quiver-csv";
+  "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-http" = dontDistribute super."quiver-http";
+  "quoridor-hs" = dontDistribute super."quoridor-hs";
+  "qux" = dontDistribute super."qux";
+  "rabocsv2qif" = dontDistribute super."rabocsv2qif";
+  "rad" = dontDistribute super."rad";
+  "radian" = dontDistribute super."radian";
+  "radium" = dontDistribute super."radium";
+  "radium-formula-parser" = dontDistribute super."radium-formula-parser";
+  "radix" = dontDistribute super."radix";
+  "rados-haskell" = dontDistribute super."rados-haskell";
+  "rail-compiler-editor" = dontDistribute super."rail-compiler-editor";
+  "rainbow-tests" = dontDistribute super."rainbow-tests";
+  "rake" = dontDistribute super."rake";
+  "rakhana" = dontDistribute super."rakhana";
+  "ralist" = dontDistribute super."ralist";
+  "rallod" = dontDistribute super."rallod";
+  "raml" = dontDistribute super."raml";
+  "rand-vars" = dontDistribute super."rand-vars";
+  "randfile" = dontDistribute super."randfile";
+  "random-access-list" = dontDistribute super."random-access-list";
+  "random-derive" = dontDistribute super."random-derive";
+  "random-eff" = dontDistribute super."random-eff";
+  "random-effin" = dontDistribute super."random-effin";
+  "random-extras" = dontDistribute super."random-extras";
+  "random-hypergeometric" = dontDistribute super."random-hypergeometric";
+  "random-stream" = dontDistribute super."random-stream";
+  "random-variates" = dontDistribute super."random-variates";
+  "randomgen" = dontDistribute super."randomgen";
+  "randproc" = dontDistribute super."randproc";
+  "randsolid" = dontDistribute super."randsolid";
+  "range-set-list" = dontDistribute super."range-set-list";
+  "range-space" = dontDistribute super."range-space";
+  "rangemin" = dontDistribute super."rangemin";
+  "ranges" = dontDistribute super."ranges";
+  "rank1dynamic" = dontDistribute super."rank1dynamic";
+  "rascal" = dontDistribute super."rascal";
+  "rate-limit" = dontDistribute super."rate-limit";
+  "ratio-int" = dontDistribute super."ratio-int";
+  "raven-haskell" = dontDistribute super."raven-haskell";
+  "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
+  "raw-strings-qq" = doDistribute super."raw-strings-qq_1_0_2";
+  "rawstring-qm" = dontDistribute super."rawstring-qm";
+  "razom-text-util" = dontDistribute super."razom-text-util";
+  "rbr" = dontDistribute super."rbr";
+  "rclient" = dontDistribute super."rclient";
+  "rcu" = dontDistribute super."rcu";
+  "rdf4h" = dontDistribute super."rdf4h";
+  "rdioh" = dontDistribute super."rdioh";
+  "rdtsc" = dontDistribute super."rdtsc";
+  "rdtsc-enolan" = dontDistribute super."rdtsc-enolan";
+  "re2" = dontDistribute super."re2";
+  "react-flux" = dontDistribute super."react-flux";
+  "react-haskell" = dontDistribute super."react-haskell";
+  "reaction-logic" = dontDistribute super."reaction-logic";
+  "reactive" = dontDistribute super."reactive";
+  "reactive-bacon" = dontDistribute super."reactive-bacon";
+  "reactive-balsa" = dontDistribute super."reactive-balsa";
+  "reactive-banana" = dontDistribute super."reactive-banana";
+  "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
+  "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
+  "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
+  "reactive-glut" = dontDistribute super."reactive-glut";
+  "reactive-haskell" = dontDistribute super."reactive-haskell";
+  "reactive-io" = dontDistribute super."reactive-io";
+  "reactive-thread" = dontDistribute super."reactive-thread";
+  "reactor" = dontDistribute super."reactor";
+  "read-bounded" = dontDistribute super."read-bounded";
+  "read-editor" = dontDistribute super."read-editor";
+  "readable" = dontDistribute super."readable";
+  "readline" = dontDistribute super."readline";
+  "readline-statevar" = dontDistribute super."readline-statevar";
+  "readpyc" = dontDistribute super."readpyc";
+  "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
+  "reasonable-lens" = dontDistribute super."reasonable-lens";
+  "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "recaptcha" = dontDistribute super."recaptcha";
+  "record" = dontDistribute super."record";
+  "record-aeson" = dontDistribute super."record-aeson";
+  "record-gl" = dontDistribute super."record-gl";
+  "record-preprocessor" = dontDistribute super."record-preprocessor";
+  "record-syntax" = dontDistribute super."record-syntax";
+  "records" = dontDistribute super."records";
+  "records-th" = dontDistribute super."records-th";
+  "recursion-schemes" = dontDistribute super."recursion-schemes";
+  "recursive-line-count" = dontDistribute super."recursive-line-count";
+  "redHandlers" = dontDistribute super."redHandlers";
+  "reddit" = dontDistribute super."reddit";
+  "redis" = dontDistribute super."redis";
+  "redis-hs" = dontDistribute super."redis-hs";
+  "redis-job-queue" = dontDistribute super."redis-job-queue";
+  "redis-simple" = dontDistribute super."redis-simple";
+  "redo" = dontDistribute super."redo";
+  "reducers" = doDistribute super."reducers_3_10_3_2";
+  "reedsolomon" = dontDistribute super."reedsolomon";
+  "reenact" = dontDistribute super."reenact";
+  "reexport-crypto-random" = dontDistribute super."reexport-crypto-random";
+  "ref" = dontDistribute super."ref";
+  "ref-mtl" = dontDistribute super."ref-mtl";
+  "ref-tf" = dontDistribute super."ref-tf";
+  "refcount" = dontDistribute super."refcount";
+  "reference" = dontDistribute super."reference";
+  "references" = dontDistribute super."references";
+  "refh" = dontDistribute super."refh";
+  "refined" = dontDistribute super."refined";
+  "reflection" = doDistribute super."reflection_2";
+  "reflection-extras" = dontDistribute super."reflection-extras";
+  "reflection-without-remorse" = dontDistribute super."reflection-without-remorse";
+  "reflex" = dontDistribute super."reflex";
+  "reflex-animation" = dontDistribute super."reflex-animation";
+  "reflex-dom" = dontDistribute super."reflex-dom";
+  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
+  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
+  "reform" = dontDistribute super."reform";
+  "reform-blaze" = dontDistribute super."reform-blaze";
+  "reform-hamlet" = dontDistribute super."reform-hamlet";
+  "reform-happstack" = dontDistribute super."reform-happstack";
+  "reform-hsp" = dontDistribute super."reform-hsp";
+  "regex-applicative-text" = dontDistribute super."regex-applicative-text";
+  "regex-compat-tdfa" = dontDistribute super."regex-compat-tdfa";
+  "regex-deriv" = dontDistribute super."regex-deriv";
+  "regex-dfa" = dontDistribute super."regex-dfa";
+  "regex-easy" = dontDistribute super."regex-easy";
+  "regex-genex" = dontDistribute super."regex-genex";
+  "regex-parsec" = dontDistribute super."regex-parsec";
+  "regex-pderiv" = dontDistribute super."regex-pderiv";
+  "regex-posix-unittest" = dontDistribute super."regex-posix-unittest";
+  "regex-tdfa-pipes" = dontDistribute super."regex-tdfa-pipes";
+  "regex-tdfa-quasiquoter" = dontDistribute super."regex-tdfa-quasiquoter";
+  "regex-tdfa-text" = dontDistribute super."regex-tdfa-text";
+  "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
+  "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
+  "regex-tre" = dontDistribute super."regex-tre";
+  "regex-xmlschema" = dontDistribute super."regex-xmlschema";
+  "regexchar" = dontDistribute super."regexchar";
+  "regexdot" = dontDistribute super."regexdot";
+  "regexp-tries" = dontDistribute super."regexp-tries";
+  "regexpr" = dontDistribute super."regexpr";
+  "regexpr-symbolic" = dontDistribute super."regexpr-symbolic";
+  "regexqq" = dontDistribute super."regexqq";
+  "regional-pointers" = dontDistribute super."regional-pointers";
+  "regions" = dontDistribute super."regions";
+  "regions-monadsfd" = dontDistribute super."regions-monadsfd";
+  "regions-monadstf" = dontDistribute super."regions-monadstf";
+  "regions-mtl" = dontDistribute super."regions-mtl";
+  "regress" = dontDistribute super."regress";
+  "regular" = dontDistribute super."regular";
+  "regular-extras" = dontDistribute super."regular-extras";
+  "regular-web" = dontDistribute super."regular-web";
+  "regular-xmlpickler" = dontDistribute super."regular-xmlpickler";
+  "reheat" = dontDistribute super."reheat";
+  "rehoo" = dontDistribute super."rehoo";
+  "rei" = dontDistribute super."rei";
+  "reified-records" = dontDistribute super."reified-records";
+  "reify" = dontDistribute super."reify";
+  "reinterpret-cast" = dontDistribute super."reinterpret-cast";
+  "relacion" = dontDistribute super."relacion";
+  "relation" = dontDistribute super."relation";
+  "relational-postgresql8" = dontDistribute super."relational-postgresql8";
+  "relational-query" = dontDistribute super."relational-query";
+  "relational-query-HDBC" = dontDistribute super."relational-query-HDBC";
+  "relational-record" = dontDistribute super."relational-record";
+  "relational-record-examples" = dontDistribute super."relational-record-examples";
+  "relational-schemas" = dontDistribute super."relational-schemas";
+  "relative-date" = dontDistribute super."relative-date";
+  "relit" = dontDistribute super."relit";
+  "rematch" = dontDistribute super."rematch";
+  "rematch-text" = dontDistribute super."rematch-text";
+  "remote" = dontDistribute super."remote";
+  "remote-debugger" = dontDistribute super."remote-debugger";
+  "remotion" = dontDistribute super."remotion";
+  "renderable" = dontDistribute super."renderable";
+  "reord" = dontDistribute super."reord";
+  "reorderable" = dontDistribute super."reorderable";
+  "repa" = doDistribute super."repa_3_4_0_1";
+  "repa-algorithms" = doDistribute super."repa-algorithms_3_4_0_1";
+  "repa-array" = dontDistribute super."repa-array";
+  "repa-bytestring" = dontDistribute super."repa-bytestring";
+  "repa-convert" = dontDistribute super."repa-convert";
+  "repa-eval" = dontDistribute super."repa-eval";
+  "repa-examples" = dontDistribute super."repa-examples";
+  "repa-fftw" = dontDistribute super."repa-fftw";
+  "repa-flow" = dontDistribute super."repa-flow";
+  "repa-io" = doDistribute super."repa-io_3_4_0_1";
+  "repa-linear-algebra" = dontDistribute super."repa-linear-algebra";
+  "repa-plugin" = dontDistribute super."repa-plugin";
+  "repa-scalar" = dontDistribute super."repa-scalar";
+  "repa-series" = dontDistribute super."repa-series";
+  "repa-sndfile" = dontDistribute super."repa-sndfile";
+  "repa-stream" = dontDistribute super."repa-stream";
+  "repa-v4l2" = dontDistribute super."repa-v4l2";
+  "repl" = dontDistribute super."repl";
+  "repl-toolkit" = dontDistribute super."repl-toolkit";
+  "repline" = dontDistribute super."repline";
+  "repo-based-blog" = dontDistribute super."repo-based-blog";
+  "repr" = dontDistribute super."repr";
+  "repr-tree-syb" = dontDistribute super."repr-tree-syb";
+  "representable-functors" = dontDistribute super."representable-functors";
+  "representable-profunctors" = dontDistribute super."representable-profunctors";
+  "representable-tries" = dontDistribute super."representable-tries";
+  "request-monad" = dontDistribute super."request-monad";
+  "reserve" = dontDistribute super."reserve";
+  "resistor-cube" = dontDistribute super."resistor-cube";
+  "resolve-trivial-conflicts" = dontDistribute super."resolve-trivial-conflicts";
+  "resource-effect" = dontDistribute super."resource-effect";
+  "resource-embed" = dontDistribute super."resource-embed";
+  "resource-pool-catchio" = dontDistribute super."resource-pool-catchio";
+  "resource-pool-monad" = dontDistribute super."resource-pool-monad";
+  "resource-simple" = dontDistribute super."resource-simple";
+  "respond" = dontDistribute super."respond";
+  "rest-core" = doDistribute super."rest-core_0_36_0_6";
+  "rest-example" = dontDistribute super."rest-example";
+  "rest-gen" = doDistribute super."rest-gen_0_17_1_3";
+  "rest-happstack" = doDistribute super."rest-happstack_0_2_10_8";
+  "rest-snap" = doDistribute super."rest-snap_0_1_17_18";
+  "rest-wai" = doDistribute super."rest-wai_0_1_0_8";
+  "restful-snap" = dontDistribute super."restful-snap";
+  "restricted-workers" = dontDistribute super."restricted-workers";
+  "restyle" = dontDistribute super."restyle";
+  "resumable-exceptions" = dontDistribute super."resumable-exceptions";
+  "rethinkdb" = dontDistribute super."rethinkdb";
+  "rethinkdb-model" = dontDistribute super."rethinkdb-model";
+  "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
+  "retry" = doDistribute super."retry_0_6";
+  "retryer" = dontDistribute super."retryer";
+  "revdectime" = dontDistribute super."revdectime";
+  "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-geocoding" = dontDistribute super."reverse-geocoding";
+  "reversi" = dontDistribute super."reversi";
+  "rewrite" = dontDistribute super."rewrite";
+  "rewriting" = dontDistribute super."rewriting";
+  "rex" = dontDistribute super."rex";
+  "rezoom" = dontDistribute super."rezoom";
+  "rfc3339" = dontDistribute super."rfc3339";
+  "rhythm-game-tutorial" = dontDistribute super."rhythm-game-tutorial";
+  "riak" = dontDistribute super."riak";
+  "riak-protobuf" = dontDistribute super."riak-protobuf";
+  "richreports" = dontDistribute super."richreports";
+  "riemann" = dontDistribute super."riemann";
+  "riff" = dontDistribute super."riff";
+  "ring-buffer" = dontDistribute super."ring-buffer";
+  "riot" = dontDistribute super."riot";
+  "ripple" = dontDistribute super."ripple";
+  "ripple-federation" = dontDistribute super."ripple-federation";
+  "risc386" = dontDistribute super."risc386";
+  "rivers" = dontDistribute super."rivers";
+  "rivet" = dontDistribute super."rivet";
+  "rivet-core" = dontDistribute super."rivet-core";
+  "rivet-migration" = dontDistribute super."rivet-migration";
+  "rivet-simple-deploy" = dontDistribute super."rivet-simple-deploy";
+  "rlglue" = dontDistribute super."rlglue";
+  "rmonad" = dontDistribute super."rmonad";
+  "rncryptor" = dontDistribute super."rncryptor";
+  "rng-utils" = dontDistribute super."rng-utils";
+  "robin" = dontDistribute super."robin";
+  "robot" = dontDistribute super."robot";
+  "robots-txt" = dontDistribute super."robots-txt";
+  "rocksdb-haskell" = dontDistribute super."rocksdb-haskell";
+  "roguestar" = dontDistribute super."roguestar";
+  "roguestar-engine" = dontDistribute super."roguestar-engine";
+  "roguestar-gl" = dontDistribute super."roguestar-gl";
+  "roguestar-glut" = dontDistribute super."roguestar-glut";
+  "rollbar" = dontDistribute super."rollbar";
+  "roller" = dontDistribute super."roller";
+  "rolling-queue" = dontDistribute super."rolling-queue";
+  "roman-numerals" = dontDistribute super."roman-numerals";
+  "romkan" = dontDistribute super."romkan";
+  "roots" = dontDistribute super."roots";
+  "rope" = dontDistribute super."rope";
+  "rosa" = dontDistribute super."rosa";
+  "rose-trees" = dontDistribute super."rose-trees";
+  "rose-trie" = dontDistribute super."rose-trie";
+  "rosezipper" = dontDistribute super."rosezipper";
+  "roshask" = dontDistribute super."roshask";
+  "rosso" = dontDistribute super."rosso";
+  "rot13" = dontDistribute super."rot13";
+  "rotating-log" = dontDistribute super."rotating-log";
+  "rounding" = dontDistribute super."rounding";
+  "roundtrip" = dontDistribute super."roundtrip";
+  "roundtrip-aeson" = dontDistribute super."roundtrip-aeson";
+  "roundtrip-string" = dontDistribute super."roundtrip-string";
+  "roundtrip-xml" = dontDistribute super."roundtrip-xml";
+  "route-generator" = dontDistribute super."route-generator";
+  "route-planning" = dontDistribute super."route-planning";
+  "rowrecord" = dontDistribute super."rowrecord";
+  "rpc" = dontDistribute super."rpc";
+  "rpc-framework" = dontDistribute super."rpc-framework";
+  "rpf" = dontDistribute super."rpf";
+  "rpm" = dontDistribute super."rpm";
+  "rsagl" = dontDistribute super."rsagl";
+  "rsagl-frp" = dontDistribute super."rsagl-frp";
+  "rsagl-math" = dontDistribute super."rsagl-math";
+  "rspp" = dontDistribute super."rspp";
+  "rss" = dontDistribute super."rss";
+  "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
+  "rtld" = dontDistribute super."rtld";
+  "rtlsdr" = dontDistribute super."rtlsdr";
+  "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";
+  "rtorrent-state" = dontDistribute super."rtorrent-state";
+  "rubberband" = dontDistribute super."rubberband";
+  "ruby-marshal" = dontDistribute super."ruby-marshal";
+  "ruby-qq" = dontDistribute super."ruby-qq";
+  "ruff" = dontDistribute super."ruff";
+  "ruler" = dontDistribute super."ruler";
+  "ruler-core" = dontDistribute super."ruler-core";
+  "rungekutta" = dontDistribute super."rungekutta";
+  "runghc" = dontDistribute super."runghc";
+  "rwlock" = dontDistribute super."rwlock";
+  "rws" = dontDistribute super."rws";
+  "s-cargot" = dontDistribute super."s-cargot";
+  "s3-signer" = dontDistribute super."s3-signer";
+  "safe-access" = dontDistribute super."safe-access";
+  "safe-failure" = dontDistribute super."safe-failure";
+  "safe-failure-cme" = dontDistribute super."safe-failure-cme";
+  "safe-freeze" = dontDistribute super."safe-freeze";
+  "safe-globals" = dontDistribute super."safe-globals";
+  "safe-lazy-io" = dontDistribute super."safe-lazy-io";
+  "safe-length" = dontDistribute super."safe-length";
+  "safe-plugins" = dontDistribute super."safe-plugins";
+  "safe-printf" = dontDistribute super."safe-printf";
+  "safeint" = dontDistribute super."safeint";
+  "safer-file-handles" = dontDistribute super."safer-file-handles";
+  "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring";
+  "safer-file-handles-text" = dontDistribute super."safer-file-handles-text";
+  "saferoute" = dontDistribute super."saferoute";
+  "sai-shape-syb" = dontDistribute super."sai-shape-syb";
+  "saltine" = dontDistribute super."saltine";
+  "saltine-quickcheck" = dontDistribute super."saltine-quickcheck";
+  "salvia" = dontDistribute super."salvia";
+  "salvia-demo" = dontDistribute super."salvia-demo";
+  "salvia-extras" = dontDistribute super."salvia-extras";
+  "salvia-protocol" = dontDistribute super."salvia-protocol";
+  "salvia-sessions" = dontDistribute super."salvia-sessions";
+  "salvia-websocket" = dontDistribute super."salvia-websocket";
+  "sample-frame" = dontDistribute super."sample-frame";
+  "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "samtools" = dontDistribute super."samtools";
+  "samtools-conduit" = dontDistribute super."samtools-conduit";
+  "samtools-enumerator" = dontDistribute super."samtools-enumerator";
+  "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandlib" = dontDistribute super."sandlib";
+  "sandman" = dontDistribute super."sandman";
+  "sarasvati" = dontDistribute super."sarasvati";
+  "sasl" = dontDistribute super."sasl";
+  "sat" = dontDistribute super."sat";
+  "sat-micro-hs" = dontDistribute super."sat-micro-hs";
+  "satchmo" = dontDistribute super."satchmo";
+  "satchmo-backends" = dontDistribute super."satchmo-backends";
+  "satchmo-examples" = dontDistribute super."satchmo-examples";
+  "satchmo-funsat" = dontDistribute super."satchmo-funsat";
+  "satchmo-minisat" = dontDistribute super."satchmo-minisat";
+  "satchmo-toysat" = dontDistribute super."satchmo-toysat";
+  "sbp" = dontDistribute super."sbp";
+  "sbv" = doDistribute super."sbv_4_4";
+  "sbvPlugin" = dontDistribute super."sbvPlugin";
+  "sc3-rdu" = dontDistribute super."sc3-rdu";
+  "scalable-server" = dontDistribute super."scalable-server";
+  "scaleimage" = dontDistribute super."scaleimage";
+  "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scan" = dontDistribute super."scan";
+  "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scat" = dontDistribute super."scat";
+  "scc" = dontDistribute super."scc";
+  "scenegraph" = dontDistribute super."scenegraph";
+  "scgi" = dontDistribute super."scgi";
+  "schedevr" = dontDistribute super."schedevr";
+  "schedule-planner" = dontDistribute super."schedule-planner";
+  "schedyield" = dontDistribute super."schedyield";
+  "scholdoc" = dontDistribute super."scholdoc";
+  "scholdoc-citeproc" = dontDistribute super."scholdoc-citeproc";
+  "scholdoc-texmath" = dontDistribute super."scholdoc-texmath";
+  "scholdoc-types" = dontDistribute super."scholdoc-types";
+  "schonfinkeling" = dontDistribute super."schonfinkeling";
+  "sci-ratio" = dontDistribute super."sci-ratio";
+  "science-constants" = dontDistribute super."science-constants";
+  "science-constants-dimensional" = dontDistribute super."science-constants-dimensional";
+  "scion" = dontDistribute super."scion";
+  "scion-browser" = dontDistribute super."scion-browser";
+  "scons2dot" = dontDistribute super."scons2dot";
+  "scope" = dontDistribute super."scope";
+  "scope-cairo" = dontDistribute super."scope-cairo";
+  "scottish" = dontDistribute super."scottish";
+  "scotty-binding-play" = dontDistribute super."scotty-binding-play";
+  "scotty-blaze" = dontDistribute super."scotty-blaze";
+  "scotty-cookie" = dontDistribute super."scotty-cookie";
+  "scotty-fay" = dontDistribute super."scotty-fay";
+  "scotty-hastache" = dontDistribute super."scotty-hastache";
+  "scotty-rest" = dontDistribute super."scotty-rest";
+  "scotty-session" = dontDistribute super."scotty-session";
+  "scotty-tls" = dontDistribute super."scotty-tls";
+  "scp-streams" = dontDistribute super."scp-streams";
+  "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrobble" = dontDistribute super."scrobble";
+  "scroll" = dontDistribute super."scroll";
+  "scrypt" = dontDistribute super."scrypt";
+  "scrz" = dontDistribute super."scrz";
+  "scyther-proof" = dontDistribute super."scyther-proof";
+  "sde-solver" = dontDistribute super."sde-solver";
+  "sdf2p1-parser" = dontDistribute super."sdf2p1-parser";
+  "sdl2" = doDistribute super."sdl2_1_3_1";
+  "sdl2-cairo" = dontDistribute super."sdl2-cairo";
+  "sdl2-cairo-image" = dontDistribute super."sdl2-cairo-image";
+  "sdl2-compositor" = dontDistribute super."sdl2-compositor";
+  "sdl2-image" = dontDistribute super."sdl2-image";
+  "sdl2-ttf" = dontDistribute super."sdl2-ttf";
+  "sdnv" = dontDistribute super."sdnv";
+  "sdr" = dontDistribute super."sdr";
+  "seacat" = dontDistribute super."seacat";
+  "seal-module" = dontDistribute super."seal-module";
+  "search" = dontDistribute super."search";
+  "sec" = dontDistribute super."sec";
+  "secdh" = dontDistribute super."secdh";
+  "seclib" = dontDistribute super."seclib";
+  "second-transfer" = doDistribute super."second-transfer_0_6_1_0";
+  "secp256k1" = dontDistribute super."secp256k1";
+  "secret-santa" = dontDistribute super."secret-santa";
+  "secret-sharing" = dontDistribute super."secret-sharing";
+  "secrm" = dontDistribute super."secrm";
+  "secure-sockets" = dontDistribute super."secure-sockets";
+  "sednaDBXML" = dontDistribute super."sednaDBXML";
+  "select" = dontDistribute super."select";
+  "selectors" = dontDistribute super."selectors";
+  "selenium" = dontDistribute super."selenium";
+  "selenium-server" = dontDistribute super."selenium-server";
+  "selfrestart" = dontDistribute super."selfrestart";
+  "selinux" = dontDistribute super."selinux";
+  "semaphore-plus" = dontDistribute super."semaphore-plus";
+  "semi-iso" = dontDistribute super."semi-iso";
+  "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax";
+  "semigroups" = doDistribute super."semigroups_0_16_2_2";
+  "semigroups-actions" = dontDistribute super."semigroups-actions";
+  "semiring" = dontDistribute super."semiring";
+  "semiring-simple" = dontDistribute super."semiring-simple";
+  "semver-range" = dontDistribute super."semver-range";
+  "sendgrid-haskell" = dontDistribute super."sendgrid-haskell";
+  "sensenet" = dontDistribute super."sensenet";
+  "sentry" = dontDistribute super."sentry";
+  "senza" = dontDistribute super."senza";
+  "separated" = dontDistribute super."separated";
+  "seqaid" = dontDistribute super."seqaid";
+  "seqid" = dontDistribute super."seqid";
+  "seqid-streams" = dontDistribute super."seqid-streams";
+  "seqloc-datafiles" = dontDistribute super."seqloc-datafiles";
+  "sequence" = dontDistribute super."sequence";
+  "sequent-core" = dontDistribute super."sequent-core";
+  "sequential-index" = dontDistribute super."sequential-index";
+  "sequor" = dontDistribute super."sequor";
+  "serial" = dontDistribute super."serial";
+  "serial-test-generators" = dontDistribute super."serial-test-generators";
+  "serialport" = dontDistribute super."serialport";
+  "serv" = dontDistribute super."serv";
+  "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
+  "servant-blaze" = dontDistribute super."servant-blaze";
+  "servant-cassava" = dontDistribute super."servant-cassava";
+  "servant-ede" = dontDistribute super."servant-ede";
+  "servant-examples" = dontDistribute super."servant-examples";
+  "servant-github" = dontDistribute super."servant-github";
+  "servant-lucid" = dontDistribute super."servant-lucid";
+  "servant-mock" = dontDistribute super."servant-mock";
+  "servant-pool" = dontDistribute super."servant-pool";
+  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-response" = dontDistribute super."servant-response";
+  "servant-scotty" = dontDistribute super."servant-scotty";
+  "servant-swagger" = dontDistribute super."servant-swagger";
+  "servant-yaml" = dontDistribute super."servant-yaml";
+  "servius" = dontDistribute super."servius";
+  "ses-html" = dontDistribute super."ses-html";
+  "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
+  "sessions" = dontDistribute super."sessions";
+  "set-cover" = dontDistribute super."set-cover";
+  "set-with" = dontDistribute super."set-with";
+  "setdown" = dontDistribute super."setdown";
+  "setgame" = dontDistribute super."setgame";
+  "setops" = dontDistribute super."setops";
+  "sets" = dontDistribute super."sets";
+  "setters" = dontDistribute super."setters";
+  "settings" = dontDistribute super."settings";
+  "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
+  "sexp-show" = dontDistribute super."sexp-show";
+  "sexpr" = dontDistribute super."sexpr";
+  "sext" = dontDistribute super."sext";
+  "sfml-audio" = dontDistribute super."sfml-audio";
+  "sfmt" = dontDistribute super."sfmt";
+  "sgd" = dontDistribute super."sgd";
+  "sgf" = dontDistribute super."sgf";
+  "sgrep" = dontDistribute super."sgrep";
+  "sha-streams" = dontDistribute super."sha-streams";
+  "shadower" = dontDistribute super."shadower";
+  "shadowsocks" = dontDistribute super."shadowsocks";
+  "shady-gen" = dontDistribute super."shady-gen";
+  "shady-graphics" = dontDistribute super."shady-graphics";
+  "shake-cabal-build" = dontDistribute super."shake-cabal-build";
+  "shake-extras" = dontDistribute super."shake-extras";
+  "shake-minify" = dontDistribute super."shake-minify";
+  "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
+  "shaker" = dontDistribute super."shaker";
+  "shakespeare-css" = dontDistribute super."shakespeare-css";
+  "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
+  "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-text" = dontDistribute super."shakespeare-text";
+  "shana" = dontDistribute super."shana";
+  "shapefile" = dontDistribute super."shapefile";
+  "shapely-data" = dontDistribute super."shapely-data";
+  "sharc-timbre" = dontDistribute super."sharc-timbre";
+  "shared-buffer" = dontDistribute super."shared-buffer";
+  "shared-fields" = dontDistribute super."shared-fields";
+  "shared-memory" = dontDistribute super."shared-memory";
+  "sharedio" = dontDistribute super."sharedio";
+  "she" = dontDistribute super."she";
+  "shelduck" = dontDistribute super."shelduck";
+  "shell-escape" = dontDistribute super."shell-escape";
+  "shell-monad" = dontDistribute super."shell-monad";
+  "shell-pipe" = dontDistribute super."shell-pipe";
+  "shellish" = dontDistribute super."shellish";
+  "shellmate" = dontDistribute super."shellmate";
+  "shelly-extra" = dontDistribute super."shelly-extra";
+  "shivers-cfg" = dontDistribute super."shivers-cfg";
+  "shoap" = dontDistribute super."shoap";
+  "shortcircuit" = dontDistribute super."shortcircuit";
+  "shorten-strings" = dontDistribute super."shorten-strings";
+  "should-not-typecheck" = dontDistribute super."should-not-typecheck";
+  "show-type" = dontDistribute super."show-type";
+  "showdown" = dontDistribute super."showdown";
+  "shpider" = dontDistribute super."shpider";
+  "shplit" = dontDistribute super."shplit";
+  "shqq" = dontDistribute super."shqq";
+  "shuffle" = dontDistribute super."shuffle";
+  "sieve" = dontDistribute super."sieve";
+  "sifflet" = dontDistribute super."sifflet";
+  "sifflet-lib" = dontDistribute super."sifflet-lib";
+  "sign" = dontDistribute super."sign";
+  "signal" = dontDistribute super."signal";
+  "signals" = dontDistribute super."signals";
+  "signed-multiset" = dontDistribute super."signed-multiset";
+  "simd" = dontDistribute super."simd";
+  "simgi" = dontDistribute super."simgi";
+  "simple" = dontDistribute super."simple";
+  "simple-actors" = dontDistribute super."simple-actors";
+  "simple-atom" = dontDistribute super."simple-atom";
+  "simple-bluetooth" = dontDistribute super."simple-bluetooth";
+  "simple-c-value" = dontDistribute super."simple-c-value";
+  "simple-conduit" = dontDistribute super."simple-conduit";
+  "simple-config" = dontDistribute super."simple-config";
+  "simple-css" = dontDistribute super."simple-css";
+  "simple-eval" = dontDistribute super."simple-eval";
+  "simple-firewire" = dontDistribute super."simple-firewire";
+  "simple-form" = dontDistribute super."simple-form";
+  "simple-genetic-algorithm" = dontDistribute super."simple-genetic-algorithm";
+  "simple-genetic-algorithm-mr" = dontDistribute super."simple-genetic-algorithm-mr";
+  "simple-get-opt" = dontDistribute super."simple-get-opt";
+  "simple-index" = dontDistribute super."simple-index";
+  "simple-log" = dontDistribute super."simple-log";
+  "simple-log-syslog" = dontDistribute super."simple-log-syslog";
+  "simple-neural-networks" = dontDistribute super."simple-neural-networks";
+  "simple-nix" = dontDistribute super."simple-nix";
+  "simple-observer" = dontDistribute super."simple-observer";
+  "simple-pascal" = dontDistribute super."simple-pascal";
+  "simple-pipe" = dontDistribute super."simple-pipe";
+  "simple-postgresql-orm" = dontDistribute super."simple-postgresql-orm";
+  "simple-rope" = dontDistribute super."simple-rope";
+  "simple-server" = dontDistribute super."simple-server";
+  "simple-session" = dontDistribute super."simple-session";
+  "simple-sessions" = dontDistribute super."simple-sessions";
+  "simple-smt" = dontDistribute super."simple-smt";
+  "simple-sql-parser" = dontDistribute super."simple-sql-parser";
+  "simple-stacked-vm" = dontDistribute super."simple-stacked-vm";
+  "simple-tabular" = dontDistribute super."simple-tabular";
+  "simple-templates" = dontDistribute super."simple-templates";
+  "simple-vec3" = dontDistribute super."simple-vec3";
+  "simpleargs" = dontDistribute super."simpleargs";
+  "simpleirc" = dontDistribute super."simpleirc";
+  "simpleirc-lens" = dontDistribute super."simpleirc-lens";
+  "simplenote" = dontDistribute super."simplenote";
+  "simpleprelude" = dontDistribute super."simpleprelude";
+  "simplesmtpclient" = dontDistribute super."simplesmtpclient";
+  "simplessh" = dontDistribute super."simplessh";
+  "simplest-sqlite" = dontDistribute super."simplest-sqlite";
+  "simplex" = dontDistribute super."simplex";
+  "simplex-basic" = dontDistribute super."simplex-basic";
+  "simseq" = dontDistribute super."simseq";
+  "simtreelo" = dontDistribute super."simtreelo";
+  "sindre" = dontDistribute super."sindre";
+  "singleton-nats" = dontDistribute super."singleton-nats";
+  "singletons" = doDistribute super."singletons_1_1_2_1";
+  "sink" = dontDistribute super."sink";
+  "sirkel" = dontDistribute super."sirkel";
+  "sitemap" = dontDistribute super."sitemap";
+  "sized" = dontDistribute super."sized";
+  "sized-types" = dontDistribute super."sized-types";
+  "sized-vector" = dontDistribute super."sized-vector";
+  "sizes" = dontDistribute super."sizes";
+  "sjsp" = dontDistribute super."sjsp";
+  "skeleton" = dontDistribute super."skeleton";
+  "skeletons" = dontDistribute super."skeletons";
+  "skell" = dontDistribute super."skell";
+  "skemmtun" = dontDistribute super."skemmtun";
+  "skype4hs" = dontDistribute super."skype4hs";
+  "skypelogexport" = dontDistribute super."skypelogexport";
+  "slack" = dontDistribute super."slack";
+  "slack-api" = dontDistribute super."slack-api";
+  "slack-notify-haskell" = dontDistribute super."slack-notify-haskell";
+  "slice-cpp-gen" = dontDistribute super."slice-cpp-gen";
+  "slidemews" = dontDistribute super."slidemews";
+  "sloane" = dontDistribute super."sloane";
+  "slot-lambda" = dontDistribute super."slot-lambda";
+  "sloth" = dontDistribute super."sloth";
+  "slug" = dontDistribute super."slug";
+  "smallarray" = dontDistribute super."smallarray";
+  "smallcaps" = dontDistribute super."smallcaps";
+  "smallcheck-laws" = dontDistribute super."smallcheck-laws";
+  "smallcheck-lens" = dontDistribute super."smallcheck-lens";
+  "smallcheck-series" = dontDistribute super."smallcheck-series";
+  "smallpt-hs" = dontDistribute super."smallpt-hs";
+  "smallstring" = dontDistribute super."smallstring";
+  "smaoin" = dontDistribute super."smaoin";
+  "smartGroup" = dontDistribute super."smartGroup";
+  "smartcheck" = dontDistribute super."smartcheck";
+  "smartconstructor" = dontDistribute super."smartconstructor";
+  "smartword" = dontDistribute super."smartword";
+  "sme" = dontDistribute super."sme";
+  "smsaero" = dontDistribute super."smsaero";
+  "smt-lib" = dontDistribute super."smt-lib";
+  "smtlib2" = dontDistribute super."smtlib2";
+  "smtp-mail-ng" = dontDistribute super."smtp-mail-ng";
+  "smtp2mta" = dontDistribute super."smtp2mta";
+  "smtps-gmail" = dontDistribute super."smtps-gmail";
+  "snake-game" = dontDistribute super."snake-game";
+  "snap-accept" = dontDistribute super."snap-accept";
+  "snap-app" = dontDistribute super."snap-app";
+  "snap-auth-cli" = dontDistribute super."snap-auth-cli";
+  "snap-blaze" = dontDistribute super."snap-blaze";
+  "snap-blaze-clay" = dontDistribute super."snap-blaze-clay";
+  "snap-configuration-utilities" = dontDistribute super."snap-configuration-utilities";
+  "snap-cors" = dontDistribute super."snap-cors";
+  "snap-elm" = dontDistribute super."snap-elm";
+  "snap-error-collector" = dontDistribute super."snap-error-collector";
+  "snap-extras" = dontDistribute super."snap-extras";
+  "snap-language" = dontDistribute super."snap-language";
+  "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic";
+  "snap-loader-static" = dontDistribute super."snap-loader-static";
+  "snap-predicates" = dontDistribute super."snap-predicates";
+  "snap-testing" = dontDistribute super."snap-testing";
+  "snap-utils" = dontDistribute super."snap-utils";
+  "snap-web-routes" = dontDistribute super."snap-web-routes";
+  "snaplet-acid-state" = dontDistribute super."snaplet-acid-state";
+  "snaplet-actionlog" = dontDistribute super."snaplet-actionlog";
+  "snaplet-amqp" = dontDistribute super."snaplet-amqp";
+  "snaplet-auth-acid" = dontDistribute super."snaplet-auth-acid";
+  "snaplet-coffee" = dontDistribute super."snaplet-coffee";
+  "snaplet-css-min" = dontDistribute super."snaplet-css-min";
+  "snaplet-environments" = dontDistribute super."snaplet-environments";
+  "snaplet-ghcjs" = dontDistribute super."snaplet-ghcjs";
+  "snaplet-hasql" = dontDistribute super."snaplet-hasql";
+  "snaplet-haxl" = dontDistribute super."snaplet-haxl";
+  "snaplet-hdbc" = dontDistribute super."snaplet-hdbc";
+  "snaplet-hslogger" = dontDistribute super."snaplet-hslogger";
+  "snaplet-i18n" = dontDistribute super."snaplet-i18n";
+  "snaplet-influxdb" = dontDistribute super."snaplet-influxdb";
+  "snaplet-lss" = dontDistribute super."snaplet-lss";
+  "snaplet-mandrill" = dontDistribute super."snaplet-mandrill";
+  "snaplet-mongoDB" = dontDistribute super."snaplet-mongoDB";
+  "snaplet-mongodb-minimalistic" = dontDistribute super."snaplet-mongodb-minimalistic";
+  "snaplet-mysql-simple" = dontDistribute super."snaplet-mysql-simple";
+  "snaplet-oauth" = dontDistribute super."snaplet-oauth";
+  "snaplet-persistent" = dontDistribute super."snaplet-persistent";
+  "snaplet-postgresql-simple" = dontDistribute super."snaplet-postgresql-simple";
+  "snaplet-postmark" = dontDistribute super."snaplet-postmark";
+  "snaplet-purescript" = dontDistribute super."snaplet-purescript";
+  "snaplet-recaptcha" = dontDistribute super."snaplet-recaptcha";
+  "snaplet-redis" = dontDistribute super."snaplet-redis";
+  "snaplet-redson" = dontDistribute super."snaplet-redson";
+  "snaplet-rest" = dontDistribute super."snaplet-rest";
+  "snaplet-riak" = dontDistribute super."snaplet-riak";
+  "snaplet-sass" = dontDistribute super."snaplet-sass";
+  "snaplet-sedna" = dontDistribute super."snaplet-sedna";
+  "snaplet-ses-html" = dontDistribute super."snaplet-ses-html";
+  "snaplet-sqlite-simple" = dontDistribute super."snaplet-sqlite-simple";
+  "snaplet-stripe" = dontDistribute super."snaplet-stripe";
+  "snaplet-tasks" = dontDistribute super."snaplet-tasks";
+  "snaplet-typed-sessions" = dontDistribute super."snaplet-typed-sessions";
+  "snaplet-wordpress" = dontDistribute super."snaplet-wordpress";
+  "snappy" = dontDistribute super."snappy";
+  "snappy-conduit" = dontDistribute super."snappy-conduit";
+  "snappy-framing" = dontDistribute super."snappy-framing";
+  "snappy-iteratee" = dontDistribute super."snappy-iteratee";
+  "sndfile-enumerators" = dontDistribute super."sndfile-enumerators";
+  "sneakyterm" = dontDistribute super."sneakyterm";
+  "sneathlane-haste" = dontDistribute super."sneathlane-haste";
+  "snippet-extractor" = dontDistribute super."snippet-extractor";
+  "snm" = dontDistribute super."snm";
+  "snow-white" = dontDistribute super."snow-white";
+  "snowball" = dontDistribute super."snowball";
+  "snowglobe" = dontDistribute super."snowglobe";
+  "soap" = dontDistribute super."soap";
+  "soap-openssl" = dontDistribute super."soap-openssl";
+  "soap-tls" = dontDistribute super."soap-tls";
+  "sock2stream" = dontDistribute super."sock2stream";
+  "sockaddr" = dontDistribute super."sockaddr";
+  "socket" = dontDistribute super."socket";
+  "socket-activation" = dontDistribute super."socket-activation";
+  "socket-sctp" = dontDistribute super."socket-sctp";
+  "socketio" = dontDistribute super."socketio";
+  "soegtk" = dontDistribute super."soegtk";
+  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
+  "sophia" = dontDistribute super."sophia";
+  "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
+  "sorted" = dontDistribute super."sorted";
+  "sorted-list" = dontDistribute super."sorted-list";
+  "sorting" = dontDistribute super."sorting";
+  "sorty" = dontDistribute super."sorty";
+  "sound-collage" = dontDistribute super."sound-collage";
+  "sounddelay" = dontDistribute super."sounddelay";
+  "source-code-server" = dontDistribute super."source-code-server";
+  "sourcemap" = doDistribute super."sourcemap_0_1_3_0";
+  "sousit" = dontDistribute super."sousit";
+  "sox" = dontDistribute super."sox";
+  "soxlib" = dontDistribute super."soxlib";
+  "soyuz" = dontDistribute super."soyuz";
+  "spacefill" = dontDistribute super."spacefill";
+  "spacepart" = dontDistribute super."spacepart";
+  "spaceprobe" = dontDistribute super."spaceprobe";
+  "spanout" = dontDistribute super."spanout";
+  "sparse" = dontDistribute super."sparse";
+  "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
+  "sparsebit" = dontDistribute super."sparsebit";
+  "sparsecheck" = dontDistribute super."sparsecheck";
+  "sparser" = dontDistribute super."sparser";
+  "spata" = dontDistribute super."spata";
+  "spatial-math" = dontDistribute super."spatial-math";
+  "spawn" = dontDistribute super."spawn";
+  "spe" = dontDistribute super."spe";
+  "special-functors" = dontDistribute super."special-functors";
+  "special-keys" = dontDistribute super."special-keys";
+  "specialize-th" = dontDistribute super."specialize-th";
+  "species" = dontDistribute super."species";
+  "speculation-transformers" = dontDistribute super."speculation-transformers";
+  "speedy-slice" = dontDistribute super."speedy-slice";
+  "spelling-suggest" = dontDistribute super."spelling-suggest";
+  "sphero" = dontDistribute super."sphero";
+  "sphinx-cli" = dontDistribute super."sphinx-cli";
+  "spice" = dontDistribute super."spice";
+  "spike" = dontDistribute super."spike";
+  "spine" = dontDistribute super."spine";
+  "spir-v" = dontDistribute super."spir-v";
+  "splay" = dontDistribute super."splay";
+  "splaytree" = dontDistribute super."splaytree";
+  "spline3" = dontDistribute super."spline3";
+  "splines" = dontDistribute super."splines";
+  "split-channel" = dontDistribute super."split-channel";
+  "split-record" = dontDistribute super."split-record";
+  "split-tchan" = dontDistribute super."split-tchan";
+  "splitter" = dontDistribute super."splitter";
+  "splot" = dontDistribute super."splot";
+  "spool" = dontDistribute super."spool";
+  "spoonutil" = dontDistribute super."spoonutil";
+  "spoty" = dontDistribute super."spoty";
+  "spreadsheet" = dontDistribute super."spreadsheet";
+  "spritz" = dontDistribute super."spritz";
+  "spsa" = dontDistribute super."spsa";
+  "spy" = dontDistribute super."spy";
+  "sql-simple" = dontDistribute super."sql-simple";
+  "sql-simple-mysql" = dontDistribute super."sql-simple-mysql";
+  "sql-simple-pool" = dontDistribute super."sql-simple-pool";
+  "sql-simple-postgresql" = dontDistribute super."sql-simple-postgresql";
+  "sql-simple-sqlite" = dontDistribute super."sql-simple-sqlite";
+  "sql-words" = dontDistribute super."sql-words";
+  "sqlite" = dontDistribute super."sqlite";
+  "sqlite-simple-typed" = dontDistribute super."sqlite-simple-typed";
+  "sqlvalue-list" = dontDistribute super."sqlvalue-list";
+  "squeeze" = dontDistribute super."squeeze";
+  "sr-extra" = dontDistribute super."sr-extra";
+  "srcinst" = dontDistribute super."srcinst";
+  "srec" = dontDistribute super."srec";
+  "sscgi" = dontDistribute super."sscgi";
+  "ssh" = dontDistribute super."ssh";
+  "sshd-lint" = dontDistribute super."sshd-lint";
+  "sshtun" = dontDistribute super."sshtun";
+  "sssp" = dontDistribute super."sssp";
+  "sstable" = dontDistribute super."sstable";
+  "ssv" = dontDistribute super."ssv";
+  "stable-heap" = dontDistribute super."stable-heap";
+  "stable-maps" = dontDistribute super."stable-maps";
+  "stable-marriage" = dontDistribute super."stable-marriage";
+  "stable-memo" = dontDistribute super."stable-memo";
+  "stable-tree" = dontDistribute super."stable-tree";
+  "stack" = doDistribute super."stack_0_1_10_1";
+  "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
+  "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
+  "stack-run-auto" = dontDistribute super."stack-run-auto";
+  "stackage-curator" = dontDistribute super."stackage-curator";
+  "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
+  "standalone-haddock" = dontDistribute super."standalone-haddock";
+  "star-to-star" = dontDistribute super."star-to-star";
+  "star-to-star-contra" = dontDistribute super."star-to-star-contra";
+  "starling" = dontDistribute super."starling";
+  "starrover2" = dontDistribute super."starrover2";
+  "stash" = dontDistribute super."stash";
+  "state" = dontDistribute super."state";
+  "state-plus" = dontDistribute super."state-plus";
+  "state-record" = dontDistribute super."state-record";
+  "stateWriter" = dontDistribute super."stateWriter";
+  "statechart" = dontDistribute super."statechart";
+  "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statethread" = dontDistribute super."statethread";
+  "statgrab" = dontDistribute super."statgrab";
+  "static-hash" = dontDistribute super."static-hash";
+  "static-resources" = dontDistribute super."static-resources";
+  "staticanalysis" = dontDistribute super."staticanalysis";
+  "statistics-dirichlet" = dontDistribute super."statistics-dirichlet";
+  "statistics-fusion" = dontDistribute super."statistics-fusion";
+  "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar";
+  "stats" = dontDistribute super."stats";
+  "statsd" = dontDistribute super."statsd";
+  "statsd-client" = dontDistribute super."statsd-client";
+  "statsd-datadog" = dontDistribute super."statsd-datadog";
+  "statvfs" = dontDistribute super."statvfs";
+  "stb-image" = dontDistribute super."stb-image";
+  "stb-truetype" = dontDistribute super."stb-truetype";
+  "stdata" = dontDistribute super."stdata";
+  "stdf" = dontDistribute super."stdf";
+  "steambrowser" = dontDistribute super."steambrowser";
+  "steeloverseer" = dontDistribute super."steeloverseer";
+  "stemmer" = dontDistribute super."stemmer";
+  "step-function" = dontDistribute super."step-function";
+  "stepwise" = dontDistribute super."stepwise";
+  "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
+  "stitch" = dontDistribute super."stitch";
+  "stm-channelize" = dontDistribute super."stm-channelize";
+  "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
+  "stm-conduit" = doDistribute super."stm-conduit_2_6_1";
+  "stm-firehose" = dontDistribute super."stm-firehose";
+  "stm-io-hooks" = dontDistribute super."stm-io-hooks";
+  "stm-lifted" = dontDistribute super."stm-lifted";
+  "stm-linkedlist" = dontDistribute super."stm-linkedlist";
+  "stm-orelse-io" = dontDistribute super."stm-orelse-io";
+  "stm-promise" = dontDistribute super."stm-promise";
+  "stm-queue-extras" = dontDistribute super."stm-queue-extras";
+  "stm-sbchan" = dontDistribute super."stm-sbchan";
+  "stm-split" = dontDistribute super."stm-split";
+  "stm-tlist" = dontDistribute super."stm-tlist";
+  "stmcontrol" = dontDistribute super."stmcontrol";
+  "stomp-conduit" = dontDistribute super."stomp-conduit";
+  "stomp-patterns" = dontDistribute super."stomp-patterns";
+  "stomp-queue" = dontDistribute super."stomp-queue";
+  "stompl" = dontDistribute super."stompl";
+  "stopwatch" = dontDistribute super."stopwatch";
+  "storable" = dontDistribute super."storable";
+  "storable-record" = dontDistribute super."storable-record";
+  "storable-static-array" = dontDistribute super."storable-static-array";
+  "storable-tuple" = dontDistribute super."storable-tuple";
+  "storablevector" = dontDistribute super."storablevector";
+  "storablevector-carray" = dontDistribute super."storablevector-carray";
+  "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
+  "str" = dontDistribute super."str";
+  "stratum-tool" = dontDistribute super."stratum-tool";
+  "stream-fusion" = dontDistribute super."stream-fusion";
+  "stream-monad" = dontDistribute super."stream-monad";
+  "streamed" = dontDistribute super."streamed";
+  "streaming" = dontDistribute super."streaming";
+  "streaming-bytestring" = dontDistribute super."streaming-bytestring";
+  "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-utils" = dontDistribute super."streaming-utils";
+  "streaming-wai" = dontDistribute super."streaming-wai";
+  "streamproc" = dontDistribute super."streamproc";
+  "strict-base-types" = dontDistribute super."strict-base-types";
+  "strict-concurrency" = dontDistribute super."strict-concurrency";
+  "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin";
+  "strict-identity" = dontDistribute super."strict-identity";
+  "strict-io" = dontDistribute super."strict-io";
+  "strictify" = dontDistribute super."strictify";
+  "strictly" = dontDistribute super."strictly";
+  "string" = dontDistribute super."string";
+  "string-conv" = dontDistribute super."string-conv";
+  "string-convert" = dontDistribute super."string-convert";
+  "string-qq" = dontDistribute super."string-qq";
+  "string-quote" = dontDistribute super."string-quote";
+  "string-similarity" = dontDistribute super."string-similarity";
+  "stringlike" = dontDistribute super."stringlike";
+  "stringprep" = dontDistribute super."stringprep";
+  "strings" = dontDistribute super."strings";
+  "stringtable-atom" = dontDistribute super."stringtable-atom";
+  "strio" = dontDistribute super."strio";
+  "stripe" = dontDistribute super."stripe";
+  "stripe-core" = dontDistribute super."stripe-core";
+  "stripe-haskell" = dontDistribute super."stripe-haskell";
+  "stripe-http-streams" = dontDistribute super."stripe-http-streams";
+  "strive" = dontDistribute super."strive";
+  "strptime" = dontDistribute super."strptime";
+  "structs" = dontDistribute super."structs";
+  "structural-induction" = dontDistribute super."structural-induction";
+  "structured-haskell-mode" = dontDistribute super."structured-haskell-mode";
+  "structured-mongoDB" = dontDistribute super."structured-mongoDB";
+  "structures" = dontDistribute super."structures";
+  "stunclient" = dontDistribute super."stunclient";
+  "stunts" = dontDistribute super."stunts";
+  "stylish-haskell" = doDistribute super."stylish-haskell_0_5_14_3";
+  "stylized" = dontDistribute super."stylized";
+  "sub-state" = dontDistribute super."sub-state";
+  "subhask" = dontDistribute super."subhask";
+  "subleq-toolchain" = dontDistribute super."subleq-toolchain";
+  "subnet" = dontDistribute super."subnet";
+  "subtitleParser" = dontDistribute super."subtitleParser";
+  "subtitles" = dontDistribute super."subtitles";
+  "success" = dontDistribute super."success";
+  "suffixarray" = dontDistribute super."suffixarray";
+  "suffixtree" = dontDistribute super."suffixtree";
+  "sugarhaskell" = dontDistribute super."sugarhaskell";
+  "suitable" = dontDistribute super."suitable";
+  "sump" = dontDistribute super."sump";
+  "sundown" = dontDistribute super."sundown";
+  "sunlight" = dontDistribute super."sunlight";
+  "sunroof-compiler" = dontDistribute super."sunroof-compiler";
+  "sunroof-examples" = dontDistribute super."sunroof-examples";
+  "sunroof-server" = dontDistribute super."sunroof-server";
+  "super-user-spark" = dontDistribute super."super-user-spark";
+  "supercollider-ht" = dontDistribute super."supercollider-ht";
+  "supercollider-midi" = dontDistribute super."supercollider-midi";
+  "superdoc" = dontDistribute super."superdoc";
+  "supero" = dontDistribute super."supero";
+  "supervisor" = dontDistribute super."supervisor";
+  "suspend" = dontDistribute super."suspend";
+  "svg2q" = dontDistribute super."svg2q";
+  "svgcairo" = dontDistribute super."svgcairo";
+  "svgutils" = dontDistribute super."svgutils";
+  "svm" = dontDistribute super."svm";
+  "svm-light-utils" = dontDistribute super."svm-light-utils";
+  "svm-simple" = dontDistribute super."svm-simple";
+  "svndump" = dontDistribute super."svndump";
+  "swagger2" = dontDistribute super."swagger2";
+  "swapper" = dontDistribute super."swapper";
+  "swearjure" = dontDistribute super."swearjure";
+  "swf" = dontDistribute super."swf";
+  "swift-lda" = dontDistribute super."swift-lda";
+  "swish" = dontDistribute super."swish";
+  "sws" = dontDistribute super."sws";
+  "syb" = doDistribute super."syb_0_5_1";
+  "syb-extras" = dontDistribute super."syb-extras";
+  "syb-with-class" = dontDistribute super."syb-with-class";
+  "syb-with-class-instances-text" = dontDistribute super."syb-with-class-instances-text";
+  "sylvia" = dontDistribute super."sylvia";
+  "sym" = dontDistribute super."sym";
+  "sym-plot" = dontDistribute super."sym-plot";
+  "sync" = dontDistribute super."sync";
+  "sync-mht" = dontDistribute super."sync-mht";
+  "synchronous-channels" = dontDistribute super."synchronous-channels";
+  "syncthing-hs" = dontDistribute super."syncthing-hs";
+  "synt" = dontDistribute super."synt";
+  "syntactic" = dontDistribute super."syntactic";
+  "syntactical" = dontDistribute super."syntactical";
+  "syntax" = dontDistribute super."syntax";
+  "syntax-attoparsec" = dontDistribute super."syntax-attoparsec";
+  "syntax-example" = dontDistribute super."syntax-example";
+  "syntax-example-json" = dontDistribute super."syntax-example-json";
+  "syntax-pretty" = dontDistribute super."syntax-pretty";
+  "syntax-printer" = dontDistribute super."syntax-printer";
+  "syntax-trees" = dontDistribute super."syntax-trees";
+  "syntax-trees-fork-bairyn" = dontDistribute super."syntax-trees-fork-bairyn";
+  "synthesizer" = dontDistribute super."synthesizer";
+  "synthesizer-alsa" = dontDistribute super."synthesizer-alsa";
+  "synthesizer-core" = dontDistribute super."synthesizer-core";
+  "synthesizer-dimensional" = dontDistribute super."synthesizer-dimensional";
+  "synthesizer-filter" = dontDistribute super."synthesizer-filter";
+  "synthesizer-inference" = dontDistribute super."synthesizer-inference";
+  "synthesizer-llvm" = dontDistribute super."synthesizer-llvm";
+  "synthesizer-midi" = dontDistribute super."synthesizer-midi";
+  "sys-auth-smbclient" = dontDistribute super."sys-auth-smbclient";
+  "sys-process" = dontDistribute super."sys-process";
+  "system-canonicalpath" = dontDistribute super."system-canonicalpath";
+  "system-command" = dontDistribute super."system-command";
+  "system-gpio" = dontDistribute super."system-gpio";
+  "system-inotify" = dontDistribute super."system-inotify";
+  "system-lifted" = dontDistribute super."system-lifted";
+  "system-random-effect" = dontDistribute super."system-random-effect";
+  "system-time-monotonic" = dontDistribute super."system-time-monotonic";
+  "system-util" = dontDistribute super."system-util";
+  "system-uuid" = dontDistribute super."system-uuid";
+  "systemd" = dontDistribute super."systemd";
+  "syz" = dontDistribute super."syz";
+  "t-regex" = dontDistribute super."t-regex";
+  "ta" = dontDistribute super."ta";
+  "table" = dontDistribute super."table";
+  "table-tennis" = dontDistribute super."table-tennis";
+  "tableaux" = dontDistribute super."tableaux";
+  "tables" = dontDistribute super."tables";
+  "tablestorage" = dontDistribute super."tablestorage";
+  "tabloid" = dontDistribute super."tabloid";
+  "taffybar" = dontDistribute super."taffybar";
+  "tag-bits" = dontDistribute super."tag-bits";
+  "tag-stream" = dontDistribute super."tag-stream";
+  "tagchup" = dontDistribute super."tagchup";
+  "tagged-exception-core" = dontDistribute super."tagged-exception-core";
+  "tagged-list" = dontDistribute super."tagged-list";
+  "tagged-th" = dontDistribute super."tagged-th";
+  "tagged-transformer" = dontDistribute super."tagged-transformer";
+  "tagging" = dontDistribute super."tagging";
+  "taggy" = dontDistribute super."taggy";
+  "taggy-lens" = dontDistribute super."taggy-lens";
+  "taglib" = dontDistribute super."taglib";
+  "taglib-api" = dontDistribute super."taglib-api";
+  "tagset-positional" = dontDistribute super."tagset-positional";
+  "tagsoup-ht" = dontDistribute super."tagsoup-ht";
+  "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "takahashi" = dontDistribute super."takahashi";
+  "takusen-oracle" = dontDistribute super."takusen-oracle";
+  "tamarin-prover" = dontDistribute super."tamarin-prover";
+  "tamarin-prover-term" = dontDistribute super."tamarin-prover-term";
+  "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory";
+  "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
+  "tamper" = dontDistribute super."tamper";
+  "target" = dontDistribute super."target";
+  "task" = dontDistribute super."task";
+  "taskpool" = dontDistribute super."taskpool";
+  "tasty" = doDistribute super."tasty_0_10_1_2";
+  "tasty-dejafu" = dontDistribute super."tasty-dejafu";
+  "tasty-expected-failure" = dontDistribute super."tasty-expected-failure";
+  "tasty-fail-fast" = dontDistribute super."tasty-fail-fast";
+  "tasty-html" = dontDistribute super."tasty-html";
+  "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
+  "tasty-integrate" = dontDistribute super."tasty-integrate";
+  "tasty-laws" = dontDistribute super."tasty-laws";
+  "tasty-lens" = dontDistribute super."tasty-lens";
+  "tasty-program" = dontDistribute super."tasty-program";
+  "tasty-tap" = dontDistribute super."tasty-tap";
+  "tateti-tateti" = dontDistribute super."tateti-tateti";
+  "tau" = dontDistribute super."tau";
+  "tbox" = dontDistribute super."tbox";
+  "tcache-AWS" = dontDistribute super."tcache-AWS";
+  "tccli" = dontDistribute super."tccli";
+  "tce-conf" = dontDistribute super."tce-conf";
+  "tconfig" = dontDistribute super."tconfig";
+  "tcp" = dontDistribute super."tcp";
+  "tdd-util" = dontDistribute super."tdd-util";
+  "tdoc" = dontDistribute super."tdoc";
+  "teams" = dontDistribute super."teams";
+  "teeth" = dontDistribute super."teeth";
+  "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
+  "tellbot" = dontDistribute super."tellbot";
+  "template-default" = dontDistribute super."template-default";
+  "template-haskell-util" = dontDistribute super."template-haskell-util";
+  "template-hsml" = dontDistribute super."template-hsml";
+  "template-yj" = dontDistribute super."template-yj";
+  "templatepg" = dontDistribute super."templatepg";
+  "templater" = dontDistribute super."templater";
+  "tempodb" = dontDistribute super."tempodb";
+  "temporal-csound" = dontDistribute super."temporal-csound";
+  "temporal-media" = dontDistribute super."temporal-media";
+  "temporal-music-notation" = dontDistribute super."temporal-music-notation";
+  "temporal-music-notation-demo" = dontDistribute super."temporal-music-notation-demo";
+  "temporal-music-notation-western" = dontDistribute super."temporal-music-notation-western";
+  "temporary-resourcet" = dontDistribute super."temporary-resourcet";
+  "tempus" = dontDistribute super."tempus";
+  "tempus-fugit" = dontDistribute super."tempus-fugit";
+  "tensor" = dontDistribute super."tensor";
+  "term-rewriting" = dontDistribute super."term-rewriting";
+  "termbox-bindings" = dontDistribute super."termbox-bindings";
+  "termination-combinators" = dontDistribute super."termination-combinators";
+  "terminfo" = doDistribute super."terminfo_0_4_0_2";
+  "terminfo-hs" = dontDistribute super."terminfo-hs";
+  "termplot" = dontDistribute super."termplot";
+  "terrahs" = dontDistribute super."terrahs";
+  "tersmu" = dontDistribute super."tersmu";
+  "test-framework-doctest" = dontDistribute super."test-framework-doctest";
+  "test-framework-golden" = dontDistribute super."test-framework-golden";
+  "test-framework-program" = dontDistribute super."test-framework-program";
+  "test-framework-quickcheck" = dontDistribute super."test-framework-quickcheck";
+  "test-framework-sandbox" = dontDistribute super."test-framework-sandbox";
+  "test-framework-skip" = dontDistribute super."test-framework-skip";
+  "test-framework-smallcheck" = dontDistribute super."test-framework-smallcheck";
+  "test-framework-testing-feat" = dontDistribute super."test-framework-testing-feat";
+  "test-framework-th-prime" = dontDistribute super."test-framework-th-prime";
+  "test-invariant" = dontDistribute super."test-invariant";
+  "test-pkg" = dontDistribute super."test-pkg";
+  "test-sandbox" = dontDistribute super."test-sandbox";
+  "test-sandbox-compose" = dontDistribute super."test-sandbox-compose";
+  "test-sandbox-hunit" = dontDistribute super."test-sandbox-hunit";
+  "test-sandbox-quickcheck" = dontDistribute super."test-sandbox-quickcheck";
+  "test-shouldbe" = dontDistribute super."test-shouldbe";
+  "test-simple" = dontDistribute super."test-simple";
+  "testPkg" = dontDistribute super."testPkg";
+  "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
+  "testloop" = dontDistribute super."testloop";
+  "testpack" = dontDistribute super."testpack";
+  "testpattern" = dontDistribute super."testpattern";
+  "testrunner" = dontDistribute super."testrunner";
+  "tetris" = dontDistribute super."tetris";
+  "tex2txt" = dontDistribute super."tex2txt";
+  "texrunner" = dontDistribute super."texrunner";
+  "text-and-plots" = dontDistribute super."text-and-plots";
+  "text-format-simple" = dontDistribute super."text-format-simple";
+  "text-icu-translit" = dontDistribute super."text-icu-translit";
+  "text-json-qq" = dontDistribute super."text-json-qq";
+  "text-latin1" = dontDistribute super."text-latin1";
+  "text-ldap" = dontDistribute super."text-ldap";
+  "text-locale-encoding" = dontDistribute super."text-locale-encoding";
+  "text-normal" = dontDistribute super."text-normal";
+  "text-position" = dontDistribute super."text-position";
+  "text-postgresql" = dontDistribute super."text-postgresql";
+  "text-printer" = dontDistribute super."text-printer";
+  "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-register-machine" = dontDistribute super."text-register-machine";
+  "text-render" = dontDistribute super."text-render";
+  "text-show" = doDistribute super."text-show_2";
+  "text-show-instances" = dontDistribute super."text-show-instances";
+  "text-stream-decode" = dontDistribute super."text-stream-decode";
+  "text-utf7" = dontDistribute super."text-utf7";
+  "text-xml-generic" = dontDistribute super."text-xml-generic";
+  "text-xml-qq" = dontDistribute super."text-xml-qq";
+  "text-zipper" = dontDistribute super."text-zipper";
+  "text1" = dontDistribute super."text1";
+  "textPlot" = dontDistribute super."textPlot";
+  "textmatetags" = dontDistribute super."textmatetags";
+  "textocat-api" = dontDistribute super."textocat-api";
+  "texts" = dontDistribute super."texts";
+  "tfp" = dontDistribute super."tfp";
+  "tfp-th" = dontDistribute super."tfp-th";
+  "tftp" = dontDistribute super."tftp";
+  "tga" = dontDistribute super."tga";
+  "th-alpha" = dontDistribute super."th-alpha";
+  "th-build" = dontDistribute super."th-build";
+  "th-cas" = dontDistribute super."th-cas";
+  "th-context" = dontDistribute super."th-context";
+  "th-fold" = dontDistribute super."th-fold";
+  "th-inline-io-action" = dontDistribute super."th-inline-io-action";
+  "th-instance-reification" = dontDistribute super."th-instance-reification";
+  "th-instances" = dontDistribute super."th-instances";
+  "th-kinds" = dontDistribute super."th-kinds";
+  "th-kinds-fork" = dontDistribute super."th-kinds-fork";
+  "th-lift-instances" = dontDistribute super."th-lift-instances";
+  "th-orphans" = doDistribute super."th-orphans_0_12_2";
+  "th-printf" = dontDistribute super."th-printf";
+  "th-sccs" = dontDistribute super."th-sccs";
+  "th-traced" = dontDistribute super."th-traced";
+  "th-typegraph" = dontDistribute super."th-typegraph";
+  "themoviedb" = dontDistribute super."themoviedb";
+  "themplate" = dontDistribute super."themplate";
+  "theoremquest" = dontDistribute super."theoremquest";
+  "theoremquest-client" = dontDistribute super."theoremquest-client";
+  "these" = dontDistribute super."these";
+  "thespian" = dontDistribute super."thespian";
+  "theta-functions" = dontDistribute super."theta-functions";
+  "thih" = dontDistribute super."thih";
+  "thimk" = dontDistribute super."thimk";
+  "thorn" = dontDistribute super."thorn";
+  "thread-local-storage" = dontDistribute super."thread-local-storage";
+  "threadPool" = dontDistribute super."threadPool";
+  "threadmanager" = dontDistribute super."threadmanager";
+  "threads-pool" = dontDistribute super."threads-pool";
+  "threads-supervisor" = dontDistribute super."threads-supervisor";
+  "threadscope" = dontDistribute super."threadscope";
+  "threefish" = dontDistribute super."threefish";
+  "threepenny-gui" = dontDistribute super."threepenny-gui";
+  "thrift" = dontDistribute super."thrift";
+  "thrist" = dontDistribute super."thrist";
+  "throttle" = dontDistribute super."throttle";
+  "thumbnail" = dontDistribute super."thumbnail";
+  "tianbar" = dontDistribute super."tianbar";
+  "tic-tac-toe" = dontDistribute super."tic-tac-toe";
+  "tickle" = dontDistribute super."tickle";
+  "tictactoe3d" = dontDistribute super."tictactoe3d";
+  "tidal" = dontDistribute super."tidal";
+  "tidal-midi" = dontDistribute super."tidal-midi";
+  "tidal-vis" = dontDistribute super."tidal-vis";
+  "tie-knot" = dontDistribute super."tie-knot";
+  "tiempo" = dontDistribute super."tiempo";
+  "tiger" = dontDistribute super."tiger";
+  "tight-apply" = dontDistribute super."tight-apply";
+  "tightrope" = dontDistribute super."tightrope";
+  "tighttp" = dontDistribute super."tighttp";
+  "tilings" = dontDistribute super."tilings";
+  "timberc" = dontDistribute super."timberc";
+  "time-extras" = dontDistribute super."time-extras";
+  "time-exts" = dontDistribute super."time-exts";
+  "time-http" = dontDistribute super."time-http";
+  "time-interval" = dontDistribute super."time-interval";
+  "time-io-access" = dontDistribute super."time-io-access";
+  "time-parsers" = dontDistribute super."time-parsers";
+  "time-patterns" = dontDistribute super."time-patterns";
+  "time-qq" = dontDistribute super."time-qq";
+  "time-recurrence" = dontDistribute super."time-recurrence";
+  "time-series" = dontDistribute super."time-series";
+  "time-units" = dontDistribute super."time-units";
+  "time-w3c" = dontDistribute super."time-w3c";
+  "timecalc" = dontDistribute super."timecalc";
+  "timeconsole" = dontDistribute super."timeconsole";
+  "timeless" = dontDistribute super."timeless";
+  "timelike" = dontDistribute super."timelike";
+  "timelike-time" = dontDistribute super."timelike-time";
+  "timemap" = dontDistribute super."timemap";
+  "timeout" = dontDistribute super."timeout";
+  "timeout-control" = dontDistribute super."timeout-control";
+  "timeout-with-results" = dontDistribute super."timeout-with-results";
+  "timeparsers" = dontDistribute super."timeparsers";
+  "timeplot" = dontDistribute super."timeplot";
+  "timers" = dontDistribute super."timers";
+  "timers-updatable" = dontDistribute super."timers-updatable";
+  "timestamp-subprocess-lines" = dontDistribute super."timestamp-subprocess-lines";
+  "timestamper" = dontDistribute super."timestamper";
+  "timezone-olson-th" = dontDistribute super."timezone-olson-th";
+  "timing-convenience" = dontDistribute super."timing-convenience";
+  "tinyMesh" = dontDistribute super."tinyMesh";
+  "tinytemplate" = dontDistribute super."tinytemplate";
+  "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
+  "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
+  "titlecase" = dontDistribute super."titlecase";
+  "tkhs" = dontDistribute super."tkhs";
+  "tkyprof" = dontDistribute super."tkyprof";
+  "tld" = dontDistribute super."tld";
+  "tls" = doDistribute super."tls_1_3_2";
+  "tls-debug" = doDistribute super."tls-debug_0_4_0";
+  "tls-extra" = dontDistribute super."tls-extra";
+  "tmpl" = dontDistribute super."tmpl";
+  "tn" = dontDistribute super."tn";
+  "tnet" = dontDistribute super."tnet";
+  "to-haskell" = dontDistribute super."to-haskell";
+  "to-string-class" = dontDistribute super."to-string-class";
+  "to-string-instances" = dontDistribute super."to-string-instances";
+  "todos" = dontDistribute super."todos";
+  "tofromxml" = dontDistribute super."tofromxml";
+  "toilet" = dontDistribute super."toilet";
+  "tokenify" = dontDistribute super."tokenify";
+  "tokenize" = dontDistribute super."tokenize";
+  "toktok" = dontDistribute super."toktok";
+  "tokyocabinet-haskell" = dontDistribute super."tokyocabinet-haskell";
+  "tokyotyrant-haskell" = dontDistribute super."tokyotyrant-haskell";
+  "tomato-rubato-openal" = dontDistribute super."tomato-rubato-openal";
+  "toml" = dontDistribute super."toml";
+  "toolshed" = dontDistribute super."toolshed";
+  "topkata" = dontDistribute super."topkata";
+  "torch" = dontDistribute super."torch";
+  "total" = dontDistribute super."total";
+  "total-map" = dontDistribute super."total-map";
+  "total-maps" = dontDistribute super."total-maps";
+  "touched" = dontDistribute super."touched";
+  "toysolver" = dontDistribute super."toysolver";
+  "tpdb" = dontDistribute super."tpdb";
+  "trace" = dontDistribute super."trace";
+  "trace-call" = dontDistribute super."trace-call";
+  "trace-function-call" = dontDistribute super."trace-function-call";
+  "traced" = dontDistribute super."traced";
+  "tracer" = dontDistribute super."tracer";
+  "tracker" = dontDistribute super."tracker";
+  "tracy" = dontDistribute super."tracy";
+  "trajectory" = dontDistribute super."trajectory";
+  "transactional-events" = dontDistribute super."transactional-events";
+  "transf" = dontDistribute super."transf";
+  "transformations" = dontDistribute super."transformations";
+  "transformers-abort" = dontDistribute super."transformers-abort";
+  "transformers-compose" = dontDistribute super."transformers-compose";
+  "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-runnable" = dontDistribute super."transformers-runnable";
+  "transformers-supply" = dontDistribute super."transformers-supply";
+  "transient" = dontDistribute super."transient";
+  "translatable-intset" = dontDistribute super."translatable-intset";
+  "translate" = dontDistribute super."translate";
+  "travis" = dontDistribute super."travis";
+  "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
+  "trawl" = dontDistribute super."trawl";
+  "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-monad" = dontDistribute super."tree-monad";
+  "treemap-html" = dontDistribute super."treemap-html";
+  "treemap-html-tools" = dontDistribute super."treemap-html-tools";
+  "treersec" = dontDistribute super."treersec";
+  "treeviz" = dontDistribute super."treeviz";
+  "tremulous-query" = dontDistribute super."tremulous-query";
+  "trhsx" = dontDistribute super."trhsx";
+  "triangulation" = dontDistribute super."triangulation";
+  "tries" = dontDistribute super."tries";
+  "trimpolya" = dontDistribute super."trimpolya";
+  "tripLL" = dontDistribute super."tripLL";
+  "trivia" = dontDistribute super."trivia";
+  "trivial-constraint" = dontDistribute super."trivial-constraint";
+  "tropical" = dontDistribute super."tropical";
+  "true-name" = dontDistribute super."true-name";
+  "truelevel" = dontDistribute super."truelevel";
+  "trurl" = dontDistribute super."trurl";
+  "truthful" = dontDistribute super."truthful";
+  "tsession" = dontDistribute super."tsession";
+  "tsession-happstack" = dontDistribute super."tsession-happstack";
+  "tskiplist" = dontDistribute super."tskiplist";
+  "tslogger" = dontDistribute super."tslogger";
+  "tsp-viz" = dontDistribute super."tsp-viz";
+  "tsparse" = dontDistribute super."tsparse";
+  "tst" = dontDistribute super."tst";
+  "tsvsql" = dontDistribute super."tsvsql";
+  "ttrie" = dontDistribute super."ttrie";
+  "tttool" = doDistribute super."tttool_1_4_0_5";
+  "tubes" = dontDistribute super."tubes";
+  "tuntap" = dontDistribute super."tuntap";
+  "tup-functor" = dontDistribute super."tup-functor";
+  "tuple-gen" = dontDistribute super."tuple-gen";
+  "tuple-generic" = dontDistribute super."tuple-generic";
+  "tuple-hlist" = dontDistribute super."tuple-hlist";
+  "tuple-lenses" = dontDistribute super."tuple-lenses";
+  "tuple-morph" = dontDistribute super."tuple-morph";
+  "tuple-th" = dontDistribute super."tuple-th";
+  "tupleinstances" = dontDistribute super."tupleinstances";
+  "turing" = dontDistribute super."turing";
+  "turing-music" = dontDistribute super."turing-music";
+  "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
+  "turni" = dontDistribute super."turni";
+  "tweak" = dontDistribute super."tweak";
+  "twentefp" = dontDistribute super."twentefp";
+  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
+  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
+  "twentefp-graphs" = dontDistribute super."twentefp-graphs";
+  "twentefp-number" = dontDistribute super."twentefp-number";
+  "twentefp-rosetree" = dontDistribute super."twentefp-rosetree";
+  "twentefp-trees" = dontDistribute super."twentefp-trees";
+  "twentefp-websockets" = dontDistribute super."twentefp-websockets";
+  "twhs" = dontDistribute super."twhs";
+  "twidge" = dontDistribute super."twidge";
+  "twilight-stm" = dontDistribute super."twilight-stm";
+  "twilio" = dontDistribute super."twilio";
+  "twill" = dontDistribute super."twill";
+  "twiml" = dontDistribute super."twiml";
+  "twine" = dontDistribute super."twine";
+  "twisty" = dontDistribute super."twisty";
+  "twitch" = dontDistribute super."twitch";
+  "twitter" = dontDistribute super."twitter";
+  "twitter-conduit" = dontDistribute super."twitter-conduit";
+  "twitter-enumerator" = dontDistribute super."twitter-enumerator";
+  "twitter-types" = dontDistribute super."twitter-types";
+  "twitter-types-lens" = dontDistribute super."twitter-types-lens";
+  "tx" = dontDistribute super."tx";
+  "txt-sushi" = dontDistribute super."txt-sushi";
+  "txt2rtf" = dontDistribute super."txt2rtf";
+  "txtblk" = dontDistribute super."txtblk";
+  "ty" = dontDistribute super."ty";
+  "typalyze" = dontDistribute super."typalyze";
+  "type-aligned" = dontDistribute super."type-aligned";
+  "type-booleans" = dontDistribute super."type-booleans";
+  "type-cereal" = dontDistribute super."type-cereal";
+  "type-combinators" = dontDistribute super."type-combinators";
+  "type-combinators-quote" = dontDistribute super."type-combinators-quote";
+  "type-digits" = dontDistribute super."type-digits";
+  "type-equality" = dontDistribute super."type-equality";
+  "type-equality-check" = dontDistribute super."type-equality-check";
+  "type-fun" = dontDistribute super."type-fun";
+  "type-functions" = dontDistribute super."type-functions";
+  "type-hint" = dontDistribute super."type-hint";
+  "type-int" = dontDistribute super."type-int";
+  "type-iso" = dontDistribute super."type-iso";
+  "type-level" = dontDistribute super."type-level";
+  "type-level-bst" = dontDistribute super."type-level-bst";
+  "type-level-natural-number" = dontDistribute super."type-level-natural-number";
+  "type-level-natural-number-induction" = dontDistribute super."type-level-natural-number-induction";
+  "type-level-natural-number-operations" = dontDistribute super."type-level-natural-number-operations";
+  "type-level-sets" = dontDistribute super."type-level-sets";
+  "type-level-tf" = dontDistribute super."type-level-tf";
+  "type-list" = doDistribute super."type-list_0_2_0_0";
+  "type-natural" = dontDistribute super."type-natural";
+  "type-ord" = dontDistribute super."type-ord";
+  "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
+  "type-prelude" = dontDistribute super."type-prelude";
+  "type-settheory" = dontDistribute super."type-settheory";
+  "type-spine" = dontDistribute super."type-spine";
+  "type-structure" = dontDistribute super."type-structure";
+  "type-sub-th" = dontDistribute super."type-sub-th";
+  "type-unary" = dontDistribute super."type-unary";
+  "typeable-th" = dontDistribute super."typeable-th";
+  "typed-spreadsheet" = dontDistribute super."typed-spreadsheet";
+  "typed-wire" = dontDistribute super."typed-wire";
+  "typed-wire-utils" = dontDistribute super."typed-wire-utils";
+  "typedquery" = dontDistribute super."typedquery";
+  "typehash" = dontDistribute super."typehash";
+  "typelevel" = dontDistribute super."typelevel";
+  "typelevel-tensor" = dontDistribute super."typelevel-tensor";
+  "typelits-witnesses" = dontDistribute super."typelits-witnesses";
+  "typeof" = dontDistribute super."typeof";
+  "typeparams" = dontDistribute super."typeparams";
+  "typesafe-endian" = dontDistribute super."typesafe-endian";
+  "typescript-docs" = dontDistribute super."typescript-docs";
+  "typical" = dontDistribute super."typical";
+  "typography-geometry" = dontDistribute super."typography-geometry";
+  "tz" = dontDistribute super."tz";
+  "tzdata" = dontDistribute super."tzdata";
+  "uAgda" = dontDistribute super."uAgda";
+  "ua-parser" = dontDistribute super."ua-parser";
+  "uacpid" = dontDistribute super."uacpid";
+  "uberlast" = dontDistribute super."uberlast";
+  "uconv" = dontDistribute super."uconv";
+  "udbus" = dontDistribute super."udbus";
+  "udbus-model" = dontDistribute super."udbus-model";
+  "udcode" = dontDistribute super."udcode";
+  "udev" = dontDistribute super."udev";
+  "uglymemo" = dontDistribute super."uglymemo";
+  "uhc-light" = dontDistribute super."uhc-light";
+  "uhc-util" = dontDistribute super."uhc-util";
+  "uhexdump" = dontDistribute super."uhexdump";
+  "uhttpc" = dontDistribute super."uhttpc";
+  "ui-command" = dontDistribute super."ui-command";
+  "uid" = dontDistribute super."uid";
+  "una" = dontDistribute super."una";
+  "unagi-chan" = dontDistribute super."unagi-chan";
+  "unagi-streams" = dontDistribute super."unagi-streams";
+  "unamb" = dontDistribute super."unamb";
+  "unamb-custom" = dontDistribute super."unamb-custom";
+  "unbound" = dontDistribute super."unbound";
+  "unbound-generics" = doDistribute super."unbound-generics_0_2";
+  "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
+  "unboxed-containers" = dontDistribute super."unboxed-containers";
+  "unbreak" = dontDistribute super."unbreak";
+  "unexceptionalio" = dontDistribute super."unexceptionalio";
+  "unfoldable" = dontDistribute super."unfoldable";
+  "ungadtagger" = dontDistribute super."ungadtagger";
+  "uni-events" = dontDistribute super."uni-events";
+  "uni-graphs" = dontDistribute super."uni-graphs";
+  "uni-htk" = dontDistribute super."uni-htk";
+  "uni-posixutil" = dontDistribute super."uni-posixutil";
+  "uni-reactor" = dontDistribute super."uni-reactor";
+  "uni-uDrawGraph" = dontDistribute super."uni-uDrawGraph";
+  "uni-util" = dontDistribute super."uni-util";
+  "unicode" = dontDistribute super."unicode";
+  "unicode-names" = dontDistribute super."unicode-names";
+  "unicode-normalization" = dontDistribute super."unicode-normalization";
+  "unicode-prelude" = dontDistribute super."unicode-prelude";
+  "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-symbols" = dontDistribute super."unicode-symbols";
+  "unicoder" = dontDistribute super."unicoder";
+  "unification-fd" = dontDistribute super."unification-fd";
+  "uniform-io" = dontDistribute super."uniform-io";
+  "uniform-pair" = dontDistribute super."uniform-pair";
+  "union-find-array" = dontDistribute super."union-find-array";
+  "union-map" = dontDistribute super."union-map";
+  "unique" = dontDistribute super."unique";
+  "unique-logic" = dontDistribute super."unique-logic";
+  "unique-logic-tf" = dontDistribute super."unique-logic-tf";
+  "uniqueid" = dontDistribute super."uniqueid";
+  "unit" = dontDistribute super."unit";
+  "units" = dontDistribute super."units";
+  "units-attoparsec" = dontDistribute super."units-attoparsec";
+  "units-defs" = dontDistribute super."units-defs";
+  "units-parser" = dontDistribute super."units-parser";
+  "unittyped" = dontDistribute super."unittyped";
+  "universal-binary" = dontDistribute super."universal-binary";
+  "universe" = dontDistribute super."universe";
+  "universe-base" = dontDistribute super."universe-base";
+  "universe-instances-base" = dontDistribute super."universe-instances-base";
+  "universe-instances-extended" = dontDistribute super."universe-instances-extended";
+  "universe-instances-trans" = dontDistribute super."universe-instances-trans";
+  "universe-reverse-instances" = dontDistribute super."universe-reverse-instances";
+  "universe-th" = dontDistribute super."universe-th";
+  "unix-bytestring" = dontDistribute super."unix-bytestring";
+  "unix-fcntl" = dontDistribute super."unix-fcntl";
+  "unix-handle" = dontDistribute super."unix-handle";
+  "unix-io-extra" = dontDistribute super."unix-io-extra";
+  "unix-memory" = dontDistribute super."unix-memory";
+  "unix-process-conduit" = dontDistribute super."unix-process-conduit";
+  "unix-pty-light" = dontDistribute super."unix-pty-light";
+  "unlit" = dontDistribute super."unlit";
+  "unm-hip" = dontDistribute super."unm-hip";
+  "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
+  "unordered-graphs" = dontDistribute super."unordered-graphs";
+  "unpack-funcs" = dontDistribute super."unpack-funcs";
+  "unroll-ghc-plugin" = dontDistribute super."unroll-ghc-plugin";
+  "unsafe" = dontDistribute super."unsafe";
+  "unsafe-promises" = dontDistribute super."unsafe-promises";
+  "unsafely" = dontDistribute super."unsafely";
+  "unsafeperformst" = dontDistribute super."unsafeperformst";
+  "unscramble" = dontDistribute super."unscramble";
+  "unusable-pkg" = dontDistribute super."unusable-pkg";
+  "uom-plugin" = dontDistribute super."uom-plugin";
+  "up" = dontDistribute super."up";
+  "up-grade" = dontDistribute super."up-grade";
+  "uploadcare" = dontDistribute super."uploadcare";
+  "upskirt" = dontDistribute super."upskirt";
+  "ureader" = dontDistribute super."ureader";
+  "urembed" = dontDistribute super."urembed";
+  "uri" = dontDistribute super."uri";
+  "uri-conduit" = dontDistribute super."uri-conduit";
+  "uri-enumerator" = dontDistribute super."uri-enumerator";
+  "uri-enumerator-file" = dontDistribute super."uri-enumerator-file";
+  "uri-template" = dontDistribute super."uri-template";
+  "url-generic" = dontDistribute super."url-generic";
+  "urlcheck" = dontDistribute super."urlcheck";
+  "urldecode" = dontDistribute super."urldecode";
+  "urldisp-happstack" = dontDistribute super."urldisp-happstack";
+  "urlencoded" = dontDistribute super."urlencoded";
+  "urlpath" = doDistribute super."urlpath_2_1_0";
+  "urn" = dontDistribute super."urn";
+  "urxml" = dontDistribute super."urxml";
+  "usb" = dontDistribute super."usb";
+  "usb-enumerator" = dontDistribute super."usb-enumerator";
+  "usb-hid" = dontDistribute super."usb-hid";
+  "usb-id-database" = dontDistribute super."usb-id-database";
+  "usb-iteratee" = dontDistribute super."usb-iteratee";
+  "usb-safe" = dontDistribute super."usb-safe";
+  "userid" = dontDistribute super."userid";
+  "utc" = dontDistribute super."utc";
+  "utf8-env" = dontDistribute super."utf8-env";
+  "utf8-prelude" = dontDistribute super."utf8-prelude";
+  "utility-ht" = dontDistribute super."utility-ht";
+  "uu-cco" = dontDistribute super."uu-cco";
+  "uu-cco-examples" = dontDistribute super."uu-cco-examples";
+  "uu-cco-hut-parsing" = dontDistribute super."uu-cco-hut-parsing";
+  "uu-cco-uu-parsinglib" = dontDistribute super."uu-cco-uu-parsinglib";
+  "uu-options" = dontDistribute super."uu-options";
+  "uu-tc" = dontDistribute super."uu-tc";
+  "uuagc" = dontDistribute super."uuagc";
+  "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap";
+  "uuagc-cabal" = dontDistribute super."uuagc-cabal";
+  "uuagc-diagrams" = dontDistribute super."uuagc-diagrams";
+  "uuagd" = dontDistribute super."uuagd";
+  "uuid-aeson" = dontDistribute super."uuid-aeson";
+  "uuid-le" = dontDistribute super."uuid-le";
+  "uuid-orphans" = dontDistribute super."uuid-orphans";
+  "uuid-quasi" = dontDistribute super."uuid-quasi";
+  "uulib" = dontDistribute super."uulib";
+  "uvector" = dontDistribute super."uvector";
+  "uvector-algorithms" = dontDistribute super."uvector-algorithms";
+  "uxadt" = dontDistribute super."uxadt";
+  "uzbl-with-source" = dontDistribute super."uzbl-with-source";
+  "v4l2" = dontDistribute super."v4l2";
+  "v4l2-examples" = dontDistribute super."v4l2-examples";
+  "vacuum" = dontDistribute super."vacuum";
+  "vacuum-cairo" = dontDistribute super."vacuum-cairo";
+  "vacuum-graphviz" = dontDistribute super."vacuum-graphviz";
+  "vacuum-opengl" = dontDistribute super."vacuum-opengl";
+  "vacuum-ubigraph" = dontDistribute super."vacuum-ubigraph";
+  "vado" = dontDistribute super."vado";
+  "valid-names" = dontDistribute super."valid-names";
+  "validate" = dontDistribute super."validate";
+  "validate-input" = doDistribute super."validate-input_0_2_0_0";
+  "validated-literals" = dontDistribute super."validated-literals";
+  "validation" = dontDistribute super."validation";
+  "validations" = dontDistribute super."validations";
+  "value-supply" = dontDistribute super."value-supply";
+  "vampire" = dontDistribute super."vampire";
+  "var" = dontDistribute super."var";
+  "varan" = dontDistribute super."varan";
+  "variable-precision" = dontDistribute super."variable-precision";
+  "variables" = dontDistribute super."variables";
+  "varying" = dontDistribute super."varying";
+  "vaultaire-common" = dontDistribute super."vaultaire-common";
+  "vcache" = dontDistribute super."vcache";
+  "vcache-trie" = dontDistribute super."vcache-trie";
+  "vcard" = dontDistribute super."vcard";
+  "vcd" = dontDistribute super."vcd";
+  "vcs-revision" = dontDistribute super."vcs-revision";
+  "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
+  "vcsgui" = dontDistribute super."vcsgui";
+  "vcswrapper" = dontDistribute super."vcswrapper";
+  "vect" = dontDistribute super."vect";
+  "vect-floating" = dontDistribute super."vect-floating";
+  "vect-floating-accelerate" = dontDistribute super."vect-floating-accelerate";
+  "vect-opengl" = dontDistribute super."vect-opengl";
+  "vector" = doDistribute super."vector_0_10_12_3";
+  "vector-binary" = dontDistribute super."vector-binary";
+  "vector-bytestring" = dontDistribute super."vector-bytestring";
+  "vector-clock" = dontDistribute super."vector-clock";
+  "vector-conduit" = dontDistribute super."vector-conduit";
+  "vector-fftw" = dontDistribute super."vector-fftw";
+  "vector-functorlazy" = dontDistribute super."vector-functorlazy";
+  "vector-heterogenous" = dontDistribute super."vector-heterogenous";
+  "vector-instances-collections" = dontDistribute super."vector-instances-collections";
+  "vector-mmap" = dontDistribute super."vector-mmap";
+  "vector-random" = dontDistribute super."vector-random";
+  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space-map" = dontDistribute super."vector-space-map";
+  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
+  "vector-static" = dontDistribute super."vector-static";
+  "vector-strategies" = dontDistribute super."vector-strategies";
+  "verbalexpressions" = dontDistribute super."verbalexpressions";
+  "verbosity" = dontDistribute super."verbosity";
+  "verdict" = dontDistribute super."verdict";
+  "verdict-json" = dontDistribute super."verdict-json";
+  "verilog" = dontDistribute super."verilog";
+  "versions" = dontDistribute super."versions";
+  "vhdl" = dontDistribute super."vhdl";
+  "views" = dontDistribute super."views";
+  "vigilance" = dontDistribute super."vigilance";
+  "vimeta" = dontDistribute super."vimeta";
+  "vimus" = dontDistribute super."vimus";
+  "vintage-basic" = dontDistribute super."vintage-basic";
+  "vinyl" = dontDistribute super."vinyl";
+  "vinyl-gl" = dontDistribute super."vinyl-gl";
+  "vinyl-json" = dontDistribute super."vinyl-json";
+  "vinyl-utils" = dontDistribute super."vinyl-utils";
+  "vinyl-vectors" = dontDistribute super."vinyl-vectors";
+  "virthualenv" = dontDistribute super."virthualenv";
+  "visibility" = dontDistribute super."visibility";
+  "vision" = dontDistribute super."vision";
+  "visual-graphrewrite" = dontDistribute super."visual-graphrewrite";
+  "visual-prof" = dontDistribute super."visual-prof";
+  "vivid" = dontDistribute super."vivid";
+  "vk-aws-route53" = dontDistribute super."vk-aws-route53";
+  "vk-posix-pty" = dontDistribute super."vk-posix-pty";
+  "vocabulary-kadma" = dontDistribute super."vocabulary-kadma";
+  "vorbiscomment" = dontDistribute super."vorbiscomment";
+  "vowpal-utils" = dontDistribute super."vowpal-utils";
+  "voyeur" = dontDistribute super."voyeur";
+  "vrpn" = dontDistribute super."vrpn";
+  "vte" = dontDistribute super."vte";
+  "vtegtk3" = dontDistribute super."vtegtk3";
+  "vty" = dontDistribute super."vty";
+  "vty-examples" = dontDistribute super."vty-examples";
+  "vty-menu" = dontDistribute super."vty-menu";
+  "vty-ui" = dontDistribute super."vty-ui";
+  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "waddle" = dontDistribute super."waddle";
+  "wai-accept-language" = dontDistribute super."wai-accept-language";
+  "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-devel" = dontDistribute super."wai-devel";
+  "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
+  "wai-dispatch" = dontDistribute super."wai-dispatch";
+  "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi";
+  "wai-graceful" = dontDistribute super."wai-graceful";
+  "wai-handler-devel" = dontDistribute super."wai-handler-devel";
+  "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
+  "wai-handler-snap" = dontDistribute super."wai-handler-snap";
+  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
+  "wai-hastache" = dontDistribute super."wai-hastache";
+  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-lens" = dontDistribute super."wai-lens";
+  "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
+  "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
+  "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
+  "wai-middleware-caching" = dontDistribute super."wai-middleware-caching";
+  "wai-middleware-caching-lru" = dontDistribute super."wai-middleware-caching-lru";
+  "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis";
+  "wai-middleware-catch" = dontDistribute super."wai-middleware-catch";
+  "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type";
+  "wai-middleware-etag" = dontDistribute super."wai-middleware-etag";
+  "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip";
+  "wai-middleware-headers" = dontDistribute super."wai-middleware-headers";
+  "wai-middleware-hmac" = dontDistribute super."wai-middleware-hmac";
+  "wai-middleware-hmac-client" = dontDistribute super."wai-middleware-hmac-client";
+  "wai-middleware-metrics" = dontDistribute super."wai-middleware-metrics";
+  "wai-middleware-preprocessor" = dontDistribute super."wai-middleware-preprocessor";
+  "wai-middleware-route" = dontDistribute super."wai-middleware-route";
+  "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1";
+  "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching";
+  "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs";
+  "wai-request-spec" = dontDistribute super."wai-request-spec";
+  "wai-responsible" = dontDistribute super."wai-responsible";
+  "wai-router" = dontDistribute super."wai-router";
+  "wai-routes" = doDistribute super."wai-routes_0_7_3";
+  "wai-session-alt" = dontDistribute super."wai-session-alt";
+  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
+  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
+  "wai-static-cache" = dontDistribute super."wai-static-cache";
+  "wai-static-pages" = dontDistribute super."wai-static-pages";
+  "wai-test" = dontDistribute super."wai-test";
+  "wai-thrift" = dontDistribute super."wai-thrift";
+  "wai-throttler" = dontDistribute super."wai-throttler";
+  "wai-transformers" = dontDistribute super."wai-transformers";
+  "wai-util" = dontDistribute super."wai-util";
+  "wait-handle" = dontDistribute super."wait-handle";
+  "waitfree" = dontDistribute super."waitfree";
+  "warc" = dontDistribute super."warc";
+  "warp" = doDistribute super."warp_3_1_3_1";
+  "warp-dynamic" = dontDistribute super."warp-dynamic";
+  "warp-static" = dontDistribute super."warp-static";
+  "warp-tls" = doDistribute super."warp-tls_3_1_3";
+  "warp-tls-uid" = dontDistribute super."warp-tls-uid";
+  "watchdog" = dontDistribute super."watchdog";
+  "watcher" = dontDistribute super."watcher";
+  "watchit" = dontDistribute super."watchit";
+  "wavconvert" = dontDistribute super."wavconvert";
+  "wavefront" = dontDistribute super."wavefront";
+  "wavesurfer" = dontDistribute super."wavesurfer";
+  "wavy" = dontDistribute super."wavy";
+  "wcwidth" = dontDistribute super."wcwidth";
+  "weather-api" = dontDistribute super."weather-api";
+  "web-browser-in-haskell" = dontDistribute super."web-browser-in-haskell";
+  "web-css" = dontDistribute super."web-css";
+  "web-encodings" = dontDistribute super."web-encodings";
+  "web-mongrel2" = dontDistribute super."web-mongrel2";
+  "web-page" = dontDistribute super."web-page";
+  "web-plugins" = dontDistribute super."web-plugins";
+  "web-routes" = dontDistribute super."web-routes";
+  "web-routes-boomerang" = dontDistribute super."web-routes-boomerang";
+  "web-routes-happstack" = dontDistribute super."web-routes-happstack";
+  "web-routes-hsp" = dontDistribute super."web-routes-hsp";
+  "web-routes-mtl" = dontDistribute super."web-routes-mtl";
+  "web-routes-quasi" = dontDistribute super."web-routes-quasi";
+  "web-routes-regular" = dontDistribute super."web-routes-regular";
+  "web-routes-th" = dontDistribute super."web-routes-th";
+  "web-routes-transformers" = dontDistribute super."web-routes-transformers";
+  "web-routes-wai" = dontDistribute super."web-routes-wai";
+  "webapi" = dontDistribute super."webapi";
+  "webapp" = dontDistribute super."webapp";
+  "webcrank" = dontDistribute super."webcrank";
+  "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
+  "webcrank-wai" = dontDistribute super."webcrank-wai";
+  "webdriver" = doDistribute super."webdriver_0_6_3_1";
+  "webdriver-snoy" = dontDistribute super."webdriver-snoy";
+  "webfinger-client" = dontDistribute super."webfinger-client";
+  "webidl" = dontDistribute super."webidl";
+  "webify" = dontDistribute super."webify";
+  "webkit" = dontDistribute super."webkit";
+  "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore";
+  "webkitgtk3" = dontDistribute super."webkitgtk3";
+  "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore";
+  "webrtc-vad" = dontDistribute super."webrtc-vad";
+  "webserver" = dontDistribute super."webserver";
+  "websnap" = dontDistribute super."websnap";
+  "websockets-snap" = dontDistribute super."websockets-snap";
+  "webwire" = dontDistribute super."webwire";
+  "wedding-announcement" = dontDistribute super."wedding-announcement";
+  "wedged" = dontDistribute super."wedged";
+  "weighted-regexp" = dontDistribute super."weighted-regexp";
+  "weighted-search" = dontDistribute super."weighted-search";
+  "welshy" = dontDistribute super."welshy";
+  "wheb-mongo" = dontDistribute super."wheb-mongo";
+  "wheb-redis" = dontDistribute super."wheb-redis";
+  "wheb-strapped" = dontDistribute super."wheb-strapped";
+  "while-lang-parser" = dontDistribute super."while-lang-parser";
+  "whim" = dontDistribute super."whim";
+  "whiskers" = dontDistribute super."whiskers";
+  "whitespace" = dontDistribute super."whitespace";
+  "whois" = dontDistribute super."whois";
+  "why3" = dontDistribute super."why3";
+  "wigner-symbols" = dontDistribute super."wigner-symbols";
+  "wikipedia4epub" = dontDistribute super."wikipedia4epub";
+  "win-hp-path" = dontDistribute super."win-hp-path";
+  "windowslive" = dontDistribute super."windowslive";
+  "winerror" = dontDistribute super."winerror";
+  "winio" = dontDistribute super."winio";
+  "wiring" = dontDistribute super."wiring";
+  "withdependencies" = dontDistribute super."withdependencies";
+  "witness" = dontDistribute super."witness";
+  "witty" = dontDistribute super."witty";
+  "wkt" = dontDistribute super."wkt";
+  "wl-pprint-ansiterm" = dontDistribute super."wl-pprint-ansiterm";
+  "wlc-hs" = dontDistribute super."wlc-hs";
+  "wobsurv" = dontDistribute super."wobsurv";
+  "woffex" = dontDistribute super."woffex";
+  "wol" = dontDistribute super."wol";
+  "wolf" = dontDistribute super."wolf";
+  "woot" = dontDistribute super."woot";
+  "word-trie" = dontDistribute super."word-trie";
+  "word24" = dontDistribute super."word24";
+  "wordcloud" = dontDistribute super."wordcloud";
+  "wordexp" = dontDistribute super."wordexp";
+  "words" = dontDistribute super."words";
+  "wordsearch" = dontDistribute super."wordsearch";
+  "wordsetdiff" = dontDistribute super."wordsetdiff";
+  "workflow-osx" = dontDistribute super."workflow-osx";
+  "wp-archivebot" = dontDistribute super."wp-archivebot";
+  "wraparound" = dontDistribute super."wraparound";
+  "wraxml" = dontDistribute super."wraxml";
+  "wreq-sb" = dontDistribute super."wreq-sb";
+  "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
+  "wsedit" = dontDistribute super."wsedit";
+  "wtk" = dontDistribute super."wtk";
+  "wtk-gtk" = dontDistribute super."wtk-gtk";
+  "wumpus-basic" = dontDistribute super."wumpus-basic";
+  "wumpus-core" = dontDistribute super."wumpus-core";
+  "wumpus-drawing" = dontDistribute super."wumpus-drawing";
+  "wumpus-microprint" = dontDistribute super."wumpus-microprint";
+  "wumpus-tree" = dontDistribute super."wumpus-tree";
+  "wuss" = dontDistribute super."wuss";
+  "wx" = dontDistribute super."wx";
+  "wxAsteroids" = dontDistribute super."wxAsteroids";
+  "wxFruit" = dontDistribute super."wxFruit";
+  "wxc" = dontDistribute super."wxc";
+  "wxcore" = dontDistribute super."wxcore";
+  "wxdirect" = dontDistribute super."wxdirect";
+  "wxhnotepad" = dontDistribute super."wxhnotepad";
+  "wxturtle" = dontDistribute super."wxturtle";
+  "wybor" = dontDistribute super."wybor";
+  "wyvern" = dontDistribute super."wyvern";
+  "x-dsp" = dontDistribute super."x-dsp";
+  "x11-xim" = dontDistribute super."x11-xim";
+  "x11-xinput" = dontDistribute super."x11-xinput";
+  "x509-util" = dontDistribute super."x509-util";
+  "xattr" = dontDistribute super."xattr";
+  "xbattbar" = dontDistribute super."xbattbar";
+  "xcb-types" = dontDistribute super."xcb-types";
+  "xcffib" = dontDistribute super."xcffib";
+  "xchat-plugin" = dontDistribute super."xchat-plugin";
+  "xcp" = dontDistribute super."xcp";
+  "xdg-basedir" = dontDistribute super."xdg-basedir";
+  "xdg-userdirs" = dontDistribute super."xdg-userdirs";
+  "xdot" = dontDistribute super."xdot";
+  "xfconf" = dontDistribute super."xfconf";
+  "xhaskell-library" = dontDistribute super."xhaskell-library";
+  "xhb" = dontDistribute super."xhb";
+  "xhb-atom-cache" = dontDistribute super."xhb-atom-cache";
+  "xhb-ewmh" = dontDistribute super."xhb-ewmh";
+  "xhtml" = doDistribute super."xhtml_3000_2_1";
+  "xhtml-combinators" = dontDistribute super."xhtml-combinators";
+  "xilinx-lava" = dontDistribute super."xilinx-lava";
+  "xine" = dontDistribute super."xine";
+  "xing-api" = dontDistribute super."xing-api";
+  "xinput-conduit" = dontDistribute super."xinput-conduit";
+  "xkbcommon" = dontDistribute super."xkbcommon";
+  "xkcd" = dontDistribute super."xkcd";
+  "xlsx" = doDistribute super."xlsx_0_1_2";
+  "xlsx-templater" = dontDistribute super."xlsx-templater";
+  "xml-basic" = dontDistribute super."xml-basic";
+  "xml-catalog" = dontDistribute super."xml-catalog";
+  "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
+  "xml-conduit-writer" = dontDistribute super."xml-conduit-writer";
+  "xml-enumerator" = dontDistribute super."xml-enumerator";
+  "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
+  "xml-extractors" = dontDistribute super."xml-extractors";
+  "xml-helpers" = dontDistribute super."xml-helpers";
+  "xml-html-conduit-lens" = dontDistribute super."xml-html-conduit-lens";
+  "xml-monad" = dontDistribute super."xml-monad";
+  "xml-parsec" = dontDistribute super."xml-parsec";
+  "xml-picklers" = dontDistribute super."xml-picklers";
+  "xml-pipe" = dontDistribute super."xml-pipe";
+  "xml-prettify" = dontDistribute super."xml-prettify";
+  "xml-push" = dontDistribute super."xml-push";
+  "xml-query" = dontDistribute super."xml-query";
+  "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit";
+  "xml-query-xml-types" = dontDistribute super."xml-query-xml-types";
+  "xml2html" = dontDistribute super."xml2html";
+  "xml2json" = dontDistribute super."xml2json";
+  "xml2x" = dontDistribute super."xml2x";
+  "xmltv" = dontDistribute super."xmltv";
+  "xmms2-client" = dontDistribute super."xmms2-client";
+  "xmms2-client-glib" = dontDistribute super."xmms2-client-glib";
+  "xmobar" = dontDistribute super."xmobar";
+  "xmonad" = dontDistribute super."xmonad";
+  "xmonad-bluetilebranch" = dontDistribute super."xmonad-bluetilebranch";
+  "xmonad-contrib" = dontDistribute super."xmonad-contrib";
+  "xmonad-contrib-bluetilebranch" = dontDistribute super."xmonad-contrib-bluetilebranch";
+  "xmonad-contrib-gpl" = dontDistribute super."xmonad-contrib-gpl";
+  "xmonad-entryhelper" = dontDistribute super."xmonad-entryhelper";
+  "xmonad-eval" = dontDistribute super."xmonad-eval";
+  "xmonad-extras" = dontDistribute super."xmonad-extras";
+  "xmonad-screenshot" = dontDistribute super."xmonad-screenshot";
+  "xmonad-utils" = dontDistribute super."xmonad-utils";
+  "xmonad-wallpaper" = dontDistribute super."xmonad-wallpaper";
+  "xmonad-windownames" = dontDistribute super."xmonad-windownames";
+  "xmpipe" = dontDistribute super."xmpipe";
+  "xorshift" = dontDistribute super."xorshift";
+  "xosd" = dontDistribute super."xosd";
+  "xournal-builder" = dontDistribute super."xournal-builder";
+  "xournal-convert" = dontDistribute super."xournal-convert";
+  "xournal-parser" = dontDistribute super."xournal-parser";
+  "xournal-render" = dontDistribute super."xournal-render";
+  "xournal-types" = dontDistribute super."xournal-types";
+  "xsact" = dontDistribute super."xsact";
+  "xsd" = dontDistribute super."xsd";
+  "xsha1" = dontDistribute super."xsha1";
+  "xslt" = dontDistribute super."xslt";
+  "xtc" = dontDistribute super."xtc";
+  "xtest" = dontDistribute super."xtest";
+  "xturtle" = dontDistribute super."xturtle";
+  "xxhash" = dontDistribute super."xxhash";
+  "y0l0bot" = dontDistribute super."y0l0bot";
+  "yabi" = dontDistribute super."yabi";
+  "yabi-muno" = dontDistribute super."yabi-muno";
+  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
+  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
+  "yajl" = dontDistribute super."yajl";
+  "yajl-enumerator" = dontDistribute super."yajl-enumerator";
+  "yall" = dontDistribute super."yall";
+  "yamemo" = dontDistribute super."yamemo";
+  "yaml-config" = dontDistribute super."yaml-config";
+  "yaml-light" = dontDistribute super."yaml-light";
+  "yaml-light-lens" = dontDistribute super."yaml-light-lens";
+  "yaml-rpc" = dontDistribute super."yaml-rpc";
+  "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
+  "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
+  "yaml2owl" = dontDistribute super."yaml2owl";
+  "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
+  "yampa-canvas" = dontDistribute super."yampa-canvas";
+  "yampa-glfw" = dontDistribute super."yampa-glfw";
+  "yampa-glut" = dontDistribute super."yampa-glut";
+  "yampa2048" = dontDistribute super."yampa2048";
+  "yaop" = dontDistribute super."yaop";
+  "yap" = dontDistribute super."yap";
+  "yarr" = dontDistribute super."yarr";
+  "yarr-image-io" = dontDistribute super."yarr-image-io";
+  "yate" = dontDistribute super."yate";
+  "yavie" = dontDistribute super."yavie";
+  "ycextra" = dontDistribute super."ycextra";
+  "yeganesh" = dontDistribute super."yeganesh";
+  "yeller" = dontDistribute super."yeller";
+  "yes-precure5-command" = dontDistribute super."yes-precure5-command";
+  "yesod-angular" = dontDistribute super."yesod-angular";
+  "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
+  "yesod-auth-account-fork" = dontDistribute super."yesod-auth-account-fork";
+  "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
+  "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos";
+  "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
+  "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
+  "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
+  "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
+  "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
+  "yesod-bootstrap" = dontDistribute super."yesod-bootstrap";
+  "yesod-comments" = dontDistribute super."yesod-comments";
+  "yesod-content-pdf" = dontDistribute super."yesod-content-pdf";
+  "yesod-continuations" = dontDistribute super."yesod-continuations";
+  "yesod-crud" = dontDistribute super."yesod-crud";
+  "yesod-crud-persist" = dontDistribute super."yesod-crud-persist";
+  "yesod-csp" = dontDistribute super."yesod-csp";
+  "yesod-datatables" = dontDistribute super."yesod-datatables";
+  "yesod-dsl" = dontDistribute super."yesod-dsl";
+  "yesod-examples" = dontDistribute super."yesod-examples";
+  "yesod-form-json" = dontDistribute super."yesod-form-json";
+  "yesod-goodies" = dontDistribute super."yesod-goodies";
+  "yesod-json" = dontDistribute super."yesod-json";
+  "yesod-links" = dontDistribute super."yesod-links";
+  "yesod-lucid" = dontDistribute super."yesod-lucid";
+  "yesod-mangopay" = doDistribute super."yesod-mangopay_1_11_5";
+  "yesod-markdown" = dontDistribute super."yesod-markdown";
+  "yesod-media-simple" = dontDistribute super."yesod-media-simple";
+  "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_4_0_1";
+  "yesod-paginate" = dontDistribute super."yesod-paginate";
+  "yesod-pagination" = dontDistribute super."yesod-pagination";
+  "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-platform" = dontDistribute super."yesod-platform";
+  "yesod-pnotify" = dontDistribute super."yesod-pnotify";
+  "yesod-pure" = dontDistribute super."yesod-pure";
+  "yesod-purescript" = dontDistribute super."yesod-purescript";
+  "yesod-raml" = dontDistribute super."yesod-raml";
+  "yesod-raml-bin" = dontDistribute super."yesod-raml-bin";
+  "yesod-raml-docs" = dontDistribute super."yesod-raml-docs";
+  "yesod-raml-mock" = dontDistribute super."yesod-raml-mock";
+  "yesod-recaptcha" = dontDistribute super."yesod-recaptcha";
+  "yesod-routes" = dontDistribute super."yesod-routes";
+  "yesod-routes-flow" = dontDistribute super."yesod-routes-flow";
+  "yesod-routes-typescript" = dontDistribute super."yesod-routes-typescript";
+  "yesod-rst" = dontDistribute super."yesod-rst";
+  "yesod-s3" = dontDistribute super."yesod-s3";
+  "yesod-sass" = dontDistribute super."yesod-sass";
+  "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-table" = doDistribute super."yesod-table_1_0_6";
+  "yesod-tableview" = dontDistribute super."yesod-tableview";
+  "yesod-test" = doDistribute super."yesod-test_1_4_4";
+  "yesod-test-json" = dontDistribute super."yesod-test-json";
+  "yesod-tls" = dontDistribute super."yesod-tls";
+  "yesod-transloadit" = dontDistribute super."yesod-transloadit";
+  "yesod-vend" = dontDistribute super."yesod-vend";
+  "yesod-websockets-extra" = dontDistribute super."yesod-websockets-extra";
+  "yesod-worker" = dontDistribute super."yesod-worker";
+  "yet-another-logger" = dontDistribute super."yet-another-logger";
+  "yhccore" = dontDistribute super."yhccore";
+  "yi" = dontDistribute super."yi";
+  "yi-contrib" = dontDistribute super."yi-contrib";
+  "yi-emacs-colours" = dontDistribute super."yi-emacs-colours";
+  "yi-fuzzy-open" = dontDistribute super."yi-fuzzy-open";
+  "yi-gtk" = dontDistribute super."yi-gtk";
+  "yi-language" = dontDistribute super."yi-language";
+  "yi-monokai" = dontDistribute super."yi-monokai";
+  "yi-rope" = dontDistribute super."yi-rope";
+  "yi-snippet" = dontDistribute super."yi-snippet";
+  "yi-solarized" = dontDistribute super."yi-solarized";
+  "yi-spolsky" = dontDistribute super."yi-spolsky";
+  "yi-vty" = dontDistribute super."yi-vty";
+  "yices" = dontDistribute super."yices";
+  "yices-easy" = dontDistribute super."yices-easy";
+  "yices-painless" = dontDistribute super."yices-painless";
+  "yjftp" = dontDistribute super."yjftp";
+  "yjftp-libs" = dontDistribute super."yjftp-libs";
+  "yjsvg" = dontDistribute super."yjsvg";
+  "yjtools" = dontDistribute super."yjtools";
+  "yocto" = dontDistribute super."yocto";
+  "yoko" = dontDistribute super."yoko";
+  "york-lava" = dontDistribute super."york-lava";
+  "youtube" = dontDistribute super."youtube";
+  "yql" = dontDistribute super."yql";
+  "yst" = dontDistribute super."yst";
+  "yuiGrid" = dontDistribute super."yuiGrid";
+  "yuuko" = dontDistribute super."yuuko";
+  "yxdb-utils" = dontDistribute super."yxdb-utils";
+  "z3" = dontDistribute super."z3";
+  "zalgo" = dontDistribute super."zalgo";
+  "zampolit" = dontDistribute super."zampolit";
+  "zasni-gerna" = dontDistribute super."zasni-gerna";
+  "zcache" = dontDistribute super."zcache";
+  "zenc" = dontDistribute super."zenc";
+  "zendesk-api" = dontDistribute super."zendesk-api";
+  "zeno" = dontDistribute super."zeno";
+  "zerobin" = dontDistribute super."zerobin";
+  "zeromq-haskell" = dontDistribute super."zeromq-haskell";
+  "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
+  "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeroth" = dontDistribute super."zeroth";
+  "zigbee-znet25" = dontDistribute super."zigbee-znet25";
+  "zim-parser" = dontDistribute super."zim-parser";
+  "zip-conduit" = dontDistribute super."zip-conduit";
+  "zipedit" = dontDistribute super."zipedit";
+  "zipkin" = dontDistribute super."zipkin";
+  "zipper" = dontDistribute super."zipper";
+  "zippers" = dontDistribute super."zippers";
+  "zippo" = dontDistribute super."zippo";
+  "zlib" = doDistribute super."zlib_0_5_4_2";
+  "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zmcat" = dontDistribute super."zmcat";
+  "zmidi-core" = dontDistribute super."zmidi-core";
+  "zmidi-score" = dontDistribute super."zmidi-score";
+  "zmqat" = dontDistribute super."zmqat";
+  "zoneinfo" = dontDistribute super."zoneinfo";
+  "zoom" = dontDistribute super."zoom";
+  "zoom-cache" = dontDistribute super."zoom-cache";
+  "zoom-cache-pcm" = dontDistribute super."zoom-cache-pcm";
+  "zoom-cache-sndfile" = dontDistribute super."zoom-cache-sndfile";
+  "zoom-refs" = dontDistribute super."zoom-refs";
+  "zot" = dontDistribute super."zot";
+  "zsh-battery" = dontDistribute super."zsh-battery";
+  "ztail" = dontDistribute super."ztail";
+
+}
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
index ec21faca0894..f1a3dd5d9b1e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
@@ -1634,6 +1634,7 @@ self: super: {
   "blank-canvas" = dontDistribute super."blank-canvas";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
@@ -2413,6 +2414,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2551,6 +2553,7 @@ self: super: {
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -3887,6 +3890,7 @@ self: super: {
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
+  "hedis" = doDistribute super."hedis_0_6_9";
   "hedis-config" = dontDistribute super."hedis-config";
   "hedis-monadic" = dontDistribute super."hedis-monadic";
   "hedis-pile" = dontDistribute super."hedis-pile";
@@ -4488,6 +4492,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
   "ide-backend" = doDistribute super."ide-backend_0_10_0";
@@ -4504,6 +4509,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -5064,6 +5070,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -5997,6 +6005,7 @@ self: super: {
   "pipes-text" = doDistribute super."pipes-text_0_0_0_16";
   "pipes-transduce" = dontDistribute super."pipes-transduce";
   "pipes-vector" = dontDistribute super."pipes-vector";
+  "pipes-wai" = doDistribute super."pipes-wai_3_0_2";
   "pipes-websockets" = dontDistribute super."pipes-websockets";
   "pipes-zeromq4" = dontDistribute super."pipes-zeromq4";
   "pipes-zlib" = dontDistribute super."pipes-zlib";
@@ -7550,6 +7559,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
index 82abaf317c37..3fb70cfa9594 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
@@ -1634,6 +1634,7 @@ self: super: {
   "blank-canvas" = dontDistribute super."blank-canvas";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
@@ -2412,6 +2413,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2550,6 +2552,7 @@ self: super: {
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -3886,6 +3889,7 @@ self: super: {
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
+  "hedis" = doDistribute super."hedis_0_6_9";
   "hedis-config" = dontDistribute super."hedis-config";
   "hedis-monadic" = dontDistribute super."hedis-monadic";
   "hedis-pile" = dontDistribute super."hedis-pile";
@@ -4487,6 +4491,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
   "ide-backend" = doDistribute super."ide-backend_0_10_0";
@@ -4503,6 +4508,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -5063,6 +5069,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -5996,6 +6004,7 @@ self: super: {
   "pipes-text" = doDistribute super."pipes-text_0_0_0_16";
   "pipes-transduce" = dontDistribute super."pipes-transduce";
   "pipes-vector" = dontDistribute super."pipes-vector";
+  "pipes-wai" = doDistribute super."pipes-wai_3_0_2";
   "pipes-websockets" = dontDistribute super."pipes-websockets";
   "pipes-zeromq4" = dontDistribute super."pipes-zeromq4";
   "pipes-zlib" = dontDistribute super."pipes-zlib";
@@ -7547,6 +7556,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
index c2308392f3d8..c89ba16ca93f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
@@ -1633,6 +1633,7 @@ self: super: {
   "blank-canvas" = dontDistribute super."blank-canvas";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
@@ -2409,6 +2410,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2547,6 +2549,7 @@ self: super: {
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -3880,6 +3883,7 @@ self: super: {
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
+  "hedis" = doDistribute super."hedis_0_6_9";
   "hedis-config" = dontDistribute super."hedis-config";
   "hedis-monadic" = dontDistribute super."hedis-monadic";
   "hedis-pile" = dontDistribute super."hedis-pile";
@@ -4479,6 +4483,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
   "ide-backend" = doDistribute super."ide-backend_0_10_0";
@@ -4495,6 +4500,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -5053,6 +5059,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -5983,6 +5991,7 @@ self: super: {
   "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
   "pipes-transduce" = dontDistribute super."pipes-transduce";
   "pipes-vector" = dontDistribute super."pipes-vector";
+  "pipes-wai" = doDistribute super."pipes-wai_3_0_2";
   "pipes-websockets" = dontDistribute super."pipes-websockets";
   "pipes-zeromq4" = dontDistribute super."pipes-zeromq4";
   "pipes-zlib" = dontDistribute super."pipes-zlib";
@@ -7529,6 +7538,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
index f1fb95a4a202..fba52274e71f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
@@ -1632,6 +1632,7 @@ self: super: {
   "blank-canvas" = dontDistribute super."blank-canvas";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
@@ -2407,6 +2408,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2545,6 +2547,7 @@ self: super: {
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -3874,6 +3877,7 @@ self: super: {
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
+  "hedis" = doDistribute super."hedis_0_6_9";
   "hedis-config" = dontDistribute super."hedis-config";
   "hedis-monadic" = dontDistribute super."hedis-monadic";
   "hedis-pile" = dontDistribute super."hedis-pile";
@@ -4473,6 +4477,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
   "ide-backend" = doDistribute super."ide-backend_0_10_0";
@@ -4489,6 +4494,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -5043,6 +5049,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -5971,6 +5979,7 @@ self: super: {
   "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
   "pipes-transduce" = dontDistribute super."pipes-transduce";
   "pipes-vector" = dontDistribute super."pipes-vector";
+  "pipes-wai" = doDistribute super."pipes-wai_3_0_2";
   "pipes-websockets" = dontDistribute super."pipes-websockets";
   "pipes-zeromq4" = dontDistribute super."pipes-zeromq4";
   "pipes-zlib" = dontDistribute super."pipes-zlib";
@@ -7517,6 +7526,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
index a57561a9311c..ef87ac94d2a1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
@@ -1629,6 +1629,7 @@ self: super: {
   "blank-canvas" = dontDistribute super."blank-canvas";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
@@ -2403,6 +2404,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2540,6 +2542,7 @@ self: super: {
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -3866,6 +3869,7 @@ self: super: {
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
+  "hedis" = doDistribute super."hedis_0_6_9";
   "hedis-config" = dontDistribute super."hedis-config";
   "hedis-monadic" = dontDistribute super."hedis-monadic";
   "hedis-pile" = dontDistribute super."hedis-pile";
@@ -4465,6 +4469,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
   "ide-backend" = doDistribute super."ide-backend_0_10_0";
@@ -4481,6 +4486,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -5034,6 +5040,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -5960,6 +5968,7 @@ self: super: {
   "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
   "pipes-transduce" = dontDistribute super."pipes-transduce";
   "pipes-vector" = dontDistribute super."pipes-vector";
+  "pipes-wai" = doDistribute super."pipes-wai_3_0_2";
   "pipes-websockets" = dontDistribute super."pipes-websockets";
   "pipes-zeromq4" = dontDistribute super."pipes-zeromq4";
   "pipes-zlib" = dontDistribute super."pipes-zlib";
@@ -7500,6 +7509,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
index a41d9423a34e..7c615bd38ab2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
@@ -1629,6 +1629,7 @@ self: super: {
   "blank-canvas" = dontDistribute super."blank-canvas";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
@@ -2400,6 +2401,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2532,6 +2534,7 @@ self: super: {
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -3858,6 +3861,7 @@ self: super: {
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
+  "hedis" = doDistribute super."hedis_0_6_9";
   "hedis-config" = dontDistribute super."hedis-config";
   "hedis-monadic" = dontDistribute super."hedis-monadic";
   "hedis-pile" = dontDistribute super."hedis-pile";
@@ -4457,6 +4461,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
   "ide-backend" = doDistribute super."ide-backend_0_10_0";
@@ -4473,6 +4478,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -5026,6 +5032,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -5950,6 +5958,7 @@ self: super: {
   "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
   "pipes-transduce" = dontDistribute super."pipes-transduce";
   "pipes-vector" = dontDistribute super."pipes-vector";
+  "pipes-wai" = doDistribute super."pipes-wai_3_0_2";
   "pipes-websockets" = dontDistribute super."pipes-websockets";
   "pipes-zeromq4" = dontDistribute super."pipes-zeromq4";
   "pipes-zlib" = dontDistribute super."pipes-zlib";
@@ -7486,6 +7495,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
index 5ea1c8955076..92bdc5051317 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
@@ -1626,6 +1626,7 @@ self: super: {
   "blank-canvas" = dontDistribute super."blank-canvas";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-bootstrap" = dontDistribute super."blaze-bootstrap";
   "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
@@ -2395,6 +2396,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "declarative" = dontDistribute super."declarative";
   "decode-utf8" = dontDistribute super."decode-utf8";
@@ -2527,6 +2529,7 @@ self: super: {
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -3850,6 +3853,7 @@ self: super: {
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
+  "hedis" = doDistribute super."hedis_0_6_9";
   "hedis-config" = dontDistribute super."hedis-config";
   "hedis-monadic" = dontDistribute super."hedis-monadic";
   "hedis-pile" = dontDistribute super."hedis-pile";
@@ -4449,6 +4453,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
   "ide-backend" = doDistribute super."ide-backend_0_10_0";
@@ -4465,6 +4470,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -5018,6 +5024,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -5941,6 +5949,7 @@ self: super: {
   "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
   "pipes-transduce" = dontDistribute super."pipes-transduce";
   "pipes-vector" = dontDistribute super."pipes-vector";
+  "pipes-wai" = doDistribute super."pipes-wai_3_0_2";
   "pipes-websockets" = dontDistribute super."pipes-websockets";
   "pipes-zeromq4" = dontDistribute super."pipes-zeromq4";
   "pipes-zlib" = dontDistribute super."pipes-zlib";
@@ -7477,6 +7486,7 @@ self: super: {
   "tinytemplate" = dontDistribute super."tinytemplate";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.0.nix b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
index edf6637ee053..e3c8373bd9a4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
@@ -1099,6 +1099,7 @@ self: super: {
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
   "alea" = dontDistribute super."alea";
+  "alex" = doDistribute super."alex_3_1_6";
   "alex-meta" = dontDistribute super."alex-meta";
   "alfred" = dontDistribute super."alfred";
   "alga" = dontDistribute super."alga";
@@ -1483,6 +1484,7 @@ self: super: {
   "blank-canvas" = dontDistribute super."blank-canvas";
   "blas" = dontDistribute super."blas";
   "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
   "blaze" = dontDistribute super."blaze";
   "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
   "blaze-from-html" = dontDistribute super."blaze-from-html";
@@ -2188,6 +2190,7 @@ self: super: {
   "debian-binary" = dontDistribute super."debian-binary";
   "debian-build" = dontDistribute super."debian-build";
   "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
   "decepticons" = dontDistribute super."decepticons";
   "decode-utf8" = dontDistribute super."decode-utf8";
   "decoder-conduit" = dontDistribute super."decoder-conduit";
@@ -2304,6 +2307,7 @@ self: super: {
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
   "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
   "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
   "distributed-process-platform" = dontDistribute super."distributed-process-platform";
@@ -2421,6 +2425,7 @@ self: super: {
   "edentv" = dontDistribute super."edentv";
   "edge" = dontDistribute super."edge";
   "edis" = dontDistribute super."edis";
+  "edit-distance-vector" = doDistribute super."edit-distance-vector_1_0_0_2";
   "edit-lenses" = dontDistribute super."edit-lenses";
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
@@ -2477,6 +2482,7 @@ self: super: {
   "endo" = dontDistribute super."endo";
   "engine-io-growler" = dontDistribute super."engine-io-growler";
   "engine-io-snap" = dontDistribute super."engine-io-snap";
+  "engine-io-yesod" = doDistribute super."engine-io-yesod_1_0_3";
   "engineering-units" = dontDistribute super."engineering-units";
   "enumerable" = dontDistribute super."enumerable";
   "enumerate" = dontDistribute super."enumerate";
@@ -2614,6 +2620,7 @@ self: super: {
   "fdo-trash" = dontDistribute super."fdo-trash";
   "fec" = dontDistribute super."fec";
   "fedora-packages" = dontDistribute super."fedora-packages";
+  "feed" = doDistribute super."feed_0_3_10_4";
   "feed-cli" = dontDistribute super."feed-cli";
   "feed-collect" = dontDistribute super."feed-collect";
   "feed-crawl" = dontDistribute super."feed-crawl";
@@ -3544,6 +3551,7 @@ self: super: {
   "headergen" = dontDistribute super."headergen";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
+  "hedis" = doDistribute super."hedis_0_6_9";
   "hedis-config" = dontDistribute super."hedis-config";
   "hedis-monadic" = dontDistribute super."hedis-monadic";
   "hedis-pile" = dontDistribute super."hedis-pile";
@@ -4083,6 +4091,7 @@ self: super: {
   "iap-verifier" = dontDistribute super."iap-verifier";
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
   "ide-backend" = doDistribute super."ide-backend_0_10_0";
   "ide-backend-common" = doDistribute super."ide-backend-common_0_10_1_1";
   "ide-backend-server" = doDistribute super."ide-backend-server_0_10_0";
@@ -4097,6 +4106,7 @@ self: super: {
   "ieee" = dontDistribute super."ieee";
   "ieee-utils" = dontDistribute super."ieee-utils";
   "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754" = doDistribute super."ieee754_0_7_6";
   "ieee754-parser" = dontDistribute super."ieee754-parser";
   "ifcxt" = dontDistribute super."ifcxt";
   "iff" = dontDistribute super."iff";
@@ -4186,6 +4196,7 @@ self: super: {
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-reactive" = dontDistribute super."io-reactive";
+  "io-streams" = doDistribute super."io-streams_1_3_4_0";
   "io-streams-http" = dontDistribute super."io-streams-http";
   "io-throttle" = dontDistribute super."io-throttle";
   "ioctl" = dontDistribute super."ioctl";
@@ -4450,6 +4461,7 @@ self: super: {
   "latest-npm-version" = dontDistribute super."latest-npm-version";
   "latex" = dontDistribute super."latex";
   "latex-formulae-hakyll" = doDistribute super."latex-formulae-hakyll_0_2_0_0";
+  "latex-formulae-image" = doDistribute super."latex-formulae-image_0_1_1_0";
   "latex-formulae-pandoc" = doDistribute super."latex-formulae-pandoc_0_2_0_2";
   "launchpad-control" = dontDistribute super."launchpad-control";
   "lax" = dontDistribute super."lax";
@@ -4622,6 +4634,8 @@ self: super: {
   "llvm-tf" = dontDistribute super."llvm-tf";
   "llvm-tools" = dontDistribute super."llvm-tools";
   "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
   "load-env" = dontDistribute super."load-env";
   "loadavg" = dontDistribute super."loadavg";
   "local-address" = dontDistribute super."local-address";
@@ -5460,6 +5474,7 @@ self: super: {
   "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
   "pipes-transduce" = dontDistribute super."pipes-transduce";
   "pipes-vector" = dontDistribute super."pipes-vector";
+  "pipes-wai" = doDistribute super."pipes-wai_3_0_2";
   "pipes-websockets" = dontDistribute super."pipes-websockets";
   "pipes-zeromq4" = dontDistribute super."pipes-zeromq4";
   "pipes-zlib" = dontDistribute super."pipes-zlib";
@@ -6663,6 +6678,7 @@ self: super: {
   "taglib" = dontDistribute super."taglib";
   "taglib-api" = dontDistribute super."taglib-api";
   "tagset-positional" = dontDistribute super."tagset-positional";
+  "tagsoup" = doDistribute super."tagsoup_0_13_6";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "takahashi" = dontDistribute super."takahashi";
@@ -6853,6 +6869,7 @@ self: super: {
   "tinyMesh" = dontDistribute super."tinyMesh";
   "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
   "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
   "titlecase" = dontDistribute super."titlecase";
   "tkhs" = dontDistribute super."tkhs";
   "tkyprof" = dontDistribute super."tkyprof";
@@ -7256,6 +7273,7 @@ self: super: {
   "wai-router" = dontDistribute super."wai-router";
   "wai-session-alt" = dontDistribute super."wai-session-alt";
   "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-postgresql" = doDistribute super."wai-session-postgresql_0_2_0_3";
   "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
   "wai-static-cache" = dontDistribute super."wai-static-cache";
   "wai-static-pages" = dontDistribute super."wai-static-pages";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.1.nix b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
new file mode 100644
index 000000000000..410145e66cc8
--- /dev/null
+++ b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
@@ -0,0 +1,7585 @@
+{ pkgs }:
+
+with import ./lib.nix { inherit pkgs; };
+
+self: super: {
+
+  # core libraries provided by the compiler
+  Cabal = null;
+  array = null;
+  base = null;
+  bin-package-db = null;
+  binary = null;
+  bytestring = null;
+  containers = null;
+  deepseq = null;
+  directory = null;
+  filepath = null;
+  ghc-prim = null;
+  hoopl = null;
+  hpc = null;
+  integer-gmp = null;
+  pretty = null;
+  process = null;
+  rts = null;
+  template-haskell = null;
+  time = null;
+  transformers = null;
+  unix = null;
+
+  # lts-4.1 packages
+  "3d-graphics-examples" = dontDistribute super."3d-graphics-examples";
+  "3dmodels" = dontDistribute super."3dmodels";
+  "4Blocks" = dontDistribute super."4Blocks";
+  "AAI" = dontDistribute super."AAI";
+  "ABList" = dontDistribute super."ABList";
+  "AC-Angle" = dontDistribute super."AC-Angle";
+  "AC-Boolean" = dontDistribute super."AC-Boolean";
+  "AC-BuildPlatform" = dontDistribute super."AC-BuildPlatform";
+  "AC-Colour" = dontDistribute super."AC-Colour";
+  "AC-EasyRaster-GTK" = dontDistribute super."AC-EasyRaster-GTK";
+  "AC-HalfInteger" = dontDistribute super."AC-HalfInteger";
+  "AC-MiniTest" = dontDistribute super."AC-MiniTest";
+  "AC-PPM" = dontDistribute super."AC-PPM";
+  "AC-Random" = dontDistribute super."AC-Random";
+  "AC-Terminal" = dontDistribute super."AC-Terminal";
+  "AC-VanillaArray" = dontDistribute super."AC-VanillaArray";
+  "AC-Vector-Fancy" = dontDistribute super."AC-Vector-Fancy";
+  "ACME" = dontDistribute super."ACME";
+  "ADPfusion" = dontDistribute super."ADPfusion";
+  "AERN-Basics" = dontDistribute super."AERN-Basics";
+  "AERN-Net" = dontDistribute super."AERN-Net";
+  "AERN-Real" = dontDistribute super."AERN-Real";
+  "AERN-Real-Double" = dontDistribute super."AERN-Real-Double";
+  "AERN-Real-Interval" = dontDistribute super."AERN-Real-Interval";
+  "AERN-RnToRm" = dontDistribute super."AERN-RnToRm";
+  "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot";
+  "AES" = dontDistribute super."AES";
+  "AGI" = dontDistribute super."AGI";
+  "ALUT" = dontDistribute super."ALUT";
+  "AMI" = dontDistribute super."AMI";
+  "ANum" = dontDistribute super."ANum";
+  "ASN1" = dontDistribute super."ASN1";
+  "AVar" = dontDistribute super."AVar";
+  "AWin32Console" = dontDistribute super."AWin32Console";
+  "AbortT-monadstf" = dontDistribute super."AbortT-monadstf";
+  "AbortT-mtl" = dontDistribute super."AbortT-mtl";
+  "AbortT-transformers" = dontDistribute super."AbortT-transformers";
+  "ActionKid" = dontDistribute super."ActionKid";
+  "Adaptive" = dontDistribute super."Adaptive";
+  "Adaptive-Blaisorblade" = dontDistribute super."Adaptive-Blaisorblade";
+  "Advgame" = dontDistribute super."Advgame";
+  "AesonBson" = dontDistribute super."AesonBson";
+  "Agata" = dontDistribute super."Agata";
+  "Agda-executable" = dontDistribute super."Agda-executable";
+  "AhoCorasick" = dontDistribute super."AhoCorasick";
+  "AlgorithmW" = dontDistribute super."AlgorithmW";
+  "AlignmentAlgorithms" = dontDistribute super."AlignmentAlgorithms";
+  "Allure" = dontDistribute super."Allure";
+  "AndroidViewHierarchyImporter" = dontDistribute super."AndroidViewHierarchyImporter";
+  "Animas" = dontDistribute super."Animas";
+  "Annotations" = dontDistribute super."Annotations";
+  "Ansi2Html" = dontDistribute super."Ansi2Html";
+  "ApplePush" = dontDistribute super."ApplePush";
+  "AppleScript" = dontDistribute super."AppleScript";
+  "ApproxFun-hs" = dontDistribute super."ApproxFun-hs";
+  "ArrayRef" = dontDistribute super."ArrayRef";
+  "ArrowVHDL" = dontDistribute super."ArrowVHDL";
+  "AspectAG" = dontDistribute super."AspectAG";
+  "AttoBencode" = dontDistribute super."AttoBencode";
+  "AttoJson" = dontDistribute super."AttoJson";
+  "Attrac" = dontDistribute super."Attrac";
+  "Aurochs" = dontDistribute super."Aurochs";
+  "AutoForms" = dontDistribute super."AutoForms";
+  "AvlTree" = dontDistribute super."AvlTree";
+  "BASIC" = dontDistribute super."BASIC";
+  "BCMtools" = dontDistribute super."BCMtools";
+  "BNFC" = dontDistribute super."BNFC";
+  "BNFC-meta" = dontDistribute super."BNFC-meta";
+  "Baggins" = dontDistribute super."Baggins";
+  "Bang" = dontDistribute super."Bang";
+  "Barracuda" = dontDistribute super."Barracuda";
+  "Befunge93" = dontDistribute super."Befunge93";
+  "BenchmarkHistory" = dontDistribute super."BenchmarkHistory";
+  "BerkeleyDB" = dontDistribute super."BerkeleyDB";
+  "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML";
+  "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm";
+  "BigPixel" = dontDistribute super."BigPixel";
+  "Binpack" = dontDistribute super."Binpack";
+  "Biobase" = dontDistribute super."Biobase";
+  "BiobaseBlast" = dontDistribute super."BiobaseBlast";
+  "BiobaseDotP" = dontDistribute super."BiobaseDotP";
+  "BiobaseFR3D" = dontDistribute super."BiobaseFR3D";
+  "BiobaseFasta" = dontDistribute super."BiobaseFasta";
+  "BiobaseInfernal" = dontDistribute super."BiobaseInfernal";
+  "BiobaseMAF" = dontDistribute super."BiobaseMAF";
+  "BiobaseTrainingData" = dontDistribute super."BiobaseTrainingData";
+  "BiobaseTurner" = dontDistribute super."BiobaseTurner";
+  "BiobaseTypes" = dontDistribute super."BiobaseTypes";
+  "BiobaseVienna" = dontDistribute super."BiobaseVienna";
+  "BiobaseXNA" = dontDistribute super."BiobaseXNA";
+  "BirdPP" = dontDistribute super."BirdPP";
+  "BitSyntax" = dontDistribute super."BitSyntax";
+  "Bitly" = dontDistribute super."Bitly";
+  "Blobs" = dontDistribute super."Blobs";
+  "BluePrintCSS" = dontDistribute super."BluePrintCSS";
+  "Blueprint" = dontDistribute super."Blueprint";
+  "Bookshelf" = dontDistribute super."Bookshelf";
+  "Bravo" = dontDistribute super."Bravo";
+  "BufferedSocket" = dontDistribute super."BufferedSocket";
+  "Buster" = dontDistribute super."Buster";
+  "CBOR" = dontDistribute super."CBOR";
+  "CC-delcont" = dontDistribute super."CC-delcont";
+  "CC-delcont-alt" = dontDistribute super."CC-delcont-alt";
+  "CC-delcont-cxe" = dontDistribute super."CC-delcont-cxe";
+  "CC-delcont-exc" = dontDistribute super."CC-delcont-exc";
+  "CC-delcont-ref" = dontDistribute super."CC-delcont-ref";
+  "CC-delcont-ref-tf" = dontDistribute super."CC-delcont-ref-tf";
+  "CCA" = dontDistribute super."CCA";
+  "CHXHtml" = dontDistribute super."CHXHtml";
+  "CLASE" = dontDistribute super."CLASE";
+  "CLI" = dontDistribute super."CLI";
+  "CMCompare" = dontDistribute super."CMCompare";
+  "CMQ" = dontDistribute super."CMQ";
+  "COrdering" = dontDistribute super."COrdering";
+  "CPBrainfuck" = dontDistribute super."CPBrainfuck";
+  "CPL" = dontDistribute super."CPL";
+  "CSPM-CoreLanguage" = dontDistribute super."CSPM-CoreLanguage";
+  "CSPM-FiringRules" = dontDistribute super."CSPM-FiringRules";
+  "CSPM-Frontend" = dontDistribute super."CSPM-Frontend";
+  "CSPM-Interpreter" = dontDistribute super."CSPM-Interpreter";
+  "CSPM-ToProlog" = dontDistribute super."CSPM-ToProlog";
+  "CSPM-cspm" = dontDistribute super."CSPM-cspm";
+  "CTRex" = dontDistribute super."CTRex";
+  "CV" = dontDistribute super."CV";
+  "CabalSearch" = dontDistribute super."CabalSearch";
+  "Capabilities" = dontDistribute super."Capabilities";
+  "Cardinality" = dontDistribute super."Cardinality";
+  "CarneadesDSL" = dontDistribute super."CarneadesDSL";
+  "CarneadesIntoDung" = dontDistribute super."CarneadesIntoDung";
+  "Cartesian" = dontDistribute super."Cartesian";
+  "Cascade" = dontDistribute super."Cascade";
+  "Catana" = dontDistribute super."Catana";
+  "Chart-diagrams" = dontDistribute super."Chart-diagrams";
+  "Chart-gtk" = dontDistribute super."Chart-gtk";
+  "Chart-simple" = dontDistribute super."Chart-simple";
+  "CheatSheet" = dontDistribute super."CheatSheet";
+  "Checked" = dontDistribute super."Checked";
+  "Chitra" = dontDistribute super."Chitra";
+  "ChristmasTree" = dontDistribute super."ChristmasTree";
+  "CirruParser" = dontDistribute super."CirruParser";
+  "ClassLaws" = dontDistribute super."ClassLaws";
+  "ClassyPrelude" = dontDistribute super."ClassyPrelude";
+  "Clean" = dontDistribute super."Clean";
+  "Clipboard" = dontDistribute super."Clipboard";
+  "Coadjute" = dontDistribute super."Coadjute";
+  "Codec-Compression-LZF" = dontDistribute super."Codec-Compression-LZF";
+  "Codec-Image-DevIL" = dontDistribute super."Codec-Image-DevIL";
+  "Combinatorrent" = dontDistribute super."Combinatorrent";
+  "Command" = dontDistribute super."Command";
+  "Commando" = dontDistribute super."Commando";
+  "ComonadSheet" = dontDistribute super."ComonadSheet";
+  "ConcurrentUtils" = dontDistribute super."ConcurrentUtils";
+  "Concurrential" = dontDistribute super."Concurrential";
+  "Condor" = dontDistribute super."Condor";
+  "ConfigFileTH" = dontDistribute super."ConfigFileTH";
+  "Configger" = dontDistribute super."Configger";
+  "Configurable" = dontDistribute super."Configurable";
+  "ConsStream" = dontDistribute super."ConsStream";
+  "Conscript" = dontDistribute super."Conscript";
+  "ConstraintKinds" = dontDistribute super."ConstraintKinds";
+  "Consumer" = dontDistribute super."Consumer";
+  "ContArrow" = dontDistribute super."ContArrow";
+  "ContextAlgebra" = dontDistribute super."ContextAlgebra";
+  "Contract" = dontDistribute super."Contract";
+  "Control-Engine" = dontDistribute super."Control-Engine";
+  "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass";
+  "Control-Monad-ST2" = dontDistribute super."Control-Monad-ST2";
+  "CoreDump" = dontDistribute super."CoreDump";
+  "CoreErlang" = dontDistribute super."CoreErlang";
+  "CoreFoundation" = dontDistribute super."CoreFoundation";
+  "Coroutine" = dontDistribute super."Coroutine";
+  "CouchDB" = dontDistribute super."CouchDB";
+  "Craft3e" = dontDistribute super."Craft3e";
+  "Crypto" = dontDistribute super."Crypto";
+  "CurryDB" = dontDistribute super."CurryDB";
+  "DAG-Tournament" = dontDistribute super."DAG-Tournament";
+  "DBlimited" = dontDistribute super."DBlimited";
+  "DBus" = dontDistribute super."DBus";
+  "DCFL" = dontDistribute super."DCFL";
+  "DMuCheck" = dontDistribute super."DMuCheck";
+  "DOM" = dontDistribute super."DOM";
+  "DP" = dontDistribute super."DP";
+  "DPM" = dontDistribute super."DPM";
+  "DSA" = dontDistribute super."DSA";
+  "DSH" = dontDistribute super."DSH";
+  "DSTM" = dontDistribute super."DSTM";
+  "DTC" = dontDistribute super."DTC";
+  "Dangerous" = dontDistribute super."Dangerous";
+  "Dao" = dontDistribute super."Dao";
+  "DarcsHelpers" = dontDistribute super."DarcsHelpers";
+  "Data-Hash-Consistent" = dontDistribute super."Data-Hash-Consistent";
+  "Data-Rope" = dontDistribute super."Data-Rope";
+  "DataTreeView" = dontDistribute super."DataTreeView";
+  "Deadpan-DDP" = dontDistribute super."Deadpan-DDP";
+  "DebugTraceHelpers" = dontDistribute super."DebugTraceHelpers";
+  "DecisionTree" = dontDistribute super."DecisionTree";
+  "DeepArrow" = dontDistribute super."DeepArrow";
+  "DefendTheKing" = dontDistribute super."DefendTheKing";
+  "DescriptiveKeys" = dontDistribute super."DescriptiveKeys";
+  "Dflow" = dontDistribute super."Dflow";
+  "DifferenceLogic" = dontDistribute super."DifferenceLogic";
+  "DifferentialEvolution" = dontDistribute super."DifferentialEvolution";
+  "Digit" = dontDistribute super."Digit";
+  "DigitalOcean" = dontDistribute super."DigitalOcean";
+  "DimensionalHash" = dontDistribute super."DimensionalHash";
+  "DirectSound" = dontDistribute super."DirectSound";
+  "DisTract" = dontDistribute super."DisTract";
+  "DiscussionSupportSystem" = dontDistribute super."DiscussionSupportSystem";
+  "Dish" = dontDistribute super."Dish";
+  "Dist" = dontDistribute super."Dist";
+  "DistanceTransform" = dontDistribute super."DistanceTransform";
+  "DistanceUnits" = dontDistribute super."DistanceUnits";
+  "DnaProteinAlignment" = dontDistribute super."DnaProteinAlignment";
+  "DocTest" = dontDistribute super."DocTest";
+  "Docs" = dontDistribute super."Docs";
+  "DrHylo" = dontDistribute super."DrHylo";
+  "DrIFT" = dontDistribute super."DrIFT";
+  "DrIFT-cabalized" = dontDistribute super."DrIFT-cabalized";
+  "Dung" = dontDistribute super."Dung";
+  "Dust" = dontDistribute super."Dust";
+  "Dust-crypto" = dontDistribute super."Dust-crypto";
+  "Dust-tools" = dontDistribute super."Dust-tools";
+  "Dust-tools-pcap" = dontDistribute super."Dust-tools-pcap";
+  "DynamicTimeWarp" = dontDistribute super."DynamicTimeWarp";
+  "DysFRP" = dontDistribute super."DysFRP";
+  "DysFRP-Cairo" = dontDistribute super."DysFRP-Cairo";
+  "DysFRP-Craftwerk" = dontDistribute super."DysFRP-Craftwerk";
+  "EEConfig" = dontDistribute super."EEConfig";
+  "EdisonAPI" = dontDistribute super."EdisonAPI";
+  "EdisonCore" = dontDistribute super."EdisonCore";
+  "EditTimeReport" = dontDistribute super."EditTimeReport";
+  "EitherT" = dontDistribute super."EitherT";
+  "Elm" = dontDistribute super."Elm";
+  "Emping" = dontDistribute super."Emping";
+  "Encode" = dontDistribute super."Encode";
+  "EnumContainers" = dontDistribute super."EnumContainers";
+  "EnumMap" = dontDistribute super."EnumMap";
+  "Eq" = dontDistribute super."Eq";
+  "EqualitySolver" = dontDistribute super."EqualitySolver";
+  "EsounD" = dontDistribute super."EsounD";
+  "EstProgress" = dontDistribute super."EstProgress";
+  "EtaMOO" = dontDistribute super."EtaMOO";
+  "Etage" = dontDistribute super."Etage";
+  "Etage-Graph" = dontDistribute super."Etage-Graph";
+  "Eternal10Seconds" = dontDistribute super."Eternal10Seconds";
+  "Etherbunny" = dontDistribute super."Etherbunny";
+  "EuroIT" = dontDistribute super."EuroIT";
+  "Euterpea" = dontDistribute super."Euterpea";
+  "EventSocket" = dontDistribute super."EventSocket";
+  "Extra" = dontDistribute super."Extra";
+  "FComp" = dontDistribute super."FComp";
+  "FM-SBLEX" = dontDistribute super."FM-SBLEX";
+  "FModExRaw" = dontDistribute super."FModExRaw";
+  "FPretty" = dontDistribute super."FPretty";
+  "FTGL" = dontDistribute super."FTGL";
+  "FTGL-bytestring" = dontDistribute super."FTGL-bytestring";
+  "FTPLine" = dontDistribute super."FTPLine";
+  "Facts" = dontDistribute super."Facts";
+  "FailureT" = dontDistribute super."FailureT";
+  "FastxPipe" = dontDistribute super."FastxPipe";
+  "FermatsLastMargin" = dontDistribute super."FermatsLastMargin";
+  "FerryCore" = dontDistribute super."FerryCore";
+  "Feval" = dontDistribute super."Feval";
+  "FieldTrip" = dontDistribute super."FieldTrip";
+  "FileManip" = dontDistribute super."FileManip";
+  "FileManipCompat" = dontDistribute super."FileManipCompat";
+  "FilePather" = dontDistribute super."FilePather";
+  "FileSystem" = dontDistribute super."FileSystem";
+  "Finance-Quote-Yahoo" = dontDistribute super."Finance-Quote-Yahoo";
+  "Finance-Treasury" = dontDistribute super."Finance-Treasury";
+  "FindBin" = dontDistribute super."FindBin";
+  "FiniteMap" = dontDistribute super."FiniteMap";
+  "FirstOrderTheory" = dontDistribute super."FirstOrderTheory";
+  "FixedPoint-simple" = dontDistribute super."FixedPoint-simple";
+  "Flippi" = dontDistribute super."Flippi";
+  "Focus" = dontDistribute super."Focus";
+  "Folly" = dontDistribute super."Folly";
+  "ForSyDe" = dontDistribute super."ForSyDe";
+  "ForkableT" = dontDistribute super."ForkableT";
+  "FormalGrammars" = dontDistribute super."FormalGrammars";
+  "Foster" = dontDistribute super."Foster";
+  "FpMLv53" = dontDistribute super."FpMLv53";
+  "FractalArt" = dontDistribute super."FractalArt";
+  "Fractaler" = dontDistribute super."Fractaler";
+  "Frames" = dontDistribute super."Frames";
+  "Frank" = dontDistribute super."Frank";
+  "FreeTypeGL" = dontDistribute super."FreeTypeGL";
+  "FunGEn" = dontDistribute super."FunGEn";
+  "Fungi" = dontDistribute super."Fungi";
+  "GA" = dontDistribute super."GA";
+  "GGg" = dontDistribute super."GGg";
+  "GHood" = dontDistribute super."GHood";
+  "GLFW" = dontDistribute super."GLFW";
+  "GLFW-OGL" = dontDistribute super."GLFW-OGL";
+  "GLFW-b-demo" = dontDistribute super."GLFW-b-demo";
+  "GLFW-task" = dontDistribute super."GLFW-task";
+  "GLHUI" = dontDistribute super."GLHUI";
+  "GLM" = dontDistribute super."GLM";
+  "GLMatrix" = dontDistribute super."GLMatrix";
+  "GLUtil" = dontDistribute super."GLUtil";
+  "GPX" = dontDistribute super."GPX";
+  "GPipe-Collada" = dontDistribute super."GPipe-Collada";
+  "GPipe-Examples" = dontDistribute super."GPipe-Examples";
+  "GPipe-TextureLoad" = dontDistribute super."GPipe-TextureLoad";
+  "GTALib" = dontDistribute super."GTALib";
+  "Gamgine" = dontDistribute super."Gamgine";
+  "Ganymede" = dontDistribute super."Ganymede";
+  "GaussQuadIntegration" = dontDistribute super."GaussQuadIntegration";
+  "GeBoP" = dontDistribute super."GeBoP";
+  "GenI" = dontDistribute super."GenI";
+  "GenSmsPdu" = dontDistribute super."GenSmsPdu";
+  "GeneralTicTacToe" = dontDistribute super."GeneralTicTacToe";
+  "GenussFold" = dontDistribute super."GenussFold";
+  "GeoIp" = dontDistribute super."GeoIp";
+  "GeocoderOpenCage" = dontDistribute super."GeocoderOpenCage";
+  "Geodetic" = dontDistribute super."Geodetic";
+  "GeomPredicates" = dontDistribute super."GeomPredicates";
+  "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE";
+  "GiST" = dontDistribute super."GiST";
+  "GiveYouAHead" = dontDistribute super."GiveYouAHead";
+  "GlomeTrace" = dontDistribute super."GlomeTrace";
+  "GlomeVec" = dontDistribute super."GlomeVec";
+  "GlomeView" = dontDistribute super."GlomeView";
+  "GoogleChart" = dontDistribute super."GoogleChart";
+  "GoogleDirections" = dontDistribute super."GoogleDirections";
+  "GoogleSB" = dontDistribute super."GoogleSB";
+  "GoogleSuggest" = dontDistribute super."GoogleSuggest";
+  "GoogleTranslate" = dontDistribute super."GoogleTranslate";
+  "GotoT-transformers" = dontDistribute super."GotoT-transformers";
+  "GrammarProducts" = dontDistribute super."GrammarProducts";
+  "Graph500" = dontDistribute super."Graph500";
+  "GraphHammer" = dontDistribute super."GraphHammer";
+  "GraphHammer-examples" = dontDistribute super."GraphHammer-examples";
+  "Graphalyze" = dontDistribute super."Graphalyze";
+  "Grempa" = dontDistribute super."Grempa";
+  "GroteTrap" = dontDistribute super."GroteTrap";
+  "Grow" = dontDistribute super."Grow";
+  "GrowlNotify" = dontDistribute super."GrowlNotify";
+  "Gtk2hsGenerics" = dontDistribute super."Gtk2hsGenerics";
+  "GtkGLTV" = dontDistribute super."GtkGLTV";
+  "GtkTV" = dontDistribute super."GtkTV";
+  "GuiHaskell" = dontDistribute super."GuiHaskell";
+  "GuiTV" = dontDistribute super."GuiTV";
+  "H" = dontDistribute super."H";
+  "HARM" = dontDistribute super."HARM";
+  "HAppS-Data" = dontDistribute super."HAppS-Data";
+  "HAppS-IxSet" = dontDistribute super."HAppS-IxSet";
+  "HAppS-Server" = dontDistribute super."HAppS-Server";
+  "HAppS-State" = dontDistribute super."HAppS-State";
+  "HAppS-Util" = dontDistribute super."HAppS-Util";
+  "HAppSHelpers" = dontDistribute super."HAppSHelpers";
+  "HCL" = dontDistribute super."HCL";
+  "HCard" = dontDistribute super."HCard";
+  "HDBC-mysql" = dontDistribute super."HDBC-mysql";
+  "HDBC-odbc" = dontDistribute super."HDBC-odbc";
+  "HDBC-postgresql-hstore" = dontDistribute super."HDBC-postgresql-hstore";
+  "HDBC-session" = dontDistribute super."HDBC-session";
+  "HDRUtils" = dontDistribute super."HDRUtils";
+  "HERA" = dontDistribute super."HERA";
+  "HFrequencyQueue" = dontDistribute super."HFrequencyQueue";
+  "HFuse" = dontDistribute super."HFuse";
+  "HGL" = dontDistribute super."HGL";
+  "HGamer3D" = dontDistribute super."HGamer3D";
+  "HGamer3D-API" = dontDistribute super."HGamer3D-API";
+  "HGamer3D-Audio" = dontDistribute super."HGamer3D-Audio";
+  "HGamer3D-Bullet-Binding" = dontDistribute super."HGamer3D-Bullet-Binding";
+  "HGamer3D-CAudio-Binding" = dontDistribute super."HGamer3D-CAudio-Binding";
+  "HGamer3D-CEGUI-Binding" = dontDistribute super."HGamer3D-CEGUI-Binding";
+  "HGamer3D-Common" = dontDistribute super."HGamer3D-Common";
+  "HGamer3D-Data" = dontDistribute super."HGamer3D-Data";
+  "HGamer3D-Enet-Binding" = dontDistribute super."HGamer3D-Enet-Binding";
+  "HGamer3D-GUI" = dontDistribute super."HGamer3D-GUI";
+  "HGamer3D-Graphics3D" = dontDistribute super."HGamer3D-Graphics3D";
+  "HGamer3D-InputSystem" = dontDistribute super."HGamer3D-InputSystem";
+  "HGamer3D-Network" = dontDistribute super."HGamer3D-Network";
+  "HGamer3D-OIS-Binding" = dontDistribute super."HGamer3D-OIS-Binding";
+  "HGamer3D-Ogre-Binding" = dontDistribute super."HGamer3D-Ogre-Binding";
+  "HGamer3D-SDL2-Binding" = dontDistribute super."HGamer3D-SDL2-Binding";
+  "HGamer3D-SFML-Binding" = dontDistribute super."HGamer3D-SFML-Binding";
+  "HGamer3D-WinEvent" = dontDistribute super."HGamer3D-WinEvent";
+  "HGamer3D-Wire" = dontDistribute super."HGamer3D-Wire";
+  "HGraphStorage" = dontDistribute super."HGraphStorage";
+  "HHDL" = dontDistribute super."HHDL";
+  "HJScript" = dontDistribute super."HJScript";
+  "HJVM" = dontDistribute super."HJVM";
+  "HJavaScript" = dontDistribute super."HJavaScript";
+  "HLearn-algebra" = dontDistribute super."HLearn-algebra";
+  "HLearn-approximation" = dontDistribute super."HLearn-approximation";
+  "HLearn-classification" = dontDistribute super."HLearn-classification";
+  "HLearn-datastructures" = dontDistribute super."HLearn-datastructures";
+  "HLearn-distributions" = dontDistribute super."HLearn-distributions";
+  "HListPP" = dontDistribute super."HListPP";
+  "HLogger" = dontDistribute super."HLogger";
+  "HMM" = dontDistribute super."HMM";
+  "HMap" = dontDistribute super."HMap";
+  "HNM" = dontDistribute super."HNM";
+  "HODE" = dontDistribute super."HODE";
+  "HOpenCV" = dontDistribute super."HOpenCV";
+  "HPath" = dontDistribute super."HPath";
+  "HPi" = dontDistribute super."HPi";
+  "HPlot" = dontDistribute super."HPlot";
+  "HPong" = dontDistribute super."HPong";
+  "HROOT" = dontDistribute super."HROOT";
+  "HROOT-core" = dontDistribute super."HROOT-core";
+  "HROOT-graf" = dontDistribute super."HROOT-graf";
+  "HROOT-hist" = dontDistribute super."HROOT-hist";
+  "HROOT-io" = dontDistribute super."HROOT-io";
+  "HROOT-math" = dontDistribute super."HROOT-math";
+  "HRay" = dontDistribute super."HRay";
+  "HSFFIG" = dontDistribute super."HSFFIG";
+  "HSGEP" = dontDistribute super."HSGEP";
+  "HSH" = dontDistribute super."HSH";
+  "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSlippyMap" = dontDistribute super."HSlippyMap";
+  "HSmarty" = dontDistribute super."HSmarty";
+  "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
+  "HSvm" = dontDistribute super."HSvm";
+  "HTTP-Simple" = dontDistribute super."HTTP-Simple";
+  "HTab" = dontDistribute super."HTab";
+  "HTicTacToe" = dontDistribute super."HTicTacToe";
+  "HUnit-Diff" = dontDistribute super."HUnit-Diff";
+  "HUnit-Plus" = dontDistribute super."HUnit-Plus";
+  "HUnit-approx" = dontDistribute super."HUnit-approx";
+  "HXMPP" = dontDistribute super."HXMPP";
+  "HXQ" = dontDistribute super."HXQ";
+  "HaLeX" = dontDistribute super."HaLeX";
+  "HaMinitel" = dontDistribute super."HaMinitel";
+  "HaPy" = dontDistribute super."HaPy";
+  "HaTeX-meta" = dontDistribute super."HaTeX-meta";
+  "HaTeX-qq" = dontDistribute super."HaTeX-qq";
+  "HaVSA" = dontDistribute super."HaVSA";
+  "Hach" = dontDistribute super."Hach";
+  "HackMail" = dontDistribute super."HackMail";
+  "Haggressive" = dontDistribute super."Haggressive";
+  "HandlerSocketClient" = dontDistribute super."HandlerSocketClient";
+  "Hangman" = dontDistribute super."Hangman";
+  "HarmTrace" = dontDistribute super."HarmTrace";
+  "HarmTrace-Base" = dontDistribute super."HarmTrace-Base";
+  "HasGP" = dontDistribute super."HasGP";
+  "Haschoo" = dontDistribute super."Haschoo";
+  "Hashell" = dontDistribute super."Hashell";
+  "HaskRel" = dontDistribute super."HaskRel";
+  "HaskellForMaths" = dontDistribute super."HaskellForMaths";
+  "HaskellLM" = dontDistribute super."HaskellLM";
+  "HaskellNN" = dontDistribute super."HaskellNN";
+  "HaskellTorrent" = dontDistribute super."HaskellTorrent";
+  "HaskellTutorials" = dontDistribute super."HaskellTutorials";
+  "Haskelloids" = dontDistribute super."Haskelloids";
+  "Hate" = dontDistribute super."Hate";
+  "Hawk" = dontDistribute super."Hawk";
+  "Hayoo" = dontDistribute super."Hayoo";
+  "Hclip" = dontDistribute super."Hclip";
+  "Hedi" = dontDistribute super."Hedi";
+  "HerbiePlugin" = dontDistribute super."HerbiePlugin";
+  "Hermes" = dontDistribute super."Hermes";
+  "Hieroglyph" = dontDistribute super."Hieroglyph";
+  "HiggsSet" = dontDistribute super."HiggsSet";
+  "Hipmunk" = dontDistribute super."Hipmunk";
+  "HipmunkPlayground" = dontDistribute super."HipmunkPlayground";
+  "Hish" = dontDistribute super."Hish";
+  "Histogram" = dontDistribute super."Histogram";
+  "Hmpf" = dontDistribute super."Hmpf";
+  "Hoed" = dontDistribute super."Hoed";
+  "HoleyMonoid" = dontDistribute super."HoleyMonoid";
+  "Holumbus-Distribution" = dontDistribute super."Holumbus-Distribution";
+  "Holumbus-MapReduce" = dontDistribute super."Holumbus-MapReduce";
+  "Holumbus-Searchengine" = dontDistribute super."Holumbus-Searchengine";
+  "Holumbus-Storage" = dontDistribute super."Holumbus-Storage";
+  "Homology" = dontDistribute super."Homology";
+  "HongoDB" = dontDistribute super."HongoDB";
+  "HostAndPort" = dontDistribute super."HostAndPort";
+  "Hricket" = dontDistribute super."Hricket";
+  "Hs2lib" = dontDistribute super."Hs2lib";
+  "HsASA" = dontDistribute super."HsASA";
+  "HsHaruPDF" = dontDistribute super."HsHaruPDF";
+  "HsHyperEstraier" = dontDistribute super."HsHyperEstraier";
+  "HsJudy" = dontDistribute super."HsJudy";
+  "HsOpenSSL-x509-system" = dontDistribute super."HsOpenSSL-x509-system";
+  "HsParrot" = dontDistribute super."HsParrot";
+  "HsPerl5" = dontDistribute super."HsPerl5";
+  "HsSVN" = dontDistribute super."HsSVN";
+  "HsTools" = dontDistribute super."HsTools";
+  "Hsed" = dontDistribute super."Hsed";
+  "Hsmtlib" = dontDistribute super."Hsmtlib";
+  "HueAPI" = dontDistribute super."HueAPI";
+  "HulkImport" = dontDistribute super."HulkImport";
+  "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres";
+  "IDynamic" = dontDistribute super."IDynamic";
+  "IFS" = dontDistribute super."IFS";
+  "INblobs" = dontDistribute super."INblobs";
+  "IOR" = dontDistribute super."IOR";
+  "IORefCAS" = dontDistribute super."IORefCAS";
+  "IOSpec" = dontDistribute super."IOSpec";
+  "IcoGrid" = dontDistribute super."IcoGrid";
+  "Imlib" = dontDistribute super."Imlib";
+  "ImperativeHaskell" = dontDistribute super."ImperativeHaskell";
+  "IndentParser" = dontDistribute super."IndentParser";
+  "IndexedList" = dontDistribute super."IndexedList";
+  "InfixApplicative" = dontDistribute super."InfixApplicative";
+  "Interpolation" = dontDistribute super."Interpolation";
+  "Interpolation-maxs" = dontDistribute super."Interpolation-maxs";
+  "Irc" = dontDistribute super."Irc";
+  "IrrHaskell" = dontDistribute super."IrrHaskell";
+  "IsNull" = dontDistribute super."IsNull";
+  "JSON-Combinator" = dontDistribute super."JSON-Combinator";
+  "JSON-Combinator-Examples" = dontDistribute super."JSON-Combinator-Examples";
+  "JSONb" = dontDistribute super."JSONb";
+  "JYU-Utils" = dontDistribute super."JYU-Utils";
+  "JackMiniMix" = dontDistribute super."JackMiniMix";
+  "Javasf" = dontDistribute super."Javasf";
+  "Javav" = dontDistribute super."Javav";
+  "JsContracts" = dontDistribute super."JsContracts";
+  "JsonGrammar" = dontDistribute super."JsonGrammar";
+  "JuicyPixels-canvas" = dontDistribute super."JuicyPixels-canvas";
+  "JunkDB" = dontDistribute super."JunkDB";
+  "JunkDB-driver-gdbm" = dontDistribute super."JunkDB-driver-gdbm";
+  "JunkDB-driver-hashtables" = dontDistribute super."JunkDB-driver-hashtables";
+  "JustParse" = dontDistribute super."JustParse";
+  "KMP" = dontDistribute super."KMP";
+  "KSP" = dontDistribute super."KSP";
+  "Kalman" = dontDistribute super."Kalman";
+  "KdTree" = dontDistribute super."KdTree";
+  "Ketchup" = dontDistribute super."Ketchup";
+  "KiCS" = dontDistribute super."KiCS";
+  "KiCS-debugger" = dontDistribute super."KiCS-debugger";
+  "KiCS-prophecy" = dontDistribute super."KiCS-prophecy";
+  "Kleislify" = dontDistribute super."Kleislify";
+  "Konf" = dontDistribute super."Konf";
+  "Kriens" = dontDistribute super."Kriens";
+  "KyotoCabinet" = dontDistribute super."KyotoCabinet";
+  "L-seed" = dontDistribute super."L-seed";
+  "LDAP" = dontDistribute super."LDAP";
+  "LRU" = dontDistribute super."LRU";
+  "LTree" = dontDistribute super."LTree";
+  "LambdaCalculator" = dontDistribute super."LambdaCalculator";
+  "LambdaHack" = dontDistribute super."LambdaHack";
+  "LambdaINet" = dontDistribute super."LambdaINet";
+  "LambdaNet" = dontDistribute super."LambdaNet";
+  "LambdaPrettyQuote" = dontDistribute super."LambdaPrettyQuote";
+  "LambdaShell" = dontDistribute super."LambdaShell";
+  "Lambdajudge" = dontDistribute super."Lambdajudge";
+  "Lambdaya" = dontDistribute super."Lambdaya";
+  "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
+  "Lastik" = dontDistribute super."Lastik";
+  "Lattices" = dontDistribute super."Lattices";
+  "LazyVault" = dontDistribute super."LazyVault";
+  "Level0" = dontDistribute super."Level0";
+  "LibClang" = dontDistribute super."LibClang";
+  "LibZip" = dontDistribute super."LibZip";
+  "Limit" = dontDistribute super."Limit";
+  "LinearSplit" = dontDistribute super."LinearSplit";
+  "LinguisticsTypes" = dontDistribute super."LinguisticsTypes";
+  "LinkChecker" = dontDistribute super."LinkChecker";
+  "ListTree" = dontDistribute super."ListTree";
+  "ListWriter" = dontDistribute super."ListWriter";
+  "ListZipper" = dontDistribute super."ListZipper";
+  "Logic" = dontDistribute super."Logic";
+  "LogicGrowsOnTrees" = dontDistribute super."LogicGrowsOnTrees";
+  "LogicGrowsOnTrees-MPI" = dontDistribute super."LogicGrowsOnTrees-MPI";
+  "LogicGrowsOnTrees-network" = dontDistribute super."LogicGrowsOnTrees-network";
+  "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
+  "LslPlus" = dontDistribute super."LslPlus";
+  "Lucu" = dontDistribute super."Lucu";
+  "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
+  "MHask" = dontDistribute super."MHask";
+  "MSQueue" = dontDistribute super."MSQueue";
+  "MTGBuilder" = dontDistribute super."MTGBuilder";
+  "MagicHaskeller" = dontDistribute super."MagicHaskeller";
+  "MailchimpSimple" = dontDistribute super."MailchimpSimple";
+  "MaybeT" = dontDistribute super."MaybeT";
+  "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf";
+  "MaybeT-transformers" = dontDistribute super."MaybeT-transformers";
+  "MazesOfMonad" = dontDistribute super."MazesOfMonad";
+  "MeanShift" = dontDistribute super."MeanShift";
+  "Measure" = dontDistribute super."Measure";
+  "MetaHDBC" = dontDistribute super."MetaHDBC";
+  "MetaObject" = dontDistribute super."MetaObject";
+  "Metrics" = dontDistribute super."Metrics";
+  "Mhailist" = dontDistribute super."Mhailist";
+  "Michelangelo" = dontDistribute super."Michelangelo";
+  "MicrosoftTranslator" = dontDistribute super."MicrosoftTranslator";
+  "MiniAgda" = dontDistribute super."MiniAgda";
+  "MissingK" = dontDistribute super."MissingK";
+  "MissingM" = dontDistribute super."MissingM";
+  "MissingPy" = dontDistribute super."MissingPy";
+  "Modulo" = dontDistribute super."Modulo";
+  "Moe" = dontDistribute super."Moe";
+  "MoeDict" = dontDistribute super."MoeDict";
+  "MonadCatchIO-mtl" = dontDistribute super."MonadCatchIO-mtl";
+  "MonadCatchIO-mtl-foreign" = dontDistribute super."MonadCatchIO-mtl-foreign";
+  "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign";
+  "MonadCompose" = dontDistribute super."MonadCompose";
+  "MonadLab" = dontDistribute super."MonadLab";
+  "MonadRandomLazy" = dontDistribute super."MonadRandomLazy";
+  "MonadStack" = dontDistribute super."MonadStack";
+  "Monadius" = dontDistribute super."Monadius";
+  "Monaris" = dontDistribute super."Monaris";
+  "Monatron" = dontDistribute super."Monatron";
+  "Monatron-IO" = dontDistribute super."Monatron-IO";
+  "Monocle" = dontDistribute super."Monocle";
+  "MorseCode" = dontDistribute super."MorseCode";
+  "MuCheck" = dontDistribute super."MuCheck";
+  "MuCheck-HUnit" = dontDistribute super."MuCheck-HUnit";
+  "MuCheck-Hspec" = dontDistribute super."MuCheck-Hspec";
+  "MuCheck-QuickCheck" = dontDistribute super."MuCheck-QuickCheck";
+  "MuCheck-SmallCheck" = dontDistribute super."MuCheck-SmallCheck";
+  "Munkres" = dontDistribute super."Munkres";
+  "Munkres-simple" = dontDistribute super."Munkres-simple";
+  "MusicBrainz-libdiscid" = dontDistribute super."MusicBrainz-libdiscid";
+  "MyPrimes" = dontDistribute super."MyPrimes";
+  "NGrams" = dontDistribute super."NGrams";
+  "NTRU" = dontDistribute super."NTRU";
+  "NXT" = dontDistribute super."NXT";
+  "NXTDSL" = dontDistribute super."NXTDSL";
+  "NanoProlog" = dontDistribute super."NanoProlog";
+  "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets";
+  "NaturalSort" = dontDistribute super."NaturalSort";
+  "NearContextAlgebra" = dontDistribute super."NearContextAlgebra";
+  "Neks" = dontDistribute super."Neks";
+  "NestedFunctor" = dontDistribute super."NestedFunctor";
+  "NestedSampling" = dontDistribute super."NestedSampling";
+  "NetSNMP" = dontDistribute super."NetSNMP";
+  "NewBinary" = dontDistribute super."NewBinary";
+  "Ninjas" = dontDistribute super."Ninjas";
+  "NoSlow" = dontDistribute super."NoSlow";
+  "NoTrace" = dontDistribute super."NoTrace";
+  "Noise" = dontDistribute super."Noise";
+  "Nomyx" = dontDistribute super."Nomyx";
+  "Nomyx-Core" = dontDistribute super."Nomyx-Core";
+  "Nomyx-Language" = dontDistribute super."Nomyx-Language";
+  "Nomyx-Rules" = dontDistribute super."Nomyx-Rules";
+  "Nomyx-Web" = dontDistribute super."Nomyx-Web";
+  "NonEmpty" = dontDistribute super."NonEmpty";
+  "NonEmptyList" = dontDistribute super."NonEmptyList";
+  "NumLazyByteString" = dontDistribute super."NumLazyByteString";
+  "NumberSieves" = dontDistribute super."NumberSieves";
+  "Numbers" = dontDistribute super."Numbers";
+  "Nussinov78" = dontDistribute super."Nussinov78";
+  "Nutri" = dontDistribute super."Nutri";
+  "OGL" = dontDistribute super."OGL";
+  "OSM" = dontDistribute super."OSM";
+  "OTP" = dontDistribute super."OTP";
+  "Object" = dontDistribute super."Object";
+  "ObjectIO" = dontDistribute super."ObjectIO";
+  "Obsidian" = dontDistribute super."Obsidian";
+  "OddWord" = dontDistribute super."OddWord";
+  "Omega" = dontDistribute super."Omega";
+  "OneTuple" = dontDistribute super."OneTuple";
+  "OpenAFP" = dontDistribute super."OpenAFP";
+  "OpenAFP-Utils" = dontDistribute super."OpenAFP-Utils";
+  "OpenAL" = dontDistribute super."OpenAL";
+  "OpenCL" = dontDistribute super."OpenCL";
+  "OpenCLRaw" = dontDistribute super."OpenCLRaw";
+  "OpenCLWrappers" = dontDistribute super."OpenCLWrappers";
+  "OpenGLCheck" = dontDistribute super."OpenGLCheck";
+  "OpenGLRaw21" = dontDistribute super."OpenGLRaw21";
+  "OpenSCAD" = dontDistribute super."OpenSCAD";
+  "OpenVG" = dontDistribute super."OpenVG";
+  "OpenVGRaw" = dontDistribute super."OpenVGRaw";
+  "Operads" = dontDistribute super."Operads";
+  "OptDir" = dontDistribute super."OptDir";
+  "OrPatterns" = dontDistribute super."OrPatterns";
+  "OrchestrateDB" = dontDistribute super."OrchestrateDB";
+  "OrderedBits" = dontDistribute super."OrderedBits";
+  "Ordinals" = dontDistribute super."Ordinals";
+  "PArrows" = dontDistribute super."PArrows";
+  "PBKDF2" = dontDistribute super."PBKDF2";
+  "PCLT" = dontDistribute super."PCLT";
+  "PCLT-DB" = dontDistribute super."PCLT-DB";
+  "PDBtools" = dontDistribute super."PDBtools";
+  "PTQ" = dontDistribute super."PTQ";
+  "PageIO" = dontDistribute super."PageIO";
+  "Paillier" = dontDistribute super."Paillier";
+  "PandocAgda" = dontDistribute super."PandocAgda";
+  "Paraiso" = dontDistribute super."Paraiso";
+  "Parry" = dontDistribute super."Parry";
+  "ParsecTools" = dontDistribute super."ParsecTools";
+  "ParserFunction" = dontDistribute super."ParserFunction";
+  "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures";
+  "PasswordGenerator" = dontDistribute super."PasswordGenerator";
+  "PastePipe" = dontDistribute super."PastePipe";
+  "Pathfinder" = dontDistribute super."Pathfinder";
+  "Peano" = dontDistribute super."Peano";
+  "PeanoWitnesses" = dontDistribute super."PeanoWitnesses";
+  "PerfectHash" = dontDistribute super."PerfectHash";
+  "PermuteEffects" = dontDistribute super."PermuteEffects";
+  "Phsu" = dontDistribute super."Phsu";
+  "Pipe" = dontDistribute super."Pipe";
+  "Piso" = dontDistribute super."Piso";
+  "PlayHangmanGame" = dontDistribute super."PlayHangmanGame";
+  "PlayingCards" = dontDistribute super."PlayingCards";
+  "Plot-ho-matic" = dontDistribute super."Plot-ho-matic";
+  "PlslTools" = dontDistribute super."PlslTools";
+  "Plural" = dontDistribute super."Plural";
+  "Pollutocracy" = dontDistribute super."Pollutocracy";
+  "PortFusion" = dontDistribute super."PortFusion";
+  "PortMidi" = dontDistribute super."PortMidi";
+  "PostgreSQL" = dontDistribute super."PostgreSQL";
+  "PrimitiveArray" = dontDistribute super."PrimitiveArray";
+  "Printf-TH" = dontDistribute super."Printf-TH";
+  "PriorityChansConverger" = dontDistribute super."PriorityChansConverger";
+  "ProbabilityMonads" = dontDistribute super."ProbabilityMonads";
+  "PropLogic" = dontDistribute super."PropLogic";
+  "Proper" = dontDistribute super."Proper";
+  "ProxN" = dontDistribute super."ProxN";
+  "Pugs" = dontDistribute super."Pugs";
+  "Pup-Events" = dontDistribute super."Pup-Events";
+  "Pup-Events-Client" = dontDistribute super."Pup-Events-Client";
+  "Pup-Events-Demo" = dontDistribute super."Pup-Events-Demo";
+  "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
+  "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
+  "QIO" = dontDistribute super."QIO";
+  "QuadEdge" = dontDistribute super."QuadEdge";
+  "QuadTree" = dontDistribute super."QuadTree";
+  "Quelea" = dontDistribute super."Quelea";
+  "QuickAnnotate" = dontDistribute super."QuickAnnotate";
+  "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT";
+  "QuickCheck-safe" = dontDistribute super."QuickCheck-safe";
+  "Quickson" = dontDistribute super."Quickson";
+  "R-pandoc" = dontDistribute super."R-pandoc";
+  "RANSAC" = dontDistribute super."RANSAC";
+  "RBTree" = dontDistribute super."RBTree";
+  "RESTng" = dontDistribute super."RESTng";
+  "RFC1751" = dontDistribute super."RFC1751";
+  "RJson" = dontDistribute super."RJson";
+  "RMP" = dontDistribute super."RMP";
+  "RNAFold" = dontDistribute super."RNAFold";
+  "RNAFoldProgs" = dontDistribute super."RNAFoldProgs";
+  "RNAdesign" = dontDistribute super."RNAdesign";
+  "RNAdraw" = dontDistribute super."RNAdraw";
+  "RNAwolf" = dontDistribute super."RNAwolf";
+  "Raincat" = dontDistribute super."Raincat";
+  "Random123" = dontDistribute super."Random123";
+  "RandomDotOrg" = dontDistribute super."RandomDotOrg";
+  "Randometer" = dontDistribute super."Randometer";
+  "Range" = dontDistribute super."Range";
+  "Ranged-sets" = dontDistribute super."Ranged-sets";
+  "Ranka" = dontDistribute super."Ranka";
+  "Rasenschach" = dontDistribute super."Rasenschach";
+  "Redmine" = dontDistribute super."Redmine";
+  "Ref" = dontDistribute super."Ref";
+  "Referees" = dontDistribute super."Referees";
+  "RepLib" = dontDistribute super."RepLib";
+  "ReplicateEffects" = dontDistribute super."ReplicateEffects";
+  "ReviewBoard" = dontDistribute super."ReviewBoard";
+  "RichConditional" = dontDistribute super."RichConditional";
+  "RollingDirectory" = dontDistribute super."RollingDirectory";
+  "RoyalMonad" = dontDistribute super."RoyalMonad";
+  "RxHaskell" = dontDistribute super."RxHaskell";
+  "SBench" = dontDistribute super."SBench";
+  "SConfig" = dontDistribute super."SConfig";
+  "SDL" = dontDistribute super."SDL";
+  "SDL-gfx" = dontDistribute super."SDL-gfx";
+  "SDL-image" = dontDistribute super."SDL-image";
+  "SDL-mixer" = dontDistribute super."SDL-mixer";
+  "SDL-mpeg" = dontDistribute super."SDL-mpeg";
+  "SDL-ttf" = dontDistribute super."SDL-ttf";
+  "SDL2-ttf" = dontDistribute super."SDL2-ttf";
+  "SFML" = dontDistribute super."SFML";
+  "SFML-control" = dontDistribute super."SFML-control";
+  "SFont" = dontDistribute super."SFont";
+  "SG" = dontDistribute super."SG";
+  "SGdemo" = dontDistribute super."SGdemo";
+  "SHA2" = dontDistribute super."SHA2";
+  "SMTPClient" = dontDistribute super."SMTPClient";
+  "SNet" = dontDistribute super."SNet";
+  "SQLDeps" = dontDistribute super."SQLDeps";
+  "STL" = dontDistribute super."STL";
+  "SVG2Q" = dontDistribute super."SVG2Q";
+  "SVGFonts" = dontDistribute super."SVGFonts";
+  "SVGPath" = dontDistribute super."SVGPath";
+  "SWMMoutGetMB" = dontDistribute super."SWMMoutGetMB";
+  "SableCC2Hs" = dontDistribute super."SableCC2Hs";
+  "Safe" = dontDistribute super."Safe";
+  "Salsa" = dontDistribute super."Salsa";
+  "Saturnin" = dontDistribute super."Saturnin";
+  "SciFlow" = dontDistribute super."SciFlow";
+  "ScratchFs" = dontDistribute super."ScratchFs";
+  "Scurry" = dontDistribute super."Scurry";
+  "Semantique" = dontDistribute super."Semantique";
+  "Semigroup" = dontDistribute super."Semigroup";
+  "SeqAlign" = dontDistribute super."SeqAlign";
+  "SessionLogger" = dontDistribute super."SessionLogger";
+  "ShellCheck" = dontDistribute super."ShellCheck";
+  "Shellac" = dontDistribute super."Shellac";
+  "Shellac-compatline" = dontDistribute super."Shellac-compatline";
+  "Shellac-editline" = dontDistribute super."Shellac-editline";
+  "Shellac-haskeline" = dontDistribute super."Shellac-haskeline";
+  "Shellac-readline" = dontDistribute super."Shellac-readline";
+  "ShowF" = dontDistribute super."ShowF";
+  "Shrub" = dontDistribute super."Shrub";
+  "Shu-thing" = dontDistribute super."Shu-thing";
+  "SimpleAES" = dontDistribute super."SimpleAES";
+  "SimpleEA" = dontDistribute super."SimpleEA";
+  "SimpleGL" = dontDistribute super."SimpleGL";
+  "SimpleH" = dontDistribute super."SimpleH";
+  "SimpleLog" = dontDistribute super."SimpleLog";
+  "SizeCompare" = dontDistribute super."SizeCompare";
+  "Slides" = dontDistribute super."Slides";
+  "Smooth" = dontDistribute super."Smooth";
+  "SmtLib" = dontDistribute super."SmtLib";
+  "Snusmumrik" = dontDistribute super."Snusmumrik";
+  "SoOSiM" = dontDistribute super."SoOSiM";
+  "SoccerFun" = dontDistribute super."SoccerFun";
+  "SoccerFunGL" = dontDistribute super."SoccerFunGL";
+  "Sonnex" = dontDistribute super."Sonnex";
+  "SourceGraph" = dontDistribute super."SourceGraph";
+  "Southpaw" = dontDistribute super."Southpaw";
+  "SpaceInvaders" = dontDistribute super."SpaceInvaders";
+  "SpacePrivateers" = dontDistribute super."SpacePrivateers";
+  "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spintax" = dontDistribute super."Spintax";
+  "Spock-auth" = dontDistribute super."Spock-auth";
+  "SpreadsheetML" = dontDistribute super."SpreadsheetML";
+  "Sprig" = dontDistribute super."Sprig";
+  "Stasis" = dontDistribute super."Stasis";
+  "StateVar-transformer" = dontDistribute super."StateVar-transformer";
+  "StatisticalMethods" = dontDistribute super."StatisticalMethods";
+  "Stomp" = dontDistribute super."Stomp";
+  "Strafunski-ATermLib" = dontDistribute super."Strafunski-ATermLib";
+  "Strafunski-Sdf2Haskell" = dontDistribute super."Strafunski-Sdf2Haskell";
+  "StrappedTemplates" = dontDistribute super."StrappedTemplates";
+  "StrategyLib" = dontDistribute super."StrategyLib";
+  "Stream" = dontDistribute super."Stream";
+  "StrictBench" = dontDistribute super."StrictBench";
+  "SuffixStructures" = dontDistribute super."SuffixStructures";
+  "SybWidget" = dontDistribute super."SybWidget";
+  "SyntaxMacros" = dontDistribute super."SyntaxMacros";
+  "Sysmon" = dontDistribute super."Sysmon";
+  "TBC" = dontDistribute super."TBC";
+  "TBit" = dontDistribute super."TBit";
+  "THEff" = dontDistribute super."THEff";
+  "TTTAS" = dontDistribute super."TTTAS";
+  "TV" = dontDistribute super."TV";
+  "TYB" = dontDistribute super."TYB";
+  "TableAlgebra" = dontDistribute super."TableAlgebra";
+  "Tables" = dontDistribute super."Tables";
+  "Tablify" = dontDistribute super."Tablify";
+  "Tainted" = dontDistribute super."Tainted";
+  "Takusen" = dontDistribute super."Takusen";
+  "Tape" = dontDistribute super."Tape";
+  "TeaHS" = dontDistribute super."TeaHS";
+  "Tensor" = dontDistribute super."Tensor";
+  "TernaryTrees" = dontDistribute super."TernaryTrees";
+  "TestExplode" = dontDistribute super."TestExplode";
+  "Theora" = dontDistribute super."Theora";
+  "Thingie" = dontDistribute super."Thingie";
+  "ThreadObjects" = dontDistribute super."ThreadObjects";
+  "Thrift" = dontDistribute super."Thrift";
+  "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe";
+  "TicTacToe" = dontDistribute super."TicTacToe";
+  "TigerHash" = dontDistribute super."TigerHash";
+  "TimePiece" = dontDistribute super."TimePiece";
+  "TinyLaunchbury" = dontDistribute super."TinyLaunchbury";
+  "TinyURL" = dontDistribute super."TinyURL";
+  "Titim" = dontDistribute super."Titim";
+  "Top" = dontDistribute super."Top";
+  "Tournament" = dontDistribute super."Tournament";
+  "TraceUtils" = dontDistribute super."TraceUtils";
+  "TransformersStepByStep" = dontDistribute super."TransformersStepByStep";
+  "Transhare" = dontDistribute super."Transhare";
+  "TreeCounter" = dontDistribute super."TreeCounter";
+  "TreeStructures" = dontDistribute super."TreeStructures";
+  "TreeT" = dontDistribute super."TreeT";
+  "Treiber" = dontDistribute super."Treiber";
+  "TrendGraph" = dontDistribute super."TrendGraph";
+  "TrieMap" = dontDistribute super."TrieMap";
+  "Twofish" = dontDistribute super."Twofish";
+  "TypeClass" = dontDistribute super."TypeClass";
+  "TypeCompose" = dontDistribute super."TypeCompose";
+  "TypeIlluminator" = dontDistribute super."TypeIlluminator";
+  "TypeNat" = dontDistribute super."TypeNat";
+  "TypingTester" = dontDistribute super."TypingTester";
+  "UISF" = dontDistribute super."UISF";
+  "UMM" = dontDistribute super."UMM";
+  "URLT" = dontDistribute super."URLT";
+  "URLb" = dontDistribute super."URLb";
+  "UTFTConverter" = dontDistribute super."UTFTConverter";
+  "Unique" = dontDistribute super."Unique";
+  "Unixutils-shadow" = dontDistribute super."Unixutils-shadow";
+  "Updater" = dontDistribute super."Updater";
+  "UrlDisp" = dontDistribute super."UrlDisp";
+  "Useful" = dontDistribute super."Useful";
+  "UtilityTM" = dontDistribute super."UtilityTM";
+  "VKHS" = dontDistribute super."VKHS";
+  "Validation" = dontDistribute super."Validation";
+  "Vec" = dontDistribute super."Vec";
+  "Vec-Boolean" = dontDistribute super."Vec-Boolean";
+  "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
+  "Vec-Transform" = dontDistribute super."Vec-Transform";
+  "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
+  "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
+  "WAVE" = dontDistribute super."WAVE";
+  "WL500gPControl" = dontDistribute super."WL500gPControl";
+  "WL500gPLib" = dontDistribute super."WL500gPLib";
+  "WMSigner" = dontDistribute super."WMSigner";
+  "WURFL" = dontDistribute super."WURFL";
+  "WXDiffCtrl" = dontDistribute super."WXDiffCtrl";
+  "WashNGo" = dontDistribute super."WashNGo";
+  "WaveFront" = dontDistribute super."WaveFront";
+  "Weather" = dontDistribute super."Weather";
+  "WebBits" = dontDistribute super."WebBits";
+  "WebBits-Html" = dontDistribute super."WebBits-Html";
+  "WebBits-multiplate" = dontDistribute super."WebBits-multiplate";
+  "WebCont" = dontDistribute super."WebCont";
+  "WeberLogic" = dontDistribute super."WeberLogic";
+  "Webrexp" = dontDistribute super."Webrexp";
+  "Wheb" = dontDistribute super."Wheb";
+  "WikimediaParser" = dontDistribute super."WikimediaParser";
+  "Win32-dhcp-server" = dontDistribute super."Win32-dhcp-server";
+  "Win32-errors" = dontDistribute super."Win32-errors";
+  "Win32-junction-point" = dontDistribute super."Win32-junction-point";
+  "Win32-security" = dontDistribute super."Win32-security";
+  "Win32-services" = dontDistribute super."Win32-services";
+  "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper";
+  "Wired" = dontDistribute super."Wired";
+  "WordAlignment" = dontDistribute super."WordAlignment";
+  "WordNet" = dontDistribute super."WordNet";
+  "WordNet-ghc74" = dontDistribute super."WordNet-ghc74";
+  "Wordlint" = dontDistribute super."Wordlint";
+  "WxGeneric" = dontDistribute super."WxGeneric";
+  "X11-extras" = dontDistribute super."X11-extras";
+  "X11-rm" = dontDistribute super."X11-rm";
+  "X11-xdamage" = dontDistribute super."X11-xdamage";
+  "X11-xfixes" = dontDistribute super."X11-xfixes";
+  "X11-xft" = dontDistribute super."X11-xft";
+  "X11-xshape" = dontDistribute super."X11-xshape";
+  "XAttr" = dontDistribute super."XAttr";
+  "XInput" = dontDistribute super."XInput";
+  "XMMS" = dontDistribute super."XMMS";
+  "XMPP" = dontDistribute super."XMPP";
+  "XSaiga" = dontDistribute super."XSaiga";
+  "Xec" = dontDistribute super."Xec";
+  "XmlHtmlWriter" = dontDistribute super."XmlHtmlWriter";
+  "Xorshift128Plus" = dontDistribute super."Xorshift128Plus";
+  "YACPong" = dontDistribute super."YACPong";
+  "YFrob" = dontDistribute super."YFrob";
+  "Yablog" = dontDistribute super."Yablog";
+  "YamlReference" = dontDistribute super."YamlReference";
+  "Yampa-core" = dontDistribute super."Yampa-core";
+  "Yocto" = dontDistribute super."Yocto";
+  "Yogurt" = dontDistribute super."Yogurt";
+  "Yogurt-Standalone" = dontDistribute super."Yogurt-Standalone";
+  "ZEBEDDE" = dontDistribute super."ZEBEDDE";
+  "ZFS" = dontDistribute super."ZFS";
+  "ZMachine" = dontDistribute super."ZMachine";
+  "ZipFold" = dontDistribute super."ZipFold";
+  "ZipperAG" = dontDistribute super."ZipperAG";
+  "Zora" = dontDistribute super."Zora";
+  "Zwaluw" = dontDistribute super."Zwaluw";
+  "a50" = dontDistribute super."a50";
+  "abacate" = dontDistribute super."abacate";
+  "abc-puzzle" = dontDistribute super."abc-puzzle";
+  "abcBridge" = dontDistribute super."abcBridge";
+  "abcnotation" = dontDistribute super."abcnotation";
+  "abeson" = dontDistribute super."abeson";
+  "abstract-deque-tests" = dontDistribute super."abstract-deque-tests";
+  "abstract-par-accelerate" = dontDistribute super."abstract-par-accelerate";
+  "abt" = dontDistribute super."abt";
+  "ac-machine" = dontDistribute super."ac-machine";
+  "ac-machine-conduit" = dontDistribute super."ac-machine-conduit";
+  "accelerate-arithmetic" = dontDistribute super."accelerate-arithmetic";
+  "accelerate-cublas" = dontDistribute super."accelerate-cublas";
+  "accelerate-cuda" = dontDistribute super."accelerate-cuda";
+  "accelerate-cufft" = dontDistribute super."accelerate-cufft";
+  "accelerate-examples" = dontDistribute super."accelerate-examples";
+  "accelerate-fft" = dontDistribute super."accelerate-fft";
+  "accelerate-fftw" = dontDistribute super."accelerate-fftw";
+  "accelerate-fourier" = dontDistribute super."accelerate-fourier";
+  "accelerate-fourier-benchmark" = dontDistribute super."accelerate-fourier-benchmark";
+  "accelerate-io" = dontDistribute super."accelerate-io";
+  "accelerate-random" = dontDistribute super."accelerate-random";
+  "accelerate-utility" = dontDistribute super."accelerate-utility";
+  "accentuateus" = dontDistribute super."accentuateus";
+  "access-time" = dontDistribute super."access-time";
+  "acid-state-dist" = dontDistribute super."acid-state-dist";
+  "acid-state-tls" = dontDistribute super."acid-state-tls";
+  "acl2" = dontDistribute super."acl2";
+  "acme-all-monad" = dontDistribute super."acme-all-monad";
+  "acme-box" = dontDistribute super."acme-box";
+  "acme-cadre" = dontDistribute super."acme-cadre";
+  "acme-cofunctor" = dontDistribute super."acme-cofunctor";
+  "acme-colosson" = dontDistribute super."acme-colosson";
+  "acme-comonad" = dontDistribute super."acme-comonad";
+  "acme-cutegirl" = dontDistribute super."acme-cutegirl";
+  "acme-dont" = dontDistribute super."acme-dont";
+  "acme-flipping-tables" = dontDistribute super."acme-flipping-tables";
+  "acme-grawlix" = dontDistribute super."acme-grawlix";
+  "acme-hq9plus" = dontDistribute super."acme-hq9plus";
+  "acme-http" = dontDistribute super."acme-http";
+  "acme-inator" = dontDistribute super."acme-inator";
+  "acme-io" = dontDistribute super."acme-io";
+  "acme-lolcat" = dontDistribute super."acme-lolcat";
+  "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
+  "acme-memorandom" = dontDistribute super."acme-memorandom";
+  "acme-microwave" = dontDistribute super."acme-microwave";
+  "acme-miscorder" = dontDistribute super."acme-miscorder";
+  "acme-missiles" = dontDistribute super."acme-missiles";
+  "acme-now" = dontDistribute super."acme-now";
+  "acme-numbersystem" = dontDistribute super."acme-numbersystem";
+  "acme-omitted" = dontDistribute super."acme-omitted";
+  "acme-one" = dontDistribute super."acme-one";
+  "acme-operators" = dontDistribute super."acme-operators";
+  "acme-php" = dontDistribute super."acme-php";
+  "acme-pointful-numbers" = dontDistribute super."acme-pointful-numbers";
+  "acme-realworld" = dontDistribute super."acme-realworld";
+  "acme-safe" = dontDistribute super."acme-safe";
+  "acme-schoenfinkel" = dontDistribute super."acme-schoenfinkel";
+  "acme-strfry" = dontDistribute super."acme-strfry";
+  "acme-stringly-typed" = dontDistribute super."acme-stringly-typed";
+  "acme-strtok" = dontDistribute super."acme-strtok";
+  "acme-timemachine" = dontDistribute super."acme-timemachine";
+  "acme-year" = dontDistribute super."acme-year";
+  "acme-zero" = dontDistribute super."acme-zero";
+  "activehs" = dontDistribute super."activehs";
+  "activehs-base" = dontDistribute super."activehs-base";
+  "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
+  "actor" = dontDistribute super."actor";
+  "adaptive-containers" = dontDistribute super."adaptive-containers";
+  "adaptive-tuple" = dontDistribute super."adaptive-tuple";
+  "adb" = dontDistribute super."adb";
+  "adblock2privoxy" = dontDistribute super."adblock2privoxy";
+  "addLicenseInfo" = dontDistribute super."addLicenseInfo";
+  "adhoc-network" = dontDistribute super."adhoc-network";
+  "adict" = dontDistribute super."adict";
+  "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange";
+  "adp-multi" = dontDistribute super."adp-multi";
+  "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp";
+  "aeson-applicative" = dontDistribute super."aeson-applicative";
+  "aeson-bson" = dontDistribute super."aeson-bson";
+  "aeson-diff" = dontDistribute super."aeson-diff";
+  "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-lens" = dontDistribute super."aeson-lens";
+  "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
+  "aeson-schema" = dontDistribute super."aeson-schema";
+  "aeson-serialize" = dontDistribute super."aeson-serialize";
+  "aeson-smart" = dontDistribute super."aeson-smart";
+  "aeson-streams" = dontDistribute super."aeson-streams";
+  "aeson-t" = dontDistribute super."aeson-t";
+  "aeson-toolkit" = dontDistribute super."aeson-toolkit";
+  "aeson-value-parser" = dontDistribute super."aeson-value-parser";
+  "aeson-yak" = dontDistribute super."aeson-yak";
+  "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
+  "afis" = dontDistribute super."afis";
+  "afv" = dontDistribute super."afv";
+  "agda-server" = dontDistribute super."agda-server";
+  "agda-snippets" = dontDistribute super."agda-snippets";
+  "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
+  "agum" = dontDistribute super."agum";
+  "aig" = dontDistribute super."aig";
+  "air" = dontDistribute super."air";
+  "air-extra" = dontDistribute super."air-extra";
+  "air-spec" = dontDistribute super."air-spec";
+  "air-th" = dontDistribute super."air-th";
+  "airbrake" = dontDistribute super."airbrake";
+  "aivika" = dontDistribute super."aivika";
+  "aivika-experiment" = dontDistribute super."aivika-experiment";
+  "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
+  "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
+  "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-transformers" = dontDistribute super."aivika-transformers";
+  "ajhc" = dontDistribute super."ajhc";
+  "al" = dontDistribute super."al";
+  "alea" = dontDistribute super."alea";
+  "alex-meta" = dontDistribute super."alex-meta";
+  "alfred" = dontDistribute super."alfred";
+  "alga" = dontDistribute super."alga";
+  "algebra" = dontDistribute super."algebra";
+  "algebra-dag" = dontDistribute super."algebra-dag";
+  "algebra-sql" = dontDistribute super."algebra-sql";
+  "algebraic" = dontDistribute super."algebraic";
+  "algebraic-classes" = dontDistribute super."algebraic-classes";
+  "align" = dontDistribute super."align";
+  "align-text" = dontDistribute super."align-text";
+  "aligned-foreignptr" = dontDistribute super."aligned-foreignptr";
+  "allocated-processor" = dontDistribute super."allocated-processor";
+  "alloy" = dontDistribute super."alloy";
+  "alloy-proxy-fd" = dontDistribute super."alloy-proxy-fd";
+  "almost-fix" = dontDistribute super."almost-fix";
+  "alms" = dontDistribute super."alms";
+  "alpha" = dontDistribute super."alpha";
+  "alpino-tools" = dontDistribute super."alpino-tools";
+  "alsa" = dontDistribute super."alsa";
+  "alsa-core" = dontDistribute super."alsa-core";
+  "alsa-gui" = dontDistribute super."alsa-gui";
+  "alsa-midi" = dontDistribute super."alsa-midi";
+  "alsa-mixer" = dontDistribute super."alsa-mixer";
+  "alsa-pcm" = dontDistribute super."alsa-pcm";
+  "alsa-pcm-tests" = dontDistribute super."alsa-pcm-tests";
+  "alsa-seq" = dontDistribute super."alsa-seq";
+  "alsa-seq-tests" = dontDistribute super."alsa-seq-tests";
+  "altcomposition" = dontDistribute super."altcomposition";
+  "alternative-io" = dontDistribute super."alternative-io";
+  "altfloat" = dontDistribute super."altfloat";
+  "alure" = dontDistribute super."alure";
+  "amazon-emailer" = dontDistribute super."amazon-emailer";
+  "amazon-emailer-client-snap" = dontDistribute super."amazon-emailer-client-snap";
+  "amazon-products" = dontDistribute super."amazon-products";
+  "ampersand" = dontDistribute super."ampersand";
+  "amqp-conduit" = dontDistribute super."amqp-conduit";
+  "amrun" = dontDistribute super."amrun";
+  "analyze-client" = dontDistribute super."analyze-client";
+  "anansi" = dontDistribute super."anansi";
+  "anansi-hscolour" = dontDistribute super."anansi-hscolour";
+  "anansi-pandoc" = dontDistribute super."anansi-pandoc";
+  "anatomy" = dontDistribute super."anatomy";
+  "android" = dontDistribute super."android";
+  "android-lint-summary" = dontDistribute super."android-lint-summary";
+  "animalcase" = dontDistribute super."animalcase";
+  "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
+  "ansi-pretty" = dontDistribute super."ansi-pretty";
+  "ansigraph" = dontDistribute super."ansigraph";
+  "antagonist" = dontDistribute super."antagonist";
+  "antfarm" = dontDistribute super."antfarm";
+  "anticiv" = dontDistribute super."anticiv";
+  "antigate" = dontDistribute super."antigate";
+  "antimirov" = dontDistribute super."antimirov";
+  "antiquoter" = dontDistribute super."antiquoter";
+  "antisplice" = dontDistribute super."antisplice";
+  "antlrc" = dontDistribute super."antlrc";
+  "anydbm" = dontDistribute super."anydbm";
+  "aosd" = dontDistribute super."aosd";
+  "ap-reflect" = dontDistribute super."ap-reflect";
+  "apache-md5" = dontDistribute super."apache-md5";
+  "apelsin" = dontDistribute super."apelsin";
+  "api-builder" = dontDistribute super."api-builder";
+  "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode";
+  "api-tools" = dontDistribute super."api-tools";
+  "apiary-helics" = dontDistribute super."apiary-helics";
+  "apiary-purescript" = dontDistribute super."apiary-purescript";
+  "apis" = dontDistribute super."apis";
+  "apotiki" = dontDistribute super."apotiki";
+  "app-lens" = dontDistribute super."app-lens";
+  "appc" = dontDistribute super."appc";
+  "applicative-extras" = dontDistribute super."applicative-extras";
+  "applicative-fail" = dontDistribute super."applicative-fail";
+  "applicative-numbers" = dontDistribute super."applicative-numbers";
+  "applicative-parsec" = dontDistribute super."applicative-parsec";
+  "applicative-quoters" = dontDistribute super."applicative-quoters";
+  "apportionment" = dontDistribute super."apportionment";
+  "approx-rand-test" = dontDistribute super."approx-rand-test";
+  "approximate-equality" = dontDistribute super."approximate-equality";
+  "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper";
+  "arb-fft" = dontDistribute super."arb-fft";
+  "arbb-vm" = dontDistribute super."arbb-vm";
+  "archive" = dontDistribute super."archive";
+  "archiver" = dontDistribute super."archiver";
+  "archlinux" = dontDistribute super."archlinux";
+  "archlinux-web" = dontDistribute super."archlinux-web";
+  "archnews" = dontDistribute super."archnews";
+  "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
+  "argon2" = dontDistribute super."argon2";
+  "argparser" = dontDistribute super."argparser";
+  "arguedit" = dontDistribute super."arguedit";
+  "ariadne" = dontDistribute super."ariadne";
+  "arion" = dontDistribute super."arion";
+  "arith-encode" = dontDistribute super."arith-encode";
+  "arithmatic" = dontDistribute super."arithmatic";
+  "arithmetic" = dontDistribute super."arithmetic";
+  "arithmoi" = dontDistribute super."arithmoi";
+  "armada" = dontDistribute super."armada";
+  "arpa" = dontDistribute super."arpa";
+  "array-forth" = dontDistribute super."array-forth";
+  "array-memoize" = dontDistribute super."array-memoize";
+  "array-primops" = dontDistribute super."array-primops";
+  "array-utils" = dontDistribute super."array-utils";
+  "arrow-improve" = dontDistribute super."arrow-improve";
+  "arrowapply-utils" = dontDistribute super."arrowapply-utils";
+  "arrowp" = dontDistribute super."arrowp";
+  "arrows" = dontDistribute super."arrows";
+  "artery" = dontDistribute super."artery";
+  "arx" = dontDistribute super."arx";
+  "arxiv" = dontDistribute super."arxiv";
+  "ascetic" = dontDistribute super."ascetic";
+  "ascii" = dontDistribute super."ascii";
+  "ascii-vector-avc" = dontDistribute super."ascii-vector-avc";
+  "ascii85-conduit" = dontDistribute super."ascii85-conduit";
+  "asic" = dontDistribute super."asic";
+  "asil" = dontDistribute super."asil";
+  "asn1-data" = dontDistribute super."asn1-data";
+  "asn1dump" = dontDistribute super."asn1dump";
+  "assembler" = dontDistribute super."assembler";
+  "assert" = dontDistribute super."assert";
+  "assert-failure" = dontDistribute super."assert-failure";
+  "assertions" = dontDistribute super."assertions";
+  "assimp" = dontDistribute super."assimp";
+  "astar" = dontDistribute super."astar";
+  "astrds" = dontDistribute super."astrds";
+  "astview" = dontDistribute super."astview";
+  "astview-utils" = dontDistribute super."astview-utils";
+  "async-extras" = dontDistribute super."async-extras";
+  "async-manager" = dontDistribute super."async-manager";
+  "async-pool" = dontDistribute super."async-pool";
+  "asynchronous-exceptions" = dontDistribute super."asynchronous-exceptions";
+  "aterm" = dontDistribute super."aterm";
+  "aterm-utils" = dontDistribute super."aterm-utils";
+  "atl" = dontDistribute super."atl";
+  "atlassian-connect-core" = dontDistribute super."atlassian-connect-core";
+  "atlassian-connect-descriptor" = dontDistribute super."atlassian-connect-descriptor";
+  "atmos" = dontDistribute super."atmos";
+  "atmos-dimensional" = dontDistribute super."atmos-dimensional";
+  "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atom" = dontDistribute super."atom";
+  "atom-basic" = dontDistribute super."atom-basic";
+  "atom-conduit" = dontDistribute super."atom-conduit";
+  "atom-msp430" = dontDistribute super."atom-msp430";
+  "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign";
+  "atomic-primops-vector" = dontDistribute super."atomic-primops-vector";
+  "atomic-write" = dontDistribute super."atomic-write";
+  "atomo" = dontDistribute super."atomo";
+  "atp-haskell" = dontDistribute super."atp-haskell";
+  "attempt" = dontDistribute super."attempt";
+  "atto-lisp" = dontDistribute super."atto-lisp";
+  "attoparsec-arff" = dontDistribute super."attoparsec-arff";
+  "attoparsec-binary" = dontDistribute super."attoparsec-binary";
+  "attoparsec-conduit" = dontDistribute super."attoparsec-conduit";
+  "attoparsec-csv" = dontDistribute super."attoparsec-csv";
+  "attoparsec-iteratee" = dontDistribute super."attoparsec-iteratee";
+  "attoparsec-parsec" = dontDistribute super."attoparsec-parsec";
+  "attoparsec-text" = dontDistribute super."attoparsec-text";
+  "attoparsec-text-enumerator" = dontDistribute super."attoparsec-text-enumerator";
+  "attosplit" = dontDistribute super."attosplit";
+  "atuin" = dontDistribute super."atuin";
+  "audacity" = dontDistribute super."audacity";
+  "audiovisual" = dontDistribute super."audiovisual";
+  "augeas" = dontDistribute super."augeas";
+  "augur" = dontDistribute super."augur";
+  "aur" = dontDistribute super."aur";
+  "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
+  "authenticate-ldap" = dontDistribute super."authenticate-ldap";
+  "authinfo-hs" = dontDistribute super."authinfo-hs";
+  "authoring" = dontDistribute super."authoring";
+  "autonix-deps" = dontDistribute super."autonix-deps";
+  "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
+  "autoproc" = dontDistribute super."autoproc";
+  "avahi" = dontDistribute super."avahi";
+  "avatar-generator" = dontDistribute super."avatar-generator";
+  "average" = dontDistribute super."average";
+  "avers" = dontDistribute super."avers";
+  "avl-static" = dontDistribute super."avl-static";
+  "avr-shake" = dontDistribute super."avr-shake";
+  "awesomium" = dontDistribute super."awesomium";
+  "awesomium-glut" = dontDistribute super."awesomium-glut";
+  "awesomium-raw" = dontDistribute super."awesomium-raw";
+  "aws-cloudfront-signer" = dontDistribute super."aws-cloudfront-signer";
+  "aws-configuration-tools" = dontDistribute super."aws-configuration-tools";
+  "aws-dynamodb-conduit" = dontDistribute super."aws-dynamodb-conduit";
+  "aws-dynamodb-streams" = dontDistribute super."aws-dynamodb-streams";
+  "aws-ec2" = dontDistribute super."aws-ec2";
+  "aws-elastic-transcoder" = dontDistribute super."aws-elastic-transcoder";
+  "aws-general" = dontDistribute super."aws-general";
+  "aws-kinesis" = dontDistribute super."aws-kinesis";
+  "aws-kinesis-client" = dontDistribute super."aws-kinesis-client";
+  "aws-kinesis-reshard" = dontDistribute super."aws-kinesis-reshard";
+  "aws-lambda" = dontDistribute super."aws-lambda";
+  "aws-performance-tests" = dontDistribute super."aws-performance-tests";
+  "aws-route53" = dontDistribute super."aws-route53";
+  "aws-sdk" = dontDistribute super."aws-sdk";
+  "aws-sdk-text-converter" = dontDistribute super."aws-sdk-text-converter";
+  "aws-sdk-xml-unordered" = dontDistribute super."aws-sdk-xml-unordered";
+  "aws-sign4" = dontDistribute super."aws-sign4";
+  "aws-sns" = dontDistribute super."aws-sns";
+  "azure-acs" = dontDistribute super."azure-acs";
+  "azure-service-api" = dontDistribute super."azure-service-api";
+  "azure-servicebus" = dontDistribute super."azure-servicebus";
+  "azurify" = dontDistribute super."azurify";
+  "b-tree" = dontDistribute super."b-tree";
+  "babylon" = dontDistribute super."babylon";
+  "backdropper" = dontDistribute super."backdropper";
+  "backtracking-exceptions" = dontDistribute super."backtracking-exceptions";
+  "backward-state" = dontDistribute super."backward-state";
+  "bacteria" = dontDistribute super."bacteria";
+  "bag" = dontDistribute super."bag";
+  "bamboo" = dontDistribute super."bamboo";
+  "bamboo-launcher" = dontDistribute super."bamboo-launcher";
+  "bamboo-plugin-highlight" = dontDistribute super."bamboo-plugin-highlight";
+  "bamboo-plugin-photo" = dontDistribute super."bamboo-plugin-photo";
+  "bamboo-theme-blueprint" = dontDistribute super."bamboo-theme-blueprint";
+  "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
+  "bamse" = dontDistribute super."bamse";
+  "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
+  "banwords" = dontDistribute super."banwords";
+  "barchart" = dontDistribute super."barchart";
+  "barcodes-code128" = dontDistribute super."barcodes-code128";
+  "barecheck" = dontDistribute super."barecheck";
+  "barley" = dontDistribute super."barley";
+  "barrie" = dontDistribute super."barrie";
+  "barrier-monad" = dontDistribute super."barrier-monad";
+  "base-generics" = dontDistribute super."base-generics";
+  "base-io-access" = dontDistribute super."base-io-access";
+  "base32-bytestring" = dontDistribute super."base32-bytestring";
+  "base58-bytestring" = dontDistribute super."base58-bytestring";
+  "base58address" = dontDistribute super."base58address";
+  "base64-conduit" = dontDistribute super."base64-conduit";
+  "base91" = dontDistribute super."base91";
+  "basex-client" = dontDistribute super."basex-client";
+  "bash" = dontDistribute super."bash";
+  "basic-lens" = dontDistribute super."basic-lens";
+  "basic-sop" = dontDistribute super."basic-sop";
+  "baskell" = dontDistribute super."baskell";
+  "battlenet" = dontDistribute super."battlenet";
+  "battlenet-yesod" = dontDistribute super."battlenet-yesod";
+  "battleships" = dontDistribute super."battleships";
+  "bayes-stack" = dontDistribute super."bayes-stack";
+  "bbdb" = dontDistribute super."bbdb";
+  "bbi" = dontDistribute super."bbi";
+  "bdd" = dontDistribute super."bdd";
+  "bdelta" = dontDistribute super."bdelta";
+  "bdo" = dontDistribute super."bdo";
+  "beamable" = dontDistribute super."beamable";
+  "beautifHOL" = dontDistribute super."beautifHOL";
+  "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
+  "bein" = dontDistribute super."bein";
+  "benchmark-function" = dontDistribute super."benchmark-function";
+  "bencoding" = dontDistribute super."bencoding";
+  "berkeleydb" = dontDistribute super."berkeleydb";
+  "berp" = dontDistribute super."berp";
+  "bert" = dontDistribute super."bert";
+  "besout" = dontDistribute super."besout";
+  "bet" = dontDistribute super."bet";
+  "betacode" = dontDistribute super."betacode";
+  "between" = dontDistribute super."between";
+  "bf-cata" = dontDistribute super."bf-cata";
+  "bff" = dontDistribute super."bff";
+  "bff-mono" = dontDistribute super."bff-mono";
+  "bgmax" = dontDistribute super."bgmax";
+  "bgzf" = dontDistribute super."bgzf";
+  "bibtex" = dontDistribute super."bibtex";
+  "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
+  "bidispec" = dontDistribute super."bidispec";
+  "bidispec-extras" = dontDistribute super."bidispec-extras";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
+  "billboard-parser" = dontDistribute super."billboard-parser";
+  "billeksah-forms" = dontDistribute super."billeksah-forms";
+  "billeksah-main" = dontDistribute super."billeksah-main";
+  "billeksah-main-static" = dontDistribute super."billeksah-main-static";
+  "billeksah-pane" = dontDistribute super."billeksah-pane";
+  "billeksah-services" = dontDistribute super."billeksah-services";
+  "bimaps" = dontDistribute super."bimaps";
+  "binary-bits" = dontDistribute super."binary-bits";
+  "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-derive" = dontDistribute super."binary-derive";
+  "binary-enum" = dontDistribute super."binary-enum";
+  "binary-file" = dontDistribute super."binary-file";
+  "binary-generic" = dontDistribute super."binary-generic";
+  "binary-indexed-tree" = dontDistribute super."binary-indexed-tree";
+  "binary-literal-qq" = dontDistribute super."binary-literal-qq";
+  "binary-protocol" = dontDistribute super."binary-protocol";
+  "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
+  "binary-shared" = dontDistribute super."binary-shared";
+  "binary-state" = dontDistribute super."binary-state";
+  "binary-store" = dontDistribute super."binary-store";
+  "binary-streams" = dontDistribute super."binary-streams";
+  "binary-strict" = dontDistribute super."binary-strict";
+  "binarydefer" = dontDistribute super."binarydefer";
+  "bind-marshal" = dontDistribute super."bind-marshal";
+  "binding-core" = dontDistribute super."binding-core";
+  "binding-gtk" = dontDistribute super."binding-gtk";
+  "binding-wx" = dontDistribute super."binding-wx";
+  "bindings" = dontDistribute super."bindings";
+  "bindings-EsounD" = dontDistribute super."bindings-EsounD";
+  "bindings-K8055" = dontDistribute super."bindings-K8055";
+  "bindings-apr" = dontDistribute super."bindings-apr";
+  "bindings-apr-util" = dontDistribute super."bindings-apr-util";
+  "bindings-audiofile" = dontDistribute super."bindings-audiofile";
+  "bindings-bfd" = dontDistribute super."bindings-bfd";
+  "bindings-cctools" = dontDistribute super."bindings-cctools";
+  "bindings-codec2" = dontDistribute super."bindings-codec2";
+  "bindings-common" = dontDistribute super."bindings-common";
+  "bindings-dc1394" = dontDistribute super."bindings-dc1394";
+  "bindings-directfb" = dontDistribute super."bindings-directfb";
+  "bindings-eskit" = dontDistribute super."bindings-eskit";
+  "bindings-fann" = dontDistribute super."bindings-fann";
+  "bindings-fluidsynth" = dontDistribute super."bindings-fluidsynth";
+  "bindings-friso" = dontDistribute super."bindings-friso";
+  "bindings-glib" = dontDistribute super."bindings-glib";
+  "bindings-gobject" = dontDistribute super."bindings-gobject";
+  "bindings-gpgme" = dontDistribute super."bindings-gpgme";
+  "bindings-gsl" = dontDistribute super."bindings-gsl";
+  "bindings-gts" = dontDistribute super."bindings-gts";
+  "bindings-hamlib" = dontDistribute super."bindings-hamlib";
+  "bindings-hdf5" = dontDistribute super."bindings-hdf5";
+  "bindings-levmar" = dontDistribute super."bindings-levmar";
+  "bindings-libcddb" = dontDistribute super."bindings-libcddb";
+  "bindings-libffi" = dontDistribute super."bindings-libffi";
+  "bindings-libftdi" = dontDistribute super."bindings-libftdi";
+  "bindings-librrd" = dontDistribute super."bindings-librrd";
+  "bindings-libstemmer" = dontDistribute super."bindings-libstemmer";
+  "bindings-libusb" = dontDistribute super."bindings-libusb";
+  "bindings-libv4l2" = dontDistribute super."bindings-libv4l2";
+  "bindings-libzip" = dontDistribute super."bindings-libzip";
+  "bindings-linux-videodev2" = dontDistribute super."bindings-linux-videodev2";
+  "bindings-lxc" = dontDistribute super."bindings-lxc";
+  "bindings-mmap" = dontDistribute super."bindings-mmap";
+  "bindings-mpdecimal" = dontDistribute super."bindings-mpdecimal";
+  "bindings-nettle" = dontDistribute super."bindings-nettle";
+  "bindings-parport" = dontDistribute super."bindings-parport";
+  "bindings-portaudio" = dontDistribute super."bindings-portaudio";
+  "bindings-potrace" = dontDistribute super."bindings-potrace";
+  "bindings-ppdev" = dontDistribute super."bindings-ppdev";
+  "bindings-saga-cmd" = dontDistribute super."bindings-saga-cmd";
+  "bindings-sane" = dontDistribute super."bindings-sane";
+  "bindings-sc3" = dontDistribute super."bindings-sc3";
+  "bindings-sipc" = dontDistribute super."bindings-sipc";
+  "bindings-sophia" = dontDistribute super."bindings-sophia";
+  "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
+  "bindings-svm" = dontDistribute super."bindings-svm";
+  "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-yices" = dontDistribute super."bindings-yices";
+  "bindynamic" = dontDistribute super."bindynamic";
+  "binembed" = dontDistribute super."binembed";
+  "binembed-example" = dontDistribute super."binembed-example";
+  "bio" = dontDistribute super."bio";
+  "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
+  "biosff" = dontDistribute super."biosff";
+  "biostockholm" = dontDistribute super."biostockholm";
+  "bird" = dontDistribute super."bird";
+  "bit-array" = dontDistribute super."bit-array";
+  "bit-vector" = dontDistribute super."bit-vector";
+  "bitarray" = dontDistribute super."bitarray";
+  "bitcoin-rpc" = dontDistribute super."bitcoin-rpc";
+  "bitly-cli" = dontDistribute super."bitly-cli";
+  "bitmap" = dontDistribute super."bitmap";
+  "bitmap-opengl" = dontDistribute super."bitmap-opengl";
+  "bitmaps" = dontDistribute super."bitmaps";
+  "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-conduit" = dontDistribute super."bits-conduit";
+  "bits-extras" = dontDistribute super."bits-extras";
+  "bitset" = dontDistribute super."bitset";
+  "bitspeak" = dontDistribute super."bitspeak";
+  "bitstream" = dontDistribute super."bitstream";
+  "bitstring" = dontDistribute super."bitstring";
+  "bittorrent" = dontDistribute super."bittorrent";
+  "bitvec" = dontDistribute super."bitvec";
+  "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
+  "bk-tree" = dontDistribute super."bk-tree";
+  "bkr" = dontDistribute super."bkr";
+  "bktrees" = dontDistribute super."bktrees";
+  "bla" = dontDistribute super."bla";
+  "black-jewel" = dontDistribute super."black-jewel";
+  "blacktip" = dontDistribute super."blacktip";
+  "blakesum" = dontDistribute super."blakesum";
+  "blakesum-demo" = dontDistribute super."blakesum-demo";
+  "blank-canvas" = dontDistribute super."blank-canvas";
+  "blas" = dontDistribute super."blas";
+  "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
+  "blaze" = dontDistribute super."blaze";
+  "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
+  "blaze-from-html" = dontDistribute super."blaze-from-html";
+  "blaze-html-contrib" = dontDistribute super."blaze-html-contrib";
+  "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat";
+  "blaze-html-truncate" = dontDistribute super."blaze-html-truncate";
+  "blaze-json" = dontDistribute super."blaze-json";
+  "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-textual-native" = dontDistribute super."blaze-textual-native";
+  "blazeMarker" = dontDistribute super."blazeMarker";
+  "blink1" = dontDistribute super."blink1";
+  "blip" = dontDistribute super."blip";
+  "bliplib" = dontDistribute super."bliplib";
+  "blocking-transactions" = dontDistribute super."blocking-transactions";
+  "blogination" = dontDistribute super."blogination";
+  "bloxorz" = dontDistribute super."bloxorz";
+  "blubber" = dontDistribute super."blubber";
+  "blubber-server" = dontDistribute super."blubber-server";
+  "bluetile" = dontDistribute super."bluetile";
+  "bluetileutils" = dontDistribute super."bluetileutils";
+  "blunt" = dontDistribute super."blunt";
+  "board-games" = dontDistribute super."board-games";
+  "bogre-banana" = dontDistribute super."bogre-banana";
+  "bond" = dontDistribute super."bond";
+  "boolean-list" = dontDistribute super."boolean-list";
+  "boolean-normal-forms" = dontDistribute super."boolean-normal-forms";
+  "boolexpr" = dontDistribute super."boolexpr";
+  "bools" = dontDistribute super."bools";
+  "boolsimplifier" = dontDistribute super."boolsimplifier";
+  "boomange" = dontDistribute super."boomange";
+  "boomslang" = dontDistribute super."boomslang";
+  "borel" = dontDistribute super."borel";
+  "bot" = dontDistribute super."bot";
+  "botpp" = dontDistribute super."botpp";
+  "bound-gen" = dontDistribute super."bound-gen";
+  "bounded-tchan" = dontDistribute super."bounded-tchan";
+  "boundingboxes" = dontDistribute super."boundingboxes";
+  "bowntz" = dontDistribute super."bowntz";
+  "bpann" = dontDistribute super."bpann";
+  "brainfuck" = dontDistribute super."brainfuck";
+  "brainfuck-monad" = dontDistribute super."brainfuck-monad";
+  "brainfuck-tut" = dontDistribute super."brainfuck-tut";
+  "break" = dontDistribute super."break";
+  "breakout" = dontDistribute super."breakout";
+  "breve" = dontDistribute super."breve";
+  "brians-brain" = dontDistribute super."brians-brain";
+  "brillig" = dontDistribute super."brillig";
+  "broccoli" = dontDistribute super."broccoli";
+  "broker-haskell" = dontDistribute super."broker-haskell";
+  "bsd-sysctl" = dontDistribute super."bsd-sysctl";
+  "bson-generic" = dontDistribute super."bson-generic";
+  "bson-generics" = dontDistribute super."bson-generics";
+  "bson-mapping" = dontDistribute super."bson-mapping";
+  "bspack" = dontDistribute super."bspack";
+  "bsparse" = dontDistribute super."bsparse";
+  "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffon" = dontDistribute super."buffon";
+  "bugzilla" = dontDistribute super."bugzilla";
+  "buildable" = dontDistribute super."buildable";
+  "buildbox" = dontDistribute super."buildbox";
+  "buildbox-tools" = dontDistribute super."buildbox-tools";
+  "buildwrapper" = dontDistribute super."buildwrapper";
+  "bullet" = dontDistribute super."bullet";
+  "burst-detection" = dontDistribute super."burst-detection";
+  "bus-pirate" = dontDistribute super."bus-pirate";
+  "buster" = dontDistribute super."buster";
+  "buster-gtk" = dontDistribute super."buster-gtk";
+  "buster-network" = dontDistribute super."buster-network";
+  "butterflies" = dontDistribute super."butterflies";
+  "bv" = dontDistribute super."bv";
+  "byline" = dontDistribute super."byline";
+  "bytable" = dontDistribute super."bytable";
+  "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary";
+  "bytestring-class" = dontDistribute super."bytestring-class";
+  "bytestring-csv" = dontDistribute super."bytestring-csv";
+  "bytestring-delta" = dontDistribute super."bytestring-delta";
+  "bytestring-from" = dontDistribute super."bytestring-from";
+  "bytestring-handle" = dontDistribute super."bytestring-handle";
+  "bytestring-nums" = dontDistribute super."bytestring-nums";
+  "bytestring-plain" = dontDistribute super."bytestring-plain";
+  "bytestring-rematch" = dontDistribute super."bytestring-rematch";
+  "bytestring-short" = dontDistribute super."bytestring-short";
+  "bytestring-show" = dontDistribute super."bytestring-show";
+  "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder";
+  "bytestringparser" = dontDistribute super."bytestringparser";
+  "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
+  "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "c-dsl" = dontDistribute super."c-dsl";
+  "c-io" = dontDistribute super."c-io";
+  "c-storable-deriving" = dontDistribute super."c-storable-deriving";
+  "c0check" = dontDistribute super."c0check";
+  "c0parser" = dontDistribute super."c0parser";
+  "c10k" = dontDistribute super."c10k";
+  "c2hsc" = dontDistribute super."c2hsc";
+  "cab" = dontDistribute super."cab";
+  "cabal-audit" = dontDistribute super."cabal-audit";
+  "cabal-bounds" = dontDistribute super."cabal-bounds";
+  "cabal-cargs" = dontDistribute super."cabal-cargs";
+  "cabal-constraints" = dontDistribute super."cabal-constraints";
+  "cabal-db" = dontDistribute super."cabal-db";
+  "cabal-dependency-licenses" = dontDistribute super."cabal-dependency-licenses";
+  "cabal-dev" = dontDistribute super."cabal-dev";
+  "cabal-dir" = dontDistribute super."cabal-dir";
+  "cabal-ghc-dynflags" = dontDistribute super."cabal-ghc-dynflags";
+  "cabal-ghci" = dontDistribute super."cabal-ghci";
+  "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
+  "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
+  "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
+  "cabal-install-ghc74" = dontDistribute super."cabal-install-ghc74";
+  "cabal-lenses" = dontDistribute super."cabal-lenses";
+  "cabal-macosx" = dontDistribute super."cabal-macosx";
+  "cabal-meta" = dontDistribute super."cabal-meta";
+  "cabal-mon" = dontDistribute super."cabal-mon";
+  "cabal-nirvana" = dontDistribute super."cabal-nirvana";
+  "cabal-progdeps" = dontDistribute super."cabal-progdeps";
+  "cabal-query" = dontDistribute super."cabal-query";
+  "cabal-scripts" = dontDistribute super."cabal-scripts";
+  "cabal-setup" = dontDistribute super."cabal-setup";
+  "cabal-sign" = dontDistribute super."cabal-sign";
+  "cabal-test" = dontDistribute super."cabal-test";
+  "cabal-test-bin" = dontDistribute super."cabal-test-bin";
+  "cabal-test-compat" = dontDistribute super."cabal-test-compat";
+  "cabal-test-quickcheck" = dontDistribute super."cabal-test-quickcheck";
+  "cabal-uninstall" = dontDistribute super."cabal-uninstall";
+  "cabal-upload" = dontDistribute super."cabal-upload";
+  "cabal2arch" = dontDistribute super."cabal2arch";
+  "cabal2doap" = dontDistribute super."cabal2doap";
+  "cabal2ebuild" = dontDistribute super."cabal2ebuild";
+  "cabal2ghci" = dontDistribute super."cabal2ghci";
+  "cabal2nix" = dontDistribute super."cabal2nix";
+  "cabal2spec" = dontDistribute super."cabal2spec";
+  "cabalQuery" = dontDistribute super."cabalQuery";
+  "cabalg" = dontDistribute super."cabalg";
+  "cabalgraph" = dontDistribute super."cabalgraph";
+  "cabalmdvrpm" = dontDistribute super."cabalmdvrpm";
+  "cabalrpmdeps" = dontDistribute super."cabalrpmdeps";
+  "cabalvchk" = dontDistribute super."cabalvchk";
+  "cabin" = dontDistribute super."cabin";
+  "cabocha" = dontDistribute super."cabocha";
+  "cached-io" = dontDistribute super."cached-io";
+  "cached-traversable" = dontDistribute super."cached-traversable";
+  "caf" = dontDistribute super."caf";
+  "cafeteria-prelude" = dontDistribute super."cafeteria-prelude";
+  "caffegraph" = dontDistribute super."caffegraph";
+  "cairo-appbase" = dontDistribute super."cairo-appbase";
+  "cake" = dontDistribute super."cake";
+  "cake3" = dontDistribute super."cake3";
+  "cakyrespa" = dontDistribute super."cakyrespa";
+  "cal3d" = dontDistribute super."cal3d";
+  "cal3d-examples" = dontDistribute super."cal3d-examples";
+  "cal3d-opengl" = dontDistribute super."cal3d-opengl";
+  "calc" = dontDistribute super."calc";
+  "caldims" = dontDistribute super."caldims";
+  "caledon" = dontDistribute super."caledon";
+  "call" = dontDistribute super."call";
+  "call-haskell-from-anything" = dontDistribute super."call-haskell-from-anything";
+  "camh" = dontDistribute super."camh";
+  "campfire" = dontDistribute super."campfire";
+  "canonical-filepath" = dontDistribute super."canonical-filepath";
+  "canteven-config" = dontDistribute super."canteven-config";
+  "canteven-listen-http" = dontDistribute super."canteven-listen-http";
+  "canteven-log" = dontDistribute super."canteven-log";
+  "canteven-template" = dontDistribute super."canteven-template";
+  "cantor" = dontDistribute super."cantor";
+  "cao" = dontDistribute super."cao";
+  "cap" = dontDistribute super."cap";
+  "capped-list" = dontDistribute super."capped-list";
+  "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
+  "caramia" = dontDistribute super."caramia";
+  "carboncopy" = dontDistribute super."carboncopy";
+  "carettah" = dontDistribute super."carettah";
+  "casadi-bindings" = dontDistribute super."casadi-bindings";
+  "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
+  "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
+  "casadi-bindings-internal" = dontDistribute super."casadi-bindings-internal";
+  "casadi-bindings-ipopt-interface" = dontDistribute super."casadi-bindings-ipopt-interface";
+  "casadi-bindings-snopt-interface" = dontDistribute super."casadi-bindings-snopt-interface";
+  "cascading" = dontDistribute super."cascading";
+  "case-conversion" = dontDistribute super."case-conversion";
+  "cash" = dontDistribute super."cash";
+  "casing" = dontDistribute super."casing";
+  "cassandra-cql" = dontDistribute super."cassandra-cql";
+  "cassandra-thrift" = dontDistribute super."cassandra-thrift";
+  "cassava-conduit" = dontDistribute super."cassava-conduit";
+  "cassava-streams" = dontDistribute super."cassava-streams";
+  "cassette" = dontDistribute super."cassette";
+  "cassy" = dontDistribute super."cassy";
+  "castle" = dontDistribute super."castle";
+  "casui" = dontDistribute super."casui";
+  "catamorphism" = dontDistribute super."catamorphism";
+  "catch-fd" = dontDistribute super."catch-fd";
+  "categorical-algebra" = dontDistribute super."categorical-algebra";
+  "categories" = dontDistribute super."categories";
+  "category-extras" = dontDistribute super."category-extras";
+  "cayley-dickson" = dontDistribute super."cayley-dickson";
+  "cblrepo" = dontDistribute super."cblrepo";
+  "cci" = dontDistribute super."cci";
+  "ccnx" = dontDistribute super."ccnx";
+  "cctools-workqueue" = dontDistribute super."cctools-workqueue";
+  "cedict" = dontDistribute super."cedict";
+  "cef" = dontDistribute super."cef";
+  "ceilometer-common" = dontDistribute super."ceilometer-common";
+  "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
+  "cerberus" = dontDistribute super."cerberus";
+  "cereal-derive" = dontDistribute super."cereal-derive";
+  "cereal-enumerator" = dontDistribute super."cereal-enumerator";
+  "cereal-ieee754" = dontDistribute super."cereal-ieee754";
+  "cereal-plus" = dontDistribute super."cereal-plus";
+  "cereal-text" = dontDistribute super."cereal-text";
+  "certificate" = dontDistribute super."certificate";
+  "cf" = dontDistribute super."cf";
+  "cfipu" = dontDistribute super."cfipu";
+  "cflp" = dontDistribute super."cflp";
+  "cfopu" = dontDistribute super."cfopu";
+  "cg" = dontDistribute super."cg";
+  "cgen" = dontDistribute super."cgen";
+  "cgi-undecidable" = dontDistribute super."cgi-undecidable";
+  "cgi-utils" = dontDistribute super."cgi-utils";
+  "cgrep" = dontDistribute super."cgrep";
+  "chain-codes" = dontDistribute super."chain-codes";
+  "chalk" = dontDistribute super."chalk";
+  "chalkboard" = dontDistribute super."chalkboard";
+  "chalkboard-viewer" = dontDistribute super."chalkboard-viewer";
+  "chalmers-lava2000" = dontDistribute super."chalmers-lava2000";
+  "chan-split" = dontDistribute super."chan-split";
+  "change-monger" = dontDistribute super."change-monger";
+  "charade" = dontDistribute super."charade";
+  "charsetdetect" = dontDistribute super."charsetdetect";
+  "chart-histogram" = dontDistribute super."chart-histogram";
+  "chaselev-deque" = dontDistribute super."chaselev-deque";
+  "chatter" = dontDistribute super."chatter";
+  "chatty" = dontDistribute super."chatty";
+  "chatty-text" = dontDistribute super."chatty-text";
+  "chatty-utils" = dontDistribute super."chatty-utils";
+  "check-pvp" = dontDistribute super."check-pvp";
+  "checked" = dontDistribute super."checked";
+  "chell-hunit" = dontDistribute super."chell-hunit";
+  "chesshs" = dontDistribute super."chesshs";
+  "chevalier-common" = dontDistribute super."chevalier-common";
+  "chp" = dontDistribute super."chp";
+  "chp-mtl" = dontDistribute super."chp-mtl";
+  "chp-plus" = dontDistribute super."chp-plus";
+  "chp-spec" = dontDistribute super."chp-spec";
+  "chp-transformers" = dontDistribute super."chp-transformers";
+  "chronograph" = dontDistribute super."chronograph";
+  "chu2" = dontDistribute super."chu2";
+  "chuchu" = dontDistribute super."chuchu";
+  "chunks" = dontDistribute super."chunks";
+  "chunky" = dontDistribute super."chunky";
+  "church-list" = dontDistribute super."church-list";
+  "cil" = dontDistribute super."cil";
+  "cinvoke" = dontDistribute super."cinvoke";
+  "cio" = dontDistribute super."cio";
+  "cipher-rc5" = dontDistribute super."cipher-rc5";
+  "ciphersaber2" = dontDistribute super."ciphersaber2";
+  "circ" = dontDistribute super."circ";
+  "cirru-parser" = dontDistribute super."cirru-parser";
+  "citation-resolve" = dontDistribute super."citation-resolve";
+  "citeproc-hs" = dontDistribute super."citeproc-hs";
+  "citeproc-hs-pandoc-filter" = dontDistribute super."citeproc-hs-pandoc-filter";
+  "cityhash" = dontDistribute super."cityhash";
+  "cjk" = dontDistribute super."cjk";
+  "clac" = dontDistribute super."clac";
+  "clafer" = dontDistribute super."clafer";
+  "claferIG" = dontDistribute super."claferIG";
+  "claferwiki" = dontDistribute super."claferwiki";
+  "clang-pure" = dontDistribute super."clang-pure";
+  "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
+  "clash" = dontDistribute super."clash";
+  "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck";
+  "classify" = dontDistribute super."classify";
+  "classy-parallel" = dontDistribute super."classy-parallel";
+  "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
+  "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
+  "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
+  "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks";
+  "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap";
+  "cld2" = dontDistribute super."cld2";
+  "clean-home" = dontDistribute super."clean-home";
+  "clean-unions" = dontDistribute super."clean-unions";
+  "cless" = dontDistribute super."cless";
+  "clevercss" = dontDistribute super."clevercss";
+  "cli" = dontDistribute super."cli";
+  "click-clack" = dontDistribute super."click-clack";
+  "clifford" = dontDistribute super."clifford";
+  "clippard" = dontDistribute super."clippard";
+  "clipper" = dontDistribute super."clipper";
+  "clippings" = dontDistribute super."clippings";
+  "clist" = dontDistribute super."clist";
+  "clocked" = dontDistribute super."clocked";
+  "clogparse" = dontDistribute super."clogparse";
+  "clone-all" = dontDistribute super."clone-all";
+  "closure" = dontDistribute super."closure";
+  "cloud-haskell" = dontDistribute super."cloud-haskell";
+  "cloudfront-signer" = dontDistribute super."cloudfront-signer";
+  "cloudyfs" = dontDistribute super."cloudyfs";
+  "cltw" = dontDistribute super."cltw";
+  "clua" = dontDistribute super."clua";
+  "cluss" = dontDistribute super."cluss";
+  "clustertools" = dontDistribute super."clustertools";
+  "clutterhs" = dontDistribute super."clutterhs";
+  "cmaes" = dontDistribute super."cmaes";
+  "cmath" = dontDistribute super."cmath";
+  "cmathml3" = dontDistribute super."cmathml3";
+  "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs-browser" = dontDistribute super."cmdargs-browser";
+  "cmdlib" = dontDistribute super."cmdlib";
+  "cmdtheline" = dontDistribute super."cmdtheline";
+  "cml" = dontDistribute super."cml";
+  "cmonad" = dontDistribute super."cmonad";
+  "cmu" = dontDistribute super."cmu";
+  "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
+  "cndict" = dontDistribute super."cndict";
+  "codec" = dontDistribute super."codec";
+  "codec-libevent" = dontDistribute super."codec-libevent";
+  "codec-mbox" = dontDistribute super."codec-mbox";
+  "codecov-haskell" = dontDistribute super."codecov-haskell";
+  "codemonitor" = dontDistribute super."codemonitor";
+  "codepad" = dontDistribute super."codepad";
+  "codo-notation" = dontDistribute super."codo-notation";
+  "cofunctor" = dontDistribute super."cofunctor";
+  "cognimeta-utils" = dontDistribute super."cognimeta-utils";
+  "coinbase-exchange" = dontDistribute super."coinbase-exchange";
+  "colada" = dontDistribute super."colada";
+  "colchis" = dontDistribute super."colchis";
+  "collada-output" = dontDistribute super."collada-output";
+  "collada-types" = dontDistribute super."collada-types";
+  "collapse-util" = dontDistribute super."collapse-util";
+  "collection-json" = dontDistribute super."collection-json";
+  "collections" = dontDistribute super."collections";
+  "collections-api" = dontDistribute super."collections-api";
+  "collections-base-instances" = dontDistribute super."collections-base-instances";
+  "colock" = dontDistribute super."colock";
+  "colorize-haskell" = dontDistribute super."colorize-haskell";
+  "colors" = dontDistribute super."colors";
+  "coltrane" = dontDistribute super."coltrane";
+  "com" = dontDistribute super."com";
+  "combinat" = dontDistribute super."combinat";
+  "combinat-diagrams" = dontDistribute super."combinat-diagrams";
+  "combinator-interactive" = dontDistribute super."combinator-interactive";
+  "combinatorial-problems" = dontDistribute super."combinatorial-problems";
+  "combinatorics" = dontDistribute super."combinatorics";
+  "combobuffer" = dontDistribute super."combobuffer";
+  "comfort-graph" = dontDistribute super."comfort-graph";
+  "command" = dontDistribute super."command";
+  "command-qq" = dontDistribute super."command-qq";
+  "commodities" = dontDistribute super."commodities";
+  "commsec" = dontDistribute super."commsec";
+  "commsec-keyexchange" = dontDistribute super."commsec-keyexchange";
+  "comonad-extras" = dontDistribute super."comonad-extras";
+  "comonad-random" = dontDistribute super."comonad-random";
+  "compact-map" = dontDistribute super."compact-map";
+  "compact-socket" = dontDistribute super."compact-socket";
+  "compact-string" = dontDistribute super."compact-string";
+  "compact-string-fix" = dontDistribute super."compact-string-fix";
+  "compare-type" = dontDistribute super."compare-type";
+  "compdata-automata" = dontDistribute super."compdata-automata";
+  "compdata-dags" = dontDistribute super."compdata-dags";
+  "compdata-param" = dontDistribute super."compdata-param";
+  "compensated" = dontDistribute super."compensated";
+  "competition" = dontDistribute super."competition";
+  "compilation" = dontDistribute super."compilation";
+  "complex-generic" = dontDistribute super."complex-generic";
+  "complex-integrate" = dontDistribute super."complex-integrate";
+  "complexity" = dontDistribute super."complexity";
+  "compose-ltr" = dontDistribute super."compose-ltr";
+  "compose-trans" = dontDistribute super."compose-trans";
+  "compression" = dontDistribute super."compression";
+  "compstrat" = dontDistribute super."compstrat";
+  "comptrans" = dontDistribute super."comptrans";
+  "computational-algebra" = dontDistribute super."computational-algebra";
+  "computations" = dontDistribute super."computations";
+  "conceit" = dontDistribute super."conceit";
+  "concorde" = dontDistribute super."concorde";
+  "concraft" = dontDistribute super."concraft";
+  "concraft-hr" = dontDistribute super."concraft-hr";
+  "concraft-pl" = dontDistribute super."concraft-pl";
+  "concrete-relaxng-parser" = dontDistribute super."concrete-relaxng-parser";
+  "concrete-typerep" = dontDistribute super."concrete-typerep";
+  "concurrent-barrier" = dontDistribute super."concurrent-barrier";
+  "concurrent-dns-cache" = dontDistribute super."concurrent-dns-cache";
+  "concurrent-extra" = dontDistribute super."concurrent-extra";
+  "concurrent-machines" = dontDistribute super."concurrent-machines";
+  "concurrent-sa" = dontDistribute super."concurrent-sa";
+  "concurrent-split" = dontDistribute super."concurrent-split";
+  "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-utilities" = dontDistribute super."concurrent-utilities";
+  "concurrentoutput" = dontDistribute super."concurrentoutput";
+  "cond" = dontDistribute super."cond";
+  "condor" = dontDistribute super."condor";
+  "condorcet" = dontDistribute super."condorcet";
+  "conductive-base" = dontDistribute super."conductive-base";
+  "conductive-clock" = dontDistribute super."conductive-clock";
+  "conductive-hsc3" = dontDistribute super."conductive-hsc3";
+  "conductive-song" = dontDistribute super."conductive-song";
+  "conduit-audio" = dontDistribute super."conduit-audio";
+  "conduit-audio-lame" = dontDistribute super."conduit-audio-lame";
+  "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate";
+  "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile";
+  "conduit-network-stream" = dontDistribute super."conduit-network-stream";
+  "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conf" = dontDistribute super."conf";
+  "config-select" = dontDistribute super."config-select";
+  "config-value" = dontDistribute super."config-value";
+  "configifier" = dontDistribute super."configifier";
+  "configuration" = dontDistribute super."configuration";
+  "configuration-tools" = dontDistribute super."configuration-tools";
+  "confsolve" = dontDistribute super."confsolve";
+  "congruence-relation" = dontDistribute super."congruence-relation";
+  "conjugateGradient" = dontDistribute super."conjugateGradient";
+  "conjure" = dontDistribute super."conjure";
+  "conlogger" = dontDistribute super."conlogger";
+  "connection-pool" = dontDistribute super."connection-pool";
+  "consistent" = dontDistribute super."consistent";
+  "console-program" = dontDistribute super."console-program";
+  "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin";
+  "constrained-categories" = dontDistribute super."constrained-categories";
+  "constrained-normal" = dontDistribute super."constrained-normal";
+  "constructible" = dontDistribute super."constructible";
+  "constructive-algebra" = dontDistribute super."constructive-algebra";
+  "consumers" = dontDistribute super."consumers";
+  "container" = dontDistribute super."container";
+  "container-classes" = dontDistribute super."container-classes";
+  "containers-benchmark" = dontDistribute super."containers-benchmark";
+  "containers-deepseq" = dontDistribute super."containers-deepseq";
+  "context-free-grammar" = dontDistribute super."context-free-grammar";
+  "context-stack" = dontDistribute super."context-stack";
+  "continue" = dontDistribute super."continue";
+  "continued-fractions" = dontDistribute super."continued-fractions";
+  "continuum" = dontDistribute super."continuum";
+  "continuum-client" = dontDistribute super."continuum-client";
+  "control-event" = dontDistribute super."control-event";
+  "control-monad-attempt" = dontDistribute super."control-monad-attempt";
+  "control-monad-exception" = dontDistribute super."control-monad-exception";
+  "control-monad-exception-monadsfd" = dontDistribute super."control-monad-exception-monadsfd";
+  "control-monad-exception-monadstf" = dontDistribute super."control-monad-exception-monadstf";
+  "control-monad-exception-mtl" = dontDistribute super."control-monad-exception-mtl";
+  "control-monad-failure" = dontDistribute super."control-monad-failure";
+  "control-monad-failure-mtl" = dontDistribute super."control-monad-failure-mtl";
+  "control-monad-omega" = dontDistribute super."control-monad-omega";
+  "control-monad-queue" = dontDistribute super."control-monad-queue";
+  "control-timeout" = dontDistribute super."control-timeout";
+  "contstuff" = dontDistribute super."contstuff";
+  "contstuff-monads-tf" = dontDistribute super."contstuff-monads-tf";
+  "contstuff-transformers" = dontDistribute super."contstuff-transformers";
+  "converge" = dontDistribute super."converge";
+  "conversion" = dontDistribute super."conversion";
+  "conversion-bytestring" = dontDistribute super."conversion-bytestring";
+  "conversion-case-insensitive" = dontDistribute super."conversion-case-insensitive";
+  "conversion-text" = dontDistribute super."conversion-text";
+  "convert" = dontDistribute super."convert";
+  "convertible-ascii" = dontDistribute super."convertible-ascii";
+  "convertible-text" = dontDistribute super."convertible-text";
+  "cookbook" = dontDistribute super."cookbook";
+  "coordinate" = dontDistribute super."coordinate";
+  "copilot" = dontDistribute super."copilot";
+  "copilot-c99" = dontDistribute super."copilot-c99";
+  "copilot-cbmc" = dontDistribute super."copilot-cbmc";
+  "copilot-core" = dontDistribute super."copilot-core";
+  "copilot-language" = dontDistribute super."copilot-language";
+  "copilot-libraries" = dontDistribute super."copilot-libraries";
+  "copilot-sbv" = dontDistribute super."copilot-sbv";
+  "copilot-theorem" = dontDistribute super."copilot-theorem";
+  "copr" = dontDistribute super."copr";
+  "core" = dontDistribute super."core";
+  "core-haskell" = dontDistribute super."core-haskell";
+  "corebot-bliki" = dontDistribute super."corebot-bliki";
+  "coroutine-enumerator" = dontDistribute super."coroutine-enumerator";
+  "coroutine-iteratee" = dontDistribute super."coroutine-iteratee";
+  "coroutine-object" = dontDistribute super."coroutine-object";
+  "couch-hs" = dontDistribute super."couch-hs";
+  "couch-simple" = dontDistribute super."couch-simple";
+  "couchdb-conduit" = dontDistribute super."couchdb-conduit";
+  "couchdb-enumerator" = dontDistribute super."couchdb-enumerator";
+  "count" = dontDistribute super."count";
+  "countable" = dontDistribute super."countable";
+  "counter" = dontDistribute super."counter";
+  "court" = dontDistribute super."court";
+  "coverage" = dontDistribute super."coverage";
+  "cpio-conduit" = dontDistribute super."cpio-conduit";
+  "cplusplus-th" = dontDistribute super."cplusplus-th";
+  "cprng-aes-effect" = dontDistribute super."cprng-aes-effect";
+  "cpsa" = dontDistribute super."cpsa";
+  "cpuid" = dontDistribute super."cpuid";
+  "cpuperf" = dontDistribute super."cpuperf";
+  "cpython" = dontDistribute super."cpython";
+  "cqrs" = dontDistribute super."cqrs";
+  "cqrs-core" = dontDistribute super."cqrs-core";
+  "cqrs-example" = dontDistribute super."cqrs-example";
+  "cqrs-memory" = dontDistribute super."cqrs-memory";
+  "cqrs-postgresql" = dontDistribute super."cqrs-postgresql";
+  "cqrs-sqlite3" = dontDistribute super."cqrs-sqlite3";
+  "cqrs-test" = dontDistribute super."cqrs-test";
+  "cqrs-testkit" = dontDistribute super."cqrs-testkit";
+  "cqrs-types" = dontDistribute super."cqrs-types";
+  "cr" = dontDistribute super."cr";
+  "crack" = dontDistribute super."crack";
+  "craftwerk" = dontDistribute super."craftwerk";
+  "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
+  "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "crc16" = dontDistribute super."crc16";
+  "crc16-table" = dontDistribute super."crc16-table";
+  "creatur" = dontDistribute super."creatur";
+  "crf-chain1" = dontDistribute super."crf-chain1";
+  "crf-chain1-constrained" = dontDistribute super."crf-chain1-constrained";
+  "crf-chain2-generic" = dontDistribute super."crf-chain2-generic";
+  "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers";
+  "critbit" = dontDistribute super."critbit";
+  "criterion-plus" = dontDistribute super."criterion-plus";
+  "criterion-to-html" = dontDistribute super."criterion-to-html";
+  "crockford" = dontDistribute super."crockford";
+  "crocodile" = dontDistribute super."crocodile";
+  "cron-compat" = dontDistribute super."cron-compat";
+  "cruncher-types" = dontDistribute super."cruncher-types";
+  "crunghc" = dontDistribute super."crunghc";
+  "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks";
+  "crypto-classical" = dontDistribute super."crypto-classical";
+  "crypto-conduit" = dontDistribute super."crypto-conduit";
+  "crypto-enigma" = dontDistribute super."crypto-enigma";
+  "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh";
+  "crypto-random-effect" = dontDistribute super."crypto-random-effect";
+  "crypto-totp" = dontDistribute super."crypto-totp";
+  "cryptsy-api" = dontDistribute super."cryptsy-api";
+  "crystalfontz" = dontDistribute super."crystalfontz";
+  "cse-ghc-plugin" = dontDistribute super."cse-ghc-plugin";
+  "csound-catalog" = dontDistribute super."csound-catalog";
+  "csound-expression" = dontDistribute super."csound-expression";
+  "csound-expression-dynamic" = dontDistribute super."csound-expression-dynamic";
+  "csound-expression-opcodes" = dontDistribute super."csound-expression-opcodes";
+  "csound-expression-typed" = dontDistribute super."csound-expression-typed";
+  "csound-sampler" = dontDistribute super."csound-sampler";
+  "csp" = dontDistribute super."csp";
+  "cspmchecker" = dontDistribute super."cspmchecker";
+  "css" = dontDistribute super."css";
+  "csv-enumerator" = dontDistribute super."csv-enumerator";
+  "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-to-qif" = dontDistribute super."csv-to-qif";
+  "ctemplate" = dontDistribute super."ctemplate";
+  "ctkl" = dontDistribute super."ctkl";
+  "ctpl" = dontDistribute super."ctpl";
+  "cube" = dontDistribute super."cube";
+  "cubical" = dontDistribute super."cubical";
+  "cubicbezier" = dontDistribute super."cubicbezier";
+  "cublas" = dontDistribute super."cublas";
+  "cuboid" = dontDistribute super."cuboid";
+  "cuda" = dontDistribute super."cuda";
+  "cudd" = dontDistribute super."cudd";
+  "cufft" = dontDistribute super."cufft";
+  "curl-aeson" = dontDistribute super."curl-aeson";
+  "curlhs" = dontDistribute super."curlhs";
+  "currency" = dontDistribute super."currency";
+  "current-locale" = dontDistribute super."current-locale";
+  "curry-base" = dontDistribute super."curry-base";
+  "curry-frontend" = dontDistribute super."curry-frontend";
+  "cursedcsv" = dontDistribute super."cursedcsv";
+  "curve25519" = dontDistribute super."curve25519";
+  "curves" = dontDistribute super."curves";
+  "custom-prelude" = dontDistribute super."custom-prelude";
+  "cv-combinators" = dontDistribute super."cv-combinators";
+  "cyclotomic" = dontDistribute super."cyclotomic";
+  "cypher" = dontDistribute super."cypher";
+  "d-bus" = dontDistribute super."d-bus";
+  "d3js" = dontDistribute super."d3js";
+  "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
+  "daemons" = dontDistribute super."daemons";
+  "dag" = dontDistribute super."dag";
+  "damnpacket" = dontDistribute super."damnpacket";
+  "dao" = dontDistribute super."dao";
+  "dapi" = dontDistribute super."dapi";
+  "darcs" = dontDistribute super."darcs";
+  "darcs-benchmark" = dontDistribute super."darcs-benchmark";
+  "darcs-beta" = dontDistribute super."darcs-beta";
+  "darcs-buildpackage" = dontDistribute super."darcs-buildpackage";
+  "darcs-cabalized" = dontDistribute super."darcs-cabalized";
+  "darcs-fastconvert" = dontDistribute super."darcs-fastconvert";
+  "darcs-graph" = dontDistribute super."darcs-graph";
+  "darcs-monitor" = dontDistribute super."darcs-monitor";
+  "darcs-scripts" = dontDistribute super."darcs-scripts";
+  "darcs2dot" = dontDistribute super."darcs2dot";
+  "darcsden" = dontDistribute super."darcsden";
+  "darcswatch" = dontDistribute super."darcswatch";
+  "darkplaces-demo" = dontDistribute super."darkplaces-demo";
+  "darkplaces-rcon" = dontDistribute super."darkplaces-rcon";
+  "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
+  "darkplaces-text" = dontDistribute super."darkplaces-text";
+  "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor-monadLib" = dontDistribute super."data-accessor-monadLib";
+  "data-accessor-monads-fd" = dontDistribute super."data-accessor-monads-fd";
+  "data-accessor-monads-tf" = dontDistribute super."data-accessor-monads-tf";
+  "data-accessor-template" = dontDistribute super."data-accessor-template";
+  "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
+  "data-aviary" = dontDistribute super."data-aviary";
+  "data-bword" = dontDistribute super."data-bword";
+  "data-carousel" = dontDistribute super."data-carousel";
+  "data-category" = dontDistribute super."data-category";
+  "data-cell" = dontDistribute super."data-cell";
+  "data-checked" = dontDistribute super."data-checked";
+  "data-clist" = dontDistribute super."data-clist";
+  "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
+  "data-construction" = dontDistribute super."data-construction";
+  "data-cycle" = dontDistribute super."data-cycle";
+  "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-dispersal" = dontDistribute super."data-dispersal";
+  "data-dword" = dontDistribute super."data-dword";
+  "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
+  "data-endian" = dontDistribute super."data-endian";
+  "data-extend-generic" = dontDistribute super."data-extend-generic";
+  "data-extra" = dontDistribute super."data-extra";
+  "data-filepath" = dontDistribute super."data-filepath";
+  "data-fin" = dontDistribute super."data-fin";
+  "data-fin-simple" = dontDistribute super."data-fin-simple";
+  "data-fix" = dontDistribute super."data-fix";
+  "data-fix-cse" = dontDistribute super."data-fix-cse";
+  "data-flags" = dontDistribute super."data-flags";
+  "data-flagset" = dontDistribute super."data-flagset";
+  "data-fresh" = dontDistribute super."data-fresh";
+  "data-interval" = dontDistribute super."data-interval";
+  "data-ivar" = dontDistribute super."data-ivar";
+  "data-kiln" = dontDistribute super."data-kiln";
+  "data-layer" = dontDistribute super."data-layer";
+  "data-layout" = dontDistribute super."data-layout";
+  "data-lens" = dontDistribute super."data-lens";
+  "data-lens-fd" = dontDistribute super."data-lens-fd";
+  "data-lens-ixset" = dontDistribute super."data-lens-ixset";
+  "data-lens-template" = dontDistribute super."data-lens-template";
+  "data-list-sequences" = dontDistribute super."data-list-sequences";
+  "data-map-multikey" = dontDistribute super."data-map-multikey";
+  "data-named" = dontDistribute super."data-named";
+  "data-nat" = dontDistribute super."data-nat";
+  "data-object" = dontDistribute super."data-object";
+  "data-object-json" = dontDistribute super."data-object-json";
+  "data-object-yaml" = dontDistribute super."data-object-yaml";
+  "data-or" = dontDistribute super."data-or";
+  "data-partition" = dontDistribute super."data-partition";
+  "data-pprint" = dontDistribute super."data-pprint";
+  "data-quotientref" = dontDistribute super."data-quotientref";
+  "data-r-tree" = dontDistribute super."data-r-tree";
+  "data-ref" = dontDistribute super."data-ref";
+  "data-reify-cse" = dontDistribute super."data-reify-cse";
+  "data-repr" = dontDistribute super."data-repr";
+  "data-rev" = dontDistribute super."data-rev";
+  "data-rope" = dontDistribute super."data-rope";
+  "data-rtuple" = dontDistribute super."data-rtuple";
+  "data-size" = dontDistribute super."data-size";
+  "data-spacepart" = dontDistribute super."data-spacepart";
+  "data-store" = dontDistribute super."data-store";
+  "data-stringmap" = dontDistribute super."data-stringmap";
+  "data-structure-inferrer" = dontDistribute super."data-structure-inferrer";
+  "data-tensor" = dontDistribute super."data-tensor";
+  "data-textual" = dontDistribute super."data-textual";
+  "data-timeout" = dontDistribute super."data-timeout";
+  "data-transform" = dontDistribute super."data-transform";
+  "data-treify" = dontDistribute super."data-treify";
+  "data-type" = dontDistribute super."data-type";
+  "data-util" = dontDistribute super."data-util";
+  "data-variant" = dontDistribute super."data-variant";
+  "database-migrate" = dontDistribute super."database-migrate";
+  "database-study" = dontDistribute super."database-study";
+  "datadog" = dontDistribute super."datadog";
+  "dataenc" = dontDistribute super."dataenc";
+  "dataflow" = dontDistribute super."dataflow";
+  "datalog" = dontDistribute super."datalog";
+  "datapacker" = dontDistribute super."datapacker";
+  "dataurl" = dontDistribute super."dataurl";
+  "date-cache" = dontDistribute super."date-cache";
+  "dates" = dontDistribute super."dates";
+  "datetime" = dontDistribute super."datetime";
+  "datetime-sb" = dontDistribute super."datetime-sb";
+  "dawdle" = dontDistribute super."dawdle";
+  "dawg" = dontDistribute super."dawg";
+  "dawg-ord" = dontDistribute super."dawg-ord";
+  "dbcleaner" = dontDistribute super."dbcleaner";
+  "dbf" = dontDistribute super."dbf";
+  "dbjava" = dontDistribute super."dbjava";
+  "dbus-client" = dontDistribute super."dbus-client";
+  "dbus-core" = dontDistribute super."dbus-core";
+  "dbus-qq" = dontDistribute super."dbus-qq";
+  "dbus-th" = dontDistribute super."dbus-th";
+  "dclabel" = dontDistribute super."dclabel";
+  "dclabel-eci11" = dontDistribute super."dclabel-eci11";
+  "ddc-base" = dontDistribute super."ddc-base";
+  "ddc-build" = dontDistribute super."ddc-build";
+  "ddc-code" = dontDistribute super."ddc-code";
+  "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-eval" = dontDistribute super."ddc-core-eval";
+  "ddc-core-flow" = dontDistribute super."ddc-core-flow";
+  "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
+  "ddc-core-salt" = dontDistribute super."ddc-core-salt";
+  "ddc-core-simpl" = dontDistribute super."ddc-core-simpl";
+  "ddc-core-tetra" = dontDistribute super."ddc-core-tetra";
+  "ddc-driver" = dontDistribute super."ddc-driver";
+  "ddc-interface" = dontDistribute super."ddc-interface";
+  "ddc-source-tetra" = dontDistribute super."ddc-source-tetra";
+  "ddc-tools" = dontDistribute super."ddc-tools";
+  "ddc-war" = dontDistribute super."ddc-war";
+  "ddci-core" = dontDistribute super."ddci-core";
+  "dead-code-detection" = dontDistribute super."dead-code-detection";
+  "dead-simple-json" = dontDistribute super."dead-simple-json";
+  "debian-binary" = dontDistribute super."debian-binary";
+  "debian-build" = dontDistribute super."debian-build";
+  "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
+  "decepticons" = dontDistribute super."decepticons";
+  "decode-utf8" = dontDistribute super."decode-utf8";
+  "decoder-conduit" = dontDistribute super."decoder-conduit";
+  "dedukti" = dontDistribute super."dedukti";
+  "deepcontrol" = dontDistribute super."deepcontrol";
+  "deeplearning-hs" = dontDistribute super."deeplearning-hs";
+  "deepseq-bounded" = dontDistribute super."deepseq-bounded";
+  "deepseq-magic" = dontDistribute super."deepseq-magic";
+  "deepseq-th" = dontDistribute super."deepseq-th";
+  "deepzoom" = dontDistribute super."deepzoom";
+  "defargs" = dontDistribute super."defargs";
+  "definitive-base" = dontDistribute super."definitive-base";
+  "definitive-filesystem" = dontDistribute super."definitive-filesystem";
+  "definitive-graphics" = dontDistribute super."definitive-graphics";
+  "definitive-parser" = dontDistribute super."definitive-parser";
+  "definitive-reactive" = dontDistribute super."definitive-reactive";
+  "definitive-sound" = dontDistribute super."definitive-sound";
+  "deiko-config" = dontDistribute super."deiko-config";
+  "deka" = dontDistribute super."deka";
+  "deka-tests" = dontDistribute super."deka-tests";
+  "delaunay" = dontDistribute super."delaunay";
+  "delicious" = dontDistribute super."delicious";
+  "delimited-text" = dontDistribute super."delimited-text";
+  "delimiter-separated" = dontDistribute super."delimiter-separated";
+  "delta" = dontDistribute super."delta";
+  "delta-h" = dontDistribute super."delta-h";
+  "demarcate" = dontDistribute super."demarcate";
+  "denominate" = dontDistribute super."denominate";
+  "depends" = dontDistribute super."depends";
+  "dephd" = dontDistribute super."dephd";
+  "dequeue" = dontDistribute super."dequeue";
+  "derangement" = dontDistribute super."derangement";
+  "derivation-trees" = dontDistribute super."derivation-trees";
+  "derive-IG" = dontDistribute super."derive-IG";
+  "derive-enumerable" = dontDistribute super."derive-enumerable";
+  "derive-gadt" = dontDistribute super."derive-gadt";
+  "derive-topdown" = dontDistribute super."derive-topdown";
+  "derive-trie" = dontDistribute super."derive-trie";
+  "deriving-compat" = dontDistribute super."deriving-compat";
+  "derp" = dontDistribute super."derp";
+  "derp-lib" = dontDistribute super."derp-lib";
+  "descrilo" = dontDistribute super."descrilo";
+  "despair" = dontDistribute super."despair";
+  "deterministic-game-engine" = dontDistribute super."deterministic-game-engine";
+  "detrospector" = dontDistribute super."detrospector";
+  "deunicode" = dontDistribute super."deunicode";
+  "devil" = dontDistribute super."devil";
+  "dewdrop" = dontDistribute super."dewdrop";
+  "dfrac" = dontDistribute super."dfrac";
+  "dfsbuild" = dontDistribute super."dfsbuild";
+  "dgim" = dontDistribute super."dgim";
+  "dgs" = dontDistribute super."dgs";
+  "dia-base" = dontDistribute super."dia-base";
+  "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams-canvas" = dontDistribute super."diagrams-canvas";
+  "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
+  "diagrams-gtk" = dontDistribute super."diagrams-gtk";
+  "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
+  "diagrams-pdf" = dontDistribute super."diagrams-pdf";
+  "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
+  "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
+  "diagrams-tikz" = dontDistribute super."diagrams-tikz";
+  "dialog" = dontDistribute super."dialog";
+  "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
+  "dicom" = dontDistribute super."dicom";
+  "dictparser" = dontDistribute super."dictparser";
+  "diet" = dontDistribute super."diet";
+  "diff-gestalt" = dontDistribute super."diff-gestalt";
+  "diff-parse" = dontDistribute super."diff-parse";
+  "diffarray" = dontDistribute super."diffarray";
+  "diffcabal" = dontDistribute super."diffcabal";
+  "diffdump" = dontDistribute super."diffdump";
+  "digamma" = dontDistribute super."digamma";
+  "digest-pure" = dontDistribute super."digest-pure";
+  "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid";
+  "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack";
+  "digestive-functors-heist" = dontDistribute super."digestive-functors-heist";
+  "digestive-functors-hsp" = dontDistribute super."digestive-functors-hsp";
+  "digestive-functors-scotty" = dontDistribute super."digestive-functors-scotty";
+  "digestive-functors-snap" = dontDistribute super."digestive-functors-snap";
+  "digit" = dontDistribute super."digit";
+  "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
+  "dimensional-tf" = dontDistribute super."dimensional-tf";
+  "dingo-core" = dontDistribute super."dingo-core";
+  "dingo-example" = dontDistribute super."dingo-example";
+  "dingo-widgets" = dontDistribute super."dingo-widgets";
+  "diophantine" = dontDistribute super."diophantine";
+  "diplomacy" = dontDistribute super."diplomacy";
+  "diplomacy-server" = dontDistribute super."diplomacy-server";
+  "direct-binary-files" = dontDistribute super."direct-binary-files";
+  "direct-daemonize" = dontDistribute super."direct-daemonize";
+  "direct-fastcgi" = dontDistribute super."direct-fastcgi";
+  "direct-http" = dontDistribute super."direct-http";
+  "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
+  "direct-plugins" = dontDistribute super."direct-plugins";
+  "directed-cubical" = dontDistribute super."directed-cubical";
+  "directory-layout" = dontDistribute super."directory-layout";
+  "dirfiles" = dontDistribute super."dirfiles";
+  "dirstream" = dontDistribute super."dirstream";
+  "disassembler" = dontDistribute super."disassembler";
+  "discordian-calendar" = dontDistribute super."discordian-calendar";
+  "discount" = dontDistribute super."discount";
+  "discrete-space-map" = dontDistribute super."discrete-space-map";
+  "discrimination" = dontDistribute super."discrimination";
+  "disjoint-set" = dontDistribute super."disjoint-set";
+  "disjoint-sets-st" = dontDistribute super."disjoint-sets-st";
+  "dist-upload" = dontDistribute super."dist-upload";
+  "distributed-closure" = dontDistribute super."distributed-closure";
+  "distributed-process-async" = dontDistribute super."distributed-process-async";
+  "distributed-process-azure" = dontDistribute super."distributed-process-azure";
+  "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-execution" = dontDistribute super."distributed-process-execution";
+  "distributed-process-extras" = dontDistribute super."distributed-process-extras";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
+  "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
+  "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
+  "distributed-process-platform" = dontDistribute super."distributed-process-platform";
+  "distributed-process-registry" = dontDistribute super."distributed-process-registry";
+  "distributed-process-simplelocalnet" = dontDistribute super."distributed-process-simplelocalnet";
+  "distributed-process-supervisor" = dontDistribute super."distributed-process-supervisor";
+  "distributed-process-task" = dontDistribute super."distributed-process-task";
+  "distributed-process-tests" = dontDistribute super."distributed-process-tests";
+  "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper";
+  "distribution" = dontDistribute super."distribution";
+  "distribution-plot" = dontDistribute super."distribution-plot";
+  "diversity" = doDistribute super."diversity_0_7_1_1";
+  "djinn" = dontDistribute super."djinn";
+  "djinn-th" = dontDistribute super."djinn-th";
+  "dnscache" = dontDistribute super."dnscache";
+  "dnsrbl" = dontDistribute super."dnsrbl";
+  "dnssd" = dontDistribute super."dnssd";
+  "doc-review" = dontDistribute super."doc-review";
+  "doccheck" = dontDistribute super."doccheck";
+  "docidx" = dontDistribute super."docidx";
+  "docker" = dontDistribute super."docker";
+  "dockercook" = dontDistribute super."dockercook";
+  "doctest-discover" = dontDistribute super."doctest-discover";
+  "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
+  "doctest-prop" = dontDistribute super."doctest-prop";
+  "dom-lt" = dontDistribute super."dom-lt";
+  "dom-selector" = dontDistribute super."dom-selector";
+  "domain-auth" = dontDistribute super."domain-auth";
+  "dominion" = dontDistribute super."dominion";
+  "domplate" = dontDistribute super."domplate";
+  "dot2graphml" = dontDistribute super."dot2graphml";
+  "dotenv" = dontDistribute super."dotenv";
+  "dotfs" = dontDistribute super."dotfs";
+  "dotgen" = dontDistribute super."dotgen";
+  "double-metaphone" = dontDistribute super."double-metaphone";
+  "dove" = dontDistribute super."dove";
+  "dow" = dontDistribute super."dow";
+  "download" = dontDistribute super."download";
+  "download-curl" = dontDistribute super."download-curl";
+  "download-media-content" = dontDistribute super."download-media-content";
+  "dozenal" = dontDistribute super."dozenal";
+  "dozens" = dontDistribute super."dozens";
+  "dph-base" = dontDistribute super."dph-base";
+  "dph-examples" = dontDistribute super."dph-examples";
+  "dph-lifted-base" = dontDistribute super."dph-lifted-base";
+  "dph-lifted-copy" = dontDistribute super."dph-lifted-copy";
+  "dph-lifted-vseg" = dontDistribute super."dph-lifted-vseg";
+  "dph-par" = dontDistribute super."dph-par";
+  "dph-prim-interface" = dontDistribute super."dph-prim-interface";
+  "dph-prim-par" = dontDistribute super."dph-prim-par";
+  "dph-prim-seq" = dontDistribute super."dph-prim-seq";
+  "dph-seq" = dontDistribute super."dph-seq";
+  "dpkg" = dontDistribute super."dpkg";
+  "drClickOn" = dontDistribute super."drClickOn";
+  "draw-poker" = dontDistribute super."draw-poker";
+  "drifter" = dontDistribute super."drifter";
+  "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "dropbox-sdk" = dontDistribute super."dropbox-sdk";
+  "dropsolve" = dontDistribute super."dropsolve";
+  "ds-kanren" = dontDistribute super."ds-kanren";
+  "dsh-sql" = dontDistribute super."dsh-sql";
+  "dsmc" = dontDistribute super."dsmc";
+  "dsmc-tools" = dontDistribute super."dsmc-tools";
+  "dson" = dontDistribute super."dson";
+  "dson-parsec" = dontDistribute super."dson-parsec";
+  "dsp" = dontDistribute super."dsp";
+  "dstring" = dontDistribute super."dstring";
+  "dtab" = dontDistribute super."dtab";
+  "dtd" = dontDistribute super."dtd";
+  "dtd-text" = dontDistribute super."dtd-text";
+  "dtd-types" = dontDistribute super."dtd-types";
+  "dtrace" = dontDistribute super."dtrace";
+  "dtw" = dontDistribute super."dtw";
+  "dump" = dontDistribute super."dump";
+  "duplo" = dontDistribute super."duplo";
+  "dvda" = dontDistribute super."dvda";
+  "dvdread" = dontDistribute super."dvdread";
+  "dvi-processing" = dontDistribute super."dvi-processing";
+  "dvorak" = dontDistribute super."dvorak";
+  "dwarf" = dontDistribute super."dwarf";
+  "dwarf-el" = dontDistribute super."dwarf-el";
+  "dwarfadt" = dontDistribute super."dwarfadt";
+  "dx9base" = dontDistribute super."dx9base";
+  "dx9d3d" = dontDistribute super."dx9d3d";
+  "dx9d3dx" = dontDistribute super."dx9d3dx";
+  "dynamic-cabal" = dontDistribute super."dynamic-cabal";
+  "dynamic-graph" = dontDistribute super."dynamic-graph";
+  "dynamic-linker-template" = dontDistribute super."dynamic-linker-template";
+  "dynamic-loader" = dontDistribute super."dynamic-loader";
+  "dynamic-mvector" = dontDistribute super."dynamic-mvector";
+  "dynamic-object" = dontDistribute super."dynamic-object";
+  "dynamic-plot" = dontDistribute super."dynamic-plot";
+  "dynamic-pp" = dontDistribute super."dynamic-pp";
+  "dynobud" = dontDistribute super."dynobud";
+  "dywapitchtrack" = dontDistribute super."dywapitchtrack";
+  "dzen-utils" = dontDistribute super."dzen-utils";
+  "eager-sockets" = dontDistribute super."eager-sockets";
+  "easy-api" = dontDistribute super."easy-api";
+  "easy-bitcoin" = dontDistribute super."easy-bitcoin";
+  "easyjson" = dontDistribute super."easyjson";
+  "easyplot" = dontDistribute super."easyplot";
+  "easyrender" = dontDistribute super."easyrender";
+  "ebeats" = dontDistribute super."ebeats";
+  "ebnf-bff" = dontDistribute super."ebnf-bff";
+  "ec2-signature" = dontDistribute super."ec2-signature";
+  "ecdsa" = dontDistribute super."ecdsa";
+  "ecma262" = dontDistribute super."ecma262";
+  "ecu" = dontDistribute super."ecu";
+  "ed25519" = dontDistribute super."ed25519";
+  "ed25519-donna" = dontDistribute super."ed25519-donna";
+  "eddie" = dontDistribute super."eddie";
+  "edenmodules" = dontDistribute super."edenmodules";
+  "edenskel" = dontDistribute super."edenskel";
+  "edentv" = dontDistribute super."edentv";
+  "edge" = dontDistribute super."edge";
+  "edis" = dontDistribute super."edis";
+  "edit-lenses" = dontDistribute super."edit-lenses";
+  "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
+  "editable" = dontDistribute super."editable";
+  "editline" = dontDistribute super."editline";
+  "effect-monad" = dontDistribute super."effect-monad";
+  "effective-aspects" = dontDistribute super."effective-aspects";
+  "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
+  "effects" = dontDistribute super."effects";
+  "effects-parser" = dontDistribute super."effects-parser";
+  "effin" = dontDistribute super."effin";
+  "egison" = dontDistribute super."egison";
+  "egison-quote" = dontDistribute super."egison-quote";
+  "egison-tutorial" = dontDistribute super."egison-tutorial";
+  "ehaskell" = dontDistribute super."ehaskell";
+  "ehs" = dontDistribute super."ehs";
+  "eibd-client-simple" = dontDistribute super."eibd-client-simple";
+  "eigen" = dontDistribute super."eigen";
+  "eithers" = dontDistribute super."eithers";
+  "ekg-bosun" = dontDistribute super."ekg-bosun";
+  "ekg-carbon" = dontDistribute super."ekg-carbon";
+  "ekg-log" = dontDistribute super."ekg-log";
+  "ekg-push" = dontDistribute super."ekg-push";
+  "ekg-rrd" = dontDistribute super."ekg-rrd";
+  "ekg-statsd" = dontDistribute super."ekg-statsd";
+  "electrum-mnemonic" = dontDistribute super."electrum-mnemonic";
+  "elerea" = dontDistribute super."elerea";
+  "elerea-examples" = dontDistribute super."elerea-examples";
+  "elerea-sdl" = dontDistribute super."elerea-sdl";
+  "elevator" = dontDistribute super."elevator";
+  "elf" = dontDistribute super."elf";
+  "elm-build-lib" = dontDistribute super."elm-build-lib";
+  "elm-compiler" = dontDistribute super."elm-compiler";
+  "elm-get" = dontDistribute super."elm-get";
+  "elm-init" = dontDistribute super."elm-init";
+  "elm-make" = dontDistribute super."elm-make";
+  "elm-package" = dontDistribute super."elm-package";
+  "elm-reactor" = dontDistribute super."elm-reactor";
+  "elm-repl" = dontDistribute super."elm-repl";
+  "elm-server" = dontDistribute super."elm-server";
+  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
+  "elocrypt" = dontDistribute super."elocrypt";
+  "emacs-keys" = dontDistribute super."emacs-keys";
+  "email" = dontDistribute super."email";
+  "email-header" = dontDistribute super."email-header";
+  "email-postmark" = dontDistribute super."email-postmark";
+  "email-validator" = dontDistribute super."email-validator";
+  "embeddock" = dontDistribute super."embeddock";
+  "embeddock-example" = dontDistribute super."embeddock-example";
+  "embroidery" = dontDistribute super."embroidery";
+  "emgm" = dontDistribute super."emgm";
+  "empty" = dontDistribute super."empty";
+  "encoding" = dontDistribute super."encoding";
+  "endo" = dontDistribute super."endo";
+  "engine-io-growler" = dontDistribute super."engine-io-growler";
+  "engine-io-snap" = dontDistribute super."engine-io-snap";
+  "engineering-units" = dontDistribute super."engineering-units";
+  "enumerable" = dontDistribute super."enumerable";
+  "enumerate" = dontDistribute super."enumerate";
+  "enumeration" = dontDistribute super."enumeration";
+  "enumerator-fd" = dontDistribute super."enumerator-fd";
+  "enumerator-tf" = dontDistribute super."enumerator-tf";
+  "enumfun" = dontDistribute super."enumfun";
+  "enummapmap" = dontDistribute super."enummapmap";
+  "enummapset" = dontDistribute super."enummapset";
+  "enummapset-th" = dontDistribute super."enummapset-th";
+  "enumset" = dontDistribute super."enumset";
+  "env-parser" = dontDistribute super."env-parser";
+  "envparse" = dontDistribute super."envparse";
+  "envy" = dontDistribute super."envy";
+  "epanet-haskell" = dontDistribute super."epanet-haskell";
+  "epass" = dontDistribute super."epass";
+  "epic" = dontDistribute super."epic";
+  "epoll" = dontDistribute super."epoll";
+  "eprocess" = dontDistribute super."eprocess";
+  "epub" = dontDistribute super."epub";
+  "epub-metadata" = dontDistribute super."epub-metadata";
+  "epub-tools" = dontDistribute super."epub-tools";
+  "epubname" = dontDistribute super."epubname";
+  "equal-files" = dontDistribute super."equal-files";
+  "equational-reasoning" = dontDistribute super."equational-reasoning";
+  "erd" = dontDistribute super."erd";
+  "erf-native" = dontDistribute super."erf-native";
+  "erlang" = dontDistribute super."erlang";
+  "eros" = dontDistribute super."eros";
+  "eros-client" = dontDistribute super."eros-client";
+  "eros-http" = dontDistribute super."eros-http";
+  "errno" = dontDistribute super."errno";
+  "error-analyze" = dontDistribute super."error-analyze";
+  "error-continuations" = dontDistribute super."error-continuations";
+  "error-list" = dontDistribute super."error-list";
+  "error-loc" = dontDistribute super."error-loc";
+  "error-location" = dontDistribute super."error-location";
+  "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
+  "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance";
+  "ersatz" = dontDistribute super."ersatz";
+  "ersatz-toysat" = dontDistribute super."ersatz-toysat";
+  "ert" = dontDistribute super."ert";
+  "esotericbot" = dontDistribute super."esotericbot";
+  "ess" = dontDistribute super."ess";
+  "estimator" = dontDistribute super."estimator";
+  "estimators" = dontDistribute super."estimators";
+  "estreps" = dontDistribute super."estreps";
+  "eternal" = dontDistribute super."eternal";
+  "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell";
+  "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db";
+  "ethereum-rlp" = dontDistribute super."ethereum-rlp";
+  "ety" = dontDistribute super."ety";
+  "euler" = dontDistribute super."euler";
+  "euphoria" = dontDistribute super."euphoria";
+  "eurofxref" = dontDistribute super."eurofxref";
+  "event-driven" = dontDistribute super."event-driven";
+  "event-handlers" = dontDistribute super."event-handlers";
+  "event-list" = dontDistribute super."event-list";
+  "event-monad" = dontDistribute super."event-monad";
+  "eventloop" = dontDistribute super."eventloop";
+  "every-bit-counts" = dontDistribute super."every-bit-counts";
+  "ewe" = dontDistribute super."ewe";
+  "ex-pool" = dontDistribute super."ex-pool";
+  "exact-combinatorics" = dontDistribute super."exact-combinatorics";
+  "exception-hierarchy" = dontDistribute super."exception-hierarchy";
+  "exception-mailer" = dontDistribute super."exception-mailer";
+  "exception-monads-fd" = dontDistribute super."exception-monads-fd";
+  "exception-monads-tf" = dontDistribute super."exception-monads-tf";
+  "exception-mtl" = dontDistribute super."exception-mtl";
+  "exherbo-cabal" = dontDistribute super."exherbo-cabal";
+  "exif" = dontDistribute super."exif";
+  "exinst" = dontDistribute super."exinst";
+  "exinst-aeson" = dontDistribute super."exinst-aeson";
+  "exinst-bytes" = dontDistribute super."exinst-bytes";
+  "exinst-deepseq" = dontDistribute super."exinst-deepseq";
+  "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "exists" = dontDistribute super."exists";
+  "exit-codes" = dontDistribute super."exit-codes";
+  "exp-extended" = dontDistribute super."exp-extended";
+  "exp-pairs" = dontDistribute super."exp-pairs";
+  "expand" = dontDistribute super."expand";
+  "expat-enumerator" = dontDistribute super."expat-enumerator";
+  "expiring-mvar" = dontDistribute super."expiring-mvar";
+  "explain" = dontDistribute super."explain";
+  "explicit-determinant" = dontDistribute super."explicit-determinant";
+  "explicit-iomodes" = dontDistribute super."explicit-iomodes";
+  "explicit-iomodes-bytestring" = dontDistribute super."explicit-iomodes-bytestring";
+  "explicit-iomodes-text" = dontDistribute super."explicit-iomodes-text";
+  "explicit-sharing" = dontDistribute super."explicit-sharing";
+  "explore" = dontDistribute super."explore";
+  "exposed-containers" = dontDistribute super."exposed-containers";
+  "expression-parser" = dontDistribute super."expression-parser";
+  "extcore" = dontDistribute super."extcore";
+  "extemp" = dontDistribute super."extemp";
+  "extended-categories" = dontDistribute super."extended-categories";
+  "extended-reals" = dontDistribute super."extended-reals";
+  "extensible" = dontDistribute super."extensible";
+  "extensible-data" = dontDistribute super."extensible-data";
+  "extensible-effects" = dontDistribute super."extensible-effects";
+  "external-sort" = dontDistribute super."external-sort";
+  "extractelf" = dontDistribute super."extractelf";
+  "ez-couch" = dontDistribute super."ez-couch";
+  "faceted" = dontDistribute super."faceted";
+  "factory" = dontDistribute super."factory";
+  "factual-api" = dontDistribute super."factual-api";
+  "fad" = dontDistribute super."fad";
+  "failable-list" = dontDistribute super."failable-list";
+  "failure" = dontDistribute super."failure";
+  "fair-predicates" = dontDistribute super."fair-predicates";
+  "fake-type" = dontDistribute super."fake-type";
+  "faker" = dontDistribute super."faker";
+  "falling-turnip" = dontDistribute super."falling-turnip";
+  "fallingblocks" = dontDistribute super."fallingblocks";
+  "family-tree" = dontDistribute super."family-tree";
+  "fast-digits" = dontDistribute super."fast-digits";
+  "fast-math" = dontDistribute super."fast-math";
+  "fast-tags" = dontDistribute super."fast-tags";
+  "fast-tagsoup" = dontDistribute super."fast-tagsoup";
+  "fast-tagsoup-utf8-only" = dontDistribute super."fast-tagsoup-utf8-only";
+  "fastbayes" = dontDistribute super."fastbayes";
+  "fastcgi" = dontDistribute super."fastcgi";
+  "fastedit" = dontDistribute super."fastedit";
+  "fastirc" = dontDistribute super."fastirc";
+  "fault-tree" = dontDistribute super."fault-tree";
+  "fay-geoposition" = dontDistribute super."fay-geoposition";
+  "fay-hsx" = dontDistribute super."fay-hsx";
+  "fay-ref" = dontDistribute super."fay-ref";
+  "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
+  "fcd" = dontDistribute super."fcd";
+  "fckeditor" = dontDistribute super."fckeditor";
+  "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
+  "fdo-trash" = dontDistribute super."fdo-trash";
+  "fec" = dontDistribute super."fec";
+  "fedora-packages" = dontDistribute super."fedora-packages";
+  "feed-cli" = dontDistribute super."feed-cli";
+  "feed-collect" = dontDistribute super."feed-collect";
+  "feed-crawl" = dontDistribute super."feed-crawl";
+  "feed-translator" = dontDistribute super."feed-translator";
+  "feed2lj" = dontDistribute super."feed2lj";
+  "feed2twitter" = dontDistribute super."feed2twitter";
+  "feldspar-compiler" = dontDistribute super."feldspar-compiler";
+  "feldspar-language" = dontDistribute super."feldspar-language";
+  "feldspar-signal" = dontDistribute super."feldspar-signal";
+  "fen2s" = dontDistribute super."fen2s";
+  "fences" = dontDistribute super."fences";
+  "fenfire" = dontDistribute super."fenfire";
+  "fez-conf" = dontDistribute super."fez-conf";
+  "ffeed" = dontDistribute super."ffeed";
+  "fficxx" = dontDistribute super."fficxx";
+  "fficxx-runtime" = dontDistribute super."fficxx-runtime";
+  "ffmpeg-light" = dontDistribute super."ffmpeg-light";
+  "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials";
+  "fftwRaw" = dontDistribute super."fftwRaw";
+  "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions";
+  "fgl-visualize" = dontDistribute super."fgl-visualize";
+  "fibon" = dontDistribute super."fibon";
+  "fibonacci" = dontDistribute super."fibonacci";
+  "fields" = dontDistribute super."fields";
+  "fields-json" = dontDistribute super."fields-json";
+  "fieldwise" = dontDistribute super."fieldwise";
+  "fig" = dontDistribute super."fig";
+  "file-collection" = dontDistribute super."file-collection";
+  "file-command-qq" = dontDistribute super."file-command-qq";
+  "filediff" = dontDistribute super."filediff";
+  "filepath-io-access" = dontDistribute super."filepath-io-access";
+  "filepather" = dontDistribute super."filepather";
+  "filestore" = dontDistribute super."filestore";
+  "filesystem-conduit" = dontDistribute super."filesystem-conduit";
+  "filesystem-enumerator" = dontDistribute super."filesystem-enumerator";
+  "filesystem-trees" = dontDistribute super."filesystem-trees";
+  "filtrable" = dontDistribute super."filtrable";
+  "final" = dontDistribute super."final";
+  "find-conduit" = dontDistribute super."find-conduit";
+  "fingertree-tf" = dontDistribute super."fingertree-tf";
+  "finite-field" = dontDistribute super."finite-field";
+  "finite-typelits" = dontDistribute super."finite-typelits";
+  "first-and-last" = dontDistribute super."first-and-last";
+  "first-class-patterns" = dontDistribute super."first-class-patterns";
+  "firstify" = dontDistribute super."firstify";
+  "fishfood" = dontDistribute super."fishfood";
+  "fit" = dontDistribute super."fit";
+  "fitsio" = dontDistribute super."fitsio";
+  "fix-imports" = dontDistribute super."fix-imports";
+  "fix-parser-simple" = dontDistribute super."fix-parser-simple";
+  "fix-symbols-gitit" = dontDistribute super."fix-symbols-gitit";
+  "fixed-length" = dontDistribute super."fixed-length";
+  "fixed-point" = dontDistribute super."fixed-point";
+  "fixed-point-vector" = dontDistribute super."fixed-point-vector";
+  "fixed-point-vector-space" = dontDistribute super."fixed-point-vector-space";
+  "fixed-precision" = dontDistribute super."fixed-precision";
+  "fixed-storable-array" = dontDistribute super."fixed-storable-array";
+  "fixed-vector-binary" = dontDistribute super."fixed-vector-binary";
+  "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal";
+  "fixedprec" = dontDistribute super."fixedprec";
+  "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixhs" = dontDistribute super."fixhs";
+  "fixplate" = dontDistribute super."fixplate";
+  "fixpoint" = dontDistribute super."fixpoint";
+  "fixtime" = dontDistribute super."fixtime";
+  "fizz-buzz" = dontDistribute super."fizz-buzz";
+  "flaccuraterip" = dontDistribute super."flaccuraterip";
+  "flamethrower" = dontDistribute super."flamethrower";
+  "flamingra" = dontDistribute super."flamingra";
+  "flat-maybe" = dontDistribute super."flat-maybe";
+  "flat-mcmc" = dontDistribute super."flat-mcmc";
+  "flat-tex" = dontDistribute super."flat-tex";
+  "flexible-time" = dontDistribute super."flexible-time";
+  "flexible-unlit" = dontDistribute super."flexible-unlit";
+  "flexiwrap" = dontDistribute super."flexiwrap";
+  "flexiwrap-smallcheck" = dontDistribute super."flexiwrap-smallcheck";
+  "flickr" = dontDistribute super."flickr";
+  "flippers" = dontDistribute super."flippers";
+  "flite" = dontDistribute super."flite";
+  "flo" = dontDistribute super."flo";
+  "float-binstring" = dontDistribute super."float-binstring";
+  "floating-bits" = dontDistribute super."floating-bits";
+  "floatshow" = dontDistribute super."floatshow";
+  "flow2dot" = dontDistribute super."flow2dot";
+  "flowdock" = dontDistribute super."flowdock";
+  "flowdock-api" = dontDistribute super."flowdock-api";
+  "flowdock-rest" = dontDistribute super."flowdock-rest";
+  "flower" = dontDistribute super."flower";
+  "flowlocks-framework" = dontDistribute super."flowlocks-framework";
+  "flowsim" = dontDistribute super."flowsim";
+  "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fluent-logger" = dontDistribute super."fluent-logger";
+  "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
+  "fluidsynth" = dontDistribute super."fluidsynth";
+  "fmark" = dontDistribute super."fmark";
+  "fold-debounce" = dontDistribute super."fold-debounce";
+  "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit";
+  "foldl-incremental" = dontDistribute super."foldl-incremental";
+  "foldl-transduce" = dontDistribute super."foldl-transduce";
+  "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec";
+  "folds" = dontDistribute super."folds";
+  "folds-common" = dontDistribute super."folds-common";
+  "follower" = dontDistribute super."follower";
+  "foma" = dontDistribute super."foma";
+  "font-opengl-basic4x6" = dontDistribute super."font-opengl-basic4x6";
+  "foo" = dontDistribute super."foo";
+  "for-free" = dontDistribute super."for-free";
+  "forbidden-fruit" = dontDistribute super."forbidden-fruit";
+  "fordo" = dontDistribute super."fordo";
+  "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric";
+  "foreign-var" = dontDistribute super."foreign-var";
+  "forger" = dontDistribute super."forger";
+  "forkable-monad" = dontDistribute super."forkable-monad";
+  "formal" = dontDistribute super."formal";
+  "format" = dontDistribute super."format";
+  "format-status" = dontDistribute super."format-status";
+  "formattable" = dontDistribute super."formattable";
+  "forml" = dontDistribute super."forml";
+  "formlets" = dontDistribute super."formlets";
+  "formlets-hsp" = dontDistribute super."formlets-hsp";
+  "formura" = dontDistribute super."formura";
+  "forth-hll" = dontDistribute super."forth-hll";
+  "foscam-directory" = dontDistribute super."foscam-directory";
+  "foscam-filename" = dontDistribute super."foscam-filename";
+  "foscam-sort" = dontDistribute super."foscam-sort";
+  "fountain" = dontDistribute super."fountain";
+  "fpco-api" = dontDistribute super."fpco-api";
+  "fpipe" = dontDistribute super."fpipe";
+  "fpnla" = dontDistribute super."fpnla";
+  "fpnla-examples" = dontDistribute super."fpnla-examples";
+  "fptest" = dontDistribute super."fptest";
+  "fquery" = dontDistribute super."fquery";
+  "fractal" = dontDistribute super."fractal";
+  "fractals" = dontDistribute super."fractals";
+  "fraction" = dontDistribute super."fraction";
+  "frag" = dontDistribute super."frag";
+  "frame" = dontDistribute super."frame";
+  "frame-markdown" = dontDistribute super."frame-markdown";
+  "franchise" = dontDistribute super."franchise";
+  "free-concurrent" = dontDistribute super."free-concurrent";
+  "free-functors" = dontDistribute super."free-functors";
+  "free-game" = dontDistribute super."free-game";
+  "free-http" = dontDistribute super."free-http";
+  "free-operational" = dontDistribute super."free-operational";
+  "free-theorems" = dontDistribute super."free-theorems";
+  "free-theorems-counterexamples" = dontDistribute super."free-theorems-counterexamples";
+  "free-theorems-seq" = dontDistribute super."free-theorems-seq";
+  "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
+  "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
+  "freekick2" = dontDistribute super."freekick2";
+  "freer" = dontDistribute super."freer";
+  "freesect" = dontDistribute super."freesect";
+  "freesound" = dontDistribute super."freesound";
+  "freetype-simple" = dontDistribute super."freetype-simple";
+  "freetype2" = dontDistribute super."freetype2";
+  "fresh" = dontDistribute super."fresh";
+  "friday" = dontDistribute super."friday";
+  "friday-devil" = dontDistribute super."friday-devil";
+  "friday-juicypixels" = dontDistribute super."friday-juicypixels";
+  "friday-scale-dct" = dontDistribute super."friday-scale-dct";
+  "friendly-time" = dontDistribute super."friendly-time";
+  "frp-arduino" = dontDistribute super."frp-arduino";
+  "frpnow" = dontDistribute super."frpnow";
+  "frpnow-gloss" = dontDistribute super."frpnow-gloss";
+  "frpnow-gtk" = dontDistribute super."frpnow-gtk";
+  "frquotes" = dontDistribute super."frquotes";
+  "fs-events" = dontDistribute super."fs-events";
+  "fsharp" = dontDistribute super."fsharp";
+  "fsmActions" = dontDistribute super."fsmActions";
+  "fst" = dontDistribute super."fst";
+  "fsutils" = dontDistribute super."fsutils";
+  "fswatcher" = dontDistribute super."fswatcher";
+  "ftdi" = dontDistribute super."ftdi";
+  "ftp-conduit" = dontDistribute super."ftp-conduit";
+  "ftphs" = dontDistribute super."ftphs";
+  "ftree" = dontDistribute super."ftree";
+  "ftshell" = dontDistribute super."ftshell";
+  "fugue" = dontDistribute super."fugue";
+  "full-sessions" = dontDistribute super."full-sessions";
+  "full-text-search" = dontDistribute super."full-text-search";
+  "fullstop" = dontDistribute super."fullstop";
+  "funbot" = dontDistribute super."funbot";
+  "funbot-client" = dontDistribute super."funbot-client";
+  "funbot-ext-events" = dontDistribute super."funbot-ext-events";
+  "funbot-git-hook" = dontDistribute super."funbot-git-hook";
+  "function-combine" = dontDistribute super."function-combine";
+  "function-instances-algebra" = dontDistribute super."function-instances-algebra";
+  "functional-arrow" = dontDistribute super."functional-arrow";
+  "functional-kmp" = dontDistribute super."functional-kmp";
+  "functor-apply" = dontDistribute super."functor-apply";
+  "functor-combo" = dontDistribute super."functor-combo";
+  "functor-infix" = dontDistribute super."functor-infix";
+  "functor-monadic" = dontDistribute super."functor-monadic";
+  "functor-utils" = dontDistribute super."functor-utils";
+  "functorm" = dontDistribute super."functorm";
+  "functors" = dontDistribute super."functors";
+  "funion" = dontDistribute super."funion";
+  "funpat" = dontDistribute super."funpat";
+  "funsat" = dontDistribute super."funsat";
+  "fusion" = dontDistribute super."fusion";
+  "futun" = dontDistribute super."futun";
+  "future" = dontDistribute super."future";
+  "future-resource" = dontDistribute super."future-resource";
+  "fuzzy" = dontDistribute super."fuzzy";
+  "fuzzy-timings" = dontDistribute super."fuzzy-timings";
+  "fuzzytime" = dontDistribute super."fuzzytime";
+  "fwgl" = dontDistribute super."fwgl";
+  "fwgl-glfw" = dontDistribute super."fwgl-glfw";
+  "fwgl-javascript" = dontDistribute super."fwgl-javascript";
+  "g-npm" = dontDistribute super."g-npm";
+  "gact" = dontDistribute super."gact";
+  "game-of-life" = dontDistribute super."game-of-life";
+  "game-probability" = dontDistribute super."game-probability";
+  "game-tree" = dontDistribute super."game-tree";
+  "gameclock" = dontDistribute super."gameclock";
+  "gamma" = dontDistribute super."gamma";
+  "gang-of-threads" = dontDistribute super."gang-of-threads";
+  "garepinoh" = dontDistribute super."garepinoh";
+  "garsia-wachs" = dontDistribute super."garsia-wachs";
+  "gbu" = dontDistribute super."gbu";
+  "gc" = dontDistribute super."gc";
+  "gc-monitoring-wai" = dontDistribute super."gc-monitoring-wai";
+  "gconf" = dontDistribute super."gconf";
+  "gdiff" = dontDistribute super."gdiff";
+  "gdiff-ig" = dontDistribute super."gdiff-ig";
+  "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
+  "gearbox" = dontDistribute super."gearbox";
+  "geek" = dontDistribute super."geek";
+  "geek-server" = dontDistribute super."geek-server";
+  "gelatin" = dontDistribute super."gelatin";
+  "gemstone" = dontDistribute super."gemstone";
+  "gencheck" = dontDistribute super."gencheck";
+  "gender" = dontDistribute super."gender";
+  "genders" = dontDistribute super."genders";
+  "general-prelude" = dontDistribute super."general-prelude";
+  "generator" = dontDistribute super."generator";
+  "generators" = dontDistribute super."generators";
+  "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-binary" = dontDistribute super."generic-binary";
+  "generic-church" = dontDistribute super."generic-church";
+  "generic-deepseq" = dontDistribute super."generic-deepseq";
+  "generic-lucid-scaffold" = dontDistribute super."generic-lucid-scaffold";
+  "generic-maybe" = dontDistribute super."generic-maybe";
+  "generic-pretty" = dontDistribute super."generic-pretty";
+  "generic-server" = dontDistribute super."generic-server";
+  "generic-storable" = dontDistribute super."generic-storable";
+  "generic-tree" = dontDistribute super."generic-tree";
+  "generic-trie" = dontDistribute super."generic-trie";
+  "generic-xml" = dontDistribute super."generic-xml";
+  "genericserialize" = dontDistribute super."genericserialize";
+  "genetics" = dontDistribute super."genetics";
+  "geni-gui" = dontDistribute super."geni-gui";
+  "geni-util" = dontDistribute super."geni-util";
+  "geniconvert" = dontDistribute super."geniconvert";
+  "genifunctors" = dontDistribute super."genifunctors";
+  "geniplate" = dontDistribute super."geniplate";
+  "geniserver" = dontDistribute super."geniserver";
+  "genprog" = dontDistribute super."genprog";
+  "gentlemark" = dontDistribute super."gentlemark";
+  "geo-resolver" = dontDistribute super."geo-resolver";
+  "geo-uk" = dontDistribute super."geo-uk";
+  "geocalc" = dontDistribute super."geocalc";
+  "geocode-google" = dontDistribute super."geocode-google";
+  "geodetic" = dontDistribute super."geodetic";
+  "geodetics" = dontDistribute super."geodetics";
+  "geohash" = dontDistribute super."geohash";
+  "geoip2" = dontDistribute super."geoip2";
+  "geojson" = dontDistribute super."geojson";
+  "geom2d" = dontDistribute super."geom2d";
+  "getemx" = dontDistribute super."getemx";
+  "getflag" = dontDistribute super."getflag";
+  "getopt-simple" = dontDistribute super."getopt-simple";
+  "gf" = dontDistribute super."gf";
+  "ggtsTC" = dontDistribute super."ggtsTC";
+  "ghc-core" = dontDistribute super."ghc-core";
+  "ghc-core-html" = dontDistribute super."ghc-core-html";
+  "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dup" = dontDistribute super."ghc-dup";
+  "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
+  "ghc-events-parallel" = dontDistribute super."ghc-events-parallel";
+  "ghc-gc-tune" = dontDistribute super."ghc-gc-tune";
+  "ghc-generic-instances" = dontDistribute super."ghc-generic-instances";
+  "ghc-imported-from" = dontDistribute super."ghc-imported-from";
+  "ghc-make" = dontDistribute super."ghc-make";
+  "ghc-man-completion" = dontDistribute super."ghc-man-completion";
+  "ghc-options" = dontDistribute super."ghc-options";
+  "ghc-parmake" = dontDistribute super."ghc-parmake";
+  "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix";
+  "ghc-pkg-lib" = dontDistribute super."ghc-pkg-lib";
+  "ghc-prof-flamegraph" = dontDistribute super."ghc-prof-flamegraph";
+  "ghc-server" = dontDistribute super."ghc-server";
+  "ghc-simple" = dontDistribute super."ghc-simple";
+  "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin";
+  "ghc-syb" = dontDistribute super."ghc-syb";
+  "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
+  "ghc-vis" = dontDistribute super."ghc-vis";
+  "ghci-diagrams" = dontDistribute super."ghci-diagrams";
+  "ghci-haskeline" = dontDistribute super."ghci-haskeline";
+  "ghci-lib" = dontDistribute super."ghci-lib";
+  "ghci-ng" = dontDistribute super."ghci-ng";
+  "ghci-pretty" = dontDistribute super."ghci-pretty";
+  "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
+  "ghcjs-dom" = dontDistribute super."ghcjs-dom";
+  "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
+  "ghcjs-websockets" = dontDistribute super."ghcjs-websockets";
+  "ghclive" = dontDistribute super."ghclive";
+  "ghczdecode" = dontDistribute super."ghczdecode";
+  "ght" = dontDistribute super."ght";
+  "gi-atk" = dontDistribute super."gi-atk";
+  "gi-cairo" = dontDistribute super."gi-cairo";
+  "gi-gdk" = dontDistribute super."gi-gdk";
+  "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
+  "gi-gio" = dontDistribute super."gi-gio";
+  "gi-glib" = dontDistribute super."gi-glib";
+  "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gtk" = dontDistribute super."gi-gtk";
+  "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
+  "gi-notify" = dontDistribute super."gi-notify";
+  "gi-pango" = dontDistribute super."gi-pango";
+  "gi-soup" = dontDistribute super."gi-soup";
+  "gi-vte" = dontDistribute super."gi-vte";
+  "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gimlh" = dontDistribute super."gimlh";
+  "ginger" = dontDistribute super."ginger";
+  "ginsu" = dontDistribute super."ginsu";
+  "gist" = dontDistribute super."gist";
+  "git-all" = dontDistribute super."git-all";
+  "git-checklist" = dontDistribute super."git-checklist";
+  "git-date" = dontDistribute super."git-date";
+  "git-embed" = dontDistribute super."git-embed";
+  "git-freq" = dontDistribute super."git-freq";
+  "git-gpush" = dontDistribute super."git-gpush";
+  "git-jump" = dontDistribute super."git-jump";
+  "git-monitor" = dontDistribute super."git-monitor";
+  "git-object" = dontDistribute super."git-object";
+  "git-repair" = dontDistribute super."git-repair";
+  "git-sanity" = dontDistribute super."git-sanity";
+  "git-vogue" = dontDistribute super."git-vogue";
+  "gitHUD" = dontDistribute super."gitHUD";
+  "gitcache" = dontDistribute super."gitcache";
+  "gitdo" = dontDistribute super."gitdo";
+  "github" = dontDistribute super."github";
+  "github-backup" = dontDistribute super."github-backup";
+  "github-post-receive" = dontDistribute super."github-post-receive";
+  "github-utils" = dontDistribute super."github-utils";
+  "gitignore" = dontDistribute super."gitignore";
+  "gitit" = dontDistribute super."gitit";
+  "gitlib-cmdline" = dontDistribute super."gitlib-cmdline";
+  "gitlib-cross" = dontDistribute super."gitlib-cross";
+  "gitlib-s3" = dontDistribute super."gitlib-s3";
+  "gitlib-sample" = dontDistribute super."gitlib-sample";
+  "gitlib-utils" = dontDistribute super."gitlib-utils";
+  "gitter" = dontDistribute super."gitter";
+  "gl-capture" = dontDistribute super."gl-capture";
+  "glade" = dontDistribute super."glade";
+  "gladexml-accessor" = dontDistribute super."gladexml-accessor";
+  "glambda" = dontDistribute super."glambda";
+  "glapp" = dontDistribute super."glapp";
+  "glasso" = dontDistribute super."glasso";
+  "glicko" = dontDistribute super."glicko";
+  "glider-nlp" = dontDistribute super."glider-nlp";
+  "glintcollider" = dontDistribute super."glintcollider";
+  "gll" = dontDistribute super."gll";
+  "global" = dontDistribute super."global";
+  "global-config" = dontDistribute super."global-config";
+  "global-lock" = dontDistribute super."global-lock";
+  "global-variables" = dontDistribute super."global-variables";
+  "glome-hs" = dontDistribute super."glome-hs";
+  "gloss" = dontDistribute super."gloss";
+  "gloss-accelerate" = dontDistribute super."gloss-accelerate";
+  "gloss-algorithms" = dontDistribute super."gloss-algorithms";
+  "gloss-banana" = dontDistribute super."gloss-banana";
+  "gloss-devil" = dontDistribute super."gloss-devil";
+  "gloss-examples" = dontDistribute super."gloss-examples";
+  "gloss-game" = dontDistribute super."gloss-game";
+  "gloss-juicy" = dontDistribute super."gloss-juicy";
+  "gloss-raster" = dontDistribute super."gloss-raster";
+  "gloss-raster-accelerate" = dontDistribute super."gloss-raster-accelerate";
+  "gloss-rendering" = dontDistribute super."gloss-rendering";
+  "gloss-sodium" = dontDistribute super."gloss-sodium";
+  "glpk-hs" = dontDistribute super."glpk-hs";
+  "glue" = dontDistribute super."glue";
+  "glue-common" = dontDistribute super."glue-common";
+  "glue-core" = dontDistribute super."glue-core";
+  "glue-ekg" = dontDistribute super."glue-ekg";
+  "glue-example" = dontDistribute super."glue-example";
+  "gluturtle" = dontDistribute super."gluturtle";
+  "gmap" = dontDistribute super."gmap";
+  "gmndl" = dontDistribute super."gmndl";
+  "gnome-desktop" = dontDistribute super."gnome-desktop";
+  "gnome-keyring" = dontDistribute super."gnome-keyring";
+  "gnomevfs" = dontDistribute super."gnomevfs";
+  "gnss-converters" = dontDistribute super."gnss-converters";
+  "gnuplot" = dontDistribute super."gnuplot";
+  "goa" = dontDistribute super."goa";
+  "goal-core" = dontDistribute super."goal-core";
+  "goal-geometry" = dontDistribute super."goal-geometry";
+  "goal-probability" = dontDistribute super."goal-probability";
+  "goal-simulation" = dontDistribute super."goal-simulation";
+  "goatee" = dontDistribute super."goatee";
+  "goatee-gtk" = dontDistribute super."goatee-gtk";
+  "gofer-prelude" = dontDistribute super."gofer-prelude";
+  "gogol" = dontDistribute super."gogol";
+  "gogol-adexchange-buyer" = dontDistribute super."gogol-adexchange-buyer";
+  "gogol-adexchange-seller" = dontDistribute super."gogol-adexchange-seller";
+  "gogol-admin-datatransfer" = dontDistribute super."gogol-admin-datatransfer";
+  "gogol-admin-directory" = dontDistribute super."gogol-admin-directory";
+  "gogol-admin-emailmigration" = dontDistribute super."gogol-admin-emailmigration";
+  "gogol-admin-reports" = dontDistribute super."gogol-admin-reports";
+  "gogol-adsense" = dontDistribute super."gogol-adsense";
+  "gogol-adsense-host" = dontDistribute super."gogol-adsense-host";
+  "gogol-affiliates" = dontDistribute super."gogol-affiliates";
+  "gogol-analytics" = dontDistribute super."gogol-analytics";
+  "gogol-android-enterprise" = dontDistribute super."gogol-android-enterprise";
+  "gogol-android-publisher" = dontDistribute super."gogol-android-publisher";
+  "gogol-appengine" = dontDistribute super."gogol-appengine";
+  "gogol-apps-activity" = dontDistribute super."gogol-apps-activity";
+  "gogol-apps-calendar" = dontDistribute super."gogol-apps-calendar";
+  "gogol-apps-licensing" = dontDistribute super."gogol-apps-licensing";
+  "gogol-apps-reseller" = dontDistribute super."gogol-apps-reseller";
+  "gogol-apps-tasks" = dontDistribute super."gogol-apps-tasks";
+  "gogol-appstate" = dontDistribute super."gogol-appstate";
+  "gogol-autoscaler" = dontDistribute super."gogol-autoscaler";
+  "gogol-bigquery" = dontDistribute super."gogol-bigquery";
+  "gogol-billing" = dontDistribute super."gogol-billing";
+  "gogol-blogger" = dontDistribute super."gogol-blogger";
+  "gogol-books" = dontDistribute super."gogol-books";
+  "gogol-civicinfo" = dontDistribute super."gogol-civicinfo";
+  "gogol-classroom" = dontDistribute super."gogol-classroom";
+  "gogol-cloudtrace" = dontDistribute super."gogol-cloudtrace";
+  "gogol-compute" = dontDistribute super."gogol-compute";
+  "gogol-container" = dontDistribute super."gogol-container";
+  "gogol-core" = dontDistribute super."gogol-core";
+  "gogol-customsearch" = dontDistribute super."gogol-customsearch";
+  "gogol-dataflow" = dontDistribute super."gogol-dataflow";
+  "gogol-datastore" = dontDistribute super."gogol-datastore";
+  "gogol-debugger" = dontDistribute super."gogol-debugger";
+  "gogol-deploymentmanager" = dontDistribute super."gogol-deploymentmanager";
+  "gogol-dfareporting" = dontDistribute super."gogol-dfareporting";
+  "gogol-discovery" = dontDistribute super."gogol-discovery";
+  "gogol-dns" = dontDistribute super."gogol-dns";
+  "gogol-doubleclick-bids" = dontDistribute super."gogol-doubleclick-bids";
+  "gogol-doubleclick-search" = dontDistribute super."gogol-doubleclick-search";
+  "gogol-drive" = dontDistribute super."gogol-drive";
+  "gogol-fitness" = dontDistribute super."gogol-fitness";
+  "gogol-fonts" = dontDistribute super."gogol-fonts";
+  "gogol-freebasesearch" = dontDistribute super."gogol-freebasesearch";
+  "gogol-fusiontables" = dontDistribute super."gogol-fusiontables";
+  "gogol-games" = dontDistribute super."gogol-games";
+  "gogol-games-configuration" = dontDistribute super."gogol-games-configuration";
+  "gogol-games-management" = dontDistribute super."gogol-games-management";
+  "gogol-genomics" = dontDistribute super."gogol-genomics";
+  "gogol-gmail" = dontDistribute super."gogol-gmail";
+  "gogol-groups-migration" = dontDistribute super."gogol-groups-migration";
+  "gogol-groups-settings" = dontDistribute super."gogol-groups-settings";
+  "gogol-identity-toolkit" = dontDistribute super."gogol-identity-toolkit";
+  "gogol-latencytest" = dontDistribute super."gogol-latencytest";
+  "gogol-logging" = dontDistribute super."gogol-logging";
+  "gogol-maps-coordinate" = dontDistribute super."gogol-maps-coordinate";
+  "gogol-maps-engine" = dontDistribute super."gogol-maps-engine";
+  "gogol-mirror" = dontDistribute super."gogol-mirror";
+  "gogol-monitoring" = dontDistribute super."gogol-monitoring";
+  "gogol-oauth2" = dontDistribute super."gogol-oauth2";
+  "gogol-pagespeed" = dontDistribute super."gogol-pagespeed";
+  "gogol-partners" = dontDistribute super."gogol-partners";
+  "gogol-play-moviespartner" = dontDistribute super."gogol-play-moviespartner";
+  "gogol-plus" = dontDistribute super."gogol-plus";
+  "gogol-plus-domains" = dontDistribute super."gogol-plus-domains";
+  "gogol-prediction" = dontDistribute super."gogol-prediction";
+  "gogol-proximitybeacon" = dontDistribute super."gogol-proximitybeacon";
+  "gogol-pubsub" = dontDistribute super."gogol-pubsub";
+  "gogol-qpxexpress" = dontDistribute super."gogol-qpxexpress";
+  "gogol-replicapool" = dontDistribute super."gogol-replicapool";
+  "gogol-replicapool-updater" = dontDistribute super."gogol-replicapool-updater";
+  "gogol-resourcemanager" = dontDistribute super."gogol-resourcemanager";
+  "gogol-resourceviews" = dontDistribute super."gogol-resourceviews";
+  "gogol-shopping-content" = dontDistribute super."gogol-shopping-content";
+  "gogol-siteverification" = dontDistribute super."gogol-siteverification";
+  "gogol-spectrum" = dontDistribute super."gogol-spectrum";
+  "gogol-sqladmin" = dontDistribute super."gogol-sqladmin";
+  "gogol-storage" = dontDistribute super."gogol-storage";
+  "gogol-storage-transfer" = dontDistribute super."gogol-storage-transfer";
+  "gogol-tagmanager" = dontDistribute super."gogol-tagmanager";
+  "gogol-taskqueue" = dontDistribute super."gogol-taskqueue";
+  "gogol-translate" = dontDistribute super."gogol-translate";
+  "gogol-urlshortener" = dontDistribute super."gogol-urlshortener";
+  "gogol-useraccounts" = dontDistribute super."gogol-useraccounts";
+  "gogol-webmaster-tools" = dontDistribute super."gogol-webmaster-tools";
+  "gogol-youtube" = dontDistribute super."gogol-youtube";
+  "gogol-youtube-analytics" = dontDistribute super."gogol-youtube-analytics";
+  "gogol-youtube-reporting" = dontDistribute super."gogol-youtube-reporting";
+  "gooey" = dontDistribute super."gooey";
+  "google-dictionary" = dontDistribute super."google-dictionary";
+  "google-drive" = dontDistribute super."google-drive";
+  "google-html5-slide" = dontDistribute super."google-html5-slide";
+  "google-mail-filters" = dontDistribute super."google-mail-filters";
+  "google-oauth2" = dontDistribute super."google-oauth2";
+  "google-search" = dontDistribute super."google-search";
+  "google-translate" = dontDistribute super."google-translate";
+  "googleplus" = dontDistribute super."googleplus";
+  "googlepolyline" = dontDistribute super."googlepolyline";
+  "gopherbot" = dontDistribute super."gopherbot";
+  "gpah" = dontDistribute super."gpah";
+  "gpcsets" = dontDistribute super."gpcsets";
+  "gpolyline" = dontDistribute super."gpolyline";
+  "gps" = dontDistribute super."gps";
+  "gps2htmlReport" = dontDistribute super."gps2htmlReport";
+  "gpx-conduit" = dontDistribute super."gpx-conduit";
+  "graceful" = dontDistribute super."graceful";
+  "grammar-combinators" = dontDistribute super."grammar-combinators";
+  "grapefruit-examples" = dontDistribute super."grapefruit-examples";
+  "grapefruit-frp" = dontDistribute super."grapefruit-frp";
+  "grapefruit-records" = dontDistribute super."grapefruit-records";
+  "grapefruit-ui" = dontDistribute super."grapefruit-ui";
+  "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-generators" = dontDistribute super."graph-generators";
+  "graph-matchings" = dontDistribute super."graph-matchings";
+  "graph-rewriting" = dontDistribute super."graph-rewriting";
+  "graph-rewriting-cl" = dontDistribute super."graph-rewriting-cl";
+  "graph-rewriting-gl" = dontDistribute super."graph-rewriting-gl";
+  "graph-rewriting-lambdascope" = dontDistribute super."graph-rewriting-lambdascope";
+  "graph-rewriting-layout" = dontDistribute super."graph-rewriting-layout";
+  "graph-rewriting-ski" = dontDistribute super."graph-rewriting-ski";
+  "graph-rewriting-strategies" = dontDistribute super."graph-rewriting-strategies";
+  "graph-rewriting-trs" = dontDistribute super."graph-rewriting-trs";
+  "graph-rewriting-ww" = dontDistribute super."graph-rewriting-ww";
+  "graph-serialize" = dontDistribute super."graph-serialize";
+  "graph-utils" = dontDistribute super."graph-utils";
+  "graph-visit" = dontDistribute super."graph-visit";
+  "graphbuilder" = dontDistribute super."graphbuilder";
+  "graphene" = dontDistribute super."graphene";
+  "graphics-drawingcombinators" = dontDistribute super."graphics-drawingcombinators";
+  "graphics-formats-collada" = dontDistribute super."graphics-formats-collada";
+  "graphicsFormats" = dontDistribute super."graphicsFormats";
+  "graphicstools" = dontDistribute super."graphicstools";
+  "graphmod" = dontDistribute super."graphmod";
+  "graphql" = dontDistribute super."graphql";
+  "graphtype" = dontDistribute super."graphtype";
+  "gray-code" = dontDistribute super."gray-code";
+  "gray-extended" = dontDistribute super."gray-extended";
+  "greencard" = dontDistribute super."greencard";
+  "greencard-lib" = dontDistribute super."greencard-lib";
+  "greg-client" = dontDistribute super."greg-client";
+  "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "grid" = dontDistribute super."grid";
+  "gridland" = dontDistribute super."gridland";
+  "grm" = dontDistribute super."grm";
+  "groundhog-inspector" = dontDistribute super."groundhog-inspector";
+  "group-with" = dontDistribute super."group-with";
+  "groupoid" = dontDistribute super."groupoid";
+  "growler" = dontDistribute super."growler";
+  "gruff" = dontDistribute super."gruff";
+  "gruff-examples" = dontDistribute super."gruff-examples";
+  "gsc-weighting" = dontDistribute super."gsc-weighting";
+  "gsl-random" = dontDistribute super."gsl-random";
+  "gsl-random-fu" = dontDistribute super."gsl-random-fu";
+  "gsmenu" = dontDistribute super."gsmenu";
+  "gstreamer" = dontDistribute super."gstreamer";
+  "gt-tools" = dontDistribute super."gt-tools";
+  "gtfs" = dontDistribute super."gtfs";
+  "gtk-helpers" = dontDistribute super."gtk-helpers";
+  "gtk-jsinput" = dontDistribute super."gtk-jsinput";
+  "gtk-largeTreeStore" = dontDistribute super."gtk-largeTreeStore";
+  "gtk-mac-integration" = dontDistribute super."gtk-mac-integration";
+  "gtk-serialized-event" = dontDistribute super."gtk-serialized-event";
+  "gtk-simple-list-view" = dontDistribute super."gtk-simple-list-view";
+  "gtk-toggle-button-list" = dontDistribute super."gtk-toggle-button-list";
+  "gtk-toy" = dontDistribute super."gtk-toy";
+  "gtk-traymanager" = dontDistribute super."gtk-traymanager";
+  "gtk2hs-cast-glade" = dontDistribute super."gtk2hs-cast-glade";
+  "gtk2hs-cast-glib" = dontDistribute super."gtk2hs-cast-glib";
+  "gtk2hs-cast-gnomevfs" = dontDistribute super."gtk2hs-cast-gnomevfs";
+  "gtk2hs-cast-gtk" = dontDistribute super."gtk2hs-cast-gtk";
+  "gtk2hs-cast-gtkglext" = dontDistribute super."gtk2hs-cast-gtkglext";
+  "gtk2hs-cast-gtksourceview2" = dontDistribute super."gtk2hs-cast-gtksourceview2";
+  "gtk2hs-cast-th" = dontDistribute super."gtk2hs-cast-th";
+  "gtk2hs-hello" = dontDistribute super."gtk2hs-hello";
+  "gtk2hs-rpn" = dontDistribute super."gtk2hs-rpn";
+  "gtk3-mac-integration" = dontDistribute super."gtk3-mac-integration";
+  "gtkglext" = dontDistribute super."gtkglext";
+  "gtkimageview" = dontDistribute super."gtkimageview";
+  "gtkrsync" = dontDistribute super."gtkrsync";
+  "gtksourceview2" = dontDistribute super."gtksourceview2";
+  "gtksourceview3" = dontDistribute super."gtksourceview3";
+  "guarded-rewriting" = dontDistribute super."guarded-rewriting";
+  "guess-combinator" = dontDistribute super."guess-combinator";
+  "gulcii" = dontDistribute super."gulcii";
+  "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis";
+  "gyah-bin" = dontDistribute super."gyah-bin";
+  "h-booru" = dontDistribute super."h-booru";
+  "h-gpgme" = dontDistribute super."h-gpgme";
+  "h2048" = dontDistribute super."h2048";
+  "hArduino" = dontDistribute super."hArduino";
+  "hBDD" = dontDistribute super."hBDD";
+  "hBDD-CMUBDD" = dontDistribute super."hBDD-CMUBDD";
+  "hBDD-CUDD" = dontDistribute super."hBDD-CUDD";
+  "hCsound" = dontDistribute super."hCsound";
+  "hDFA" = dontDistribute super."hDFA";
+  "hF2" = dontDistribute super."hF2";
+  "hGelf" = dontDistribute super."hGelf";
+  "hLLVM" = dontDistribute super."hLLVM";
+  "hMollom" = dontDistribute super."hMollom";
+  "hPDB-examples" = dontDistribute super."hPDB-examples";
+  "hPushover" = dontDistribute super."hPushover";
+  "hR" = dontDistribute super."hR";
+  "hRESP" = dontDistribute super."hRESP";
+  "hS3" = dontDistribute super."hS3";
+  "hScraper" = dontDistribute super."hScraper";
+  "hSimpleDB" = dontDistribute super."hSimpleDB";
+  "hTalos" = dontDistribute super."hTalos";
+  "hTensor" = dontDistribute super."hTensor";
+  "hVOIDP" = dontDistribute super."hVOIDP";
+  "hXmixer" = dontDistribute super."hXmixer";
+  "haar" = dontDistribute super."haar";
+  "hacanon-light" = dontDistribute super."hacanon-light";
+  "hack" = dontDistribute super."hack";
+  "hack-contrib" = dontDistribute super."hack-contrib";
+  "hack-contrib-press" = dontDistribute super."hack-contrib-press";
+  "hack-frontend-happstack" = dontDistribute super."hack-frontend-happstack";
+  "hack-frontend-monadcgi" = dontDistribute super."hack-frontend-monadcgi";
+  "hack-handler-cgi" = dontDistribute super."hack-handler-cgi";
+  "hack-handler-epoll" = dontDistribute super."hack-handler-epoll";
+  "hack-handler-evhttp" = dontDistribute super."hack-handler-evhttp";
+  "hack-handler-fastcgi" = dontDistribute super."hack-handler-fastcgi";
+  "hack-handler-happstack" = dontDistribute super."hack-handler-happstack";
+  "hack-handler-hyena" = dontDistribute super."hack-handler-hyena";
+  "hack-handler-kibro" = dontDistribute super."hack-handler-kibro";
+  "hack-handler-simpleserver" = dontDistribute super."hack-handler-simpleserver";
+  "hack-middleware-cleanpath" = dontDistribute super."hack-middleware-cleanpath";
+  "hack-middleware-clientsession" = dontDistribute super."hack-middleware-clientsession";
+  "hack-middleware-gzip" = dontDistribute super."hack-middleware-gzip";
+  "hack-middleware-jsonp" = dontDistribute super."hack-middleware-jsonp";
+  "hack2" = dontDistribute super."hack2";
+  "hack2-contrib" = dontDistribute super."hack2-contrib";
+  "hack2-contrib-extra" = dontDistribute super."hack2-contrib-extra";
+  "hack2-handler-happstack-server" = dontDistribute super."hack2-handler-happstack-server";
+  "hack2-handler-mongrel2-http" = dontDistribute super."hack2-handler-mongrel2-http";
+  "hack2-handler-snap-server" = dontDistribute super."hack2-handler-snap-server";
+  "hack2-handler-warp" = dontDistribute super."hack2-handler-warp";
+  "hack2-interface-wai" = dontDistribute super."hack2-interface-wai";
+  "hackage-diff" = dontDistribute super."hackage-diff";
+  "hackage-plot" = dontDistribute super."hackage-plot";
+  "hackage-proxy" = dontDistribute super."hackage-proxy";
+  "hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
+  "hackage-security" = dontDistribute super."hackage-security";
+  "hackage-security-HTTP" = dontDistribute super."hackage-security-HTTP";
+  "hackage-server" = dontDistribute super."hackage-server";
+  "hackage-sparks" = dontDistribute super."hackage-sparks";
+  "hackage2hwn" = dontDistribute super."hackage2hwn";
+  "hackage2twitter" = dontDistribute super."hackage2twitter";
+  "hackager" = dontDistribute super."hackager";
+  "hackernews" = dontDistribute super."hackernews";
+  "hackertyper" = dontDistribute super."hackertyper";
+  "hackport" = dontDistribute super."hackport";
+  "hactor" = dontDistribute super."hactor";
+  "hactors" = dontDistribute super."hactors";
+  "haddock" = dontDistribute super."haddock";
+  "haddock-leksah" = dontDistribute super."haddock-leksah";
+  "haddocset" = dontDistribute super."haddocset";
+  "hadoop-formats" = dontDistribute super."hadoop-formats";
+  "hadoop-rpc" = dontDistribute super."hadoop-rpc";
+  "hadoop-tools" = dontDistribute super."hadoop-tools";
+  "haeredes" = dontDistribute super."haeredes";
+  "haggis" = dontDistribute super."haggis";
+  "haha" = dontDistribute super."haha";
+  "haiji" = dontDistribute super."haiji";
+  "hailgun" = dontDistribute super."hailgun";
+  "hailgun-send" = dontDistribute super."hailgun-send";
+  "hails" = dontDistribute super."hails";
+  "hails-bin" = dontDistribute super."hails-bin";
+  "hairy" = dontDistribute super."hairy";
+  "hakaru" = dontDistribute super."hakaru";
+  "hake" = dontDistribute super."hake";
+  "hakismet" = dontDistribute super."hakismet";
+  "hako" = dontDistribute super."hako";
+  "hakyll-R" = dontDistribute super."hakyll-R";
+  "hakyll-agda" = dontDistribute super."hakyll-agda";
+  "hakyll-blaze-templates" = dontDistribute super."hakyll-blaze-templates";
+  "hakyll-contrib" = dontDistribute super."hakyll-contrib";
+  "hakyll-contrib-hyphenation" = dontDistribute super."hakyll-contrib-hyphenation";
+  "hakyll-contrib-links" = dontDistribute super."hakyll-contrib-links";
+  "hakyll-convert" = dontDistribute super."hakyll-convert";
+  "hakyll-elm" = dontDistribute super."hakyll-elm";
+  "hakyll-sass" = dontDistribute super."hakyll-sass";
+  "halberd" = dontDistribute super."halberd";
+  "halfs" = dontDistribute super."halfs";
+  "halipeto" = dontDistribute super."halipeto";
+  "halive" = dontDistribute super."halive";
+  "halma" = dontDistribute super."halma";
+  "haltavista" = dontDistribute super."haltavista";
+  "hamid" = dontDistribute super."hamid";
+  "hampp" = dontDistribute super."hampp";
+  "hamtmap" = dontDistribute super."hamtmap";
+  "hamusic" = dontDistribute super."hamusic";
+  "handa-gdata" = dontDistribute super."handa-gdata";
+  "handa-geodata" = dontDistribute super."handa-geodata";
+  "handa-opengl" = dontDistribute super."handa-opengl";
+  "handle-like" = dontDistribute super."handle-like";
+  "handsy" = dontDistribute super."handsy";
+  "hangman" = dontDistribute super."hangman";
+  "hannahci" = dontDistribute super."hannahci";
+  "hans" = dontDistribute super."hans";
+  "hans-pcap" = dontDistribute super."hans-pcap";
+  "hans-pfq" = dontDistribute super."hans-pfq";
+  "haphviz" = dontDistribute super."haphviz";
+  "happindicator" = dontDistribute super."happindicator";
+  "happindicator3" = dontDistribute super."happindicator3";
+  "happraise" = dontDistribute super."happraise";
+  "happs-hsp" = dontDistribute super."happs-hsp";
+  "happs-hsp-template" = dontDistribute super."happs-hsp-template";
+  "happs-tutorial" = dontDistribute super."happs-tutorial";
+  "happstack" = dontDistribute super."happstack";
+  "happstack-auth" = dontDistribute super."happstack-auth";
+  "happstack-contrib" = dontDistribute super."happstack-contrib";
+  "happstack-data" = dontDistribute super."happstack-data";
+  "happstack-dlg" = dontDistribute super."happstack-dlg";
+  "happstack-facebook" = dontDistribute super."happstack-facebook";
+  "happstack-fastcgi" = dontDistribute super."happstack-fastcgi";
+  "happstack-fay" = dontDistribute super."happstack-fay";
+  "happstack-fay-ajax" = dontDistribute super."happstack-fay-ajax";
+  "happstack-foundation" = dontDistribute super."happstack-foundation";
+  "happstack-hamlet" = dontDistribute super."happstack-hamlet";
+  "happstack-heist" = dontDistribute super."happstack-heist";
+  "happstack-helpers" = dontDistribute super."happstack-helpers";
+  "happstack-hstringtemplate" = dontDistribute super."happstack-hstringtemplate";
+  "happstack-ixset" = dontDistribute super."happstack-ixset";
+  "happstack-lite" = dontDistribute super."happstack-lite";
+  "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
+  "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
+  "happstack-state" = dontDistribute super."happstack-state";
+  "happstack-static-routing" = dontDistribute super."happstack-static-routing";
+  "happstack-util" = dontDistribute super."happstack-util";
+  "happstack-yui" = dontDistribute super."happstack-yui";
+  "happy-meta" = dontDistribute super."happy-meta";
+  "happybara" = dontDistribute super."happybara";
+  "happybara-webkit" = dontDistribute super."happybara-webkit";
+  "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "har" = dontDistribute super."har";
+  "harchive" = dontDistribute super."harchive";
+  "hark" = dontDistribute super."hark";
+  "harmony" = dontDistribute super."harmony";
+  "haroonga" = dontDistribute super."haroonga";
+  "haroonga-httpd" = dontDistribute super."haroonga-httpd";
+  "harpy" = dontDistribute super."harpy";
+  "has" = dontDistribute super."has";
+  "has-th" = dontDistribute super."has-th";
+  "hascal" = dontDistribute super."hascal";
+  "hascat" = dontDistribute super."hascat";
+  "hascat-lib" = dontDistribute super."hascat-lib";
+  "hascat-setup" = dontDistribute super."hascat-setup";
+  "hascat-system" = dontDistribute super."hascat-system";
+  "hash" = dontDistribute super."hash";
+  "hashable-generics" = dontDistribute super."hashable-generics";
+  "hashabler" = dontDistribute super."hashabler";
+  "hashed-storage" = dontDistribute super."hashed-storage";
+  "hashids" = dontDistribute super."hashids";
+  "hashring" = dontDistribute super."hashring";
+  "hashtables-plus" = dontDistribute super."hashtables-plus";
+  "hasim" = dontDistribute super."hasim";
+  "hask" = dontDistribute super."hask";
+  "hask-home" = dontDistribute super."hask-home";
+  "haskades" = dontDistribute super."haskades";
+  "haskakafka" = dontDistribute super."haskakafka";
+  "haskanoid" = dontDistribute super."haskanoid";
+  "haskarrow" = dontDistribute super."haskarrow";
+  "haskbot-core" = dontDistribute super."haskbot-core";
+  "haskdeep" = dontDistribute super."haskdeep";
+  "haskdogs" = dontDistribute super."haskdogs";
+  "haskeem" = dontDistribute super."haskeem";
+  "haskeline" = doDistribute super."haskeline_0_7_2_2";
+  "haskeline-class" = dontDistribute super."haskeline-class";
+  "haskell-aliyun" = dontDistribute super."haskell-aliyun";
+  "haskell-awk" = dontDistribute super."haskell-awk";
+  "haskell-bcrypt" = dontDistribute super."haskell-bcrypt";
+  "haskell-brainfuck" = dontDistribute super."haskell-brainfuck";
+  "haskell-cnc" = dontDistribute super."haskell-cnc";
+  "haskell-coffee" = dontDistribute super."haskell-coffee";
+  "haskell-compression" = dontDistribute super."haskell-compression";
+  "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
+  "haskell-docs" = dontDistribute super."haskell-docs";
+  "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-formatter" = dontDistribute super."haskell-formatter";
+  "haskell-ftp" = dontDistribute super."haskell-ftp";
+  "haskell-generate" = dontDistribute super."haskell-generate";
+  "haskell-gi" = dontDistribute super."haskell-gi";
+  "haskell-gi-base" = dontDistribute super."haskell-gi-base";
+  "haskell-import-graph" = dontDistribute super."haskell-import-graph";
+  "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpi" = dontDistribute super."haskell-mpi";
+  "haskell-names" = dontDistribute super."haskell-names";
+  "haskell-openflow" = dontDistribute super."haskell-openflow";
+  "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
+  "haskell-platform-test" = dontDistribute super."haskell-platform-test";
+  "haskell-plot" = dontDistribute super."haskell-plot";
+  "haskell-qrencode" = dontDistribute super."haskell-qrencode";
+  "haskell-read-editor" = dontDistribute super."haskell-read-editor";
+  "haskell-reflect" = dontDistribute super."haskell-reflect";
+  "haskell-rules" = dontDistribute super."haskell-rules";
+  "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq";
+  "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton";
+  "haskell-token-utils" = dontDistribute super."haskell-token-utils";
+  "haskell-tor" = dontDistribute super."haskell-tor";
+  "haskell-type-exts" = dontDistribute super."haskell-type-exts";
+  "haskell-typescript" = dontDistribute super."haskell-typescript";
+  "haskell-tyrant" = dontDistribute super."haskell-tyrant";
+  "haskell-updater" = dontDistribute super."haskell-updater";
+  "haskell-xmpp" = dontDistribute super."haskell-xmpp";
+  "haskell2010" = dontDistribute super."haskell2010";
+  "haskell98" = dontDistribute super."haskell98";
+  "haskell98libraries" = dontDistribute super."haskell98libraries";
+  "haskelldb" = dontDistribute super."haskelldb";
+  "haskelldb-connect-hdbc" = dontDistribute super."haskelldb-connect-hdbc";
+  "haskelldb-connect-hdbc-catchio-mtl" = dontDistribute super."haskelldb-connect-hdbc-catchio-mtl";
+  "haskelldb-connect-hdbc-catchio-tf" = dontDistribute super."haskelldb-connect-hdbc-catchio-tf";
+  "haskelldb-connect-hdbc-catchio-transformers" = dontDistribute super."haskelldb-connect-hdbc-catchio-transformers";
+  "haskelldb-connect-hdbc-lifted" = dontDistribute super."haskelldb-connect-hdbc-lifted";
+  "haskelldb-dynamic" = dontDistribute super."haskelldb-dynamic";
+  "haskelldb-flat" = dontDistribute super."haskelldb-flat";
+  "haskelldb-hdbc" = dontDistribute super."haskelldb-hdbc";
+  "haskelldb-hdbc-mysql" = dontDistribute super."haskelldb-hdbc-mysql";
+  "haskelldb-hdbc-odbc" = dontDistribute super."haskelldb-hdbc-odbc";
+  "haskelldb-hdbc-postgresql" = dontDistribute super."haskelldb-hdbc-postgresql";
+  "haskelldb-hdbc-sqlite3" = dontDistribute super."haskelldb-hdbc-sqlite3";
+  "haskelldb-hsql" = dontDistribute super."haskelldb-hsql";
+  "haskelldb-hsql-mysql" = dontDistribute super."haskelldb-hsql-mysql";
+  "haskelldb-hsql-odbc" = dontDistribute super."haskelldb-hsql-odbc";
+  "haskelldb-hsql-oracle" = dontDistribute super."haskelldb-hsql-oracle";
+  "haskelldb-hsql-postgresql" = dontDistribute super."haskelldb-hsql-postgresql";
+  "haskelldb-hsql-sqlite" = dontDistribute super."haskelldb-hsql-sqlite";
+  "haskelldb-hsql-sqlite3" = dontDistribute super."haskelldb-hsql-sqlite3";
+  "haskelldb-th" = dontDistribute super."haskelldb-th";
+  "haskelldb-wx" = dontDistribute super."haskelldb-wx";
+  "haskellscrabble" = dontDistribute super."haskellscrabble";
+  "haskellscript" = dontDistribute super."haskellscript";
+  "haskelm" = dontDistribute super."haskelm";
+  "haskgame" = dontDistribute super."haskgame";
+  "haskheap" = dontDistribute super."haskheap";
+  "haskhol-core" = dontDistribute super."haskhol-core";
+  "haskmon" = dontDistribute super."haskmon";
+  "haskoin" = dontDistribute super."haskoin";
+  "haskoin-core" = dontDistribute super."haskoin-core";
+  "haskoin-crypto" = dontDistribute super."haskoin-crypto";
+  "haskoin-node" = dontDistribute super."haskoin-node";
+  "haskoin-protocol" = dontDistribute super."haskoin-protocol";
+  "haskoin-script" = dontDistribute super."haskoin-script";
+  "haskoin-util" = dontDistribute super."haskoin-util";
+  "haskoin-wallet" = dontDistribute super."haskoin-wallet";
+  "haskoon" = dontDistribute super."haskoon";
+  "haskoon-httpspec" = dontDistribute super."haskoon-httpspec";
+  "haskoon-salvia" = dontDistribute super."haskoon-salvia";
+  "haskore" = dontDistribute super."haskore";
+  "haskore-realtime" = dontDistribute super."haskore-realtime";
+  "haskore-supercollider" = dontDistribute super."haskore-supercollider";
+  "haskore-synthesizer" = dontDistribute super."haskore-synthesizer";
+  "haskore-vintage" = dontDistribute super."haskore-vintage";
+  "hasktags" = dontDistribute super."hasktags";
+  "haslo" = dontDistribute super."haslo";
+  "hasloGUI" = dontDistribute super."hasloGUI";
+  "hasparql-client" = dontDistribute super."hasparql-client";
+  "haspell" = dontDistribute super."haspell";
+  "hasql-pool" = dontDistribute super."hasql-pool";
+  "hasql-postgres" = dontDistribute super."hasql-postgres";
+  "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
+  "hasql-th" = dontDistribute super."hasql-th";
+  "hasql-transaction" = dontDistribute super."hasql-transaction";
+  "hastache-aeson" = dontDistribute super."hastache-aeson";
+  "haste" = dontDistribute super."haste";
+  "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-markup" = dontDistribute super."haste-markup";
+  "haste-perch" = dontDistribute super."haste-perch";
+  "hastily" = dontDistribute super."hastily";
+  "hat" = dontDistribute super."hat";
+  "hatex-guide" = dontDistribute super."hatex-guide";
+  "hath" = dontDistribute super."hath";
+  "hatt" = dontDistribute super."hatt";
+  "haverer" = dontDistribute super."haverer";
+  "hawitter" = dontDistribute super."hawitter";
+  "haxl-amazonka" = dontDistribute super."haxl-amazonka";
+  "haxl-facebook" = dontDistribute super."haxl-facebook";
+  "haxparse" = dontDistribute super."haxparse";
+  "haxr-th" = dontDistribute super."haxr-th";
+  "haxy" = dontDistribute super."haxy";
+  "hayland" = dontDistribute super."hayland";
+  "hayoo-cli" = dontDistribute super."hayoo-cli";
+  "hback" = dontDistribute super."hback";
+  "hbayes" = dontDistribute super."hbayes";
+  "hbb" = dontDistribute super."hbb";
+  "hbcd" = dontDistribute super."hbcd";
+  "hbeat" = dontDistribute super."hbeat";
+  "hblas" = dontDistribute super."hblas";
+  "hblock" = dontDistribute super."hblock";
+  "hbro" = dontDistribute super."hbro";
+  "hbro-contrib" = dontDistribute super."hbro-contrib";
+  "hburg" = dontDistribute super."hburg";
+  "hcc" = dontDistribute super."hcc";
+  "hcg-minus" = dontDistribute super."hcg-minus";
+  "hcg-minus-cairo" = dontDistribute super."hcg-minus-cairo";
+  "hcheat" = dontDistribute super."hcheat";
+  "hchesslib" = dontDistribute super."hchesslib";
+  "hcltest" = dontDistribute super."hcltest";
+  "hcron" = dontDistribute super."hcron";
+  "hcube" = dontDistribute super."hcube";
+  "hcwiid" = dontDistribute super."hcwiid";
+  "hdaemonize-buildfix" = dontDistribute super."hdaemonize-buildfix";
+  "hdbc-aeson" = dontDistribute super."hdbc-aeson";
+  "hdbc-postgresql-hstore" = dontDistribute super."hdbc-postgresql-hstore";
+  "hdbc-tuple" = dontDistribute super."hdbc-tuple";
+  "hdbi" = dontDistribute super."hdbi";
+  "hdbi-conduit" = dontDistribute super."hdbi-conduit";
+  "hdbi-postgresql" = dontDistribute super."hdbi-postgresql";
+  "hdbi-sqlite" = dontDistribute super."hdbi-sqlite";
+  "hdbi-tests" = dontDistribute super."hdbi-tests";
+  "hdf" = dontDistribute super."hdf";
+  "hdigest" = dontDistribute super."hdigest";
+  "hdirect" = dontDistribute super."hdirect";
+  "hdis86" = dontDistribute super."hdis86";
+  "hdiscount" = dontDistribute super."hdiscount";
+  "hdm" = dontDistribute super."hdm";
+  "hdph" = dontDistribute super."hdph";
+  "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
+  "headergen" = dontDistribute super."headergen";
+  "heapsort" = dontDistribute super."heapsort";
+  "hecc" = dontDistribute super."hecc";
+  "hedis-config" = dontDistribute super."hedis-config";
+  "hedis-monadic" = dontDistribute super."hedis-monadic";
+  "hedis-pile" = dontDistribute super."hedis-pile";
+  "hedis-simple" = dontDistribute super."hedis-simple";
+  "hedis-tags" = dontDistribute super."hedis-tags";
+  "hedn" = dontDistribute super."hedn";
+  "hein" = dontDistribute super."hein";
+  "heist-aeson" = dontDistribute super."heist-aeson";
+  "heist-async" = dontDistribute super."heist-async";
+  "helics" = dontDistribute super."helics";
+  "helics-wai" = dontDistribute super."helics-wai";
+  "helisp" = dontDistribute super."helisp";
+  "helium" = dontDistribute super."helium";
+  "hell" = dontDistribute super."hell";
+  "hellage" = dontDistribute super."hellage";
+  "hellnet" = dontDistribute super."hellnet";
+  "hello" = dontDistribute super."hello";
+  "helm" = dontDistribute super."helm";
+  "help-esb" = dontDistribute super."help-esb";
+  "hemkay" = dontDistribute super."hemkay";
+  "hemkay-core" = dontDistribute super."hemkay-core";
+  "hemokit" = dontDistribute super."hemokit";
+  "hen" = dontDistribute super."hen";
+  "henet" = dontDistribute super."henet";
+  "hepevt" = dontDistribute super."hepevt";
+  "her-lexer" = dontDistribute super."her-lexer";
+  "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
+  "herbalizer" = dontDistribute super."herbalizer";
+  "hermit" = dontDistribute super."hermit";
+  "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
+  "heroku" = dontDistribute super."heroku";
+  "heroku-persistent" = dontDistribute super."heroku-persistent";
+  "herringbone" = dontDistribute super."herringbone";
+  "herringbone-embed" = dontDistribute super."herringbone-embed";
+  "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesql" = dontDistribute super."hesql";
+  "hetero-map" = dontDistribute super."hetero-map";
+  "hetris" = dontDistribute super."hetris";
+  "heukarya" = dontDistribute super."heukarya";
+  "hevolisa" = dontDistribute super."hevolisa";
+  "hevolisa-dph" = dontDistribute super."hevolisa-dph";
+  "hexdump" = dontDistribute super."hexdump";
+  "hexif" = dontDistribute super."hexif";
+  "hexpat-iteratee" = dontDistribute super."hexpat-iteratee";
+  "hexpat-lens" = dontDistribute super."hexpat-lens";
+  "hexpat-pickle" = dontDistribute super."hexpat-pickle";
+  "hexpat-pickle-generic" = dontDistribute super."hexpat-pickle-generic";
+  "hexpat-tagsoup" = dontDistribute super."hexpat-tagsoup";
+  "hexpr" = dontDistribute super."hexpr";
+  "hexquote" = dontDistribute super."hexquote";
+  "heyefi" = dontDistribute super."heyefi";
+  "hfann" = dontDistribute super."hfann";
+  "hfd" = dontDistribute super."hfd";
+  "hfiar" = dontDistribute super."hfiar";
+  "hfmt" = dontDistribute super."hfmt";
+  "hfoil" = dontDistribute super."hfoil";
+  "hfov" = dontDistribute super."hfov";
+  "hfractal" = dontDistribute super."hfractal";
+  "hfusion" = dontDistribute super."hfusion";
+  "hg-buildpackage" = dontDistribute super."hg-buildpackage";
+  "hgal" = dontDistribute super."hgal";
+  "hgalib" = dontDistribute super."hgalib";
+  "hgdbmi" = dontDistribute super."hgdbmi";
+  "hgearman" = dontDistribute super."hgearman";
+  "hgen" = dontDistribute super."hgen";
+  "hgeometric" = dontDistribute super."hgeometric";
+  "hgeometry" = dontDistribute super."hgeometry";
+  "hgithub" = dontDistribute super."hgithub";
+  "hgl-example" = dontDistribute super."hgl-example";
+  "hgom" = dontDistribute super."hgom";
+  "hgopher" = dontDistribute super."hgopher";
+  "hgrev" = dontDistribute super."hgrev";
+  "hgrib" = dontDistribute super."hgrib";
+  "hharp" = dontDistribute super."hharp";
+  "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
+  "hiccup" = dontDistribute super."hiccup";
+  "hichi" = dontDistribute super."hichi";
+  "hieraclus" = dontDistribute super."hieraclus";
+  "hierarchical-clustering-diagrams" = dontDistribute super."hierarchical-clustering-diagrams";
+  "hierarchical-exceptions" = dontDistribute super."hierarchical-exceptions";
+  "hierarchy" = dontDistribute super."hierarchy";
+  "hiernotify" = dontDistribute super."hiernotify";
+  "highWaterMark" = dontDistribute super."highWaterMark";
+  "higher-leveldb" = dontDistribute super."higher-leveldb";
+  "higherorder" = dontDistribute super."higherorder";
+  "highlight-versions" = dontDistribute super."highlight-versions";
+  "highlighter" = dontDistribute super."highlighter";
+  "highlighter2" = dontDistribute super."highlighter2";
+  "hills" = dontDistribute super."hills";
+  "himerge" = dontDistribute super."himerge";
+  "himg" = dontDistribute super."himg";
+  "himpy" = dontDistribute super."himpy";
+  "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
+  "hinduce-classifier" = dontDistribute super."hinduce-classifier";
+  "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
+  "hinduce-examples" = dontDistribute super."hinduce-examples";
+  "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinquire" = dontDistribute super."hinquire";
+  "hinstaller" = dontDistribute super."hinstaller";
+  "hint-server" = dontDistribute super."hint-server";
+  "hinvaders" = dontDistribute super."hinvaders";
+  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hipbot" = dontDistribute super."hipbot";
+  "hipe" = dontDistribute super."hipe";
+  "hips" = dontDistribute super."hips";
+  "hircules" = dontDistribute super."hircules";
+  "hirt" = dontDistribute super."hirt";
+  "hissmetrics" = dontDistribute super."hissmetrics";
+  "hist-pl" = dontDistribute super."hist-pl";
+  "hist-pl-dawg" = dontDistribute super."hist-pl-dawg";
+  "hist-pl-fusion" = dontDistribute super."hist-pl-fusion";
+  "hist-pl-lexicon" = dontDistribute super."hist-pl-lexicon";
+  "hist-pl-lmf" = dontDistribute super."hist-pl-lmf";
+  "hist-pl-transliter" = dontDistribute super."hist-pl-transliter";
+  "hist-pl-types" = dontDistribute super."hist-pl-types";
+  "histogram-fill-binary" = dontDistribute super."histogram-fill-binary";
+  "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal";
+  "historian" = dontDistribute super."historian";
+  "hjcase" = dontDistribute super."hjcase";
+  "hjpath" = dontDistribute super."hjpath";
+  "hjs" = dontDistribute super."hjs";
+  "hjson" = dontDistribute super."hjson";
+  "hjson-query" = dontDistribute super."hjson-query";
+  "hjsonpointer" = dontDistribute super."hjsonpointer";
+  "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
+  "hlatex" = dontDistribute super."hlatex";
+  "hlbfgsb" = dontDistribute super."hlbfgsb";
+  "hlcm" = dontDistribute super."hlcm";
+  "hledger-chart" = dontDistribute super."hledger-chart";
+  "hledger-diff" = dontDistribute super."hledger-diff";
+  "hledger-irr" = dontDistribute super."hledger-irr";
+  "hledger-ui" = dontDistribute super."hledger-ui";
+  "hledger-vty" = dontDistribute super."hledger-vty";
+  "hlibBladeRF" = dontDistribute super."hlibBladeRF";
+  "hlibev" = dontDistribute super."hlibev";
+  "hlibfam" = dontDistribute super."hlibfam";
+  "hlogger" = dontDistribute super."hlogger";
+  "hlongurl" = dontDistribute super."hlongurl";
+  "hls" = dontDistribute super."hls";
+  "hlwm" = dontDistribute super."hlwm";
+  "hly" = dontDistribute super."hly";
+  "hmark" = dontDistribute super."hmark";
+  "hmarkup" = dontDistribute super."hmarkup";
+  "hmatrix-banded" = dontDistribute super."hmatrix-banded";
+  "hmatrix-csv" = dontDistribute super."hmatrix-csv";
+  "hmatrix-glpk" = dontDistribute super."hmatrix-glpk";
+  "hmatrix-mmap" = dontDistribute super."hmatrix-mmap";
+  "hmatrix-nipals" = dontDistribute super."hmatrix-nipals";
+  "hmatrix-quadprogpp" = dontDistribute super."hmatrix-quadprogpp";
+  "hmatrix-repa" = dontDistribute super."hmatrix-repa";
+  "hmatrix-special" = dontDistribute super."hmatrix-special";
+  "hmatrix-static" = dontDistribute super."hmatrix-static";
+  "hmatrix-svdlibc" = dontDistribute super."hmatrix-svdlibc";
+  "hmatrix-syntax" = dontDistribute super."hmatrix-syntax";
+  "hmatrix-tests" = dontDistribute super."hmatrix-tests";
+  "hmeap" = dontDistribute super."hmeap";
+  "hmeap-utils" = dontDistribute super."hmeap-utils";
+  "hmemdb" = dontDistribute super."hmemdb";
+  "hmenu" = dontDistribute super."hmenu";
+  "hmidi" = dontDistribute super."hmidi";
+  "hmk" = dontDistribute super."hmk";
+  "hmm" = dontDistribute super."hmm";
+  "hmm-hmatrix" = dontDistribute super."hmm-hmatrix";
+  "hmp3" = dontDistribute super."hmp3";
+  "hmpfr" = dontDistribute super."hmpfr";
+  "hmt" = dontDistribute super."hmt";
+  "hmt-diagrams" = dontDistribute super."hmt-diagrams";
+  "hmumps" = dontDistribute super."hmumps";
+  "hnetcdf" = dontDistribute super."hnetcdf";
+  "hnix" = dontDistribute super."hnix";
+  "hnn" = dontDistribute super."hnn";
+  "hnop" = dontDistribute super."hnop";
+  "ho-rewriting" = dontDistribute super."ho-rewriting";
+  "hoauth" = dontDistribute super."hoauth";
+  "hob" = dontDistribute super."hob";
+  "hobbes" = dontDistribute super."hobbes";
+  "hobbits" = dontDistribute super."hobbits";
+  "hoe" = dontDistribute super."hoe";
+  "hofix-mtl" = dontDistribute super."hofix-mtl";
+  "hog" = dontDistribute super."hog";
+  "hogg" = dontDistribute super."hogg";
+  "hogre" = dontDistribute super."hogre";
+  "hogre-examples" = dontDistribute super."hogre-examples";
+  "hois" = dontDistribute super."hois";
+  "hoist-error" = dontDistribute super."hoist-error";
+  "hold-em" = dontDistribute super."hold-em";
+  "hole" = dontDistribute super."hole";
+  "holey-format" = dontDistribute super."holey-format";
+  "homeomorphic" = dontDistribute super."homeomorphic";
+  "hommage" = dontDistribute super."hommage";
+  "hommage-ds" = dontDistribute super."hommage-ds";
+  "homplexity" = dontDistribute super."homplexity";
+  "honi" = dontDistribute super."honi";
+  "honk" = dontDistribute super."honk";
+  "hoobuddy" = dontDistribute super."hoobuddy";
+  "hood" = dontDistribute super."hood";
+  "hood-off" = dontDistribute super."hood-off";
+  "hood2" = dontDistribute super."hood2";
+  "hoodie" = dontDistribute super."hoodie";
+  "hoodle" = dontDistribute super."hoodle";
+  "hoodle-builder" = dontDistribute super."hoodle-builder";
+  "hoodle-core" = dontDistribute super."hoodle-core";
+  "hoodle-extra" = dontDistribute super."hoodle-extra";
+  "hoodle-parser" = dontDistribute super."hoodle-parser";
+  "hoodle-publish" = dontDistribute super."hoodle-publish";
+  "hoodle-render" = dontDistribute super."hoodle-render";
+  "hoodle-types" = dontDistribute super."hoodle-types";
+  "hoogle-index" = dontDistribute super."hoogle-index";
+  "hooks-dir" = dontDistribute super."hooks-dir";
+  "hoovie" = dontDistribute super."hoovie";
+  "hopencc" = dontDistribute super."hopencc";
+  "hopencl" = dontDistribute super."hopencl";
+  "hopfield" = dontDistribute super."hopfield";
+  "hopfield-networks" = dontDistribute super."hopfield-networks";
+  "hopfli" = dontDistribute super."hopfli";
+  "hops" = dontDistribute super."hops";
+  "hoq" = dontDistribute super."hoq";
+  "horizon" = dontDistribute super."horizon";
+  "hosc" = dontDistribute super."hosc";
+  "hosc-json" = dontDistribute super."hosc-json";
+  "hosc-utils" = dontDistribute super."hosc-utils";
+  "hosts-server" = dontDistribute super."hosts-server";
+  "hothasktags" = dontDistribute super."hothasktags";
+  "hotswap" = dontDistribute super."hotswap";
+  "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
+  "hp2any-core" = dontDistribute super."hp2any-core";
+  "hp2any-graph" = dontDistribute super."hp2any-graph";
+  "hp2any-manager" = dontDistribute super."hp2any-manager";
+  "hp2html" = dontDistribute super."hp2html";
+  "hp2pretty" = dontDistribute super."hp2pretty";
+  "hpack" = dontDistribute super."hpack";
+  "hpaco" = dontDistribute super."hpaco";
+  "hpaco-lib" = dontDistribute super."hpaco-lib";
+  "hpage" = dontDistribute super."hpage";
+  "hpapi" = dontDistribute super."hpapi";
+  "hpaste" = dontDistribute super."hpaste";
+  "hpasteit" = dontDistribute super."hpasteit";
+  "hpc-strobe" = dontDistribute super."hpc-strobe";
+  "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hplayground" = dontDistribute super."hplayground";
+  "hplaylist" = dontDistribute super."hplaylist";
+  "hpodder" = dontDistribute super."hpodder";
+  "hpp" = dontDistribute super."hpp";
+  "hpqtypes" = dontDistribute super."hpqtypes";
+  "hprotoc-fork" = dontDistribute super."hprotoc-fork";
+  "hps" = dontDistribute super."hps";
+  "hps-cairo" = dontDistribute super."hps-cairo";
+  "hps-kmeans" = dontDistribute super."hps-kmeans";
+  "hpuz" = dontDistribute super."hpuz";
+  "hpygments" = dontDistribute super."hpygments";
+  "hpylos" = dontDistribute super."hpylos";
+  "hpyrg" = dontDistribute super."hpyrg";
+  "hquantlib" = dontDistribute super."hquantlib";
+  "hquery" = dontDistribute super."hquery";
+  "hranker" = dontDistribute super."hranker";
+  "hreader" = dontDistribute super."hreader";
+  "hricket" = dontDistribute super."hricket";
+  "hruby" = dontDistribute super."hruby";
+  "hs-GeoIP" = dontDistribute super."hs-GeoIP";
+  "hs-blake2" = dontDistribute super."hs-blake2";
+  "hs-captcha" = dontDistribute super."hs-captcha";
+  "hs-carbon" = dontDistribute super."hs-carbon";
+  "hs-carbon-examples" = dontDistribute super."hs-carbon-examples";
+  "hs-cdb" = dontDistribute super."hs-cdb";
+  "hs-dotnet" = dontDistribute super."hs-dotnet";
+  "hs-duktape" = dontDistribute super."hs-duktape";
+  "hs-excelx" = dontDistribute super."hs-excelx";
+  "hs-ffmpeg" = dontDistribute super."hs-ffmpeg";
+  "hs-fltk" = dontDistribute super."hs-fltk";
+  "hs-gchart" = dontDistribute super."hs-gchart";
+  "hs-gen-iface" = dontDistribute super."hs-gen-iface";
+  "hs-gizapp" = dontDistribute super."hs-gizapp";
+  "hs-inspector" = dontDistribute super."hs-inspector";
+  "hs-java" = dontDistribute super."hs-java";
+  "hs-json-rpc" = dontDistribute super."hs-json-rpc";
+  "hs-logo" = dontDistribute super."hs-logo";
+  "hs-mesos" = dontDistribute super."hs-mesos";
+  "hs-nombre-generator" = dontDistribute super."hs-nombre-generator";
+  "hs-pgms" = dontDistribute super."hs-pgms";
+  "hs-php-session" = dontDistribute super."hs-php-session";
+  "hs-pkg-config" = dontDistribute super."hs-pkg-config";
+  "hs-pkpass" = dontDistribute super."hs-pkpass";
+  "hs-re" = dontDistribute super."hs-re";
+  "hs-scrape" = dontDistribute super."hs-scrape";
+  "hs-twitter" = dontDistribute super."hs-twitter";
+  "hs-twitterarchiver" = dontDistribute super."hs-twitterarchiver";
+  "hs-vcard" = dontDistribute super."hs-vcard";
+  "hs2048" = dontDistribute super."hs2048";
+  "hs2bf" = dontDistribute super."hs2bf";
+  "hs2dot" = dontDistribute super."hs2dot";
+  "hsConfigure" = dontDistribute super."hsConfigure";
+  "hsSqlite3" = dontDistribute super."hsSqlite3";
+  "hsXenCtrl" = dontDistribute super."hsXenCtrl";
+  "hsay" = dontDistribute super."hsay";
+  "hsb2hs" = dontDistribute super."hsb2hs";
+  "hsbackup" = dontDistribute super."hsbackup";
+  "hsbencher" = dontDistribute super."hsbencher";
+  "hsbencher-codespeed" = dontDistribute super."hsbencher-codespeed";
+  "hsbencher-fusion" = dontDistribute super."hsbencher-fusion";
+  "hsc2hs" = dontDistribute super."hsc2hs";
+  "hsc3" = dontDistribute super."hsc3";
+  "hsc3-auditor" = dontDistribute super."hsc3-auditor";
+  "hsc3-cairo" = dontDistribute super."hsc3-cairo";
+  "hsc3-data" = dontDistribute super."hsc3-data";
+  "hsc3-db" = dontDistribute super."hsc3-db";
+  "hsc3-dot" = dontDistribute super."hsc3-dot";
+  "hsc3-forth" = dontDistribute super."hsc3-forth";
+  "hsc3-graphs" = dontDistribute super."hsc3-graphs";
+  "hsc3-lang" = dontDistribute super."hsc3-lang";
+  "hsc3-lisp" = dontDistribute super."hsc3-lisp";
+  "hsc3-plot" = dontDistribute super."hsc3-plot";
+  "hsc3-process" = dontDistribute super."hsc3-process";
+  "hsc3-rec" = dontDistribute super."hsc3-rec";
+  "hsc3-rw" = dontDistribute super."hsc3-rw";
+  "hsc3-server" = dontDistribute super."hsc3-server";
+  "hsc3-sf" = dontDistribute super."hsc3-sf";
+  "hsc3-sf-hsndfile" = dontDistribute super."hsc3-sf-hsndfile";
+  "hsc3-unsafe" = dontDistribute super."hsc3-unsafe";
+  "hsc3-utils" = dontDistribute super."hsc3-utils";
+  "hscamwire" = dontDistribute super."hscamwire";
+  "hscassandra" = dontDistribute super."hscassandra";
+  "hscd" = dontDistribute super."hscd";
+  "hsclock" = dontDistribute super."hsclock";
+  "hscope" = dontDistribute super."hscope";
+  "hscrtmpl" = dontDistribute super."hscrtmpl";
+  "hscuid" = dontDistribute super."hscuid";
+  "hscurses" = dontDistribute super."hscurses";
+  "hscurses-fish-ex" = dontDistribute super."hscurses-fish-ex";
+  "hsdev" = dontDistribute super."hsdev";
+  "hsdif" = dontDistribute super."hsdif";
+  "hsdip" = dontDistribute super."hsdip";
+  "hsdns" = dontDistribute super."hsdns";
+  "hsdns-cache" = dontDistribute super."hsdns-cache";
+  "hsemail-ns" = dontDistribute super."hsemail-ns";
+  "hsenv" = dontDistribute super."hsenv";
+  "hserv" = dontDistribute super."hserv";
+  "hset" = dontDistribute super."hset";
+  "hsfacter" = dontDistribute super."hsfacter";
+  "hsfcsh" = dontDistribute super."hsfcsh";
+  "hsfilt" = dontDistribute super."hsfilt";
+  "hsgnutls" = dontDistribute super."hsgnutls";
+  "hsgnutls-yj" = dontDistribute super."hsgnutls-yj";
+  "hsgsom" = dontDistribute super."hsgsom";
+  "hsgtd" = dontDistribute super."hsgtd";
+  "hsharc" = dontDistribute super."hsharc";
+  "hsilop" = dontDistribute super."hsilop";
+  "hsimport" = dontDistribute super."hsimport";
+  "hsini" = dontDistribute super."hsini";
+  "hskeleton" = dontDistribute super."hskeleton";
+  "hslackbuilder" = dontDistribute super."hslackbuilder";
+  "hslibsvm" = dontDistribute super."hslibsvm";
+  "hslinks" = dontDistribute super."hslinks";
+  "hslogger-reader" = dontDistribute super."hslogger-reader";
+  "hslogger-template" = dontDistribute super."hslogger-template";
+  "hslogger4j" = dontDistribute super."hslogger4j";
+  "hslogstash" = dontDistribute super."hslogstash";
+  "hsmagick" = dontDistribute super."hsmagick";
+  "hsmisc" = dontDistribute super."hsmisc";
+  "hsmtpclient" = dontDistribute super."hsmtpclient";
+  "hsndfile-storablevector" = dontDistribute super."hsndfile-storablevector";
+  "hsnock" = dontDistribute super."hsnock";
+  "hsnoise" = dontDistribute super."hsnoise";
+  "hsns" = dontDistribute super."hsns";
+  "hsnsq" = dontDistribute super."hsnsq";
+  "hsntp" = dontDistribute super."hsntp";
+  "hsoptions" = dontDistribute super."hsoptions";
+  "hsp-cgi" = dontDistribute super."hsp-cgi";
+  "hsparklines" = dontDistribute super."hsparklines";
+  "hsparql" = dontDistribute super."hsparql";
+  "hspear" = dontDistribute super."hspear";
+  "hspec-checkers" = dontDistribute super."hspec-checkers";
+  "hspec-expectations-lens" = dontDistribute super."hspec-expectations-lens";
+  "hspec-expectations-lifted" = dontDistribute super."hspec-expectations-lifted";
+  "hspec-expectations-pretty" = dontDistribute super."hspec-expectations-pretty";
+  "hspec-experimental" = dontDistribute super."hspec-experimental";
+  "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-monad-control" = dontDistribute super."hspec-monad-control";
+  "hspec-server" = dontDistribute super."hspec-server";
+  "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
+  "hspec-test-framework" = dontDistribute super."hspec-test-framework";
+  "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th";
+  "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox";
+  "hspec2" = dontDistribute super."hspec2";
+  "hspr-sh" = dontDistribute super."hspr-sh";
+  "hspread" = dontDistribute super."hspread";
+  "hspresent" = dontDistribute super."hspresent";
+  "hsprocess" = dontDistribute super."hsprocess";
+  "hsql" = dontDistribute super."hsql";
+  "hsql-mysql" = dontDistribute super."hsql-mysql";
+  "hsql-odbc" = dontDistribute super."hsql-odbc";
+  "hsql-postgresql" = dontDistribute super."hsql-postgresql";
+  "hsql-sqlite3" = dontDistribute super."hsql-sqlite3";
+  "hsqml" = dontDistribute super."hsqml";
+  "hsqml-datamodel" = dontDistribute super."hsqml-datamodel";
+  "hsqml-datamodel-vinyl" = dontDistribute super."hsqml-datamodel-vinyl";
+  "hsqml-demo-morris" = dontDistribute super."hsqml-demo-morris";
+  "hsqml-demo-notes" = dontDistribute super."hsqml-demo-notes";
+  "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples";
+  "hsqml-morris" = dontDistribute super."hsqml-morris";
+  "hsreadability" = dontDistribute super."hsreadability";
+  "hsseccomp" = dontDistribute super."hsseccomp";
+  "hsshellscript" = dontDistribute super."hsshellscript";
+  "hssourceinfo" = dontDistribute super."hssourceinfo";
+  "hssqlppp" = dontDistribute super."hssqlppp";
+  "hstats" = dontDistribute super."hstats";
+  "hstest" = dontDistribute super."hstest";
+  "hstidy" = dontDistribute super."hstidy";
+  "hstorchat" = dontDistribute super."hstorchat";
+  "hstradeking" = dontDistribute super."hstradeking";
+  "hstyle" = dontDistribute super."hstyle";
+  "hstzaar" = dontDistribute super."hstzaar";
+  "hsubconvert" = dontDistribute super."hsubconvert";
+  "hsverilog" = dontDistribute super."hsverilog";
+  "hswip" = dontDistribute super."hswip";
+  "hsx" = dontDistribute super."hsx";
+  "hsx-xhtml" = dontDistribute super."hsx-xhtml";
+  "hsyscall" = dontDistribute super."hsyscall";
+  "hszephyr" = dontDistribute super."hszephyr";
+  "htags" = dontDistribute super."htags";
+  "htar" = dontDistribute super."htar";
+  "htiled" = dontDistribute super."htiled";
+  "htime" = dontDistribute super."htime";
+  "html-email-validate" = dontDistribute super."html-email-validate";
+  "html-entities" = dontDistribute super."html-entities";
+  "html-kure" = dontDistribute super."html-kure";
+  "html-minimalist" = dontDistribute super."html-minimalist";
+  "html-rules" = dontDistribute super."html-rules";
+  "html-tokenizer" = dontDistribute super."html-tokenizer";
+  "html-truncate" = dontDistribute super."html-truncate";
+  "html2hamlet" = dontDistribute super."html2hamlet";
+  "html5-entity" = dontDistribute super."html5-entity";
+  "htodo" = dontDistribute super."htodo";
+  "htoml" = dontDistribute super."htoml";
+  "htrace" = dontDistribute super."htrace";
+  "hts" = dontDistribute super."hts";
+  "htsn" = dontDistribute super."htsn";
+  "htsn-common" = dontDistribute super."htsn-common";
+  "htsn-import" = dontDistribute super."htsn-import";
+  "http-attoparsec" = dontDistribute super."http-attoparsec";
+  "http-client-auth" = dontDistribute super."http-client-auth";
+  "http-client-conduit" = dontDistribute super."http-client-conduit";
+  "http-client-lens" = dontDistribute super."http-client-lens";
+  "http-client-multipart" = dontDistribute super."http-client-multipart";
+  "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers";
+  "http-client-streams" = dontDistribute super."http-client-streams";
+  "http-conduit-browser" = dontDistribute super."http-conduit-browser";
+  "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-encodings" = dontDistribute super."http-encodings";
+  "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kit" = dontDistribute super."http-kit";
+  "http-listen" = dontDistribute super."http-listen";
+  "http-monad" = dontDistribute super."http-monad";
+  "http-proxy" = dontDistribute super."http-proxy";
+  "http-querystring" = dontDistribute super."http-querystring";
+  "http-server" = dontDistribute super."http-server";
+  "http-shed" = dontDistribute super."http-shed";
+  "http-test" = dontDistribute super."http-test";
+  "http-wget" = dontDistribute super."http-wget";
+  "httpd-shed" = dontDistribute super."httpd-shed";
+  "https-everywhere-rules" = dontDistribute super."https-everywhere-rules";
+  "https-everywhere-rules-raw" = dontDistribute super."https-everywhere-rules-raw";
+  "httpspec" = dontDistribute super."httpspec";
+  "htune" = dontDistribute super."htune";
+  "htzaar" = dontDistribute super."htzaar";
+  "hub" = dontDistribute super."hub";
+  "hubigraph" = dontDistribute super."hubigraph";
+  "hubris" = dontDistribute super."hubris";
+  "huckleberry" = dontDistribute super."huckleberry";
+  "huffman" = dontDistribute super."huffman";
+  "hugs2yc" = dontDistribute super."hugs2yc";
+  "hulk" = dontDistribute super."hulk";
+  "hums" = dontDistribute super."hums";
+  "hunch" = dontDistribute super."hunch";
+  "hunit-gui" = dontDistribute super."hunit-gui";
+  "hunit-parsec" = dontDistribute super."hunit-parsec";
+  "hunit-rematch" = dontDistribute super."hunit-rematch";
+  "hunp" = dontDistribute super."hunp";
+  "hunt-searchengine" = dontDistribute super."hunt-searchengine";
+  "hunt-server" = dontDistribute super."hunt-server";
+  "hunt-server-cli" = dontDistribute super."hunt-server-cli";
+  "hurdle" = dontDistribute super."hurdle";
+  "husk-scheme" = dontDistribute super."husk-scheme";
+  "husk-scheme-libs" = dontDistribute super."husk-scheme-libs";
+  "husky" = dontDistribute super."husky";
+  "hutton" = dontDistribute super."hutton";
+  "huttons-razor" = dontDistribute super."huttons-razor";
+  "huzzy" = dontDistribute super."huzzy";
+  "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
+  "hws" = dontDistribute super."hws";
+  "hwsl2" = dontDistribute super."hwsl2";
+  "hwsl2-bytevector" = dontDistribute super."hwsl2-bytevector";
+  "hwsl2-reducers" = dontDistribute super."hwsl2-reducers";
+  "hx" = dontDistribute super."hx";
+  "hxmppc" = dontDistribute super."hxmppc";
+  "hxournal" = dontDistribute super."hxournal";
+  "hxt-binary" = dontDistribute super."hxt-binary";
+  "hxt-cache" = dontDistribute super."hxt-cache";
+  "hxt-extras" = dontDistribute super."hxt-extras";
+  "hxt-filter" = dontDistribute super."hxt-filter";
+  "hxt-xpath" = dontDistribute super."hxt-xpath";
+  "hxt-xslt" = dontDistribute super."hxt-xslt";
+  "hxthelper" = dontDistribute super."hxthelper";
+  "hxweb" = dontDistribute super."hxweb";
+  "hyahtzee" = dontDistribute super."hyahtzee";
+  "hyakko" = dontDistribute super."hyakko";
+  "hybrid" = dontDistribute super."hybrid";
+  "hydra-hs" = dontDistribute super."hydra-hs";
+  "hydra-print" = dontDistribute super."hydra-print";
+  "hydrogen" = dontDistribute super."hydrogen";
+  "hydrogen-cli" = dontDistribute super."hydrogen-cli";
+  "hydrogen-cli-args" = dontDistribute super."hydrogen-cli-args";
+  "hydrogen-data" = dontDistribute super."hydrogen-data";
+  "hydrogen-multimap" = dontDistribute super."hydrogen-multimap";
+  "hydrogen-parsing" = dontDistribute super."hydrogen-parsing";
+  "hydrogen-prelude" = dontDistribute super."hydrogen-prelude";
+  "hydrogen-prelude-parsec" = dontDistribute super."hydrogen-prelude-parsec";
+  "hydrogen-syntax" = dontDistribute super."hydrogen-syntax";
+  "hydrogen-util" = dontDistribute super."hydrogen-util";
+  "hydrogen-version" = dontDistribute super."hydrogen-version";
+  "hyena" = dontDistribute super."hyena";
+  "hylolib" = dontDistribute super."hylolib";
+  "hylotab" = dontDistribute super."hylotab";
+  "hyloutils" = dontDistribute super."hyloutils";
+  "hyperdrive" = dontDistribute super."hyperdrive";
+  "hyperfunctions" = dontDistribute super."hyperfunctions";
+  "hyperpublic" = dontDistribute super."hyperpublic";
+  "hyphenate" = dontDistribute super."hyphenate";
+  "hypher" = dontDistribute super."hypher";
+  "hzk" = dontDistribute super."hzk";
+  "i18n" = dontDistribute super."i18n";
+  "iCalendar" = dontDistribute super."iCalendar";
+  "iException" = dontDistribute super."iException";
+  "iap-verifier" = dontDistribute super."iap-verifier";
+  "ib-api" = dontDistribute super."ib-api";
+  "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
+  "ideas" = dontDistribute super."ideas";
+  "ideas-math" = dontDistribute super."ideas-math";
+  "idempotent" = dontDistribute super."idempotent";
+  "identifiers" = dontDistribute super."identifiers";
+  "idiii" = dontDistribute super."idiii";
+  "idna" = dontDistribute super."idna";
+  "idna2008" = dontDistribute super."idna2008";
+  "idris" = dontDistribute super."idris";
+  "ieee" = dontDistribute super."ieee";
+  "ieee-utils" = dontDistribute super."ieee-utils";
+  "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754-parser" = dontDistribute super."ieee754-parser";
+  "ifcxt" = dontDistribute super."ifcxt";
+  "iff" = dontDistribute super."iff";
+  "ifscs" = dontDistribute super."ifscs";
+  "ige-mac-integration" = dontDistribute super."ige-mac-integration";
+  "igraph" = dontDistribute super."igraph";
+  "igrf" = dontDistribute super."igrf";
+  "ihaskell-display" = dontDistribute super."ihaskell-display";
+  "ihaskell-inline-r" = dontDistribute super."ihaskell-inline-r";
+  "ihaskell-parsec" = dontDistribute super."ihaskell-parsec";
+  "ihaskell-plot" = dontDistribute super."ihaskell-plot";
+  "ihaskell-widgets" = dontDistribute super."ihaskell-widgets";
+  "ihttp" = dontDistribute super."ihttp";
+  "illuminate" = dontDistribute super."illuminate";
+  "image-type" = dontDistribute super."image-type";
+  "imagefilters" = dontDistribute super."imagefilters";
+  "imagemagick" = dontDistribute super."imagemagick";
+  "imagepaste" = dontDistribute super."imagepaste";
+  "imapget" = dontDistribute super."imapget";
+  "imbib" = dontDistribute super."imbib";
+  "imgurder" = dontDistribute super."imgurder";
+  "imm" = dontDistribute super."imm";
+  "imparse" = dontDistribute super."imparse";
+  "imperative-edsl" = dontDistribute super."imperative-edsl";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
+  "implicit" = dontDistribute super."implicit";
+  "implicit-params" = dontDistribute super."implicit-params";
+  "imports" = dontDistribute super."imports";
+  "improve" = dontDistribute super."improve";
+  "inc-ref" = dontDistribute super."inc-ref";
+  "inch" = dontDistribute super."inch";
+  "incremental-computing" = dontDistribute super."incremental-computing";
+  "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
+  "increments" = dontDistribute super."increments";
+  "indentation" = dontDistribute super."indentation";
+  "indentparser" = dontDistribute super."indentparser";
+  "index-core" = dontDistribute super."index-core";
+  "indexed" = dontDistribute super."indexed";
+  "indexed-do-notation" = dontDistribute super."indexed-do-notation";
+  "indexed-extras" = dontDistribute super."indexed-extras";
+  "indexed-free" = dontDistribute super."indexed-free";
+  "indian-language-font-converter" = dontDistribute super."indian-language-font-converter";
+  "indices" = dontDistribute super."indices";
+  "indieweb-algorithms" = dontDistribute super."indieweb-algorithms";
+  "inf-interval" = dontDistribute super."inf-interval";
+  "infer-upstream" = dontDistribute super."infer-upstream";
+  "infernu" = dontDistribute super."infernu";
+  "infinite-search" = dontDistribute super."infinite-search";
+  "infinity" = dontDistribute super."infinity";
+  "infix" = dontDistribute super."infix";
+  "inflist" = dontDistribute super."inflist";
+  "influxdb" = dontDistribute super."influxdb";
+  "informative" = dontDistribute super."informative";
+  "inilist" = dontDistribute super."inilist";
+  "inject" = dontDistribute super."inject";
+  "inject-function" = dontDistribute super."inject-function";
+  "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inline-r" = dontDistribute super."inline-r";
+  "inquire" = dontDistribute super."inquire";
+  "inserts" = dontDistribute super."inserts";
+  "inspection-proxy" = dontDistribute super."inspection-proxy";
+  "instant-aeson" = dontDistribute super."instant-aeson";
+  "instant-bytes" = dontDistribute super."instant-bytes";
+  "instant-deepseq" = dontDistribute super."instant-deepseq";
+  "instant-generics" = dontDistribute super."instant-generics";
+  "instant-hashable" = dontDistribute super."instant-hashable";
+  "instant-zipper" = dontDistribute super."instant-zipper";
+  "instinct" = dontDistribute super."instinct";
+  "instrument-chord" = dontDistribute super."instrument-chord";
+  "int-cast" = dontDistribute super."int-cast";
+  "integer-pure" = dontDistribute super."integer-pure";
+  "intel-aes" = dontDistribute super."intel-aes";
+  "interchangeable" = dontDistribute super."interchangeable";
+  "interleavableGen" = dontDistribute super."interleavableGen";
+  "interleavableIO" = dontDistribute super."interleavableIO";
+  "interleave" = dontDistribute super."interleave";
+  "interlude" = dontDistribute super."interlude";
+  "intern" = dontDistribute super."intern";
+  "internetmarke" = dontDistribute super."internetmarke";
+  "interpol" = dontDistribute super."interpol";
+  "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
+  "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
+  "interpolation" = dontDistribute super."interpolation";
+  "intricacy" = dontDistribute super."intricacy";
+  "intset" = dontDistribute super."intset";
+  "invertible-syntax" = dontDistribute super."invertible-syntax";
+  "io-capture" = dontDistribute super."io-capture";
+  "io-reactive" = dontDistribute super."io-reactive";
+  "io-streams-http" = dontDistribute super."io-streams-http";
+  "io-throttle" = dontDistribute super."io-throttle";
+  "ioctl" = dontDistribute super."ioctl";
+  "ioref-stable" = dontDistribute super."ioref-stable";
+  "iothread" = dontDistribute super."iothread";
+  "iotransaction" = dontDistribute super."iotransaction";
+  "ip-quoter" = dontDistribute super."ip-quoter";
+  "ipatch" = dontDistribute super."ipatch";
+  "ipc" = dontDistribute super."ipc";
+  "ipcvar" = dontDistribute super."ipcvar";
+  "ipopt-hs" = dontDistribute super."ipopt-hs";
+  "ipprint" = dontDistribute super."ipprint";
+  "iptables-helpers" = dontDistribute super."iptables-helpers";
+  "iptadmin" = dontDistribute super."iptadmin";
+  "irc-bytestring" = dontDistribute super."irc-bytestring";
+  "irc-colors" = dontDistribute super."irc-colors";
+  "irc-core" = dontDistribute super."irc-core";
+  "irc-fun-bot" = dontDistribute super."irc-fun-bot";
+  "irc-fun-client" = dontDistribute super."irc-fun-client";
+  "irc-fun-color" = dontDistribute super."irc-fun-color";
+  "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "ircbot" = dontDistribute super."ircbot";
+  "ircbouncer" = dontDistribute super."ircbouncer";
+  "ireal" = dontDistribute super."ireal";
+  "iron-mq" = dontDistribute super."iron-mq";
+  "ironforge" = dontDistribute super."ironforge";
+  "is" = dontDistribute super."is";
+  "isdicom" = dontDistribute super."isdicom";
+  "isevaluated" = dontDistribute super."isevaluated";
+  "isiz" = dontDistribute super."isiz";
+  "ismtp" = dontDistribute super."ismtp";
+  "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
+  "isohunt" = dontDistribute super."isohunt";
+  "itanium-abi" = dontDistribute super."itanium-abi";
+  "iter-stats" = dontDistribute super."iter-stats";
+  "iterIO" = dontDistribute super."iterIO";
+  "iteratee" = dontDistribute super."iteratee";
+  "iteratee-compress" = dontDistribute super."iteratee-compress";
+  "iteratee-mtl" = dontDistribute super."iteratee-mtl";
+  "iteratee-parsec" = dontDistribute super."iteratee-parsec";
+  "iteratee-stm" = dontDistribute super."iteratee-stm";
+  "iterio-server" = dontDistribute super."iterio-server";
+  "ivar-simple" = dontDistribute super."ivar-simple";
+  "ivor" = dontDistribute super."ivor";
+  "ivory" = dontDistribute super."ivory";
+  "ivory-backend-c" = dontDistribute super."ivory-backend-c";
+  "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-examples" = dontDistribute super."ivory-examples";
+  "ivory-hw" = dontDistribute super."ivory-hw";
+  "ivory-opts" = dontDistribute super."ivory-opts";
+  "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-stdlib" = dontDistribute super."ivory-stdlib";
+  "ivy-web" = dontDistribute super."ivy-web";
+  "ixdopp" = dontDistribute super."ixdopp";
+  "ixmonad" = dontDistribute super."ixmonad";
+  "iyql" = dontDistribute super."iyql";
+  "j2hs" = dontDistribute super."j2hs";
+  "ja-base-extra" = dontDistribute super."ja-base-extra";
+  "jack" = dontDistribute super."jack";
+  "jack-bindings" = dontDistribute super."jack-bindings";
+  "jackminimix" = dontDistribute super."jackminimix";
+  "jacobi-roots" = dontDistribute super."jacobi-roots";
+  "jail" = dontDistribute super."jail";
+  "jailbreak-cabal" = dontDistribute super."jailbreak-cabal";
+  "jalaali" = dontDistribute super."jalaali";
+  "jalla" = dontDistribute super."jalla";
+  "jammittools" = dontDistribute super."jammittools";
+  "jarfind" = dontDistribute super."jarfind";
+  "java-bridge" = dontDistribute super."java-bridge";
+  "java-bridge-extras" = dontDistribute super."java-bridge-extras";
+  "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
+  "java-reflect" = dontDistribute super."java-reflect";
+  "javasf" = dontDistribute super."javasf";
+  "javav" = dontDistribute super."javav";
+  "jcdecaux-vls" = dontDistribute super."jcdecaux-vls";
+  "jdi" = dontDistribute super."jdi";
+  "jespresso" = dontDistribute super."jespresso";
+  "jobqueue" = dontDistribute super."jobqueue";
+  "join" = dontDistribute super."join";
+  "joinlist" = dontDistribute super."joinlist";
+  "jonathanscard" = dontDistribute super."jonathanscard";
+  "jort" = dontDistribute super."jort";
+  "jose" = dontDistribute super."jose";
+  "jpeg" = dontDistribute super."jpeg";
+  "js-good-parts" = dontDistribute super."js-good-parts";
+  "jsaddle" = dontDistribute super."jsaddle";
+  "jsaddle-hello" = dontDistribute super."jsaddle-hello";
+  "jsc" = dontDistribute super."jsc";
+  "jsmw" = dontDistribute super."jsmw";
+  "json-assertions" = dontDistribute super."json-assertions";
+  "json-b" = dontDistribute super."json-b";
+  "json-encoder" = dontDistribute super."json-encoder";
+  "json-enumerator" = dontDistribute super."json-enumerator";
+  "json-extra" = dontDistribute super."json-extra";
+  "json-fu" = dontDistribute super."json-fu";
+  "json-litobj" = dontDistribute super."json-litobj";
+  "json-python" = dontDistribute super."json-python";
+  "json-qq" = dontDistribute super."json-qq";
+  "json-rpc" = dontDistribute super."json-rpc";
+  "json-rpc-client" = dontDistribute super."json-rpc-client";
+  "json-rpc-server" = dontDistribute super."json-rpc-server";
+  "json-sop" = dontDistribute super."json-sop";
+  "json-state" = dontDistribute super."json-state";
+  "json-stream" = dontDistribute super."json-stream";
+  "json-togo" = dontDistribute super."json-togo";
+  "json-tools" = dontDistribute super."json-tools";
+  "json-types" = dontDistribute super."json-types";
+  "json2" = dontDistribute super."json2";
+  "json2-hdbc" = dontDistribute super."json2-hdbc";
+  "json2-types" = dontDistribute super."json2-types";
+  "json2yaml" = dontDistribute super."json2yaml";
+  "jsonresume" = dontDistribute super."jsonresume";
+  "jsonrpc-conduit" = dontDistribute super."jsonrpc-conduit";
+  "jsonschema-gen" = dontDistribute super."jsonschema-gen";
+  "jsonsql" = dontDistribute super."jsonsql";
+  "jsontsv" = dontDistribute super."jsontsv";
+  "jspath" = dontDistribute super."jspath";
+  "judy" = dontDistribute super."judy";
+  "jukebox" = dontDistribute super."jukebox";
+  "jumpthefive" = dontDistribute super."jumpthefive";
+  "jvm-parser" = dontDistribute super."jvm-parser";
+  "kademlia" = dontDistribute super."kademlia";
+  "kafka-client" = dontDistribute super."kafka-client";
+  "kangaroo" = dontDistribute super."kangaroo";
+  "kansas-comet" = dontDistribute super."kansas-comet";
+  "kansas-lava" = dontDistribute super."kansas-lava";
+  "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
+  "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio";
+  "kansas-lava-shake" = dontDistribute super."kansas-lava-shake";
+  "karakuri" = dontDistribute super."karakuri";
+  "karver" = dontDistribute super."karver";
+  "katt" = dontDistribute super."katt";
+  "kbq-gu" = dontDistribute super."kbq-gu";
+  "kd-tree" = dontDistribute super."kd-tree";
+  "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
+  "keera-callbacks" = dontDistribute super."keera-callbacks";
+  "keera-hails-i18n" = dontDistribute super."keera-hails-i18n";
+  "keera-hails-mvc-controller" = dontDistribute super."keera-hails-mvc-controller";
+  "keera-hails-mvc-environment-gtk" = dontDistribute super."keera-hails-mvc-environment-gtk";
+  "keera-hails-mvc-model-lightmodel" = dontDistribute super."keera-hails-mvc-model-lightmodel";
+  "keera-hails-mvc-model-protectedmodel" = dontDistribute super."keera-hails-mvc-model-protectedmodel";
+  "keera-hails-mvc-solutions-config" = dontDistribute super."keera-hails-mvc-solutions-config";
+  "keera-hails-mvc-solutions-gtk" = dontDistribute super."keera-hails-mvc-solutions-gtk";
+  "keera-hails-mvc-view" = dontDistribute super."keera-hails-mvc-view";
+  "keera-hails-mvc-view-gtk" = dontDistribute super."keera-hails-mvc-view-gtk";
+  "keera-hails-reactive-fs" = dontDistribute super."keera-hails-reactive-fs";
+  "keera-hails-reactive-gtk" = dontDistribute super."keera-hails-reactive-gtk";
+  "keera-hails-reactive-network" = dontDistribute super."keera-hails-reactive-network";
+  "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling";
+  "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx";
+  "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa";
+  "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses";
+  "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues";
+  "keera-posture" = dontDistribute super."keera-posture";
+  "keiretsu" = dontDistribute super."keiretsu";
+  "kevin" = dontDistribute super."kevin";
+  "keyed" = dontDistribute super."keyed";
+  "keyring" = dontDistribute super."keyring";
+  "keystore" = dontDistribute super."keystore";
+  "keyvaluehash" = dontDistribute super."keyvaluehash";
+  "keyword-args" = dontDistribute super."keyword-args";
+  "kibro" = dontDistribute super."kibro";
+  "kicad-data" = dontDistribute super."kicad-data";
+  "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
+  "kickchan" = dontDistribute super."kickchan";
+  "kif-parser" = dontDistribute super."kif-parser";
+  "kinds" = dontDistribute super."kinds";
+  "kit" = dontDistribute super."kit";
+  "kmeans-par" = dontDistribute super."kmeans-par";
+  "kmeans-vector" = dontDistribute super."kmeans-vector";
+  "knots" = dontDistribute super."knots";
+  "koellner-phonetic" = dontDistribute super."koellner-phonetic";
+  "kontrakcja-templates" = dontDistribute super."kontrakcja-templates";
+  "korfu" = dontDistribute super."korfu";
+  "kqueue" = dontDistribute super."kqueue";
+  "krpc" = dontDistribute super."krpc";
+  "ks-test" = dontDistribute super."ks-test";
+  "ktx" = dontDistribute super."ktx";
+  "kure-your-boilerplate" = dontDistribute super."kure-your-boilerplate";
+  "kyotocabinet" = dontDistribute super."kyotocabinet";
+  "l-bfgs-b" = dontDistribute super."l-bfgs-b";
+  "labeled-graph" = dontDistribute super."labeled-graph";
+  "labeled-tree" = dontDistribute super."labeled-tree";
+  "laborantin-hs" = dontDistribute super."laborantin-hs";
+  "labyrinth" = dontDistribute super."labyrinth";
+  "labyrinth-server" = dontDistribute super."labyrinth-server";
+  "lackey" = dontDistribute super."lackey";
+  "lagrangian" = dontDistribute super."lagrangian";
+  "laika" = dontDistribute super."laika";
+  "lambda-ast" = dontDistribute super."lambda-ast";
+  "lambda-bridge" = dontDistribute super."lambda-bridge";
+  "lambda-canvas" = dontDistribute super."lambda-canvas";
+  "lambda-devs" = dontDistribute super."lambda-devs";
+  "lambda-options" = dontDistribute super."lambda-options";
+  "lambda-placeholders" = dontDistribute super."lambda-placeholders";
+  "lambda-toolbox" = dontDistribute super."lambda-toolbox";
+  "lambda2js" = dontDistribute super."lambda2js";
+  "lambdaBase" = dontDistribute super."lambdaBase";
+  "lambdaFeed" = dontDistribute super."lambdaFeed";
+  "lambdaLit" = dontDistribute super."lambdaLit";
+  "lambdabot" = dontDistribute super."lambdabot";
+  "lambdabot-core" = dontDistribute super."lambdabot-core";
+  "lambdabot-haskell-plugins" = dontDistribute super."lambdabot-haskell-plugins";
+  "lambdabot-irc-plugins" = dontDistribute super."lambdabot-irc-plugins";
+  "lambdabot-misc-plugins" = dontDistribute super."lambdabot-misc-plugins";
+  "lambdabot-novelty-plugins" = dontDistribute super."lambdabot-novelty-plugins";
+  "lambdabot-reference-plugins" = dontDistribute super."lambdabot-reference-plugins";
+  "lambdabot-social-plugins" = dontDistribute super."lambdabot-social-plugins";
+  "lambdabot-trusted" = dontDistribute super."lambdabot-trusted";
+  "lambdabot-utils" = dontDistribute super."lambdabot-utils";
+  "lambdacat" = dontDistribute super."lambdacat";
+  "lambdacms-core" = dontDistribute super."lambdacms-core";
+  "lambdacms-media" = dontDistribute super."lambdacms-media";
+  "lambdacube" = dontDistribute super."lambdacube";
+  "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-core" = dontDistribute super."lambdacube-core";
+  "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
+  "lambdacube-engine" = dontDistribute super."lambdacube-engine";
+  "lambdacube-examples" = dontDistribute super."lambdacube-examples";
+  "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-samples" = dontDistribute super."lambdacube-samples";
+  "lambdatex" = dontDistribute super."lambdatex";
+  "lambdatwit" = dontDistribute super."lambdatwit";
+  "lambdiff" = dontDistribute super."lambdiff";
+  "lame-tester" = dontDistribute super."lame-tester";
+  "language-asn1" = dontDistribute super."language-asn1";
+  "language-bash" = dontDistribute super."language-bash";
+  "language-boogie" = dontDistribute super."language-boogie";
+  "language-c-comments" = dontDistribute super."language-c-comments";
+  "language-c-inline" = dontDistribute super."language-c-inline";
+  "language-c-quote" = dontDistribute super."language-c-quote";
+  "language-cil" = dontDistribute super."language-cil";
+  "language-css" = dontDistribute super."language-css";
+  "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
+  "language-eiffel" = dontDistribute super."language-eiffel";
+  "language-fortran" = dontDistribute super."language-fortran";
+  "language-gcl" = dontDistribute super."language-gcl";
+  "language-go" = dontDistribute super."language-go";
+  "language-guess" = dontDistribute super."language-guess";
+  "language-java-classfile" = dontDistribute super."language-java-classfile";
+  "language-kort" = dontDistribute super."language-kort";
+  "language-lua" = dontDistribute super."language-lua";
+  "language-lua-qq" = dontDistribute super."language-lua-qq";
+  "language-mixal" = dontDistribute super."language-mixal";
+  "language-objc" = dontDistribute super."language-objc";
+  "language-openscad" = dontDistribute super."language-openscad";
+  "language-pig" = dontDistribute super."language-pig";
+  "language-puppet" = dontDistribute super."language-puppet";
+  "language-python" = dontDistribute super."language-python";
+  "language-python-colour" = dontDistribute super."language-python-colour";
+  "language-python-test" = dontDistribute super."language-python-test";
+  "language-qux" = dontDistribute super."language-qux";
+  "language-sh" = dontDistribute super."language-sh";
+  "language-slice" = dontDistribute super."language-slice";
+  "language-spelling" = dontDistribute super."language-spelling";
+  "language-sqlite" = dontDistribute super."language-sqlite";
+  "language-typescript" = dontDistribute super."language-typescript";
+  "language-vhdl" = dontDistribute super."language-vhdl";
+  "lat" = dontDistribute super."lat";
+  "latest-npm-version" = dontDistribute super."latest-npm-version";
+  "latex" = dontDistribute super."latex";
+  "launchpad-control" = dontDistribute super."launchpad-control";
+  "lax" = dontDistribute super."lax";
+  "layers" = dontDistribute super."layers";
+  "layers-game" = dontDistribute super."layers-game";
+  "layout" = dontDistribute super."layout";
+  "layout-bootstrap" = dontDistribute super."layout-bootstrap";
+  "lazy-io" = dontDistribute super."lazy-io";
+  "lazyarray" = dontDistribute super."lazyarray";
+  "lazyio" = dontDistribute super."lazyio";
+  "lazysmallcheck" = dontDistribute super."lazysmallcheck";
+  "lazysplines" = dontDistribute super."lazysplines";
+  "lbfgs" = dontDistribute super."lbfgs";
+  "lcs" = dontDistribute super."lcs";
+  "lda" = dontDistribute super."lda";
+  "ldap-client" = dontDistribute super."ldap-client";
+  "ldif" = dontDistribute super."ldif";
+  "leaf" = dontDistribute super."leaf";
+  "leaky" = dontDistribute super."leaky";
+  "leankit-api" = dontDistribute super."leankit-api";
+  "leapseconds-announced" = dontDistribute super."leapseconds-announced";
+  "learn" = dontDistribute super."learn";
+  "learn-physics" = dontDistribute super."learn-physics";
+  "learn-physics-examples" = dontDistribute super."learn-physics-examples";
+  "learning-hmm" = dontDistribute super."learning-hmm";
+  "leetify" = dontDistribute super."leetify";
+  "leksah" = dontDistribute super."leksah";
+  "leksah-server" = dontDistribute super."leksah-server";
+  "lendingclub" = dontDistribute super."lendingclub";
+  "lens-datetime" = dontDistribute super."lens-datetime";
+  "lens-prelude" = dontDistribute super."lens-prelude";
+  "lens-properties" = dontDistribute super."lens-properties";
+  "lens-sop" = dontDistribute super."lens-sop";
+  "lens-text-encoding" = dontDistribute super."lens-text-encoding";
+  "lens-time" = dontDistribute super."lens-time";
+  "lens-tutorial" = dontDistribute super."lens-tutorial";
+  "lens-utils" = dontDistribute super."lens-utils";
+  "lenses" = dontDistribute super."lenses";
+  "lensref" = dontDistribute super."lensref";
+  "lentil" = dontDistribute super."lentil";
+  "lenz" = dontDistribute super."lenz";
+  "lenz-template" = dontDistribute super."lenz-template";
+  "level-monad" = dontDistribute super."level-monad";
+  "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
+  "levmar" = dontDistribute super."levmar";
+  "levmar-chart" = dontDistribute super."levmar-chart";
+  "lgtk" = dontDistribute super."lgtk";
+  "lha" = dontDistribute super."lha";
+  "lhae" = dontDistribute super."lhae";
+  "lhc" = dontDistribute super."lhc";
+  "lhe" = dontDistribute super."lhe";
+  "lhs2TeX-hl" = dontDistribute super."lhs2TeX-hl";
+  "lhs2html" = dontDistribute super."lhs2html";
+  "lhslatex" = dontDistribute super."lhslatex";
+  "libGenI" = dontDistribute super."libGenI";
+  "libarchive-conduit" = dontDistribute super."libarchive-conduit";
+  "libconfig" = dontDistribute super."libconfig";
+  "libcspm" = dontDistribute super."libcspm";
+  "libexpect" = dontDistribute super."libexpect";
+  "libffi" = dontDistribute super."libffi";
+  "libgraph" = dontDistribute super."libgraph";
+  "libhbb" = dontDistribute super."libhbb";
+  "libjenkins" = dontDistribute super."libjenkins";
+  "liblastfm" = dontDistribute super."liblastfm";
+  "liblinear-enumerator" = dontDistribute super."liblinear-enumerator";
+  "libltdl" = dontDistribute super."libltdl";
+  "libmpd" = dontDistribute super."libmpd";
+  "libnvvm" = dontDistribute super."libnvvm";
+  "liboleg" = dontDistribute super."liboleg";
+  "libpafe" = dontDistribute super."libpafe";
+  "libpq" = dontDistribute super."libpq";
+  "librandomorg" = dontDistribute super."librandomorg";
+  "libravatar" = dontDistribute super."libravatar";
+  "libssh2" = dontDistribute super."libssh2";
+  "libssh2-conduit" = dontDistribute super."libssh2-conduit";
+  "libstackexchange" = dontDistribute super."libstackexchange";
+  "libsystemd-daemon" = dontDistribute super."libsystemd-daemon";
+  "libtagc" = dontDistribute super."libtagc";
+  "libvirt-hs" = dontDistribute super."libvirt-hs";
+  "libvorbis" = dontDistribute super."libvorbis";
+  "libxml" = dontDistribute super."libxml";
+  "libxml-enumerator" = dontDistribute super."libxml-enumerator";
+  "libxslt" = dontDistribute super."libxslt";
+  "life" = dontDistribute super."life";
+  "lift-generics" = dontDistribute super."lift-generics";
+  "lifted-threads" = dontDistribute super."lifted-threads";
+  "lifter" = dontDistribute super."lifter";
+  "ligature" = dontDistribute super."ligature";
+  "ligd" = dontDistribute super."ligd";
+  "lighttpd-conf" = dontDistribute super."lighttpd-conf";
+  "lighttpd-conf-qq" = dontDistribute super."lighttpd-conf-qq";
+  "lilypond" = dontDistribute super."lilypond";
+  "limp" = dontDistribute super."limp";
+  "limp-cbc" = dontDistribute super."limp-cbc";
+  "lin-alg" = dontDistribute super."lin-alg";
+  "linda" = dontDistribute super."linda";
+  "lindenmayer" = dontDistribute super."lindenmayer";
+  "line-break" = dontDistribute super."line-break";
+  "line2pdf" = dontDistribute super."line2pdf";
+  "linear-algebra-cblas" = dontDistribute super."linear-algebra-cblas";
+  "linear-circuit" = dontDistribute super."linear-circuit";
+  "linear-grammar" = dontDistribute super."linear-grammar";
+  "linear-maps" = dontDistribute super."linear-maps";
+  "linear-opengl" = dontDistribute super."linear-opengl";
+  "linear-vect" = dontDistribute super."linear-vect";
+  "linearEqSolver" = dontDistribute super."linearEqSolver";
+  "linearscan" = dontDistribute super."linearscan";
+  "linearscan-hoopl" = dontDistribute super."linearscan-hoopl";
+  "linebreak" = dontDistribute super."linebreak";
+  "linguistic-ordinals" = dontDistribute super."linguistic-ordinals";
+  "link-relations" = dontDistribute super."link-relations";
+  "linkchk" = dontDistribute super."linkchk";
+  "linkcore" = dontDistribute super."linkcore";
+  "linkedhashmap" = dontDistribute super."linkedhashmap";
+  "linklater" = dontDistribute super."linklater";
+  "linode" = dontDistribute super."linode";
+  "linux-blkid" = dontDistribute super."linux-blkid";
+  "linux-cgroup" = dontDistribute super."linux-cgroup";
+  "linux-evdev" = dontDistribute super."linux-evdev";
+  "linux-inotify" = dontDistribute super."linux-inotify";
+  "linux-kmod" = dontDistribute super."linux-kmod";
+  "linux-mount" = dontDistribute super."linux-mount";
+  "linux-perf" = dontDistribute super."linux-perf";
+  "linux-ptrace" = dontDistribute super."linux-ptrace";
+  "linux-xattr" = dontDistribute super."linux-xattr";
+  "linx-gateway" = dontDistribute super."linx-gateway";
+  "lio" = dontDistribute super."lio";
+  "lio-eci11" = dontDistribute super."lio-eci11";
+  "lio-fs" = dontDistribute super."lio-fs";
+  "lio-simple" = dontDistribute super."lio-simple";
+  "lipsum-gen" = dontDistribute super."lipsum-gen";
+  "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
+  "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "lispparser" = dontDistribute super."lispparser";
+  "list-extras" = dontDistribute super."list-extras";
+  "list-grouping" = dontDistribute super."list-grouping";
+  "list-mux" = dontDistribute super."list-mux";
+  "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t-attoparsec" = dontDistribute super."list-t-attoparsec";
+  "list-t-html-parser" = dontDistribute super."list-t-html-parser";
+  "list-t-http-client" = dontDistribute super."list-t-http-client";
+  "list-t-libcurl" = dontDistribute super."list-t-libcurl";
+  "list-t-text" = dontDistribute super."list-t-text";
+  "list-tries" = dontDistribute super."list-tries";
+  "list-zip-def" = dontDistribute super."list-zip-def";
+  "listlike-instances" = dontDistribute super."listlike-instances";
+  "lists" = dontDistribute super."lists";
+  "listsafe" = dontDistribute super."listsafe";
+  "lit" = dontDistribute super."lit";
+  "literals" = dontDistribute super."literals";
+  "live-sequencer" = dontDistribute super."live-sequencer";
+  "ll-picosat" = dontDistribute super."ll-picosat";
+  "llrbtree" = dontDistribute super."llrbtree";
+  "llsd" = dontDistribute super."llsd";
+  "llvm" = dontDistribute super."llvm";
+  "llvm-analysis" = dontDistribute super."llvm-analysis";
+  "llvm-base" = dontDistribute super."llvm-base";
+  "llvm-base-types" = dontDistribute super."llvm-base-types";
+  "llvm-base-util" = dontDistribute super."llvm-base-util";
+  "llvm-data-interop" = dontDistribute super."llvm-data-interop";
+  "llvm-extra" = dontDistribute super."llvm-extra";
+  "llvm-ffi" = dontDistribute super."llvm-ffi";
+  "llvm-general" = dontDistribute super."llvm-general";
+  "llvm-general-pure" = dontDistribute super."llvm-general-pure";
+  "llvm-general-quote" = dontDistribute super."llvm-general-quote";
+  "llvm-ht" = dontDistribute super."llvm-ht";
+  "llvm-pkg-config" = dontDistribute super."llvm-pkg-config";
+  "llvm-pretty" = dontDistribute super."llvm-pretty";
+  "llvm-pretty-bc-parser" = dontDistribute super."llvm-pretty-bc-parser";
+  "llvm-tf" = dontDistribute super."llvm-tf";
+  "llvm-tools" = dontDistribute super."llvm-tools";
+  "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
+  "load-env" = dontDistribute super."load-env";
+  "loadavg" = dontDistribute super."loadavg";
+  "local-address" = dontDistribute super."local-address";
+  "local-search" = dontDistribute super."local-search";
+  "located-base" = dontDistribute super."located-base";
+  "locators" = dontDistribute super."locators";
+  "loch" = dontDistribute super."loch";
+  "lock-file" = dontDistribute super."lock-file";
+  "locked-poll" = dontDistribute super."locked-poll";
+  "lockfree-queue" = dontDistribute super."lockfree-queue";
+  "log" = dontDistribute super."log";
+  "log-effect" = dontDistribute super."log-effect";
+  "log2json" = dontDistribute super."log2json";
+  "logfloat" = dontDistribute super."logfloat";
+  "logger" = dontDistribute super."logger";
+  "logging" = dontDistribute super."logging";
+  "logging-facade-journald" = dontDistribute super."logging-facade-journald";
+  "logic-TPTP" = dontDistribute super."logic-TPTP";
+  "logic-classes" = dontDistribute super."logic-classes";
+  "logicst" = dontDistribute super."logicst";
+  "logplex-parse" = dontDistribute super."logplex-parse";
+  "logsink" = dontDistribute super."logsink";
+  "lojban" = dontDistribute super."lojban";
+  "lojbanParser" = dontDistribute super."lojbanParser";
+  "lojbanXiragan" = dontDistribute super."lojbanXiragan";
+  "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
+  "loli" = dontDistribute super."loli";
+  "lookup-tables" = dontDistribute super."lookup-tables";
+  "loop-effin" = dontDistribute super."loop-effin";
+  "loop-while" = dontDistribute super."loop-while";
+  "loops" = dontDistribute super."loops";
+  "loopy" = dontDistribute super."loopy";
+  "lord" = dontDistribute super."lord";
+  "lorem" = dontDistribute super."lorem";
+  "loris" = dontDistribute super."loris";
+  "loshadka" = dontDistribute super."loshadka";
+  "lostcities" = dontDistribute super."lostcities";
+  "lowgl" = dontDistribute super."lowgl";
+  "ls-usb" = dontDistribute super."ls-usb";
+  "lscabal" = dontDistribute super."lscabal";
+  "lss" = dontDistribute super."lss";
+  "lsystem" = dontDistribute super."lsystem";
+  "ltk" = dontDistribute super."ltk";
+  "ltl" = dontDistribute super."ltl";
+  "lua-bytecode" = dontDistribute super."lua-bytecode";
+  "luachunk" = dontDistribute super."luachunk";
+  "luautils" = dontDistribute super."luautils";
+  "lub" = dontDistribute super."lub";
+  "lucid-foundation" = dontDistribute super."lucid-foundation";
+  "lucienne" = dontDistribute super."lucienne";
+  "luhn" = dontDistribute super."luhn";
+  "lui" = dontDistribute super."lui";
+  "luka" = dontDistribute super."luka";
+  "lushtags" = dontDistribute super."lushtags";
+  "luthor" = dontDistribute super."luthor";
+  "lvish" = dontDistribute super."lvish";
+  "lvmlib" = dontDistribute super."lvmlib";
+  "lvmrun" = dontDistribute super."lvmrun";
+  "lxc" = dontDistribute super."lxc";
+  "lye" = dontDistribute super."lye";
+  "lz4" = dontDistribute super."lz4";
+  "lzma" = dontDistribute super."lzma";
+  "lzma-clib" = dontDistribute super."lzma-clib";
+  "lzma-enumerator" = dontDistribute super."lzma-enumerator";
+  "lzma-streams" = dontDistribute super."lzma-streams";
+  "maam" = dontDistribute super."maam";
+  "mac" = dontDistribute super."mac";
+  "maccatcher" = dontDistribute super."maccatcher";
+  "machinecell" = dontDistribute super."machinecell";
+  "machines-binary" = dontDistribute super."machines-binary";
+  "machines-zlib" = dontDistribute super."machines-zlib";
+  "macho" = dontDistribute super."macho";
+  "maclight" = dontDistribute super."maclight";
+  "macosx-make-standalone" = dontDistribute super."macosx-make-standalone";
+  "mage" = dontDistribute super."mage";
+  "magico" = dontDistribute super."magico";
+  "magma" = dontDistribute super."magma";
+  "mahoro" = dontDistribute super."mahoro";
+  "maid" = dontDistribute super."maid";
+  "mailbox-count" = dontDistribute super."mailbox-count";
+  "mailchimp-subscribe" = dontDistribute super."mailchimp-subscribe";
+  "mailgun" = dontDistribute super."mailgun";
+  "mainland-pretty" = dontDistribute super."mainland-pretty";
+  "majordomo" = dontDistribute super."majordomo";
+  "majority" = dontDistribute super."majority";
+  "make-hard-links" = dontDistribute super."make-hard-links";
+  "make-package" = dontDistribute super."make-package";
+  "makedo" = dontDistribute super."makedo";
+  "manatee" = dontDistribute super."manatee";
+  "manatee-all" = dontDistribute super."manatee-all";
+  "manatee-anything" = dontDistribute super."manatee-anything";
+  "manatee-browser" = dontDistribute super."manatee-browser";
+  "manatee-core" = dontDistribute super."manatee-core";
+  "manatee-curl" = dontDistribute super."manatee-curl";
+  "manatee-editor" = dontDistribute super."manatee-editor";
+  "manatee-filemanager" = dontDistribute super."manatee-filemanager";
+  "manatee-imageviewer" = dontDistribute super."manatee-imageviewer";
+  "manatee-ircclient" = dontDistribute super."manatee-ircclient";
+  "manatee-mplayer" = dontDistribute super."manatee-mplayer";
+  "manatee-pdfviewer" = dontDistribute super."manatee-pdfviewer";
+  "manatee-processmanager" = dontDistribute super."manatee-processmanager";
+  "manatee-reader" = dontDistribute super."manatee-reader";
+  "manatee-template" = dontDistribute super."manatee-template";
+  "manatee-terminal" = dontDistribute super."manatee-terminal";
+  "manatee-welcome" = dontDistribute super."manatee-welcome";
+  "mancala" = dontDistribute super."mancala";
+  "mandulia" = dontDistribute super."mandulia";
+  "manifold-random" = dontDistribute super."manifold-random";
+  "manifolds" = dontDistribute super."manifolds";
+  "marionetta" = dontDistribute super."marionetta";
+  "markdown-kate" = dontDistribute super."markdown-kate";
+  "markdown-pap" = dontDistribute super."markdown-pap";
+  "markdown2svg" = dontDistribute super."markdown2svg";
+  "marked-pretty" = dontDistribute super."marked-pretty";
+  "markov" = dontDistribute super."markov";
+  "markov-chain" = dontDistribute super."markov-chain";
+  "markov-processes" = dontDistribute super."markov-processes";
+  "markup-preview" = dontDistribute super."markup-preview";
+  "marmalade-upload" = dontDistribute super."marmalade-upload";
+  "marquise" = dontDistribute super."marquise";
+  "marxup" = dontDistribute super."marxup";
+  "masakazu-bot" = dontDistribute super."masakazu-bot";
+  "mastermind" = dontDistribute super."mastermind";
+  "matchers" = dontDistribute super."matchers";
+  "mathblog" = dontDistribute super."mathblog";
+  "mathgenealogy" = dontDistribute super."mathgenealogy";
+  "mathista" = dontDistribute super."mathista";
+  "mathlink" = dontDistribute super."mathlink";
+  "matlab" = dontDistribute super."matlab";
+  "matrix-market" = dontDistribute super."matrix-market";
+  "matrix-market-pure" = dontDistribute super."matrix-market-pure";
+  "matsuri" = dontDistribute super."matsuri";
+  "maude" = dontDistribute super."maude";
+  "maxent" = dontDistribute super."maxent";
+  "maxsharing" = dontDistribute super."maxsharing";
+  "maybe-justify" = dontDistribute super."maybe-justify";
+  "maybench" = dontDistribute super."maybench";
+  "mbox-tools" = dontDistribute super."mbox-tools";
+  "mcmaster-gloss-examples" = dontDistribute super."mcmaster-gloss-examples";
+  "mcmc-samplers" = dontDistribute super."mcmc-samplers";
+  "mcmc-synthesis" = dontDistribute super."mcmc-synthesis";
+  "mcpi" = dontDistribute super."mcpi";
+  "mdapi" = dontDistribute super."mdapi";
+  "mdcat" = dontDistribute super."mdcat";
+  "mdo" = dontDistribute super."mdo";
+  "mecab" = dontDistribute super."mecab";
+  "mecha" = dontDistribute super."mecha";
+  "mediawiki" = dontDistribute super."mediawiki";
+  "mediawiki2latex" = dontDistribute super."mediawiki2latex";
+  "medium-sdk-haskell" = dontDistribute super."medium-sdk-haskell";
+  "meep" = dontDistribute super."meep";
+  "mega-sdist" = dontDistribute super."mega-sdist";
+  "meldable-heap" = dontDistribute super."meldable-heap";
+  "melody" = dontDistribute super."melody";
+  "memcache" = dontDistribute super."memcache";
+  "memcache-conduit" = dontDistribute super."memcache-conduit";
+  "memcache-haskell" = dontDistribute super."memcache-haskell";
+  "memcached" = dontDistribute super."memcached";
+  "memexml" = dontDistribute super."memexml";
+  "memo-ptr" = dontDistribute super."memo-ptr";
+  "memo-sqlite" = dontDistribute super."memo-sqlite";
+  "memscript" = dontDistribute super."memscript";
+  "mersenne-random" = dontDistribute super."mersenne-random";
+  "messente" = dontDistribute super."messente";
+  "meta-misc" = dontDistribute super."meta-misc";
+  "meta-par" = dontDistribute super."meta-par";
+  "meta-par-accelerate" = dontDistribute super."meta-par-accelerate";
+  "metadata" = dontDistribute super."metadata";
+  "metamorphic" = dontDistribute super."metamorphic";
+  "metaplug" = dontDistribute super."metaplug";
+  "metric" = dontDistribute super."metric";
+  "metricsd-client" = dontDistribute super."metricsd-client";
+  "metronome" = dontDistribute super."metronome";
+  "mezzolens" = dontDistribute super."mezzolens";
+  "mfsolve" = dontDistribute super."mfsolve";
+  "mgeneric" = dontDistribute super."mgeneric";
+  "mi" = dontDistribute super."mi";
+  "microbench" = dontDistribute super."microbench";
+  "microformats2-types" = dontDistribute super."microformats2-types";
+  "microlens" = doDistribute super."microlens_0_3_5_1";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
+  "microlens-each" = dontDistribute super."microlens-each";
+  "microlens-ghc" = doDistribute super."microlens-ghc_0_3_1_0";
+  "microlens-mtl" = doDistribute super."microlens-mtl_0_1_6_0";
+  "microlens-platform" = doDistribute super."microlens-platform_0_1_7_0";
+  "microlens-th" = doDistribute super."microlens-th_0_2_2_0";
+  "microtimer" = dontDistribute super."microtimer";
+  "mida" = dontDistribute super."mida";
+  "midi" = dontDistribute super."midi";
+  "midi-alsa" = dontDistribute super."midi-alsa";
+  "midi-music-box" = dontDistribute super."midi-music-box";
+  "midi-util" = dontDistribute super."midi-util";
+  "midimory" = dontDistribute super."midimory";
+  "midisurface" = dontDistribute super."midisurface";
+  "mighttpd" = dontDistribute super."mighttpd";
+  "mighttpd2" = dontDistribute super."mighttpd2";
+  "mikmod" = dontDistribute super."mikmod";
+  "miku" = dontDistribute super."miku";
+  "milena" = dontDistribute super."milena";
+  "mime" = dontDistribute super."mime";
+  "mime-directory" = dontDistribute super."mime-directory";
+  "mime-string" = dontDistribute super."mime-string";
+  "mines" = dontDistribute super."mines";
+  "minesweeper" = dontDistribute super."minesweeper";
+  "miniball" = dontDistribute super."miniball";
+  "miniforth" = dontDistribute super."miniforth";
+  "minilens" = dontDistribute super."minilens";
+  "minimal-configuration" = dontDistribute super."minimal-configuration";
+  "minimorph" = dontDistribute super."minimorph";
+  "minimung" = dontDistribute super."minimung";
+  "minions" = dontDistribute super."minions";
+  "minioperational" = dontDistribute super."minioperational";
+  "miniplex" = dontDistribute super."miniplex";
+  "minirotate" = dontDistribute super."minirotate";
+  "minisat" = dontDistribute super."minisat";
+  "ministg" = dontDistribute super."ministg";
+  "miniutter" = dontDistribute super."miniutter";
+  "minst-idx" = dontDistribute super."minst-idx";
+  "mirror-tweet" = dontDistribute super."mirror-tweet";
+  "missing-py2" = dontDistribute super."missing-py2";
+  "mix-arrows" = dontDistribute super."mix-arrows";
+  "mixed-strategies" = dontDistribute super."mixed-strategies";
+  "mkbndl" = dontDistribute super."mkbndl";
+  "mkcabal" = dontDistribute super."mkcabal";
+  "ml-w" = dontDistribute super."ml-w";
+  "mlist" = dontDistribute super."mlist";
+  "mmtl" = dontDistribute super."mmtl";
+  "mmtl-base" = dontDistribute super."mmtl-base";
+  "moan" = dontDistribute super."moan";
+  "modbus-tcp" = dontDistribute super."modbus-tcp";
+  "modelicaparser" = dontDistribute super."modelicaparser";
+  "modsplit" = dontDistribute super."modsplit";
+  "modular-arithmetic" = dontDistribute super."modular-arithmetic";
+  "modular-prelude" = dontDistribute super."modular-prelude";
+  "modular-prelude-classy" = dontDistribute super."modular-prelude-classy";
+  "module-management" = dontDistribute super."module-management";
+  "modulespection" = dontDistribute super."modulespection";
+  "modulo" = dontDistribute super."modulo";
+  "moe" = dontDistribute super."moe";
+  "mohws" = dontDistribute super."mohws";
+  "monad-abort-fd" = dontDistribute super."monad-abort-fd";
+  "monad-atom" = dontDistribute super."monad-atom";
+  "monad-atom-simple" = dontDistribute super."monad-atom-simple";
+  "monad-bool" = dontDistribute super."monad-bool";
+  "monad-classes" = dontDistribute super."monad-classes";
+  "monad-codec" = dontDistribute super."monad-codec";
+  "monad-exception" = dontDistribute super."monad-exception";
+  "monad-fork" = dontDistribute super."monad-fork";
+  "monad-gen" = dontDistribute super."monad-gen";
+  "monad-interleave" = dontDistribute super."monad-interleave";
+  "monad-levels" = dontDistribute super."monad-levels";
+  "monad-loops-stm" = dontDistribute super."monad-loops-stm";
+  "monad-lrs" = dontDistribute super."monad-lrs";
+  "monad-memo" = dontDistribute super."monad-memo";
+  "monad-mersenne-random" = dontDistribute super."monad-mersenne-random";
+  "monad-open" = dontDistribute super."monad-open";
+  "monad-ox" = dontDistribute super."monad-ox";
+  "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
+  "monad-param" = dontDistribute super."monad-param";
+  "monad-ran" = dontDistribute super."monad-ran";
+  "monad-resumption" = dontDistribute super."monad-resumption";
+  "monad-state" = dontDistribute super."monad-state";
+  "monad-statevar" = dontDistribute super."monad-statevar";
+  "monad-stlike-io" = dontDistribute super."monad-stlike-io";
+  "monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
+  "monad-supply" = dontDistribute super."monad-supply";
+  "monad-task" = dontDistribute super."monad-task";
+  "monad-tx" = dontDistribute super."monad-tx";
+  "monad-unify" = dontDistribute super."monad-unify";
+  "monad-wrap" = dontDistribute super."monad-wrap";
+  "monadIO" = dontDistribute super."monadIO";
+  "monadLib-compose" = dontDistribute super."monadLib-compose";
+  "monadacme" = dontDistribute super."monadacme";
+  "monadbi" = dontDistribute super."monadbi";
+  "monadfibre" = dontDistribute super."monadfibre";
+  "monadiccp" = dontDistribute super."monadiccp";
+  "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
+  "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
+  "monadlist" = dontDistribute super."monadlist";
+  "monadloc-pp" = dontDistribute super."monadloc-pp";
+  "monadplus" = dontDistribute super."monadplus";
+  "monads-fd" = dontDistribute super."monads-fd";
+  "monadtransform" = dontDistribute super."monadtransform";
+  "monarch" = dontDistribute super."monarch";
+  "mongodb-queue" = dontDistribute super."mongodb-queue";
+  "mongrel2-handler" = dontDistribute super."mongrel2-handler";
+  "monitor" = dontDistribute super."monitor";
+  "mono-foldable" = dontDistribute super."mono-foldable";
+  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-owns" = dontDistribute super."monoid-owns";
+  "monoid-record" = dontDistribute super."monoid-record";
+  "monoid-statistics" = dontDistribute super."monoid-statistics";
+  "monoid-transformer" = dontDistribute super."monoid-transformer";
+  "monoidplus" = dontDistribute super."monoidplus";
+  "monoids" = dontDistribute super."monoids";
+  "monomorphic" = dontDistribute super."monomorphic";
+  "montage" = dontDistribute super."montage";
+  "montage-client" = dontDistribute super."montage-client";
+  "monte-carlo" = dontDistribute super."monte-carlo";
+  "moo" = dontDistribute super."moo";
+  "moonshine" = dontDistribute super."moonshine";
+  "morfette" = dontDistribute super."morfette";
+  "morfeusz" = dontDistribute super."morfeusz";
+  "mosaico-lib" = dontDistribute super."mosaico-lib";
+  "mount" = dontDistribute super."mount";
+  "mp" = dontDistribute super."mp";
+  "mp3decoder" = dontDistribute super."mp3decoder";
+  "mpdmate" = dontDistribute super."mpdmate";
+  "mpppc" = dontDistribute super."mpppc";
+  "mpretty" = dontDistribute super."mpretty";
+  "mpris" = dontDistribute super."mpris";
+  "mprover" = dontDistribute super."mprover";
+  "mps" = dontDistribute super."mps";
+  "mpvguihs" = dontDistribute super."mpvguihs";
+  "mqtt-hs" = dontDistribute super."mqtt-hs";
+  "ms" = dontDistribute super."ms";
+  "msgpack" = dontDistribute super."msgpack";
+  "msgpack-aeson" = dontDistribute super."msgpack-aeson";
+  "msgpack-idl" = dontDistribute super."msgpack-idl";
+  "msgpack-rpc" = dontDistribute super."msgpack-rpc";
+  "msh" = dontDistribute super."msh";
+  "msu" = dontDistribute super."msu";
+  "mtgoxapi" = dontDistribute super."mtgoxapi";
+  "mtl-c" = dontDistribute super."mtl-c";
+  "mtl-evil-instances" = dontDistribute super."mtl-evil-instances";
+  "mtl-tf" = dontDistribute super."mtl-tf";
+  "mtl-unleashed" = dontDistribute super."mtl-unleashed";
+  "mtlparse" = dontDistribute super."mtlparse";
+  "mtlx" = dontDistribute super."mtlx";
+  "mtp" = dontDistribute super."mtp";
+  "mtree" = dontDistribute super."mtree";
+  "mucipher" = dontDistribute super."mucipher";
+  "mudbath" = dontDistribute super."mudbath";
+  "muesli" = dontDistribute super."muesli";
+  "mueval" = dontDistribute super."mueval";
+  "multext-east-msd" = dontDistribute super."multext-east-msd";
+  "multi-cabal" = dontDistribute super."multi-cabal";
+  "multifocal" = dontDistribute super."multifocal";
+  "multihash" = dontDistribute super."multihash";
+  "multipart-names" = dontDistribute super."multipart-names";
+  "multipass" = dontDistribute super."multipass";
+  "multiplate-simplified" = dontDistribute super."multiplate-simplified";
+  "multiplicity" = dontDistribute super."multiplicity";
+  "multirec" = dontDistribute super."multirec";
+  "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver";
+  "multirec-binary" = dontDistribute super."multirec-binary";
+  "multiset-comb" = dontDistribute super."multiset-comb";
+  "multisetrewrite" = dontDistribute super."multisetrewrite";
+  "multistate" = dontDistribute super."multistate";
+  "muon" = dontDistribute super."muon";
+  "murder" = dontDistribute super."murder";
+  "murmur3" = dontDistribute super."murmur3";
+  "murmurhash3" = dontDistribute super."murmurhash3";
+  "music-articulation" = dontDistribute super."music-articulation";
+  "music-diatonic" = dontDistribute super."music-diatonic";
+  "music-dynamics" = dontDistribute super."music-dynamics";
+  "music-dynamics-literal" = dontDistribute super."music-dynamics-literal";
+  "music-graphics" = dontDistribute super."music-graphics";
+  "music-parts" = dontDistribute super."music-parts";
+  "music-pitch" = dontDistribute super."music-pitch";
+  "music-pitch-literal" = dontDistribute super."music-pitch-literal";
+  "music-preludes" = dontDistribute super."music-preludes";
+  "music-score" = dontDistribute super."music-score";
+  "music-sibelius" = dontDistribute super."music-sibelius";
+  "music-suite" = dontDistribute super."music-suite";
+  "music-util" = dontDistribute super."music-util";
+  "musicbrainz-email" = dontDistribute super."musicbrainz-email";
+  "musicxml" = dontDistribute super."musicxml";
+  "musicxml2" = dontDistribute super."musicxml2";
+  "mustache" = dontDistribute super."mustache";
+  "mustache-haskell" = dontDistribute super."mustache-haskell";
+  "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-iter" = dontDistribute super."mutable-iter";
+  "mute-unmute" = dontDistribute super."mute-unmute";
+  "mvc" = dontDistribute super."mvc";
+  "mvc-updates" = dontDistribute super."mvc-updates";
+  "mvclient" = dontDistribute super."mvclient";
+  "mwc-random-monad" = dontDistribute super."mwc-random-monad";
+  "myTestlll" = dontDistribute super."myTestlll";
+  "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
+  "myo" = dontDistribute super."myo";
+  "mysnapsession" = dontDistribute super."mysnapsession";
+  "mysnapsession-example" = dontDistribute super."mysnapsession-example";
+  "mysql-effect" = dontDistribute super."mysql-effect";
+  "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi";
+  "mysql-simple-typed" = dontDistribute super."mysql-simple-typed";
+  "mzv" = dontDistribute super."mzv";
+  "n-m" = dontDistribute super."n-m";
+  "nagios-perfdata" = dontDistribute super."nagios-perfdata";
+  "nagios-plugin-ekg" = dontDistribute super."nagios-plugin-ekg";
+  "named-formlet" = dontDistribute super."named-formlet";
+  "named-lock" = dontDistribute super."named-lock";
+  "named-records" = dontDistribute super."named-records";
+  "namelist" = dontDistribute super."namelist";
+  "names" = dontDistribute super."names";
+  "names-th" = dontDistribute super."names-th";
+  "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-hmac" = dontDistribute super."nano-hmac";
+  "nano-md5" = dontDistribute super."nano-md5";
+  "nanoAgda" = dontDistribute super."nanoAgda";
+  "nanocurses" = dontDistribute super."nanocurses";
+  "nanomsg" = dontDistribute super."nanomsg";
+  "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
+  "nanoparsec" = dontDistribute super."nanoparsec";
+  "nanq" = dontDistribute super."nanq";
+  "narc" = dontDistribute super."narc";
+  "nat" = dontDistribute super."nat";
+  "nats-queue" = dontDistribute super."nats-queue";
+  "natural-number" = dontDistribute super."natural-number";
+  "natural-numbers" = dontDistribute super."natural-numbers";
+  "natural-transformation" = dontDistribute super."natural-transformation";
+  "naturalcomp" = dontDistribute super."naturalcomp";
+  "naturals" = dontDistribute super."naturals";
+  "naver-translate" = dontDistribute super."naver-translate";
+  "nbt" = dontDistribute super."nbt";
+  "nc-indicators" = dontDistribute super."nc-indicators";
+  "ncurses" = dontDistribute super."ncurses";
+  "neat" = dontDistribute super."neat";
+  "needle" = dontDistribute super."needle";
+  "neet" = dontDistribute super."neet";
+  "nehe-tuts" = dontDistribute super."nehe-tuts";
+  "neil" = dontDistribute super."neil";
+  "neither" = dontDistribute super."neither";
+  "nemesis" = dontDistribute super."nemesis";
+  "nemesis-titan" = dontDistribute super."nemesis-titan";
+  "nerf" = dontDistribute super."nerf";
+  "nero" = dontDistribute super."nero";
+  "nero-wai" = dontDistribute super."nero-wai";
+  "nero-warp" = dontDistribute super."nero-warp";
+  "nested-routes" = dontDistribute super."nested-routes";
+  "nested-sets" = dontDistribute super."nested-sets";
+  "nestedmap" = dontDistribute super."nestedmap";
+  "net-concurrent" = dontDistribute super."net-concurrent";
+  "netclock" = dontDistribute super."netclock";
+  "netcore" = dontDistribute super."netcore";
+  "netlines" = dontDistribute super."netlines";
+  "netlink" = dontDistribute super."netlink";
+  "netlist" = dontDistribute super."netlist";
+  "netlist-to-vhdl" = dontDistribute super."netlist-to-vhdl";
+  "netpbm" = dontDistribute super."netpbm";
+  "netrc" = dontDistribute super."netrc";
+  "netspec" = dontDistribute super."netspec";
+  "netstring-enumerator" = dontDistribute super."netstring-enumerator";
+  "nettle-frp" = dontDistribute super."nettle-frp";
+  "nettle-netkit" = dontDistribute super."nettle-netkit";
+  "nettle-openflow" = dontDistribute super."nettle-openflow";
+  "netwire" = dontDistribute super."netwire";
+  "netwire-input" = dontDistribute super."netwire-input";
+  "netwire-input-glfw" = dontDistribute super."netwire-input-glfw";
+  "network-address" = dontDistribute super."network-address";
+  "network-api-support" = dontDistribute super."network-api-support";
+  "network-bitcoin" = dontDistribute super."network-bitcoin";
+  "network-builder" = dontDistribute super."network-builder";
+  "network-bytestring" = dontDistribute super."network-bytestring";
+  "network-conduit" = dontDistribute super."network-conduit";
+  "network-connection" = dontDistribute super."network-connection";
+  "network-data" = dontDistribute super."network-data";
+  "network-dbus" = dontDistribute super."network-dbus";
+  "network-dns" = dontDistribute super."network-dns";
+  "network-enumerator" = dontDistribute super."network-enumerator";
+  "network-fancy" = dontDistribute super."network-fancy";
+  "network-interfacerequest" = dontDistribute super."network-interfacerequest";
+  "network-ip" = dontDistribute super."network-ip";
+  "network-metrics" = dontDistribute super."network-metrics";
+  "network-minihttp" = dontDistribute super."network-minihttp";
+  "network-msg" = dontDistribute super."network-msg";
+  "network-netpacket" = dontDistribute super."network-netpacket";
+  "network-pgi" = dontDistribute super."network-pgi";
+  "network-rpca" = dontDistribute super."network-rpca";
+  "network-server" = dontDistribute super."network-server";
+  "network-service" = dontDistribute super."network-service";
+  "network-simple-sockaddr" = dontDistribute super."network-simple-sockaddr";
+  "network-simple-tls" = dontDistribute super."network-simple-tls";
+  "network-socket-options" = dontDistribute super."network-socket-options";
+  "network-stream" = dontDistribute super."network-stream";
+  "network-topic-models" = dontDistribute super."network-topic-models";
+  "network-transport-amqp" = dontDistribute super."network-transport-amqp";
+  "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
+  "network-uri-static" = dontDistribute super."network-uri-static";
+  "network-wai-router" = dontDistribute super."network-wai-router";
+  "network-websocket" = dontDistribute super."network-websocket";
+  "networked-game" = dontDistribute super."networked-game";
+  "newports" = dontDistribute super."newports";
+  "newsynth" = dontDistribute super."newsynth";
+  "newt" = dontDistribute super."newt";
+  "newtype-deriving" = dontDistribute super."newtype-deriving";
+  "newtype-th" = dontDistribute super."newtype-th";
+  "newtyper" = dontDistribute super."newtyper";
+  "nextstep-plist" = dontDistribute super."nextstep-plist";
+  "nf" = dontDistribute super."nf";
+  "ngrams-loader" = dontDistribute super."ngrams-loader";
+  "niagra" = dontDistribute super."niagra";
+  "nibblestring" = dontDistribute super."nibblestring";
+  "nicify" = dontDistribute super."nicify";
+  "nicify-lib" = dontDistribute super."nicify-lib";
+  "nicovideo-translator" = dontDistribute super."nicovideo-translator";
+  "nikepub" = dontDistribute super."nikepub";
+  "nimber" = dontDistribute super."nimber";
+  "nitro" = dontDistribute super."nitro";
+  "nix-eval" = dontDistribute super."nix-eval";
+  "nixfromnpm" = dontDistribute super."nixfromnpm";
+  "nixos-types" = dontDistribute super."nixos-types";
+  "nkjp" = dontDistribute super."nkjp";
+  "nlp-scores" = dontDistribute super."nlp-scores";
+  "nlp-scores-scripts" = dontDistribute super."nlp-scores-scripts";
+  "nm" = dontDistribute super."nm";
+  "nme" = dontDistribute super."nme";
+  "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
+  "no-role-annots" = dontDistribute super."no-role-annots";
+  "nofib-analyse" = dontDistribute super."nofib-analyse";
+  "nofib-analyze" = dontDistribute super."nofib-analyze";
+  "noise" = dontDistribute super."noise";
+  "non-empty" = dontDistribute super."non-empty";
+  "non-negative" = dontDistribute super."non-negative";
+  "nondeterminism" = dontDistribute super."nondeterminism";
+  "nonfree" = dontDistribute super."nonfree";
+  "nonlinear-optimization" = dontDistribute super."nonlinear-optimization";
+  "nonlinear-optimization-ad" = dontDistribute super."nonlinear-optimization-ad";
+  "noodle" = dontDistribute super."noodle";
+  "normaldistribution" = dontDistribute super."normaldistribution";
+  "not-gloss" = dontDistribute super."not-gloss";
+  "not-gloss-examples" = dontDistribute super."not-gloss-examples";
+  "not-in-base" = dontDistribute super."not-in-base";
+  "notcpp" = dontDistribute super."notcpp";
+  "notmuch-haskell" = dontDistribute super."notmuch-haskell";
+  "notmuch-web" = dontDistribute super."notmuch-web";
+  "notzero" = dontDistribute super."notzero";
+  "np-extras" = dontDistribute super."np-extras";
+  "np-linear" = dontDistribute super."np-linear";
+  "nptools" = dontDistribute super."nptools";
+  "nth-prime" = dontDistribute super."nth-prime";
+  "nthable" = dontDistribute super."nthable";
+  "ntp-control" = dontDistribute super."ntp-control";
+  "null-canvas" = dontDistribute super."null-canvas";
+  "nullary" = dontDistribute super."nullary";
+  "number" = dontDistribute super."number";
+  "numbering" = dontDistribute super."numbering";
+  "numerals" = dontDistribute super."numerals";
+  "numerals-base" = dontDistribute super."numerals-base";
+  "numeric-limits" = dontDistribute super."numeric-limits";
+  "numeric-prelude" = dontDistribute super."numeric-prelude";
+  "numeric-qq" = dontDistribute super."numeric-qq";
+  "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
+  "numeric-tools" = dontDistribute super."numeric-tools";
+  "numericpeano" = dontDistribute super."numericpeano";
+  "nums" = dontDistribute super."nums";
+  "numtype" = dontDistribute super."numtype";
+  "numtype-tf" = dontDistribute super."numtype-tf";
+  "nurbs" = dontDistribute super."nurbs";
+  "nvim-hs" = dontDistribute super."nvim-hs";
+  "nvim-hs-contrib" = dontDistribute super."nvim-hs-contrib";
+  "nyan" = dontDistribute super."nyan";
+  "nylas" = dontDistribute super."nylas";
+  "nymphaea" = dontDistribute super."nymphaea";
+  "oauthenticated" = dontDistribute super."oauthenticated";
+  "obdd" = dontDistribute super."obdd";
+  "oberon0" = dontDistribute super."oberon0";
+  "obj" = dontDistribute super."obj";
+  "objectid" = dontDistribute super."objectid";
+  "observable-sharing" = dontDistribute super."observable-sharing";
+  "octohat" = dontDistribute super."octohat";
+  "octopus" = dontDistribute super."octopus";
+  "oculus" = dontDistribute super."oculus";
+  "oeis" = dontDistribute super."oeis";
+  "off-simple" = dontDistribute super."off-simple";
+  "ohloh-hs" = dontDistribute super."ohloh-hs";
+  "oi" = dontDistribute super."oi";
+  "oidc-client" = dontDistribute super."oidc-client";
+  "ois-input-manager" = dontDistribute super."ois-input-manager";
+  "old-version" = dontDistribute super."old-version";
+  "olwrapper" = dontDistribute super."olwrapper";
+  "omaketex" = dontDistribute super."omaketex";
+  "omega" = dontDistribute super."omega";
+  "omnicodec" = dontDistribute super."omnicodec";
+  "on-a-horse" = dontDistribute super."on-a-horse";
+  "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel";
+  "one-liner" = dontDistribute super."one-liner";
+  "one-time-password" = dontDistribute super."one-time-password";
+  "oneOfN" = dontDistribute super."oneOfN";
+  "oneormore" = dontDistribute super."oneormore";
+  "only" = dontDistribute super."only";
+  "onu-course" = dontDistribute super."onu-course";
+  "opaleye-classy" = dontDistribute super."opaleye-classy";
+  "opaleye-sqlite" = dontDistribute super."opaleye-sqlite";
+  "opaleye-trans" = dontDistribute super."opaleye-trans";
+  "open-haddock" = dontDistribute super."open-haddock";
+  "open-pandoc" = dontDistribute super."open-pandoc";
+  "open-symbology" = dontDistribute super."open-symbology";
+  "open-typerep" = dontDistribute super."open-typerep";
+  "open-union" = dontDistribute super."open-union";
+  "open-witness" = dontDistribute super."open-witness";
+  "opencog-atomspace" = dontDistribute super."opencog-atomspace";
+  "opencv-raw" = dontDistribute super."opencv-raw";
+  "opendatatable" = dontDistribute super."opendatatable";
+  "openexchangerates" = dontDistribute super."openexchangerates";
+  "openflow" = dontDistribute super."openflow";
+  "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
+  "opengles" = dontDistribute super."opengles";
+  "openid" = dontDistribute super."openid";
+  "openpgp" = dontDistribute super."openpgp";
+  "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
+  "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
+  "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "openssh-github-keys" = dontDistribute super."openssh-github-keys";
+  "openssl-createkey" = dontDistribute super."openssl-createkey";
+  "opentheory" = dontDistribute super."opentheory";
+  "opentheory-bits" = dontDistribute super."opentheory-bits";
+  "opentheory-byte" = dontDistribute super."opentheory-byte";
+  "opentheory-char" = dontDistribute super."opentheory-char";
+  "opentheory-divides" = dontDistribute super."opentheory-divides";
+  "opentheory-fibonacci" = dontDistribute super."opentheory-fibonacci";
+  "opentheory-parser" = dontDistribute super."opentheory-parser";
+  "opentheory-prime" = dontDistribute super."opentheory-prime";
+  "opentheory-primitive" = dontDistribute super."opentheory-primitive";
+  "opentheory-probability" = dontDistribute super."opentheory-probability";
+  "opentheory-stream" = dontDistribute super."opentheory-stream";
+  "opentheory-unicode" = dontDistribute super."opentheory-unicode";
+  "operational-alacarte" = dontDistribute super."operational-alacarte";
+  "opml" = dontDistribute super."opml";
+  "opn" = dontDistribute super."opn";
+  "optimal-blocks" = dontDistribute super."optimal-blocks";
+  "optimization" = dontDistribute super."optimization";
+  "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
+  "optional" = dontDistribute super."optional";
+  "options-time" = dontDistribute super."options-time";
+  "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "orc" = dontDistribute super."orc";
+  "orchestrate" = dontDistribute super."orchestrate";
+  "orchid" = dontDistribute super."orchid";
+  "orchid-demo" = dontDistribute super."orchid-demo";
+  "ord-adhoc" = dontDistribute super."ord-adhoc";
+  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistics" = dontDistribute super."order-statistics";
+  "ordered" = dontDistribute super."ordered";
+  "orders" = dontDistribute super."orders";
+  "ordrea" = dontDistribute super."ordrea";
+  "organize-imports" = dontDistribute super."organize-imports";
+  "orgmode" = dontDistribute super."orgmode";
+  "orgmode-parse" = dontDistribute super."orgmode-parse";
+  "origami" = dontDistribute super."origami";
+  "os-release" = dontDistribute super."os-release";
+  "osc" = dontDistribute super."osc";
+  "osm-download" = dontDistribute super."osm-download";
+  "oso2pdf" = dontDistribute super."oso2pdf";
+  "osx-ar" = dontDistribute super."osx-ar";
+  "ot" = dontDistribute super."ot";
+  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overture" = dontDistribute super."overture";
+  "pack" = dontDistribute super."pack";
+  "package-o-tron" = dontDistribute super."package-o-tron";
+  "package-vt" = dontDistribute super."package-vt";
+  "packdeps" = dontDistribute super."packdeps";
+  "packed-dawg" = dontDistribute super."packed-dawg";
+  "packedstring" = dontDistribute super."packedstring";
+  "packer" = dontDistribute super."packer";
+  "packman" = dontDistribute super."packman";
+  "packunused" = dontDistribute super."packunused";
+  "pacman-memcache" = dontDistribute super."pacman-memcache";
+  "padKONTROL" = dontDistribute super."padKONTROL";
+  "pagarme" = dontDistribute super."pagarme";
+  "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palindromes" = dontDistribute super."palindromes";
+  "pam" = dontDistribute super."pam";
+  "panda" = dontDistribute super."panda";
+  "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble";
+  "pandoc-crossref" = dontDistribute super."pandoc-crossref";
+  "pandoc-csv2table" = dontDistribute super."pandoc-csv2table";
+  "pandoc-include" = dontDistribute super."pandoc-include";
+  "pandoc-lens" = dontDistribute super."pandoc-lens";
+  "pandoc-placetable" = dontDistribute super."pandoc-placetable";
+  "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams";
+  "pandoc-unlit" = dontDistribute super."pandoc-unlit";
+  "papillon" = dontDistribute super."papillon";
+  "pappy" = dontDistribute super."pappy";
+  "para" = dontDistribute super."para";
+  "paragon" = dontDistribute super."paragon";
+  "parallel-tasks" = dontDistribute super."parallel-tasks";
+  "parallel-tree-search" = dontDistribute super."parallel-tree-search";
+  "parameterized-data" = dontDistribute super."parameterized-data";
+  "parco" = dontDistribute super."parco";
+  "parco-attoparsec" = dontDistribute super."parco-attoparsec";
+  "parco-parsec" = dontDistribute super."parco-parsec";
+  "parcom-lib" = dontDistribute super."parcom-lib";
+  "parconc-examples" = dontDistribute super."parconc-examples";
+  "parport" = dontDistribute super."parport";
+  "parse-dimacs" = dontDistribute super."parse-dimacs";
+  "parse-help" = dontDistribute super."parse-help";
+  "parsec-extra" = dontDistribute super."parsec-extra";
+  "parsec-numbers" = dontDistribute super."parsec-numbers";
+  "parsec-parsers" = dontDistribute super."parsec-parsers";
+  "parsec-permutation" = dontDistribute super."parsec-permutation";
+  "parsec-tagsoup" = dontDistribute super."parsec-tagsoup";
+  "parsec-trace" = dontDistribute super."parsec-trace";
+  "parsec-utils" = dontDistribute super."parsec-utils";
+  "parsec1" = dontDistribute super."parsec1";
+  "parsec2" = dontDistribute super."parsec2";
+  "parsec3" = dontDistribute super."parsec3";
+  "parsec3-numbers" = dontDistribute super."parsec3-numbers";
+  "parsedate" = dontDistribute super."parsedate";
+  "parseerror-eq" = dontDistribute super."parseerror-eq";
+  "parsek" = dontDistribute super."parsek";
+  "parsely" = dontDistribute super."parsely";
+  "parser-helper" = dontDistribute super."parser-helper";
+  "parser241" = dontDistribute super."parser241";
+  "parsergen" = dontDistribute super."parsergen";
+  "parsestar" = dontDistribute super."parsestar";
+  "parsimony" = dontDistribute super."parsimony";
+  "partial" = dontDistribute super."partial";
+  "partial-lens" = dontDistribute super."partial-lens";
+  "partial-uri" = dontDistribute super."partial-uri";
+  "partly" = dontDistribute super."partly";
+  "passage" = dontDistribute super."passage";
+  "passwords" = dontDistribute super."passwords";
+  "pastis" = dontDistribute super."pastis";
+  "pasty" = dontDistribute super."pasty";
+  "patch-combinators" = dontDistribute super."patch-combinators";
+  "patch-image" = dontDistribute super."patch-image";
+  "pathfinding" = dontDistribute super."pathfinding";
+  "pathfindingcore" = dontDistribute super."pathfindingcore";
+  "pathtype" = dontDistribute super."pathtype";
+  "patronscraper" = dontDistribute super."patronscraper";
+  "patterns" = dontDistribute super."patterns";
+  "paymill" = dontDistribute super."paymill";
+  "paypal-adaptive-hoops" = dontDistribute super."paypal-adaptive-hoops";
+  "paypal-api" = dontDistribute super."paypal-api";
+  "pb" = dontDistribute super."pb";
+  "pbc4hs" = dontDistribute super."pbc4hs";
+  "pbkdf" = dontDistribute super."pbkdf";
+  "pcap-conduit" = dontDistribute super."pcap-conduit";
+  "pcap-enumerator" = dontDistribute super."pcap-enumerator";
+  "pcd-loader" = dontDistribute super."pcd-loader";
+  "pcf" = dontDistribute super."pcf";
+  "pcg-random" = dontDistribute super."pcg-random";
+  "pcre-less" = dontDistribute super."pcre-less";
+  "pcre-light-extra" = dontDistribute super."pcre-light-extra";
+  "pdf-toolbox-viewer" = dontDistribute super."pdf-toolbox-viewer";
+  "pdf2line" = dontDistribute super."pdf2line";
+  "pdfsplit" = dontDistribute super."pdfsplit";
+  "pdynload" = dontDistribute super."pdynload";
+  "peakachu" = dontDistribute super."peakachu";
+  "peano" = dontDistribute super."peano";
+  "peano-inf" = dontDistribute super."peano-inf";
+  "pec" = dontDistribute super."pec";
+  "pecoff" = dontDistribute super."pecoff";
+  "peg" = dontDistribute super."peg";
+  "peggy" = dontDistribute super."peggy";
+  "pell" = dontDistribute super."pell";
+  "penn-treebank" = dontDistribute super."penn-treebank";
+  "penny" = dontDistribute super."penny";
+  "penny-bin" = dontDistribute super."penny-bin";
+  "penny-lib" = dontDistribute super."penny-lib";
+  "peparser" = dontDistribute super."peparser";
+  "perceptron" = dontDistribute super."perceptron";
+  "perdure" = dontDistribute super."perdure";
+  "period" = dontDistribute super."period";
+  "perm" = dontDistribute super."perm";
+  "permutation" = dontDistribute super."permutation";
+  "permute" = dontDistribute super."permute";
+  "persist2er" = dontDistribute super."persist2er";
+  "persistable-record" = dontDistribute super."persistable-record";
+  "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
+  "persistent-cereal" = dontDistribute super."persistent-cereal";
+  "persistent-equivalence" = dontDistribute super."persistent-equivalence";
+  "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
+  "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
+  "persistent-map" = dontDistribute super."persistent-map";
+  "persistent-odbc" = dontDistribute super."persistent-odbc";
+  "persistent-protobuf" = dontDistribute super."persistent-protobuf";
+  "persistent-ratelimit" = dontDistribute super."persistent-ratelimit";
+  "persistent-redis" = dontDistribute super."persistent-redis";
+  "persistent-vector" = dontDistribute super."persistent-vector";
+  "persistent-zookeeper" = dontDistribute super."persistent-zookeeper";
+  "persona" = dontDistribute super."persona";
+  "persona-idp" = dontDistribute super."persona-idp";
+  "pesca" = dontDistribute super."pesca";
+  "peyotls" = dontDistribute super."peyotls";
+  "peyotls-codec" = dontDistribute super."peyotls-codec";
+  "pez" = dontDistribute super."pez";
+  "pg-harness" = dontDistribute super."pg-harness";
+  "pg-harness-client" = dontDistribute super."pg-harness-client";
+  "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pgdl" = dontDistribute super."pgdl";
+  "pgm" = dontDistribute super."pgm";
+  "pgsql-simple" = dontDistribute super."pgsql-simple";
+  "pgstream" = dontDistribute super."pgstream";
+  "phasechange" = dontDistribute super."phasechange";
+  "phizzle" = dontDistribute super."phizzle";
+  "phoityne" = dontDistribute super."phoityne";
+  "phone-numbers" = dontDistribute super."phone-numbers";
+  "phone-push" = dontDistribute super."phone-push";
+  "phonetic-code" = dontDistribute super."phonetic-code";
+  "phooey" = dontDistribute super."phooey";
+  "photoname" = dontDistribute super."photoname";
+  "phraskell" = dontDistribute super."phraskell";
+  "phybin" = dontDistribute super."phybin";
+  "pi-calculus" = dontDistribute super."pi-calculus";
+  "pia-forward" = dontDistribute super."pia-forward";
+  "pianola" = dontDistribute super."pianola";
+  "picologic" = dontDistribute super."picologic";
+  "picosat" = dontDistribute super."picosat";
+  "piet" = dontDistribute super."piet";
+  "piki" = dontDistribute super."piki";
+  "pinboard" = dontDistribute super."pinboard";
+  "pipe-enumerator" = dontDistribute super."pipe-enumerator";
+  "pipeclip" = dontDistribute super."pipeclip";
+  "pipes-async" = dontDistribute super."pipes-async";
+  "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
+  "pipes-cellular" = dontDistribute super."pipes-cellular";
+  "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
+  "pipes-cereal" = dontDistribute super."pipes-cereal";
+  "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus";
+  "pipes-conduit" = dontDistribute super."pipes-conduit";
+  "pipes-core" = dontDistribute super."pipes-core";
+  "pipes-courier" = dontDistribute super."pipes-courier";
+  "pipes-errors" = dontDistribute super."pipes-errors";
+  "pipes-extra" = dontDistribute super."pipes-extra";
+  "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-http" = dontDistribute super."pipes-http";
+  "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-network-tls" = dontDistribute super."pipes-network-tls";
+  "pipes-p2p" = dontDistribute super."pipes-p2p";
+  "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
+  "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple";
+  "pipes-rt" = dontDistribute super."pipes-rt";
+  "pipes-shell" = dontDistribute super."pipes-shell";
+  "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
+  "pipes-transduce" = dontDistribute super."pipes-transduce";
+  "pipes-vector" = dontDistribute super."pipes-vector";
+  "pipes-wai" = doDistribute super."pipes-wai_3_0_2";
+  "pipes-websockets" = dontDistribute super."pipes-websockets";
+  "pipes-zeromq4" = dontDistribute super."pipes-zeromq4";
+  "pipes-zlib" = dontDistribute super."pipes-zlib";
+  "pisigma" = dontDistribute super."pisigma";
+  "pit" = dontDistribute super."pit";
+  "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
+  "pkcs1" = dontDistribute super."pkcs1";
+  "pkcs7" = dontDistribute super."pkcs7";
+  "pkggraph" = dontDistribute super."pkggraph";
+  "pktree" = dontDistribute super."pktree";
+  "plailude" = dontDistribute super."plailude";
+  "planar-graph" = dontDistribute super."planar-graph";
+  "plat" = dontDistribute super."plat";
+  "playlists" = dontDistribute super."playlists";
+  "plist" = dontDistribute super."plist";
+  "plist-buddy" = dontDistribute super."plist-buddy";
+  "plivo" = dontDistribute super."plivo";
+  "plot-lab" = dontDistribute super."plot-lab";
+  "plotfont" = dontDistribute super."plotfont";
+  "plotserver-api" = dontDistribute super."plotserver-api";
+  "plugins" = dontDistribute super."plugins";
+  "plugins-auto" = dontDistribute super."plugins-auto";
+  "plugins-multistage" = dontDistribute super."plugins-multistage";
+  "plumbers" = dontDistribute super."plumbers";
+  "ply-loader" = dontDistribute super."ply-loader";
+  "png-file" = dontDistribute super."png-file";
+  "pngload" = dontDistribute super."pngload";
+  "pngload-fixed" = dontDistribute super."pngload-fixed";
+  "pnm" = dontDistribute super."pnm";
+  "pocket-dns" = dontDistribute super."pocket-dns";
+  "pointfree" = dontDistribute super."pointfree";
+  "pointful" = dontDistribute super."pointful";
+  "pointless-fun" = dontDistribute super."pointless-fun";
+  "pointless-haskell" = dontDistribute super."pointless-haskell";
+  "pointless-lenses" = dontDistribute super."pointless-lenses";
+  "pointless-rewrite" = dontDistribute super."pointless-rewrite";
+  "poker-eval" = dontDistribute super."poker-eval";
+  "pokitdok" = dontDistribute super."pokitdok";
+  "polar" = dontDistribute super."polar";
+  "polar-configfile" = dontDistribute super."polar-configfile";
+  "polar-shader" = dontDistribute super."polar-shader";
+  "polh-lexicon" = dontDistribute super."polh-lexicon";
+  "polimorf" = dontDistribute super."polimorf";
+  "poll" = dontDistribute super."poll";
+  "polyToMonoid" = dontDistribute super."polyToMonoid";
+  "polymap" = dontDistribute super."polymap";
+  "polynomial" = dontDistribute super."polynomial";
+  "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
+  "polyseq" = dontDistribute super."polyseq";
+  "polysoup" = dontDistribute super."polysoup";
+  "polytypeable" = dontDistribute super."polytypeable";
+  "polytypeable-utils" = dontDistribute super."polytypeable-utils";
+  "ponder" = dontDistribute super."ponder";
+  "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
+  "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
+  "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
+  "pony" = dontDistribute super."pony";
+  "pool" = dontDistribute super."pool";
+  "pool-conduit" = dontDistribute super."pool-conduit";
+  "pooled-io" = dontDistribute super."pooled-io";
+  "pop3-client" = dontDistribute super."pop3-client";
+  "popenhs" = dontDistribute super."popenhs";
+  "poppler" = dontDistribute super."poppler";
+  "populate-setup-exe-cache" = dontDistribute super."populate-setup-exe-cache";
+  "portable-lines" = dontDistribute super."portable-lines";
+  "portaudio" = dontDistribute super."portaudio";
+  "porte" = dontDistribute super."porte";
+  "porter" = dontDistribute super."porter";
+  "ports" = dontDistribute super."ports";
+  "ports-tools" = dontDistribute super."ports-tools";
+  "positive" = dontDistribute super."positive";
+  "posix-acl" = dontDistribute super."posix-acl";
+  "posix-escape" = dontDistribute super."posix-escape";
+  "posix-filelock" = dontDistribute super."posix-filelock";
+  "posix-paths" = dontDistribute super."posix-paths";
+  "posix-pty" = dontDistribute super."posix-pty";
+  "posix-timer" = dontDistribute super."posix-timer";
+  "posix-waitpid" = dontDistribute super."posix-waitpid";
+  "possible" = dontDistribute super."possible";
+  "postcodes" = dontDistribute super."postcodes";
+  "postgresql-config" = dontDistribute super."postgresql-config";
+  "postgresql-connector" = dontDistribute super."postgresql-connector";
+  "postgresql-copy-escape" = dontDistribute super."postgresql-copy-escape";
+  "postgresql-cube" = dontDistribute super."postgresql-cube";
+  "postgresql-error-codes" = dontDistribute super."postgresql-error-codes";
+  "postgresql-orm" = dontDistribute super."postgresql-orm";
+  "postgresql-query" = dontDistribute super."postgresql-query";
+  "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
+  "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
+  "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-typed" = dontDistribute super."postgresql-typed";
+  "postgrest" = dontDistribute super."postgrest";
+  "postie" = dontDistribute super."postie";
+  "postmark" = dontDistribute super."postmark";
+  "postmaster" = dontDistribute super."postmaster";
+  "potato-tool" = dontDistribute super."potato-tool";
+  "potrace" = dontDistribute super."potrace";
+  "potrace-diagrams" = dontDistribute super."potrace-diagrams";
+  "powermate" = dontDistribute super."powermate";
+  "powerpc" = dontDistribute super."powerpc";
+  "ppm" = dontDistribute super."ppm";
+  "pqc" = dontDistribute super."pqc";
+  "pqueue-mtl" = dontDistribute super."pqueue-mtl";
+  "practice-room" = dontDistribute super."practice-room";
+  "precis" = dontDistribute super."precis";
+  "pred-trie" = dontDistribute super."pred-trie";
+  "predicates" = dontDistribute super."predicates";
+  "prednote-test" = dontDistribute super."prednote-test";
+  "prefork" = dontDistribute super."prefork";
+  "pregame" = dontDistribute super."pregame";
+  "prelude-edsl" = dontDistribute super."prelude-edsl";
+  "prelude-generalize" = dontDistribute super."prelude-generalize";
+  "prelude-plus" = dontDistribute super."prelude-plus";
+  "prelude-prime" = dontDistribute super."prelude-prime";
+  "prelude-safeenum" = dontDistribute super."prelude-safeenum";
+  "preprocess-haskell" = dontDistribute super."preprocess-haskell";
+  "preprocessor-tools" = dontDistribute super."preprocessor-tools";
+  "present" = dontDistribute super."present";
+  "press" = dontDistribute super."press";
+  "presto-hdbc" = dontDistribute super."presto-hdbc";
+  "prettify" = dontDistribute super."prettify";
+  "pretty-compact" = dontDistribute super."pretty-compact";
+  "pretty-error" = dontDistribute super."pretty-error";
+  "pretty-hex" = dontDistribute super."pretty-hex";
+  "pretty-ncols" = dontDistribute super."pretty-ncols";
+  "pretty-sop" = dontDistribute super."pretty-sop";
+  "pretty-tree" = dontDistribute super."pretty-tree";
+  "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-uniq" = dontDistribute super."prim-uniq";
+  "primula-board" = dontDistribute super."primula-board";
+  "primula-bot" = dontDistribute super."primula-bot";
+  "printf-mauke" = dontDistribute super."printf-mauke";
+  "printxosd" = dontDistribute super."printxosd";
+  "priority-queue" = dontDistribute super."priority-queue";
+  "priority-sync" = dontDistribute super."priority-sync";
+  "privileged-concurrency" = dontDistribute super."privileged-concurrency";
+  "prizm" = dontDistribute super."prizm";
+  "probability" = dontDistribute super."probability";
+  "probable" = dontDistribute super."probable";
+  "proc" = dontDistribute super."proc";
+  "process-conduit" = dontDistribute super."process-conduit";
+  "process-iterio" = dontDistribute super."process-iterio";
+  "process-leksah" = dontDistribute super."process-leksah";
+  "process-listlike" = dontDistribute super."process-listlike";
+  "process-progress" = dontDistribute super."process-progress";
+  "process-qq" = dontDistribute super."process-qq";
+  "process-streaming" = dontDistribute super."process-streaming";
+  "processing" = dontDistribute super."processing";
+  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
+  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
+  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
+  "procstat" = dontDistribute super."procstat";
+  "proctest" = dontDistribute super."proctest";
+  "prof2dot" = dontDistribute super."prof2dot";
+  "prof2pretty" = dontDistribute super."prof2pretty";
+  "profiteur" = dontDistribute super."profiteur";
+  "progress" = dontDistribute super."progress";
+  "progressbar" = dontDistribute super."progressbar";
+  "progression" = dontDistribute super."progression";
+  "progressive" = dontDistribute super."progressive";
+  "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings";
+  "projection" = dontDistribute super."projection";
+  "prolog" = dontDistribute super."prolog";
+  "prolog-graph" = dontDistribute super."prolog-graph";
+  "prolog-graph-lib" = dontDistribute super."prolog-graph-lib";
+  "prologue" = dontDistribute super."prologue";
+  "promise" = dontDistribute super."promise";
+  "promises" = dontDistribute super."promises";
+  "prompt" = dontDistribute super."prompt";
+  "propane" = dontDistribute super."propane";
+  "propellor" = dontDistribute super."propellor";
+  "properties" = dontDistribute super."properties";
+  "property-list" = dontDistribute super."property-list";
+  "proplang" = dontDistribute super."proplang";
+  "props" = dontDistribute super."props";
+  "prosper" = dontDistribute super."prosper";
+  "proteaaudio" = dontDistribute super."proteaaudio";
+  "protobuf-native" = dontDistribute super."protobuf-native";
+  "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork";
+  "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork";
+  "proton-haskell" = dontDistribute super."proton-haskell";
+  "prototype" = dontDistribute super."prototype";
+  "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxy-kindness" = dontDistribute super."proxy-kindness";
+  "pseudo-boolean" = dontDistribute super."pseudo-boolean";
+  "pseudo-trie" = dontDistribute super."pseudo-trie";
+  "pseudomacros" = dontDistribute super."pseudomacros";
+  "pub" = dontDistribute super."pub";
+  "publicsuffixlist" = dontDistribute super."publicsuffixlist";
+  "publicsuffixlistcreate" = dontDistribute super."publicsuffixlistcreate";
+  "pubnub" = dontDistribute super."pubnub";
+  "pubsub" = dontDistribute super."pubsub";
+  "puffytools" = dontDistribute super."puffytools";
+  "pugixml" = dontDistribute super."pugixml";
+  "pugs-DrIFT" = dontDistribute super."pugs-DrIFT";
+  "pugs-HsSyck" = dontDistribute super."pugs-HsSyck";
+  "pugs-compat" = dontDistribute super."pugs-compat";
+  "pugs-hsregex" = dontDistribute super."pugs-hsregex";
+  "pulse-simple" = dontDistribute super."pulse-simple";
+  "punkt" = dontDistribute super."punkt";
+  "punycode" = dontDistribute super."punycode";
+  "puppetresources" = dontDistribute super."puppetresources";
+  "pure-cdb" = dontDistribute super."pure-cdb";
+  "pure-fft" = dontDistribute super."pure-fft";
+  "pure-priority-queue" = dontDistribute super."pure-priority-queue";
+  "pure-priority-queue-tests" = dontDistribute super."pure-priority-queue-tests";
+  "pure-zlib" = dontDistribute super."pure-zlib";
+  "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "push-notify" = dontDistribute super."push-notify";
+  "push-notify-ccs" = dontDistribute super."push-notify-ccs";
+  "push-notify-general" = dontDistribute super."push-notify-general";
+  "pusher-haskell" = dontDistribute super."pusher-haskell";
+  "pusher-http-haskell" = dontDistribute super."pusher-http-haskell";
+  "pushme" = dontDistribute super."pushme";
+  "putlenses" = dontDistribute super."putlenses";
+  "puzzle-draw" = dontDistribute super."puzzle-draw";
+  "puzzle-draw-cmdline" = dontDistribute super."puzzle-draw-cmdline";
+  "pvd" = dontDistribute super."pvd";
+  "pwstore-cli" = dontDistribute super."pwstore-cli";
+  "pxsl-tools" = dontDistribute super."pxsl-tools";
+  "pyffi" = dontDistribute super."pyffi";
+  "pyfi" = dontDistribute super."pyfi";
+  "python-pickle" = dontDistribute super."python-pickle";
+  "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator";
+  "qd" = dontDistribute super."qd";
+  "qd-vec" = dontDistribute super."qd-vec";
+  "qed" = dontDistribute super."qed";
+  "qhull-simple" = dontDistribute super."qhull-simple";
+  "qrcode" = dontDistribute super."qrcode";
+  "qt" = dontDistribute super."qt";
+  "quadratic-irrational" = dontDistribute super."quadratic-irrational";
+  "quantfin" = dontDistribute super."quantfin";
+  "quantities" = dontDistribute super."quantities";
+  "quantum-arrow" = dontDistribute super."quantum-arrow";
+  "qudb" = dontDistribute super."qudb";
+  "quenya-verb" = dontDistribute super."quenya-verb";
+  "querystring-pickle" = dontDistribute super."querystring-pickle";
+  "queue" = dontDistribute super."queue";
+  "queuelike" = dontDistribute super."queuelike";
+  "quick-generator" = dontDistribute super."quick-generator";
+  "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-poly" = dontDistribute super."quickcheck-poly";
+  "quickcheck-properties" = dontDistribute super."quickcheck-properties";
+  "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
+  "quickcheck-property-monad" = dontDistribute super."quickcheck-property-monad";
+  "quickcheck-regex" = dontDistribute super."quickcheck-regex";
+  "quickcheck-relaxng" = dontDistribute super."quickcheck-relaxng";
+  "quickcheck-rematch" = dontDistribute super."quickcheck-rematch";
+  "quickcheck-script" = dontDistribute super."quickcheck-script";
+  "quickcheck-simple" = dontDistribute super."quickcheck-simple";
+  "quickcheck-webdriver" = dontDistribute super."quickcheck-webdriver";
+  "quicklz" = dontDistribute super."quicklz";
+  "quickpull" = dontDistribute super."quickpull";
+  "quickset" = dontDistribute super."quickset";
+  "quickspec" = dontDistribute super."quickspec";
+  "quicktest" = dontDistribute super."quicktest";
+  "quickwebapp" = dontDistribute super."quickwebapp";
+  "quiver" = dontDistribute super."quiver";
+  "quiver-bytestring" = dontDistribute super."quiver-bytestring";
+  "quiver-cell" = dontDistribute super."quiver-cell";
+  "quiver-csv" = dontDistribute super."quiver-csv";
+  "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-http" = dontDistribute super."quiver-http";
+  "quoridor-hs" = dontDistribute super."quoridor-hs";
+  "qux" = dontDistribute super."qux";
+  "rabocsv2qif" = dontDistribute super."rabocsv2qif";
+  "rad" = dontDistribute super."rad";
+  "radian" = dontDistribute super."radian";
+  "radium" = dontDistribute super."radium";
+  "radium-formula-parser" = dontDistribute super."radium-formula-parser";
+  "radix" = dontDistribute super."radix";
+  "rados-haskell" = dontDistribute super."rados-haskell";
+  "rail-compiler-editor" = dontDistribute super."rail-compiler-editor";
+  "rainbow-tests" = dontDistribute super."rainbow-tests";
+  "rake" = dontDistribute super."rake";
+  "rakhana" = dontDistribute super."rakhana";
+  "ralist" = dontDistribute super."ralist";
+  "rallod" = dontDistribute super."rallod";
+  "raml" = dontDistribute super."raml";
+  "rand-vars" = dontDistribute super."rand-vars";
+  "randfile" = dontDistribute super."randfile";
+  "random-access-list" = dontDistribute super."random-access-list";
+  "random-derive" = dontDistribute super."random-derive";
+  "random-eff" = dontDistribute super."random-eff";
+  "random-effin" = dontDistribute super."random-effin";
+  "random-extras" = dontDistribute super."random-extras";
+  "random-hypergeometric" = dontDistribute super."random-hypergeometric";
+  "random-stream" = dontDistribute super."random-stream";
+  "random-variates" = dontDistribute super."random-variates";
+  "randomgen" = dontDistribute super."randomgen";
+  "randproc" = dontDistribute super."randproc";
+  "randsolid" = dontDistribute super."randsolid";
+  "range-set-list" = dontDistribute super."range-set-list";
+  "range-space" = dontDistribute super."range-space";
+  "rangemin" = dontDistribute super."rangemin";
+  "ranges" = dontDistribute super."ranges";
+  "rascal" = dontDistribute super."rascal";
+  "rate-limit" = dontDistribute super."rate-limit";
+  "ratio-int" = dontDistribute super."ratio-int";
+  "raven-haskell" = dontDistribute super."raven-haskell";
+  "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
+  "rawstring-qm" = dontDistribute super."rawstring-qm";
+  "razom-text-util" = dontDistribute super."razom-text-util";
+  "rbr" = dontDistribute super."rbr";
+  "rclient" = dontDistribute super."rclient";
+  "rcu" = dontDistribute super."rcu";
+  "rdf4h" = dontDistribute super."rdf4h";
+  "rdioh" = dontDistribute super."rdioh";
+  "rdtsc" = dontDistribute super."rdtsc";
+  "rdtsc-enolan" = dontDistribute super."rdtsc-enolan";
+  "re2" = dontDistribute super."re2";
+  "react-flux" = dontDistribute super."react-flux";
+  "react-haskell" = dontDistribute super."react-haskell";
+  "reaction-logic" = dontDistribute super."reaction-logic";
+  "reactive" = dontDistribute super."reactive";
+  "reactive-bacon" = dontDistribute super."reactive-bacon";
+  "reactive-balsa" = dontDistribute super."reactive-balsa";
+  "reactive-banana" = dontDistribute super."reactive-banana";
+  "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
+  "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
+  "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
+  "reactive-glut" = dontDistribute super."reactive-glut";
+  "reactive-haskell" = dontDistribute super."reactive-haskell";
+  "reactive-io" = dontDistribute super."reactive-io";
+  "reactive-thread" = dontDistribute super."reactive-thread";
+  "reactor" = dontDistribute super."reactor";
+  "read-bounded" = dontDistribute super."read-bounded";
+  "readable" = dontDistribute super."readable";
+  "readline-statevar" = dontDistribute super."readline-statevar";
+  "readpyc" = dontDistribute super."readpyc";
+  "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
+  "reasonable-lens" = dontDistribute super."reasonable-lens";
+  "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "recaptcha" = dontDistribute super."recaptcha";
+  "record" = dontDistribute super."record";
+  "record-aeson" = dontDistribute super."record-aeson";
+  "record-gl" = dontDistribute super."record-gl";
+  "record-preprocessor" = dontDistribute super."record-preprocessor";
+  "record-syntax" = dontDistribute super."record-syntax";
+  "records" = dontDistribute super."records";
+  "records-th" = dontDistribute super."records-th";
+  "recursion-schemes" = dontDistribute super."recursion-schemes";
+  "recursive-line-count" = dontDistribute super."recursive-line-count";
+  "redHandlers" = dontDistribute super."redHandlers";
+  "reddit" = dontDistribute super."reddit";
+  "redis" = dontDistribute super."redis";
+  "redis-hs" = dontDistribute super."redis-hs";
+  "redis-job-queue" = dontDistribute super."redis-job-queue";
+  "redis-simple" = dontDistribute super."redis-simple";
+  "redo" = dontDistribute super."redo";
+  "reedsolomon" = dontDistribute super."reedsolomon";
+  "reenact" = dontDistribute super."reenact";
+  "reexport-crypto-random" = dontDistribute super."reexport-crypto-random";
+  "ref" = dontDistribute super."ref";
+  "ref-mtl" = dontDistribute super."ref-mtl";
+  "ref-tf" = dontDistribute super."ref-tf";
+  "refcount" = dontDistribute super."refcount";
+  "reference" = dontDistribute super."reference";
+  "references" = dontDistribute super."references";
+  "refh" = dontDistribute super."refh";
+  "refined" = dontDistribute super."refined";
+  "reflection-extras" = dontDistribute super."reflection-extras";
+  "reflection-without-remorse" = dontDistribute super."reflection-without-remorse";
+  "reflex" = dontDistribute super."reflex";
+  "reflex-animation" = dontDistribute super."reflex-animation";
+  "reflex-dom" = dontDistribute super."reflex-dom";
+  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
+  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
+  "regex-compat-tdfa" = dontDistribute super."regex-compat-tdfa";
+  "regex-deriv" = dontDistribute super."regex-deriv";
+  "regex-dfa" = dontDistribute super."regex-dfa";
+  "regex-easy" = dontDistribute super."regex-easy";
+  "regex-genex" = dontDistribute super."regex-genex";
+  "regex-parsec" = dontDistribute super."regex-parsec";
+  "regex-pderiv" = dontDistribute super."regex-pderiv";
+  "regex-posix-unittest" = dontDistribute super."regex-posix-unittest";
+  "regex-tdfa-pipes" = dontDistribute super."regex-tdfa-pipes";
+  "regex-tdfa-quasiquoter" = dontDistribute super."regex-tdfa-quasiquoter";
+  "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
+  "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
+  "regex-tre" = dontDistribute super."regex-tre";
+  "regex-xmlschema" = dontDistribute super."regex-xmlschema";
+  "regexchar" = dontDistribute super."regexchar";
+  "regexdot" = dontDistribute super."regexdot";
+  "regexp-tries" = dontDistribute super."regexp-tries";
+  "regexpr" = dontDistribute super."regexpr";
+  "regexpr-symbolic" = dontDistribute super."regexpr-symbolic";
+  "regexqq" = dontDistribute super."regexqq";
+  "regional-pointers" = dontDistribute super."regional-pointers";
+  "regions" = dontDistribute super."regions";
+  "regions-monadsfd" = dontDistribute super."regions-monadsfd";
+  "regions-monadstf" = dontDistribute super."regions-monadstf";
+  "regions-mtl" = dontDistribute super."regions-mtl";
+  "regress" = dontDistribute super."regress";
+  "regular" = dontDistribute super."regular";
+  "regular-extras" = dontDistribute super."regular-extras";
+  "regular-web" = dontDistribute super."regular-web";
+  "regular-xmlpickler" = dontDistribute super."regular-xmlpickler";
+  "reheat" = dontDistribute super."reheat";
+  "rehoo" = dontDistribute super."rehoo";
+  "rei" = dontDistribute super."rei";
+  "reified-records" = dontDistribute super."reified-records";
+  "reify" = dontDistribute super."reify";
+  "relacion" = dontDistribute super."relacion";
+  "relation" = dontDistribute super."relation";
+  "relational-postgresql8" = dontDistribute super."relational-postgresql8";
+  "relational-query" = dontDistribute super."relational-query";
+  "relational-query-HDBC" = dontDistribute super."relational-query-HDBC";
+  "relational-record" = dontDistribute super."relational-record";
+  "relational-record-examples" = dontDistribute super."relational-record-examples";
+  "relational-schemas" = dontDistribute super."relational-schemas";
+  "relative-date" = dontDistribute super."relative-date";
+  "relit" = dontDistribute super."relit";
+  "rematch" = dontDistribute super."rematch";
+  "rematch-text" = dontDistribute super."rematch-text";
+  "remote" = dontDistribute super."remote";
+  "remote-debugger" = dontDistribute super."remote-debugger";
+  "remotion" = dontDistribute super."remotion";
+  "renderable" = dontDistribute super."renderable";
+  "reord" = dontDistribute super."reord";
+  "reorderable" = dontDistribute super."reorderable";
+  "repa-array" = dontDistribute super."repa-array";
+  "repa-bytestring" = dontDistribute super."repa-bytestring";
+  "repa-convert" = dontDistribute super."repa-convert";
+  "repa-eval" = dontDistribute super."repa-eval";
+  "repa-examples" = dontDistribute super."repa-examples";
+  "repa-fftw" = dontDistribute super."repa-fftw";
+  "repa-flow" = dontDistribute super."repa-flow";
+  "repa-linear-algebra" = dontDistribute super."repa-linear-algebra";
+  "repa-plugin" = dontDistribute super."repa-plugin";
+  "repa-scalar" = dontDistribute super."repa-scalar";
+  "repa-series" = dontDistribute super."repa-series";
+  "repa-sndfile" = dontDistribute super."repa-sndfile";
+  "repa-stream" = dontDistribute super."repa-stream";
+  "repa-v4l2" = dontDistribute super."repa-v4l2";
+  "repl" = dontDistribute super."repl";
+  "repl-toolkit" = dontDistribute super."repl-toolkit";
+  "repline" = dontDistribute super."repline";
+  "repo-based-blog" = dontDistribute super."repo-based-blog";
+  "repr" = dontDistribute super."repr";
+  "repr-tree-syb" = dontDistribute super."repr-tree-syb";
+  "representable-functors" = dontDistribute super."representable-functors";
+  "representable-profunctors" = dontDistribute super."representable-profunctors";
+  "representable-tries" = dontDistribute super."representable-tries";
+  "request-monad" = dontDistribute super."request-monad";
+  "reserve" = dontDistribute super."reserve";
+  "resistor-cube" = dontDistribute super."resistor-cube";
+  "resource-effect" = dontDistribute super."resource-effect";
+  "resource-embed" = dontDistribute super."resource-embed";
+  "resource-pool-catchio" = dontDistribute super."resource-pool-catchio";
+  "resource-pool-monad" = dontDistribute super."resource-pool-monad";
+  "resource-simple" = dontDistribute super."resource-simple";
+  "respond" = dontDistribute super."respond";
+  "rest-example" = dontDistribute super."rest-example";
+  "restful-snap" = dontDistribute super."restful-snap";
+  "restricted-workers" = dontDistribute super."restricted-workers";
+  "restyle" = dontDistribute super."restyle";
+  "resumable-exceptions" = dontDistribute super."resumable-exceptions";
+  "rethinkdb-model" = dontDistribute super."rethinkdb-model";
+  "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
+  "retryer" = dontDistribute super."retryer";
+  "revdectime" = dontDistribute super."revdectime";
+  "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-geocoding" = dontDistribute super."reverse-geocoding";
+  "reversi" = dontDistribute super."reversi";
+  "rewrite" = dontDistribute super."rewrite";
+  "rewriting" = dontDistribute super."rewriting";
+  "rex" = dontDistribute super."rex";
+  "rezoom" = dontDistribute super."rezoom";
+  "rfc3339" = dontDistribute super."rfc3339";
+  "rhythm-game-tutorial" = dontDistribute super."rhythm-game-tutorial";
+  "richreports" = dontDistribute super."richreports";
+  "riemann" = dontDistribute super."riemann";
+  "riff" = dontDistribute super."riff";
+  "ring-buffer" = dontDistribute super."ring-buffer";
+  "riot" = dontDistribute super."riot";
+  "ripple" = dontDistribute super."ripple";
+  "ripple-federation" = dontDistribute super."ripple-federation";
+  "risc386" = dontDistribute super."risc386";
+  "rivers" = dontDistribute super."rivers";
+  "rivet" = dontDistribute super."rivet";
+  "rivet-core" = dontDistribute super."rivet-core";
+  "rivet-migration" = dontDistribute super."rivet-migration";
+  "rivet-simple-deploy" = dontDistribute super."rivet-simple-deploy";
+  "rlglue" = dontDistribute super."rlglue";
+  "rmonad" = dontDistribute super."rmonad";
+  "rncryptor" = dontDistribute super."rncryptor";
+  "rng-utils" = dontDistribute super."rng-utils";
+  "robin" = dontDistribute super."robin";
+  "robot" = dontDistribute super."robot";
+  "robots-txt" = dontDistribute super."robots-txt";
+  "rocksdb-haskell" = dontDistribute super."rocksdb-haskell";
+  "roguestar" = dontDistribute super."roguestar";
+  "roguestar-engine" = dontDistribute super."roguestar-engine";
+  "roguestar-gl" = dontDistribute super."roguestar-gl";
+  "roguestar-glut" = dontDistribute super."roguestar-glut";
+  "rollbar" = dontDistribute super."rollbar";
+  "roller" = dontDistribute super."roller";
+  "rolling-queue" = dontDistribute super."rolling-queue";
+  "roman-numerals" = dontDistribute super."roman-numerals";
+  "romkan" = dontDistribute super."romkan";
+  "roots" = dontDistribute super."roots";
+  "rope" = dontDistribute super."rope";
+  "rosa" = dontDistribute super."rosa";
+  "rose-trie" = dontDistribute super."rose-trie";
+  "roshask" = dontDistribute super."roshask";
+  "rosso" = dontDistribute super."rosso";
+  "rot13" = dontDistribute super."rot13";
+  "rotating-log" = dontDistribute super."rotating-log";
+  "rounding" = dontDistribute super."rounding";
+  "roundtrip" = dontDistribute super."roundtrip";
+  "roundtrip-aeson" = dontDistribute super."roundtrip-aeson";
+  "roundtrip-string" = dontDistribute super."roundtrip-string";
+  "roundtrip-xml" = dontDistribute super."roundtrip-xml";
+  "route-generator" = dontDistribute super."route-generator";
+  "route-planning" = dontDistribute super."route-planning";
+  "rowrecord" = dontDistribute super."rowrecord";
+  "rpc" = dontDistribute super."rpc";
+  "rpc-framework" = dontDistribute super."rpc-framework";
+  "rpf" = dontDistribute super."rpf";
+  "rpm" = dontDistribute super."rpm";
+  "rsagl" = dontDistribute super."rsagl";
+  "rsagl-frp" = dontDistribute super."rsagl-frp";
+  "rsagl-math" = dontDistribute super."rsagl-math";
+  "rspp" = dontDistribute super."rspp";
+  "rss" = dontDistribute super."rss";
+  "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
+  "rtld" = dontDistribute super."rtld";
+  "rtlsdr" = dontDistribute super."rtlsdr";
+  "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";
+  "rtorrent-state" = dontDistribute super."rtorrent-state";
+  "rubberband" = dontDistribute super."rubberband";
+  "ruby-marshal" = dontDistribute super."ruby-marshal";
+  "ruby-qq" = dontDistribute super."ruby-qq";
+  "ruff" = dontDistribute super."ruff";
+  "ruler" = dontDistribute super."ruler";
+  "ruler-core" = dontDistribute super."ruler-core";
+  "rungekutta" = dontDistribute super."rungekutta";
+  "runghc" = dontDistribute super."runghc";
+  "rwlock" = dontDistribute super."rwlock";
+  "rws" = dontDistribute super."rws";
+  "s-cargot" = dontDistribute super."s-cargot";
+  "s3-signer" = dontDistribute super."s3-signer";
+  "safe-access" = dontDistribute super."safe-access";
+  "safe-failure" = dontDistribute super."safe-failure";
+  "safe-failure-cme" = dontDistribute super."safe-failure-cme";
+  "safe-freeze" = dontDistribute super."safe-freeze";
+  "safe-globals" = dontDistribute super."safe-globals";
+  "safe-lazy-io" = dontDistribute super."safe-lazy-io";
+  "safe-length" = dontDistribute super."safe-length";
+  "safe-plugins" = dontDistribute super."safe-plugins";
+  "safe-printf" = dontDistribute super."safe-printf";
+  "safeint" = dontDistribute super."safeint";
+  "safer-file-handles" = dontDistribute super."safer-file-handles";
+  "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring";
+  "safer-file-handles-text" = dontDistribute super."safer-file-handles-text";
+  "saferoute" = dontDistribute super."saferoute";
+  "sai-shape-syb" = dontDistribute super."sai-shape-syb";
+  "saltine" = dontDistribute super."saltine";
+  "saltine-quickcheck" = dontDistribute super."saltine-quickcheck";
+  "salvia" = dontDistribute super."salvia";
+  "salvia-demo" = dontDistribute super."salvia-demo";
+  "salvia-extras" = dontDistribute super."salvia-extras";
+  "salvia-protocol" = dontDistribute super."salvia-protocol";
+  "salvia-sessions" = dontDistribute super."salvia-sessions";
+  "salvia-websocket" = dontDistribute super."salvia-websocket";
+  "sample-frame" = dontDistribute super."sample-frame";
+  "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "samtools" = dontDistribute super."samtools";
+  "samtools-conduit" = dontDistribute super."samtools-conduit";
+  "samtools-enumerator" = dontDistribute super."samtools-enumerator";
+  "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandlib" = dontDistribute super."sandlib";
+  "sarasvati" = dontDistribute super."sarasvati";
+  "sasl" = dontDistribute super."sasl";
+  "sat" = dontDistribute super."sat";
+  "sat-micro-hs" = dontDistribute super."sat-micro-hs";
+  "satchmo" = dontDistribute super."satchmo";
+  "satchmo-backends" = dontDistribute super."satchmo-backends";
+  "satchmo-examples" = dontDistribute super."satchmo-examples";
+  "satchmo-funsat" = dontDistribute super."satchmo-funsat";
+  "satchmo-minisat" = dontDistribute super."satchmo-minisat";
+  "satchmo-toysat" = dontDistribute super."satchmo-toysat";
+  "sbp" = dontDistribute super."sbp";
+  "sbvPlugin" = dontDistribute super."sbvPlugin";
+  "sc3-rdu" = dontDistribute super."sc3-rdu";
+  "scalable-server" = dontDistribute super."scalable-server";
+  "scaleimage" = dontDistribute super."scaleimage";
+  "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scan" = dontDistribute super."scan";
+  "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scat" = dontDistribute super."scat";
+  "scc" = dontDistribute super."scc";
+  "scenegraph" = dontDistribute super."scenegraph";
+  "scgi" = dontDistribute super."scgi";
+  "schedevr" = dontDistribute super."schedevr";
+  "schedule-planner" = dontDistribute super."schedule-planner";
+  "schedyield" = dontDistribute super."schedyield";
+  "scholdoc" = dontDistribute super."scholdoc";
+  "scholdoc-citeproc" = dontDistribute super."scholdoc-citeproc";
+  "scholdoc-texmath" = dontDistribute super."scholdoc-texmath";
+  "scholdoc-types" = dontDistribute super."scholdoc-types";
+  "schonfinkeling" = dontDistribute super."schonfinkeling";
+  "sci-ratio" = dontDistribute super."sci-ratio";
+  "science-constants" = dontDistribute super."science-constants";
+  "science-constants-dimensional" = dontDistribute super."science-constants-dimensional";
+  "scion" = dontDistribute super."scion";
+  "scion-browser" = dontDistribute super."scion-browser";
+  "scons2dot" = dontDistribute super."scons2dot";
+  "scope" = dontDistribute super."scope";
+  "scope-cairo" = dontDistribute super."scope-cairo";
+  "scottish" = dontDistribute super."scottish";
+  "scotty-binding-play" = dontDistribute super."scotty-binding-play";
+  "scotty-blaze" = dontDistribute super."scotty-blaze";
+  "scotty-cookie" = dontDistribute super."scotty-cookie";
+  "scotty-fay" = dontDistribute super."scotty-fay";
+  "scotty-hastache" = dontDistribute super."scotty-hastache";
+  "scotty-rest" = dontDistribute super."scotty-rest";
+  "scotty-session" = dontDistribute super."scotty-session";
+  "scotty-tls" = dontDistribute super."scotty-tls";
+  "scp-streams" = dontDistribute super."scp-streams";
+  "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrobble" = dontDistribute super."scrobble";
+  "scroll" = dontDistribute super."scroll";
+  "scrypt" = dontDistribute super."scrypt";
+  "scrz" = dontDistribute super."scrz";
+  "scyther-proof" = dontDistribute super."scyther-proof";
+  "sde-solver" = dontDistribute super."sde-solver";
+  "sdf2p1-parser" = dontDistribute super."sdf2p1-parser";
+  "sdl2-cairo" = dontDistribute super."sdl2-cairo";
+  "sdl2-cairo-image" = dontDistribute super."sdl2-cairo-image";
+  "sdl2-compositor" = dontDistribute super."sdl2-compositor";
+  "sdl2-image" = dontDistribute super."sdl2-image";
+  "sdl2-ttf" = dontDistribute super."sdl2-ttf";
+  "sdnv" = dontDistribute super."sdnv";
+  "sdr" = dontDistribute super."sdr";
+  "seacat" = dontDistribute super."seacat";
+  "seal-module" = dontDistribute super."seal-module";
+  "search" = dontDistribute super."search";
+  "sec" = dontDistribute super."sec";
+  "secdh" = dontDistribute super."secdh";
+  "seclib" = dontDistribute super."seclib";
+  "secp256k1" = dontDistribute super."secp256k1";
+  "secret-santa" = dontDistribute super."secret-santa";
+  "secret-sharing" = dontDistribute super."secret-sharing";
+  "secrm" = dontDistribute super."secrm";
+  "secure-sockets" = dontDistribute super."secure-sockets";
+  "sednaDBXML" = dontDistribute super."sednaDBXML";
+  "select" = dontDistribute super."select";
+  "selectors" = dontDistribute super."selectors";
+  "selenium" = dontDistribute super."selenium";
+  "selenium-server" = dontDistribute super."selenium-server";
+  "selfrestart" = dontDistribute super."selfrestart";
+  "selinux" = dontDistribute super."selinux";
+  "semaphore-plus" = dontDistribute super."semaphore-plus";
+  "semi-iso" = dontDistribute super."semi-iso";
+  "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax";
+  "semigroups-actions" = dontDistribute super."semigroups-actions";
+  "semiring" = dontDistribute super."semiring";
+  "semiring-simple" = dontDistribute super."semiring-simple";
+  "semver-range" = dontDistribute super."semver-range";
+  "sendgrid-haskell" = dontDistribute super."sendgrid-haskell";
+  "sensenet" = dontDistribute super."sensenet";
+  "sentry" = dontDistribute super."sentry";
+  "senza" = dontDistribute super."senza";
+  "separated" = dontDistribute super."separated";
+  "seqaid" = dontDistribute super."seqaid";
+  "seqid" = dontDistribute super."seqid";
+  "seqid-streams" = dontDistribute super."seqid-streams";
+  "seqloc-datafiles" = dontDistribute super."seqloc-datafiles";
+  "sequence" = dontDistribute super."sequence";
+  "sequent-core" = dontDistribute super."sequent-core";
+  "sequential-index" = dontDistribute super."sequential-index";
+  "sequor" = dontDistribute super."sequor";
+  "serial" = dontDistribute super."serial";
+  "serial-test-generators" = dontDistribute super."serial-test-generators";
+  "serialport" = dontDistribute super."serialport";
+  "serv" = dontDistribute super."serv";
+  "servant-cassava" = dontDistribute super."servant-cassava";
+  "servant-ede" = dontDistribute super."servant-ede";
+  "servant-examples" = dontDistribute super."servant-examples";
+  "servant-github" = dontDistribute super."servant-github";
+  "servant-lucid" = dontDistribute super."servant-lucid";
+  "servant-mock" = dontDistribute super."servant-mock";
+  "servant-pool" = dontDistribute super."servant-pool";
+  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-response" = dontDistribute super."servant-response";
+  "servant-scotty" = dontDistribute super."servant-scotty";
+  "servant-swagger" = dontDistribute super."servant-swagger";
+  "ses-html" = dontDistribute super."ses-html";
+  "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
+  "sessions" = dontDistribute super."sessions";
+  "set-cover" = dontDistribute super."set-cover";
+  "set-with" = dontDistribute super."set-with";
+  "setdown" = dontDistribute super."setdown";
+  "setgame" = dontDistribute super."setgame";
+  "setops" = dontDistribute super."setops";
+  "setters" = dontDistribute super."setters";
+  "settings" = dontDistribute super."settings";
+  "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
+  "sexp-show" = dontDistribute super."sexp-show";
+  "sexpr" = dontDistribute super."sexpr";
+  "sext" = dontDistribute super."sext";
+  "sfml-audio" = dontDistribute super."sfml-audio";
+  "sfmt" = dontDistribute super."sfmt";
+  "sgd" = dontDistribute super."sgd";
+  "sgf" = dontDistribute super."sgf";
+  "sgrep" = dontDistribute super."sgrep";
+  "sha-streams" = dontDistribute super."sha-streams";
+  "shadower" = dontDistribute super."shadower";
+  "shadowsocks" = dontDistribute super."shadowsocks";
+  "shady-gen" = dontDistribute super."shady-gen";
+  "shady-graphics" = dontDistribute super."shady-graphics";
+  "shake-cabal-build" = dontDistribute super."shake-cabal-build";
+  "shake-extras" = dontDistribute super."shake-extras";
+  "shake-minify" = dontDistribute super."shake-minify";
+  "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
+  "shaker" = dontDistribute super."shaker";
+  "shakespeare-css" = dontDistribute super."shakespeare-css";
+  "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
+  "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-text" = dontDistribute super."shakespeare-text";
+  "shana" = dontDistribute super."shana";
+  "shapefile" = dontDistribute super."shapefile";
+  "shapely-data" = dontDistribute super."shapely-data";
+  "sharc-timbre" = dontDistribute super."sharc-timbre";
+  "shared-buffer" = dontDistribute super."shared-buffer";
+  "shared-fields" = dontDistribute super."shared-fields";
+  "shared-memory" = dontDistribute super."shared-memory";
+  "sharedio" = dontDistribute super."sharedio";
+  "she" = dontDistribute super."she";
+  "shelduck" = dontDistribute super."shelduck";
+  "shell-escape" = dontDistribute super."shell-escape";
+  "shell-monad" = dontDistribute super."shell-monad";
+  "shell-pipe" = dontDistribute super."shell-pipe";
+  "shellish" = dontDistribute super."shellish";
+  "shellmate" = dontDistribute super."shellmate";
+  "shelltestrunner" = dontDistribute super."shelltestrunner";
+  "shelly-extra" = dontDistribute super."shelly-extra";
+  "shivers-cfg" = dontDistribute super."shivers-cfg";
+  "shoap" = dontDistribute super."shoap";
+  "shortcircuit" = dontDistribute super."shortcircuit";
+  "shorten-strings" = dontDistribute super."shorten-strings";
+  "show" = dontDistribute super."show";
+  "show-type" = dontDistribute super."show-type";
+  "showdown" = dontDistribute super."showdown";
+  "shpider" = dontDistribute super."shpider";
+  "shplit" = dontDistribute super."shplit";
+  "shqq" = dontDistribute super."shqq";
+  "shuffle" = dontDistribute super."shuffle";
+  "sieve" = dontDistribute super."sieve";
+  "sifflet" = dontDistribute super."sifflet";
+  "sifflet-lib" = dontDistribute super."sifflet-lib";
+  "sign" = dontDistribute super."sign";
+  "signals" = dontDistribute super."signals";
+  "signed-multiset" = dontDistribute super."signed-multiset";
+  "simd" = dontDistribute super."simd";
+  "simgi" = dontDistribute super."simgi";
+  "simple" = dontDistribute super."simple";
+  "simple-actors" = dontDistribute super."simple-actors";
+  "simple-atom" = dontDistribute super."simple-atom";
+  "simple-bluetooth" = dontDistribute super."simple-bluetooth";
+  "simple-c-value" = dontDistribute super."simple-c-value";
+  "simple-conduit" = dontDistribute super."simple-conduit";
+  "simple-config" = dontDistribute super."simple-config";
+  "simple-css" = dontDistribute super."simple-css";
+  "simple-eval" = dontDistribute super."simple-eval";
+  "simple-firewire" = dontDistribute super."simple-firewire";
+  "simple-form" = dontDistribute super."simple-form";
+  "simple-genetic-algorithm" = dontDistribute super."simple-genetic-algorithm";
+  "simple-genetic-algorithm-mr" = dontDistribute super."simple-genetic-algorithm-mr";
+  "simple-get-opt" = dontDistribute super."simple-get-opt";
+  "simple-index" = dontDistribute super."simple-index";
+  "simple-log" = dontDistribute super."simple-log";
+  "simple-log-syslog" = dontDistribute super."simple-log-syslog";
+  "simple-neural-networks" = dontDistribute super."simple-neural-networks";
+  "simple-nix" = dontDistribute super."simple-nix";
+  "simple-observer" = dontDistribute super."simple-observer";
+  "simple-pascal" = dontDistribute super."simple-pascal";
+  "simple-pipe" = dontDistribute super."simple-pipe";
+  "simple-postgresql-orm" = dontDistribute super."simple-postgresql-orm";
+  "simple-rope" = dontDistribute super."simple-rope";
+  "simple-server" = dontDistribute super."simple-server";
+  "simple-session" = dontDistribute super."simple-session";
+  "simple-sessions" = dontDistribute super."simple-sessions";
+  "simple-smt" = dontDistribute super."simple-smt";
+  "simple-sql-parser" = dontDistribute super."simple-sql-parser";
+  "simple-stacked-vm" = dontDistribute super."simple-stacked-vm";
+  "simple-tabular" = dontDistribute super."simple-tabular";
+  "simple-templates" = dontDistribute super."simple-templates";
+  "simple-vec3" = dontDistribute super."simple-vec3";
+  "simpleargs" = dontDistribute super."simpleargs";
+  "simpleirc" = dontDistribute super."simpleirc";
+  "simpleirc-lens" = dontDistribute super."simpleirc-lens";
+  "simplenote" = dontDistribute super."simplenote";
+  "simpleprelude" = dontDistribute super."simpleprelude";
+  "simplesmtpclient" = dontDistribute super."simplesmtpclient";
+  "simplessh" = dontDistribute super."simplessh";
+  "simplest-sqlite" = dontDistribute super."simplest-sqlite";
+  "simplex" = dontDistribute super."simplex";
+  "simplex-basic" = dontDistribute super."simplex-basic";
+  "simseq" = dontDistribute super."simseq";
+  "simtreelo" = dontDistribute super."simtreelo";
+  "sindre" = dontDistribute super."sindre";
+  "singleton-nats" = dontDistribute super."singleton-nats";
+  "sink" = dontDistribute super."sink";
+  "sirkel" = dontDistribute super."sirkel";
+  "sitemap" = dontDistribute super."sitemap";
+  "sized" = dontDistribute super."sized";
+  "sized-types" = dontDistribute super."sized-types";
+  "sized-vector" = dontDistribute super."sized-vector";
+  "sizes" = dontDistribute super."sizes";
+  "sjsp" = dontDistribute super."sjsp";
+  "skeleton" = dontDistribute super."skeleton";
+  "skell" = dontDistribute super."skell";
+  "skemmtun" = dontDistribute super."skemmtun";
+  "skype4hs" = dontDistribute super."skype4hs";
+  "skypelogexport" = dontDistribute super."skypelogexport";
+  "slack" = dontDistribute super."slack";
+  "slack-api" = dontDistribute super."slack-api";
+  "slack-notify-haskell" = dontDistribute super."slack-notify-haskell";
+  "slice-cpp-gen" = dontDistribute super."slice-cpp-gen";
+  "slidemews" = dontDistribute super."slidemews";
+  "sloane" = dontDistribute super."sloane";
+  "slot-lambda" = dontDistribute super."slot-lambda";
+  "sloth" = dontDistribute super."sloth";
+  "smallarray" = dontDistribute super."smallarray";
+  "smallcheck-laws" = dontDistribute super."smallcheck-laws";
+  "smallcheck-lens" = dontDistribute super."smallcheck-lens";
+  "smallcheck-series" = dontDistribute super."smallcheck-series";
+  "smallpt-hs" = dontDistribute super."smallpt-hs";
+  "smallstring" = dontDistribute super."smallstring";
+  "smaoin" = dontDistribute super."smaoin";
+  "smartGroup" = dontDistribute super."smartGroup";
+  "smartcheck" = dontDistribute super."smartcheck";
+  "smartconstructor" = dontDistribute super."smartconstructor";
+  "smartword" = dontDistribute super."smartword";
+  "sme" = dontDistribute super."sme";
+  "smt-lib" = dontDistribute super."smt-lib";
+  "smtlib2" = dontDistribute super."smtlib2";
+  "smtp-mail-ng" = dontDistribute super."smtp-mail-ng";
+  "smtp2mta" = dontDistribute super."smtp2mta";
+  "smtps-gmail" = dontDistribute super."smtps-gmail";
+  "snake-game" = dontDistribute super."snake-game";
+  "snap-accept" = dontDistribute super."snap-accept";
+  "snap-app" = dontDistribute super."snap-app";
+  "snap-auth-cli" = dontDistribute super."snap-auth-cli";
+  "snap-blaze" = dontDistribute super."snap-blaze";
+  "snap-blaze-clay" = dontDistribute super."snap-blaze-clay";
+  "snap-configuration-utilities" = dontDistribute super."snap-configuration-utilities";
+  "snap-cors" = dontDistribute super."snap-cors";
+  "snap-elm" = dontDistribute super."snap-elm";
+  "snap-error-collector" = dontDistribute super."snap-error-collector";
+  "snap-extras" = dontDistribute super."snap-extras";
+  "snap-language" = dontDistribute super."snap-language";
+  "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic";
+  "snap-loader-static" = dontDistribute super."snap-loader-static";
+  "snap-predicates" = dontDistribute super."snap-predicates";
+  "snap-testing" = dontDistribute super."snap-testing";
+  "snap-utils" = dontDistribute super."snap-utils";
+  "snap-web-routes" = dontDistribute super."snap-web-routes";
+  "snaplet-acid-state" = dontDistribute super."snaplet-acid-state";
+  "snaplet-actionlog" = dontDistribute super."snaplet-actionlog";
+  "snaplet-amqp" = dontDistribute super."snaplet-amqp";
+  "snaplet-auth-acid" = dontDistribute super."snaplet-auth-acid";
+  "snaplet-coffee" = dontDistribute super."snaplet-coffee";
+  "snaplet-css-min" = dontDistribute super."snaplet-css-min";
+  "snaplet-environments" = dontDistribute super."snaplet-environments";
+  "snaplet-ghcjs" = dontDistribute super."snaplet-ghcjs";
+  "snaplet-hasql" = dontDistribute super."snaplet-hasql";
+  "snaplet-haxl" = dontDistribute super."snaplet-haxl";
+  "snaplet-hdbc" = dontDistribute super."snaplet-hdbc";
+  "snaplet-hslogger" = dontDistribute super."snaplet-hslogger";
+  "snaplet-i18n" = dontDistribute super."snaplet-i18n";
+  "snaplet-influxdb" = dontDistribute super."snaplet-influxdb";
+  "snaplet-lss" = dontDistribute super."snaplet-lss";
+  "snaplet-mandrill" = dontDistribute super."snaplet-mandrill";
+  "snaplet-mongoDB" = dontDistribute super."snaplet-mongoDB";
+  "snaplet-mongodb-minimalistic" = dontDistribute super."snaplet-mongodb-minimalistic";
+  "snaplet-mysql-simple" = dontDistribute super."snaplet-mysql-simple";
+  "snaplet-oauth" = dontDistribute super."snaplet-oauth";
+  "snaplet-persistent" = dontDistribute super."snaplet-persistent";
+  "snaplet-postgresql-simple" = dontDistribute super."snaplet-postgresql-simple";
+  "snaplet-postmark" = dontDistribute super."snaplet-postmark";
+  "snaplet-purescript" = dontDistribute super."snaplet-purescript";
+  "snaplet-recaptcha" = dontDistribute super."snaplet-recaptcha";
+  "snaplet-redis" = dontDistribute super."snaplet-redis";
+  "snaplet-redson" = dontDistribute super."snaplet-redson";
+  "snaplet-rest" = dontDistribute super."snaplet-rest";
+  "snaplet-riak" = dontDistribute super."snaplet-riak";
+  "snaplet-sass" = dontDistribute super."snaplet-sass";
+  "snaplet-sedna" = dontDistribute super."snaplet-sedna";
+  "snaplet-ses-html" = dontDistribute super."snaplet-ses-html";
+  "snaplet-sqlite-simple" = dontDistribute super."snaplet-sqlite-simple";
+  "snaplet-stripe" = dontDistribute super."snaplet-stripe";
+  "snaplet-tasks" = dontDistribute super."snaplet-tasks";
+  "snaplet-typed-sessions" = dontDistribute super."snaplet-typed-sessions";
+  "snaplet-wordpress" = dontDistribute super."snaplet-wordpress";
+  "snappy" = dontDistribute super."snappy";
+  "snappy-conduit" = dontDistribute super."snappy-conduit";
+  "snappy-framing" = dontDistribute super."snappy-framing";
+  "snappy-iteratee" = dontDistribute super."snappy-iteratee";
+  "sndfile-enumerators" = dontDistribute super."sndfile-enumerators";
+  "sneakyterm" = dontDistribute super."sneakyterm";
+  "sneathlane-haste" = dontDistribute super."sneathlane-haste";
+  "snippet-extractor" = dontDistribute super."snippet-extractor";
+  "snm" = dontDistribute super."snm";
+  "snow-white" = dontDistribute super."snow-white";
+  "snowball" = dontDistribute super."snowball";
+  "snowglobe" = dontDistribute super."snowglobe";
+  "sock2stream" = dontDistribute super."sock2stream";
+  "sockaddr" = dontDistribute super."sockaddr";
+  "socket-activation" = dontDistribute super."socket-activation";
+  "socket-sctp" = dontDistribute super."socket-sctp";
+  "socketio" = dontDistribute super."socketio";
+  "soegtk" = dontDistribute super."soegtk";
+  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
+  "sophia" = dontDistribute super."sophia";
+  "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
+  "sorted" = dontDistribute super."sorted";
+  "sorting" = dontDistribute super."sorting";
+  "sorty" = dontDistribute super."sorty";
+  "sound-collage" = dontDistribute super."sound-collage";
+  "sounddelay" = dontDistribute super."sounddelay";
+  "source-code-server" = dontDistribute super."source-code-server";
+  "sousit" = dontDistribute super."sousit";
+  "sox" = dontDistribute super."sox";
+  "soxlib" = dontDistribute super."soxlib";
+  "soyuz" = dontDistribute super."soyuz";
+  "spacefill" = dontDistribute super."spacefill";
+  "spacepart" = dontDistribute super."spacepart";
+  "spaceprobe" = dontDistribute super."spaceprobe";
+  "spanout" = dontDistribute super."spanout";
+  "sparse" = dontDistribute super."sparse";
+  "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
+  "sparsebit" = dontDistribute super."sparsebit";
+  "sparsecheck" = dontDistribute super."sparsecheck";
+  "sparser" = dontDistribute super."sparser";
+  "spata" = dontDistribute super."spata";
+  "spatial-math" = dontDistribute super."spatial-math";
+  "spawn" = dontDistribute super."spawn";
+  "spe" = dontDistribute super."spe";
+  "special-functors" = dontDistribute super."special-functors";
+  "special-keys" = dontDistribute super."special-keys";
+  "specialize-th" = dontDistribute super."specialize-th";
+  "species" = dontDistribute super."species";
+  "speculation-transformers" = dontDistribute super."speculation-transformers";
+  "spelling-suggest" = dontDistribute super."spelling-suggest";
+  "sphero" = dontDistribute super."sphero";
+  "sphinx-cli" = dontDistribute super."sphinx-cli";
+  "spice" = dontDistribute super."spice";
+  "spike" = dontDistribute super."spike";
+  "spine" = dontDistribute super."spine";
+  "spir-v" = dontDistribute super."spir-v";
+  "splay" = dontDistribute super."splay";
+  "splaytree" = dontDistribute super."splaytree";
+  "spline3" = dontDistribute super."spline3";
+  "splines" = dontDistribute super."splines";
+  "split-channel" = dontDistribute super."split-channel";
+  "split-record" = dontDistribute super."split-record";
+  "split-tchan" = dontDistribute super."split-tchan";
+  "splitter" = dontDistribute super."splitter";
+  "splot" = dontDistribute super."splot";
+  "spool" = dontDistribute super."spool";
+  "spoonutil" = dontDistribute super."spoonutil";
+  "spoty" = dontDistribute super."spoty";
+  "spreadsheet" = dontDistribute super."spreadsheet";
+  "spritz" = dontDistribute super."spritz";
+  "spsa" = dontDistribute super."spsa";
+  "spy" = dontDistribute super."spy";
+  "sql-simple" = dontDistribute super."sql-simple";
+  "sql-simple-mysql" = dontDistribute super."sql-simple-mysql";
+  "sql-simple-pool" = dontDistribute super."sql-simple-pool";
+  "sql-simple-postgresql" = dontDistribute super."sql-simple-postgresql";
+  "sql-simple-sqlite" = dontDistribute super."sql-simple-sqlite";
+  "sql-words" = dontDistribute super."sql-words";
+  "sqlite" = dontDistribute super."sqlite";
+  "sqlite-simple-typed" = dontDistribute super."sqlite-simple-typed";
+  "sqlvalue-list" = dontDistribute super."sqlvalue-list";
+  "squeeze" = dontDistribute super."squeeze";
+  "sr-extra" = dontDistribute super."sr-extra";
+  "srcinst" = dontDistribute super."srcinst";
+  "srec" = dontDistribute super."srec";
+  "sscgi" = dontDistribute super."sscgi";
+  "ssh" = dontDistribute super."ssh";
+  "sshd-lint" = dontDistribute super."sshd-lint";
+  "sshtun" = dontDistribute super."sshtun";
+  "sssp" = dontDistribute super."sssp";
+  "sstable" = dontDistribute super."sstable";
+  "ssv" = dontDistribute super."ssv";
+  "stable-heap" = dontDistribute super."stable-heap";
+  "stable-maps" = dontDistribute super."stable-maps";
+  "stable-marriage" = dontDistribute super."stable-marriage";
+  "stable-memo" = dontDistribute super."stable-memo";
+  "stable-tree" = dontDistribute super."stable-tree";
+  "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
+  "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
+  "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
+  "standalone-haddock" = dontDistribute super."standalone-haddock";
+  "star-to-star" = dontDistribute super."star-to-star";
+  "star-to-star-contra" = dontDistribute super."star-to-star-contra";
+  "starling" = dontDistribute super."starling";
+  "starrover2" = dontDistribute super."starrover2";
+  "stash" = dontDistribute super."stash";
+  "state" = dontDistribute super."state";
+  "state-plus" = dontDistribute super."state-plus";
+  "state-record" = dontDistribute super."state-record";
+  "statechart" = dontDistribute super."statechart";
+  "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statethread" = dontDistribute super."statethread";
+  "statgrab" = dontDistribute super."statgrab";
+  "static-hash" = dontDistribute super."static-hash";
+  "static-resources" = dontDistribute super."static-resources";
+  "staticanalysis" = dontDistribute super."staticanalysis";
+  "statistics-dirichlet" = dontDistribute super."statistics-dirichlet";
+  "statistics-fusion" = dontDistribute super."statistics-fusion";
+  "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar";
+  "stats" = dontDistribute super."stats";
+  "statsd" = dontDistribute super."statsd";
+  "statsd-client" = dontDistribute super."statsd-client";
+  "statsd-datadog" = dontDistribute super."statsd-datadog";
+  "statvfs" = dontDistribute super."statvfs";
+  "stb-image" = dontDistribute super."stb-image";
+  "stb-truetype" = dontDistribute super."stb-truetype";
+  "stdata" = dontDistribute super."stdata";
+  "stdf" = dontDistribute super."stdf";
+  "steambrowser" = dontDistribute super."steambrowser";
+  "steeloverseer" = dontDistribute super."steeloverseer";
+  "stemmer" = dontDistribute super."stemmer";
+  "step-function" = dontDistribute super."step-function";
+  "stepwise" = dontDistribute super."stepwise";
+  "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
+  "stitch" = dontDistribute super."stitch";
+  "stm-channelize" = dontDistribute super."stm-channelize";
+  "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
+  "stm-firehose" = dontDistribute super."stm-firehose";
+  "stm-io-hooks" = dontDistribute super."stm-io-hooks";
+  "stm-lifted" = dontDistribute super."stm-lifted";
+  "stm-linkedlist" = dontDistribute super."stm-linkedlist";
+  "stm-orelse-io" = dontDistribute super."stm-orelse-io";
+  "stm-promise" = dontDistribute super."stm-promise";
+  "stm-queue-extras" = dontDistribute super."stm-queue-extras";
+  "stm-sbchan" = dontDistribute super."stm-sbchan";
+  "stm-split" = dontDistribute super."stm-split";
+  "stm-tlist" = dontDistribute super."stm-tlist";
+  "stmcontrol" = dontDistribute super."stmcontrol";
+  "stomp-conduit" = dontDistribute super."stomp-conduit";
+  "stomp-patterns" = dontDistribute super."stomp-patterns";
+  "stomp-queue" = dontDistribute super."stomp-queue";
+  "stompl" = dontDistribute super."stompl";
+  "stopwatch" = dontDistribute super."stopwatch";
+  "storable" = dontDistribute super."storable";
+  "storable-record" = dontDistribute super."storable-record";
+  "storable-static-array" = dontDistribute super."storable-static-array";
+  "storable-tuple" = dontDistribute super."storable-tuple";
+  "storablevector" = dontDistribute super."storablevector";
+  "storablevector-carray" = dontDistribute super."storablevector-carray";
+  "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
+  "str" = dontDistribute super."str";
+  "stratum-tool" = dontDistribute super."stratum-tool";
+  "stream-fusion" = dontDistribute super."stream-fusion";
+  "stream-monad" = dontDistribute super."stream-monad";
+  "streamed" = dontDistribute super."streamed";
+  "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-utils" = dontDistribute super."streaming-utils";
+  "streaming-wai" = dontDistribute super."streaming-wai";
+  "strict-concurrency" = dontDistribute super."strict-concurrency";
+  "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin";
+  "strict-identity" = dontDistribute super."strict-identity";
+  "strict-io" = dontDistribute super."strict-io";
+  "strictify" = dontDistribute super."strictify";
+  "strictly" = dontDistribute super."strictly";
+  "string" = dontDistribute super."string";
+  "string-conv" = dontDistribute super."string-conv";
+  "string-convert" = dontDistribute super."string-convert";
+  "string-quote" = dontDistribute super."string-quote";
+  "string-similarity" = dontDistribute super."string-similarity";
+  "stringlike" = dontDistribute super."stringlike";
+  "stringprep" = dontDistribute super."stringprep";
+  "strings" = dontDistribute super."strings";
+  "stringtable-atom" = dontDistribute super."stringtable-atom";
+  "strio" = dontDistribute super."strio";
+  "stripe" = dontDistribute super."stripe";
+  "stripe-core" = dontDistribute super."stripe-core";
+  "stripe-haskell" = dontDistribute super."stripe-haskell";
+  "stripe-http-streams" = dontDistribute super."stripe-http-streams";
+  "strive" = dontDistribute super."strive";
+  "strptime" = dontDistribute super."strptime";
+  "structs" = dontDistribute super."structs";
+  "structural-induction" = dontDistribute super."structural-induction";
+  "structured-haskell-mode" = dontDistribute super."structured-haskell-mode";
+  "structured-mongoDB" = dontDistribute super."structured-mongoDB";
+  "structures" = dontDistribute super."structures";
+  "stunclient" = dontDistribute super."stunclient";
+  "stunts" = dontDistribute super."stunts";
+  "stylized" = dontDistribute super."stylized";
+  "sub-state" = dontDistribute super."sub-state";
+  "subhask" = dontDistribute super."subhask";
+  "subleq-toolchain" = dontDistribute super."subleq-toolchain";
+  "subnet" = dontDistribute super."subnet";
+  "subtitleParser" = dontDistribute super."subtitleParser";
+  "subtitles" = dontDistribute super."subtitles";
+  "suffixarray" = dontDistribute super."suffixarray";
+  "suffixtree" = dontDistribute super."suffixtree";
+  "sugarhaskell" = dontDistribute super."sugarhaskell";
+  "suitable" = dontDistribute super."suitable";
+  "sump" = dontDistribute super."sump";
+  "sundown" = dontDistribute super."sundown";
+  "sunlight" = dontDistribute super."sunlight";
+  "sunroof-compiler" = dontDistribute super."sunroof-compiler";
+  "sunroof-examples" = dontDistribute super."sunroof-examples";
+  "sunroof-server" = dontDistribute super."sunroof-server";
+  "super-user-spark" = dontDistribute super."super-user-spark";
+  "supercollider-ht" = dontDistribute super."supercollider-ht";
+  "supercollider-midi" = dontDistribute super."supercollider-midi";
+  "superdoc" = dontDistribute super."superdoc";
+  "supero" = dontDistribute super."supero";
+  "supervisor" = dontDistribute super."supervisor";
+  "suspend" = dontDistribute super."suspend";
+  "svg2q" = dontDistribute super."svg2q";
+  "svgcairo" = dontDistribute super."svgcairo";
+  "svgutils" = dontDistribute super."svgutils";
+  "svm" = dontDistribute super."svm";
+  "svm-light-utils" = dontDistribute super."svm-light-utils";
+  "svm-simple" = dontDistribute super."svm-simple";
+  "svndump" = dontDistribute super."svndump";
+  "swapper" = dontDistribute super."swapper";
+  "swearjure" = dontDistribute super."swearjure";
+  "swf" = dontDistribute super."swf";
+  "swift-lda" = dontDistribute super."swift-lda";
+  "swish" = dontDistribute super."swish";
+  "sws" = dontDistribute super."sws";
+  "syb-extras" = dontDistribute super."syb-extras";
+  "syb-with-class-instances-text" = dontDistribute super."syb-with-class-instances-text";
+  "sylvia" = dontDistribute super."sylvia";
+  "sym" = dontDistribute super."sym";
+  "sym-plot" = dontDistribute super."sym-plot";
+  "symbol" = dontDistribute super."symbol";
+  "sync" = dontDistribute super."sync";
+  "synchronous-channels" = dontDistribute super."synchronous-channels";
+  "syncthing-hs" = dontDistribute super."syncthing-hs";
+  "synt" = dontDistribute super."synt";
+  "syntactic" = dontDistribute super."syntactic";
+  "syntactical" = dontDistribute super."syntactical";
+  "syntax" = dontDistribute super."syntax";
+  "syntax-attoparsec" = dontDistribute super."syntax-attoparsec";
+  "syntax-example" = dontDistribute super."syntax-example";
+  "syntax-example-json" = dontDistribute super."syntax-example-json";
+  "syntax-pretty" = dontDistribute super."syntax-pretty";
+  "syntax-printer" = dontDistribute super."syntax-printer";
+  "syntax-trees" = dontDistribute super."syntax-trees";
+  "syntax-trees-fork-bairyn" = dontDistribute super."syntax-trees-fork-bairyn";
+  "synthesizer" = dontDistribute super."synthesizer";
+  "synthesizer-alsa" = dontDistribute super."synthesizer-alsa";
+  "synthesizer-core" = dontDistribute super."synthesizer-core";
+  "synthesizer-dimensional" = dontDistribute super."synthesizer-dimensional";
+  "synthesizer-filter" = dontDistribute super."synthesizer-filter";
+  "synthesizer-inference" = dontDistribute super."synthesizer-inference";
+  "synthesizer-llvm" = dontDistribute super."synthesizer-llvm";
+  "synthesizer-midi" = dontDistribute super."synthesizer-midi";
+  "sys-auth-smbclient" = dontDistribute super."sys-auth-smbclient";
+  "sys-process" = dontDistribute super."sys-process";
+  "system-canonicalpath" = dontDistribute super."system-canonicalpath";
+  "system-command" = dontDistribute super."system-command";
+  "system-gpio" = dontDistribute super."system-gpio";
+  "system-inotify" = dontDistribute super."system-inotify";
+  "system-lifted" = dontDistribute super."system-lifted";
+  "system-random-effect" = dontDistribute super."system-random-effect";
+  "system-time-monotonic" = dontDistribute super."system-time-monotonic";
+  "system-util" = dontDistribute super."system-util";
+  "system-uuid" = dontDistribute super."system-uuid";
+  "systemd" = dontDistribute super."systemd";
+  "t-regex" = dontDistribute super."t-regex";
+  "ta" = dontDistribute super."ta";
+  "table" = dontDistribute super."table";
+  "table-tennis" = dontDistribute super."table-tennis";
+  "tableaux" = dontDistribute super."tableaux";
+  "tables" = dontDistribute super."tables";
+  "tablestorage" = dontDistribute super."tablestorage";
+  "tabloid" = dontDistribute super."tabloid";
+  "taffybar" = dontDistribute super."taffybar";
+  "tag-bits" = dontDistribute super."tag-bits";
+  "tag-stream" = dontDistribute super."tag-stream";
+  "tagchup" = dontDistribute super."tagchup";
+  "tagged-exception-core" = dontDistribute super."tagged-exception-core";
+  "tagged-list" = dontDistribute super."tagged-list";
+  "tagged-th" = dontDistribute super."tagged-th";
+  "tagged-transformer" = dontDistribute super."tagged-transformer";
+  "tagging" = dontDistribute super."tagging";
+  "taggy" = dontDistribute super."taggy";
+  "taggy-lens" = dontDistribute super."taggy-lens";
+  "taglib" = dontDistribute super."taglib";
+  "taglib-api" = dontDistribute super."taglib-api";
+  "tagset-positional" = dontDistribute super."tagset-positional";
+  "tagsoup-ht" = dontDistribute super."tagsoup-ht";
+  "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "takahashi" = dontDistribute super."takahashi";
+  "takusen-oracle" = dontDistribute super."takusen-oracle";
+  "tamarin-prover" = dontDistribute super."tamarin-prover";
+  "tamarin-prover-term" = dontDistribute super."tamarin-prover-term";
+  "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory";
+  "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
+  "tamper" = dontDistribute super."tamper";
+  "target" = dontDistribute super."target";
+  "task" = dontDistribute super."task";
+  "taskpool" = dontDistribute super."taskpool";
+  "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
+  "tasty-integrate" = dontDistribute super."tasty-integrate";
+  "tasty-laws" = dontDistribute super."tasty-laws";
+  "tasty-lens" = dontDistribute super."tasty-lens";
+  "tasty-program" = dontDistribute super."tasty-program";
+  "tateti-tateti" = dontDistribute super."tateti-tateti";
+  "tau" = dontDistribute super."tau";
+  "tbox" = dontDistribute super."tbox";
+  "tcache-AWS" = dontDistribute super."tcache-AWS";
+  "tccli" = dontDistribute super."tccli";
+  "tce-conf" = dontDistribute super."tce-conf";
+  "tconfig" = dontDistribute super."tconfig";
+  "tcp" = dontDistribute super."tcp";
+  "tdd-util" = dontDistribute super."tdd-util";
+  "tdoc" = dontDistribute super."tdoc";
+  "teams" = dontDistribute super."teams";
+  "teeth" = dontDistribute super."teeth";
+  "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
+  "template-default" = dontDistribute super."template-default";
+  "template-haskell-util" = dontDistribute super."template-haskell-util";
+  "template-hsml" = dontDistribute super."template-hsml";
+  "template-yj" = dontDistribute super."template-yj";
+  "templatepg" = dontDistribute super."templatepg";
+  "templater" = dontDistribute super."templater";
+  "tempodb" = dontDistribute super."tempodb";
+  "temporal-csound" = dontDistribute super."temporal-csound";
+  "temporal-media" = dontDistribute super."temporal-media";
+  "temporal-music-notation" = dontDistribute super."temporal-music-notation";
+  "temporal-music-notation-demo" = dontDistribute super."temporal-music-notation-demo";
+  "temporal-music-notation-western" = dontDistribute super."temporal-music-notation-western";
+  "temporary-resourcet" = dontDistribute super."temporary-resourcet";
+  "tempus" = dontDistribute super."tempus";
+  "tempus-fugit" = dontDistribute super."tempus-fugit";
+  "tensor" = dontDistribute super."tensor";
+  "term-rewriting" = dontDistribute super."term-rewriting";
+  "termbox-bindings" = dontDistribute super."termbox-bindings";
+  "termination-combinators" = dontDistribute super."termination-combinators";
+  "terminfo" = doDistribute super."terminfo_0_4_0_2";
+  "terminfo-hs" = dontDistribute super."terminfo-hs";
+  "termplot" = dontDistribute super."termplot";
+  "terrahs" = dontDistribute super."terrahs";
+  "tersmu" = dontDistribute super."tersmu";
+  "test-framework-doctest" = dontDistribute super."test-framework-doctest";
+  "test-framework-golden" = dontDistribute super."test-framework-golden";
+  "test-framework-program" = dontDistribute super."test-framework-program";
+  "test-framework-quickcheck" = dontDistribute super."test-framework-quickcheck";
+  "test-framework-sandbox" = dontDistribute super."test-framework-sandbox";
+  "test-framework-skip" = dontDistribute super."test-framework-skip";
+  "test-framework-testing-feat" = dontDistribute super."test-framework-testing-feat";
+  "test-framework-th-prime" = dontDistribute super."test-framework-th-prime";
+  "test-invariant" = dontDistribute super."test-invariant";
+  "test-pkg" = dontDistribute super."test-pkg";
+  "test-sandbox" = dontDistribute super."test-sandbox";
+  "test-sandbox-compose" = dontDistribute super."test-sandbox-compose";
+  "test-sandbox-hunit" = dontDistribute super."test-sandbox-hunit";
+  "test-sandbox-quickcheck" = dontDistribute super."test-sandbox-quickcheck";
+  "test-shouldbe" = dontDistribute super."test-shouldbe";
+  "test-simple" = dontDistribute super."test-simple";
+  "testPkg" = dontDistribute super."testPkg";
+  "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
+  "testloop" = dontDistribute super."testloop";
+  "testpack" = dontDistribute super."testpack";
+  "testpattern" = dontDistribute super."testpattern";
+  "testrunner" = dontDistribute super."testrunner";
+  "tetris" = dontDistribute super."tetris";
+  "tex2txt" = dontDistribute super."tex2txt";
+  "texrunner" = dontDistribute super."texrunner";
+  "text-and-plots" = dontDistribute super."text-and-plots";
+  "text-format-simple" = dontDistribute super."text-format-simple";
+  "text-icu-translit" = dontDistribute super."text-icu-translit";
+  "text-json-qq" = dontDistribute super."text-json-qq";
+  "text-latin1" = dontDistribute super."text-latin1";
+  "text-ldap" = dontDistribute super."text-ldap";
+  "text-locale-encoding" = dontDistribute super."text-locale-encoding";
+  "text-normal" = dontDistribute super."text-normal";
+  "text-position" = dontDistribute super."text-position";
+  "text-postgresql" = dontDistribute super."text-postgresql";
+  "text-printer" = dontDistribute super."text-printer";
+  "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-register-machine" = dontDistribute super."text-register-machine";
+  "text-render" = dontDistribute super."text-render";
+  "text-show-instances" = dontDistribute super."text-show-instances";
+  "text-stream-decode" = dontDistribute super."text-stream-decode";
+  "text-utf7" = dontDistribute super."text-utf7";
+  "text-xml-generic" = dontDistribute super."text-xml-generic";
+  "text-xml-qq" = dontDistribute super."text-xml-qq";
+  "text1" = dontDistribute super."text1";
+  "textPlot" = dontDistribute super."textPlot";
+  "textmatetags" = dontDistribute super."textmatetags";
+  "textocat-api" = dontDistribute super."textocat-api";
+  "texts" = dontDistribute super."texts";
+  "tfp" = dontDistribute super."tfp";
+  "tfp-th" = dontDistribute super."tfp-th";
+  "tftp" = dontDistribute super."tftp";
+  "tga" = dontDistribute super."tga";
+  "th-alpha" = dontDistribute super."th-alpha";
+  "th-build" = dontDistribute super."th-build";
+  "th-cas" = dontDistribute super."th-cas";
+  "th-context" = dontDistribute super."th-context";
+  "th-fold" = dontDistribute super."th-fold";
+  "th-inline-io-action" = dontDistribute super."th-inline-io-action";
+  "th-instance-reification" = dontDistribute super."th-instance-reification";
+  "th-instances" = dontDistribute super."th-instances";
+  "th-kinds" = dontDistribute super."th-kinds";
+  "th-kinds-fork" = dontDistribute super."th-kinds-fork";
+  "th-lift-instances" = dontDistribute super."th-lift-instances";
+  "th-printf" = dontDistribute super."th-printf";
+  "th-sccs" = dontDistribute super."th-sccs";
+  "th-traced" = dontDistribute super."th-traced";
+  "th-typegraph" = dontDistribute super."th-typegraph";
+  "themoviedb" = dontDistribute super."themoviedb";
+  "themplate" = dontDistribute super."themplate";
+  "theoremquest" = dontDistribute super."theoremquest";
+  "theoremquest-client" = dontDistribute super."theoremquest-client";
+  "thespian" = dontDistribute super."thespian";
+  "theta-functions" = dontDistribute super."theta-functions";
+  "thih" = dontDistribute super."thih";
+  "thimk" = dontDistribute super."thimk";
+  "thorn" = dontDistribute super."thorn";
+  "thread-local-storage" = dontDistribute super."thread-local-storage";
+  "threadPool" = dontDistribute super."threadPool";
+  "threadmanager" = dontDistribute super."threadmanager";
+  "threads-pool" = dontDistribute super."threads-pool";
+  "threads-supervisor" = dontDistribute super."threads-supervisor";
+  "threadscope" = dontDistribute super."threadscope";
+  "threefish" = dontDistribute super."threefish";
+  "threepenny-gui" = dontDistribute super."threepenny-gui";
+  "thrift" = dontDistribute super."thrift";
+  "thrist" = dontDistribute super."thrist";
+  "throttle" = dontDistribute super."throttle";
+  "thumbnail" = dontDistribute super."thumbnail";
+  "tianbar" = dontDistribute super."tianbar";
+  "tic-tac-toe" = dontDistribute super."tic-tac-toe";
+  "tickle" = dontDistribute super."tickle";
+  "tictactoe3d" = dontDistribute super."tictactoe3d";
+  "tidal" = dontDistribute super."tidal";
+  "tidal-midi" = dontDistribute super."tidal-midi";
+  "tidal-vis" = dontDistribute super."tidal-vis";
+  "tie-knot" = dontDistribute super."tie-knot";
+  "tiempo" = dontDistribute super."tiempo";
+  "tiger" = dontDistribute super."tiger";
+  "tight-apply" = dontDistribute super."tight-apply";
+  "tightrope" = dontDistribute super."tightrope";
+  "tighttp" = dontDistribute super."tighttp";
+  "tilings" = dontDistribute super."tilings";
+  "timberc" = dontDistribute super."timberc";
+  "time-extras" = dontDistribute super."time-extras";
+  "time-exts" = dontDistribute super."time-exts";
+  "time-http" = dontDistribute super."time-http";
+  "time-interval" = dontDistribute super."time-interval";
+  "time-io-access" = dontDistribute super."time-io-access";
+  "time-patterns" = dontDistribute super."time-patterns";
+  "time-qq" = dontDistribute super."time-qq";
+  "time-recurrence" = dontDistribute super."time-recurrence";
+  "time-series" = dontDistribute super."time-series";
+  "time-w3c" = dontDistribute super."time-w3c";
+  "timecalc" = dontDistribute super."timecalc";
+  "timeconsole" = dontDistribute super."timeconsole";
+  "timeless" = dontDistribute super."timeless";
+  "timelike" = dontDistribute super."timelike";
+  "timelike-time" = dontDistribute super."timelike-time";
+  "timemap" = dontDistribute super."timemap";
+  "timeout" = dontDistribute super."timeout";
+  "timeout-control" = dontDistribute super."timeout-control";
+  "timeout-with-results" = dontDistribute super."timeout-with-results";
+  "timeparsers" = dontDistribute super."timeparsers";
+  "timeplot" = dontDistribute super."timeplot";
+  "timers" = dontDistribute super."timers";
+  "timers-updatable" = dontDistribute super."timers-updatable";
+  "timestamp-subprocess-lines" = dontDistribute super."timestamp-subprocess-lines";
+  "timestamper" = dontDistribute super."timestamper";
+  "timezone-olson-th" = dontDistribute super."timezone-olson-th";
+  "timing-convenience" = dontDistribute super."timing-convenience";
+  "tinyMesh" = dontDistribute super."tinyMesh";
+  "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
+  "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
+  "titlecase" = dontDistribute super."titlecase";
+  "tkhs" = dontDistribute super."tkhs";
+  "tkyprof" = dontDistribute super."tkyprof";
+  "tld" = dontDistribute super."tld";
+  "tls-extra" = dontDistribute super."tls-extra";
+  "tmpl" = dontDistribute super."tmpl";
+  "tn" = dontDistribute super."tn";
+  "tnet" = dontDistribute super."tnet";
+  "to-haskell" = dontDistribute super."to-haskell";
+  "to-string-class" = dontDistribute super."to-string-class";
+  "to-string-instances" = dontDistribute super."to-string-instances";
+  "todos" = dontDistribute super."todos";
+  "tofromxml" = dontDistribute super."tofromxml";
+  "toilet" = dontDistribute super."toilet";
+  "tokenify" = dontDistribute super."tokenify";
+  "tokenize" = dontDistribute super."tokenize";
+  "toktok" = dontDistribute super."toktok";
+  "tokyocabinet-haskell" = dontDistribute super."tokyocabinet-haskell";
+  "tokyotyrant-haskell" = dontDistribute super."tokyotyrant-haskell";
+  "tomato-rubato-openal" = dontDistribute super."tomato-rubato-openal";
+  "toml" = dontDistribute super."toml";
+  "toolshed" = dontDistribute super."toolshed";
+  "topkata" = dontDistribute super."topkata";
+  "torch" = dontDistribute super."torch";
+  "total" = dontDistribute super."total";
+  "total-map" = dontDistribute super."total-map";
+  "total-maps" = dontDistribute super."total-maps";
+  "touched" = dontDistribute super."touched";
+  "toysolver" = dontDistribute super."toysolver";
+  "tpdb" = dontDistribute super."tpdb";
+  "trace" = dontDistribute super."trace";
+  "trace-call" = dontDistribute super."trace-call";
+  "trace-function-call" = dontDistribute super."trace-function-call";
+  "traced" = dontDistribute super."traced";
+  "tracer" = dontDistribute super."tracer";
+  "tracker" = dontDistribute super."tracker";
+  "trajectory" = dontDistribute super."trajectory";
+  "transactional-events" = dontDistribute super."transactional-events";
+  "transf" = dontDistribute super."transf";
+  "transformations" = dontDistribute super."transformations";
+  "transformers-abort" = dontDistribute super."transformers-abort";
+  "transformers-compose" = dontDistribute super."transformers-compose";
+  "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-runnable" = dontDistribute super."transformers-runnable";
+  "transformers-supply" = dontDistribute super."transformers-supply";
+  "transient" = dontDistribute super."transient";
+  "translatable-intset" = dontDistribute super."translatable-intset";
+  "translate" = dontDistribute super."translate";
+  "travis" = dontDistribute super."travis";
+  "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
+  "trawl" = dontDistribute super."trawl";
+  "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-monad" = dontDistribute super."tree-monad";
+  "treemap-html" = dontDistribute super."treemap-html";
+  "treemap-html-tools" = dontDistribute super."treemap-html-tools";
+  "treersec" = dontDistribute super."treersec";
+  "treeviz" = dontDistribute super."treeviz";
+  "tremulous-query" = dontDistribute super."tremulous-query";
+  "trhsx" = dontDistribute super."trhsx";
+  "triangulation" = dontDistribute super."triangulation";
+  "trimpolya" = dontDistribute super."trimpolya";
+  "tripLL" = dontDistribute super."tripLL";
+  "trivia" = dontDistribute super."trivia";
+  "trivial-constraint" = dontDistribute super."trivial-constraint";
+  "tropical" = dontDistribute super."tropical";
+  "truelevel" = dontDistribute super."truelevel";
+  "trurl" = dontDistribute super."trurl";
+  "truthful" = dontDistribute super."truthful";
+  "tsession" = dontDistribute super."tsession";
+  "tsession-happstack" = dontDistribute super."tsession-happstack";
+  "tskiplist" = dontDistribute super."tskiplist";
+  "tslogger" = dontDistribute super."tslogger";
+  "tsp-viz" = dontDistribute super."tsp-viz";
+  "tsparse" = dontDistribute super."tsparse";
+  "tst" = dontDistribute super."tst";
+  "tsvsql" = dontDistribute super."tsvsql";
+  "tubes" = dontDistribute super."tubes";
+  "tuntap" = dontDistribute super."tuntap";
+  "tup-functor" = dontDistribute super."tup-functor";
+  "tuple" = dontDistribute super."tuple";
+  "tuple-gen" = dontDistribute super."tuple-gen";
+  "tuple-generic" = dontDistribute super."tuple-generic";
+  "tuple-hlist" = dontDistribute super."tuple-hlist";
+  "tuple-lenses" = dontDistribute super."tuple-lenses";
+  "tuple-morph" = dontDistribute super."tuple-morph";
+  "tupleinstances" = dontDistribute super."tupleinstances";
+  "turing" = dontDistribute super."turing";
+  "turing-music" = dontDistribute super."turing-music";
+  "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
+  "turni" = dontDistribute super."turni";
+  "tweak" = dontDistribute super."tweak";
+  "twentefp" = dontDistribute super."twentefp";
+  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
+  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
+  "twentefp-graphs" = dontDistribute super."twentefp-graphs";
+  "twentefp-number" = dontDistribute super."twentefp-number";
+  "twentefp-rosetree" = dontDistribute super."twentefp-rosetree";
+  "twentefp-trees" = dontDistribute super."twentefp-trees";
+  "twentefp-websockets" = dontDistribute super."twentefp-websockets";
+  "twhs" = dontDistribute super."twhs";
+  "twidge" = dontDistribute super."twidge";
+  "twilight-stm" = dontDistribute super."twilight-stm";
+  "twilio" = dontDistribute super."twilio";
+  "twill" = dontDistribute super."twill";
+  "twiml" = dontDistribute super."twiml";
+  "twine" = dontDistribute super."twine";
+  "twisty" = dontDistribute super."twisty";
+  "twitch" = dontDistribute super."twitch";
+  "twitter" = dontDistribute super."twitter";
+  "twitter-conduit" = dontDistribute super."twitter-conduit";
+  "twitter-enumerator" = dontDistribute super."twitter-enumerator";
+  "twitter-types" = dontDistribute super."twitter-types";
+  "twitter-types-lens" = dontDistribute super."twitter-types-lens";
+  "tx" = dontDistribute super."tx";
+  "txt-sushi" = dontDistribute super."txt-sushi";
+  "txt2rtf" = dontDistribute super."txt2rtf";
+  "txtblk" = dontDistribute super."txtblk";
+  "ty" = dontDistribute super."ty";
+  "typalyze" = dontDistribute super."typalyze";
+  "type-aligned" = dontDistribute super."type-aligned";
+  "type-booleans" = dontDistribute super."type-booleans";
+  "type-cereal" = dontDistribute super."type-cereal";
+  "type-combinators" = dontDistribute super."type-combinators";
+  "type-combinators-quote" = dontDistribute super."type-combinators-quote";
+  "type-digits" = dontDistribute super."type-digits";
+  "type-equality" = dontDistribute super."type-equality";
+  "type-equality-check" = dontDistribute super."type-equality-check";
+  "type-fun" = dontDistribute super."type-fun";
+  "type-functions" = dontDistribute super."type-functions";
+  "type-hint" = dontDistribute super."type-hint";
+  "type-int" = dontDistribute super."type-int";
+  "type-iso" = dontDistribute super."type-iso";
+  "type-level" = dontDistribute super."type-level";
+  "type-level-bst" = dontDistribute super."type-level-bst";
+  "type-level-natural-number" = dontDistribute super."type-level-natural-number";
+  "type-level-natural-number-induction" = dontDistribute super."type-level-natural-number-induction";
+  "type-level-natural-number-operations" = dontDistribute super."type-level-natural-number-operations";
+  "type-level-sets" = dontDistribute super."type-level-sets";
+  "type-level-tf" = dontDistribute super."type-level-tf";
+  "type-natural" = dontDistribute super."type-natural";
+  "type-ord" = dontDistribute super."type-ord";
+  "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
+  "type-prelude" = dontDistribute super."type-prelude";
+  "type-settheory" = dontDistribute super."type-settheory";
+  "type-spine" = dontDistribute super."type-spine";
+  "type-structure" = dontDistribute super."type-structure";
+  "type-sub-th" = dontDistribute super."type-sub-th";
+  "type-unary" = dontDistribute super."type-unary";
+  "typeable-th" = dontDistribute super."typeable-th";
+  "typed-spreadsheet" = dontDistribute super."typed-spreadsheet";
+  "typed-wire" = dontDistribute super."typed-wire";
+  "typed-wire-utils" = dontDistribute super."typed-wire-utils";
+  "typedquery" = dontDistribute super."typedquery";
+  "typehash" = dontDistribute super."typehash";
+  "typelevel" = dontDistribute super."typelevel";
+  "typelevel-tensor" = dontDistribute super."typelevel-tensor";
+  "typeof" = dontDistribute super."typeof";
+  "typeparams" = dontDistribute super."typeparams";
+  "typesafe-endian" = dontDistribute super."typesafe-endian";
+  "typescript-docs" = dontDistribute super."typescript-docs";
+  "typical" = dontDistribute super."typical";
+  "typography-geometry" = dontDistribute super."typography-geometry";
+  "uAgda" = dontDistribute super."uAgda";
+  "ua-parser" = dontDistribute super."ua-parser";
+  "uacpid" = dontDistribute super."uacpid";
+  "uberlast" = dontDistribute super."uberlast";
+  "uconv" = dontDistribute super."uconv";
+  "udbus" = dontDistribute super."udbus";
+  "udbus-model" = dontDistribute super."udbus-model";
+  "udcode" = dontDistribute super."udcode";
+  "udev" = dontDistribute super."udev";
+  "uhc-light" = dontDistribute super."uhc-light";
+  "uhc-util" = dontDistribute super."uhc-util";
+  "uhexdump" = dontDistribute super."uhexdump";
+  "uhttpc" = dontDistribute super."uhttpc";
+  "ui-command" = dontDistribute super."ui-command";
+  "uid" = dontDistribute super."uid";
+  "una" = dontDistribute super."una";
+  "unagi-chan" = dontDistribute super."unagi-chan";
+  "unagi-streams" = dontDistribute super."unagi-streams";
+  "unamb" = dontDistribute super."unamb";
+  "unamb-custom" = dontDistribute super."unamb-custom";
+  "unbound" = dontDistribute super."unbound";
+  "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
+  "unboxed-containers" = dontDistribute super."unboxed-containers";
+  "unbreak" = dontDistribute super."unbreak";
+  "unexceptionalio" = dontDistribute super."unexceptionalio";
+  "unfoldable" = dontDistribute super."unfoldable";
+  "ungadtagger" = dontDistribute super."ungadtagger";
+  "uni-events" = dontDistribute super."uni-events";
+  "uni-graphs" = dontDistribute super."uni-graphs";
+  "uni-htk" = dontDistribute super."uni-htk";
+  "uni-posixutil" = dontDistribute super."uni-posixutil";
+  "uni-reactor" = dontDistribute super."uni-reactor";
+  "uni-uDrawGraph" = dontDistribute super."uni-uDrawGraph";
+  "uni-util" = dontDistribute super."uni-util";
+  "unicode" = dontDistribute super."unicode";
+  "unicode-names" = dontDistribute super."unicode-names";
+  "unicode-normalization" = dontDistribute super."unicode-normalization";
+  "unicode-prelude" = dontDistribute super."unicode-prelude";
+  "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-symbols" = dontDistribute super."unicode-symbols";
+  "unicoder" = dontDistribute super."unicoder";
+  "uniform-io" = dontDistribute super."uniform-io";
+  "uniform-pair" = dontDistribute super."uniform-pair";
+  "union-find-array" = dontDistribute super."union-find-array";
+  "union-map" = dontDistribute super."union-map";
+  "unique" = dontDistribute super."unique";
+  "unique-logic" = dontDistribute super."unique-logic";
+  "unique-logic-tf" = dontDistribute super."unique-logic-tf";
+  "uniqueid" = dontDistribute super."uniqueid";
+  "unit" = dontDistribute super."unit";
+  "units" = dontDistribute super."units";
+  "units-attoparsec" = dontDistribute super."units-attoparsec";
+  "units-defs" = dontDistribute super."units-defs";
+  "units-parser" = dontDistribute super."units-parser";
+  "unittyped" = dontDistribute super."unittyped";
+  "universal-binary" = dontDistribute super."universal-binary";
+  "universe-th" = dontDistribute super."universe-th";
+  "unix-fcntl" = dontDistribute super."unix-fcntl";
+  "unix-handle" = dontDistribute super."unix-handle";
+  "unix-io-extra" = dontDistribute super."unix-io-extra";
+  "unix-memory" = dontDistribute super."unix-memory";
+  "unix-process-conduit" = dontDistribute super."unix-process-conduit";
+  "unix-pty-light" = dontDistribute super."unix-pty-light";
+  "unlambda" = dontDistribute super."unlambda";
+  "unlit" = dontDistribute super."unlit";
+  "unm-hip" = dontDistribute super."unm-hip";
+  "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
+  "unordered-graphs" = dontDistribute super."unordered-graphs";
+  "unpack-funcs" = dontDistribute super."unpack-funcs";
+  "unroll-ghc-plugin" = dontDistribute super."unroll-ghc-plugin";
+  "unsafe" = dontDistribute super."unsafe";
+  "unsafe-promises" = dontDistribute super."unsafe-promises";
+  "unsafely" = dontDistribute super."unsafely";
+  "unsafeperformst" = dontDistribute super."unsafeperformst";
+  "unscramble" = dontDistribute super."unscramble";
+  "unusable-pkg" = dontDistribute super."unusable-pkg";
+  "uom-plugin" = dontDistribute super."uom-plugin";
+  "up" = dontDistribute super."up";
+  "up-grade" = dontDistribute super."up-grade";
+  "uploadcare" = dontDistribute super."uploadcare";
+  "upskirt" = dontDistribute super."upskirt";
+  "ureader" = dontDistribute super."ureader";
+  "urembed" = dontDistribute super."urembed";
+  "uri" = dontDistribute super."uri";
+  "uri-conduit" = dontDistribute super."uri-conduit";
+  "uri-enumerator" = dontDistribute super."uri-enumerator";
+  "uri-enumerator-file" = dontDistribute super."uri-enumerator-file";
+  "uri-template" = dontDistribute super."uri-template";
+  "url-generic" = dontDistribute super."url-generic";
+  "urlcheck" = dontDistribute super."urlcheck";
+  "urldecode" = dontDistribute super."urldecode";
+  "urldisp-happstack" = dontDistribute super."urldisp-happstack";
+  "urlencoded" = dontDistribute super."urlencoded";
+  "urn" = dontDistribute super."urn";
+  "urxml" = dontDistribute super."urxml";
+  "usb" = dontDistribute super."usb";
+  "usb-enumerator" = dontDistribute super."usb-enumerator";
+  "usb-hid" = dontDistribute super."usb-hid";
+  "usb-id-database" = dontDistribute super."usb-id-database";
+  "usb-iteratee" = dontDistribute super."usb-iteratee";
+  "usb-safe" = dontDistribute super."usb-safe";
+  "utc" = dontDistribute super."utc";
+  "utf8-env" = dontDistribute super."utf8-env";
+  "utf8-prelude" = dontDistribute super."utf8-prelude";
+  "uu-cco" = dontDistribute super."uu-cco";
+  "uu-cco-examples" = dontDistribute super."uu-cco-examples";
+  "uu-cco-hut-parsing" = dontDistribute super."uu-cco-hut-parsing";
+  "uu-cco-uu-parsinglib" = dontDistribute super."uu-cco-uu-parsinglib";
+  "uu-options" = dontDistribute super."uu-options";
+  "uu-tc" = dontDistribute super."uu-tc";
+  "uuagc" = dontDistribute super."uuagc";
+  "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap";
+  "uuagc-cabal" = dontDistribute super."uuagc-cabal";
+  "uuagc-diagrams" = dontDistribute super."uuagc-diagrams";
+  "uuagd" = dontDistribute super."uuagd";
+  "uuid-aeson" = dontDistribute super."uuid-aeson";
+  "uuid-le" = dontDistribute super."uuid-le";
+  "uuid-quasi" = dontDistribute super."uuid-quasi";
+  "uulib" = dontDistribute super."uulib";
+  "uvector" = dontDistribute super."uvector";
+  "uvector-algorithms" = dontDistribute super."uvector-algorithms";
+  "uxadt" = dontDistribute super."uxadt";
+  "uzbl-with-source" = dontDistribute super."uzbl-with-source";
+  "v4l2" = dontDistribute super."v4l2";
+  "v4l2-examples" = dontDistribute super."v4l2-examples";
+  "vacuum" = dontDistribute super."vacuum";
+  "vacuum-cairo" = dontDistribute super."vacuum-cairo";
+  "vacuum-graphviz" = dontDistribute super."vacuum-graphviz";
+  "vacuum-opengl" = dontDistribute super."vacuum-opengl";
+  "vacuum-ubigraph" = dontDistribute super."vacuum-ubigraph";
+  "vado" = dontDistribute super."vado";
+  "valid-names" = dontDistribute super."valid-names";
+  "validate" = dontDistribute super."validate";
+  "validated-literals" = dontDistribute super."validated-literals";
+  "validation" = dontDistribute super."validation";
+  "validations" = dontDistribute super."validations";
+  "value-supply" = dontDistribute super."value-supply";
+  "vampire" = dontDistribute super."vampire";
+  "var" = dontDistribute super."var";
+  "varan" = dontDistribute super."varan";
+  "variable-precision" = dontDistribute super."variable-precision";
+  "variables" = dontDistribute super."variables";
+  "varying" = dontDistribute super."varying";
+  "vaultaire-common" = dontDistribute super."vaultaire-common";
+  "vcache" = dontDistribute super."vcache";
+  "vcache-trie" = dontDistribute super."vcache-trie";
+  "vcard" = dontDistribute super."vcard";
+  "vcd" = dontDistribute super."vcd";
+  "vcs-revision" = dontDistribute super."vcs-revision";
+  "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
+  "vcsgui" = dontDistribute super."vcsgui";
+  "vcswrapper" = dontDistribute super."vcswrapper";
+  "vect" = dontDistribute super."vect";
+  "vect-floating" = dontDistribute super."vect-floating";
+  "vect-floating-accelerate" = dontDistribute super."vect-floating-accelerate";
+  "vect-opengl" = dontDistribute super."vect-opengl";
+  "vector-binary" = dontDistribute super."vector-binary";
+  "vector-bytestring" = dontDistribute super."vector-bytestring";
+  "vector-clock" = dontDistribute super."vector-clock";
+  "vector-conduit" = dontDistribute super."vector-conduit";
+  "vector-functorlazy" = dontDistribute super."vector-functorlazy";
+  "vector-heterogenous" = dontDistribute super."vector-heterogenous";
+  "vector-instances-collections" = dontDistribute super."vector-instances-collections";
+  "vector-mmap" = dontDistribute super."vector-mmap";
+  "vector-random" = dontDistribute super."vector-random";
+  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space-map" = dontDistribute super."vector-space-map";
+  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
+  "vector-static" = dontDistribute super."vector-static";
+  "vector-strategies" = dontDistribute super."vector-strategies";
+  "verbalexpressions" = dontDistribute super."verbalexpressions";
+  "verbosity" = dontDistribute super."verbosity";
+  "verdict" = dontDistribute super."verdict";
+  "verdict-json" = dontDistribute super."verdict-json";
+  "verilog" = dontDistribute super."verilog";
+  "versions" = dontDistribute super."versions";
+  "vhdl" = dontDistribute super."vhdl";
+  "views" = dontDistribute super."views";
+  "vigilance" = dontDistribute super."vigilance";
+  "vimeta" = dontDistribute super."vimeta";
+  "vimus" = dontDistribute super."vimus";
+  "vintage-basic" = dontDistribute super."vintage-basic";
+  "vinyl-gl" = dontDistribute super."vinyl-gl";
+  "vinyl-json" = dontDistribute super."vinyl-json";
+  "vinyl-utils" = dontDistribute super."vinyl-utils";
+  "vinyl-vectors" = dontDistribute super."vinyl-vectors";
+  "virthualenv" = dontDistribute super."virthualenv";
+  "visibility" = dontDistribute super."visibility";
+  "vision" = dontDistribute super."vision";
+  "visual-graphrewrite" = dontDistribute super."visual-graphrewrite";
+  "visual-prof" = dontDistribute super."visual-prof";
+  "vivid" = dontDistribute super."vivid";
+  "vk-aws-route53" = dontDistribute super."vk-aws-route53";
+  "vk-posix-pty" = dontDistribute super."vk-posix-pty";
+  "vocabulary-kadma" = dontDistribute super."vocabulary-kadma";
+  "vorbiscomment" = dontDistribute super."vorbiscomment";
+  "vowpal-utils" = dontDistribute super."vowpal-utils";
+  "voyeur" = dontDistribute super."voyeur";
+  "vrpn" = dontDistribute super."vrpn";
+  "vte" = dontDistribute super."vte";
+  "vtegtk3" = dontDistribute super."vtegtk3";
+  "vty-examples" = dontDistribute super."vty-examples";
+  "vty-menu" = dontDistribute super."vty-menu";
+  "vty-ui" = dontDistribute super."vty-ui";
+  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "waddle" = dontDistribute super."waddle";
+  "wai-accept-language" = dontDistribute super."wai-accept-language";
+  "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-devel" = dontDistribute super."wai-devel";
+  "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
+  "wai-dispatch" = dontDistribute super."wai-dispatch";
+  "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi";
+  "wai-graceful" = dontDistribute super."wai-graceful";
+  "wai-handler-devel" = dontDistribute super."wai-handler-devel";
+  "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
+  "wai-handler-snap" = dontDistribute super."wai-handler-snap";
+  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
+  "wai-hastache" = dontDistribute super."wai-hastache";
+  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-lens" = dontDistribute super."wai-lens";
+  "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
+  "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
+  "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
+  "wai-middleware-catch" = dontDistribute super."wai-middleware-catch";
+  "wai-middleware-etag" = dontDistribute super."wai-middleware-etag";
+  "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip";
+  "wai-middleware-headers" = dontDistribute super."wai-middleware-headers";
+  "wai-middleware-hmac" = dontDistribute super."wai-middleware-hmac";
+  "wai-middleware-hmac-client" = dontDistribute super."wai-middleware-hmac-client";
+  "wai-middleware-preprocessor" = dontDistribute super."wai-middleware-preprocessor";
+  "wai-middleware-route" = dontDistribute super."wai-middleware-route";
+  "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching";
+  "wai-request-spec" = dontDistribute super."wai-request-spec";
+  "wai-responsible" = dontDistribute super."wai-responsible";
+  "wai-router" = dontDistribute super."wai-router";
+  "wai-session-alt" = dontDistribute super."wai-session-alt";
+  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
+  "wai-static-cache" = dontDistribute super."wai-static-cache";
+  "wai-static-pages" = dontDistribute super."wai-static-pages";
+  "wai-test" = dontDistribute super."wai-test";
+  "wai-thrift" = dontDistribute super."wai-thrift";
+  "wai-throttler" = dontDistribute super."wai-throttler";
+  "wait-handle" = dontDistribute super."wait-handle";
+  "waitfree" = dontDistribute super."waitfree";
+  "warc" = dontDistribute super."warc";
+  "warp-dynamic" = dontDistribute super."warp-dynamic";
+  "warp-static" = dontDistribute super."warp-static";
+  "warp-tls-uid" = dontDistribute super."warp-tls-uid";
+  "watchdog" = dontDistribute super."watchdog";
+  "watcher" = dontDistribute super."watcher";
+  "watchit" = dontDistribute super."watchit";
+  "wavconvert" = dontDistribute super."wavconvert";
+  "wavefront" = dontDistribute super."wavefront";
+  "wavesurfer" = dontDistribute super."wavesurfer";
+  "wavy" = dontDistribute super."wavy";
+  "wcwidth" = dontDistribute super."wcwidth";
+  "weather-api" = dontDistribute super."weather-api";
+  "web-browser-in-haskell" = dontDistribute super."web-browser-in-haskell";
+  "web-css" = dontDistribute super."web-css";
+  "web-encodings" = dontDistribute super."web-encodings";
+  "web-mongrel2" = dontDistribute super."web-mongrel2";
+  "web-page" = dontDistribute super."web-page";
+  "web-routes-mtl" = dontDistribute super."web-routes-mtl";
+  "web-routes-quasi" = dontDistribute super."web-routes-quasi";
+  "web-routes-regular" = dontDistribute super."web-routes-regular";
+  "web-routes-transformers" = dontDistribute super."web-routes-transformers";
+  "webapi" = dontDistribute super."webapi";
+  "webapp" = dontDistribute super."webapp";
+  "webcrank" = dontDistribute super."webcrank";
+  "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
+  "webcrank-wai" = dontDistribute super."webcrank-wai";
+  "webdriver-snoy" = dontDistribute super."webdriver-snoy";
+  "webfinger-client" = dontDistribute super."webfinger-client";
+  "webidl" = dontDistribute super."webidl";
+  "webify" = dontDistribute super."webify";
+  "webkit" = dontDistribute super."webkit";
+  "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore";
+  "webkitgtk3" = dontDistribute super."webkitgtk3";
+  "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore";
+  "webrtc-vad" = dontDistribute super."webrtc-vad";
+  "webserver" = dontDistribute super."webserver";
+  "websnap" = dontDistribute super."websnap";
+  "websockets-snap" = dontDistribute super."websockets-snap";
+  "webwire" = dontDistribute super."webwire";
+  "wedding-announcement" = dontDistribute super."wedding-announcement";
+  "wedged" = dontDistribute super."wedged";
+  "weighted-regexp" = dontDistribute super."weighted-regexp";
+  "weighted-search" = dontDistribute super."weighted-search";
+  "welshy" = dontDistribute super."welshy";
+  "wheb-mongo" = dontDistribute super."wheb-mongo";
+  "wheb-redis" = dontDistribute super."wheb-redis";
+  "wheb-strapped" = dontDistribute super."wheb-strapped";
+  "while-lang-parser" = dontDistribute super."while-lang-parser";
+  "whim" = dontDistribute super."whim";
+  "whiskers" = dontDistribute super."whiskers";
+  "whitespace" = dontDistribute super."whitespace";
+  "whois" = dontDistribute super."whois";
+  "why3" = dontDistribute super."why3";
+  "wigner-symbols" = dontDistribute super."wigner-symbols";
+  "wikipedia4epub" = dontDistribute super."wikipedia4epub";
+  "win-hp-path" = dontDistribute super."win-hp-path";
+  "windowslive" = dontDistribute super."windowslive";
+  "winerror" = dontDistribute super."winerror";
+  "winio" = dontDistribute super."winio";
+  "wiring" = dontDistribute super."wiring";
+  "witness" = dontDistribute super."witness";
+  "witty" = dontDistribute super."witty";
+  "wkt" = dontDistribute super."wkt";
+  "wl-pprint-ansiterm" = dontDistribute super."wl-pprint-ansiterm";
+  "wlc-hs" = dontDistribute super."wlc-hs";
+  "wobsurv" = dontDistribute super."wobsurv";
+  "woffex" = dontDistribute super."woffex";
+  "wol" = dontDistribute super."wol";
+  "wolf" = dontDistribute super."wolf";
+  "woot" = dontDistribute super."woot";
+  "word24" = dontDistribute super."word24";
+  "wordcloud" = dontDistribute super."wordcloud";
+  "wordexp" = dontDistribute super."wordexp";
+  "words" = dontDistribute super."words";
+  "wordsearch" = dontDistribute super."wordsearch";
+  "wordsetdiff" = dontDistribute super."wordsetdiff";
+  "workflow-osx" = dontDistribute super."workflow-osx";
+  "wp-archivebot" = dontDistribute super."wp-archivebot";
+  "wraparound" = dontDistribute super."wraparound";
+  "wraxml" = dontDistribute super."wraxml";
+  "wreq-sb" = dontDistribute super."wreq-sb";
+  "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
+  "wsedit" = dontDistribute super."wsedit";
+  "wtk" = dontDistribute super."wtk";
+  "wtk-gtk" = dontDistribute super."wtk-gtk";
+  "wumpus-basic" = dontDistribute super."wumpus-basic";
+  "wumpus-core" = dontDistribute super."wumpus-core";
+  "wumpus-drawing" = dontDistribute super."wumpus-drawing";
+  "wumpus-microprint" = dontDistribute super."wumpus-microprint";
+  "wumpus-tree" = dontDistribute super."wumpus-tree";
+  "wuss" = dontDistribute super."wuss";
+  "wx" = dontDistribute super."wx";
+  "wxAsteroids" = dontDistribute super."wxAsteroids";
+  "wxFruit" = dontDistribute super."wxFruit";
+  "wxc" = dontDistribute super."wxc";
+  "wxcore" = dontDistribute super."wxcore";
+  "wxdirect" = dontDistribute super."wxdirect";
+  "wxhnotepad" = dontDistribute super."wxhnotepad";
+  "wxturtle" = dontDistribute super."wxturtle";
+  "wybor" = dontDistribute super."wybor";
+  "wyvern" = dontDistribute super."wyvern";
+  "x-dsp" = dontDistribute super."x-dsp";
+  "x11-xim" = dontDistribute super."x11-xim";
+  "x11-xinput" = dontDistribute super."x11-xinput";
+  "x509-util" = dontDistribute super."x509-util";
+  "xattr" = dontDistribute super."xattr";
+  "xbattbar" = dontDistribute super."xbattbar";
+  "xcb-types" = dontDistribute super."xcb-types";
+  "xcffib" = dontDistribute super."xcffib";
+  "xchat-plugin" = dontDistribute super."xchat-plugin";
+  "xcp" = dontDistribute super."xcp";
+  "xdg-userdirs" = dontDistribute super."xdg-userdirs";
+  "xdot" = dontDistribute super."xdot";
+  "xfconf" = dontDistribute super."xfconf";
+  "xhaskell-library" = dontDistribute super."xhaskell-library";
+  "xhb" = dontDistribute super."xhb";
+  "xhb-atom-cache" = dontDistribute super."xhb-atom-cache";
+  "xhb-ewmh" = dontDistribute super."xhb-ewmh";
+  "xhtml" = doDistribute super."xhtml_3000_2_1";
+  "xhtml-combinators" = dontDistribute super."xhtml-combinators";
+  "xilinx-lava" = dontDistribute super."xilinx-lava";
+  "xine" = dontDistribute super."xine";
+  "xing-api" = dontDistribute super."xing-api";
+  "xinput-conduit" = dontDistribute super."xinput-conduit";
+  "xkbcommon" = dontDistribute super."xkbcommon";
+  "xkcd" = dontDistribute super."xkcd";
+  "xlsx-templater" = dontDistribute super."xlsx-templater";
+  "xml-basic" = dontDistribute super."xml-basic";
+  "xml-catalog" = dontDistribute super."xml-catalog";
+  "xml-enumerator" = dontDistribute super."xml-enumerator";
+  "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
+  "xml-extractors" = dontDistribute super."xml-extractors";
+  "xml-helpers" = dontDistribute super."xml-helpers";
+  "xml-html-conduit-lens" = dontDistribute super."xml-html-conduit-lens";
+  "xml-monad" = dontDistribute super."xml-monad";
+  "xml-parsec" = dontDistribute super."xml-parsec";
+  "xml-picklers" = dontDistribute super."xml-picklers";
+  "xml-pipe" = dontDistribute super."xml-pipe";
+  "xml-prettify" = dontDistribute super."xml-prettify";
+  "xml-push" = dontDistribute super."xml-push";
+  "xml-query" = dontDistribute super."xml-query";
+  "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit";
+  "xml-query-xml-types" = dontDistribute super."xml-query-xml-types";
+  "xml2html" = dontDistribute super."xml2html";
+  "xml2json" = dontDistribute super."xml2json";
+  "xml2x" = dontDistribute super."xml2x";
+  "xmltv" = dontDistribute super."xmltv";
+  "xmms2-client" = dontDistribute super."xmms2-client";
+  "xmms2-client-glib" = dontDistribute super."xmms2-client-glib";
+  "xmobar" = dontDistribute super."xmobar";
+  "xmonad-bluetilebranch" = dontDistribute super."xmonad-bluetilebranch";
+  "xmonad-contrib" = dontDistribute super."xmonad-contrib";
+  "xmonad-contrib-bluetilebranch" = dontDistribute super."xmonad-contrib-bluetilebranch";
+  "xmonad-contrib-gpl" = dontDistribute super."xmonad-contrib-gpl";
+  "xmonad-entryhelper" = dontDistribute super."xmonad-entryhelper";
+  "xmonad-eval" = dontDistribute super."xmonad-eval";
+  "xmonad-extras" = dontDistribute super."xmonad-extras";
+  "xmonad-screenshot" = dontDistribute super."xmonad-screenshot";
+  "xmonad-utils" = dontDistribute super."xmonad-utils";
+  "xmonad-wallpaper" = dontDistribute super."xmonad-wallpaper";
+  "xmonad-windownames" = dontDistribute super."xmonad-windownames";
+  "xmpipe" = dontDistribute super."xmpipe";
+  "xorshift" = dontDistribute super."xorshift";
+  "xosd" = dontDistribute super."xosd";
+  "xournal-builder" = dontDistribute super."xournal-builder";
+  "xournal-convert" = dontDistribute super."xournal-convert";
+  "xournal-parser" = dontDistribute super."xournal-parser";
+  "xournal-render" = dontDistribute super."xournal-render";
+  "xournal-types" = dontDistribute super."xournal-types";
+  "xsact" = dontDistribute super."xsact";
+  "xsd" = dontDistribute super."xsd";
+  "xsha1" = dontDistribute super."xsha1";
+  "xslt" = dontDistribute super."xslt";
+  "xtc" = dontDistribute super."xtc";
+  "xtest" = dontDistribute super."xtest";
+  "xturtle" = dontDistribute super."xturtle";
+  "xxhash" = dontDistribute super."xxhash";
+  "y0l0bot" = dontDistribute super."y0l0bot";
+  "yabi" = dontDistribute super."yabi";
+  "yabi-muno" = dontDistribute super."yabi-muno";
+  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
+  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
+  "yajl" = dontDistribute super."yajl";
+  "yajl-enumerator" = dontDistribute super."yajl-enumerator";
+  "yall" = dontDistribute super."yall";
+  "yamemo" = dontDistribute super."yamemo";
+  "yaml-config" = dontDistribute super."yaml-config";
+  "yaml-light-lens" = dontDistribute super."yaml-light-lens";
+  "yaml-rpc" = dontDistribute super."yaml-rpc";
+  "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
+  "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
+  "yaml2owl" = dontDistribute super."yaml2owl";
+  "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
+  "yampa-canvas" = dontDistribute super."yampa-canvas";
+  "yampa-glfw" = dontDistribute super."yampa-glfw";
+  "yampa-glut" = dontDistribute super."yampa-glut";
+  "yampa2048" = dontDistribute super."yampa2048";
+  "yaop" = dontDistribute super."yaop";
+  "yap" = dontDistribute super."yap";
+  "yarr" = dontDistribute super."yarr";
+  "yarr-image-io" = dontDistribute super."yarr-image-io";
+  "yate" = dontDistribute super."yate";
+  "yavie" = dontDistribute super."yavie";
+  "ycextra" = dontDistribute super."ycextra";
+  "yeganesh" = dontDistribute super."yeganesh";
+  "yeller" = dontDistribute super."yeller";
+  "yesod-angular" = dontDistribute super."yesod-angular";
+  "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
+  "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
+  "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos";
+  "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
+  "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
+  "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = dontDistribute super."yesod-auth-oauth";
+  "yesod-auth-oauth2" = dontDistribute super."yesod-auth-oauth2";
+  "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
+  "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
+  "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
+  "yesod-bootstrap" = dontDistribute super."yesod-bootstrap";
+  "yesod-comments" = dontDistribute super."yesod-comments";
+  "yesod-content-pdf" = dontDistribute super."yesod-content-pdf";
+  "yesod-continuations" = dontDistribute super."yesod-continuations";
+  "yesod-crud" = dontDistribute super."yesod-crud";
+  "yesod-crud-persist" = dontDistribute super."yesod-crud-persist";
+  "yesod-csp" = dontDistribute super."yesod-csp";
+  "yesod-datatables" = dontDistribute super."yesod-datatables";
+  "yesod-dsl" = dontDistribute super."yesod-dsl";
+  "yesod-examples" = dontDistribute super."yesod-examples";
+  "yesod-form-json" = dontDistribute super."yesod-form-json";
+  "yesod-goodies" = dontDistribute super."yesod-goodies";
+  "yesod-json" = dontDistribute super."yesod-json";
+  "yesod-links" = dontDistribute super."yesod-links";
+  "yesod-lucid" = dontDistribute super."yesod-lucid";
+  "yesod-markdown" = dontDistribute super."yesod-markdown";
+  "yesod-media-simple" = dontDistribute super."yesod-media-simple";
+  "yesod-paginate" = dontDistribute super."yesod-paginate";
+  "yesod-pagination" = dontDistribute super."yesod-pagination";
+  "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-platform" = dontDistribute super."yesod-platform";
+  "yesod-pnotify" = dontDistribute super."yesod-pnotify";
+  "yesod-pure" = dontDistribute super."yesod-pure";
+  "yesod-purescript" = dontDistribute super."yesod-purescript";
+  "yesod-raml" = dontDistribute super."yesod-raml";
+  "yesod-raml-bin" = dontDistribute super."yesod-raml-bin";
+  "yesod-raml-docs" = dontDistribute super."yesod-raml-docs";
+  "yesod-raml-mock" = dontDistribute super."yesod-raml-mock";
+  "yesod-recaptcha" = dontDistribute super."yesod-recaptcha";
+  "yesod-routes" = dontDistribute super."yesod-routes";
+  "yesod-routes-flow" = dontDistribute super."yesod-routes-flow";
+  "yesod-routes-typescript" = dontDistribute super."yesod-routes-typescript";
+  "yesod-rst" = dontDistribute super."yesod-rst";
+  "yesod-s3" = dontDistribute super."yesod-s3";
+  "yesod-sass" = dontDistribute super."yesod-sass";
+  "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-tableview" = dontDistribute super."yesod-tableview";
+  "yesod-test-json" = dontDistribute super."yesod-test-json";
+  "yesod-tls" = dontDistribute super."yesod-tls";
+  "yesod-transloadit" = dontDistribute super."yesod-transloadit";
+  "yesod-vend" = dontDistribute super."yesod-vend";
+  "yesod-websockets-extra" = dontDistribute super."yesod-websockets-extra";
+  "yesod-worker" = dontDistribute super."yesod-worker";
+  "yet-another-logger" = dontDistribute super."yet-another-logger";
+  "yhccore" = dontDistribute super."yhccore";
+  "yi-contrib" = dontDistribute super."yi-contrib";
+  "yi-emacs-colours" = dontDistribute super."yi-emacs-colours";
+  "yi-gtk" = dontDistribute super."yi-gtk";
+  "yi-monokai" = dontDistribute super."yi-monokai";
+  "yi-snippet" = dontDistribute super."yi-snippet";
+  "yi-solarized" = dontDistribute super."yi-solarized";
+  "yi-spolsky" = dontDistribute super."yi-spolsky";
+  "yi-vty" = dontDistribute super."yi-vty";
+  "yices" = dontDistribute super."yices";
+  "yices-easy" = dontDistribute super."yices-easy";
+  "yices-painless" = dontDistribute super."yices-painless";
+  "yjftp" = dontDistribute super."yjftp";
+  "yjftp-libs" = dontDistribute super."yjftp-libs";
+  "yjsvg" = dontDistribute super."yjsvg";
+  "yjtools" = dontDistribute super."yjtools";
+  "yocto" = dontDistribute super."yocto";
+  "yoko" = dontDistribute super."yoko";
+  "york-lava" = dontDistribute super."york-lava";
+  "youtube" = dontDistribute super."youtube";
+  "yql" = dontDistribute super."yql";
+  "yst" = dontDistribute super."yst";
+  "yuiGrid" = dontDistribute super."yuiGrid";
+  "yuuko" = dontDistribute super."yuuko";
+  "yxdb-utils" = dontDistribute super."yxdb-utils";
+  "z3" = dontDistribute super."z3";
+  "zalgo" = dontDistribute super."zalgo";
+  "zampolit" = dontDistribute super."zampolit";
+  "zasni-gerna" = dontDistribute super."zasni-gerna";
+  "zcache" = dontDistribute super."zcache";
+  "zenc" = dontDistribute super."zenc";
+  "zendesk-api" = dontDistribute super."zendesk-api";
+  "zeno" = dontDistribute super."zeno";
+  "zerobin" = dontDistribute super."zerobin";
+  "zeromq-haskell" = dontDistribute super."zeromq-haskell";
+  "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
+  "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeroth" = dontDistribute super."zeroth";
+  "zigbee-znet25" = dontDistribute super."zigbee-znet25";
+  "zip-conduit" = dontDistribute super."zip-conduit";
+  "zipedit" = dontDistribute super."zipedit";
+  "zipkin" = dontDistribute super."zipkin";
+  "zipper" = dontDistribute super."zipper";
+  "zippers" = dontDistribute super."zippers";
+  "zippo" = dontDistribute super."zippo";
+  "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zmcat" = dontDistribute super."zmcat";
+  "zmidi-core" = dontDistribute super."zmidi-core";
+  "zmidi-score" = dontDistribute super."zmidi-score";
+  "zmqat" = dontDistribute super."zmqat";
+  "zoneinfo" = dontDistribute super."zoneinfo";
+  "zoom" = dontDistribute super."zoom";
+  "zoom-cache" = dontDistribute super."zoom-cache";
+  "zoom-cache-pcm" = dontDistribute super."zoom-cache-pcm";
+  "zoom-cache-sndfile" = dontDistribute super."zoom-cache-sndfile";
+  "zoom-refs" = dontDistribute super."zoom-refs";
+  "zot" = dontDistribute super."zot";
+  "zsh-battery" = dontDistribute super."zsh-battery";
+  "ztail" = dontDistribute super."ztail";
+
+}
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 385a24d5a237..3d141ef5664e 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -6401,6 +6401,20 @@ self: {
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;};
 
+  "GLURaw_2_0_0_1" = callPackage
+    ({ mkDerivation, base, freeglut, mesa, OpenGLRaw, transformers }:
+     mkDerivation {
+       pname = "GLURaw";
+       version = "2.0.0.1";
+       sha256 = "d561b2e170e6048f7f1b18647fa569f28684291e25924b41f169ecfdc281ab40";
+       libraryHaskellDepends = [ base OpenGLRaw transformers ];
+       librarySystemDepends = [ freeglut mesa ];
+       homepage = "http://www.haskell.org/haskellwiki/Opengl";
+       description = "A raw binding for the OpenGL graphics system";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;};
+
   "GLUT_2_5_1_1" = callPackage
     ({ mkDerivation, array, base, containers, freeglut, mesa, OpenGL
      , OpenGLRaw
@@ -14552,6 +14566,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) mesa;};
 
+  "OpenGLRaw_3_1_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, fixed, half, mesa
+     , text, transformers
+     }:
+     mkDerivation {
+       pname = "OpenGLRaw";
+       version = "3.1.0.0";
+       sha256 = "414364cacce1c7601c93b388dbb73c5bdc76e5b0f3754ee61d0a5b94ccf9f3ce";
+       libraryHaskellDepends = [
+         base bytestring containers fixed half text transformers
+       ];
+       librarySystemDepends = [ mesa ];
+       homepage = "http://www.haskell.org/haskellwiki/Opengl";
+       description = "A raw binding for the OpenGL graphics system";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) mesa;};
+
   "OpenGLRaw21" = callPackage
     ({ mkDerivation, OpenGLRaw }:
      mkDerivation {
@@ -17093,8 +17125,8 @@ self: {
      }:
      mkDerivation {
        pname = "ShellCheck";
-       version = "0.4.1";
-       sha256 = "531af7608dea3f84b14a0d795fb9322c89850235992584d4b7a7b73dc47a3905";
+       version = "0.4.2";
+       sha256 = "26a4a0be02cf2dd443b60e0b4900cbe278c207f6118af6a1d95bee70e02221e3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -17307,17 +17339,16 @@ self: {
 
   "Slides" = callPackage
     ({ mkDerivation, base, colour, diagrams-lib, diagrams-svg
-     , file-embed, regexpr, utf8-string
+     , file-embed, regex-applicative
      }:
      mkDerivation {
        pname = "Slides";
-       version = "0.1.0.6";
-       sha256 = "b8bc88708a6bb7ec886e74ffd8bbc9c93f57deb75ee0d4770050557138ad3bd6";
+       version = "0.1.0.8";
+       sha256 = "1058d7ccedef0081bec5a4f7ebbb70e7e564d70ee642d3fd49920b0be569c57c";
        libraryHaskellDepends = [
-         base colour diagrams-lib diagrams-svg file-embed regexpr
-         utf8-string
+         base colour diagrams-lib diagrams-svg file-embed regex-applicative
        ];
-       jailbreak = true;
+       testHaskellDepends = [ base file-embed ];
        description = "Generate slides from Haskell code";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -19180,8 +19211,8 @@ self: {
     ({ mkDerivation, base, containers, matrix }:
      mkDerivation {
        pname = "Verba";
-       version = "0.1.0.0";
-       sha256 = "28d93cc4f585229cb8d666863b74910c81e176fb2281d088f9cdd9de553d619e";
+       version = "0.1.2.0";
+       sha256 = "f5c68bcb9ea60f75f853fecb0b399cf1794caebe4ab3bfcb0ea5e9d8fb4f2fba";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base containers matrix ];
@@ -23328,7 +23359,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "alex" = callPackage
+  "alex_3_1_6" = callPackage
     ({ mkDerivation, array, base, containers, directory, happy, process
      , QuickCheck
      }:
@@ -23347,9 +23378,10 @@ self: {
        homepage = "http://www.haskell.org/alex/";
        description = "Alex is a tool for generating lexical analysers in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "alex_3_1_7" = callPackage
+  "alex" = callPackage
     ({ mkDerivation, array, base, containers, directory, happy, process
      , QuickCheck
      }:
@@ -23367,7 +23399,6 @@ self: {
        homepage = "http://www.haskell.org/alex/";
        description = "Alex is a tool for generating lexical analysers in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "alex-meta" = callPackage
@@ -33979,8 +34010,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "between";
-       version = "0.10.0.0";
-       sha256 = "516fec2ddecda16a18b4056418a1448b926c7b1188a53c626e898542c4267281";
+       version = "0.11.0.0";
+       sha256 = "8337351326c5a613d9b7520b6a8203234c04454e23550a81739beaa6f671465d";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/trskop/between";
        description = "Function combinator \"between\" and derived combinators";
@@ -34385,6 +34416,7 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
          test-framework-th
        ];
+       jailbreak = true;
        homepage = "https://github.com/choener/bimaps";
        description = "bijections with multiple implementations";
        license = stdenv.lib.licenses.bsd3;
@@ -36802,6 +36834,25 @@ self: {
        license = "LGPL";
      }) {};
 
+  "blatex" = callPackage
+    ({ mkDerivation, base, blaze-html, directory, HaTeX, split, tagsoup
+     , text
+     }:
+     mkDerivation {
+       pname = "blatex";
+       version = "0.1.0.1";
+       sha256 = "fce281ebb969b1147259d42c5129ac567ee1136a057a2a7e223c148a17602349";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base blaze-html directory HaTeX split tagsoup text
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/2016rshah/BlaTeX";
+       description = "Blog in LaTeX";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "blaze" = callPackage
     ({ mkDerivation }:
      mkDerivation {
@@ -38435,8 +38486,8 @@ self: {
     ({ mkDerivation, base, bson, ghc-prim, text }:
      mkDerivation {
        pname = "bson-generic";
-       version = "0.0.8";
-       sha256 = "b01d0fbd972e3d74f66021e4c8e627981ad32baa7dc4b184b20a7fdea5692f64";
+       version = "0.0.8.1";
+       sha256 = "9b9f8d160c7d813224946f194f82bf38a2299b6eb9d643f590ed7616a226877e";
        libraryHaskellDepends = [ base bson ghc-prim text ];
        jailbreak = true;
        description = "Generic functionality for BSON";
@@ -40917,6 +40968,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cabal-src_0_3_0_1" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, conduit-extra
+     , containers, directory, filepath, http-conduit, http-types
+     , network, process, resourcet, shelly, system-fileio
+     , system-filepath, tar, text, transformers
+     }:
+     mkDerivation {
+       pname = "cabal-src";
+       version = "0.3.0.1";
+       sha256 = "80effd26be00526fa876b6ab9c64e1b7f3e576f9064175d15ff689a7a0fa8a4c";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bytestring conduit conduit-extra containers directory filepath
+         http-conduit http-types network process resourcet shelly
+         system-fileio system-filepath tar text transformers
+       ];
+       homepage = "https://github.com/yesodweb/cabal-src";
+       description = "Alternative install procedure to avoid the diamond dependency issue";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cabal-test" = callPackage
     ({ mkDerivation, base, Cabal, filepath, ghc, pqc, QuickCheck }:
      mkDerivation {
@@ -41987,6 +42061,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "carray_0_1_6_3" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, ix-shapable
+     , QuickCheck, syb
+     }:
+     mkDerivation {
+       pname = "carray";
+       version = "0.1.6.3";
+       sha256 = "92f78eaf7c88d9652edb452fdeb4292deb896b667e44fb2f99aeab324bdd7bff";
+       libraryHaskellDepends = [
+         array base binary bytestring ix-shapable QuickCheck syb
+       ];
+       testHaskellDepends = [ array base ix-shapable QuickCheck ];
+       description = "A C-compatible array library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cartel_0_14_2_6" = callPackage
     ({ mkDerivation, base, directory, filepath, multiarg, QuickCheck
      , random, tasty, tasty-quickcheck, tasty-th, time, transformers
@@ -56412,15 +56503,15 @@ self: {
      }) {};
 
   "dawg-ord" = callPackage
-    ({ mkDerivation, base, binary, containers, mtl, transformers
-     , vector
-     }:
+    ({ mkDerivation, base, containers, mtl, transformers, vector }:
      mkDerivation {
        pname = "dawg-ord";
-       version = "0.2";
-       sha256 = "e64f7c448b694073c2dc70f18cad77e5fbcf46055432cc9c391532373f05d267";
+       version = "0.4.0.2";
+       sha256 = "a8f007ba497f5592d4e7a6253dcc7b1ed3c8885ec98506571b3135ac94c9e4be";
+       revision = "1";
+       editedCabalFile = "e855c06865af4ca1c876baf8c89cfe3479efb00501449f2bb717ad749161a638";
        libraryHaskellDepends = [
-         base binary containers mtl transformers vector
+         base containers mtl transformers vector
        ];
        homepage = "https://github.com/kawu/dawg-ord";
        description = "Directed acyclic word graphs";
@@ -57103,6 +57194,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "debug-time" = callPackage
+    ({ mkDerivation, base, clock, containers }:
+     mkDerivation {
+       pname = "debug-time";
+       version = "0.1.0.1";
+       sha256 = "6076a78e42012a902b8ee157ec9069ca3148cb89ca659e4dff5267f11aca4d99";
+       libraryHaskellDepends = [ base clock containers ];
+       testHaskellDepends = [ base ];
+       homepage = "http://github.com/LukaHorvat/debug-time#readme";
+       description = "Debug.Trace equivalent for timing computations";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "decepticons" = callPackage
     ({ mkDerivation, base, comonad-transformers }:
      mkDerivation {
@@ -60767,8 +60871,8 @@ self: {
     ({ mkDerivation, base, numtype-tf, time }:
      mkDerivation {
        pname = "dimensional-tf";
-       version = "0.3.0.2";
-       sha256 = "9d30fc10cc719638732d67935ef0ea299500797ff88213e1f4d5278f92380daf";
+       version = "0.3.0.3";
+       sha256 = "50081bf621515ee7fbe54f7aac45b0f3df7433dcc6ba681e0ca418f0cd17b110";
        libraryHaskellDepends = [ base numtype-tf time ];
        homepage = "http://dimensional.googlecode.com/";
        description = "Statically checked physical dimensions, implemented using type families";
@@ -61670,6 +61774,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "distributed-process-lifted" = callPackage
+    ({ mkDerivation, base, binary, deepseq, distributed-process
+     , distributed-process-monad-control, HUnit, lifted-base
+     , monad-control, mtl, network, network-transport
+     , network-transport-tcp, rematch, test-framework
+     , test-framework-hunit, transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "distributed-process-lifted";
+       version = "0.1.0.0";
+       sha256 = "638112333b5bc20117396d673d46cc3786719fd545a7a76f9fb80957ee1a5a4e";
+       libraryHaskellDepends = [
+         base deepseq distributed-process distributed-process-monad-control
+         lifted-base monad-control mtl network-transport transformers
+         transformers-base
+       ];
+       testHaskellDepends = [
+         base binary distributed-process HUnit lifted-base mtl network
+         network-transport network-transport-tcp rematch test-framework
+         test-framework-hunit transformers
+       ];
+       homepage = "https://github.com/jeremyjh/distributed-process-lifted";
+       description = "monad-control style typeclass and transformer instances for Process monad";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "distributed-process-monad-control" = callPackage
     ({ mkDerivation, base, distributed-process, monad-control
      , transformers, transformers-base
@@ -64690,7 +64820,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "edit-distance-vector" = callPackage
+  "edit-distance-vector_1_0_0_2" = callPackage
     ({ mkDerivation, base, QuickCheck, quickcheck-instances, vector }:
      mkDerivation {
        pname = "edit-distance-vector";
@@ -64703,6 +64833,22 @@ self: {
        homepage = "https://github.com/thsutton/edit-distance-vector";
        description = "Calculate edit distances and edit scripts between vectors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "edit-distance-vector" = callPackage
+    ({ mkDerivation, base, QuickCheck, quickcheck-instances, vector }:
+     mkDerivation {
+       pname = "edit-distance-vector";
+       version = "1.0.0.3";
+       sha256 = "a52670b6887d9cc852243fdd2adbb89e7cf152188f4b698d67d9825cef8d375b";
+       libraryHaskellDepends = [ base vector ];
+       testHaskellDepends = [
+         base QuickCheck quickcheck-instances vector
+       ];
+       homepage = "https://github.com/thsutton/edit-distance-vector";
+       description = "Calculate edit distances and edit scripts between vectors";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "edit-lenses" = callPackage
@@ -66154,6 +66300,7 @@ self: {
        version = "0.2.0.1";
        sha256 = "312ea501116bddc01dd523948b80693ec6348a8f6beb5a1b9bcbeaa709d9eb6b";
        libraryHaskellDepends = [ base between transformers ];
+       jailbreak = true;
        homepage = "https://github.com/trskop/endo";
        description = "Endomorphism utilities";
        license = stdenv.lib.licenses.bsd3;
@@ -66255,7 +66402,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "engine-io-yesod" = callPackage
+  "engine-io-yesod_1_0_3" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-extra
      , engine-io, http-types, text, unordered-containers, wai
      , wai-websockets, websockets, yesod-core
@@ -66269,6 +66416,23 @@ self: {
          unordered-containers wai wai-websockets websockets yesod-core
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "engine-io-yesod" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, conduit-extra
+     , engine-io, http-types, text, unordered-containers, wai
+     , wai-websockets, websockets, yesod-core
+     }:
+     mkDerivation {
+       pname = "engine-io-yesod";
+       version = "1.0.4";
+       sha256 = "d569661729341eca76a4c04fea27e02fccf27978e61ca93848cd095f36dcdbc5";
+       libraryHaskellDepends = [
+         base bytestring conduit conduit-extra engine-io http-types text
+         unordered-containers wai wai-websockets websockets yesod-core
+       ];
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "engineering-units" = callPackage
@@ -67086,6 +67250,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "errors_2_1_0" = callPackage
+    ({ mkDerivation, base, safe, transformers, transformers-compat
+     , unexceptionalio
+     }:
+     mkDerivation {
+       pname = "errors";
+       version = "2.1.0";
+       sha256 = "8689fa17307692eed702a87460506e407f746f2ac1fa2183953cc6204bda0658";
+       libraryHaskellDepends = [
+         base safe transformers transformers-compat unexceptionalio
+       ];
+       description = "Simplified error-handling";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ersatz_0_2_6_1" = callPackage
     ({ mkDerivation, array, base, blaze-builder, blaze-textual
      , bytestring, containers, data-default, data-reify, directory
@@ -70462,7 +70642,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "feed" = callPackage
+  "feed_0_3_10_4" = callPackage
     ({ mkDerivation, base, HUnit, old-locale, old-time, test-framework
      , test-framework-hunit, time, time-locale-compat, utf8-string, xml
      }:
@@ -70480,16 +70660,17 @@ self: {
        homepage = "https://github.com/bergmark/feed";
        description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "feed_0_3_11_0" = callPackage
+  "feed" = callPackage
     ({ mkDerivation, base, HUnit, old-locale, old-time, test-framework
      , test-framework-hunit, time, time-locale-compat, utf8-string, xml
      }:
      mkDerivation {
        pname = "feed";
-       version = "0.3.11.0";
-       sha256 = "39ca3bd23d4ff7d6b4ce2129ac4453ad789c9454ddd7c1629451933e1eb3f884";
+       version = "0.3.11.1";
+       sha256 = "ed04d0fc120a4b1b47c7675d395afbb419506431bc6f8e0f2c382c73a4afc983";
        libraryHaskellDepends = [
          base old-locale old-time time time-locale-compat utf8-string xml
        ];
@@ -70500,7 +70681,6 @@ self: {
        homepage = "https://github.com/bergmark/feed";
        description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "feed-cli" = callPackage
@@ -84739,6 +84919,47 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hOpenPGP_2_3" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
+     , bifunctors, binary, binary-conduit, byteable, bytestring, bzlib
+     , conduit, conduit-extra, containers, crypto-cipher-types
+     , cryptonite, data-default-class, errors, hashable
+     , incremental-parser, ixset-typed, lens, memory, monad-loops
+     , nettle, network, network-uri, newtype, openpgp-asciiarmor
+     , QuickCheck, quickcheck-instances, resourcet, securemem
+     , semigroups, split, tasty, tasty-hunit, tasty-quickcheck, text
+     , time, time-locale-compat, transformers, unordered-containers
+     , wl-pprint-extras, zlib
+     }:
+     mkDerivation {
+       pname = "hOpenPGP";
+       version = "2.3";
+       sha256 = "2f1ff22747fdef1ac87f0dca27af6a632a5e6cac2201f942243a914ea2cb9a6a";
+       libraryHaskellDepends = [
+         aeson attoparsec base base64-bytestring bifunctors binary
+         binary-conduit byteable bytestring bzlib conduit conduit-extra
+         containers crypto-cipher-types cryptonite data-default-class errors
+         hashable incremental-parser ixset-typed lens memory monad-loops
+         nettle network network-uri newtype openpgp-asciiarmor resourcet
+         securemem semigroups split text time time-locale-compat
+         transformers unordered-containers wl-pprint-extras zlib
+       ];
+       testHaskellDepends = [
+         aeson attoparsec base bifunctors binary binary-conduit byteable
+         bytestring bzlib conduit conduit-extra containers
+         crypto-cipher-types cryptonite data-default-class errors hashable
+         incremental-parser ixset-typed lens memory monad-loops nettle
+         network network-uri newtype QuickCheck quickcheck-instances
+         resourcet securemem semigroups split tasty tasty-hunit
+         tasty-quickcheck text time time-locale-compat transformers
+         unordered-containers wl-pprint-extras zlib
+       ];
+       homepage = "http://floss.scru.org/hOpenPGP/";
+       description = "native Haskell implementation of OpenPGP (RFC4880)";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hPDB_1_2_0" = callPackage
     ({ mkDerivation, AC-Vector, base, bytestring, containers, deepseq
      , directory, ghc-prim, iterable, mmap, mtl, Octree, parallel
@@ -93961,7 +94182,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hedis" = callPackage
+  "hedis_0_6_9" = callPackage
     ({ mkDerivation, attoparsec, base, BoundedChan, bytestring
      , bytestring-lexing, HUnit, mtl, network, resource-pool
      , test-framework, test-framework-hunit, time, vector
@@ -93983,9 +94204,10 @@ self: {
        homepage = "https://github.com/informatikr/hedis";
        description = "Client library for the Redis datastore: supports full command set, pipelining";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hedis_0_6_10" = callPackage
+  "hedis" = callPackage
     ({ mkDerivation, attoparsec, base, BoundedChan, bytestring
      , bytestring-lexing, HUnit, mtl, network, resource-pool
      , test-framework, test-framework-hunit, time, vector
@@ -94001,11 +94223,12 @@ self: {
        testHaskellDepends = [
          base bytestring HUnit mtl test-framework test-framework-hunit time
        ];
+       doHaddock = false;
        jailbreak = true;
+       doCheck = false;
        homepage = "https://github.com/informatikr/hedis";
        description = "Client library for the Redis datastore: supports full command set, pipelining";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hedis-config" = callPackage
@@ -110186,6 +110409,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ibus-hs" = callPackage
+    ({ mkDerivation, base, dbus, directory, unix, xdg-basedir }:
+     mkDerivation {
+       pname = "ibus-hs";
+       version = "0.0.0.1";
+       sha256 = "4166d8e641a88eb71b10d0d6717384518bf7c1f426af5c29788d6a0d3c812d7b";
+       libraryHaskellDepends = [ base dbus directory unix xdg-basedir ];
+       homepage = "https://github.com/Ongy/ibus-hs";
+       description = "A simple uncomplete ibus api";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "ical" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, containers, either, mtl
      , text, time, transformers
@@ -110831,6 +111066,30 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ide-backend-server_0_10_0_2" = callPackage
+    ({ mkDerivation, array, async, base, bytestring, Cabal, containers
+     , data-accessor, data-accessor-mtl, directory, file-embed
+     , filemanip, filepath, ghc, haddock-api, ide-backend-common, mtl
+     , network, process, tar, temporary, text, time, transformers, unix
+     , unordered-containers, zlib
+     }:
+     mkDerivation {
+       pname = "ide-backend-server";
+       version = "0.10.0.2";
+       sha256 = "e5290e08247cc77b7736016342d743c01d850b01e38193bfa2b897d19accfe5f";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         array async base bytestring Cabal containers data-accessor
+         data-accessor-mtl directory file-embed filemanip filepath ghc
+         haddock-api ide-backend-common mtl network process tar temporary
+         text time transformers unix unordered-containers zlib
+       ];
+       description = "An IDE backend server";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ideas" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, Diff
      , directory, exceptions, filepath, mtl, multipart, network
@@ -111054,7 +111313,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ieee754" = callPackage
+  "ieee754_0_7_6" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "ieee754";
@@ -111064,9 +111323,10 @@ self: {
        homepage = "http://github.com/patperry/hs-ieee754";
        description = "Utilities for dealing with IEEE floating point numbers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ieee754_0_7_8" = callPackage
+  "ieee754" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "ieee754";
@@ -111076,7 +111336,6 @@ self: {
        homepage = "http://github.com/patperry/hs-ieee754";
        description = "Utilities for dealing with IEEE floating point numbers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ieee754-parser" = callPackage
@@ -112568,7 +112827,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ini" = callPackage
+  "ini_0_3_3" = callPackage
     ({ mkDerivation, attoparsec, base, text, unordered-containers }:
      mkDerivation {
        pname = "ini";
@@ -112580,9 +112839,10 @@ self: {
        homepage = "http://github.com/chrisdone/ini";
        description = "Quick and easy configuration files in the INI format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ini_0_3_4" = callPackage
+  "ini" = callPackage
     ({ mkDerivation, attoparsec, base, text, unordered-containers }:
      mkDerivation {
        pname = "ini";
@@ -112594,7 +112854,6 @@ self: {
        homepage = "http://github.com/chrisdone/ini";
        description = "Quick and easy configuration files in the INI format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "inilist" = callPackage
@@ -113480,7 +113739,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "io-streams" = callPackage
+  "io-streams_1_3_4_0" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder
      , deepseq, directory, filepath, HUnit, mtl, network, primitive
      , process, QuickCheck, test-framework, test-framework-hunit
@@ -113504,6 +113763,33 @@ self: {
        ];
        description = "Simple, composable, and easy-to-use stream I/O";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "io-streams" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder
+     , deepseq, directory, filepath, HUnit, mtl, network, primitive
+     , process, QuickCheck, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, time, transformers, vector
+     , zlib, zlib-bindings
+     }:
+     mkDerivation {
+       pname = "io-streams";
+       version = "1.3.5.0";
+       sha256 = "6c27d7ef3c5e06f4dd3aac33d5f2354b9778455473ab314a0b58dec4794ecae0";
+       configureFlags = [ "-fnointeractivetests" ];
+       libraryHaskellDepends = [
+         attoparsec base bytestring bytestring-builder network primitive
+         process text time transformers vector zlib-bindings
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring bytestring-builder deepseq directory
+         filepath HUnit mtl network primitive process QuickCheck
+         test-framework test-framework-hunit test-framework-quickcheck2 text
+         time transformers vector zlib zlib-bindings
+       ];
+       description = "Simple, composable, and easy-to-use stream I/O";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "io-streams-http" = callPackage
@@ -120763,7 +121049,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "latex-formulae-image" = callPackage
+  "latex-formulae-image_0_1_1_0" = callPackage
     ({ mkDerivation, base, directory, errors, filepath, JuicyPixels
      , process, temporary, transformers
      }:
@@ -120778,6 +121064,24 @@ self: {
        homepage = "http://github.com/liamoc/latex-formulae#readme";
        description = "A library for rendering LaTeX formulae as images using an actual LaTeX installation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "latex-formulae-image" = callPackage
+    ({ mkDerivation, base, directory, errors, filepath, JuicyPixels
+     , process, temporary, transformers
+     }:
+     mkDerivation {
+       pname = "latex-formulae-image";
+       version = "0.1.1.1";
+       sha256 = "6c663420647282ec20c71421a2faf95629f2690283df4b9279ae53536cac3f61";
+       libraryHaskellDepends = [
+         base directory errors filepath JuicyPixels process temporary
+         transformers
+       ];
+       homepage = "http://github.com/liamoc/latex-formulae#readme";
+       description = "A library for rendering LaTeX formulae as images using an actual LaTeX installation";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "latex-formulae-pandoc_0_2_0_2" = callPackage
@@ -123044,6 +123348,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lifted-async_0_8_0" = callPackage
+    ({ mkDerivation, async, base, constraints, HUnit, lifted-base
+     , monad-control, mtl, tasty, tasty-hunit, tasty-th
+     , transformers-base
+     }:
+     mkDerivation {
+       pname = "lifted-async";
+       version = "0.8.0";
+       sha256 = "81b2ebf0ae0e2154dca047a3ddd5f3cda2305245549b52487249f53c8f70ee7d";
+       libraryHaskellDepends = [
+         async base constraints lifted-base monad-control transformers-base
+       ];
+       testHaskellDepends = [
+         async base HUnit lifted-base monad-control mtl tasty tasty-hunit
+         tasty-th
+       ];
+       homepage = "https://github.com/maoe/lifted-async";
+       description = "Run lifted IO operations asynchronously and wait for their results";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lifted-base_0_2_2_1" = callPackage
     ({ mkDerivation, base, base-unicode-symbols, HUnit, monad-control
      , test-framework, test-framework-hunit, transformers
@@ -125082,6 +125408,46 @@ self: {
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) lmdb;};
 
+  "lmonad" = callPackage
+    ({ mkDerivation, base, containers, exceptions, HUnit, monad-control
+     , transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "lmonad";
+       version = "0.1.0.0";
+       sha256 = "610403335028e21a0eb7f31d5d9a1e9a6befcb53edb28c3a44fb38de14218240";
+       libraryHaskellDepends = [
+         base containers exceptions monad-control transformers
+         transformers-base
+       ];
+       testHaskellDepends = [
+         base containers exceptions HUnit monad-control transformers
+         transformers-base
+       ];
+       description = "LMonad is an Information Flow Control (IFC) framework for Haskell applications";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "lmonad-yesod" = callPackage
+    ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup
+     , containers, esqueleto, haskell-src-meta, lifted-base, lmonad, mtl
+     , persistent, shakespeare, tagged, template-haskell, text
+     , transformers, yesod-core, yesod-persistent
+     }:
+     mkDerivation {
+       pname = "lmonad-yesod";
+       version = "0.1.0.0";
+       sha256 = "bd2389ecb5d8c734c72da1bb77f76824bacbabb42ae727d2c161184a4f9f508f";
+       libraryHaskellDepends = [
+         attoparsec base blaze-html blaze-markup containers esqueleto
+         haskell-src-meta lifted-base lmonad mtl persistent shakespeare
+         tagged template-haskell text transformers yesod-core
+         yesod-persistent
+       ];
+       description = "LMonad for Yesod integrates LMonad's IFC with Yesod web applications";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "load-env" = callPackage
     ({ mkDerivation, base, directory, hspec, HUnit, parsec }:
      mkDerivation {
@@ -127058,6 +127424,23 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "machines-io_0_2_0_8" = callPackage
+    ({ mkDerivation, base, bytestring, chunked-data, machines
+     , transformers
+     }:
+     mkDerivation {
+       pname = "machines-io";
+       version = "0.2.0.8";
+       sha256 = "a24e3c3acb84c53bf7d4c1257c3b1f9c65bdac40a1b27667b58422624a761c25";
+       libraryHaskellDepends = [
+         base bytestring chunked-data machines transformers
+       ];
+       homepage = "http://github.com/aloiscochard/machines-io";
+       description = "IO utilities for the machines library";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "machines-process_0_2_0_0" = callPackage
     ({ mkDerivation, base, chunked-data, machines, machines-io, process
      }:
@@ -143511,8 +143894,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-crossref";
-       version = "0.1.6.2";
-       sha256 = "5317de67d381210fda43dba79061c33abb64c5eb42707a2fa570c330a165bd57";
+       version = "0.1.6.3";
+       sha256 = "7ec41e6fa2acf6826889670e7636b209a6833872de3b65034891a402b7bd356b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -149448,8 +149831,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-transduce";
-       version = "0.1.0.0";
-       sha256 = "b6b2974613f9574a76eb54211fc6702df311fcb0e0737b03e35946df0be04182";
+       version = "0.2.0.0";
+       sha256 = "378a636143751acb414bdedfc13053653ec02a38299cd03ba3097784c7943bb3";
        libraryHaskellDepends = [
          base bifunctors bytestring comonad conceit containers foldl free
          lens-family-core monoid-subclasses pipes pipes-bytestring
@@ -149480,7 +149863,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "pipes-wai" = callPackage
+  "pipes-wai_3_0_2" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, http-types, pipes
      , transformers, wai
      }:
@@ -149494,9 +149877,10 @@ self: {
        homepage = "http://github.com/brewtown/pipes-wai";
        description = "A port of wai-conduit for the pipes ecosystem";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "pipes-wai_3_2_0" = callPackage
+  "pipes-wai" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, http-types, pipes
      , transformers, wai
      }:
@@ -149510,7 +149894,6 @@ self: {
        homepage = "http://github.com/iand675/pipes-wai";
        description = "A port of wai-conduit for the pipes ecosystem";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-websockets" = callPackage
@@ -161160,6 +161543,8 @@ self: {
        pname = "rest-core";
        version = "0.37";
        sha256 = "6a7e13b5e1ae6aadf53cc0dcbeca99a01b68737833962b2abdd50f4e6e9d066c";
+       revision = "1";
+       editedCabalFile = "88d214458142c107f807581931c4d9e995b178d2d76801534f6b1239234aa3be";
        libraryHaskellDepends = [
          aeson aeson-utils base bytestring case-insensitive errors fclabels
          hxt hxt-pickle-utils json-schema mtl mtl-compat multipart random
@@ -168597,6 +168982,8 @@ self: {
        pname = "servant-yaml";
        version = "0.1.0.0";
        sha256 = "c917d9b046b06a9c4386f743a78142c27cf7f0ec1ad8562770ab9828f2ee3204";
+       revision = "1";
+       editedCabalFile = "b9472e33042ed5317fdf61d3f413ae148e66b3747a20248ba059db75272c57d4";
        libraryHaskellDepends = [
          base bytestring http-media servant yaml
        ];
@@ -177466,8 +177853,8 @@ self: {
        pname = "stack";
        version = "1.0.0";
        sha256 = "cd2f606d390fe521b6ba0794de87edcba64c4af66856af09594907c2b4f4751d";
-       revision = "1";
-       editedCabalFile = "84e631220c35a7563414b2a2c96b7fde9269cce8bd7569e7bccb2ed8d44c5f16";
+       revision = "3";
+       editedCabalFile = "2cf74cc8112bd8e1379d998d20d2411a321e74787b267119b384d6a7f77e39f2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -179539,8 +179926,8 @@ self: {
     ({ mkDerivation, base, transformers, utility-ht }:
      mkDerivation {
        pname = "storable-record";
-       version = "0.0.3";
-       sha256 = "a1f7ff75fb3337945f15e7033bed284fc42fb2e7de4a0ebc1374e27632d162d7";
+       version = "0.0.3.1";
+       sha256 = "74e5ceee49e0b7625d13759597d21e714843406b8b80e9168a0bb1199ffdadba";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base transformers utility-ht ];
@@ -179566,8 +179953,8 @@ self: {
     ({ mkDerivation, base, storable-record, utility-ht }:
      mkDerivation {
        pname = "storable-tuple";
-       version = "0.0.2";
-       sha256 = "0de37d7052b809045287720b38e0dc044b9bf330fb9a0cc6517f309e0dd1140f";
+       version = "0.0.3.1";
+       sha256 = "d6f035e56e7a786dc1b0fdf820260a55fec16cf8df486f9fc5ecadb13f583585";
        libraryHaskellDepends = [ base storable-record utility-ht ];
        homepage = "http://code.haskell.org/~thielema/storable-tuple/";
        description = "Storable instance for pairs and triples";
@@ -183521,7 +183908,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "tagsoup" = callPackage
+  "tagsoup_0_13_6" = callPackage
     ({ mkDerivation, base, bytestring, containers, text }:
      mkDerivation {
        pname = "tagsoup";
@@ -183533,6 +183920,21 @@ self: {
        homepage = "http://community.haskell.org/~ndm/tagsoup/";
        description = "Parsing and extracting information from (possibly malformed) HTML/XML documents";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "tagsoup" = callPackage
+    ({ mkDerivation, base, bytestring, containers, text }:
+     mkDerivation {
+       pname = "tagsoup";
+       version = "0.13.7";
+       sha256 = "6fd72e0d42e686f2af3bfcff30a1abe673530f86dfebf8cf2b02fd1667366d37";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base bytestring containers text ];
+       homepage = "https://github.com/ndmitchell/tagsoup#readme";
+       description = "Parsing and extracting information from (possibly malformed) HTML/XML documents";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "tagsoup-ht" = callPackage
@@ -183815,21 +184217,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "tar_0_4_5_0" = callPackage
+  "tar_0_5_0_1" = callPackage
     ({ mkDerivation, array, base, bytestring, bytestring-handle
-     , containers, deepseq, directory, filepath, old-time, QuickCheck
-     , tasty, tasty-quickcheck, time
+     , containers, deepseq, directory, filepath, QuickCheck, tasty
+     , tasty-quickcheck, time
      }:
      mkDerivation {
        pname = "tar";
-       version = "0.4.5.0";
-       sha256 = "2959d7bb5e941969f023ba558e38f1723e72c6883e6eeca459472f42be33f32a";
+       version = "0.5.0.1";
+       sha256 = "c465e21b9d70abaa610e94a3792c69b88bb4436fadc02a5fd72a933d46dc5818";
        libraryHaskellDepends = [
          array base bytestring containers deepseq directory filepath time
        ];
        testHaskellDepends = [
          array base bytestring bytestring-handle containers deepseq
-         directory filepath old-time QuickCheck tasty tasty-quickcheck time
+         directory filepath QuickCheck tasty tasty-quickcheck time
        ];
        description = "Reading, writing and manipulating \".tar\" archive files.";
        license = stdenv.lib.licenses.bsd3;
@@ -184766,8 +185168,8 @@ self: {
      }:
      mkDerivation {
        pname = "telegram-api";
-       version = "0.1.0.1";
-       sha256 = "fe6ef3a3095be721784a2c669f34aefda121bf3f507c4da5a8f029af2b9523b8";
+       version = "0.2.1.0";
+       sha256 = "02e564a45e095053f36e77772fc8dd9847b65f95087d47c6d50b96418f373a4f";
        libraryHaskellDepends = [
          aeson base either servant servant-client text
        ];
@@ -186912,8 +187314,8 @@ self: {
     ({ mkDerivation, base, QuickCheck, utility-ht }:
      mkDerivation {
        pname = "tfp";
-       version = "1.0";
-       sha256 = "94a87735c81cc5e44a75b25d65eb655e113a7487cc4c2e4eb6ef3d7d66134e0e";
+       version = "1.0.0.2";
+       sha256 = "9a817090cb91f78424affc3bfb6a7ea65b520087b779c9fd501fc9779e654cda";
        libraryHaskellDepends = [ base utility-ht ];
        testHaskellDepends = [ base QuickCheck ];
        homepage = "http://www.haskell.org/haskellwiki/Type_arithmetic";
@@ -189037,6 +189439,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tiphys" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, errors, hspec, text
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "tiphys";
+       version = "0.1.0.0";
+       sha256 = "d998ce85b4e1aa71d86cfebe6945978b4a4545ec670e9e5279e21d155d0e2d97";
+       libraryHaskellDepends = [
+         aeson attoparsec base errors text unordered-containers vector
+       ];
+       testHaskellDepends = [ aeson base hspec vector ];
+       homepage = "https://github.com/llhotka/tiphys";
+       description = "Navigating and editing JSON data";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "titlecase" = callPackage
     ({ mkDerivation, base, blaze-markup, semigroups, tasty, tasty-hunit
      , tasty-quickcheck, text
@@ -193528,8 +193947,8 @@ self: {
      }:
      mkDerivation {
        pname = "uniform-io";
-       version = "1.0.1.0";
-       sha256 = "6c772b6b8a6876e41935267a789dfc466fdccc3f78e80098eabcacaf0675cc76";
+       version = "1.1.0.0";
+       sha256 = "6775fa62ca0b1e87e70c6ae468a54486a8a1ca510f0a86de5cc376a39729da9f";
        libraryHaskellDepends = [
          attoparsec base bytestring data-default-class iproute network
          transformers word8
@@ -194430,8 +194849,8 @@ self: {
     ({ mkDerivation, base, parsec, safe, utf8-string }:
      mkDerivation {
        pname = "uri";
-       version = "0.1.6.3";
-       sha256 = "321165b9897aaab108170ee3b6073ec718150ebf650a3f76042a0e5c89cd15b6";
+       version = "0.1.6.4";
+       sha256 = "a90cd3d3ca1d33740dc732f14773266a7707901a872747a6e543129cab4ee409";
        libraryHaskellDepends = [ base parsec safe utf8-string ];
        homepage = "http://gitorious.org/uri";
        description = "Library for working with URIs";
@@ -200216,7 +200635,7 @@ self: {
        license = "unknown";
      }) {};
 
-  "wai-session-postgresql" = callPackage
+  "wai-session-postgresql_0_2_0_3" = callPackage
     ({ mkDerivation, base, bytestring, cereal, cookie, data-default
      , entropy, postgresql-simple, resource-pool, text, time
      , transformers, wai, wai-session
@@ -200237,6 +200656,30 @@ self: {
        homepage = "https://github.com/hce/postgresql-session#readme";
        description = "PostgreSQL backed Wai session store";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "wai-session-postgresql" = callPackage
+    ({ mkDerivation, base, bytestring, cereal, cookie, data-default
+     , entropy, postgresql-simple, resource-pool, text, time
+     , transformers, wai, wai-session
+     }:
+     mkDerivation {
+       pname = "wai-session-postgresql";
+       version = "0.2.0.4";
+       sha256 = "d9fa9493f80ab850e5bccca4b82eaf47193c2006a9123fe0972f83ea995f0f34";
+       libraryHaskellDepends = [
+         base bytestring cereal cookie data-default entropy
+         postgresql-simple resource-pool text time transformers wai
+         wai-session
+       ];
+       testHaskellDepends = [
+         base bytestring data-default postgresql-simple text wai-session
+       ];
+       doCheck = false;
+       homepage = "https://github.com/hce/postgresql-session#readme";
+       description = "PostgreSQL backed Wai session store";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "wai-session-tokyocabinet" = callPackage
@@ -209144,7 +209587,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-auth-oauth2" = callPackage
+  "yesod-auth-oauth2_0_1_5" = callPackage
     ({ mkDerivation, aeson, authenticate, base, bytestring, hoauth2
      , http-client, http-conduit, http-types, lifted-base, network-uri
      , random, text, transformers, vector, yesod-auth, yesod-core
@@ -209163,6 +209606,28 @@ self: {
        homepage = "http://github.com/thoughtbot/yesod-auth-oauth2";
        description = "OAuth 2.0 authentication plugins";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "yesod-auth-oauth2" = callPackage
+    ({ mkDerivation, aeson, authenticate, base, bytestring, hoauth2
+     , hspec, http-client, http-conduit, http-types, lifted-base
+     , network-uri, random, text, transformers, vector, yesod-auth
+     , yesod-core, yesod-form
+     }:
+     mkDerivation {
+       pname = "yesod-auth-oauth2";
+       version = "0.1.6";
+       sha256 = "6f10629639a6d8d5886d7375f8a2daa63085fa4427d8308e397ac03093fddb53";
+       libraryHaskellDepends = [
+         aeson authenticate base bytestring hoauth2 http-client http-conduit
+         http-types lifted-base network-uri random text transformers vector
+         yesod-auth yesod-core yesod-form
+       ];
+       testHaskellDepends = [ base hspec ];
+       homepage = "http://github.com/thoughtbot/yesod-auth-oauth2";
+       description = "OAuth 2.0 authentication plugins";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "yesod-auth-pam" = callPackage
@@ -210235,6 +210700,40 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-bin_1_4_17_1" = callPackage
+    ({ mkDerivation, async, attoparsec, base, base64-bytestring
+     , blaze-builder, bytestring, Cabal, conduit, conduit-extra
+     , containers, data-default-class, deepseq, directory, file-embed
+     , filepath, fsnotify, ghc, ghc-paths, http-client, http-conduit
+     , http-reverse-proxy, http-types, lifted-base, network
+     , optparse-applicative, parsec, process, project-template
+     , resourcet, shakespeare, split, streaming-commons, tar
+     , template-haskell, text, time, transformers, transformers-compat
+     , unix-compat, unordered-containers, wai, wai-extra, warp, warp-tls
+     , yaml, zlib
+     }:
+     mkDerivation {
+       pname = "yesod-bin";
+       version = "1.4.17.1";
+       sha256 = "0d7052caf0aadc00e04a4d1ce537670d7b8da4d1fc86d36c500abc70777a2ee8";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         async attoparsec base base64-bytestring blaze-builder bytestring
+         Cabal conduit conduit-extra containers data-default-class deepseq
+         directory file-embed filepath fsnotify ghc ghc-paths http-client
+         http-conduit http-reverse-proxy http-types lifted-base network
+         optparse-applicative parsec process project-template resourcet
+         shakespeare split streaming-commons tar template-haskell text time
+         transformers transformers-compat unix-compat unordered-containers
+         wai wai-extra warp warp-tls yaml zlib
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "The yesod helper executable";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-bootstrap" = callPackage
     ({ mkDerivation, base, blaze-html, blaze-markup, conduit
      , conduit-extra, containers, either, email-validate

From a05017cd6c8fc8aa7c073c07e50702bd685c8901 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 8 Jan 2016 18:43:24 +0100
Subject: [PATCH 532/884] haskell-vector-algorithms: temporarily disable test
 suite to work around a compiler crash

---
 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index 0c2685eee838..e56fd431324d 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -208,4 +208,7 @@ self: super: {
   # https://github.com/DanielG/cabal-helper/issues/10
   cabal-helper = dontCheck super.cabal-helper;
 
+  # https://github.com/fpco/stackage/issues/1112
+  vector-algorithms = dontCheck super.vector-algorithms;
+
 }

From 9c0fccc7243dc6bcc57c82c24541f5caf366ecd2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 10 Jan 2016 19:47:38 +0100
Subject: [PATCH 533/884] Add LTS Haskell 4.1.

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

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 2b30c15932a0..b00d617666ad 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -320,6 +320,9 @@ rec {
     lts-4_0 = packages.ghc7103.override {
       packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-4.0.nix { };
     };
+    lts-4_1 = packages.ghc7103.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-4.1.nix { };
+    };
 
   };
 }

From c6a209403e9ea4a8f857bb3df1fcd393df186649 Mon Sep 17 00:00:00 2001
From: Leroy Hopson <git@leroy.geek.nz>
Date: Sun, 10 Jan 2016 13:06:10 +1300
Subject: [PATCH 534/884] dopy: init at 2016-01-04

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 384b40356008..e11fd07292ee 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4360,6 +4360,28 @@ in modules // {
     };
   };
 
+  dopy = buildPythonPackage rec {
+    version = "2016-01-04";
+    name = "dopy-${version}";
+
+    src = pkgs.fetchFromGitHub {
+      owner = "Wiredcraft";
+      repo = "dopy";
+      rev = "cb443214166a4e91b17c925f40009ac883336dc3";
+      sha256 ="0ams289qcgna96aak96jbz6wybs6qb95h2gn8lb4lmx2p5sq4q56";
+    };
+
+    propagatedBuildInputs = with self; [ requests2 six ];
+
+    meta = {
+      description = "Digital Ocean API python wrapper";
+      homepage = "https://github.com/Wiredcraft/dopy";
+      license = licenses.mit;
+      maintainers = with maintainers; [ lihop ];
+      platforms = platforms.all;
+    };
+  };
+
   dpkt = buildPythonPackage rec {
     name = "dpkt-1.8";
     disabled = isPy3k;

From dfe65b6ef82c58c4649ee3979ac099fe2c6f60a9 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 10 Jan 2016 20:10:24 +0100
Subject: [PATCH 535/884] albatross: 1.7.3 -> 1.7.4

---
 pkgs/misc/themes/albatross/default.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/misc/themes/albatross/default.nix b/pkgs/misc/themes/albatross/default.nix
index 01b9d59aa7be..969f21d6ec12 100644
--- a/pkgs/misc/themes/albatross/default.nix
+++ b/pkgs/misc/themes/albatross/default.nix
@@ -1,13 +1,14 @@
-{stdenv, fetchgit}:
+{ stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   name = "Albatross-${version}";
-  version = "1.7.3";
+  version = "1.7.4";
 
-  src = fetchgit {
-    url = git://github.com/shimmerproject/Albatross.git;
-    rev = "refs/tags/v${version}";
-    sha256 = "7a585068dd59f753149c0d390f2ef541f2ace67e7d681613588edb9f962e3196";
+  src = fetchFromGitHub {
+    repo = "Albatross";
+    owner = "shimmerproject";
+    rev = "v${version}";
+    sha256 = "0mq87n2hxy44nzr567av24n5nqjaljhi1afxrn3mpjqdbkq7lx88";
   };
 
   dontBuild = true;
@@ -18,8 +19,8 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "Albatross";
-    homepage = "http://shimmerproject.org/our-projects/albatross/";
+    description = "A desktop Suite for Xfce";
+    homepage = http://shimmerproject.org/our-projects/albatross/;
     license = stdenv.lib.licenses.gpl2;
   };
 }

From a3dcb3051d53a41a4d1fab51b3da1a85f97e1f17 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sun, 10 Jan 2016 12:15:52 -0500
Subject: [PATCH 536/884] apple-source-releases: bump many packages to 10.10.5

This also changes the versioning scheme to be in more "human-meaningful"
terms, so instead of the internal release numbers we talk about 10.10.5
or 10.9.5.
---
 .../apple-source-releases/Csu/default.nix     |   4 +-
 .../apple-source-releases/IOKit/default.nix   | 194 ++++++------
 .../Libsystem/default.nix                     |   2 +-
 .../darwin/apple-source-releases/default.nix  | 285 +++++++++++++-----
 .../apple-source-releases/xnu/default.nix     |   2 +
 5 files changed, 312 insertions(+), 175 deletions(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/Csu/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Csu/default.nix
index 893e9f2b2ebd..8dcf28a59094 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Csu/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/Csu/default.nix
@@ -6,7 +6,9 @@ appleDerivation {
       --replace "/usr/lib" "/lib" \
       --replace "/usr/local/lib" "/lib" \
       --replace "/usr/bin" "" \
-      --replace "/bin/" ""
+      --replace "/bin/" "" \
+      --replace "CC = " "CC = cc #" \
+      --replace "SDK_DIR = " "SDK_DIR = . #"
   '';
 
   # Mac OS didn't support rpaths back before 10.5, and this package intentionally builds stubs targeting versions prior to that
diff --git a/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix b/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix
index 12f38cd195fe..4b82209f176c 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix
@@ -32,141 +32,141 @@ appleDerivation {
     popd
 
     # root: complete
-    cp IOKitUser-907.100.13/IOCFBundle.h                                       $dest
-    cp IOKitUser-907.100.13/IOCFPlugIn.h                                       $dest
-    cp IOKitUser-907.100.13/IOCFSerialize.h                                    $dest
-    cp IOKitUser-907.100.13/IOCFUnserialize.h                                  $dest
-    cp IOKitUser-907.100.13/IOCFURLAccess.h                                    $dest
-    cp IOKitUser-907.100.13/IODataQueueClient.h                                $dest
-    cp IOKitUser-907.100.13/IOKitLib.h                                         $dest
-    cp IOKitUser-907.100.13/iokitmig.h                                         $dest
+    cp IOKitUser-*/IOCFBundle.h                                       $dest
+    cp IOKitUser-*/IOCFPlugIn.h                                       $dest
+    cp IOKitUser-*/IOCFSerialize.h                                    $dest
+    cp IOKitUser-*/IOCFUnserialize.h                                  $dest
+    cp IOKitUser-*/IOCFURLAccess.h                                    $dest
+    cp IOKitUser-*/IODataQueueClient.h                                $dest
+    cp IOKitUser-*/IOKitLib.h                                         $dest
+    cp IOKitUser-*/iokitmig.h                                         $dest
     cp ${xnu}/Library/PrivateFrameworks/IOKit.framework/Versions/A/Headers/*.h $dest
 
     # audio: complete
-    cp IOAudioFamily-197.4.2/IOAudioDefines.h          $dest/audio
-    cp IOKitUser-907.100.13/audio.subproj/IOAudioLib.h $dest/audio
-    cp IOAudioFamily-197.4.2/IOAudioTypes.h            $dest/audio
+    cp IOAudioFamily-*/IOAudioDefines.h          $dest/audio
+    cp IOKitUser-*/audio.subproj/IOAudioLib.h    $dest/audio
+    cp IOAudioFamily-*/IOAudioTypes.h            $dest/audio
 
     # avc: complete
-    cp IOFireWireAVC-422.4.0/IOFireWireAVC/IOFireWireAVCConsts.h $dest/avc
-    cp IOFireWireAVC-422.4.0/IOFireWireAVCLib/IOFireWireAVCLib.h $dest/avc
+    cp IOFireWireAVC-*/IOFireWireAVC/IOFireWireAVCConsts.h $dest/avc
+    cp IOFireWireAVC-*/IOFireWireAVCLib/IOFireWireAVCLib.h $dest/avc
 
     # DV: complete
-    cp IOFWDVComponents-207.4.1/DVFamily.h $dest/DV
+    cp IOFWDVComponents-*/DVFamily.h $dest/DV
 
     # firewire: complete
-    cp IOFireWireFamily-455.4.0/IOFireWireFamily.kmodproj/IOFireWireFamilyCommon.h $dest/firewire
-    cp IOFireWireFamily-455.4.0/IOFireWireLib.CFPlugInProj/IOFireWireLib.h         $dest/firewire
-    cp IOFireWireFamily-455.4.0/IOFireWireLib.CFPlugInProj/IOFireWireLibIsoch.h    $dest/firewire
-    cp IOFireWireFamily-455.4.0/IOFireWireFamily.kmodproj/IOFWIsoch.h              $dest/firewire
+    cp IOFireWireFamily-*/IOFireWireFamily.kmodproj/IOFireWireFamilyCommon.h $dest/firewire
+    cp IOFireWireFamily-*/IOFireWireLib.CFPlugInProj/IOFireWireLib.h         $dest/firewire
+    cp IOFireWireFamily-*/IOFireWireLib.CFPlugInProj/IOFireWireLibIsoch.h    $dest/firewire
+    cp IOFireWireFamily-*/IOFireWireFamily.kmodproj/IOFWIsoch.h              $dest/firewire
 
     # graphics: missing AppleGraphicsDeviceControlUserCommand.h
-    cp IOGraphics-471.92.1/IOGraphicsFamily/IOKit/graphics/IOAccelClientConnect.h     $dest/graphics
-    cp IOGraphics-471.92.1/IOGraphicsFamily/IOKit/graphics/IOAccelSurfaceConnect.h    $dest/graphics
-    cp IOGraphics-471.92.1/IOGraphicsFamily/IOKit/graphics/IOAccelTypes.h             $dest/graphics
-    cp IOGraphics-471.92.1/IOGraphicsFamily/IOKit/graphics/IOFramebufferShared.h      $dest/graphics
-    cp IOGraphics-471.92.1/IOGraphicsFamily/IOKit/graphics/IOGraphicsEngine.h         $dest/graphics
-    cp IOGraphics-471.92.1/IOGraphicsFamily/IOKit/graphics/IOGraphicsInterface.h      $dest/graphics
-    cp IOGraphics-471.92.1/IOGraphicsFamily/IOKit/graphics/IOGraphicsInterfaceTypes.h $dest/graphics
-    cp IOKitUser-907.100.13/graphics.subproj/IOGraphicsLib.h                          $dest/graphics
-    cp IOGraphics-471.92.1/IOGraphicsFamily/IOKit/graphics/IOGraphicsTypes.h          $dest/graphics
+    cp IOGraphics-*/IOGraphicsFamily/IOKit/graphics/IOAccelClientConnect.h     $dest/graphics
+    cp IOGraphics-*/IOGraphicsFamily/IOKit/graphics/IOAccelSurfaceConnect.h    $dest/graphics
+    cp IOGraphics-*/IOGraphicsFamily/IOKit/graphics/IOAccelTypes.h             $dest/graphics
+    cp IOGraphics-*/IOGraphicsFamily/IOKit/graphics/IOFramebufferShared.h      $dest/graphics
+    cp IOGraphics-*/IOGraphicsFamily/IOKit/graphics/IOGraphicsEngine.h         $dest/graphics
+    cp IOGraphics-*/IOGraphicsFamily/IOKit/graphics/IOGraphicsInterface.h      $dest/graphics
+    cp IOGraphics-*/IOGraphicsFamily/IOKit/graphics/IOGraphicsInterfaceTypes.h $dest/graphics
+    cp IOKitUser-*/graphics.subproj/IOGraphicsLib.h                            $dest/graphics
+    cp IOGraphics-*/IOGraphicsFamily/IOKit/graphics/IOGraphicsTypes.h          $dest/graphics
 
     # hid: complete
-    cp IOKitUser-907.100.13/hid.subproj/IOHIDBase.h         $dest/hid
-    cp IOKitUser-907.100.13/hid.subproj/IOHIDDevice.h       $dest/hid
-    cp IOKitUser-907.100.13/hid.subproj/IOHIDDevicePlugIn.h $dest/hid
-    cp IOKitUser-907.100.13/hid.subproj/IOHIDElement.h      $dest/hid
-    cp IOKitUser-907.100.13/hid.subproj/IOHIDLib.h          $dest/hid
-    cp IOKitUser-907.100.13/hid.subproj/IOHIDManager.h      $dest/hid
-    cp IOKitUser-907.100.13/hid.subproj/IOHIDQueue.h        $dest/hid
-    cp IOKitUser-907.100.13/hid.subproj/IOHIDTransaction.h  $dest/hid
-    cp IOKitUser-907.100.13/hid.subproj/IOHIDValue.h        $dest/hid
-    cp IOHIDFamily-503.215.2/IOHIDFamily/IOHIDKeys.h        $dest/hid
-    cp IOHIDFamily-503.215.2/IOHIDFamily/IOHIDUsageTables.h $dest/hid
-    cp IOHIDFamily-503.215.2/IOHIDLib/IOHIDLibObsolete.h    $dest/hid
+    cp IOKitUser-*/hid.subproj/IOHIDBase.h          $dest/hid
+    cp IOKitUser-*/hid.subproj/IOHIDDevice.h        $dest/hid
+    cp IOKitUser-*/hid.subproj/IOHIDDevicePlugIn.h  $dest/hid
+    cp IOKitUser-*/hid.subproj/IOHIDElement.h       $dest/hid
+    cp IOKitUser-*/hid.subproj/IOHIDLib.h           $dest/hid
+    cp IOKitUser-*/hid.subproj/IOHIDManager.h       $dest/hid
+    cp IOKitUser-*/hid.subproj/IOHIDQueue.h         $dest/hid
+    cp IOKitUser-*/hid.subproj/IOHIDTransaction.h   $dest/hid
+    cp IOKitUser-*/hid.subproj/IOHIDValue.h         $dest/hid
+    cp IOHIDFamily-*/IOHIDFamily/IOHIDKeys.h        $dest/hid
+    cp IOHIDFamily-*/IOHIDFamily/IOHIDUsageTables.h $dest/hid
+    cp IOHIDFamily-*/IOHIDLib/IOHIDLibObsolete.h    $dest/hid
 
     # hidsystem: complete
-    cp IOHIDFamily-503.215.2/IOHIDSystem/IOKit/hidsystem/ev_keymap.h      $dest/hidsystem
-    cp IOKitUser-907.100.13/hidsystem.subproj/event_status_driver.h       $dest/hidsystem
-    cp IOKitUser-907.100.13/hidsystem.subproj/IOHIDLib.h                  $dest/hidsystem
-    cp IOHIDFamily-503.215.2/IOHIDSystem/IOKit/hidsystem/IOHIDParameter.h $dest/hidsystem
-    cp IOHIDFamily-503.215.2/IOHIDSystem/IOKit/hidsystem/IOHIDShared.h    $dest/hidsystem
-    cp IOHIDFamily-503.215.2/IOHIDSystem/IOKit/hidsystem/IOHIDTypes.h     $dest/hidsystem
-    cp IOHIDFamily-503.215.2/IOHIDSystem/IOKit/hidsystem/IOLLEvent.h      $dest/hidsystem
+    cp IOHIDFamily-*/IOHIDSystem/IOKit/hidsystem/ev_keymap.h      $dest/hidsystem
+    cp IOKitUser-*/hidsystem.subproj/event_status_driver.h        $dest/hidsystem
+    cp IOKitUser-*/hidsystem.subproj/IOHIDLib.h                   $dest/hidsystem
+    cp IOHIDFamily-*/IOHIDSystem/IOKit/hidsystem/IOHIDParameter.h $dest/hidsystem
+    cp IOHIDFamily-*/IOHIDSystem/IOKit/hidsystem/IOHIDShared.h    $dest/hidsystem
+    cp IOHIDFamily-*/IOHIDSystem/IOKit/hidsystem/IOHIDTypes.h     $dest/hidsystem
+    cp IOHIDFamily-*/IOHIDSystem/IOKit/hidsystem/IOLLEvent.h      $dest/hidsystem
 
 
     # i2c: complete
-    cp IOGraphics-471.92.1/IOGraphicsFamily/IOKit/i2c/IOI2CInterface.h $dest/i2c
+    cp IOGraphics-*/IOGraphicsFamily/IOKit/i2c/IOI2CInterface.h $dest/i2c
 
     # kext: complete
-    cp IOKitUser-907.100.13/kext.subproj/KextManager.h $dest/kext
+    cp IOKitUser-*/kext.subproj/KextManager.h $dest/kext
 
     # ndrvsupport: complete
-    cp IOGraphics-471.92.1/IONDRVSupport/IOKit/ndrvsupport/IOMacOSTypes.h $dest/ndrvsupport
-    cp IOGraphics-471.92.1/IONDRVSupport/IOKit/ndrvsupport/IOMacOSVideo.h $dest/ndrvsupport
+    cp IOGraphics-*/IONDRVSupport/IOKit/ndrvsupport/IOMacOSTypes.h $dest/ndrvsupport
+    cp IOGraphics-*/IONDRVSupport/IOKit/ndrvsupport/IOMacOSVideo.h $dest/ndrvsupport
 
     # network: complete
-    cp IONetworkingFamily-100/IOEthernetController.h       $dest/network
-    cp IONetworkingFamily-100/IOEthernetInterface.h        $dest/network
-    cp IONetworkingFamily-100/IOEthernetStats.h            $dest/network
-    cp IONetworkingFamily-100/IONetworkController.h        $dest/network
-    cp IONetworkingFamily-100/IONetworkData.h              $dest/network
-    cp IONetworkingFamily-100/IONetworkInterface.h         $dest/network
-    cp IOKitUser-907.100.13/network.subproj/IONetworkLib.h $dest/network
-    cp IONetworkingFamily-100/IONetworkMedium.h            $dest/network
-    cp IONetworkingFamily-100/IONetworkStack.h             $dest/network
-    cp IONetworkingFamily-100/IONetworkStats.h             $dest/network
-    cp IONetworkingFamily-100/IONetworkUserClient.h        $dest/network
+    cp IONetworkingFamily-*/IOEthernetController.h       $dest/network
+    cp IONetworkingFamily-*/IOEthernetInterface.h        $dest/network
+    cp IONetworkingFamily-*/IOEthernetStats.h            $dest/network
+    cp IONetworkingFamily-*/IONetworkController.h        $dest/network
+    cp IONetworkingFamily-*/IONetworkData.h              $dest/network
+    cp IONetworkingFamily-*/IONetworkInterface.h         $dest/network
+    cp IOKitUser-*/network.subproj/IONetworkLib.h        $dest/network
+    cp IONetworkingFamily-*/IONetworkMedium.h            $dest/network
+    cp IONetworkingFamily-*/IONetworkStack.h             $dest/network
+    cp IONetworkingFamily-*/IONetworkStats.h             $dest/network
+    cp IONetworkingFamily-*/IONetworkUserClient.h        $dest/network
 
     # ps: missing IOUPSPlugIn.h
-    cp IOKitUser-907.100.13/ps.subproj/IOPowerSources.h $dest/ps
-    cp IOKitUser-907.100.13/ps.subproj/IOPSKeys.h       $dest/ps
+    cp IOKitUser-*/ps.subproj/IOPowerSources.h $dest/ps
+    cp IOKitUser-*/ps.subproj/IOPSKeys.h       $dest/ps
 
     # pwr_mgt: complete
-    cp IOKitUser-907.100.13/pwr_mgt.subproj/IOPMKeys.h                                 $dest/pwr_mgt
-    cp IOKitUser-907.100.13/pwr_mgt.subproj/IOPMLib.h                                  $dest/pwr_mgt
+    cp IOKitUser-*/pwr_mgt.subproj/IOPMKeys.h                                          $dest/pwr_mgt
+    cp IOKitUser-*/pwr_mgt.subproj/IOPMLib.h                                           $dest/pwr_mgt
     cp ${xnu}/Library/PrivateFrameworks/IOKit.framework/Versions/A/Headers/pwr_mgt/*.h $dest/pwr_mgt
-    cp IOKitUser-907.100.13/pwr_mgt.subproj/IOPMLibPrivate.h                           $dest/pwr_mgt # Private
+    cp IOKitUser-*/pwr_mgt.subproj/IOPMLibPrivate.h                                    $dest/pwr_mgt # Private
 
     # sbp2: complete
-    cp IOFireWireSBP2-426.4.1/IOFireWireSBP2Lib/IOFireWireSBP2Lib.h $dest/sbp2
+    cp IOFireWireSBP2-*/IOFireWireSBP2Lib/IOFireWireSBP2Lib.h $dest/sbp2
 
     # scsi: omitted for now
 
     # serial: complete
-    cp IOSerialFamily-64.1.1/IOSerialFamily.kmodproj/IOSerialKeys.h $dest/serial
-    cp IOSerialFamily-64.1.1/IOSerialFamily.kmodproj/ioss.h         $dest/serial
+    cp IOSerialFamily-*/IOSerialFamily.kmodproj/IOSerialKeys.h $dest/serial
+    cp IOSerialFamily-*/IOSerialFamily.kmodproj/ioss.h         $dest/serial
 
     # storage: complete
     # Needs ata subdirectory
-    cp IOStorageFamily-172/IOAppleLabelScheme.h                                        $dest/storage
-    cp IOStorageFamily-172/IOApplePartitionScheme.h                                    $dest/storage
-    cp IOBDStorageFamily-14/IOBDBlockStorageDevice.h                                   $dest/storage
-    cp IOBDStorageFamily-14/IOBDMedia.h                                                $dest/storage
-    cp IOBDStorageFamily-14/IOBDMediaBSDClient.h                                       $dest/storage
-    cp IOBDStorageFamily-14/IOBDTypes.h                                                $dest/storage
-    cp IOStorageFamily-172/IOBlockStorageDevice.h                                      $dest/storage
-    cp IOStorageFamily-172/IOBlockStorageDriver.h                                      $dest/storage
-    cp IOCDStorageFamily-51/IOCDBlockStorageDevice.h                                   $dest/storage
-    cp IOCDStorageFamily-51/IOCDMedia.h                                                $dest/storage
-    cp IOCDStorageFamily-51/IOCDMediaBSDClient.h                                       $dest/storage
-    cp IOCDStorageFamily-51/IOCDPartitionScheme.h                                      $dest/storage
-    cp IOCDStorageFamily-51/IOCDTypes.h                                                $dest/storage
-    cp IODVDStorageFamily-35/IODVDBlockStorageDevice.h                                 $dest/storage
-    cp IODVDStorageFamily-35/IODVDMedia.h                                              $dest/storage
-    cp IODVDStorageFamily-35/IODVDMediaBSDClient.h                                     $dest/storage
-    cp IODVDStorageFamily-35/IODVDTypes.h                                              $dest/storage
-    cp IOStorageFamily-172/IOFDiskPartitionScheme.h                                    $dest/storage
-    cp IOStorageFamily-172/IOFilterScheme.h                                            $dest/storage
-    cp IOFireWireSerialBusProtocolTransport-251.0.1/IOFireWireStorageCharacteristics.h $dest/storage
-    cp IOStorageFamily-172/IOGUIDPartitionScheme.h                                     $dest/storage
-    cp IOStorageFamily-172/IOMedia.h                                                   $dest/storage
-    cp IOStorageFamily-172/IOMediaBSDClient.h                                          $dest/storage
-    cp IOStorageFamily-172/IOPartitionScheme.h                                         $dest/storage
-    cp IOStorageFamily-172/IOStorage.h                                                 $dest/storage
-    cp IOStorageFamily-172/IOStorageCardCharacteristics.h                              $dest/storage
-    cp IOStorageFamily-172/IOStorageDeviceCharacteristics.h                            $dest/storage
-    cp IOStorageFamily-172/IOStorageProtocolCharacteristics.h                          $dest/storage
+    cp IOStorageFamily-*/IOAppleLabelScheme.h                                    $dest/storage
+    cp IOStorageFamily-*/IOApplePartitionScheme.h                                $dest/storage
+    cp IOBDStorageFamily-*/IOBDBlockStorageDevice.h                              $dest/storage
+    cp IOBDStorageFamily-*/IOBDMedia.h                                           $dest/storage
+    cp IOBDStorageFamily-*/IOBDMediaBSDClient.h                                  $dest/storage
+    cp IOBDStorageFamily-*/IOBDTypes.h                                           $dest/storage
+    cp IOStorageFamily-*/IOBlockStorageDevice.h                                  $dest/storage
+    cp IOStorageFamily-*/IOBlockStorageDriver.h                                  $dest/storage
+    cp IOCDStorageFamily-*/IOCDBlockStorageDevice.h                              $dest/storage
+    cp IOCDStorageFamily-*/IOCDMedia.h                                           $dest/storage
+    cp IOCDStorageFamily-*/IOCDMediaBSDClient.h                                  $dest/storage
+    cp IOCDStorageFamily-*/IOCDPartitionScheme.h                                 $dest/storage
+    cp IOCDStorageFamily-*/IOCDTypes.h                                           $dest/storage
+    cp IODVDStorageFamily-*/IODVDBlockStorageDevice.h                            $dest/storage
+    cp IODVDStorageFamily-*/IODVDMedia.h                                         $dest/storage
+    cp IODVDStorageFamily-*/IODVDMediaBSDClient.h                                $dest/storage
+    cp IODVDStorageFamily-*/IODVDTypes.h                                         $dest/storage
+    cp IOStorageFamily-*/IOFDiskPartitionScheme.h                                $dest/storage
+    cp IOStorageFamily-*/IOFilterScheme.h                                        $dest/storage
+    cp IOFireWireSerialBusProtocolTransport-*/IOFireWireStorageCharacteristics.h $dest/storage
+    cp IOStorageFamily-*/IOGUIDPartitionScheme.h                                 $dest/storage
+    cp IOStorageFamily-*/IOMedia.h                                               $dest/storage
+    cp IOStorageFamily-*/IOMediaBSDClient.h                                      $dest/storage
+    cp IOStorageFamily-*/IOPartitionScheme.h                                     $dest/storage
+    cp IOStorageFamily-*/IOStorage.h                                             $dest/storage
+    cp IOStorageFamily-*/IOStorageCardCharacteristics.h                          $dest/storage
+    cp IOStorageFamily-*/IOStorageDeviceCharacteristics.h                        $dest/storage
+    cp IOStorageFamily-*/IOStorageProtocolCharacteristics.h                      $dest/storage
 
     # stream: missing altogether
 
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
index 95c1ca73e511..42adab1c887c 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
@@ -113,7 +113,7 @@ appleDerivation rec {
        -o $out/lib/libSystem.dylib \
        CompatibilityHacks.o init.o \
        -compatibility_version 1.0 \
-       -current_version ${version} \
+       -current_version 1197.1.1 \
        -reexport_library $out/lib/system/libsystem_c.dylib \
        -reexport_library $out/lib/system/libsystem_kernel.dylib \
         ${stdenv.lib.concatStringsSep " "
diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix
index f1b72b4123ff..ce128f14530b 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix
@@ -1,8 +1,130 @@
 { stdenv, fetchurl, pkgs }:
 
 let
+  # This attrset can in theory be computed automatically, but for that to work nicely we need
+  # import-from-derivation to work properly. Currently it's rather ugly when we try to bootstrap
+  # a stdenv out of something like this. With some care we can probably get rid of this, but for
+  # now it's staying here.
+  versions = {
+    "osx-10.11.2" = {
+      dtrace = "168";
+      xnu    = "3248.20.55";
+    };
+    "osx-10.10.5" = {
+      adv_cmds      = "158";
+      architecture  = "266";
+      CF            = "1153.18";
+      CommonCrypto  = "60061.30.1";
+      copyfile      = "118.1.2";
+      Csu           = "85";
+      dyld          = "353.2.3";
+      eap8021x      = "198.30.1";
+      libauto       = "186";
+      Libc          = "1044.40.1";
+      libclosure    = "65";
+      libdispatch   = "442.1.4";
+      libiconv      = "42";
+      Libinfo       = "459.40.1";
+      Libnotify     = "133.1.1";
+      libpthread    = "105.40.1";
+      libresolv     = "57";
+      Libsystem     = "1213";
+      libunwind     = "35.3";
+      libutil       = "38";
+      mDNSResponder = "576.30.4";
+      objc4         = "647";
+      ppp           = "786.40.2";
+      removefile    = "35";
+      Security      = "57031.40.6";
+      xnu           = "2782.40.9";
+
+      IOAudioFamily                        = "203.3";
+      IOFireWireFamily                     = "458";
+      IOFWDVComponents                     = "207.4.1";
+      IOFireWireAVC                        = "423";
+      IOFireWireSBP2                       = "427";
+      IOFireWireSerialBusProtocolTransport = "251.0.1";
+      IOGraphics                           = "485.40.1";
+      IOHIDFamily                          = "606.40.1";
+      IONetworkingFamily                   = "101";
+      IOSerialFamily                       = "74.20.1";
+      IOStorageFamily                      = "182.1.1";
+      IOBDStorageFamily                    = "14";
+      IOCDStorageFamily                    = "51";
+      IODVDStorageFamily                   = "35";
+      IOKitUser                            = "1050.20.2";
+    };
+    "osx-10.9.5" = {
+      CF                 = "855.17";
+      launchd            = "842.92.1";
+      libauto            = "185.5";
+      Libc               = "997.90.3";
+      libdispatch        = "339.92.1";
+      libiconv           = "41";
+      Libnotify          = "121.20.1";
+      Libsystem          = "1197.1.1";
+      objc4              = "551.1";
+      Security           = "55471.14.18";
+      security_dotmac_tp = "55107.1";
+      xnu                = "2422.115.4";
+
+      IOStorageFamily = "172";
+    };
+    "osx-10.8.5" = {
+      configd     = "453.19";
+      Libc        = "825.40.1";
+      IOUSBFamily = "630.4.5";
+    };
+    "osx-10.8.4" = {
+      IOUSBFamily = "560.4.2";
+    };
+    "osx-10.7.5" = {
+      libsecurity_apple_csp      = "55003";
+      libsecurity_apple_cspdl    = "55000";
+      libsecurity_apple_file_dl  = "55000";
+      libsecurity_apple_x509_cl  = "55004";
+      libsecurity_apple_x509_tp  = "55009.3";
+      libsecurity_asn1           = "55000.2";
+      libsecurity_cdsa_client    = "55000";
+      libsecurity_cdsa_plugin    = "55001";
+      libsecurity_cdsa_utilities = "55006";
+      libsecurity_cdsa_utils     = "55000";
+      libsecurity_codesigning    = "55037.15";
+      libsecurity_cssm           = "55005.5";
+      libsecurity_filedb         = "55016.1";
+      libsecurity_keychain       = "55050.9";
+      libsecurity_mds            = "55000";
+      libsecurity_ocspd          = "55010";
+      libsecurity_pkcs12         = "55000";
+      libsecurity_sd_cspdl       = "55003";
+      libsecurity_utilities      = "55030.3";
+      libsecurityd               = "55004";
+    };
+    "osx-10.7.4" = {
+      Libm = "2026";
+    };
+    "osx-10.6.2" = {
+      CarbonHeaders = "18.1";
+    };
+    "osx-10.5.8" = {
+      adv_cmds = "119";
+    };
+    "osx-10.5" = {
+      CoreOSMakeFiles = "40";
+    };
+    "dev-tools-7.0" = {
+      bootstrap_cmds = "93";
+    };
+    "dev-tools-5.1" = {
+      bootstrap_cmds = "86";
+    };
+    "dev-tools-3.2.6" = {
+      bsdmake = "24";
+    };
+  };
+
   fetchApple = version: sha256: name: fetchurl {
-    url = "http://www.opensource.apple.com/tarballs/${name}/${name}-${version}.tar.gz";
+    url = "http://www.opensource.apple.com/tarballs/${name}/${name}-${versions.${version}.${name}}.tar.gz";
     inherit sha256;
   };
 
@@ -25,90 +147,101 @@ let
   };
 
   IOKitSpecs = {
-    IOAudioFamily                        = fetchApple "197.4.2"    "1dmrczdmbdkvnhjbv233wx4xczgpf5wjrhr83aizrwpks5avkxbr";
-    IOFireWireFamily                     = fetchApple "455.4.0"    "034n2v6z7lf1cx3sp3309z4sn8mkchjcrsf177iag46yzlzcjgfl";
-    IOFWDVComponents                     = fetchApple "207.4.1"    "1brr0yn6mxgapw3bvlhyissfksifzj2mqsvj9vmps6zwcsxjfw7m";
-    IOFireWireAVC                        = fetchApple "422.4.0"    "1anw8cfmwkavnrs28bzshwa3cwk4r1p3x72561zljx57d0na9164";
-    IOFireWireSBP2                       = fetchApple "426.4.1"    "0asik6qjhf3jjp22awsiyyd6rj02zwnx47l0afbwmxpn5bchfk60";
-    IOFireWireSerialBusProtocolTransport = fetchApple "251.0.1"    "09kiq907qpk94zbij1mrcfcnyyc5ncvlxavxjrj4v5braxm78lhi";
-    IOGraphics                           = fetchApple "471.92.1"   "1c110c9chafy5ilvnc08my9ka530aljggbn66gh3sjsg7lzck9nb";
-    IOHIDFamily                          = fetchApple "503.215.2"  "0nx9mzdw848y6ppcfvip3ybczd1fxkr413zhi9qhw7gnpvac5g3n";
-    IONetworkingFamily                   = fetchApple "100"        "10r769mqq7aiksdsvyz76xjln0lg7dj4pkg2x067ygyf9md55hlz";
-    IOSerialFamily                       = fetchApple "64.1.1"     "1bfkqmg7clwm23byr3iji812j7v1p6565b1ri6p78zviqxnxh7cx";
-    IOStorageFamily                      = fetchApple "172"        "0w5yr8ppl82anwph2zba0ppjji6ipf5x410zhcm1drzwn4bbkxrj";
-    IOBDStorageFamily                    = fetchApple "14"         "1rbvmh311n853j5qb6hfda94vym9wkws5w736w2r7dwbrjyppc1q";
-    IOCDStorageFamily                    = fetchApple "51"         "1905sxwmpxdcnm6yggklc5zimx1558ygm3ycj6b34f9h48xfxzgy";
-    IODVDStorageFamily                   = fetchApple "35"         "1fv82rn199mi998l41c0qpnlp3irhqp2rb7v53pxbx7cra4zx3i6";
+    IOAudioFamily                        = fetchApple "osx-10.10.5" "0ggq7za3iq8g02j16rj67prqhrw828jsw3ah3bxq8a1cvr55aqnq";
+    IOFireWireFamily                     = fetchApple "osx-10.10.5" "059qa1m668kwvchl90cqcx35b31zaqdg61zi11y1imn5s389y2g1";
+    IOFWDVComponents                     = fetchApple "osx-10.10.5" "1brr0yn6mxgapw3bvlhyissfksifzj2mqsvj9vmps6zwcsxjfw7m";
+    IOFireWireAVC                        = fetchApple "osx-10.10.5" "194an37gbqs9s5s891lmw6prvd1m2362602s8lj5m89fp9h8mbal";
+    IOFireWireSBP2                       = fetchApple "osx-10.10.5" "1mym158kp46y1vfiq625b15ihh4jjbpimfm7d56wlw6l2syajqvi";
+    IOFireWireSerialBusProtocolTransport = fetchApple "osx-10.10.5" "09kiq907qpk94zbij1mrcfcnyyc5ncvlxavxjrj4v5braxm78lhi";
+    IOGraphics                           = fetchApple "osx-10.10.5" "1z0x3yrv0p8pfdqnvwf8rvrf9wip593lhm9q6yzbclz3fn53ad0p";
+    IOHIDFamily                          = fetchApple "osx-10.10.5" "0yibagwk74imp3j3skjycm703s5ybdqw0qlsmnml6zwjpbrz5894";
+    IONetworkingFamily                   = fetchApple "osx-10.10.5" "04as1hc8avncijf61mp9dmplz8vb1inhirkd1g74gah08lgrfs9j";
+    IOSerialFamily                       = fetchApple "osx-10.10.5" "0jh12aanxcigqi9w6wqzbwjdin9m48zwrhdj3n4ki0h41sg89y91";
+    IOStorageFamily                      = fetchApple "osx-10.9.5"  "0w5yr8ppl82anwph2zba0ppjji6ipf5x410zhcm1drzwn4bbkxrj";
+    IOBDStorageFamily                    = fetchApple "osx-10.10.5" "1rbvmh311n853j5qb6hfda94vym9wkws5w736w2r7dwbrjyppc1q";
+    IOCDStorageFamily                    = fetchApple "osx-10.10.5" "1905sxwmpxdcnm6yggklc5zimx1558ygm3ycj6b34f9h48xfxzgy";
+    IODVDStorageFamily                   = fetchApple "osx-10.10.5" "1fv82rn199mi998l41c0qpnlp3irhqp2rb7v53pxbx7cra4zx3i6";
     # There should be an IOStreamFamily project here, but they haven't released it :(
-    IOUSBFamily                          = fetchApple "630.4.5"    "1znqb6frxgab9mkyv7csa08c26p9p0ip6hqb4wm9c7j85kf71f4j"; # This is from 10.8 :(
-    IOUSBFamily_older                    = fetchApple "560.4.2"    "113lmpz8n6sibd27p42h8bl7a6c3myc6zngwri7gnvf8qlajzyml" "IOUSBFamily"; # This is even older :(
-    IOKitUser                            = fetchApple "907.100.13" "0kcbrlyxcyirvg5p95hjd9k8a01k161zg0bsfgfhkb90kh2s8x0m";
+    IOUSBFamily                          = fetchApple "osx-10.8.5"  "1znqb6frxgab9mkyv7csa08c26p9p0ip6hqb4wm9c7j85kf71f4j"; # This is from 10.8 :(
+    IOUSBFamily_older                    = fetchApple "osx-10.8.4"  "113lmpz8n6sibd27p42h8bl7a6c3myc6zngwri7gnvf8qlajzyml" "IOUSBFamily"; # This is even older :(
+    IOKitUser                            = fetchApple "osx-10.10.5" "1jzndziv97bhjxmla8nib5fpcswbvsxr04447g251ls81rw313lb";
     # There should be an IOVideo here, but they haven't released it :(
   };
 
   IOKitSrcs = stdenv.lib.mapAttrs (name: value: if builtins.isFunction value then value name else value) IOKitSpecs;
 
-  adv_cmds        = applePackage "adv_cmds"          "119"         "102ssayxbg9wb35mdmhswbnw0bg7js3pfd8fcbic83c5q3bqa6c6" {};
+  adv_cmds = applePackage "adv_cmds" "osx-10.5.8" "102ssayxbg9wb35mdmhswbnw0bg7js3pfd8fcbic83c5q3bqa6c6" {};
 
   packages = {
     inherit (adv_cmds) ps locale;
-    architecture    = applePackage "architecture"      "265"         "05wz8wmxlqssfp29x203fwfb8pgbdjj1mpz12v508658166yzqj8" {};
-    bootstrap_cmds  = applePackage "bootstrap_cmds"    "86"          "0xr0296jm1r3q7kbam98h85g23qlfi763z54ahj563n636kyk2wb" {};
-    bsdmake         = applePackage "bsdmake"           "24"          "11a9kkhz5bfgi1i8kpdkis78lhc6b5vxmhd598fcdgra1jw4iac2" {};
-    CarbonHeaders   = applePackage "CarbonHeaders"     "9A581"       "1hc0yijlpwq39x5bic6nnywqp2m1wj1f11j33m2q7p505h1h740c" {};
-    CF              = applePackage "CF"                "855.17"      "1sadmxi9fsvsmdyxvg2133sdzvkzwil5fvyyidxsyk1iyfzqsvln" {};
-    CommonCrypto    = applePackage "CommonCrypto"      "60049"       "1azin6w7cnzl0iv8kd2qzgwcp6a45zy64y5z1i6jysjcl6xmlw2h" {};
-    configd         = applePackage "configd"           "453.19"      "1gxakahk8gallf16xmhxhprdxkh3prrmzxnmxfvj0slr0939mmr2" {};
-    copyfile        = applePackage "copyfile"          "103.92.1"    "15i2hw5aqx0fklvmq6avin5s00adacvzqc740vviwc2y742vrdcd" {};
-    CoreOSMakefiles = applePackage "CoreOSMakefiles"   "40"          "0kxp53spbn7109l7cvhi88pmfsi81lwmbws819b6wr3hm16v84f4" {};
-    Csu             = applePackage "Csu"               "79"          "1hif4dz23isgx85sgh11yg8amvp2ksvvhz3y5v07zppml7df2lnh" {};
-    dtrace          = applePackage "dtrace"            "118.1"       "0pp5x8dgvzmg9vvg32hpy2brm17dpmbwrcr4prsmdmfvd4767wcf" {};
-    dyld            = applePackage "dyld"              "239.4"       "07z7lyv6x0f6gllb5hymccl31zisrdhz4gqp722xcs9nhsqaqvn7" {};
-    eap8021x        = applePackage "eap8021x"          "180"         "1ynkq8zmhgqhpkdg2syj085lzya0fz55d3423hvf9kcgpbjcd9ic" {};
-    IOKit           = applePackage "IOKit"             "907.100.13"  "0kcbrlyxcyirvg5p95hjd9k8a01k161zg0bsfgfhkb90kh2s8x0m" { inherit IOKitSrcs; };
-    launchd         = applePackage "launchd"           "842.92.1"    "0w30hvwqq8j5n90s3qyp0fccxflvrmmjnicjri4i1vd2g196jdgj" {};
-    libauto         = applePackage "libauto"           "185.5"       "17z27yq5d7zfkwr49r7f0vn9pxvj95884sd2k6lq6rfaz9gxqhy3" {};
-    Libc            = applePackage "Libc"              "997.90.3"    "1jz5bx9l4q484vn28c6n9b28psja3rpxiqbj6zwrwvlndzmq1yz5" {};
-    Libc_old        = applePackage "Libc/825_40_1.nix" "825.40.1"    "0xsx1im52gwlmcrv4lnhhhn9dyk5ci6g27k6yvibn9vj8fzjxwcf" {};
-    libclosure      = applePackage "libclosure"        "63"          "083v5xhihkkajj2yvz0dwgbi0jl2qvzk22p7pqq1zp3ry85xagrx" {};
-    libdispatch     = applePackage "libdispatch"       "339.92.1"    "1lc5033cmkwxy3r26gh9plimxshxfcbgw6i0j7mgjlnpk86iy5bk" {};
-    libiconv        = applePackage "libiconv"          "41"          "0sni1gx6i2h7r4r4hhwbxdir45cp039m4wi74izh4l0pfw7gywad" {};
-    Libinfo         = applePackage "Libinfo"           "449.1.3"     "1ix6f7xwjnq9bqgv8w27k4j64bqn1mfhh91nc7ciiv55axpdb9hq" {};
-    Libm            = applePackage "Libm"              "2026"        "02sd82ig2jvvyyfschmb4gpz6psnizri8sh6i982v341x6y4ysl7" {}; # This is from 10.7 !! :(
-    Libnotify       = applePackage "Libnotify"         "121.20.1"    "164rx4za5z74s0mk9x0m1815r1m9kfal8dz3bfaw7figyjd6nqad" {};
-    libpthread      = applePackage "libpthread"        "105.1.4"     "09vwwahcvmxvx2xl0890gkp91n61dld29j73y2pa597bqkag2qpg" {};
-    libresolv       = applePackage "libresolv"         "54"          "028mp2smd744ryxwl8cqz4njv8h540sdw3an1yl7yxqcs04r0p4b" {};
-    Libsystem       = applePackage "Libsystem"         "1197.1.1"    "1yfj2qdrf9vrzs7p9m4wlb7zzxcrim1gw43x4lvz4qydpp5kg2rh" {};
-    libutil         = applePackage "libutil"           "38"          "12gsvmj342n5d81kqwba68bmz3zf2757442g1sz2y5xmcapa3g5f" {};
-    libunwind       = applePackage "libunwind"         "35.3"        "0miffaa41cv0lzf8az5k1j1ng8jvqvxcr4qrlkf3xyj479arbk1b" {};
-    mDNSResponder   = applePackage "mDNSResponder"     "522.92.1"    "1cp87qda1s7brriv413i71yggm8yqfwv64vknrnqv24fcb8hzbmy" {};
-    objc4           = applePackage "objc4"             "551.1"       "1jrdb6yyb5jwwj27c1r0nr2y2ihqjln8ynj61mpkvp144c1cm5bg" {};
-    #objc4_pure      = applePackage "objc4/pure.nix"    "551.1"       "1jrdb6yyb5jwwj27c1r0nr2y2ihqjln8ynj61mpkvp144c1cm5bg" {};
-    ppp             = applePackage "ppp"               "727.90.1"    "166xz1q7al12hm3q3drlp2r6fgdrsq3pmazjp3nsqg3vnglyh4gk" {};
-    removefile      = applePackage "removefile"        "33"          "0ycvp7cnv40952a1jyhm258p6gg5xzh30x86z5gb204x80knw30y" {};
-    Security        = applePackage "Security"          "55471.14.18" "1nv0dczf67dhk17hscx52izgdcyacgyy12ag0jh6nl5hmfzsn8yy" {};
-    xnu             = applePackage "xnu"               "2422.115.4"  "1ssw5fzvgix20bw6y13c39ib0zs7ykpig3irlwbaccpjpci5jl0s" {};
+    architecture    = applePackage "architecture"      "osx-10.10.5"     "0fc9s1f4mnzaixrmkkq9y8276g8i5grryh2dggi4h347i33kd097" {};
+    bootstrap_cmds  = applePackage "bootstrap_cmds"    "dev-tools-7.0"   "1v5dv2q3af1xwj5kz0a5g54fd5dm6j4c9dd2g66n4kc44ixyrhp3" {};
+    bsdmake         = applePackage "bsdmake"           "dev-tools-3.2.6" "11a9kkhz5bfgi1i8kpdkis78lhc6b5vxmhd598fcdgra1jw4iac2" {};
+    CarbonHeaders   = applePackage "CarbonHeaders"     "osx-10.6.2"      "1zam29847cxr6y9rnl76zqmkbac53nx0szmqm9w5p469a6wzjqar" {};
+    CF              = applePackage "CF"                "osx-10.9.5"      "1sadmxi9fsvsmdyxvg2133sdzvkzwil5fvyyidxsyk1iyfzqsvln" {};
+    CommonCrypto    = applePackage "CommonCrypto"      "osx-10.10.5"     "0rm1r552i3mhyik2y3309dw90ap6vlhk583237jxfmdkip4c6mdr" {};
+    configd         = applePackage "configd"           "osx-10.8.5"      "1gxakahk8gallf16xmhxhprdxkh3prrmzxnmxfvj0slr0939mmr2" {};
+    copyfile        = applePackage "copyfile"          "osx-10.10.5"     "1s90wv9jsi6ismdnc1my3rxaa83k3s5ialrs5xlrmyb7s0pgvz7j" {};
+    CoreOSMakefiles = applePackage "CoreOSMakefiles"   "osx-10.5"        "0kxp53spbn7109l7cvhi88pmfsi81lwmbws819b6wr3hm16v84f4" {};
+    Csu             = applePackage "Csu"               "osx-10.10.5"     "0yh5mslyx28xzpv8qww14infkylvc1ssi57imhi471fs91sisagj" {};
+    dtrace          = applePackage "dtrace"            "osx-10.10.5"     "0pp5x8dgvzmg9vvg32hpy2brm17dpmbwrcr4prsmdmfvd4767wcf" {};
+    dtracen         = applePackage "dtrace"            "osx-10.11.2"     "04mi0jy8gy0w59rk9i9dqznysv6fzz1v5mq779s41cp308yi0h1c" {};
+    dyld            = applePackage "dyld"              "osx-10.10.5"     "167f74ln8pmfimwn6kwh199ylvy3fw72fd15da94mf34ii0zar6k" {};
+    eap8021x        = applePackage "eap8021x"          "osx-10.10.5"     "1f37dpbcgrd1b14nrv2lpqrkap74myjbparz9masx92df6kcn7l2" {};
+    IOKit           = applePackage "IOKit"             "osx-10.10.5"     "0kcbrlyxcyirvg5p95hjd9k8a01k161zg0bsfgfhkb90kh2s8x0m" { inherit IOKitSrcs; };
+    launchd         = applePackage "launchd"           "osx-10.9.5"      "0w30hvwqq8j5n90s3qyp0fccxflvrmmjnicjri4i1vd2g196jdgj" {};
+    libauto         = applePackage "libauto"           "osx-10.9.5"      "17z27yq5d7zfkwr49r7f0vn9pxvj95884sd2k6lq6rfaz9gxqhy3" {};
+    Libc            = applePackage "Libc"              "osx-10.9.5"      "1jz5bx9l4q484vn28c6n9b28psja3rpxiqbj6zwrwvlndzmq1yz5" {};
+    Libc_old        = applePackage "Libc/825_40_1.nix" "osx-10.8.5"      "0xsx1im52gwlmcrv4lnhhhn9dyk5ci6g27k6yvibn9vj8fzjxwcf" {};
+    libclosure      = applePackage "libclosure"        "osx-10.10.5"     "1zqy1zvra46cmqv6vsf1mcsz3a76r9bky145phfwh4ab6y15vjpq" {};
+    libdispatch     = applePackage "libdispatch"       "osx-10.9.5"      "1lc5033cmkwxy3r26gh9plimxshxfcbgw6i0j7mgjlnpk86iy5bk" {};
+    libiconv        = applePackage "libiconv"          "osx-10.9.5"      "0sni1gx6i2h7r4r4hhwbxdir45cp039m4wi74izh4l0pfw7gywad" {};
+    Libinfo         = applePackage "Libinfo"           "osx-10.10.5"     "19n72s652rrqnc9hzlh4xq3h7xsfyjyklmcgyzyj0v0z68ww3z6h" {};
+    Libm            = applePackage "Libm"              "osx-10.7.4"      "02sd82ig2jvvyyfschmb4gpz6psnizri8sh6i982v341x6y4ysl7" {};
+    Libnotify       = applePackage "Libnotify"         "osx-10.9.5"      "164rx4za5z74s0mk9x0m1815r1m9kfal8dz3bfaw7figyjd6nqad" {};
+    libpthread      = applePackage "libpthread"        "osx-10.10.5"     "1p2y6xvsfqyakivr6d48fgrd163b5m9r045cxyfwrf8w0r33nfn3" {};
+    libresolv       = applePackage "libresolv"         "osx-10.10.5"     "0nvssf4qaqgs1dxwayzdy66757k99969f6c7n68n58n2yh6f5f6a" {};
+    Libsystem       = applePackage "Libsystem"         "osx-10.9.5"      "1yfj2qdrf9vrzs7p9m4wlb7zzxcrim1gw43x4lvz4qydpp5kg2rh" {};
+    libutil         = applePackage "libutil"           "osx-10.10.5"     "12gsvmj342n5d81kqwba68bmz3zf2757442g1sz2y5xmcapa3g5f" {};
+    libunwind       = applePackage "libunwind"         "osx-10.10.5"     "0miffaa41cv0lzf8az5k1j1ng8jvqvxcr4qrlkf3xyj479arbk1b" {};
+    mDNSResponder   = applePackage "mDNSResponder"     "osx-10.10.5"     "1h4jin7ya1ih7v0hksi7gfmbv767pv8wsyyv1qfy2xw36x8wnds7" {};
+    objc4           = applePackage "objc4"             "osx-10.9.5"      "1jrdb6yyb5jwwj27c1r0nr2y2ihqjln8ynj61mpkvp144c1cm5bg" {};
+    ppp             = applePackage "ppp"               "osx-10.10.5"     "01v7i0xds185glv8psvlffylfcfhbx1wgsfg74kx5rh3lyrigwrb" {};
+    removefile      = applePackage "removefile"        "osx-10.10.5"     "1f2jw5irq6fz2jv5pag1w2ivfp8659v74f0h8kh0yx0rqw4asm33" {};
+    Security        = applePackage "Security"          "osx-10.9.5"      "1nv0dczf67dhk17hscx52izgdcyacgyy12ag0jh6nl5hmfzsn8yy" {};
+    xnu             = applePackage "xnu"               "osx-10.9.5"      "1ssw5fzvgix20bw6y13c39ib0zs7ykpig3irlwbaccpjpci5jl0s" {};
 
-    libsecurity_apple_csp      = libsecPackage "libsecurity_apple_csp"      "55003"    "1ngyn1ik27n4x981px3kfd1z1n8zx7r5w812b6qfjpy5nw4h746w" {};
-    libsecurity_apple_cspdl    = libsecPackage "libsecurity_apple_cspdl"    "55000"    "1svqa5fhw7p7njzf8bzg7zgc5776aqjhdbnlhpwmr5hmz5i0x8r7" {};
-    libsecurity_apple_file_dl  = libsecPackage "libsecurity_apple_file_dl"  "55000"    "1dfqani3n135i3iqmafc1k9awmz6s0a78zifhk15rx5a8ps870bl" {};
-    libsecurity_apple_x509_cl  = libsecPackage "libsecurity_apple_x509_cl"  "55004"    "1gji2i080560s08k1nigsla1zdmi6slyv97xaj5vqxjpxb0g1xf5" {};
-    libsecurity_apple_x509_tp  = libsecPackage "libsecurity_apple_x509_tp"  "55009.3"  "1bsms3nvi62wbvjviwjhjhzhylad8g6vmvlj3ngd0wyd0ywxrs46" {};
-    libsecurity_asn1           = libsecPackage "libsecurity_asn1"           "55000.2"  "0i8aakjxdfj0lqcgqmbip32g7r4h57xhs8w0sxfvfl45q22s782w" {};
-    libsecurity_cdsa_client    = libsecPackage "libsecurity_cdsa_client"    "55000"    "127jxnypkycy8zqwicfv333h11318m00gd37jnswbrpg44xd1wdy" {};
-    libsecurity_cdsa_plugin    = libsecPackage "libsecurity_cdsa_plugin"    "55001"    "0ifmx85rs51i7zjm015s8kc2dqyrlvbr39lw9xzxgd2ds33i4lfj" {};
-    libsecurity_cdsa_utilities = libsecPackage "libsecurity_cdsa_utilities" "55006"    "1kzsl0prvfa8a0m3j3pcxq06aix1csgayd3lzx27iqg84c8mhzan" {};
-    libsecurity_cdsa_utils     = libsecPackage "libsecurity_cdsa_utils"     "55000"    "0q55jizav6n0lkj7lcmcr2mjdhnbnnn525fa9ipwgvzbspihw0g6" {};
-    libsecurity_codesigning    = libsecPackage "libsecurity_codesigning"    "55037.15" "0vf5nj2g383b4hknlp51qll5pm8z4qbf56dnc16n3wm8gj82iasy" {};
-    libsecurity_cssm           = libsecPackage "libsecurity_cssm"           "55005.5"  "0l6ia533bhr8kqp2wa712bnzzzisif3kbn7h3bzzf4nps4wmwzn4" {};
-    libsecurity_filedb         = libsecPackage "libsecurity_filedb"         "55016.1"  "1r0ik95xapdl6l2lhd079vpq41jjgshz2hqb8490gpy5wyc49cxb" {};
-    libsecurity_keychain       = libsecPackage "libsecurity_keychain"       "55050.9"  "15wf2slcgyns61kk7jndgm9h22vidyphh9x15x8viyprra9bkhja" {};
-    libsecurity_mds            = libsecPackage "libsecurity_mds"            "55000"    "0vin5hnzvkx2rdzaaj2gxmx38amxlyh6j24a8gc22y09d74p5lzs" {};
-    libsecurity_ocspd          = libsecPackage "libsecurity_ocspd"          "55010"    "1bxzpihc6w0ji4x8810a4lfkq83787yhjl60xm24bv1prhqcm73b" {};
-    libsecurity_pkcs12         = libsecPackage "libsecurity_pkcs12"         "55000"    "1yq8p2sp39q40fxshb256b7jn9lvmpymgpm8yz9kqrf980xddgsg" {};
-    libsecurity_sd_cspdl       = libsecPackage "libsecurity_sd_cspdl"       "55003"    "10v76xycfnvz1n0zqfbwn3yh4w880lbssqhkn23iim3ihxgm5pbd" {};
-    libsecurity_utilities      = libsecPackage "libsecurity_utilities"      "55030.3"  "0ayycfy9jm0n0c7ih9f3m69ynh8hs80v8yicq47aa1h9wclbxg8r" {};
-    libsecurityd               = libsecPackage "libsecurityd"               "55004"    "1ywm2qj8l7rhaxy5biwxsyavd0d09d4bzchm03nlvwl313p2747x" {};
-    security_dotmac_tp         = libsecPackage "security_dotmac_tp"         "55107.1"  "1l4fi9qhrghj0pkvywi8da22bh06c5bv3l40a621b5g258na50pl" {};
+    # Pending work... we can't change the above packages in place because the bootstrap depends on them, so we detach the expressions
+    # here so we can work on them.
+    CF_new          = applePackage "CF/new.nix"          "osx-10.10.5"     "1sadmxi9fsvsmdyxvg2133sdzvkzwil50vyyidxsyk1iyfzqsvln" {};
+    Libc_new        = applePackage "Libc/new.nix"        "osx-10.10.5"     "1jz5bx9l4q484vn08c6n9b28psja3rpxiqbj6zwrwvlndzmq1yz5" {};
+    libdispatch_new = applePackage "libdispatch/new.nix" "osx-10.10.5"     "1lc5033cmkwxy0r26gh9plimxshxfcbgw6i0j7mgjlnpk86iy5bk" {};
+    libiconv_new    = applePackage "libiconv/new.nix"    "osx-10.10.5"     "0sni1gx6i2h7r404hhwbxdir45cp039m4wi74izh4l0pfw7gywad" {};
+    Libnotify_new   = applePackage "Libnotify/new.nix"   "osx-10.10.5"     "0sni1gx6i2h7r404hhwbxdir45cp039m4wi70izh4l0pfw7gywad" {};
+    Libsystem_new   = applePackage "Libsystem/new.nix"   "osx-10.10.5"     "1yfj2qdrf9vrzs7p9m4wlb7zzxcrim10w43x4lvz4qydpp5kg2rh" {};
+    objc4_new       = applePackage "objc4/new.nix"       "osx-10.10.5"     "0r0797ckmgv19if4i14dzyjh7i5klkm9jpacjif9v3rpycyyx1n3" {};
+    xnu_new         = applePackage "xnu/new.nix"         "osx-10.11.2"     "1ax280jblz7laqam8fcwrffrrz26am10p1va9mlg9mklvbqarhqh" {};
+
+    libsecurity_apple_csp      = libsecPackage "libsecurity_apple_csp"      "osx-10.7.5" "1ngyn1ik27n4x981px3kfd1z1n8zx7r5w812b6qfjpy5nw4h746w" {};
+    libsecurity_apple_cspdl    = libsecPackage "libsecurity_apple_cspdl"    "osx-10.7.5" "1svqa5fhw7p7njzf8bzg7zgc5776aqjhdbnlhpwmr5hmz5i0x8r7" {};
+    libsecurity_apple_file_dl  = libsecPackage "libsecurity_apple_file_dl"  "osx-10.7.5" "1dfqani3n135i3iqmafc1k9awmz6s0a78zifhk15rx5a8ps870bl" {};
+    libsecurity_apple_x509_cl  = libsecPackage "libsecurity_apple_x509_cl"  "osx-10.7.5" "1gji2i080560s08k1nigsla1zdmi6slyv97xaj5vqxjpxb0g1xf5" {};
+    libsecurity_apple_x509_tp  = libsecPackage "libsecurity_apple_x509_tp"  "osx-10.7.5" "1bsms3nvi62wbvjviwjhjhzhylad8g6vmvlj3ngd0wyd0ywxrs46" {};
+    libsecurity_asn1           = libsecPackage "libsecurity_asn1"           "osx-10.7.5" "0i8aakjxdfj0lqcgqmbip32g7r4h57xhs8w0sxfvfl45q22s782w" {};
+    libsecurity_cdsa_client    = libsecPackage "libsecurity_cdsa_client"    "osx-10.7.5" "127jxnypkycy8zqwicfv333h11318m00gd37jnswbrpg44xd1wdy" {};
+    libsecurity_cdsa_plugin    = libsecPackage "libsecurity_cdsa_plugin"    "osx-10.7.5" "0ifmx85rs51i7zjm015s8kc2dqyrlvbr39lw9xzxgd2ds33i4lfj" {};
+    libsecurity_cdsa_utilities = libsecPackage "libsecurity_cdsa_utilities" "osx-10.7.5" "1kzsl0prvfa8a0m3j3pcxq06aix1csgayd3lzx27iqg84c8mhzan" {};
+    libsecurity_cdsa_utils     = libsecPackage "libsecurity_cdsa_utils"     "osx-10.7.5" "0q55jizav6n0lkj7lcmcr2mjdhnbnnn525fa9ipwgvzbspihw0g6" {};
+    libsecurity_codesigning    = libsecPackage "libsecurity_codesigning"    "osx-10.7.5" "0vf5nj2g383b4hknlp51qll5pm8z4qbf56dnc16n3wm8gj82iasy" {};
+    libsecurity_cssm           = libsecPackage "libsecurity_cssm"           "osx-10.7.5" "0l6ia533bhr8kqp2wa712bnzzzisif3kbn7h3bzzf4nps4wmwzn4" {};
+    libsecurity_filedb         = libsecPackage "libsecurity_filedb"         "osx-10.7.5" "1r0ik95xapdl6l2lhd079vpq41jjgshz2hqb8490gpy5wyc49cxb" {};
+    libsecurity_keychain       = libsecPackage "libsecurity_keychain"       "osx-10.7.5" "15wf2slcgyns61kk7jndgm9h22vidyphh9x15x8viyprra9bkhja" {};
+    libsecurity_mds            = libsecPackage "libsecurity_mds"            "osx-10.7.5" "0vin5hnzvkx2rdzaaj2gxmx38amxlyh6j24a8gc22y09d74p5lzs" {};
+    libsecurity_ocspd          = libsecPackage "libsecurity_ocspd"          "osx-10.7.5" "1bxzpihc6w0ji4x8810a4lfkq83787yhjl60xm24bv1prhqcm73b" {};
+    libsecurity_pkcs12         = libsecPackage "libsecurity_pkcs12"         "osx-10.7.5" "1yq8p2sp39q40fxshb256b7jn9lvmpymgpm8yz9kqrf980xddgsg" {};
+    libsecurity_sd_cspdl       = libsecPackage "libsecurity_sd_cspdl"       "osx-10.7.5" "10v76xycfnvz1n0zqfbwn3yh4w880lbssqhkn23iim3ihxgm5pbd" {};
+    libsecurity_utilities      = libsecPackage "libsecurity_utilities"      "osx-10.7.5" "0ayycfy9jm0n0c7ih9f3m69ynh8hs80v8yicq47aa1h9wclbxg8r" {};
+    libsecurityd               = libsecPackage "libsecurityd"               "osx-10.7.5" "1ywm2qj8l7rhaxy5biwxsyavd0d09d4bzchm03nlvwl313p2747x" {};
+    security_dotmac_tp         = libsecPackage "security_dotmac_tp"         "osx-10.9.5" "1l4fi9qhrghj0pkvywi8da22bh06c5bv3l40a621b5g258na50pl" {};
   };
 in packages
diff --git a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix
index 8276d2f4b425..4933f94d4a93 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix
@@ -81,6 +81,8 @@ appleDerivation {
     export HOST_CODESIGN='echo dummy_codesign'
     export HOST_CODESIGN_ALLOCATE=echo
 
+    export BUILT_PRODUCTS_DIR=.
+
     export DSTROOT=$out
     make installhdrs
 

From f807f159427d578963457ef5b5fcea7ad72568dd Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 10 Jan 2016 14:10:03 -0600
Subject: [PATCH 537/884] kde5: remove kde-frameworks-5.17

---
 .../libraries/kde-frameworks-5.17/attica.nix  |  11 -
 .../libraries/kde-frameworks-5.17/baloo.nix   |  25 -
 .../kde-frameworks-5.17/bluez-qt.nix          |  17 -
 .../kde-frameworks-5.17/breeze-icons.nix      |  10 -
 .../libraries/kde-frameworks-5.17/default.nix | 112 ----
 .../0001-extra-cmake-modules-paths.patch      |  74 ---
 .../extra-cmake-modules/default.nix           |  18 -
 .../extra-cmake-modules/setup-hook.sh         |  27 -
 .../kde-frameworks-5.17/fetchsrcs.sh          |  57 --
 .../frameworkintegration.nix                  |  17 -
 .../kde-frameworks-5.17/kactivities.nix       |  22 -
 .../libraries/kde-frameworks-5.17/kapidox.nix |  12 -
 .../kde-frameworks-5.17/karchive.nix          |  11 -
 .../kde-frameworks-5.17/kauth/default.nix     |  16 -
 .../kauth/kauth-policy-install.patch          |  13 -
 .../kde-frameworks-5.17/kbookmarks.nix        |  25 -
 .../0001-qdiriterator-follow-symlinks.patch   |  25 -
 .../kde-frameworks-5.17/kcmutils/default.nix  |  17 -
 .../libraries/kde-frameworks-5.17/kcodecs.nix |  11 -
 .../kde-frameworks-5.17/kcompletion.nix       |  14 -
 .../libraries/kde-frameworks-5.17/kconfig.nix |  16 -
 .../0001-qdiriterator-follow-symlinks.patch   |  25 -
 .../kconfigwidgets/default.nix                |  17 -
 .../kde-frameworks-5.17/kcoreaddons.nix       |  16 -
 .../libraries/kde-frameworks-5.17/kcrash.nix  |  16 -
 .../kde-frameworks-5.17/kdbusaddons.nix       |  17 -
 .../kde-frameworks-5.17/kdeclarative.nix      |  22 -
 .../libraries/kde-frameworks-5.17/kded.nix    |  19 -
 .../kde-frameworks-5.17/kdelibs4support.nix   |  32 -
 .../kde-frameworks-5.17/kdesignerplugin.nix   |  34 --
 .../libraries/kde-frameworks-5.17/kdesu.nix   |  13 -
 .../kde-frameworks-5.17/kdewebkit.nix         |  13 -
 .../libraries/kde-frameworks-5.17/kdnssd.nix  |  13 -
 .../kde-frameworks-5.17/kdoctools/default.nix |  20 -
 .../kdoctools-no-find-docbook-xml.patch       |  12 -
 .../kdoctools/setup-hook.sh                   |   5 -
 .../kde-frameworks-5.17/kemoticons.nix        |  17 -
 .../kde-frameworks-5.17/kfilemetadata.nix     |  13 -
 .../kde-frameworks-5.17/kglobalaccel.nix      |  23 -
 .../kde-frameworks-5.17/kguiaddons.nix        |  13 -
 .../libraries/kde-frameworks-5.17/khtml.nix   |  21 -
 .../libraries/kde-frameworks-5.17/ki18n.nix   |  17 -
 .../kiconthemes/default-theme-breeze.patch    |  13 -
 .../kiconthemes/default.nix                   |  18 -
 .../kde-frameworks-5.17/kiconthemes/series    |   1 -
 .../kde-frameworks-5.17/kidletime.nix         |  15 -
 .../kde-frameworks-5.17/kimageformats.nix     |  13 -
 .../kinit/0001-kinit-libpath.patch            |  42 --
 .../kde-frameworks-5.17/kinit/default.nix     |  17 -
 .../kde-frameworks-5.17/kio/default.nix       |  33 -
 .../kio/samba-search-path.patch               |  28 -
 .../libraries/kde-frameworks-5.17/kio/series  |   1 -
 .../kde-frameworks-5.17/kitemmodels.nix       |  11 -
 .../kde-frameworks-5.17/kitemviews.nix        |  11 -
 .../kde-frameworks-5.17/kjobwidgets.nix       |  16 -
 .../libraries/kde-frameworks-5.17/kjs.nix     |  16 -
 .../kde-frameworks-5.17/kjsembed.nix          |  17 -
 .../kde-frameworks-5.17/kmediaplayer.nix      |  15 -
 .../kde-frameworks-5.17/knewstuff.nix         |  17 -
 .../kde-frameworks-5.17/knotifications.nix    |  21 -
 .../kde-frameworks-5.17/knotifyconfig.nix     |  13 -
 .../kpackage/0001-allow-external-paths.patch  |  25 -
 .../0002-qdiriterator-follow-symlinks.patch   |  39 --
 .../kde-frameworks-5.17/kpackage/default.nix  |  26 -
 .../libraries/kde-frameworks-5.17/kparts.nix  |  17 -
 .../libraries/kde-frameworks-5.17/kpeople.nix |  15 -
 .../kde-frameworks-5.17/kplotting.nix         |  11 -
 .../libraries/kde-frameworks-5.17/kpty.nix    |  10 -
 .../libraries/kde-frameworks-5.17/kross.nix   |  14 -
 .../libraries/kde-frameworks-5.17/krunner.nix |  16 -
 .../0001-qdiriterator-follow-symlinks.patch   |  25 -
 .../kservice/0002-no-canonicalize-path.patch  |  25 -
 .../kde-frameworks-5.17/kservice/default.nix  |  19 -
 .../kservice/setup-hook.sh                    |  43 --
 .../0001-no-qcoreapplication.patch            |  48 --
 .../ktexteditor/default.nix                   |  18 -
 .../kde-frameworks-5.17/ktextwidgets.nix      |  16 -
 .../kde-frameworks-5.17/kunitconversion.nix   |  10 -
 .../libraries/kde-frameworks-5.17/kwallet.nix |  21 -
 .../kde-frameworks-5.17/kwidgetsaddons.nix    |  11 -
 .../kde-frameworks-5.17/kwindowsystem.nix     |  13 -
 .../libraries/kde-frameworks-5.17/kxmlgui.nix |  18 -
 .../kde-frameworks-5.17/kxmlrpcclient.nix     |  10 -
 .../kde-frameworks-5.17/modemmanager-qt.nix   |  13 -
 .../kde-frameworks-5.17/networkmanager-qt.nix |  13 -
 .../kde-frameworks-5.17/oxygen-icons5.nix     |  13 -
 .../plasma-framework/default.nix              |  25 -
 .../libraries/kde-frameworks-5.17/solid.nix   |  17 -
 .../libraries/kde-frameworks-5.17/sonnet.nix  |  13 -
 .../libraries/kde-frameworks-5.17/srcs.nix    | 565 ------------------
 .../kde-frameworks-5.17/threadweaver.nix      |  11 -
 pkgs/top-level/all-packages.nix               |  13 +-
 92 files changed, 2 insertions(+), 2377 deletions(-)
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/attica.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/baloo.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/bluez-qt.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/breeze-icons.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/default.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/extra-cmake-modules/default.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/extra-cmake-modules/setup-hook.sh
 delete mode 100755 pkgs/development/libraries/kde-frameworks-5.17/fetchsrcs.sh
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/frameworkintegration.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kactivities.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kapidox.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/karchive.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kauth/default.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kauth/kauth-policy-install.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kbookmarks.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kcmutils/0001-qdiriterator-follow-symlinks.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kcmutils/default.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kcodecs.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kcompletion.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kconfig.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kconfigwidgets/default.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kcoreaddons.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kcrash.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kdbusaddons.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kdeclarative.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kded.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kdelibs4support.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kdesignerplugin.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kdesu.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kdewebkit.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kdnssd.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kdoctools/default.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kdoctools/kdoctools-no-find-docbook-xml.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kdoctools/setup-hook.sh
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kemoticons.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kfilemetadata.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kglobalaccel.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kguiaddons.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/khtml.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/ki18n.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kiconthemes/default-theme-breeze.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kiconthemes/default.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kiconthemes/series
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kidletime.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kimageformats.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kinit/0001-kinit-libpath.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kinit/default.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kio/default.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kio/samba-search-path.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kio/series
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kitemmodels.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kitemviews.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kjobwidgets.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kjs.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kjsembed.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kmediaplayer.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/knewstuff.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/knotifications.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/knotifyconfig.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kpackage/0001-allow-external-paths.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kpackage/0002-qdiriterator-follow-symlinks.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kpackage/default.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kparts.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kpeople.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kplotting.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kpty.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kross.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/krunner.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kservice/0001-qdiriterator-follow-symlinks.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kservice/0002-no-canonicalize-path.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kservice/default.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kservice/setup-hook.sh
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/ktexteditor/0001-no-qcoreapplication.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/ktexteditor/default.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/ktextwidgets.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kunitconversion.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kwallet.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kwidgetsaddons.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kwindowsystem.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kxmlgui.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/kxmlrpcclient.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/modemmanager-qt.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/networkmanager-qt.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/oxygen-icons5.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/plasma-framework/default.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/solid.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/sonnet.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/srcs.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.17/threadweaver.nix

diff --git a/pkgs/development/libraries/kde-frameworks-5.17/attica.nix b/pkgs/development/libraries/kde-frameworks-5.17/attica.nix
deleted file mode 100644
index 98721876c120..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/attica.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-}:
-
-kdeFramework {
-  name = "attica";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/baloo.nix b/pkgs/development/libraries/kde-frameworks-5.17/baloo.nix
deleted file mode 100644
index 38c41d9271d8..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/baloo.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kauth, kconfig
-, kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n, kidletime
-, kio, lmdb, makeQtWrapper, qtbase, qtquick1, solid
-}:
-
-kdeFramework {
-  name = "baloo";
-  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [
-    kconfig kcrash kdbusaddons lmdb qtquick1 solid
-  ];
-  propagatedBuildInputs = [
-    kauth kcoreaddons kfilemetadata ki18n kio kidletime qtbase
-  ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/baloo_file"
-    wrapQtProgram "$out/bin/baloo_file_extractor"
-    wrapQtProgram "$out/bin/balooctl"
-    wrapQtProgram "$out/bin/baloosearch"
-    wrapQtProgram "$out/bin/balooshow"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/bluez-qt.nix b/pkgs/development/libraries/kde-frameworks-5.17/bluez-qt.nix
deleted file mode 100644
index f981b0516f72..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/bluez-qt.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, qtdeclarative
-}:
-
-kdeFramework {
-  name = "bluez-qt";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtdeclarative ];
-  preConfigure = ''
-    substituteInPlace CMakeLists.txt \
-      --replace /lib/udev/rules.d "$out/lib/udev/rules.d"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/breeze-icons.nix b/pkgs/development/libraries/kde-frameworks-5.17/breeze-icons.nix
deleted file mode 100644
index 879262c56a41..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/breeze-icons.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kdeFramework
-, extra-cmake-modules
-, qtsvg
-}:
-
-kdeFramework {
-  name = "breeze-icons";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedUserEnvPkgs = [ qtsvg ];
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/default.nix b/pkgs/development/libraries/kde-frameworks-5.17/default.nix
deleted file mode 100644
index f41aebcb59d3..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/default.nix
+++ /dev/null
@@ -1,112 +0,0 @@
-# Maintainer's Notes:
-#
-# How To Update
-#  1. Edit the URL in ./manifest.sh
-#  2. Run ./manifest.sh
-#  3. Fix build errors.
-
-{ pkgs, debug ? false }:
-
-let
-
-  inherit (pkgs) lib makeSetupHook stdenv;
-
-  mirror = "mirror://kde";
-  srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
-
-  packages = self: with self; {
-    kdeFramework = args:
-      let
-        inherit (args) name;
-        inherit (srcs."${name}") src version;
-      in stdenv.mkDerivation (args // {
-        name = "${name}-${version}";
-        inherit src;
-
-        cmakeFlags =
-          (args.cmakeFlags or [])
-          ++ [ "-DBUILD_TESTING=OFF" ]
-          ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
-
-        meta = {
-          license = with lib.licenses; [
-            lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
-          ];
-          platforms = lib.platforms.linux;
-          homepage = "http://www.kde.org";
-        } // (args.meta or {});
-      });
-
-    attica = callPackage ./attica.nix {};
-    baloo = callPackage ./baloo.nix {};
-    bluez-qt = callPackage ./bluez-qt.nix {};
-    breeze-icons = callPackage ./breeze-icons.nix {};
-    extra-cmake-modules = callPackage ./extra-cmake-modules {};
-    frameworkintegration = callPackage ./frameworkintegration.nix {};
-    kactivities = callPackage ./kactivities.nix {};
-    kapidox = callPackage ./kapidox.nix {};
-    karchive = callPackage ./karchive.nix {};
-    kauth = callPackage ./kauth {};
-    kbookmarks = callPackage ./kbookmarks.nix {};
-    kcmutils = callPackage ./kcmutils {};
-    kcodecs = callPackage ./kcodecs.nix {};
-    kcompletion = callPackage ./kcompletion.nix {};
-    kconfig = callPackage ./kconfig.nix {};
-    kconfigwidgets = callPackage ./kconfigwidgets {};
-    kcoreaddons = callPackage ./kcoreaddons.nix {};
-    kcrash = callPackage ./kcrash.nix {};
-    kdbusaddons = callPackage ./kdbusaddons.nix {};
-    kdeclarative = callPackage ./kdeclarative.nix {};
-    kded = callPackage ./kded.nix {};
-    kdelibs4support = callPackage ./kdelibs4support.nix {};
-    kdesignerplugin = callPackage ./kdesignerplugin.nix {};
-    kdewebkit = callPackage ./kdewebkit.nix {};
-    kdesu = callPackage ./kdesu.nix {};
-    kdnssd = callPackage ./kdnssd.nix {};
-    kdoctools = callPackage ./kdoctools {};
-    kemoticons = callPackage ./kemoticons.nix {};
-    kfilemetadata = callPackage ./kfilemetadata.nix {};
-    kglobalaccel = callPackage ./kglobalaccel.nix {};
-    kguiaddons = callPackage ./kguiaddons.nix {};
-    khtml = callPackage ./khtml.nix {};
-    ki18n = callPackage ./ki18n.nix {};
-    kiconthemes = callPackage ./kiconthemes {};
-    kidletime = callPackage ./kidletime.nix {};
-    kimageformats = callPackage ./kimageformats.nix {};
-    kinit = callPackage ./kinit {};
-    kio = callPackage ./kio {};
-    kitemmodels = callPackage ./kitemmodels.nix {};
-    kitemviews = callPackage ./kitemviews.nix {};
-    kjobwidgets = callPackage ./kjobwidgets.nix {};
-    kjs = callPackage ./kjs.nix {};
-    kjsembed = callPackage ./kjsembed.nix {};
-    kmediaplayer = callPackage ./kmediaplayer.nix {};
-    knewstuff = callPackage ./knewstuff.nix {};
-    knotifications = callPackage ./knotifications.nix {};
-    knotifyconfig = callPackage ./knotifyconfig.nix {};
-    kpackage = callPackage ./kpackage {};
-    kparts = callPackage ./kparts.nix {};
-    kpeople = callPackage ./kpeople.nix {};
-    kplotting = callPackage ./kplotting.nix {};
-    kpty = callPackage ./kpty.nix {};
-    kross = callPackage ./kross.nix {};
-    krunner = callPackage ./krunner.nix {};
-    kservice = callPackage ./kservice {};
-    ktexteditor = callPackage ./ktexteditor {};
-    ktextwidgets = callPackage ./ktextwidgets.nix {};
-    kunitconversion = callPackage ./kunitconversion.nix {};
-    kwallet = callPackage ./kwallet.nix {};
-    kwidgetsaddons = callPackage ./kwidgetsaddons.nix {};
-    kwindowsystem = callPackage ./kwindowsystem.nix {};
-    kxmlgui = callPackage ./kxmlgui.nix {};
-    kxmlrpcclient = callPackage ./kxmlrpcclient.nix {};
-    modemmanager-qt = callPackage ./modemmanager-qt.nix {};
-    networkmanager-qt = callPackage ./networkmanager-qt.nix {};
-    oxygen-icons5 = callPackage ./oxygen-icons5.nix {};
-    plasma-framework = callPackage ./plasma-framework {};
-    solid = callPackage ./solid.nix {};
-    sonnet = callPackage ./sonnet.nix {};
-    threadweaver = callPackage ./threadweaver.nix {};
-  };
-
-in packages
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/extra-cmake-modules/0001-extra-cmake-modules-paths.patch b/pkgs/development/libraries/kde-frameworks-5.17/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
deleted file mode 100644
index 9717716faf5b..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 3cc148e878b69fc3e0228f3e3bf1bbe689dad87c Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Fri, 20 Feb 2015 23:17:39 -0600
-Subject: [PATCH] extra-cmake-modules paths
-
----
- kde-modules/KDEInstallDirs.cmake | 37 ++++---------------------------------
- 1 file changed, 4 insertions(+), 33 deletions(-)
-
-diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake
-index b7cd34d..2f868ac 100644
---- a/kde-modules/KDEInstallDirs.cmake
-+++ b/kde-modules/KDEInstallDirs.cmake
-@@ -193,37 +193,8 @@
- # (To distribute this file outside of extra-cmake-modules, substitute the full
- #  License text for the above reference.)
- 
--# Figure out what the default install directory for libraries should be.
--# This is based on the logic in GNUInstallDirs, but simplified (the
--# GNUInstallDirs code deals with re-configuring, but that is dealt with
--# by the _define_* macros in this module).
-+# The default library directory on NixOS is *always* /lib.
- set(_LIBDIR_DEFAULT "lib")
--# Override this default 'lib' with 'lib64' iff:
--#  - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling
--#  - we are NOT on debian
--#  - we are on a 64 bits system
--# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
--# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
--# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
--# See http://wiki.debian.org/Multiarch
--if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU")
--   AND NOT CMAKE_CROSSCOMPILING)
--  if (EXISTS "/etc/debian_version") # is this a debian system ?
--    if(CMAKE_LIBRARY_ARCHITECTURE)
--      set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
--    endif()
--  else() # not debian, rely on CMAKE_SIZEOF_VOID_P:
--    if(NOT DEFINED CMAKE_SIZEOF_VOID_P)
--      message(AUTHOR_WARNING
--        "Unable to determine default LIB_INSTALL_LIBDIR directory because no target architecture is known. "
--        "Please enable at least one language before including KDEInstallDirs.")
--    else()
--      if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
--        set(_LIBDIR_DEFAULT "lib64")
--      endif()
--    endif()
--  endif()
--endif()
- 
- set(_gnu_install_dirs_vars
-     BINDIR
-@@ -445,15 +416,15 @@ if(KDE_INSTALL_USE_QT_SYS_PATHS)
-         "QtQuick2 imports"
-         QML_INSTALL_DIR)
- else()
--    _define_relative(QTPLUGINDIR LIBDIR "plugins"
-+    _define_relative(QTPLUGINDIR LIBDIR "qt5/plugins"
-         "Qt plugins"
-         QT_PLUGIN_INSTALL_DIR)
- 
--    _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "imports"
-+    _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "qt5/imports"
-         "QtQuick1 imports"
-         IMPORTS_INSTALL_DIR)
- 
--    _define_relative(QMLDIR LIBDIR "qml"
-+    _define_relative(QMLDIR LIBDIR "qt5/qml"
-         "QtQuick2 imports"
-         QML_INSTALL_DIR)
- endif()
--- 
-2.3.0
-
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks-5.17/extra-cmake-modules/default.nix
deleted file mode 100644
index 4e1b1aff3bd1..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/extra-cmake-modules/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ kdeFramework, lib, stdenv, cmake, pkgconfig, qttools }:
-
-kdeFramework {
-  name = "extra-cmake-modules";
-  patches = [ ./0001-extra-cmake-modules-paths.patch ];
-
-  setupHook = ./setup-hook.sh;
-
-  # It is OK to propagate these inputs as long as
-  # extra-cmake-modules is never a propagated input
-  # of some other derivation.
-  propagatedNativeBuildInputs = [ cmake pkgconfig qttools ];
-
-  meta = {
-    license = stdenv.lib.licenses.bsd2;
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.17/extra-cmake-modules/setup-hook.sh
deleted file mode 100644
index a6fa6189240b..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/extra-cmake-modules/setup-hook.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-addMimePkg() {
-    local propagated
-
-    if [[ -d "$1/share/mime" ]]; then
-        propagated=
-        for pkg in $propagatedBuildInputs; do
-            if [[ "z$pkg" == "z$1" ]]; then
-                propagated=1
-            fi
-        done
-        if [[ -z $propagated ]]; then
-            propagatedBuildInputs="$propagatedBuildInputs $1"
-        fi
-
-        propagated=
-        for pkg in $propagatedUserEnvPkgs; do
-            if [[ "z$pkg" == "z$1" ]]; then
-                propagated=1
-            fi
-        done
-        if [[ -z $propagated ]]; then
-            propagatedUserEnvPkgs="$propagatedUserEnvPkgs $1"
-        fi
-    fi
-}
-
-envHooks+=(addMimePkg)
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/fetchsrcs.sh b/pkgs/development/libraries/kde-frameworks-5.17/fetchsrcs.sh
deleted file mode 100755
index 16a8de82c590..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/fetchsrcs.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#! /usr/bin/env nix-shell
-#! nix-shell -i bash -p coreutils findutils gnused nix wget
-
-set -x
-
-# The trailing slash at the end is necessary!
-RELEASE_URL="http://download.kde.org/stable/frameworks/5.17/"
-EXTRA_WGET_ARGS='-A *.tar.xz'
-
-mkdir tmp; cd tmp
-
-rm -f ../srcs.csv
-
-wget -nH -r -c --no-parent $RELEASE_URL $EXTRA_WGET_ARGS
-
-find . | while read src; do
-    if [[ -f "${src}" ]]; then
-        # Sanitize file name
-        filename=$(basename "$src" | tr '@' '_')
-        nameVersion="${filename%.tar.*}"
-        name=$(echo "$nameVersion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,')
-        version=$(echo "$nameVersion" | sed -e 's,^\([[:alpha:]][[:alnum:]]*-\)\+,,')
-        echo "$name,$version,$src,$filename" >>../srcs.csv
-    fi
-done
-
-cat >../srcs.nix <<EOF
-# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
-{ fetchurl, mirror }:
-
-{
-EOF
-
-gawk -F , "{ print \$1 }" ../srcs.csv | sort | uniq | while read name; do
-    versions=$(gawk -F , "/^$name,/ { print \$2 }" ../srcs.csv)
-    latestVersion=$(echo "$versions" | sort -rV | head -n 1)
-    src=$(gawk -F , "/^$name,$latestVersion,/ { print \$3 }" ../srcs.csv)
-    filename=$(gawk -F , "/^$name,$latestVersion,/ { print \$4 }" ../srcs.csv)
-    url="${src:2}"
-    sha256=$(nix-hash --type sha256 --base32 --flat "$src")
-    cat >>../srcs.nix <<EOF
-  $name = {
-    version = "$latestVersion";
-    src = fetchurl {
-      url = "\${mirror}/$url";
-      sha256 = "$sha256";
-      name = "$filename";
-    };
-  };
-EOF
-done
-
-echo "}" >>../srcs.nix
-
-rm -f ../srcs.csv
-
-cd ..
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks-5.17/frameworkintegration.nix
deleted file mode 100644
index 26987c385ad5..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/frameworkintegration.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kbookmarks, kcompletion
-, kconfig, kconfigwidgets, ki18n, kiconthemes, kio, knotifications
-, kwidgetsaddons, libXcursor, qtx11extras
-}:
-
-kdeFramework {
-  name = "frameworkintegration";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kbookmarks kcompletion kconfig knotifications kwidgetsaddons
-    libXcursor
-  ];
-  propagatedBuildInputs = [ kconfigwidgets ki18n kio kiconthemes qtx11extras ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kactivities.nix b/pkgs/development/libraries/kde-frameworks-5.17/kactivities.nix
deleted file mode 100644
index 3225098f4398..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kactivities.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, boost, kcmutils, kconfig
-, kcoreaddons, kdbusaddons, kdeclarative, kglobalaccel, ki18n
-, kio, kservice, kwindowsystem, kxmlgui, makeQtWrapper, qtdeclarative
-}:
-
-kdeFramework {
-  name = "kactivities";
-  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [
-    boost kcmutils kconfig kcoreaddons kdbusaddons kservice
-    kxmlgui
-  ];
-  propagatedBuildInputs = [
-    kdeclarative kglobalaccel ki18n kio kwindowsystem qtdeclarative
-  ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kactivitymanagerd"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kapidox.nix b/pkgs/development/libraries/kde-frameworks-5.17/kapidox.nix
deleted file mode 100644
index 647be8f052c3..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kapidox.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, python
-}:
-
-kdeFramework {
-  name = "kapidox";
-  nativeBuildInputs = [ extra-cmake-modules python ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/karchive.nix b/pkgs/development/libraries/kde-frameworks-5.17/karchive.nix
deleted file mode 100644
index a8d9a0003c3b..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/karchive.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-}:
-
-kdeFramework {
-  name = "karchive";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kauth/default.nix b/pkgs/development/libraries/kde-frameworks-5.17/kauth/default.nix
deleted file mode 100644
index 2b000ff3c041..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kauth/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kcoreaddons
-, polkit-qt
-}:
-
-kdeFramework {
-  name = "kauth";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ polkit-qt ];
-  propagatedBuildInputs = [ kcoreaddons ];
-  patches = [ ./kauth-policy-install.patch ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kauth/kauth-policy-install.patch b/pkgs/development/libraries/kde-frameworks-5.17/kauth/kauth-policy-install.patch
deleted file mode 100644
index 340155256f28..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kauth/kauth-policy-install.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/KF5AuthConfig.cmake.in b/KF5AuthConfig.cmake.in
-index e859ec7..9a8ab18 100644
---- a/KF5AuthConfig.cmake.in
-+++ b/KF5AuthConfig.cmake.in
-@@ -4,7 +4,7 @@ set(KAUTH_STUB_FILES_DIR "${PACKAGE_PREFIX_DIR}/@KF5_DATA_INSTALL_DIR@/kauth/")
- 
- set(KAUTH_BACKEND_NAME "@KAUTH_BACKEND_NAME@")
- set(KAUTH_HELPER_BACKEND_NAME "@KAUTH_HELPER_BACKEND_NAME@")
--set(KAUTH_POLICY_FILES_INSTALL_DIR "@KAUTH_POLICY_FILES_INSTALL_DIR@")
-+set(KAUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions")
- set(KAUTH_HELPER_INSTALL_DIR "@KAUTH_HELPER_INSTALL_DIR@")
- 
- find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@")
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kbookmarks.nix b/pkgs/development/libraries/kde-frameworks-5.17/kbookmarks.nix
deleted file mode 100644
index 1a469ab4db6d..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kbookmarks.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kcodecs
-, kconfig
-, kconfigwidgets
-, kcoreaddons
-, kiconthemes
-, kxmlgui
-}:
-
-kdeFramework {
-  name = "kbookmarks";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kcodecs
-    kconfig
-    kconfigwidgets
-    kcoreaddons
-    kiconthemes
-    kxmlgui
-  ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kcmutils/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.17/kcmutils/0001-qdiriterator-follow-symlinks.patch
deleted file mode 100644
index 0d861fa95012..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kcmutils/0001-qdiriterator-follow-symlinks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f14d2a275323a47104b33eb61c5b6910ae1a9f59 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Wed, 14 Oct 2015 06:43:53 -0500
-Subject: [PATCH] qdiriterator follow symlinks
-
----
- src/kpluginselector.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp
-index 9c3431d..d6b1ee2 100644
---- a/src/kpluginselector.cpp
-+++ b/src/kpluginselector.cpp
-@@ -305,7 +305,7 @@ void KPluginSelector::addPlugins(const QString &componentName,
-     QStringList desktopFileNames;
-     const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory);
-     Q_FOREACH (const QString &dir, dirs) {
--        QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
-+      QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-         while (it.hasNext()) {
-             desktopFileNames.append(it.next());
-         }
--- 
-2.5.2
-
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kcmutils/default.nix b/pkgs/development/libraries/kde-frameworks-5.17/kcmutils/default.nix
deleted file mode 100644
index dbbb783ac615..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kcmutils/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfigwidgets
-, kcoreaddons, kdeclarative, ki18n, kiconthemes, kitemviews
-, kpackage, kservice, kxmlgui
-}:
-
-kdeFramework {
-  name = "kcmutils";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kcoreaddons kiconthemes kitemviews kpackage kxmlgui
-  ];
-  propagatedBuildInputs = [ kconfigwidgets kdeclarative ki18n kservice ];
-  patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kcodecs.nix b/pkgs/development/libraries/kde-frameworks-5.17/kcodecs.nix
deleted file mode 100644
index 53a69a69b69c..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kcodecs.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-}:
-
-kdeFramework {
-  name = "kcodecs";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kcompletion.nix b/pkgs/development/libraries/kde-frameworks-5.17/kcompletion.nix
deleted file mode 100644
index e393774f16a5..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kcompletion.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kconfig
-, kwidgetsaddons
-}:
-
-kdeFramework {
-  name = "kcompletion";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kconfig kwidgetsaddons ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kconfig.nix b/pkgs/development/libraries/kde-frameworks-5.17/kconfig.nix
deleted file mode 100644
index e132afe59886..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kconfig.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, makeQtWrapper
-}:
-
-kdeFramework {
-  name = "kconfig";
-  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kreadconfig5"
-    wrapQtProgram "$out/bin/kwriteconfig5"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.17/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
deleted file mode 100644
index 7a6c0ee90534..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4f84780893d505b2d62a14633dd983baa8ec6e28 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Wed, 14 Oct 2015 06:47:01 -0500
-Subject: [PATCH] qdiriterator follow symlinks
-
----
- src/khelpclient.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/khelpclient.cpp b/src/khelpclient.cpp
-index 53a331e..80fbb01 100644
---- a/src/khelpclient.cpp
-+++ b/src/khelpclient.cpp
-@@ -48,7 +48,7 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname)
-     QString docPath;
-     const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation);
-     Q_FOREACH (const QString &dir, desktopDirs) {
--        QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
-+        QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-         while (it.hasNext()) {
-             const QString desktopPath(it.next());
-             KDesktopFile desktopFile(desktopPath);
--- 
-2.5.2
-
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks-5.17/kconfigwidgets/default.nix
deleted file mode 100644
index 0e14d06edd36..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kconfigwidgets/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kauth, kcodecs, kconfig
-, kdoctools, kguiaddons, ki18n, kwidgetsaddons, makeQtWrapper
-}:
-
-kdeFramework {
-  name = "kconfigwidgets";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [ kguiaddons ];
-  propagatedBuildInputs = [ kauth kconfig kcodecs ki18n kwidgetsaddons ];
-  patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/preparetips5"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks-5.17/kcoreaddons.nix
deleted file mode 100644
index f3a1db7bd484..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kcoreaddons.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kdeFramework, lib, makeQtWrapper
-, extra-cmake-modules
-, shared_mime_info
-}:
-
-kdeFramework {
-  name = "kcoreaddons";
-  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [ shared_mime_info ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/desktoptojson"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kcrash.nix b/pkgs/development/libraries/kde-frameworks-5.17/kcrash.nix
deleted file mode 100644
index bbab78ccb409..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kcrash.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kcoreaddons
-, kwindowsystem
-, qtx11extras
-}:
-
-kdeFramework {
-  name = "kcrash";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kcoreaddons ];
-  propagatedBuildInputs = [ kwindowsystem qtx11extras ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks-5.17/kdbusaddons.nix
deleted file mode 100644
index d2ceab31d14b..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kdbusaddons.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, makeQtWrapper
-, qtx11extras
-}:
-
-kdeFramework {
-  name = "kdbusaddons";
-  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  propagatedBuildInputs = [ qtx11extras ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kquitapp5"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks-5.17/kdeclarative.nix
deleted file mode 100644
index 74d107466cfc..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kdeclarative.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, epoxy, kconfig
-, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage
-, kwidgetsaddons, kwindowsystem, makeQtWrapper, pkgconfig
-, qtdeclarative
-}:
-
-kdeFramework {
-  name = "kdeclarative";
-  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [
-    epoxy kguiaddons kiconthemes kwidgetsaddons
-  ];
-  propagatedBuildInputs = [
-    kconfig kglobalaccel ki18n kio kpackage kwindowsystem qtdeclarative
-  ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kpackagelauncherqml"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kded.nix b/pkgs/development/libraries/kde-frameworks-5.17/kded.nix
deleted file mode 100644
index 47ae2d68c68e..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kded.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kconfig
-, kcoreaddons
-, kcrash
-, kdbusaddons
-, kdoctools
-, kinit
-, kservice
-}:
-
-kdeFramework {
-  name = "kded";
-  buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons kinit kservice ];
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kdelibs4support.nix b/pkgs/development/libraries/kde-frameworks-5.17/kdelibs4support.nix
deleted file mode 100644
index 0dd5c4157612..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kdelibs4support.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45, kauth
-, karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons
-, kcrash, kdbusaddons, kdesignerplugin, kdoctools, kemoticons
-, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kitemmodels
-, kinit, knotifications, kparts, kservice, ktextwidgets
-, kunitconversion, kwidgetsaddons, kwindowsystem, kxmlgui
-, networkmanager, qtsvg, qtx11extras, xlibs
-}:
-
-# TODO: debug docbook detection
-
-kdeFramework {
-  name = "kdelibs4support";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [
-    kcompletion kconfig kservice kwidgetsaddons
-    kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM
-  ];
-  propagatedBuildInputs = [
-    kauth karchive kconfigwidgets kcoreaddons kcrash kdbusaddons
-    kdesignerplugin kemoticons kglobalaccel kguiaddons ki18n kio
-    kiconthemes kitemmodels kinit knotifications kparts ktextwidgets
-    kunitconversion kwindowsystem
-  ];
-  cmakeFlags = [
-    "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
-    "-DDocBookXML4_DTD_VERSION=4.5"
-  ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kdesignerplugin.nix b/pkgs/development/libraries/kde-frameworks-5.17/kdesignerplugin.nix
deleted file mode 100644
index cbc114ccca03..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kdesignerplugin.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ kdeFramework, lib, makeQtWrapper
-, extra-cmake-modules
-, kcompletion
-, kconfig
-, kconfigwidgets
-, kcoreaddons
-, kdewebkit
-, kdoctools
-, kiconthemes
-, kio
-, kitemviews
-, kplotting
-, ktextwidgets
-, kwidgetsaddons
-, kxmlgui
-, sonnet
-}:
-
-kdeFramework {
-  name = "kdesignerplugin";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [
-    kcompletion kconfig kconfigwidgets kcoreaddons kdewebkit
-    kiconthemes kitemviews kplotting ktextwidgets kwidgetsaddons
-    kxmlgui
-  ];
-  propagatedBuildInputs = [ kio sonnet ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kgendesignerplugin"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kdesu.nix b/pkgs/development/libraries/kde-frameworks-5.17/kdesu.nix
deleted file mode 100644
index 364fbd6a720b..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kdesu.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n, kpty
-, kservice
-}:
-
-kdeFramework {
-  name = "kdesu";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kcoreaddons kservice ];
-  propagatedBuildInputs = [ ki18n kpty ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kdewebkit.nix b/pkgs/development/libraries/kde-frameworks-5.17/kdewebkit.nix
deleted file mode 100644
index d361313d1d49..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kdewebkit.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
-, ki18n, kio, kjobwidgets, kparts, kservice, kwallet, qtwebkit
-}:
-
-kdeFramework {
-  name = "kdewebkit";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kconfig kcoreaddons kjobwidgets kparts kservice kwallet ];
-  propagatedBuildInputs = [ ki18n kio qtwebkit ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kdnssd.nix b/pkgs/development/libraries/kde-frameworks-5.17/kdnssd.nix
deleted file mode 100644
index f00432b0c9ce..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kdnssd.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, avahi
-}:
-
-kdeFramework {
-  name = "kdnssd";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ avahi ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks-5.17/kdoctools/default.nix
deleted file mode 100644
index 138c3fc33b94..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kdoctools/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45
-, docbook5_xsl, karchive, ki18n, makeQtWrapper, perl, perlPackages
-}:
-
-kdeFramework {
-  name = "kdoctools";
-  setupHook = ./setup-hook.sh;
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ karchive ];
-  propagatedBuildInputs = [ ki18n ];
-  propagatedNativeBuildInputs = [ makeQtWrapper perl perlPackages.URI ];
-  cmakeFlags = [
-    "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
-    "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook"
-  ];
-  patches = [ ./kdoctools-no-find-docbook-xml.patch ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/development/libraries/kde-frameworks-5.17/kdoctools/kdoctools-no-find-docbook-xml.patch
deleted file mode 100644
index 4e3a33efab32..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kdoctools/kdoctools-no-find-docbook-xml.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5c4863c..f731775 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -46,7 +46,6 @@ set_package_properties(LibXml2 PROPERTIES
-                       )
- 
- 
--find_package(DocBookXML4 "4.5")
- 
- set_package_properties(DocBookXML4 PROPERTIES
-                        TYPE REQUIRED
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kdoctools/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.17/kdoctools/setup-hook.sh
deleted file mode 100644
index 5cfffbd622d1..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kdoctools/setup-hook.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-addXdgData() {
-    addToSearchPath XDG_DATA_DIRS "$1/share"
-}
-
-envHooks+=(addXdgData)
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kemoticons.nix b/pkgs/development/libraries/kde-frameworks-5.17/kemoticons.nix
deleted file mode 100644
index d165f84e3a2d..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kemoticons.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, karchive
-, kconfig
-, kcoreaddons
-, kservice
-}:
-
-kdeFramework {
-  name = "kemoticons";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ karchive kconfig kcoreaddons ];
-  propagatedBuildInputs = [ kservice ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kfilemetadata.nix b/pkgs/development/libraries/kde-frameworks-5.17/kfilemetadata.nix
deleted file mode 100644
index be99c58d5504..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kfilemetadata.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, attr, ebook_tools, exiv2
-, ffmpeg, karchive, ki18n, poppler, qtbase, taglib
-}:
-
-kdeFramework {
-  name = "kfilemetadata";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ attr ebook_tools exiv2 ffmpeg karchive poppler taglib ];
-  propagatedBuildInputs = [ qtbase ki18n ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks-5.17/kglobalaccel.nix
deleted file mode 100644
index c535b3590a38..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kglobalaccel.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kconfig
-, kcoreaddons
-, kcrash
-, kdbusaddons
-, kwindowsystem
-, makeQtWrapper
-, qtx11extras
-}:
-
-kdeFramework {
-  name = "kglobalaccel";
-  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons ];
-  propagatedBuildInputs = [ kwindowsystem qtx11extras ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kglobalaccel5"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks-5.17/kguiaddons.nix
deleted file mode 100644
index bc4e9ab11843..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kguiaddons.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, qtx11extras
-}:
-
-kdeFramework {
-  name = "kguiaddons";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtx11extras ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/khtml.nix b/pkgs/development/libraries/kde-frameworks-5.17/khtml.nix
deleted file mode 100644
index d40df466ebbd..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/khtml.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, giflib, karchive
-, kcodecs, kglobalaccel, ki18n, kiconthemes, kio, kjs
-, knotifications, kparts, ktextwidgets, kwallet, kwidgetsaddons
-, kwindowsystem, kxmlgui, perl, phonon, qtx11extras, sonnet
-}:
-
-kdeFramework {
-  name = "khtml";
-  nativeBuildInputs = [ extra-cmake-modules perl ];
-  buildInputs = [
-    giflib karchive kiconthemes knotifications kwallet kwidgetsaddons
-    kxmlgui phonon
-  ];
-  propagatedBuildInputs = [
-    kcodecs kglobalaccel ki18n kio kjs kparts ktextwidgets
-    kwindowsystem qtx11extras sonnet
-  ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/ki18n.nix b/pkgs/development/libraries/kde-frameworks-5.17/ki18n.nix
deleted file mode 100644
index 268006512e7c..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/ki18n.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, gettext
-, python
-, qtdeclarative
-, qtscript
-}:
-
-kdeFramework {
-  name = "ki18n";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtdeclarative qtscript ];
-  propagatedNativeBuildInputs = [ gettext python ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kiconthemes/default-theme-breeze.patch b/pkgs/development/libraries/kde-frameworks-5.17/kiconthemes/default-theme-breeze.patch
deleted file mode 100644
index 5b3b15d5d5b5..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kiconthemes/default-theme-breeze.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: kiconthemes-5.17.0/src/kicontheme.cpp
-===================================================================
---- kiconthemes-5.17.0.orig/src/kicontheme.cpp
-+++ kiconthemes-5.17.0/src/kicontheme.cpp
-@@ -557,7 +557,7 @@ void KIconTheme::reconfigure()
- // static
- QString KIconTheme::defaultThemeName()
- {
--    return QStringLiteral("oxygen");
-+    return QStringLiteral("breeze");
- }
- 
- void KIconTheme::assignIconsToContextMenu(ContextMenus type,
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kiconthemes/default.nix b/pkgs/development/libraries/kde-frameworks-5.17/kiconthemes/default.nix
deleted file mode 100644
index b78b25582beb..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kiconthemes/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ kdeFramework, lib, copyPathsToStore
-, extra-cmake-modules, makeQtWrapper
-, kconfigwidgets, ki18n, breeze-icons, kitemviews, qtsvg
-}:
-
-kdeFramework {
-  name = "kiconthemes";
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [ kconfigwidgets kitemviews qtsvg ];
-  propagatedBuildInputs = [ breeze-icons ki18n ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kiconfinder5"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kiconthemes/series b/pkgs/development/libraries/kde-frameworks-5.17/kiconthemes/series
deleted file mode 100644
index ab5cc8a3edb2..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kiconthemes/series
+++ /dev/null
@@ -1 +0,0 @@
-default-theme-breeze.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kidletime.nix b/pkgs/development/libraries/kde-frameworks-5.17/kidletime.nix
deleted file mode 100644
index fc0865600239..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kidletime.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, qtbase
-, qtx11extras
-}:
-
-kdeFramework {
-  name = "kidletime";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtx11extras ];
-  propagatedBuildInputs = [ qtbase ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kimageformats.nix b/pkgs/development/libraries/kde-frameworks-5.17/kimageformats.nix
deleted file mode 100644
index 49d66bbcc2c6..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kimageformats.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, ilmbase
-}:
-
-kdeFramework {
-  name = "kimageformats";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kinit/0001-kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks-5.17/kinit/0001-kinit-libpath.patch
deleted file mode 100644
index 9c76079a382a..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kinit/0001-kinit-libpath.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 723c9b1268a04127647a1c20eebe9804150566dd Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Sat, 13 Jun 2015 08:57:55 -0500
-Subject: [PATCH] kinit libpath
-
----
- src/kdeinit/kinit.cpp | 18 ++++++++++--------
- 1 file changed, 10 insertions(+), 8 deletions(-)
-
-diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp
-index 9e775b6..0ac5646 100644
---- a/src/kdeinit/kinit.cpp
-+++ b/src/kdeinit/kinit.cpp
-@@ -660,15 +660,17 @@ static pid_t launch(int argc, const char *_name, const char *args,
-         if (!libpath.isEmpty()) {
-             if (!l.load()) {
-                 if (libpath_relative) {
--                    // NB: Because Qt makes the actual dlopen() call, the
--                    //     RUNPATH of kdeinit is *not* respected - see
--                    //     https://sourceware.org/bugzilla/show_bug.cgi?id=13945
--                    //     - so we try hacking it in ourselves
--                    QString install_lib_dir = QFile::decodeName(
--                            CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/");
--                    libpath = install_lib_dir + libpath;
--                    l.setFileName(libpath);
-+                  // Use QT_PLUGIN_PATH to find shared library directories
-+                  // For KF5, the plugin path is /lib/qt5/plugins/, so kdeinit5
-+                  // shared libraries should be in /lib/qt5/plugins/../../
-+                  const QRegExp pathSepRegExp(QString::fromLatin1("[:\b]"));
-+                  const QString up = QString::fromLocal8Bit("/../../");
-+                  const QStringList paths = QString::fromLocal8Bit(qgetenv("QT_PLUGIN_PATH")).split(pathSepRegExp, QString::KeepEmptyParts);
-+                  Q_FOREACH (const QString &path, paths) {
-+                    l.setFileName(path + up + libpath);
-                     l.load();
-+                    if (l.isLoaded()) break;
-+                  }
-                 }
-             }
-             if (!l.isLoaded()) {
--- 
-2.4.2
-
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kinit/default.nix b/pkgs/development/libraries/kde-frameworks-5.17/kinit/default.nix
deleted file mode 100644
index 5f644d7c424e..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kinit/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfig, kcrash
-, kdoctools, ki18n, kio, kservice, kwindowsystem, libcap
-, libcap_progs
-}:
-
-# TODO: setuid wrapper
-
-kdeFramework {
-  name = "kinit";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools libcap_progs ];
-  buildInputs = [ kconfig kcrash kservice libcap ];
-  propagatedBuildInputs = [ ki18n kio kwindowsystem ];
-  patches = [ ./0001-kinit-libpath.patch ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kio/default.nix b/pkgs/development/libraries/kde-frameworks-5.17/kio/default.nix
deleted file mode 100644
index a2131ff33850..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kio/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ kdeFramework, lib, copyPathsToStore
-, extra-cmake-modules, acl, karchive
-, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons
-, kdbusaddons, kdoctools, ki18n, kiconthemes, kitemviews
-, kjobwidgets, knotifications, kservice, ktextwidgets, kwallet
-, kwidgetsaddons, kwindowsystem, kxmlgui, makeQtWrapper
-, qtscript, qtx11extras, solid
-}:
-
-kdeFramework {
-  name = "kio";
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [
-    acl karchive kconfig kcoreaddons kdbusaddons kiconthemes
-    knotifications ktextwidgets kwallet kwidgetsaddons
-    qtscript
-  ];
-  propagatedBuildInputs = [
-    kbookmarks kcompletion kconfigwidgets ki18n kitemviews kjobwidgets
-    kservice kwindowsystem kxmlgui solid qtx11extras
-  ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kcookiejar5"
-    wrapQtProgram "$out/bin/ktelnetservice5"
-    wrapQtProgram "$out/bin/ktrash5"
-    wrapQtProgram "$out/bin/kmailservice5"
-    wrapQtProgram "$out/bin/protocoltojson"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kio/samba-search-path.patch b/pkgs/development/libraries/kde-frameworks-5.17/kio/samba-search-path.patch
deleted file mode 100644
index c9ad46b41bb7..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kio/samba-search-path.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: kio-5.17.0/src/core/ksambashare.cpp
-===================================================================
---- kio-5.17.0.orig/src/core/ksambashare.cpp
-+++ kio-5.17.0/src/core/ksambashare.cpp
-@@ -67,13 +67,18 @@ KSambaSharePrivate::~KSambaSharePrivate(
- 
- bool KSambaSharePrivate::isSambaInstalled()
- {
--    if (QFile::exists(QStringLiteral("/usr/sbin/smbd"))
--            || QFile::exists(QStringLiteral("/usr/local/sbin/smbd"))) {
--        return true;
-+    const QByteArray pathEnv = qgetenv("PATH");
-+    if (!pathEnv.isEmpty()) {
-+        QLatin1Char pathSep(':');
-+        QStringList paths = QFile::decodeName(pathEnv).split(pathSep, QString::SkipEmptyParts);
-+        for (QStringList::iterator it = paths.begin(); it != paths.end(); ++it) {
-+            it->append("/smbd");
-+            if (QFile::exists(*it)) {
-+                return true;
-+            }
-+        }
-     }
- 
--    //qDebug() << "Samba is not installed!";
--
-     return false;
- }
- 
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kio/series b/pkgs/development/libraries/kde-frameworks-5.17/kio/series
deleted file mode 100644
index 77ca15450047..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kio/series
+++ /dev/null
@@ -1 +0,0 @@
-samba-search-path.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kitemmodels.nix b/pkgs/development/libraries/kde-frameworks-5.17/kitemmodels.nix
deleted file mode 100644
index a9024d771cc3..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kitemmodels.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-}:
-
-kdeFramework {
-  name = "kitemmodels";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kitemviews.nix b/pkgs/development/libraries/kde-frameworks-5.17/kitemviews.nix
deleted file mode 100644
index 931019ce495d..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kitemviews.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-}:
-
-kdeFramework {
-  name = "kitemviews";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kjobwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.17/kjobwidgets.nix
deleted file mode 100644
index 746edf12eea0..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kjobwidgets.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kcoreaddons
-, kwidgetsaddons
-, qtx11extras
-}:
-
-kdeFramework {
-  name = "kjobwidgets";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kcoreaddons kwidgetsaddons ];
-  propagatedBuildInputs = [ qtx11extras ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kjs.nix b/pkgs/development/libraries/kde-frameworks-5.17/kjs.nix
deleted file mode 100644
index 768720f178c8..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kjs.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kdoctools
-, makeQtWrapper
-}:
-
-kdeFramework {
-  name = "kjs";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kjs5"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kjsembed.nix b/pkgs/development/libraries/kde-frameworks-5.17/kjsembed.nix
deleted file mode 100644
index 22eef2d47bde..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kjsembed.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kdoctools, ki18n, kjs
-, makeQtWrapper, qtsvg
-}:
-
-kdeFramework {
-  name = "kjsembed";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [ qtsvg ];
-  propagatedBuildInputs = [ ki18n kjs ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kjscmd5"
-    wrapQtProgram "$out/bin/kjsconsole"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kmediaplayer.nix b/pkgs/development/libraries/kde-frameworks-5.17/kmediaplayer.nix
deleted file mode 100644
index 460458b22323..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kmediaplayer.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kparts
-, kxmlgui
-}:
-
-kdeFramework {
-  name = "kmediaplayer";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kxmlgui ];
-  propagatedBuildInputs = [ kparts ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/knewstuff.nix b/pkgs/development/libraries/kde-frameworks-5.17/knewstuff.nix
deleted file mode 100644
index 5bcd6f301462..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/knewstuff.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, attica, karchive
-, kcompletion, kconfig, kcoreaddons, ki18n, kiconthemes, kio
-, kitemviews, kservice, ktextwidgets, kwidgetsaddons, kxmlgui
-}:
-
-kdeFramework {
-  name = "knewstuff";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    karchive kcompletion kconfig kcoreaddons kiconthemes
-    kitemviews ktextwidgets kwidgetsaddons
-  ];
-  propagatedBuildInputs = [ attica ki18n kio kservice kxmlgui ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/knotifications.nix b/pkgs/development/libraries/kde-frameworks-5.17/knotifications.nix
deleted file mode 100644
index 7e301dd0f268..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/knotifications.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kcodecs
-, kconfig
-, kcoreaddons
-, kwindowsystem
-, phonon
-, qtx11extras
-}:
-
-kdeFramework {
-  name = "knotifications";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kcodecs kconfig kcoreaddons phonon
-  ];
-  propagatedBuildInputs = [ kwindowsystem qtx11extras ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/knotifyconfig.nix b/pkgs/development/libraries/kde-frameworks-5.17/knotifyconfig.nix
deleted file mode 100644
index dd99d2d4f1e5..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/knotifyconfig.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kcompletion, kconfig
-, ki18n, kio, phonon
-}:
-
-kdeFramework {
-  name = "knotifyconfig";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kcompletion kconfig phonon ];
-  propagatedBuildInputs = [ ki18n kio ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kpackage/0001-allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.17/kpackage/0001-allow-external-paths.patch
deleted file mode 100644
index beede4d7ccb5..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kpackage/0001-allow-external-paths.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a92ac391b4e6ca335bd7fa78f1addd23c9467931 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Wed, 28 Jan 2015 07:15:30 -0600
-Subject: [PATCH 1/2] allow external paths
-
----
- src/kpackage/package.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/kpackage/package.cpp b/src/kpackage/package.cpp
-index 539b21a..977a026 100644
---- a/src/kpackage/package.cpp
-+++ b/src/kpackage/package.cpp
-@@ -789,7 +789,7 @@ PackagePrivate::PackagePrivate()
-     : QSharedData(),
-       fallbackPackage(0),
-       metadata(0),
--      externalPaths(false),
-+      externalPaths(true),
-       valid(false),
-       checkedValid(false)
- {
--- 
-2.5.2
-
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kpackage/0002-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.17/kpackage/0002-qdiriterator-follow-symlinks.patch
deleted file mode 100644
index 6e93fca9b21d..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kpackage/0002-qdiriterator-follow-symlinks.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 9fc26c3c0478eb7cb0a531836ba2e3a85d820c88 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Wed, 14 Oct 2015 06:50:28 -0500
-Subject: [PATCH 2/2] qdiriterator follow symlinks
-
----
- src/kpackage/packageloader.cpp            | 2 +-
- src/kpackage/private/packagejobthread.cpp | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/kpackage/packageloader.cpp b/src/kpackage/packageloader.cpp
-index eb5ed47..94217f6 100644
---- a/src/kpackage/packageloader.cpp
-+++ b/src/kpackage/packageloader.cpp
-@@ -241,7 +241,7 @@ QList<KPluginMetaData> PackageLoader::listPackages(const QString &packageFormat,
-         } else {
-             //qDebug() << "Not cached";
-             // If there's no cache file, fall back to listing the directory
--            const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories;
-+            const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories | QDirIterator::FollowSymlinks;
-             const QStringList nameFilters = QStringList(QStringLiteral("metadata.desktop"));
- 
-             QDirIterator it(plugindir, nameFilters, QDir::Files, flags);
-diff --git a/src/kpackage/private/packagejobthread.cpp b/src/kpackage/private/packagejobthread.cpp
-index ca523b3..1cfa792 100644
---- a/src/kpackage/private/packagejobthread.cpp
-+++ b/src/kpackage/private/packagejobthread.cpp
-@@ -145,7 +145,7 @@ bool indexDirectory(const QString& dir, const QString& dest)
-     QJsonArray plugins;
- 
-     int i = 0;
--    QDirIterator it(dir, QStringList()<<QStringLiteral("*.desktop"), QDir::Files, QDirIterator::Subdirectories);
-+    QDirIterator it(dir, QStringList()<<QStringLiteral("*.desktop"), QDir::Files, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-     while (it.hasNext()) {
-         it.next();
-         const QString path = it.fileInfo().absoluteFilePath();
--- 
-2.5.2
-
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks-5.17/kpackage/default.nix
deleted file mode 100644
index d2dc262bf1ac..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kpackage/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, karchive
-, kconfig
-, kcoreaddons
-, kdoctools
-, ki18n
-, makeQtWrapper
-}:
-
-kdeFramework {
-  name = "kpackage";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [ karchive kconfig ];
-  propagatedBuildInputs = [ kcoreaddons ki18n ];
-  patches = [
-    ./0001-allow-external-paths.patch
-    ./0002-qdiriterator-follow-symlinks.patch
-  ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kpackagetool5"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kparts.nix b/pkgs/development/libraries/kde-frameworks-5.17/kparts.nix
deleted file mode 100644
index 1c3e0b2cbc51..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kparts.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
-, ki18n, kiconthemes, kio, kjobwidgets, knotifications, kservice
-, ktextwidgets, kwidgetsaddons, kxmlgui
-}:
-
-kdeFramework {
-  name = "kparts";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kconfig kcoreaddons kiconthemes kjobwidgets knotifications
-    kservice kwidgetsaddons
-  ];
-  propagatedBuildInputs = [ ki18n kio ktextwidgets kxmlgui ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kpeople.nix b/pkgs/development/libraries/kde-frameworks-5.17/kpeople.nix
deleted file mode 100644
index 4c3877e7efd2..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kpeople.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n
-, kitemviews, kservice, kwidgetsaddons, qtdeclarative
-}:
-
-kdeFramework {
-  name = "kpeople";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kcoreaddons kitemviews kservice kwidgetsaddons
-  ];
-  propagatedBuildInputs = [ ki18n qtdeclarative ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kplotting.nix b/pkgs/development/libraries/kde-frameworks-5.17/kplotting.nix
deleted file mode 100644
index c16f51b5ac3c..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kplotting.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-}:
-
-kdeFramework {
-  name = "kplotting";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kpty.nix b/pkgs/development/libraries/kde-frameworks-5.17/kpty.nix
deleted file mode 100644
index 2e34e6f674ce..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kpty.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n }:
-
-kdeFramework {
-  name = "kpty";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ kcoreaddons ki18n ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kross.nix b/pkgs/development/libraries/kde-frameworks-5.17/kross.nix
deleted file mode 100644
index 7c6f079feaa7..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kross.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kcompletion, kcoreaddons
-, kdoctools, ki18n, kiconthemes, kio, kparts, kwidgetsaddons
-, kxmlgui, qtscript
-}:
-
-kdeFramework {
-  name = "kross";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [ kcompletion kcoreaddons kxmlgui ];
-  propagatedBuildInputs = [ ki18n kiconthemes kio kparts kwidgetsaddons qtscript ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/krunner.nix b/pkgs/development/libraries/kde-frameworks-5.17/krunner.nix
deleted file mode 100644
index 12d2b54d0eb3..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/krunner.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
-, ki18n, kio, kservice, plasma-framework, qtquick1, solid
-, threadweaver
-}:
-
-kdeFramework {
-  name = "krunner";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kconfig kcoreaddons kservice qtquick1 solid threadweaver
-  ];
-  propagatedBuildInputs = [ ki18n kio plasma-framework ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kservice/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.17/kservice/0001-qdiriterator-follow-symlinks.patch
deleted file mode 100644
index 3d8397d8ee2d..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kservice/0001-qdiriterator-follow-symlinks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From ae8919eb81abad369e4a26ffcd845b140983398d Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Wed, 14 Oct 2015 06:28:57 -0500
-Subject: [PATCH 1/2] qdiriterator follow symlinks
-
----
- src/sycoca/kbuildsycoca.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/sycoca/kbuildsycoca.cpp b/src/sycoca/kbuildsycoca.cpp
-index 1deae14..250baa8 100644
---- a/src/sycoca/kbuildsycoca.cpp
-+++ b/src/sycoca/kbuildsycoca.cpp
-@@ -208,7 +208,7 @@ bool KBuildSycoca::build()
-         QStringList relFiles;
-         const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, m_resourceSubdir, QStandardPaths::LocateDirectory);
-         Q_FOREACH (const QString &dir, dirs) {
--            QDirIterator it(dir, QDirIterator::Subdirectories);
-+            QDirIterator it(dir, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-             while (it.hasNext()) {
-                 const QString filePath = it.next();
-                 Q_ASSERT(filePath.startsWith(dir)); // due to the line below...
--- 
-2.5.2
-
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kservice/0002-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.17/kservice/0002-no-canonicalize-path.patch
deleted file mode 100644
index 685c68526119..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kservice/0002-no-canonicalize-path.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 46d124da602d84b7611a7ff0ac0862168d451cdb Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Wed, 14 Oct 2015 06:31:29 -0500
-Subject: [PATCH 2/2] no canonicalize path
-
----
- src/sycoca/vfolder_menu.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/sycoca/vfolder_menu.cpp b/src/sycoca/vfolder_menu.cpp
-index d3e31c3..d15d743 100644
---- a/src/sycoca/vfolder_menu.cpp
-+++ b/src/sycoca/vfolder_menu.cpp
-@@ -415,7 +415,7 @@ VFolderMenu::absoluteDir(const QString &_dir, const QString &baseDir, bool keepR
-     }
- 
-     if (!relative) {
--        QString resolved = QDir(dir).canonicalPath();
-+      QString resolved = QDir::cleanPath(dir);
-         if (!resolved.isEmpty()) {
-             dir = resolved;
-         }
--- 
-2.5.2
-
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kservice/default.nix b/pkgs/development/libraries/kde-frameworks-5.17/kservice/default.nix
deleted file mode 100644
index 03b7c7c2f51d..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kservice/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
-, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem
-}:
-
-kdeFramework {
-  name = "kservice";
-  setupHook = ./setup-hook.sh;
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [ kcrash kdbusaddons ];
-  propagatedBuildInputs = [ kconfig kcoreaddons ki18n kwindowsystem ];
-  propagatedUserEnvPkgs = [ kcoreaddons ];
-  patches = [
-    ./0001-qdiriterator-follow-symlinks.patch
-    ./0002-no-canonicalize-path.patch
-  ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kservice/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.17/kservice/setup-hook.sh
deleted file mode 100644
index c28e862ff8ae..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kservice/setup-hook.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-addServicePkg() {
-    local propagated
-    for dir in "share/kservices5" "share/kservicetypes5"; do
-        if [[ -d "$1/$dir" ]]; then
-            propagated=
-            for pkg in $propagatedBuildInputs; do
-                if [[ "z$pkg" == "z$1" ]]; then
-                    propagated=1
-                    break
-                fi
-            done
-            if [[ -z $propagated ]]; then
-                propagatedBuildInputs="$propagatedBuildInputs $1"
-            fi
-
-            propagated=
-            for pkg in $propagatedUserEnvPkgs; do
-                if [[ "z$pkg" == "z$1" ]]; then
-                    propagated=1
-                    break
-                fi
-            done
-            if [[ -z $propagated ]]; then
-                propagatedUserEnvPkgs="$propagatedUserEnvPkgs $1"
-            fi
-
-            break
-        fi
-    done
-}
-
-envHooks+=(addServicePkg)
-
-local propagated
-for pkg in $propagatedBuildInputs; do
-    if [[ "z$pkg" == "z@out@" ]]; then
-        propagated=1
-        break
-    fi
-done
-if [[ -z $propagated ]]; then
-    propagatedBuildInputs="$propagatedBuildInputs @out@"
-fi
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/ktexteditor/0001-no-qcoreapplication.patch b/pkgs/development/libraries/kde-frameworks-5.17/ktexteditor/0001-no-qcoreapplication.patch
deleted file mode 100644
index def55bff9b23..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/ktexteditor/0001-no-qcoreapplication.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From dc50fffdc72b76498384ce2f9065c3757b786d71 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Wed, 14 Oct 2015 09:08:59 -0500
-Subject: [PATCH] no qcoreapplication
-
----
- src/syntax/data/katehighlightingindexer.cpp | 11 ++++-------
- 1 file changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/src/syntax/data/katehighlightingindexer.cpp b/src/syntax/data/katehighlightingindexer.cpp
-index 3c63140..e3d5efe 100644
---- a/src/syntax/data/katehighlightingindexer.cpp
-+++ b/src/syntax/data/katehighlightingindexer.cpp
-@@ -51,19 +51,16 @@ QStringList readListing(const QString &fileName)
- 
- int main(int argc, char *argv[])
- {
--    // get app instance
--    QCoreApplication app(argc, argv);
--
-     // ensure enough arguments are passed
--    if (app.arguments().size() < 3)
-+    if (argc < 3)
-         return 1;
- 
-     // open schema
-     QXmlSchema schema;
--    if (!schema.load(QUrl::fromLocalFile(app.arguments().at(2))))
-+    if (!schema.load(QUrl::fromLocalFile(QString::fromLocal8Bit(argv[2]))))
-         return 2;
- 
--    const QString hlFilenamesListing = app.arguments().value(3);
-+    const QString hlFilenamesListing = QString::fromLocal8Bit(argv[3]);
-     if (hlFilenamesListing.isEmpty()) {
-         return 1;
-     }
-@@ -147,7 +144,7 @@ int main(int argc, char *argv[])
-         return anyError;
- 
-     // create outfile, after all has worked!
--    QFile outFile(app.arguments().at(1));
-+    QFile outFile(QString::fromLocal8Bit(argv[1]));
-     if (!outFile.open(QIODevice::WriteOnly | QIODevice::Truncate))
-         return 7;
- 
--- 
-2.5.2
-
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/ktexteditor/default.nix b/pkgs/development/libraries/kde-frameworks-5.17/ktexteditor/default.nix
deleted file mode 100644
index 39092fbb2784..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/ktexteditor/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, karchive, kconfig
-, kguiaddons, ki18n, kio, kiconthemes, kparts, perl, qtscript
-, qtxmlpatterns, sonnet
-}:
-
-kdeFramework {
-  name = "ktexteditor";
-  nativeBuildInputs = [ extra-cmake-modules perl ];
-  buildInputs = [
-    karchive kconfig kguiaddons kiconthemes kparts qtscript
-    qtxmlpatterns
-  ];
-  propagatedBuildInputs = [ ki18n kio sonnet ];
-  patches = [ ./0001-no-qcoreapplication.patch ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/ktextwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.17/ktextwidgets.nix
deleted file mode 100644
index e332d4ff9a83..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/ktextwidgets.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kcompletion, kconfig
-, kconfigwidgets, ki18n, kiconthemes, kservice, kwindowsystem
-, sonnet
-}:
-
-kdeFramework {
-  name = "ktextwidgets";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kcompletion kconfig kconfigwidgets kiconthemes kservice
-  ];
-  propagatedBuildInputs = [ ki18n kwindowsystem sonnet ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kunitconversion.nix b/pkgs/development/libraries/kde-frameworks-5.17/kunitconversion.nix
deleted file mode 100644
index 3cf0f847d83d..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kunitconversion.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, ki18n }:
-
-kdeFramework {
-  name = "kunitconversion";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ ki18n ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kwallet.nix b/pkgs/development/libraries/kde-frameworks-5.17/kwallet.nix
deleted file mode 100644
index 7c4177e009d2..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kwallet.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
-, kdbusaddons, kdoctools, ki18n, kiconthemes, knotifications
-, kservice, kwidgetsaddons, kwindowsystem, libgcrypt, makeQtWrapper
-}:
-
-kdeFramework {
-  name = "kwallet";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [
-    kconfig kcoreaddons kdbusaddons kiconthemes knotifications
-    kservice kwidgetsaddons libgcrypt
-  ];
-  propagatedBuildInputs = [ ki18n kwindowsystem ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kwalletd5"
-    wrapQtProgram "$out/bin/kwallet-query"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kwidgetsaddons.nix b/pkgs/development/libraries/kde-frameworks-5.17/kwidgetsaddons.nix
deleted file mode 100644
index d95f44d3fecf..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kwidgetsaddons.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-}:
-
-kdeFramework {
-  name = "kwidgetsaddons";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kwindowsystem.nix b/pkgs/development/libraries/kde-frameworks-5.17/kwindowsystem.nix
deleted file mode 100644
index 09ab1f2200de..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kwindowsystem.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, qtx11extras
-}:
-
-kdeFramework {
-  name = "kwindowsystem";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtx11extras ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks-5.17/kxmlgui.nix
deleted file mode 100644
index f081d5f9170e..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kxmlgui.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, attica, kconfig
-, kconfigwidgets, kglobalaccel, ki18n, kiconthemes, kitemviews
-, ktextwidgets, kwindowsystem, sonnet
-}:
-
-kdeFramework {
-  name = "kxmlgui";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    attica kconfig kiconthemes kitemviews ktextwidgets
-  ];
-  propagatedBuildInputs = [
-    kconfigwidgets kglobalaccel ki18n kwindowsystem sonnet
-  ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kxmlrpcclient.nix b/pkgs/development/libraries/kde-frameworks-5.17/kxmlrpcclient.nix
deleted file mode 100644
index 20a300b68bc8..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/kxmlrpcclient.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, ki18n, kio }:
-
-kdeFramework {
-  name = "kxmlrpcclient";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ ki18n kio ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/modemmanager-qt.nix b/pkgs/development/libraries/kde-frameworks-5.17/modemmanager-qt.nix
deleted file mode 100644
index 7d7f769d6a9b..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/modemmanager-qt.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, modemmanager
-}:
-
-kdeFramework {
-  name = "modemmanager-qt";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ modemmanager ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks-5.17/networkmanager-qt.nix
deleted file mode 100644
index 333378bd1431..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/networkmanager-qt.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, networkmanager
-}:
-
-kdeFramework {
-  name = "networkmanager-qt";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ networkmanager ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/oxygen-icons5.nix b/pkgs/development/libraries/kde-frameworks-5.17/oxygen-icons5.nix
deleted file mode 100644
index ee350f8e1536..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/oxygen-icons5.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework
-, lib
-, extra-cmake-modules
-}:
-
-kdeFramework {
-  name = "oxygen-icons5";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    license = lib.licenses.lgpl3Plus;
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/plasma-framework/default.nix b/pkgs/development/libraries/kde-frameworks-5.17/plasma-framework/default.nix
deleted file mode 100644
index d8846f777231..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/plasma-framework/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kactivities, karchive
-, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative
-, kdoctools, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio
-, knotifications, kpackage, kservice, kwindowsystem, kxmlgui
-, makeQtWrapper, qtscript, qtx11extras
-}:
-
-kdeFramework {
-  name = "plasma-framework";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [
-    karchive kconfig kconfigwidgets kcoreaddons kdbusaddons kguiaddons
-    kiconthemes knotifications kxmlgui qtscript
-  ];
-  propagatedBuildInputs = [
-    kactivities kdeclarative kglobalaccel ki18n kio kpackage kservice kwindowsystem
-    qtx11extras
-  ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/plasmapkg2"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/solid.nix b/pkgs/development/libraries/kde-frameworks-5.17/solid.nix
deleted file mode 100644
index afd125e3c597..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/solid.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, makeQtWrapper
-, qtdeclarative
-}:
-
-kdeFramework {
-  name = "solid";
-  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [ qtdeclarative ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/solid-hardware5"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/sonnet.nix b/pkgs/development/libraries/kde-frameworks-5.17/sonnet.nix
deleted file mode 100644
index 943fe04a1c92..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/sonnet.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, hunspell
-}:
-
-kdeFramework {
-  name = "sonnet";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ hunspell ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/srcs.nix b/pkgs/development/libraries/kde-frameworks-5.17/srcs.nix
deleted file mode 100644
index 8cf8d1bbad45..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/srcs.nix
+++ /dev/null
@@ -1,565 +0,0 @@
-# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
-{ fetchurl, mirror }:
-
-{
-  attica = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/attica-5.17.0.tar.xz";
-      sha256 = "0n5f8754705ga3s158nn56haakajcpx7hms3pjn32jc1n95h06nf";
-      name = "attica-5.17.0.tar.xz";
-    };
-  };
-  baloo = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/baloo-5.17.0.tar.xz";
-      sha256 = "01gkn69i63ppjrswpqw1vdfc590vn4xlld1zmjzprbfs2ryni2k0";
-      name = "baloo-5.17.0.tar.xz";
-    };
-  };
-  bluez-qt = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/bluez-qt-5.17.0.tar.xz";
-      sha256 = "1jh60gs2lqwg1x609lh3lrgqjfg179r40j59wgmzrm5bfvc5zsk5";
-      name = "bluez-qt-5.17.0.tar.xz";
-    };
-  };
-  breeze-icons = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/breeze-icons-5.17.0.tar.xz";
-      sha256 = "120x15mps8gy4c4vzrcwvfcmjv7qka7q92lyqk76g70v6yh29q84";
-      name = "breeze-icons-5.17.0.tar.xz";
-    };
-  };
-  extra-cmake-modules = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/extra-cmake-modules-5.17.0.tar.xz";
-      sha256 = "01blad3rwffsgd21xkkk653kbqv2gvh0ckmvpil9x9fc0w7gwmqs";
-      name = "extra-cmake-modules-5.17.0.tar.xz";
-    };
-  };
-  frameworkintegration = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/frameworkintegration-5.17.0.tar.xz";
-      sha256 = "1f8clq6wszb74qal6402r66izansn9cz1x5j13v8ajwqb7rr8gvl";
-      name = "frameworkintegration-5.17.0.tar.xz";
-    };
-  };
-  kactivities = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kactivities-5.17.0.tar.xz";
-      sha256 = "0lnx3kbgna9pq1bdzzygng0l7rkwyvr2gkxm5abhbw290dvq0xas";
-      name = "kactivities-5.17.0.tar.xz";
-    };
-  };
-  kapidox = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kapidox-5.17.0.tar.xz";
-      sha256 = "1cd32n36w8hfggng61m50jflb9lpv4ba74aq1g64c1grbfjad3k1";
-      name = "kapidox-5.17.0.tar.xz";
-    };
-  };
-  karchive = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/karchive-5.17.0.tar.xz";
-      sha256 = "1ry7vwgc1np9pw1b8791lji09n1y6afyifqlv112riifq7ljmld1";
-      name = "karchive-5.17.0.tar.xz";
-    };
-  };
-  kauth = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kauth-5.17.0.tar.xz";
-      sha256 = "0v7vgh4hmfk3h3083jwx3n11xz22j6vn50naffzwwixqlrqa7qy3";
-      name = "kauth-5.17.0.tar.xz";
-    };
-  };
-  kbookmarks = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kbookmarks-5.17.0.tar.xz";
-      sha256 = "0rk70ag21lpym9lw4dd9rlq77lfi2v2y076g6000hhrqjnvdbcya";
-      name = "kbookmarks-5.17.0.tar.xz";
-    };
-  };
-  kcmutils = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kcmutils-5.17.0.tar.xz";
-      sha256 = "176b8ai490ipc1p8zqzi3ymsqzazb7awgnrd81b4fr3fzcm3q8zh";
-      name = "kcmutils-5.17.0.tar.xz";
-    };
-  };
-  kcodecs = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kcodecs-5.17.0.tar.xz";
-      sha256 = "12nic57sx69zvj9ihw3ifiwnf9giqq57kgp892kcz5q42wjqzvj3";
-      name = "kcodecs-5.17.0.tar.xz";
-    };
-  };
-  kcompletion = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kcompletion-5.17.0.tar.xz";
-      sha256 = "0d8mx3kr29lp1fk0n8pmmzlzrw9fa3czayn46xdwf1dr2pjj4a2g";
-      name = "kcompletion-5.17.0.tar.xz";
-    };
-  };
-  kconfig = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kconfig-5.17.0.tar.xz";
-      sha256 = "1kdagw6wisqnfj6iq77r0nkc04cvhj4n454s3w3az0bhk23b4nrj";
-      name = "kconfig-5.17.0.tar.xz";
-    };
-  };
-  kconfigwidgets = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kconfigwidgets-5.17.0.tar.xz";
-      sha256 = "0fvrk5ap4lr8i2nlphsy3z7kv39h28v33yja2r54pa4207kq4cy2";
-      name = "kconfigwidgets-5.17.0.tar.xz";
-    };
-  };
-  kcoreaddons = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kcoreaddons-5.17.0.tar.xz";
-      sha256 = "0pd6siicagcjd4vbn30rhrlwy6r3iiyjpl2pim1njr6fvsb0687n";
-      name = "kcoreaddons-5.17.0.tar.xz";
-    };
-  };
-  kcrash = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kcrash-5.17.0.tar.xz";
-      sha256 = "0v1v4ksfswc3fg7piqiw0fln30vilk5pbqq2wphbwbgn5im91m7d";
-      name = "kcrash-5.17.0.tar.xz";
-    };
-  };
-  kdbusaddons = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kdbusaddons-5.17.0.tar.xz";
-      sha256 = "1n4k97206v7hdkrd2p8vhy1bnr194zvamw3vpvhfxgq4pr4a96dm";
-      name = "kdbusaddons-5.17.0.tar.xz";
-    };
-  };
-  kdeclarative = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kdeclarative-5.17.0.tar.xz";
-      sha256 = "12p5dkdww32d5gk71aw7x5xpa3gj1ag60vj17b9v3zmax0a2g84k";
-      name = "kdeclarative-5.17.0.tar.xz";
-    };
-  };
-  kded = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kded-5.17.0.tar.xz";
-      sha256 = "1sly9dviv0q99045p13xswjr78x2x5fzwj4qad66w6cyv67i0khk";
-      name = "kded-5.17.0.tar.xz";
-    };
-  };
-  kdelibs4support = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/portingAids/kdelibs4support-5.17.0.tar.xz";
-      sha256 = "03i7r60zjd10cam0q0kld0x43a8fn281bgn25fysw7604f92x7rx";
-      name = "kdelibs4support-5.17.0.tar.xz";
-    };
-  };
-  kdesignerplugin = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kdesignerplugin-5.17.0.tar.xz";
-      sha256 = "0v47sia41gsf9gaf5jgvfgf2wzszfa76abzplqrmlgvrymi1fk1z";
-      name = "kdesignerplugin-5.17.0.tar.xz";
-    };
-  };
-  kdesu = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kdesu-5.17.0.tar.xz";
-      sha256 = "188k34x4z1s948f3qdy4c5pascdzshrqnbsx0ppnjlgxhv8sx108";
-      name = "kdesu-5.17.0.tar.xz";
-    };
-  };
-  kdewebkit = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kdewebkit-5.17.0.tar.xz";
-      sha256 = "1p3nanp1i09hpxp9gfvjyqcrfjf7ypxpfhpd381az96pjs35dixc";
-      name = "kdewebkit-5.17.0.tar.xz";
-    };
-  };
-  kdnssd = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kdnssd-5.17.0.tar.xz";
-      sha256 = "05njhdpmp28c46271laxjy87v6miwzf7xm1886b9q0v47cpin2p1";
-      name = "kdnssd-5.17.0.tar.xz";
-    };
-  };
-  kdoctools = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kdoctools-5.17.0.tar.xz";
-      sha256 = "0qbzj68rfg9xc3nabhrnaqm9ysgbrdhdgm8ag64ixk6b4x6hjmr8";
-      name = "kdoctools-5.17.0.tar.xz";
-    };
-  };
-  kemoticons = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kemoticons-5.17.0.tar.xz";
-      sha256 = "0cxzjfsl1ph3nl6ycsgyaz22rb4nc15n2glcgnmrqchh67xxzv13";
-      name = "kemoticons-5.17.0.tar.xz";
-    };
-  };
-  kfilemetadata = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kfilemetadata-5.17.0.tar.xz";
-      sha256 = "1a6865v1cz31i8a63hhjzp1lw5b78p0r7ypml6syxlblpg2y9mzh";
-      name = "kfilemetadata-5.17.0.tar.xz";
-    };
-  };
-  kglobalaccel = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kglobalaccel-5.17.0.tar.xz";
-      sha256 = "0dm8xljqgxay98dcqdgvmhcf0fanv3iiw23nk4vyzis6n8nv04hz";
-      name = "kglobalaccel-5.17.0.tar.xz";
-    };
-  };
-  kguiaddons = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kguiaddons-5.17.0.tar.xz";
-      sha256 = "1r15ll4c27zp78p9i18izxrpmf41hynz16z0fmz8jgcdnxgx0d74";
-      name = "kguiaddons-5.17.0.tar.xz";
-    };
-  };
-  khtml = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/portingAids/khtml-5.17.0.tar.xz";
-      sha256 = "0mz5mb7mh2nxih2avy2ncmchlyzg8pignnl4lbr5cnfc7y79g7i4";
-      name = "khtml-5.17.0.tar.xz";
-    };
-  };
-  ki18n = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/ki18n-5.17.0.tar.xz";
-      sha256 = "07chysr2x579ll6qwxmirmcy5b06wf0578l8xmvgc9q4wk0m0m73";
-      name = "ki18n-5.17.0.tar.xz";
-    };
-  };
-  kiconthemes = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kiconthemes-5.17.0.tar.xz";
-      sha256 = "1fgwgwmrb0pav30s7wc30src92cvfw6cxqz2q14n5flz7kg1d0k3";
-      name = "kiconthemes-5.17.0.tar.xz";
-    };
-  };
-  kidletime = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kidletime-5.17.0.tar.xz";
-      sha256 = "06ig3wca3k1kdq0w1pl5syvcgrrshyws6xal7qswr6vsf6jd7n95";
-      name = "kidletime-5.17.0.tar.xz";
-    };
-  };
-  kimageformats = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kimageformats-5.17.0.tar.xz";
-      sha256 = "0dw007wc50fhgpm1sv8qxs3y8xwwgcz33nd8p7yg8bxqfgjmhzbs";
-      name = "kimageformats-5.17.0.tar.xz";
-    };
-  };
-  kinit = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kinit-5.17.0.tar.xz";
-      sha256 = "18agcc5z8g0vsk97wh4p09185m5vz52wdsia7rg8f5fb4wkzrn5i";
-      name = "kinit-5.17.0.tar.xz";
-    };
-  };
-  kio = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kio-5.17.0.tar.xz";
-      sha256 = "1dfh2kbp00kv5b94p4xjimh4fhlwmcgac7wsi1g2pvrbw7gsi48l";
-      name = "kio-5.17.0.tar.xz";
-    };
-  };
-  kitemmodels = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kitemmodels-5.17.0.tar.xz";
-      sha256 = "19zq1d7ymfzlz3nx4a9hvlfssa7x0rdh8pg8i9rchalals6239ny";
-      name = "kitemmodels-5.17.0.tar.xz";
-    };
-  };
-  kitemviews = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kitemviews-5.17.0.tar.xz";
-      sha256 = "1k3f1j3sw86jl5y3ak767ldb2fraspldjh6i98926wingqq3y8p3";
-      name = "kitemviews-5.17.0.tar.xz";
-    };
-  };
-  kjobwidgets = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kjobwidgets-5.17.0.tar.xz";
-      sha256 = "02j7fm0g0dc6grvgjhx269b5p4xil7k8z1m8amkjpc7v3j3vkyrw";
-      name = "kjobwidgets-5.17.0.tar.xz";
-    };
-  };
-  kjs = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/portingAids/kjs-5.17.0.tar.xz";
-      sha256 = "0988qcgiqc4mla3x12mb8xaw0mhy2kmdi94xw634az03mwghljh4";
-      name = "kjs-5.17.0.tar.xz";
-    };
-  };
-  kjsembed = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/portingAids/kjsembed-5.17.0.tar.xz";
-      sha256 = "0am27pdc2pdjisc82iinq68lw8r12a0zb9n6ywa1mlqbrvr5sqgs";
-      name = "kjsembed-5.17.0.tar.xz";
-    };
-  };
-  kmediaplayer = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/portingAids/kmediaplayer-5.17.0.tar.xz";
-      sha256 = "1idzbddyfrf05kbqqm1hcyy53qrnvg9sb0f29rqp33mq36y63rxg";
-      name = "kmediaplayer-5.17.0.tar.xz";
-    };
-  };
-  knewstuff = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/knewstuff-5.17.0.tar.xz";
-      sha256 = "1ljr1syg7810ww0wlqq2p7xdqn9sfz7kkxr8vdw4627gjqr50l5s";
-      name = "knewstuff-5.17.0.tar.xz";
-    };
-  };
-  knotifications = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/knotifications-5.17.0.tar.xz";
-      sha256 = "0k2g0vmlhandp9zihj5sbs06yanmpy06h2pq5d2hn569anvpxr0r";
-      name = "knotifications-5.17.0.tar.xz";
-    };
-  };
-  knotifyconfig = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/knotifyconfig-5.17.0.tar.xz";
-      sha256 = "1lfa23vag5j294ry5c0n59rs04k1mb5yr7vi69al2pw6xmnkbw6n";
-      name = "knotifyconfig-5.17.0.tar.xz";
-    };
-  };
-  kpackage = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kpackage-5.17.0.tar.xz";
-      sha256 = "03z3hcibzkzymva935gx39bbrl61jw8wnxqxh2f56z7qmm7sj9x7";
-      name = "kpackage-5.17.0.tar.xz";
-    };
-  };
-  kparts = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kparts-5.17.0.tar.xz";
-      sha256 = "08dh17z5345gmvaacrllpx9zdfayndfxl8ykhzpp3gvx0ssrswwx";
-      name = "kparts-5.17.0.tar.xz";
-    };
-  };
-  kpeople = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kpeople-5.17.0.tar.xz";
-      sha256 = "0d7j2j92r2iwkabnqm6f6wm5d4j69r4z1859pc9l4rhh4f0qy9g3";
-      name = "kpeople-5.17.0.tar.xz";
-    };
-  };
-  kplotting = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kplotting-5.17.0.tar.xz";
-      sha256 = "0i8gcvf2fiaxxqjan1lil9is8v5bfd4yi9zyl7bzijcishckrkmx";
-      name = "kplotting-5.17.0.tar.xz";
-    };
-  };
-  kpty = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kpty-5.17.0.tar.xz";
-      sha256 = "1csgwp9y33sfgzn4mwinqznfmsd2cm1iia6qm0xpmf8n39rassxc";
-      name = "kpty-5.17.0.tar.xz";
-    };
-  };
-  kross = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/portingAids/kross-5.17.0.tar.xz";
-      sha256 = "0bjkp8ibaw1zr71dbfz09qbaragmzh3slyp8mm6ypaixgfvprklx";
-      name = "kross-5.17.0.tar.xz";
-    };
-  };
-  krunner = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/portingAids/krunner-5.17.0.tar.xz";
-      sha256 = "0ghxbmkpi20kbrsn6kib3na3gdnsn5akfzazfwh8q00dhabhin4k";
-      name = "krunner-5.17.0.tar.xz";
-    };
-  };
-  kservice = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kservice-5.17.0.tar.xz";
-      sha256 = "0nz46n6yj3h6ml0gvn2j7malvxn4p96q9xh9f2i7j1jwl3c5j4b8";
-      name = "kservice-5.17.0.tar.xz";
-    };
-  };
-  ktexteditor = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/ktexteditor-5.17.0.tar.xz";
-      sha256 = "16shf6zq019pmg8avnlvn4l5w71h4y6v3511rckn8kqdrz3wb4pr";
-      name = "ktexteditor-5.17.0.tar.xz";
-    };
-  };
-  ktextwidgets = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/ktextwidgets-5.17.0.tar.xz";
-      sha256 = "1940a2s084hwf359rr3vrlzdz09iyn3nlpch24wgff728i28mc73";
-      name = "ktextwidgets-5.17.0.tar.xz";
-    };
-  };
-  kunitconversion = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kunitconversion-5.17.0.tar.xz";
-      sha256 = "0yc3k0d91m5ql75azabqqsihy3hai3x0hzwby8wwm5by20mq1bjf";
-      name = "kunitconversion-5.17.0.tar.xz";
-    };
-  };
-  kwallet = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kwallet-5.17.0.tar.xz";
-      sha256 = "0552cd4m6nf439vrbwljxmb030h1ndmldvnl4p5r0g8h8jd12siv";
-      name = "kwallet-5.17.0.tar.xz";
-    };
-  };
-  kwidgetsaddons = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kwidgetsaddons-5.17.0.tar.xz";
-      sha256 = "151jywz4z375kgx362i39gf5xb7fdayz9kly738vzwx4vx253xvn";
-      name = "kwidgetsaddons-5.17.0.tar.xz";
-    };
-  };
-  kwindowsystem = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kwindowsystem-5.17.0.tar.xz";
-      sha256 = "180b567ixiv487fdw2hp0jgs7cckm8f82y0mny5zvi25l39gjq54";
-      name = "kwindowsystem-5.17.0.tar.xz";
-    };
-  };
-  kxmlgui = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kxmlgui-5.17.0.tar.xz";
-      sha256 = "0rbxk9f918wmq1ijxcpjf6rl31p1f0f85f8rjk5aln3gh65b1zdn";
-      name = "kxmlgui-5.17.0.tar.xz";
-    };
-  };
-  kxmlrpcclient = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/kxmlrpcclient-5.17.0.tar.xz";
-      sha256 = "1zj7c6b72cnnkds73938xyy87padbv0ah3jfqxdfb1yd5zxba7cs";
-      name = "kxmlrpcclient-5.17.0.tar.xz";
-    };
-  };
-  modemmanager-qt = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/modemmanager-qt-5.17.0.tar.xz";
-      sha256 = "1q3abgr527lcrzy40anm3sjy9j8ycga4g1gkqz201lwa1wp22zr3";
-      name = "modemmanager-qt-5.17.0.tar.xz";
-    };
-  };
-  networkmanager-qt = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/networkmanager-qt-5.17.0.tar.xz";
-      sha256 = "08aafz3y2lnnl5dmzj4s1nfjwhy3mda20pkxjyw1vk8l3s8nhs1l";
-      name = "networkmanager-qt-5.17.0.tar.xz";
-    };
-  };
-  oxygen-icons5 = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/oxygen-icons5-5.17.0.tar.xz";
-      sha256 = "18m5hfz4zappnz45f230sgjbl52fsjxli6d5dvm6998bhcyvv1y9";
-      name = "oxygen-icons5-5.17.0.tar.xz";
-    };
-  };
-  plasma-framework = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/plasma-framework-5.17.0.tar.xz";
-      sha256 = "0pi91pg9h0s4xziw9m8mc65b8ryhgjnv14zalmbwyr63qn7bkfjh";
-      name = "plasma-framework-5.17.0.tar.xz";
-    };
-  };
-  solid = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/solid-5.17.0.tar.xz";
-      sha256 = "1igdqk5cgrxq4is55zdskkc0kbcyp9vjfdrvr9xxhs0lxgizccx3";
-      name = "solid-5.17.0.tar.xz";
-    };
-  };
-  sonnet = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/sonnet-5.17.0.tar.xz";
-      sha256 = "0f7bzdcknc7kc4133q0c3zc1j78yf29kh8i7c0qg01zv1iafbbsv";
-      name = "sonnet-5.17.0.tar.xz";
-    };
-  };
-  threadweaver = {
-    version = "5.17.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.17/threadweaver-5.17.0.tar.xz";
-      sha256 = "1cf7qrzw4saai0z6l7bzhfc8clhngcgxla5zbpj28l6130lha8sw";
-      name = "threadweaver-5.17.0.tar.xz";
-    };
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.17/threadweaver.nix b/pkgs/development/libraries/kde-frameworks-5.17/threadweaver.nix
deleted file mode 100644
index 52817921cc72..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.17/threadweaver.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-}:
-
-kdeFramework {
-  name = "threadweaver";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 94062f06d7d7..8fef5b0e370c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14810,17 +14810,6 @@ let
   };
 
   kde5 =
-    let
-      frameworks = import ../development/libraries/kde-frameworks-5.17 { inherit pkgs; };
-      plasma = import ../desktops/plasma-5.5 { inherit pkgs; };
-      apps = import ../applications/kde-apps-15.12 { inherit pkgs; };
-      named = self: { plasma = plasma self; frameworks = frameworks self; apps = apps self; };
-      merged = self:
-        named self // frameworks self // plasma self // apps self // kde5PackagesFun self;
-    in
-      recurseIntoAttrs (lib.makeScope qt55.newScope merged);
-
-  kde5_latest =
     let
       frameworks = import ../development/libraries/kde-frameworks-5.18 { inherit pkgs; };
       plasma = import ../desktops/plasma-5.5 { inherit pkgs; };
@@ -14831,6 +14820,8 @@ let
     in
       recurseIntoAttrs (lib.makeScope qt55.newScope merged);
 
+  kde5_latest = kde5;
+
   theme-vertex = callPackage ../misc/themes/vertex { };
 
   xfce = xfce4-12;

From 3d81213509e1933f03f3ad85b17e568ecc23bfd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 4 Jan 2016 15:50:46 +0100
Subject: [PATCH 538/884] gnome-terminal: enable GNOME Shell search provider

Silly ./configure, it looks for dbus file from gnome-shell in the
installation tree of the package it is configuring. Fix by copying the
needed file from gnome-shell before ./configure is run.

This change makes gnome-shell a build time dependency (not runtime).
---
 .../gnome-3/3.16/core/gnome-terminal/default.nix         | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-terminal/default.nix
index c7432a760cf6..8be614f7397c 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-terminal/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-terminal/default.nix
@@ -19,8 +19,15 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2 desktop_file_utils ];
 
+  # Silly ./configure, it looks for dbus file from gnome-shell in the
+  # installation tree of the package it is configuring.
+  preConfigure = ''
+    mkdir -p "$out/share/dbus-1/interfaces"
+    cp "${gnome3.gnome_shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" "$out/share/dbus-1/interfaces"
+  '';
+
   # FIXME: enable for gnome3
-  configureFlags = [ "--disable-search-provider" "--disable-migration" ];
+  configureFlags = [ "--disable-migration" ];
 
   preFixup = ''
     for f in "$out/libexec/gnome-terminal-server"; do

From 521f903b80676fb0f2408f51d81a08129ef77681 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 11 Jan 2016 00:03:31 +0100
Subject: [PATCH 539/884] xorgVideoUnichrome: remove dead package

Broken since 2013, upstream very dead.
---
 nixos/modules/services/x11/xserver.nix        |  1 -
 .../x11/xorg/unichrome/configure.patch        | 37 -------------------
 pkgs/servers/x11/xorg/unichrome/default.nix   | 32 ----------------
 pkgs/top-level/all-packages.nix               |  2 -
 4 files changed, 72 deletions(-)
 delete mode 100644 pkgs/servers/x11/xorg/unichrome/configure.patch
 delete mode 100644 pkgs/servers/x11/xorg/unichrome/default.nix

diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 768fa50313a9..a7a9aac5c7fa 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -13,7 +13,6 @@ let
 
   # Map video driver names to driver packages. FIXME: move into card-specific modules.
   knownVideoDrivers = {
-    unichrome    = { modules = [ pkgs.xorgVideoUnichrome ]; };
     virtualbox   = { modules = [ kernelPackages.virtualboxGuestAdditions ]; driverName = "vboxvideo"; };
     ati = { modules = [ pkgs.xorg.xf86videoati pkgs.xorg.glamoregl ]; };
     intel-testing = { modules = with pkgs.xorg; [ xf86videointel-testing glamoregl ]; driverName = "intel"; };
diff --git a/pkgs/servers/x11/xorg/unichrome/configure.patch b/pkgs/servers/x11/xorg/unichrome/configure.patch
deleted file mode 100644
index 3c9fc927711b..000000000000
--- a/pkgs/servers/x11/xorg/unichrome/configure.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index bacea8a..691a9fa 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -77,6 +77,14 @@ AC_MSG_CHECKING([X protocol headers directory])
- protodir=$(pkg-config --variable=includex11dir xproto)
- AC_MSG_RESULT([$protodir])
- 
-+AC_MSG_CHECKING([X extension protocol headers directory])
-+extprotodir=$(pkg-config --variable=includedir xextproto)
-+AC_MSG_RESULT([$extprotodir])
-+
-+AC_MSG_CHECKING([XvMC headers directory])
-+xvmcdir=$(pkg-config --variable=includedir xvmc)
-+AC_MSG_RESULT([$extprotodir])
-+
- # Checks for libraries.
- 
- # Checks for header files.
-@@ -139,7 +147,7 @@ if test "x$have_xvmc" != xno; then
- 		      [have_xvmc_h="yes"], [have_xvmc_h="no"])
- 	AC_CHECK_FILE([${protodir}/extensions/vldXvMC.h],
- 		      [have_vldxvmc_h="yes"], [have_vldxvmc_h="no"])
--	AC_CHECK_FILE([${protodir}/extensions/XvMClib.h],
-+	AC_CHECK_FILE([${xvmcdir}/X11/extensions/XvMClib.h],
- 		      [have_xvmclib_h="yes"], [have_xvmclib_h="no"])
- fi
- 
-@@ -225,7 +233,7 @@ fi
- CFLAGS="$SAVED_CFLAGS"
- 
- # in the xserver 1.7 timeframe, the protocol headers were split up.
--AC_CHECK_FILE([${protodir}/extensions/dpmsconst.h],
-+AC_CHECK_FILE([${extprotodir}/X11/extensions/dpmsconst.h],
- 	      [have_dpmsconst_h="yes"], [have_dpmsconst_h="no"])
- if test "x$have_dpmsconst_h" = xyes; then
- 	AC_DEFINE(HAVE_DPMSCONST_H, 1, [Proto Headers have dpmsconst.h])
diff --git a/pkgs/servers/x11/xorg/unichrome/default.nix b/pkgs/servers/x11/xorg/unichrome/default.nix
deleted file mode 100644
index b9cedfc4679f..000000000000
--- a/pkgs/servers/x11/xorg/unichrome/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{stdenv, fetchgit, pkgconfig, fontsproto, libdrm, libpciaccess, randrproto, renderproto,
-videoproto, libX11,
-xextproto, xf86driproto, xorgserver, xproto, libXvMC, glproto, mesa, automake,
-autoconf, libtool, libXext, utilmacros, pixman}:
-
-stdenv.mkDerivation {
-  name = "xf86-video-unichrome";
-  src = fetchgit {
-    url = "git://people.freedesktop.org/~libv/xf86-video-unichrome";
-    md5 = "6e5e0f8ee204af2385a02e502d1ca8f1";
-    rev = "6260e0fc9f0754d101dda014a8f4b5f76f58e978";
-  };
-  buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto
-    videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC
-    glproto mesa automake autoconf libtool libXext utilmacros pixman ];
-  preConfigure = "chmod +x autogen.sh";
-  prePatch = ''
-    sed s,/bin/bash,/bin/sh, -i git_version.sh
-  '';
-  patches = [ ./configure.patch ];
-  configureScript = "./autogen.sh";
-  CFLAGS="-I${pixman}/include/pixman-1";
-
-  meta = {
-    homepage = "http://unichrome.sourceforge.net/";
-    description = "Xorg video driver for the S3 Unichrome family of integrated graphics devices";
-    license = stdenv.lib.licenses.free;
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
-    broken = true;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 148bb3886d78..2b34e8e184b7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9632,8 +9632,6 @@ let
     libdrm = if stdenv.isLinux then libdrm else null;
   } // { inherit xlibsWrapper; } );
 
-  xorgVideoUnichrome = callPackage ../servers/x11/xorg/unichrome/default.nix { };
-
   xwayland = callPackage ../servers/x11/xorg/xwayland.nix { };
 
   yaws = callPackage ../servers/http/yaws { erlang = erlangR17; };

From 228774aaf57c1b437ec92ff3b8df0dd28c95e9e4 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 11 Jan 2016 00:03:31 +0100
Subject: [PATCH 540/884] wis_go7007: remove dead package & module

Broken since 2014, but basically a package from 2008 with no
upstream.
---
 .../hardware/video/encoder/wis-go7007.nix     | 15 ----
 pkgs/os-specific/linux/wis-go7007/alsa.patch  | 20 -----
 pkgs/os-specific/linux/wis-go7007/default.nix | 74 -------------------
 pkgs/top-level/all-packages.nix               |  2 -
 4 files changed, 111 deletions(-)
 delete mode 100644 nixos/modules/hardware/video/encoder/wis-go7007.nix
 delete mode 100644 pkgs/os-specific/linux/wis-go7007/alsa.patch
 delete mode 100644 pkgs/os-specific/linux/wis-go7007/default.nix

diff --git a/nixos/modules/hardware/video/encoder/wis-go7007.nix b/nixos/modules/hardware/video/encoder/wis-go7007.nix
deleted file mode 100644
index e9b3cf72a8dd..000000000000
--- a/nixos/modules/hardware/video/encoder/wis-go7007.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{pkgs, config, ...}:
-
-let
-  wis_go7007 = config.boot.kernelPackages.wis_go7007;
-in
-
-{
-  boot.extraModulePackages = [ wis_go7007 ];
-
-  environment.systemPackages = [ wis_go7007 ];
-
-  hardware.firmware = [ wis_go7007 ];
-
-  services.udev.packages = [ wis_go7007 ];
-}
diff --git a/pkgs/os-specific/linux/wis-go7007/alsa.patch b/pkgs/os-specific/linux/wis-go7007/alsa.patch
deleted file mode 100644
index 64fd9310e775..000000000000
--- a/pkgs/os-specific/linux/wis-go7007/alsa.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -rc wis-go7007-linux-0.9.8-orig/apps/gorecord.c wis-go7007-linux-0.9.8/apps/gorecord.c
-*** wis-go7007-linux-0.9.8-orig/apps/gorecord.c	2006-04-02 00:35:17.000000000 +0200
---- wis-go7007-linux-0.9.8/apps/gorecord.c	2008-06-20 19:47:48.000000000 +0200
-***************
-*** 196,202 ****
-  		sprintf(sympath, "/sys/class/sound/pcmC%dD0c/device", i);
-  		if (realpath(sympath, canonpath) == NULL)
-  			continue;
-! 		if (!strcmp(gopath, canonpath))
-  			break;
-  	}
-  	if (i == 20) {
---- 196,202 ----
-  		sprintf(sympath, "/sys/class/sound/pcmC%dD0c/device", i);
-  		if (realpath(sympath, canonpath) == NULL)
-  			continue;
-! 		if (!strncmp(gopath, canonpath, strlen(gopath)))
-  			break;
-  	}
-  	if (i == 20) {
diff --git a/pkgs/os-specific/linux/wis-go7007/default.nix b/pkgs/os-specific/linux/wis-go7007/default.nix
deleted file mode 100644
index 4dae68d4871e..000000000000
--- a/pkgs/os-specific/linux/wis-go7007/default.nix
+++ /dev/null
@@ -1,74 +0,0 @@
-{stdenv, fetchurl, kernel, ncurses, fxload}:
-
-let
-
-  # A patch to fix A/V sync, and to allow video to be played
-  # (e.g. using MPlayer) while the AVI is being recorded.
-  gorecordAV = fetchurl {
-    url = http://colabti.org/convertx/patch-av-aviheader.diff;
-    sha256 = "04qk58qigzwfdnn3mr3pg28qx4r89nlzdhgkvfipz36bsny23r50";
-  };
-
-in   
-
-stdenv.mkDerivation {
-  name = "wis-go7007-0.9.8-${kernel.version}";
-
-  src = fetchurl {
-    url = http://gentoo.osuosl.org/distfiles/wis-go7007-linux-0.9.8.tar.bz2;
-    sha256 = "06lvlz42c5msvwc081p8vjcbv8qq1j1g1myxhh27xi8zi06n1mzg";
-  };
-
-  patches = map fetchurl [
-    { url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/media-tv/wis-go7007/files/wis-go7007-0.9.8-kernel-2.6.17.diff?rev=1.1";
-      sha256 = "0cizbg82fdl5byhvpkdx64qa02xcahdyddi2l2jn95sxab28a5yg";
-    }
-    { url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/media-tv/wis-go7007/files/wis-go7007-0.9.8-fix-udev.diff?rev=1.2";
-      sha256 = "1985lcb7gh5zsf3lm0b43zd6q0cb9q4z376n9q060bh99yw6m0w1";
-    }
-    { url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/media-tv/wis-go7007/files/snd.patch?rev=1.1";
-      sha256 = "0a6dz1l16pz1fk77s3awxh635cacbivfcfnd1carbx5jp2gq3jna";
-    }
-    { url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/media-tv/wis-go7007/files/wis-go7007-2.6.26-nopage.diff?rev=1.1";
-      sha256 = "18ks6dm9nnliab9ncgxx5nhw528vhwg83byps8wjsbadd3wzwym3";
-    }
-    { url = http://home.comcast.net/~bender647/go7007/wis-go7007-2.6.24-no_algo_control.diff;
-      sha256 = "1a7jkcsnzagir3wpsj60pjrr9wgfaqq21jlmq6s0qg9hqg4nzbvf";
-    }
-  ] ++ [
-    # http://nikosapi.org/wiki/index.php/WIS_Go7007_Linux_driver#wis-streamer_fails_to_find_the_ALSA_audio_node_and_emulated_OSS_device_node
-    ./alsa.patch
-  ];
-
-  buildInputs = [ncurses];
-
-  postPatch = ''
-    (cd apps && patch < ${gorecordAV}) || false
-  '';
-
-  preBuild = ''
-    includeDir=$TMPDIR/scratch
-    substituteInPlace Makefile \
-        --replace '$(DESTDIR)$(KSRC)/include/linux' $includeDir \
-        --replace '$(DESTDIR)$(FIRMWARE_DIR)' '$(FIRMWARE_DIR)'
-    mkdir -p $includeDir
-    mkdir -p $out/etc/hotplug/usb
-    mkdir -p $out/etc/udev/rules.d
- 
-    makeFlagsArray=(KERNELSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source \
-        FIRMWARE_DIR=$out/lib/firmware FXLOAD=${fxload}/sbin/fxload \
-        DESTDIR=$out SKIP_DEPMOD=1 \
-        USE_UDEV=y)
-  ''; # */
-
-  postInstall = ''
-    mkdir -p $out/bin
-    cp apps/gorecord apps/modet $out/bin/
-  '';
-
-  meta = {
-    description = "Kernel module for the Micronas GO7007, used in a number of USB TV devices";
-    homepage = http://oss.wischip.com/;
-    broken = true;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2b34e8e184b7..73e2a134fe57 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10143,8 +10143,6 @@ let
 
     openafsClient = callPackage ../servers/openafs-client { };
 
-    wis_go7007 = callPackage ../os-specific/linux/wis-go7007 { };
-
     kernelHeaders = callPackage ../os-specific/linux/kernel-headers { };
 
     klibc = callPackage ../os-specific/linux/klibc { };

From d57164a39cd7f98a41ed1ec5f3f9076d4b6c77be Mon Sep 17 00:00:00 2001
From: Erik Rybakken <erik.rybakken@math.ntnu.no>
Date: Mon, 11 Jan 2016 00:24:54 +0100
Subject: [PATCH 541/884] rofi: 0.15.10 -> 0.15.12

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

diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix
index 5899708a6825..6d8edec91031 100644
--- a/pkgs/applications/misc/rofi/default.nix
+++ b/pkgs/applications/misc/rofi/default.nix
@@ -1,18 +1,18 @@
 { stdenv, fetchurl, autoconf, automake, pkgconfig
-, libX11, libXinerama, libXft, pango, cairo
+, libX11, libXinerama, pango, cairo
 , libstartup_notification, i3Support ? false, i3
 }:
 
 stdenv.mkDerivation rec {
   name = "rofi-${version}";
-  version = "0.15.10";
+  version = "0.15.12";
 
   src = fetchurl {
     url = "https://github.com/DaveDavenport/rofi/archive/${version}.tar.gz";
-    sha256 = "0wwdc9dj8qfmqv4pcllq78h38hqmz9s3hqf71fsk71byiid69ln9";
+    sha256 = "112fgx2awsw1xf1983bmy3jvs33qwyi8qj7j59jqc4gx07nv1rp5";
   };
 
-  buildInputs = [ autoconf automake pkgconfig libX11 libXinerama libXft pango
+  buildInputs = [ autoconf automake pkgconfig libX11 libXinerama pango
                   cairo libstartup_notification
                 ] ++ stdenv.lib.optional i3Support i3;
 

From fcb913b3a7b37544dbfd6522146b79c4b301cc24 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 11 Jan 2016 01:37:29 +0100
Subject: [PATCH 542/884] systemtap: remove dead package

Broken since 2013. Depends on equally broken latex2html.
Our version 1.2 is almost six years old; latest is 2.9.
And it's (still) no dtrace.
---
 .../tools/profiling/systemtap/default.nix     | 74 -------------------
 .../systemtap/nixos-kernel-store-path.patch   | 47 ------------
 pkgs/top-level/all-packages.nix               |  4 -
 3 files changed, 125 deletions(-)
 delete mode 100644 pkgs/development/tools/profiling/systemtap/default.nix
 delete mode 100644 pkgs/development/tools/profiling/systemtap/nixos-kernel-store-path.patch

diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix
deleted file mode 100644
index 66dda8f43efd..000000000000
--- a/pkgs/development/tools/profiling/systemtap/default.nix
+++ /dev/null
@@ -1,74 +0,0 @@
-{ fetchurl, stdenv, elfutils, latex2html, xmlto, docbook_xml_dtd_412
-, libxml2, docbook_xsl, libxslt, texLive, texLiveExtra, ghostscript, pkgconfig
-, gtkmm, libglademm, boost, perl, sqlite }:
-
-stdenv.mkDerivation rec {
-  name = "systemtap-1.2";
-
-  src = fetchurl {
-    url = "http://sources.redhat.com/systemtap/ftp/releases/${name}.tar.gz";
-    sha256 = "0kxgjr8p1pnncc0l4941gzx0jsyyqjzjqar2qkcjzp266ajn9qz6";
-  };
-
-  patches =
-    stdenv.lib.optional (stdenv ? glibc) ./nixos-kernel-store-path.patch;
-
-  postPatch =
-    '' sed -i scripts/kernel-doc -e 's|/usr/bin/perl|${perl}/bin/perl|g'
-    '';
-
-  preConfigure =
-    # XXX: This should really be handled by TeXLive's setup-hook.
-    '' export TEXINPUTS="${latex2html}/texinputs:$TEXINPUTS"
-       export TEXINPUTS="${texLiveExtra}/texmf-dist/tex/latex/preprint:$TEXINPUTS"
-       echo "\$TEXINPUTS is \`$TEXINPUTS'"
-    '';
-
-  postConfigure =
-    /* Work around this:
-
-        StapParser.cxx:118:   instantiated from here
-        /...-boost-1.42.0/include/boost/algorithm/string/compare.hpp:43: error: comparison between signed and unsigned integer expressions
-
-     */
-    '' sed -i "grapher/Makefile" -e's/-Werror//g'
-    '';
-
-  buildInputs =
-    [ elfutils latex2html xmlto texLive texLiveExtra ghostscript
-      pkgconfig gtkmm libglademm boost sqlite
-      docbook_xml_dtd_412 libxml2
-      docbook_xsl libxslt
-    ];
-
-  meta = {
-    description = "SystemTap, tools to gather information about a running GNU/Linux system";
-
-    longDescription =
-      '' SystemTap provides free software (GPL) infrastructure to simplify
-         the gathering of information about the running GNU/Linux system.
-         This assists diagnosis of a performance or functional problem.
-         SystemTap eliminates the need for the developer to go through the
-         tedious and disruptive instrument, recompile, install, and reboot
-         sequence that may be otherwise required to collect data.
-
-         SystemTap provides a simple command line interface and scripting
-         language for writing instrumentation for a live running kernel.  We
-         are publishing samples, as well as enlarging the internal "tapset"
-         script library to aid reuse and abstraction.
-
-         Among other tracing/probing tools, SystemTap is the tool of choice
-         for complex tasks that may require live analysis, programmable
-         on-line response, and whole-system symbolic access.  SystemTap can
-         also handle simple tracing jobs.
-      '';
-
-    homepage = http://sourceware.org/systemtap/;
-
-    license = stdenv.lib.licenses.gpl2Plus;
-
-    maintainers = [ ];
-    platforms = stdenv.lib.platforms.linux;
-    broken = true;
-  };
-}
diff --git a/pkgs/development/tools/profiling/systemtap/nixos-kernel-store-path.patch b/pkgs/development/tools/profiling/systemtap/nixos-kernel-store-path.patch
deleted file mode 100644
index 5881ed84533f..000000000000
--- a/pkgs/development/tools/profiling/systemtap/nixos-kernel-store-path.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-This patch makes stap(1) know about the kernel store path on NixOS.
-
---- systemtap-1.2/main.cxx	2010-03-22 22:51:49.000000000 +0100
-+++ systemtap-1.2/main.cxx	2010-05-04 14:56:19.000000000 +0200
-@@ -528,6 +528,32 @@ getmemusage ()
-   return oss.str();
- }
- 
-+/* Read `/proc/cmdline' and extract the store path.  The assumption is that
-+   `/proc/cmdline' looks like this:
-+
-+   BOOT_IMAGE=/nix/store/sxjd69wfcr6w8jlbcc5bc20nwjliq872-linux-2.6.32.8/bzImage systemConfig=/nix/store/kiicqkjwgfvkwrg4fp3dnhwldh7dq7is-system init=/nix/store/czgncihjwx3n58xij6i1rlnz8wv6ym4j-stage-2-init.sh splash=verbose vga=0x317
-+
-+   This is the case on NixOS GNU/Linux.  */
-+static string
-+kernel_store_path (void)
-+{
-+  ifstream proc_cmdline ("/proc/cmdline");
-+  string variable_name, store_path;
-+
-+  getline (proc_cmdline, variable_name, '=');
-+  if (variable_name == "BOOT_IMAGE")
-+    {
-+      string boot_image_path;
-+      size_t slash_pos;
-+
-+      getline (proc_cmdline, boot_image_path, ' ');
-+      slash_pos = boot_image_path.find_last_of ('/');
-+      store_path = boot_image_path.substr (0, slash_pos);
-+    }
-+
-+  return store_path;
-+}
-+
- int
- main (int argc, char * const argv [])
- {
-@@ -541,7 +567,8 @@ main (int argc, char * const argv [])
-   struct utsname buf;
-   (void) uname (& buf);
-   s.kernel_release = string (buf.release);
--  s.kernel_build_tree = "/lib/modules/" + s.kernel_release + "/build";
-+  s.kernel_build_tree =
-+    kernel_store_path () + "/lib/modules/" + s.kernel_release + "/build";
- 
-   // PR4186: Copy logic from coreutils uname (uname -i) to squash
-   // i?86->i386.  Actually, copy logic from linux top-level Makefile
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 73e2a134fe57..a7716a9e1f66 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10484,10 +10484,6 @@ let
     linuxHeaders = linuxHeaders_3_18;
   };
 
-  systemtap = callPackage ../development/tools/profiling/systemtap {
-    inherit (gnome) libglademm;
-  };
-
   # In nixos, you can set systemd.package = pkgs.systemd_with_lvm2 to get
   # LVM2 working in systemd.
   systemd_with_lvm2 = pkgs.lib.overrideDerivation pkgs.systemd (p: {

From 9e44faab97bfef1335e53434841fffa42dabdace Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 11 Jan 2016 00:55:25 +0100
Subject: [PATCH 543/884] latex2html: remove dead package

Broken since Aug 2015, but upstream has been dead for donkey's
years. Only dependent was systemtap. No reasonable way (or indeed
reason) to artificially keep this alive.

Aim for the head.
---
 .../typesetting/tex/latex2html/default.nix    | 27 -------------------
 pkgs/top-level/all-packages.nix               |  4 ---
 2 files changed, 31 deletions(-)
 delete mode 100644 pkgs/tools/typesetting/tex/latex2html/default.nix

diff --git a/pkgs/tools/typesetting/tex/latex2html/default.nix b/pkgs/tools/typesetting/tex/latex2html/default.nix
deleted file mode 100644
index 45fec9f76da0..000000000000
--- a/pkgs/tools/typesetting/tex/latex2html/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, fetchurl, tex, perl, netpbm, ghostscript }:
-
-stdenv.mkDerivation rec {
-  name = "latex2html-2008";
-
-  src = fetchurl {
-    url = "http://www.latex2html.org/~latex2ht/current/${name}.tar.gz";
-    sha256 = "1b9pld6wz01p1pf5qwxjipdkhq34hmmw9mfkjp150hlqlcanhiar";
-  };
-
-  buildInputs = [ tex perl ghostscript netpbm ];
-
-  preConfigure = ''
-    patchShebangs .
-    sed -i -e "s|#! /bin/cat|#! $(type -p cat)|" configure
-    configureFlags="--with-texpath=$out/share/texmf-nix";
-  '';
-
-  meta = {
-    homepage = "http://www.latex2html.org/";
-    description = "Converter written in Perl that converts LaTeX documents to HTML";
-    license = stdenv.lib.licenses.gpl2Plus;
-
-    broken = true;
-  };
-
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a7716a9e1f66..cca65c52cade 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15483,10 +15483,6 @@ let
 
   DisnixWebService = callPackage ../tools/package-management/disnix/DisnixWebService { };
 
-  latex2html = callPackage ../tools/typesetting/tex/latex2html/default.nix {
-    tex = tetex;
-  };
-
   lkproof = callPackage ../tools/typesetting/tex/lkproof { };
 
   mysqlWorkbench = newScope gnome ../applications/misc/mysql-workbench {

From 93ddfbacd4a25eab23eb5eba073638c6af7657d2 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sat, 9 Jan 2016 16:35:27 +0000
Subject: [PATCH 544/884] pngcrush: fixes compilation on darwin

---
 pkgs/tools/graphics/pngcrush/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix
index d4383e363491..6a6f3e7b13c6 100644
--- a/pkgs/tools/graphics/pngcrush/default.nix
+++ b/pkgs/tools/graphics/pngcrush/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "0dlwbqckv90cpvg8qhkl3nk5yb75ddi61vbpmmp9n0j6qq9lp6y4";
   };
 
+  makeFlags = [ "CC=cc" "LD=cc" ];      # gcc and/or clang compat
+
   configurePhase = ''
     sed -i s,/usr,$out, Makefile
   '';
@@ -18,7 +20,7 @@ stdenv.mkDerivation rec {
     homepage = http://pmt.sourceforge.net/pngcrush;
     description = "A PNG optimizer";
     license = stdenv.lib.licenses.free;
-    platforms = with stdenv.lib.platforms; linux;
+    platforms = with stdenv.lib.platforms; linux ++ darwin;
     maintainers = with stdenv.lib.maintainers; [ the-kenny ];
   };
 }

From f31804996462f9fd90560d91744e9e6bccc11603 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <steinbach.tim@googlemail.com>
Date: Mon, 11 Jan 2016 02:08:31 +0000
Subject: [PATCH 545/884] kernel: 4.3.2 -> 4.3.3

---
 pkgs/os-specific/linux/kernel/linux-4.3.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.3.nix b/pkgs/os-specific/linux/kernel/linux-4.3.nix
index 00d46761b2af..1a33f4828cd1 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.3.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.3.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.3.2";
+  version = "4.3.3";
 
   extraMeta.branch = "4.3";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "27689c993943f21b4a34d45889fbd02daa7edabf00561eebee1ca0670e31ae9d";
+    sha256 = "8cad4ce7d049c2ecc041b0844bd478bf85f0d3071c93e0c885a776d57cbca3cf";
   };
 
   features.iwlwifi = true;

From 038241a761fc0ad298e3bd65d6d168e1b5f231da Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 11 Jan 2016 05:21:24 +0300
Subject: [PATCH 546/884] ltunify: init at 20140331

---
 pkgs/tools/misc/ltunify/default.nix | 21 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/tools/misc/ltunify/default.nix

diff --git a/pkgs/tools/misc/ltunify/default.nix b/pkgs/tools/misc/ltunify/default.nix
new file mode 100644
index 000000000000..0329581bfaab
--- /dev/null
+++ b/pkgs/tools/misc/ltunify/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchgit }:
+
+stdenv.mkDerivation rec {
+  name = "ltunify-20140331";
+
+  src = fetchgit {
+    url = "https://git.lekensteyn.nl/ltunify.git";
+    rev = "c3a263ff97bcd31e96abbfed33d066f8d2778f58";
+    sha256 = "0zjw064fl9f73ppl9c37wsfhp6296yx65m1gis2n2ia6arlnh45q";
+  };
+
+  makeFlags = [ "DESTDIR=$(out)" "bindir=/bin" ];
+
+  meta = with stdenv.lib; {
+    description = "Tool for working with Logitech Unifying receivers and devices";
+    homepage = https://lekensteyn.nl/logitech-unifying.html;
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.abbradar ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cca65c52cade..2799aeed4c2b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13194,6 +13194,8 @@ let
     apiKey = config.libspotify.apiKey or null;
   };
 
+  ltunify = callPackage ../tools/misc/ltunify { };
+
   src = callPackage ../applications/version-management/src/default.nix {
     git = gitMinimal;
   };

From 2d6ebc9189ec0efc54ca97eae8a38f44c1bc9699 Mon Sep 17 00:00:00 2001
From: Thomas Levine <_@thomaslevine.com>
Date: Sun, 10 Jan 2016 23:26:27 +0000
Subject: [PATCH 547/884] trackpoint: fix typo in configuration description

I fixed a typo in the description for hardware.trackpoint.speed.
---
 nixos/modules/tasks/trackpoint.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/tasks/trackpoint.nix b/nixos/modules/tasks/trackpoint.nix
index bd340869d69f..32e69dd2bf58 100644
--- a/nixos/modules/tasks/trackpoint.nix
+++ b/nixos/modules/tasks/trackpoint.nix
@@ -32,7 +32,7 @@ with lib;
         example = 255;
         type = types.int;
         description = ''
-          Configure the trackpoint sensitivity. By default, the kernel
+          Configure the trackpoint speed. By default, the kernel
           configures 97.
         '';
       };

From 074d1f2ffd1f4954620ef62d172ceba1b9c6d4e5 Mon Sep 17 00:00:00 2001
From: Mate Kovacs <mkovaxx@gmail.com>
Date: Sun, 10 Jan 2016 21:44:55 -0800
Subject: [PATCH 548/884] pythonPackages.pyglet: 1.1.2 -> 1.2.4

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b84bc9bee296..65d7363819ba 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15263,11 +15263,12 @@ in modules // {
   };
 
   pyglet = buildPythonPackage rec {
-    name = "pyglet-1.1.4";
+    name = "pyglet-${version}";
+    version = "1.2.4";
 
     src = pkgs.fetchurl {
-      url = "http://pyglet.googlecode.com/files/${name}.tar.gz";
-      sha256 = "048n20d606i3njnzhajadnznnfm8pwchs43hxs50da9p79g2m6qx";
+      url = "https://pypi.python.org/packages/source/p/pyglet/pyglet-${version}.tar.gz";
+      sha256 = "9f62ffbbcf2b202d084bf158685e77d28b8f4f5f2738f4c5e63a947a07503445";
     };
 
     patchPhase = let

From 3af6c86e7e37eac0f7bd1633709666d40d111bde Mon Sep 17 00:00:00 2001
From: Sean Lee <freshdried@gmail.com>
Date: Mon, 11 Jan 2016 02:18:28 -0500
Subject: [PATCH 549/884] ranger: added file as a runtime dependency

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

diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix
index 5fcb028f0cd9..3c13623af948 100644
--- a/pkgs/applications/misc/ranger/default.nix
+++ b/pkgs/applications/misc/ranger/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildPythonPackage, python, w3m }:
+{ stdenv, fetchurl, buildPythonPackage, python, w3m, file }:
 
 buildPythonPackage rec {
   name = "ranger-1.7.1";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     sha256 = "11nznx2lqv884q9d2if63101prgnjlnan8pcwy550hji2qsn3c7q";
   };
 
-  propagatedBuildInputs = with python.modules; [ curses ];
+  propagatedBuildInputs = [ python.modules.curses file ];
 
   preConfigure = ''
     substituteInPlace ranger/ext/img_display.py \

From cf184179bd83f3bc3f22ebf0c46832a3a8930478 Mon Sep 17 00:00:00 2001
From: Asko Soukka <asko.soukka@iki.fi>
Date: Mon, 11 Jan 2016 09:35:36 +0200
Subject: [PATCH 550/884] xkcdpass: init at 1.4.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b84bc9bee296..0649ac42df40 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -23393,6 +23393,21 @@ in modules // {
     };
   };
 
+  xkcdpass = buildPythonPackage rec {
+    name = "xkcdpass-${version}";
+    version = "1.4.2";
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/x/xkcdpass/xkcdpass-1.4.2.tar.gz";
+      sha256 = "4c1f8bee886820c42ccc64c15c3a2275dc6d01028cf6af7c481ded87267d8269";
+    };
+    meta = {
+      homepage = https://pypi.python.org/pypi/xkcdpass/;
+      description = "Generate secure multiword passwords/passphrases, inspired by XKCD";
+      license = licenses.bsd3;
+      maintainers = [ ];
+    };
+  };
+
   xstatic = buildPythonPackage rec {
     name = "XStatic-${version}";
     version = "1.0.1";

From 1792ca581079a5bfbf8d0dcd66a92e459efefd19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Mon, 11 Jan 2016 09:27:58 +0100
Subject: [PATCH 551/884] Increasing mmc possible partitions from 8 to 32.

In kernel common config. I have a modern tablet with 18 gpt partitions
on eMMC (Android+Win10 dualboot).
---
 pkgs/os-specific/linux/kernel/common-config.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index cb6e45e52c8b..8179211ba5ca 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -328,6 +328,7 @@ with stdenv.lib;
   ${optionalString (versionAtLeast version "3.11") ''
     PINCTRL_BAYTRAIL y # GPIO on Intel Bay Trail, for some Chromebook internal eMMC disks
   ''}
+  MMC_BLOCK_MINORS 32 # 8 is default. Modern gpt tables on eMMC may go far beyond 8.
   PPP_MULTILINK y # PPP multilink support
   PPP_FILTER y
   REGULATOR y # Voltage and Current Regulator Support

From 7b0613d51e072708b07de94a574ad7f0a128e450 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 11 Jan 2016 11:29:16 +0100
Subject: [PATCH 552/884] Revert "nixos/qemu-vm: Disable cache for
 $NIX_DISK_IMAGE"

This reverts commit 6353f580f90c0fdd2b418fa853a78ec508bda2a5.

Unfortunately cache=none doesn't work with all filesystem options.

Hydra tests error out with: file system may not support O_DIRECT

See http://hydra.nixos.org/build/30323625/
---
 nixos/modules/virtualisation/qemu-vm.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 5c4686044430..82b58aa67a3d 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -77,14 +77,14 @@ let
           -virtfs local,path=$TMPDIR/xchg,security_model=none,mount_tag=xchg \
           -virtfs local,path=''${SHARED_DIR:-$TMPDIR/xchg},security_model=none,mount_tag=shared \
           ${if cfg.useBootLoader then ''
-            -drive index=0,id=drive1,file=$NIX_DISK_IMAGE,if=${cfg.qemu.diskInterface},cache=none,werror=report \
+            -drive index=0,id=drive1,file=$NIX_DISK_IMAGE,if=${cfg.qemu.diskInterface},cache=writeback,werror=report \
             -drive index=1,id=drive2,file=$TMPDIR/disk.img,media=disk \
             ${if cfg.useEFIBoot then ''
               -pflash $TMPDIR/bios.bin \
             '' else ''
             ''}
           '' else ''
-            -drive index=0,id=drive1,file=$NIX_DISK_IMAGE,if=${cfg.qemu.diskInterface},cache=none,werror=report \
+            -drive index=0,id=drive1,file=$NIX_DISK_IMAGE,if=${cfg.qemu.diskInterface},cache=writeback,werror=report \
             -kernel ${config.system.build.toplevel}/kernel \
             -initrd ${config.system.build.toplevel}/initrd \
             -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo} ${kernelConsole} $QEMU_KERNEL_PARAMS" \

From c493d6e69764af36f5d174aca9a2c88c3b509f85 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Mon, 11 Jan 2016 05:42:13 -0500
Subject: [PATCH 553/884] beacon, bug-hunter: un-mark broken

I am able to successfully build, install and invoke both packages
without problems.
---
 pkgs/applications/editors/emacs-modes/elpa-packages.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-packages.nix b/pkgs/applications/editors/emacs-modes/elpa-packages.nix
index 2337f45c4ad6..475f7cb34762 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-packages.nix
@@ -66,8 +66,6 @@ self:
     elpaPackages = super // {
       ace-window = markBroken super.ace-window;
       ada-mode = markBroken super.ada-mode;
-      beacon = markBroken super.beacon;
-      bug-hunter = markBroken super.bug-hunter;
       company-math = markBroken super.company-math;
       company-statistics = markBroken super.company-statistics;
       context-coloring = markBroken super.context-coloring;

From 1ec9144cad4d2433799bffd325448748ddb57519 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 11 Jan 2016 12:06:03 +0100
Subject: [PATCH 554/884] ghcjs: mark broken

Citing from http://hydra.cryp.to/build/1533084/log/raw:

    Configuring ghcjs-0.2.0...
    Setup: At least the following dependencies are missing:
    aeson >=0.7 && <0.10,
    haskell-src-exts ==1.16.*,
    optparse-applicative ==0.11.*,
    syb >=0.4 && <0.6

This issue has been present for a while now, and it's only gotten worse.
---
 pkgs/development/compilers/ghcjs/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix
index 5ddfdc419179..1dee12ca12c0 100644
--- a/pkgs/development/compilers/ghcjs/default.nix
+++ b/pkgs/development/compilers/ghcjs/default.nix
@@ -119,4 +119,5 @@ mkDerivation (rec {
   license = stdenv.lib.licenses.bsd3;
   platforms = ghc.meta.platforms;
   maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan ];
+  broken = true; # depends on outdated versions of its Haskell build inputs
 })

From 573ec2d9ae732442766a887a88f33c88a4c63b18 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sat, 9 Jan 2016 17:08:43 +0000
Subject: [PATCH 555/884] sshuttle: 0.71 -> 0.74

the tags are now in a different form

sshuttle is now a real python package
---
 pkgs/tools/security/sshuttle/default.nix | 50 ++++++------------------
 pkgs/tools/security/sshuttle/sudo.patch  | 13 ++++++
 2 files changed, 26 insertions(+), 37 deletions(-)
 create mode 100644 pkgs/tools/security/sshuttle/sudo.patch

diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix
index e085bfaaa91a..831a815e787b 100644
--- a/pkgs/tools/security/sshuttle/default.nix
+++ b/pkgs/tools/security/sshuttle/default.nix
@@ -1,54 +1,30 @@
-{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper, pandoc
-, coreutils, iptables, nettools, openssh, procps,  pythonPackages }:
+{ stdenv, pythonPackages, fetchFromGitHub, makeWrapper, pandoc
+, coreutils, iptables, nettools, openssh, procps }:
   
-let version = "0.71"; in
-stdenv.mkDerivation rec {
+pythonPackages.buildPythonPackage rec {
+  version = "0.74";
   name = "sshuttle-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "0yr8nih97jg6azfj3k7064lfbh3g36l6vwyjlngl4ph6mgcki1cm";
-    rev = name;
+    sha256 = "1mx440wb1clis97nvgx67am9qssa3v11nb9irjzhnx44ygadhfcp";
+    rev = "v${version}";
     repo = "sshuttle";
     owner = "sshuttle";
   };
 
-  patches = [
-    (fetchpatch {
-      sha256 = "1yrjyvdz6k6zk020dmbagf8w49w8vhfbzgfpsq9jqdh2hbykv3m3";
-      url = https://github.com/sshuttle/sshuttle/commit/3cf5002b62650c26a50e18af8d8c5c91d754bab9.patch;
-    })
-    (fetchpatch {
-      sha256 = "091gg28cnmx200q46bcnxpp9ih9p5qlq0r3bxfm0f4qalg8rmp2g";
-      url = https://github.com/sshuttle/sshuttle/commit/d70b5f2b89e593506834cf8ea10785d96c801dfc.patch;
-    })
-    (fetchpatch {
-      sha256 = "17l9h8clqlbyxdkssavxqpb902j7b3yabrrdalybfpkhj69x8ghk";
-      url = https://github.com/sshuttle/sshuttle/commit/a38963301e9c29fbe3232f0a41ea080b642c5ad2.patch;
-    })
-  ];
+  patches = [ ./sudo.patch ];
 
+  propagatedBuildInputs = with pythonPackages; [ PyXAPI mock pytest ];
   nativeBuildInputs = [ makeWrapper pandoc ];
   buildInputs =
-    [ coreutils iptables nettools openssh procps pythonPackages.python ];
-  pythonPaths = with pythonPackages; [ PyXAPI ];
+    [ coreutils openssh ] ++
+    stdenv.lib.optionals stdenv.isLinux [ iptables nettools procps ];
 
-  preConfigure = ''
-    cd src
-  '';
-
-  installPhase = let
+  postInstall = let
     mapPath = f: x: stdenv.lib.concatStringsSep ":" (map f x);
   in ''
-    mkdir -p $out/share/sshuttle
-    cp -R sshuttle *.py compat $out/share/sshuttle
-
-    mkdir -p $out/bin
-    ln -s $out/share/sshuttle/sshuttle $out/bin
-    wrapProgram $out/bin/sshuttle \
-      --prefix PATH : "${mapPath (x: "${x}/bin") buildInputs}" \
-      --prefix PYTHONPATH : "${mapPath (x: "$(toPythonPath ${x})") pythonPaths}"
-
-    install -Dm644 sshuttle.8 $out/share/man/man8/sshuttle.8
+  wrapProgram $out/bin/sshuttle \
+    --prefix PATH : "${mapPath (x: "${x}/bin") buildInputs}" \
   '';
   
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/security/sshuttle/sudo.patch b/pkgs/tools/security/sshuttle/sudo.patch
new file mode 100644
index 000000000000..761bfaef8525
--- /dev/null
+++ b/pkgs/tools/security/sshuttle/sudo.patch
@@ -0,0 +1,13 @@
+diff --git a/sshuttle/client.py b/sshuttle/client.py
+index 7a7b6d7..8dde615 100644
+--- a/sshuttle/client.py
++++ b/sshuttle/client.py
+@@ -158,7 +158,7 @@ class FirewallClient:
+     def __init__(self, method_name):
+         self.auto_nets = []
+         python_path = os.path.dirname(os.path.dirname(__file__))
+-        argvbase = ([sys.executable, sys.argv[0]] +
++        argvbase = ([sys.argv[0]] +
+                     ['-v'] * (helpers.verbose or 0) +
+                     ['--method', method_name] +
+                     ['--firewall'])

From 15f6633210f3ec7e7d6e5ebefe9a5129914d8d03 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 11 Jan 2016 14:22:31 +0100
Subject: [PATCH 556/884] geolite-legacy 2016-01-06 -> 2016-01-11

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

diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix
index 826891834746..581d1db5088b 100644
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@@ -8,7 +8,7 @@ let
 
   # Annoyingly, these files are updated without a change in URL. This means that
   # builds will start failing every month or so, until the hashes are updated.
-  version = "2016-01-06";
+  version = "2016-01-11";
 in
 stdenv.mkDerivation {
   name = "geolite-legacy-${version}";
@@ -27,10 +27,10 @@ stdenv.mkDerivation {
     "1fksbnmda2a05cpax41h9r7jhi8102q41kl5nij4ai42d6yqy73x";
   srcGeoIPASNum = fetchDB
     "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
-    "15sagwf6l5fmfgf780qyf1sc3kcmxkv37510h7b9db76mzmicgln";
+    "06lhgkycyxisnvcrcdqcxlbhawyqw302yv1p3836bm0fjhyr7v4r";
   srcGeoIPASNumv6 = fetchDB
     "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz"
-    "0dyrpis64sgijl701vfpwklxcdr1wq3z0saymaw6scy3a1anpyfi";
+    "1scn63zd8di5jzxx4nfic4ggfy4jas9l56h0mcyvgypzlyvxgz43";
 
   meta = with stdenv.lib; {
     inherit version;

From c2224b8c0ea90f2b9e8d7001b62b0311cb99b03c Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jascha@jgeerds.name>
Date: Mon, 11 Jan 2016 13:51:17 +0100
Subject: [PATCH 557/884] pluggy: init at 0.3.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 98c8d3728a94..689a5bef6b64 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -23160,6 +23160,23 @@ in modules // {
     };
   };
 
+  pluggy = buildPythonPackage rec {
+    name = "pluggy-${version}";
+    version = "0.3.1";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/p/pluggy/${name}.tar.gz";
+      sha256 = "18qfzfm40bgx672lkg8q9x5hdh76n7vax99aank7vh2nw21wg70m";
+    };
+
+    meta = {
+      description = "Plugin and hook calling mechanisms for Python";
+      homepage = "https://pypi.python.org/pypi/pluggy";
+      license = licenses.mit;
+      maintainers = with maintainers; [ jgeerds ];
+    };
+  };
+
   xcffib = buildPythonPackage rec {
     version = "0.3.2";
     name = "xcffib-${version}";

From 95d6a61f18fdd7aed1d14c65981e6c3e177ac6d3 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jascha@jgeerds.name>
Date: Mon, 11 Jan 2016 13:54:16 +0100
Subject: [PATCH 558/884] tox: 1.8.1 -> 2.3.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 689a5bef6b64..67c5ab4177ec 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19382,15 +19382,16 @@ in modules // {
   };
 
   tox = buildPythonPackage rec {
-    name = "tox-1.8.1";
+    name = "tox-${version}";
+    version = "2.3.1";
 
-    propagatedBuildInputs = with self; [ py virtualenv ];
+    propagatedBuildInputs = with self; [ py virtualenv pluggy ];
 
     doCheck = false;
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/t/tox/${name}.tar.gz";
-      md5 = "c4423cc6512932b37e5b0d1faa87bef2";
+      sha256 = "1vj73ar4rimq3fwy5r2z3jv4g9qbh8rmpmncsc00g0k310acqzxz";
     };
   };
 

From 79e145a970b476eaac79e92e1952232b9892e509 Mon Sep 17 00:00:00 2001
From: Andreas Herrmann <andreash87@gmx.ch>
Date: Mon, 11 Jan 2016 11:36:50 +0100
Subject: [PATCH 559/884] gnuplot: Improve startup performance

Before executing the gnuplot executable the environment variable `GDFONTPATH`
is populated with a list of font directories, which is obtained from `fc-list`.
In that process we iterated over each line and called `dirname` on it, which
introduces a performance hit for loading and executing the external executable
`dirname` every time.

The new version avoids the loop.

The author of this patch measured a 42 fold performance improvement:

old version:

    $ time ./gnuplot_old/bin/gnuplot -e ''
    real    0m3.828s
    user    0m0.392s
    sys     0m0.465s

new version:

    $ time ./gnuplot_new2/bin/gnuplot -e ''
    real    0m0.091s
    user    0m0.112s
    sys     0m0.014s

The correctness of the value of `GDFONTPATH` was confirmed with the following
command and comparing its output between versions:

    $ gnuplot -e 'print system("echo $GDFONTPATH")'
---
 pkgs/tools/graphics/gnuplot/set-gdfontpath-from-fontconfig.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/graphics/gnuplot/set-gdfontpath-from-fontconfig.sh b/pkgs/tools/graphics/gnuplot/set-gdfontpath-from-fontconfig.sh
index 4886b4f2b7c0..92ad2e97b5b4 100644
--- a/pkgs/tools/graphics/gnuplot/set-gdfontpath-from-fontconfig.sh
+++ b/pkgs/tools/graphics/gnuplot/set-gdfontpath-from-fontconfig.sh
@@ -1,4 +1,4 @@
-p=( $(for n in $(fc-list | sed -r -e 's|^([^:]+):.*$|\1|'); do echo $(dirname "$n"); done | sort | uniq) )
+p=( $(fc-list : file | sed "s@/[^/]*: @@" | sort -u) )
 IFS=:
 export GDFONTPATH="${GDFONTPATH}${GDFONTPATH:+:}${p[*]}"
 unset IFS p

From 35bad9465fe132feda2ef477a5630a0926bf2d11 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 11 Jan 2016 09:45:19 -0600
Subject: [PATCH 560/884] emacsPackagesNg.elpaPackages: un-break some packages

---
 .../editors/emacs-modes/elpa-packages.nix             | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-packages.nix b/pkgs/applications/editors/emacs-modes/elpa-packages.nix
index 475f7cb34762..af7066cfcc1c 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-packages.nix
@@ -64,21 +64,10 @@ self:
     };
 
     elpaPackages = super // {
-      ace-window = markBroken super.ace-window;
-      ada-mode = markBroken super.ada-mode;
-      company-math = markBroken super.company-math;
-      company-statistics = markBroken super.company-statistics;
-      context-coloring = markBroken super.context-coloring;
-      dict-tree = markBroken super.dict-tree;
       el-search = markBroken super.el-search;
       ergoemacs-mode = markBroken super.ergoemacs-mode;
-      exwm = markBroken super.exwm;
-      gnugo = markBroken super.gnugo;
       iterators = markBroken super.iterators;
       midi-kbd = markBroken super.midi-kbd;
       stream = markBroken super.stream;
-      tNFA = markBroken super.tNFA;
-      trie = markBroken super.trie;
-      xelb = markBroken super.xelb;
     };
   in elpaPackages // { inherit elpaBuild elpaPackages; }

From 49aa382f87c556d9483965303088565b0f54ac76 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 11 Jan 2016 09:45:50 -0600
Subject: [PATCH 561/884] emacsPackagesNg.undo-tree: 0.6.4 -> 0.6.5

This removes the hand-written expression.
---
 pkgs/top-level/emacs-packages.nix | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 4a1e7de80523..c1e1baaaf8ed 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -1801,20 +1801,6 @@ let
     };
   };
 
-  undo-tree = melpaBuild rec {
-    pname   = "undo-tree";
-    version = "0.6.4";
-    src = fetchgit {
-      url    = "http://www.dr-qubit.org/git/${pname}.git";
-      rev    = "a3e81b682053a81e082139300ef0a913a7a610a2";
-      sha256 = "1qla7njkb7gx5aj87i8x6ni8jfk1k78ivwfiiws3gpbnyiydpx8y";
-    };
-    meta = {
-      description = "A port of Vim's undo tree functionality to Emacs";
-      license = gpl3Plus;
-    };
-  };
-
   use-package = melpaBuild rec {
     pname   = "use-package";
     version = "20151112";

From d6995049d33480ea8c0d8c7ed6431815cd20e909 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 11 Jan 2016 09:46:47 -0600
Subject: [PATCH 562/884] emacsPackagesNg.elpaPackages.ergoemacs-mode: unmark
 broken

---
 pkgs/applications/editors/emacs-modes/elpa-packages.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-packages.nix b/pkgs/applications/editors/emacs-modes/elpa-packages.nix
index af7066cfcc1c..475e62579fba 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-packages.nix
@@ -65,7 +65,6 @@ self:
 
     elpaPackages = super // {
       el-search = markBroken super.el-search;
-      ergoemacs-mode = markBroken super.ergoemacs-mode;
       iterators = markBroken super.iterators;
       midi-kbd = markBroken super.midi-kbd;
       stream = markBroken super.stream;

From 5f817922651e61154c04d66370639534288e468f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 11 Jan 2016 09:47:22 -0600
Subject: [PATCH 563/884] emacsPackagesNg.elpaPackages: state reason for broken
 packages

---
 pkgs/applications/editors/emacs-modes/elpa-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-packages.nix b/pkgs/applications/editors/emacs-modes/elpa-packages.nix
index 475e62579fba..e88206fc8b73 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-packages.nix
@@ -64,6 +64,7 @@ self:
     };
 
     elpaPackages = super // {
+      # These packages require emacs-25
       el-search = markBroken super.el-search;
       iterators = markBroken super.iterators;
       midi-kbd = markBroken super.midi-kbd;

From 64d15ab844ddc5cf4c616b21fb030a3f037ab730 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 11 Jan 2016 16:13:50 +0100
Subject: [PATCH 564/884] libpsl: list 2016-01-04 -> 2016-01-09

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

diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix
index 2495b923b798..7368729a881d 100644
--- a/pkgs/development/libraries/libpsl/default.nix
+++ b/pkgs/development/libraries/libpsl/default.nix
@@ -5,10 +5,10 @@ let
 
   version = "${libVersion}-list-${listVersion}";
 
-  listVersion = "2016-01-04";
+  listVersion = "2016-01-09";
   listSources = fetchFromGitHub {
-    sha256 = "1pn04yjmzmdh5adanp7ryhyzvg8dz5lmnhh1gikpa3k2r3gj6zxw";
-    rev = "3594dcfbd8cf1cb3ba2c57bd56b761147ea31fca";
+    sha256 = "1xsal9vyan954ahyn9pxvqpipmpcf6drp30xz7ag5xp3f2clcx8s";
+    rev = "0f7cc8b00498812ddaa983c56d67ef3713e48350";
     repo = "list";
     owner = "publicsuffix";
   };

From 83289318f02ce3d8355a1f1d5eb26e8311f7c919 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 11 Jan 2016 17:18:37 +0100
Subject: [PATCH 565/884] xdelta: 3.0.10 -> 3.0.11

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

diff --git a/pkgs/tools/compression/xdelta/default.nix b/pkgs/tools/compression/xdelta/default.nix
index 6fdf555986b9..d490d92e7d13 100644
--- a/pkgs/tools/compression/xdelta/default.nix
+++ b/pkgs/tools/compression/xdelta/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchFromGitHub, autoreconfHook }:
 
-let version = "3.0.10"; in
+let version = "3.0.11"; in
 stdenv.mkDerivation {
   name = "xdelta-${version}";
   
   src = fetchFromGitHub {
-    sha256 = "0wwxdr01var3f90iwi1lgjpsa4y549g850hyyix5cm0qk67ck4rg";
+    sha256 = "1c7xym7xr26phyf4wb9hh2w88ybzbzh2w3h1kyqq3da0ndidmf2r";
     rev = "v${version}";
     repo = "xdelta-devel";
     owner = "jmacd";

From 5e9b49dd539cbf8f8f39d27cfa07db4dd099fb00 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 11 Jan 2016 17:20:40 +0100
Subject: [PATCH 566/884] xdelta: add lzmaSupport; enable by default

---
 pkgs/tools/compression/xdelta/default.nix | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/compression/xdelta/default.nix b/pkgs/tools/compression/xdelta/default.nix
index d490d92e7d13..54e04d303d66 100644
--- a/pkgs/tools/compression/xdelta/default.nix
+++ b/pkgs/tools/compression/xdelta/default.nix
@@ -1,7 +1,15 @@
-{ stdenv, fetchFromGitHub, autoreconfHook }:
+{ stdenv, fetchFromGitHub, autoreconfHook
+, lzmaSupport ? true, xz ? null
+}:
 
-let version = "3.0.11"; in
-stdenv.mkDerivation {
+assert lzmaSupport -> xz != null;
+
+let
+  version = "3.0.11";
+  mkWith = flag: name: if flag
+    then "--with-${name}"
+    else "--without-${name}";
+in stdenv.mkDerivation {
   name = "xdelta-${version}";
   
   src = fetchFromGitHub {
@@ -12,11 +20,17 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [ autoreconfHook ];
+  buildInputs = []
+    ++ stdenv.lib.optionals lzmaSupport [ xz ];
 
   postPatch = ''
     cd xdelta3
   '';
 
+  configureFlags = [
+    (mkWith lzmaSupport "liblzma")
+  ];
+
   enableParallelBuilding = true;
 
   doCheck = true;

From 823f797c2678c8057db1ad0dd1f91a09adbd2151 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Mon, 11 Jan 2016 11:33:32 -0800
Subject: [PATCH 567/884] emacs24Macport: 5.13 -> 5.15

---
 pkgs/applications/editors/emacs-24/macport-24.5.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs-24/macport-24.5.nix b/pkgs/applications/editors/emacs-24/macport-24.5.nix
index 6b377abdda10..715b89085342 100644
--- a/pkgs/applications/editors/emacs-24/macport-24.5.nix
+++ b/pkgs/applications/editors/emacs-24/macport-24.5.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   emacsName = "emacs-24.5";
-  name = "${emacsName}-mac-5.13";
+  name = "${emacsName}-mac-5.15";
 
   #builder = ./builder.sh;
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   macportSrc = fetchurl {
     url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${name}.tar.gz";
-    sha256 = "0p8xpsnsdpwpfq4mz0fazm785d0my0pq4ifbw533g959jh17b36h";
+    sha256 = "1r47bm1pf5av2yr37byz91y7bp6vdw9smahiy18g5qp4jp6mz193";
   };
 
   enableParallelBuilding = true;

From 6aa786d1d602b4bfb5b8bff1caf0739aec71db95 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 11 Jan 2016 18:34:21 +0100
Subject: [PATCH 568/884] xdeltaUnstable: init at 3.1.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This will eventually become the new stable branch (as unstable ones
are wont to do), but is worth having if you want to patch yesterday's
‘large’ files today, or need to apply patches already created with it.

“First release of the 3.1.x series. This is taken from the
"64bithash" branch.

- Adds support for -B values greater than 2GB, enabled by
  -DXD3_USE_LARGESIZET=1 variable. [Enabled in nixpkgs.]
- Adds new performance and speed regression test, written in #Golang.
  [Not enabled in nixpkgs.]

When compiled for large sizes, xdelta3 uses a 64bit checksum function.
This impacts both compression and speed.

Relative to 3.0.11, the new branch is currently 3-5% slower and
has 1-2% worse compression. Performance will be addressed in
future 3.1.x releases.”
---
 pkgs/tools/compression/xdelta/default.nix  |  2 +-
 pkgs/tools/compression/xdelta/unstable.nix | 62 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  1 +
 3 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/compression/xdelta/unstable.nix

diff --git a/pkgs/tools/compression/xdelta/default.nix b/pkgs/tools/compression/xdelta/default.nix
index 54e04d303d66..84ccde3fd37d 100644
--- a/pkgs/tools/compression/xdelta/default.nix
+++ b/pkgs/tools/compression/xdelta/default.nix
@@ -11,7 +11,7 @@ let
     else "--without-${name}";
 in stdenv.mkDerivation {
   name = "xdelta-${version}";
-  
+
   src = fetchFromGitHub {
     sha256 = "1c7xym7xr26phyf4wb9hh2w88ybzbzh2w3h1kyqq3da0ndidmf2r";
     rev = "v${version}";
diff --git a/pkgs/tools/compression/xdelta/unstable.nix b/pkgs/tools/compression/xdelta/unstable.nix
new file mode 100644
index 000000000000..8637463dfc0d
--- /dev/null
+++ b/pkgs/tools/compression/xdelta/unstable.nix
@@ -0,0 +1,62 @@
+{ stdenv, fetchFromGitHub, autoreconfHook
+, lzmaSupport ? true, xz ? null
+}:
+
+assert lzmaSupport -> xz != null;
+
+let
+  version = "3.1.0";
+  mkWith = flag: name: if flag
+    then "--with-${name}"
+    else "--without-${name}";
+in stdenv.mkDerivation {
+  name = "xdelta-${version}";
+
+  src = fetchFromGitHub {
+    sha256 = "09mmsalc7dwlvgrda56s2k927rpl3a5dzfa88aslkqcjnr790wjy";
+    rev = "v${version}";
+    repo = "xdelta-devel";
+    owner = "jmacd";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+  buildInputs = []
+    ++ stdenv.lib.optionals lzmaSupport [ xz ];
+
+  postPatch = ''
+    cd xdelta3
+
+    substituteInPlace Makefile.am --replace \
+      "common_CFLAGS =" \
+      "common_CFLAGS = -DXD3_USE_LARGESIZET=1"
+  '';
+
+  configureFlags = [
+    (mkWith lzmaSupport "liblzma")
+  ];
+
+  enableParallelBuilding = true;
+
+  doCheck = true;
+  checkPhase = ''
+    mkdir $PWD/tmp
+    for i in testing/file.h xdelta3-test.h; do
+      substituteInPlace $i --replace /tmp $PWD/tmp
+    done
+    ./xdelta3regtest
+  '';
+
+  installPhase = ''
+    install -D -m755 xdelta3 $out/bin/xdelta3
+    install -D -m644 xdelta3.1 $out/share/man/man1/xdelta3.1
+  '';
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "Binary differential compression in VCDIFF (RFC 3284) format";
+    homepage = http://xdelta.org/;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2799aeed4c2b..01fef969bf3f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3658,6 +3658,7 @@ let
   xtitle = callPackage ../tools/misc/xtitle { };
 
   xdelta = callPackage ../tools/compression/xdelta { };
+  xdeltaUnstable = callPackage ../tools/compression/xdelta/unstable.nix { };
 
   xdummy = callPackage ../tools/misc/xdummy { };
 

From 685b2ebb60aa7cddedd56736d49ea02ab29e1063 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 11 Jan 2016 18:40:02 +0100
Subject: [PATCH 569/884] xdelta: add longDescription

---
 pkgs/tools/compression/xdelta/default.nix  | 5 +++++
 pkgs/tools/compression/xdelta/unstable.nix | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/pkgs/tools/compression/xdelta/default.nix b/pkgs/tools/compression/xdelta/default.nix
index 84ccde3fd37d..396099df41cc 100644
--- a/pkgs/tools/compression/xdelta/default.nix
+++ b/pkgs/tools/compression/xdelta/default.nix
@@ -50,6 +50,11 @@ in stdenv.mkDerivation {
   meta = with stdenv.lib; {
     inherit version;
     description = "Binary differential compression in VCDIFF (RFC 3284) format";
+    longDescription = ''
+      xdelta is a command line program for delta encoding, which generates two
+      file differences. This is similar to diff and patch, but it is targeted
+      for binary files and does not generate human readable output.
+    '';
     homepage = http://xdelta.org/;
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
diff --git a/pkgs/tools/compression/xdelta/unstable.nix b/pkgs/tools/compression/xdelta/unstable.nix
index 8637463dfc0d..a19fb4de68a4 100644
--- a/pkgs/tools/compression/xdelta/unstable.nix
+++ b/pkgs/tools/compression/xdelta/unstable.nix
@@ -54,6 +54,11 @@ in stdenv.mkDerivation {
   meta = with stdenv.lib; {
     inherit version;
     description = "Binary differential compression in VCDIFF (RFC 3284) format";
+    longDescription = ''
+      xdelta is a command line program for delta encoding, which generates two
+      file differences. This is similar to diff and patch, but it is targeted
+      for binary files and does not generate human readable output.
+    '';
     homepage = http://xdelta.org/;
     license = licenses.gpl2Plus;
     platforms = platforms.linux;

From da698fd9da2b15ef8f0189afc4ce25e5171b244d Mon Sep 17 00:00:00 2001
From: Corbin Simpson <cds@corbinsimpson.com>
Date: Sun, 10 Jan 2016 15:33:36 -0800
Subject: [PATCH 570/884] pypy: add some required build inputs and disable some
 unsafe tests

I had to disable another networking-centric test suite; it was trying to make
unapproved phone calls.
---
 pkgs/development/interpreters/pypy/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/pypy/default.nix b/pkgs/development/interpreters/pypy/default.nix
index d95018443879..1edda33a1ae9 100644
--- a/pkgs/development/interpreters/pypy/default.nix
+++ b/pkgs/development/interpreters/pypy/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi
 , sqlite, openssl, ncurses, pythonFull, expat, tcl, tk, xlibsWrapper, libX11
-, makeWrapper, callPackage, self }:
+, makeWrapper, callPackage, self, gdbm, db }:
 
 assert zlibSupport -> zlib != null;
 
@@ -21,7 +21,7 @@ let
       sha256 = "1g7iipllgdfjgdkypsa1g2pzxgjw9agp40rh82hk31rsbak2hfbl";
     };
 
-    buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 makeWrapper ]
+    buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 makeWrapper gdbm db ]
       ++ stdenv.lib.optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc
       ++ stdenv.lib.optional zlibSupport zlib;
 
@@ -81,11 +81,11 @@ let
        # disable sqlite3 due to https://bugs.pypy.org/issue1740
        # disable test_multiprocessing due to transient errors
        # disable test_os because test_urandom_failure fails
-       # disable test_urllib2net and test_urllibnet because it requires networking (example.com)
+       # disable test_urllib2net, test_urllib2_localnet, and test_urllibnet because they require networking (example.com)
        # disable test_zipfile64 because it randomly timeouts
        # disable test_cpickle because timeouts
        # disable test_ssl because no shared cipher' not found in '[Errno 1] error:14077410:SSL routines:SSL23_GET_SERVER_HELLO:sslv3 alert handshake failure
-      ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k 'not (test_ssl or test_cpickle or test_sqlite or test_urllib2net or test_urllibnet or test_socket or test_os or test_shutil or test_mhlib or test_multiprocessing or test_zipfile64)' lib-python
+      ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k 'not (test_ssl or test_cpickle or test_sqlite or test_urllib2net or test_urllibnet or test_urllib2_localnet or test_socket or test_os or test_shutil or test_mhlib or test_multiprocessing or test_zipfile64)' lib-python
     '';
 
     installPhase = ''

From 5c2c881c5769afe83640d7df80ecc7da6f33017c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 11 Jan 2016 20:40:49 +0100
Subject: [PATCH 571/884] pypy: parallel build improvements, remove some
 patching

incorporates http://paste.pound-python.org/show/oFyMaSSzvb07lenWYmAK/
from NixCon sprints
---
 pkgs/development/interpreters/pypy/default.nix | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/interpreters/pypy/default.nix b/pkgs/development/interpreters/pypy/default.nix
index 1edda33a1ae9..8abc1ac489cd 100644
--- a/pkgs/development/interpreters/pypy/default.nix
+++ b/pkgs/development/interpreters/pypy/default.nix
@@ -31,16 +31,6 @@ let
       (stdenv.lib.filter (x : x.outPath != stdenv.cc.libc.outPath or "") buildInputs));
 
     preConfigure = ''
-      substituteInPlace Makefile \
-        --replace "-Ojit" "-Ojit --batch" \
-        --replace "pypy/goal/targetpypystandalone.py" "pypy/goal/targetpypystandalone.py --withmod-_minimal_curses --withmod-unicodedata --withmod-thread --withmod-bz2 --withmod-_multiprocessing"
-
-      # we are using cpython and not pypy to do translation
-      substituteInPlace rpython/bin/rpython \
-        --replace "/usr/bin/env pypy" "${pythonFull}/bin/python"
-      substituteInPlace pypy/goal/targetpypystandalone.py \
-        --replace "/usr/bin/env pypy" "${pythonFull}/bin/python"
-
       # hint pypy to find nix ncurses
       substituteInPlace pypy/module/_minimal_curses/fficurses.py \
         --replace "/usr/include/ncurses/curses.h" "${ncurses}/include/curses.h" \
@@ -57,6 +47,10 @@ let
       sed -i "s@libraries=\['sqlite3'\]\$@libraries=['sqlite3'], include_dirs=['${sqlite}/include'], library_dirs=['${sqlite}/lib']@" lib_pypy/_sqlite3_build.py
     '';
 
+    buildPhase = ''
+      ${pythonFull.interpreter} rpython/bin/rpython --make-jobs="$NIX_BUILD_CORES" -Ojit --batch pypy/goal/targetpypystandalone.py --withmod-_minimal_curses --withmod-unicodedata --withmod-thread --withmod-bz2 --withmod-_multiprocessing
+    '';
+
     setupHook = ./setup-hook.sh;
 
     postBuild = ''

From b444fe98a5f48cfc253c1a6799d0d502d0e3d2f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Mon, 11 Jan 2016 21:23:01 +0100
Subject: [PATCH 572/884] python33Packages.acd_cli: restrict package to
 python33

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 67c5ab4177ec..b2007163f57e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -223,8 +223,8 @@ in modules // {
     pname = "acd_cli";
     version = "0.3.1";
 
-    disabled = !isPy3k;
-    doCheck = !isPy3k;
+    disabled = !isPy33;
+    doCheck = !isPy33;
 
     src = pkgs.fetchFromGitHub {
       owner = "yadayada";

From 56fdc710139a6072d7593f8d0f7b897dbf9ab0e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Mon, 11 Jan 2016 21:24:31 +0100
Subject: [PATCH 573/884] idea: restrict packages to oraclejdk8

---
 pkgs/applications/editors/idea/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index 4c9476d0b9f0..c34e93480087 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeDesktopItem, makeWrapper, patchelf, p7zip, jdk
+{ stdenv, fetchurl, makeDesktopItem, makeWrapper, patchelf, p7zip, oraclejdk8
 , coreutils, gnugrep, which, git, python, unzip, androidsdk
 }:
 
@@ -6,6 +6,10 @@ assert stdenv.isLinux;
 
 let
 
+  # After IDEA 15 we can no longer use OpenJDK.
+  # https://youtrack.jetbrains.com/issue/IDEA-147272
+  jdk = oraclejdk8;
+
   mkIdeaProduct = with stdenv.lib;
   { name, product, version, build, src, meta }:
 

From fdc69f2e8f3c152065f65d5e516a4308e430047e Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Mon, 11 Jan 2016 12:28:58 -0800
Subject: [PATCH 574/884] emacs24: Add jwiegley as a maintainer

---
 pkgs/applications/editors/emacs-24/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix
index c2956006fb40..1db56577278c 100644
--- a/pkgs/applications/editors/emacs-24/default.nix
+++ b/pkgs/applications/editors/emacs-24/default.nix
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
     description = "GNU Emacs 24, the extensible, customizable text editor";
     homepage    = http://www.gnu.org/software/emacs/;
     license     = licenses.gpl3Plus;
-    maintainers = with maintainers; [ chaoflow lovek323 simons the-kenny ];
+    maintainers = with maintainers; [ chaoflow lovek323 simons the-kenny jwiegley ];
     platforms   = platforms.all;
 
     # So that Exuberant ctags is preferred

From b7ff0301d6f26bd8419e888fd0e129f3dc8bd328 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Mon, 11 Jan 2016 12:55:25 -0800
Subject: [PATCH 575/884] emacs24Macport: change expressions to better match
 emacs24

---
 .../editors/emacs-24/macport-24.5.nix         | 60 +++++++------------
 1 file changed, 20 insertions(+), 40 deletions(-)

diff --git a/pkgs/applications/editors/emacs-24/macport-24.5.nix b/pkgs/applications/editors/emacs-24/macport-24.5.nix
index 715b89085342..ed4c435c09b8 100644
--- a/pkgs/applications/editors/emacs-24/macport-24.5.nix
+++ b/pkgs/applications/editors/emacs-24/macport-24.5.nix
@@ -1,12 +1,13 @@
 { stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls
-, Carbon, Cocoa, ImageCaptureCore, OSAKit, Quartz, WebKit
+, Carbon, Cocoa, ImageCaptureCore, OSAKit, Quartz, WebKit, gettext
+, AppKit, GSS, ImageIO
 }:
 
 stdenv.mkDerivation rec {
   emacsName = "emacs-24.5";
   name = "${emacsName}-mac-5.15";
 
-  #builder = ./builder.sh;
+  builder = ./builder.sh;
 
   src = fetchurl {
     url = "mirror://gnu/emacs/${emacsName}.tar.xz";
@@ -21,11 +22,11 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   buildInputs = [
-    ncurses pkgconfig texinfo libxml2 gnutls
+    ncurses libxml2 gnutls pkgconfig texinfo gettext
   ];
 
   propagatedBuildInputs = [
-    Carbon Cocoa ImageCaptureCore OSAKit Quartz WebKit
+    Carbon Cocoa ImageCaptureCore OSAKit Quartz WebKit AppKit GSS ImageIO
   ];
 
   postUnpack = ''
@@ -34,46 +35,25 @@ stdenv.mkDerivation rec {
     mv $name $emacsName
   '';
 
-  preConfigure = ''
-    substituteInPlace lisp/international/mule-cmds.el --replace /usr $TMPDIR
-    substituteInPlace Makefile.in --replace "/bin/pwd" "pwd"
-    substituteInPlace lib-src/Makefile.in --replace "/bin/pwd" "pwd"
-
+  postPatch = ''
     patch -p1 < patch-mac
-
-    # The search for 'tputs' will fail because it's in ncursesw within the
-    # ncurses package, yet Emacs' configure script only looks in ncurses.
-    # Further, we need to make sure that the -L option occurs before mention
-    # of the library, so that it finds it within the Nix store.
-    sed -i 's/tinfo ncurses/tinfo ncursesw/' configure
-    ncurseslib=$(echo ${ncurses}/lib | sed 's#/#\\/#g')
-    sed -i "s/OLIBS=\$LIBS/OLIBS=\"-L$ncurseslib \$LIBS\"/" configure
-    sed -i 's/LIBS="\$LIBS_TERMCAP \$LIBS"/LIBS="\$LIBS \$LIBS_TERMCAP"/' configure
-
-    configureFlagsArray=(
-      LDFLAGS=-L${ncurses}/lib
-      --with-xml2=yes
-      --with-gnutls=yes
-      --with-mac
-      --enable-mac-app=$out/Applications
-    )
-    makeFlagsArray=(
-      CFLAGS=-O3
-      LDFLAGS="-O3 -L${ncurses}/lib"
-    );
+    sed -i 's|/usr/share/locale|${gettext}/share/locale|g' lisp/international/mule-cmds.el
   '';
 
-  postInstall = ''
-    cat >$out/share/emacs/site-lisp/site-start.el <<EOF
-    ;; nixos specific load-path
-    (when (getenv "NIX_PROFILES") (setq load-path
-                          (append (reverse (mapcar (lambda (x) (concat x "/share/emacs/site-lisp/"))
-                             (split-string (getenv "NIX_PROFILES"))))
-                    load-path)))
+  configureFlags = [
+    "LDFLAGS=-L${ncurses}/lib"
+    "--with-xml2=yes"
+    "--with-gnutls=yes"
+    "--with-mac"
+    "--enable-mac-app=$$out/Applications"
+  ];
 
-    ;; make tramp work for NixOS machines
-    (eval-after-load 'tramp '(add-to-list 'tramp-remote-path "/run/current-system/sw/bin"))
-    EOF
+  CFLAGS = "-O3";
+  LDFLAGS = "-O3 -L${ncurses}/lib";
+
+  postInstall = ''
+    mkdir -p $out/share/emacs/site-lisp/
+    cp ${./site-start.el} $out/share/emacs/site-lisp/site-start.el
   '';
 
   doCheck = true;

From 14c8a6f32debade73660eae7308271f714d021b2 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Mon, 11 Jan 2016 14:31:03 -0800
Subject: [PATCH 576/884] emacs24Macport: Further cleanups, remove old code

---
 .../editors/emacs-24/macport-24.3.nix         |  98 -----------------
 .../editors/emacs-24/macport-24.4.nix         | 101 ------------------
 .../editors/emacs-24/macport-24.5.nix         |  13 ++-
 pkgs/top-level/all-packages.nix               |  12 +--
 4 files changed, 10 insertions(+), 214 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs-24/macport-24.3.nix
 delete mode 100644 pkgs/applications/editors/emacs-24/macport-24.4.nix

diff --git a/pkgs/applications/editors/emacs-24/macport-24.3.nix b/pkgs/applications/editors/emacs-24/macport-24.3.nix
deleted file mode 100644
index 191969eef5b0..000000000000
--- a/pkgs/applications/editors/emacs-24/macport-24.3.nix
+++ /dev/null
@@ -1,98 +0,0 @@
-{ stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls
-}:
-
-stdenv.mkDerivation rec {
-  emacsName = "emacs-24.3";
-  name = "${emacsName}-mac-4.8";
-
-  #builder = ./builder.sh;
-
-  src = fetchurl {
-    url = "mirror://gnu/emacs/${emacsName}.tar.xz";
-    sha256 = "1385qzs3bsa52s5rcncbrkxlydkw0ajzrvfxgv8rws5fx512kakh";
-  };
-
-  macportSrc = fetchurl {
-    url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${name}.tar.gz";
-    sha256 = "194y341zrpjp75mc3099kjc0inr1d379wwsnav257bwsc967h8yx";
-  };
-
-  buildInputs = [ ncurses pkgconfig texinfo libxml2 gnutls ];
-
-  postUnpack = ''
-    mv $emacsName $name
-    tar xzf $macportSrc
-    mv $name $emacsName
-  '';
-
-  preConfigure = ''
-    patch -p0 < patch-mac
-
-    # The search for 'tputs' will fail because it's in ncursesw within the
-    # ncurses package, yet Emacs' configure script only looks in ncurses.
-    # Further, we need to make sure that the -L option occurs before mention
-    # of the library, so that it finds it within the Nix store.
-    sed -i 's/tinfo ncurses/tinfo ncursesw/' configure
-    ncurseslib=$(echo ${ncurses}/lib | sed 's#/#\\/#g')
-    sed -i "s/OLIBS=\$LIBS/OLIBS=\"-L$ncurseslib \$LIBS\"/" configure
-    sed -i 's/LIBS="\$LIBS_TERMCAP \$LIBS"/LIBS="\$LIBS \$LIBS_TERMCAP"/' configure
-
-    configureFlagsArray=(
-      LDFLAGS=-L${ncurses}/lib
-      --with-xml2=yes
-      --with-gnutls=yes
-      --with-mac
-      --enable-mac-app=$out/Applications
-    )
-    makeFlagsArray=(
-      CFLAGS=-O3
-      LDFLAGS="-O3 -L${ncurses}/lib"
-    );
-  '';
-
-  postInstall = ''
-    cat >$out/share/emacs/site-lisp/site-start.el <<EOF
-    ;; nixos specific load-path
-    (when (getenv "NIX_PROFILES") (setq load-path
-                          (append (reverse (mapcar (lambda (x) (concat x "/share/emacs/site-lisp/"))
-                             (split-string (getenv "NIX_PROFILES"))))
-                    load-path)))
-
-    ;; make tramp work for NixOS machines
-    (eval-after-load 'tramp '(add-to-list 'tramp-remote-path "/run/current-system/sw/bin"))
-    EOF
-  '';
-
-  doCheck = true;
-
-  meta = with stdenv.lib; {
-    description = "GNU Emacs 24, the extensible, customizable text editor";
-    homepage    = http://www.gnu.org/software/emacs/;
-    license     = licenses.gpl3Plus;
-    maintainers = with maintainers; [ jwiegley ];
-    platforms   = platforms.darwin;
-
-    longDescription = ''
-      GNU Emacs is an extensible, customizable text editor—and more.  At its
-      core is an interpreter for Emacs Lisp, a dialect of the Lisp
-      programming language with extensions to support text editing.
-
-      The features of GNU Emacs include: content-sensitive editing modes,
-      including syntax coloring, for a wide variety of file types including
-      plain text, source code, and HTML; complete built-in documentation,
-      including a tutorial for new users; full Unicode support for nearly all
-      human languages and their scripts; highly customizable, using Emacs
-      Lisp code or a graphical interface; a large number of extensions that
-      add other functionality, including a project planner, mail and news
-      reader, debugger interface, calendar, and more.  Many of these
-      extensions are distributed with GNU Emacs; others are available
-      separately.
-
-      This is "Mac port" addition to GNU Emacs 24. This provides a native
-      GUI support for Mac OS X 10.4 - 10.9. Note that Emacs 23 and later
-      already contain the official GUI support via the NS (Cocoa) port for
-      Mac OS X 10.4 and later. So if it is good enough for you, then you
-      don't need to try this.
-    '';
-  };
-}
diff --git a/pkgs/applications/editors/emacs-24/macport-24.4.nix b/pkgs/applications/editors/emacs-24/macport-24.4.nix
deleted file mode 100644
index b79ac6150edd..000000000000
--- a/pkgs/applications/editors/emacs-24/macport-24.4.nix
+++ /dev/null
@@ -1,101 +0,0 @@
-{ stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls
-}:
-
-stdenv.mkDerivation rec {
-  emacsName = "emacs-24.4";
-  name = "${emacsName}-mac-5.3";
-
-  #builder = ./builder.sh;
-
-  src = fetchurl {
-    url = "mirror://gnu/emacs/${emacsName}.tar.xz";
-    sha256 = "1zflm6ac34s6v166p58ilxrxbxjm0q2wfc25f8y0mjml1lbr3qs7";
-  };
-
-  macportSrc = fetchurl {
-    url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${name}.tar.gz";
-    sha256 = "0qzzqnql0z0a2p3ciccy8gq79v0s7s717lchcprn3wlaqcrk2g1p";
-  };
-
-  buildInputs = [ ncurses pkgconfig texinfo libxml2 gnutls ];
-
-  postUnpack = ''
-    mv $emacsName $name
-    tar xzf $macportSrc
-    mv $name $emacsName
-  '';
-
-  preConfigure = ''
-    substituteInPlace Makefile.in --replace "/bin/pwd" "pwd"
-    substituteInPlace lib-src/Makefile.in --replace "/bin/pwd" "pwd"
-
-    patch -p0 < patch-mac
-
-    # The search for 'tputs' will fail because it's in ncursesw within the
-    # ncurses package, yet Emacs' configure script only looks in ncurses.
-    # Further, we need to make sure that the -L option occurs before mention
-    # of the library, so that it finds it within the Nix store.
-    sed -i 's/tinfo ncurses/tinfo ncursesw/' configure
-    ncurseslib=$(echo ${ncurses}/lib | sed 's#/#\\/#g')
-    sed -i "s/OLIBS=\$LIBS/OLIBS=\"-L$ncurseslib \$LIBS\"/" configure
-    sed -i 's/LIBS="\$LIBS_TERMCAP \$LIBS"/LIBS="\$LIBS \$LIBS_TERMCAP"/' configure
-
-    configureFlagsArray=(
-      LDFLAGS=-L${ncurses}/lib
-      --with-xml2=yes
-      --with-gnutls=yes
-      --with-mac
-      --enable-mac-app=$out/Applications
-    )
-    makeFlagsArray=(
-      CFLAGS=-O3
-      LDFLAGS="-O3 -L${ncurses}/lib"
-    );
-  '';
-
-  postInstall = ''
-    cat >$out/share/emacs/site-lisp/site-start.el <<EOF
-    ;; nixos specific load-path
-    (when (getenv "NIX_PROFILES") (setq load-path
-                          (append (reverse (mapcar (lambda (x) (concat x "/share/emacs/site-lisp/"))
-                             (split-string (getenv "NIX_PROFILES"))))
-                    load-path)))
-
-    ;; make tramp work for NixOS machines
-    (eval-after-load 'tramp '(add-to-list 'tramp-remote-path "/run/current-system/sw/bin"))
-    EOF
-  '';
-
-  doCheck = true;
-
-  meta = with stdenv.lib; {
-    description = "GNU Emacs 24, the extensible, customizable text editor";
-    homepage    = http://www.gnu.org/software/emacs/;
-    license     = licenses.gpl3Plus;
-    maintainers = with maintainers; [ jwiegley ];
-    platforms   = platforms.darwin;
-
-    longDescription = ''
-      GNU Emacs is an extensible, customizable text editor—and more.  At its
-      core is an interpreter for Emacs Lisp, a dialect of the Lisp
-      programming language with extensions to support text editing.
-
-      The features of GNU Emacs include: content-sensitive editing modes,
-      including syntax coloring, for a wide variety of file types including
-      plain text, source code, and HTML; complete built-in documentation,
-      including a tutorial for new users; full Unicode support for nearly all
-      human languages and their scripts; highly customizable, using Emacs
-      Lisp code or a graphical interface; a large number of extensions that
-      add other functionality, including a project planner, mail and news
-      reader, debugger interface, calendar, and more.  Many of these
-      extensions are distributed with GNU Emacs; others are available
-      separately.
-
-      This is "Mac port" addition to GNU Emacs 24. This provides a native
-      GUI support for Mac OS X 10.4 - 10.9. Note that Emacs 23 and later
-      already contain the official GUI support via the NS (Cocoa) port for
-      Mac OS X 10.4 and later. So if it is good enough for you, then you
-      don't need to try this.
-    '';
-  };
-}
diff --git a/pkgs/applications/editors/emacs-24/macport-24.5.nix b/pkgs/applications/editors/emacs-24/macport-24.5.nix
index ed4c435c09b8..c778c42de857 100644
--- a/pkgs/applications/editors/emacs-24/macport-24.5.nix
+++ b/pkgs/applications/editors/emacs-24/macport-24.5.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls
-, Carbon, Cocoa, ImageCaptureCore, OSAKit, Quartz, WebKit, gettext
-, AppKit, GSS, ImageIO
+{ stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls, gettext
+, AppKit, Carbon, Cocoa, IOKit, OSAKit, Quartz, QuartzCore, WebKit
+, ImageCaptureCore, GSS, ImageIO # These may be optional
 }:
 
 stdenv.mkDerivation rec {
@@ -21,12 +21,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  buildInputs = [
-    ncurses libxml2 gnutls pkgconfig texinfo gettext
-  ];
+  buildInputs = [ ncurses libxml2 gnutls pkgconfig texinfo gettext ];
 
   propagatedBuildInputs = [
-    Carbon Cocoa ImageCaptureCore OSAKit Quartz WebKit AppKit GSS ImageIO
+    AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit
+    ImageCaptureCore GSS ImageIO   # may be optional
   ];
 
   postUnpack = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 01fef969bf3f..04c33ff547a0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11479,14 +11479,10 @@ let
     withGTK3 = false;
   }));
 
-  emacs24Macport_24_3 = lowPrio (callPackage ../applications/editors/emacs-24/macport-24.3.nix {
-    stdenv = pkgs.clangStdenv;
-  });
-  emacs24Macport_24_4 = lowPrio (callPackage ../applications/editors/emacs-24/macport-24.4.nix {
-    stdenv = pkgs.clangStdenv;
-  });
-  emacs24Macport_24_5 = lowPrio (newScope darwin.apple_sdk.frameworks ../applications/editors/emacs-24/macport-24.5.nix {
-    stdenv = pkgs.clangStdenv;
+  emacs24Macport_24_5 = lowPrio (callPackage ../applications/editors/emacs-24/macport-24.5.nix {
+    inherit (darwin.apple_sdk.frameworks)
+      AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit
+      ImageCaptureCore GSS ImageIO;
   });
   emacs24Macport = self.emacs24Macport_24_5;
 

From a8f526432c15c8448dc9dfc3bbc3ec7853a1ef3b Mon Sep 17 00:00:00 2001
From: Jakob Gillich <jakob@gillich.me>
Date: Tue, 5 Jan 2016 23:29:11 +0100
Subject: [PATCH 577/884] pybitmessage: init at 0.4.4

---
 .../pybitmessage/default.nix                  | 39 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/pybitmessage/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix
new file mode 100644
index 000000000000..c19b5ff31f9d
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchFromGitHub, python, pythonPackages, pyqt4, openssl }:
+
+stdenv.mkDerivation rec {
+  name = "pybitmessage-${version}";
+
+  version = "0.4.4";
+
+  src = fetchFromGitHub {
+    owner = "bitmessage";
+    repo = "PyBitmessage";
+    rev = "v${version}";
+    sha256 = "1f4h0yc1mfjnxzvxiv9hxgak59mgr3a5ykv50vlyiay82za20jax";
+  };
+
+  buildInputs = [ python pyqt4 openssl pythonPackages.wrapPython pythonPackages.sqlite3 ];
+
+  preConfigure = ''
+    substituteInPlace Makefile \
+      --replace "PREFIX?=/usr/local" "" \
+      --replace "/usr" ""
+  '';
+
+  makeFlags = [ "DESTDIR=$(out)" ];
+
+  postInstall = ''
+    substituteInPlace $out/bin/pybitmessage \
+      --replace "exec python2" "exec ${python}/bin/python" \
+      --replace "/opt/openssl-compat-bitcoin/lib/" "${openssl}/lib/"
+    wrapProgram $out/bin/pybitmessage \
+      --prefix PYTHONPATH : "$(toPythonPath $out):$PYTHONPATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://bitmessage.org/;
+    description = "The official Bitmessage client";
+    license = licenses.mit;
+    maintainers = with maintainers; [ jgillich ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 90bc9bfdc6b7..e0d2f5e3b126 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12916,6 +12916,8 @@ let
 
   puremapping = callPackage ../applications/audio/pd-plugins/puremapping { };
 
+  pybitmessage = callPackage ../applications/networking/instant-messengers/pybitmessage { };
+
   pythonmagick = callPackage ../applications/graphics/PythonMagick { };
 
   qbittorrent = callPackage ../applications/networking/p2p/qbittorrent {

From 464f327aa6b504526ef5526f1968491c4d44de90 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 11 Jan 2016 23:15:17 +0100
Subject: [PATCH 578/884] Move some excess description to longDescription

---
 pkgs/applications/misc/kgocode/default.nix      | 7 ++++++-
 pkgs/development/libraries/accelio/default.nix  | 6 +++++-
 pkgs/development/libraries/jemalloc/default.nix | 6 +++++-
 pkgs/tools/misc/ttylog/default.nix              | 6 +++++-
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/kgocode/default.nix b/pkgs/applications/misc/kgocode/default.nix
index 5e72b02045c7..aa184cbe1a48 100644
--- a/pkgs/applications/misc/kgocode/default.nix
+++ b/pkgs/applications/misc/kgocode/default.nix
@@ -12,7 +12,12 @@ stdenv.mkDerivation rec {
   };
 
   meta = with stdenv.lib; {
-    description = "a plugin for KTextEditor (Kate, KDevelop, among others) that provides basic code completion for the Go programming language. Uses gocode as completion provider";
+    description = "Go code completion for Kate, KDevelop and others";
+    longDescription = ''
+      A plugin for KTextEditor (Kate, KDevelop, among others) that provides
+      basic code completion for the Go programming language.
+      Uses gocode as completion provider.
+    '';
     homepage    = https://bitbucket.org/lucashnegri/kgocode/overview;
     maintainers = with maintainers; [ qknight ];
     license = licenses.gpl3Plus;
diff --git a/pkgs/development/libraries/accelio/default.nix b/pkgs/development/libraries/accelio/default.nix
index 80b0eba60bd2..637976977b14 100644
--- a/pkgs/development/libraries/accelio/default.nix
+++ b/pkgs/development/libraries/accelio/default.nix
@@ -47,7 +47,11 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://www.accelio.org/;
-    description = "a high-performance asynchronous reliable messaging and RPC library optimized for hardware acceleration";
+    description = "High-performance messaging and RPC library";
+    longDescription = ''
+      A high-performance asynchronous reliable messaging and RPC library
+      optimized for hardware acceleration.
+    '';
     license = licenses.bsd3;
     platforms = with platforms; linux ++ freebsd;
     maintainers = with maintainers; [ wkennington ];
diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix
index 746ebd2bfcdb..4a4bc0392290 100644
--- a/pkgs/development/libraries/jemalloc/default.nix
+++ b/pkgs/development/libraries/jemalloc/default.nix
@@ -10,7 +10,11 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://www.canonware.com/jemalloc/index.html;
-    description = "a general purpose malloc(3) implementation that emphasizes fragmentation avoidance and scalable concurrency support";
+    description = "General purpose malloc(3) implementation";
+    longDescription = ''
+      malloc(3)-compatible memory allocator that emphasizes fragmentation
+      avoidance and scalable concurrency support.
+    '';
     license = licenses.bsd2;
     platforms = platforms.all;
     maintainers = with maintainers; [ wkennington ];
diff --git a/pkgs/tools/misc/ttylog/default.nix b/pkgs/tools/misc/ttylog/default.nix
index 16db6b62eb7a..ab7ab2b68c34 100644
--- a/pkgs/tools/misc/ttylog/default.nix
+++ b/pkgs/tools/misc/ttylog/default.nix
@@ -15,7 +15,11 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = "http://ttylog.sourceforg.net";
-    description = "a serial port logger which can be used to print everything to stdout that comes from a serial device";
+    description = "Simple serial port logger";
+    longDescription = ''
+      A serial port logger which can be used to print everything to stdout
+      that comes from a serial device.
+    '';
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ wkennington ];

From b021d9aacfdcb4b1e60734a560138f18cdb90220 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 11 Jan 2016 23:26:02 +0100
Subject: [PATCH 579/884] metaEnvironment: remove dead packages

Broken since 2013. Upstream is dead.
---
 .../libraries/asc-support/default.nix         |  34 -
 .../libraries/asc-support/mingw.patch         |  48 -
 .../libraries/asf-support/default.nix         |  24 -
 pkgs/development/libraries/aterm/2.8.nix      |  36 -
 .../libraries/c-library/default.nix           |  22 -
 .../libraries/c-library/mingw.patch           | 114 ---
 .../libraries/config-support/default.nix      |  22 -
 .../libraries/error-support/default.nix       |  22 -
 pkgs/development/libraries/pgen/default.nix   |  33 -
 .../libraries/pt-support/default.nix          |  24 -
 .../libraries/ptable-support/default.nix      |  22 -
 .../libraries/rstore-support/default.nix      |  23 -
 .../libraries/sdf-library/default.nix         |  14 -
 .../libraries/sdf-support/default.nix         |  27 -
 .../libraries/sdf-support/mingw.patch         |  20 -
 pkgs/development/libraries/sglr/default.nix   |  28 -
 .../libraries/tide-support/default.nix        |  23 -
 .../libraries/toolbuslib/default.nix          |  24 -
 .../libraries/toolbuslib/mingw.patch          | 888 ------------------
 pkgs/top-level/all-packages.nix               |  19 -
 20 files changed, 1467 deletions(-)
 delete mode 100644 pkgs/development/libraries/asc-support/default.nix
 delete mode 100644 pkgs/development/libraries/asc-support/mingw.patch
 delete mode 100644 pkgs/development/libraries/asf-support/default.nix
 delete mode 100644 pkgs/development/libraries/aterm/2.8.nix
 delete mode 100644 pkgs/development/libraries/c-library/default.nix
 delete mode 100644 pkgs/development/libraries/c-library/mingw.patch
 delete mode 100644 pkgs/development/libraries/config-support/default.nix
 delete mode 100644 pkgs/development/libraries/error-support/default.nix
 delete mode 100644 pkgs/development/libraries/pgen/default.nix
 delete mode 100644 pkgs/development/libraries/pt-support/default.nix
 delete mode 100644 pkgs/development/libraries/ptable-support/default.nix
 delete mode 100644 pkgs/development/libraries/rstore-support/default.nix
 delete mode 100644 pkgs/development/libraries/sdf-library/default.nix
 delete mode 100644 pkgs/development/libraries/sdf-support/default.nix
 delete mode 100644 pkgs/development/libraries/sdf-support/mingw.patch
 delete mode 100644 pkgs/development/libraries/sglr/default.nix
 delete mode 100644 pkgs/development/libraries/tide-support/default.nix
 delete mode 100644 pkgs/development/libraries/toolbuslib/default.nix
 delete mode 100644 pkgs/development/libraries/toolbuslib/mingw.patch

diff --git a/pkgs/development/libraries/asc-support/default.nix b/pkgs/development/libraries/asc-support/default.nix
deleted file mode 100644
index a2b2588d9cc3..000000000000
--- a/pkgs/development/libraries/asc-support/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-
-{ stdenv
-, fetchurl
-, aterm
-, toolbuslib
-, asfSupport
-, errorSupport
-, ptSupport
-, sglr
-, tideSupport
-, cLibrary
-, configSupport 
-, ptableSupport
-, rstoreSupport
-, pkgconfig
-}:
-let 
-  isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ;
-in
-stdenv.mkDerivation rec {
-  name = "asc-support-2.6";
-
-  src = fetchurl {
-    url = "http://www.meta-environment.org/releases/${name}.tar.gz";
-    sha256 = "1svq368kdxnmjdfv8sqs0cn9s69c75qcp44mpapfjj6kfhrzkxdc";
-  };
-  
-  patches = if isMingw then [./mingw.patch] else [];
-
-  buildInputs = [aterm toolbuslib asfSupport errorSupport ptSupport sglr tideSupport cLibrary configSupport ptableSupport rstoreSupport ];
-  nativeBuildInputs = [pkgconfig];
-  
-  dontStrip = isMingw;
-}  
diff --git a/pkgs/development/libraries/asc-support/mingw.patch b/pkgs/development/libraries/asc-support/mingw.patch
deleted file mode 100644
index 8a421a99dae7..000000000000
--- a/pkgs/development/libraries/asc-support/mingw.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -rc asc-support-2.6/lib/asc-main.c asc-support-2.6-new/lib/asc-main.c
-*** asc-support-2.6/lib/asc-main.c	2008-11-10 14:12:47.000000000 +0100
---- asc-support-2.6-new/lib/asc-main.c	2010-08-24 11:02:04.000000000 +0200
-***************
-*** 7,13 ****
-  #include <ctype.h>
-  #include <string.h>
-  #include <sys/time.h>
-- #include <sys/resource.h>
-  #include <unistd.h>
-  #include <aterm2.h>
-  #include <sglrInterface.h>
---- 7,12 ----
-***************
-*** 46,52 ****
-  }
-  
-  static void printStats() {
--   struct rusage usage;
-    FILE *file;
-    char buf[BUFSIZ];
-    int size, resident, shared, trs, lrs, drs, dt;
---- 45,50 ----
-***************
-*** 61,74 ****
-      fprintf(stderr, "could not open %s\n", buf);
-      perror("");
-    }
-!   if (getrusage(RUSAGE_SELF, &usage) == -1) {
-!     perror("rusage");
-!   } else {
-!     fprintf(stderr, "utime       : %ld.%06d sec.\n",
-! 	    (long)usage.ru_utime.tv_sec, (int)usage.ru_utime.tv_usec);
-!     fprintf(stderr, "stime       : %ld.%06d sec.\n",
-! 	    (long)usage.ru_stime.tv_sec, (int)usage.ru_stime.tv_usec);
-!   }
-  }
-  
-  static ATbool toolbusMode(int argc, char* argv[]) {
---- 59,66 ----
-      fprintf(stderr, "could not open %s\n", buf);
-      perror("");
-    }
-!   fprintf(stderr, "utime       : %ld.%06d sec.\n", 0, 0);
-!   fprintf(stderr, "stime       : %ld.%06d sec.\n", 0, 0);
-  }
-  
-  static ATbool toolbusMode(int argc, char* argv[]) {
diff --git a/pkgs/development/libraries/asf-support/default.nix b/pkgs/development/libraries/asf-support/default.nix
deleted file mode 100644
index 9a712a869af7..000000000000
--- a/pkgs/development/libraries/asf-support/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-
-{ stdenv
-, fetchurl
-, aterm
-, errorSupport
-, ptSupport
-, pkgconfig
-}:
-let 
-  isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ;
-in
-stdenv.mkDerivation rec {
-  name = "asf-support-1.8";
-
-  src = fetchurl {
-    url = "http://www.meta-environment.org/releases/${name}.tar.gz";
-    sha256 = "04f7grfadq0si24rs9vlcknlahfa7nb3d6n6pjl1qbxi8m1gwhnc";
-  };
-
-  buildInputs = [aterm errorSupport ptSupport];
-  nativeBuildInputs = [pkgconfig];  
-
-  dontStrip = isMingw;
-} 
diff --git a/pkgs/development/libraries/aterm/2.8.nix b/pkgs/development/libraries/aterm/2.8.nix
deleted file mode 100644
index 3aa0e95305a9..000000000000
--- a/pkgs/development/libraries/aterm/2.8.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, fetchurl }:
-
-let
-  isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ;
-in
-stdenv.mkDerivation {
-  name = "aterm-2.8";
-
-  src = fetchurl {
-    url = http://www.meta-environment.org/releases/aterm-2.8.tar.gz;
-    sha256 = "1vq4qpmcww3n9v7bklgp7z1yqi9gmk6hcahqjqdzc5ksa089rdms";
-  };
-
-  patches = [
-    # Fix for http://bugzilla.sen.cwi.nl:8080/show_bug.cgi?id=841
-    ./max-long.patch
-  ] ++ ( if isMingw then [./aterm-mingw-asm.patch] else [] );
-
-  # The test programs stress, randgen, fib, and testsafio all fail with
-  # segmentation faults when compiled with GCC 4.8.x, and the code itself many
-  # warnings, complaining "cast from pointer to integer of different size".
-  # This looks really bad. I leave the test suite enabled, because those issue
-  # feel too serious to just ignore.
-  doCheck = true;
-
-  dontStrip = isMingw;
-
-  meta = {
-    homepage = http://www.cwi.nl/htbin/sen1/twiki/bin/view/SEN1/ATerm;
-    license = "LGPL";
-    description = "Library for manipulation of term data structures in C";
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
-    broken = true;
-  };
-}
diff --git a/pkgs/development/libraries/c-library/default.nix b/pkgs/development/libraries/c-library/default.nix
deleted file mode 100644
index 714e8b66089c..000000000000
--- a/pkgs/development/libraries/c-library/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv
-, fetchurl
-, aterm
-, pkgconfig
-}:
-let 
-  isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ;
-in
-stdenv.mkDerivation rec {
-  name = "c-library-1.2";
-
-  src = fetchurl {
-    url = "http://www.meta-environment.org/releases/${name}.tar.gz";
-    sha256 = "0rmhag2653nq76n1n49blii9zx0ph58szv1xzw1i551wmw7yrz88";
-  };
-  
-  patches = if isMingw then [./mingw.patch] else [];
-  
-  buildInputs = [aterm];
-  nativeBuildInputs = [pkgconfig];
-  dontStrip = isMingw;
-}  
diff --git a/pkgs/development/libraries/c-library/mingw.patch b/pkgs/development/libraries/c-library/mingw.patch
deleted file mode 100644
index 8b5ca31e20de..000000000000
--- a/pkgs/development/libraries/c-library/mingw.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-diff -rc c-library-1.2/statistics/rsrc-usage.c c-library-1.2-new/statistics/rsrc-usage.c
-*** c-library-1.2/statistics/rsrc-usage.c	2008-11-10 14:09:47.000000000 +0100
---- c-library-1.2-new/statistics/rsrc-usage.c	2010-08-24 09:09:13.000000000 +0200
-***************
-*** 2,81 ****
-  
-  #include <unistd.h>
-  #include <stdio.h>
-- #include <sys/time.h>
-- #include <sys/resource.h>
-  #include "rsrc-usage.h"
-  
-  /*static int AT_calcAllocatedSize();*/
-- static struct rusage rsrc_usage;
-- static struct rusage flt_rsrc_usage;
-  
-  void printrusage(struct rusage *rusage) {
--   fprintf(stderr, "maxrss %ld\n", rusage->ru_maxrss);
--   fprintf(stderr, "ixrss %ld\n", rusage->ru_ixrss);
--   fprintf(stderr, "idrss %ld\n", rusage->ru_idrss);
--   fprintf(stderr, "isrss %ld\n", rusage->ru_isrss);
--   fprintf(stderr, "minflt %ld\n", rusage->ru_minflt);
--   fprintf(stderr, "majflt %ld\n", rusage->ru_majflt);
--   fprintf(stderr, "nswap %ld\n", rusage->ru_nswap);
--   fprintf(stderr, "inblock %ld\n", rusage->ru_inblock);
--   fprintf(stderr, "oublock %ld\n", rusage->ru_oublock);
--   fprintf(stderr, "msgsnd %ld\n", rusage->ru_msgsnd);
--   fprintf(stderr, "msgrcv %ld\n", rusage->ru_msgrcv);
--   fprintf(stderr, "nsignals %ld\n", rusage->ru_nsignals);
--   fprintf(stderr, "nvcsw %ld\n", rusage->ru_nvcsw);
--   fprintf(stderr, "nivcsw %ld\n", rusage->ru_nivcsw);
-  }
-  
-  double STATS_Timer(void) {
-!   static double cur = 0;
-!   double prev;
-! 
-!   prev = cur;
-!   if (getrusage(RUSAGE_SELF, &rsrc_usage) == -1) {
-!     perror("getrusage");
-!     return (double)0;
-!   }
-! 
-!   cur  =  (double) (rsrc_usage.ru_utime.tv_sec) +
-!     (double) ((rsrc_usage.ru_utime.tv_usec) * 1.0e-06);
-! 
-!   prev = cur - prev;
-!   return prev > 0 ? prev: 0;
-  }
-  
-  void STATS_PageFlt(long *maj, long *min) {
-!   static long ma, mi, ma_prev, mi_prev;
-! 
-! 
-!   ma_prev = ma;
-!   mi_prev = mi;
-!   getrusage(RUSAGE_SELF, &flt_rsrc_usage);
-! 
-!   /* printrusage(&flt_rsrc_usage); */
-! 
-!   mi = flt_rsrc_usage.ru_minflt - mi_prev;
-!   ma = flt_rsrc_usage.ru_majflt - ma_prev;
-! 
-!   *maj = ma;
-!   *min = mi;
-  }
-  
-  long STATS_Allocated(void) {
-!   static long allocated = 0L;
-!   long tmp;
-! 
-!   tmp = allocated;
-!   /** \todo: AT_calcAllocatedSize() is unreachable. Fix. */
-!   /*allocated = AT_calcAllocatedSize();*/
-! 
-!   return allocated - tmp;
-  }
-  
-  long STATS_ResidentSetSize(void) {
-!   getrusage(RUSAGE_SELF, &rsrc_usage);
-! 
-!   return rsrc_usage.ru_maxrss;
-  }
-  
-  
---- 2,29 ----
-  
-  #include <unistd.h>
-  #include <stdio.h>
-  #include "rsrc-usage.h"
-  
-  /*static int AT_calcAllocatedSize();*/
-  
-  void printrusage(struct rusage *rusage) {
-  }
-  
-  double STATS_Timer(void) {
-!    return 0;
-  }
-  
-  void STATS_PageFlt(long *maj, long *min) {
-!   *maj = 0;
-!   *min = 0;
-  }
-  
-  long STATS_Allocated(void) {
-!   return 0;
-  }
-  
-  long STATS_ResidentSetSize(void) {
-!   return 0;
-  }
-  
-  
diff --git a/pkgs/development/libraries/config-support/default.nix b/pkgs/development/libraries/config-support/default.nix
deleted file mode 100644
index d25accd4664e..000000000000
--- a/pkgs/development/libraries/config-support/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-
-{ stdenv
-, fetchurl
-, aterm
-, pkgconfig
-}:
-let 
-  isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ;
-in
-stdenv.mkDerivation rec {
-  name = "config-support-1.4";
-
-  src = fetchurl {
-    url = "http://www.meta-environment.org/releases/${name}.tar.gz";
-    sha256 = "0klhc7v760aklsy73pwn87snhgalkfxisac8srn8qcd3ljbfdrmi";
-  };
-
-  buildInputs = [aterm];
-  nativeBuildInputs = [pkgconfig];
-
-  dontStrip = isMingw;
-} 
diff --git a/pkgs/development/libraries/error-support/default.nix b/pkgs/development/libraries/error-support/default.nix
deleted file mode 100644
index 766a0dbef1d8..000000000000
--- a/pkgs/development/libraries/error-support/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv
-, fetchurl
-, aterm
-, toolbuslib
-, pkgconfig
-}:
-let 
-  isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ;
-in
-stdenv.mkDerivation rec {
-  name = "error-support-1.6";
-
-  src = fetchurl {
-    url = "http://www.meta-environment.org/releases/${name}.tar.gz";
-    sha256 = "0sdw3mrh90k76w2pvpdfg7d2cxfxb3s5spbqglkkpvx8bldhlk33";
-  };
-
-  buildInputs = [aterm toolbuslib];
-  nativeBuildInputs = [pkgconfig];
-
-  dontStrip = isMingw;
-} 
diff --git a/pkgs/development/libraries/pgen/default.nix b/pkgs/development/libraries/pgen/default.nix
deleted file mode 100644
index 53dc7a768ee3..000000000000
--- a/pkgs/development/libraries/pgen/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-
-{ stdenv
-, fetchurl
-, aterm
-, toolbuslib
-, cLibrary
-, configSupport
-, ptSupport
-, ptableSupport
-, errorSupport 
-, tideSupport
-, ascSupport
-, asfSupport
-, sdfSupport
-, sglr
-, pkgconfig
-}:
-let 
-  isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ;
-in
-stdenv.mkDerivation ( rec {
-  name = "pgen-2.8.1";
-
-  src = fetchurl {
-    url = "http://www.meta-environment.org/releases/${name}.tar.gz";
-    sha256 = "0z5x6rnsp732jdszcgm22bfw3v6ai9zl49b3s5iyk9qjfmyx0h41";
-  };
-
-  buildInputs = [aterm toolbuslib cLibrary configSupport ptSupport ptableSupport errorSupport tideSupport sdfSupport sglr ascSupport asfSupport];
-  nativeBuildInputs = [pkgconfig];
-
-  dontStrip = isMingw;
-} // ( if isMingw then { NIX_CFLAGS_COMPILE = "-O2 -Wl,--stack=0x2300000"; } else {} ) )
diff --git a/pkgs/development/libraries/pt-support/default.nix b/pkgs/development/libraries/pt-support/default.nix
deleted file mode 100644
index 063fdd7cc049..000000000000
--- a/pkgs/development/libraries/pt-support/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv
-, fetchurl
-, aterm
-, toolbuslib
-, errorSupport
-, pkgconfig
-}:
-let 
-  isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ;
-in
-stdenv.mkDerivation ( rec {
-  name = "pt-support-2.4";
-
-  src = fetchurl {
-    url = "http://www.meta-environment.org/releases/${name}.tar.gz";
-    sha256 = "14krhhhmrg7605ppglzd1k08n7x61g7vdkh11qcz8hb9r4n71j45";
-  };
-
-  buildInputs = [aterm toolbuslib errorSupport];
-  nativeBuildInputs = [pkgconfig];
-  
-  dontStrip = isMingw;
-} // ( if isMingw then { NIX_CFLAGS_COMPILE = "-O2 -Wl,--stack=0x2300000"; } else {} ) )
-
diff --git a/pkgs/development/libraries/ptable-support/default.nix b/pkgs/development/libraries/ptable-support/default.nix
deleted file mode 100644
index 357d288c7320..000000000000
--- a/pkgs/development/libraries/ptable-support/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv
-, fetchurl
-, aterm
-, ptSupport
-, pkgconfig
-}:
-let 
-  isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ;
-in
-stdenv.mkDerivation rec {
-  name = "ptable-support-1.2";
-
-  src = fetchurl {
-    url = "http://www.meta-environment.org/releases/${name}.tar.gz";
-    sha256 = "0bqx1xsimf9vq6q2qnsy3565rzlha4cm2blcn3kqwbirfyj1kln9";
-  };
-
-  buildInputs = [aterm ptSupport];
-  nativeBuildInputs = [pkgconfig];
-  
-  dontStrip = isMingw;
-} 
diff --git a/pkgs/development/libraries/rstore-support/default.nix b/pkgs/development/libraries/rstore-support/default.nix
deleted file mode 100644
index c18f52e84d7c..000000000000
--- a/pkgs/development/libraries/rstore-support/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-
-{ stdenv
-, fetchurl
-, aterm
-, toolbuslib
-, pkgconfig
-}:
-let 
-  isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ;
-in    
-stdenv.mkDerivation rec {
-  name = "rstore-support-1.0";
-
-  src = fetchurl {
-    url = "http://www.meta-environment.org/releases/${name}.tar.gz";
-    sha256 = "0fahq947bdaiymfz08fb2kvbnggpc8ybhh3sbxgja61pp2jizg46";
-  };
-
-  buildInputs = [aterm toolbuslib];
-  nativeBuildInputs = [pkgconfig];  
-
-  dontStrip = isMingw;
-} 
diff --git a/pkgs/development/libraries/sdf-library/default.nix b/pkgs/development/libraries/sdf-library/default.nix
deleted file mode 100644
index 76c1782fbc56..000000000000
--- a/pkgs/development/libraries/sdf-library/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ stdenv
-, fetchurl
-, aterm
-}:
-stdenv.mkDerivation {
-  name = "sdf-library-1.1";
-
-  src = fetchurl {
-    url = http://www.meta-environment.org/releases/sdf-library-1.1.tar.gz;
-    sha256 = "0dnv2f690s4q60bssavivganyalh7n966grcsb5hlb6z57gbaqp1";
-  };
-
-  buildInputs = [aterm];
-}
diff --git a/pkgs/development/libraries/sdf-support/default.nix b/pkgs/development/libraries/sdf-support/default.nix
deleted file mode 100644
index 8095650b12ff..000000000000
--- a/pkgs/development/libraries/sdf-support/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-
-{ stdenv
-, fetchurl
-, aterm
-, toolbuslib
-, errorSupport
-, ptSupport
-, pkgconfig
-}:
-let 
-  isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ;
-in
-stdenv.mkDerivation rec {
-  name = "sdf-support-2.5";
-
-  src = fetchurl {
-    url = "http://www.meta-environment.org/releases/${name}.tar.gz";
-    sha256 = "0zazks2yvm8gqdx0389b1b8hf8ss284q1ywk4d7cqc8glba29cs0";
-  };
-
-  patches = if isMingw then [./mingw.patch] else [];
-
-  buildInputs = [aterm toolbuslib errorSupport ptSupport];
-  nativeBuildInputs = [pkgconfig];  
-
-  dontStrip = isMingw;
-} 
diff --git a/pkgs/development/libraries/sdf-support/mingw.patch b/pkgs/development/libraries/sdf-support/mingw.patch
deleted file mode 100644
index 59e57065b7da..000000000000
--- a/pkgs/development/libraries/sdf-support/mingw.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -rc sdf-support-2.5/utils/sdf-modules/src/main.c sdf-support-2.5-new/utils/sdf-modules/src/main.c
-*** sdf-support-2.5/utils/sdf-modules/src/main.c	2008-11-10 14:20:07.000000000 +0100
---- sdf-support-2.5-new/utils/sdf-modules/src/main.c	2010-08-24 10:53:04.000000000 +0200
-***************
-*** 19,25 ****
-  /*{{{  defines */
-  
-  #define SEP '/'
-! #define PATH_LEN (_POSIX_PATH_MAX)
-  
-  /*}}}  */
-  /*{{{  variables */
---- 19,25 ----
-  /*{{{  defines */
-  
-  #define SEP '/'
-! #define PATH_LEN (256)
-  
-  /*}}}  */
-  /*{{{  variables */
diff --git a/pkgs/development/libraries/sglr/default.nix b/pkgs/development/libraries/sglr/default.nix
deleted file mode 100644
index f6c14eae464d..000000000000
--- a/pkgs/development/libraries/sglr/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-
-{ stdenv
-, fetchurl
-, aterm
-, toolbuslib
-, cLibrary
-, configSupport
-, ptSupport
-, ptableSupport
-, errorSupport 
-, pkgconfig
-}:
-let 
-  isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ;
-in    
-stdenv.mkDerivation rec {
-  name = "sglr-4.5.3";
-
-  src = fetchurl {
-    url = "http://www.meta-environment.org/releases/${name}.tar.gz";
-    sha256 = "1k3q9k32r6i2wh3k6b000fs11n0vhy6yr8kr0bd58ybwp5dnjj77";
-  };
-
-  buildInputs = [aterm toolbuslib cLibrary configSupport ptSupport ptableSupport errorSupport];
-  nativeBuildInputs = [pkgconfig];  
-
-  dontStrip = isMingw;
-} 
diff --git a/pkgs/development/libraries/tide-support/default.nix b/pkgs/development/libraries/tide-support/default.nix
deleted file mode 100644
index d30d316c0dc0..000000000000
--- a/pkgs/development/libraries/tide-support/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-
-{ stdenv
-, fetchurl
-, aterm
-, toolbuslib
-, pkgconfig
-}:
-let 
-  isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ;
-in    
-stdenv.mkDerivation rec {
-  name = "tide-support-1.3.1";
-
-  src = fetchurl {
-    url = "http://www.meta-environment.org/releases/${name}.tar.gz";
-    sha256 = "06n80rihcj2dhrvx8969jbgxqvg2vb3jqpkdmcr47y08xs7j5n2b";
-  };
-
-  buildInputs = [aterm toolbuslib];
-  nativeBuildInputs = [pkgconfig];    
-
-  dontStrip = isMingw;
-} 
diff --git a/pkgs/development/libraries/toolbuslib/default.nix b/pkgs/development/libraries/toolbuslib/default.nix
deleted file mode 100644
index 16680f0134c3..000000000000
--- a/pkgs/development/libraries/toolbuslib/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv
-, fetchurl
-, aterm
-, pkgconfig
-, w32api
-}:
-let 
-  isMingw = stdenv ? cross && stdenv.cross.config == "i686-pc-mingw32" ;
-in
-stdenv.mkDerivation rec {
-  name = "toolbuslib-1.1";
-
-  src = fetchurl {
-    url = "http://www.meta-environment.org/releases/${name}.tar.gz";
-    sha256 = "0f4q0r177lih23ypypc8ckkyv5vhvnkhbrv25gswrqdif5dxbwr0";
-  };
-
-  patches = if isMingw then [./mingw.patch] else [];
-  
-  buildInputs = [aterm] ++ (if isMingw then [w32api] else []);
-  nativeBuildInputs = [pkgconfig];
-  
-  dontStrip = isMingw; 
-}  
diff --git a/pkgs/development/libraries/toolbuslib/mingw.patch b/pkgs/development/libraries/toolbuslib/mingw.patch
deleted file mode 100644
index 04484aaee921..000000000000
--- a/pkgs/development/libraries/toolbuslib/mingw.patch
+++ /dev/null
@@ -1,888 +0,0 @@
-diff -rc toolbuslib-1.1/configure toolbuslib-1.1-new/configure
-*** toolbuslib-1.1/configure	2008-11-10 13:59:46.000000000 +0100
---- toolbuslib-1.1-new/configure	2010-08-23 16:53:39.000000000 +0200
-***************
-*** 20719,21162 ****
-  fi
-  
-  
-- if test "${ac_cv_header_netdb_h+set}" = set; then
--   echo "$as_me:$LINENO: checking for netdb.h" >&5
-- echo $ECHO_N "checking for netdb.h... $ECHO_C" >&6
-- if test "${ac_cv_header_netdb_h+set}" = set; then
--   echo $ECHO_N "(cached) $ECHO_C" >&6
-- fi
-- echo "$as_me:$LINENO: result: $ac_cv_header_netdb_h" >&5
-- echo "${ECHO_T}$ac_cv_header_netdb_h" >&6
-- else
--   # Is the header compilable?
-- echo "$as_me:$LINENO: checking netdb.h usability" >&5
-- echo $ECHO_N "checking netdb.h usability... $ECHO_C" >&6
-- cat >conftest.$ac_ext <<_ACEOF
-- /* confdefs.h.  */
-- _ACEOF
-- cat confdefs.h >>conftest.$ac_ext
-- cat >>conftest.$ac_ext <<_ACEOF
-- /* end confdefs.h.  */
-- $ac_includes_default
-- #include <netdb.h>
-- _ACEOF
-- rm -f conftest.$ac_objext
-- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--   (eval $ac_compile) 2>conftest.er1
--   ac_status=$?
--   grep -v '^ *+' conftest.er1 >conftest.err
--   rm -f conftest.er1
--   cat conftest.err >&5
--   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--   (exit $ac_status); } &&
-- 	 { ac_try='test -z "$ac_c_werror_flag"
-- 			 || test ! -s conftest.err'
--   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--   (eval $ac_try) 2>&5
--   ac_status=$?
--   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--   (exit $ac_status); }; } &&
-- 	 { ac_try='test -s conftest.$ac_objext'
--   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--   (eval $ac_try) 2>&5
--   ac_status=$?
--   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--   (exit $ac_status); }; }; then
--   ac_header_compiler=yes
-- else
--   echo "$as_me: failed program was:" >&5
-- sed 's/^/| /' conftest.$ac_ext >&5
-- 
-- ac_header_compiler=no
-- fi
-- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-- echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-- echo "${ECHO_T}$ac_header_compiler" >&6
-- 
-- # Is the header present?
-- echo "$as_me:$LINENO: checking netdb.h presence" >&5
-- echo $ECHO_N "checking netdb.h presence... $ECHO_C" >&6
-- cat >conftest.$ac_ext <<_ACEOF
-- /* confdefs.h.  */
-- _ACEOF
-- cat confdefs.h >>conftest.$ac_ext
-- cat >>conftest.$ac_ext <<_ACEOF
-- /* end confdefs.h.  */
-- #include <netdb.h>
-- _ACEOF
-- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
--   ac_status=$?
--   grep -v '^ *+' conftest.er1 >conftest.err
--   rm -f conftest.er1
--   cat conftest.err >&5
--   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--   (exit $ac_status); } >/dev/null; then
--   if test -s conftest.err; then
--     ac_cpp_err=$ac_c_preproc_warn_flag
--     ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
--   else
--     ac_cpp_err=
--   fi
-- else
--   ac_cpp_err=yes
-- fi
-- if test -z "$ac_cpp_err"; then
--   ac_header_preproc=yes
-- else
--   echo "$as_me: failed program was:" >&5
-- sed 's/^/| /' conftest.$ac_ext >&5
-- 
--   ac_header_preproc=no
-- fi
-- rm -f conftest.err conftest.$ac_ext
-- echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-- echo "${ECHO_T}$ac_header_preproc" >&6
-- 
-- # So?  What about this header?
-- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
--   yes:no: )
--     { echo "$as_me:$LINENO: WARNING: netdb.h: accepted by the compiler, rejected by the preprocessor!" >&5
-- echo "$as_me: WARNING: netdb.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
--     { echo "$as_me:$LINENO: WARNING: netdb.h: proceeding with the compiler's result" >&5
-- echo "$as_me: WARNING: netdb.h: proceeding with the compiler's result" >&2;}
--     ac_header_preproc=yes
--     ;;
--   no:yes:* )
--     { echo "$as_me:$LINENO: WARNING: netdb.h: present but cannot be compiled" >&5
-- echo "$as_me: WARNING: netdb.h: present but cannot be compiled" >&2;}
--     { echo "$as_me:$LINENO: WARNING: netdb.h:     check for missing prerequisite headers?" >&5
-- echo "$as_me: WARNING: netdb.h:     check for missing prerequisite headers?" >&2;}
--     { echo "$as_me:$LINENO: WARNING: netdb.h: see the Autoconf documentation" >&5
-- echo "$as_me: WARNING: netdb.h: see the Autoconf documentation" >&2;}
--     { echo "$as_me:$LINENO: WARNING: netdb.h:     section \"Present But Cannot Be Compiled\"" >&5
-- echo "$as_me: WARNING: netdb.h:     section \"Present But Cannot Be Compiled\"" >&2;}
--     { echo "$as_me:$LINENO: WARNING: netdb.h: proceeding with the preprocessor's result" >&5
-- echo "$as_me: WARNING: netdb.h: proceeding with the preprocessor's result" >&2;}
--     { echo "$as_me:$LINENO: WARNING: netdb.h: in the future, the compiler will take precedence" >&5
-- echo "$as_me: WARNING: netdb.h: in the future, the compiler will take precedence" >&2;}
--     (
--       cat <<\_ASBOX
-- ## ------------------------------------------ ##
-- ## Report this to the AC_PACKAGE_NAME lists.  ##
-- ## ------------------------------------------ ##
-- _ASBOX
--     ) |
--       sed "s/^/$as_me: WARNING:     /" >&2
--     ;;
-- esac
-- echo "$as_me:$LINENO: checking for netdb.h" >&5
-- echo $ECHO_N "checking for netdb.h... $ECHO_C" >&6
-- if test "${ac_cv_header_netdb_h+set}" = set; then
--   echo $ECHO_N "(cached) $ECHO_C" >&6
-- else
--   ac_cv_header_netdb_h=$ac_header_preproc
-- fi
-- echo "$as_me:$LINENO: result: $ac_cv_header_netdb_h" >&5
-- echo "${ECHO_T}$ac_cv_header_netdb_h" >&6
-- 
-- fi
-- if test $ac_cv_header_netdb_h = yes; then
--   :
-- else
--   { { echo "$as_me:$LINENO: error: \"*** no netdb.h\"" >&5
-- echo "$as_me: error: \"*** no netdb.h\"" >&2;}
--    { (exit 1); exit 1; }; }
-- fi
-- 
-- 
-- if test "${ac_cv_header_netinet_in_h+set}" = set; then
--   echo "$as_me:$LINENO: checking for netinet/in.h" >&5
-- echo $ECHO_N "checking for netinet/in.h... $ECHO_C" >&6
-- if test "${ac_cv_header_netinet_in_h+set}" = set; then
--   echo $ECHO_N "(cached) $ECHO_C" >&6
-- fi
-- echo "$as_me:$LINENO: result: $ac_cv_header_netinet_in_h" >&5
-- echo "${ECHO_T}$ac_cv_header_netinet_in_h" >&6
-- else
--   # Is the header compilable?
-- echo "$as_me:$LINENO: checking netinet/in.h usability" >&5
-- echo $ECHO_N "checking netinet/in.h usability... $ECHO_C" >&6
-- cat >conftest.$ac_ext <<_ACEOF
-- /* confdefs.h.  */
-- _ACEOF
-- cat confdefs.h >>conftest.$ac_ext
-- cat >>conftest.$ac_ext <<_ACEOF
-- /* end confdefs.h.  */
-- $ac_includes_default
-- #include <netinet/in.h>
-- _ACEOF
-- rm -f conftest.$ac_objext
-- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--   (eval $ac_compile) 2>conftest.er1
--   ac_status=$?
--   grep -v '^ *+' conftest.er1 >conftest.err
--   rm -f conftest.er1
--   cat conftest.err >&5
--   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--   (exit $ac_status); } &&
-- 	 { ac_try='test -z "$ac_c_werror_flag"
-- 			 || test ! -s conftest.err'
--   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--   (eval $ac_try) 2>&5
--   ac_status=$?
--   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--   (exit $ac_status); }; } &&
-- 	 { ac_try='test -s conftest.$ac_objext'
--   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--   (eval $ac_try) 2>&5
--   ac_status=$?
--   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--   (exit $ac_status); }; }; then
--   ac_header_compiler=yes
-- else
--   echo "$as_me: failed program was:" >&5
-- sed 's/^/| /' conftest.$ac_ext >&5
-- 
-- ac_header_compiler=no
-- fi
-- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-- echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-- echo "${ECHO_T}$ac_header_compiler" >&6
-- 
-- # Is the header present?
-- echo "$as_me:$LINENO: checking netinet/in.h presence" >&5
-- echo $ECHO_N "checking netinet/in.h presence... $ECHO_C" >&6
-- cat >conftest.$ac_ext <<_ACEOF
-- /* confdefs.h.  */
-- _ACEOF
-- cat confdefs.h >>conftest.$ac_ext
-- cat >>conftest.$ac_ext <<_ACEOF
-- /* end confdefs.h.  */
-- #include <netinet/in.h>
-- _ACEOF
-- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
--   ac_status=$?
--   grep -v '^ *+' conftest.er1 >conftest.err
--   rm -f conftest.er1
--   cat conftest.err >&5
--   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--   (exit $ac_status); } >/dev/null; then
--   if test -s conftest.err; then
--     ac_cpp_err=$ac_c_preproc_warn_flag
--     ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
--   else
--     ac_cpp_err=
--   fi
-- else
--   ac_cpp_err=yes
-- fi
-- if test -z "$ac_cpp_err"; then
--   ac_header_preproc=yes
-- else
--   echo "$as_me: failed program was:" >&5
-- sed 's/^/| /' conftest.$ac_ext >&5
-- 
--   ac_header_preproc=no
-- fi
-- rm -f conftest.err conftest.$ac_ext
-- echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-- echo "${ECHO_T}$ac_header_preproc" >&6
-- 
-- # So?  What about this header?
-- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
--   yes:no: )
--     { echo "$as_me:$LINENO: WARNING: netinet/in.h: accepted by the compiler, rejected by the preprocessor!" >&5
-- echo "$as_me: WARNING: netinet/in.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
--     { echo "$as_me:$LINENO: WARNING: netinet/in.h: proceeding with the compiler's result" >&5
-- echo "$as_me: WARNING: netinet/in.h: proceeding with the compiler's result" >&2;}
--     ac_header_preproc=yes
--     ;;
--   no:yes:* )
--     { echo "$as_me:$LINENO: WARNING: netinet/in.h: present but cannot be compiled" >&5
-- echo "$as_me: WARNING: netinet/in.h: present but cannot be compiled" >&2;}
--     { echo "$as_me:$LINENO: WARNING: netinet/in.h:     check for missing prerequisite headers?" >&5
-- echo "$as_me: WARNING: netinet/in.h:     check for missing prerequisite headers?" >&2;}
--     { echo "$as_me:$LINENO: WARNING: netinet/in.h: see the Autoconf documentation" >&5
-- echo "$as_me: WARNING: netinet/in.h: see the Autoconf documentation" >&2;}
--     { echo "$as_me:$LINENO: WARNING: netinet/in.h:     section \"Present But Cannot Be Compiled\"" >&5
-- echo "$as_me: WARNING: netinet/in.h:     section \"Present But Cannot Be Compiled\"" >&2;}
--     { echo "$as_me:$LINENO: WARNING: netinet/in.h: proceeding with the preprocessor's result" >&5
-- echo "$as_me: WARNING: netinet/in.h: proceeding with the preprocessor's result" >&2;}
--     { echo "$as_me:$LINENO: WARNING: netinet/in.h: in the future, the compiler will take precedence" >&5
-- echo "$as_me: WARNING: netinet/in.h: in the future, the compiler will take precedence" >&2;}
--     (
--       cat <<\_ASBOX
-- ## ------------------------------------------ ##
-- ## Report this to the AC_PACKAGE_NAME lists.  ##
-- ## ------------------------------------------ ##
-- _ASBOX
--     ) |
--       sed "s/^/$as_me: WARNING:     /" >&2
--     ;;
-- esac
-- echo "$as_me:$LINENO: checking for netinet/in.h" >&5
-- echo $ECHO_N "checking for netinet/in.h... $ECHO_C" >&6
-- if test "${ac_cv_header_netinet_in_h+set}" = set; then
--   echo $ECHO_N "(cached) $ECHO_C" >&6
-- else
--   ac_cv_header_netinet_in_h=$ac_header_preproc
-- fi
-- echo "$as_me:$LINENO: result: $ac_cv_header_netinet_in_h" >&5
-- echo "${ECHO_T}$ac_cv_header_netinet_in_h" >&6
-- 
-- fi
-- if test $ac_cv_header_netinet_in_h = yes; then
--   :
-- else
--   { { echo "$as_me:$LINENO: error: \"*** no netinet/in.h\"" >&5
-- echo "$as_me: error: \"*** no netinet/in.h\"" >&2;}
--    { (exit 1); exit 1; }; }
-- fi
-- 
-- 
-- if test "${ac_cv_header_netinet_tcp_h+set}" = set; then
--   echo "$as_me:$LINENO: checking for netinet/tcp.h" >&5
-- echo $ECHO_N "checking for netinet/tcp.h... $ECHO_C" >&6
-- if test "${ac_cv_header_netinet_tcp_h+set}" = set; then
--   echo $ECHO_N "(cached) $ECHO_C" >&6
-- fi
-- echo "$as_me:$LINENO: result: $ac_cv_header_netinet_tcp_h" >&5
-- echo "${ECHO_T}$ac_cv_header_netinet_tcp_h" >&6
-- else
--   # Is the header compilable?
-- echo "$as_me:$LINENO: checking netinet/tcp.h usability" >&5
-- echo $ECHO_N "checking netinet/tcp.h usability... $ECHO_C" >&6
-- cat >conftest.$ac_ext <<_ACEOF
-- /* confdefs.h.  */
-- _ACEOF
-- cat confdefs.h >>conftest.$ac_ext
-- cat >>conftest.$ac_ext <<_ACEOF
-- /* end confdefs.h.  */
-- $ac_includes_default
-- #include <netinet/tcp.h>
-- _ACEOF
-- rm -f conftest.$ac_objext
-- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--   (eval $ac_compile) 2>conftest.er1
--   ac_status=$?
--   grep -v '^ *+' conftest.er1 >conftest.err
--   rm -f conftest.er1
--   cat conftest.err >&5
--   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--   (exit $ac_status); } &&
-- 	 { ac_try='test -z "$ac_c_werror_flag"
-- 			 || test ! -s conftest.err'
--   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--   (eval $ac_try) 2>&5
--   ac_status=$?
--   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--   (exit $ac_status); }; } &&
-- 	 { ac_try='test -s conftest.$ac_objext'
--   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--   (eval $ac_try) 2>&5
--   ac_status=$?
--   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--   (exit $ac_status); }; }; then
--   ac_header_compiler=yes
-- else
--   echo "$as_me: failed program was:" >&5
-- sed 's/^/| /' conftest.$ac_ext >&5
-- 
-- ac_header_compiler=no
-- fi
-- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-- echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-- echo "${ECHO_T}$ac_header_compiler" >&6
-- 
-- # Is the header present?
-- echo "$as_me:$LINENO: checking netinet/tcp.h presence" >&5
-- echo $ECHO_N "checking netinet/tcp.h presence... $ECHO_C" >&6
-- cat >conftest.$ac_ext <<_ACEOF
-- /* confdefs.h.  */
-- _ACEOF
-- cat confdefs.h >>conftest.$ac_ext
-- cat >>conftest.$ac_ext <<_ACEOF
-- /* end confdefs.h.  */
-- #include <netinet/tcp.h>
-- _ACEOF
-- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
--   ac_status=$?
--   grep -v '^ *+' conftest.er1 >conftest.err
--   rm -f conftest.er1
--   cat conftest.err >&5
--   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--   (exit $ac_status); } >/dev/null; then
--   if test -s conftest.err; then
--     ac_cpp_err=$ac_c_preproc_warn_flag
--     ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
--   else
--     ac_cpp_err=
--   fi
-- else
--   ac_cpp_err=yes
-- fi
-- if test -z "$ac_cpp_err"; then
--   ac_header_preproc=yes
-- else
--   echo "$as_me: failed program was:" >&5
-- sed 's/^/| /' conftest.$ac_ext >&5
-- 
--   ac_header_preproc=no
-- fi
-- rm -f conftest.err conftest.$ac_ext
-- echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-- echo "${ECHO_T}$ac_header_preproc" >&6
-- 
-- # So?  What about this header?
-- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
--   yes:no: )
--     { echo "$as_me:$LINENO: WARNING: netinet/tcp.h: accepted by the compiler, rejected by the preprocessor!" >&5
-- echo "$as_me: WARNING: netinet/tcp.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
--     { echo "$as_me:$LINENO: WARNING: netinet/tcp.h: proceeding with the compiler's result" >&5
-- echo "$as_me: WARNING: netinet/tcp.h: proceeding with the compiler's result" >&2;}
--     ac_header_preproc=yes
--     ;;
--   no:yes:* )
--     { echo "$as_me:$LINENO: WARNING: netinet/tcp.h: present but cannot be compiled" >&5
-- echo "$as_me: WARNING: netinet/tcp.h: present but cannot be compiled" >&2;}
--     { echo "$as_me:$LINENO: WARNING: netinet/tcp.h:     check for missing prerequisite headers?" >&5
-- echo "$as_me: WARNING: netinet/tcp.h:     check for missing prerequisite headers?" >&2;}
--     { echo "$as_me:$LINENO: WARNING: netinet/tcp.h: see the Autoconf documentation" >&5
-- echo "$as_me: WARNING: netinet/tcp.h: see the Autoconf documentation" >&2;}
--     { echo "$as_me:$LINENO: WARNING: netinet/tcp.h:     section \"Present But Cannot Be Compiled\"" >&5
-- echo "$as_me: WARNING: netinet/tcp.h:     section \"Present But Cannot Be Compiled\"" >&2;}
--     { echo "$as_me:$LINENO: WARNING: netinet/tcp.h: proceeding with the preprocessor's result" >&5
-- echo "$as_me: WARNING: netinet/tcp.h: proceeding with the preprocessor's result" >&2;}
--     { echo "$as_me:$LINENO: WARNING: netinet/tcp.h: in the future, the compiler will take precedence" >&5
-- echo "$as_me: WARNING: netinet/tcp.h: in the future, the compiler will take precedence" >&2;}
--     (
--       cat <<\_ASBOX
-- ## ------------------------------------------ ##
-- ## Report this to the AC_PACKAGE_NAME lists.  ##
-- ## ------------------------------------------ ##
-- _ASBOX
--     ) |
--       sed "s/^/$as_me: WARNING:     /" >&2
--     ;;
-- esac
-- echo "$as_me:$LINENO: checking for netinet/tcp.h" >&5
-- echo $ECHO_N "checking for netinet/tcp.h... $ECHO_C" >&6
-- if test "${ac_cv_header_netinet_tcp_h+set}" = set; then
--   echo $ECHO_N "(cached) $ECHO_C" >&6
-- else
--   ac_cv_header_netinet_tcp_h=$ac_header_preproc
-- fi
-- echo "$as_me:$LINENO: result: $ac_cv_header_netinet_tcp_h" >&5
-- echo "${ECHO_T}$ac_cv_header_netinet_tcp_h" >&6
-- 
-- fi
-- if test $ac_cv_header_netinet_tcp_h = yes; then
--   :
-- else
--   { { echo "$as_me:$LINENO: error: \"*** no netinet/tcp.h\"" >&5
-- echo "$as_me: error: \"*** no netinet/tcp.h\"" >&2;}
--    { (exit 1); exit 1; }; }
-- fi
-- 
-- 
-  if test "${ac_cv_header_sys_param_h+set}" = set; then
-    echo "$as_me:$LINENO: checking for sys/param.h" >&5
-  echo $ECHO_N "checking for sys/param.h... $ECHO_C" >&6
---- 20719,20724 ----
-***************
-*** 21303,21454 ****
-  fi
-  
-  
-- if test "${ac_cv_header_sys_socket_h+set}" = set; then
--   echo "$as_me:$LINENO: checking for sys/socket.h" >&5
-- echo $ECHO_N "checking for sys/socket.h... $ECHO_C" >&6
-- if test "${ac_cv_header_sys_socket_h+set}" = set; then
--   echo $ECHO_N "(cached) $ECHO_C" >&6
-- fi
-- echo "$as_me:$LINENO: result: $ac_cv_header_sys_socket_h" >&5
-- echo "${ECHO_T}$ac_cv_header_sys_socket_h" >&6
-- else
--   # Is the header compilable?
-- echo "$as_me:$LINENO: checking sys/socket.h usability" >&5
-- echo $ECHO_N "checking sys/socket.h usability... $ECHO_C" >&6
-- cat >conftest.$ac_ext <<_ACEOF
-- /* confdefs.h.  */
-- _ACEOF
-- cat confdefs.h >>conftest.$ac_ext
-- cat >>conftest.$ac_ext <<_ACEOF
-- /* end confdefs.h.  */
-- $ac_includes_default
-- #include <sys/socket.h>
-- _ACEOF
-- rm -f conftest.$ac_objext
-- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--   (eval $ac_compile) 2>conftest.er1
--   ac_status=$?
--   grep -v '^ *+' conftest.er1 >conftest.err
--   rm -f conftest.er1
--   cat conftest.err >&5
--   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--   (exit $ac_status); } &&
-- 	 { ac_try='test -z "$ac_c_werror_flag"
-- 			 || test ! -s conftest.err'
--   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--   (eval $ac_try) 2>&5
--   ac_status=$?
--   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--   (exit $ac_status); }; } &&
-- 	 { ac_try='test -s conftest.$ac_objext'
--   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--   (eval $ac_try) 2>&5
--   ac_status=$?
--   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--   (exit $ac_status); }; }; then
--   ac_header_compiler=yes
-- else
--   echo "$as_me: failed program was:" >&5
-- sed 's/^/| /' conftest.$ac_ext >&5
-- 
-- ac_header_compiler=no
-- fi
-- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-- echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-- echo "${ECHO_T}$ac_header_compiler" >&6
-- 
-- # Is the header present?
-- echo "$as_me:$LINENO: checking sys/socket.h presence" >&5
-- echo $ECHO_N "checking sys/socket.h presence... $ECHO_C" >&6
-- cat >conftest.$ac_ext <<_ACEOF
-- /* confdefs.h.  */
-- _ACEOF
-- cat confdefs.h >>conftest.$ac_ext
-- cat >>conftest.$ac_ext <<_ACEOF
-- /* end confdefs.h.  */
-- #include <sys/socket.h>
-- _ACEOF
-- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
--   ac_status=$?
--   grep -v '^ *+' conftest.er1 >conftest.err
--   rm -f conftest.er1
--   cat conftest.err >&5
--   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--   (exit $ac_status); } >/dev/null; then
--   if test -s conftest.err; then
--     ac_cpp_err=$ac_c_preproc_warn_flag
--     ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
--   else
--     ac_cpp_err=
--   fi
-- else
--   ac_cpp_err=yes
-- fi
-- if test -z "$ac_cpp_err"; then
--   ac_header_preproc=yes
-- else
--   echo "$as_me: failed program was:" >&5
-- sed 's/^/| /' conftest.$ac_ext >&5
-- 
--   ac_header_preproc=no
-- fi
-- rm -f conftest.err conftest.$ac_ext
-- echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-- echo "${ECHO_T}$ac_header_preproc" >&6
-- 
-- # So?  What about this header?
-- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
--   yes:no: )
--     { echo "$as_me:$LINENO: WARNING: sys/socket.h: accepted by the compiler, rejected by the preprocessor!" >&5
-- echo "$as_me: WARNING: sys/socket.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
--     { echo "$as_me:$LINENO: WARNING: sys/socket.h: proceeding with the compiler's result" >&5
-- echo "$as_me: WARNING: sys/socket.h: proceeding with the compiler's result" >&2;}
--     ac_header_preproc=yes
--     ;;
--   no:yes:* )
--     { echo "$as_me:$LINENO: WARNING: sys/socket.h: present but cannot be compiled" >&5
-- echo "$as_me: WARNING: sys/socket.h: present but cannot be compiled" >&2;}
--     { echo "$as_me:$LINENO: WARNING: sys/socket.h:     check for missing prerequisite headers?" >&5
-- echo "$as_me: WARNING: sys/socket.h:     check for missing prerequisite headers?" >&2;}
--     { echo "$as_me:$LINENO: WARNING: sys/socket.h: see the Autoconf documentation" >&5
-- echo "$as_me: WARNING: sys/socket.h: see the Autoconf documentation" >&2;}
--     { echo "$as_me:$LINENO: WARNING: sys/socket.h:     section \"Present But Cannot Be Compiled\"" >&5
-- echo "$as_me: WARNING: sys/socket.h:     section \"Present But Cannot Be Compiled\"" >&2;}
--     { echo "$as_me:$LINENO: WARNING: sys/socket.h: proceeding with the preprocessor's result" >&5
-- echo "$as_me: WARNING: sys/socket.h: proceeding with the preprocessor's result" >&2;}
--     { echo "$as_me:$LINENO: WARNING: sys/socket.h: in the future, the compiler will take precedence" >&5
-- echo "$as_me: WARNING: sys/socket.h: in the future, the compiler will take precedence" >&2;}
--     (
--       cat <<\_ASBOX
-- ## ------------------------------------------ ##
-- ## Report this to the AC_PACKAGE_NAME lists.  ##
-- ## ------------------------------------------ ##
-- _ASBOX
--     ) |
--       sed "s/^/$as_me: WARNING:     /" >&2
--     ;;
-- esac
-- echo "$as_me:$LINENO: checking for sys/socket.h" >&5
-- echo $ECHO_N "checking for sys/socket.h... $ECHO_C" >&6
-- if test "${ac_cv_header_sys_socket_h+set}" = set; then
--   echo $ECHO_N "(cached) $ECHO_C" >&6
-- else
--   ac_cv_header_sys_socket_h=$ac_header_preproc
-- fi
-- echo "$as_me:$LINENO: result: $ac_cv_header_sys_socket_h" >&5
-- echo "${ECHO_T}$ac_cv_header_sys_socket_h" >&6
-- 
-- fi
-- if test $ac_cv_header_sys_socket_h = yes; then
--   :
-- else
--   { { echo "$as_me:$LINENO: error: \"*** no sys/socket.h\"" >&5
-- echo "$as_me: error: \"*** no sys/socket.h\"" >&2;}
--    { (exit 1); exit 1; }; }
-- fi
-- 
-- 
-  if test "${ac_cv_header_sys_time_h+set}" = set; then
-    echo "$as_me:$LINENO: checking for sys/time.h" >&5
-  echo $ECHO_N "checking for sys/time.h... $ECHO_C" >&6
---- 20865,20870 ----
-***************
-*** 21595,21746 ****
-  fi
-  
-  
-- if test "${ac_cv_header_sys_un_h+set}" = set; then
--   echo "$as_me:$LINENO: checking for sys/un.h" >&5
-- echo $ECHO_N "checking for sys/un.h... $ECHO_C" >&6
-- if test "${ac_cv_header_sys_un_h+set}" = set; then
--   echo $ECHO_N "(cached) $ECHO_C" >&6
-- fi
-- echo "$as_me:$LINENO: result: $ac_cv_header_sys_un_h" >&5
-- echo "${ECHO_T}$ac_cv_header_sys_un_h" >&6
-- else
--   # Is the header compilable?
-- echo "$as_me:$LINENO: checking sys/un.h usability" >&5
-- echo $ECHO_N "checking sys/un.h usability... $ECHO_C" >&6
-- cat >conftest.$ac_ext <<_ACEOF
-- /* confdefs.h.  */
-- _ACEOF
-- cat confdefs.h >>conftest.$ac_ext
-- cat >>conftest.$ac_ext <<_ACEOF
-- /* end confdefs.h.  */
-- $ac_includes_default
-- #include <sys/un.h>
-- _ACEOF
-- rm -f conftest.$ac_objext
-- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--   (eval $ac_compile) 2>conftest.er1
--   ac_status=$?
--   grep -v '^ *+' conftest.er1 >conftest.err
--   rm -f conftest.er1
--   cat conftest.err >&5
--   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--   (exit $ac_status); } &&
-- 	 { ac_try='test -z "$ac_c_werror_flag"
-- 			 || test ! -s conftest.err'
--   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--   (eval $ac_try) 2>&5
--   ac_status=$?
--   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--   (exit $ac_status); }; } &&
-- 	 { ac_try='test -s conftest.$ac_objext'
--   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--   (eval $ac_try) 2>&5
--   ac_status=$?
--   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--   (exit $ac_status); }; }; then
--   ac_header_compiler=yes
-- else
--   echo "$as_me: failed program was:" >&5
-- sed 's/^/| /' conftest.$ac_ext >&5
-- 
-- ac_header_compiler=no
-- fi
-- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-- echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-- echo "${ECHO_T}$ac_header_compiler" >&6
-- 
-- # Is the header present?
-- echo "$as_me:$LINENO: checking sys/un.h presence" >&5
-- echo $ECHO_N "checking sys/un.h presence... $ECHO_C" >&6
-- cat >conftest.$ac_ext <<_ACEOF
-- /* confdefs.h.  */
-- _ACEOF
-- cat confdefs.h >>conftest.$ac_ext
-- cat >>conftest.$ac_ext <<_ACEOF
-- /* end confdefs.h.  */
-- #include <sys/un.h>
-- _ACEOF
-- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
--   ac_status=$?
--   grep -v '^ *+' conftest.er1 >conftest.err
--   rm -f conftest.er1
--   cat conftest.err >&5
--   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--   (exit $ac_status); } >/dev/null; then
--   if test -s conftest.err; then
--     ac_cpp_err=$ac_c_preproc_warn_flag
--     ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
--   else
--     ac_cpp_err=
--   fi
-- else
--   ac_cpp_err=yes
-- fi
-- if test -z "$ac_cpp_err"; then
--   ac_header_preproc=yes
-- else
--   echo "$as_me: failed program was:" >&5
-- sed 's/^/| /' conftest.$ac_ext >&5
-- 
--   ac_header_preproc=no
-- fi
-- rm -f conftest.err conftest.$ac_ext
-- echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-- echo "${ECHO_T}$ac_header_preproc" >&6
-- 
-- # So?  What about this header?
-- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
--   yes:no: )
--     { echo "$as_me:$LINENO: WARNING: sys/un.h: accepted by the compiler, rejected by the preprocessor!" >&5
-- echo "$as_me: WARNING: sys/un.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
--     { echo "$as_me:$LINENO: WARNING: sys/un.h: proceeding with the compiler's result" >&5
-- echo "$as_me: WARNING: sys/un.h: proceeding with the compiler's result" >&2;}
--     ac_header_preproc=yes
--     ;;
--   no:yes:* )
--     { echo "$as_me:$LINENO: WARNING: sys/un.h: present but cannot be compiled" >&5
-- echo "$as_me: WARNING: sys/un.h: present but cannot be compiled" >&2;}
--     { echo "$as_me:$LINENO: WARNING: sys/un.h:     check for missing prerequisite headers?" >&5
-- echo "$as_me: WARNING: sys/un.h:     check for missing prerequisite headers?" >&2;}
--     { echo "$as_me:$LINENO: WARNING: sys/un.h: see the Autoconf documentation" >&5
-- echo "$as_me: WARNING: sys/un.h: see the Autoconf documentation" >&2;}
--     { echo "$as_me:$LINENO: WARNING: sys/un.h:     section \"Present But Cannot Be Compiled\"" >&5
-- echo "$as_me: WARNING: sys/un.h:     section \"Present But Cannot Be Compiled\"" >&2;}
--     { echo "$as_me:$LINENO: WARNING: sys/un.h: proceeding with the preprocessor's result" >&5
-- echo "$as_me: WARNING: sys/un.h: proceeding with the preprocessor's result" >&2;}
--     { echo "$as_me:$LINENO: WARNING: sys/un.h: in the future, the compiler will take precedence" >&5
-- echo "$as_me: WARNING: sys/un.h: in the future, the compiler will take precedence" >&2;}
--     (
--       cat <<\_ASBOX
-- ## ------------------------------------------ ##
-- ## Report this to the AC_PACKAGE_NAME lists.  ##
-- ## ------------------------------------------ ##
-- _ASBOX
--     ) |
--       sed "s/^/$as_me: WARNING:     /" >&2
--     ;;
-- esac
-- echo "$as_me:$LINENO: checking for sys/un.h" >&5
-- echo $ECHO_N "checking for sys/un.h... $ECHO_C" >&6
-- if test "${ac_cv_header_sys_un_h+set}" = set; then
--   echo $ECHO_N "(cached) $ECHO_C" >&6
-- else
--   ac_cv_header_sys_un_h=$ac_header_preproc
-- fi
-- echo "$as_me:$LINENO: result: $ac_cv_header_sys_un_h" >&5
-- echo "${ECHO_T}$ac_cv_header_sys_un_h" >&6
-- 
-- fi
-- if test $ac_cv_header_sys_un_h = yes; then
--   :
-- else
--   { { echo "$as_me:$LINENO: error: \"*** no sys/un.h\"" >&5
-- echo "$as_me: error: \"*** no sys/un.h\"" >&2;}
--    { (exit 1); exit 1; }; }
-- fi
-- 
-- 
-  if test "${ac_cv_header_unistd_h+set}" = set; then
-    echo "$as_me:$LINENO: checking for unistd.h" >&5
-  echo $ECHO_N "checking for unistd.h... $ECHO_C" >&6
---- 21011,21016 ----
-diff -rc toolbuslib-1.1/src/atb-tool.c toolbuslib-1.1-new/src/atb-tool.c
-*** toolbuslib-1.1/src/atb-tool.c	2008-11-10 13:59:41.000000000 +0100
---- toolbuslib-1.1-new/src/atb-tool.c	2010-08-23 16:58:11.000000000 +0200
-***************
-*** 6,22 ****
-  #include <stdlib.h> 
-  #include <unistd.h>
-  #include <errno.h>
-- #include <netdb.h>
-- #include <sys/socket.h>
-  #include <sys/time.h>
-- #include <sys/un.h>
-  #include <sys/param.h>
-- #include <netinet/in.h>
-- #include <netinet/tcp.h>
-  #include <signal.h>
-  #include <string.h>
-! 
-! #include <sys/resource.h>
-  
-  #include <aterm2.h>
-  #include "safio.h"
---- 6,16 ----
-  #include <stdlib.h> 
-  #include <unistd.h>
-  #include <errno.h>
-  #include <sys/time.h>
-  #include <sys/param.h>
-  #include <signal.h>
-  #include <string.h>
-! #include <winsock2.h>
-  
-  #include <aterm2.h>
-  #include "safio.h"
-***************
-*** 39,44 ****
---- 33,40 ----
-  #define MAX_NR_QUEUES	64
-  #define MAX_QUEUE_LEN	128
-  
-+ #define MAXHOSTNAMELEN 256
-+ 
-  /* Operation codes. */
-  /* From Tool to ToolBus. */
-  #define CONNECT 1
-***************
-*** 144,151 ****
-   * Gathers performance stats. 
-   */
-  static ATerm getPerformanceStats(){
-- 	struct rusage resourceUsage;
-- 	
-  	// Type stuff
-  	ATerm remote = (ATerm) ATmakeAppl0(ATmakeAFun("remote", 0, ATtrue));
-  	ATerm toolType = (ATerm) ATmakeAppl1(ATmakeAFun("type", 1, ATfalse), remote);
---- 140,145 ----
-***************
-*** 161,171 ****
-  	// Thread stuff
-  	ATerm threads;
-  	
-- 	getrusage(RUSAGE_SELF, &resourceUsage);
-- 	
-  	{
-! 		int userTime = (int) (resourceUsage.ru_utime.tv_sec * 1000) + (resourceUsage.ru_utime.tv_usec / 1000);
-! 		int systemTime = (int) (resourceUsage.ru_stime.tv_sec * 1000) + (resourceUsage.ru_stime.tv_usec / 1000);
-  		
-  		ATerm userTimeTerm = (ATerm) ATmakeAppl1(ATmakeAFun("user-time", 1, ATfalse), (ATerm) ATmakeInt(userTime));
-  		ATerm systemTimeTerm = (ATerm) ATmakeAppl1(ATmakeAFun("system-time", 1, ATfalse), (ATerm) ATmakeInt(systemTime));
---- 155,163 ----
-  	// Thread stuff
-  	ATerm threads;
-  	
-  	{
-! 		int userTime = 0;
-! 		int systemTime = 0;
-  		
-  		ATerm userTimeTerm = (ATerm) ATmakeAppl1(ATmakeAFun("user-time", 1, ATfalse), (ATerm) ATmakeInt(userTime));
-  		ATerm systemTimeTerm = (ATerm) ATmakeAppl1(ATmakeAFun("system-time", 1, ATfalse), (ATerm) ATmakeInt(systemTime));
-***************
-*** 349,364 ****
-    
-    otp = (OperationTermPair) malloc(sizeof(struct _OperationTermPair));
-  
--   /* Initialize handlers for OS signals */
--   {
--     struct sigaction disconnect;
--     disconnect.sa_handler = disconnectHandler;
--     sigemptyset(&disconnect.sa_mask);
-- 
--     sigaction(SIGTERM, &disconnect, NULL);
--     sigaction(SIGQUIT, &disconnect, NULL);
--   }
-- 
-    /* Get hostname of machine that runs this particular tool */
-    return gethostname(this_host, MAXHOSTNAMELEN);
-  }
---- 341,346 ----
-diff -rc toolbuslib-1.1/src/Makefile.in toolbuslib-1.1-new/src/Makefile.in
-*** toolbuslib-1.1/src/Makefile.in	2008-11-10 13:59:47.000000000 +0100
---- toolbuslib-1.1-new/src/Makefile.in	2010-08-24 10:28:10.000000000 +0200
-***************
-*** 223,234 ****
-  libATB_la_SOURCES = atb-tool.c
-  libATB_la_CPPFLAGS = $(ATERM_CFLAGS)
-  libATB_la_LDFLAGS = -avoid-version -no-undefined $(AM_LDFLAGS)
-! libATB_la_LIBADD = $(ATERM_LIBS) $(SOCKETLIBS)
-  
-  bin_PROGRAMS = tbunpack
-  
-  tbunpack_SOURCES = tbunpack.c atb-tool.c
-! tbunpack_LDADD = $(ATERM_LIBS)
-  subdir = ./src
-  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
---- 223,234 ----
-  libATB_la_SOURCES = atb-tool.c
-  libATB_la_CPPFLAGS = $(ATERM_CFLAGS)
-  libATB_la_LDFLAGS = -avoid-version -no-undefined $(AM_LDFLAGS)
-! libATB_la_LIBADD = $(ATERM_LIBS) $(SOCKETLIBS) -lwsock32
-  
-  bin_PROGRAMS = tbunpack
-  
-  tbunpack_SOURCES = tbunpack.c atb-tool.c
-! tbunpack_LDADD = $(ATERM_LIBS) -lwsock32
-  subdir = ./src
-  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 04c33ff547a0..5c960b5f9801 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6133,8 +6133,6 @@ let
 
   aterm25 = callPackage ../development/libraries/aterm/2.5.nix { };
 
-  aterm28 = lowPrio (callPackage ../development/libraries/aterm/2.8.nix { });
-
   attica = callPackage ../development/libraries/attica { };
 
   attr = callPackage ../development/libraries/attr { };
@@ -7817,23 +7815,6 @@ let
 
   meterbridge = callPackage ../applications/audio/meterbridge { };
 
-  metaEnvironment = recurseIntoAttrs (let callPackage = newScope pkgs.metaEnvironment; in rec {
-    sdfLibrary    = callPackage ../development/libraries/sdf-library { aterm = aterm28; };
-    toolbuslib    = callPackage ../development/libraries/toolbuslib { aterm = aterm28; inherit (windows) w32api; };
-    cLibrary      = callPackage ../development/libraries/c-library { aterm = aterm28; };
-    errorSupport  = callPackage ../development/libraries/error-support { aterm = aterm28; };
-    ptSupport     = callPackage ../development/libraries/pt-support { aterm = aterm28; };
-    ptableSupport = callPackage ../development/libraries/ptable-support { aterm = aterm28; };
-    configSupport = callPackage ../development/libraries/config-support { aterm = aterm28; };
-    asfSupport    = callPackage ../development/libraries/asf-support { aterm = aterm28; };
-    tideSupport   = callPackage ../development/libraries/tide-support { aterm = aterm28; };
-    rstoreSupport = callPackage ../development/libraries/rstore-support { aterm = aterm28; };
-    sdfSupport    = callPackage ../development/libraries/sdf-support { aterm = aterm28; };
-    sglr          = callPackage ../development/libraries/sglr { aterm = aterm28; };
-    ascSupport    = callPackage ../development/libraries/asc-support { aterm = aterm28; };
-    pgen          = callPackage ../development/libraries/pgen { aterm = aterm28; };
-  });
-
   mhddfs = callPackage ../tools/filesystems/mhddfs { };
 
   ming = callPackage ../development/libraries/ming { };

From 3b0dc7b2d75ef7308da67dc4e5f98d9ed3f32fe0 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 12 Jan 2016 03:02:42 +0100
Subject: [PATCH 580/884] zotero: remove unused firefox-bin fork

Dead code since 3d919a002de81463d3e2a5903244ddf58dca78e2.
---
 .../office/zotero/firefox-bin/default.nix     | 162 ---------------
 .../zotero/firefox-bin/generate_sources.rb    |  48 -----
 .../office/zotero/firefox-bin/sources.nix     | 192 ------------------
 3 files changed, 402 deletions(-)
 delete mode 100644 pkgs/applications/office/zotero/firefox-bin/default.nix
 delete mode 100644 pkgs/applications/office/zotero/firefox-bin/generate_sources.rb
 delete mode 100644 pkgs/applications/office/zotero/firefox-bin/sources.nix

diff --git a/pkgs/applications/office/zotero/firefox-bin/default.nix b/pkgs/applications/office/zotero/firefox-bin/default.nix
deleted file mode 100644
index edf56c3eb4db..000000000000
--- a/pkgs/applications/office/zotero/firefox-bin/default.nix
+++ /dev/null
@@ -1,162 +0,0 @@
-{ stdenv, fetchurl, config
-, alsaLib
-, atk
-, cairo
-, cups
-, dbus_glib
-, dbus_libs
-, fontconfig
-, freetype
-, gconf
-, gdk_pixbuf
-, glib
-, glibc
-, gst_plugins_base
-, gstreamer
-, gtk
-, libX11
-, libXScrnSaver
-, libXcomposite
-, libXdamage
-, libXext
-, libXfixes
-, libXinerama
-, libXrender
-, libXt
-, libcanberra
-, libgnome
-, libgnomeui
-, mesa
-, nspr
-, nss
-, pango
-, libheimdal
-, libpulseaudio
-, systemd
-}:
-
-assert stdenv.isLinux;
-
-# imports `version` and `sources`
-with (import ./sources.nix);
-
-let
-  arch = if stdenv.system == "i686-linux"
-    then "linux-i686"
-    else "linux-x86_64";
-
-  isPrefixOf = prefix: string:
-    builtins.substring 0 (builtins.stringLength prefix) string == prefix;
-
-  sourceMatches = locale: source:
-      (isPrefixOf source.locale locale) && source.arch == arch;
-
-  systemLocale = config.i18n.defaultLocale or "en-US";
-
-  defaultSource = stdenv.lib.findFirst (sourceMatches "en-US") {} sources;
-
-  source = stdenv.lib.findFirst (sourceMatches systemLocale) defaultSource sources;
-
-in
-
-stdenv.mkDerivation {
-  name = "firefox-bin-${version}";
-
-  src = fetchurl {
-    url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/${version}/${source.arch}/${source.locale}/firefox-${version}.tar.bz2";
-    inherit (source) sha1;
-  };
-
-  phases = "unpackPhase installPhase";
-
-  libPath = stdenv.lib.makeLibraryPath
-    [ stdenv.cc.cc
-      alsaLib
-      atk
-      cairo
-      cups
-      dbus_glib
-      dbus_libs
-      fontconfig
-      freetype
-      gconf
-      gdk_pixbuf
-      glib
-      glibc
-      gst_plugins_base
-      gstreamer
-      gtk
-      libX11
-      libXScrnSaver
-      libXcomposite
-      libXdamage
-      libXext
-      libXfixes
-      libXinerama
-      libXrender
-      libXt
-      libcanberra
-      libgnome
-      libgnomeui
-      mesa
-      nspr
-      nss
-      pango
-      libheimdal
-      libpulseaudio
-      systemd
-    ] + ":" + stdenv.lib.makeSearchPath "lib64" [
-      stdenv.cc.cc
-    ];
-
-  # "strip" after "patchelf" may break binaries.
-  # See: https://github.com/NixOS/patchelf/issues/10
-  dontStrip = 1;
-
-  installPhase =
-    ''
-      mkdir -p "$prefix/usr/lib/firefox-bin-${version}"
-      cp -r * "$prefix/usr/lib/firefox-bin-${version}"
-
-      mkdir -p "$out/bin"
-      ln -s "$prefix/usr/lib/firefox-bin-${version}/firefox" "$out/bin/"
-
-      for executable in \
-        firefox mozilla-xremote-client firefox-bin plugin-container \
-        updater crashreporter webapprt-stub
-      do
-        patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-          "$out/usr/lib/firefox-bin-${version}/$executable"
-      done
-
-      for executable in \
-        firefox mozilla-xremote-client firefox-bin plugin-container \
-        updater crashreporter webapprt-stub libxul.so
-      do
-        patchelf --set-rpath "$libPath" \
-          "$out/usr/lib/firefox-bin-${version}/$executable"
-      done
-
-      # Create a desktop item.
-      mkdir -p $out/share/applications
-      cat > $out/share/applications/firefox.desktop <<EOF
-      [Desktop Entry]
-      Type=Application
-      Exec=$out/bin/firefox
-      Icon=$out/lib/firefox-bin-${version}/chrome/icons/default/default256.png
-      Name=Firefox
-      GenericName=Web Browser
-      Categories=Application;Network;
-      EOF
-    '';
-
-  meta = with stdenv.lib; {
-    description = "Mozilla Firefox, free web browser (binary package)";
-    homepage = http://www.mozilla.org/firefox/;
-    license = {
-      free = false;
-      url = http://www.mozilla.org/en-US/foundation/trademarks/policy/;
-    };
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/applications/office/zotero/firefox-bin/generate_sources.rb b/pkgs/applications/office/zotero/firefox-bin/generate_sources.rb
deleted file mode 100644
index eabff067f750..000000000000
--- a/pkgs/applications/office/zotero/firefox-bin/generate_sources.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-# TODO share code with thunderbird-bin/generate_sources.rb
-
-require "open-uri"
-
-version = if ARGV.empty?
-            "latest"
-          else
-            ARGV[0]
-          end
-
-base_path = "http://download-installer.cdn.mozilla.net/pub/firefox/releases"
-
-Source = Struct.new(:hash, :arch, :locale, :filename)
-
-sources = open("#{base_path}/#{version}/SHA1SUMS") do |input|
-  input.readlines
-end.select do |line|
-  /\/firefox-.*\.tar\.bz2$/ === line && !(/source/ === line)
-end.map do |line|
-  hash, name = line.chomp.split(/ +/)
-  Source.new(hash, *(name.split("/")))
-end.sort_by do |source|
-  [source.locale, source.arch]
-end
-
-real_version = sources[0].filename.match(/firefox-([0-9.]*)\.tar\.bz2/)[1]
-
-arches = ["linux-i686", "linux-x86_64"]
-
-puts(<<"EOH")
-# This file is generated from generate_nix.rb. DO NOT EDIT.
-# Execute the following command in a temporary directory to update the file.
-#
-# ruby generate_source.rb > source.nix
-
-{
-  version = "#{real_version}";
-  sources = [
-EOH
-
-sources.each do |source|
-  puts(%Q|    { locale = "#{source.locale}"; arch = "#{source.arch}"; sha1 = "#{source.hash}"; }|)
-end
-
-puts(<<'EOF')
-  ];
-}
-EOF
diff --git a/pkgs/applications/office/zotero/firefox-bin/sources.nix b/pkgs/applications/office/zotero/firefox-bin/sources.nix
deleted file mode 100644
index c052a007beb4..000000000000
--- a/pkgs/applications/office/zotero/firefox-bin/sources.nix
+++ /dev/null
@@ -1,192 +0,0 @@
-# This file is generated from generate_nix.rb. DO NOT EDIT.
-# Execute the following command in a temporary directory to update the file.
-#
-# ruby generate_source.rb > source.nix
-
-{
-  version = "33.1";
-  sources = [
-    { locale = "ach"; arch = "linux-i686"; sha1 = "f6ecc5e1d1470a4d79d0f680f3a194857674c5a1"; }
-    { locale = "ach"; arch = "linux-x86_64"; sha1 = "d28450930e53f168c11e7e0c4e7df46c20d50882"; }
-    { locale = "af"; arch = "linux-i686"; sha1 = "2865493140bd8838e7981749f9fe7a734fa59745"; }
-    { locale = "af"; arch = "linux-x86_64"; sha1 = "8f94c2be8ba8e496ff917f78206ab9a9294e4de1"; }
-    { locale = "an"; arch = "linux-i686"; sha1 = "3f6ecaab216f91759a39e255571edaf9b48d4733"; }
-    { locale = "an"; arch = "linux-x86_64"; sha1 = "ae0fce83ae2aa416dc3acda327dec98f2c7c0b98"; }
-    { locale = "ar"; arch = "linux-i686"; sha1 = "aeaed8574b13046d1afb129ad9d3cc0ee22b2bff"; }
-    { locale = "ar"; arch = "linux-x86_64"; sha1 = "997495abb13611591ce9ab5ea81cc65dd7ee579a"; }
-    { locale = "as"; arch = "linux-i686"; sha1 = "84193f01192c8341905a0f8d2e7b3d198c39e113"; }
-    { locale = "as"; arch = "linux-x86_64"; sha1 = "f7e9278e9d4b0d3b45f453a16b5840bb84598ccc"; }
-    { locale = "ast"; arch = "linux-i686"; sha1 = "e52fb5a1e813e1d91ec7562bd7e94632f661c5a4"; }
-    { locale = "ast"; arch = "linux-x86_64"; sha1 = "89f13d927c9d8596899ed09f8c9f7d97c26d78f5"; }
-    { locale = "az"; arch = "linux-i686"; sha1 = "bc0972e18db99f9d6fdbe100dd09d62bb2c3afbd"; }
-    { locale = "az"; arch = "linux-x86_64"; sha1 = "4552aa92a799086b7f79178eb8d846a84e77e094"; }
-    { locale = "be"; arch = "linux-i686"; sha1 = "4c2577170f9df45a313c6728076cc35504f7ad80"; }
-    { locale = "be"; arch = "linux-x86_64"; sha1 = "dea774633ab5c1ab5c74380984253b0597d53d2c"; }
-    { locale = "bg"; arch = "linux-i686"; sha1 = "5f770c719895ddec1a8c27bda298361341b2e924"; }
-    { locale = "bg"; arch = "linux-x86_64"; sha1 = "5581f70176eb35cf01d5ebb368741130420b505e"; }
-    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "f0853164e4d1497be6dcffd6dd365eaf56b6582b"; }
-    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "0ccb11141eb9c339cfe652aee6e902ed0cd700e4"; }
-    { locale = "bn-IN"; arch = "linux-i686"; sha1 = "36448e2198e3650f0e5a107af3ae10dbdc8273ce"; }
-    { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "804668a7692b378f6686ea56dae3b9e047bce4a1"; }
-    { locale = "br"; arch = "linux-i686"; sha1 = "396a845931ee25c79baaa2147c94b7eea6c8505f"; }
-    { locale = "br"; arch = "linux-x86_64"; sha1 = "87d9567073d22f09abe6c45a044fd3b4ee4d925b"; }
-    { locale = "bs"; arch = "linux-i686"; sha1 = "e3263e2215862dad2268686242a2374e460d1868"; }
-    { locale = "bs"; arch = "linux-x86_64"; sha1 = "714597790f46b03289a4a91e20f797c82672f849"; }
-    { locale = "ca"; arch = "linux-i686"; sha1 = "0dfc5d9abcac90e5ab254bb72ae20d987ff206f3"; }
-    { locale = "ca"; arch = "linux-x86_64"; sha1 = "2eac6e7cb6eae8ca0714dd219eb08b3f7d846191"; }
-    { locale = "cs"; arch = "linux-i686"; sha1 = "505764e55d673a282d38c3bca7db4ac29325ead1"; }
-    { locale = "cs"; arch = "linux-x86_64"; sha1 = "bd32e999d5c61b20bb3a5983032227ff2a7d6d84"; }
-    { locale = "csb"; arch = "linux-i686"; sha1 = "ae5065363647da475901fb7cc156a4ecdecc528b"; }
-    { locale = "csb"; arch = "linux-x86_64"; sha1 = "df0de3d7e5b2aa84e37097b5f65168d732bfd3de"; }
-    { locale = "cy"; arch = "linux-i686"; sha1 = "3e1e7991983277f4c07486d1f2896e2a192d5f85"; }
-    { locale = "cy"; arch = "linux-x86_64"; sha1 = "20232e85c69830eb08b4387f69e3d26637b3d06c"; }
-    { locale = "da"; arch = "linux-i686"; sha1 = "1a3a3913876fe8eea20b4b6d33b939b9e531fd34"; }
-    { locale = "da"; arch = "linux-x86_64"; sha1 = "f89864c28eb750655fb212d77569fcfdfbd38ee9"; }
-    { locale = "de"; arch = "linux-i686"; sha1 = "da97ff54467b5d0cad8142158e01514a1e75f457"; }
-    { locale = "de"; arch = "linux-x86_64"; sha1 = "988c4cd52388368d21cfb1e6002c28f3e8fb57b1"; }
-    { locale = "dsb"; arch = "linux-i686"; sha1 = "0997a81282c73a8faf8a784a296bbe9102c823bd"; }
-    { locale = "dsb"; arch = "linux-x86_64"; sha1 = "d6573147c354d29f0ba928888916882aafb92268"; }
-    { locale = "el"; arch = "linux-i686"; sha1 = "df53cedb977f9f1cff6b43351fa19801c51e53d9"; }
-    { locale = "el"; arch = "linux-x86_64"; sha1 = "e124b8586af6fb23371c006be0fbe3525dafc8a9"; }
-    { locale = "en-GB"; arch = "linux-i686"; sha1 = "738a7335b42e4d324bb3c8411666c3d64e481f85"; }
-    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "788abe682ac80e08739edf0fabfd4f160eee44da"; }
-    { locale = "en-US"; arch = "linux-i686"; sha1 = "9aeaab7265640c4dfdde57b0ef7eebac26c1d1ec"; }
-    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "e4bdb638b0a4c90ecb664a9b64351a31ad237ee5"; }
-    { locale = "en-ZA"; arch = "linux-i686"; sha1 = "381749003d0755cec8dbf29cd1d4ebfa806576f8"; }
-    { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "518c307bb0b23592ff711943594ea76ffdf0d0c3"; }
-    { locale = "eo"; arch = "linux-i686"; sha1 = "f570024c9c665b36bd8646f44b2b27ff7021f590"; }
-    { locale = "eo"; arch = "linux-x86_64"; sha1 = "fb777076f2a2a7d911a381a0561c02701dd54878"; }
-    { locale = "es-AR"; arch = "linux-i686"; sha1 = "20cac134a4312d5cee8ad1f144b2c44108e96b8e"; }
-    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "d4757bfb61d84d6d3e4b484377f1037b1ff2728c"; }
-    { locale = "es-CL"; arch = "linux-i686"; sha1 = "0416114a667fbc9144186d9a74ce2cf3e09944cc"; }
-    { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "73eeff57047143e8d4217bb22a3831555f87341f"; }
-    { locale = "es-ES"; arch = "linux-i686"; sha1 = "66d8288cb4af4d4e8584dcebefc14d9aaf46f4bc"; }
-    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "d0830ffc8634ab47033b932dcac51e7d042c4f19"; }
-    { locale = "es-MX"; arch = "linux-i686"; sha1 = "592df3f8ee6e6a6fc56991a7b1e9f55a1ea1b8e8"; }
-    { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "cf0d2afac587dbb4f640ea672ea01190f2425905"; }
-    { locale = "et"; arch = "linux-i686"; sha1 = "441a5dbb69fe61e28e06ec3ed29f34d067ec2ade"; }
-    { locale = "et"; arch = "linux-x86_64"; sha1 = "633b25f83507b61829a934385766628c8764544e"; }
-    { locale = "eu"; arch = "linux-i686"; sha1 = "f8f6ddf346afb5bb0420ab092463d61e5e6abfe7"; }
-    { locale = "eu"; arch = "linux-x86_64"; sha1 = "cc7cfc43d8e6db5ac08f846e81a416e5a75b37b6"; }
-    { locale = "fa"; arch = "linux-i686"; sha1 = "796ee1d052e97372a870f113390ef25f26047203"; }
-    { locale = "fa"; arch = "linux-x86_64"; sha1 = "3810bd3727a7de7474070e329ddeabfb98f4aeee"; }
-    { locale = "ff"; arch = "linux-i686"; sha1 = "436b6732f58bb6a128c6e3027358089bca0d753e"; }
-    { locale = "ff"; arch = "linux-x86_64"; sha1 = "ed7e3e1a90d31e40cd47645474246adba30eaa1d"; }
-    { locale = "fi"; arch = "linux-i686"; sha1 = "1d7909cbfe55f6234b6789addae5c9a2dbcf1e49"; }
-    { locale = "fi"; arch = "linux-x86_64"; sha1 = "d7734ee040a5ff56aa6d7149d6d5a78541f533fb"; }
-    { locale = "fr"; arch = "linux-i686"; sha1 = "a8614ef406ed6d4ce7f64f14335b5c4a13fd1ee2"; }
-    { locale = "fr"; arch = "linux-x86_64"; sha1 = "98d5e3476784ee4d759b7995e2ff936910a1b213"; }
-    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "3c7a1c5e1fb9e0f2320a33771bde1cbd774eb6bf"; }
-    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "10178c5fc56dd8f510f80748767e7e5961bac6ff"; }
-    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "235c5016eb77c9369ee10e51514961a6986f3c78"; }
-    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "023c3aafa794faa30cc25576e411f2482cc83131"; }
-    { locale = "gd"; arch = "linux-i686"; sha1 = "e86c734f2afb872f407f78e867735ecda7ceb622"; }
-    { locale = "gd"; arch = "linux-x86_64"; sha1 = "29b695a5c8291f23b22871dcec4d6e66f918e21c"; }
-    { locale = "gl"; arch = "linux-i686"; sha1 = "c13ac4e21e70e5d3bcf0b2149bfc3e6090c383ce"; }
-    { locale = "gl"; arch = "linux-x86_64"; sha1 = "70116ba4463b6937382dc9c7c8da465f5aa78c07"; }
-    { locale = "gu-IN"; arch = "linux-i686"; sha1 = "7b687b19b72543d411c9eeb4055015c4e4ebaa4b"; }
-    { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "d2cc38aafa2311808d92f1c927b6b6fd86c35d59"; }
-    { locale = "he"; arch = "linux-i686"; sha1 = "24027663a19be1d27379167585936591ffe01650"; }
-    { locale = "he"; arch = "linux-x86_64"; sha1 = "0ab9ec52df1e0debad953b2c658c16396a7c336d"; }
-    { locale = "hi-IN"; arch = "linux-i686"; sha1 = "d72b91be0e392a853d3b894f2809bb16d4ed77f5"; }
-    { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "560a3562b66a46f7b5c235e5f0c9a37518dc60f4"; }
-    { locale = "hr"; arch = "linux-i686"; sha1 = "319c19a36f1d9f087f59470cb14ad0b9429cb751"; }
-    { locale = "hr"; arch = "linux-x86_64"; sha1 = "2c98ac830fb0eff611cb82690d068dc61fa6fb21"; }
-    { locale = "hsb"; arch = "linux-i686"; sha1 = "f8b2f8a85b7e5d8d4c551f0e64340cfe491695c4"; }
-    { locale = "hsb"; arch = "linux-x86_64"; sha1 = "5b6533ac4222a3e18c3d4ba74e0aa459bfa413d1"; }
-    { locale = "hu"; arch = "linux-i686"; sha1 = "93308746df2c99182d2919fece807b47db688b3d"; }
-    { locale = "hu"; arch = "linux-x86_64"; sha1 = "9fd5cd46a04bed5b8fb079aeb59050664c5d93e0"; }
-    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "d889d18ccef0c7c25dc2e1fc71b9eaa6aaeb4229"; }
-    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "2ef01a1c2f01825d80d6a0846d59ff6ad77e90e1"; }
-    { locale = "id"; arch = "linux-i686"; sha1 = "1c5cb9d1d4b20b2060a8fd07d2851067a4b71d6a"; }
-    { locale = "id"; arch = "linux-x86_64"; sha1 = "82c871d7554fe8411d8f6fccf5e3c7f0d7798885"; }
-    { locale = "is"; arch = "linux-i686"; sha1 = "1e697fa5802915b826e29ea73805b7101a32312c"; }
-    { locale = "is"; arch = "linux-x86_64"; sha1 = "44b0d19bc285462f305abf8137aefd9477715e8f"; }
-    { locale = "it"; arch = "linux-i686"; sha1 = "16e00713bd355373c676e05a032933d9c210ba87"; }
-    { locale = "it"; arch = "linux-x86_64"; sha1 = "c32e8d9e9dde6c61092e4b72a3192f50e70bcfa9"; }
-    { locale = "ja"; arch = "linux-i686"; sha1 = "d2d4d0a2c32769ae9fb6d27dfb71e52f146824c3"; }
-    { locale = "ja"; arch = "linux-x86_64"; sha1 = "271d50bcf97440e61bf7b952a48fe3992c40faf0"; }
-    { locale = "kk"; arch = "linux-i686"; sha1 = "bc1e2c28b01b7bffde01d88e6aa6aec1a8868f3d"; }
-    { locale = "kk"; arch = "linux-x86_64"; sha1 = "94a66d608cec6de58fb8d72b116395c77198494d"; }
-    { locale = "km"; arch = "linux-i686"; sha1 = "99fdf2ae88c34db6fe9234d236caffeb50cbb843"; }
-    { locale = "km"; arch = "linux-x86_64"; sha1 = "78645872859dc627c5d12e6aa86aef6e3528b3d9"; }
-    { locale = "kn"; arch = "linux-i686"; sha1 = "ef5dcee189c685ee5b71a76cb19138e65f22a0be"; }
-    { locale = "kn"; arch = "linux-x86_64"; sha1 = "87b064a5ce23ffd1397b8a480e6a158b1de4cd67"; }
-    { locale = "ko"; arch = "linux-i686"; sha1 = "95e6290a38025af724c34272f8e2a4d531e4f06a"; }
-    { locale = "ko"; arch = "linux-x86_64"; sha1 = "e989184dfda401f19a895275519f729597a27e97"; }
-    { locale = "ku"; arch = "linux-i686"; sha1 = "c1004b96937b848d9e1e53f9fe4a8507d218572d"; }
-    { locale = "ku"; arch = "linux-x86_64"; sha1 = "a4e61d630ab6ce54a06ff1a90c7df3b76b235181"; }
-    { locale = "lij"; arch = "linux-i686"; sha1 = "be5da1e0d17c7b51da616c082932d8190a33a74e"; }
-    { locale = "lij"; arch = "linux-x86_64"; sha1 = "35e29b7825124dd5c68d02e7c1a15e9cdefaec22"; }
-    { locale = "lt"; arch = "linux-i686"; sha1 = "c09c5cf5f25eac88f90f4aeb48495f688d78d80d"; }
-    { locale = "lt"; arch = "linux-x86_64"; sha1 = "7f4f6511d9cf4b70e34b37c823c12bd13409a7e8"; }
-    { locale = "lv"; arch = "linux-i686"; sha1 = "7fc81c00badbbd877a67d5e1998f16560dd41f3e"; }
-    { locale = "lv"; arch = "linux-x86_64"; sha1 = "5edb8fac36c755db3e3270a0cf4320970696ff4c"; }
-    { locale = "mai"; arch = "linux-i686"; sha1 = "4d49ecb2e195c9c65382155128ff02d857937703"; }
-    { locale = "mai"; arch = "linux-x86_64"; sha1 = "96d0dac8116f20972469e527757d17cf7c22792b"; }
-    { locale = "mk"; arch = "linux-i686"; sha1 = "b72b07ab4d69430d62fb9c497c047f2987636ea1"; }
-    { locale = "mk"; arch = "linux-x86_64"; sha1 = "441918ac58ff166851921bf1566e7dda24ce2377"; }
-    { locale = "ml"; arch = "linux-i686"; sha1 = "b7947f50a0618ba9b8fb5fa9f1adff13dbfc0147"; }
-    { locale = "ml"; arch = "linux-x86_64"; sha1 = "3c98db55a6b9c707957786cc40a03d69e9b4e619"; }
-    { locale = "mr"; arch = "linux-i686"; sha1 = "f1e5109a2fe72d1c7d8a32f83918064d607efa1a"; }
-    { locale = "mr"; arch = "linux-x86_64"; sha1 = "820f056eb3413fc0e1979f192e9542db0c9e0e79"; }
-    { locale = "ms"; arch = "linux-i686"; sha1 = "6a9f01f286fbe0b63f6c171f0171f2883fa5b474"; }
-    { locale = "ms"; arch = "linux-x86_64"; sha1 = "f8cccf1c87845947693c631fd60300d1a5ec7436"; }
-    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "2dbe61442b310777b427d27159ee767d82a4b254"; }
-    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "b7a437552fc540966478832bf89a85dc81b16766"; }
-    { locale = "nl"; arch = "linux-i686"; sha1 = "36f65d56954e59bd758b4a1c09abec85872eb140"; }
-    { locale = "nl"; arch = "linux-x86_64"; sha1 = "0c1ed8b52afdd3d15f163fc8899e14caeb0a4497"; }
-    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "729144a52c95cbcb2665da00e953cbdb269c0665"; }
-    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "5298026198b8d6c7eb0b816ca29bbd26f0f65907"; }
-    { locale = "or"; arch = "linux-i686"; sha1 = "33aaf77833a3c3a504559c399a270061a582ffbb"; }
-    { locale = "or"; arch = "linux-x86_64"; sha1 = "a2dca791375b174d0f888ce56555fe21e5b2eaf4"; }
-    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "3670a8492dde8b19e1f5fba10d54eabd003183e1"; }
-    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "376576536d6a7d373ec5c453e107f63261819cf1"; }
-    { locale = "pl"; arch = "linux-i686"; sha1 = "53af2036a170d77f828e80d455edf6cddf826cfb"; }
-    { locale = "pl"; arch = "linux-x86_64"; sha1 = "01e04cf2530c1b51bd9e8ee5114ac9ba5317e0e4"; }
-    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "0fec2a4ea90ecb6d7e09041d45a4b0647c37ebe0"; }
-    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "f7f1dd1f7d78b3647cb77f282b87a3d7224ec567"; }
-    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "cf46849b5fbd06b51c468f2dc6dab3eb9e8ffde1"; }
-    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "e6bae39233b0c3735fb122b9e56ac4e82d435749"; }
-    { locale = "rm"; arch = "linux-i686"; sha1 = "41ed6d9c3816647069b0416d1b7edda97fe1abff"; }
-    { locale = "rm"; arch = "linux-x86_64"; sha1 = "36a83ca4594ba79a3b01ee21a5cfde45b13b323e"; }
-    { locale = "ro"; arch = "linux-i686"; sha1 = "d70284aea6297688eb25835a482d9ca349eac313"; }
-    { locale = "ro"; arch = "linux-x86_64"; sha1 = "78079d94b0ad83e6cd687433c335b7e0012c8cb8"; }
-    { locale = "ru"; arch = "linux-i686"; sha1 = "354fb775dbddfe9f87e78982e7456f20d01476bb"; }
-    { locale = "ru"; arch = "linux-x86_64"; sha1 = "30a29bb1cbf967fb24e5bbc6abefcdf074b316cc"; }
-    { locale = "si"; arch = "linux-i686"; sha1 = "b20089f3f2ef670426a29e409426a9cd3569090a"; }
-    { locale = "si"; arch = "linux-x86_64"; sha1 = "bee5b374f0ca41a858e9b61fe0b43a56bf303180"; }
-    { locale = "sk"; arch = "linux-i686"; sha1 = "6c9d83b2cef140bdf513c7226854fc991d087785"; }
-    { locale = "sk"; arch = "linux-x86_64"; sha1 = "57595905385b6b7e77eee34f54a40562d041169d"; }
-    { locale = "sl"; arch = "linux-i686"; sha1 = "63b3edf9aec8a6beabdf1a4b4a9fb0fb835345fc"; }
-    { locale = "sl"; arch = "linux-x86_64"; sha1 = "3afafa985ee73cfe378e39881665d2242a6943c9"; }
-    { locale = "son"; arch = "linux-i686"; sha1 = "e6b6b56ebee586bb10511d197b11d93aefae6316"; }
-    { locale = "son"; arch = "linux-x86_64"; sha1 = "f95cb4b571fa389df4e182632b12216699cc9f0a"; }
-    { locale = "sq"; arch = "linux-i686"; sha1 = "18dfa5b40bd31a0d23884f6e9af357b0be01c4b2"; }
-    { locale = "sq"; arch = "linux-x86_64"; sha1 = "f9d026e9d5a85eaad008d65b736ae8c63cb5064d"; }
-    { locale = "sr"; arch = "linux-i686"; sha1 = "a5ed16491244d9ab6237546e241335005572c1c0"; }
-    { locale = "sr"; arch = "linux-x86_64"; sha1 = "2ed29dec3a28949b93f82d0652a38a5539fb2304"; }
-    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "594eae45b36645a47b12d9579826789e3255b275"; }
-    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "0cec1133910c8ae87878ca56fd63b610651f99ca"; }
-    { locale = "ta"; arch = "linux-i686"; sha1 = "86da5bfa06e670359b831226822db6a40a7ec7c3"; }
-    { locale = "ta"; arch = "linux-x86_64"; sha1 = "86b3749d396a7be3628face4bf7ed7278b98c5ab"; }
-    { locale = "te"; arch = "linux-i686"; sha1 = "7020a27e9173b52a54c8e442e8e2ffc60a888e2c"; }
-    { locale = "te"; arch = "linux-x86_64"; sha1 = "417ea3e749a9f7309b11d50f99bd5c1b916a0c77"; }
-    { locale = "th"; arch = "linux-i686"; sha1 = "539293f4f6183ec2941fa83705f7c91bf5e65776"; }
-    { locale = "th"; arch = "linux-x86_64"; sha1 = "362d3c39936725437d63576f2c8ee6deaf9429ea"; }
-    { locale = "tr"; arch = "linux-i686"; sha1 = "eb0d205cf6eac45a8405d072b89856293d4cb63e"; }
-    { locale = "tr"; arch = "linux-x86_64"; sha1 = "84c19d6ec3446ecbe03f0751822501d3628699a8"; }
-    { locale = "uk"; arch = "linux-i686"; sha1 = "5ef72696a4180c91483f406627ea040bede2f30c"; }
-    { locale = "uk"; arch = "linux-x86_64"; sha1 = "9de7bcc3ff254234e1844860c3bc907317c02ae6"; }
-    { locale = "vi"; arch = "linux-i686"; sha1 = "3338130b87e4dd9ee7b8e7120dd158065a772290"; }
-    { locale = "vi"; arch = "linux-x86_64"; sha1 = "53ebf9890f9b4ccdc786fa65dcae739fae7b8f7c"; }
-    { locale = "xh"; arch = "linux-i686"; sha1 = "83ae4b1f84c64733d196b9bec58ab1468b126577"; }
-    { locale = "xh"; arch = "linux-x86_64"; sha1 = "da5b9dca0277dd2be1027251c96f7524e0204f2f"; }
-    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "bc3e12000156a886e00a64bf536c5b2c35bb727d"; }
-    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "1ac45fd506eb1d5bb92a86ee3a9686e8c93b5c9e"; }
-    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "5377236c138066df6f67083ae8ed348c6d611a81"; }
-    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "8733a47e10d1bd025507c09a443acf80dd614643"; }
-    { locale = "zu"; arch = "linux-i686"; sha1 = "a653e724fe28431b2b5ca5f2553654da4ffa526f"; }
-    { locale = "zu"; arch = "linux-x86_64"; sha1 = "81c967fc251d77a38de24519dba0f4465326fcd8"; }
-  ];
-}

From ae6686441e5d396a067a6aa4442a45ebc3d1af1d Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Tue, 12 Jan 2016 12:30:28 +0800
Subject: [PATCH 581/884] bluejeans: 2.100.102.8 -> 2.125.24.5

---
 .../networking/browsers/mozilla-plugins/bluejeans/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
index 5b3ceeae70a0..80c9b1b31d8e 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
@@ -17,11 +17,11 @@ in
 stdenv.mkDerivation rec {
   name = "bluejeans-${version}";
 
-  version = "2.100.102.8";
+  version = "2.125.24.5";
 
   src = fetchurl {
     url = "https://swdl.bluejeans.com/skinny/bjnplugin_${version}-1_amd64.deb";
-    sha256 = "18f8jmhxvqy1yiiwlsssj7rjlfcb41xn16hnl6wv8r8r2mmic4v8";
+    sha256 = "0lxxd7icfqcpg5rb4njkk4ybxmisv4c509yisznxspi49qfxirwq";
   };
 
   phases = [ "unpackPhase" "installPhase" "fixupPhase" ];

From 010724bc6ffe7eace64b70f14724b9569c9e7126 Mon Sep 17 00:00:00 2001
From: Louis Taylor <louis@kragniz.eu>
Date: Tue, 12 Jan 2016 07:02:11 +0000
Subject: [PATCH 582/884] mpv: 0.12.0 -> 0.14.0

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

diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 96f0c2f38f95..38efe61a7df5 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/mpv-player/mpv/archive/v${meta.version}.tar.gz";
-    sha256 = "1i3cinyjg1k7rp93cgf641zi8j98hl6qd6al9ws51n29qx22096z";
+    sha256 = "0cqjwl0xyg0sv1jflipfkvqjg32y0kqfh4gc3lyhqgv0hgs3fa84";
   };
 
   patchPhase = ''
@@ -125,7 +125,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    version = "0.12.0";
+    version = "0.14.0";
     description = "A media player that supports many video formats (MPlayer and mplayer2 fork)";
     homepage = http://mpv.io;
     license = licenses.gpl2Plus;

From 8da514d7268188058a7bc97afb08db85d0cbf898 Mon Sep 17 00:00:00 2001
From: Luke Clifton <ltclifton@gmail.com>
Date: Tue, 12 Jan 2016 20:21:53 +1100
Subject: [PATCH 583/884] Bring in krb5 for darwin builds seeing as we use

---
 pkgs/development/libraries/gsasl/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix
index 383c1a7e223a..1ca5d019b220 100644
--- a/pkgs/development/libraries/gsasl/default.nix
+++ b/pkgs/development/libraries/gsasl/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, gss, libidn }:
+{ fetchurl, stdenv, gss, libidn, krb5Full }:
 
 stdenv.mkDerivation rec {
   name = "gsasl-1.8.0";
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ libidn ]
-    ++ stdenv.lib.optional (!stdenv.isDarwin) gss;
+    ++ stdenv.lib.optional (!stdenv.isDarwin) gss
+    ++ stdenv.lib.optional stdenv.isDarwin krb5Full;
 
   configureFlags = stdenv.lib.optionalString stdenv.isDarwin "--with-gssapi-impl=mit";
 

From 43f1de91f8c63f5e8bff84d8e30b90e739cc78f2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 10 Jan 2016 19:55:11 +0100
Subject: [PATCH 584/884] hackage-packages.nix: update Haskell package set

This update was generated by hackage2nix v20151217-7-g3384c26 using the following inputs:

  - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/7cbc1f27d4607eff027366b8034ffc091ab2c4d6
  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/dfdbb526eda858439d70ecfdf4276b24776400c6
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/e72964a5535ea93cb5ce89d4f3bfb39e18b4e1b7
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/a9df6f5b3228030f69462820f45a1feffbab03ca
---
 .../haskell-modules/configuration-lts-0.0.nix |   2 +
 .../haskell-modules/configuration-lts-0.1.nix |   2 +
 .../haskell-modules/configuration-lts-0.2.nix |   2 +
 .../haskell-modules/configuration-lts-0.3.nix |   2 +
 .../haskell-modules/configuration-lts-0.4.nix |   2 +
 .../haskell-modules/configuration-lts-0.5.nix |   2 +
 .../haskell-modules/configuration-lts-0.6.nix |   2 +
 .../haskell-modules/configuration-lts-0.7.nix |   2 +
 .../haskell-modules/configuration-lts-1.0.nix |   2 +
 .../haskell-modules/configuration-lts-1.1.nix |   2 +
 .../configuration-lts-1.10.nix                |   2 +
 .../configuration-lts-1.11.nix                |   2 +
 .../configuration-lts-1.12.nix                |   2 +
 .../configuration-lts-1.13.nix                |   2 +
 .../configuration-lts-1.14.nix                |   2 +
 .../configuration-lts-1.15.nix                |   2 +
 .../haskell-modules/configuration-lts-1.2.nix |   2 +
 .../haskell-modules/configuration-lts-1.4.nix |   2 +
 .../haskell-modules/configuration-lts-1.5.nix |   2 +
 .../haskell-modules/configuration-lts-1.7.nix |   2 +
 .../haskell-modules/configuration-lts-1.8.nix |   2 +
 .../haskell-modules/configuration-lts-1.9.nix |   2 +
 .../haskell-modules/configuration-lts-2.0.nix |   2 +
 .../haskell-modules/configuration-lts-2.1.nix |   2 +
 .../configuration-lts-2.10.nix                |   4 +
 .../configuration-lts-2.11.nix                |   4 +
 .../configuration-lts-2.12.nix                |   4 +
 .../configuration-lts-2.13.nix                |   4 +
 .../configuration-lts-2.14.nix                |   4 +
 .../configuration-lts-2.15.nix                |   4 +
 .../configuration-lts-2.16.nix                |   4 +
 .../configuration-lts-2.17.nix                |   4 +
 .../configuration-lts-2.18.nix                |   4 +
 .../configuration-lts-2.19.nix                |   4 +
 .../haskell-modules/configuration-lts-2.2.nix |   2 +
 .../configuration-lts-2.20.nix                |   4 +
 .../configuration-lts-2.21.nix                |   4 +
 .../configuration-lts-2.22.nix                |   4 +
 .../haskell-modules/configuration-lts-2.3.nix |   2 +
 .../haskell-modules/configuration-lts-2.4.nix |   2 +
 .../haskell-modules/configuration-lts-2.5.nix |   2 +
 .../haskell-modules/configuration-lts-2.6.nix |   2 +
 .../haskell-modules/configuration-lts-2.7.nix |   2 +
 .../haskell-modules/configuration-lts-2.8.nix |   3 +
 .../haskell-modules/configuration-lts-2.9.nix |   3 +
 .../haskell-modules/configuration-lts-3.0.nix |   5 +
 .../haskell-modules/configuration-lts-3.1.nix |   5 +
 .../configuration-lts-3.10.nix                |   6 +
 .../configuration-lts-3.11.nix                |   7 +
 .../configuration-lts-3.12.nix                |   7 +
 .../configuration-lts-3.13.nix                |   7 +
 .../configuration-lts-3.14.nix                |   7 +
 .../configuration-lts-3.15.nix                |   7 +
 .../configuration-lts-3.16.nix                |   8 +
 .../configuration-lts-3.17.nix                |   8 +
 .../configuration-lts-3.18.nix                |   8 +
 .../configuration-lts-3.19.nix                |   8 +
 .../haskell-modules/configuration-lts-3.2.nix |   5 +
 .../configuration-lts-3.20.nix                |   8 +
 .../configuration-lts-3.21.nix                |  10 +
 .../configuration-lts-3.22.nix                |  11 +
 .../haskell-modules/configuration-lts-3.3.nix |   5 +
 .../haskell-modules/configuration-lts-3.4.nix |   5 +
 .../haskell-modules/configuration-lts-3.5.nix |   5 +
 .../haskell-modules/configuration-lts-3.6.nix |   6 +
 .../haskell-modules/configuration-lts-3.7.nix |   6 +
 .../haskell-modules/configuration-lts-3.8.nix |   6 +
 .../haskell-modules/configuration-lts-3.9.nix |   6 +
 .../haskell-modules/configuration-lts-4.0.nix |  18 +
 .../haskell-modules/configuration-lts-4.1.nix |  20 +
 .../haskell-modules/hackage-packages.nix      | 832 +++++++++++++++---
 71 files changed, 1011 insertions(+), 133 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
index f9c43556f34d..ec6426e460b5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
@@ -1011,6 +1011,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1807,6 +1808,7 @@ self: super: {
   "btrfs" = dontDistribute super."btrfs";
   "buffer-builder" = dontDistribute super."buffer-builder";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
index 0d4159090c77..aa7063e77cc5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
@@ -1011,6 +1011,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1807,6 +1808,7 @@ self: super: {
   "btrfs" = dontDistribute super."btrfs";
   "buffer-builder" = dontDistribute super."buffer-builder";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
index 0f8ebefd7628..5c1933f4f10d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
@@ -1011,6 +1011,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1807,6 +1808,7 @@ self: super: {
   "btrfs" = dontDistribute super."btrfs";
   "buffer-builder" = dontDistribute super."buffer-builder";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
index b503f2e97158..6d8dd5a5f8a3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
@@ -1011,6 +1011,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1807,6 +1808,7 @@ self: super: {
   "btrfs" = dontDistribute super."btrfs";
   "buffer-builder" = dontDistribute super."buffer-builder";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
index e6fec6b11549..7db699bfd0b8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
@@ -1011,6 +1011,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1807,6 +1808,7 @@ self: super: {
   "btrfs" = dontDistribute super."btrfs";
   "buffer-builder" = dontDistribute super."buffer-builder";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
index e4fabc4a7ee3..0f9edc365292 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
@@ -1011,6 +1011,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1807,6 +1808,7 @@ self: super: {
   "btrfs" = dontDistribute super."btrfs";
   "buffer-builder" = dontDistribute super."buffer-builder";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
index 74309d6b7afc..92e938ff7355 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
@@ -1010,6 +1010,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1804,6 +1805,7 @@ self: super: {
   "btrfs" = dontDistribute super."btrfs";
   "buffer-builder" = dontDistribute super."buffer-builder";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
index 47bd4677eb59..b4f602bb8e50 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
@@ -1010,6 +1010,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1804,6 +1805,7 @@ self: super: {
   "btrfs" = dontDistribute super."btrfs";
   "buffer-builder" = dontDistribute super."buffer-builder";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
index 9907c42fb522..7d5fee5db365 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
@@ -1006,6 +1006,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1798,6 +1799,7 @@ self: super: {
   "btrfs" = dontDistribute super."btrfs";
   "buffer-builder" = dontDistribute super."buffer-builder";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
index 225255a40d98..764a3ec80978 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
@@ -1006,6 +1006,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1798,6 +1799,7 @@ self: super: {
   "btrfs" = dontDistribute super."btrfs";
   "buffer-builder" = dontDistribute super."buffer-builder";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
index a05ce9aee47d..d73babe8172d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
@@ -1005,6 +1005,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1797,6 +1798,7 @@ self: super: {
   "btrfs" = dontDistribute super."btrfs";
   "buffer-builder" = dontDistribute super."buffer-builder";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
index b565f56278bd..41688f6ab93c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
@@ -1005,6 +1005,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1797,6 +1798,7 @@ self: super: {
   "btrfs" = dontDistribute super."btrfs";
   "buffer-builder" = dontDistribute super."buffer-builder";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
index 06d802c27b74..a7ba1c33c1f1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
@@ -1005,6 +1005,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1797,6 +1798,7 @@ self: super: {
   "btrfs" = dontDistribute super."btrfs";
   "buffer-builder" = dontDistribute super."buffer-builder";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
index d3895d30de69..2f1f52358bf9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
@@ -1005,6 +1005,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1797,6 +1798,7 @@ self: super: {
   "btrfs" = dontDistribute super."btrfs";
   "buffer-builder" = dontDistribute super."buffer-builder";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
index 530de7f8b32e..9bb8c9fa80f9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
@@ -1004,6 +1004,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1795,6 +1796,7 @@ self: super: {
   "btrfs" = dontDistribute super."btrfs";
   "buffer-builder" = dontDistribute super."buffer-builder";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
index 3abf18303fc8..b31b68d5242d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
@@ -1003,6 +1003,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1794,6 +1795,7 @@ self: super: {
   "btrfs" = dontDistribute super."btrfs";
   "buffer-builder" = dontDistribute super."buffer-builder";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
index cc495247e7f0..607eb1008846 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
@@ -1006,6 +1006,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1798,6 +1799,7 @@ self: super: {
   "btrfs" = dontDistribute super."btrfs";
   "buffer-builder" = dontDistribute super."buffer-builder";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
index 8f9b01775bd3..9ba134d352b4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
@@ -1005,6 +1005,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1797,6 +1798,7 @@ self: super: {
   "btrfs" = dontDistribute super."btrfs";
   "buffer-builder" = dontDistribute super."buffer-builder";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
index cfb73bafd7ff..5778c35978e5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
@@ -1005,6 +1005,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1797,6 +1798,7 @@ self: super: {
   "btrfs" = dontDistribute super."btrfs";
   "buffer-builder" = dontDistribute super."buffer-builder";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
index 98a17cd7b979..c43310b578c0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
@@ -1005,6 +1005,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1797,6 +1798,7 @@ self: super: {
   "btrfs" = dontDistribute super."btrfs";
   "buffer-builder" = dontDistribute super."buffer-builder";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
index c49352a84a62..d811365170b6 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
@@ -1005,6 +1005,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1797,6 +1798,7 @@ self: super: {
   "btrfs" = dontDistribute super."btrfs";
   "buffer-builder" = dontDistribute super."buffer-builder";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
index 3b61493cadf3..fdad5275921e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
@@ -1005,6 +1005,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1797,6 +1798,7 @@ self: super: {
   "btrfs" = dontDistribute super."btrfs";
   "buffer-builder" = dontDistribute super."buffer-builder";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
index 9021d0eeffee..0cfc9b9c9118 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
@@ -995,6 +995,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1782,6 +1783,7 @@ self: super: {
   "btrfs" = dontDistribute super."btrfs";
   "buffer-builder" = dontDistribute super."buffer-builder";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
index 0a9cdc1c9277..155388b3edf7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
@@ -995,6 +995,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1782,6 +1783,7 @@ self: super: {
   "btrfs" = dontDistribute super."btrfs";
   "buffer-builder" = dontDistribute super."buffer-builder";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
index c9a3d2cdd3f7..c6cf2eb343e5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
@@ -992,6 +992,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1773,6 +1774,7 @@ self: super: {
   "btrfs" = dontDistribute super."btrfs";
   "buffer-builder" = dontDistribute super."buffer-builder";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
@@ -4893,6 +4895,7 @@ self: super: {
   "jose-jwt" = doDistribute super."jose-jwt_0_4_2";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_11_3";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -5365,6 +5368,7 @@ self: super: {
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
   "machines-binary" = dontDistribute super."machines-binary";
+  "machines-io" = doDistribute super."machines-io_0_2_0_6";
   "machines-zlib" = dontDistribute super."machines-zlib";
   "macho" = dontDistribute super."macho";
   "maclight" = dontDistribute super."maclight";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
index 96be05851d78..2d94ce3e02fd 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
@@ -992,6 +992,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1772,6 +1773,7 @@ self: super: {
   "btrfs" = dontDistribute super."btrfs";
   "buffer-builder" = dontDistribute super."buffer-builder";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
@@ -4889,6 +4891,7 @@ self: super: {
   "jose-jwt" = doDistribute super."jose-jwt_0_4_2";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_11_3";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -5361,6 +5364,7 @@ self: super: {
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
   "machines-binary" = dontDistribute super."machines-binary";
+  "machines-io" = doDistribute super."machines-io_0_2_0_6";
   "machines-zlib" = dontDistribute super."machines-zlib";
   "macho" = dontDistribute super."macho";
   "maclight" = dontDistribute super."maclight";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
index b214ee9552c1..181dc4386197 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
@@ -992,6 +992,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1772,6 +1773,7 @@ self: super: {
   "btrfs" = dontDistribute super."btrfs";
   "buffer-builder" = dontDistribute super."buffer-builder";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
@@ -4889,6 +4891,7 @@ self: super: {
   "jose-jwt" = doDistribute super."jose-jwt_0_4_2";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_11_3";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -5361,6 +5364,7 @@ self: super: {
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
   "machines-binary" = dontDistribute super."machines-binary";
+  "machines-io" = doDistribute super."machines-io_0_2_0_6";
   "machines-zlib" = dontDistribute super."machines-zlib";
   "macho" = dontDistribute super."macho";
   "maclight" = dontDistribute super."maclight";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
index 217e6cca37cc..23e09e2751ce 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
@@ -992,6 +992,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1772,6 +1773,7 @@ self: super: {
   "btrfs" = dontDistribute super."btrfs";
   "buffer-builder" = dontDistribute super."buffer-builder";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
@@ -4887,6 +4889,7 @@ self: super: {
   "jose-jwt" = doDistribute super."jose-jwt_0_4_2";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_11_3";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -5359,6 +5362,7 @@ self: super: {
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
   "machines-binary" = dontDistribute super."machines-binary";
+  "machines-io" = doDistribute super."machines-io_0_2_0_6";
   "machines-zlib" = dontDistribute super."machines-zlib";
   "macho" = dontDistribute super."macho";
   "maclight" = dontDistribute super."maclight";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
index 529fdf3a9af8..e12c4f8b74c3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
@@ -992,6 +992,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1771,6 +1772,7 @@ self: super: {
   "btrfs" = dontDistribute super."btrfs";
   "buffer-builder" = dontDistribute super."buffer-builder";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
@@ -4884,6 +4886,7 @@ self: super: {
   "jose-jwt" = doDistribute super."jose-jwt_0_4_2";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_11_3";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -5356,6 +5359,7 @@ self: super: {
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
   "machines-binary" = dontDistribute super."machines-binary";
+  "machines-io" = doDistribute super."machines-io_0_2_0_6";
   "machines-zlib" = dontDistribute super."machines-zlib";
   "macho" = dontDistribute super."macho";
   "maclight" = dontDistribute super."maclight";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
index b3ee5b2175f8..b19efb0c948b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
@@ -992,6 +992,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1771,6 +1772,7 @@ self: super: {
   "btrfs" = dontDistribute super."btrfs";
   "buffer-builder" = dontDistribute super."buffer-builder";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
@@ -4883,6 +4885,7 @@ self: super: {
   "jose-jwt" = doDistribute super."jose-jwt_0_4_2";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_11_3";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -5355,6 +5358,7 @@ self: super: {
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
   "machines-binary" = dontDistribute super."machines-binary";
+  "machines-io" = doDistribute super."machines-io_0_2_0_6";
   "machines-zlib" = dontDistribute super."machines-zlib";
   "macho" = dontDistribute super."macho";
   "maclight" = dontDistribute super."maclight";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
index dde146a4c693..b92094bd7a40 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
@@ -991,6 +991,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1770,6 +1771,7 @@ self: super: {
   "btrfs" = dontDistribute super."btrfs";
   "buffer-builder" = dontDistribute super."buffer-builder";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
@@ -4877,6 +4879,7 @@ self: super: {
   "jose-jwt" = doDistribute super."jose-jwt_0_4_2";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_11_3";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -5348,6 +5351,7 @@ self: super: {
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
   "machines-binary" = dontDistribute super."machines-binary";
+  "machines-io" = doDistribute super."machines-io_0_2_0_6";
   "machines-zlib" = dontDistribute super."machines-zlib";
   "macho" = dontDistribute super."macho";
   "maclight" = dontDistribute super."maclight";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
index 9326e2788fee..5cc4dee0ed2f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
@@ -991,6 +991,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1768,6 +1769,7 @@ self: super: {
   "btrfs" = dontDistribute super."btrfs";
   "buffer-builder" = dontDistribute super."buffer-builder";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
@@ -4872,6 +4874,7 @@ self: super: {
   "jose-jwt" = doDistribute super."jose-jwt_0_4_2";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_11_3";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -5343,6 +5346,7 @@ self: super: {
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
   "machines-binary" = dontDistribute super."machines-binary";
+  "machines-io" = doDistribute super."machines-io_0_2_0_6";
   "machines-zlib" = dontDistribute super."machines-zlib";
   "macho" = dontDistribute super."macho";
   "maclight" = dontDistribute super."maclight";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
index a2a7e8ff95d1..bfe463d6ea93 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
@@ -991,6 +991,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1768,6 +1769,7 @@ self: super: {
   "btrfs" = dontDistribute super."btrfs";
   "buffer-builder" = dontDistribute super."buffer-builder";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
@@ -4869,6 +4871,7 @@ self: super: {
   "jose-jwt" = doDistribute super."jose-jwt_0_4_2";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_11_3";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -5340,6 +5343,7 @@ self: super: {
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
   "machines-binary" = dontDistribute super."machines-binary";
+  "machines-io" = doDistribute super."machines-io_0_2_0_6";
   "machines-zlib" = dontDistribute super."machines-zlib";
   "macho" = dontDistribute super."macho";
   "maclight" = dontDistribute super."maclight";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
index 92787cdb0a3d..186cf5894879 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
@@ -991,6 +991,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1768,6 +1769,7 @@ self: super: {
   "btrfs" = dontDistribute super."btrfs";
   "buffer-builder" = dontDistribute super."buffer-builder";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
@@ -4868,6 +4870,7 @@ self: super: {
   "jose-jwt" = doDistribute super."jose-jwt_0_4_2";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_11_3";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -5339,6 +5342,7 @@ self: super: {
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
   "machines-binary" = dontDistribute super."machines-binary";
+  "machines-io" = doDistribute super."machines-io_0_2_0_6";
   "machines-zlib" = dontDistribute super."machines-zlib";
   "macho" = dontDistribute super."macho";
   "maclight" = dontDistribute super."maclight";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
index ea3757006c40..43c807311a64 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
@@ -994,6 +994,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1781,6 +1782,7 @@ self: super: {
   "btrfs" = dontDistribute super."btrfs";
   "buffer-builder" = dontDistribute super."buffer-builder";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
index 241a54c88491..94540f44ac70 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
@@ -991,6 +991,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1768,6 +1769,7 @@ self: super: {
   "btrfs" = dontDistribute super."btrfs";
   "buffer-builder" = dontDistribute super."buffer-builder";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
@@ -4866,6 +4868,7 @@ self: super: {
   "jose-jwt" = doDistribute super."jose-jwt_0_4_2";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_11_3";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -5337,6 +5340,7 @@ self: super: {
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
   "machines-binary" = dontDistribute super."machines-binary";
+  "machines-io" = doDistribute super."machines-io_0_2_0_6";
   "machines-zlib" = dontDistribute super."machines-zlib";
   "macho" = dontDistribute super."macho";
   "maclight" = dontDistribute super."maclight";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
index f1817bcf582b..c6436d1d728a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
@@ -991,6 +991,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1768,6 +1769,7 @@ self: super: {
   "btrfs" = dontDistribute super."btrfs";
   "buffer-builder" = dontDistribute super."buffer-builder";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
@@ -4866,6 +4868,7 @@ self: super: {
   "jose-jwt" = doDistribute super."jose-jwt_0_4_2";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_11_3";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -5336,6 +5339,7 @@ self: super: {
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
   "machines-binary" = dontDistribute super."machines-binary";
+  "machines-io" = doDistribute super."machines-io_0_2_0_6";
   "machines-zlib" = dontDistribute super."machines-zlib";
   "macho" = dontDistribute super."macho";
   "maclight" = dontDistribute super."maclight";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
index a7100dbced8b..c35bcbb2cda6 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
@@ -991,6 +991,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1768,6 +1769,7 @@ self: super: {
   "btrfs" = dontDistribute super."btrfs";
   "buffer-builder" = dontDistribute super."buffer-builder";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
@@ -4865,6 +4867,7 @@ self: super: {
   "jose-jwt" = doDistribute super."jose-jwt_0_4_2";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_11_3";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -5335,6 +5338,7 @@ self: super: {
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
   "machines-binary" = dontDistribute super."machines-binary";
+  "machines-io" = doDistribute super."machines-io_0_2_0_6";
   "machines-zlib" = dontDistribute super."machines-zlib";
   "macho" = dontDistribute super."macho";
   "maclight" = dontDistribute super."maclight";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
index a8635180afb0..8e459791eaff 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
@@ -994,6 +994,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1781,6 +1782,7 @@ self: super: {
   "btrfs" = dontDistribute super."btrfs";
   "buffer-builder" = dontDistribute super."buffer-builder";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
index 568a559f6678..f071eff3e71d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
@@ -994,6 +994,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1780,6 +1781,7 @@ self: super: {
   "btrfs" = dontDistribute super."btrfs";
   "buffer-builder" = dontDistribute super."buffer-builder";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
index 654773b38a8e..fc079f4ab454 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
@@ -994,6 +994,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1780,6 +1781,7 @@ self: super: {
   "btrfs" = dontDistribute super."btrfs";
   "buffer-builder" = dontDistribute super."buffer-builder";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
index d1232893e9fe..33d8eac9aa6d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
@@ -994,6 +994,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1777,6 +1778,7 @@ self: super: {
   "btrfs" = dontDistribute super."btrfs";
   "buffer-builder" = dontDistribute super."buffer-builder";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
index 7d95a486a30f..5e81a8330834 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
@@ -993,6 +993,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1776,6 +1777,7 @@ self: super: {
   "btrfs" = dontDistribute super."btrfs";
   "buffer-builder" = dontDistribute super."buffer-builder";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
index 83bf0d3bf1a0..9a19550bb8c0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
@@ -992,6 +992,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1775,6 +1776,7 @@ self: super: {
   "btrfs" = dontDistribute super."btrfs";
   "buffer-builder" = dontDistribute super."buffer-builder";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
@@ -4906,6 +4908,7 @@ self: super: {
   "jose-jwt" = doDistribute super."jose-jwt_0_4_2";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_11_3";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
index 4216ef6fd628..6431dc6acc87 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
@@ -992,6 +992,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1773,6 +1774,7 @@ self: super: {
   "btrfs" = dontDistribute super."btrfs";
   "buffer-builder" = dontDistribute super."buffer-builder";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
@@ -4898,6 +4900,7 @@ self: super: {
   "jose-jwt" = doDistribute super."jose-jwt_0_4_2";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_11_3";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
index 62bfee2192c1..27466c8216cd 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
@@ -969,6 +969,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1708,6 +1709,7 @@ self: super: {
   "btree-concurrent" = dontDistribute super."btree-concurrent";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
@@ -1780,6 +1782,7 @@ self: super: {
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
   "cabal-sort" = dontDistribute super."cabal-sort";
+  "cabal-src" = doDistribute super."cabal-src_0_3_0";
   "cabal-test" = dontDistribute super."cabal-test";
   "cabal-test-bin" = dontDistribute super."cabal-test-bin";
   "cabal-test-compat" = dontDistribute super."cabal-test-compat";
@@ -4724,6 +4727,7 @@ self: super: {
   "jose-jwt" = doDistribute super."jose-jwt_0_6_2";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_11_3";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -5169,6 +5173,7 @@ self: super: {
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
+  "machines-io" = doDistribute super."machines-io_0_2_0_6";
   "machines-zlib" = dontDistribute super."machines-zlib";
   "macho" = dontDistribute super."macho";
   "maclight" = dontDistribute super."maclight";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
index 49437d99d37c..98fb2c84b6ec 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
@@ -969,6 +969,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1707,6 +1708,7 @@ self: super: {
   "btree-concurrent" = dontDistribute super."btree-concurrent";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
@@ -1779,6 +1781,7 @@ self: super: {
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
   "cabal-sort" = dontDistribute super."cabal-sort";
+  "cabal-src" = doDistribute super."cabal-src_0_3_0";
   "cabal-test" = dontDistribute super."cabal-test";
   "cabal-test-bin" = dontDistribute super."cabal-test-bin";
   "cabal-test-compat" = dontDistribute super."cabal-test-compat";
@@ -4719,6 +4722,7 @@ self: super: {
   "jose-jwt" = doDistribute super."jose-jwt_0_6_2";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_11_3";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -5163,6 +5167,7 @@ self: super: {
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
+  "machines-io" = doDistribute super."machines-io_0_2_0_6";
   "machines-zlib" = dontDistribute super."machines-zlib";
   "macho" = dontDistribute super."macho";
   "maclight" = dontDistribute super."maclight";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
index 7d4b5306be2e..2e8107faf592 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
@@ -962,6 +962,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1689,6 +1690,7 @@ self: super: {
   "btree-concurrent" = dontDistribute super."btree-concurrent";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
@@ -1760,6 +1762,7 @@ self: super: {
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
   "cabal-sort" = dontDistribute super."cabal-sort";
+  "cabal-src" = doDistribute super."cabal-src_0_3_0";
   "cabal-test" = dontDistribute super."cabal-test";
   "cabal-test-bin" = dontDistribute super."cabal-test-bin";
   "cabal-test-compat" = dontDistribute super."cabal-test-compat";
@@ -2751,6 +2754,7 @@ self: super: {
   "error-message" = dontDistribute super."error-message";
   "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance";
+  "errors" = doDistribute super."errors_2_0_1";
   "ersatz" = dontDistribute super."ersatz";
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
   "ert" = dontDistribute super."ert";
@@ -4657,6 +4661,7 @@ self: super: {
   "jose-jwt" = doDistribute super."jose-jwt_0_6_2";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_11_3";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -5095,6 +5100,7 @@ self: super: {
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
+  "machines-io" = doDistribute super."machines-io_0_2_0_6";
   "machines-zlib" = dontDistribute super."machines-zlib";
   "macho" = dontDistribute super."macho";
   "maclight" = dontDistribute super."maclight";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
index da6193236e10..6e26abff3382 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
@@ -962,6 +962,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1688,6 +1689,7 @@ self: super: {
   "btree-concurrent" = dontDistribute super."btree-concurrent";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
@@ -1758,6 +1760,7 @@ self: super: {
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
   "cabal-sort" = dontDistribute super."cabal-sort";
+  "cabal-src" = doDistribute super."cabal-src_0_3_0";
   "cabal-test" = dontDistribute super."cabal-test";
   "cabal-test-bin" = dontDistribute super."cabal-test-bin";
   "cabal-test-compat" = dontDistribute super."cabal-test-compat";
@@ -2749,6 +2752,7 @@ self: super: {
   "error-message" = dontDistribute super."error-message";
   "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance";
+  "errors" = doDistribute super."errors_2_0_1";
   "ersatz" = dontDistribute super."ersatz";
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
   "ert" = dontDistribute super."ert";
@@ -4653,6 +4657,7 @@ self: super: {
   "jose-jwt" = doDistribute super."jose-jwt_0_6_2";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_11_3";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -5091,6 +5096,7 @@ self: super: {
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
+  "machines-io" = doDistribute super."machines-io_0_2_0_6";
   "machines-zlib" = dontDistribute super."machines-zlib";
   "macho" = dontDistribute super."macho";
   "maclight" = dontDistribute super."maclight";
@@ -7259,6 +7265,7 @@ self: super: {
   "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory";
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
+  "tar" = doDistribute super."tar_0_4_2_2";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "taskpool" = dontDistribute super."taskpool";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
index 93f1abf97d7f..51c4b7dd7294 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
@@ -961,6 +961,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1687,6 +1688,7 @@ self: super: {
   "btree-concurrent" = dontDistribute super."btree-concurrent";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
@@ -1757,6 +1759,7 @@ self: super: {
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
   "cabal-sort" = dontDistribute super."cabal-sort";
+  "cabal-src" = doDistribute super."cabal-src_0_3_0";
   "cabal-test" = dontDistribute super."cabal-test";
   "cabal-test-bin" = dontDistribute super."cabal-test-bin";
   "cabal-test-compat" = dontDistribute super."cabal-test-compat";
@@ -2744,6 +2747,7 @@ self: super: {
   "error-message" = dontDistribute super."error-message";
   "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance";
+  "errors" = doDistribute super."errors_2_0_1";
   "ersatz" = dontDistribute super."ersatz";
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
   "ert" = dontDistribute super."ert";
@@ -4647,6 +4651,7 @@ self: super: {
   "jose-jwt" = doDistribute super."jose-jwt_0_6_2";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_11_3";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -5085,6 +5090,7 @@ self: super: {
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
+  "machines-io" = doDistribute super."machines-io_0_2_0_6";
   "machines-zlib" = dontDistribute super."machines-zlib";
   "macho" = dontDistribute super."macho";
   "maclight" = dontDistribute super."maclight";
@@ -7252,6 +7258,7 @@ self: super: {
   "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory";
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
+  "tar" = doDistribute super."tar_0_4_2_2";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "taskpool" = dontDistribute super."taskpool";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
index e5fc2efb7aab..3b1134e5819a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
@@ -961,6 +961,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1687,6 +1688,7 @@ self: super: {
   "btree-concurrent" = dontDistribute super."btree-concurrent";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
@@ -1757,6 +1759,7 @@ self: super: {
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
   "cabal-sort" = dontDistribute super."cabal-sort";
+  "cabal-src" = doDistribute super."cabal-src_0_3_0";
   "cabal-test" = dontDistribute super."cabal-test";
   "cabal-test-bin" = dontDistribute super."cabal-test-bin";
   "cabal-test-compat" = dontDistribute super."cabal-test-compat";
@@ -2744,6 +2747,7 @@ self: super: {
   "error-message" = dontDistribute super."error-message";
   "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance";
+  "errors" = doDistribute super."errors_2_0_1";
   "ersatz" = dontDistribute super."ersatz";
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
   "ert" = dontDistribute super."ert";
@@ -4646,6 +4650,7 @@ self: super: {
   "jose-jwt" = doDistribute super."jose-jwt_0_6_2";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_11_3";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -5083,6 +5088,7 @@ self: super: {
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
+  "machines-io" = doDistribute super."machines-io_0_2_0_6";
   "machines-zlib" = dontDistribute super."machines-zlib";
   "macho" = dontDistribute super."macho";
   "maclight" = dontDistribute super."maclight";
@@ -7248,6 +7254,7 @@ self: super: {
   "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory";
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
+  "tar" = doDistribute super."tar_0_4_2_2";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "taskpool" = dontDistribute super."taskpool";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.14.nix b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
index 57f2843d7e91..110e037d766e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
@@ -961,6 +961,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1684,6 +1685,7 @@ self: super: {
   "btree-concurrent" = dontDistribute super."btree-concurrent";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
@@ -1754,6 +1756,7 @@ self: super: {
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
   "cabal-sort" = dontDistribute super."cabal-sort";
+  "cabal-src" = doDistribute super."cabal-src_0_3_0";
   "cabal-test" = dontDistribute super."cabal-test";
   "cabal-test-bin" = dontDistribute super."cabal-test-bin";
   "cabal-test-compat" = dontDistribute super."cabal-test-compat";
@@ -2736,6 +2739,7 @@ self: super: {
   "error-message" = dontDistribute super."error-message";
   "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance";
+  "errors" = doDistribute super."errors_2_0_1";
   "ersatz" = dontDistribute super."ersatz";
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
   "ert" = dontDistribute super."ert";
@@ -4637,6 +4641,7 @@ self: super: {
   "jose-jwt" = doDistribute super."jose-jwt_0_6_2";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_11_3";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -5073,6 +5078,7 @@ self: super: {
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
+  "machines-io" = doDistribute super."machines-io_0_2_0_6";
   "machines-zlib" = dontDistribute super."machines-zlib";
   "macho" = dontDistribute super."macho";
   "maclight" = dontDistribute super."maclight";
@@ -7236,6 +7242,7 @@ self: super: {
   "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory";
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
+  "tar" = doDistribute super."tar_0_4_2_2";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "taskpool" = dontDistribute super."taskpool";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.15.nix b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
index 08599d5ebe15..8416bbdd226a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
@@ -960,6 +960,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1683,6 +1684,7 @@ self: super: {
   "btree-concurrent" = dontDistribute super."btree-concurrent";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
@@ -1753,6 +1755,7 @@ self: super: {
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
   "cabal-sort" = dontDistribute super."cabal-sort";
+  "cabal-src" = doDistribute super."cabal-src_0_3_0";
   "cabal-test" = dontDistribute super."cabal-test";
   "cabal-test-bin" = dontDistribute super."cabal-test-bin";
   "cabal-test-compat" = dontDistribute super."cabal-test-compat";
@@ -2735,6 +2738,7 @@ self: super: {
   "error-message" = dontDistribute super."error-message";
   "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance";
+  "errors" = doDistribute super."errors_2_0_1";
   "ersatz" = dontDistribute super."ersatz";
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
   "ert" = dontDistribute super."ert";
@@ -4632,6 +4636,7 @@ self: super: {
   "jose-jwt" = doDistribute super."jose-jwt_0_6_2";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_11_3";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -5068,6 +5073,7 @@ self: super: {
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
+  "machines-io" = doDistribute super."machines-io_0_2_0_6";
   "machines-zlib" = dontDistribute super."machines-zlib";
   "macho" = dontDistribute super."macho";
   "maclight" = dontDistribute super."maclight";
@@ -7228,6 +7234,7 @@ self: super: {
   "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory";
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
+  "tar" = doDistribute super."tar_0_4_2_2";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "taskpool" = dontDistribute super."taskpool";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.16.nix b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
index d827948f546d..c7073f598dbe 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
@@ -959,6 +959,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1681,6 +1682,7 @@ self: super: {
   "btree-concurrent" = dontDistribute super."btree-concurrent";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
@@ -1751,6 +1753,7 @@ self: super: {
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
   "cabal-sort" = dontDistribute super."cabal-sort";
+  "cabal-src" = doDistribute super."cabal-src_0_3_0";
   "cabal-test" = dontDistribute super."cabal-test";
   "cabal-test-bin" = dontDistribute super."cabal-test-bin";
   "cabal-test-compat" = dontDistribute super."cabal-test-compat";
@@ -2733,6 +2736,7 @@ self: super: {
   "error-message" = dontDistribute super."error-message";
   "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance";
+  "errors" = doDistribute super."errors_2_0_1";
   "ersatz" = dontDistribute super."ersatz";
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
   "ert" = dontDistribute super."ert";
@@ -4628,6 +4632,7 @@ self: super: {
   "jose-jwt" = doDistribute super."jose-jwt_0_6_2";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_11_3";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -4894,6 +4899,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_2";
   "lifted-threads" = dontDistribute super."lifted-threads";
   "lifter" = dontDistribute super."lifter";
   "ligature" = dontDistribute super."ligature";
@@ -5062,6 +5068,7 @@ self: super: {
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
+  "machines-io" = doDistribute super."machines-io_0_2_0_6";
   "machines-zlib" = dontDistribute super."machines-zlib";
   "macho" = dontDistribute super."macho";
   "maclight" = dontDistribute super."maclight";
@@ -7216,6 +7223,7 @@ self: super: {
   "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory";
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
+  "tar" = doDistribute super."tar_0_4_2_2";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "taskpool" = dontDistribute super."taskpool";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.17.nix b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
index 55953cce45aa..aa4e90d19f20 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
@@ -958,6 +958,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1679,6 +1680,7 @@ self: super: {
   "btree-concurrent" = dontDistribute super."btree-concurrent";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
@@ -1748,6 +1750,7 @@ self: super: {
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
   "cabal-sort" = dontDistribute super."cabal-sort";
+  "cabal-src" = doDistribute super."cabal-src_0_3_0";
   "cabal-test" = dontDistribute super."cabal-test";
   "cabal-test-bin" = dontDistribute super."cabal-test-bin";
   "cabal-test-compat" = dontDistribute super."cabal-test-compat";
@@ -2727,6 +2730,7 @@ self: super: {
   "error-message" = dontDistribute super."error-message";
   "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance";
+  "errors" = doDistribute super."errors_2_0_1";
   "ersatz" = dontDistribute super."ersatz";
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
   "ert" = dontDistribute super."ert";
@@ -4620,6 +4624,7 @@ self: super: {
   "jose-jwt" = doDistribute super."jose-jwt_0_6_2";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_11_3";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -4886,6 +4891,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_2";
   "lifted-threads" = dontDistribute super."lifted-threads";
   "lifter" = dontDistribute super."lifter";
   "ligature" = dontDistribute super."ligature";
@@ -5053,6 +5059,7 @@ self: super: {
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
+  "machines-io" = doDistribute super."machines-io_0_2_0_6";
   "machines-zlib" = dontDistribute super."machines-zlib";
   "macho" = dontDistribute super."macho";
   "maclight" = dontDistribute super."maclight";
@@ -7203,6 +7210,7 @@ self: super: {
   "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory";
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
+  "tar" = doDistribute super."tar_0_4_2_2";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "taskpool" = dontDistribute super."taskpool";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.18.nix b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
index c669e7f0dffa..a9a4ed101355 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
@@ -958,6 +958,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1679,6 +1680,7 @@ self: super: {
   "btree-concurrent" = dontDistribute super."btree-concurrent";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
@@ -1748,6 +1750,7 @@ self: super: {
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
   "cabal-sort" = dontDistribute super."cabal-sort";
+  "cabal-src" = doDistribute super."cabal-src_0_3_0";
   "cabal-test" = dontDistribute super."cabal-test";
   "cabal-test-bin" = dontDistribute super."cabal-test-bin";
   "cabal-test-compat" = dontDistribute super."cabal-test-compat";
@@ -2726,6 +2729,7 @@ self: super: {
   "error-message" = dontDistribute super."error-message";
   "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance";
+  "errors" = doDistribute super."errors_2_0_1";
   "ersatz" = dontDistribute super."ersatz";
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
   "ert" = dontDistribute super."ert";
@@ -4610,6 +4614,7 @@ self: super: {
   "jose-jwt" = doDistribute super."jose-jwt_0_6_2";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_11_3";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -4876,6 +4881,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_2";
   "lifted-threads" = dontDistribute super."lifted-threads";
   "lifter" = dontDistribute super."lifter";
   "ligature" = dontDistribute super."ligature";
@@ -5043,6 +5049,7 @@ self: super: {
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
+  "machines-io" = doDistribute super."machines-io_0_2_0_6";
   "machines-zlib" = dontDistribute super."machines-zlib";
   "macho" = dontDistribute super."macho";
   "maclight" = dontDistribute super."maclight";
@@ -7188,6 +7195,7 @@ self: super: {
   "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory";
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
+  "tar" = doDistribute super."tar_0_4_2_2";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "taskpool" = dontDistribute super."taskpool";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.19.nix b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
index 356ff9ca35f8..321d516b14c7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
@@ -957,6 +957,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1673,6 +1674,7 @@ self: super: {
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
@@ -1742,6 +1744,7 @@ self: super: {
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
   "cabal-sort" = dontDistribute super."cabal-sort";
+  "cabal-src" = doDistribute super."cabal-src_0_3_0";
   "cabal-test" = dontDistribute super."cabal-test";
   "cabal-test-bin" = dontDistribute super."cabal-test-bin";
   "cabal-test-compat" = dontDistribute super."cabal-test-compat";
@@ -2719,6 +2722,7 @@ self: super: {
   "error-message" = dontDistribute super."error-message";
   "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance";
+  "errors" = doDistribute super."errors_2_0_1";
   "ersatz" = dontDistribute super."ersatz";
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
   "ert" = dontDistribute super."ert";
@@ -4600,6 +4604,7 @@ self: super: {
   "jose-jwt" = doDistribute super."jose-jwt_0_6_2";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_11_3";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -4865,6 +4870,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_2";
   "lifted-threads" = dontDistribute super."lifted-threads";
   "lifter" = dontDistribute super."lifter";
   "ligature" = dontDistribute super."ligature";
@@ -5031,6 +5037,7 @@ self: super: {
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
+  "machines-io" = doDistribute super."machines-io_0_2_0_6";
   "machines-zlib" = dontDistribute super."machines-zlib";
   "macho" = dontDistribute super."macho";
   "maclight" = dontDistribute super."maclight";
@@ -7171,6 +7178,7 @@ self: super: {
   "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory";
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
+  "tar" = doDistribute super."tar_0_4_2_2";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "taskpool" = dontDistribute super."taskpool";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
index 1306fd9aff69..4b36506ba210 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
@@ -967,6 +967,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1704,6 +1705,7 @@ self: super: {
   "btree-concurrent" = dontDistribute super."btree-concurrent";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
@@ -1776,6 +1778,7 @@ self: super: {
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
   "cabal-sort" = dontDistribute super."cabal-sort";
+  "cabal-src" = doDistribute super."cabal-src_0_3_0";
   "cabal-test" = dontDistribute super."cabal-test";
   "cabal-test-bin" = dontDistribute super."cabal-test-bin";
   "cabal-test-compat" = dontDistribute super."cabal-test-compat";
@@ -4714,6 +4717,7 @@ self: super: {
   "jose-jwt" = doDistribute super."jose-jwt_0_6_2";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_11_3";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -5156,6 +5160,7 @@ self: super: {
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
+  "machines-io" = doDistribute super."machines-io_0_2_0_6";
   "machines-zlib" = dontDistribute super."machines-zlib";
   "macho" = dontDistribute super."macho";
   "maclight" = dontDistribute super."maclight";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.20.nix b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
index e0593aaee47d..0e18f8f22b29 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
@@ -955,6 +955,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1669,6 +1670,7 @@ self: super: {
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
@@ -1737,6 +1739,7 @@ self: super: {
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
   "cabal-sort" = dontDistribute super."cabal-sort";
+  "cabal-src" = doDistribute super."cabal-src_0_3_0";
   "cabal-test" = dontDistribute super."cabal-test";
   "cabal-test-bin" = dontDistribute super."cabal-test-bin";
   "cabal-test-compat" = dontDistribute super."cabal-test-compat";
@@ -2714,6 +2717,7 @@ self: super: {
   "error-message" = dontDistribute super."error-message";
   "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance";
+  "errors" = doDistribute super."errors_2_0_1";
   "ersatz" = dontDistribute super."ersatz";
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
   "ert" = dontDistribute super."ert";
@@ -4594,6 +4598,7 @@ self: super: {
   "jose-jwt" = doDistribute super."jose-jwt_0_6_2";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_11_3";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -4858,6 +4863,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_2";
   "lifted-threads" = dontDistribute super."lifted-threads";
   "lifter" = dontDistribute super."lifter";
   "ligature" = dontDistribute super."ligature";
@@ -5024,6 +5030,7 @@ self: super: {
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
+  "machines-io" = doDistribute super."machines-io_0_2_0_6";
   "machines-zlib" = dontDistribute super."machines-zlib";
   "macho" = dontDistribute super."macho";
   "maclight" = dontDistribute super."maclight";
@@ -7161,6 +7168,7 @@ self: super: {
   "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory";
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
+  "tar" = doDistribute super."tar_0_4_2_2";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "taskpool" = dontDistribute super."taskpool";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.21.nix b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
index fb139d4980c9..7749dbd353c8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
@@ -954,6 +954,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1666,6 +1667,7 @@ self: super: {
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
@@ -1734,6 +1736,7 @@ self: super: {
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
   "cabal-sort" = dontDistribute super."cabal-sort";
+  "cabal-src" = doDistribute super."cabal-src_0_3_0";
   "cabal-test" = dontDistribute super."cabal-test";
   "cabal-test-bin" = dontDistribute super."cabal-test-bin";
   "cabal-test-compat" = dontDistribute super."cabal-test-compat";
@@ -2709,6 +2712,7 @@ self: super: {
   "error-message" = dontDistribute super."error-message";
   "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance";
+  "errors" = doDistribute super."errors_2_0_1";
   "ersatz" = dontDistribute super."ersatz";
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
   "ert" = dontDistribute super."ert";
@@ -4378,6 +4382,7 @@ self: super: {
   "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
+  "ide-backend-server" = doDistribute super."ide-backend-server_0_10_0_1";
   "ideas" = dontDistribute super."ideas";
   "ideas-math" = dontDistribute super."ideas-math";
   "idempotent" = dontDistribute super."idempotent";
@@ -4583,6 +4588,7 @@ self: super: {
   "jose-jwt" = doDistribute super."jose-jwt_0_6_2";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_11_3";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -4847,6 +4853,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_2";
   "lifted-threads" = dontDistribute super."lifted-threads";
   "lifter" = dontDistribute super."lifter";
   "ligature" = dontDistribute super."ligature";
@@ -5013,6 +5020,7 @@ self: super: {
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
+  "machines-io" = doDistribute super."machines-io_0_2_0_6";
   "machines-zlib" = dontDistribute super."machines-zlib";
   "macho" = dontDistribute super."macho";
   "maclight" = dontDistribute super."maclight";
@@ -7135,6 +7143,7 @@ self: super: {
   "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory";
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
+  "tar" = doDistribute super."tar_0_4_2_2";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "taskpool" = dontDistribute super."taskpool";
@@ -8022,6 +8031,7 @@ self: super: {
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
   "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
+  "yesod-bin" = doDistribute super."yesod-bin_1_4_17";
   "yesod-bootstrap" = dontDistribute super."yesod-bootstrap";
   "yesod-comments" = dontDistribute super."yesod-comments";
   "yesod-content-pdf" = dontDistribute super."yesod-content-pdf";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.22.nix b/pkgs/development/haskell-modules/configuration-lts-3.22.nix
index 44851fd0f8be..d3d69d0ce722 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.22.nix
@@ -954,6 +954,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1666,6 +1667,7 @@ self: super: {
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
@@ -1734,6 +1736,7 @@ self: super: {
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
   "cabal-sort" = dontDistribute super."cabal-sort";
+  "cabal-src" = doDistribute super."cabal-src_0_3_0";
   "cabal-test" = dontDistribute super."cabal-test";
   "cabal-test-bin" = dontDistribute super."cabal-test-bin";
   "cabal-test-compat" = dontDistribute super."cabal-test-compat";
@@ -2709,6 +2712,7 @@ self: super: {
   "error-message" = dontDistribute super."error-message";
   "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance";
+  "errors" = doDistribute super."errors_2_0_1";
   "ersatz" = dontDistribute super."ersatz";
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
   "ert" = dontDistribute super."ert";
@@ -4375,6 +4379,7 @@ self: super: {
   "ibus-hs" = dontDistribute super."ibus-hs";
   "ical" = dontDistribute super."ical";
   "iconv" = dontDistribute super."iconv";
+  "ide-backend-server" = doDistribute super."ide-backend-server_0_10_0_1";
   "ideas" = dontDistribute super."ideas";
   "ideas-math" = dontDistribute super."ideas-math";
   "idempotent" = dontDistribute super."idempotent";
@@ -4577,6 +4582,7 @@ self: super: {
   "jose-jwt" = doDistribute super."jose-jwt_0_6_2";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_11_3";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -4841,6 +4847,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_2";
   "lifted-threads" = dontDistribute super."lifted-threads";
   "lifter" = dontDistribute super."lifter";
   "ligature" = dontDistribute super."ligature";
@@ -5007,6 +5014,7 @@ self: super: {
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
+  "machines-io" = doDistribute super."machines-io_0_2_0_6";
   "machines-zlib" = dontDistribute super."machines-zlib";
   "macho" = dontDistribute super."macho";
   "maclight" = dontDistribute super."maclight";
@@ -7119,6 +7127,7 @@ self: super: {
   "taglib" = dontDistribute super."taglib";
   "taglib-api" = dontDistribute super."taglib-api";
   "tagset-positional" = dontDistribute super."tagset-positional";
+  "tagsoup" = doDistribute super."tagsoup_0_13_7";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "takahashi" = dontDistribute super."takahashi";
@@ -7128,6 +7137,7 @@ self: super: {
   "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory";
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
+  "tar" = doDistribute super."tar_0_4_2_2";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "taskpool" = dontDistribute super."taskpool";
@@ -8014,6 +8024,7 @@ self: super: {
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
   "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
+  "yesod-bin" = doDistribute super."yesod-bin_1_4_17";
   "yesod-bootstrap" = dontDistribute super."yesod-bootstrap";
   "yesod-comments" = dontDistribute super."yesod-comments";
   "yesod-content-pdf" = dontDistribute super."yesod-content-pdf";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
index f1a3dd5d9b1e..015ecca62fe8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
@@ -967,6 +967,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1703,6 +1704,7 @@ self: super: {
   "btree-concurrent" = dontDistribute super."btree-concurrent";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
@@ -1775,6 +1777,7 @@ self: super: {
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
   "cabal-sort" = dontDistribute super."cabal-sort";
+  "cabal-src" = doDistribute super."cabal-src_0_3_0";
   "cabal-test" = dontDistribute super."cabal-test";
   "cabal-test-bin" = dontDistribute super."cabal-test-bin";
   "cabal-test-compat" = dontDistribute super."cabal-test-compat";
@@ -4707,6 +4710,7 @@ self: super: {
   "jose-jwt" = doDistribute super."jose-jwt_0_6_2";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_11_3";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -5149,6 +5153,7 @@ self: super: {
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
+  "machines-io" = doDistribute super."machines-io_0_2_0_6";
   "machines-zlib" = dontDistribute super."machines-zlib";
   "macho" = dontDistribute super."macho";
   "maclight" = dontDistribute super."maclight";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
index 3fb70cfa9594..c914cd506d41 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
@@ -967,6 +967,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1703,6 +1704,7 @@ self: super: {
   "btree-concurrent" = dontDistribute super."btree-concurrent";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
@@ -1775,6 +1777,7 @@ self: super: {
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
   "cabal-sort" = dontDistribute super."cabal-sort";
+  "cabal-src" = doDistribute super."cabal-src_0_3_0";
   "cabal-test" = dontDistribute super."cabal-test";
   "cabal-test-bin" = dontDistribute super."cabal-test-bin";
   "cabal-test-compat" = dontDistribute super."cabal-test-compat";
@@ -4706,6 +4709,7 @@ self: super: {
   "jose-jwt" = doDistribute super."jose-jwt_0_6_2";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_11_3";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -5148,6 +5152,7 @@ self: super: {
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
+  "machines-io" = doDistribute super."machines-io_0_2_0_6";
   "machines-zlib" = dontDistribute super."machines-zlib";
   "macho" = dontDistribute super."macho";
   "maclight" = dontDistribute super."maclight";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
index c89ba16ca93f..96c247063ecb 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
@@ -967,6 +967,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1702,6 +1703,7 @@ self: super: {
   "btree-concurrent" = dontDistribute super."btree-concurrent";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
@@ -1774,6 +1776,7 @@ self: super: {
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
   "cabal-sort" = dontDistribute super."cabal-sort";
+  "cabal-src" = doDistribute super."cabal-src_0_3_0";
   "cabal-test" = dontDistribute super."cabal-test";
   "cabal-test-bin" = dontDistribute super."cabal-test-bin";
   "cabal-test-compat" = dontDistribute super."cabal-test-compat";
@@ -4696,6 +4699,7 @@ self: super: {
   "jose-jwt" = doDistribute super."jose-jwt_0_6_2";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_11_3";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -5138,6 +5142,7 @@ self: super: {
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
+  "machines-io" = doDistribute super."machines-io_0_2_0_6";
   "machines-zlib" = dontDistribute super."machines-zlib";
   "macho" = dontDistribute super."macho";
   "maclight" = dontDistribute super."maclight";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
index fba52274e71f..f24bb137b16e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
@@ -967,6 +967,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1701,6 +1702,7 @@ self: super: {
   "btree-concurrent" = dontDistribute super."btree-concurrent";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
@@ -1773,6 +1775,7 @@ self: super: {
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
   "cabal-sort" = dontDistribute super."cabal-sort";
+  "cabal-src" = doDistribute super."cabal-src_0_3_0";
   "cabal-test" = dontDistribute super."cabal-test";
   "cabal-test-bin" = dontDistribute super."cabal-test-bin";
   "cabal-test-compat" = dontDistribute super."cabal-test-compat";
@@ -2776,6 +2779,7 @@ self: super: {
   "error-message" = dontDistribute super."error-message";
   "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance";
+  "errors" = doDistribute super."errors_2_0_1";
   "ersatz" = dontDistribute super."ersatz";
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
   "ert" = dontDistribute super."ert";
@@ -4689,6 +4693,7 @@ self: super: {
   "jose-jwt" = doDistribute super."jose-jwt_0_6_2";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_11_3";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -5128,6 +5133,7 @@ self: super: {
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
+  "machines-io" = doDistribute super."machines-io_0_2_0_6";
   "machines-zlib" = dontDistribute super."machines-zlib";
   "macho" = dontDistribute super."macho";
   "maclight" = dontDistribute super."maclight";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
index ef87ac94d2a1..f1980ea5a02c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
@@ -967,6 +967,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1698,6 +1699,7 @@ self: super: {
   "btree-concurrent" = dontDistribute super."btree-concurrent";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
@@ -1770,6 +1772,7 @@ self: super: {
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
   "cabal-sort" = dontDistribute super."cabal-sort";
+  "cabal-src" = doDistribute super."cabal-src_0_3_0";
   "cabal-test" = dontDistribute super."cabal-test";
   "cabal-test-bin" = dontDistribute super."cabal-test-bin";
   "cabal-test-compat" = dontDistribute super."cabal-test-compat";
@@ -2771,6 +2774,7 @@ self: super: {
   "error-message" = dontDistribute super."error-message";
   "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance";
+  "errors" = doDistribute super."errors_2_0_1";
   "ersatz" = dontDistribute super."ersatz";
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
   "ert" = dontDistribute super."ert";
@@ -4681,6 +4685,7 @@ self: super: {
   "jose-jwt" = doDistribute super."jose-jwt_0_6_2";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_11_3";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -5119,6 +5124,7 @@ self: super: {
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
+  "machines-io" = doDistribute super."machines-io_0_2_0_6";
   "machines-zlib" = dontDistribute super."machines-zlib";
   "macho" = dontDistribute super."macho";
   "maclight" = dontDistribute super."maclight";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
index 7c615bd38ab2..b3a5533e928c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
@@ -967,6 +967,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1696,6 +1697,7 @@ self: super: {
   "btree-concurrent" = dontDistribute super."btree-concurrent";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
@@ -1768,6 +1770,7 @@ self: super: {
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
   "cabal-sort" = dontDistribute super."cabal-sort";
+  "cabal-src" = doDistribute super."cabal-src_0_3_0";
   "cabal-test" = dontDistribute super."cabal-test";
   "cabal-test-bin" = dontDistribute super."cabal-test-bin";
   "cabal-test-compat" = dontDistribute super."cabal-test-compat";
@@ -2763,6 +2766,7 @@ self: super: {
   "error-message" = dontDistribute super."error-message";
   "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance";
+  "errors" = doDistribute super."errors_2_0_1";
   "ersatz" = dontDistribute super."ersatz";
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
   "ert" = dontDistribute super."ert";
@@ -4673,6 +4677,7 @@ self: super: {
   "jose-jwt" = doDistribute super."jose-jwt_0_6_2";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_11_3";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -5111,6 +5116,7 @@ self: super: {
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
+  "machines-io" = doDistribute super."machines-io_0_2_0_6";
   "machines-zlib" = dontDistribute super."machines-zlib";
   "macho" = dontDistribute super."macho";
   "maclight" = dontDistribute super."maclight";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
index 92bdc5051317..704d9bc9e2fe 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
@@ -965,6 +965,7 @@ self: super: {
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
   "ViennaRNAParser" = dontDistribute super."ViennaRNAParser";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1693,6 +1694,7 @@ self: super: {
   "btree-concurrent" = dontDistribute super."btree-concurrent";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
@@ -1764,6 +1766,7 @@ self: super: {
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
   "cabal-sort" = dontDistribute super."cabal-sort";
+  "cabal-src" = doDistribute super."cabal-src_0_3_0";
   "cabal-test" = dontDistribute super."cabal-test";
   "cabal-test-bin" = dontDistribute super."cabal-test-bin";
   "cabal-test-compat" = dontDistribute super."cabal-test-compat";
@@ -2757,6 +2760,7 @@ self: super: {
   "error-message" = dontDistribute super."error-message";
   "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance";
+  "errors" = doDistribute super."errors_2_0_1";
   "ersatz" = dontDistribute super."ersatz";
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
   "ert" = dontDistribute super."ert";
@@ -4665,6 +4669,7 @@ self: super: {
   "jose-jwt" = doDistribute super."jose-jwt_0_6_2";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_11_3";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -5103,6 +5108,7 @@ self: super: {
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
+  "machines-io" = doDistribute super."machines-io_0_2_0_6";
   "machines-zlib" = dontDistribute super."machines-zlib";
   "macho" = dontDistribute super."macho";
   "maclight" = dontDistribute super."maclight";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.0.nix b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
index e3c8373bd9a4..b0fbca2b58e9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
@@ -327,6 +327,8 @@ self: super: {
   "GLHUI" = dontDistribute super."GLHUI";
   "GLM" = dontDistribute super."GLM";
   "GLMatrix" = dontDistribute super."GLMatrix";
+  "GLURaw" = doDistribute super."GLURaw_2_0_0_0";
+  "GLUT" = doDistribute super."GLUT_2_7_0_5";
   "GLUtil" = dontDistribute super."GLUtil";
   "GPX" = dontDistribute super."GPX";
   "GPipe-Collada" = dontDistribute super."GPipe-Collada";
@@ -684,7 +686,9 @@ self: super: {
   "OpenCL" = dontDistribute super."OpenCL";
   "OpenCLRaw" = dontDistribute super."OpenCLRaw";
   "OpenCLWrappers" = dontDistribute super."OpenCLWrappers";
+  "OpenGL" = doDistribute super."OpenGL_3_0_0_0";
   "OpenGLCheck" = dontDistribute super."OpenGLCheck";
+  "OpenGLRaw" = doDistribute super."OpenGLRaw_3_0_0_0";
   "OpenGLRaw21" = dontDistribute super."OpenGLRaw21";
   "OpenSCAD" = dontDistribute super."OpenSCAD";
   "OpenVG" = dontDistribute super."OpenVG";
@@ -923,6 +927,7 @@ self: super: {
   "VecN" = dontDistribute super."VecN";
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1542,6 +1547,7 @@ self: super: {
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
@@ -1592,6 +1598,7 @@ self: super: {
   "cabal-ghc-dynflags" = dontDistribute super."cabal-ghc-dynflags";
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
+  "cabal-helper" = doDistribute super."cabal-helper_0_6_2_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
   "cabal-install-ghc74" = dontDistribute super."cabal-install-ghc74";
@@ -1605,6 +1612,7 @@ self: super: {
   "cabal-scripts" = dontDistribute super."cabal-scripts";
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
+  "cabal-src" = doDistribute super."cabal-src_0_3_0";
   "cabal-test" = dontDistribute super."cabal-test";
   "cabal-test-bin" = dontDistribute super."cabal-test-bin";
   "cabal-test-compat" = dontDistribute super."cabal-test-compat";
@@ -1658,6 +1666,7 @@ self: super: {
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
+  "carray" = doDistribute super."carray_0_1_6_2";
   "casadi-bindings" = dontDistribute super."casadi-bindings";
   "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
   "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
@@ -2523,6 +2532,7 @@ self: super: {
   "error-message" = dontDistribute super."error-message";
   "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance";
+  "errors" = doDistribute super."errors_2_0_1";
   "ersatz" = dontDistribute super."ersatz";
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
   "ert" = dontDistribute super."ert";
@@ -2569,6 +2579,7 @@ self: super: {
   "expiring-mvar" = dontDistribute super."expiring-mvar";
   "explain" = dontDistribute super."explain";
   "explicit-determinant" = dontDistribute super."explicit-determinant";
+  "explicit-exception" = doDistribute super."explicit-exception_0_1_7_3";
   "explicit-iomodes" = dontDistribute super."explicit-iomodes";
   "explicit-iomodes-bytestring" = dontDistribute super."explicit-iomodes-bytestring";
   "explicit-iomodes-text" = dontDistribute super."explicit-iomodes-text";
@@ -3227,6 +3238,7 @@ self: super: {
   "hGelf" = dontDistribute super."hGelf";
   "hLLVM" = dontDistribute super."hLLVM";
   "hMollom" = dontDistribute super."hMollom";
+  "hOpenPGP" = doDistribute super."hOpenPGP_2_2_1";
   "hPDB-examples" = dontDistribute super."hPDB-examples";
   "hPushover" = dontDistribute super."hPushover";
   "hR" = dontDistribute super."hR";
@@ -4283,6 +4295,7 @@ self: super: {
   "jose" = dontDistribute super."jose";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_11_3";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -4547,6 +4560,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_2";
   "lifted-threads" = dontDistribute super."lifted-threads";
   "lifter" = dontDistribute super."lifter";
   "ligature" = dontDistribute super."ligature";
@@ -4707,6 +4721,7 @@ self: super: {
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
+  "machines-io" = doDistribute super."machines-io_0_2_0_6";
   "machines-zlib" = dontDistribute super."machines-zlib";
   "macho" = dontDistribute super."macho";
   "maclight" = dontDistribute super."maclight";
@@ -5804,6 +5819,7 @@ self: super: {
   "reactive-thread" = dontDistribute super."reactive-thread";
   "reactor" = dontDistribute super."reactor";
   "read-bounded" = dontDistribute super."read-bounded";
+  "read-editor" = doDistribute super."read-editor_0_1_0_1";
   "readable" = dontDistribute super."readable";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
@@ -6688,6 +6704,7 @@ self: super: {
   "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory";
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
+  "tar" = doDistribute super."tar_0_4_2_2";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "taskpool" = dontDistribute super."taskpool";
@@ -7503,6 +7520,7 @@ self: super: {
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
   "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
+  "yesod-bin" = doDistribute super."yesod-bin_1_4_17";
   "yesod-bootstrap" = dontDistribute super."yesod-bootstrap";
   "yesod-comments" = dontDistribute super."yesod-comments";
   "yesod-content-pdf" = dontDistribute super."yesod-content-pdf";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.1.nix b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
index 410145e66cc8..b95fbc7a60af 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
@@ -327,6 +327,8 @@ self: super: {
   "GLHUI" = dontDistribute super."GLHUI";
   "GLM" = dontDistribute super."GLM";
   "GLMatrix" = dontDistribute super."GLMatrix";
+  "GLURaw" = doDistribute super."GLURaw_2_0_0_0";
+  "GLUT" = doDistribute super."GLUT_2_7_0_5";
   "GLUtil" = dontDistribute super."GLUtil";
   "GPX" = dontDistribute super."GPX";
   "GPipe-Collada" = dontDistribute super."GPipe-Collada";
@@ -683,7 +685,9 @@ self: super: {
   "OpenCL" = dontDistribute super."OpenCL";
   "OpenCLRaw" = dontDistribute super."OpenCLRaw";
   "OpenCLWrappers" = dontDistribute super."OpenCLWrappers";
+  "OpenGL" = doDistribute super."OpenGL_3_0_0_0";
   "OpenGLCheck" = dontDistribute super."OpenGLCheck";
+  "OpenGLRaw" = doDistribute super."OpenGLRaw_3_0_0_0";
   "OpenGLRaw21" = dontDistribute super."OpenGLRaw21";
   "OpenSCAD" = dontDistribute super."OpenSCAD";
   "OpenVG" = dontDistribute super."OpenVG";
@@ -922,6 +926,7 @@ self: super: {
   "VecN" = dontDistribute super."VecN";
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
+  "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
   "WL500gPLib" = dontDistribute super."WL500gPLib";
@@ -1538,6 +1543,7 @@ self: super: {
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
   "bugzilla" = dontDistribute super."bugzilla";
   "buildable" = dontDistribute super."buildable";
@@ -1588,6 +1594,7 @@ self: super: {
   "cabal-ghc-dynflags" = dontDistribute super."cabal-ghc-dynflags";
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
+  "cabal-helper" = doDistribute super."cabal-helper_0_6_2_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
   "cabal-install-ghc74" = dontDistribute super."cabal-install-ghc74";
@@ -1601,6 +1608,7 @@ self: super: {
   "cabal-scripts" = dontDistribute super."cabal-scripts";
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
+  "cabal-src" = doDistribute super."cabal-src_0_3_0";
   "cabal-test" = dontDistribute super."cabal-test";
   "cabal-test-bin" = dontDistribute super."cabal-test-bin";
   "cabal-test-compat" = dontDistribute super."cabal-test-compat";
@@ -1654,6 +1662,7 @@ self: super: {
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
+  "carray" = doDistribute super."carray_0_1_6_2";
   "casadi-bindings" = dontDistribute super."casadi-bindings";
   "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
   "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
@@ -2516,6 +2525,7 @@ self: super: {
   "error-message" = dontDistribute super."error-message";
   "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance";
+  "errors" = doDistribute super."errors_2_0_1";
   "ersatz" = dontDistribute super."ersatz";
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
   "ert" = dontDistribute super."ert";
@@ -2562,6 +2572,7 @@ self: super: {
   "expiring-mvar" = dontDistribute super."expiring-mvar";
   "explain" = dontDistribute super."explain";
   "explicit-determinant" = dontDistribute super."explicit-determinant";
+  "explicit-exception" = doDistribute super."explicit-exception_0_1_7_3";
   "explicit-iomodes" = dontDistribute super."explicit-iomodes";
   "explicit-iomodes-bytestring" = dontDistribute super."explicit-iomodes-bytestring";
   "explicit-iomodes-text" = dontDistribute super."explicit-iomodes-text";
@@ -3218,6 +3229,7 @@ self: super: {
   "hGelf" = dontDistribute super."hGelf";
   "hLLVM" = dontDistribute super."hLLVM";
   "hMollom" = dontDistribute super."hMollom";
+  "hOpenPGP" = doDistribute super."hOpenPGP_2_2_1";
   "hPDB-examples" = dontDistribute super."hPDB-examples";
   "hPushover" = dontDistribute super."hPushover";
   "hR" = dontDistribute super."hR";
@@ -4082,6 +4094,7 @@ self: super: {
   "ib-api" = dontDistribute super."ib-api";
   "iban" = dontDistribute super."iban";
   "ibus-hs" = dontDistribute super."ibus-hs";
+  "ide-backend-server" = doDistribute super."ide-backend-server_0_10_0_1";
   "ideas" = dontDistribute super."ideas";
   "ideas-math" = dontDistribute super."ideas-math";
   "idempotent" = dontDistribute super."idempotent";
@@ -4267,6 +4280,7 @@ self: super: {
   "jose" = dontDistribute super."jose";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_11_3";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -4528,6 +4542,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_2";
   "lifted-threads" = dontDistribute super."lifted-threads";
   "lifter" = dontDistribute super."lifter";
   "ligature" = dontDistribute super."ligature";
@@ -4688,6 +4703,7 @@ self: super: {
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
+  "machines-io" = doDistribute super."machines-io_0_2_0_6";
   "machines-zlib" = dontDistribute super."machines-zlib";
   "macho" = dontDistribute super."macho";
   "maclight" = dontDistribute super."maclight";
@@ -5783,6 +5799,7 @@ self: super: {
   "reactive-thread" = dontDistribute super."reactive-thread";
   "reactor" = dontDistribute super."reactor";
   "read-bounded" = dontDistribute super."read-bounded";
+  "read-editor" = doDistribute super."read-editor_0_1_0_1";
   "readable" = dontDistribute super."readable";
   "readline-statevar" = dontDistribute super."readline-statevar";
   "readpyc" = dontDistribute super."readpyc";
@@ -6656,6 +6673,7 @@ self: super: {
   "taglib" = dontDistribute super."taglib";
   "taglib-api" = dontDistribute super."taglib-api";
   "tagset-positional" = dontDistribute super."tagset-positional";
+  "tagsoup" = doDistribute super."tagsoup_0_13_7";
   "tagsoup-ht" = dontDistribute super."tagsoup-ht";
   "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
   "takahashi" = dontDistribute super."takahashi";
@@ -6665,6 +6683,7 @@ self: super: {
   "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory";
   "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
   "tamper" = dontDistribute super."tamper";
+  "tar" = doDistribute super."tar_0_4_2_2";
   "target" = dontDistribute super."target";
   "task" = dontDistribute super."task";
   "taskpool" = dontDistribute super."taskpool";
@@ -7478,6 +7497,7 @@ self: super: {
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
   "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
+  "yesod-bin" = doDistribute super."yesod-bin_1_4_17";
   "yesod-bootstrap" = dontDistribute super."yesod-bootstrap";
   "yesod-comments" = dontDistribute super."yesod-comments";
   "yesod-content-pdf" = dontDistribute super."yesod-content-pdf";
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 3d141ef5664e..80d9a5e83c69 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1947,8 +1947,8 @@ self: {
      }:
      mkDerivation {
        pname = "Bookshelf";
-       version = "0.5";
-       sha256 = "b9437069606fadc6b4f9213588c8269e187b00f00453856c7bfabd38dfe00ca2";
+       version = "0.6";
+       sha256 = "58b10d81bafc9a0b3c865277cec76c6fa31349c44744ba9d202bf37b6f442fa8";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -1956,6 +1956,7 @@ self: {
          pandoc-types parseargs
        ];
        testHaskellDepends = [ base process ];
+       jailbreak = true;
        homepage = "http://www.cse.chalmers.se/~emax/bookshelf/Manual.shelf.html";
        description = "A simple document organizer with some wiki functionality";
        license = "GPL";
@@ -6327,6 +6328,7 @@ self: {
        homepage = "https://github.com/fiendfan1/GLMatrix";
        description = "Utilities for working with OpenGL matrices";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GLURaw_1_4_0_1" = callPackage
@@ -6387,7 +6389,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;};
 
-  "GLURaw" = callPackage
+  "GLURaw_2_0_0_0" = callPackage
     ({ mkDerivation, base, freeglut, mesa, OpenGLRaw, transformers }:
      mkDerivation {
        pname = "GLURaw";
@@ -6395,13 +6397,14 @@ self: {
        sha256 = "8ddd5d1bcab6668f6a6c6cd2dccbe17ff66aa0f58e8f197d78827963621d9104";
        libraryHaskellDepends = [ base OpenGLRaw transformers ];
        librarySystemDepends = [ freeglut mesa ];
+       jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A raw binding for the OpenGL graphics system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;};
 
-  "GLURaw_2_0_0_1" = callPackage
+  "GLURaw" = callPackage
     ({ mkDerivation, base, freeglut, mesa, OpenGLRaw, transformers }:
      mkDerivation {
        pname = "GLURaw";
@@ -6412,7 +6415,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A raw binding for the OpenGL graphics system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;};
 
   "GLUT_2_5_1_1" = callPackage
@@ -6471,7 +6474,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;};
 
-  "GLUT" = callPackage
+  "GLUT_2_7_0_5" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, freeglut
      , mesa, OpenGL, OpenGLRaw, random, StateVar, transformers
      }:
@@ -6488,6 +6491,30 @@ self: {
        executableHaskellDepends = [
          array base bytestring OpenGLRaw random
        ];
+       jailbreak = true;
+       homepage = "http://www.haskell.org/haskellwiki/Opengl";
+       description = "A binding for the OpenGL Utility Toolkit";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;};
+
+  "GLUT" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, freeglut
+     , mesa, OpenGL, OpenGLRaw, random, StateVar, transformers
+     }:
+     mkDerivation {
+       pname = "GLUT";
+       version = "2.7.0.6";
+       sha256 = "c2166db513482178bd5f331a591d70f00d78e9f19afe9e1e572d222e7855d43a";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base containers OpenGL StateVar transformers
+       ];
+       librarySystemDepends = [ freeglut mesa ];
+       executableHaskellDepends = [
+         array base bytestring OpenGLRaw random
+       ];
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A binding for the OpenGL Utility Toolkit";
        license = stdenv.lib.licenses.bsd3;
@@ -6648,7 +6675,7 @@ self: {
        jailbreak = true;
        description = "Some kind of game library or set of utilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Ganymede" = callPackage
@@ -9178,6 +9205,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "HUnit_1_3_1_0" = callPackage
+    ({ mkDerivation, base, deepseq, filepath }:
+     mkDerivation {
+       pname = "HUnit";
+       version = "1.3.1.0";
+       sha256 = "8d8075152b5123ca20523d86f2f33c3523ee6857cc748cec88f1e30be47abe0f";
+       libraryHaskellDepends = [ base deepseq ];
+       testHaskellDepends = [ base deepseq filepath ];
+       homepage = "http://hunit.sourceforge.net/";
+       description = "A unit testing framework for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "HUnit-Diff" = callPackage
     ({ mkDerivation, ansi-terminal, base, Diff, groom, HUnit }:
      mkDerivation {
@@ -10105,6 +10146,7 @@ self: {
        homepage = "http://github.com/bananu7/Hate";
        description = "A small 2D game framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Hawk" = callPackage
@@ -12815,6 +12857,8 @@ self: {
        pname = "MemoTrie";
        version = "0.6.3";
        sha256 = "ca99debcd2cd4349e26e4438e8d896af3a274b8edc859a0216c2cc9e2f7b1334";
+       revision = "1";
+       editedCabalFile = "3a0a6ac7c3731f329b511d593e1a4cd1686080b272bb4ca64cfa046f04805fc3";
        libraryHaskellDepends = [ base void ];
        homepage = "https://github.com/conal/MemoTrie";
        description = "Trie-based memo functions";
@@ -12828,6 +12872,8 @@ self: {
        pname = "MemoTrie";
        version = "0.6.4";
        sha256 = "4238c8f7ea1ecd2497d0a948493acbdc47728b2528b6e7841ef064b783d68b1c";
+       revision = "1";
+       editedCabalFile = "035cea173a56cf920ebb4c84b4033d2ea270c1ee24d07ad323b9b2701ebc72e7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -14475,7 +14521,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "OpenGL" = callPackage
+  "OpenGL_3_0_0_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, GLURaw, ObjectName
      , OpenGLRaw, StateVar, text, transformers
      }:
@@ -14487,6 +14533,25 @@ self: {
          base bytestring containers GLURaw ObjectName OpenGLRaw StateVar
          text transformers
        ];
+       jailbreak = true;
+       homepage = "http://www.haskell.org/haskellwiki/Opengl";
+       description = "A binding for the OpenGL graphics system";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "OpenGL" = callPackage
+    ({ mkDerivation, base, bytestring, containers, GLURaw, ObjectName
+     , OpenGLRaw, StateVar, text, transformers
+     }:
+     mkDerivation {
+       pname = "OpenGL";
+       version = "3.0.0.1";
+       sha256 = "6039244fa37f8ace40e3d778757ecca331b37fd846b8717363038b269b58e100";
+       libraryHaskellDepends = [
+         base bytestring containers GLURaw ObjectName OpenGLRaw StateVar
+         text transformers
+       ];
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A binding for the OpenGL graphics system";
        license = stdenv.lib.licenses.bsd3;
@@ -14549,7 +14614,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) mesa;};
 
-  "OpenGLRaw" = callPackage
+  "OpenGLRaw_3_0_0_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, fixed, half, mesa
      , text, transformers
      }:
@@ -14564,9 +14629,10 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A raw binding for the OpenGL graphics system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) mesa;};
 
-  "OpenGLRaw_3_1_0_0" = callPackage
+  "OpenGLRaw" = callPackage
     ({ mkDerivation, base, bytestring, containers, fixed, half, mesa
      , text, transformers
      }:
@@ -14581,7 +14647,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A raw binding for the OpenGL graphics system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) mesa;};
 
   "OpenGLRaw21" = callPackage
@@ -14594,6 +14659,7 @@ self: {
        jailbreak = true;
        description = "The intersection of OpenGL 2.1 and OpenGL 3.1 Core";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "OpenSCAD" = callPackage
@@ -15230,7 +15296,7 @@ self: {
        executableHaskellDepends = [ array base clock GLUT random ];
        description = "An imaginary world";
        license = "GPL";
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "PortFusion" = callPackage
@@ -16117,7 +16183,7 @@ self: {
        homepage = "http://hub.darcs.net/martingw/Rasenschach";
        description = "Soccer simulation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Rasterific_0_4" = callPackage
@@ -17243,7 +17309,7 @@ self: {
        homepage = "http://www.geocities.jp/takascience/index_en.html";
        description = "A vector shooter game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SimpleAES" = callPackage
@@ -19245,6 +19311,17 @@ self: {
        license = "GPL";
      }) {};
 
+  "Vulkan" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "Vulkan";
+       version = "0.1.0.0";
+       sha256 = "e1cb8411cf76d254fa1c708f498442a27fe1c2783d7aa04f887ca9608b21fcca";
+       libraryHaskellDepends = [ base ];
+       description = "A binding for the Vulkan API";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "WAVE" = callPackage
     ({ mkDerivation, base, bytestring, containers, parseargs }:
      mkDerivation {
@@ -22249,8 +22326,8 @@ self: {
      }:
      mkDerivation {
        pname = "aeson-diff";
-       version = "0.1.1.2";
-       sha256 = "78d53e8ecfafa98070adb2211547d2ef7ed7621336382143246670886ddb7501";
+       version = "0.1.1.3";
+       sha256 = "c178500a64e09d14f39af26ec5930a23de3c64dfa7b68a1f047e847834f6a895";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -22264,7 +22341,6 @@ self: {
          aeson base QuickCheck quickcheck-instances text
          unordered-containers vector
        ];
-       jailbreak = true;
        homepage = "https://github.com/thsutton/aeson-diff";
        description = "Extract and apply patches to JSON documents";
        license = stdenv.lib.licenses.bsd3;
@@ -23088,6 +23164,37 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "airship_0_4_3_0" = callPackage
+    ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder
+     , bytestring, bytestring-trie, case-insensitive, cryptohash
+     , directory, either, filepath, http-date, http-media, http-types
+     , lifted-base, microlens, mime-types, mmorph, monad-control, mtl
+     , network, old-locale, random, tasty, tasty-hunit, tasty-quickcheck
+     , text, time, transformers, transformers-base, unix
+     , unordered-containers, wai, wai-extra
+     }:
+     mkDerivation {
+       pname = "airship";
+       version = "0.4.3.0";
+       sha256 = "1b7b3e5b66c853b7d84bce08c7cb92e7b40d69e02dbd28cd95bcb39dba9a6544";
+       libraryHaskellDepends = [
+         attoparsec base base64-bytestring blaze-builder bytestring
+         bytestring-trie case-insensitive cryptohash directory either
+         filepath http-date http-media http-types lifted-base microlens
+         mime-types mmorph monad-control mtl network old-locale random text
+         time transformers transformers-base unix unordered-containers wai
+         wai-extra
+       ];
+       testHaskellDepends = [
+         base bytestring tasty tasty-hunit tasty-quickcheck text
+         transformers wai
+       ];
+       homepage = "https://github.com/helium/airship/";
+       description = "A Webmachine-inspired HTTP library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "aivika" = callPackage
     ({ mkDerivation, array, base, containers, mtl, random, vector }:
      mkDerivation {
@@ -29217,6 +29324,7 @@ self: {
        homepage = "https://github.com/ocharles/argon2.git";
        description = "Haskell bindings to libargon2 - the reference implementation of the Argon2 password-hashing function";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "argparser" = callPackage
@@ -32707,8 +32815,8 @@ self: {
     ({ mkDerivation, base, hspec, HUnit, QuickCheck, time }:
      mkDerivation {
        pname = "bank-holiday-usa";
-       version = "0.0.1";
-       sha256 = "f46c4950c96f0e790477d95e75709d13f0409abb53c60382fcfcc7637f204270";
+       version = "0.1.0";
+       sha256 = "c5de8ab4ffc24c11d60762057c9261adc2b05762e8465b27afe6f4f7a499dbc8";
        libraryHaskellDepends = [ base time ];
        testHaskellDepends = [ base hspec HUnit QuickCheck time ];
        homepage = "https://github.com/tippenein/BankHoliday";
@@ -34635,6 +34743,8 @@ self: {
        pname = "binary-literal-qq";
        version = "1.0";
        sha256 = "5506586d39e0d8b311516c05dc8eeaa8589782d0340cf45c853f68eab3687d4d";
+       revision = "1";
+       editedCabalFile = "61a53a601a913dd5fe5d52bc552f965d62d448ecea220dc1acb4884b67f54667";
        libraryHaskellDepends = [ base template-haskell ];
        description = "Extends Haskell with binary literals";
        license = stdenv.lib.licenses.bsd3;
@@ -35710,7 +35820,7 @@ self: {
        homepage = "http://floss.scru.org/bindings-sane";
        description = "FFI bindings to libsane";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {saneBackends = null;};
 
   "bindings-sc3" = callPackage
@@ -36835,17 +36945,17 @@ self: {
      }) {};
 
   "blatex" = callPackage
-    ({ mkDerivation, base, blaze-html, directory, HaTeX, split, tagsoup
-     , text
+    ({ mkDerivation, base, blaze-html, directory, HaTeX, process, split
+     , tagsoup, text
      }:
      mkDerivation {
        pname = "blatex";
-       version = "0.1.0.1";
-       sha256 = "fce281ebb969b1147259d42c5129ac567ee1136a057a2a7e223c148a17602349";
+       version = "0.1.0.4";
+       sha256 = "cbf1adfa07407c66a1dc071fca663a709e2b7cd7787f07a82276b6c58451f236";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base blaze-html directory HaTeX split tagsoup text
+         base blaze-html directory HaTeX process split tagsoup text
        ];
        jailbreak = true;
        homepage = "https://github.com/2016rshah/BlaTeX";
@@ -38334,6 +38444,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "brick_0_4" = callPackage
+    ({ mkDerivation, base, containers, contravariant, data-default
+     , deepseq, lens, template-haskell, text, text-zipper, transformers
+     , vector, vty
+     }:
+     mkDerivation {
+       pname = "brick";
+       version = "0.4";
+       sha256 = "138fbf408e26ad7cf0dbc9a490e79965a84a9dbd33fa2016791ae295f08f3526";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers contravariant data-default deepseq lens
+         template-haskell text text-zipper transformers vector vty
+       ];
+       executableHaskellDepends = [
+         base data-default lens text vector vty
+       ];
+       homepage = "https://github.com/jtdaugherty/brick/";
+       description = "A declarative terminal user interface library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "brillig" = callPackage
     ({ mkDerivation, base, binary, cmdargs, containers, directory
      , filepath, ListZipper, text
@@ -38676,6 +38810,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "buffer-pipe" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "buffer-pipe";
+       version = "0.0";
+       sha256 = "0875b6e41988f70e20d2e9d1a092ae03d545954732f93d65a3481b5c4b52dccf";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base ];
+       description = "Read from stdin and write to stdout in large blocks";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "buffon" = callPackage
     ({ mkDerivation, base, monad-primitive, mwc-random
      , mwc-random-monad, primitive, transformers
@@ -38969,6 +39116,33 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "bustle_0_5_3" = callPackage
+    ({ mkDerivation, base, bytestring, cairo, containers, dbus
+     , directory, filepath, gio, glib, gtk3, hgettext, HUnit, mtl, pango
+     , parsec, pcap, process, QuickCheck, setlocale, test-framework
+     , test-framework-hunit, text, time
+     }:
+     mkDerivation {
+       pname = "bustle";
+       version = "0.5.3";
+       sha256 = "9e525611cfb0c0715969b0ea77c2f63aaf7bc6ad70c9cf889a1655b66c0c24fd";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bytestring cairo containers dbus directory filepath gio glib
+         gtk3 hgettext mtl pango parsec pcap process setlocale text time
+       ];
+       testHaskellDepends = [
+         base bytestring cairo containers dbus directory filepath gtk3
+         hgettext HUnit mtl pango pcap QuickCheck setlocale test-framework
+         test-framework-hunit text
+       ];
+       homepage = "http://www.freedesktop.org/wiki/Software/Bustle/";
+       description = "Draw sequence diagrams of D-Bus traffic";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "butterflies" = callPackage
     ({ mkDerivation, base, bytestring, gl-capture, GLUT, OpenGLRaw
      , OpenGLRaw21, repa, repa-devil
@@ -38988,6 +39162,7 @@ self: {
        homepage = "http://code.mathr.co.uk/butterflies";
        description = "butterfly tilings";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bv" = callPackage
@@ -40218,7 +40393,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "cabal-helper" = callPackage
+  "cabal-helper_0_6_2_0" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, directory, extra
      , filepath, ghc-prim, mtl, process, template-haskell, temporary
      , transformers, unix, utf8-string
@@ -40240,6 +40415,35 @@ self: {
          base bytestring Cabal directory extra filepath ghc-prim mtl process
          template-haskell temporary transformers unix utf8-string
        ];
+       doCheck = false;
+       description = "Simple interface to some of Cabal's configuration state used by ghc-mod";
+       license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "cabal-helper" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, directory, extra
+     , filepath, ghc-prim, mtl, process, template-haskell, temporary
+     , transformers, unix, utf8-string
+     }:
+     mkDerivation {
+       pname = "cabal-helper";
+       version = "0.6.3.0";
+       sha256 = "95d62411205c03f87737daaa790e885e73fea875194366a0b2168af494735f04";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base Cabal directory filepath ghc-prim mtl process transformers
+       ];
+       executableHaskellDepends = [
+         base bytestring Cabal directory filepath ghc-prim process
+         template-haskell temporary transformers utf8-string
+       ];
+       testHaskellDepends = [
+         base bytestring Cabal directory extra filepath ghc-prim mtl process
+         template-haskell temporary transformers unix utf8-string
+       ];
+       doCheck = false;
        description = "Simple interface to some of Cabal's configuration state used by ghc-mod";
        license = stdenv.lib.licenses.agpl3;
      }) {};
@@ -40946,7 +41150,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "cabal-src" = callPackage
+  "cabal-src_0_3_0" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-extra
      , containers, directory, filepath, http-conduit, http-types
      , network, process, resourcet, shelly, system-fileio
@@ -40966,9 +41170,10 @@ self: {
        homepage = "https://github.com/yesodweb/cabal-src";
        description = "Alternative install procedure to avoid the diamond dependency issue";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "cabal-src_0_3_0_1" = callPackage
+  "cabal-src" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-extra
      , containers, directory, filepath, http-conduit, http-types
      , network, process, resourcet, shelly, system-fileio
@@ -40988,7 +41193,6 @@ self: {
        homepage = "https://github.com/yesodweb/cabal-src";
        description = "Alternative install procedure to avoid the diamond dependency issue";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-test" = callPackage
@@ -42045,7 +42249,7 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
-  "carray" = callPackage
+  "carray_0_1_6_2" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, ix-shapable
      , QuickCheck, syb
      }:
@@ -42059,9 +42263,10 @@ self: {
        testHaskellDepends = [ array base ix-shapable QuickCheck ];
        description = "A C-compatible array library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "carray_0_1_6_3" = callPackage
+  "carray" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, ix-shapable
      , QuickCheck, syb
      }:
@@ -42075,7 +42280,6 @@ self: {
        testHaskellDepends = [ array base ix-shapable QuickCheck ];
        description = "A C-compatible array library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cartel_0_14_2_6" = callPackage
@@ -43241,6 +43445,7 @@ self: {
          HTF HUnit mmorph mtl QuickCheck quickcheck-instances stm text time
          unordered-containers vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/cereal-plus";
        description = "An extended serialization library on top of \"cereal\"";
        license = stdenv.lib.licenses.mit;
@@ -47393,6 +47598,34 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "codex_0_4_0_8" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, cryptohash
+     , directory, either, filepath, hackage-db, http-client, lens
+     , machines, machines-directory, MissingH, monad-loops, network
+     , process, tar, text, transformers, wreq, yaml, zlib
+     }:
+     mkDerivation {
+       pname = "codex";
+       version = "0.4.0.8";
+       sha256 = "b648e6b2a90e5e032caeaaf013f4d97318fa8396d20de0a54980ccdf16b5117f";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring Cabal containers cryptohash directory either
+         filepath hackage-db http-client lens machines machines-directory
+         process tar text transformers wreq yaml zlib
+       ];
+       executableHaskellDepends = [
+         base bytestring Cabal directory either filepath hackage-db MissingH
+         monad-loops network process transformers wreq yaml
+       ];
+       jailbreak = true;
+       homepage = "http://github.com/aloiscochard/codex";
+       description = "A ctags file generator for cabal project dependencies";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "codo-notation" = callPackage
     ({ mkDerivation, base, comonad, haskell-src-meta, parsec
      , template-haskell, uniplate
@@ -47837,8 +48070,8 @@ self: {
      }:
      mkDerivation {
        pname = "comfort-graph";
-       version = "0.0.0.3";
-       sha256 = "e379d8d331d3b0245528a4c88a0fad369a2ad9a04f45f6e57546a342bf58c783";
+       version = "0.0.1";
+       sha256 = "81487e3610993d2939bf1777823357095645f710d1bee94dd4dd0fa052b428a0";
        libraryHaskellDepends = [
          base containers QuickCheck transformers utility-ht
        ];
@@ -48447,8 +48680,8 @@ self: {
     ({ mkDerivation, base, hspec, QuickCheck }:
      mkDerivation {
        pname = "compose-ltr";
-       version = "0.1.2";
-       sha256 = "9d4bd35d7d5b5cfcc530281a9d55d508d719414d50dcb835b3c9097d51854123";
+       version = "0.1.3";
+       sha256 = "ebd267fc0ff418bd58d337830cf9cabab5d2d01eec59e3a1bdf82786cc8ab750";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck ];
        jailbreak = true;
@@ -53074,17 +53307,17 @@ self: {
 
   "crypto-classical" = callPackage
     ({ mkDerivation, base, bytestring, containers, crypto-numbers
-     , crypto-random, lens, modular-arithmetic, QuickCheck, random
-     , random-shuffle, text, transformers
+     , crypto-random, microlens, microlens-th, modular-arithmetic
+     , QuickCheck, random, random-shuffle, text, transformers
      }:
      mkDerivation {
        pname = "crypto-classical";
-       version = "0.1.0";
-       sha256 = "8f8791fc2cff3eeddfc2ee555bec5e3d64b666fd790a24d4289caaa02249a61b";
+       version = "0.2.0";
+       sha256 = "8911490fc1f12ee76593552aa601f000359cafc4596eab7c98562d5bb8ded83e";
        libraryHaskellDepends = [
-         base bytestring containers crypto-numbers crypto-random lens
-         modular-arithmetic QuickCheck random random-shuffle text
-         transformers
+         base bytestring containers crypto-numbers crypto-random microlens
+         microlens-th modular-arithmetic QuickCheck random random-shuffle
+         text transformers
        ];
        homepage = "https://github.com/fosskers/crypto-classical";
        description = "An educational tool for studying classical cryptography schemes";
@@ -56518,6 +56751,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dawg-ord_0_5_0_0" = callPackage
+    ({ mkDerivation, base, containers, HUnit, mtl, smallcheck, tasty
+     , tasty-hunit, tasty-quickcheck, tasty-smallcheck, transformers
+     , vector
+     }:
+     mkDerivation {
+       pname = "dawg-ord";
+       version = "0.5.0.0";
+       sha256 = "86d9ba955c6c03c5f9916d11d2c886f6ecdeae488dd3759da397efad2d9ab4cc";
+       libraryHaskellDepends = [
+         base containers mtl transformers vector
+       ];
+       testHaskellDepends = [
+         base containers HUnit mtl smallcheck tasty tasty-hunit
+         tasty-quickcheck tasty-smallcheck
+       ];
+       homepage = "https://github.com/kawu/dawg-ord";
+       description = "Directed acyclic word graphs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "dbcleaner" = callPackage
     ({ mkDerivation, base, hspec, postgresql-simple, text }:
      mkDerivation {
@@ -63056,8 +63311,8 @@ self: {
      }:
      mkDerivation {
        pname = "dotenv";
-       version = "0.1.0.8";
-       sha256 = "a6df43fcba59acd851b77bba0a8154dc50554e30b960ce0ada889a080b4739c3";
+       version = "0.1.0.9";
+       sha256 = "7e6546de1969bd0e3fcb8be864da3f103d19c4b10b173a807381969729cbed6c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base base-compat parsec ];
@@ -63067,7 +63322,6 @@ self: {
        testHaskellDepends = [
          base base-compat hspec parsec parseerror-eq
        ];
-       jailbreak = true;
        homepage = "https://github.com/stackbuilders/dotenv-hs";
        description = "Loads environment variables from dotenv files";
        license = stdenv.lib.licenses.mit;
@@ -66299,8 +66553,9 @@ self: {
        pname = "endo";
        version = "0.2.0.1";
        sha256 = "312ea501116bddc01dd523948b80693ec6348a8f6beb5a1b9bcbeaa709d9eb6b";
+       revision = "1";
+       editedCabalFile = "4c0b97bc6e43d18ae5dc423824ab4406e6b2188b887094b6eff3e49103e456b3";
        libraryHaskellDepends = [ base between transformers ];
-       jailbreak = true;
        homepage = "https://github.com/trskop/endo";
        description = "Endomorphism utilities";
        license = stdenv.lib.licenses.bsd3;
@@ -67237,7 +67492,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "errors" = callPackage
+  "errors_2_0_1" = callPackage
     ({ mkDerivation, base, safe, transformers, transformers-compat }:
      mkDerivation {
        pname = "errors";
@@ -67248,9 +67503,10 @@ self: {
        ];
        description = "Simplified error-handling";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "errors_2_1_0" = callPackage
+  "errors" = callPackage
     ({ mkDerivation, base, safe, transformers, transformers-compat
      , unexceptionalio
      }:
@@ -67263,7 +67519,6 @@ self: {
        ];
        description = "Simplified error-handling";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ersatz_0_2_6_1" = callPackage
@@ -68624,7 +68879,7 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
-  "explicit-exception" = callPackage
+  "explicit-exception_0_1_7_3" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
        pname = "explicit-exception";
@@ -68636,6 +68891,21 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Exception";
        description = "Exceptions which are explicit in the type signature";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "explicit-exception" = callPackage
+    ({ mkDerivation, base, deepseq, transformers }:
+     mkDerivation {
+       pname = "explicit-exception";
+       version = "0.1.8";
+       sha256 = "7fee7a3781db3c3bf82079e635d510088dbb6f4295fde887c603819ec14cd16f";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base deepseq transformers ];
+       homepage = "http://www.haskell.org/haskellwiki/Exception";
+       description = "Exceptions which are explicit in the type signature";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "explicit-iomodes" = callPackage
@@ -75896,7 +76166,7 @@ self: {
        homepage = "http://code.mathr.co.uk/gearbox";
        description = "zooming rotating fractal gears graphics demo";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "geek" = callPackage
@@ -78322,6 +78592,7 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Soup bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.gnome) libsoup;};
 
   "gi-vte" = callPackage
@@ -78385,6 +78656,7 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "WebKit2 bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {webkit2gtk = null;};
 
   "gimlh" = callPackage
@@ -79635,6 +79907,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "gitrev_1_2_0" = callPackage
+    ({ mkDerivation, base, directory, filepath, process
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "gitrev";
+       version = "1.2.0";
+       sha256 = "4391e34edb5caaab901c6faa4369b246b6896c747869f6ab85b6db5524003102";
+       libraryHaskellDepends = [
+         base directory filepath process template-haskell
+       ];
+       homepage = "https://github.com/acfoltzer/gitrev";
+       description = "Compile git revision info into Haskell projects";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gitson" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
      , doctest, errors, filepath, flock, Glob, hspec, monad-control
@@ -82456,12 +82745,11 @@ self: {
     ({ mkDerivation, base, base-unicode-symbols, containers, mtl }:
      mkDerivation {
        pname = "graph-rewriting";
-       version = "0.7.6";
-       sha256 = "5f0ed54252152984a0a057c97ebe5a3eca0435ed7d74151ec9d4eb8912d79f04";
+       version = "0.7.7";
+       sha256 = "2e0be0ffd95d245caa506f73553cf5d3d501b06e27de7188a1f281178ded2eef";
        libraryHaskellDepends = [
          base base-unicode-symbols containers mtl
        ];
-       jailbreak = true;
        homepage = "http://rochel.info/#graph-rewriting";
        description = "Monadic graph rewriting of hypergraphs with ports and multiedges";
        license = stdenv.lib.licenses.bsd3;
@@ -83490,6 +83778,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "grouped-list_0_2_1_1" = callPackage
+    ({ mkDerivation, base, containers, deepseq, pointed, QuickCheck
+     , tasty, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "grouped-list";
+       version = "0.2.1.1";
+       sha256 = "df2db99d9144bfe69b20e245ec53bfa76aa641855042a7fac1f2f601662d8fbb";
+       libraryHaskellDepends = [ base containers deepseq pointed ];
+       testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
+       homepage = "https://github.com/Daniel-Diaz/grouped-list/blob/master/README.md";
+       description = "Grouped lists. Equal consecutive elements are grouped.";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "groupoid" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -84876,7 +85180,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hOpenPGP" = callPackage
+  "hOpenPGP_2_2_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
      , bifunctors, binary, binary-conduit, byteable, bytestring, bzlib
      , conduit, conduit-extra, containers, crypto-cipher-types
@@ -84919,7 +85223,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hOpenPGP_2_3" = callPackage
+  "hOpenPGP" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
      , bifunctors, binary, binary-conduit, byteable, bytestring, bzlib
      , conduit, conduit-extra, containers, crypto-cipher-types
@@ -84960,6 +85264,47 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hOpenPGP_2_4" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
+     , bifunctors, binary, binary-conduit, byteable, bytestring, bzlib
+     , conduit, conduit-extra, containers, crypto-cipher-types
+     , cryptonite, data-default-class, errors, hashable
+     , incremental-parser, ixset-typed, lens, memory, monad-loops
+     , nettle, network, network-uri, newtype, openpgp-asciiarmor
+     , QuickCheck, quickcheck-instances, resourcet, securemem
+     , semigroups, split, tasty, tasty-hunit, tasty-quickcheck, text
+     , time, time-locale-compat, transformers, unordered-containers
+     , wl-pprint-extras, zlib
+     }:
+     mkDerivation {
+       pname = "hOpenPGP";
+       version = "2.4";
+       sha256 = "7c5ce3a314ac0172bc03e6ddca41a8508ab22e1c89ff1458642d56a942974386";
+       libraryHaskellDepends = [
+         aeson attoparsec base base64-bytestring bifunctors binary
+         binary-conduit byteable bytestring bzlib conduit conduit-extra
+         containers crypto-cipher-types cryptonite data-default-class errors
+         hashable incremental-parser ixset-typed lens memory monad-loops
+         nettle network network-uri newtype openpgp-asciiarmor resourcet
+         securemem semigroups split text time time-locale-compat
+         transformers unordered-containers wl-pprint-extras zlib
+       ];
+       testHaskellDepends = [
+         aeson attoparsec base bifunctors binary binary-conduit byteable
+         bytestring bzlib conduit conduit-extra containers
+         crypto-cipher-types cryptonite data-default-class errors hashable
+         incremental-parser ixset-typed lens memory monad-loops nettle
+         network network-uri newtype QuickCheck quickcheck-instances
+         resourcet securemem semigroups split tasty tasty-hunit
+         tasty-quickcheck text time time-locale-compat transformers
+         unordered-containers wl-pprint-extras zlib
+       ];
+       homepage = "http://floss.scru.org/hOpenPGP/";
+       description = "native Haskell implementation of OpenPGP (RFC4880)";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hPDB_1_2_0" = callPackage
     ({ mkDerivation, AC-Vector, base, bytestring, containers, deepseq
      , directory, ghc-prim, iterable, mmap, mtl, Octree, parallel
@@ -85926,7 +86271,6 @@ self: {
          base bytestring Cabal containers HUnit network-uri tar tasty
          tasty-hunit temporary time zlib
        ];
-       jailbreak = true;
        homepage = "https://github.com/well-typed/hackage-security";
        description = "Hackage security library";
        license = stdenv.lib.licenses.bsd3;
@@ -86512,6 +86856,7 @@ self: {
        ];
        description = "A typed template engine, subset of jinja2";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hailgun" = callPackage
@@ -92598,8 +92943,8 @@ self: {
        pname = "hastache";
        version = "0.6.0";
        sha256 = "b033a0dd3a38e0ef0772562bb1d5ed8f535c2fa6955633875ae520a6614dc0fc";
-       revision = "2";
-       editedCabalFile = "81792c6664e5cfaa6c99b9c57203ab3c1d321e786e13b42906b22178666f9a1d";
+       revision = "3";
+       editedCabalFile = "ef93124dacac0dcfb2b13d6cc6e5628682284641897065e145adc062c17e7e6e";
        libraryHaskellDepends = [
          base blaze-builder bytestring containers directory filepath ieee754
          mtl syb text transformers utf8-string
@@ -92623,8 +92968,8 @@ self: {
        pname = "hastache";
        version = "0.6.1";
        sha256 = "8c8f89669d6125201d7163385ea9055ab8027a69d1513259f8fbdd53c244b464";
-       revision = "2";
-       editedCabalFile = "92cea66e7c2d33e62c5caac8eaaf0e716fa6e2146ef906360db4d5f72cd30091";
+       revision = "3";
+       editedCabalFile = "29ee2fa8aa0d428e48e444a4bc6f287ca4e8db25ae04db0a18d72af06129dd51";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -93283,6 +93628,8 @@ self: {
        pname = "hblas";
        version = "0.3.2.1";
        sha256 = "3e159cc8c98735861edad47cd4da11bd5862bb629601a9bc441960c921ae8215";
+       revision = "1";
+       editedCabalFile = "cf7946aba77f6f23a665fe06859a6ba306b513f5849f9828ed171e84bad4a43e";
        libraryHaskellDepends = [ base primitive storable-complex vector ];
        librarySystemDepends = [ blas liblapack ];
        testHaskellDepends = [ base HUnit tasty tasty-hunit vector ];
@@ -93845,6 +94192,27 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hdevtools_0_1_2_2" = callPackage
+    ({ mkDerivation, base, bin-package-db, Cabal, cmdargs, directory
+     , filepath, ghc, ghc-paths, network, process, syb, time
+     , transformers, unix
+     }:
+     mkDerivation {
+       pname = "hdevtools";
+       version = "0.1.2.2";
+       sha256 = "e1bb2a45e4911b9b8811e0c43aab3a819fa150829c26489a85ee0f395e2633aa";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bin-package-db Cabal cmdargs directory filepath ghc ghc-paths
+         network process syb time transformers unix
+       ];
+       homepage = "https://github.com/hdevtools/hdevtools/";
+       description = "Persistent GHC powered background server for FAST haskell development tools";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hdf" = callPackage
     ({ mkDerivation, base, directory, fgl, fgl-visualize, filepath
      , hosc, hsc3, murmur-hash, process, split, transformers
@@ -94920,13 +95288,13 @@ self: {
     ({ mkDerivation, base, random, text }:
      mkDerivation {
        pname = "hero-club-five-tenets";
-       version = "0.3.0.0";
-       sha256 = "3bb65ed20ec40faa37f05477b5901961facdf58d386dfebe38626683ccb48aec";
+       version = "0.3.0.1";
+       sha256 = "4d89022b55d139afd274318238706ef4c12fbcd22f3191af9008da4b78eb11c6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base random text ];
        executableHaskellDepends = [ base random text ];
-       homepage = "http://github.com/i-amd3/hero-club-five-tenets#README";
+       homepage = "http://github.com/i-amd3/hero-club-five-tenets";
        description = "Remember the five tenets of hero club";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -97856,8 +98224,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-ui";
-       version = "0.27.1";
-       sha256 = "98721c60eb3d30005f51fc1468c6d8a95d87088a2bfa0c95c734569820fd9c4b";
+       version = "0.27.2";
+       sha256 = "aa637d484796eda892cc2e1b1138746ac7c2b4bf0dba0855b257100fe4a2bcba";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -97865,7 +98233,6 @@ self: {
          hledger hledger-lib HUnit lens pretty-show safe split time
          transformers vector vty
        ];
-       jailbreak = true;
        homepage = "http://hledger.org";
        description = "Curses-style user interface for the hledger accounting tool";
        license = "GPL";
@@ -98947,8 +99314,8 @@ self: {
      }:
      mkDerivation {
        pname = "hmk";
-       version = "0.9.7.3";
-       sha256 = "b0d338864cd2bc5984ac5b6c7da990a63f907327fecf2da564134e1b260d9821";
+       version = "0.9.7.4";
+       sha256 = "c952fbf1dcf7dc99958a92efa387004ba600ed168c5b2ae221327909a79a23a1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers ];
@@ -98956,7 +99323,6 @@ self: {
          base bytestring containers directory filepath mtl parsec pcre-light
          process unix
        ];
-       jailbreak = true;
        homepage = "http://www.github.com/mboes/hmk";
        description = "A make alternative based on Plan9's mk";
        license = "GPL";
@@ -99333,6 +99699,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hoauth2_0_5_1" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, http-conduit
+     , http-types, text, wai, warp
+     }:
+     mkDerivation {
+       pname = "hoauth2";
+       version = "0.5.1";
+       sha256 = "266ddc04f2d0e0a2a60d89ba019da267a2a3c310a5bac6677b3105bbaf5a1cc4";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring http-conduit http-types text
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring containers http-conduit http-types text wai
+         warp
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/freizl/hoauth2";
+       description = "Haskell OAuth2 authentication client";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hob" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , glib, gtk-largeTreeStore, gtk3, gtksourceview3, hspec, mtl, pango
@@ -101498,6 +101888,36 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hprotoc_2_2_0" = callPackage
+    ({ mkDerivation, alex, array, base, binary, bytestring, containers
+     , directory, filepath, haskell-src-exts, mtl, parsec
+     , protocol-buffers, protocol-buffers-descriptor, utf8-string
+     }:
+     mkDerivation {
+       pname = "hprotoc";
+       version = "2.2.0";
+       sha256 = "12461b7b11b90486f7b40cd21d3839f089695341e090eeac3a6fb85e715b50be";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base binary bytestring containers directory filepath
+         haskell-src-exts mtl parsec protocol-buffers
+         protocol-buffers-descriptor utf8-string
+       ];
+       libraryToolDepends = [ alex ];
+       executableHaskellDepends = [
+         array base binary bytestring containers directory filepath
+         haskell-src-exts mtl parsec protocol-buffers
+         protocol-buffers-descriptor utf8-string
+       ];
+       executableToolDepends = [ alex ];
+       jailbreak = true;
+       homepage = "https://github.com/k-bx/protocol-buffers";
+       description = "Parse Google Protocol Buffer specifications";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hprotoc-fork" = callPackage
     ({ mkDerivation, alex, array, base, binary, bytestring, containers
      , directory, filepath, haskell-src-exts, mtl, parsec
@@ -104555,6 +104975,8 @@ self: {
        pname = "hspec-core";
        version = "2.2.1";
        sha256 = "af50b465accc865bdbce450f04b1ba69348cae71523a5212c2aa50a995ad4e75";
+       revision = "1";
+       editedCabalFile = "2a97857496ff09dadfb4bf65122ca54c395070a4d0f6fe7a3cff3d734dc02852";
        libraryHaskellDepends = [
          ansi-terminal async base deepseq hspec-expectations HUnit
          QuickCheck quickcheck-io random setenv tf-random time transformers
@@ -104741,6 +105163,8 @@ self: {
        pname = "hspec-expectations";
        version = "0.7.1";
        sha256 = "afcac6b3492a2db618e0e85e83cb106ba555fd966a3b045ee4aa30ccf199a258";
+       revision = "1";
+       editedCabalFile = "80e2d70b0dbb2b017d8af3ee30cc491e0b76fe7e8efb2706cda32060215a19a8";
        libraryHaskellDepends = [ base HUnit ];
        homepage = "https://github.com/sol/hspec-expectations#readme";
        description = "Catchy combinators for HUnit";
@@ -105096,8 +105520,8 @@ self: {
     ({ mkDerivation, base, hspec }:
      mkDerivation {
        pname = "hspec-structured-formatter";
-       version = "0.1.0.2";
-       sha256 = "523e0cb381c982813c38f04d5f20f51a1b5c463e3ba6433b4693f25ae220324f";
+       version = "0.1.0.3";
+       sha256 = "b23e1dfc676bcc43fc9f79a076152a02a48525bdbb609d94f9e66eb831a80f01";
        libraryHaskellDepends = [ base hspec ];
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -111043,7 +111467,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ide-backend-server" = callPackage
+  "ide-backend-server_0_10_0_1" = callPackage
     ({ mkDerivation, array, async, base, bytestring, Cabal, containers
      , data-accessor, data-accessor-mtl, directory, file-embed
      , filemanip, filepath, ghc, haddock-api, ide-backend-common, mtl
@@ -111064,9 +111488,10 @@ self: {
        ];
        description = "An IDE backend server";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ide-backend-server_0_10_0_2" = callPackage
+  "ide-backend-server" = callPackage
     ({ mkDerivation, array, async, base, bytestring, Cabal, containers
      , data-accessor, data-accessor-mtl, directory, file-embed
      , filemanip, filepath, ghc, haddock-api, ide-backend-common, mtl
@@ -111087,7 +111512,6 @@ self: {
        ];
        description = "An IDE backend server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ideas" = callPackage
@@ -115916,7 +116340,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "js-jquery" = callPackage
+  "js-jquery_1_11_3" = callPackage
     ({ mkDerivation, base, HTTP }:
      mkDerivation {
        pname = "js-jquery";
@@ -115928,6 +116352,21 @@ self: {
        homepage = "https://github.com/ndmitchell/js-jquery#readme";
        description = "Obtain minified jQuery code";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "js-jquery" = callPackage
+    ({ mkDerivation, base, HTTP }:
+     mkDerivation {
+       pname = "js-jquery";
+       version = "1.12.0";
+       sha256 = "23535bdcd96bc45f96ac0bdd67ee83b761816612a5dff7d2c13b081fecca59a6";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base HTTP ];
+       doCheck = false;
+       homepage = "https://github.com/ndmitchell/js-jquery#readme";
+       description = "Obtain minified jQuery code";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "jsaddle" = callPackage
@@ -119588,6 +120027,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/LambdaCubeEngine";
        description = "OpenGL backend for LambdaCube graphics language (main package)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdacube-samples" = callPackage
@@ -121061,6 +121501,7 @@ self: {
          base directory errors filepath JuicyPixels process temporary
          transformers
        ];
+       jailbreak = true;
        homepage = "http://github.com/liamoc/latex-formulae#readme";
        description = "A library for rendering LaTeX formulae as images using an actual LaTeX installation";
        license = stdenv.lib.licenses.bsd3;
@@ -121244,7 +121685,7 @@ self: {
        jailbreak = true;
        description = "A prototypical 2d platform game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "layout" = callPackage
@@ -121573,6 +122014,7 @@ self: {
        ];
        description = "Haskell code for learning physics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "learn-physics-examples" = callPackage
@@ -123327,7 +123769,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "lifted-async" = callPackage
+  "lifted-async_0_7_0_2" = callPackage
     ({ mkDerivation, async, base, constraints, HUnit, lifted-base
      , monad-control, mtl, tasty, tasty-hunit, tasty-th
      , transformers-base
@@ -123346,9 +123788,10 @@ self: {
        homepage = "https://github.com/maoe/lifted-async";
        description = "Run lifted IO operations asynchronously and wait for their results";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "lifted-async_0_8_0" = callPackage
+  "lifted-async" = callPackage
     ({ mkDerivation, async, base, constraints, HUnit, lifted-base
      , monad-control, mtl, tasty, tasty-hunit, tasty-th
      , transformers-base
@@ -123367,7 +123810,6 @@ self: {
        homepage = "https://github.com/maoe/lifted-async";
        description = "Run lifted IO operations asynchronously and wait for their results";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lifted-base_0_2_2_1" = callPackage
@@ -123951,7 +124393,7 @@ self: {
        homepage = "http://www.github.com/bgamari/linear-opengl";
        description = "Isomorphisms between linear and OpenGL types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "linear-vect" = callPackage
@@ -125426,6 +125868,7 @@ self: {
        ];
        description = "LMonad is an Information Flow Control (IFC) framework for Haskell applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lmonad-yesod" = callPackage
@@ -125446,6 +125889,7 @@ self: {
        ];
        description = "LMonad for Yesod integrates LMonad's IFC with Yesod web applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "load-env" = callPackage
@@ -127312,8 +127756,8 @@ self: {
     ({ mkDerivation, base, binary, bytestring, machines }:
      mkDerivation {
        pname = "machines-binary";
-       version = "0.2.0.0";
-       sha256 = "b8f7d857f4d79c853845e1ff2eb3f10968787da02e523279d69a86b089215519";
+       version = "0.3.0.0";
+       sha256 = "013b925cc53a804dcaf9d3b626c48c816513ed236940302c4274c3946141d58b";
        libraryHaskellDepends = [ base binary bytestring machines ];
        homepage = "http://github.com/aloiscochard/machines-binary";
        description = "Binary utilities for the machines library";
@@ -127408,7 +127852,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "machines-io" = callPackage
+  "machines-io_0_2_0_6" = callPackage
     ({ mkDerivation, base, bytestring, chunked-data, machines
      , transformers
      }:
@@ -127422,9 +127866,10 @@ self: {
        homepage = "http://github.com/aloiscochard/machines-io";
        description = "IO utilities for the machines library";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "machines-io_0_2_0_8" = callPackage
+  "machines-io" = callPackage
     ({ mkDerivation, base, bytestring, chunked-data, machines
      , transformers
      }:
@@ -127438,7 +127883,6 @@ self: {
        homepage = "http://github.com/aloiscochard/machines-io";
        description = "IO utilities for the machines library";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "machines-process_0_2_0_0" = callPackage
@@ -130358,14 +130802,16 @@ self: {
      }) {};
 
   "mfsolve" = callPackage
-    ({ mkDerivation, base, hashable, mtl, tasty, tasty-hunit
-     , unordered-containers
+    ({ mkDerivation, base, hashable, mtl, mtl-compat, tasty
+     , tasty-hunit, unordered-containers
      }:
      mkDerivation {
        pname = "mfsolve";
-       version = "0.3.1.0";
-       sha256 = "f0e423870e8757da5538190b3a88c18db79c7791ffb4286790248eefd6f8a571";
-       libraryHaskellDepends = [ base hashable mtl unordered-containers ];
+       version = "0.3.2.0";
+       sha256 = "232167442f9c0f326b7514b362d4521b3937b716fd4155c65060d34430aa42f1";
+       libraryHaskellDepends = [
+         base hashable mtl mtl-compat unordered-containers
+       ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Equation solver and calculator à la metafont";
        license = stdenv.lib.licenses.bsd3;
@@ -131071,12 +131517,12 @@ self: {
      }:
      mkDerivation {
        pname = "mime-directory";
-       version = "0.5.1";
-       sha256 = "b98095ece69a24d20675978812c3f232b5304f1af92b2f0e2455946dffcaa4b8";
+       version = "0.5.2";
+       sha256 = "a3f337e2bcd3cbb27f92cea6b9fa65cd6c79832367d3e3bcd45989b53930077a";
        libraryHaskellDepends = [
          base base64-string bytestring containers old-locale regex-pcre time
        ];
-       homepage = "http://code.haskell.org/~mboes/mime-directory.git";
+       homepage = "http://github.com/mboes/mime-directory";
        description = "A library for parsing/printing the text/directory mime type";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -135417,6 +135863,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "multiset_0_3_1" = callPackage
+    ({ mkDerivation, base, containers, doctest, Glob }:
+     mkDerivation {
+       pname = "multiset";
+       version = "0.3.1";
+       sha256 = "9303952e410141e93fd301bb5ff0e0951c5d17b0c4bb7c46c03a65b3445d505e";
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [ base doctest Glob ];
+       description = "The Data.MultiSet container type";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "multiset-comb" = callPackage
     ({ mkDerivation, base, containers, transformers }:
      mkDerivation {
@@ -135511,15 +135970,15 @@ self: {
      }) {};
 
   "murmur3" = callPackage
-    ({ mkDerivation, base, base16-bytestring, binary, bytestring, HUnit
+    ({ mkDerivation, base, base16-bytestring, bytestring, cereal, HUnit
      , QuickCheck, test-framework, test-framework-hunit
      , test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "murmur3";
-       version = "1.0.0";
-       sha256 = "b8ca890c2a038f81245bb1ccd6c3cfbd9214a71030ed76d5c5b9d6768677b6e5";
-       libraryHaskellDepends = [ base binary bytestring ];
+       version = "1.0.1";
+       sha256 = "5bac92e0d72d5858bdc390c5c5e234e3c3d4191d717e3d5b972d6fd3401500c3";
+       libraryHaskellDepends = [ base bytestring cereal ];
        testHaskellDepends = [
          base base16-bytestring bytestring HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
@@ -137193,7 +137652,7 @@ self: {
        ];
        description = "Port of the NeHe OpenGL tutorials to Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "neil" = callPackage
@@ -139768,7 +140227,7 @@ self: {
        jailbreak = true;
        description = "Painless 3D graphics, no affiliation with gloss";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "not-gloss-examples" = callPackage
@@ -142824,8 +143283,8 @@ self: {
      }:
      mkDerivation {
        pname = "packdeps";
-       version = "0.4.2";
-       sha256 = "ce07300998bb107c343df8afff03e88398d4ad69b0fd10cb8777f11746123e40";
+       version = "0.4.2.1";
+       sha256 = "468fd8d83023865bb240c5b8fd5615501ffb2dcced9eaa2f15d22502d208c85c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -143593,7 +144052,7 @@ self: {
        license = "GPL";
      }) {};
 
-  "pandoc_1_16" = callPackage
+  "pandoc_1_16_0_1" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, array, base
      , base64-bytestring, binary, blaze-html, blaze-markup, bytestring
      , cmark, containers, data-default, deepseq-generics, Diff
@@ -143608,8 +144067,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc";
-       version = "1.16";
-       sha256 = "20c0b19a6bf435166da3b9e400c021b90687d8258ad1a0aecfc49fce1f2c6d0c";
+       version = "1.16.0.1";
+       sha256 = "211bc1a4f1beaaf888d82e4e67414a3984cf494b58be49e157a1c21d9a09db1a";
        configureFlags = [ "-fhttps" ];
        isLibrary = true;
        isExecutable = true;
@@ -149046,6 +149505,7 @@ self: {
          base hspec lifted-async lifted-base monad-control pipes pipes-safe
          stm transformers-base
        ];
+       jailbreak = true;
        homepage = "https://github.com/jwiegley/pipes-async";
        description = "A higher-level interface to using concurrency with pipes";
        license = stdenv.lib.licenses.bsd3;
@@ -154397,6 +154857,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "protocol-buffers_2_2_0" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, containers
+     , directory, filepath, mtl, parsec, syb, utf8-string
+     }:
+     mkDerivation {
+       pname = "protocol-buffers";
+       version = "2.2.0";
+       sha256 = "069a9ded2e9f7840ec51aef66eaabcdb428ceed8eee2b913590d5ee245506967";
+       libraryHaskellDepends = [
+         array base binary bytestring containers directory filepath mtl
+         parsec syb utf8-string
+       ];
+       homepage = "https://github.com/k-bx/protocol-buffers";
+       description = "Parse Google Protocol Buffer specifications";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "protocol-buffers-descriptor_2_1_4" = callPackage
     ({ mkDerivation, base, bytestring, containers, protocol-buffers }:
      mkDerivation {
@@ -154491,6 +154969,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "protocol-buffers-descriptor_2_2_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, protocol-buffers }:
+     mkDerivation {
+       pname = "protocol-buffers-descriptor";
+       version = "2.2.0";
+       sha256 = "62b6d996c8ee7e11fad73744b3267c92b60ec4ddb59f4c37a53b97ce9836c09a";
+       libraryHaskellDepends = [
+         base bytestring containers protocol-buffers
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/k-bx/protocol-buffers";
+       description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "protocol-buffers-descriptor-fork" = callPackage
     ({ mkDerivation, base, bytestring, containers
      , protocol-buffers-fork
@@ -158016,7 +158510,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "read-editor" = callPackage
+  "read-editor_0_1_0_1" = callPackage
     ({ mkDerivation, base, directory, hspec, process }:
      mkDerivation {
        pname = "read-editor";
@@ -158027,6 +158521,21 @@ self: {
        homepage = "https://github.com/yamadapc/haskell-read-editor";
        description = "Opens a temporary file on the system's EDITOR and returns the resulting edits";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "read-editor" = callPackage
+    ({ mkDerivation, base, directory, process }:
+     mkDerivation {
+       pname = "read-editor";
+       version = "0.1.0.2";
+       sha256 = "ed8aeca86823fbaf11a0a543fd106c9c3abe65216ea974ed56050cbebf777085";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base directory process ];
+       homepage = "https://github.com/yamadapc/haskell-read-editor";
+       description = "Opens a temporary file on the system's EDITOR and returns the resulting edits";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "readable" = callPackage
@@ -158989,14 +159498,13 @@ self: {
      }:
      mkDerivation {
        pname = "reflex-dom-contrib";
-       version = "0.3";
-       sha256 = "a5d7d60dbd3d752111e0d3517c3c25e62ddaae30ca5ae61278d9c8ef9997d733";
+       version = "0.4";
+       sha256 = "7bceed2b8347bdb8618e21d860a787d53187236a2253c83ab02bd51608a9236e";
        libraryHaskellDepends = [
          aeson base bifunctors bytestring containers data-default ghcjs-dom
          http-types lens mtl random readable reflex reflex-dom safe
          string-conv text time transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/reflex-frp/reflex-dom-contrib";
        description = "A playground for experimenting with infrastructure and common code for reflex applications";
        license = stdenv.lib.licenses.bsd3;
@@ -161526,6 +162034,7 @@ self: {
          base bytestring HUnit mtl test-framework test-framework-hunit
          transformers transformers-compat unordered-containers
        ];
+       jailbreak = true;
        description = "Rest API library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -171461,14 +171970,14 @@ self: {
   "simple" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
      , blaze-builder, bytestring, cmdargs, directory, filepath, hspec
-     , http-types, HUnit, mime-types, monad-control, mtl, process
-     , setenv, simple-templates, text, transformers, transformers-base
-     , unordered-containers, vector, wai, wai-extra
+     , hspec-contrib, http-types, mime-types, monad-control, mtl
+     , process, setenv, simple-templates, text, transformers
+     , transformers-base, unordered-containers, vector, wai, wai-extra
      }:
      mkDerivation {
        pname = "simple";
-       version = "0.11.0";
-       sha256 = "006bfe1d98473d2750aa14373dbd257d91d31c3174f9d06e6ea6d9203aa939d8";
+       version = "0.11.1";
+       sha256 = "74c3cfb9a92cbaebb47e8abbc7d918947a05340fd0d4fab1661ff8e777f5e815";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -171482,9 +171991,11 @@ self: {
          setenv simple-templates text unordered-containers vector
        ];
        testHaskellDepends = [
-         base hspec HUnit monad-control mtl transformers wai
+         aeson base base64-bytestring blaze-builder bytestring directory
+         filepath hspec hspec-contrib http-types mime-types monad-control
+         mtl simple-templates text transformers transformers-base
+         unordered-containers vector wai wai-extra
        ];
-       jailbreak = true;
        homepage = "http://simple.cx";
        description = "A minimalist web framework for the WAI server interface";
        license = stdenv.lib.licenses.gpl3;
@@ -172062,8 +172573,8 @@ self: {
      }:
      mkDerivation {
        pname = "simple-templates";
-       version = "0.8.0.0";
-       sha256 = "e8482e6d14ed95f8e5682a22298d992bf18112a88e2e08e95c28b4e540d2b4d2";
+       version = "0.8.0.1";
+       sha256 = "28e10f916320bb5097d9ed323a1726d88d17a51b0ac0290a91806d97840bca8e";
        libraryHaskellDepends = [
          aeson attoparsec base scientific text unordered-containers vector
        ];
@@ -175353,7 +175864,7 @@ self: {
        homepage = "http://code.mathr.co.uk/snowglobe";
        description = "randomized fractal snowflakes demo";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "soap_0_2_2_5" = callPackage
@@ -177853,8 +178364,8 @@ self: {
        pname = "stack";
        version = "1.0.0";
        sha256 = "cd2f606d390fe521b6ba0794de87edcba64c4af66856af09594907c2b4f4751d";
-       revision = "3";
-       editedCabalFile = "2cf74cc8112bd8e1379d998d20d2411a321e74787b267119b384d6a7f77e39f2";
+       revision = "4";
+       editedCabalFile = "f9396c12ec617c8c49730105f6cec3fe14bfa679fbf8ad37fa66b687691733e0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -183923,7 +184434,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "tagsoup" = callPackage
+  "tagsoup_0_13_7" = callPackage
     ({ mkDerivation, base, bytestring, containers, text }:
      mkDerivation {
        pname = "tagsoup";
@@ -183935,6 +184446,21 @@ self: {
        homepage = "https://github.com/ndmitchell/tagsoup#readme";
        description = "Parsing and extracting information from (possibly malformed) HTML/XML documents";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "tagsoup" = callPackage
+    ({ mkDerivation, base, bytestring, containers, text }:
+     mkDerivation {
+       pname = "tagsoup";
+       version = "0.13.8";
+       sha256 = "cff171695c5c559565eff8296bd44442ffff6bc8972e81f3a6c27eb1f13e1c2e";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base bytestring containers text ];
+       homepage = "https://github.com/ndmitchell/tagsoup#readme";
+       description = "Parsing and extracting information from (possibly malformed) HTML/XML documents";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "tagsoup-ht" = callPackage
@@ -184194,7 +184720,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "tar" = callPackage
+  "tar_0_4_2_2" = callPackage
     ({ mkDerivation, array, base, bytestring, bytestring-handle
      , directory, filepath, old-time, QuickCheck, tasty
      , tasty-quickcheck, time
@@ -184215,6 +184741,28 @@ self: {
        doCheck = false;
        description = "Reading, writing and manipulating \".tar\" archive files.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "tar" = callPackage
+    ({ mkDerivation, array, base, bytestring, bytestring-handle
+     , containers, deepseq, directory, filepath, old-time, QuickCheck
+     , tasty, tasty-quickcheck, time
+     }:
+     mkDerivation {
+       pname = "tar";
+       version = "0.4.5.0";
+       sha256 = "2959d7bb5e941969f023ba558e38f1723e72c6883e6eeca459472f42be33f32a";
+       libraryHaskellDepends = [
+         array base bytestring containers deepseq directory filepath time
+       ];
+       testHaskellDepends = [
+         array base bytestring bytestring-handle containers deepseq
+         directory filepath old-time QuickCheck tasty tasty-quickcheck time
+       ];
+       doCheck = false;
+       description = "Reading, writing and manipulating \".tar\" archive files.";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "tar_0_5_0_1" = callPackage
@@ -185179,6 +185727,7 @@ self: {
        homepage = "http://github.com/klappvisor/haskell-telegram-api#readme";
        description = "Telegram Bot API bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "teleport" = callPackage
@@ -189445,8 +189994,8 @@ self: {
      }:
      mkDerivation {
        pname = "tiphys";
-       version = "0.1.0.0";
-       sha256 = "d998ce85b4e1aa71d86cfebe6945978b4a4545ec670e9e5279e21d155d0e2d97";
+       version = "0.1.1.0";
+       sha256 = "6e120092e002d76903e47ce70871ba6aa7b8f194a2ea1319344693178acb9cdf";
        libraryHaskellDepends = [
          aeson attoparsec base errors text unordered-containers vector
        ];
@@ -191118,6 +191667,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "true-name_0_1_0_0" = callPackage
+    ({ mkDerivation, base, containers, template-haskell, time }:
+     mkDerivation {
+       pname = "true-name";
+       version = "0.1.0.0";
+       sha256 = "1423602dc6e9325e68da0763c7946b85ce0b6548de7a6600a58351ddc6de3f25";
+       libraryHaskellDepends = [ base template-haskell ];
+       testHaskellDepends = [ base containers template-haskell time ];
+       homepage = "https://github.com/liyang/true-name";
+       description = "Template Haskell hack to violate another module's abstractions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "truelevel" = callPackage
     ({ mkDerivation, base, containers, parseargs, WAVE }:
      mkDerivation {
@@ -196800,7 +197363,7 @@ self: {
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "OpenGL support for the `vect' low-dimensional linear algebra library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vector_0_10_9_3" = callPackage
@@ -200261,8 +200824,8 @@ self: {
        pname = "wai-middleware-static";
        version = "0.8.0";
        sha256 = "a37aaf452e3816928934d39b4eef3c1f7186c9db618d0b303e5136fc858e5e58";
-       revision = "1";
-       editedCabalFile = "b365b6463ecd16b5e9782776e365b1441109a2909ff42873b7fd5862b1397eb7";
+       revision = "2";
+       editedCabalFile = "41421955e1c4c86f72ea709dd43ff1e8a7a4b5ad59fb90923441d449a9506327";
        libraryHaskellDepends = [
          base base16-bytestring bytestring containers cryptohash directory
          expiring-cache-map filepath http-types mime-types mtl old-locale
@@ -202662,6 +203225,7 @@ self: {
        homepage = "http://byteally.github.io/webapi/";
        description = "WAI based library for web api";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "webapp" = callPackage
@@ -204730,6 +205294,7 @@ self: {
        ];
        description = "WSDL parsing in Haskell";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wsedit" = callPackage
@@ -208173,6 +208738,7 @@ self: {
        homepage = "https://github.com/michelk/yaml-overrides.hs";
        description = "Read multiple yaml-files and override fields recursively";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yaml2owl" = callPackage
@@ -210667,7 +211233,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-bin" = callPackage
+  "yesod-bin_1_4_17" = callPackage
     ({ mkDerivation, async, attoparsec, base, base64-bytestring
      , blaze-builder, bytestring, Cabal, conduit, conduit-extra
      , containers, data-default-class, deepseq, directory, file-embed
@@ -210698,9 +211264,10 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "The yesod helper executable";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-bin_1_4_17_1" = callPackage
+  "yesod-bin" = callPackage
     ({ mkDerivation, async, attoparsec, base, base64-bytestring
      , blaze-builder, bytestring, Cabal, conduit, conduit-extra
      , containers, data-default-class, deepseq, directory, file-embed
@@ -210731,7 +211298,6 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "The yesod helper executable";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-bootstrap" = callPackage

From c8da4cf7af213cfced62c0831efcbc67dc48539d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 10 Jan 2016 19:51:28 +0100
Subject: [PATCH 585/884] configuration-hackage2nix.yaml: update list of broken
 builds

---
 .../configuration-hackage2nix.yaml            | 40 +++++++++++++------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index c024d705dff1..cbf95632479c 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -261,6 +261,7 @@ dont-distribute-packages:
   archlinux:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   archlinux-web:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   arff:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  argon2:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   argparser:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   arguedit:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ariadne:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -403,7 +404,7 @@ dont-distribute-packages:
   bindings-mpdecimal:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-portaudio:                           [ x86_64-darwin ]
   bindings-ppdev:                               [ x86_64-darwin ]
-  bindings-sane:                                [ x86_64-darwin ]
+  bindings-sane:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-sc3:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-sipc:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-svm:                                 [ x86_64-darwin ]
@@ -489,6 +490,7 @@ dont-distribute-packages:
   Buster:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   buster-network:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   bustle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  butterflies:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytable:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestring-arbitrary:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestring-class:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -1201,13 +1203,13 @@ dont-distribute-packages:
   fwgl-glfw:                                    [ x86_64-darwin ]
   gact:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gameclock:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Gamgine:                                      [ x86_64-darwin ]
+  Gamgine:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Ganymede:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   gbu:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   gc-monitoring-wai:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   gdiff-ig:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   gdiff-th:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gearbox:                                      [ x86_64-darwin ]
+  gearbox:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   geek:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   geek-server:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   gelatin:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -1255,6 +1257,7 @@ dont-distribute-packages:
   gi-gdk:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-gtk:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-javascriptcore:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gi-soup:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   gist:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   git-all:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   git-checklist:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -1266,6 +1269,7 @@ dont-distribute-packages:
   gitlib-utils:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   git-repair:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-vte:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gi-webkit2:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-webkit:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   glade:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   gladexml-accessor:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -1279,6 +1283,7 @@ dont-distribute-packages:
   GLHUI:                                        [ x86_64-darwin ]
   glicko:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   glider-nlp:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  GLMatrix:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   global:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   glome-hs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   GlomeTrace:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -1419,6 +1424,7 @@ dont-distribute-packages:
   haddock-leksah:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   haggis:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Haggressive:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haiji:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hairy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hakaru:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hakismet:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -1566,6 +1572,7 @@ dont-distribute-packages:
   hasql-transaction:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   haste-perch:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   has-th:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Hate:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hatex-guide:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   HaTeX-meta:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hat:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2198,6 +2205,7 @@ dont-distribute-packages:
   lambdacube-bullet:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdacube-engine:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdacube-examples:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambdacube-gl:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdacube:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdacube-samples:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambda-devs:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2233,7 +2241,7 @@ dont-distribute-packages:
   latest-npm-version:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   lat:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   launchpad-control:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  layers-game:                                  [ x86_64-darwin ]
+  layers-game:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   layers:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   layout-bootstrap:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   layout:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2246,6 +2254,7 @@ dont-distribute-packages:
   leaf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   leaky:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   learn-physics-examples:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  learn-physics:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   Level0:                                       [ x86_64-darwin ]
   leveldb-haskell-fork:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   leveldb-haskell:                              [ x86_64-darwin ]
@@ -2287,7 +2296,7 @@ dont-distribute-packages:
   linear-algebra-cblas:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   linear-circuit:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   linear-maps:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  linear-opengl:                                [ x86_64-darwin ]
+  linear-opengl:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   linearscan-hoopl:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   LinearSplit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   LinkChecker:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2325,6 +2334,8 @@ dont-distribute-packages:
   llvm-tf:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   llvm-tools:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   lmdb:                                         [ x86_64-darwin ]
+  lmonad:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lmonad-yesod:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   local-search:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   loch:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   locked-poll:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2573,7 +2584,7 @@ dont-distribute-packages:
   natural-number:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   neat:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   needle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nehe-tuts:                                    [ x86_64-darwin ]
+  nehe-tuts:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   nerf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   nero:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   nero-wai:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2627,7 +2638,7 @@ dont-distribute-packages:
   noodle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   NoSlow:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   not-gloss-examples:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  not-gloss:                                    [ x86_64-darwin ]
+  not-gloss:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   notmuch-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   notmuch-web:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   np-linear:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2678,6 +2689,7 @@ dont-distribute-packages:
   openflow:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   OpenGLCheck:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   opengles:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  OpenGLRaw21:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   OpenGL:                                       [ x86_64-darwin ]
   openid:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   open-pandoc:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2808,7 +2820,7 @@ dont-distribute-packages:
   pointless-rewrite:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   polar-configfile:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   polh-lexicon:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Pollutocracy:                                 [ x86_64-darwin ]
+  Pollutocracy:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   polyseq:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   polysoup:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   polytypeable:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2952,7 +2964,7 @@ dont-distribute-packages:
   rand-vars:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   rangemin:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Ranka:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Rasenschach:                                  [ x86_64-darwin ]
+  Rasenschach:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   raven-haskell-scotty:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   rbr:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   rcu:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3218,7 +3230,7 @@ dont-distribute-packages:
   shell-pipe:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   showdown:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   shpider:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Shu-thing:                                    [ x86_64-darwin ]
+  Shu-thing:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   sifflet:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   sifflet-lib:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   signals:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3297,7 +3309,7 @@ dont-distribute-packages:
   sndfile-enumerators:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   SNet:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   snm:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snowglobe:                                    [ x86_64-darwin ]
+  snowglobe:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   snow-white:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Snusmumrik:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   SoccerFunGL:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3456,6 +3468,7 @@ dont-distribute-packages:
   tdd-util:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   TeaHS:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   teams:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  telegram-api:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   telegram:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   template-default:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   template-haskell-util:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3669,7 +3682,7 @@ dont-distribute-packages:
   vcard:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Vec-Boolean:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Vec-OpenGLRaw:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vect-opengl:                                  [ x86_64-darwin ]
+  vect-opengl:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   vector-bytestring:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   vector-clock:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   vector-conduit:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3731,6 +3744,7 @@ dont-distribute-packages:
   WaveFront:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   wavesurfer:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   weather-api:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  webapi:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   WebBits-Html:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   WebBits-multiplate:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   web-browser-in-haskell:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3779,6 +3793,7 @@ dont-distribute-packages:
   wp-archivebot:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   wraxml:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   wright:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wsdl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   wtk-gtk:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   wtk:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   wumpus-basic:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3858,6 +3873,7 @@ dont-distribute-packages:
   yaml-rpc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   yaml-rpc-scotty:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   yaml-rpc-snap:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yaml-union:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   yampa2048:                                    [ x86_64-darwin ]
   yampa-canvas:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   yampa-glfw:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]

From 8e70d65652ccf2b4229f56bb3b7ba96755f31820 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 11 Jan 2016 11:23:45 +0100
Subject: [PATCH 586/884] haskell-cabal-helper: drop obsolete override

Tests are now being disabled by hackage2nix.
---
 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index e56fd431324d..648522914591 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -205,9 +205,6 @@ self: super: {
   # The tests in vty-ui do not build, but vty-ui itself builds.
   vty-ui = enableCabalFlag super.vty-ui "no-tests";
 
-  # https://github.com/DanielG/cabal-helper/issues/10
-  cabal-helper = dontCheck super.cabal-helper;
-
   # https://github.com/fpco/stackage/issues/1112
   vector-algorithms = dontCheck super.vector-algorithms;
 

From ab346fd1bb720d40a5fc9f0832363be4438f254b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 12 Jan 2016 11:19:18 +0100
Subject: [PATCH 587/884] mesa drivers: revert back to llvm-3.6 for now

/cc #11367, #11467.
Only the drivers are overridden for now to avoid a mass rebuild.
---
 pkgs/top-level/all-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5c960b5f9801..4e0d99102bd0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7805,6 +7805,7 @@ let
   mesa_drivers = mesaDarwinOr (
     let mo = mesa_noglu.override {
       grsecEnabled = config.grsecurity or false;
+      llvmPackages = llvmPackages_36; # various problems with 3.7; see #11367, #11467
     };
     in mo.drivers
   );

From 7fe71389680d3cf32b59c3973f39935bad98ff8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 12 Jan 2016 11:50:34 +0100
Subject: [PATCH 588/884] nixos: fix acme service @abbradar

---
 nixos/modules/security/acme.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix
index a2806973a35d..15e5b49878f6 100644
--- a/nixos/modules/security/acme.nix
+++ b/nixos/modules/security/acme.nix
@@ -143,7 +143,7 @@ in
       systemd.services = flip mapAttrs' cfg.certs (cert: data:
         let
           cpath = "${cfg.directory}/${cert}";
-          rights = if cfg.allowKeysForGroup then "750" else "700";
+          rights = if data.allowKeysForGroup then "750" else "700";
           cmdline = [ "-v" "-d" cert "--default_root" data.webroot "--valid_min" cfg.validMin ]
                     ++ optionals (data.email != null) [ "--email" data.email ]
                     ++ concatMap (p: [ "-f" p ]) data.plugins

From 3fdf018f77cd6c7e7767e32a6651d4d476fb5539 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 12 Jan 2016 12:06:41 +0100
Subject: [PATCH 589/884] gnugrep: Disable tests

The test long-pattern-perf is timing sensitive, so it can fail
randomly based on load.

http://hydra.nixos.org/build/30265484
---
 pkgs/tools/text/gnugrep/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix
index cad3ccefe1a5..8ef67674cd21 100644
--- a/pkgs/tools/text/gnugrep/default.nix
+++ b/pkgs/tools/text/gnugrep/default.nix
@@ -16,7 +16,9 @@ stdenv.mkDerivation {
 
   # cygwin: FAIL: multibyte-white-space
   # freebsd: FAIL mb-non-UTF8-performance
-  doCheck = !stdenv.isDarwin && !stdenv.isSunOS && !stdenv.isCygwin && !stdenv.isFreeBSD;
+  # all platforms: timing sensitivity in long-pattern-perf 
+  #doCheck = !stdenv.isDarwin && !stdenv.isSunOS && !stdenv.isCygwin && !stdenv.isFreeBSD;
+  doCheck = false;
 
   # On Mac OS X, force use of mkdir -p, since Grep's fallback
   # (./install-sh) is broken.

From d82c0f97901154ac93a9f69c1c98693da275b822 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 7 Jan 2016 19:15:01 +0300
Subject: [PATCH 590/884] nixos/cdemu: use system kernel modules

---
 nixos/modules/programs/cdemu.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/programs/cdemu.nix b/nixos/modules/programs/cdemu.nix
index 98df9b94380f..6a0185d362c5 100644
--- a/nixos/modules/programs/cdemu.nix
+++ b/nixos/modules/programs/cdemu.nix
@@ -38,7 +38,7 @@ in {
   config = mkIf cfg.enable {
 
     boot = {
-      extraModulePackages = [ pkgs.linuxPackages.vhba ];
+      extraModulePackages = [ config.boot.kernelPackages.vhba ];
       kernelModules = [ "vhba" ];
     };
 

From 8d4bc5c029b8ce92ed7aebdc1178b6aef013310a Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 5 Jan 2016 21:23:04 +0300
Subject: [PATCH 591/884] nixos/swap: fix stopping mkswap for encrypted device

---
 nixos/modules/config/swap.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/config/swap.nix b/nixos/modules/config/swap.nix
index 9a5d6a9fc333..0ab5bb3d89c8 100644
--- a/nixos/modules/config/swap.nix
+++ b/nixos/modules/config/swap.nix
@@ -149,7 +149,7 @@ in
             unitConfig.DefaultDependencies = false; # needed to prevent a cycle
             serviceConfig.Type = "oneshot";
             serviceConfig.RemainAfterExit = sw.randomEncryption;
-            serviceConfig.ExecStop = optionalString sw.randomEncryption "cryptsetup luksClose ${sw.deviceName}";
+            serviceConfig.ExecStop = optionalString sw.randomEncryption "${pkgs.cryptsetup}/bin/cryptsetup luksClose ${sw.deviceName}";
           };
 
       in listToAttrs (map createSwapDevice (filter (sw: sw.size != null || sw.randomEncryption) config.swapDevices));

From ee6ca494d2427f13fc9bb09ef197f768b53b2637 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 5 Dec 2015 02:40:32 +0300
Subject: [PATCH 592/884] libpcap: support static build

---
 pkgs/development/libraries/libpcap/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix
index b8985bbed82f..4dc7d43122b3 100644
--- a/pkgs/development/libraries/libpcap/default.nix
+++ b/pkgs/development/libraries/libpcap/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, flex, bison }:
+{ stdenv, fetchurl, flex, bison
+, enableStatic ? false
+}:
 
 stdenv.mkDerivation rec {
   name = "libpcap-1.7.4";
@@ -13,9 +15,10 @@ stdenv.mkDerivation rec {
   # We need to force the autodetection because detection doesn't
   # work in pure build enviroments.
   configureFlags =
-    if stdenv.isLinux then [ "--with-pcap=linux" ]
-    else if stdenv.isDarwin then [ "--with-pcap=bpf" ]
-    else [];
+    (if stdenv.isLinux then [ "--with-pcap=linux" ]
+     else if stdenv.isDarwin then [ "--with-pcap=bpf" ]
+     else [])
+    ++ stdenv.lib.optional enableStatic "--enable-static";
 
   prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
     substituteInPlace configure --replace " -arch i386" ""

From fda6c0d3c706f07c53fb2cc01dcd651d8925bcea Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 5 Dec 2015 02:40:42 +0300
Subject: [PATCH 593/884] vde2: support static build

---
 pkgs/tools/networking/vde2/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/vde2/default.nix b/pkgs/tools/networking/vde2/default.nix
index 72a31262e26f..e3b0bcf87c6a 100644
--- a/pkgs/tools/networking/vde2/default.nix
+++ b/pkgs/tools/networking/vde2/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, openssl, libpcap, python }:
+{ stdenv, fetchurl, openssl, libpcap, python
+, enableStatic ? false
+}:
 
 stdenv.mkDerivation rec {
   name = "vde2-2.3.2";
@@ -10,6 +12,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ openssl libpcap python ];
 
+  # Avoid qemu rebuild; feel free to replace with optional
+  configureFlags = if enableStatic then [ "--enable-static" ] else null;
+
   meta = {
     homepage = http://vde.sourceforge.net/;
     description = "Virtual Distributed Ethernet, an Ethernet compliant virtual network";

From 7bedf42435afb50be1a5d30108e92cd6807baf7b Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 11 Jan 2016 16:28:47 +0300
Subject: [PATCH 594/884] pythonPackages.future: fix version

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b2007163f57e..7818d8e9d515 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8432,11 +8432,11 @@ in modules // {
   };
 
   future = buildPythonPackage rec {
-    version = "v0.14.3";
+    version = "0.14.3";
     name = "future-${version}";
 
     src = pkgs.fetchurl {
-      url = "http://github.com/PythonCharmers/python-future/archive/${version}.tar.gz";
+      url = "http://github.com/PythonCharmers/python-future/archive/v${version}.tar.gz";
       sha256 = "0hgp9kq7h4ipw8ax5xvvkyh3bkqw361d3rndvb9xix01h9j9mi3p";
     };
 

From bbfbadf327af8454fc449fb567db00ab254cfc3c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 12 Jan 2016 14:25:26 +0100
Subject: [PATCH 595/884] diffoscope: Reduce closure size

This reduces diffoscope's closure size from 2470 MiB to 579 MiB by
leaving out some less crucial dependencies (like GHC and Free
Pascal). These can be re-enabled by turning on enableBloat.
---
 pkgs/tools/misc/diffoscope/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index 7fe21e8b3474..2ec79e2867d7 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -1,6 +1,7 @@
-{ stdenv, fetchgit, pythonPackages, docutils
+{ lib, stdenv, fetchgit, pythonPackages, docutils
 , acl, binutils, bzip2, cbfstool, cdrkit, cpio, diffutils, e2fsprogs, file, fpc, gettext, ghc, gnupg1
 , gzip, jdk, libcaca, mono, pdftk, poppler_utils, rpm, sng, sqlite, squashfsTools, unzip, vim, xz
+, enableBloat ? false
 }:
 
 pythonPackages.buildPythonPackage rec {
@@ -22,9 +23,11 @@ pythonPackages.buildPythonPackage rec {
 
   # Still missing these tools: enjarify otool(maybe OS X only) showttf
   # Also these libraries: python3-guestfs
+  # FIXME: move xxd into a separate package so we don't have to pull in all of vim.
   propagatedBuildInputs = (with pythonPackages; [ debian libarchive-c python_magic tlsh ]) ++
-    [ acl binutils bzip2 cbfstool cdrkit cpio diffutils e2fsprogs file fpc gettext ghc gnupg1
-      gzip jdk libcaca mono pdftk poppler_utils rpm sng sqlite squashfsTools unzip vim xz ];
+    [ acl binutils bzip2 cbfstool cdrkit cpio diffutils e2fsprogs file gettext
+      gzip libcaca poppler_utils rpm sng sqlite squashfsTools unzip vim xz
+    ] ++ lib.optionals enableBloat [ jdk ghc fpc gnupg1 pdftk mono ];
 
   doCheck = false; # Calls 'mknod' in squashfs tests, which needs root
 

From 22fb0cb058d5f2362565bd384d8612b547231947 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 9 Jan 2016 02:48:24 +0300
Subject: [PATCH 596/884] nixos/postfix: don't emit alias_maps config option if
 we don't have aliases set

---
 nixos/modules/services/mail/postfix.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index 9090fbdaa1ea..35f9c53aa8c9 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -57,8 +57,6 @@ let
         else
           "[" + cfg.relayHost + "]"}
 
-      alias_maps = hash:/var/postfix/conf/aliases
-
       mail_spool_directory = /var/spool/mail/
 
       setgid_group = ${setgidGroup}
@@ -85,6 +83,8 @@ let
     ''
     + optionalString (cfg.transport != "") ''
       transport_maps = hash:/etc/postfix/transport
+    + optionalString (cfg.postmasterAlias != "" || cfg.rootAlias != "" || cfg.extraAliases != "") ''
+      alias_maps = hash:/var/postfix/conf/aliases
     ''
     + cfg.extraConfig;
 

From 57c1d09857d826e2774e20d28783299f1f7ac6ca Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 9 Jan 2016 03:35:40 +0300
Subject: [PATCH 597/884] postfix30: add patch to silence setuid-in-nix-store
 related warnings

---
 pkgs/servers/mail/postfix/3.0.nix             |  2 +-
 .../postfix/postfix-3.0-no-warnings.patch     | 86 +++++++++++++++++++
 2 files changed, 87 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/servers/mail/postfix/postfix-3.0-no-warnings.patch

diff --git a/pkgs/servers/mail/postfix/3.0.nix b/pkgs/servers/mail/postfix/3.0.nix
index 8c625da2c9e2..93084f3ba609 100644
--- a/pkgs/servers/mail/postfix/3.0.nix
+++ b/pkgs/servers/mail/postfix/3.0.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ makeWrapper gnused db openssl cyrus_sasl icu ];
 
-  patches = [ ./postfix-script-shell.patch ];
+  patches = [ ./postfix-script-shell.patch ./postfix-3.0-no-warnings.patch ];
 
   preBuild = ''
     sed -e '/^PATH=/d' -i postfix-install
diff --git a/pkgs/servers/mail/postfix/postfix-3.0-no-warnings.patch b/pkgs/servers/mail/postfix/postfix-3.0-no-warnings.patch
new file mode 100644
index 000000000000..d93eaf0aaa0d
--- /dev/null
+++ b/pkgs/servers/mail/postfix/postfix-3.0-no-warnings.patch
@@ -0,0 +1,86 @@
+diff -ru3 postfix-3.0.3/conf/postfix-script postfix-3.0.3-new/conf/postfix-script
+--- postfix-3.0.3/conf/postfix-script	2014-06-27 18:05:15.000000000 +0400
++++ postfix-3.0.3-new/conf/postfix-script	2016-01-09 17:51:38.545733631 +0300
+@@ -84,24 +84,6 @@
+ 	exit 1
+ }
+ 
+-# If this is a secondary instance, don't touch shared files.
+-
+-instances=`test ! -f $def_config_directory/main.cf ||
+-    $command_directory/postconf -c $def_config_directory \
+-    -h multi_instance_directories | sed 's/,/ /'` || {
+-	$FATAL cannot execute $command_directory/postconf!
+-	exit 1
+-}
+-
+-check_shared_files=1
+-for name in $instances
+-do
+-    case "$name" in
+-    "$def_config_directory") ;;
+-    "$config_directory") check_shared_files=; break;;
+-    esac
+-done
+-
+ #
+ # Parse JCL
+ #
+@@ -262,22 +244,6 @@
+ 	    -prune \( -perm -020 -o -perm -002 \) \
+ 	    -exec $WARN group or other writable: {} \;
+ 
+-	# Check Postfix root-owned directory tree owner/permissions.
+-
+-	todo="$config_directory/."
+-	test -n "$check_shared_files" && {
+-		todo="$daemon_directory/. $meta_directory/. $todo"
+-		test "$shlib_directory" = "no" || 
+-		    todo="$shlib_directory/. $todo"
+-	}
+-	todo=`echo "$todo" | tr ' ' '\12' | sort -u`
+-
+-	find $todo ! -user root \
+-	    -exec $WARN not owned by root: {} \;
+-
+-	find $todo \( -perm -020 -o -perm -002 \) \
+-	    -exec $WARN group or other writable: {} \;
+-
+ 	# Check Postfix mail_owner-owned directory tree owner/permissions.
+ 
+ 	find $data_directory/. ! -user $mail_owner \
+@@ -302,18 +268,11 @@
+ 	# Check Postfix setgid_group-owned directory and file group/permissions.
+ 
+ 	todo="$queue_directory/public $queue_directory/maildrop"
+-	test -n "$check_shared_files" && 
+-	   todo="$command_directory/postqueue $command_directory/postdrop $todo"
+ 
+ 	find $todo \
+ 	    -prune ! -group $setgid_group \
+ 	    -exec $WARN not owned by group $setgid_group: {} \;
+ 
+-	test -n "$check_shared_files" &&
+-	find $command_directory/postqueue $command_directory/postdrop \
+-	    -prune ! -perm -02111 \
+-	    -exec $WARN not set-gid or not owner+group+world executable: {} \;
+-
+ 	# Check non-Postfix root-owned directory tree owner/content.
+ 
+ 	for dir in bin etc lib sbin usr
+@@ -334,15 +293,6 @@
+ 
+ 	find corrupt -type f -exec $WARN damaged message: {} \;
+ 
+-	# Check for non-Postfix MTA remnants.
+-
+-	test -n "$check_shared_files" -a -f /usr/sbin/sendmail -a \
+-		-f /usr/lib/sendmail && {
+-	    cmp -s /usr/sbin/sendmail /usr/lib/sendmail || {
+-		$WARN /usr/lib/sendmail and /usr/sbin/sendmail differ
+-		$WARN Replace one by a symbolic link to the other
+-	    }
+-	}
+ 	exit 0
+ 	;;
+ 

From 54bc19270b6ac94ec0e8c9d740d1f21b47d2c989 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 9 Jan 2016 03:36:39 +0300
Subject: [PATCH 598/884] nixos/postfix: add users and groups only if needed,
 fix group name

---
 nixos/modules/services/mail/postfix.nix | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index 35f9c53aa8c9..3231a10aa22b 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -378,26 +378,27 @@ in
       program = "sendmail";
       source = "${pkgs.postfix}/bin/sendmail";
       owner = "nobody";
-      group = "postdrop";
+      group = setgidGroup;
       setuid = false;
       setgid = true;
     };
 
-    users.extraUsers = singleton
-      { name = user;
+    users.extraUsers = optional (user == "postfix")
+      { name = "postfix";
         description = "Postfix mail server user";
         uid = config.ids.uids.postfix;
         group = group;
       };
 
     users.extraGroups =
-      [ { name = group;
-          gid = config.ids.gids.postfix;
-        }
-        { name = setgidGroup;
-          gid = config.ids.gids.postdrop;
-        }
-      ];
+      optional (group == "postfix")
+      { name = group;
+        gid = config.ids.gids.postfix;
+      }
+      ++ optional (setgidGroup == "postdrop")
+      { name = setgidGroup;
+        gid = config.ids.gids.postdrop;
+      };
 
     systemd.services.postfix =
       { description = "Postfix mail server";

From d65850e56f26ce6eb9bb01d309aa3cf2c82ff6dd Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 9 Jan 2016 17:42:01 +0300
Subject: [PATCH 599/884] postfix30: split meta_directory from configuration,
 fix queue_directory and data_directory

---
 pkgs/servers/mail/postfix/3.0.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mail/postfix/3.0.nix b/pkgs/servers/mail/postfix/3.0.nix
index 93084f3ba609..786107e9393a 100644
--- a/pkgs/servers/mail/postfix/3.0.nix
+++ b/pkgs/servers/mail/postfix/3.0.nix
@@ -22,13 +22,14 @@ stdenv.mkDerivation rec {
 
     export command_directory=$out/sbin
     export config_directory=/etc/postfix
+    export meta_directory=$out/etc/postfix
     export daemon_directory=$out/libexec/postfix
-    export data_directory=/var/lib/postfix
+    export data_directory=/var/lib/postfix/data
     export html_directory=$out/share/postfix/doc/html
     export mailq_path=$out/bin/mailq
     export manpage_directory=$out/share/man
     export newaliases_path=$out/bin/newaliases
-    export queue_directory=/var/spool/postfix
+    export queue_directory=/var/lib/postfix/queue
     export readme_directory=$out/share/postfix/doc
     export sendmail_path=$out/bin/sendmail
 

From e9597ff555012848e3cf20ab2d30780f6892ab85 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 12 Jan 2016 17:13:31 +0300
Subject: [PATCH 600/884] Revert "libpcap: support static build"

This reverts commit ee6ca494d2427f13fc9bb09ef197f768b53b2637.
---
 pkgs/development/libraries/libpcap/default.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix
index 4dc7d43122b3..b8985bbed82f 100644
--- a/pkgs/development/libraries/libpcap/default.nix
+++ b/pkgs/development/libraries/libpcap/default.nix
@@ -1,6 +1,4 @@
-{ stdenv, fetchurl, flex, bison
-, enableStatic ? false
-}:
+{ stdenv, fetchurl, flex, bison }:
 
 stdenv.mkDerivation rec {
   name = "libpcap-1.7.4";
@@ -15,10 +13,9 @@ stdenv.mkDerivation rec {
   # We need to force the autodetection because detection doesn't
   # work in pure build enviroments.
   configureFlags =
-    (if stdenv.isLinux then [ "--with-pcap=linux" ]
-     else if stdenv.isDarwin then [ "--with-pcap=bpf" ]
-     else [])
-    ++ stdenv.lib.optional enableStatic "--enable-static";
+    if stdenv.isLinux then [ "--with-pcap=linux" ]
+    else if stdenv.isDarwin then [ "--with-pcap=bpf" ]
+    else [];
 
   prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
     substituteInPlace configure --replace " -arch i386" ""

From 4a9ad20a9598f03b098e236b22b5136e325b6924 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 12 Jan 2016 17:13:38 +0300
Subject: [PATCH 601/884] Revert "vde2: support static build"

This reverts commit fda6c0d3c706f07c53fb2cc01dcd651d8925bcea.
See https://github.com/NixOS/nixpkgs/commit/ee6ca494d2427f13fc9bb09ef197f768b53b2637
for related discussion.
---
 pkgs/tools/networking/vde2/default.nix | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/pkgs/tools/networking/vde2/default.nix b/pkgs/tools/networking/vde2/default.nix
index e3b0bcf87c6a..72a31262e26f 100644
--- a/pkgs/tools/networking/vde2/default.nix
+++ b/pkgs/tools/networking/vde2/default.nix
@@ -1,6 +1,4 @@
-{ stdenv, fetchurl, openssl, libpcap, python
-, enableStatic ? false
-}:
+{ stdenv, fetchurl, openssl, libpcap, python }:
 
 stdenv.mkDerivation rec {
   name = "vde2-2.3.2";
@@ -12,9 +10,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ openssl libpcap python ];
 
-  # Avoid qemu rebuild; feel free to replace with optional
-  configureFlags = if enableStatic then [ "--enable-static" ] else null;
-
   meta = {
     homepage = http://vde.sourceforge.net/;
     description = "Virtual Distributed Ethernet, an Ethernet compliant virtual network";

From 9df07753cef9dcc7f8aa08b3152bc62d95d01062 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 12 Jan 2016 17:27:21 +0300
Subject: [PATCH 602/884] swap service: don't restart mkswap.service on
 switches

Sadly, we can't instruct systemd to properly restart device-name.swap when this service restarts (or I haven't found the way to do so). As of now blindly restarting it would only get you a bunch of errors about device already used -- let's avoid it.
---
 nixos/modules/config/swap.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/config/swap.nix b/nixos/modules/config/swap.nix
index 0ab5bb3d89c8..f0353c5a35ec 100644
--- a/nixos/modules/config/swap.nix
+++ b/nixos/modules/config/swap.nix
@@ -128,6 +128,7 @@ in
             wantedBy = [ "${realDevice'}.swap" ];
             before = [ "${realDevice'}.swap" ];
             path = [ pkgs.utillinux ] ++ optional sw.randomEncryption pkgs.cryptsetup;
+
             script =
               ''
                 ${optionalString (sw.size != null) ''
@@ -145,11 +146,13 @@ in
                   mkswap ${sw.realDevice}
                 ''}
               '';
+
             unitConfig.RequiresMountsFor = [ "${dirOf sw.device}" ];
             unitConfig.DefaultDependencies = false; # needed to prevent a cycle
             serviceConfig.Type = "oneshot";
             serviceConfig.RemainAfterExit = sw.randomEncryption;
             serviceConfig.ExecStop = optionalString sw.randomEncryption "${pkgs.cryptsetup}/bin/cryptsetup luksClose ${sw.deviceName}";
+            restartIfChanged = false;
           };
 
       in listToAttrs (map createSwapDevice (filter (sw: sw.size != null || sw.randomEncryption) config.swapDevices));

From b1d6e6a38b57f5aba1019f99b5aab178e67c7e26 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Tue, 12 Jan 2016 14:32:22 +0000
Subject: [PATCH 603/884] Fix running apache tomcat as a daemon

---
 nixos/modules/services/web-servers/tomcat.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix
index 9f1be5a82904..6abd6dfb306b 100644
--- a/nixos/modules/services/web-servers/tomcat.nix
+++ b/nixos/modules/services/web-servers/tomcat.nix
@@ -131,7 +131,8 @@ in
       description = "Apache Tomcat server";
       wantedBy = [ "multi-user.target" ];
       after = [ "network-interfaces.target" ];
-      serviceConfig.Type = "daemon";
+      serviceConfig.Type = "oneshot";
+      serviceConfig.RemainAfterExit = true;
 
       preStart = ''
         # Create the base directory

From d5c070283b4add1a38822177be9f39cf94082aa7 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 12 Jan 2016 08:52:02 -0600
Subject: [PATCH 604/884] kde5.kscreen: add missing runtime dependencies

Fixes #12331.
---
 pkgs/desktops/plasma-5.5/kscreen.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/plasma-5.5/kscreen.nix b/pkgs/desktops/plasma-5.5/kscreen.nix
index 113c2565d07e..2cfd0df2e1d3 100644
--- a/pkgs/desktops/plasma-5.5/kscreen.nix
+++ b/pkgs/desktops/plasma-5.5/kscreen.nix
@@ -1,6 +1,6 @@
 { plasmaPackage, extra-cmake-modules, kconfig, kconfigwidgets
 , kdbusaddons, kglobalaccel, ki18n, kwidgetsaddons, kxmlgui
-, libkscreen, makeQtWrapper, qtdeclarative
+, libkscreen, makeQtWrapper, qtdeclarative, qtgraphicaleffects
 }:
 
 plasmaPackage {
@@ -21,9 +21,12 @@ plasmaPackage {
     ki18n
     libkscreen
     qtdeclarative
+    qtgraphicaleffects
   ];
   propagatedUserEnvPkgs = [
     libkscreen  # D-Bus service
+    qtdeclarative  # QML import
+    qtgraphicaleffects  # QML import
   ];
   postInstall = ''
     wrapQtProgram "$out/bin/kscreen-console"

From ef3102b27e9a5613b3134f440ddd54b7b453f0a8 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 9 Jan 2016 15:48:36 +0300
Subject: [PATCH 605/884] nixos/postfix: move /var/postfix to /var/lib/postfix,
 fix access rights

---
 nixos/modules/services/mail/postfix.nix | 70 ++++++++++++++-----------
 1 file changed, 40 insertions(+), 30 deletions(-)

diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index 3231a10aa22b..cbce53a1727d 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -9,14 +9,14 @@ let
   group = cfg.group;
   setgidGroup = cfg.setgidGroup;
 
+  haveAliases = cfg.postmasterAlias != "" || cfg.rootAlias != "" || cfg.extraAliases != "";
+  haveTransport = cfg.transport != "";
+  haveVirtual = cfg.virtual != "";
+
   mainCf =
     ''
       compatibility_level = 2
 
-      queue_directory = /var/postfix/queue
-      command_directory = ${pkgs.postfix}/sbin
-      daemon_directory = ${pkgs.postfix}/libexec/postfix
-
       mail_owner = ${user}
       default_privs = nobody
 
@@ -78,13 +78,14 @@ let
     + optionalString (cfg.recipientDelimiter != "") ''
       recipient_delimiter = ${cfg.recipientDelimiter}
     ''
-    + optionalString (cfg.virtual != "") ''
-      virtual_alias_maps = hash:/etc/postfix/virtual
+    + optionalString haveAliases ''
+      alias_maps = hash:/etc/postfix/aliases
     ''
-    + optionalString (cfg.transport != "") ''
+    + optionalString haveTransport ''
       transport_maps = hash:/etc/postfix/transport
-    + optionalString (cfg.postmasterAlias != "" || cfg.rootAlias != "" || cfg.extraAliases != "") ''
-      alias_maps = hash:/var/postfix/conf/aliases
+    ''
+    + optionalString haveVirtual ''
+      virtual_alias_maps = hash:/etc/postfix/virtual
     ''
     + cfg.extraConfig;
 
@@ -366,7 +367,7 @@ in
 
     environment = {
       etc = singleton
-        { source = "/var/postfix/conf";
+        { source = "/var/lib/postfix/conf";
           target = "postfix";
         };
 
@@ -377,7 +378,6 @@ in
     services.mail.sendmailSetuidWrapper = mkIf config.services.postfix.setSendmail {
       program = "sendmail";
       source = "${pkgs.postfix}/bin/sendmail";
-      owner = "nobody";
       group = setgidGroup;
       setuid = false;
       setgid = true;
@@ -409,41 +409,51 @@ in
         serviceConfig = {
           Type = "forking";
           Restart = "always";
-          PIDFile = "/var/postfix/queue/pid/master.pid";
+          PIDFile = "/var/lib/postfix/queue/pid/master.pid";
         };
 
         preStart = ''
-          ${pkgs.coreutils}/bin/mkdir -p /var/spool/mail /var/postfix/conf /var/postfix/queue
+          ${pkgs.coreutils}/bin/mkdir -p /var/lib/postfix/data /var/lib/postfix/queue/{pid,public,maildrop}
 
-          ${pkgs.coreutils}/bin/chown -R ${user}:${group} /var/postfix
-          ${pkgs.coreutils}/bin/chown -R ${user}:${setgidGroup} /var/postfix/queue
-          ${pkgs.coreutils}/bin/chmod -R ug+rwX /var/postfix/queue
+          ${pkgs.coreutils}/bin/chown -R ${user}:${group} /var/lib/postfix
+          ${pkgs.coreutils}/bin/chown root /var/lib/postfix/queue
+          ${pkgs.coreutils}/bin/chown root /var/lib/postfix/queue/pid
+          ${pkgs.coreutils}/bin/chgrp -R ${setgidGroup} /var/lib/postfix/queue/{public,maildrop}
+          ${pkgs.coreutils}/bin/chmod 770 /var/lib/postfix/queue/{public,maildrop}
+
+          ${pkgs.coreutils}/bin/rm -rf /var/lib/postfix/conf
+          ${pkgs.coreutils}/bin/mkdir -p /var/lib/postfix/conf
+          ${pkgs.coreutils}/bin/ln -sf ${mainCfFile} /var/lib/postfix/conf/main.cf
+          ${pkgs.coreutils}/bin/ln -sf ${masterCfFile} /var/lib/postfix/conf/master.cf
+          ${optionalString haveAliases ''
+            ${pkgs.coreutils}/bin/ln -sf ${aliasesFile} /var/lib/postfix/conf/aliases
+            ${pkgs.postfix}/bin/postalias /var/lib/postfix/conf/aliases
+          ''}
+          ${optionalString haveTransport ''
+            ${pkgs.coreutils}/bin/ln -sf ${transportFile} /var/lib/postfix/conf/transport
+            ${pkgs.postfix}/bin/postmap /var/lib/postfix/conf/transport
+          ''}
+          ${optionalString haveVirtual ''
+            ${pkgs.coreutils}/bin/ln -sf ${virtualFile} /var/lib/postfix/conf/virtual
+            ${pkgs.postfix}/bin/postmap /var/lib/postfix/conf/virtual
+          ''}
+
+          ${pkgs.coreutils}/bin/mkdir -p /var/spool/mail
           ${pkgs.coreutils}/bin/chown root:root /var/spool/mail
           ${pkgs.coreutils}/bin/chmod a+rwxt /var/spool/mail
           ${pkgs.coreutils}/bin/ln -sf /var/spool/mail /var/
-
-          ln -sf ${pkgs.postfix}/etc/postfix/postfix-files /var/postfix/conf
-
-          ln -sf ${aliasesFile} /var/postfix/conf/aliases
-          ln -sf ${virtualFile} /var/postfix/conf/virtual
-          ln -sf ${mainCfFile} /var/postfix/conf/main.cf
-          ln -sf ${masterCfFile} /var/postfix/conf/master.cf
-          ln -sf ${transportFile} /var/postfix/conf/transport
-
-          ${pkgs.postfix}/sbin/postalias -c /var/postfix/conf /var/postfix/conf/aliases
-          ${pkgs.postfix}/sbin/postmap -c /var/postfix/conf /var/postfix/conf/virtual
         '';
 
         script = ''
-          ${pkgs.postfix}/sbin/postfix -c /var/postfix/conf start
+          ${pkgs.postfix}/sbin/postfix -c /etc/postfix start
         '';
 
         reload = ''
-          ${pkgs.postfix}/sbin/postfix -c /var/postfix/conf reload
+          ${pkgs.postfix}/sbin/postfix -c /etc/postfix reload
         '';
 
         preStop = ''
-          ${pkgs.postfix}/sbin/postfix -c /var/postfix/conf stop
+          ${pkgs.postfix}/sbin/postfix -c /etc/postfix stop
         '';
 
       };

From 902dd35d47d5ab62345f2e17537818cc69cc5cb9 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 9 Jan 2016 18:16:29 +0300
Subject: [PATCH 606/884] nixos/postfix: move scripts to serviceConfig

---
 nixos/modules/services/mail/postfix.nix | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index cbce53a1727d..9c3c77450215 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -410,6 +410,9 @@ in
           Type = "forking";
           Restart = "always";
           PIDFile = "/var/lib/postfix/queue/pid/master.pid";
+          ExecStart = "${pkgs.postfix}/bin/postfix -c /etc/postfix start";
+          ExecStop = "${pkgs.postfix}/bin/postfix -c /etc/postfix stop";
+          ExecReload = "${pkgs.postfix}/bin/postfix -c /etc/postfix reload";
         };
 
         preStart = ''
@@ -443,19 +446,6 @@ in
           ${pkgs.coreutils}/bin/chmod a+rwxt /var/spool/mail
           ${pkgs.coreutils}/bin/ln -sf /var/spool/mail /var/
         '';
-
-        script = ''
-          ${pkgs.postfix}/sbin/postfix -c /etc/postfix start
-        '';
-
-        reload = ''
-          ${pkgs.postfix}/sbin/postfix -c /etc/postfix reload
-        '';
-
-        preStop = ''
-          ${pkgs.postfix}/sbin/postfix -c /etc/postfix stop
-        '';
-
       };
 
   };

From 9c502abb1cd764b6c0dd3099705273b8e8ef36bf Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 12 Jan 2016 17:56:54 +0300
Subject: [PATCH 607/884] nixos/postfix: use path instead of direct package
 mentions

---
 nixos/modules/services/mail/postfix.nix | 37 +++++++++++++------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index 9c3c77450215..4d5f9c8c5480 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -405,6 +405,7 @@ in
 
         wantedBy = [ "multi-user.target" ];
         after = [ "network.target" ];
+        path = [ pkgs.postfix ];
 
         serviceConfig = {
           Type = "forking";
@@ -416,35 +417,35 @@ in
         };
 
         preStart = ''
-          ${pkgs.coreutils}/bin/mkdir -p /var/lib/postfix/data /var/lib/postfix/queue/{pid,public,maildrop}
+          mkdir -p /var/lib/postfix/data /var/lib/postfix/queue/{pid,public,maildrop}
 
-          ${pkgs.coreutils}/bin/chown -R ${user}:${group} /var/lib/postfix
-          ${pkgs.coreutils}/bin/chown root /var/lib/postfix/queue
-          ${pkgs.coreutils}/bin/chown root /var/lib/postfix/queue/pid
-          ${pkgs.coreutils}/bin/chgrp -R ${setgidGroup} /var/lib/postfix/queue/{public,maildrop}
-          ${pkgs.coreutils}/bin/chmod 770 /var/lib/postfix/queue/{public,maildrop}
+          chown -R ${user}:${group} /var/lib/postfix
+          chown root /var/lib/postfix/queue
+          chown root /var/lib/postfix/queue/pid
+          chgrp -R ${setgidGroup} /var/lib/postfix/queue/{public,maildrop}
+          chmod 770 /var/lib/postfix/queue/{public,maildrop}
 
-          ${pkgs.coreutils}/bin/rm -rf /var/lib/postfix/conf
-          ${pkgs.coreutils}/bin/mkdir -p /var/lib/postfix/conf
-          ${pkgs.coreutils}/bin/ln -sf ${mainCfFile} /var/lib/postfix/conf/main.cf
-          ${pkgs.coreutils}/bin/ln -sf ${masterCfFile} /var/lib/postfix/conf/master.cf
+          rm -rf /var/lib/postfix/conf
+          mkdir -p /var/lib/postfix/conf
+          ln -sf ${mainCfFile} /var/lib/postfix/conf/main.cf
+          ln -sf ${masterCfFile} /var/lib/postfix/conf/master.cf
           ${optionalString haveAliases ''
-            ${pkgs.coreutils}/bin/ln -sf ${aliasesFile} /var/lib/postfix/conf/aliases
-            ${pkgs.postfix}/bin/postalias /var/lib/postfix/conf/aliases
+            ln -sf ${aliasesFile} /var/lib/postfix/conf/aliases
+            postalias /var/lib/postfix/conf/aliases
           ''}
           ${optionalString haveTransport ''
             ${pkgs.coreutils}/bin/ln -sf ${transportFile} /var/lib/postfix/conf/transport
             ${pkgs.postfix}/bin/postmap /var/lib/postfix/conf/transport
           ''}
           ${optionalString haveVirtual ''
-            ${pkgs.coreutils}/bin/ln -sf ${virtualFile} /var/lib/postfix/conf/virtual
-            ${pkgs.postfix}/bin/postmap /var/lib/postfix/conf/virtual
+            ln -sf ${virtualFile} /var/lib/postfix/conf/virtual
+            postmap /var/lib/postfix/conf/virtual
           ''}
 
-          ${pkgs.coreutils}/bin/mkdir -p /var/spool/mail
-          ${pkgs.coreutils}/bin/chown root:root /var/spool/mail
-          ${pkgs.coreutils}/bin/chmod a+rwxt /var/spool/mail
-          ${pkgs.coreutils}/bin/ln -sf /var/spool/mail /var/
+          mkdir -p /var/spool/mail
+          chown root:root /var/spool/mail
+          chmod a+rwxt /var/spool/mail
+          ln -sf /var/spool/mail /var/
         '';
       };
 

From 1edb62b40abb54532d0f8c953409a551d23b35a4 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 10 Jan 2016 05:39:17 +0300
Subject: [PATCH 608/884] nixos/postfix: add options to compile additional maps
 and aliases

---
 nixos/modules/services/mail/postfix.nix | 175 +++++++++++++-----------
 1 file changed, 97 insertions(+), 78 deletions(-)

diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index 4d5f9c8c5480..00cabc505cab 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -356,6 +356,18 @@ in
         description = "Extra lines to append to the generated master.cf file.";
       };
 
+      aliasFiles = mkOption {
+        type = types.attrsOf types.path;
+        default = {};
+        description = "Aliases' tables to be compiled and placed into /var/lib/postfix/conf.";
+      };
+
+      mapFiles = mkOption {
+        type = types.attrsOf types.path;
+        default = {};
+        description = "Maps to be compiled and placed into /var/lib/postfix/conf.";
+      };
+
     };
 
   };
@@ -363,92 +375,99 @@ in
 
   ###### implementation
 
-  config = mkIf config.services.postfix.enable {
+  config = mkIf config.services.postfix.enable (mkMerge [
+    {
 
-    environment = {
-      etc = singleton
-        { source = "/var/lib/postfix/conf";
-          target = "postfix";
+      environment = {
+        etc = singleton
+          { source = "/var/lib/postfix/conf";
+            target = "postfix";
+          };
+
+        # This makes comfortable for root to run 'postqueue' for example.
+        systemPackages = [ pkgs.postfix ];
+      };
+
+      services.mail.sendmailSetuidWrapper = mkIf config.services.postfix.setSendmail {
+        program = "sendmail";
+        source = "${pkgs.postfix}/bin/sendmail";
+        group = setgidGroup;
+        setuid = false;
+        setgid = true;
+      };
+
+      users.extraUsers = optional (user == "postfix")
+        { name = "postfix";
+          description = "Postfix mail server user";
+          uid = config.ids.uids.postfix;
+          group = group;
         };
 
-      # This makes comfortable for root to run 'postqueue' for example.
-      systemPackages = [ pkgs.postfix ];
-    };
-
-    services.mail.sendmailSetuidWrapper = mkIf config.services.postfix.setSendmail {
-      program = "sendmail";
-      source = "${pkgs.postfix}/bin/sendmail";
-      group = setgidGroup;
-      setuid = false;
-      setgid = true;
-    };
-
-    users.extraUsers = optional (user == "postfix")
-      { name = "postfix";
-        description = "Postfix mail server user";
-        uid = config.ids.uids.postfix;
-        group = group;
-      };
-
-    users.extraGroups =
-      optional (group == "postfix")
-      { name = group;
-        gid = config.ids.gids.postfix;
-      }
-      ++ optional (setgidGroup == "postdrop")
-      { name = setgidGroup;
-        gid = config.ids.gids.postdrop;
-      };
-
-    systemd.services.postfix =
-      { description = "Postfix mail server";
-
-        wantedBy = [ "multi-user.target" ];
-        after = [ "network.target" ];
-        path = [ pkgs.postfix ];
-
-        serviceConfig = {
-          Type = "forking";
-          Restart = "always";
-          PIDFile = "/var/lib/postfix/queue/pid/master.pid";
-          ExecStart = "${pkgs.postfix}/bin/postfix -c /etc/postfix start";
-          ExecStop = "${pkgs.postfix}/bin/postfix -c /etc/postfix stop";
-          ExecReload = "${pkgs.postfix}/bin/postfix -c /etc/postfix reload";
+      users.extraGroups =
+        optional (group == "postfix")
+        { name = group;
+          gid = config.ids.gids.postfix;
+        }
+        ++ optional (setgidGroup == "postdrop")
+        { name = setgidGroup;
+          gid = config.ids.gids.postdrop;
         };
 
-        preStart = ''
-          mkdir -p /var/lib/postfix/data /var/lib/postfix/queue/{pid,public,maildrop}
+      systemd.services.postfix =
+        { description = "Postfix mail server";
 
-          chown -R ${user}:${group} /var/lib/postfix
-          chown root /var/lib/postfix/queue
-          chown root /var/lib/postfix/queue/pid
-          chgrp -R ${setgidGroup} /var/lib/postfix/queue/{public,maildrop}
-          chmod 770 /var/lib/postfix/queue/{public,maildrop}
+          wantedBy = [ "multi-user.target" ];
+          after = [ "network.target" ];
+          path = [ pkgs.postfix ];
 
-          rm -rf /var/lib/postfix/conf
-          mkdir -p /var/lib/postfix/conf
-          ln -sf ${mainCfFile} /var/lib/postfix/conf/main.cf
-          ln -sf ${masterCfFile} /var/lib/postfix/conf/master.cf
-          ${optionalString haveAliases ''
-            ln -sf ${aliasesFile} /var/lib/postfix/conf/aliases
-            postalias /var/lib/postfix/conf/aliases
-          ''}
-          ${optionalString haveTransport ''
-            ${pkgs.coreutils}/bin/ln -sf ${transportFile} /var/lib/postfix/conf/transport
-            ${pkgs.postfix}/bin/postmap /var/lib/postfix/conf/transport
-          ''}
-          ${optionalString haveVirtual ''
-            ln -sf ${virtualFile} /var/lib/postfix/conf/virtual
-            postmap /var/lib/postfix/conf/virtual
-          ''}
+          serviceConfig = {
+            Type = "forking";
+            Restart = "always";
+            PIDFile = "/var/lib/postfix/queue/pid/master.pid";
+            ExecStart = "${pkgs.postfix}/bin/postfix start";
+            ExecStop = "${pkgs.postfix}/bin/postfix stop";
+            ExecReload = "${pkgs.postfix}/bin/postfix reload";
+          };
 
-          mkdir -p /var/spool/mail
-          chown root:root /var/spool/mail
-          chmod a+rwxt /var/spool/mail
-          ln -sf /var/spool/mail /var/
-        '';
-      };
+          preStart = ''
+            mkdir -p /var/lib/postfix/data /var/lib/postfix/queue/{pid,public,maildrop}
 
-  };
+            chown -R ${user}:${group} /var/lib/postfix
+            chown root /var/lib/postfix/queue
+            chown root /var/lib/postfix/queue/pid
+            chgrp -R ${setgidGroup} /var/lib/postfix/queue/{public,maildrop}
+            chmod 770 /var/lib/postfix/queue/{public,maildrop}
+
+            rm -rf /var/lib/postfix/conf
+            mkdir -p /var/lib/postfix/conf
+            ln -sf ${mainCfFile} /var/lib/postfix/conf/main.cf
+            ln -sf ${masterCfFile} /var/lib/postfix/conf/master.cf
+            ${concatStringsSep "\n" (mapAttrsToList (to: from: ''
+              ln -sf ${from} /var/lib/postfix/conf/${to}
+              postalias /var/lib/postfix/conf/${to}
+            '') cfg.aliasFiles)}
+            ${concatStringsSep "\n" (mapAttrsToList (to: from: ''
+              ln -sf ${from} /var/lib/postfix/conf/${to}
+              postmap /var/lib/postfix/conf/${to}
+            '') cfg.mapFiles)}
+
+            mkdir -p /var/spool/mail
+            chown root:root /var/spool/mail
+            chmod a+rwxt /var/spool/mail
+            ln -sf /var/spool/mail /var/
+          '';
+        };
+    }
+
+    (mkIf haveAliases {
+      services.postfix.aliasFiles."aliases" = aliasesFile;
+    })
+    (mkIf haveTransport {
+      services.postfix.mapFiles."transport" = transportFile;
+    })
+    (mkIf haveVirtual {
+      services.postfix.mapFiles."virtual" = virtualFile;
+    })
+  ]);
 
 }

From be2b9898422c6c33af9108ffc126e1479ad728ed Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 9 Jan 2016 20:25:36 +0300
Subject: [PATCH 609/884] postfix30: build with pcre, add database drivers
 support

---
 pkgs/servers/mail/postfix/3.0.nix | 42 +++++++++++++++++++++----------
 1 file changed, 29 insertions(+), 13 deletions(-)

diff --git a/pkgs/servers/mail/postfix/3.0.nix b/pkgs/servers/mail/postfix/3.0.nix
index 786107e9393a..73ab8c8116f3 100644
--- a/pkgs/servers/mail/postfix/3.0.nix
+++ b/pkgs/servers/mail/postfix/3.0.nix
@@ -1,8 +1,25 @@
-{ stdenv, fetchurl, makeWrapper, gnused, db, openssl, cyrus_sasl, coreutils
-, findutils, gnugrep, gawk, icu
+{ stdenv, lib, fetchurl, makeWrapper, gnused, db, openssl, cyrus_sasl
+, coreutils, findutils, gnugrep, gawk, icu, pcre
+, withPgSQL ? false, postgresql
+, withMySQL ? false, libmysql
+, withSQLite ? false, sqlite
 }:
 
-stdenv.mkDerivation rec {
+let
+  ccargs = lib.concatStringsSep " " ([
+    "-DUSE_TLS" "-DUSE_SASL_AUTH" "-DUSE_CYRUS_SASL" "-I${cyrus_sasl}/include/sasl"
+    "-DHAS_DB_BYPASS_MAKEDEFS_CHECK"
+    "-fPIE" "-fstack-protector-all" "--param" "ssp-buffer-size=4" "-O2" "-D_FORTIFY_SOURCE=2"
+   ] ++ lib.optional withPgSQL "-DHAS_PGSQL"
+     ++ lib.optionals withMySQL [ "-DHAS_MYSQL" "-I${libmysql}/include/mysql" ]
+     ++ lib.optional withSQLite "-DHAS_SQLITE");
+   auxlibs = lib.concatStringsSep " " ([
+     "-ldb" "-lnsl" "-lresolv" "-lsasl2" "-lcrypto" "-lssl" "-pie" "-Wl,-z,relro,-z,now"
+   ] ++ lib.optional withPgSQL "-lpq"
+     ++ lib.optional withMySQL "-lmysqlclient"
+     ++ lib.optional withSQLite "-lsqlite3");
+
+in stdenv.mkDerivation rec {
 
   name = "postfix-${version}";
 
@@ -13,7 +30,10 @@ stdenv.mkDerivation rec {
     sha256 = "00mc12k5p1zlrlqcf33vh5zizaqr5ai8q78dwv69smjh6kn4c7j0";
   };
 
-  buildInputs = [ makeWrapper gnused db openssl cyrus_sasl icu ];
+  buildInputs = [ makeWrapper gnused db openssl cyrus_sasl icu pcre ]
+                ++ lib.optional withPgSQL postgresql
+                ++ lib.optional withMySQL libmysql
+                ++ lib.optional withSQLite sqlite;
 
   patches = [ ./postfix-script-shell.patch ./postfix-3.0-no-warnings.patch ];
 
@@ -33,16 +53,12 @@ stdenv.mkDerivation rec {
     export readme_directory=$out/share/postfix/doc
     export sendmail_path=$out/bin/sendmail
 
-    make makefiles \
-      CCARGS='-DUSE_TLS -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I${cyrus_sasl}/include/sasl \
-              -DHAS_DB_BYPASS_MAKEDEFS_CHECK \
-              -fPIE -fstack-protector-all --param ssp-buffer-size=4 -O2 -D_FORTIFY_SOURCE=2' \
-      AUXLIBS='-ldb -lnsl -lresolv -lsasl2 -lcrypto -lssl -pie -Wl,-z,relro,-z,now'
+    make makefiles CCARGS='${ccargs}' AUXLIBS='${auxlibs}'
   '';
 
   installTargets = [ "non-interactive-package" ];
 
-  installFlags = [ " install_root=installdir " ];
+  installFlags = [ "install_root=installdir" ];
 
   postInstall = ''
     mkdir -p $out
@@ -58,9 +74,9 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://www.postfix.org/";
     description = "A fast, easy to administer, and secure mail server";
-    license = stdenv.lib.licenses.bsdOriginal;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.rickynils ];
+    license = lib.licenses.bsdOriginal;
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.rickynils ];
   };
 
 }

From d3a19f1b8e65668ca711c4f329ab0a296f3774c9 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 10 Jan 2016 15:33:23 +0300
Subject: [PATCH 610/884] nixos/postfix: backwards compatibility with
 /var/postfix

---
 nixos/modules/services/mail/postfix.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index 00cabc505cab..ab6ad3906000 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -430,6 +430,11 @@ in
           };
 
           preStart = ''
+            # Backwards compatibility
+            if [ ! -d /var/lib/postfix ] && [ -d /var/postfix ]; then
+              mkdir -p /var/lib
+              mv /var/postfix /var/lib/postfix
+            fi
             mkdir -p /var/lib/postfix/data /var/lib/postfix/queue/{pid,public,maildrop}
 
             chown -R ${user}:${group} /var/lib/postfix

From 9c2da8a2969ff2284d875f67380c4536cda37cda Mon Sep 17 00:00:00 2001
From: Andrey Pavlov <couchemar@yandex.ru>
Date: Tue, 12 Jan 2016 16:53:31 +0300
Subject: [PATCH 611/884] elixir: 1.1.1 -> 1.2.0

---
 pkgs/development/interpreters/elixir/default.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix
index 380da51da77d..642bde39e7e9 100644
--- a/pkgs/development/interpreters/elixir/default.nix
+++ b/pkgs/development/interpreters/elixir/default.nix
@@ -1,18 +1,21 @@
 { stdenv, fetchurl, erlang, rebar, makeWrapper, coreutils, curl, bash }:
 
-let
-  version = "1.1.1";
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "elixir-${version}";
+  version = "1.2.0";
 
   src = fetchurl {
     url = "https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz";
-    sha256 = "0shh5brhcrvbvhl4bw0fs2y5llw7i97khkkglygx30ncvd7nwz9v";
+    sha256 = "0s3j7ra9gb2p3dwgfxghvc9mkv6ffgvz27aj5wgwk0xq2d9fws4z";
   };
 
   buildInputs = [ erlang rebar makeWrapper ];
 
+  # Elixir expects that UTF-8 locale to be set (see https://github.com/elixir-lang/elixir/issues/3548).
+  # In other cases there is warnings during compilation.
+  LANG = "en_US.UTF-8";
+  LC_TYPE = "en_US.UTF-8";
+
   preBuild = ''
     # The build process uses ./rebar. Link it to the nixpkgs rebar
     rm -v rebar
@@ -52,6 +55,6 @@ stdenv.mkDerivation {
 
     license = licenses.epl10;
     platforms = platforms.unix;
-    maintainers = [ maintainers.the-kenny maintainers.havvy ];
+    maintainers = with maintainers; [ the-kenny havvy couchemar ];
   };
 }

From f5e731168b47a42fcefdc51af05acd3997de3e05 Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Tue, 12 Jan 2016 16:14:07 +0100
Subject: [PATCH 612/884] cohttp: 0.17.1 -> 0.19.3

---
 pkgs/development/ocaml-modules/cohttp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix
index e219b59de5de..9a30a5e4615e 100644
--- a/pkgs/development/ocaml-modules/cohttp/default.nix
+++ b/pkgs/development/ocaml-modules/cohttp/default.nix
@@ -4,13 +4,13 @@
 
 buildOcaml rec {
   name = "cohttp";
-  version = "0.17.1";
+  version = "0.19.3";
 
   minimumSupportedOcamlVersion = "4.02";
 
   src = fetchurl {
     url = "https://github.com/mirage/ocaml-cohttp/archive/v${version}.tar.gz";
-    sha256 = "fb124fb2fb5ff2e74559bf380627f6a537e208c1518ddcb01f0d37b62b55f673";
+    sha256 = "1nrzpd4h52c1hnzcgsz462676saj9zss708ng001h54dglk8i1iv";
   };
 
   buildInputs = [ alcotest ];

From 1ecba0c1d7e1eaef4c6462be73572b807fa2154b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 12 Jan 2016 16:38:12 +0100
Subject: [PATCH 613/884] diffoscope: 44 -> 45

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

diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index 2ec79e2867d7..4a88ddfff148 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -6,14 +6,14 @@
 
 pythonPackages.buildPythonPackage rec {
   name = "diffoscope-${version}";
-  version = "44";
+  version = "45";
 
   namePrefix = "";
 
   src = fetchgit {
     url = "git://anonscm.debian.org/reproducible/diffoscope.git";
     rev = "refs/tags/${version}";
-    sha256 = "1sisdmh1bl62b16yfjy9mxxdfzhskrabp0l3pl1kxn7db0c4vpac";
+    sha256 = "1wdphcmr2n0pyg7zwvczy7ik1bzjlrjb76jwbzk971lwba3ajazk";
   };
 
   postPatch = ''

From eda93bb51fe37e27b6932086f3d3a2a35c0d697a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 12 Jan 2016 17:00:24 +0100
Subject: [PATCH 614/884] diffoscope: Ignore different link counts and inode
 change times

Nix does not canonicalize these, so ignore them to prevent lots of
spurious differences.
---
 pkgs/tools/misc/diffoscope/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index 4a88ddfff148..6715f1ac38fd 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchgit, pythonPackages, docutils
+{ lib, stdenv, fetchgit, fetchpatch, pythonPackages, docutils
 , acl, binutils, bzip2, cbfstool, cdrkit, cpio, diffutils, e2fsprogs, file, fpc, gettext, ghc, gnupg1
 , gzip, jdk, libcaca, mono, pdftk, poppler_utils, rpm, sng, sqlite, squashfsTools, unzip, vim, xz
 , enableBloat ? false
@@ -16,6 +16,14 @@ pythonPackages.buildPythonPackage rec {
     sha256 = "1wdphcmr2n0pyg7zwvczy7ik1bzjlrjb76jwbzk971lwba3ajazk";
   };
 
+  patches =
+    [ # Ignore different link counts and inode change times.
+      (fetchpatch {
+        url = https://github.com/edolstra/diffoscope/commit/367f77bba8df0dbc89e63c9f66f05736adf5ec59.patch;
+        sha256 = "0mnp7icdrjn02dr6f5dwqvvr848jzgkv3cg69a24234y9gxd30ww";
+      })
+    ];
+
   postPatch = ''
     # Upstream doesn't provide a PKG-INFO file
     sed -i setup.py -e "/'rpm-python',/d"

From 23772ef0a26fe631cde87690ecc586c598e2f3d9 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Tue, 12 Jan 2016 17:12:47 +0000
Subject: [PATCH 615/884] ejabberd: make config parameter nullable, so that the
 default bundled config can be used if none is given

---
 nixos/modules/services/networking/ejabberd.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/ejabberd.nix b/nixos/modules/services/networking/ejabberd.nix
index a990200f44c6..7af11f37a43c 100644
--- a/nixos/modules/services/networking/ejabberd.nix
+++ b/nixos/modules/services/networking/ejabberd.nix
@@ -11,7 +11,7 @@ let
     ${cfg.ctlConfig}
   '';
 
-  ectl = ''${cfg.package}/bin/ejabberdctl --config "${cfg.configFile}" --ctl-config "${ctlcfg}" --spool "${cfg.spoolDir}" --logs "${cfg.logsDir}"'';
+  ectl = ''${cfg.package}/bin/ejabberdctl ${if cfg.configFile == null then "" else "--config ${cfg.configFile}"} --ctl-config "${ctlcfg}" --spool "${cfg.spoolDir}" --logs "${cfg.logsDir}"'';
 
   dumps = lib.concatMapStringsSep " " lib.escapeShellArg cfg.loadDumps;
 
@@ -60,8 +60,9 @@ in {
       };
 
       configFile = mkOption {
-        type = types.path;
+        type = types.nullOr types.path;
         description = "Configuration file for ejabberd in YAML format";
+        default = null;
       };
 
       ctlConfig = mkOption {

From 5c89edbc3b2f7968fe7c2f66a78546d0dd69576a Mon Sep 17 00:00:00 2001
From: Tyson Whitehead <twhitehead@gmail.com>
Date: Tue, 12 Jan 2016 11:08:25 -0500
Subject: [PATCH 616/884] buildRustPackage: don't hardcode /nix/store, use
 $NIX_STORE

---
 pkgs/build-support/rust/patch-registry-deps/pkg-config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/rust/patch-registry-deps/pkg-config b/pkgs/build-support/rust/patch-registry-deps/pkg-config
index 2acf489851e9..fbb094304587 100644
--- a/pkgs/build-support/rust/patch-registry-deps/pkg-config
+++ b/pkgs/build-support/rust/patch-registry-deps/pkg-config
@@ -4,5 +4,5 @@ for dir in pkg-config-*; do
     echo "Patching pkg-config registry dep"
 
     substituteInPlace "$dir/src/lib.rs" \
-        --replace '"/usr"' '"/nix/store/"'
+        --replace '"/usr"' '"'"$NIX_STORE"'/"'
 done

From 3eaca0b6676fc91e37318af3493590719414f0b6 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 12 Jan 2016 13:25:54 -0600
Subject: [PATCH 617/884] kde5.apps: 15.12.0 -> 15.12.1

---
 pkgs/applications/kde-apps-15.12/fetchsrcs.sh |    2 +-
 pkgs/applications/kde-apps-15.12/srcs.nix     | 1928 ++++++++---------
 2 files changed, 965 insertions(+), 965 deletions(-)

diff --git a/pkgs/applications/kde-apps-15.12/fetchsrcs.sh b/pkgs/applications/kde-apps-15.12/fetchsrcs.sh
index 1a8c17d4ab56..93da9d332f7c 100755
--- a/pkgs/applications/kde-apps-15.12/fetchsrcs.sh
+++ b/pkgs/applications/kde-apps-15.12/fetchsrcs.sh
@@ -4,7 +4,7 @@
 set -x
 
 # The trailing slash at the end is necessary!
-WGET_ARGS='http://download.kde.org/stable/applications/15.12.0/ -A *.tar.xz'
+WGET_ARGS='http://download.kde.org/stable/applications/15.12.1/ -A *.tar.xz'
 
 mkdir tmp; cd tmp
 
diff --git a/pkgs/applications/kde-apps-15.12/srcs.nix b/pkgs/applications/kde-apps-15.12/srcs.nix
index a6f6c1107317..cd123f49f76b 100644
--- a/pkgs/applications/kde-apps-15.12/srcs.nix
+++ b/pkgs/applications/kde-apps-15.12/srcs.nix
@@ -3,1931 +3,1931 @@
 
 {
   akonadi = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/akonadi-15.12.0.tar.xz";
-      sha256 = "0xqas8nbqvs4bvsqi234rwsbi06h5i7a07cjmd3ggrrg9p0nk2i8";
-      name = "akonadi-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/akonadi-15.12.1.tar.xz";
+      sha256 = "1v9l1i9yny1ckyvq95wvd0bn3ain3fdlba76gf4f2zjwd57kw4il";
+      name = "akonadi-15.12.1.tar.xz";
     };
   };
   akonadi-calendar = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/akonadi-calendar-15.12.0.tar.xz";
-      sha256 = "1cxz2vrd1b96azs5pkhs6agdamqxya4xsaalfqgl3ii65gm5s6gf";
-      name = "akonadi-calendar-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/akonadi-calendar-15.12.1.tar.xz";
+      sha256 = "120fzy2l7c3rl4jlvk021wsrkp0gihqxhihmk6jrlwj4v7nswp69";
+      name = "akonadi-calendar-15.12.1.tar.xz";
     };
   };
   akonadi-search = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/akonadi-search-15.12.0.tar.xz";
-      sha256 = "180d1591k1c6l0ky6x0clmif1fw7pwikz2pzrh9c7kzmmdrfr3xf";
-      name = "akonadi-search-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/akonadi-search-15.12.1.tar.xz";
+      sha256 = "1kzjhqxa3n8216x1cs2xkyqyzjq7i8py5y5d303yr38m62z3f4qr";
+      name = "akonadi-search-15.12.1.tar.xz";
     };
   };
   analitza = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/analitza-15.12.0.tar.xz";
-      sha256 = "1z2km469f7s3mfvrgsszvffnbnihd0cbs8hp15vrd9jpsl4p7kws";
-      name = "analitza-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/analitza-15.12.1.tar.xz";
+      sha256 = "0lvjsrraffqfl53gkdsbzmrsznrz1sqnhpsbx015v21pgiwnx6ll";
+      name = "analitza-15.12.1.tar.xz";
     };
   };
   ark = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/ark-15.12.0.tar.xz";
-      sha256 = "0z5xhyyhs3gl7133qpa029b4gp44nql0576wczaqjy9p3hx7r9n3";
-      name = "ark-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/ark-15.12.1.tar.xz";
+      sha256 = "0x61k21rjydcjz4b2z52xa559kymsji52ik0hjdkljvwhggcw96a";
+      name = "ark-15.12.1.tar.xz";
     };
   };
   artikulate = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/artikulate-15.12.0.tar.xz";
-      sha256 = "0w9bbkznxxiriml4kqmswdn02ygassx8rq87k6bhvrbqziwgb8as";
-      name = "artikulate-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/artikulate-15.12.1.tar.xz";
+      sha256 = "1nlpyslrsqs0zirkaryq4sk2cb53sh2b8mk3cdzpj9w9isx9565x";
+      name = "artikulate-15.12.1.tar.xz";
     };
   };
   audiocd-kio = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/audiocd-kio-15.12.0.tar.xz";
-      sha256 = "016bv43b3bfyx15npps7wm1zpkrfzbiyqv48p9wd32fg5blmxnd5";
-      name = "audiocd-kio-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/audiocd-kio-15.12.1.tar.xz";
+      sha256 = "0x9x25x096grhm5lb3zibvrdy1x0hf2ryqkgp3l05580iirdjwss";
+      name = "audiocd-kio-15.12.1.tar.xz";
     };
   };
   baloo-widgets = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/baloo-widgets-15.12.0.tar.xz";
-      sha256 = "0lbjnwb5k5rwz4jwig7b4cm9di0b6kdr7c35ib3cy34vk2jrfzp1";
-      name = "baloo-widgets-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/baloo-widgets-15.12.1.tar.xz";
+      sha256 = "01nrw2wrvzkvnh1xgzxqzy6zpx2p74iwrz44rrgr5dixciy5bqf5";
+      name = "baloo-widgets-15.12.1.tar.xz";
     };
   };
   blinken = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/blinken-15.12.0.tar.xz";
-      sha256 = "1r7wk11gqz1zklpcqb33vkqywad356g7py5967mi21nsflz00a6c";
-      name = "blinken-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/blinken-15.12.1.tar.xz";
+      sha256 = "1x9pdji26s0hwrni26wl8r0rqbykxdpl348671d0jwmnidq6rabv";
+      name = "blinken-15.12.1.tar.xz";
     };
   };
   bomber = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/bomber-15.12.0.tar.xz";
-      sha256 = "1rcp2qmazzdsvxzy1zky4jp0vygpab6z9pmpzbjdpki5smkmpdv4";
-      name = "bomber-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/bomber-15.12.1.tar.xz";
+      sha256 = "0666ghxjcpscnc4d0q1jh29kx6knabkglbvggpkk1zqq3zl0fw6y";
+      name = "bomber-15.12.1.tar.xz";
     };
   };
   bovo = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/bovo-15.12.0.tar.xz";
-      sha256 = "026sxcdbvpdq07miw5z107cjaclhsphr7i3w19kw7hx911chaipk";
-      name = "bovo-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/bovo-15.12.1.tar.xz";
+      sha256 = "0cma6b1896nj2m7gra5g7jc9lwb7m70mhd593nib93w1i2mkamfr";
+      name = "bovo-15.12.1.tar.xz";
     };
   };
   cantor = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/cantor-15.12.0.tar.xz";
-      sha256 = "09cyf50la3v91vqwiciq7i9c5mcjqlmq9hjrm717bcr9029abqma";
-      name = "cantor-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/cantor-15.12.1.tar.xz";
+      sha256 = "15bdh85hrcx54ynq70jh42aw4m46g9sszg1rvymjpqi0za80srrj";
+      name = "cantor-15.12.1.tar.xz";
     };
   };
   cervisia = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/cervisia-15.12.0.tar.xz";
-      sha256 = "1gx196x33k4nb3knrfzzksxhcy1vdcgnzx3pwqmz2w7bvsdcl1vx";
-      name = "cervisia-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/cervisia-15.12.1.tar.xz";
+      sha256 = "1kgnvv3az7mdl6q29wxwaj8k3cnxzyizri7l6zjkp6n5jywxpq5h";
+      name = "cervisia-15.12.1.tar.xz";
     };
   };
   dolphin = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/dolphin-15.12.0.tar.xz";
-      sha256 = "19bkrwn842qygv2a0kwf76d5aqfw7wa1348x8vny2hmmbwk7laha";
-      name = "dolphin-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/dolphin-15.12.1.tar.xz";
+      sha256 = "0lpc21abdw242cans08jnswbsf9avckf6v12za029g6p4nnvmspx";
+      name = "dolphin-15.12.1.tar.xz";
     };
   };
   dolphin-plugins = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/dolphin-plugins-15.12.0.tar.xz";
-      sha256 = "0l74z0v55qki1xnwsdzq68i4qyxb16xw2g1fhlp069c975jlmakv";
-      name = "dolphin-plugins-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/dolphin-plugins-15.12.1.tar.xz";
+      sha256 = "0k438rhcscqin9735mjq8qrapc4ff4kimwp8bl6b77743b2bk59f";
+      name = "dolphin-plugins-15.12.1.tar.xz";
     };
   };
   dragon = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/dragon-15.12.0.tar.xz";
-      sha256 = "0afjl9758hb32hmiacx5bwg9paaxpxh1y4nh2r97wzb5krny3ghr";
-      name = "dragon-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/dragon-15.12.1.tar.xz";
+      sha256 = "0kqd7m8vjpc4ywz3hpqa8cy3fdlznnhv291wrgvvgm7dv83wylq3";
+      name = "dragon-15.12.1.tar.xz";
     };
   };
   ffmpegthumbs = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/ffmpegthumbs-15.12.0.tar.xz";
-      sha256 = "1i5sci7q4d9dflkgn8h2gsnah6snhlajydlgpknjb5l4dxdqbcg4";
-      name = "ffmpegthumbs-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/ffmpegthumbs-15.12.1.tar.xz";
+      sha256 = "1apcafjdjzhpqm72h2rvzxcy00fjdl8dah49ss7mj2ld0f36vl07";
+      name = "ffmpegthumbs-15.12.1.tar.xz";
     };
   };
   filelight = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/filelight-15.12.0.tar.xz";
-      sha256 = "0q4xwi2nbap5f4fn5ym0azk0knp053qq3ix4vbyg2mkh9r268wd6";
-      name = "filelight-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/filelight-15.12.1.tar.xz";
+      sha256 = "0za42abixfhkxczcddy9n4b98ryf3wvq2gngnqwgrs0m4wv3y530";
+      name = "filelight-15.12.1.tar.xz";
     };
   };
   gpgmepp = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/gpgmepp-15.12.0.tar.xz";
-      sha256 = "1480kx5n14ipk7sxpqpwgf2dq6jyp2b3rf7rblkis0jwqrzy61k4";
-      name = "gpgmepp-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/gpgmepp-15.12.1.tar.xz";
+      sha256 = "0ygmdmampd3yc0mkfbw7ihrdc6vmxb178kd5y3dxms4kiilxw6lv";
+      name = "gpgmepp-15.12.1.tar.xz";
     };
   };
   granatier = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/granatier-15.12.0.tar.xz";
-      sha256 = "07l4aq2qfk7blmmkpc8w6xkgj7zz6qs4vv2ifpdvkjv621475bcp";
-      name = "granatier-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/granatier-15.12.1.tar.xz";
+      sha256 = "09v0fwwkz7k8dx2rqc18qdrlmzkbmxna0ppxwq4cdhxixyppi0py";
+      name = "granatier-15.12.1.tar.xz";
     };
   };
   gwenview = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/gwenview-15.12.0.tar.xz";
-      sha256 = "00rsw57ivicx4j9kyvx92nppxv7m2kr3p2skp5qlidpgygwig4n5";
-      name = "gwenview-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/gwenview-15.12.1.tar.xz";
+      sha256 = "1bqcq277h6421rwhqvy8b2dn95h0zqqiskw38xfzrablfmr4ba9h";
+      name = "gwenview-15.12.1.tar.xz";
     };
   };
   jovie = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/jovie-15.12.0.tar.xz";
-      sha256 = "107ga496j0li1bqmppc96r25iq40yby63qi4hxzr6rvql0sk4vq3";
-      name = "jovie-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/jovie-15.12.1.tar.xz";
+      sha256 = "0z6lxvzv92z5hkbin6l7d75l6alnk94l3mhdkfa6p9mfimxvzixy";
+      name = "jovie-15.12.1.tar.xz";
     };
   };
   juk = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/juk-15.12.0.tar.xz";
-      sha256 = "0l0l72r6l2xpn7ym3zdvrpjl0qbn3jb4hdy371qn14s1gk1clai5";
-      name = "juk-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/juk-15.12.1.tar.xz";
+      sha256 = "1k9js66kmbpc6wyxxgp3z2zx7zhyvdsawy8fra9j76zd2fjyja60";
+      name = "juk-15.12.1.tar.xz";
     };
   };
   kaccessible = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kaccessible-15.12.0.tar.xz";
-      sha256 = "0gg90sy5a8kmllcryj7xncbyn4w6rd0f19vnn5vgsdrhgh8b8kf8";
-      name = "kaccessible-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kaccessible-15.12.1.tar.xz";
+      sha256 = "1vjla5wf63h88y738f0p8prqkmzdifl0l6akmjvkasjipy3bcdw6";
+      name = "kaccessible-15.12.1.tar.xz";
     };
   };
   kaccounts-integration = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kaccounts-integration-15.12.0.tar.xz";
-      sha256 = "1g5rbnhl7vfhh9ni2clrkszlns9iiibdpfxgpsjfjlljr8ai8fn8";
-      name = "kaccounts-integration-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kaccounts-integration-15.12.1.tar.xz";
+      sha256 = "1q7gjv4jr534q42am40x27kbk2sqs8im800xjw214y3dgw146g6d";
+      name = "kaccounts-integration-15.12.1.tar.xz";
     };
   };
   kaccounts-providers = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kaccounts-providers-15.12.0.tar.xz";
-      sha256 = "12hq0rwlqz8pjnm4p0p44q4m4vj4z1r79z5pc5glv3r0rvmn05xk";
-      name = "kaccounts-providers-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kaccounts-providers-15.12.1.tar.xz";
+      sha256 = "1ir7cb3ma8j1jfnjk4m9xx5mj7yj769pblsjz1v6nh6s846ri1fh";
+      name = "kaccounts-providers-15.12.1.tar.xz";
     };
   };
   kajongg = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kajongg-15.12.0.tar.xz";
-      sha256 = "0qbyqixvcpn5z07cwv9jzvf0dawlcsgzq776lhh49ds6hh4xgdcw";
-      name = "kajongg-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kajongg-15.12.1.tar.xz";
+      sha256 = "1dzw9dvh3an26i6w8zf319337x7d4iggfgz0v9c46kngh8b9lydx";
+      name = "kajongg-15.12.1.tar.xz";
     };
   };
   kalarmcal = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kalarmcal-15.12.0.tar.xz";
-      sha256 = "10lj01gsg2mr2kq39nih4cv1i48mp8b5i5s01kvaf2mwhwrj2hb5";
-      name = "kalarmcal-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kalarmcal-15.12.1.tar.xz";
+      sha256 = "1kdbqy6hb19sip49nca05375rjwj2502mq1vmylrqfggbrh277wz";
+      name = "kalarmcal-15.12.1.tar.xz";
     };
   };
   kalgebra = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kalgebra-15.12.0.tar.xz";
-      sha256 = "11d5yzwv9p5fa9rz06gv3b773kcqmxd9hmkraz6i3ph2z2xdyfmc";
-      name = "kalgebra-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kalgebra-15.12.1.tar.xz";
+      sha256 = "1f4kqjljw2rwzi82vzfbk7j9h4b9i127lnhklw47vyapllw2jjjc";
+      name = "kalgebra-15.12.1.tar.xz";
     };
   };
   kalzium = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kalzium-15.12.0.tar.xz";
-      sha256 = "1p26pz900yl8ig9vh3aa1xkxap4962477rgiysckzvil1b3z9jn4";
-      name = "kalzium-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kalzium-15.12.1.tar.xz";
+      sha256 = "00fh91p4rrw7y6qdkg33dqf74c15q4j76b8xp1a6ydcvwjjcp4cv";
+      name = "kalzium-15.12.1.tar.xz";
     };
   };
   kamera = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kamera-15.12.0.tar.xz";
-      sha256 = "1wa6ihbbxrdc3axj9g7ayizka2h5hv7890c8s23mrrnigf911s21";
-      name = "kamera-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kamera-15.12.1.tar.xz";
+      sha256 = "01vd2zg2gyzbzcgdk6yd10vndn41wrf4cqg6vk65y0idk2gqjfbi";
+      name = "kamera-15.12.1.tar.xz";
     };
   };
   kanagram = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kanagram-15.12.0.tar.xz";
-      sha256 = "03faj636jaf4r7sdp4zlkl0l4v66pdphw4yzw6lp8pg2mp6ydnjl";
-      name = "kanagram-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kanagram-15.12.1.tar.xz";
+      sha256 = "0pifl0qh33cm09m1fl8ma7p4nzd6bw2sisq3aj1x6r2yal48n5l7";
+      name = "kanagram-15.12.1.tar.xz";
     };
   };
   kapman = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kapman-15.12.0.tar.xz";
-      sha256 = "1m7dzspf7bg4z3v9slp6dr78gcmd6yn44mqx1ycmby85cwh5y39l";
-      name = "kapman-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kapman-15.12.1.tar.xz";
+      sha256 = "1fygp0v0s4dk6cb30samg63dbzdspx0fmd7shijhx4rdphq6jr5f";
+      name = "kapman-15.12.1.tar.xz";
     };
   };
   kapptemplate = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kapptemplate-15.12.0.tar.xz";
-      sha256 = "1inzkhg6acj2z3jlj04jf46xl6p9zc671j8j8mp8r2qdr6yiy0xa";
-      name = "kapptemplate-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kapptemplate-15.12.1.tar.xz";
+      sha256 = "045v0gb8gbhsnqk63zvwhmq7nncf6wd8zpbrp1s92sjkyjc7p8rn";
+      name = "kapptemplate-15.12.1.tar.xz";
     };
   };
   kate = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kate-15.12.0.tar.xz";
-      sha256 = "0vsj28xdx58sfyxjb0x03xn3d7hbwzq9rr81jwmdp3f1np1rm5xf";
-      name = "kate-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kate-15.12.1.tar.xz";
+      sha256 = "1nwg578z49pswj098awlqblxzj7a5isqg6j9fy28zdg29rzfwchx";
+      name = "kate-15.12.1.tar.xz";
     };
   };
   katomic = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/katomic-15.12.0.tar.xz";
-      sha256 = "0sgs46bqq52sy3rym5c7d4vyf20y517iykzk3c8wndg3bkmar18s";
-      name = "katomic-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/katomic-15.12.1.tar.xz";
+      sha256 = "1xvqpazmak4xdzg0wlan5ysn0xnpjqfz8c0j5vhsbglhfw8a71d6";
+      name = "katomic-15.12.1.tar.xz";
     };
   };
   kblackbox = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kblackbox-15.12.0.tar.xz";
-      sha256 = "0lphzs5fn7n8z0c0kmfpqfqv8mcgj420254csil9gsp994873hia";
-      name = "kblackbox-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kblackbox-15.12.1.tar.xz";
+      sha256 = "1dgla3c0wd1vl3yx8civn60xv10kab7nkngmclp6kw4v6f4vqk7q";
+      name = "kblackbox-15.12.1.tar.xz";
     };
   };
   kblocks = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kblocks-15.12.0.tar.xz";
-      sha256 = "1zbs48z358h35vplr32q5nhq9gp3rfmijwg2ird25mjmxwc87bi1";
-      name = "kblocks-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kblocks-15.12.1.tar.xz";
+      sha256 = "1zzdwg8bmf28r8yfjw4105j96xja30yq0aqg5cvpp0krmnr3254i";
+      name = "kblocks-15.12.1.tar.xz";
     };
   };
   kblog = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kblog-15.12.0.tar.xz";
-      sha256 = "0j6kcbzivz6ali3wyg7qyv936pvbjsf0f68xsfgci57hb4lam386";
-      name = "kblog-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kblog-15.12.1.tar.xz";
+      sha256 = "0yzi0q64szwgrda3x1w6vblfymgaqp3rq61z71fr327n8hngnpq8";
+      name = "kblog-15.12.1.tar.xz";
     };
   };
   kbounce = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kbounce-15.12.0.tar.xz";
-      sha256 = "0jgdjj7r966j1rm6vdhbdndrbiych4z1ndx5809mpxpg9b1lr427";
-      name = "kbounce-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kbounce-15.12.1.tar.xz";
+      sha256 = "18z8q2ny5m3fik4q0zi0hkqy3w87qfhbpffp9nd6vrsi3wdj013p";
+      name = "kbounce-15.12.1.tar.xz";
     };
   };
   kbreakout = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kbreakout-15.12.0.tar.xz";
-      sha256 = "1h9adxf4v0qb43avbamw73gzc3cij4i2z5z8fcznczb3gbmpp1h9";
-      name = "kbreakout-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kbreakout-15.12.1.tar.xz";
+      sha256 = "02d964h3ay2sr5xk2g2kam80w9pi8ah98k6ld3vx5l5mjs5qffib";
+      name = "kbreakout-15.12.1.tar.xz";
     };
   };
   kbruch = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kbruch-15.12.0.tar.xz";
-      sha256 = "0sr4nx9y15hkf74m86m1ghmw1i4jcvlxhbmh3d404z64yks97hv1";
-      name = "kbruch-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kbruch-15.12.1.tar.xz";
+      sha256 = "05s8ghmg562za2y7g9vqwdh4jbifz7kjd9fj45j9mjwb5rxdckpr";
+      name = "kbruch-15.12.1.tar.xz";
     };
   };
   kcachegrind = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kcachegrind-15.12.0.tar.xz";
-      sha256 = "0gkafyf9980dryvv5mdgnv3fxxxfy5smpd1x8fmgjiyp8izg5nb9";
-      name = "kcachegrind-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kcachegrind-15.12.1.tar.xz";
+      sha256 = "0v036sc9lmvc00gllyzzvlgbap3m7q2gx4m0c931iaw6sal473q0";
+      name = "kcachegrind-15.12.1.tar.xz";
     };
   };
   kcalc = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kcalc-15.12.0.tar.xz";
-      sha256 = "0ybs87g6axmp3yip4wip0cf9lvyf37nhywravpk3z3284dl9z6cx";
-      name = "kcalc-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kcalc-15.12.1.tar.xz";
+      sha256 = "1dgpifj3w26d595gbv6m4r16729i92lkwl6p8hk0l5v5hxx82dkw";
+      name = "kcalc-15.12.1.tar.xz";
     };
   };
   kcalcore = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kcalcore-15.12.0.tar.xz";
-      sha256 = "1zbfcbl8b7vmvzwi8969zcwb4ini3mxdc1q6n47hkmyl2rsradiq";
-      name = "kcalcore-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kcalcore-15.12.1.tar.xz";
+      sha256 = "14w47ljak5v5nnbcgilsqc1hxf212vi8vycfxddflvmxzcy6b9c3";
+      name = "kcalcore-15.12.1.tar.xz";
     };
   };
   kcalutils = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kcalutils-15.12.0.tar.xz";
-      sha256 = "0ya2wgvv5vkxil6xcibrp0di6k18qfll173rw3h417ykgf11q0ir";
-      name = "kcalutils-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kcalutils-15.12.1.tar.xz";
+      sha256 = "0p10vvbnn01qnaxgyinyil4dwqfbwgqk7ngkgblfbmfg9h8drwfp";
+      name = "kcalutils-15.12.1.tar.xz";
     };
   };
   kcharselect = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kcharselect-15.12.0.tar.xz";
-      sha256 = "0pllisc3p8nlzx8pgfclr28zvnwzgb3yrlbx33l09g7x0spn5whd";
-      name = "kcharselect-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kcharselect-15.12.1.tar.xz";
+      sha256 = "1jagbaxs9nfih2wic0i9cgbmz76kwnrscrmcvd0w8jg4w5rnf59d";
+      name = "kcharselect-15.12.1.tar.xz";
     };
   };
   kcolorchooser = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kcolorchooser-15.12.0.tar.xz";
-      sha256 = "0qbl18q41jhra0arfvymhxd27y7hs6bmqwzfls80l9nxa16di57c";
-      name = "kcolorchooser-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kcolorchooser-15.12.1.tar.xz";
+      sha256 = "1djcknlp97zlwvrs9fswg4v188qs2acb7lzw8y9j2p982d0g1idc";
+      name = "kcolorchooser-15.12.1.tar.xz";
     };
   };
   kcontacts = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kcontacts-15.12.0.tar.xz";
-      sha256 = "1ijh9brvgqdva168a1inj8p8z837h2sg05smzxk4f56779z43cry";
-      name = "kcontacts-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kcontacts-15.12.1.tar.xz";
+      sha256 = "0i6mx1ss19g86j55kj47qvrcvqwp6ax7wyg0ar436aa18digfa96";
+      name = "kcontacts-15.12.1.tar.xz";
     };
   };
   kcron = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kcron-15.12.0.tar.xz";
-      sha256 = "03b9zwa5fm8giynfz993y51cxpchi13k58afd6w4y19733scpc8w";
-      name = "kcron-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kcron-15.12.1.tar.xz";
+      sha256 = "04w3017y3955fj3z76ng28fksyzjbqlw09g6g6b9l8nyi5y1zgm0";
+      name = "kcron-15.12.1.tar.xz";
     };
   };
   kde-baseapps = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-baseapps-15.12.0.tar.xz";
-      sha256 = "10l7yr9jfmzb4jh59f8mdf36bvbr7da5wacyjpgvamjzcj87l5f3";
-      name = "kde-baseapps-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-baseapps-15.12.1.tar.xz";
+      sha256 = "0n0g7jjb2kf8h9nr9sc0l5ia796nc2nzlfxnibyvvlp68sj4ffwd";
+      name = "kde-baseapps-15.12.1.tar.xz";
     };
   };
   kdebugsettings = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kdebugsettings-15.12.0.tar.xz";
-      sha256 = "0n9l6pish25a4wg1bbibfngdzwyy5lyxyjj4aicvcx415j9yzicf";
-      name = "kdebugsettings-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kdebugsettings-15.12.1.tar.xz";
+      sha256 = "1b7w5rnbxg0m4xlrlisd1ipv4w0xl5125m5vxvrqdrcsl647xbk0";
+      name = "kdebugsettings-15.12.1.tar.xz";
     };
   };
   kde-dev-scripts = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-dev-scripts-15.12.0.tar.xz";
-      sha256 = "18xr7763778qmpg38avq23kaqcpyccr802wig5xy6b9dqv6jh894";
-      name = "kde-dev-scripts-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-dev-scripts-15.12.1.tar.xz";
+      sha256 = "1d2d1r11xnk3wbxgmnkm8k6azbjxz8gm0mpp37lrx5aq181i8598";
+      name = "kde-dev-scripts-15.12.1.tar.xz";
     };
   };
   kde-dev-utils = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-dev-utils-15.12.0.tar.xz";
-      sha256 = "0707skcsnw5bzk7234w6jd1kwwqi010dyq4vnajxg52kmf4592j8";
-      name = "kde-dev-utils-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-dev-utils-15.12.1.tar.xz";
+      sha256 = "1igpf4qa502nsz7rxqmv3phrlj58fgjdbamlrz9fz4czlcd4j8fb";
+      name = "kde-dev-utils-15.12.1.tar.xz";
     };
   };
   kdeedu-data = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kdeedu-data-15.12.0.tar.xz";
-      sha256 = "125rh8wmm5p9q6py1z25s22j1xfpn7dn1czd3l0s7diaygl28li3";
-      name = "kdeedu-data-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kdeedu-data-15.12.1.tar.xz";
+      sha256 = "0avpy6w5n554hxi2qhsfi8n9m1x9wf3faklqzfj650j1574n17yj";
+      name = "kdeedu-data-15.12.1.tar.xz";
     };
   };
   kdegraphics-mobipocket = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kdegraphics-mobipocket-15.12.0.tar.xz";
-      sha256 = "0jqz242p20xdwhy9ncxv2njksz4ymz9xh3zvynwljq5ixw6qjayz";
-      name = "kdegraphics-mobipocket-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kdegraphics-mobipocket-15.12.1.tar.xz";
+      sha256 = "0ya6cli7c0yh7myh00b818qydlm481cnszc39b3557iq43qrxd89";
+      name = "kdegraphics-mobipocket-15.12.1.tar.xz";
     };
   };
   kdegraphics-strigi-analyzer = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kdegraphics-strigi-analyzer-15.12.0.tar.xz";
-      sha256 = "10gqbnpmzlv2rijy6yszr92aq51bsb63ypkxxpw1r9q2yzjb974b";
-      name = "kdegraphics-strigi-analyzer-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kdegraphics-strigi-analyzer-15.12.1.tar.xz";
+      sha256 = "1i0sqdyl2fcg7v0q9c7pvk5v4klzsfphv82knapmkpvlddj7mwyz";
+      name = "kdegraphics-strigi-analyzer-15.12.1.tar.xz";
     };
   };
   kdegraphics-thumbnailers = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kdegraphics-thumbnailers-15.12.0.tar.xz";
-      sha256 = "1lns9z65596rwc9899lrkw75lq8yk4hniys4c3q114s8gvqi89i5";
-      name = "kdegraphics-thumbnailers-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kdegraphics-thumbnailers-15.12.1.tar.xz";
+      sha256 = "03fvrlk6dgj6s6dr3vvhxn9877ay3798kf156hjn9pqx4iypqhz3";
+      name = "kdegraphics-thumbnailers-15.12.1.tar.xz";
     };
   };
   kde-l10n-ar = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-ar-15.12.0.tar.xz";
-      sha256 = "1mhz3dylhndh3y8qxvmz41jq6rvya8l7bvd58m3lavbj1lx7n2ks";
-      name = "kde-l10n-ar-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-ar-15.12.1.tar.xz";
+      sha256 = "1p417hkkikggy01awyazd1njyq2bs6y1jvspd7ijr3y4w1jia78q";
+      name = "kde-l10n-ar-15.12.1.tar.xz";
     };
   };
   kde-l10n-bg = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-bg-15.12.0.tar.xz";
-      sha256 = "1lnsz222jv1n3hn6ahyyshrxn33dypfdfxrfb9kqilrlqb147pv3";
-      name = "kde-l10n-bg-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-bg-15.12.1.tar.xz";
+      sha256 = "1l2s8h2rpyp71xs8jkww6s5zi58xxizf38k5xh4jrvx9vias4cl8";
+      name = "kde-l10n-bg-15.12.1.tar.xz";
     };
   };
   kde-l10n-bs = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-bs-15.12.0.tar.xz";
-      sha256 = "1qb4axsj4832l0n6k2lrw50jjvc0pv6zs8g0yrnybpgyfmxa8157";
-      name = "kde-l10n-bs-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-bs-15.12.1.tar.xz";
+      sha256 = "10a5680bl5w30ynndf019627l235bx2v5bi5yyx27l7ki3infs86";
+      name = "kde-l10n-bs-15.12.1.tar.xz";
     };
   };
   kde-l10n-ca = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-ca-15.12.0.tar.xz";
-      sha256 = "016kqlllv3chwnryxg72p4g9n455q1xiyy5sqncpa3gw3w65c7s7";
-      name = "kde-l10n-ca-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-ca-15.12.1.tar.xz";
+      sha256 = "1841vmsf1iya41zwkcpgmcs2agc825l8mjbpmvpa5d5xyh9nsyp3";
+      name = "kde-l10n-ca-15.12.1.tar.xz";
     };
   };
   kde-l10n-ca_valencia = {
-    version = "ca_valencia-15.12.0";
+    version = "ca_valencia-15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-ca@valencia-15.12.0.tar.xz";
-      sha256 = "1prm8lsfa9a72g9av6yl3zyjbpvfp8a6bwcqs65l98zlysb7qfma";
-      name = "kde-l10n-ca_valencia-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-ca@valencia-15.12.1.tar.xz";
+      sha256 = "0yz30y1khvsng166wkq49kr17vv8y67n3cns5y6zrnq6wb7zplri";
+      name = "kde-l10n-ca_valencia-15.12.1.tar.xz";
     };
   };
   kde-l10n-cs = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-cs-15.12.0.tar.xz";
-      sha256 = "1xf1zsmw7c5rvk9557jlrm643x6wxflk3r4zg6ddgk7nxs6l1mg0";
-      name = "kde-l10n-cs-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-cs-15.12.1.tar.xz";
+      sha256 = "1vvi8mlj3sxwvpbz5fp2yhkzm1933nfmmhhfklpj264dynw6jxzm";
+      name = "kde-l10n-cs-15.12.1.tar.xz";
     };
   };
   kde-l10n-da = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-da-15.12.0.tar.xz";
-      sha256 = "033yy4p15994lraadsmhdfmz63cmp8pds65nsrmckbicb2a748id";
-      name = "kde-l10n-da-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-da-15.12.1.tar.xz";
+      sha256 = "00vy9if529za7iybb8i7xxdazd8f4y9kiy1yjpgky39yhsjp65bw";
+      name = "kde-l10n-da-15.12.1.tar.xz";
     };
   };
   kde-l10n-de = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-de-15.12.0.tar.xz";
-      sha256 = "1pl0rj1i8zkra27c36bj4qh5vpgb9x71zzx3dszx8pmb0y88mp55";
-      name = "kde-l10n-de-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-de-15.12.1.tar.xz";
+      sha256 = "0s9ibm1sjw1xa4gx36g0midy2wvc8baixaq7ldv23a56gr9ls37a";
+      name = "kde-l10n-de-15.12.1.tar.xz";
     };
   };
   kde-l10n-el = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-el-15.12.0.tar.xz";
-      sha256 = "1mza3kg2jha0c5bm0s9146yispp6rhx8z9lf0bis60ppn3zprmdi";
-      name = "kde-l10n-el-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-el-15.12.1.tar.xz";
+      sha256 = "16xfri6pv01vvxh47h0an2gy9hd38l0lvnmvq33kf60424p20iy9";
+      name = "kde-l10n-el-15.12.1.tar.xz";
     };
   };
   kde-l10n-en_GB = {
-    version = "en_GB-15.12.0";
+    version = "en_GB-15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-en_GB-15.12.0.tar.xz";
-      sha256 = "07nlriiccl1zaywycg25ai92avy3k7glmxglidkkngjrkg6pfq04";
-      name = "kde-l10n-en_GB-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-en_GB-15.12.1.tar.xz";
+      sha256 = "170hd2g8a7dafsjr35lkpc9wwiwj0gsg0bmrir3dmqjw78fkfrjw";
+      name = "kde-l10n-en_GB-15.12.1.tar.xz";
     };
   };
   kde-l10n-eo = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-eo-15.12.0.tar.xz";
-      sha256 = "0rn8vp25s4lza4x6s4i72wkilf043idq6smdn2mndzvff0bcpjy1";
-      name = "kde-l10n-eo-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-eo-15.12.1.tar.xz";
+      sha256 = "0jrhrr4rxz9qfapx2gvw8i7q17fc4zzp45q1scz0h7cvnmw087ac";
+      name = "kde-l10n-eo-15.12.1.tar.xz";
     };
   };
   kde-l10n-es = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-es-15.12.0.tar.xz";
-      sha256 = "02iamhlj3j4y6j1v7dd6scz4fffq0pn494gy8nvi343y3dbyvqvc";
-      name = "kde-l10n-es-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-es-15.12.1.tar.xz";
+      sha256 = "1f54wg365mqbcgf93rs6lay78ac9zijff0kszylzjm1k2a2vl5wj";
+      name = "kde-l10n-es-15.12.1.tar.xz";
     };
   };
   kde-l10n-et = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-et-15.12.0.tar.xz";
-      sha256 = "1j26ig05xp45g3cbgw80kz6kzi3966wb1hk3lr4w0l80y5f4ygxg";
-      name = "kde-l10n-et-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-et-15.12.1.tar.xz";
+      sha256 = "0arrgznymzv4vfc97g40b51z3szbg7y4k1nncl01w0758szrp6c0";
+      name = "kde-l10n-et-15.12.1.tar.xz";
     };
   };
   kde-l10n-eu = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-eu-15.12.0.tar.xz";
-      sha256 = "1y0lzl5y05yv21blkllipzfjcs6k1s1znz7wkk0kcmqrvmwpx1r5";
-      name = "kde-l10n-eu-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-eu-15.12.1.tar.xz";
+      sha256 = "15dpm0isgh8645qwqw5mza295hb8ls6lp2pnil1iy2lpcmsr53cr";
+      name = "kde-l10n-eu-15.12.1.tar.xz";
     };
   };
   kde-l10n-fa = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-fa-15.12.0.tar.xz";
-      sha256 = "09axzs55bnfdjwmlyanljnlcx7zb179hkc7i2179px4iywn4fcw5";
-      name = "kde-l10n-fa-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-fa-15.12.1.tar.xz";
+      sha256 = "1867bxi0bvy5dgig41z4gwghnkjgy43h4i5w65al8djf0haqyr52";
+      name = "kde-l10n-fa-15.12.1.tar.xz";
     };
   };
   kde-l10n-fi = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-fi-15.12.0.tar.xz";
-      sha256 = "141ikl2q9zhawg6ib6ppdsk03vs6fwlwzlxlg7bphfxr1nc202lw";
-      name = "kde-l10n-fi-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-fi-15.12.1.tar.xz";
+      sha256 = "1028psgc58wk5lp245jk905w54m654pmwkfj24g06jxas65pglrd";
+      name = "kde-l10n-fi-15.12.1.tar.xz";
     };
   };
   kde-l10n-fr = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-fr-15.12.0.tar.xz";
-      sha256 = "170ijawwvx6kqdph09w8kb9m7zzs6xya2f73an0qvvwz40aixvnn";
-      name = "kde-l10n-fr-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-fr-15.12.1.tar.xz";
+      sha256 = "0hi3dzd07ns8hrm7rv6hxx1b6idwmgvr3jgdmzs2883gkjivv6g8";
+      name = "kde-l10n-fr-15.12.1.tar.xz";
     };
   };
   kde-l10n-ga = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-ga-15.12.0.tar.xz";
-      sha256 = "1d3b3wqdn5n9lqdrf63la73hiacm95mbx0x9khc8navrcx17ybmv";
-      name = "kde-l10n-ga-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-ga-15.12.1.tar.xz";
+      sha256 = "1gq7j053c3lv30pmf0q2xlsazyl21jgpcr0kfmza6yrg5cxaivjb";
+      name = "kde-l10n-ga-15.12.1.tar.xz";
     };
   };
   kde-l10n-gl = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-gl-15.12.0.tar.xz";
-      sha256 = "04d74sdqgdg5rzvzg0pnk1yj4x7x0i0k6ki2npyzd9jymcasckp7";
-      name = "kde-l10n-gl-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-gl-15.12.1.tar.xz";
+      sha256 = "1pmizbmfqi95lcwbka5h87f015p3ml1vf59npkchfq6v7iv45zxf";
+      name = "kde-l10n-gl-15.12.1.tar.xz";
     };
   };
   kde-l10n-he = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-he-15.12.0.tar.xz";
-      sha256 = "1r0j7fjg3k97dhs3q8myywm9n7cn073wy05hwv3zwc8124invgyb";
-      name = "kde-l10n-he-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-he-15.12.1.tar.xz";
+      sha256 = "1kyf48hpj42hzc75r1s1js730n0gw94ldcrap3ypd1vjzg67f6wn";
+      name = "kde-l10n-he-15.12.1.tar.xz";
     };
   };
   kde-l10n-hi = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-hi-15.12.0.tar.xz";
-      sha256 = "1ki2hd2ixvyiqkldhinmidbg9gw1ivrwgynlcjx31c0aasyndbjj";
-      name = "kde-l10n-hi-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-hi-15.12.1.tar.xz";
+      sha256 = "0rarsx7y0plr1l0vh5nx4dm9xdq69wr3szcdcvlxx1xdx0f2xyxk";
+      name = "kde-l10n-hi-15.12.1.tar.xz";
     };
   };
   kde-l10n-hr = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-hr-15.12.0.tar.xz";
-      sha256 = "0skqv67jnwaw2zcnb73w5yfdpqagmx1bm1p6vrbh31ra8gc0v32b";
-      name = "kde-l10n-hr-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-hr-15.12.1.tar.xz";
+      sha256 = "15gxrrla5gwvwsx5ncf97naj9p09x3g03jbxkpzjf2vn4xgkq7wf";
+      name = "kde-l10n-hr-15.12.1.tar.xz";
     };
   };
   kde-l10n-hu = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-hu-15.12.0.tar.xz";
-      sha256 = "0hm7lwajgnvqawpabbkb7i8w39xbl8dgnb8bbfxcaz9gilhzy4in";
-      name = "kde-l10n-hu-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-hu-15.12.1.tar.xz";
+      sha256 = "15cw97fjcbqn6n6h03mldf40vjsmzzjwgb63z0qlcg5s87yl8lik";
+      name = "kde-l10n-hu-15.12.1.tar.xz";
     };
   };
   kde-l10n-ia = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-ia-15.12.0.tar.xz";
-      sha256 = "0kpj2zw1id9l9i9mhjq5wxmvx204aj1yk47yyrw6yca8mlsj3mzl";
-      name = "kde-l10n-ia-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-ia-15.12.1.tar.xz";
+      sha256 = "1ab7pivq4xbzvjwq18rnw1c7lyaz0yyhfqkkw0w31qdvh8zx91xg";
+      name = "kde-l10n-ia-15.12.1.tar.xz";
     };
   };
   kde-l10n-id = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-id-15.12.0.tar.xz";
-      sha256 = "0xwkfa5dd1bpi345aagrbimy0jkgswjvzq1wgz4n6p3d8kazyvj0";
-      name = "kde-l10n-id-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-id-15.12.1.tar.xz";
+      sha256 = "1w7s7m7p4mia0q9x32rcmdszsz0x7zw210pssw1zk3vh9dc29f1j";
+      name = "kde-l10n-id-15.12.1.tar.xz";
     };
   };
   kde-l10n-is = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-is-15.12.0.tar.xz";
-      sha256 = "0n9ikkni821lsk6l3wvk8nir4rjnyb3pfl9dw1ffqh1q62wn8z7c";
-      name = "kde-l10n-is-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-is-15.12.1.tar.xz";
+      sha256 = "0w1b8fsw3q6ry63bs27s7rbv9q5cps3kd5rd4bhkja0v950p2lfg";
+      name = "kde-l10n-is-15.12.1.tar.xz";
     };
   };
   kde-l10n-it = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-it-15.12.0.tar.xz";
-      sha256 = "0h5bjm754gcls7gnzdvdcggnvbbqx0l16902bygdh3z2gyp76avy";
-      name = "kde-l10n-it-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-it-15.12.1.tar.xz";
+      sha256 = "03cal5i75540q6vk8ln32lfg93s1hy02qnnajggm96ncpmlw1fp4";
+      name = "kde-l10n-it-15.12.1.tar.xz";
     };
   };
   kde-l10n-ja = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-ja-15.12.0.tar.xz";
-      sha256 = "0ga202v7vi262khdwplkljc1hdf9y85dk0g09wb70gc0mm52zzyg";
-      name = "kde-l10n-ja-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-ja-15.12.1.tar.xz";
+      sha256 = "1d8p2pvz5h9mr0agbazggjd363h4ggmxs35lfkc41sw2ka8wc7zk";
+      name = "kde-l10n-ja-15.12.1.tar.xz";
     };
   };
   kde-l10n-kk = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-kk-15.12.0.tar.xz";
-      sha256 = "0334ida4dhm8l6m1kqgksz68ckrfxas5b3vgnm7f4058dqvm1w6b";
-      name = "kde-l10n-kk-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-kk-15.12.1.tar.xz";
+      sha256 = "06pr04sq9szkgvgrj0saiwc5axqv09sz48alz97qvhprfi63k7gm";
+      name = "kde-l10n-kk-15.12.1.tar.xz";
     };
   };
   kde-l10n-km = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-km-15.12.0.tar.xz";
-      sha256 = "18ln6h2fiwspybiripqmglrkq81z0q4llnrqz7c7gzm1jg85k8w2";
-      name = "kde-l10n-km-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-km-15.12.1.tar.xz";
+      sha256 = "1j0jf01j12y1jsyx8n47nz5wjwk545z6wn3hp8shkf3gfrda6x8h";
+      name = "kde-l10n-km-15.12.1.tar.xz";
     };
   };
   kde-l10n-ko = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-ko-15.12.0.tar.xz";
-      sha256 = "13a8iik27klxp07m798g66r5a547py2ii914pdbrx65hzgzvxn6l";
-      name = "kde-l10n-ko-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-ko-15.12.1.tar.xz";
+      sha256 = "08hknapyy10205h71zapj3n5k46gqjjfd7acpqz85ff92l0iryxd";
+      name = "kde-l10n-ko-15.12.1.tar.xz";
     };
   };
   kde-l10n-lt = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-lt-15.12.0.tar.xz";
-      sha256 = "1ks9ywlhxzgick1iradagc78xcnfnwmcw49d3pqdjdpw6icz1xs8";
-      name = "kde-l10n-lt-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-lt-15.12.1.tar.xz";
+      sha256 = "0l844nsr0najfhfbqzwhi4pvagir9fvq2gx2p1xkfk06m1ki1krw";
+      name = "kde-l10n-lt-15.12.1.tar.xz";
     };
   };
   kde-l10n-lv = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-lv-15.12.0.tar.xz";
-      sha256 = "0l9shh6rg44qgw4lh9kp6b4rs51hn0w04dgrga0hrdm28cr1npl7";
-      name = "kde-l10n-lv-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-lv-15.12.1.tar.xz";
+      sha256 = "09pnn4m70655pn9ycqpmxlich8pih5j0kgqa64r3ip2gsw4gx5js";
+      name = "kde-l10n-lv-15.12.1.tar.xz";
     };
   };
   kde-l10n-mr = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-mr-15.12.0.tar.xz";
-      sha256 = "0liivk7bibz125hj1dcq8ilwyzhdlq7bs4adiicc26dp9r1way4c";
-      name = "kde-l10n-mr-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-mr-15.12.1.tar.xz";
+      sha256 = "1nqvacfyar88zgq1h836r6amm56qk8whr4xh7q571969qmcbz8mc";
+      name = "kde-l10n-mr-15.12.1.tar.xz";
     };
   };
   kde-l10n-nb = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-nb-15.12.0.tar.xz";
-      sha256 = "1glnp3qqrhsy7vkmljqzx8ghsl1qyvmdcpdvhnjw8rdfdss5pcx2";
-      name = "kde-l10n-nb-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-nb-15.12.1.tar.xz";
+      sha256 = "0h9w9ya8ridprsav2ypn1rl92gdkx7cdnzjhjfyb028c6mrzx2xl";
+      name = "kde-l10n-nb-15.12.1.tar.xz";
     };
   };
   kde-l10n-nds = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-nds-15.12.0.tar.xz";
-      sha256 = "1p1fm1jkic7gzw2n762yfq6w9laakx831mdgl3gdp0xgx7x8mg1q";
-      name = "kde-l10n-nds-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-nds-15.12.1.tar.xz";
+      sha256 = "0xj644sdicdqg4f5qvvmb3gzdw46rcma1bz2wr19prismswm61q4";
+      name = "kde-l10n-nds-15.12.1.tar.xz";
     };
   };
   kde-l10n-nl = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-nl-15.12.0.tar.xz";
-      sha256 = "1ki6bhw85zkgl132bf1q677r409sdvf7gfd51cj9p0fy63r87wym";
-      name = "kde-l10n-nl-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-nl-15.12.1.tar.xz";
+      sha256 = "00wimacv53ggjrccm33mm406yd501c57pkvzdvzzx6ljdq0gz3j1";
+      name = "kde-l10n-nl-15.12.1.tar.xz";
     };
   };
   kde-l10n-nn = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-nn-15.12.0.tar.xz";
-      sha256 = "1hrsk4kdk5w2bf0iplhpmajkrzflgxbwdks3vd2q5zrqkzx3ykgd";
-      name = "kde-l10n-nn-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-nn-15.12.1.tar.xz";
+      sha256 = "13cb7inz00i0cj9da3zhlbh6mb3rrya4c79ydy2gvwj5p54bdbxy";
+      name = "kde-l10n-nn-15.12.1.tar.xz";
     };
   };
   kde-l10n-pa = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-pa-15.12.0.tar.xz";
-      sha256 = "1kyqdz490ix0qm3ck2c9grqkdiqdf7aw659kvdjsh34f818ns5sq";
-      name = "kde-l10n-pa-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-pa-15.12.1.tar.xz";
+      sha256 = "1f58fnmlzgsyfmn9f2lfsla1v0ynpmg4d5x6kk8b92a6ad2an9dc";
+      name = "kde-l10n-pa-15.12.1.tar.xz";
     };
   };
   kde-l10n-pl = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-pl-15.12.0.tar.xz";
-      sha256 = "1p3z3anik2fh9wi36ag11kyk4mfv6gjx9sgkxxdzkyd2i67jig2y";
-      name = "kde-l10n-pl-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-pl-15.12.1.tar.xz";
+      sha256 = "0wfl6sgdbzwbg00c8rqj9i2avi46vdppdjk48w222j9cibf1ifwp";
+      name = "kde-l10n-pl-15.12.1.tar.xz";
     };
   };
   kde-l10n-pt = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-pt-15.12.0.tar.xz";
-      sha256 = "04slrcs6f3bbi73l51lga42srx022x00lzlmn8m2617922kag92f";
-      name = "kde-l10n-pt-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-pt-15.12.1.tar.xz";
+      sha256 = "0ljxz362ahz1r8hvvh8zliiki3jmsqzx656jn5f6g3c4xjxmmhd9";
+      name = "kde-l10n-pt-15.12.1.tar.xz";
     };
   };
   kde-l10n-pt_BR = {
-    version = "pt_BR-15.12.0";
+    version = "pt_BR-15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-pt_BR-15.12.0.tar.xz";
-      sha256 = "1n38d2p47bavmn248sdpb0w8k9kqxpas7rkh3dgnfwsjgd7bsb6g";
-      name = "kde-l10n-pt_BR-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-pt_BR-15.12.1.tar.xz";
+      sha256 = "072jn9r4sfi62mb5yh6ayisana18da0xrvdf9r2c03rhl1hlqiiq";
+      name = "kde-l10n-pt_BR-15.12.1.tar.xz";
     };
   };
   kde-l10n-ro = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-ro-15.12.0.tar.xz";
-      sha256 = "0m9lx63d0q53c3rxmznmrsyi3kpgflg8giqgspni1pkx3injzdyv";
-      name = "kde-l10n-ro-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-ro-15.12.1.tar.xz";
+      sha256 = "0pp328zj5v50paf7xgajh2l4mk75hg3am6xyiw7p94fx3m6lnw9g";
+      name = "kde-l10n-ro-15.12.1.tar.xz";
     };
   };
   kde-l10n-ru = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-ru-15.12.0.tar.xz";
-      sha256 = "0ki1cj9bngzjjqmlsi6rgbvrkxbsr53qdyfxqndbab5r76yzkjnz";
-      name = "kde-l10n-ru-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-ru-15.12.1.tar.xz";
+      sha256 = "1sg38y0778ld1cjvvm2zfn8gmav195dak52596lpzklh6ahnp9dc";
+      name = "kde-l10n-ru-15.12.1.tar.xz";
     };
   };
   kde-l10n-sk = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-sk-15.12.0.tar.xz";
-      sha256 = "1hsi3simcyc1239rjiybzv7jmcrmmc9js543s1nw9y84jn6kk78k";
-      name = "kde-l10n-sk-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-sk-15.12.1.tar.xz";
+      sha256 = "16nxrz95x558n5kqvs8q0rdy8lqas0w7zlgr910v92497hsmxmsg";
+      name = "kde-l10n-sk-15.12.1.tar.xz";
     };
   };
   kde-l10n-sl = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-sl-15.12.0.tar.xz";
-      sha256 = "0fld0lgr070w1v9830700182lslm7pmkyrxarwbf11g7a4wzsc1s";
-      name = "kde-l10n-sl-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-sl-15.12.1.tar.xz";
+      sha256 = "128jp5pis4np8734dn8j77xf2h8a8hq041gnjdlfd0yvq61pn9dk";
+      name = "kde-l10n-sl-15.12.1.tar.xz";
     };
   };
   kde-l10n-sr = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-sr-15.12.0.tar.xz";
-      sha256 = "028frgvzy000l38kpixyfxvcx9skwf9w2x5xl31172icwzyfvj28";
-      name = "kde-l10n-sr-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-sr-15.12.1.tar.xz";
+      sha256 = "0cmchn7niddx48lvjflzvqv0xlbp1fxwr492ldb8vs0l71ifsl6v";
+      name = "kde-l10n-sr-15.12.1.tar.xz";
     };
   };
   kde-l10n-sv = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-sv-15.12.0.tar.xz";
-      sha256 = "0i2qkz02nfcxi3s41as65d0m1bcp85j1024vyd0g746dy9d4qq8b";
-      name = "kde-l10n-sv-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-sv-15.12.1.tar.xz";
+      sha256 = "02sh0z394bd03m0as4n6qdk9mm8yy8z80b2xk9d42f27v6snqr29";
+      name = "kde-l10n-sv-15.12.1.tar.xz";
     };
   };
   kde-l10n-tr = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-tr-15.12.0.tar.xz";
-      sha256 = "1biw08ad87l3bpg39iz42a5chdbmarp7jq9gk6zd1z76iv930may";
-      name = "kde-l10n-tr-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-tr-15.12.1.tar.xz";
+      sha256 = "18rlg2xdif54npfi2dhw2my494pbg089r3wvl6msc17nf0c72w10";
+      name = "kde-l10n-tr-15.12.1.tar.xz";
     };
   };
   kde-l10n-ug = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-ug-15.12.0.tar.xz";
-      sha256 = "1lhmxa9k7n0za60c9l4x0k002mzgd5hyjf2y8jwh2788vd6760fq";
-      name = "kde-l10n-ug-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-ug-15.12.1.tar.xz";
+      sha256 = "1dkv3vqa66fvyksqxjdvrm6jmks07dp34934ccx9dm2kqq0nciz9";
+      name = "kde-l10n-ug-15.12.1.tar.xz";
     };
   };
   kde-l10n-uk = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-uk-15.12.0.tar.xz";
-      sha256 = "0mwmzf5zqda3py1xd6sk3wsz4636h0mg6mvd05raajiz7986bp30";
-      name = "kde-l10n-uk-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-uk-15.12.1.tar.xz";
+      sha256 = "15vl45g85f9xncn2dxz527kxig151iddf1pbh57hngdhdirz98cd";
+      name = "kde-l10n-uk-15.12.1.tar.xz";
     };
   };
   kde-l10n-wa = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-wa-15.12.0.tar.xz";
-      sha256 = "184syr1kydbykyjprpvh1mhhi31snjadjphzapcb1d656rlw99ig";
-      name = "kde-l10n-wa-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-wa-15.12.1.tar.xz";
+      sha256 = "192rb9hrfw9b525czwc33x2djjg9klm5icdx4l7jp0qsrwzdgr0g";
+      name = "kde-l10n-wa-15.12.1.tar.xz";
     };
   };
   kde-l10n-zh_CN = {
-    version = "zh_CN-15.12.0";
+    version = "zh_CN-15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-zh_CN-15.12.0.tar.xz";
-      sha256 = "1jyqcaa1xbgf27bpjwjyks93zj940j4f1i7ngs5d379w2g8jp8d1";
-      name = "kde-l10n-zh_CN-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-zh_CN-15.12.1.tar.xz";
+      sha256 = "055prxx6dspsyp3j51a8chmg6fdzl0ncjkhhyr21hlfiwv91fac0";
+      name = "kde-l10n-zh_CN-15.12.1.tar.xz";
     };
   };
   kde-l10n-zh_TW = {
-    version = "zh_TW-15.12.0";
+    version = "zh_TW-15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-zh_TW-15.12.0.tar.xz";
-      sha256 = "0wpw1shcp2bp55smcx0xxw7g7r1rd5sm9ca9zgx979mddv8gmil3";
-      name = "kde-l10n-zh_TW-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-zh_TW-15.12.1.tar.xz";
+      sha256 = "14kargm5s1vb6ylf7nrnv1s3pbjaplmbi8kr4qrggcyinda4wp74";
+      name = "kde-l10n-zh_TW-15.12.1.tar.xz";
     };
   };
   kdelibs = {
-    version = "4.14.15";
+    version = "4.14.16";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kdelibs-4.14.15.tar.xz";
-      sha256 = "0698nbih5sgkr08rrsap64kpc3vil84hzgdyara62v0wmffdr7a7";
-      name = "kdelibs-4.14.15.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kdelibs-4.14.16.tar.xz";
+      sha256 = "1amkwrwjm2v0jd1rl1n0pfi8ahvzaszj03093bmxqllrqhqbkxkv";
+      name = "kdelibs-4.14.16.tar.xz";
     };
   };
   kdenetwork-filesharing = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kdenetwork-filesharing-15.12.0.tar.xz";
-      sha256 = "03npxv2p9hy7dl6h7d1yn4f8caycgfxvgq6r8rar3lq8c170bqgj";
-      name = "kdenetwork-filesharing-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kdenetwork-filesharing-15.12.1.tar.xz";
+      sha256 = "15fj3kk76gg6vk43yiz508cks1l9yazlhmqf7s4q0b9xwmvdahsj";
+      name = "kdenetwork-filesharing-15.12.1.tar.xz";
     };
   };
   kdenetwork-strigi-analyzers = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kdenetwork-strigi-analyzers-15.12.0.tar.xz";
-      sha256 = "01axll3636r5xqzrwjwqgq8gcnm6dcbmxfr07g81wb4q479py78g";
-      name = "kdenetwork-strigi-analyzers-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kdenetwork-strigi-analyzers-15.12.1.tar.xz";
+      sha256 = "1nwckiggwrmvsdhyfmhqv1w79zcvzh4s2jyivyprvk418c1qy69b";
+      name = "kdenetwork-strigi-analyzers-15.12.1.tar.xz";
     };
   };
   kdenlive = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kdenlive-15.12.0.tar.xz";
-      sha256 = "1y7vhd0i3pw67lh20f52ngcc3japnisqgs7blf84pih7ppj4lvss";
-      name = "kdenlive-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kdenlive-15.12.1.tar.xz";
+      sha256 = "1j7mpjwis9n99dsyax7swqmx45g9mw46lcn063m0rsdzsh905yrk";
+      name = "kdenlive-15.12.1.tar.xz";
     };
   };
   kdepim = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kdepim-15.12.0.tar.xz";
-      sha256 = "0qh5iw8w3b2n1zv9c5hh0bcwrfisfk7ks0xmiqc711zc5r9a5nwh";
-      name = "kdepim-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kdepim-15.12.1.tar.xz";
+      sha256 = "0r1l3za5jbdvr4x6hv0d94d8lwa1a5qcg3q83wn1jrb6mlfc1f03";
+      name = "kdepim-15.12.1.tar.xz";
     };
   };
   kdepimlibs = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kdepimlibs-15.12.0.tar.xz";
-      sha256 = "1zyjsq8fmrs2xy1zxcpkjz70sxx7nvnvgvxnx9q2dc4ikyqf1hqr";
-      name = "kdepimlibs-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kdepimlibs-15.12.1.tar.xz";
+      sha256 = "1f5j4alzmpm4scvn6k4mg9ykdsi0b6r28h2bisq39apn0k6fzadl";
+      name = "kdepimlibs-15.12.1.tar.xz";
     };
   };
   kdepim-runtime = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kdepim-runtime-15.12.0.tar.xz";
-      sha256 = "0d9p6wvg05y54mi2aa6x6882rgk6hqr9z85iqmcd4lfsw50lp7v3";
-      name = "kdepim-runtime-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kdepim-runtime-15.12.1.tar.xz";
+      sha256 = "0l6la5jds6byg9ibphlbf8yywgfjyin4w02ik16h3mm01rl5d1mn";
+      name = "kdepim-runtime-15.12.1.tar.xz";
     };
   };
   kde-runtime = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-runtime-15.12.0.tar.xz";
-      sha256 = "1qlqqicnysqfl32rpddklv1qhy8wqnhvchl7dm62i94w50w86am6";
-      name = "kde-runtime-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-runtime-15.12.1.tar.xz";
+      sha256 = "19arkcj95dysxhanbh0armwimxph3s7ljhvgbzdi7r4glm9aq0kn";
+      name = "kde-runtime-15.12.1.tar.xz";
     };
   };
   kdesdk-kioslaves = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kdesdk-kioslaves-15.12.0.tar.xz";
-      sha256 = "1rgynw1zzn72sslgkxihrx4swx0sbz72a52smkjjhbykj10nlp54";
-      name = "kdesdk-kioslaves-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kdesdk-kioslaves-15.12.1.tar.xz";
+      sha256 = "198i8cfz194smlhj8rafmkjbgzk1wmiw1gki4mb9vvk1gddgxc65";
+      name = "kdesdk-kioslaves-15.12.1.tar.xz";
     };
   };
   kdesdk-strigi-analyzers = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kdesdk-strigi-analyzers-15.12.0.tar.xz";
-      sha256 = "0cxrrv6ry4bjhyqw8nlzin4wajqcf0rshaiq4scgb8iy5g2cpfr5";
-      name = "kdesdk-strigi-analyzers-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kdesdk-strigi-analyzers-15.12.1.tar.xz";
+      sha256 = "0lcn0b58574kwsg7j5qyf46vjkbvsl7w8y9wi983rd06dhfgql5l";
+      name = "kdesdk-strigi-analyzers-15.12.1.tar.xz";
     };
   };
   kdesdk-thumbnailers = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kdesdk-thumbnailers-15.12.0.tar.xz";
-      sha256 = "0w1lcvv2h4ndv91i4di9v5m6d9df5a8r93cblzm57z3izflpvf89";
-      name = "kdesdk-thumbnailers-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kdesdk-thumbnailers-15.12.1.tar.xz";
+      sha256 = "18fbgwb8bil90arbylw4605xk240g21saaw39zlx203q8bmnm7cm";
+      name = "kdesdk-thumbnailers-15.12.1.tar.xz";
     };
   };
   kdewebdev = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kdewebdev-15.12.0.tar.xz";
-      sha256 = "1xq0ayrnbskb0g6bmvcayfxkb6sws4vvjhv3s65im1rmsrqnrgly";
-      name = "kdewebdev-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kdewebdev-15.12.1.tar.xz";
+      sha256 = "1zmbagi1fqlr2y74hghlbs8y7kbaxx739vjhxxvd8qn4akhgij92";
+      name = "kdewebdev-15.12.1.tar.xz";
     };
   };
   kdf = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kdf-15.12.0.tar.xz";
-      sha256 = "0gahpl2la6xkhbkh607b3p07csja1v43i3m29q47f3gaxj4dxpln";
-      name = "kdf-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kdf-15.12.1.tar.xz";
+      sha256 = "0g0b2hqsls8nrwrqj78v6m38h4szsr0hs9bwfbrv63ppjm6a8272";
+      name = "kdf-15.12.1.tar.xz";
     };
   };
   kdiamond = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kdiamond-15.12.0.tar.xz";
-      sha256 = "04w7sc22cf1rvgqav2vdj1msbdggq77a8znsqgy0my2mbsqwa175";
-      name = "kdiamond-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kdiamond-15.12.1.tar.xz";
+      sha256 = "12xl2h3hcb4c7sm1v9p9cqcflqi30cfqhjj6vjwwb474pjffxfdw";
+      name = "kdiamond-15.12.1.tar.xz";
     };
   };
   kfloppy = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kfloppy-15.12.0.tar.xz";
-      sha256 = "1ihbbrrxdhgkh7nk8wmpvibxiw4a7nazw0pi88pxflbjjc4f67sn";
-      name = "kfloppy-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kfloppy-15.12.1.tar.xz";
+      sha256 = "1hrr4rfk63q4r7lbqq6nn96camcm5jq41qnvx6cm4pqqd4a8z6hp";
+      name = "kfloppy-15.12.1.tar.xz";
     };
   };
   kfourinline = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kfourinline-15.12.0.tar.xz";
-      sha256 = "1z8y1q7ij9pc5wzfhpvy16yh6c000gwhas9kq3sjhzz9qynw9bd1";
-      name = "kfourinline-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kfourinline-15.12.1.tar.xz";
+      sha256 = "1xj3krs20j3df3mkbav1nmwjaw524kif6g5qp36jipv9f58zw73g";
+      name = "kfourinline-15.12.1.tar.xz";
     };
   };
   kgeography = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kgeography-15.12.0.tar.xz";
-      sha256 = "1sj25ijc3n1xl8xmmkg784dxjcwxg4nviw89114qllbiy6q3lczh";
-      name = "kgeography-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kgeography-15.12.1.tar.xz";
+      sha256 = "0rvq9a4l4yjyk2bmlwppjmik3pfkhbxrp9105136n4vskizhrm8h";
+      name = "kgeography-15.12.1.tar.xz";
     };
   };
   kget = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kget-15.12.0.tar.xz";
-      sha256 = "0n9ah65c000x6xm04704pj6gxcgsbjfscw3gccv73vwin54y2ij5";
-      name = "kget-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kget-15.12.1.tar.xz";
+      sha256 = "1nqiw64yaz7kw58cldjjwdmlilrg9hxrlqwd2r7d0ip3mid5clkj";
+      name = "kget-15.12.1.tar.xz";
     };
   };
   kgoldrunner = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kgoldrunner-15.12.0.tar.xz";
-      sha256 = "0lril6s1m9frvkac531myg3jsx2xd1pp2ggnx0463hvfzgk73nd7";
-      name = "kgoldrunner-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kgoldrunner-15.12.1.tar.xz";
+      sha256 = "0rlhqvksyi0b79z955d3anagk5p5k4b9nikr8fsb64xzq7pjwn42";
+      name = "kgoldrunner-15.12.1.tar.xz";
     };
   };
   kgpg = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kgpg-15.12.0.tar.xz";
-      sha256 = "04y6amdjmnqg80zsrwxwixgazr3ar90a7w9mj7fiv1982xcl6wis";
-      name = "kgpg-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kgpg-15.12.1.tar.xz";
+      sha256 = "1ylns50237qr3af9i66n3v31qm6n1dd64j09smbjy6ij010ja4l3";
+      name = "kgpg-15.12.1.tar.xz";
     };
   };
   khangman = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/khangman-15.12.0.tar.xz";
-      sha256 = "1d8sf29ib1v06f4apg7g40qbf61zhgpw48pkgwxs01fdax0fahlz";
-      name = "khangman-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/khangman-15.12.1.tar.xz";
+      sha256 = "12xkqa8i53km3nwi9kzlclr29hg185pcjmsd6grzkyh3brqz40y2";
+      name = "khangman-15.12.1.tar.xz";
     };
   };
   kholidays = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kholidays-15.12.0.tar.xz";
-      sha256 = "0nclblhfjanvisn8xnis2b5y06cgk5wgqwzakywr74rffsg7nsqh";
-      name = "kholidays-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kholidays-15.12.1.tar.xz";
+      sha256 = "01ycl8j4nsc454wkk7ir5q38j4xlqcq05bgapks04s9lws1582dz";
+      name = "kholidays-15.12.1.tar.xz";
     };
   };
   kidentitymanagement = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kidentitymanagement-15.12.0.tar.xz";
-      sha256 = "04x01w4lvn07nybsivzh0a44cf9axxn7k8m1gdwhynqd4pjlsv4h";
-      name = "kidentitymanagement-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kidentitymanagement-15.12.1.tar.xz";
+      sha256 = "12adkn01h5392fqixiap62cql20sijjm23c666kabwdmji98183p";
+      name = "kidentitymanagement-15.12.1.tar.xz";
     };
   };
   kig = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kig-15.12.0.tar.xz";
-      sha256 = "00163mm6ac3njw1farwm4rml1c9pkxp0583w10siwq7sfz28kx72";
-      name = "kig-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kig-15.12.1.tar.xz";
+      sha256 = "0x3g1ipxrqvd7pxpc2kccv0r4m2qnasarjcxz6ljz3227xzcc5zf";
+      name = "kig-15.12.1.tar.xz";
     };
   };
   kigo = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kigo-15.12.0.tar.xz";
-      sha256 = "15r298wxxl2ja6awmsvdxjrkp02hb70q097ry5vg2cmbay96drkj";
-      name = "kigo-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kigo-15.12.1.tar.xz";
+      sha256 = "0b3ngl9ndgfbbihp1dikii40r8kbpi8yz9s0f4jadp6gqna6xjl5";
+      name = "kigo-15.12.1.tar.xz";
     };
   };
   killbots = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/killbots-15.12.0.tar.xz";
-      sha256 = "1kgs427jxdg7kl7vp7a4ycf2bcpr3dcbyaimyi0c77vcsa9n3jq5";
-      name = "killbots-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/killbots-15.12.1.tar.xz";
+      sha256 = "1qvy6y4rbapp2y7vd2ammbiqxxqp3dbpyy16fyd7h08639wbrl7f";
+      name = "killbots-15.12.1.tar.xz";
     };
   };
   kimap = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kimap-15.12.0.tar.xz";
-      sha256 = "0xc3dki8qxwax89ic2qxc6kwxxc45fyg6lchm0j0n1b7h2z0d1km";
-      name = "kimap-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kimap-15.12.1.tar.xz";
+      sha256 = "0q1n8p4h7n5zad0lwaawh5kb5k6z4wzdr8kbpvhlw0dkp8a504ds";
+      name = "kimap-15.12.1.tar.xz";
     };
   };
   kio-extras = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kio-extras-15.12.0.tar.xz";
-      sha256 = "0l697zllgd1myhabsj0sg4yrk1qlhap80r82im7lil48nzj9lh77";
-      name = "kio-extras-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kio-extras-15.12.1.tar.xz";
+      sha256 = "0crl21kq8ya49hhcgfcch4x9xxjakwgs90yv0qp8zj19k12kl8fn";
+      name = "kio-extras-15.12.1.tar.xz";
     };
   };
   kiriki = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kiriki-15.12.0.tar.xz";
-      sha256 = "0xfg70wd93hqzlvdaarv2nni35641gyp9in9k0fr17q7h8znpmak";
-      name = "kiriki-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kiriki-15.12.1.tar.xz";
+      sha256 = "04zyq7nmdlnskzlw0hn78hpcf8rwjq53d7imnai7gvbxgcv2qf7a";
+      name = "kiriki-15.12.1.tar.xz";
     };
   };
   kiten = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kiten-15.12.0.tar.xz";
-      sha256 = "194f85p7kg0z2jd5r229nawzqi091c4giwms99hf0dj9sl0mga3r";
-      name = "kiten-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kiten-15.12.1.tar.xz";
+      sha256 = "0wr3zr26y07m911fy6ar4n53fp8b9jvms49i9cf7qwx4dc4a0wvr";
+      name = "kiten-15.12.1.tar.xz";
     };
   };
   kjumpingcube = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kjumpingcube-15.12.0.tar.xz";
-      sha256 = "0zhl528h38x64r1mq0bjmh67487np3izcfij6d1w603mabhp146n";
-      name = "kjumpingcube-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kjumpingcube-15.12.1.tar.xz";
+      sha256 = "1xsza01v0c6d1p6ydng1pkqq8g9397x1xbzfzq3fal8l8bf1nnl7";
+      name = "kjumpingcube-15.12.1.tar.xz";
     };
   };
   kldap = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kldap-15.12.0.tar.xz";
-      sha256 = "110pfp650w2ll02xcc0wb7d0fj3bp88k4l1mnyad0xw9acsd2l8r";
-      name = "kldap-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kldap-15.12.1.tar.xz";
+      sha256 = "1dr8pavgr3hrlk0xxvfnsk9p05bzg9rgwzgqw4xci9cx22jmyaxi";
+      name = "kldap-15.12.1.tar.xz";
     };
   };
   klettres = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/klettres-15.12.0.tar.xz";
-      sha256 = "016hnl7pihikanapn79qj49q5fc3pgx7pdmqhs8v6kqic20wgrj1";
-      name = "klettres-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/klettres-15.12.1.tar.xz";
+      sha256 = "0b1sw7x3miqivryc6bq1qn5gnfm8x8ns5v8qpvq5a2j76ifwkj54";
+      name = "klettres-15.12.1.tar.xz";
     };
   };
   klickety = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/klickety-15.12.0.tar.xz";
-      sha256 = "092x764bflnwjlmw4mdzpi4q6i206axy711h3fibkdlmnir7yj9w";
-      name = "klickety-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/klickety-15.12.1.tar.xz";
+      sha256 = "1cfrn7fvrrvn9s22d8ry1nck6h0hg0l8ccdy6405wjiks9wb5jra";
+      name = "klickety-15.12.1.tar.xz";
     };
   };
   klines = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/klines-15.12.0.tar.xz";
-      sha256 = "0qs93fl1snsycbzy074xx96p5s29fjs8qwz84jz2qh1p7jb0kdn1";
-      name = "klines-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/klines-15.12.1.tar.xz";
+      sha256 = "1b0plhc79cpxag02ij5zj3ix1hg4rpsnbc272gdy6kzl2862brdd";
+      name = "klines-15.12.1.tar.xz";
     };
   };
   kmag = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kmag-15.12.0.tar.xz";
-      sha256 = "1bx65bz7j4ab3zmc4sl6j9hdp7bmr3287ly66n3bidyc9rn25w02";
-      name = "kmag-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kmag-15.12.1.tar.xz";
+      sha256 = "1j7vgzpl61b2bm4csh6y9m58451nj0d7sxvjhxbimz0vzv9hh90x";
+      name = "kmag-15.12.1.tar.xz";
     };
   };
   kmahjongg = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kmahjongg-15.12.0.tar.xz";
-      sha256 = "1m56qq98f344g9snnpfg1z26xnca6zr6av29i4fnx4p33hcbg9rx";
-      name = "kmahjongg-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kmahjongg-15.12.1.tar.xz";
+      sha256 = "1ng2495vrk7czfd1zlmij1qch6ir3vm2dfm63y8vnyf1dj39g1z3";
+      name = "kmahjongg-15.12.1.tar.xz";
     };
   };
   kmailtransport = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kmailtransport-15.12.0.tar.xz";
-      sha256 = "1v20v0cy34cpp559zcn5cbbqv6gxy60msmyar5dlyx2xxi7jrzrc";
-      name = "kmailtransport-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kmailtransport-15.12.1.tar.xz";
+      sha256 = "04c9pq16aaf1fmyy25jlnq2wcsninbr19j7ygaaiqm2scj2mikk3";
+      name = "kmailtransport-15.12.1.tar.xz";
     };
   };
   kmbox = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kmbox-15.12.0.tar.xz";
-      sha256 = "0kygxv69zcsf3zjdlnxcxbnbv2zdsx8n4z2ai4smdkwm3gp15h34";
-      name = "kmbox-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kmbox-15.12.1.tar.xz";
+      sha256 = "17ri9ay28v7f8yar8a33gx2wm99shby8bi9pj0sflxnzvawnlrwq";
+      name = "kmbox-15.12.1.tar.xz";
     };
   };
   kmime = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kmime-15.12.0.tar.xz";
-      sha256 = "1gzir5bz2rbd24hwr9v7k6ri86ga5c7l1xgyr15pzdpa4q5nr975";
-      name = "kmime-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kmime-15.12.1.tar.xz";
+      sha256 = "0r5scbsq21zhxs6c2lj0ay6sizrkyfczzjrnyv15izxh18jm7h7d";
+      name = "kmime-15.12.1.tar.xz";
     };
   };
   kmines = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kmines-15.12.0.tar.xz";
-      sha256 = "07pn7k9ls8h8xc4wap3zgrz2z0x4yf9krmb8qgjk7k5basr6bcmy";
-      name = "kmines-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kmines-15.12.1.tar.xz";
+      sha256 = "0za53gh6v74c2rwmm2f084z80w9gqrdx5g6zqdlxwiml8m9ybzq1";
+      name = "kmines-15.12.1.tar.xz";
     };
   };
   kmix = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kmix-15.12.0.tar.xz";
-      sha256 = "0cfs6xgj1yqv5ig8hx2m43a1yzjmbxkqhwj4gfpzl1anmhywmqz0";
-      name = "kmix-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kmix-15.12.1.tar.xz";
+      sha256 = "10vbb5x9hbd124avs68x39zlp7jrqww0gp2avsgvgv8hr7caxwlv";
+      name = "kmix-15.12.1.tar.xz";
     };
   };
   kmousetool = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kmousetool-15.12.0.tar.xz";
-      sha256 = "08mbjbf4i9xfadblwrviq9l3hfc2l0zpfhv1v6a1piz1cijr3zlz";
-      name = "kmousetool-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kmousetool-15.12.1.tar.xz";
+      sha256 = "16lr93v2jmj0851afiz63p317fbnfdjavi2f2j49dxd51dayxydl";
+      name = "kmousetool-15.12.1.tar.xz";
     };
   };
   kmouth = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kmouth-15.12.0.tar.xz";
-      sha256 = "1hxy6hk40s4kasv5qwhjhsq5k6lf2cfvvkwmh46rc3z7g6q02i10";
-      name = "kmouth-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kmouth-15.12.1.tar.xz";
+      sha256 = "0hfkmj3gd71fjp3fvqyv2ds42rlrgyzd1g0scrjpaql9d28g5q7f";
+      name = "kmouth-15.12.1.tar.xz";
     };
   };
   kmplot = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kmplot-15.12.0.tar.xz";
-      sha256 = "0fs5zvpfb8plpijsibqygcqhwxx9h2aqjkcfha7lpi6wscb33j21";
-      name = "kmplot-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kmplot-15.12.1.tar.xz";
+      sha256 = "1bniv6aahgmdh4kqkcvhi34jpd5i6g4q9s1gyjsfi4b65lhvb908";
+      name = "kmplot-15.12.1.tar.xz";
     };
   };
   knavalbattle = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/knavalbattle-15.12.0.tar.xz";
-      sha256 = "18idqx5nrfp3fwb1xjk1l4pf5wak1pmym87xvnwg4xbiv26gv6v9";
-      name = "knavalbattle-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/knavalbattle-15.12.1.tar.xz";
+      sha256 = "1ky6wx26l1dk244py2j59rh1yyyhdv00kv698i44w71g21g0zg2h";
+      name = "knavalbattle-15.12.1.tar.xz";
     };
   };
   knetwalk = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/knetwalk-15.12.0.tar.xz";
-      sha256 = "1h7bqh83ykjhmv6xfn2wkq6ki7p1zpf7q18rypbchlkl8qm2q992";
-      name = "knetwalk-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/knetwalk-15.12.1.tar.xz";
+      sha256 = "0zxq3rcs62q2q393b5nrf9496h0ahja7rwydgqmim0gywfnq1xk6";
+      name = "knetwalk-15.12.1.tar.xz";
     };
   };
   kolf = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kolf-15.12.0.tar.xz";
-      sha256 = "0xbxvd1zwsqxsdnidizp83fydz42700bh9zp8wr4kymf6rjr43g4";
-      name = "kolf-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kolf-15.12.1.tar.xz";
+      sha256 = "182196bjz721vxll4d1j6kflrpqnzrx2ws369p2wm7sy72md5d9s";
+      name = "kolf-15.12.1.tar.xz";
     };
   };
   kollision = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kollision-15.12.0.tar.xz";
-      sha256 = "1d4msxppm4f01dmi5lmivx7rzn070clg1gcxknf05i2kdkrfsal0";
-      name = "kollision-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kollision-15.12.1.tar.xz";
+      sha256 = "09cf6dkq499wlafdlzvgkvs4vbkz4pws1q2x1w8ayl0qg4d85a5g";
+      name = "kollision-15.12.1.tar.xz";
     };
   };
   kolourpaint = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kolourpaint-15.12.0.tar.xz";
-      sha256 = "0931r80xdwxbqja59qrr9rsmkksyr2dimak2b757klsbnmpyb9kv";
-      name = "kolourpaint-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kolourpaint-15.12.1.tar.xz";
+      sha256 = "1dnzgyd61n09ia4nvzdc94z2w82akv386kqvla85yrjyr11jcr2j";
+      name = "kolourpaint-15.12.1.tar.xz";
     };
   };
   kompare = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kompare-15.12.0.tar.xz";
-      sha256 = "1cvigjqzzf7jinw69nxhx7n87wv6wf1rchfb0mcq86bhjfc8f5fi";
-      name = "kompare-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kompare-15.12.1.tar.xz";
+      sha256 = "00mibqn1ca09z3i12ic7vkpdr48sh6ry302jmlcbbmx9pfwlnvdv";
+      name = "kompare-15.12.1.tar.xz";
     };
   };
   konquest = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/konquest-15.12.0.tar.xz";
-      sha256 = "1c87d6xjp2dz1s0r6pa7vcn5waw2m21i5z7r3mlcaj0gk4s8wmgj";
-      name = "konquest-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/konquest-15.12.1.tar.xz";
+      sha256 = "1lhfv8l2yn49bdbkh41pjdjin7g1xgy6qh5hcixvh5sizhnax3yd";
+      name = "konquest-15.12.1.tar.xz";
     };
   };
   konsole = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/konsole-15.12.0.tar.xz";
-      sha256 = "1mabhr3pm59558592gjkp6h1hsrna582lixy6rranrzh6mk9rswh";
-      name = "konsole-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/konsole-15.12.1.tar.xz";
+      sha256 = "0vpaq3081y8x0sybnnkhq6sz6gdpsl73yvzpgnbmshxr34xnn26z";
+      name = "konsole-15.12.1.tar.xz";
     };
   };
   kontactinterface = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kontactinterface-15.12.0.tar.xz";
-      sha256 = "0n934mrm8kn1b8kqf51xv9ax0b7jfi9729rvnjr0mblpj506bnzq";
-      name = "kontactinterface-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kontactinterface-15.12.1.tar.xz";
+      sha256 = "1j95qcfiwbij7l2fwls4wmpsad2mzsrzg82cdfy6wddgl86v1i1n";
+      name = "kontactinterface-15.12.1.tar.xz";
     };
   };
   kopete = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kopete-15.12.0.tar.xz";
-      sha256 = "0c3cydhaa20mcz2g8d3gcsrclfzsfwd6cqajsvh7ns5xjvkkw4g0";
-      name = "kopete-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kopete-15.12.1.tar.xz";
+      sha256 = "0cv22hx0xk2yfwbqh7dqhpdsifb63gyjng2k4zbjjgiixhyg82z8";
+      name = "kopete-15.12.1.tar.xz";
     };
   };
   kpat = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kpat-15.12.0.tar.xz";
-      sha256 = "0nqv8pmarj0lf50f6szn20j05i2c238hk2nvslbazsqjyqcadm5s";
-      name = "kpat-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kpat-15.12.1.tar.xz";
+      sha256 = "1qjrs2sblwkhb9avrjsximfshabpc0gqznhq6lwwm41i8kql261m";
+      name = "kpat-15.12.1.tar.xz";
     };
   };
   kpimtextedit = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kpimtextedit-15.12.0.tar.xz";
-      sha256 = "1gvnnfkwj3qayb500xhja1x467j3qrj9bgcjvkdrwbgg3s82pias";
-      name = "kpimtextedit-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kpimtextedit-15.12.1.tar.xz";
+      sha256 = "1qgr5bcqmlqngi1g2ylxik80pixa5nijj2ii8qvjh7wkbd7m549y";
+      name = "kpimtextedit-15.12.1.tar.xz";
     };
   };
   kppp = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kppp-15.12.0.tar.xz";
-      sha256 = "07x1603sfgxjd51dwrdwd1gwwypklbzib9wxi8r6d24f1mgiv9c1";
-      name = "kppp-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kppp-15.12.1.tar.xz";
+      sha256 = "0v03mp295h184dhx0kps7r1aygmbdyxr7yz2ab8m259pzb6mfv5l";
+      name = "kppp-15.12.1.tar.xz";
     };
   };
   kqtquickcharts = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kqtquickcharts-15.12.0.tar.xz";
-      sha256 = "1rp1kg8mm5p9h4h8n9js5l0xvvhiqbca2hbaywckr1ckwwiy16is";
-      name = "kqtquickcharts-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kqtquickcharts-15.12.1.tar.xz";
+      sha256 = "1vwx3qb8hrwn4r89a9kb8ycvgv43d94zhfi46l0a5msl94k2kigr";
+      name = "kqtquickcharts-15.12.1.tar.xz";
     };
   };
   krdc = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/krdc-15.12.0.tar.xz";
-      sha256 = "00q8lddqabbkb5lscsxq7sqny07zi1l449vhrahjxygqjivzrif8";
-      name = "krdc-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/krdc-15.12.1.tar.xz";
+      sha256 = "1vhxl6h4xjqvckl2zxhfcb633wllj1xx5dv4lwpvpqk2zpihkrli";
+      name = "krdc-15.12.1.tar.xz";
     };
   };
   kremotecontrol = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kremotecontrol-15.12.0.tar.xz";
-      sha256 = "1vlzrc9p4icw4rniwhnjqw75h7r43n70rbbjmlir2py7cxybgmip";
-      name = "kremotecontrol-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kremotecontrol-15.12.1.tar.xz";
+      sha256 = "0v59y8ilgyyjl327qf25d21z0gr7ii2p9wd985xj9lcdx2gax811";
+      name = "kremotecontrol-15.12.1.tar.xz";
     };
   };
   kreversi = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kreversi-15.12.0.tar.xz";
-      sha256 = "09zbbvpllx4q2q1x0c5m1924a7vf8m0x55qb670fnx9cgybygvdm";
-      name = "kreversi-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kreversi-15.12.1.tar.xz";
+      sha256 = "1hlh2ddxg1kcg9pmd0pmw8kwnnvv7jy45sq8dhw1wnfmqxyni5m9";
+      name = "kreversi-15.12.1.tar.xz";
     };
   };
   krfb = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/krfb-15.12.0.tar.xz";
-      sha256 = "1zi84gzy7k7rvn9z5anphgqjnv19sb4kls2gw483isc6dp5xlrm7";
-      name = "krfb-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/krfb-15.12.1.tar.xz";
+      sha256 = "1dw7jwny6qqffykdkv1ic0xb4qbn5kymxv3rpy9g0gzwgyphgg3c";
+      name = "krfb-15.12.1.tar.xz";
     };
   };
   kross-interpreters = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kross-interpreters-15.12.0.tar.xz";
-      sha256 = "0ycs9agc872l1kcbcbhibyyv8xznww8qazh5z2db1w3c0380g4hv";
-      name = "kross-interpreters-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kross-interpreters-15.12.1.tar.xz";
+      sha256 = "1lwxk5p5mb4760bwi5b10yqdrbr7vw1g4xq9g8krd9k3nz5gkkqg";
+      name = "kross-interpreters-15.12.1.tar.xz";
     };
   };
   kruler = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kruler-15.12.0.tar.xz";
-      sha256 = "1gzbsl6xw5x5kcf52gal8f07rxz2xilr541j14isp5qnl1qlym6p";
-      name = "kruler-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kruler-15.12.1.tar.xz";
+      sha256 = "0y7cli4k0hhdrsw1c0mldlrw9nh7smsayik108na5wyd10ps2yyl";
+      name = "kruler-15.12.1.tar.xz";
     };
   };
   ksaneplugin = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/ksaneplugin-15.12.0.tar.xz";
-      sha256 = "1zwdxa91j6yh5607aawg1jcn02fnp17ydf2q0fzq5211b0ly6hvf";
-      name = "ksaneplugin-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/ksaneplugin-15.12.1.tar.xz";
+      sha256 = "1fs19rs6kkh2vq5kg1i2n1650349qanw03v6wziqnar4ay243grp";
+      name = "ksaneplugin-15.12.1.tar.xz";
     };
   };
   kscd = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kscd-15.12.0.tar.xz";
-      sha256 = "1x0pw2cbkm4x9phb0j4ac9kc5w6ikvhz2a4bf5p1asidpcd0vfw0";
-      name = "kscd-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kscd-15.12.1.tar.xz";
+      sha256 = "16hzmxgc73p0n154clnyqz5hc3xliqcra37hrsbx2g0mkbm15p8g";
+      name = "kscd-15.12.1.tar.xz";
     };
   };
   kshisen = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kshisen-15.12.0.tar.xz";
-      sha256 = "1azqrg8268557wa7y4l4z667pvgk40nzn9cq5h7i2s6spqbirj1a";
-      name = "kshisen-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kshisen-15.12.1.tar.xz";
+      sha256 = "1kkzpf4dvlfaqs6f5rxabjn0n95nqxadfw1rp6aqxj0v2qb60pcp";
+      name = "kshisen-15.12.1.tar.xz";
     };
   };
   ksirk = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/ksirk-15.12.0.tar.xz";
-      sha256 = "04pyppz7pnj8ivlv2aqdjawcjlgbra7zxdsmbb1f7x1il0hdwwhy";
-      name = "ksirk-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/ksirk-15.12.1.tar.xz";
+      sha256 = "1hfq7c77y9wia4534j4cwai3xj4xn4nny9mxx6jwj9hfw6yh3lj6";
+      name = "ksirk-15.12.1.tar.xz";
     };
   };
   ksnakeduel = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/ksnakeduel-15.12.0.tar.xz";
-      sha256 = "1pmk7v8djcq3jkw77g074xi5j7sds6nn0y87vxl7fpldn7xj1msh";
-      name = "ksnakeduel-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/ksnakeduel-15.12.1.tar.xz";
+      sha256 = "0mdfv4slh2nj50jc27p2hslqxzghyv0mvx270wk2b1n53zg079q9";
+      name = "ksnakeduel-15.12.1.tar.xz";
     };
   };
   kspaceduel = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kspaceduel-15.12.0.tar.xz";
-      sha256 = "14z3wgzjdc28a4rkv99r9m4am9qprnf3m8sgdgjcvq478308z2qc";
-      name = "kspaceduel-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kspaceduel-15.12.1.tar.xz";
+      sha256 = "0wi6zcmgihw42w4hxrcwc5bq3cksgc71m4a53hqs9j3pq1lz1ykr";
+      name = "kspaceduel-15.12.1.tar.xz";
     };
   };
   ksquares = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/ksquares-15.12.0.tar.xz";
-      sha256 = "1w5z1j99gjizzd3zdym9q6frjfybyk4zjhvv8r788562j3qm1iiz";
-      name = "ksquares-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/ksquares-15.12.1.tar.xz";
+      sha256 = "0cmls8lpm271m55wflg1cbj88nvqzfawqn27nxfrg313j7n3a04b";
+      name = "ksquares-15.12.1.tar.xz";
     };
   };
   kstars = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kstars-15.12.0.tar.xz";
-      sha256 = "1qf0ir0s3bw7dxv74w88y4165s87ah8hi1ivwi4391wm1qkijm00";
-      name = "kstars-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kstars-15.12.1.tar.xz";
+      sha256 = "1jfha7s54rcs76kzw2v445k4s0qnkfdfipbylhkd0jd50a5j7wvl";
+      name = "kstars-15.12.1.tar.xz";
     };
   };
   ksudoku = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/ksudoku-15.12.0.tar.xz";
-      sha256 = "14m8alqgyc8lc4jmca3lfgw4lhigj7xy7ibyilc7d5ql9fwl8aqm";
-      name = "ksudoku-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/ksudoku-15.12.1.tar.xz";
+      sha256 = "0pm0a3b59wv30pkl50mcaqn37pmq4yjyviy2l62gbvb229sw9cl2";
+      name = "ksudoku-15.12.1.tar.xz";
     };
   };
   ksystemlog = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/ksystemlog-15.12.0.tar.xz";
-      sha256 = "1gqarafcn6j0ingkdn5mnwcv3y7rw6i564dmwjsncn3jsk4217v2";
-      name = "ksystemlog-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/ksystemlog-15.12.1.tar.xz";
+      sha256 = "0k3bwjmxs0xzxdvmq6s5sm1x84bfglf347f5bxdcfjmv95vp9bq6";
+      name = "ksystemlog-15.12.1.tar.xz";
     };
   };
   kteatime = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kteatime-15.12.0.tar.xz";
-      sha256 = "089gpi9gd0gk5pmikziz8jgzjvm2n60bmiyv13w955dsldqr04bv";
-      name = "kteatime-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kteatime-15.12.1.tar.xz";
+      sha256 = "12fjqq5n6305203b05q1lkwq7a56jynlkwykjai0yfjg2phxwa1c";
+      name = "kteatime-15.12.1.tar.xz";
     };
   };
   ktimer = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/ktimer-15.12.0.tar.xz";
-      sha256 = "1zjv9nqx8ij66r2ig7ran9wzlffiw13kyjili4mxyvlg1gq2piwc";
-      name = "ktimer-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/ktimer-15.12.1.tar.xz";
+      sha256 = "0nwjyd7z6gz45291w50qa356nlbva6mc4qa53z8jl8nqn6c74iwn";
+      name = "ktimer-15.12.1.tar.xz";
     };
   };
   ktnef = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/ktnef-15.12.0.tar.xz";
-      sha256 = "15qyvyqww4fhhwb6ms0wakvs7lxi7pgljyjw9vxc73ppmn3i69ps";
-      name = "ktnef-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/ktnef-15.12.1.tar.xz";
+      sha256 = "178r4ql1jyfk40l6s3jwabqvx5i25fzq3kv83csvd7p3y2299xbh";
+      name = "ktnef-15.12.1.tar.xz";
     };
   };
   ktouch = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/ktouch-15.12.0.tar.xz";
-      sha256 = "1yh9jdl45vq99ra9lp759c6gh4zs8s9nnb58f3kbhhqn8sphw4qx";
-      name = "ktouch-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/ktouch-15.12.1.tar.xz";
+      sha256 = "1d7nkq060h5wvjxrgsqdjhmilgaaakk48a6qnx4yv5bc0gpd47rl";
+      name = "ktouch-15.12.1.tar.xz";
     };
   };
   ktp-accounts-kcm = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/ktp-accounts-kcm-15.12.0.tar.xz";
-      sha256 = "1az0048wzq1kx2c4si4k2470mpskcan904l4biqflqsdy2zfg7rj";
-      name = "ktp-accounts-kcm-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/ktp-accounts-kcm-15.12.1.tar.xz";
+      sha256 = "1nfk33cxl278p4a3f3hiwxn25crvc0bvggfsmmkqd5m1iq1y2vid";
+      name = "ktp-accounts-kcm-15.12.1.tar.xz";
     };
   };
   ktp-approver = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/ktp-approver-15.12.0.tar.xz";
-      sha256 = "0gcyvkrpj91hvyzvgk4anj51xni6xzp9vb6cb6afp2g72nvhzqsm";
-      name = "ktp-approver-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/ktp-approver-15.12.1.tar.xz";
+      sha256 = "10h40f8hhxv5a50yby728znfsl8w3jhy4cpp3a15bl21y0javb8p";
+      name = "ktp-approver-15.12.1.tar.xz";
     };
   };
   ktp-auth-handler = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/ktp-auth-handler-15.12.0.tar.xz";
-      sha256 = "00ipr6936j0iwdy9c6r1x57was9f7g17sh5r5nb1fgdk0rfvnpm4";
-      name = "ktp-auth-handler-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/ktp-auth-handler-15.12.1.tar.xz";
+      sha256 = "00r0r46vqd4y89djmkdibb566i23nkd0viz7rfp46s35mlwlfylf";
+      name = "ktp-auth-handler-15.12.1.tar.xz";
     };
   };
   ktp-common-internals = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/ktp-common-internals-15.12.0.tar.xz";
-      sha256 = "11ad84y8x4nac9f5bqzwhmwjigdx69z2zfiwfjzxv6fjkf02gz2m";
-      name = "ktp-common-internals-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/ktp-common-internals-15.12.1.tar.xz";
+      sha256 = "0bswmvzr78amwpcrmsvpr49854rcq6c9d1g475bgwwi9h2qjajqg";
+      name = "ktp-common-internals-15.12.1.tar.xz";
     };
   };
   ktp-contact-list = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/ktp-contact-list-15.12.0.tar.xz";
-      sha256 = "0l1k1spnsf8s3h6ivamihl3bfwhy5y4f0jv44nr2qlk370ip404c";
-      name = "ktp-contact-list-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/ktp-contact-list-15.12.1.tar.xz";
+      sha256 = "1awidixqp12i29bm15vr1c6lf6m5mwqs9yvfczdvhxmq1vkniwxr";
+      name = "ktp-contact-list-15.12.1.tar.xz";
     };
   };
   ktp-contact-runner = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/ktp-contact-runner-15.12.0.tar.xz";
-      sha256 = "17vkp9idmywbrxjlrmaxkhv75iv1nqfqvmgisxdi1rv224rayif3";
-      name = "ktp-contact-runner-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/ktp-contact-runner-15.12.1.tar.xz";
+      sha256 = "0b7gj3vandgqyd27rc7cdr61l7f7ph0whq9pggfxcbly7xmhyhh1";
+      name = "ktp-contact-runner-15.12.1.tar.xz";
     };
   };
   ktp-desktop-applets = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/ktp-desktop-applets-15.12.0.tar.xz";
-      sha256 = "01pnr2nvlz1hg4s6w1xlxi42k1m53k0zlzzjjw0hzpjyjvvqybpw";
-      name = "ktp-desktop-applets-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/ktp-desktop-applets-15.12.1.tar.xz";
+      sha256 = "0h6zw79canpwlnngkn9w7qnz4jch0ksqvn2vw4vfqgy3w91dxxkj";
+      name = "ktp-desktop-applets-15.12.1.tar.xz";
     };
   };
   ktp-filetransfer-handler = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/ktp-filetransfer-handler-15.12.0.tar.xz";
-      sha256 = "0hq1jws3fknl0xsy4j4i72af0s700l065ikfcjlmqfkmr9kvgf3j";
-      name = "ktp-filetransfer-handler-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/ktp-filetransfer-handler-15.12.1.tar.xz";
+      sha256 = "13mzc2brzfxfpsqya35iyf76mllp7bhs6yjfcy4rhvazdf79p3dm";
+      name = "ktp-filetransfer-handler-15.12.1.tar.xz";
     };
   };
   ktp-kded-module = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/ktp-kded-module-15.12.0.tar.xz";
-      sha256 = "0cmgcfg3aw9dqjf6x0vb040mji4wfp8fxrs89916hhh7icavcab7";
-      name = "ktp-kded-module-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/ktp-kded-module-15.12.1.tar.xz";
+      sha256 = "1bn22k1ai2bsncim1k55nm0k0k34xkxs2cvvf4f8y4za5s0hsyix";
+      name = "ktp-kded-module-15.12.1.tar.xz";
     };
   };
   ktp-send-file = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/ktp-send-file-15.12.0.tar.xz";
-      sha256 = "1rasdrdydv5mmq2nkgb5nflklid02pbwb2kff6dfkz45xbsjirqa";
-      name = "ktp-send-file-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/ktp-send-file-15.12.1.tar.xz";
+      sha256 = "18l6il6b70bqs9ggjah2yrmbw229k8cjr8gf1kvkckwh1rv3z343";
+      name = "ktp-send-file-15.12.1.tar.xz";
     };
   };
   ktp-text-ui = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/ktp-text-ui-15.12.0.tar.xz";
-      sha256 = "1hzsgl9rcvqsadvaksiqg6cfrgds2w5pxq4s0i1swqmssxnlvnhl";
-      name = "ktp-text-ui-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/ktp-text-ui-15.12.1.tar.xz";
+      sha256 = "0ydk503b8gn84jk5l1v061g9zdi79mb5xjpa7lffgqzjippsb5y1";
+      name = "ktp-text-ui-15.12.1.tar.xz";
     };
   };
   ktuberling = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/ktuberling-15.12.0.tar.xz";
-      sha256 = "0sp4hbqi84b2ndavc19jnij76s8x06hz4sg8rjlbk3v86d7gsh7y";
-      name = "ktuberling-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/ktuberling-15.12.1.tar.xz";
+      sha256 = "1rxn6ih2jy36jisaxf8gxs6rnsdbgmbhv0xmczn74vlzfi35izja";
+      name = "ktuberling-15.12.1.tar.xz";
     };
   };
   kturtle = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kturtle-15.12.0.tar.xz";
-      sha256 = "04xa4rr03gr3qbb45ab1paq4jxq297xdg8gmg47mzl81i803hxcl";
-      name = "kturtle-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kturtle-15.12.1.tar.xz";
+      sha256 = "1d3vmkjww7zc0blc0i62jbay3mqgcccnkr6wxfabmcsz8cp062f4";
+      name = "kturtle-15.12.1.tar.xz";
     };
   };
   kubrick = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kubrick-15.12.0.tar.xz";
-      sha256 = "0p4y9q6f7l6hmk8ip84wbm30p1w8mk54i65gqb3qrbqyxgrw3bdp";
-      name = "kubrick-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kubrick-15.12.1.tar.xz";
+      sha256 = "1r2pwrj8hd5vb18m3ad72cfka6kjz9rab0nsk33sp2yg23zwrg2y";
+      name = "kubrick-15.12.1.tar.xz";
     };
   };
   kuser = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kuser-15.12.0.tar.xz";
-      sha256 = "1hhglba2jxy56aziyy45d0g5mn2fadn092j6qd81d91qpp41syf5";
-      name = "kuser-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kuser-15.12.1.tar.xz";
+      sha256 = "1qg67d6r2ng217r5f36qgqyyvy16bv1pv0xy3i35d1qpq6y7indy";
+      name = "kuser-15.12.1.tar.xz";
     };
   };
   kwalletmanager = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kwalletmanager-15.12.0.tar.xz";
-      sha256 = "1sb1dq7ngvy0mmjm2dch05d5iifw49kvvdxqz1xhycy7ld09a9nf";
-      name = "kwalletmanager-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kwalletmanager-15.12.1.tar.xz";
+      sha256 = "09801vnq6c2cq10ywg68fddwbmvly6lyaybdffw27h8cl4qkxy9f";
+      name = "kwalletmanager-15.12.1.tar.xz";
     };
   };
   kwordquiz = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kwordquiz-15.12.0.tar.xz";
-      sha256 = "0mswx58i3zcwzf8m424vsh1rck4vmbjjsy98adyyhhj0szr356sf";
-      name = "kwordquiz-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kwordquiz-15.12.1.tar.xz";
+      sha256 = "1brihl4a488nmi5s1yk4jy8bb1a5l5576j9vldh2ad9y5mqdq68d";
+      name = "kwordquiz-15.12.1.tar.xz";
     };
   };
   libkcddb = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/libkcddb-15.12.0.tar.xz";
-      sha256 = "1n40p6byankdwlm2097pnn3lx1hkxhxpr9fw4mjwc40h0185yzl7";
-      name = "libkcddb-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/libkcddb-15.12.1.tar.xz";
+      sha256 = "0y5jsimz71a8dilb3gwa8xa2r6bgfh3giwqbg0vl5xsnmq5q282k";
+      name = "libkcddb-15.12.1.tar.xz";
     };
   };
   libkcompactdisc = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/libkcompactdisc-15.12.0.tar.xz";
-      sha256 = "1wpkhm3y499wllifqvbcgfypgkl81m0xbdbmji9drvhw59bj287h";
-      name = "libkcompactdisc-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/libkcompactdisc-15.12.1.tar.xz";
+      sha256 = "1cmabgzv1lliqlc0yc3y365g5rdvqpjfs8am4179h2mr1vibvx6b";
+      name = "libkcompactdisc-15.12.1.tar.xz";
     };
   };
   libkdcraw = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/libkdcraw-15.12.0.tar.xz";
-      sha256 = "10l3il1slpwk2djkgv5sh6mfv866mjlv7y799g2qx1kns6pkzf9k";
-      name = "libkdcraw-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/libkdcraw-15.12.1.tar.xz";
+      sha256 = "0gl1a5dk63jmdh7ip8b1z8179daz1hx0w0p2pqgyklaxg883r88v";
+      name = "libkdcraw-15.12.1.tar.xz";
     };
   };
   libkdeedu = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/libkdeedu-15.12.0.tar.xz";
-      sha256 = "07i5ibd1p0sxqhv4rc6hl88198nvnrxwhkfd36rfg44n3353gdvi";
-      name = "libkdeedu-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/libkdeedu-15.12.1.tar.xz";
+      sha256 = "1fp41cx2gsdax8iqx2kw790i8j718q46ss4c5zhxagshnkd3czmz";
+      name = "libkdeedu-15.12.1.tar.xz";
     };
   };
   libkdegames = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/libkdegames-15.12.0.tar.xz";
-      sha256 = "1x3303lpks1bh5bpj4slhlqs1b2ajrdwgsipqxvy96qpdbj00lvv";
-      name = "libkdegames-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/libkdegames-15.12.1.tar.xz";
+      sha256 = "003ypjiqi3mk00a6iv9d8nf6d4kq7l6nflgwf0d3sq0y4cbkix0m";
+      name = "libkdegames-15.12.1.tar.xz";
     };
   };
   libkeduvocdocument = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/libkeduvocdocument-15.12.0.tar.xz";
-      sha256 = "0vpa5f3wgvxw2ib5sfngnl1wj1f8z1xq4qrgxs3qhfcl5ci4mcfz";
-      name = "libkeduvocdocument-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/libkeduvocdocument-15.12.1.tar.xz";
+      sha256 = "0v1ssh4m59kb7b82r06fwgb0cmj9xm5yy9vcrmhs1167l1s8vr6w";
+      name = "libkeduvocdocument-15.12.1.tar.xz";
     };
   };
   libkexiv2 = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/libkexiv2-15.12.0.tar.xz";
-      sha256 = "0gmaris7jjcq8990ccahs00k9yrik077kppxjh4l41ipr3g3kwn2";
-      name = "libkexiv2-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/libkexiv2-15.12.1.tar.xz";
+      sha256 = "1z4z77psaiqwh62spsvqpkd21agsfjjrpaiiqdaxinsimw5pagb0";
+      name = "libkexiv2-15.12.1.tar.xz";
     };
   };
   libkface = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/libkface-15.12.0.tar.xz";
-      sha256 = "0zdvwzna9x9d9fdzs7nzrqsfiq6z2f11aj97xl3lhfryqcbwdfyj";
-      name = "libkface-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/libkface-15.12.1.tar.xz";
+      sha256 = "0x6pz72vxmrsncc0kkwdaci9i9nxkdqkdklwlg7q4wbn8kxxa8n6";
+      name = "libkface-15.12.1.tar.xz";
     };
   };
   libkgeomap = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/libkgeomap-15.12.0.tar.xz";
-      sha256 = "0l4pfv5a2nq4s4m8xp0s08khlvzd97pfjr6ghlx4wrcygnsqwwy7";
-      name = "libkgeomap-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/libkgeomap-15.12.1.tar.xz";
+      sha256 = "127flkwgkmcdkd40ccrvxmyq2nzb1jshpj79pjyhwirh9iqbw773";
+      name = "libkgeomap-15.12.1.tar.xz";
     };
   };
   libkipi = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/libkipi-15.12.0.tar.xz";
-      sha256 = "047ga97fapnk39xcz41c4l6hdvxh4f0zjajl9ll116c20whbi8g1";
-      name = "libkipi-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/libkipi-15.12.1.tar.xz";
+      sha256 = "0x14adzkla7cpiwbs75n87x5gb8ifcby1zkw2f2i69g6w9x8nnps";
+      name = "libkipi-15.12.1.tar.xz";
     };
   };
   libkmahjongg = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/libkmahjongg-15.12.0.tar.xz";
-      sha256 = "0dgvxc2v48j17n0b547h74w9g8v7n975szzr3bgwkxljkcw99zgc";
-      name = "libkmahjongg-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/libkmahjongg-15.12.1.tar.xz";
+      sha256 = "1q04c91j78hzk5x7iiwxkn2is3c5cy7wca1wmxlbqbw3q3zc5jlh";
+      name = "libkmahjongg-15.12.1.tar.xz";
     };
   };
   libkomparediff2 = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/libkomparediff2-15.12.0.tar.xz";
-      sha256 = "1spxzl7a6blyfwndissf489dixndycwigcpav5qfdav00s20vbdx";
-      name = "libkomparediff2-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/libkomparediff2-15.12.1.tar.xz";
+      sha256 = "0vkndb5l5lv50id8fik6zbg0ph5mv0kmcxz6ywh2i6mh3nf5h0m2";
+      name = "libkomparediff2-15.12.1.tar.xz";
     };
   };
   libksane = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/libksane-15.12.0.tar.xz";
-      sha256 = "1262gvy61a07vgam4ws6vjy7q0d7pz9q05d24bcy0dqi6wvlsbwp";
-      name = "libksane-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/libksane-15.12.1.tar.xz";
+      sha256 = "112w0hpnq4rzp40rq68wjdkx0w2p06z1chxribgh032wh09j21by";
+      name = "libksane-15.12.1.tar.xz";
     };
   };
   lokalize = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/lokalize-15.12.0.tar.xz";
-      sha256 = "0nmqp78a2amgyiisvhqcpxjrvv1p3ssx4wg3gyqz9rw5x7yzh1v7";
-      name = "lokalize-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/lokalize-15.12.1.tar.xz";
+      sha256 = "0ldmw4rgli64dq4xllxbrgvc8wz52a5xhmbcb7m31yr7vpsav533";
+      name = "lokalize-15.12.1.tar.xz";
     };
   };
   lskat = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/lskat-15.12.0.tar.xz";
-      sha256 = "0nwbsfz6hi20rv8w1hm4lblwifmnyvdyv9icn5z8hlqf2wz0kn73";
-      name = "lskat-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/lskat-15.12.1.tar.xz";
+      sha256 = "116vfahyh65bhfp8z5ay2xj8gb7s935d3cbd4f9ppidva493lpvp";
+      name = "lskat-15.12.1.tar.xz";
     };
   };
   marble = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/marble-15.12.0.tar.xz";
-      sha256 = "01hdndic1k5f6fr75152adi0ph8q0ypxhj15yr02l7i2lcwzk9va";
-      name = "marble-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/marble-15.12.1.tar.xz";
+      sha256 = "15zybdm28a0q3nanv43y5g3xbl2gpi19fdx1smslypkz33srfwlm";
+      name = "marble-15.12.1.tar.xz";
     };
   };
   mplayerthumbs = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/mplayerthumbs-15.12.0.tar.xz";
-      sha256 = "0ghqfcys8qkr7jm5g7i4753bisg6ah36f0i3bm437r27gf8jy2xk";
-      name = "mplayerthumbs-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/mplayerthumbs-15.12.1.tar.xz";
+      sha256 = "16wgsg3s0a0mcn1p3ixy8xw8qci082qq415hcy4vr1ycbxzypcd0";
+      name = "mplayerthumbs-15.12.1.tar.xz";
     };
   };
   okteta = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/okteta-15.12.0.tar.xz";
-      sha256 = "01fa1ai0c6ifh8gjzhv9jrmpr43h84bj17m22g8z3aa0yci25mfq";
-      name = "okteta-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/okteta-15.12.1.tar.xz";
+      sha256 = "1fzk1qlsxw5mkvk5sbzaxs902waagf9i8rggis00c6cpgd2il75q";
+      name = "okteta-15.12.1.tar.xz";
     };
   };
   okular = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/okular-15.12.0.tar.xz";
-      sha256 = "17bbns5r43h05say0drqyc9w1lfm8vwsqrknaj16cgd2kz23rxwq";
-      name = "okular-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/okular-15.12.1.tar.xz";
+      sha256 = "17d2xhwdlqf2jcx34hh0l7gj3n3lpidv9wha8xp2vww8hibmdmn3";
+      name = "okular-15.12.1.tar.xz";
     };
   };
   palapeli = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/palapeli-15.12.0.tar.xz";
-      sha256 = "18c70brh5gw2rnl4xwxa32avcyv5nmj8q2l826ah9gbx74y0ffjw";
-      name = "palapeli-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/palapeli-15.12.1.tar.xz";
+      sha256 = "1kq06xi6d6f47chzzcknr1v1jd3pajzg7s45zc78sfwvq1lkcwpj";
+      name = "palapeli-15.12.1.tar.xz";
     };
   };
   parley = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/parley-15.12.0.tar.xz";
-      sha256 = "0sj5mgbj77p0kj1nylnrjr010nw53a0x3lqfbhxmv09bhszpfnqs";
-      name = "parley-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/parley-15.12.1.tar.xz";
+      sha256 = "1imkxanm5nzjkvgyskj3bcnn7rz7hwggspg3iyq75vmrqvmnd17y";
+      name = "parley-15.12.1.tar.xz";
     };
   };
   picmi = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/picmi-15.12.0.tar.xz";
-      sha256 = "02p2c14bis99f1ylkdclk95awx6b87n2ln555dyy2m3sf7pjdllg";
-      name = "picmi-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/picmi-15.12.1.tar.xz";
+      sha256 = "0ka8ksq2v7j313i0iki07d2rn6d0ga7qi5zmwvz0c7c0yk1ndpd0";
+      name = "picmi-15.12.1.tar.xz";
     };
   };
   poxml = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/poxml-15.12.0.tar.xz";
-      sha256 = "0l5y2a68yikwjp83c65wyb589yf6jxlj3432wcrj3zkx46l8rwd0";
-      name = "poxml-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/poxml-15.12.1.tar.xz";
+      sha256 = "08qyhw1x4lf5lgbi55cdvvlizbfjjrg2xncgnnvcc2xvs0vbsdrx";
+      name = "poxml-15.12.1.tar.xz";
     };
   };
   print-manager = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/print-manager-15.12.0.tar.xz";
-      sha256 = "09vfs3gj46asyqq1dxwil4rvd7pm0svbq4kfj76s0b4likmwn34b";
-      name = "print-manager-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/print-manager-15.12.1.tar.xz";
+      sha256 = "0n11ras6zk68zb901jwg5dkay04cl4qwplh57yvcvkaqzp7dx29h";
+      name = "print-manager-15.12.1.tar.xz";
     };
   };
   rocs = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/rocs-15.12.0.tar.xz";
-      sha256 = "1sgf2ppiwj7yn1yc08lvrd0pfrdfyaxjm1hm5c7mbz2bfz48mv6v";
-      name = "rocs-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/rocs-15.12.1.tar.xz";
+      sha256 = "1car9wdw3jrnczcws8hp15nky6fm04asqh6z64v1x46xpgqq15s8";
+      name = "rocs-15.12.1.tar.xz";
     };
   };
   signon-kwallet-extension = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/signon-kwallet-extension-15.12.0.tar.xz";
-      sha256 = "17wwdxyv7w8y7v6kl23czg1ffbhx9yv5siln923zw52wvfd23gwb";
-      name = "signon-kwallet-extension-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/signon-kwallet-extension-15.12.1.tar.xz";
+      sha256 = "1s96924sahamdiw6gs42c7f6fmxacccy0x7a7vcm25jrdw2y8rny";
+      name = "signon-kwallet-extension-15.12.1.tar.xz";
     };
   };
   spectacle = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/spectacle-15.12.0.tar.xz";
-      sha256 = "0ynffi4k52g1wgdqgswdn4q48zv2z2wa9k7l34m2kqs4qlwlffrh";
-      name = "spectacle-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/spectacle-15.12.1.tar.xz";
+      sha256 = "0ikv29g85fzk4k84a3p56krsabg92na1kc3r1dvg6vmhprr5ar0y";
+      name = "spectacle-15.12.1.tar.xz";
     };
   };
   step = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/step-15.12.0.tar.xz";
-      sha256 = "050nk1kqwjl687x2fd1zslpsjibkq6qsjl61naslrp58xsvninnl";
-      name = "step-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/step-15.12.1.tar.xz";
+      sha256 = "0g85cwr4ixh254i75af0pvqs6rp9zmzifnn8757dmqb0z0l31l9r";
+      name = "step-15.12.1.tar.xz";
     };
   };
   svgpart = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/svgpart-15.12.0.tar.xz";
-      sha256 = "01lib7f7nngypxj3fz367fa4hikfh3v03405idsrqb80fm1jwwjr";
-      name = "svgpart-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/svgpart-15.12.1.tar.xz";
+      sha256 = "1l86kvgrjbhyqaldw3cdm483lc1j9lrf8rif059qnq20r35llfp0";
+      name = "svgpart-15.12.1.tar.xz";
     };
   };
   sweeper = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/sweeper-15.12.0.tar.xz";
-      sha256 = "0p5lz1zzxsvy0frjzjhn1g8z60qy8ffb69qy6gnkzm5qz2b7c0gc";
-      name = "sweeper-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/sweeper-15.12.1.tar.xz";
+      sha256 = "1ykk3msicf71p3p9y6135hdrv3szjfv9khb0bl2nzqg2i28psdad";
+      name = "sweeper-15.12.1.tar.xz";
     };
   };
   syndication = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/syndication-15.12.0.tar.xz";
-      sha256 = "1awsqsz2603iik7qajv8m19ygyyj16i5iyz24cp2dabxy5zhhn4i";
-      name = "syndication-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/syndication-15.12.1.tar.xz";
+      sha256 = "1kq97rid82dv70ii4imh6aq1bwc2i0x7yzw95g855khxbd485a1m";
+      name = "syndication-15.12.1.tar.xz";
     };
   };
   umbrello = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/umbrello-15.12.0.tar.xz";
-      sha256 = "09lkqdialqvx3qgj25gx3wqyz2qfwgy27ahmlac0zg7grjpf0gf9";
-      name = "umbrello-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/umbrello-15.12.1.tar.xz";
+      sha256 = "1qxqkqvkp19vj8zkl39cwn077sncl3wqkgv0a1a16cdxhhvfbf23";
+      name = "umbrello-15.12.1.tar.xz";
     };
   };
   zeroconf-ioslave = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/zeroconf-ioslave-15.12.0.tar.xz";
-      sha256 = "1mly8j549yd1azc5g5clglypbadxngzml75wvi2irvwsvmzwshf7";
-      name = "zeroconf-ioslave-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/zeroconf-ioslave-15.12.1.tar.xz";
+      sha256 = "0q9q1vj62h3lw0451csg4sa2cgm9h5r9jxbgn8yg4xa31vx1cw03";
+      name = "zeroconf-ioslave-15.12.1.tar.xz";
     };
   };
 }

From 7a81d470233bb96503b9a3d55a2eb690f8ad99f8 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Fri, 4 Sep 2015 14:05:03 +0300
Subject: [PATCH 618/884] xfstests: init at 2016-01-11

---
 pkgs/tools/misc/xfstests/default.nix | 86 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 +
 2 files changed, 88 insertions(+)
 create mode 100644 pkgs/tools/misc/xfstests/default.nix

diff --git a/pkgs/tools/misc/xfstests/default.nix b/pkgs/tools/misc/xfstests/default.nix
new file mode 100644
index 000000000000..b7c1795c0372
--- /dev/null
+++ b/pkgs/tools/misc/xfstests/default.nix
@@ -0,0 +1,86 @@
+{ stdenv, acl, attr, autoreconfHook, bash, bc, coreutils, e2fsprogs, fetchgit, fio, gawk
+, lib, libaio, libcap_progs, libuuid, libxfs, lvm2, openssl, perl, procps, psmisc, su
+, time, utillinux, which, writeScript, xfsprogs }:
+
+stdenv.mkDerivation {
+  name = "xfstests-2016-01-11";
+
+  src = fetchgit {
+    url = "git://oss.sgi.com/xfs/cmds/xfstests.git";
+    rev = "dfe582dd396f16ddce1909baab7376e00af07792";
+    sha256 = "0hbgccmhcxn5nm87nq13kpi3rcbjadlj65kd03bfjqxhm4gx732q";
+  };
+
+  buildInputs = [ acl autoreconfHook attr gawk libaio libuuid libxfs openssl perl ];
+
+  patchPhase = ''
+    # Patch the destination directory
+    sed -i include/builddefs.in -e "s|^PKG_LIB_DIR\s*=.*|PKG_LIB_DIR=$out/lib/xfstests|"
+
+    # Don't canonicalize path to mkfs (in util-linux) - otherwise e.g. mkfs.ext4 isn't found
+    sed -i common/config -e 's|^export MKFS_PROG=.*|export MKFS_PROG=mkfs|'
+
+    for f in common/* tools/* tests/*/*; do
+      sed -i $f -e 's|/bin/bash|${bash}/bin/bash|'
+      sed -i $f -e 's|/bin/true|true|'
+      sed -i $f -e 's|/usr/sbin/filefrag|${e2fsprogs}/bin/filefrag|'
+      sed -i $f -e 's|hostname -s|hostname|'   # `hostname -s` seems problematic on NixOS
+      sed -i $f -e 's|$(_yp_active)|1|'        # NixOS won't ever have Yellow Pages enabled
+    done
+
+    for f in src/*.c src/*.sh; do
+      sed -e 's|/bin/rm|${coreutils}/bin/rm|' -i $f
+      sed -e 's|/usr/bin/time|${time}/bin/time|' -i $f
+    done
+
+    patchShebangs .
+  '';
+
+  preConfigure = ''
+    # The configure scripts really don't like looking in PATH at all...
+    export AWK=$(type -P awk)
+    export ECHO=$(type -P sort)
+    export LIBTOOL=$(type -P libtool)
+    export MAKE=$(type -P make)
+    export SED=$(type -P sed)
+    export SORT=$(type -P sort)
+  '';
+
+  postInstall = ''
+    patchShebangs $out/lib/xfstests
+
+    mkdir -p $out/bin
+    substitute $wrapperScript $out/bin/xfstests-check --subst-var out
+    chmod a+x $out/bin/xfstests-check
+  '';
+
+  # The upstream package is pretty hostile to packaging; it looks up
+  # various paths relative to current working directory, and also
+  # wants to write temporary files there. So create a temporary
+  # to run from and symlink the runtime files to it.
+  wrapperScript = writeScript "xfstests-check" ''
+    #!/bin/sh
+    set -e
+    export RESULT_BASE="$(pwd)/results"
+
+    dir=$(mktemp --tmpdir -d xfstests.XXXXXX)
+    trap "rm -rf $dir" EXIT
+
+    chmod a+rx "$dir"
+    cd "$dir"
+    for f in check common ltp src tests; do
+      ln -s @out@/lib/xfstests/$f $f
+    done
+
+    export PATH=${lib.makeSearchPath "bin" [acl attr bc e2fsprogs fio gawk libcap_progs lvm2 perl procps psmisc su utillinux which xfsprogs]}:$PATH
+    exec ./check "$@"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Torture test suite for filesystems";
+    homepage = "http://oss.sgi.com/cgi-bin/gitweb.cgi?p=xfs/cmds/xfstests.git";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.dezgeg ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2799aeed4c2b..5a3a13dc32d1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3530,6 +3530,8 @@ let
 
   xbrightness = callPackage ../tools/X11/xbrightness { };
 
+  xfstests = callPackage ../tools/misc/xfstests { };
+
   xprintidle-ng = callPackage ../tools/X11/xprintidle-ng {};
 
   xsettingsd = callPackage ../tools/X11/xsettingsd { };

From 0d021828432be2c7680b832ff20dd4491a10ae4b Mon Sep 17 00:00:00 2001
From: Slawomir Gonet <slawek@otwiera.cz>
Date: Thu, 7 Jan 2016 11:13:23 +0100
Subject: [PATCH 619/884] utox, libutoxcore and filter_audio version bump

---
 .../instant-messengers/utox/default.nix       | 25 +++++++++++--------
 .../libraries/libtoxcore/new-api/default.nix  |  6 ++---
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix
index 17a7f11cccea..61b7e8ec5105 100644
--- a/pkgs/applications/networking/instant-messengers/utox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/utox/default.nix
@@ -1,35 +1,38 @@
-{ stdenv, fetchFromGitHub, pkgconfig, libtoxcore, dbus, libvpx, libX11, openal, freetype, libv4l
-, libXrender, fontconfig, libXext, libXft }:
+{ stdenv, fetchFromGitHub, pkgconfig, libtoxcore-dev, dbus, libvpx, libX11, openal, freetype, libv4l
+, libXrender, fontconfig, libXext, libXft, utillinux, git, libsodium }:
 
 let
 
   filteraudio = stdenv.mkDerivation rec {
-    name = "filter_audio-20150128";
+    name = "filter_audio-20150516";
 
     src = fetchFromGitHub {
       owner = "irungentoo";
       repo = "filter_audio";
-      rev = "76428a6cda";
-      sha256 = "0c4wp9a7dzbj9ykfkbsxrkkyy0nz7vyr5map3z7q8bmv9pjylbk9";
+      rev = "612c5a102550c614e4c8f859e753ea64c0b7250c";
+      sha256 = "0bmf8dxnr4vb6y36lvlwqd5x68r4cbsd625kbw3pypm5yqp0n5na";
     };
 
+    buildInputs = [ utillinux ];
+
     doCheck = false;
 
     makeFlags = "PREFIX=$(out)";
   };
 
 in stdenv.mkDerivation rec {
-  name = "utox-dev-20150130";
+  name = "utox-dev-20151220";
 
   src = fetchFromGitHub {
-    owner = "notsecure";
+    owner = "GrayHatter";
     repo = "uTox";
-    rev = "cb7b8d09b08";
-    sha256 = "0vg9h07ipwyf7p54p43z9bcymy0skiyjbm7zvyjg7r5cvqxv1vpa";
+    rev = "7e2907470835746b6819d631b48dd54bc9c4de66";
+    sha256 = "074wa0np8hyqwy9xqgyyds94pdfv2i1jh019m98d8apxc5vn36wk";
   };
 
-  buildInputs = [ pkgconfig libtoxcore dbus libvpx libX11 openal freetype
-                  libv4l libXrender fontconfig libXext libXft filteraudio ];
+  buildInputs = [ pkgconfig libtoxcore-dev dbus libvpx libX11 openal freetype
+                  libv4l libXrender fontconfig libXext libXft filteraudio 
+                  git libsodium ];
 
   doCheck = false;
   
diff --git a/pkgs/development/libraries/libtoxcore/new-api/default.nix b/pkgs/development/libraries/libtoxcore/new-api/default.nix
index 42f81cf6a9d2..b0e3a09c0b48 100644
--- a/pkgs/development/libraries/libtoxcore/new-api/default.nix
+++ b/pkgs/development/libraries/libtoxcore/new-api/default.nix
@@ -2,13 +2,13 @@
 , libvpx, check, libconfig, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "tox-core-dev-20150629";
+  name = "tox-core-dev-20160105";
 
   src = fetchFromGitHub {
     owner  = "irungentoo";
     repo   = "toxcore";
-    rev    = "219fabc0f5dbaac7968cb7728d25dface3ebb2ea";
-    sha256 = "1rsnxa5b7i2zclx0kzbf4a5mds0jfkvfjz1s4whzk7rf8w3vpqkh";
+    rev    = "b9ef24875ce1d9bf5f04f0164ae95f729330a295";
+    sha256 = "0hxwp4nk5an3a2pmha6x2729mxm57j52vnrsq47gir31c0hk6x2x";
   };
 
   NIX_LDFLAGS = "-lgcc_s";

From 8b7d28251ae61d47a2b4f74426516fafee9adf52 Mon Sep 17 00:00:00 2001
From: Slawomir Gonet <slawek@otwiera.cz>
Date: Sun, 10 Jan 2016 09:45:27 +0100
Subject: [PATCH 620/884] qtsvg dependency added for qtox

---
 .../applications/networking/instant-messengers/qtox/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix
index 0a7b44ba8cbc..8ea9d104c7fc 100644
--- a/pkgs/applications/networking/instant-messengers/qtox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   buildInputs =
     [
       libtoxcore-dev openal opencv libsodium filter-audio
-      qtbase qttools libXScrnSaver glib gtk2 cairo
+      qtbase qttools qtsvg libXScrnSaver glib gtk2 cairo
       pango atk qrencode ffmpeg qttranslations makeWrapper
     ];
 

From efeffdbdc00adbbd9839c71b7e20e02d2ff62047 Mon Sep 17 00:00:00 2001
From: Slawomir Gonet <slawek@otwiera.cz>
Date: Tue, 12 Jan 2016 20:04:14 +0100
Subject: [PATCH 621/884] qTox updated due to bug with A/V subsystem

---
 .../networking/instant-messengers/qtox/default.nix       | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix
index 8ea9d104c7fc..72619e417adb 100644
--- a/pkgs/applications/networking/instant-messengers/qtox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix
@@ -1,19 +1,19 @@
 { stdenv, fetchgit, pkgconfig, libtoxcore-dev, openal, opencv,
   libsodium, libXScrnSaver, glib, gdk_pixbuf, gtk2, cairo,
   pango, atk, qrencode, ffmpeg, filter-audio, makeWrapper,
-  qtbase, qtsvg, qttools, qttranslations }:
+  qtbase, qtsvg, qttools, qttranslations, sqlcipher }:
 
 let
-  revision = "1673b43e26c853f6446f228fec083af166cbf446";
+  revision = "8b671916abdcc1d553a367a502b23ec4ea7568a1";
 in
 
 stdenv.mkDerivation rec {
-  name = "qtox-dev-20150925";
+  name = "qtox-dev-20151221";
 
   src = fetchgit {
       url = "https://github.com/tux3/qTox.git";
       rev = "${revision}";
-      md5 = "785f5b305cdcdf777d93ee823a5b9f49";
+      md5 = "a93a63d35e506be4b21abda0986f19e7";
   };
 
   buildInputs =
@@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
       libtoxcore-dev openal opencv libsodium filter-audio
       qtbase qttools qtsvg libXScrnSaver glib gtk2 cairo
       pango atk qrencode ffmpeg qttranslations makeWrapper
+      sqlcipher
     ];
 
   nativeBuildInputs = [ pkgconfig ];

From 3a6c354094392c5aed8d785ac1794f57777673c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Tue, 12 Jan 2016 21:37:36 +0100
Subject: [PATCH 622/884] i2pd: 2.2.0 -> 2.3.0

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

diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix
index a11f0347ce56..ff41beaeb05b 100644
--- a/pkgs/tools/networking/i2pd/default.nix
+++ b/pkgs/tools/networking/i2pd/default.nix
@@ -4,13 +4,13 @@ stdenv.mkDerivation rec {
 
   name = pname + "-" + version;
   pname = "i2pd";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "PurpleI2P";
     repo = pname;
     rev = version;
-    sha256 = "0slrfmgrf9b689wpsdpvsnmhbqsygcy558dz259k6xcf50f7lfqh";
+    sha256 = "0gb6bdsyb7m0jkilln9h7z2l8gr8ia10jah17ygc15jzycygijis";
   };
 
   buildInputs = [ boost zlib openssl ];

From 376e842c228c6bd5a8b328cbdea035f6874dbccf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Tue, 12 Jan 2016 21:38:58 +0100
Subject: [PATCH 623/884] kodiPlugins.svtplay: 4.0.18 -> 4.0.21

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

diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix
index b02ab0eb8a96..db7b56e51b33 100644
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/pkgs/applications/video/kodi/plugins.nix
@@ -96,13 +96,14 @@ in
 
     plugin = "svtplay";
     namespace = "plugin.video.svtplay";
-    version = "4.0.18";
+    version = "4.0.21";
 
     src = fetchFromGitHub {
+      name = plugin + "-" + version + ".tar.gz";
       owner = "nilzen";
       repo = "xbmc-" + plugin;
-      rev = "b60cc1164d0077451be935d0d1a26f2d29b0f589";
-      sha256 = "0rdmrgjlzhnrpmhgqvf2947i98s51r0pjbnwrhw67nnqkylss5dj";
+      rev = "1fb099dcddc65e58ca8691d19de657321b1b1fc2";
+      sha256 = "178krh8kzll7cprqwyhydb41b1jh961av875bm5yfdlplzaiynm0";
     };
 
     meta = with stdenv.lib; {

From 32a36e8a6a7fc807c8f3765946be1257f976f24d Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Tue, 12 Jan 2016 22:36:15 +0100
Subject: [PATCH 624/884] tigervnc: git-20150504 -> 1.6.0

---
 pkgs/tools/admin/tigervnc/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix
index f2c18bd7f942..db88f30a205c 100644
--- a/pkgs/tools/admin/tigervnc/default.nix
+++ b/pkgs/tools/admin/tigervnc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, libX11, libXext, gettext, libICE, libXtst, libXi, libSM, xorgserver
+{ stdenv, fetchFromGitHub, libX11, libXext, gettext, libICE, libXtst, libXi, libSM, xorgserver
 , autoconf, automake, cvs, libtool, nasm, utilmacros, pixman, xkbcomp, xkeyboard_config
 , fontDirectories, fontutil, libgcrypt, gnutls, pam, flex, bison
 , fixesproto, damageproto, xcmiscproto, bigreqsproto, randrproto, renderproto
@@ -10,13 +10,14 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "git-20150504";
   name = "tigervnc-${version}";
+  version = "1.6.0";
 
-  src = fetchgit {
-    url = "https://github.com/TigerVNC/tigervnc/";
-    sha256 = "1ib8f870wqa8kpvif01fvd2690dhq7fg233pc78pl9ag6pxlihmn";
-    rev = "bc84faa2f366ed8fa0f44abc7e3e481e0a54859d";
+  src = fetchFromGitHub {
+    owner = "TigerVNC";
+    repo = "tigervnc";
+    rev = "v${version}";
+    sha256 = "1plljv1cxsax88kv52g02n8c1hzwgp6j1p8z1aqhskw36shg4pij";
   };
 
   inherit fontDirectories;

From acf0952458eae38ab738f28f297edff9b624687c Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Tue, 12 Jan 2016 22:37:30 +0100
Subject: [PATCH 625/884] git-appraise: Init at 0.3.

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

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index f3a1b62fc187..58ffb307895b 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -824,6 +824,13 @@ let
     subPackages = [ "./" ];  # don't try to build test fixtures
   };
 
+  git-appraise = buildFromGitHub {
+    rev = "v0.3";
+    owner = "google";
+    repo = "git-appraise";
+    sha256 = "124hci9whsvlcywsfz5y20kkj3nhy176a1d5s1lkvsga09yxq6wm";
+  };
+
   git-lfs = buildFromGitHub {
     rev = "v1.0.0";
     owner = "github";

From d3dbedac5011d78fa1ec2feab19c1ee5ea443c93 Mon Sep 17 00:00:00 2001
From: David Calvo Ruiz <dcr@outlook.es>
Date: Tue, 12 Jan 2016 21:24:50 +0100
Subject: [PATCH 626/884] pyliblo: init at 0.9.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7818d8e9d515..474ea6a8a05f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15944,6 +15944,25 @@ in modules // {
     };
   });
 
+  pyliblo = buildPythonPackage rec {
+    name = "pyliblo-${version}";
+    version = "0.9.2";
+
+    disabled = isPyPy;
+
+    src = pkgs.fetchurl {
+      url = "http://das.nasophon.de/download/${name}.tar.gz";
+      sha256 = "382ee7360aa00aeebf1b955eef65f8491366657a626254574c647521b36e0eb0";
+    };
+
+    propagatedBuildInputs = with self ; [ pkgs.liblo ];
+
+    meta = {
+      homepage = http://das.nasophon.de/pyliblo/;
+      description = "Python wrapper for the liblo OSC library";
+      license = licenses.lgpl21;
+    };
+  };
 
   pymacs = buildPythonPackage rec {
     version = "0.25";

From d445ee9f37d274a36929629817d241c41c241dbd Mon Sep 17 00:00:00 2001
From: David Calvo Ruiz <dcr@outlook.es>
Date: Tue, 12 Jan 2016 21:29:54 +0100
Subject: [PATCH 627/884] klick: init at 0.12.2

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

diff --git a/pkgs/applications/audio/klick/default.nix b/pkgs/applications/audio/klick/default.nix
new file mode 100644
index 000000000000..20ac0f1aba66
--- /dev/null
+++ b/pkgs/applications/audio/klick/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, scons, pkgconfig
+, libsamplerate, libsndfile, liblo, libjack2, boost }:
+
+stdenv.mkDerivation rec {
+  name = "klick-${version}";
+  version = "0.12.2";
+
+  src = fetchurl {
+    url = "http://das.nasophon.de/download/${name}.tar.gz";
+    sha256 = "1289533c0849b1b66463bf27f7ce5f71736b655cfb7672ef884c7e6eb957ac42";
+  };
+
+  buildInputs = [ scons pkgconfig libsamplerate libsndfile liblo libjack2 boost ];
+
+  buildPhase = ''
+    mkdir -p $out
+    scons PREFIX=$out
+  '';
+
+  installPhase = "scons install";
+
+  meta = {
+    homepage = "http://das.nasophon.de/klick/";
+    description = "Advanced command-line metronome for JACK";
+    license = stdenv.lib.licenses.gpl2Plus;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 73a4c899823b..0ce32a992864 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2031,6 +2031,8 @@ let
 
   kismet = callPackage ../applications/networking/sniffers/kismet { };
 
+  klick = callPackage ../applications/audio/klick { };
+
   knockknock = callPackage ../tools/security/knockknock { };
 
   kpcli = callPackage ../tools/security/kpcli { };

From 5c3a84fc89952e76a3072cf3344a57f76a68d20c Mon Sep 17 00:00:00 2001
From: David Calvo Ruiz <dcr@outlook.es>
Date: Tue, 12 Jan 2016 21:33:50 +0100
Subject: [PATCH 628/884] gtklick: init at 0.6.4

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

diff --git a/pkgs/applications/audio/gtklick/default.nix b/pkgs/applications/audio/gtklick/default.nix
new file mode 100644
index 000000000000..b11e1ac0fa79
--- /dev/null
+++ b/pkgs/applications/audio/gtklick/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, pythonPackages, gettext, klick}:
+
+pythonPackages.buildPythonPackage rec {
+  name = "gtklick-${version}";
+  namePrefix = "";
+  version = "0.6.4";
+
+  src = fetchurl {
+    url = "http://das.nasophon.de/download/${name}.tar.gz";
+    sha256 = "7799d884126ccc818678aed79d58057f8cf3528e9f1be771c3fa5b694d9d0137";
+  };
+
+  pythonPath = with pythonPackages; [
+    pyliblo
+    pyGtkGlade
+  ];
+
+  buildInputs = [ gettext ];
+
+  propagatedBuildInputs = [ klick ];
+
+  # wrapPythonPrograms breaks gtklick in the postFixup phase.
+  # To fix it, apply wrapPythonPrograms and then clean up the wrapped file.
+  postFixup = ''
+    wrapPythonPrograms
+
+    sed -i "/import sys; sys.argv\[0\] = 'gtklick'/d" $out/bin/.gtklick-wrapped
+  '';
+
+  meta = {
+    homepage = "http://das.nasophon.de/gtklick/";
+    description = "Simple metronome with an easy-to-use GTK interface";
+    license = stdenv.lib.licenses.gpl2Plus;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0ce32a992864..0a0ed2d49b26 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1789,6 +1789,8 @@ let
 
   gtkdatabox = callPackage ../development/libraries/gtkdatabox {};
 
+  gtklick = callPackage ../applications/audio/gtklick {};
+
   gtdialog = callPackage ../development/libraries/gtdialog {};
 
   gtkgnutella = callPackage ../tools/networking/p2p/gtk-gnutella { };

From 0d79a33fb69d37868f42a594855a26734859ec1c Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jascha@jgeerds.name>
Date: Tue, 12 Jan 2016 23:45:06 +0100
Subject: [PATCH 629/884] pycharm: 5.0.1 -> 5.0.3

---
 pkgs/applications/editors/idea/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index c34e93480087..58e9ab347dfb 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -277,25 +277,25 @@ in
 
   pycharm-community = buildPycharm rec {
     name = "pycharm-community-${version}";
-    version = "5.0.1";
-    build = "143.595";
+    version = "5.0.3";
+    build = "143.1559.1";
     description = "PyCharm Community Edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "14m3imy64cp2l9pnmknxbjzj3z30rx88r4brz9d5xk5qailjg2wf";
+      sha256 = "1xb3qxhl8ln488v0hmjqkzpyypm7wh941c7syi4cs7plbdp6w4c2";
     };
   };
 
   pycharm-professional = buildPycharm rec {
     name = "pycharm-professional-${version}";
-    version = "5.0.1";
-    build = "143.595";
+    version = "5.0.3";
+    build = "143.1559.1";
     description = "PyCharm Professional Edition";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "102sfjvchk80911w3qpjsp30wvq73kgpwyqcqdgqxcgm2vqh3183";
+      sha256 = "1v2g9867nn3id1zfbg4zwj0c0z9d72rl9c1dz6vs2c4j0y4gy9xl";
     };
   };
 

From 44274f62f59a7f0b7460b098c1eb50b54f449565 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 12 Jan 2016 19:39:00 -0500
Subject: [PATCH 630/884] linux: Add 4.4

---
 pkgs/os-specific/linux/kernel/linux-4.4.nix | 18 ++++++++++++++++++
 pkgs/top-level/all-packages.nix             | 12 +++++++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/linux/kernel/linux-4.4.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
new file mode 100644
index 000000000000..36a297b95e57
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
+
+import ./generic.nix (args // rec {
+  version = "4.4";
+  modDirVersion = "4.4.0";
+  extraMeta.branch = "4.4";
+
+  src = fetchurl {
+    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
+    sha256 = "401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2";
+  };
+
+  features.iwlwifi = true;
+  features.efiBootStub = true;
+  features.needsCifsUtils = true;
+  features.canDisableNetfilterConntrackHelpers = true;
+  features.netfilterRPFilter = true;
+} // (args.argsOverride or {}))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 73a4c899823b..ab32b1b2f385 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10030,6 +10030,15 @@ let
       ];
   };
 
+  linux_4_4 = callPackage ../os-specific/linux/kernel/linux-4.4.nix {
+    kernelPatches = [ kernelPatches.bridge_stp_helper ]
+      ++ lib.optionals ((platform.kernelArch or null) == "mips")
+      [ kernelPatches.mips_fpureg_emu
+        kernelPatches.mips_fpu_sigill
+        kernelPatches.mips_ext3_n32
+      ];
+  };
+
   linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix {
     kernelPatches = [ kernelPatches.bridge_stp_helper ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
@@ -10190,7 +10199,7 @@ let
   linux = linuxPackages.kernel;
 
   # Update this when adding the newest kernel major version!
-  linuxPackages_latest = pkgs.linuxPackages_4_3;
+  linuxPackages_latest = pkgs.linuxPackages_4_4;
   linux_latest = linuxPackages_latest.kernel;
 
   # Build the kernel modules for the some of the kernels.
@@ -10203,6 +10212,7 @@ let
   linuxPackages_4_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_1 linuxPackages_4_1);
   linuxPackages_4_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_2 linuxPackages_4_2);
   linuxPackages_4_3 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_3 linuxPackages_4_3);
+  linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4 linuxPackages_4_4);
   linuxPackages_testing = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing linuxPackages_testing);
   linuxPackages_custom = {version, src, configfile}:
                            let linuxPackages_self = (linuxPackagesFor (pkgs.linuxManualConfig {inherit version src configfile;

From f85b5c4c07e85fbafbfaecd34aeaf96010e652d7 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 13 Jan 2016 01:31:46 +0100
Subject: [PATCH 631/884] ntop: remove dead package

Broken since 2013. Discontinued. Use ntopng.
---
 pkgs/tools/networking/ntop/default.nix | 27 --------------------------
 pkgs/top-level/all-packages.nix        |  2 --
 2 files changed, 29 deletions(-)
 delete mode 100644 pkgs/tools/networking/ntop/default.nix

diff --git a/pkgs/tools/networking/ntop/default.nix b/pkgs/tools/networking/ntop/default.nix
deleted file mode 100644
index 11e67ae63336..000000000000
--- a/pkgs/tools/networking/ntop/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, fetchurl, autoconf, automake, libtool, wget, libpcap, gdbm, zlib, openssl, rrdtool
-, python, geoip }:
-
-stdenv.mkDerivation rec {
-  name = "ntop-4.1.0";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/ntop/${name}.tar.gz";
-    sha256 = "19440gnswnqwvkbzpay9hzmnfnhbyc2ifpl2jri8dhcyhxima7n7";
-  };
-
-  preConfigure = ''
-    ./autogen.sh
-    cp ${libtool}/share/aclocal/libtool.m4 libtool.m4.in
-  '';
-
-  nativeBuildInputs = [ autoconf automake libtool wget libpcap gdbm zlib openssl rrdtool
-    python geoip ];
-
-  meta = {
-    description = "Traffic analysis with NetFlow and sFlow support";
-    license = stdenv.lib.licenses.gpl3Plus;
-    homepage = http://www.ntop.org/products/ntop/;
-    platforms = stdenv.lib.platforms.linux;
-    broken = true;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ab32b1b2f385..9ecb1f59b4dc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2478,8 +2478,6 @@ let
   # ntfsprogs are merged into ntfs-3g
   ntfsprogs = pkgs.ntfs3g;
 
-  ntop = callPackage ../tools/networking/ntop { };
-
   ntopng = callPackage ../tools/networking/ntopng { };
 
   ntp = callPackage ../tools/networking/ntp {

From 9888fbd8d244eeb68fe2f11fd00fcc6e7548f7ec Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 13 Jan 2016 01:43:57 +0100
Subject: [PATCH 632/884] gtk-gnutella: 1.0.1 -> 1.1.5

Still broken, though.
---
 .../networking/p2p/gtk-gnutella/default.nix    | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix
index 7eefb516e1ca..5f335c8f76a9 100644
--- a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix
+++ b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix
@@ -1,28 +1,30 @@
-{stdenv, fetchurl, pkgconfig, glib, gtk, libxml2, bison, gettext, zlib}:
+{ stdenv, fetchurl, bison, pkgconfig
+, glib, gtk, libxml2, gettext, zlib }:
 
 let
   name = "gtk-gnutella";
-  version = "1.0.1";
+  version = "1.1.5";
 in
 stdenv.mkDerivation {
   name = "${name}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/${name}/${name}-${version}.tar.bz2";
-    sha256 = "010gzk2xqqkm309qnj5k28ghh9i92vvpnn8ly9apzb5gh8bqfm0g";
+    sha256 = "19d8mmyxrdwdafcjq1hvs9zn40yrcj1127163a2058svi0x08cn3";
   };
 
-  buildInputs = [pkgconfig glib gtk libxml2 bison gettext zlib];
+  nativeBuildInputs = [ bison pkgconfig ];
+  buildInputs = [ glib gtk libxml2 gettext zlib ];
 
   NIX_LDFLAGS = "-rpath ${zlib}/lib";
   configureScript = "./Configure";
   dontAddPrefix = true;
   configureFlags = "-d -e -D prefix=$out -D gtkversion=2 -D official=true";
 
-  meta = {
-    homepage = "http://gtk-gnutella.sourceforge.net/";
-    description = "a server/client for Gnutella";
-    license = stdenv.lib.licenses.gpl2;
+  meta = with stdenv.lib; {
+    homepage = http://gtk-gnutella.sourceforge.net/;
+    description = "Server/client for Gnutella";
+    license = licenses.gpl2;
     broken = true;
   };
 }

From 59047385579c94a21256d226b9951c100bb7ca3a Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 13 Jan 2016 03:28:14 +0100
Subject: [PATCH 633/884] regionset: 20030629 -> 0.2

Later version with cleaned-up code and a very basic man page.
---
 pkgs/os-specific/linux/regionset/default.nix | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/regionset/default.nix b/pkgs/os-specific/linux/regionset/default.nix
index 699c4cd82b85..ba35d9f73ffc 100644
--- a/pkgs/os-specific/linux/regionset/default.nix
+++ b/pkgs/os-specific/linux/regionset/default.nix
@@ -1,18 +1,24 @@
 { stdenv, fetchurl }:
 
+let version = "0.2"; in
 stdenv.mkDerivation {
-  name = "regionset-20030629";
+  name = "regionset-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/dvd/regionset.tar.gz";
-    sha256 = "0ssr7s0g60kq04y8v60rh2fzn9wp93al3v4rl0ybza1skild9v70";
+    url = "http://linvdr.org/download/regionset/regionset-${version}.tar.gz";
+    sha256 = "1fgps85dmjvj41a5bkira43vs2aiivzhqwzdvvpw5dpvdrjqcp0d";
   };
 
-  installPhase = "mkdir -p $out/sbin; cp regionset $out/sbin";
+  installPhase = ''
+    install -Dm755 {.,$out/bin}/regionset
+    install -Dm644 {.,$out/share/man/man8}/regionset.8
+  '';
 
-  meta = {
-    homepage = http://dvd.sourceforge.net/;
+  meta = with stdenv.lib; {
+    inherit version;
+    homepage = http://linvdr.org/projects/regionset/;
     descriptions = "Tool for changing the region code setting of DVD players";
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
   };
 }

From 3b62c8cdc8a2adb1db4c9be5a7f4446a1bb05865 Mon Sep 17 00:00:00 2001
From: Brian McKenna <bmckenna@atlassian.com>
Date: Wed, 13 Jan 2016 15:06:42 +1100
Subject: [PATCH 634/884] zeal: 0.1.1 -> 0.2.1

---
 pkgs/data/documentation/zeal/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix
index 0f02bb7dc945..81be2dfb89be 100644
--- a/pkgs/data/documentation/zeal/default.nix
+++ b/pkgs/data/documentation/zeal/default.nix
@@ -1,19 +1,19 @@
 { stdenv, fetchFromGitHub, libarchive, pkgconfig, qtbase
-, qtimageformats, qtwebkit, xorg }:
+, qtimageformats, qtwebkit, qtx11extras, xorg }:
 
 stdenv.mkDerivation rec {
-  version = "0.1.1";
+  version = "0.2.1";
   name = "zeal-${version}";
 
   src = fetchFromGitHub {
     owner = "zealdocs";
     repo = "zeal";
     rev = "v${version}";
-    sha256 = "172wf50fq1l5p8hq1irvpwr7ljxkjaby71afrm82jz3ixl6dg2ii";
+    sha256 = "1j1nfvkwkb2xdh289q5gdb526miwwqmqjyd6fz9qm5dg467wmwa3";
   };
 
   buildInputs = [
-    xorg.xcbutilkeysyms pkgconfig qtbase qtimageformats qtwebkit libarchive
+    xorg.xcbutilkeysyms pkgconfig qtbase qtimageformats qtwebkit qtx11extras libarchive
   ];
 
   configurePhase = ''

From 9516c065bafd20f0c6b43b79a3c3ceaae492c3d8 Mon Sep 17 00:00:00 2001
From: Louis Taylor <louis@kragniz.eu>
Date: Wed, 13 Jan 2016 05:28:00 +0000
Subject: [PATCH 635/884] redis: 3.0.2 -> 3.0.6

---
 pkgs/servers/nosql/redis/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix
index 6da7ec11e7c6..dacbaff1835e 100644
--- a/pkgs/servers/nosql/redis/default.nix
+++ b/pkgs/servers/nosql/redis/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "3.0.2";
+  version = "3.0.6";
   name = "redis-${version}";
 
   src = fetchurl {
     url = "http://download.redis.io/releases/${name}.tar.gz";
-    sha256 = "93e422c0d584623601f89b956045be158889ebe594478a2c24e1bf218495633f";
+    sha256 = "092nnxjyaf7h9mnwac5rwjl0ikyyqa44vn426w64hn2534iia7kg";
   };
 
   makeFlags = "PREFIX=$(out)";

From e6a892bb55e664a7ac151855fefb579812c66e60 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Tue, 12 Jan 2016 21:52:39 -0800
Subject: [PATCH 636/884] phantomjs2: build on darwin

---
 pkgs/development/tools/phantomjs2/default.nix | 74 ++++++++++++++++++-
 pkgs/misc/cups/default.nix                    | 15 +++-
 2 files changed, 82 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/phantomjs2/default.nix b/pkgs/development/tools/phantomjs2/default.nix
index 8ef68f93a2f7..8c162589bf6e 100644
--- a/pkgs/development/tools/phantomjs2/default.nix
+++ b/pkgs/development/tools/phantomjs2/default.nix
@@ -1,8 +1,37 @@
 { stdenv, fetchurl,
-  bison2, flex, fontconfig, freetype, gperf, icu, openssl, libjpeg, libpng, perl, python, ruby, sqlite
+  bison2, flex, fontconfig, freetype, gperf, icu, openssl, libjpeg, libpng, perl, python, ruby, sqlite,
+  darwin, writeScriptBin, cups
 }:
 
-stdenv.mkDerivation rec {
+let
+  fakeXcrun = writeScriptBin "xcrun" ''
+    #!${stdenv.shell}
+    echo >&2 "Fake xcrun: ''$@"
+    args=()
+    while (("$#")); do
+      case "$1" in
+        -sdk*) shift;;
+        -find*) shift;;
+        *) args+=("$1");;
+      esac
+      shift
+    done
+
+    if [ "''${#args[@]}" -gt "0" ]; then
+      echo >&2 "Fake xcrun: ''${args[@]}"
+      exec "''${args[@]}"
+    fi
+  '';
+  fakeClang = writeScriptBin "clang" ''
+    #!${stdenv.shell}
+    if [[ "$@" == *.c ]]; then
+      exec "${stdenv.cc}/bin/clang" "$@"
+    else
+      exec "${stdenv.cc}/bin/clang++" "$@"
+    fi
+  '';
+
+in stdenv.mkDerivation rec {
   name = "phantomjs-${version}";
   version = "2.0.0-20150528";
 
@@ -11,19 +40,58 @@ stdenv.mkDerivation rec {
     sha256 = "18h37bxxg25lacry9k3vb5yim057bqcxmsifw97jrjp7gzfx56v5";
   };
 
-  buildInputs = [ bison2 flex fontconfig freetype gperf icu openssl libjpeg libpng perl python ruby sqlite ];
+  buildInputs = [ bison2 flex fontconfig freetype gperf icu openssl libjpeg libpng perl python ruby sqlite ]
+    ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+      AGL ApplicationServices AppKit Cocoa OpenGL
+      darwin.libobjc fakeClang cups
+    ]);
+
 
   patchPhase = ''
     patchShebangs .
     sed -i -e 's|/bin/pwd|pwd|' src/qt/qtbase/configure 
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    sed -i 's,-licucore,/usr/lib/libicucore.dylib,' src/qt/qtwebkit/Source/WTF/WTF.pri
+    substituteInPlace src/qt/qtwebkit/Tools/qmake/mkspecs/features/features.pri \
+      --replace "ENABLE_3D_RENDERING=1" "ENABLE_3D_RENDERING=0"
+    sed -i 88d src/qt/qtwebkit/Tools/qmake/mkspecs/features/features.prf
+    echo 'CONFIG -= create_cmake' >> src/qt/qtwebkit/Source/api.pri
+    echo 'CONFIG -= create_cmake' >> src/qt/qtwebkit/Source/widgetsapi.pri
+    pushd src/qt
+
+      substituteInPlace qtbase/configure \
+        --replace /usr/bin/xcode-select true \
+        --replace '/usr/bin/xcodebuild -sdk $sdk -version Path 2>/dev/null' 'echo /var/empty' \
+        --replace '/usr/bin/xcrun -sdk $sdk -find' 'type -P'
+      substituteInPlace qtbase/mkspecs/features/mac/default_pre.prf \
+        --replace '/usr/bin/xcode-select --print-path 2>/dev/null' "echo ${stdenv.libc}" \
+        --replace '/usr/bin/xcrun -find xcrun 2>/dev/null' 'echo success' \
+        --replace '/usr/bin/xcodebuild -version' 'echo Xcode 7.2; echo Build version 7C68' \
+        --replace 'sdk rez' ""
+      for file in $(grep -rl /usr/bin/xcrun .); do
+        substituteInPlace "$file" --replace "/usr/bin/xcrun" ${fakeXcrun}/bin/xcrun
+      done
+      substituteInPlace qtbase/src/tools/qlalr/lalr.cpp --replace _Nullable Nullable
+
+    popd
   '';
 
+  __impureHostDeps = stdenv.lib.optional stdenv.isDarwin "/usr/lib/libicucore.dylib";
+
   buildPhase = "./build.sh --confirm";
 
   installPhase = ''
     mkdir -p $out/share/doc/phantomjs
     cp -a bin $out
     cp -a ChangeLog examples LICENSE.BSD README.md third-party.txt $out/share/doc/phantomjs
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    install_name_tool -change \
+        ${darwin.CF}/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation \
+        /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation \
+      -change \
+        ${darwin.configd}/Library/Frameworks/SystemConfiguration.framework/SystemConfiguration \
+        /System/Library/Frameworks/SystemConfiguration.framework/Versions/A/SystemConfiguration \
+    $out/bin/phantomjs
   '';
 
   meta = {
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index dea00c35b4e0..8fa111ecc023 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam
-, dbus, acl, gmp
+, dbus, acl, gmp, darwin
 , libusb ? null, gnutls ? null, avahi ? null, libpaper ? null
 }:
 
@@ -16,8 +16,11 @@ stdenv.mkDerivation {
     sha256 = "1gaakz24k6x5nc09rmpiq0xq20j1qdjc3szag8qwmyi4ky6ydmg1";
   };
 
-  buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls avahi libpaper ]
-    ++ optionals stdenv.isLinux [ pam dbus.libs acl ];
+  buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls libpaper ]
+    ++ optionals stdenv.isLinux [ avahi pam dbus.libs acl ]
+    ++ optionals stdenv.isDarwin (with darwin; [
+      configd apple_sdk.frameworks.ApplicationServices
+    ]);
 
   propagatedBuildInputs = [ gmp ];
 
@@ -33,7 +36,11 @@ stdenv.mkDerivation {
   ] ++ optional (libusb != null) "--enable-libusb"
     ++ optional (gnutls != null) "--enable-ssl"
     ++ optional (avahi != null) "--enable-avahi"
-    ++ optional (libpaper != null) "--enable-libpaper";
+    ++ optional (libpaper != null) "--enable-libpaper"
+    ++ optionals stdenv.isDarwin [
+    "--with-bundledir=$out"
+    "--disable-launchd"
+  ];
 
   installFlags =
     [ # Don't try to write in /var at build time.

From cea8ee50c7de8106d74ed66a9b54db56e3ab491e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 13 Jan 2016 08:31:37 +0100
Subject: [PATCH 637/884] phantomjs2: fix evaluation and refactor

The error was due to the fact that with-introduced bindings have lower
priority and we do have `darwin` in scope already.

Fixes #12350. Closes #12351. (A slightly different fix.
I chose this to lower the risk of people re-introducing the mistake.)
---
 pkgs/development/tools/phantomjs2/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/phantomjs2/default.nix b/pkgs/development/tools/phantomjs2/default.nix
index 8c162589bf6e..a0f919b404f3 100644
--- a/pkgs/development/tools/phantomjs2/default.nix
+++ b/pkgs/development/tools/phantomjs2/default.nix
@@ -94,7 +94,7 @@ in stdenv.mkDerivation rec {
     $out/bin/phantomjs
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Headless WebKit with JavaScript API";
     longDescription = ''
       PhantomJS2 is a headless WebKit with JavaScript API.
@@ -109,9 +109,9 @@ in stdenv.mkDerivation rec {
     '';
 
     homepage = http://phantomjs.org/;
-    license = stdenv.lib.licenses.bsd3;
+    license = licenses.bsd3;
 
-    maintainers = [ stdenv.lib.maintainers.aflatter ];
-    platforms = with stdenv.lib.platforms; darwin ++ linux;
+    maintainers = [ maintainers.aflatter ];
+    platforms = platforms.darwin ++ platforms.linux;
   };
 }

From 625fe8164fed723c90248a6c5dbb12533309e4a6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 13 Jan 2016 10:05:01 +0100
Subject: [PATCH 638/884] melpa-packages.json: remove "2048-game" to mitigate
 the effects of https://github.com/NixOS/nixpkgs/issues/12353

---
 .../editors/emacs-modes/melpa-packages.json        | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.json b/pkgs/applications/editors/emacs-modes/melpa-packages.json
index 889b4cea4a5a..b5b4aa4b7e1b 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.json
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.json
@@ -11403,20 +11403,6 @@
         "version": "20140306.845",
         "deps": []
     },
-    "2048-game": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "https://bitbucket.com/zck/2048.el",
-            "sha256": "1p9qn9n8mfb4z62h1s94mlg0vshpzafbhsxgzvx78sqlf6bfc80l",
-            "rev": "ea6c3bce8ac1"
-        },
-        "recipe": {
-            "sha256": "0z7x9bnyi3qlq7l0fskb61i6yr9gm7w7wplqd28wz8p1j5yw8aa0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151026.1433",
-        "deps": []
-    },
     "mag-menu": {
         "fetch": {
             "tag": "fetchFromGitHub",

From 1587e1e5787806572e57a7cf187f989ae29d9118 Mon Sep 17 00:00:00 2001
From: Louis Taylor <louis@kragniz.eu>
Date: Wed, 13 Jan 2016 09:06:41 +0000
Subject: [PATCH 639/884] screenfetch: 2015-04-20 -> 2016-01-13

This brings in the all-important new NixOS logo.
---
 pkgs/tools/misc/screenfetch/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/screenfetch/default.nix b/pkgs/tools/misc/screenfetch/default.nix
index 92cc800d83d3..972e10492784 100644
--- a/pkgs/tools/misc/screenfetch/default.nix
+++ b/pkgs/tools/misc/screenfetch/default.nix
@@ -3,12 +3,12 @@
 }:
 
 stdenv.mkDerivation {
-  name = "screenFetch-2015-04-20";
+  name = "screenFetch-2016-01-13";
 
   src = fetchgit {
     url = git://github.com/KittyKatt/screenFetch.git;
-    rev = "53e1c0cccacf648e846057938a68dda914f532a1";
-    sha256 = "1wyvy1sn7vnclwrzd32jqlq6iirjkhp2ak55brhkpp9rj1qxk3q6";
+    rev = "22e5bee7647453d45ec82f543f37b8a6a062835d";
+    sha256 = "0xdiz02bqg7ajj547j496qq9adysm1f6zymcy3yyfgw3prnzvdir";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 2f5e87a7bff1148df4cdb3494894f003046b6385 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 13 Jan 2016 10:09:36 +0100
Subject: [PATCH 640/884] melpa-packages.json: remove "4clojure" to mitigate
 the effects of https://github.com/NixOS/nixpkgs/issues/12353

---
 .../editors/emacs-modes/melpa-packages.json    | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.json b/pkgs/applications/editors/emacs-modes/melpa-packages.json
index b5b4aa4b7e1b..8717a5f126ad 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.json
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.json
@@ -2115,24 +2115,6 @@
             "web-server"
         ]
     },
-    "4clojure": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "joshuarh",
-            "repo": "4clojure.el",
-            "sha256": "1fybicg46fc5jjqv7g2d3dnj1x9n58m2fg9x6qxn9l8qlzk9yxkq",
-            "rev": "3cdfd356c24cd3518397d29ae833f56a4d20b4ca"
-        },
-        "recipe": {
-            "sha256": "1w9zxy6jwiln28cmdgkbbdfk3pdscqlfahrqi6lbgpjvkw9z44mb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131014.1707",
-        "deps": [
-            "json",
-            "request"
-        ]
-    },
     "mustard-theme": {
         "fetch": {
             "tag": "fetchFromGitHub",

From 4f85afad5ba5629f2b6bb792f38cad0841a946bc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 13 Jan 2016 10:09:55 +0100
Subject: [PATCH 641/884] melpa-packages.json: remove "0blayout" to mitigate
 the effects of https://github.com/NixOS/nixpkgs/issues/12353

---
 .../editors/emacs-modes/melpa-packages.json       | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.json b/pkgs/applications/editors/emacs-modes/melpa-packages.json
index 8717a5f126ad..0035cbf2d056 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.json
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.json
@@ -37286,21 +37286,6 @@
             "emacs"
         ]
     },
-    "0blayout": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "etu",
-            "repo": "0blayout-mode",
-            "sha256": "1xigpz2aswlmpcsc1f7gfakyw7041pbyl9zfd8nz38iq036n5b96",
-            "rev": "e256da71d4e0f126a0fd8a9b8fb77f54931f4dfc"
-        },
-        "recipe": {
-            "sha256": "027k85h34998i8vmbg2hi4q1m4f7jfva5jm38k0g9m1db700gk92",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151021.549",
-        "deps": []
-    },
     "afternoon-theme": {
         "fetch": {
             "tag": "fetchFromGitHub",

From d83a10bc6c4a0a25e0f19c51be14ae3e221e6e35 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 13 Jan 2016 10:10:33 +0100
Subject: [PATCH 642/884] emacs-25: mark the pre-release as low-priority

This ensures that users running "nix-env -i emacs" will get the
release version.
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9ecb1f59b4dc..bed19376547f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11476,7 +11476,7 @@ let
   });
   emacs24Macport = self.emacs24Macport_24_5;
 
-  emacs25pre = callPackage ../applications/editors/emacs-25 {
+  emacs25pre = lowPrio (callPackage ../applications/editors/emacs-25 {
     # use override to enable additional features
     libXaw = xorg.libXaw;
     Xaw3d = null;

From 7f21df9001ee5fa62e8fdecc4aef62884589e605 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 13 Jan 2016 10:11:31 +0100
Subject: [PATCH 643/884] all-packages.nix: strip trailing white-space

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bed19376547f..9474f0556e9d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11487,7 +11487,7 @@ let
     gpm = null;
     inherit (darwin.apple_sdk.frameworks) AppKit Foundation;
     inherit (darwin) libobjc;
-  };
+  });
 
   emacsPackagesGen = emacs: self: let callPackage = newScope self; in rec {
     inherit emacs;
@@ -12172,7 +12172,7 @@ let
     inherit (pythonPackages) lxml;
     lcms = lcms2;
   };
-  
+
   inspectrum = callPackage ../applications/misc/inspectrum { };
 
   ion3 = callPackage ../applications/window-managers/ion-3 {

From 4a4561ce244c0cea1cb07fd02f176b11f094f570 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Thu, 19 Nov 2015 13:11:17 +0100
Subject: [PATCH 644/884] dockerTools: nix functions for manipulating docker
 images

---
 doc/functions.xml                     | 336 ++++++++++++++++++++++++
 pkgs/build-support/docker/default.nix | 365 ++++++++++++++++++++++++++
 pkgs/build-support/docker/detjson.py  |  38 +++
 pkgs/build-support/docker/pull.nix    |  50 ++++
 pkgs/build-support/docker/pull.sh     |  75 ++++++
 pkgs/build-support/docker/tarsum.go   |  24 ++
 pkgs/top-level/all-packages.nix       |   2 +
 7 files changed, 890 insertions(+)
 create mode 100644 pkgs/build-support/docker/default.nix
 create mode 100644 pkgs/build-support/docker/detjson.py
 create mode 100644 pkgs/build-support/docker/pull.nix
 create mode 100644 pkgs/build-support/docker/pull.sh
 create mode 100644 pkgs/build-support/docker/tarsum.go

diff --git a/doc/functions.xml b/doc/functions.xml
index 7f40ba33cd4a..5a350a23e0ad 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -291,4 +291,340 @@ c = lib.makeOverridable f { a = 1; b = 2; }</programlisting>
   </para>
 </section>
 
+<section xml:id="sec-pkgs-dockerTools">
+ <title>pkgs.dockerTools</title>
+
+ <para>
+  <varname>pkgs.dockerTools</varname> is a set of functions for creating and
+  manipulating Docker images according to the
+  <link xlink:href="https://github.com/docker/docker/blob/master/image/spec/v1.md#docker-image-specification-v100">
+   Docker Image Specification v1.0.0
+  </link>. Docker itself is not used to perform any of the operations done by these
+  functions.
+ </para>
+
+ <warning>
+  <para>
+   The <varname>dockerTools</varname> API is unstable and may be subject to
+   backwards-incompatible changes in the future.
+  </para>
+ </warning>
+
+ <section xml:id="ssec-pkgs-dockerTools-buildImage">
+  <title>buildImage</title>
+
+  <para>
+   This function is analogous to the <command>docker build</command> command,
+   in that can used to build a Docker-compatible repository tarball containing
+   a single image with one or multiple layers. As such, the result
+   is suitable for being loaded in Docker with <command>docker load</command>.
+  </para>
+
+  <para>
+   The parameters of <varname>buildImage</varname> with relative example values are
+   described below:
+  </para>
+
+  <example xml:id='ex-dockerTools-buildImage'><title>Docker build</title>
+  <programlisting>
+  buildImage {
+    name = "redis"; <co xml:id='ex-dockerTools-buildImage-1' />
+    tag = "latest"; <co xml:id='ex-dockerTools-buildImage-2' />
+    
+    fromImage = someBaseImage; <co xml:id='ex-dockerTools-buildImage-3' />
+    fromImageName = null; <co xml:id='ex-dockerTools-buildImage-4' />
+    fromImageTag = "latest"; <co xml:id='ex-dockerTools-buildImage-5' />
+    
+    contents = pkgs.redis; <co xml:id='ex-dockerTools-buildImage-6' />
+    runAsRoot = '' <co xml:id='ex-dockerTools-buildImage-runAsRoot' />
+      #!${stdenv.shell}
+      mkdir -p /data
+    '';
+
+    config = { <co xml:id='ex-dockerTools-buildImage-8' />
+      Cmd = [ "/bin/redis-server" ];
+      WorkingDir = "/data";
+      Volumes = {
+        "/data" = {};
+      };
+    };
+  }
+  </programlisting>
+  </example>
+
+  <para>The above example will build a Docker image <literal>redis/latest</literal>
+   from the given base image. Loading and running this image in Docker results in
+   <literal>redis-server</literal> being started automatically.
+  </para>
+
+  <calloutlist>
+   <callout arearefs='ex-dockerTools-buildImage-1'>
+    <para>
+     <varname>name</varname> specifies the name of the resulting image.
+     This is the only required argument for <varname>buildImage</varname>.
+    </para>
+   </callout>
+
+   <callout arearefs='ex-dockerTools-buildImage-2'>
+    <para>
+     <varname>tag</varname> specifies the tag of the resulting image.
+     By default it's <literal>latest</literal>.
+    </para>
+   </callout>
+
+   <callout arearefs='ex-dockerTools-buildImage-3'>
+    <para>
+     <varname>fromImage</varname> is the repository tarball containing the base image.
+     It must be a valid Docker image, such as exported by <command>docker save</command>.
+     By default it's <literal>null</literal>, which can be seen as equivalent
+     to <literal>FROM scratch</literal> of a <filename>Dockerfile</filename>.
+    </para>
+   </callout>
+   
+   <callout arearefs='ex-dockerTools-buildImage-4'>
+    <para>
+     <varname>fromImageName</varname> can be used to further specify
+     the base image within the repository, in case it contains multiple images.
+     By default it's <literal>null</literal>, in which case
+     <varname>buildImage</varname> will peek the first image available
+     in the repository.
+    </para>
+   </callout>
+
+   <callout arearefs='ex-dockerTools-buildImage-5'>
+    <para>
+     <varname>fromImageTag</varname> can be used to further specify the tag
+     of the base image within the repository, in case an image contains multiple tags.
+     By default it's <literal>null</literal>, in which case
+     <varname>buildImage</varname> will peek the first tag available for the base image.
+    </para>
+   </callout>
+
+   <callout arearefs='ex-dockerTools-buildImage-6'>
+    <para>
+     <varname>contents</varname> is a derivation that will be copied in the new
+     layer of the resulting image. This can be similarly seen as
+     <command>ADD contents/ /</command> in a <filename>Dockerfile</filename>.
+     By default it's <literal>null</literal>.
+    </para>
+   </callout>
+
+   <callout arearefs='ex-dockerTools-buildImage-runAsRoot'>
+    <para>
+     <varname>runAsRoot</varname> is a bash script that will run as root
+     in an environment that overlays the existing layers of the base image with
+     the new resulting layer, including the previously copied
+     <varname>contents</varname> derivation.
+     This can be similarly seen as
+     <command>RUN ...</command> in a <filename>Dockerfile</filename>.
+     
+     <note>
+      <para>
+       Using this parameter requires the <literal>kvm</literal>
+       device to be available.
+      </para>
+     </note>
+    </para>
+   </callout>
+
+   <callout arearefs='ex-dockerTools-buildImage-8'>
+    <para>
+     <varname>config</varname> is used to specify the configuration of the
+     containers that will be started off the built image in Docker.
+     The available options are listed in the
+     <link xlink:href="https://github.com/docker/docker/blob/master/image/spec/v1.md#container-runconfig-field-descriptions">
+      Docker Image Specification v1.0.0
+     </link>.
+    </para>
+   </callout>
+
+  </calloutlist>
+
+  <para>
+   After the new layer has been created, its closure
+   (to which <varname>contents</varname>, <varname>config</varname> and
+   <varname>runAsRoot</varname> contribute) will be copied in the layer itself.
+   Only new dependencies that are not already in the existing layers will be copied.
+  </para>
+
+  <para>
+   At the end of the process, only one new single layer will be produced and
+   added to the resulting image.
+  </para>
+
+  <para>
+   The resulting repository will only list the single image
+   <varname>image/tag</varname>. In the case of <xref linkend='ex-dockerTools-buildImage'/>
+   it would be <varname>redis/latest</varname>.
+  </para>
+
+  <para>
+   It is possible to inspect the arguments with which an image was built
+   using its <varname>buildArgs</varname> attribute.
+  </para>
+
+ </section>
+
+ <section xml:id="ssec-pkgs-dockerTools-fetchFromRegistry">
+  <title>pullImage</title>
+
+  <para>
+   This function is analogous to the <command>docker pull</command> command,
+   in that can be used to fetch a Docker image from a Docker registry.
+   Currently only registry <literal>v1</literal> is supported.
+   By default <link xlink:href="https://hub.docker.com/">Docker Hub</link>
+   is used to pull images.
+  </para>
+
+  <para>
+   Its parameters are described in the example below:
+  </para>
+
+  <example xml:id='ex-dockerTools-pullImage'><title>Docker pull</title>
+  <programlisting>
+  pullImage {
+    imageName = "debian"; <co xml:id='ex-dockerTools-pullImage-1' />
+    imageTag = "jessie"; <co xml:id='ex-dockerTools-pullImage-2' />
+    imageId = null; <co xml:id='ex-dockerTools-pullImage-3' />
+    sha256 = "1bhw5hkz6chrnrih0ymjbmn69hyfriza2lr550xyvpdrnbzr4gk2"; <co xml:id='ex-dockerTools-pullImage-4' />
+
+    indexUrl = "https://index.docker.io"; <co xml:id='ex-dockerTools-pullImage-5' />
+    registryUrl = "https://registry-1.docker.io";
+    registryVersion = "v1";
+  }
+  </programlisting>
+  </example>
+
+  <calloutlist>
+   <callout arearefs='ex-dockerTools-pullImage-1'>
+    <para>
+     <varname>imageName</varname> specifies the name of the image to be downloaded,
+     which can also include the registry namespace (e.g. <literal>library/debian</literal>).
+     This argument is required.
+    </para>
+   </callout>
+   
+   <callout arearefs='ex-dockerTools-pullImage-2'>
+    <para>
+     <varname>imageTag</varname> specifies the tag of the image to be downloaded.
+     By default it's <literal>latest</literal>.
+    </para>
+   </callout>
+
+   <callout arearefs='ex-dockerTools-pullImage-3'>
+    <para>
+     <varname>imageId</varname>, if specified this exact image will be fetched, instead
+     of <varname>imageName/imageTag</varname>. However, the resulting repository
+     will still be named <varname>imageName/imageTag</varname>.
+     By default it's <literal>null</literal>.
+    </para>
+   </callout>
+
+   <callout arearefs='ex-dockerTools-pullImage-4'>
+    <para>
+     <varname>sha256</varname> is the checksum of the whole fetched image.
+     This argument is required.
+    </para>
+
+    <note>
+     <para>The checksum is computed on the unpacked directory, not on the final tarball.</para>
+    </note>
+
+   </callout>
+
+   <callout arearefs='ex-dockerTools-pullImage-5'>
+    <para>
+     In the above example the default values are shown for the variables <varname>indexUrl</varname>,
+     <varname>registryUrl</varname> and <varname>registryVersion</varname>.
+     Hence by default the Docker.io registry is used to pull the images.
+    </para>
+   </callout>
+  </calloutlist>
+   
+ </section>
+  
+ <section xml:id="ssec-pkgs-dockerTools-exportImage">
+  <title>exportImage</title>
+
+  <para>
+   This function is analogous to the <command>docker export</command> command,
+   in that can used to flatten a Docker image that contains multiple layers.
+   It is in fact the result of the merge of all the layers of the image.
+   As such, the result is suitable for being imported in Docker
+   with <command>docker import</command>.
+  </para>
+
+  <note>
+   <para>
+    Using this function requires the <literal>kvm</literal>
+    device to be available.
+   </para>
+  </note>
+
+  <para>
+   The parameters of <varname>exportImage</varname> are the following:
+  </para>
+
+  <example xml:id='ex-dockerTools-exportImage'><title>Docker export</title>
+  <programlisting>
+  exportImage {
+    fromImage = someLayeredImage;
+    fromImageName = null;
+    fromImageTag = null;
+    
+    name = someLayeredImage.name;
+  }
+  </programlisting>
+  </example>
+
+  <para>
+   The parameters relative to the base image have the same synopsis as
+   described in <xref linkend='ssec-pkgs-dockerTools-buildImage'/>, except that
+   <varname>fromImage</varname> is the only required argument in this case.
+  </para>
+
+  <para>
+   The <varname>name</varname> argument is the name of the derivation output,
+   which defaults to <varname>fromImage.name</varname>.
+  </para>
+ </section>
+
+ <section xml:id="ssec-pkgs-dockerTools-shadowSetup">
+  <title>shadowSetup</title>
+
+  <para>
+   This constant string is a helper for setting up the base files for managing
+   users and groups, only if such files don't exist already.
+   It is suitable for being used in a
+   <varname>runAsRoot</varname> <xref linkend='ex-dockerTools-buildImage-runAsRoot'/> script for cases like
+   in the example below:
+  </para>
+  
+  <example xml:id='ex-dockerTools-shadowSetup'><title>Shadow base files</title>
+  <programlisting>
+  buildImage {
+    name = "shadow-basic";
+
+    runAsRoot = ''
+      #!${stdenv.shell}
+      ${shadowSetup}
+      groupadd -r redis
+      useradd -r -g redis redis
+      mkdir /data
+      chown redis:redis /data
+    '';
+  }
+  </programlisting>
+  </example>
+
+  <para>
+   Creating base files like <literal>/etc/passwd</literal> or
+   <literal>/etc/login.defs</literal> are necessary for shadow-utils to
+   manipulate users and groups.
+  </para>
+  
+ </section>
+ 
+</section>
+
 </chapter>
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
new file mode 100644
index 000000000000..55344aad566f
--- /dev/null
+++ b/pkgs/build-support/docker/default.nix
@@ -0,0 +1,365 @@
+{ stdenv, lib, callPackage, runCommand, writeReferencesToFile, writeText, vmTools, writeScript
+, docker, shadow, utillinux, coreutils, jshon, e2fsprogs, goPackages }:
+
+# WARNING: this API is unstable and may be subject to backwards-incompatible changes in the future.
+  
+rec {
+
+  pullImage = callPackage ./pull.nix {};
+  
+  # We need to sum layer.tar, not a directory, hence tarsum instead of nix-hash.
+  # And we cannot untar it, because then we cannot preserve permissions ecc.
+  tarsum = runCommand "tarsum" {
+    buildInputs = [ goPackages.go ];
+  } ''
+    mkdir tarsum
+    cd tarsum
+
+    cp ${./tarsum.go} tarsum.go
+    export GOPATH=$(pwd)
+    mkdir src
+    ln -sT ${docker.src}/pkg/tarsum src/tarsum
+    go build
+
+    cp tarsum $out
+  '';
+  
+  # buildEnv creates symlinks to dirs, which is hard to edit inside the overlay VM
+  mergeDrvs = { drvs, onlyDeps ? false }:
+    runCommand "merge-drvs" {
+      inherit drvs onlyDeps;
+    } ''
+      if [ -n "$onlyDeps" ]; then
+        echo $drvs > $out
+        exit 0
+      fi
+        
+      mkdir $out
+      for drv in $drvs; do
+        echo Merging $drv
+        if [ -d "$drv" ]; then
+          cp -drf --preserve=mode -f $drv/* $out/
+        else
+          tar -C $out -xpf $drv || true
+        fi
+      done
+    '';
+  
+  mkTarball = { name ? "docker-tar", drv, onlyDeps ? false }:
+    runCommand "${name}.tar.gz" rec {
+      inherit drv onlyDeps;
+      
+      drvClosure = writeReferencesToFile drv;
+      
+    } ''
+      while read dep; do
+        echo Copying $dep
+        dir="$(dirname "$dep")"
+        mkdir -p "rootfs/$dir"
+        cp -drf --preserve=mode $dep "rootfs/$dir/"
+      done < "$drvClosure"
+
+      if [ -z "$onlyDeps" ]; then
+        cp -drf --preserve=mode $drv/* rootfs/
+      fi
+      
+      tar -C rootfs/ -cpzf $out .
+    '';
+
+  shellScript = text:
+    writeScript "script.sh" ''
+      #!${stdenv.shell}
+      set -e
+      export PATH=${coreutils}/bin:/bin
+
+      ${text}
+    '';
+
+  shadowSetup = ''
+    export PATH=${shadow}/bin:$PATH
+    mkdir -p /etc/pam.d
+    if [ ! -f /etc/passwd ]; then
+      echo "root:x:0:0::/root:/bin/sh" > /etc/passwd
+      echo "root:!x:::::::" > /etc/shadow
+    fi
+    if [ ! -f /etc/group ]; then
+      echo "root:x:0:" > /etc/group
+      echo "root:x::" > /etc/gshadow
+    fi
+    if [ ! -f /etc/pam.d/other ]; then
+      cat > /etc/pam.d/other <<EOF
+account sufficient pam_unix.so
+auth sufficient pam_rootok.so
+password requisite pam_unix.so nullok sha512
+session required pam_unix.so
+EOF
+    fi
+    if [ ! -f /etc/login.defs ]; then
+      touch /etc/login.defs
+    fi
+  '';
+
+  # Append to tar instead of unpacking
+  mergeTarballs = tarballs:
+    runCommand "merge-tars" { inherit tarballs; } ''
+      mkdir tmp
+      for tb in $tarballs; do
+        tar -C tmp -xkpf $tb
+      done
+      tar -C tmp -cpzf $out .
+    '';
+
+  runWithOverlay = { name , fromImage ? null, fromImageName ? null, fromImageTag ? null
+                   , diskSize ? 1024, preMount ? "", postMount ? "", postUmount ? "" }:
+    vmTools.runInLinuxVM (
+      runCommand name {
+        preVM = vmTools.createEmptyImage { size = diskSize; fullName = "docker-run-disk"; };
+
+        inherit fromImage fromImageName fromImageTag;
+        
+        buildInputs = [ utillinux e2fsprogs jshon ];
+      } ''
+      rm -rf $out
+      
+      mkdir disk
+      mkfs /dev/${vmTools.hd}
+      mount /dev/${vmTools.hd} disk
+      cd disk
+
+      if [ -n "$fromImage" ]; then
+        echo Unpacking base image
+        mkdir image
+        tar -C image -xpf "$fromImage"
+
+        if [ -z "$fromImageName" ]; then
+          fromImageName=$(jshon -k < image/repositories|head -n1)
+        fi
+        if [ -z "$fromImageTag" ]; then
+          fromImageTag=$(jshon -e $fromImageName -k < image/repositories|head -n1)
+        fi
+        parentID=$(jshon -e $fromImageName -e $fromImageTag -u < image/repositories)
+      fi
+
+      lowerdir=""
+      while [ -n "$parentID" ]; do
+        echo Unpacking layer $parentID
+        mkdir -p image/$parentID/layer
+        tar -C image/$parentID/layer -xpf image/$parentID/layer.tar
+        rm image/$parentID/layer.tar
+
+        find image/$parentID/layer -name ".wh.*" -exec bash -c 'name="$(basename {}|sed "s/^.wh.//")"; mknod "$(dirname {})/$name" c 0 0; rm {}' \;
+
+        lowerdir=$lowerdir''${lowerdir:+:}image/$parentID/layer
+        parentID=$(cat image/$parentID/json|(jshon -e parent -u 2>/dev/null || true))
+      done
+
+      mkdir work
+      mkdir layer
+      mkdir mnt
+
+      ${preMount}
+
+      if [ -n "$lowerdir" ]; then
+        mount -t overlay overlay -olowerdir=$lowerdir,workdir=work,upperdir=layer mnt
+      else
+        mount --bind layer mnt
+      fi
+
+      ${postMount}
+ 
+      umount mnt
+
+      pushd layer
+      find . -type c -exec bash -c 'name="$(basename {})"; touch "$(dirname {})/.wh.$name"; rm "{}"' \;
+      popd
+
+      ${postUmount}
+      '');
+
+  exportImage = { name ? fromImage.name, fromImage, fromImageName ? null, fromImageTag ? null, diskSize ? 1024 }:
+    runWithOverlay {
+      inherit name fromImage fromImageName fromImageTag diskSize;
+
+      postMount = ''
+        echo Packing raw image
+        tar -C mnt -czf $out .
+      '';
+    };
+    
+  mkPureLayer = { baseJson, contents ? null, extraCommands ? "" }:
+    runCommand "docker-layer" {
+      inherit baseJson contents extraCommands;
+
+      buildInputs = [ jshon ];
+    } ''
+      mkdir layer
+      if [ -n "$contents" ]; then
+        echo Adding contents
+        for c in $contents; do
+          cp -drf $c/* layer/
+          chmod -R ug+w layer/
+        done
+      fi
+
+      pushd layer
+      ${extraCommands}
+      popd
+      
+      echo Packing layer
+      mkdir $out
+      tar -C layer -cf $out/layer.tar .
+      ts=$(${tarsum} < $out/layer.tar)
+      cat ${baseJson} | jshon -s "$ts" -i checksum > $out/json
+      echo -n "1.0" > $out/VERSION
+    '';
+
+  mkRootLayer = { runAsRoot, baseJson, fromImage ? null, fromImageName ? null, fromImageTag ? null
+                , diskSize ? 1024, contents ? null, extraCommands ? "" }:
+    let runAsRootScript = writeScript "run-as-root.sh" runAsRoot;
+    in runWithOverlay {
+      name = "docker-layer";
+      
+      inherit fromImage fromImageName fromImageTag diskSize;
+
+      preMount = lib.optionalString (contents != null) ''
+        echo Adding contents
+        for c in ${builtins.toString contents}; do
+          cp -drf $c/* layer/
+          chmod -R ug+w layer/
+        done
+      '';
+
+      postMount = ''
+        mkdir -p mnt/{dev,proc,sys,nix/store}
+        mount --rbind /dev mnt/dev
+        mount --rbind /sys mnt/sys
+        mount --rbind /nix/store mnt/nix/store
+
+        unshare -imnpuf --mount-proc chroot mnt ${runAsRootScript}
+        umount -R mnt/dev mnt/sys mnt/nix/store
+        rmdir --ignore-fail-on-non-empty mnt/dev mnt/proc mnt/sys mnt/nix/store mnt/nix
+      '';
+ 
+      postUmount = ''
+        pushd layer
+        ${extraCommands}
+        popd
+
+        echo Packing layer
+        mkdir $out
+        tar -C layer -cf $out/layer.tar .
+        ts=$(${tarsum} < $out/layer.tar)
+        cat ${baseJson} | jshon -s "$ts" -i checksum > $out/json
+        echo -n "1.0" > $out/VERSION
+      '';
+    };
+
+  # 1. extract the base image
+  # 2. create the layer
+  # 3. add layer deps to the layer itself, diffing with the base image
+  # 4. compute the layer id
+  # 5. put the layer in the image
+  # 6. repack the image
+  buildImage = args@{ name, tag ? "latest"
+               , fromImage ? null, fromImageName ? null, fromImageTag ? null
+               , contents ? null, tarballs ? [], config ? null
+               , runAsRoot ? null, diskSize ? 1024, extraCommands ? "" }:
+
+    let
+
+      baseJson = writeText "${name}-config.json" (builtins.toJSON {
+          created = "1970-01-01T00:00:01Z";
+          architecture = "amd64";
+          os = "linux";
+          config = config;
+      });
+      
+      layer = (if runAsRoot == null
+               then mkPureLayer { inherit baseJson contents extraCommands; }
+               else mkRootLayer { inherit baseJson fromImage fromImageName fromImageTag contents runAsRoot diskSize extraCommands; });
+      depsTarball = mkTarball { name = "${name}-deps";
+                                drv = layer;
+                                onlyDeps = true; };
+      
+      result = runCommand "${name}.tar.gz" {
+        buildInputs = [ jshon ];
+
+        imageName = name;
+        imageTag = tag;
+        inherit fromImage baseJson;
+
+        mergedTarball = if tarballs == [] then depsTarball else mergeTarballs ([ depsTarball ] ++ tarballs);
+
+        passthru = {
+          buildArgs = args;
+        };
+      } ''
+        mkdir image
+        touch baseFiles
+        if [ -n "$fromImage" ]; then
+          echo Unpacking base image
+          tar -C image -xpf "$fromImage"
+          
+          if [ -z "$fromImageName" ]; then
+            fromImageName=$(jshon -k < image/repositories|head -n1)
+          fi
+          if [ -z "$fromImageTag" ]; then
+            fromImageTag=$(jshon -e $fromImageName -k < image/repositories|head -n1)
+          fi
+          parentID=$(jshon -e $fromImageName -e $fromImageTag -u < image/repositories)
+          
+          for l in image/*/layer.tar; do
+            tar -tf $l >> baseFiles
+          done
+        fi
+
+        chmod -R ug+rw image
+        
+        mkdir temp
+        cp ${layer}/* temp/
+        chmod ug+w temp/*
+        
+        echo Adding dependencies
+        tar -tf temp/layer.tar >> baseFiles
+        tar -tf "$mergedTarball" | grep -v ${layer} > layerFiles
+        if [ "$(wc -l layerFiles|cut -d ' ' -f 1)" -gt 3 ]; then
+          sed -i -e 's|^[\./]\+||' baseFiles layerFiles
+          comm <(sort -n baseFiles|uniq) <(sort -n layerFiles|uniq) -1 -3 > newFiles
+          mkdir deps
+          pushd deps
+          tar -xpf "$mergedTarball" --no-recursion --files-from ../newFiles 2>/dev/null || true
+          tar -rf ../temp/layer.tar --no-recursion --files-from ../newFiles 2>/dev/null || true
+          popd
+        else
+          echo No new deps, no diffing needed
+        fi 
+        
+        echo Adding meta
+        
+        if [ -n "$parentID" ]; then
+          cat temp/json | jshon -s "$parentID" -i parent > tmpjson
+          mv tmpjson temp/json
+        fi
+        
+        layerID=$(sha256sum temp/json|cut -d ' ' -f 1)
+        size=$(stat --printf="%s" temp/layer.tar)
+        cat temp/json | jshon -s "$layerID" -i id -n $size -i Size > tmpjson
+        mv tmpjson temp/json
+
+        mv temp image/$layerID
+        
+        jshon -n object \
+          -n object -s "$layerID" -i "$imageTag" \
+          -i "$imageName" > image/repositories
+
+        chmod -R a-w image
+
+        echo Cooking the image
+        tar -C image -czf $out .
+      '';
+
+    in
+
+      result;
+
+}
diff --git a/pkgs/build-support/docker/detjson.py b/pkgs/build-support/docker/detjson.py
new file mode 100644
index 000000000000..ba2c20a475a9
--- /dev/null
+++ b/pkgs/build-support/docker/detjson.py
@@ -0,0 +1,38 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# Deterministic layer json: https://github.com/docker/hub-feedback/issues/488
+
+import sys
+reload(sys)
+sys.setdefaultencoding('UTF8')
+import json
+
+# If any of the keys below are equal to a certain value
+# then we can delete it because it's the default value
+SAFEDELS = {
+    "Size": 0,
+    "config": {
+        "ExposedPorts": None,
+        "MacAddress": "",
+        "NetworkDisabled": False,
+        "PortSpecs": None,
+        "VolumeDriver": ""
+    }
+}
+SAFEDELS["container_config"] = SAFEDELS["config"]
+
+def makedet(j, safedels):
+    for k,v in safedels.items():
+        if type(v) == dict:
+            makedet(j[k], v)
+        elif k in j and j[k] == v:
+            del j[k]
+
+def main():
+    j = json.load(sys.stdin)
+    makedet(j, SAFEDELS)
+    json.dump(j, sys.stdout, sort_keys=True)
+
+if __name__ == '__main__':
+    main()
\ No newline at end of file
diff --git a/pkgs/build-support/docker/pull.nix b/pkgs/build-support/docker/pull.nix
new file mode 100644
index 000000000000..7115a83df426
--- /dev/null
+++ b/pkgs/build-support/docker/pull.nix
@@ -0,0 +1,50 @@
+{ stdenv, lib, curl, jshon, python, runCommand }:
+
+# Inspired and simplified version of fetchurl.
+# For simplicity we only support sha256.
+
+# Currently only registry v1 is supported, compatible with Docker Hub.
+
+{ imageName, imageTag ? "latest", imageId ? null
+, sha256, name ? "${imageName}-${imageTag}"
+, indexUrl ? "https://index.docker.io"
+, registryUrl ? "https://registry-1.docker.io"
+, registryVersion ? "v1"
+, curlOpts ? "" }:
+
+let layer = stdenv.mkDerivation {
+  inherit name imageName imageTag imageId
+          indexUrl registryUrl registryVersion curlOpts;
+
+  builder = ./pull.sh;
+  detjson = ./detjson.py;
+
+  buildInputs = [ curl jshon python ];
+
+  outputHashAlgo = "sha256";
+  outputHash = sha256;
+  outputHashMode = "recursive";
+
+  impureEnvVars = [
+    # We borrow these environment variables from the caller to allow
+    # easy proxy configuration.  This is impure, but a fixed-output
+    # derivation like fetchurl is allowed to do so since its result is
+    # by definition pure.
+    "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy"
+
+    # This variable allows the user to pass additional options to curl
+    "NIX_CURL_FLAGS"
+
+    # This variable allows overriding the timeout for connecting to
+    # the hashed mirrors.
+    "NIX_CONNECT_TIMEOUT"
+  ];
+  
+  # Doing the download on a remote machine just duplicates network
+  # traffic, so don't do that.
+  preferLocalBuild = true;
+};
+
+in runCommand "${name}.tar.gz" {} ''
+  tar -C ${layer} -czf $out .
+''
diff --git a/pkgs/build-support/docker/pull.sh b/pkgs/build-support/docker/pull.sh
new file mode 100644
index 000000000000..8a0782780afc
--- /dev/null
+++ b/pkgs/build-support/docker/pull.sh
@@ -0,0 +1,75 @@
+# Reference: docker src contrib/download-frozen-image.sh
+
+source $stdenv/setup
+
+# Curl flags to handle redirects, not use EPSV, handle cookies for
+# servers to need them during redirects, and work on SSL without a
+# certificate (this isn't a security problem because we check the
+# cryptographic hash of the output anyway).
+curl="curl \
+ --location --max-redirs 20 \
+ --retry 3 \
+ --fail \
+ --disable-epsv \
+ --cookie-jar cookies \
+ --insecure \
+ $curlOpts \
+ $NIX_CURL_FLAGS"
+
+baseUrl="$registryUrl/$registryVersion"
+
+fetchLayer() {
+    local url="$1"
+    local dest="$2"
+    local curlexit=18;
+
+    # if we get error code 18, resume partial download
+    while [ $curlexit -eq 18 ]; do
+        # keep this inside an if statement, since on failure it doesn't abort the script
+        if $curl -H "Authorization: Token $token" "$url" --output "$dest"; then
+            return 0
+        else
+            curlexit=$?;
+        fi
+    done
+
+    return $curlexit
+}
+
+token="$($curl -o /dev/null -D- -H 'X-Docker-Token: true' "$indexUrl/$registryVersion/repositories/$imageName/images" | grep X-Docker-Token | tr -d '\r' | cut -d ' ' -f 2)"
+
+if [ -z "$token" ]; then
+    echo "error: registry returned no token"
+    exit 1
+fi
+
+# token="${token//\"/\\\"}"
+
+if [ -z "$imageId" ]; then
+    imageId="$($curl -H "Authorization: Token $token" "$baseUrl/repositories/$imageName/tags/$imageTag")"
+    imageId="${imageId//\"/}"
+    if [ -z "$imageId" ]; then
+        echo "error: no image ID found for ${imageName}:${imageTag}"
+        exit 1
+    fi
+
+    echo "found image ${imageName}:${imageTag}@$imageId"
+fi
+
+mkdir -p $out
+
+jshon -n object \
+  -n object -s "$imageId" -i "$imageTag" \
+  -i "$imageName" > $out/repositories
+
+$curl -H "Authorization: Token $token" "$baseUrl/images/$imageId/ancestry" -o ancestry.json
+
+layerIds=$(jshon -a -u < ancestry.json)
+for layerId in $layerIds; do
+    echo "fetching layer $layerId"
+    
+    mkdir "$out/$layerId"
+    echo '1.0' > "$out/$layerId/VERSION"
+    $curl -H "Authorization: Token $token" "$baseUrl/images/$layerId/json" | python $detjson > "$out/$layerId/json"
+    fetchLayer "$baseUrl/images/$layerId/layer" "$out/$layerId/layer.tar"
+done
\ No newline at end of file
diff --git a/pkgs/build-support/docker/tarsum.go b/pkgs/build-support/docker/tarsum.go
new file mode 100644
index 000000000000..4c25f11b71e0
--- /dev/null
+++ b/pkgs/build-support/docker/tarsum.go
@@ -0,0 +1,24 @@
+package main
+
+import (
+    "tarsum"
+    "io"
+    "io/ioutil"
+    "fmt"
+    "os"
+)
+
+func main() {
+    ts, err := tarsum.NewTarSum(os.Stdin, false, tarsum.Version1)
+    if err != nil {
+        fmt.Println(err)
+        os.Exit(1)
+    }
+
+    if _, err = io.Copy(ioutil.Discard, ts); err != nil {
+        fmt.Println(err)
+        os.Exit(1)
+    }
+
+    fmt.Println(ts.Sum(nil))
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9474f0556e9d..e86ff62805d6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -289,6 +289,8 @@ let
 
   cmark = callPackage ../development/libraries/cmark { };
 
+  dockerTools = callPackage ../build-support/docker { };
+
   dotnetenv = callPackage ../build-support/dotnetenv {
     dotnetfx = dotnetfx40;
   };

From 2053b3a32ae671d268d3da78294502630b0ecfb4 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 6 Jan 2016 05:33:52 +0300
Subject: [PATCH 645/884] postsrsd: init at 1.3

---
 pkgs/servers/mail/postsrsd/default.nix | 31 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/servers/mail/postsrsd/default.nix

diff --git a/pkgs/servers/mail/postsrsd/default.nix b/pkgs/servers/mail/postsrsd/default.nix
new file mode 100644
index 000000000000..18c21ffc8154
--- /dev/null
+++ b/pkgs/servers/mail/postsrsd/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, cmake, help2man }:
+
+let
+  version = "1.3";
+
+in stdenv.mkDerivation {
+  name = "postsrsd-${version}";
+
+  src = fetchFromGitHub {
+    owner = "roehling";
+    repo = "postsrsd";
+    rev = version;
+    sha256 = "1z89qh2bnypgb4i2vs0zdzzpqlf445jixwa1acd955hryww50npv";
+  };
+
+  cmakeFlags = [ "-DGENERATE_SRS_SECRET=OFF" "-DINIT_FLAVOR=systemd" ];
+
+  preConfigure = ''
+    sed -i "s,\"/etc\",\"$out/etc\",g" CMakeLists.txt
+  '';
+
+  nativeBuildInputs = [ cmake help2man ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/roehling/postsrsd";
+    description = "Postfix Sender Rewriting Scheme daemon";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 252b567b7e6c..670dc1d0a7d5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9338,6 +9338,8 @@ let
   postfix30 = callPackage ../servers/mail/postfix/3.0.nix { };
   postfix = postfix30;
 
+  postsrsd = callPackage ../servers/mail/postsrsd { };
+
   pshs = callPackage ../servers/http/pshs { };
 
   libpulseaudio = callPackage ../servers/pulseaudio { libOnly = true; };

From c51d08cf271af95c62f40be9a281751669be55aa Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 6 Jan 2016 06:04:50 +0300
Subject: [PATCH 646/884] nixos/postsrsd: add module

---
 nixos/modules/misc/ids.nix               |   2 +
 nixos/modules/module-list.nix            |   1 +
 nixos/modules/services/mail/postsrsd.nix | 107 +++++++++++++++++++++++
 3 files changed, 110 insertions(+)
 create mode 100644 nixos/modules/services/mail/postsrsd.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index c9247815a35c..bcd1067b39c3 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -241,6 +241,7 @@
       nm-openvpn = 217;
       mathics = 218;
       ejabberd = 219;
+      postsrsd = 220;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -459,6 +460,7 @@
       nm-openvpn = 217;
       mathics = 218;
       ejabberd = 219;
+      postsrsd = 220;
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 33a45f2240cc..dc7bd86b40f8 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -189,6 +189,7 @@
   ./services/mail/mlmmj.nix
   ./services/mail/opensmtpd.nix
   ./services/mail/postfix.nix
+  ./services/mail/postsrsd.nix
   ./services/mail/spamassassin.nix
   ./services/misc/apache-kafka.nix
   ./services/misc/autofs.nix
diff --git a/nixos/modules/services/mail/postsrsd.nix b/nixos/modules/services/mail/postsrsd.nix
new file mode 100644
index 000000000000..36a0f8218d88
--- /dev/null
+++ b/nixos/modules/services/mail/postsrsd.nix
@@ -0,0 +1,107 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.postsrsd;
+
+in {
+
+  ###### interface
+
+  options = {
+
+    services.postsrsd = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Whether to enable the postsrsd SRS server for Postfix.";
+      };
+
+      domain = mkOption {
+        type = types.str;
+        description = "Domain name for rewrite";
+      };
+
+      secretsFile = mkOption {
+        type = types.path;
+        default = "/var/lib/postsrsd/postsrsd.secret";
+        description = "Secret keys used for signing and verification";
+      };
+
+      forwardPort = mkOption {
+        type = types.int;
+        default = 10001;
+        description = "Port for the forward SRS lookup";
+      };
+
+      reversePort = mkOption {
+        type = types.int;
+        default = 10002;
+        description = "Port for the reverse SRS lookup";
+      };
+
+      user = mkOption {
+        type = types.str;
+        default = "postsrsd";
+        description = "User for the daemon";
+      };
+
+      group = mkOption {
+        type = types.str;
+        default = "postsrsd";
+        description = "Group for the daemon";
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    services.postsrsd.domain = mkDefault config.networking.hostName;
+
+    users.extraUsers = optionalAttrs (cfg.user == "postsrsd") (singleton
+      { name = "postsrsd";
+        group = cfg.group;
+        uid = config.ids.uids.postsrsd;
+      });
+
+    users.extraGroups = optionalAttrs (cfg.group == "postsrsd") (singleton
+      { name = "postsrsd";
+        gid = config.ids.gids.postsrsd;
+      });
+
+    systemd.services.postsrsd = {
+      description = "PostSRSd SRS rewriting server";
+      after = [ "network.target" ];
+      before = [ "postfix.service" ];
+      wantedBy = [ "multi-user.target" ];
+
+      path = [ pkgs.coreutils ];
+
+      serviceConfig = {
+        ExecStart = ''${pkgs.postsrsd}/sbin/postsrsd "-s${cfg.secretsFile}" "-d${cfg.domain}" -f${toString cfg.forwardPort} -r${toString cfg.reversePort}'';
+        User = cfg.user;
+        Group = cfg.group;
+        PermissionsStartOnly = true;
+      };
+
+      preStart = ''
+        if [ ! -e "${cfg.secretsFile}" ]; then
+          echo "WARNING: secrets file not found, autogenerating!"
+          mkdir -p -m750 "$(dirname "${cfg.secretsFile}")"
+          dd if=/dev/random bs=18 count=1 | base64 > "${cfg.secretsFile}"
+          chmod 600 "${cfg.secretsFile}"
+        fi
+        chown "${cfg.user}:${cfg.group}" "${cfg.secretsFile}"
+      '';
+    };
+
+  };
+}

From 1ea34520cd431277dfd97499d3fa48d42d8c7999 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 2 Nov 2015 00:59:44 +0300
Subject: [PATCH 647/884] opendkim: adopt, cleanup and fix opendkim-genkey

---
 .../libraries/opendkim/default.nix            | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/opendkim/default.nix b/pkgs/development/libraries/opendkim/default.nix
index d84f9e755100..e89cd880df13 100644
--- a/pkgs/development/libraries/opendkim/default.nix
+++ b/pkgs/development/libraries/opendkim/default.nix
@@ -1,4 +1,5 @@
-{stdenv, fetchurl, openssl, libmilter, libbsd}:
+{ stdenv, fetchurl, pkgconfig, libbsd, openssl, libmilter
+, perl, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "opendkim-2.10.3";
@@ -7,15 +8,22 @@ stdenv.mkDerivation rec {
     sha256 = "06v8bqhh604sz9rh5bvw278issrwjgc4h1wx2pz9a84lpxbvm823";
   };
 
-  configureFlags="--with-openssl=${openssl} --with-milter=${libmilter}";
+  configureFlags= [ "--with-milter=${libmilter}" ];
 
-  buildInputs = [openssl libmilter libbsd];
-  
-  meta = {
+  nativeBuildInputs = [ pkgconfig makeWrapper ];
+
+  buildInputs = [ libbsd openssl libmilter perl ];
+
+  postInstall = ''
+    wrapProgram $out/sbin/opendkim-genkey \
+      --prefix PATH : ${openssl}/bin
+  '';
+
+  meta = with stdenv.lib; {
     description = "C library for producing DKIM-aware applications and an open source milter for providing DKIM service";
-    homepage = http://opendkim.org/;
-    maintainers = [ ];
-    platforms = with stdenv.lib.platforms; all;
+    homepage = http://www.opendkim.org/;
+    maintainers = with maintainers; [ abbradar ];
+    license = licenses.bsd3;
+    platforms = platforms.unix;
   };
-
 }

From f5efac09aaced787d9fc80c1e192367e6f93d9fb Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 7 Jan 2016 01:10:56 +0300
Subject: [PATCH 648/884] nixos/opendkim: add module

---
 nixos/modules/misc/ids.nix               |   2 +
 nixos/modules/module-list.nix            |   1 +
 nixos/modules/services/mail/opendkim.nix | 109 +++++++++++++++++++++++
 3 files changed, 112 insertions(+)
 create mode 100644 nixos/modules/services/mail/opendkim.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index bcd1067b39c3..83c5fde829f1 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -242,6 +242,7 @@
       mathics = 218;
       ejabberd = 219;
       postsrsd = 220;
+      opendkim = 221;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -461,6 +462,7 @@
       mathics = 218;
       ejabberd = 219;
       postsrsd = 220;
+      opendkim = 221;
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index dc7bd86b40f8..41389c711121 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -187,6 +187,7 @@
   ./services/mail/freepops.nix
   ./services/mail/mail.nix
   ./services/mail/mlmmj.nix
+  ./services/mail/opendkim.nix
   ./services/mail/opensmtpd.nix
   ./services/mail/postfix.nix
   ./services/mail/postsrsd.nix
diff --git a/nixos/modules/services/mail/opendkim.nix b/nixos/modules/services/mail/opendkim.nix
new file mode 100644
index 000000000000..1cdae9cb6548
--- /dev/null
+++ b/nixos/modules/services/mail/opendkim.nix
@@ -0,0 +1,109 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.opendkim;
+
+  defaultSock = "local:/run/opendkim/opendkim.sock";
+
+  args = [ "-f" "-l"
+           "-p" cfg.socket
+           "-d" cfg.domains
+           "-k" cfg.keyFile
+           "-s" cfg.selector
+         ] ++ optionals (cfg.configFile != null) [ "-x" cfg.configFile ];
+
+in {
+
+  ###### interface
+
+  options = {
+
+    services.opendkim = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Whether to enable the OpenDKIM sender authentication system.";
+      };
+
+      socket = mkOption {
+        type = types.str;
+        default = defaultSock;
+        description = "Socket which is used for communication with OpenDKIM.";
+      };
+
+      user = mkOption {
+        type = types.str;
+        default = "opendkim";
+        description = "User for the daemon.";
+      };
+
+      group = mkOption {
+        type = types.str;
+        default = "opendkim";
+        description = "Group for the daemon.";
+      };
+
+      domains = mkOption {
+        type = types.str;
+        description = "Local domains set; messages from them are signed, not verified.";
+      };
+
+      keyFile = mkOption {
+        type = types.path;
+        description = "Secret key file used for signing messages.";
+      };
+
+      selector = mkOption {
+        type = types.str;
+        description = "Selector to use when signing.";
+      };
+
+      configFile = mkOption {
+        type = types.nullOr types.path;
+        default = null;
+        description = "Additional opendkim configuration.";
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    services.opendkim.domains = mkDefault "csl:${config.networking.hostName}";
+
+    users.extraUsers = optionalAttrs (cfg.user == "opendkim") (singleton
+      { name = "opendkim";
+        group = cfg.group;
+        uid = config.ids.uids.opendkim;
+      });
+
+    users.extraGroups = optionalAttrs (cfg.group == "opendkim") (singleton
+      { name = "opendkim";
+        gid = config.ids.gids.opendkim;
+      });
+
+    environment.systemPackages = [ pkgs.opendkim ];
+
+    systemd.services.opendkim = {
+      description = "OpenDKIM signing and verification daemon";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+
+      serviceConfig = {
+        ExecStart = "${pkgs.opendkim}/bin/opendkim ${concatMapStringsSep " " escapeShellArg args}";
+        User = cfg.user;
+        Group = cfg.group;
+        RuntimeDirectory = optional (cfg.socket == defaultSock) "opendkim";
+      };
+    };
+
+  };
+}

From f5835ce77f75da92309153d899b1f17500b6765b Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 2 Nov 2015 03:46:18 +0300
Subject: [PATCH 649/884] dspam: init at 3.10.2

---
 pkgs/servers/mail/dspam/default.nix | 106 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |   4 ++
 2 files changed, 110 insertions(+)
 create mode 100644 pkgs/servers/mail/dspam/default.nix

diff --git a/pkgs/servers/mail/dspam/default.nix b/pkgs/servers/mail/dspam/default.nix
new file mode 100644
index 000000000000..2b5949959516
--- /dev/null
+++ b/pkgs/servers/mail/dspam/default.nix
@@ -0,0 +1,106 @@
+{ stdenv, lib, fetchurl, makeWrapper
+, gawk, gnused, gnugrep, coreutils
+, perl, NetSMTP
+, withMySQL ? false, zlib, libmysql
+, withPgSQL ? false, postgresql
+, withSQLite ? false, sqlite
+, withDB ? false, db
+}:
+
+let
+  drivers = lib.concatStringsSep ","
+            ([ "hash_drv" ]
+             ++ lib.optional withMySQL "mysql_drv"
+             ++ lib.optional withPgSQL "pgsql_drv"
+             ++ lib.optional withSQLite "sqlite3_drv"
+             ++ lib.optional withDB "libdb4_drv"
+            );
+  maintenancePath = lib.makeSearchPath "bin" [ gawk gnused gnugrep coreutils ];
+
+in stdenv.mkDerivation rec {
+  name = "dspam-3.10.2";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/dspam/dspam/${name}/${name}.tar.gz";
+    sha256 = "1acklnxn1wvc7abn31l3qdj8q6k13s51k5gv86vka7q20jb5cxmf";
+  };
+
+  buildInputs = [ perl ]
+                ++ lib.optionals withMySQL [ zlib libmysql ]
+                ++ lib.optional withPgSQL postgresql
+                ++ lib.optional withSQLite sqlite
+                ++ lib.optional withDB db;
+  nativeBuildInputs = [ makeWrapper ];
+
+  configureFlags = [
+    "--with-storage-driver=${drivers}"
+    "--sysconfdir=/etc/dspam"
+    "--localstatedir=/var"
+    "--with-dspam-home=/var/lib/dspam"
+    "--with-logdir=/var/log/dspam"
+    "--with-logfile=/var/log/dspam/dspam.log"
+
+    "--enable-daemon"
+    "--enable-clamav"
+    "--enable-syslog"
+    "--enable-large-scale"
+    "--enable-virtual-users"
+    "--enable-split-configuration"
+    "--enable-preferences-extension"
+    "--enable-long-usernames"
+    "--enable-external-lookup"
+  ] ++ lib.optional withMySQL "--with-mysql-includes=${libmysql}/include/mysql";
+
+  # Lots of things are hardwired to paths like sysconfdir. That's why we install with both "prefix" and "DESTDIR"
+  # and fix directory structure manually after that.
+  installFlags = [ "DESTDIR=$(out)" ];
+
+  postInstall = ''
+    cp -r $out/$out/* $out
+    rm -rf $out/$(echo "$out" | cut -d "/" -f2)
+    rm -rf $out/var
+
+    wrapProgram $out/bin/dspam_notify \
+      --set PERL5LIB "${lib.makePerlPath [ NetSMTP ]}"
+
+    # Install SQL scripts
+    mkdir -p $out/share/dspam/sql
+    # MySQL
+    cp src/tools.mysql_drv/mysql_*.sql $out/share/dspam/sql
+    for i in src/tools.mysql_drv/{purge*.sql,virtual*.sql}; do
+      cp "$i" $out/share/dspam/sql/mysql_$(basename "$i")
+    done
+    # PostgreSQL
+    cp src/tools.pgsql_drv/pgsql_*.sql $out/share/dspam/sql
+    for i in src/tools.pgsql_drv/{purge*.sql,virtual*.sql}; do
+      cp "$i" $out/share/dspam/sql/pgsql_$(basename "$i")
+    done
+    # SQLite
+    for i in src/tools.sqlite_drv/purge*.sql; do
+      cp "$i" $out/share/dspam/sql/sqlite_$(basename "$i")
+    done
+
+    # Install maintenance script
+    install -Dm755 contrib/dspam_maintenance/dspam_maintenance.sh $out/bin/dspam_maintenance
+    sed -i \
+      -e '2iexport PATH=${maintenancePath}:$PATH' \
+      -e 's,/usr/[a-z0-9/]*,,g' \
+      -e 's,^DSPAM_CONFIGDIR=.*,DSPAM_CONFIGDIR=/etc/dspam,' \
+      -e "s,^DSPAM_HOMEDIR=.*,DSPAM_HOMEDIR=/var/lib/dspam," \
+      -e "s,^DSPAM_PURGE_SCRIPT_DIR=.*,DSPAM_PURGE_SCRIPT_DIR=$out/share/dspam/sql," \
+      -e "s,^DSPAM_BIN_DIR=.*,DSPAM_BIN_DIR=$out/bin," \
+      -e "s,^MYSQL_BIN_DIR=.*,MYSQL_BIN_DIR=/run/current-system/sw/bin," \
+      -e "s,^PGSQL_BIN_DIR=.*,PGSQL_BIN_DIR=/run/current-system/sw/bin," \
+      -e "s,^SQLITE_BIN_DIR=.*,SQLITE_BIN_DIR=/run/current-system/sw/bin," \
+      -e "s,^SQLITE3_BIN_DIR=.*,SQLITE3_BIN_DIR=/run/current-system/sw/bin," \
+      $out/bin/dspam_maintenance
+  '';
+
+  meta = with lib; {
+    homepage = http://dspam.nuclearelephant.com/;
+    description = "Community Driven Antispam Filter";
+    license = licenses.agpl3;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 670dc1d0a7d5..d8a56bcb1795 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9189,6 +9189,10 @@ let
 
   dovecot_pigeonhole = callPackage ../servers/mail/dovecot-pigeonhole { };
 
+  dspam = callPackage ../servers/mail/dspam {
+    inherit (perlPackages) NetSMTP;
+  };
+
   etcd = goPackages.etcd.bin // { outputs = [ "bin" ]; };
 
   ejabberd = callPackage ../servers/xmpp/ejabberd { };

From b4179c56124b7fca8280271c806f3482cd8c3ab1 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 7 Jan 2016 04:17:42 +0300
Subject: [PATCH 650/884] nixos/dspam: add module

---
 nixos/modules/misc/ids.nix            |   2 +
 nixos/modules/module-list.nix         |   1 +
 nixos/modules/services/mail/dspam.nix | 147 ++++++++++++++++++++++++++
 3 files changed, 150 insertions(+)
 create mode 100644 nixos/modules/services/mail/dspam.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 83c5fde829f1..f24afccb405a 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -243,6 +243,7 @@
       ejabberd = 219;
       postsrsd = 220;
       opendkim = 221;
+      dspam = 222;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -463,6 +464,7 @@
       ejabberd = 219;
       postsrsd = 220;
       opendkim = 221;
+      dspam = 222;
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 41389c711121..b2f08feb1082 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -183,6 +183,7 @@
   ./services/logging/syslogd.nix
   ./services/logging/syslog-ng.nix
   ./services/mail/dovecot.nix
+  ./services/mail/dspam.nix
   ./services/mail/exim.nix
   ./services/mail/freepops.nix
   ./services/mail/mail.nix
diff --git a/nixos/modules/services/mail/dspam.nix b/nixos/modules/services/mail/dspam.nix
new file mode 100644
index 000000000000..10352ba6abcc
--- /dev/null
+++ b/nixos/modules/services/mail/dspam.nix
@@ -0,0 +1,147 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.dspam;
+
+  dspam = pkgs.dspam;
+
+  defaultSock = "/run/dspam/dspam.sock";
+
+  cfgfile = pkgs.writeText "dspam.conf" ''
+    Home /var/lib/dspam
+    StorageDriver ${dspam}/lib/dspam/lib${cfg.storageDriver}_drv.so
+
+    Trust root
+    Trust ${cfg.user}
+    SystemLog on
+    UserLog on
+
+    ${optionalString (cfg.domainSocket != null) ''ServerDomainSocketPath "${cfg.domainSocket}"''}
+
+    ${cfg.extraConfig}
+  '';
+
+in {
+
+  ###### interface
+
+  options = {
+
+    services.dspam = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Whether to enable the dspam spam filter.";
+      };
+
+      user = mkOption {
+        type = types.str;
+        default = "dspam";
+        description = "User for the dspam daemon.";
+      };
+
+      group = mkOption {
+        type = types.str;
+        default = "dspam";
+        description = "Group for the dspam daemon.";
+      };
+
+      storageDriver = mkOption {
+        type = types.str;
+        default = "hash";
+        description =  "Storage driver backend to use for dspam.";
+      };
+
+      domainSocket = mkOption {
+        type = types.nullOr types.path;
+        default = defaultSock;
+        description = "Path to local domain socket which is used for communication with the daemon. Set to null to disable UNIX socket.";
+      };
+
+      extraConfig = mkOption {
+        type = types.lines;
+        default = "";
+        description = "Additional dspam configuration.";
+      };
+
+      maintenanceInterval = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        description = "If set, maintenance script will be run at specified (in systemd.timer format) interval";
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable (mkMerge [
+    {
+      users.extraUsers = optionalAttrs (cfg.user == "dspam") (singleton
+        { name = "dspam";
+          group = cfg.group;
+          uid = config.ids.uids.dspam;
+        });
+
+      users.extraGroups = optionalAttrs (cfg.group == "dspam") (singleton
+        { name = "dspam";
+          gid = config.ids.gids.dspam;
+        });
+
+      environment.systemPackages = [ dspam ];
+
+      environment.etc."dspam/dspam.conf".source = cfgfile;
+
+      systemd.services.dspam = {
+        description = "dspam spam filtering daemon";
+        wantedBy = [ "multi-user.target" ];
+        restartTriggers = [ cfgfile ];
+
+        serviceConfig = {
+          ExecStart = "${dspam}/bin/dspam --daemon --nofork";
+          User = cfg.user;
+          Group = cfg.group;
+          RuntimeDirectory = optional (cfg.domainSocket == defaultSock) "dspam";
+          PermissionsStartOnly = true;
+        };
+
+        preStart = ''
+          mkdir -m750 -p /var/lib/dspam
+          chown -R "${cfg.user}:${cfg.group}" /var/lib/dspam
+
+          mkdir -m750 -p /var/log/dspam
+          chown -R "${cfg.user}:${cfg.group}" /var/log/dspam
+        '';
+      };
+    }
+
+    (mkIf (cfg.maintenanceInterval != null) {
+      systemd.timers.dspam-maintenance = {
+        description = "Timer for dspam maintenance script";
+        wantedBy = [ "timers.target" ];
+        timerConfig = {
+          OnCalendar = cfg.maintenanceInterval;
+          Unit = "dspam-maintenance.service";
+        };
+      };
+
+      systemd.services.dspam-maintenance = {
+        description = "dspam maintenance script";
+        restartTriggers = [ cfgfile ];
+
+        serviceConfig = {
+          ExecStart = "${dspam}/bin/dspam_maintenance";
+          Type = "oneshot";
+          User = cfg.user;
+          Group = cfg.group;
+        };
+      };
+    })
+  ]);
+}

From d0e3cca04edd5d1b3d61f188b4a5f61f35cdf1ce Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 13 Jan 2016 13:26:28 +0300
Subject: [PATCH 651/884] tlp: add more shell script dependencies

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

diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix
index d21b4fb2f3f8..7b57458bd3f4 100644
--- a/pkgs/tools/misc/tlp/default.nix
+++ b/pkgs/tools/misc/tlp/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchFromGitHub, makeWrapper, perl, systemd, iw, rfkill, hdparm, ethtool, inetutils
-, module_init_tools, pciutils, smartmontools, x86_energy_perf_policy
+, module_init_tools, pciutils, smartmontools, x86_energy_perf_policy, gawk, gnugrep, coreutils
 , enableRDW ? false, networkmanager
 }:
 
@@ -28,7 +28,7 @@ in stdenv.mkDerivation {
 
   paths = lib.makeSearchPath "bin"
           ([ iw rfkill hdparm ethtool inetutils systemd module_init_tools pciutils smartmontools
-             x86_energy_perf_policy
+             x86_energy_perf_policy gawk gnugrep coreutils
            ]
            ++ lib.optional enableRDW networkmanager
           );

From 893f376587664a086205b2ef795dd3b14ba7be29 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 10 Jan 2016 20:24:23 +0300
Subject: [PATCH 652/884] rustRegistry: 2015-12-23 -> 2016-01-10

---
 pkgs/top-level/rust-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix
index 1f43751bc737..d19131dab83d 100644
--- a/pkgs/top-level/rust-packages.nix
+++ b/pkgs/top-level/rust-packages.nix
@@ -7,15 +7,15 @@
 { runCommand, fetchFromGitHub, git }:
 
 let
-  version = "2015-12-23";
-  rev = "0fd482d73d5a13fd49a36d2940ad7a069a6fc049";
+  version = "2016-01-10";
+  rev = "d4120073882c5520f66ed56729b38af2063c2d28";
 
   src = fetchFromGitHub {
       inherit rev;
 
       owner = "rust-lang";
       repo = "crates.io-index";
-      sha256 = "18g69d7npky31rbd4bfcps9180bhfnddg2vhp9w1w0smvgzmg0i3";
+      sha256 = "1xxsaz3inxpkn25afbi8ncwnhns2vpr2f845wk2vs3vv7qpyr0a4";
   };
 
 in

From cdb5f269e2c8efb8379d0624d3a2c9135298b20c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 10 Jan 2016 20:25:07 +0300
Subject: [PATCH 653/884] rustcMaster: 2015-12-09 -> 2016-01-10

---
 pkgs/development/compilers/rustc/head.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix
index ccbfc51b671a..2cefc4cfc137 100644
--- a/pkgs/development/compilers/rustc/head.nix
+++ b/pkgs/development/compilers/rustc/head.nix
@@ -2,11 +2,11 @@
 { stdenv, callPackage }:
 
 callPackage ./generic.nix {
-  shortVersion = "2015-12-09";
+  shortVersion = "2016-01-10";
   isRelease = false;
-  forceBundledLLVM = true;
-  srcRev = "462ec0576";
-  srcSha = "1mci0hxwnqb24j4k68rgffqk8ccznz2iddfmyhi8wxa094hqgghp";
+  forceBundledLLVM = false;
+  srcRev = "d70ab2bdf16c22b9f3ff0230089b44855e3f1593";
+  srcSha = "13ssis1bdgg8sdkgrvxcbd1qcfmf7q6bv4akfxrjgdm44l1n1l97";
 
   /* Rust is bootstrapped from an earlier built version. We need
   to fetch these earlier versions, which vary per platform.
@@ -15,12 +15,12 @@ callPackage ./generic.nix {
   with the set you want at the top.
   */
 
-  snapshotHashLinux686 = "e2553bf399cd134a08ef3511a0a6ab0d7a667216";
-  snapshotHashLinux64 = "7df8ba9dec63ec77b857066109d4b6250f3d222f";
-  snapshotHashDarwin686 = "29750870c82a0347f8b8b735a4e2e0da26f5098d";
-  snapshotHashDarwin64 = "c9f2c588238b4c6998190c3abeb33fd6164099a2";
-  snapshotDate = "2015-08-11";
-  snapshotRev = "1af31d4";
+  snapshotHashLinux686 = "a09c4a4036151d0cb28e265101669731600e01f2";
+  snapshotHashLinux64 = "97e2a5eb8904962df8596e95d6e5d9b574d73bf4";
+  snapshotHashDarwin686 = "ca52d2d3ba6497ed007705ee3401cf7efc136ca1";
+  snapshotHashDarwin64 = "3c44ffa18f89567c2b81f8d695e711c86d81ffc7";
+  snapshotDate = "2015-12-18";
+  snapshotRev = "3391630";
 
   patches = [ ./patches/remove-uneeded-git.patch ]
     ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;

From d1ed30ac0d6704300ba5c4251bb4b253a8f19329 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 10 Jan 2016 20:51:11 +0300
Subject: [PATCH 654/884] cargoUnstable: init at 2016-01-10

---
 .../tools/build-managers/cargo/head.nix       | 39 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  7 +++-
 2 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/tools/build-managers/cargo/head.nix

diff --git a/pkgs/development/tools/build-managers/cargo/head.nix b/pkgs/development/tools/build-managers/cargo/head.nix
new file mode 100644
index 000000000000..d5a2dce66828
--- /dev/null
+++ b/pkgs/development/tools/build-managers/cargo/head.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchgit, rustPlatform, file, curl, python, pkgconfig, openssl
+, cmake, zlib, makeWrapper }:
+
+with rustPlatform;
+
+with ((import ./common.nix) {
+  inherit stdenv rustc;
+  version = "2016-01-10";
+});
+
+buildRustPackage rec {
+  inherit name version meta passthru;
+
+  # Needs to use fetchgit instead of fetchFromGitHub to fetch submodules
+  src = fetchgit {
+    url = "git://github.com/rust-lang/cargo";
+    rev = "ca373452de159491354cf38279dbc19308c91e72";
+    sha256 = "0fx88b3ndvzhfwq159xavs0z5c7jww231kd65cbzyih9g0ab9x65";
+  };
+
+  depsSha256 = "0csagk2dnwg5z0vbxilz1kzcygd4llw7s81ka0xn1g05x30jqrnn";
+
+  buildInputs = [ file curl pkgconfig python openssl cmake zlib makeWrapper ];
+
+  configurePhase = ''
+    ./configure --enable-optimize --prefix=$out --local-cargo=${cargo}/bin/cargo
+  '';
+
+  buildPhase = "make";
+
+  # Disable check phase as there are lots of failures (some probably due to
+  # trying to access the network).
+  doCheck = false;
+
+  installPhase = ''
+    make install
+    ${postInstall}
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eddb75c31446..52ec706ad7ba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4878,8 +4878,7 @@ let
   rustPlatform = rustStable;
 
   rustStable = recurseIntoAttrs (makeRustPlatform cargo rustStable);
-  rustUnstable = recurseIntoAttrs (makeRustPlatform
-    (cargo.override { rustPlatform = rustUnstableCargoPlatform; }) rustUnstable);
+  rustUnstable = recurseIntoAttrs (makeRustPlatform cargoUnstable rustUnstable);
 
   # rust platform to build cargo itself (with cargoSnapshot)
   rustCargoPlatform = makeRustPlatform (cargoSnapshot rustc) rustCargoPlatform;
@@ -5533,6 +5532,10 @@ let
     rustPlatform = rustCargoPlatform;
   };
 
+  cargoUnstable = callPackage ../development/tools/build-managers/cargo/head.nix {
+    rustPlatform = rustUnstableCargoPlatform;
+  };
+
   cargoSnapshot = rustc:
     callPackage ../development/tools/build-managers/cargo/snapshot.nix {
       inherit rustc;

From 6ea56a46fb9a8eed9acd9e341cf2ae1c90d52944 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Wed, 13 Jan 2016 10:49:34 +0000
Subject: [PATCH 655/884] titaniumsdk: bump to version 5.1.2

---
 .../mobile/titaniumenv/titaniumsdk-5.1.nix           | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-5.1.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-5.1.nix
index fce14c383c13..670e55e0f304 100644
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk-5.1.nix
+++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-5.1.nix
@@ -1,14 +1,14 @@
 {stdenv, fetchurl, unzip, makeWrapper, python, jdk}:
 
 stdenv.mkDerivation {
-  name = "mobilesdk-5.1.1.GA";
+  name = "mobilesdk-5.1.2.GA";
   src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl {
-    url = http://builds.appcelerator.com/mobile/5_1_1/mobilesdk-5.1.1.v20151203123251-linux.zip;
-    sha256 = "197pia5a0bacwwyi0s7s69iyx4i2jdrgjc3ybiahaqv27dhw9zr2";
+    url = http://builds.appcelerator.com/mobile/5_1_X/mobilesdk-5.1.2.v20151216190036-linux.zip;
+    sha256 = "013ipqwkfqj60mn09jbbf6a9mc4pjrn0kr0ix906whzb888zz6bv";
   }
   else if stdenv.system == "x86_64-darwin" then fetchurl {
-    url = http://builds.appcelerator.com/mobile/5_1_1/mobilesdk-5.1.1.v20151203123251-osx.zip;
-    sha256 = "1ij2zc5450fnl13w8ia1z6pa12vja6ks1ssvlb73n2rx52krgvxr";
+    url = http://builds.appcelerator.com/mobile/5_1_X/mobilesdk-5.1.2.v20151216190036-osx.zip;
+    sha256 = "1ylwh7zxa5yfyckzn3a9zc4cmh8gdndgb3jyr61s3j7zb1whn9ww";
   }
   else throw "Platform: ${stdenv.system} not supported!";
   
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
     
     # Rename ugly version number
     cd mobilesdk/*
-    mv * 5.1.1.GA
+    mv * 5.1.2.GA
     cd *
     
     # Hack to make dx.jar work with new build-tools

From 487a684bad4a618e8231dc6a0abc0fe751f4cf73 Mon Sep 17 00:00:00 2001
From: Louis Taylor <louis@kragniz.eu>
Date: Wed, 13 Jan 2016 11:08:21 +0000
Subject: [PATCH 656/884] gimp: 2.8.14 -> 2.8.16

---
 pkgs/applications/graphics/gimp/2.8.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix
index 7c394ae11c6f..954a1d4c19c9 100644
--- a/pkgs/applications/graphics/gimp/2.8.nix
+++ b/pkgs/applications/graphics/gimp/2.8.nix
@@ -4,11 +4,11 @@
 , python, pygtk, libart_lgpl, libexif, gettext, xorg, wrapPython }:
 
 stdenv.mkDerivation rec {
-  name = "gimp-2.8.14";
+  name = "gimp-2.8.16";
 
   src = fetchurl {
     url = "http://download.gimp.org/pub/gimp/v2.8/${name}.tar.bz2";
-    sha256 = "d82a958641c9c752d68e35f65840925c08e314cea90222ad845892a40e05b22d";
+    sha256 = "1dsgazia9hmab8cw3iis7s69dvqyfj5wga7ds7w2q5mms1xqbqwm";
   };
 
   buildInputs =

From e45bd511f732d96ba76abc4dfa2af17f9a212bcd Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 13 Jan 2016 11:41:07 +0100
Subject: [PATCH 657/884] pythonPackages.pyaudio: 0.2.4 -> 0.2.9

Update python-pyaudio to the latest version.
buildPythonPackage is now used instead of mkDerivation.

pyaudio does not have an automated test suite but there are some
examples.
---
 pkgs/top-level/python-packages.nix | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 474ea6a8a05f..a1da200c3069 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14601,24 +14601,18 @@ in modules // {
     };
   };
 
-  pyaudio = pkgs.stdenv.mkDerivation rec {
+  pyaudio = buildPythonPackage rec {
     name = "python-pyaudio-${version}";
-    version = "0.2.4";
+    version = "0.2.9";
 
     src = pkgs.fetchurl {
-      url = "http://people.csail.mit.edu/hubert/pyaudio/packages/pyaudio-${version}.tar.gz";
-      md5 = "623809778f3d70254a25492bae63b575";
+      url = "https://pypi.python.org/packages/source/P/PyAudio/PyAudio-${version}.tar.gz";
+      sha256 = "bfd694272b3d1efc51726d0c27650b3c3ba1345f7f8fdada7e86c9751ce0f2a1";
     };
 
-    buildInputs = with self; [ python pkgs.portaudio ];
+    disabled = isPyPy;
 
-    buildPhase = if stdenv.isDarwin then ''
-      PORTAUDIO_PATH="${pkgs.portaudio}" ${python}/bin/${python.executable} setup.py build --static-link
-    '' else ''
-      ${python}/bin/${python.executable} setup.py build
-    '';
-
-    installPhase = "${python}/bin/${python.executable} setup.py install --prefix=$out";
+    buildInputs = with self; [ pkgs.portaudio ];
 
     meta = {
       description = "Python bindings for PortAudio";

From 2dd99b8abb8cb5f687efa07ef6560e5e4afbae92 Mon Sep 17 00:00:00 2001
From: Louis Taylor <louis@kragniz.eu>
Date: Wed, 13 Jan 2016 11:46:15 +0000
Subject: [PATCH 658/884] kmod: 21 -> 22

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

diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix
index 45ca5d0d21d3..1b12a0076b45 100644
--- a/pkgs/os-specific/linux/kmod/default.nix
+++ b/pkgs/os-specific/linux/kmod/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, xz, zlib, pkgconfig, libxslt }:
 
 stdenv.mkDerivation rec {
-  name = "kmod-21";
+  name = "kmod-22";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/kernel/kmod/${name}.tar.xz";
-    sha256 = "1h4m1mkknxcshsz1qbg9riszmynix2ikg7q8inq7bkvlmx4982hn";
+    sha256 = "10lzfkmnpq6a43a3gkx7x633njh216w0bjwz31rv8a1jlgg1sfxs";
   };
 
   # Disable xz/zlib support to prevent needing them in the initrd.

From dbac5951de93ea97320f0d6527ff00048fcf26ed Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 13 Jan 2016 14:57:40 +0300
Subject: [PATCH 659/884] pg_top: add license and platforms

---
 pkgs/tools/misc/pg_top/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/misc/pg_top/default.nix b/pkgs/tools/misc/pg_top/default.nix
index 0d379cd11d4a..4de334331158 100644
--- a/pkgs/tools/misc/pg_top/default.nix
+++ b/pkgs/tools/misc/pg_top/default.nix
@@ -1,16 +1,16 @@
-{stdenv, fetchurl, ncurses, postgresql}:
+{ stdenv, fetchurl, ncurses, postgresql }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "pg_top-3.7.0";
 
   src = fetchurl {
-    url = http://pgfoundry.org/frs/download.php/1781/pg_top-3.7.0.tar.gz;
+    url = "http://pgfoundry.org/frs/download.php/1781/${name}.tar.gz";
     sha256 = "17xrv0l58rv3an06gkajzw0gg6v810xx6vl137an1iykmhvfh7h2";
   };
 
-  buildInputs = [ncurses postgresql]; 
+  buildInputs = [ ncurses postgresql ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A 'top' like tool for PostgreSQL";
     longDescription = '' 
       pg_top allows you to: 
@@ -21,8 +21,10 @@ stdenv.mkDerivation {
         <listitem>View user table statistics.</listitem>
         <listitem>View user index statistics.</listitem>
       </itemizedlist>
-    ''; 
+    '';
 
     homepage = http://ptop.projects.postgresql.org/;
+    platforms = platforms.linux;
+    license = licenses.free; # see commands.c
   };
 }

From f96a72dc04f2348e3f1b92edcabc9a765f1f1d79 Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Wed, 13 Jan 2016 13:02:03 +0100
Subject: [PATCH 660/884] qtpass: 1.0.5 -> 1.0.6

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

diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix
index 3d45ef6884c4..940aa8eb4bf4 100644
--- a/pkgs/applications/misc/qtpass/default.nix
+++ b/pkgs/applications/misc/qtpass/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "qtpass-${version}";
-  version = "1.0.5";
+  version = "1.0.6";
 
   src = fetchurl {
     url = "https://github.com/IJHack/qtpass/archive/v${version}.tar.gz";
-    sha256 = "0c07bd1eb9e5336c0225f891e5b9a9df103f218619cf7ec6311edf654e8db281";
+    sha256 = "ccad9a06e3efa23278fa3e958185bf24fb3800874d8165be4ae6649706a2ab1c";
   };
 
   buildInputs = [ git gnupg makeWrapper pass qtbase qttools ];

From 6ac550a3e9607fd4f7ab7bd808f0faa4a2af22ec Mon Sep 17 00:00:00 2001
From: Louis Taylor <louis@kragniz.eu>
Date: Wed, 13 Jan 2016 12:06:29 +0000
Subject: [PATCH 661/884] powertop: 2.7 -> 2.8

Removed patch, since an equivalent fix was made upstream and included in
the 2.8 release.
---
 pkgs/os-specific/linux/powertop/auto-tune.patch | 11 -----------
 pkgs/os-specific/linux/powertop/default.nix     |  8 ++------
 2 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/powertop/auto-tune.patch

diff --git a/pkgs/os-specific/linux/powertop/auto-tune.patch b/pkgs/os-specific/linux/powertop/auto-tune.patch
deleted file mode 100644
index c9095336e8dc..000000000000
--- a/pkgs/os-specific/linux/powertop/auto-tune.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/src/devices/devfreq.cpp b/src/devices/devfreq.cpp
-index d2e56e3..4de5c9b 100644
---- a/src/devices/devfreq.cpp
-+++ b/src/devices/devfreq.cpp
-@@ -247,6 +247,7 @@ void create_all_devfreq_devices(void)
- 		fprintf(stderr, "Devfreq not enabled\n");
- 		is_enabled = false;
- 		closedir(dir);
-+		dir = NULL;
- 		return;
- 	}
diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix
index 82ca746d6a47..ef1dbf00b52c 100644
--- a/pkgs/os-specific/linux/powertop/default.nix
+++ b/pkgs/os-specific/linux/powertop/default.nix
@@ -1,19 +1,15 @@
 { stdenv, fetchurl, gettext, libnl, ncurses, pciutils, pkgconfig, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "powertop-2.7";
+  name = "powertop-2.8";
 
   src = fetchurl {
     url = "https://01.org/sites/default/files/downloads/powertop/${name}.tar.gz";
-    sha256 = "1jkqqr3l1x98m7rgin1dgfzxqwj4vciw9lyyq1kl9bdswa818jwd";
+    sha256 = "0nlwazxbnn0k6q5f5b09wdhw0f194lpzkp3l7vxansqhfczmcyx8";
   };
 
   buildInputs = [ gettext libnl ncurses pciutils pkgconfig zlib ];
 
-  # Fix --auto-tune bug:
-  # https://lists.01.org/pipermail/powertop/2014-December/001727.html
-  patches = [ ./auto-tune.patch ];
-
   postPatch = ''
     substituteInPlace src/main.cpp --replace "/sbin/modprobe" "modprobe"
   '';

From 27928a020a8d0d4f48140adacdc74716cc2d73bc Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Wed, 13 Jan 2016 12:07:23 +0000
Subject: [PATCH 662/884] gnome3: default to gnome 3.18

---
 nixos/tests/gnome3_18.nix       | 36 ---------------------------------
 pkgs/top-level/all-packages.nix |  2 +-
 2 files changed, 1 insertion(+), 37 deletions(-)
 delete mode 100644 nixos/tests/gnome3_18.nix

diff --git a/nixos/tests/gnome3_18.nix b/nixos/tests/gnome3_18.nix
deleted file mode 100644
index 971fd48b1868..000000000000
--- a/nixos/tests/gnome3_18.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-import ./make-test.nix ({ pkgs, ...} : {
-  name = "gnome3";
-  meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ iElectric eelco chaoflow lethalman ];
-  };
-
-  machine =
-    { config, pkgs, ... }:
-
-    { imports = [ ./common/user-account.nix ];
-
-      services.xserver.enable = true;
-
-      services.xserver.displayManager.auto.enable = true;
-      services.xserver.displayManager.auto.user = "alice";
-      services.xserver.desktopManager.gnome3.enable = true;
-
-      environment.gnome3.packageSet = pkgs.gnome3_18;
-
-      virtualisation.memorySize = 512;
-    };
-
-  testScript =
-    ''
-      $machine->waitForX;
-      $machine->sleep(15);
-
-      # Check that logging in has given the user ownership of devices.
-      $machine->succeed("getfacl /dev/snd/timer | grep -q alice");
-
-      $machine->succeed("su - alice -c 'DISPLAY=:0.0 gnome-terminal &'");
-      $machine->waitForWindow(qr/Terminal/);
-      $machine->sleep(20);
-      $machine->screenshot("screen");
-    '';
-})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d8a56bcb1795..d93656b81f05 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14516,7 +14516,7 @@ let
 
   gnome3_18 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.18 { });
 
-  gnome3 = gnome3_16;
+  gnome3 = gnome3_18;
 
   gnome = recurseIntoAttrs gnome2;
 

From c5554597bd6bdf412620b68c95a3e03ee1a0e2ec Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 13 Jan 2016 13:55:11 +0100
Subject: [PATCH 663/884] gnome3_18: add libgee_1

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

diff --git a/pkgs/desktops/gnome-3/3.18/default.nix b/pkgs/desktops/gnome-3/3.18/default.nix
index e98424a22503..f949eb1b2085 100644
--- a/pkgs/desktops/gnome-3/3.18/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/default.nix
@@ -176,6 +176,7 @@ let
   libcroco = callPackage ./core/libcroco {};
 
   libgee = callPackage ./core/libgee { };
+  libgee_1 = callPackage ./core/libgee/libgee-1.nix { };
 
   libgdata = callPackage ./core/libgdata { };
 

From 5ad58df002dbb0e35b5faac0b153a8413998c7e2 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 13 Jan 2016 13:37:49 +0300
Subject: [PATCH 664/884] sddm: add QtQuick dependency to the wrapper

---
 pkgs/applications/display-managers/sddm/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix
index b7bf5ee56640..89dfab1a6896 100644
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@@ -25,9 +25,11 @@ let
     nativeBuildInputs = [ cmake pkgconfig qttools ];
 
     buildInputs = [
-      libxcb libpthreadstubs libXdmcp libXau qtbase qtdeclarative pam systemd
+      libxcb libpthreadstubs libXdmcp libXau qtbase pam systemd
     ];
 
+    propagatedBuildInputs = [ qtdeclarative ];
+
     cmakeFlags = [
       "-DCONFIG_FILE=/etc/sddm.conf"
       # Set UID_MIN and UID_MAX so that the build script won't try

From 15821e1b6906d23b1a20d41062113ba2b38b4a68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Wed, 13 Jan 2016 14:27:04 +0100
Subject: [PATCH 665/884] kodiPlugins.salts: init at 1.0.98

---
 pkgs/applications/video/kodi/plugins.nix | 30 ++++++++++++++++++++++--
 pkgs/top-level/all-packages.nix          |  3 ++-
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix
index db7b56e51b33..a8d25aa8dd8d 100644
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/pkgs/applications/video/kodi/plugins.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, kodi, steam, libcec_platform, tinyxml }:
+{ stdenv, fetchFromGitHub, fetchpatch, cmake, kodi, steam, libcec_platform, tinyxml }:
 
 let
 
@@ -92,6 +92,32 @@ in
 
   };
 
+  salts = (mkKodiPlugin rec {
+
+    plugin = "salts";
+    namespace = "plugin.video.salts";
+    version = "1.0.98";
+
+    src = fetchFromGitHub {
+      name = plugin + "-" + version + ".tar.gz";
+      owner = "tknorris";
+      repo = plugin;
+      rev = "02cb63360ac1f60c01ec29d1da94902542f9a47a";
+      sha256 = "10cy633g383m1xy6yap46aqzyz96dh62y7c5rn5nvyw8ms18089z";
+    };
+
+    meta = with stdenv.lib; {
+      homepage = "https://github.com/tknorris/salts";
+      description = "Stream All The Sources";
+      maintainers = with maintainers; [ edwtjo ];
+    };
+  }).override {
+    patches = [ (fetchpatch {
+      url = https://github.com/tknorris/salts/pull/115.patch;
+      sha256 = "157dhp049mw8lna6cg3x549jv2b9zq1vj6v94mil65q2hlw09sjd";
+    }) ];
+  };
+
   svtplay = mkKodiPlugin rec {
 
     plugin = "svtplay";
@@ -122,7 +148,7 @@ in
   };
 
   steam-launcher = (mkKodiPlugin rec {
-  
+
     plugin = "steam-launcher";
     namespace = "script.steam.launcher";
     version = "3.1.1";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bf6dbffd9e59..19722a2d23f4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13699,6 +13699,7 @@ let
       ++ optional (config.kodi.enableSVTPlay or false) svtplay
       ++ optional (config.kodi.enableSteamLauncher or false) steam-launcher
       ++ optional (config.kodi.enablePVRHTS or false) pvr-hts
+      ++ optional (config.kodi.enableSALTS or false) salts
       );
   };
 
@@ -15845,7 +15846,7 @@ aliases = with self; rec {
   cool-old-term = cool-retro-term; # added 2015-01-31
   cupsBjnp = cups-bjnp; # added 2016-01-02
   cv = progress; # added 2015-09-06
-  enblendenfuse = enblend-enfuse;	# 2015-09-30
+  enblendenfuse = enblend-enfuse; # 2015-09-30
   exfat-utils = exfat;                  # 2015-09-11
   firefoxWrapper = firefox-wrapper;
   fuse_exfat = exfat;                   # 2015-09-11

From 32cd7228f68bd19064caf472ce501caab5777b12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Wed, 13 Jan 2016 14:27:04 +0100
Subject: [PATCH 666/884] kodiPlugins.urlresolver: init at 2.10.0

---
 pkgs/applications/video/kodi/plugins.nix | 26 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  4 ++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix
index a8d25aa8dd8d..5b03c1bcd985 100644
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/pkgs/applications/video/kodi/plugins.nix
@@ -92,6 +92,32 @@ in
 
   };
 
+  urlresolver = (mkKodiPlugin rec {
+
+    plugin = "urlresolver";
+    namespace = "script.module.urlresolver";
+    version = "2.10.0";
+
+    src = fetchFromGitHub {
+      name = plugin + "-" + version + ".tar.gz";
+      owner = "Eldorados";
+      repo = namespace;
+      rev = "72b9d978d90d54bb7a0224a1fd2407143e592984";
+      sha256 = "0r5glfvgy9ri3ar9zdkvix8lalr1kfp22fap2pqp739b6k2iqir6";
+    };
+
+    meta = with stdenv.lib; {
+      homepage = "https://github.com/Eldorados/urlresolver";
+      description = "Resolve common video host URL's to be playable in XBMC/Kodi";
+      maintainers = with maintainers; [ edwtjo ];
+    };
+  }).override {
+    patches = [ (fetchpatch {
+      url = https://github.com/Eldorados/script.module.urlresolver/pull/355.patch;
+      sha256 = "0q1n2sqdjqq32202s6ifh81c9a1l5a7yfkkf170dbkiajvxglz1m";
+    }) ];
+  };
+
   salts = (mkKodiPlugin rec {
 
     plugin = "salts";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 19722a2d23f4..884992feb1e2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13692,14 +13692,14 @@ let
 
   wrapKodi = { kodi }: callPackage ../applications/video/kodi/wrapper.nix {
     inherit kodi;
-    plugins = let inherit (lib) optional; in with kodiPlugins;
+    plugins = let inherit (lib) optional optionals; in with kodiPlugins;
       ([]
       ++ optional (config.kodi.enableAdvancedLauncher or false) advanced-launcher
       ++ optional (config.kodi.enableGenesis or false) genesis
       ++ optional (config.kodi.enableSVTPlay or false) svtplay
       ++ optional (config.kodi.enableSteamLauncher or false) steam-launcher
       ++ optional (config.kodi.enablePVRHTS or false) pvr-hts
-      ++ optional (config.kodi.enableSALTS or false) salts
+      ++ optionals (config.kodi.enableSALTS or false) [salts urlresolver]
       );
   };
 

From cee61fd1159d27a30cdfe28ac6574f1632acf067 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Wed, 13 Jan 2016 14:27:04 +0100
Subject: [PATCH 667/884] kodiPlugins.t0mm0-common: init at 0.0.1

---
 pkgs/applications/video/kodi/plugins.nix | 21 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix
index 5b03c1bcd985..9e0f4cd2b68d 100644
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/pkgs/applications/video/kodi/plugins.nix
@@ -202,6 +202,27 @@ in
     propagatedBuildinputs = [ steam ];
   };
 
+  t0mm0-common = mkKodiPlugin rec {
+
+    plugin = "t0mm0-common";
+    namespace = "script.module.t0mm0.common";
+    version = "0.0.1";
+
+    src = fetchFromGitHub {
+      name = plugin + "-" + version + ".tar.gz";
+      owner = "t0mm0";
+      repo = "xbmc-urlresolver";
+      rev = "ab16933a996a9e77b572953c45e70900c723d6e1";
+      sha256 = "1yd00md8iirizzaiqy6fv1n2snydcpqvp2f9irzfzxxi3i9asb93";
+    };
+
+    meta = with stdenv.lib; {
+      homepage = "https://github.com/t0mm0/xbmc-urlresolver/";
+      description = "t0mm0's common stuff";
+      maintainers = with maintainers; [ edwtjo ];
+    };
+  };
+
   pvr-hts = (mkKodiPlugin rec {
     plugin = "pvr-hts";
     namespace = "pvr.hts";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 884992feb1e2..0aea21afdcdd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13699,7 +13699,7 @@ let
       ++ optional (config.kodi.enableSVTPlay or false) svtplay
       ++ optional (config.kodi.enableSteamLauncher or false) steam-launcher
       ++ optional (config.kodi.enablePVRHTS or false) pvr-hts
-      ++ optionals (config.kodi.enableSALTS or false) [salts urlresolver]
+      ++ optionals (config.kodi.enableSALTS or false) [salts urlresolver t0mm0-common]
       );
   };
 

From a0023674807b9798850a7198073965a5edf8293a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 13 Jan 2016 14:44:40 +0100
Subject: [PATCH 668/884] Revert "gnome3_18: add libgee_1"

This reverts commit c5554597bd6bdf412620b68c95a3e03ee1a0e2ec. The patch
is incomplete and breaks Nixpkgs evaluation.
---
 pkgs/desktops/gnome-3/3.18/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/3.18/default.nix b/pkgs/desktops/gnome-3/3.18/default.nix
index f949eb1b2085..e98424a22503 100644
--- a/pkgs/desktops/gnome-3/3.18/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/default.nix
@@ -176,7 +176,6 @@ let
   libcroco = callPackage ./core/libcroco {};
 
   libgee = callPackage ./core/libgee { };
-  libgee_1 = callPackage ./core/libgee/libgee-1.nix { };
 
   libgdata = callPackage ./core/libgdata { };
 

From 4181e5ccae54e6f3b5ecc89b9eedfc7e40478e28 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 13 Jan 2016 14:45:25 +0100
Subject: [PATCH 669/884] libgee: add missing libgee-1.nix file

---
 .../gnome-3/3.18/core/libgee/libgee-1.nix     | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 pkgs/desktops/gnome-3/3.18/core/libgee/libgee-1.nix

diff --git a/pkgs/desktops/gnome-3/3.18/core/libgee/libgee-1.nix b/pkgs/desktops/gnome-3/3.18/core/libgee/libgee-1.nix
new file mode 100644
index 000000000000..1715e7eeb856
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.18/core/libgee/libgee-1.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobjectIntrospection, gnome3 }:
+let
+  ver_maj = "0.6";
+  ver_min = "8";
+in
+stdenv.mkDerivation rec {
+  name = "libgee-${ver_maj}.${ver_min}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/libgee/${ver_maj}/${name}.tar.xz";
+    sha256 = "1lzmxgz1bcs14ghfp8qqzarhn7s64ayx8c508ihizm3kc5wqs7x6";
+  };
+
+  doCheck = true;
+
+  patches = [ ./fix_introspection_paths.patch ];
+
+  buildInputs = [ autoconf vala pkgconfig glib gobjectIntrospection ];
+
+  meta = with stdenv.lib; {
+    description = "Utility library providing GObject-based interfaces and classes for commonly used data structures";
+    license = licenses.lgpl21Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.spacefrogg ] ++ gnome3.maintainers;
+  };
+}

From 2b8b0b88e7ebe666551ad4fc5318ebd079a8e4fd Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 13 Jan 2016 14:46:18 +0100
Subject: [PATCH 670/884] Revert "Revert "gnome3_18: add libgee_1""

This reverts commit a0023674807b9798850a7198073965a5edf8293a.
---
 pkgs/desktops/gnome-3/3.18/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/desktops/gnome-3/3.18/default.nix b/pkgs/desktops/gnome-3/3.18/default.nix
index e98424a22503..f949eb1b2085 100644
--- a/pkgs/desktops/gnome-3/3.18/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/default.nix
@@ -176,6 +176,7 @@ let
   libcroco = callPackage ./core/libcroco {};
 
   libgee = callPackage ./core/libgee { };
+  libgee_1 = callPackage ./core/libgee/libgee-1.nix { };
 
   libgdata = callPackage ./core/libgdata { };
 

From 4be51c84d53338e77dccc6dd083ef4d8f368c24e Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jascha@jgeerds.name>
Date: Wed, 13 Jan 2016 15:11:40 +0100
Subject: [PATCH 671/884] gnome3_18: Update to latest patch release

---
 .../desktops/gnome-3/3.18/apps/bijiben/src.nix |  6 +++---
 pkgs/desktops/gnome-3/3.18/apps/cheese/src.nix |  6 +++---
 .../gnome-3/3.18/apps/evolution/src.nix        |  6 +++---
 pkgs/desktops/gnome-3/3.18/apps/gedit/src.nix  |  6 +++---
 .../gnome-3/3.18/apps/gnome-boxes/src.nix      |  6 +++---
 .../gnome-3/3.18/apps/gnome-calendar/src.nix   |  6 +++---
 .../gnome-3/3.18/apps/gnome-characters/src.nix |  6 +++---
 .../gnome-3/3.18/apps/gnome-documents/src.nix  |  6 +++---
 .../apps/gnome-getting-started-docs/src.nix    |  6 +++---
 .../gnome-3/3.18/apps/gnome-logs/src.nix       |  6 +++---
 .../gnome-3/3.18/apps/gnome-maps/src.nix       |  6 +++---
 .../gnome-3/3.18/apps/gnome-music/src.nix      |  6 +++---
 .../gnome-3/3.18/apps/gnome-photos/src.nix     |  6 +++---
 .../gnome-3/3.18/apps/gnome-weather/src.nix    |  6 +++---
 pkgs/desktops/gnome-3/3.18/apps/polari/src.nix |  6 +++---
 .../gnome-3/3.18/apps/seahorse/src.nix         |  6 +++---
 .../desktops/gnome-3/3.18/apps/vinagre/src.nix |  6 +++---
 pkgs/desktops/gnome-3/3.18/core/baobab/src.nix |  6 +++---
 .../gnome-3/3.18/core/dconf-editor/src.nix     |  6 +++---
 pkgs/desktops/gnome-3/3.18/core/eog/src.nix    |  6 +++---
 .../gnome-3/3.18/core/epiphany/src.nix         |  6 +++---
 pkgs/desktops/gnome-3/3.18/core/evince/src.nix |  6 +++---
 .../3.18/core/evolution-data-server/src.nix    |  6 +++---
 pkgs/desktops/gnome-3/3.18/core/gcr/src.nix    |  6 +++---
 .../gnome-3/3.18/core/gnome-bluetooth/src.nix  |  6 +++---
 .../gnome-3/3.18/core/gnome-calculator/src.nix |  6 +++---
 .../gnome-3/3.18/core/gnome-contacts/src.nix   |  6 +++---
 .../3.18/core/gnome-control-center/src.nix     |  6 +++---
 .../gnome-3/3.18/core/gnome-desktop/src.nix    |  6 +++---
 .../3.18/core/gnome-disk-utility/src.nix       |  6 +++---
 .../gnome-3/3.18/core/gnome-keyring/src.nix    |  6 +++---
 .../3.18/core/gnome-online-accounts/src.nix    |  6 +++---
 .../gnome-3/3.18/core/gnome-session/src.nix    |  6 +++---
 .../3.18/core/gnome-settings-daemon/src.nix    |  6 +++---
 .../3.18/core/gnome-shell-extensions/src.nix   |  6 +++---
 .../gnome-3/3.18/core/gnome-shell/src.nix      |  6 +++---
 .../3.18/core/gnome-system-monitor/src.nix     |  6 +++---
 .../gnome-3/3.18/core/gnome-terminal/src.nix   |  6 +++---
 .../gnome-3/3.18/core/gnome-user-docs/src.nix  |  6 +++---
 .../core/gsettings-desktop-schemas/src.nix     |  6 +++---
 .../gnome-3/3.18/core/gtksourceview/src.nix    |  6 +++---
 .../gnome-3/3.18/core/gucharmap/src.nix        |  6 +++---
 .../gnome-3/3.18/core/libgweather/src.nix      |  6 +++---
 pkgs/desktops/gnome-3/3.18/core/mutter/src.nix |  6 +++---
 .../gnome-3/3.18/core/nautilus/src.nix         |  6 +++---
 pkgs/desktops/gnome-3/3.18/core/totem/src.nix  |  6 +++---
 pkgs/desktops/gnome-3/3.18/core/vino/src.nix   |  6 +++---
 pkgs/desktops/gnome-3/3.18/core/vte/src.nix    |  6 +++---
 .../gnome-3/3.18/core/yelp-xsl/src.nix         |  6 +++---
 pkgs/desktops/gnome-3/3.18/core/yelp/src.nix   |  6 +++---
 pkgs/desktops/gnome-3/3.18/core/zenity/src.nix |  6 +++---
 .../gnome-3/3.18/devtools/anjuta/src.nix       |  6 +++---
 .../gnome-3/3.18/devtools/devhelp/src.nix      |  6 +++---
 .../3.18/devtools/gnome-devel-docs/src.nix     |  6 +++---
 .../gnome-3/3.18/games/aisleriot/src.nix       |  6 +++---
 .../gnome-3/3.18/games/four-in-a-row/src.nix   |  6 +++---
 .../gnome-3/3.18/games/gnome-klotski/src.nix   |  6 +++---
 .../gnome-3/3.18/games/gnome-mines/src.nix     |  6 +++---
 .../gnome-3/3.18/games/gnome-nibbles/src.nix   |  6 +++---
 .../gnome-3/3.18/games/gnome-robots/src.nix    |  6 +++---
 .../gnome-3/3.18/games/gnome-sudoku/src.nix    |  6 +++---
 .../gnome-3/3.18/games/gnome-taquin/src.nix    |  6 +++---
 pkgs/desktops/gnome-3/3.18/games/iagno/src.nix |  6 +++---
 .../gnome-3/3.18/games/swell-foop/src.nix      |  6 +++---
 ...-themes-and-icons-in-system-data-dirs.patch | 18 +++++++++---------
 ...w-multiple-entries-for-a-single-theme.patch | 18 +++++++++---------
 ...Create-config-dir-if-it-doesn-t-exist.patch |  8 ++++----
 .../gnome-3/3.18/misc/gnome-tweak-tool/src.nix |  6 +++---
 68 files changed, 217 insertions(+), 217 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.18/apps/bijiben/src.nix b/pkgs/desktops/gnome-3/3.18/apps/bijiben/src.nix
index 9eb11c0e3791..7c30c037d8c0 100644
--- a/pkgs/desktops/gnome-3/3.18/apps/bijiben/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/apps/bijiben/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "bijiben-3.18.0";
+  name = "bijiben-3.18.2";
 
   src = fetchurl {
-    url = mirror://gnome/sources/bijiben/3.18/bijiben-3.18.0.tar.xz;
-    sha256 = "3e933eae3776ae50a639f0866b5c11279961b5ebdaa83a621509dfe31c218fea";
+    url = mirror://gnome/sources/bijiben/3.18/bijiben-3.18.2.tar.xz;
+    sha256 = "45fed3242ba092138760b99e725f0a4d3c8d749ef37c607d43c8f010e11a645d";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/apps/cheese/src.nix b/pkgs/desktops/gnome-3/3.18/apps/cheese/src.nix
index 7e47c2c49505..588ccb4e4fb4 100644
--- a/pkgs/desktops/gnome-3/3.18/apps/cheese/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/apps/cheese/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "cheese-3.18.0";
+  name = "cheese-3.18.1";
 
   src = fetchurl {
-    url = mirror://gnome/sources/cheese/3.18/cheese-3.18.0.tar.xz;
-    sha256 = "65ba4a60be51b9fc5537e5c1cdb6605b3098145982fae75a08ace94b965aeb0b";
+    url = mirror://gnome/sources/cheese/3.18/cheese-3.18.1.tar.xz;
+    sha256 = "fc9d8798b1f0c6b35731f063869a32c6910bab6d0386b9ea36386ebda0d57177";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/apps/evolution/src.nix b/pkgs/desktops/gnome-3/3.18/apps/evolution/src.nix
index 46af1c8b8bb3..1dbbd3908775 100644
--- a/pkgs/desktops/gnome-3/3.18/apps/evolution/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/apps/evolution/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "evolution-3.18.0";
+  name = "evolution-3.18.3";
 
   src = fetchurl {
-    url = mirror://gnome/sources/evolution/3.18/evolution-3.18.0.tar.xz;
-    sha256 = "a3efe42a861200c0463476e0a02e566fde74a0d4a699d8cc6514c031d5cad410";
+    url = mirror://gnome/sources/evolution/3.18/evolution-3.18.3.tar.xz;
+    sha256 = "f073b7cbef4ecc3dc4c3e0b80f98198eec577a20cae93e784659e8cf5af7c9b9";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/apps/gedit/src.nix b/pkgs/desktops/gnome-3/3.18/apps/gedit/src.nix
index ff427fdfb905..e368fd2cdd98 100644
--- a/pkgs/desktops/gnome-3/3.18/apps/gedit/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/apps/gedit/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gedit-3.18.0";
+  name = "gedit-3.18.2";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gedit/3.18/gedit-3.18.0.tar.xz;
-    sha256 = "9abd4f1478385f8b6c983298206f4ab1a25c682b9c87fb00d759b7db5b949533";
+    url = mirror://gnome/sources/gedit/3.18/gedit-3.18.2.tar.xz;
+    sha256 = "856e451aec29ee45980011de57cadfe89c3cbc53968f6cc865f8efe0bd0d49b1";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-boxes/src.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-boxes/src.nix
index 06543540e76a..cd43d87f826b 100644
--- a/pkgs/desktops/gnome-3/3.18/apps/gnome-boxes/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/apps/gnome-boxes/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gnome-boxes-3.18.0";
+  name = "gnome-boxes-3.18.1";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gnome-boxes/3.18/gnome-boxes-3.18.0.tar.xz;
-    sha256 = "ed2b442fc676bdfa47d6b6326836238c2c98af9725a91eb023784a3e692ae749";
+    url = mirror://gnome/sources/gnome-boxes/3.18/gnome-boxes-3.18.1.tar.xz;
+    sha256 = "0235d7f76cf3faa3889b302c743d608759e84506657ed4e374592c39f768fb2b";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-calendar/src.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-calendar/src.nix
index 6b941b592e5c..b8a7f5a47619 100644
--- a/pkgs/desktops/gnome-3/3.18/apps/gnome-calendar/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/apps/gnome-calendar/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gnome-calendar-3.18.0";
+  name = "gnome-calendar-3.18.2.1";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gnome-calendar/3.18/gnome-calendar-3.18.0.tar.xz;
-    sha256 = "f7d50fe8d5d3dcc574f0034dba6a64cbb9b3f842faab5978c9d02b38548f355b";
+    url = mirror://gnome/sources/gnome-calendar/3.18/gnome-calendar-3.18.2.1.tar.xz;
+    sha256 = "eedd9b10da837db6e7dc02794a942e9a98b3cdaa975b0d46226aa0cdaf88c0f6";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-characters/src.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-characters/src.nix
index a957aa91d755..95874e7cfece 100644
--- a/pkgs/desktops/gnome-3/3.18/apps/gnome-characters/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/apps/gnome-characters/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gnome-characters-3.18.0";
+  name = "gnome-characters-3.18.1";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gnome-characters/3.18/gnome-characters-3.18.0.tar.xz;
-    sha256 = "e068b2275a08639565a88b096d378a4ac2abf90301ff43056bb5157dff54ce08";
+    url = mirror://gnome/sources/gnome-characters/3.18/gnome-characters-3.18.1.tar.xz;
+    sha256 = "161839bb6c1ffca78b6c11b8d4f3f32b8263705911df0aed3268672c050b9bac";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-documents/src.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-documents/src.nix
index 5906bade1eff..8e2b3d0645d3 100644
--- a/pkgs/desktops/gnome-3/3.18/apps/gnome-documents/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/apps/gnome-documents/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gnome-documents-3.18.0.1";
+  name = "gnome-documents-3.18.2";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gnome-documents/3.18/gnome-documents-3.18.0.1.tar.xz;
-    sha256 = "0b19593e949276de71cb7292bb77520eb3cd915ac8c71d27a8d05f79b9e86816";
+    url = mirror://gnome/sources/gnome-documents/3.18/gnome-documents-3.18.2.tar.xz;
+    sha256 = "850ddaf3366549bbe0696c2ec3a36faf16438b387b8e9cb7812c7d5266a74cd4";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-getting-started-docs/src.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-getting-started-docs/src.nix
index a4ed1d6b909a..83abd9504b93 100644
--- a/pkgs/desktops/gnome-3/3.18/apps/gnome-getting-started-docs/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/apps/gnome-getting-started-docs/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gnome-getting-started-docs-3.18.0";
+  name = "gnome-getting-started-docs-3.18.2";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gnome-getting-started-docs/3.18/gnome-getting-started-docs-3.18.0.tar.xz;
-    sha256 = "5ef0373c5a864fefdecb17bffdfc2cca00fb2abf93756b1df9062e12208925d6";
+    url = mirror://gnome/sources/gnome-getting-started-docs/3.18/gnome-getting-started-docs-3.18.2.tar.xz;
+    sha256 = "5f4a39d51aba3669d84ce2cb06619a09a92103f58d4bc6728db448398b1f308b";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-logs/src.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-logs/src.nix
index b077f8cee4d4..754a49651843 100644
--- a/pkgs/desktops/gnome-3/3.18/apps/gnome-logs/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/apps/gnome-logs/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gnome-logs-3.18.0";
+  name = "gnome-logs-3.18.1";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gnome-logs/3.18/gnome-logs-3.18.0.tar.xz;
-    sha256 = "7602b55d47b5d889be7547869a0a48f03f6b22a1c872b86ed70049695d06d699";
+    url = mirror://gnome/sources/gnome-logs/3.18/gnome-logs-3.18.1.tar.xz;
+    sha256 = "3ccbd74e61af13b9ab4f8a45df9c0ff84b7c06a7baccf2150601a82b6dd662dc";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-maps/src.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-maps/src.nix
index 9d33216480df..d0373e037b8d 100644
--- a/pkgs/desktops/gnome-3/3.18/apps/gnome-maps/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/apps/gnome-maps/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gnome-maps-3.18.0";
+  name = "gnome-maps-3.18.2";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gnome-maps/3.18/gnome-maps-3.18.0.tar.xz;
-    sha256 = "242f70346a1527ba0d9a664bd863b02e2227f9f0f0f577b9b0c00dc3075eb85e";
+    url = mirror://gnome/sources/gnome-maps/3.18/gnome-maps-3.18.2.tar.xz;
+    sha256 = "693ff1559252eabe5d8c9c7354333b5aa1996e870936456d15706a0e0bac9278";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-music/src.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-music/src.nix
index de2cf6054868..f52e5c38de85 100644
--- a/pkgs/desktops/gnome-3/3.18/apps/gnome-music/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/apps/gnome-music/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gnome-music-3.18.0";
+  name = "gnome-music-3.18.2";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gnome-music/3.18/gnome-music-3.18.0.tar.xz;
-    sha256 = "e2e4b99a57c7b5c83ce3deccd38880cbafb875b423ab276204af523bc648d69c";
+    url = mirror://gnome/sources/gnome-music/3.18/gnome-music-3.18.2.tar.xz;
+    sha256 = "81b6ae8b4193774a1dc05e77c59ad8ff5e7debc0aea30ce2ecd13b2ceda10bff";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-photos/src.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-photos/src.nix
index 1af6b71cdb90..28b2ada45bae 100644
--- a/pkgs/desktops/gnome-3/3.18/apps/gnome-photos/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/apps/gnome-photos/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gnome-photos-3.18.0";
+  name = "gnome-photos-3.18.2";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gnome-photos/3.18/gnome-photos-3.18.0.tar.xz;
-    sha256 = "5ca74b33de33da125059918e2d7c665ff78ac1adfbc04c98b3378e705cc73a54";
+    url = mirror://gnome/sources/gnome-photos/3.18/gnome-photos-3.18.2.tar.xz;
+    sha256 = "7f6169c663b7a0e1b971d5af4def3d9a633e16a24e7d2c593b51be0053f9a0d8";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-weather/src.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-weather/src.nix
index b1dc538815de..6062444fa048 100644
--- a/pkgs/desktops/gnome-3/3.18/apps/gnome-weather/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/apps/gnome-weather/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gnome-weather-3.18.0";
+  name = "gnome-weather-3.18.1";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gnome-weather/3.18/gnome-weather-3.18.0.tar.xz;
-    sha256 = "fa0c098bef351af7457abf0ef6bd0afb62d727f041a15107e02693c9c7bd48aa";
+    url = mirror://gnome/sources/gnome-weather/3.18/gnome-weather-3.18.1.tar.xz;
+    sha256 = "d0cbe0ee6e9f9332e30836d72c9a462ecc908a97402943c33cd6e61d08323fdf";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/apps/polari/src.nix b/pkgs/desktops/gnome-3/3.18/apps/polari/src.nix
index 9d7497b61c7f..acb570c0a14c 100644
--- a/pkgs/desktops/gnome-3/3.18/apps/polari/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/apps/polari/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "polari-3.18.0";
+  name = "polari-3.18.1";
 
   src = fetchurl {
-    url = mirror://gnome/sources/polari/3.18/polari-3.18.0.tar.xz;
-    sha256 = "7b98c820a1e9a25a0f3a927e8d4ba8400296041f783301a764e37840c7ef6018";
+    url = mirror://gnome/sources/polari/3.18/polari-3.18.1.tar.xz;
+    sha256 = "554a089b1edf88d49408ecf6ce79ad6f7114ecf557753c8f39a9af153a76843a";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/apps/seahorse/src.nix b/pkgs/desktops/gnome-3/3.18/apps/seahorse/src.nix
index 1d790c81e4f9..05c8a9c474c4 100644
--- a/pkgs/desktops/gnome-3/3.18/apps/seahorse/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/apps/seahorse/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "seahorse-3.16.0";
+  name = "seahorse-3.18.0";
 
   src = fetchurl {
-    url = mirror://gnome/sources/seahorse/3.16/seahorse-3.16.0.tar.xz;
-    sha256 = "770a5f03b8745054ef04cef9923dd713b1fbf309169150bc8dd32d7e5f7ee131";
+    url = mirror://gnome/sources/seahorse/3.18/seahorse-3.18.0.tar.xz;
+    sha256 = "530c889a01c4cad25df4c9ab58ab95d24747875789bc6116bef529d60fc1b667";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/apps/vinagre/src.nix b/pkgs/desktops/gnome-3/3.18/apps/vinagre/src.nix
index 94b6d8a83e14..27e5792ea427 100644
--- a/pkgs/desktops/gnome-3/3.18/apps/vinagre/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/apps/vinagre/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "vinagre-3.18.0";
+  name = "vinagre-3.18.2";
 
   src = fetchurl {
-    url = mirror://gnome/sources/vinagre/3.18/vinagre-3.18.0.tar.xz;
-    sha256 = "77214384c03df985551a5094ea16fd3f42b74c708123128b29baff6458b2fef9";
+    url = mirror://gnome/sources/vinagre/3.18/vinagre-3.18.2.tar.xz;
+    sha256 = "65b81299de0b75a9433e5654d5314f347895d5efb7acd3b111e5e8c03f48fbc4";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/core/baobab/src.nix b/pkgs/desktops/gnome-3/3.18/core/baobab/src.nix
index 5032262f278d..b8e5c9af3cf8 100644
--- a/pkgs/desktops/gnome-3/3.18/core/baobab/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/baobab/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "baobab-3.18.0";
+  name = "baobab-3.18.1";
 
   src = fetchurl {
-    url = mirror://gnome/sources/baobab/3.18/baobab-3.18.0.tar.xz;
-    sha256 = "75924c53dd0e94d97c2f0ec30270fa3ffc59adfab7e21aac3ed9c6c088760b5a";
+    url = mirror://gnome/sources/baobab/3.18/baobab-3.18.1.tar.xz;
+    sha256 = "c2ac90426390e77147446a290c1480c49936c0a224f740b555ddaec2675b44b5";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/core/dconf-editor/src.nix b/pkgs/desktops/gnome-3/3.18/core/dconf-editor/src.nix
index eb15838bb48f..aef30cf0820a 100644
--- a/pkgs/desktops/gnome-3/3.18/core/dconf-editor/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/dconf-editor/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "dconf-editor-3.18.0";
+  name = "dconf-editor-3.18.2";
 
   src = fetchurl {
-    url = mirror://gnome/sources/dconf-editor/3.18/dconf-editor-3.18.0.tar.xz;
-    sha256 = "6579b8b216b068acae7d8301b5e2d57054c85a3f147c92355ffa46a62c052534";
+    url = mirror://gnome/sources/dconf-editor/3.18/dconf-editor-3.18.2.tar.xz;
+    sha256 = "a7957f5274b5b20c2dfdead5ebf42321c82fae1326465413cbafb61ede89bc75";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/core/eog/src.nix b/pkgs/desktops/gnome-3/3.18/core/eog/src.nix
index 154a02d7b439..937f1dcaa215 100644
--- a/pkgs/desktops/gnome-3/3.18/core/eog/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/eog/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "eog-3.16.3";
+  name = "eog-3.18.1";
 
   src = fetchurl {
-    url = mirror://gnome/sources/eog/3.16/eog-3.16.3.tar.xz;
-    sha256 = "ee6d101f8e73aacc8d48256f06a780c6d0d5f3975990f375f58cd0e70816b766";
+    url = mirror://gnome/sources/eog/3.18/eog-3.18.1.tar.xz;
+    sha256 = "7b7bb47a680518701e2e724c8632fcf12dcb3c3e45ce1f2bdd4c4ace325793a7";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/core/epiphany/src.nix b/pkgs/desktops/gnome-3/3.18/core/epiphany/src.nix
index 2ecf2c98d19a..2daa8ecc24e1 100644
--- a/pkgs/desktops/gnome-3/3.18/core/epiphany/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/epiphany/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "epiphany-3.18.0";
+  name = "epiphany-3.18.3";
 
   src = fetchurl {
-    url = mirror://gnome/sources/epiphany/3.18/epiphany-3.18.0.tar.xz;
-    sha256 = "d5ba67a8cd85c80b81e076862bcab3fc376ba51b0a1536ca7430608d1f50491d";
+    url = mirror://gnome/sources/epiphany/3.18/epiphany-3.18.3.tar.xz;
+    sha256 = "cd4e9ce588c4c66109547d93999d9740d338c3f9dbfbc2143cf2cbb74260def9";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/core/evince/src.nix b/pkgs/desktops/gnome-3/3.18/core/evince/src.nix
index 392aeefb4e96..17dca072e777 100644
--- a/pkgs/desktops/gnome-3/3.18/core/evince/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/evince/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "evince-3.18.0";
+  name = "evince-3.18.2";
 
   src = fetchurl {
-    url = mirror://gnome/sources/evince/3.18/evince-3.18.0.tar.xz;
-    sha256 = "96e8351f6a6fc5823bb8f51178cde1182bd66481af6fb09bf58a18b673cafa70";
+    url = mirror://gnome/sources/evince/3.18/evince-3.18.2.tar.xz;
+    sha256 = "42ad6c7354d881a9ecab136ea84ff867acb942605bcfac48b6c12e1c2d8ecb17";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/core/evolution-data-server/src.nix b/pkgs/desktops/gnome-3/3.18/core/evolution-data-server/src.nix
index 876b2236ef5b..9f899fb6e42d 100644
--- a/pkgs/desktops/gnome-3/3.18/core/evolution-data-server/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/evolution-data-server/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "evolution-data-server-3.18.0";
+  name = "evolution-data-server-3.18.3";
 
   src = fetchurl {
-    url = mirror://gnome/sources/evolution-data-server/3.18/evolution-data-server-3.18.0.tar.xz;
-    sha256 = "ca4273b888912cadc474c1c2aebd2f02639381a9ddfa516a46cf9abd3dbc11f7";
+    url = mirror://gnome/sources/evolution-data-server/3.18/evolution-data-server-3.18.3.tar.xz;
+    sha256 = "9de9d6392822bb4b89318a88f5db1fd2f0f09899b793a0dd5525a656ed0e8163";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/core/gcr/src.nix b/pkgs/desktops/gnome-3/3.18/core/gcr/src.nix
index e2b4ad195ffe..6f2d0fd29b31 100644
--- a/pkgs/desktops/gnome-3/3.18/core/gcr/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/gcr/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gcr-3.16.0";
+  name = "gcr-3.18.0";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gcr/3.16/gcr-3.16.0.tar.xz;
-    sha256 = "ecfe8df41cc88158364bb15addc670b11e539fe844742983629ba2323888d075";
+    url = mirror://gnome/sources/gcr/3.18/gcr-3.18.0.tar.xz;
+    sha256 = "d4d16da5af55148a694055835ccd07ad34daf0ad03bdad929bf7cad15637ce00";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-bluetooth/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-bluetooth/src.nix
index eb5f61499765..2e0df487ee49 100644
--- a/pkgs/desktops/gnome-3/3.18/core/gnome-bluetooth/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/gnome-bluetooth/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gnome-bluetooth-3.18.0";
+  name = "gnome-bluetooth-3.18.1";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gnome-bluetooth/3.18/gnome-bluetooth-3.18.0.tar.xz;
-    sha256 = "f5c0d43226c4ec6a545dddb86181adadbc2b5cf720b640026003b9660fba0b8f";
+    url = mirror://gnome/sources/gnome-bluetooth/3.18/gnome-bluetooth-3.18.1.tar.xz;
+    sha256 = "c51d5b896d32845a2b5bb6ccd48926c88c8e9ef0915c32d3c56cb7e7974d4a49";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-calculator/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-calculator/src.nix
index 42fc4667087d..501e4ed0b1ee 100644
--- a/pkgs/desktops/gnome-3/3.18/core/gnome-calculator/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/gnome-calculator/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gnome-calculator-3.18.0";
+  name = "gnome-calculator-3.18.2";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gnome-calculator/3.18/gnome-calculator-3.18.0.tar.xz;
-    sha256 = "54dc40de68b118c06b443f9d8a56397425434a45dddbb2daba7b720b77b35672";
+    url = mirror://gnome/sources/gnome-calculator/3.18/gnome-calculator-3.18.2.tar.xz;
+    sha256 = "c86c5857409ce1d01896904e97ccf0a1a880f3dcf428a524e5c0fec27b274d64";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-contacts/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-contacts/src.nix
index 94fcfb85fdfe..9a47605b3bc3 100644
--- a/pkgs/desktops/gnome-3/3.18/core/gnome-contacts/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/gnome-contacts/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gnome-contacts-3.18.0";
+  name = "gnome-contacts-3.18.1";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gnome-contacts/3.18/gnome-contacts-3.18.0.tar.xz;
-    sha256 = "c81ad739a1f554e4c89979564565e32ceaf1d2cc6c93a6a75d929d7d1fe8e287";
+    url = mirror://gnome/sources/gnome-contacts/3.18/gnome-contacts-3.18.1.tar.xz;
+    sha256 = "0418d25e70e73c05f4db58ce843819ef91180a21531549a832eafeaf2700cf26";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-control-center/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-control-center/src.nix
index f87859fe51ff..87263aef6854 100644
--- a/pkgs/desktops/gnome-3/3.18/core/gnome-control-center/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/gnome-control-center/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gnome-control-center-3.18.0";
+  name = "gnome-control-center-3.18.2";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gnome-control-center/3.18/gnome-control-center-3.18.0.tar.xz;
-    sha256 = "42648eda11fc1df0f717d7d3b385cb7c519fdd084ed4e3fad2e55fd11712fb52";
+    url = mirror://gnome/sources/gnome-control-center/3.18/gnome-control-center-3.18.2.tar.xz;
+    sha256 = "36fe6157247d2b7c8a98dbb3dbcde1c3a6f9e5e8fcc9ccf357e2b2417578f8ad";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-desktop/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-desktop/src.nix
index 84fbb8ebdff4..3a864781f927 100644
--- a/pkgs/desktops/gnome-3/3.18/core/gnome-desktop/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/gnome-desktop/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gnome-desktop-3.18.0";
+  name = "gnome-desktop-3.18.2";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gnome-desktop/3.18/gnome-desktop-3.18.0.tar.xz;
-    sha256 = "44c806b16ea7d38bdc0e6343f2cb6be97afd7f64490f30c0cb5c3373e89a9d44";
+    url = mirror://gnome/sources/gnome-desktop/3.18/gnome-desktop-3.18.2.tar.xz;
+    sha256 = "ddd46d022de137543a71f50c7392b32f9b98d5d3f2b53040b35f5802de2e7b56";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-disk-utility/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-disk-utility/src.nix
index 29589586625e..9014ce2effb6 100644
--- a/pkgs/desktops/gnome-3/3.18/core/gnome-disk-utility/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/gnome-disk-utility/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gnome-disk-utility-3.18.0";
+  name = "gnome-disk-utility-3.18.3.1";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gnome-disk-utility/3.18/gnome-disk-utility-3.18.0.tar.xz;
-    sha256 = "e7363107e40fb1e7fb9f65e37194c0e8da3928f9ec35a4b27a5c439c64e51686";
+    url = mirror://gnome/sources/gnome-disk-utility/3.18/gnome-disk-utility-3.18.3.1.tar.xz;
+    sha256 = "652e6332bcf987b15621ebcefc2c14f360b21b7295f94fded6ecfc40c45ae4e8";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-keyring/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-keyring/src.nix
index ccd1488fd30d..a9ad02a6217e 100644
--- a/pkgs/desktops/gnome-3/3.18/core/gnome-keyring/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/gnome-keyring/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gnome-keyring-3.16.0";
+  name = "gnome-keyring-3.18.3";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gnome-keyring/3.16/gnome-keyring-3.16.0.tar.xz;
-    sha256 = "15a3bb8c53855a4ff0dbbdfbe4ec3df206c32048f50bdc76a51f8e3e14ece1f5";
+    url = mirror://gnome/sources/gnome-keyring/3.18/gnome-keyring-3.18.3.tar.xz;
+    sha256 = "3f670dd61789bdda75b9c9e31e289bf7b1d23ba012433474790081ba7dc0ed98";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-online-accounts/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-online-accounts/src.nix
index 3038209042e2..3dd7f17a42e7 100644
--- a/pkgs/desktops/gnome-3/3.18/core/gnome-online-accounts/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/gnome-online-accounts/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gnome-online-accounts-3.18.0";
+  name = "gnome-online-accounts-3.18.3";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gnome-online-accounts/3.18/gnome-online-accounts-3.18.0.tar.xz;
-    sha256 = "fc2dac96551746576759bd14f9b322bae1dd0aeedc0e755065ddf5eaaefacd34";
+    url = mirror://gnome/sources/gnome-online-accounts/3.18/gnome-online-accounts-3.18.3.tar.xz;
+    sha256 = "bfb983831af8b1fbd81b70befda7683a38f86ca4cc911f763ae31207306e3827";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-session/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-session/src.nix
index 211cc140a881..41c48b7f5347 100644
--- a/pkgs/desktops/gnome-3/3.18/core/gnome-session/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/gnome-session/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gnome-session-3.18.0";
+  name = "gnome-session-3.18.1.2";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gnome-session/3.18/gnome-session-3.18.0.tar.xz;
-    sha256 = "ba23d0e41e90f238103835603eded0f30a7cc56506b68168899377785aec706f";
+    url = mirror://gnome/sources/gnome-session/3.18/gnome-session-3.18.1.2.tar.xz;
+    sha256 = "b37d823d57ff2e3057401a426279954699cfe1e44e59a4cbdd941687ff928a45";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-settings-daemon/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-settings-daemon/src.nix
index d7b459ae0eaf..fea0cf72cd99 100644
--- a/pkgs/desktops/gnome-3/3.18/core/gnome-settings-daemon/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/gnome-settings-daemon/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gnome-settings-daemon-3.18.0";
+  name = "gnome-settings-daemon-3.18.2";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gnome-settings-daemon/3.18/gnome-settings-daemon-3.18.0.tar.xz;
-    sha256 = "8d3ef9c18538831ed89122fee0bdaca68b0e482a18b3c4388c4e672aba1b3cd5";
+    url = mirror://gnome/sources/gnome-settings-daemon/3.18/gnome-settings-daemon-3.18.2.tar.xz;
+    sha256 = "3071c7258f22684f7f64b7f735821e4cb25f59fc4665eb08e8d86b560e72fc6f";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-shell-extensions/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-shell-extensions/src.nix
index ed51bc4b2009..96ad5a9c84b9 100644
--- a/pkgs/desktops/gnome-3/3.18/core/gnome-shell-extensions/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/gnome-shell-extensions/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gnome-shell-extensions-3.18.0";
+  name = "gnome-shell-extensions-3.18.3";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gnome-shell-extensions/3.18/gnome-shell-extensions-3.18.0.tar.xz;
-    sha256 = "a5fb88004b021e4a16f4fa5eb3d7d6f0903db1288023c18c0f9825152fa0f5f7";
+    url = mirror://gnome/sources/gnome-shell-extensions/3.18/gnome-shell-extensions-3.18.3.tar.xz;
+    sha256 = "2bb3726decf14a31ae35755c049d8f03425231857c42ed27f01854af755ec035";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-shell/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-shell/src.nix
index 340a2e672523..5d0ee821394c 100644
--- a/pkgs/desktops/gnome-3/3.18/core/gnome-shell/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/gnome-shell/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gnome-shell-3.18.0";
+  name = "gnome-shell-3.18.3";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gnome-shell/3.18/gnome-shell-3.18.0.tar.xz;
-    sha256 = "1f0f276c45c0979c72700121cb0f711aea343c4393eb3d5ddd6b311d8dc83c99";
+    url = mirror://gnome/sources/gnome-shell/3.18/gnome-shell-3.18.3.tar.xz;
+    sha256 = "8517baf8606f970ebf38222411eb7563cab2ae5efbfb088954ce23705b67519b";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-system-monitor/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-system-monitor/src.nix
index a4c87752e784..ab800c1aecc8 100644
--- a/pkgs/desktops/gnome-3/3.18/core/gnome-system-monitor/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/gnome-system-monitor/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gnome-system-monitor-3.18.0.1";
+  name = "gnome-system-monitor-3.18.2";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gnome-system-monitor/3.18/gnome-system-monitor-3.18.0.1.tar.xz;
-    sha256 = "71ff8db2fa3eb53d8f54ffd612c6679b231a9d69c13adb91cf63421425953b10";
+    url = mirror://gnome/sources/gnome-system-monitor/3.18/gnome-system-monitor-3.18.2.tar.xz;
+    sha256 = "9e4a5d6aefa362448f301907fe07f3889e3dd7824922ceef8c48a7808be3e666";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-terminal/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-terminal/src.nix
index dff213cc3891..2827ca7c65c1 100644
--- a/pkgs/desktops/gnome-3/3.18/core/gnome-terminal/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/gnome-terminal/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gnome-terminal-3.18.0";
+  name = "gnome-terminal-3.18.2";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gnome-terminal/3.18/gnome-terminal-3.18.0.tar.xz;
-    sha256 = "776642502b57b7a6b5f099291b660c0b4a4ff2b3024d15a2f5b33c4286c9dce6";
+    url = mirror://gnome/sources/gnome-terminal/3.18/gnome-terminal-3.18.2.tar.xz;
+    sha256 = "5e35c0fa1395258bab83952cfabe4c1828b8655bcd761f8faed70b452bd89efa";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-user-docs/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-user-docs/src.nix
index 0187516061b1..61bbcf576cee 100644
--- a/pkgs/desktops/gnome-3/3.18/core/gnome-user-docs/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/gnome-user-docs/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gnome-user-docs-3.18.0";
+  name = "gnome-user-docs-3.18.1";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gnome-user-docs/3.18/gnome-user-docs-3.18.0.tar.xz;
-    sha256 = "c515d2c8b051ffb05ec497e4231d1ceecec824dc4fca45425d21295bb592e952";
+    url = mirror://gnome/sources/gnome-user-docs/3.18/gnome-user-docs-3.18.1.tar.xz;
+    sha256 = "83e52528de6afe4412679d7fd8c7f8124b07770b4e291592f24e9e50657efae4";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/core/gsettings-desktop-schemas/src.nix b/pkgs/desktops/gnome-3/3.18/core/gsettings-desktop-schemas/src.nix
index 047f014d2af0..a7d5a77a23bd 100644
--- a/pkgs/desktops/gnome-3/3.18/core/gsettings-desktop-schemas/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/gsettings-desktop-schemas/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gsettings-desktop-schemas-3.18.0";
+  name = "gsettings-desktop-schemas-3.18.1";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gsettings-desktop-schemas/3.18/gsettings-desktop-schemas-3.18.0.tar.xz;
-    sha256 = "ba27337226a96d83f385c0ad192fdfe561c7e7882c61bb326c571be24e41eceb";
+    url = mirror://gnome/sources/gsettings-desktop-schemas/3.18/gsettings-desktop-schemas-3.18.1.tar.xz;
+    sha256 = "258713b2a3dc6b6590971bcfc81f98d78ea9827d60e2f55ffbe40d9cd0f99a1a";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/core/gtksourceview/src.nix b/pkgs/desktops/gnome-3/3.18/core/gtksourceview/src.nix
index 5bbd2c424740..bb02f9c6f844 100644
--- a/pkgs/desktops/gnome-3/3.18/core/gtksourceview/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/gtksourceview/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gtksourceview-3.18.0";
+  name = "gtksourceview-3.18.1";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gtksourceview/3.18/gtksourceview-3.18.0.tar.xz;
-    sha256 = "54b111264e6985e26a878dec88ff94fd0a9ae0dc4cfcdf08f4a6b5f655d4b693";
+    url = mirror://gnome/sources/gtksourceview/3.18/gtksourceview-3.18.1.tar.xz;
+    sha256 = "7be95faf068b9f0ac7540cc1e8d607baa98a482850ef11a6471b53c9327aede6";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/core/gucharmap/src.nix b/pkgs/desktops/gnome-3/3.18/core/gucharmap/src.nix
index 01eca1e367b1..69c0dd600251 100644
--- a/pkgs/desktops/gnome-3/3.18/core/gucharmap/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/gucharmap/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gucharmap-3.18.0";
+  name = "gucharmap-3.18.2";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gucharmap/3.18/gucharmap-3.18.0.tar.xz;
-    sha256 = "121d2652f59a26c9426c96e7c6ca73295c45b675dd4ef0ccdb1b50bc0b4f3830";
+    url = mirror://gnome/sources/gucharmap/3.18/gucharmap-3.18.2.tar.xz;
+    sha256 = "80141d3e892c3c4812c1a8fad8f89978559ef19e933843267e6e9a5524c09ec9";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/core/libgweather/src.nix b/pkgs/desktops/gnome-3/3.18/core/libgweather/src.nix
index da56dc3361ae..e7690af4c2de 100644
--- a/pkgs/desktops/gnome-3/3.18/core/libgweather/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/libgweather/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "libgweather-3.18.0";
+  name = "libgweather-3.18.1";
 
   src = fetchurl {
-    url = mirror://gnome/sources/libgweather/3.18/libgweather-3.18.0.tar.xz;
-    sha256 = "8f4fda67f48c776f2bf955d384de4cc842aacb8d9b2ad87b42d83d0dc5a1cb1f";
+    url = mirror://gnome/sources/libgweather/3.18/libgweather-3.18.1.tar.xz;
+    sha256 = "94b2292f8f7616e2aa81b1516befd7b27682b20acecbd5d656b6954990ca7ad0";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/core/mutter/src.nix b/pkgs/desktops/gnome-3/3.18/core/mutter/src.nix
index 2f183d1a919e..7fbdae378e51 100644
--- a/pkgs/desktops/gnome-3/3.18/core/mutter/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/mutter/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "mutter-3.18.0";
+  name = "mutter-3.18.2";
 
   src = fetchurl {
-    url = mirror://gnome/sources/mutter/3.18/mutter-3.18.0.tar.xz;
-    sha256 = "9fb287976b9c65f0a2aca09d0e2c4c2748d3d2cfa5f38921dbeafe4cd1d541b1";
+    url = mirror://gnome/sources/mutter/3.18/mutter-3.18.2.tar.xz;
+    sha256 = "8a69326f216c7575ed6cd53938b9cfc49b3b359cde95d3b6a7ed46c837261181";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/core/nautilus/src.nix b/pkgs/desktops/gnome-3/3.18/core/nautilus/src.nix
index 4e8c692bce44..83809052efc3 100644
--- a/pkgs/desktops/gnome-3/3.18/core/nautilus/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/nautilus/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "nautilus-3.18.0";
+  name = "nautilus-3.18.4";
 
   src = fetchurl {
-    url = mirror://gnome/sources/nautilus/3.18/nautilus-3.18.0.tar.xz;
-    sha256 = "6914e5698c5ce865870086e4db9395d56a78eddf8002020458ce05db16a95a33";
+    url = mirror://gnome/sources/nautilus/3.18/nautilus-3.18.4.tar.xz;
+    sha256 = "4ff2c78dba352b4666bb30e0c80ed786eed09199fd624f00810fce4d987fcd26";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/core/totem/src.nix b/pkgs/desktops/gnome-3/3.18/core/totem/src.nix
index 92bf2c1f8a65..a946fe27a637 100644
--- a/pkgs/desktops/gnome-3/3.18/core/totem/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/totem/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "totem-3.18.0";
+  name = "totem-3.18.1";
 
   src = fetchurl {
-    url = mirror://gnome/sources/totem/3.18/totem-3.18.0.tar.xz;
-    sha256 = "1b6a7e66414df4b2e2427a9c5f1fee5a5f286beb098fdbe0902e37e3663e3e89";
+    url = mirror://gnome/sources/totem/3.18/totem-3.18.1.tar.xz;
+    sha256 = "d7816eae9606846c44fd508902eae10bdaed28e6d4f621531990d473184107a2";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/core/vino/src.nix b/pkgs/desktops/gnome-3/3.18/core/vino/src.nix
index b2202c48733d..e550fda483ed 100644
--- a/pkgs/desktops/gnome-3/3.18/core/vino/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/vino/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "vino-3.18.0";
+  name = "vino-3.18.1";
 
   src = fetchurl {
-    url = mirror://gnome/sources/vino/3.18/vino-3.18.0.tar.xz;
-    sha256 = "52be0b036389713eab224abf27f2ca2a067ba5bd1f6b526592703576005e0919";
+    url = mirror://gnome/sources/vino/3.18/vino-3.18.1.tar.xz;
+    sha256 = "07ec6e78bbecd4ee3fce873eb26932fdda9c7642bb09d17ac36483b996fafe5a";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/core/vte/src.nix b/pkgs/desktops/gnome-3/3.18/core/vte/src.nix
index ea6e39182fcc..fe67aaf9fe1b 100644
--- a/pkgs/desktops/gnome-3/3.18/core/vte/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/vte/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "vte-0.42.0";
+  name = "vte-0.42.1";
 
   src = fetchurl {
-    url = mirror://gnome/sources/vte/0.42/vte-0.42.0.tar.xz;
-    sha256 = "2168f79d2043cbbe6d4375d01e54cebda71bb6f5d9dc8ad658b9a1dc1052de04";
+    url = mirror://gnome/sources/vte/0.42/vte-0.42.1.tar.xz;
+    sha256 = "0d4xzjq6mxrlhnh4i12a1yy90n41m03z8wf8g6wh4hjgx7ly404y";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/core/yelp-xsl/src.nix b/pkgs/desktops/gnome-3/3.18/core/yelp-xsl/src.nix
index a3343d2dfd1b..54c55eaab5a1 100644
--- a/pkgs/desktops/gnome-3/3.18/core/yelp-xsl/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/yelp-xsl/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "yelp-xsl-3.18.0";
+  name = "yelp-xsl-3.18.1";
 
   src = fetchurl {
-    url = mirror://gnome/sources/yelp-xsl/3.18/yelp-xsl-3.18.0.tar.xz;
-    sha256 = "893620857b72b3b43ee3b462281240b7ca4d80292f469552827f0597bf60d2b2";
+    url = mirror://gnome/sources/yelp-xsl/3.18/yelp-xsl-3.18.1.tar.xz;
+    sha256 = "00870fbe59a1bc7797b385fce16386917e2987c404e9b5a7adcf0036f1c1ba62";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/core/yelp/src.nix b/pkgs/desktops/gnome-3/3.18/core/yelp/src.nix
index cb25d3d30c67..a32918a02d06 100644
--- a/pkgs/desktops/gnome-3/3.18/core/yelp/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/yelp/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "yelp-3.18.0";
+  name = "yelp-3.18.1";
 
   src = fetchurl {
-    url = mirror://gnome/sources/yelp/3.18/yelp-3.18.0.tar.xz;
-    sha256 = "a8c201e520c87832d017439492e4343e957a90da5c6d85060e8dd3b28ffee72e";
+    url = mirror://gnome/sources/yelp/3.18/yelp-3.18.1.tar.xz;
+    sha256 = "ba3a4eb4717c0ecf4a2e40eff0963fcd12c700c4fb80b83ecaad8b7032256880";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/core/zenity/src.nix b/pkgs/desktops/gnome-3/3.18/core/zenity/src.nix
index 87f16156515b..7fd6d35f4eda 100644
--- a/pkgs/desktops/gnome-3/3.18/core/zenity/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/zenity/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "zenity-3.18.0";
+  name = "zenity-3.18.1.1";
 
   src = fetchurl {
-    url = mirror://gnome/sources/zenity/3.18/zenity-3.18.0.tar.xz;
-    sha256 = "0efafea95a830f3bf6eca805ff4a8008df760a6ad3e81181b9473dcf721c3a69";
+    url = mirror://gnome/sources/zenity/3.18/zenity-3.18.1.1.tar.xz;
+    sha256 = "e6317a03f58b528e2e3330fef5acea39506ec08a7c2aeec5c4f1e7505d43a80a";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/devtools/anjuta/src.nix b/pkgs/desktops/gnome-3/3.18/devtools/anjuta/src.nix
index 835024c3447f..34394b686d3a 100644
--- a/pkgs/desktops/gnome-3/3.18/devtools/anjuta/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/devtools/anjuta/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "anjuta-3.18.0";
+  name = "anjuta-3.18.2";
 
   src = fetchurl {
-    url = mirror://gnome/sources/anjuta/3.18/anjuta-3.18.0.tar.xz;
-    sha256 = "6a3fec0963f04bc62a9dfb951e577a3276d39c3414083ef73163c3fea8e741ba";
+    url = mirror://gnome/sources/anjuta/3.18/anjuta-3.18.2.tar.xz;
+    sha256 = "be864f2f1807e1b870697f646294e997d221d5984a135245543b719e501cef8e";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/devtools/devhelp/src.nix b/pkgs/desktops/gnome-3/3.18/devtools/devhelp/src.nix
index 8da63dc2685d..acbcedb60439 100644
--- a/pkgs/desktops/gnome-3/3.18/devtools/devhelp/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/devtools/devhelp/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "devhelp-3.18.0";
+  name = "devhelp-3.18.1";
 
   src = fetchurl {
-    url = mirror://gnome/sources/devhelp/3.18/devhelp-3.18.0.tar.xz;
-    sha256 = "2494af16fedc311d7bb50bc47c32a69035f7b95fd7995d9db4fe497926087fb5";
+    url = mirror://gnome/sources/devhelp/3.18/devhelp-3.18.1.tar.xz;
+    sha256 = "303a162ad294dc6f9984898e501a06dc5d2aa9812b06801c2e39b250d8c51aef";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/devtools/gnome-devel-docs/src.nix b/pkgs/desktops/gnome-3/3.18/devtools/gnome-devel-docs/src.nix
index 50a575945d7e..4926a56fc296 100644
--- a/pkgs/desktops/gnome-3/3.18/devtools/gnome-devel-docs/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/devtools/gnome-devel-docs/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gnome-devel-docs-3.18.0";
+  name = "gnome-devel-docs-3.18.1";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gnome-devel-docs/3.18/gnome-devel-docs-3.18.0.tar.xz;
-    sha256 = "f237fb8593ada0346ccc932ae17647a883cc9f7026f4cad16f084bb7420e0925";
+    url = mirror://gnome/sources/gnome-devel-docs/3.18/gnome-devel-docs-3.18.1.tar.xz;
+    sha256 = "33d06a27bd41107fcb0cf6d447e113db081c0d08fb2d041317ad2b8abae7d880";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/games/aisleriot/src.nix b/pkgs/desktops/gnome-3/3.18/games/aisleriot/src.nix
index 465fccd15b42..f67c43bc15e7 100644
--- a/pkgs/desktops/gnome-3/3.18/games/aisleriot/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/games/aisleriot/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "aisleriot-3.18.0";
+  name = "aisleriot-3.18.2";
 
   src = fetchurl {
-    url = mirror://gnome/sources/aisleriot/3.18/aisleriot-3.18.0.tar.xz;
-    sha256 = "3421f7dabe482ddae2fd2a053a13a2a9549fe960fec5838ab4fe6d89cff054dd";
+    url = mirror://gnome/sources/aisleriot/3.18/aisleriot-3.18.2.tar.xz;
+    sha256 = "0bac8ba11ce37e4e7beddcd173f55ac1630a425399cfabb57e0e500886642fe3";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/games/four-in-a-row/src.nix b/pkgs/desktops/gnome-3/3.18/games/four-in-a-row/src.nix
index dc24a4366e3c..0b558106edd3 100644
--- a/pkgs/desktops/gnome-3/3.18/games/four-in-a-row/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/games/four-in-a-row/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "four-in-a-row-3.18.0";
+  name = "four-in-a-row-3.18.2";
 
   src = fetchurl {
-    url = mirror://gnome/sources/four-in-a-row/3.18/four-in-a-row-3.18.0.tar.xz;
-    sha256 = "a65fece60b66122fbf5fddf646ac2acffc58a802cf3e87e5985d5b962d53df48";
+    url = mirror://gnome/sources/four-in-a-row/3.18/four-in-a-row-3.18.2.tar.xz;
+    sha256 = "458fa0ba35a2640248b3b4a2f162ded27bd6056e146c521760e0ef06961b8356";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/games/gnome-klotski/src.nix b/pkgs/desktops/gnome-3/3.18/games/gnome-klotski/src.nix
index c772988198cf..132fc45c5bdb 100644
--- a/pkgs/desktops/gnome-3/3.18/games/gnome-klotski/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/games/gnome-klotski/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gnome-klotski-3.18.0";
+  name = "gnome-klotski-3.18.2";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gnome-klotski/3.18/gnome-klotski-3.18.0.tar.xz;
-    sha256 = "75ef9f7b3b09edf660165f62f8797f3850a49d6be4de0c258ee7d828e67820f2";
+    url = mirror://gnome/sources/gnome-klotski/3.18/gnome-klotski-3.18.2.tar.xz;
+    sha256 = "e22b7136c4646b1aa6a9cefa8206bc92aed4ac389e891e48551e1804a2748192";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/games/gnome-mines/src.nix b/pkgs/desktops/gnome-3/3.18/games/gnome-mines/src.nix
index e5099ac95756..c054ef6efd98 100644
--- a/pkgs/desktops/gnome-3/3.18/games/gnome-mines/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/games/gnome-mines/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gnome-mines-3.18.0";
+  name = "gnome-mines-3.18.2";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gnome-mines/3.18/gnome-mines-3.18.0.tar.xz;
-    sha256 = "8b4c05ef0ab43031661e3cdb1b17ba551efe4e4488fe4462fee9557cd10a64f9";
+    url = mirror://gnome/sources/gnome-mines/3.18/gnome-mines-3.18.2.tar.xz;
+    sha256 = "7e1e0778eb623bb96063944b0397503f964b898c234d30936c24ca1c9063f347";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/games/gnome-nibbles/src.nix b/pkgs/desktops/gnome-3/3.18/games/gnome-nibbles/src.nix
index d82422619f86..d3054b558d2a 100644
--- a/pkgs/desktops/gnome-3/3.18/games/gnome-nibbles/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/games/gnome-nibbles/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gnome-nibbles-3.18.0";
+  name = "gnome-nibbles-3.18.2";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gnome-nibbles/3.18/gnome-nibbles-3.18.0.tar.xz;
-    sha256 = "9ffc549d574774905c79b391d3e59f8045f47504d96279d9b26cc602f59ad545";
+    url = mirror://gnome/sources/gnome-nibbles/3.18/gnome-nibbles-3.18.2.tar.xz;
+    sha256 = "106cacd8b55aeb6911b4d982071cf599cbec272e01bed6f16f16f9486026e229";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/games/gnome-robots/src.nix b/pkgs/desktops/gnome-3/3.18/games/gnome-robots/src.nix
index 228e2ca81b18..130cb2fcef97 100644
--- a/pkgs/desktops/gnome-3/3.18/games/gnome-robots/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/games/gnome-robots/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gnome-robots-3.18.0";
+  name = "gnome-robots-3.18.1";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gnome-robots/3.18/gnome-robots-3.18.0.tar.xz;
-    sha256 = "34311cb9de6a970f00fa9743dced2925e98f40f77b4a406e17b589412cb902fc";
+    url = mirror://gnome/sources/gnome-robots/3.18/gnome-robots-3.18.1.tar.xz;
+    sha256 = "2e58ffdc4b243a4a3557ba9c84fa1c0129c5ffadbb5c2a20fede48ccf4618090";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/games/gnome-sudoku/src.nix b/pkgs/desktops/gnome-3/3.18/games/gnome-sudoku/src.nix
index f7dd422bec55..0699fec31c52 100644
--- a/pkgs/desktops/gnome-3/3.18/games/gnome-sudoku/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/games/gnome-sudoku/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gnome-sudoku-3.18.0";
+  name = "gnome-sudoku-3.18.2";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gnome-sudoku/3.18/gnome-sudoku-3.18.0.tar.xz;
-    sha256 = "e6180b14f7ccb9ec43e187cf358eceaf707edb4d9defff3386ae4ef8e53cce5b";
+    url = mirror://gnome/sources/gnome-sudoku/3.18/gnome-sudoku-3.18.2.tar.xz;
+    sha256 = "4eefde04145d9f4bf30f4327b83929f6bfb8a19b604337c1d75f66e984f8c0ac";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/games/gnome-taquin/src.nix b/pkgs/desktops/gnome-3/3.18/games/gnome-taquin/src.nix
index 41cb361edb3c..7017d94cf990 100644
--- a/pkgs/desktops/gnome-3/3.18/games/gnome-taquin/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/games/gnome-taquin/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gnome-taquin-3.18.0";
+  name = "gnome-taquin-3.18.2";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gnome-taquin/3.18/gnome-taquin-3.18.0.tar.xz;
-    sha256 = "3cee6a52003ccec3147020d24c079a0cd01b6855fcd486ef20a60e0f862e8760";
+    url = mirror://gnome/sources/gnome-taquin/3.18/gnome-taquin-3.18.2.tar.xz;
+    sha256 = "26154f5fd9f75b6e9e6857d6a31a9d2ce4814ec81afc6ca3e4643058877d1155";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/games/iagno/src.nix b/pkgs/desktops/gnome-3/3.18/games/iagno/src.nix
index 09b30cf066b2..77ef9f02dcc0 100644
--- a/pkgs/desktops/gnome-3/3.18/games/iagno/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/games/iagno/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "iagno-3.18.0";
+  name = "iagno-3.18.2";
 
   src = fetchurl {
-    url = mirror://gnome/sources/iagno/3.18/iagno-3.18.0.tar.xz;
-    sha256 = "4a03b474f9b0f0812c8b22b4991aa6dd894dedc05959001fd9e3e09d0d323c56";
+    url = mirror://gnome/sources/iagno/3.18/iagno-3.18.2.tar.xz;
+    sha256 = "2ee2954ef459211643fadf74745be79a82592e12750b5cf813e784e2cbbfe1bb";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/games/swell-foop/src.nix b/pkgs/desktops/gnome-3/3.18/games/swell-foop/src.nix
index ea127d8c8dc6..148fe3474742 100644
--- a/pkgs/desktops/gnome-3/3.18/games/swell-foop/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/games/swell-foop/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "swell-foop-3.18.0";
+  name = "swell-foop-3.18.1";
 
   src = fetchurl {
-    url = mirror://gnome/sources/swell-foop/3.18/swell-foop-3.18.0.tar.xz;
-    sha256 = "b105a36e04dc33e2fe1c3200ed62efea0a68e2411453cb41269508aa739d2936";
+    url = mirror://gnome/sources/swell-foop/3.18/swell-foop-3.18.1.tar.xz;
+    sha256 = "b454fb8ccc1d040a7ae08d632a07feecf88a2bf0c172b75b863f2a05e97179f6";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch b/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch
index d5a6f90e33db..0649d2bc8cc0 100644
--- a/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch
+++ b/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch
@@ -1,7 +1,7 @@
-From 175218579aa2b4f4974ff1cf4fd1ac93082a4714 Mon Sep 17 00:00:00 2001
-From: Jascha Geerds <jg@ekby.de>
+From bdbbe312e6520ce70e91319162e85367a69ce044 Mon Sep 17 00:00:00 2001
+From: Jascha Geerds <jascha@jgeerds.name>
 Date: Sat, 1 Aug 2015 21:01:11 +0200
-Subject: [PATCH 1/1] Search for themes and icons in system data dirs
+Subject: [PATCH 1/3] Search for themes and icons in system data dirs
 
 ---
  gtweak/tweaks/tweak_group_interface.py | 17 ++++-------------
@@ -59,7 +59,7 @@ index ed2ad5f..a319907 100644
                          os.path.exists(os.path.join(d, "cursors")))
          return valid
 diff --git a/gtweak/tweaks/tweak_group_keymouse.py b/gtweak/tweaks/tweak_group_keymouse.py
-index b56a4f4..3486098 100644
+index e4cce7b..4ac08b7 100644
 --- a/gtweak/tweaks/tweak_group_keymouse.py
 +++ b/gtweak/tweaks/tweak_group_keymouse.py
 @@ -20,7 +20,7 @@ import os.path
@@ -68,10 +68,10 @@ index b56a4f4..3486098 100644
  import gtweak
 -from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default
 +from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs
- from gtweak.widgets import ListBoxTweakGroup, GSettingsComboTweak, GSettingsSwitchTweak, GetterSetterSwitchTweak, Title
+ from gtweak.widgets import ListBoxTweakGroup, GSettingsComboTweak, GSettingsSwitchTweak, GetterSetterSwitchTweak, Title, GSettingsComboEnumTweak
  
  class PrimaryPasteTweak(GetterSetterSwitchTweak):
-@@ -47,10 +47,7 @@ class KeyThemeSwitcher(GSettingsComboTweak):
+@@ -48,10 +48,7 @@ class KeyThemeSwitcher(GSettingsComboTweak):
              **options)
  
      def _get_valid_key_themes(self):
@@ -84,7 +84,7 @@ index b56a4f4..3486098 100644
                      os.path.isfile(os.path.join(d, "gtk-2.0-key", "gtkrc")))
          return valid
 diff --git a/gtweak/utils.py b/gtweak/utils.py
-index 3d20425..0fcb51d 100644
+index 6e4d701..535e1f3 100644
 --- a/gtweak/utils.py
 +++ b/gtweak/utils.py
 @@ -21,6 +21,7 @@ import tempfile
@@ -95,7 +95,7 @@ index 3d20425..0fcb51d 100644
  
  import gtweak
  from gtweak.gsettings import GSettingsSetting
-@@ -114,6 +115,22 @@ def execute_subprocess(cmd_then_args, block=True):
+@@ -116,6 +117,22 @@ def execute_subprocess(cmd_then_args, block=True):
          stdout, stderr = p.communicate()
          return stdout, stderr, p.returncode
  
@@ -119,5 +119,5 @@ index 3d20425..0fcb51d 100644
  class AutostartManager:
  
 -- 
-2.4.5
+2.7.0
 
diff --git a/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch b/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch
index 61ae27349795..7863941a420a 100644
--- a/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch
+++ b/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch
@@ -1,7 +1,7 @@
-From edd3203c7b7d5ba596df9f148c443cdfc8a58d88 Mon Sep 17 00:00:00 2001
-From: Jascha Geerds <jg@ekby.de>
+From 22b948c39b32fb45066c4f5a9f99082094fea3d1 Mon Sep 17 00:00:00 2001
+From: Jascha Geerds <jascha@jgeerds.name>
 Date: Sat, 1 Aug 2015 21:26:57 +0200
-Subject: [PATCH 1/1] Don't show multiple entries for a single theme
+Subject: [PATCH 2/3] Don't show multiple entries for a single theme
 
 ---
  gtweak/tweaks/tweak_group_interface.py |  8 ++++----
@@ -50,7 +50,7 @@ index a319907..82c0286 100644
  class ShellThemeTweak(Gtk.Box, Tweak):
  
 diff --git a/gtweak/tweaks/tweak_group_keymouse.py b/gtweak/tweaks/tweak_group_keymouse.py
-index 3486098..9f53425 100644
+index 4ac08b7..ce1d0c1 100644
 --- a/gtweak/tweaks/tweak_group_keymouse.py
 +++ b/gtweak/tweaks/tweak_group_keymouse.py
 @@ -20,7 +20,7 @@ import os.path
@@ -59,10 +59,10 @@ index 3486098..9f53425 100644
  import gtweak
 -from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs
 +from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs, get_unique_resources
- from gtweak.widgets import ListBoxTweakGroup, GSettingsComboTweak, GSettingsSwitchTweak, GetterSetterSwitchTweak, Title
+ from gtweak.widgets import ListBoxTweakGroup, GSettingsComboTweak, GSettingsSwitchTweak, GetterSetterSwitchTweak, Title, GSettingsComboEnumTweak
  
  class PrimaryPasteTweak(GetterSetterSwitchTweak):
-@@ -50,7 +50,7 @@ class KeyThemeSwitcher(GSettingsComboTweak):
+@@ -51,7 +51,7 @@ class KeyThemeSwitcher(GSettingsComboTweak):
          valid = walk_directories(get_resource_dirs("themes"), lambda d:
                      os.path.isfile(os.path.join(d, "gtk-3.0", "gtk-keys.css")) and \
                      os.path.isfile(os.path.join(d, "gtk-2.0-key", "gtkrc")))
@@ -72,10 +72,10 @@ index 3486098..9f53425 100644
  TWEAK_GROUPS = [
      ListBoxTweakGroup(_("Keyboard and Mouse"),
 diff --git a/gtweak/utils.py b/gtweak/utils.py
-index 0fcb51d..ce8e12e 100644
+index 535e1f3..42f7d96 100644
 --- a/gtweak/utils.py
 +++ b/gtweak/utils.py
-@@ -131,6 +131,22 @@ def get_resource_dirs(resource):
+@@ -133,6 +133,22 @@ def get_resource_dirs(resource):
  
      return [dir for dir in dirs if os.path.isdir(dir)]
  
@@ -99,5 +99,5 @@ index 0fcb51d..ce8e12e 100644
  class AutostartManager:
  
 -- 
-2.4.5
+2.7.0
 
diff --git a/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch b/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch
index 840ebb82ec75..b25b2d6dc4aa 100644
--- a/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch
+++ b/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch
@@ -1,7 +1,7 @@
-From dea8fc3c37c43f4fbbcc658ee995a95b93452b3c Mon Sep 17 00:00:00 2001
-From: Jascha Geerds <jg@ekby.de>
+From cdafa01dc90da486d0114b423e3e467f7b083d1b Mon Sep 17 00:00:00 2001
+From: Jascha Geerds <jascha@jgeerds.name>
 Date: Sun, 2 Aug 2015 12:01:20 +0200
-Subject: [PATCH 1/1] Create config dir if it doesn't exist
+Subject: [PATCH 3/3] Create config dir if it doesn't exist
 
 Otherwise gnome-tweak-tool can't enable the dark theme and fails
 without a clear error message.
@@ -25,5 +25,5 @@ index bcec9f1..f39991b 100644
              keyfile.load_from_file(self._path, 0)
          except MemoryError:
 -- 
-2.4.5
+2.7.0
 
diff --git a/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/src.nix b/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/src.nix
index abb957394e7b..799087bd9b9b 100644
--- a/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gnome-tweak-tool-3.16.2";
+  name = "gnome-tweak-tool-3.18.1";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gnome-tweak-tool/3.16/gnome-tweak-tool-3.16.2.tar.xz;
-    sha256 = "b1e403725c3489be07e1d754f044d1128eddb38204a344bbe0baa523d531bd64";
+    url = mirror://gnome/sources/gnome-tweak-tool/3.18/gnome-tweak-tool-3.18.1.tar.xz;
+    sha256 = "5c2c1103237648413c2d63a941e06b7057d6b102276b5968517753075de29430";
   };
 }

From b292e19fbddaddd4ada813965e3be3880f15fa7e Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 13 Jan 2016 17:16:51 +0300
Subject: [PATCH 672/884] xserver service: wait for systemd-logind

This seems the right thing to do, and most likely has fixed the race condition
described at https://github.com/NixOS/nixpkgs/issues/12132#issuecomment-171284532
---
 nixos/modules/services/x11/xserver.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index a7a9aac5c7fa..68745ba8197a 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -502,7 +502,7 @@ in
     systemd.services.display-manager =
       { description = "X11 Server";
 
-        after = [ "systemd-udev-settle.service" "local-fs.target" "acpid.service" ];
+        after = [ "systemd-udev-settle.service" "local-fs.target" "acpid.service" "systemd-logind.service" ];
 
         restartIfChanged = false;
 

From 0deb1c1e750f0ca786d0bc216f808ec469a13979 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 13 Jan 2016 18:08:04 +0300
Subject: [PATCH 673/884] sddm: fix focus of the password field

---
 pkgs/applications/display-managers/sddm/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix
index 89dfab1a6896..e4f68d786f40 100644
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, makeQtWrapper, fetchFromGitHub
+{ stdenv, makeQtWrapper, fetchFromGitHub, fetchpatch
 , cmake, pkgconfig, libxcb, libpthreadstubs, lndir
 , libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd
 , themes
@@ -20,6 +20,10 @@ let
     patches = [
       ./0001-ignore-config-mtime.patch
       ./0002-fix-ConfigReader-QStringList-corruption.patch
+      (fetchpatch {
+        url = https://github.com/benjarobin/sddm/commit/7d05362e3c7c5945ad85b0176771bc1c5a370598.patch;
+        sha256 = "17f174lsb8vm7k1vx00yiqcipyyr6hgg4rm1rclps7saapfah5sj";
+      })
     ];
 
     nativeBuildInputs = [ cmake pkgconfig qttools ];

From 3d3dec9acf6d1edb7e5b4810cb2a918515bfd617 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 13 Jan 2016 16:17:00 +0100
Subject: [PATCH 674/884] Add Crypt::JWT

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 9dce40913726..6f3b945cf5a8 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2293,6 +2293,19 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ClassMix];
   };
 
+  CryptJWT = buildPerlPackage {
+    name = "Crypt-JWT-0.011";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/M/MI/MIK/Crypt-JWT-0.011.tar.gz;
+      sha256 = "0eb02328aa2949adbf91c760bcdc9a5f6e206db8533023847fd7f76783f71e09";
+    };
+    propagatedBuildInputs = [ CryptX JSONMaybeXS ];
+    meta = {
+      description = "JSON Web Token";
+      license = "perl";
+    };
+  };
+
   CryptPasswdMD5 = buildPerlPackage {
     name = "Crypt-PasswdMD5-1.40";
     src = fetchurl {
@@ -2476,6 +2489,20 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  CryptX = buildPerlModule {
+    name = "CryptX-0.026";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/M/MI/MIK/CryptX-0.026.tar.gz;
+      sha256 = "0465843c86eb16b13717fde5b803c7390bb14805e277e1a1841a62e5124debc2";
+    };
+    buildInputs = [ JSONMaybeXS ];
+    propagatedBuildInputs = [ JSONMaybeXS ];
+    meta = {
+      description = "Crypto toolkit";
+      license = "perl";
+    };
+  };
+
   CwdGuard = buildPerlModule rec {
     name = "Cwd-Guard-0.04";
     src = fetchurl {

From 9238521b1c7f2d3d40b6d5ff85835e809c01d260 Mon Sep 17 00:00:00 2001
From: Joe Hermaszewski <git@monoid.al>
Date: Wed, 13 Jan 2016 15:21:23 +0000
Subject: [PATCH 675/884] llvm: Add enableSharedLibraries option to 3.5 and 3.6

---
 pkgs/development/compilers/llvm/3.5/llvm.nix | 6 ++++--
 pkgs/development/compilers/llvm/3.6/llvm.nix | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix
index 8daba7b1d9cd..f16b6981dea5 100644
--- a/pkgs/development/compilers/llvm/3.5/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.5/llvm.nix
@@ -13,6 +13,7 @@
 , zlib
 , compiler-rt_src
 , debugVersion ? false
+, enableSharedLibraries ? !stdenv.isDarwin
 }:
 
 let
@@ -43,10 +44,11 @@ in stdenv.mkDerivation rec {
     "-DLLVM_BUILD_TESTS=ON"
     "-DLLVM_ENABLE_FFI=ON"
     "-DLLVM_REQUIRES_RTTI=1"
-  ] ++ stdenv.lib.optionals (!isDarwin) [
+  ] ++ stdenv.lib.optional enableSharedLibraries
     "-DBUILD_SHARED_LIBS=ON"
+    ++ stdenv.lib.optional (!isDarwin)
     "-DLLVM_BINUTILS_INCDIR=${binutils}/include"
-  ] ++ stdenv.lib.optionals ( isDarwin) [
+    ++ stdenv.lib.optionals ( isDarwin) [
     "-DCMAKE_CXX_FLAGS=-stdlib=libc++"
     "-DCAN_TARGET_i386=false"
   ];
diff --git a/pkgs/development/compilers/llvm/3.6/llvm.nix b/pkgs/development/compilers/llvm/3.6/llvm.nix
index 6da31fbbf5b3..2ccf9d1ed712 100644
--- a/pkgs/development/compilers/llvm/3.6/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.6/llvm.nix
@@ -13,6 +13,7 @@
 , zlib
 , compiler-rt_src
 , debugVersion ? false
+, enableSharedLibraries ? !stdenv.isDarwin
 }:
 
 let
@@ -43,10 +44,11 @@ in stdenv.mkDerivation rec {
     "-DLLVM_BUILD_TESTS=ON"
     "-DLLVM_ENABLE_FFI=ON"
     "-DLLVM_ENABLE_RTTI=ON"
-  ] ++ stdenv.lib.optionals (!isDarwin) [
+  ] ++ stdenv.lib.optional enableSharedLibraries
     "-DBUILD_SHARED_LIBS=ON"
+    ++ stdenv.lib.optional (!isDarwin)
     "-DLLVM_BINUTILS_INCDIR=${binutils}/include"
-  ] ++ stdenv.lib.optionals ( isDarwin) [
+    ++ stdenv.lib.optionals ( isDarwin) [
     "-DCMAKE_CXX_FLAGS=-stdlib=libc++"
     "-DCAN_TARGET_i386=false"
   ];

From f9d166350d90cfa82bf0ab5d58226793d6d717ee Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 13 Jan 2016 17:36:28 +0100
Subject: [PATCH 676/884] Remove previous CryptX version

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 6f3b945cf5a8..849db4820a8c 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2451,19 +2451,6 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ PathClass TryTiny ];
   };
 
-  CryptX = buildPerlModule rec {
-    name = "CryptX-0.025";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/M/MI/MIK/${name}.tar.gz";
-      sha256 = "f8b7e3ec1713c8dfe3eef9d114f45f223b97e2340f81a20589b5605fa49cfe38";
-    };
-    propagatedBuildInputs = [ JSON ];
-    meta = {
-      description = "Crypto toolkit";
-      license = "perl";
-    };
-  };
-
   CSSDOM = buildPerlPackage rec {
     name = "CSS-DOM-0.15";
     src = fetchurl {

From 3800c62d8993e2a5e1533b7e1400bef2913b38d6 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 13 Jan 2016 11:01:39 -0600
Subject: [PATCH 677/884] Revert "melpa-packages.json: remove "0blayout" to
 mitigate the effects of https://github.com/NixOS/nixpkgs/issues/12353"

This reverts commit 4f85afad5ba5629f2b6bb792f38cad0841a946bc.
---
 .../editors/emacs-modes/melpa-packages.json       | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.json b/pkgs/applications/editors/emacs-modes/melpa-packages.json
index 0035cbf2d056..8717a5f126ad 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.json
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.json
@@ -37286,6 +37286,21 @@
             "emacs"
         ]
     },
+    "0blayout": {
+        "fetch": {
+            "tag": "fetchFromGitHub",
+            "owner": "etu",
+            "repo": "0blayout-mode",
+            "sha256": "1xigpz2aswlmpcsc1f7gfakyw7041pbyl9zfd8nz38iq036n5b96",
+            "rev": "e256da71d4e0f126a0fd8a9b8fb77f54931f4dfc"
+        },
+        "recipe": {
+            "sha256": "027k85h34998i8vmbg2hi4q1m4f7jfva5jm38k0g9m1db700gk92",
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
+        },
+        "version": "20151021.549",
+        "deps": []
+    },
     "afternoon-theme": {
         "fetch": {
             "tag": "fetchFromGitHub",

From 3673ab7799711c4cdb7331a99ce48b50a488893a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 13 Jan 2016 11:02:11 -0600
Subject: [PATCH 678/884] Revert "melpa-packages.json: remove "4clojure" to
 mitigate the effects of https://github.com/NixOS/nixpkgs/issues/12353"

This reverts commit 2f5e87a7bff1148df4cdb3494894f003046b6385.
---
 .../editors/emacs-modes/melpa-packages.json    | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.json b/pkgs/applications/editors/emacs-modes/melpa-packages.json
index 8717a5f126ad..b5b4aa4b7e1b 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.json
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.json
@@ -2115,6 +2115,24 @@
             "web-server"
         ]
     },
+    "4clojure": {
+        "fetch": {
+            "tag": "fetchFromGitHub",
+            "owner": "joshuarh",
+            "repo": "4clojure.el",
+            "sha256": "1fybicg46fc5jjqv7g2d3dnj1x9n58m2fg9x6qxn9l8qlzk9yxkq",
+            "rev": "3cdfd356c24cd3518397d29ae833f56a4d20b4ca"
+        },
+        "recipe": {
+            "sha256": "1w9zxy6jwiln28cmdgkbbdfk3pdscqlfahrqi6lbgpjvkw9z44mb",
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
+        },
+        "version": "20131014.1707",
+        "deps": [
+            "json",
+            "request"
+        ]
+    },
     "mustard-theme": {
         "fetch": {
             "tag": "fetchFromGitHub",

From f094da5e0d1bcac74a782834423d9d37a5db4dcf Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 13 Jan 2016 11:02:21 -0600
Subject: [PATCH 679/884] Revert "melpa-packages.json: remove "2048-game" to
 mitigate the effects of https://github.com/NixOS/nixpkgs/issues/12353"

This reverts commit 625fe8164fed723c90248a6c5dbb12533309e4a6.
---
 .../editors/emacs-modes/melpa-packages.json        | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.json b/pkgs/applications/editors/emacs-modes/melpa-packages.json
index b5b4aa4b7e1b..889b4cea4a5a 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.json
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.json
@@ -11403,6 +11403,20 @@
         "version": "20140306.845",
         "deps": []
     },
+    "2048-game": {
+        "fetch": {
+            "tag": "fetchhg",
+            "url": "https://bitbucket.com/zck/2048.el",
+            "sha256": "1p9qn9n8mfb4z62h1s94mlg0vshpzafbhsxgzvx78sqlf6bfc80l",
+            "rev": "ea6c3bce8ac1"
+        },
+        "recipe": {
+            "sha256": "0z7x9bnyi3qlq7l0fskb61i6yr9gm7w7wplqd28wz8p1j5yw8aa0",
+            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
+        },
+        "version": "20151026.1433",
+        "deps": []
+    },
     "mag-menu": {
         "fetch": {
             "tag": "fetchFromGitHub",

From f3b7101bbbc17f3127cb0374f6217df1afdb81f9 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 13 Jan 2016 11:03:07 -0600
Subject: [PATCH 680/884] emacs24PackagesNg: do not recurseIntoAttrs

Fixes #12353. The "emacs-" prefix on the package names interfered with
"nix-env -i" because package names starting with numerals were
interpreted as versions of the "emacs" package.
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3c9fda23a30e..8d185f61369a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11688,7 +11688,7 @@ let
     };
   };
 
-  emacs24PackagesNg = recurseIntoAttrs (emacsPackagesNgGen emacs24);
+  emacs24PackagesNg = emacsPackagesNgGen emacs24;
 
   emacs24WithPackages = emacs24PackagesNg.emacsWithPackages;
   emacsWithPackages = emacsPackagesNg.emacsWithPackages;

From 3a03a6dd608ab64ab0d396890e572064bce5dc4f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 13 Jan 2016 11:05:45 -0600
Subject: [PATCH 681/884] build emacs24PackagesNg on Hydra

This is required now because we do not recurseIntoAttrs for
emacsPackagesNg. This has the side-effect of removing duplicate jobs.
---
 pkgs/top-level/release.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 4795fa21a901..5682b331c927 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -235,6 +235,8 @@ let
       zsh = linux;
       zsnes = ["i686-linux"];
 
+      emacs24PackagesNg = packagePlatforms pkgs.emacs24PackagesNg;
+
       gnome = {
         gnome_panel = linux;
         metacity = linux;

From 007d1b41fcde11c7eb9a12adfd6786eaa0b34ed5 Mon Sep 17 00:00:00 2001
From: Matthew O'Gorman <mog@rldn.net>
Date: Wed, 13 Jan 2016 12:48:15 -0500
Subject: [PATCH 682/884] platformio: 2.7 -> 2.7.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0494c97b7e39..bcf84f13cd80 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14059,13 +14059,13 @@ in modules // {
 
   platformio =  buildPythonPackage rec {
     name = "platformio-${version}";
-    version="2.7.0";
+    version="2.7.1";
 
     disabled = isPy3k || isPyPy;
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/p/platformio/platformio-${version}.tar.gz";
-      sha256 = "0bjp8gapd8v5az0xvsgh44zyma5kazhhbq266fk092i2q348zbv6";
+      sha256 = "1xrjzgwdw7526vfimqjyr9115qzcs17dbyf7023x13anc8b2s9pq";
      };
 
      propagatedBuildInputs = with self; [ click_5 requests2 bottle pyserial lockfile colorama];

From 00b06e6d459c051b20b01df08b2db71fdcc7ca83 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 13 Jan 2016 19:15:44 +0100
Subject: [PATCH 683/884] minissdpd: 1.4 -> 1.5

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

diff --git a/pkgs/tools/networking/minissdpd/default.nix b/pkgs/tools/networking/minissdpd/default.nix
index f99a3de90468..b197d16abdb2 100644
--- a/pkgs/tools/networking/minissdpd/default.nix
+++ b/pkgs/tools/networking/minissdpd/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, libnfnetlink }:
 
 let
-  version = "1.4";
+  version = "1.5";
   name = "minissdpd-${version}";
 in stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
-    sha256 = "0450680b9hpr3z4dn6gy01clxdc17w0lmxcjx6kfj8ahsklwg8j6";
+    sha256 = "03w9zg8i8bfjlr0haa08r823rfcff6lzm1ia875il7kkhnqkgmnz";
     url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
     name = "${name}.tar.gz";
   };

From 0f516115a4b8230fd3da57187f13bdde7dd0c8fd Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 13 Jan 2016 18:36:12 +0300
Subject: [PATCH 684/884] libbluray: 0.9.0 -> 0.9.2

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

diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix
index 77fa6dec43ec..7d7689bf23ed 100644
--- a/pkgs/development/libraries/libbluray/default.nix
+++ b/pkgs/development/libraries/libbluray/default.nix
@@ -19,12 +19,12 @@ assert withFonts -> freetype != null;
 
 stdenv.mkDerivation rec {
   baseName = "libbluray";
-  version  = "0.9.0";
+  version  = "0.9.2";
   name = "${baseName}-${version}";
 
   src = fetchurl {
     url = "ftp://ftp.videolan.org/pub/videolan/${baseName}/${version}/${name}.tar.bz2";
-    sha256 = "0kb9znxk6610vi0fjhqxn4z5i98nvxlsz1f8dakj99rg42livdl4";
+    sha256 = "1sp71j4agcsg17g6b85cqz78pn5vknl5pl39rvr6mkib5ps99jgg";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ]

From ca4e0a483eb7ce5655a94d12bcdffb4904db03d7 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 13 Jan 2016 18:38:46 +0300
Subject: [PATCH 685/884] libtirpc: 0.3.2 -> 1.0.1

---
 pkgs/development/libraries/ti-rpc/default.nix |  7 +-
 .../fix_missing_rpc_get_default_domain.patch  | 88 -------------------
 2 files changed, 2 insertions(+), 93 deletions(-)
 delete mode 100644 pkgs/development/libraries/ti-rpc/fix_missing_rpc_get_default_domain.patch

diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix
index a4d210547fd2..7a58f4c8cff0 100644
--- a/pkgs/development/libraries/ti-rpc/default.nix
+++ b/pkgs/development/libraries/ti-rpc/default.nix
@@ -1,19 +1,16 @@
 { fetchurl, stdenv, autoreconfHook, libkrb5 }:
 
 stdenv.mkDerivation rec {
-  name = "libtirpc-0.3.2";
+  name = "libtirpc-1.0.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/libtirpc/${name}.tar.bz2";
-    sha256 = "1z1z8xnlqgqznxzmyc6sypjc6b220xkv0s55hxd5sb3zydws6210";
+    sha256 = "17mqrdgsgp9m92pmq7bvr119svdg753prqqxmg4cnz5y657rfmji";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
   propagatedBuildInputs = [ libkrb5 ];
 
-  # http://sourceforge.net/p/libtirpc/mailman/libtirpc-devel/thread/5581CB06.5020604%40email.com/#msg34216933
-  patches = [ ./fix_missing_rpc_get_default_domain.patch ];
-
   preConfigure = ''
     sed -es"|/etc/netconfig|$out/etc/netconfig|g" -i doc/Makefile.in tirpc/netconfig.h
   '';
diff --git a/pkgs/development/libraries/ti-rpc/fix_missing_rpc_get_default_domain.patch b/pkgs/development/libraries/ti-rpc/fix_missing_rpc_get_default_domain.patch
deleted file mode 100644
index c905d3c0de87..000000000000
--- a/pkgs/development/libraries/ti-rpc/fix_missing_rpc_get_default_domain.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-diff -rNu3 libtirpc-0.3.2-old/src/Makefile.am libtirpc-0.3.2/src/Makefile.am
---- libtirpc-0.3.2-old/src/Makefile.am	2015-07-28 15:17:49.248168000 +0300
-+++ libtirpc-0.3.2/src/Makefile.am	2015-07-28 15:18:04.870144456 +0300
-@@ -69,7 +69,7 @@
- endif
- 
- libtirpc_la_SOURCES += key_call.c key_prot_xdr.c getpublickey.c
--libtirpc_la_SOURCES += netname.c netnamer.c rtime.c
-+libtirpc_la_SOURCES += netname.c netnamer.c rpcdname.c rtime.c
- 
- CLEANFILES	       = cscope.* *~
- DISTCLEANFILES	       = Makefile.in
-diff -rNu3 libtirpc-0.3.2-old/src/rpcdname.c libtirpc-0.3.2/src/rpcdname.c
---- libtirpc-0.3.2-old/src/rpcdname.c	1970-01-01 03:00:00.000000000 +0300
-+++ libtirpc-0.3.2/src/rpcdname.c	2015-07-28 15:18:04.870144456 +0300
-@@ -0,0 +1,72 @@
-+/*
-+ * Copyright (c) 2009, Sun Microsystems, Inc.
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are met:
-+ * - Redistributions of source code must retain the above copyright notice,
-+ *   this list of conditions and the following disclaimer.
-+ * - Redistributions in binary form must reproduce the above copyright notice,
-+ *   this list of conditions and the following disclaimer in the documentation
-+ *   and/or other materials provided with the distribution.
-+ * - Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *   contributors may be used to endorse or promote products derived
-+ *   from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-+ * POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+/*
-+ * rpcdname.c
-+ * Gets the default domain name
-+ */
-+
-+#include <stdlib.h>
-+#include <unistd.h>
-+#include <string.h>
-+
-+static char *default_domain = 0;
-+
-+static char *
-+get_default_domain()
-+{
-+	char temp[256];
-+
-+	if (default_domain)
-+		return (default_domain);
-+	if (getdomainname(temp, sizeof(temp)) < 0)
-+		return (0);
-+	if ((int) strlen(temp) > 0) {
-+		default_domain = (char *)malloc((strlen(temp)+(unsigned)1));
-+		if (default_domain == 0)
-+			return (0);
-+		(void) strcpy(default_domain, temp);
-+		return (default_domain);
-+	}
-+	return (0);
-+}
-+
-+/*
-+ * This is a wrapper for the system call getdomainname which returns a
-+ * ypclnt.h error code in the failure case.  It also checks to see that
-+ * the domain name is non-null, knowing that the null string is going to
-+ * get rejected elsewhere in the NIS client package.
-+ */
-+int
-+__rpc_get_default_domain(domain)
-+	char **domain;
-+{
-+	if ((*domain = get_default_domain()) != 0)
-+		return (0);
-+	return (-1);
-+}

From 530ac7b17ba84374669ba6a7d4371542561eb211 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 13 Jan 2016 18:45:00 +0300
Subject: [PATCH 686/884] cppzmq: 20150926 -> 20151203

---
 pkgs/development/libraries/cppzmq/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix
index f74ee51cab26..c8ab48288a1c 100644
--- a/pkgs/development/libraries/cppzmq/default.nix
+++ b/pkgs/development/libraries/cppzmq/default.nix
@@ -1,12 +1,13 @@
-{ stdenv, fetchgit }:
+{ stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "cppzmq-20150926";
+  name = "cppzmq-20151203";
 
-  src = fetchgit {
-    url = "https://github.com/zeromq/cppzmq";
-    rev = "fa2f2c67a79c31d73bfef6862cc8ce12a98dd022";
-    sha256 = "7b46712b5fa7e59cd0ffae190674046c71d5762c064003c125d6cd7a3da19b71";
+  src = fetchFromGitHub {
+    owner = "zeromq";
+    repo = "cppzmq";
+    rev = "7f7c83411d83eafe57ae6ffc2972ad9455ac258e";
+    sha256 = "1h6fl7mgkv98gz0csbp525a4bp1w9nwm059gwmmv1wqc1l741pv7";
   };
 
   installPhase = ''

From 9aa961a299463e6b03470c22087a927f9d954ff0 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 13 Jan 2016 19:46:29 +0300
Subject: [PATCH 687/884] rxvt_unicode: 9.20 -> 9.21

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

diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix
index c1d74c247cef..d30c2761f73c 100644
--- a/pkgs/applications/misc/rxvt_unicode/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode/default.nix
@@ -4,7 +4,7 @@
 
 let
   name = "rxvt-unicode";
-  version = "9.20";
+  version = "9.21";
   n = "${name}-${version}";
 in
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation (rec {
 
   src = fetchurl {
     url = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${version}.tar.bz2";
-    sha256 = "e73e13fe64b59fd3c8e6e20c00f149d388741f141b8155e4700d3ed40aa94b4e";
+    sha256 = "0swmi308v5yxsddrdhvi4cch88k2bbs2nffpl5j5m2f55gbhw9vm";
   };
 
   buildInputs =

From ad735e76e72d5b5cdbe51e3342d44173e8409aff Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 13 Jan 2016 20:00:38 +0300
Subject: [PATCH 688/884] vc: 1.0.0 -> 1.1.0

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

diff --git a/pkgs/development/libraries/vc/default.nix b/pkgs/development/libraries/vc/default.nix
index 9d5a24c43713..c96c2c47cb92 100644
--- a/pkgs/development/libraries/vc/default.nix
+++ b/pkgs/development/libraries/vc/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  version = "1.0.0";
+  version = "1.1.0";
   name = "Vc-${version}";
 
   src = fetchFromGitHub {
     owner = "VcDevel";
     repo = "Vc";
     rev = version;
-    sha256 = "014li9kcbbxinh9r1nngdzspjzs2nxwslcknd950msjkqgnjhz4r";
+    sha256 = "1i27zpwcpsfabvf1vpyx5rlzkkgqfd55c3c0jq5fghywyj6743j8";
   };
 
   nativeBuildInputs = [ cmake ];

From 1774cee91afaecca842763608faa55b7ab705176 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 13 Jan 2016 20:00:50 +0300
Subject: [PATCH 689/884] crawl: 0.17.0 -> 0.17.1

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

diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix
index e09e5ed730b3..e6a1eb2c1a62 100644
--- a/pkgs/games/crawl/default.nix
+++ b/pkgs/games/crawl/default.nix
@@ -3,7 +3,7 @@
 , tileMode ? true
 }:
 
-let version = "0.17.0";
+let version = "0.17.1";
 in
 stdenv.mkDerivation rec {
   name = "crawl-${version}" + (if tileMode then "-tiles" else "");
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     owner = "crawl-ref";
     repo = "crawl-ref";
     rev = version;
-    sha256 = "0igvgi3dgf73da4gznc2dcbiix79hn08qk9yalrc92d2c1xxdawh";
+    sha256 = "05rgqg9kh4bsgzhyan4l9ygj9pqr0nbya0sv8rpm4kny0h3b006a";
   };
 
   patches = [ ./crawl_purify.patch ];

From 957b09d61acac12bfa40c43eb78c7bd1e4e36370 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 13 Jan 2016 20:01:29 +0300
Subject: [PATCH 690/884] android-udev-rules: 20151108 -> 20151209

---
 .../linux/android-udev-rules/default.nix            | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix
index efc0e7bedb57..d4acceb52622 100644
--- a/pkgs/os-specific/linux/android-udev-rules/default.nix
+++ b/pkgs/os-specific/linux/android-udev-rules/default.nix
@@ -1,12 +1,13 @@
-{ stdenv, fetchgit }:
+{ stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation {
-  name = "android-udev-rules-20151108";
+  name = "android-udev-rules-20151209";
 
-  src = fetchgit {
-    url = "https://github.com/M0Rf30/android-udev-rules";
-    rev = "3d21377820694cf8412e1fd09be5caaad3a5eef8";
-    sha256 = "2f90bc5822144df916d11ff5312c3179f1b905a7b003aa86056aa24ba433c99b";
+  src = fetchFromGitHub {
+    owner = "M0Rf30";
+    repo = "android-udev-rules";
+    rev = "b22717d2337f991787ab687f6d0258207c6ad288";
+    sha256 = "1z03nlqj68bxs163jmn66j3n0ywwar5bihpsz5ag8ak3nn2d3fp2";
   };
 
   installPhase = ''

From 9aca5edfdd1a55fe0af61b81df5ee16a3064028b Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 13 Jan 2016 20:01:43 +0300
Subject: [PATCH 691/884] grub4dos: 0.4.6a -> 0.4.6a-2015-12-31

---
 pkgs/tools/misc/grub4dos/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/grub4dos/default.nix b/pkgs/tools/misc/grub4dos/default.nix
index 18464574d440..c59869c0dc7e 100644
--- a/pkgs/tools/misc/grub4dos/default.nix
+++ b/pkgs/tools/misc/grub4dos/default.nix
@@ -5,11 +5,11 @@ let arch =
   else if stdenv.isx86_64 then "x86_64"
   else abort "Unknown architecture";
 in stdenv.mkDerivation {
-  name = "grub4dos-0.4.6a";
+  name = "grub4dos-0.4.6a-2015-12-31";
 
   src = fetchurl {
-    url = https://github.com/chenall/grub4dos/archive/e855b293432bd4d155e42d48356f9aa1974ec385.zip;
-    sha256 = "1vihzllsdshd5dyr7i7dp5ragyg77gg8r279pz954p7lkcda4kx7";
+    url = https://github.com/chenall/grub4dos/archive/a8024743c61cc4909514b27df07b7cc4bc89d1fb.zip;
+    sha256 = "1m5d7klb12qz5sa09919z7jchfafgh84cmpwilp52qnbpi3zh2fd";
   };
 
   nativeBuildInputs = [ unzip nasm ];

From f48d1f088d4e274a378fb86480f86dbccd70660f Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 13 Jan 2016 21:16:28 +0300
Subject: [PATCH 692/884] rpcbind: fix for libtiprc 1.0.1

---
 ...n-t-use-the-xp_auth-pointer-directly.patch | 43 +++++++++++++++++++
 pkgs/servers/rpcbind/default.nix              |  5 ++-
 2 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/servers/rpcbind/0001-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch

diff --git a/pkgs/servers/rpcbind/0001-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch b/pkgs/servers/rpcbind/0001-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch
new file mode 100644
index 000000000000..16b763ef0dec
--- /dev/null
+++ b/pkgs/servers/rpcbind/0001-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch
@@ -0,0 +1,43 @@
+From 9194122389f2a56b1cd1f935e64307e2e963c2da Mon Sep 17 00:00:00 2001
+From: Steve Dickson <steved@redhat.com>
+Date: Mon, 2 Nov 2015 17:05:18 -0500
+Subject: [PATCH] handle_reply: Don't use the xp_auth pointer directly
+
+In the latest libtirpc version to access the xp_auth
+one must use the SVC_XP_AUTH macro. To be backwards
+compatible a couple ifdefs were added to use the
+macro when it exists.
+
+Upstream-Status: Backport
+
+Signed-off-by: Steve Dickson <steved@redhat.com>
+Signed-off-by: Maxin B. John <maxin.john@intel.com>
+---
+ src/rpcb_svc_com.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c
+index 4ae93f1..22d6c84 100644
+--- a/src/rpcb_svc_com.c
++++ b/src/rpcb_svc_com.c
+@@ -1295,10 +1295,17 @@ handle_reply(int fd, SVCXPRT *xprt)
+ 	a.rmt_localvers = fi->versnum;
+ 
+ 	xprt_set_caller(xprt, fi);
++#if defined(SVC_XP_AUTH)
++	SVC_XP_AUTH(xprt) = svc_auth_none;
++#else 
+ 	xprt->xp_auth = &svc_auth_none;
++#endif
+ 	svc_sendreply(xprt, (xdrproc_t) xdr_rmtcall_result, (char *) &a);
++#if !defined(SVC_XP_AUTH)
+ 	SVCAUTH_DESTROY(xprt->xp_auth);
+ 	xprt->xp_auth = NULL;
++#endif
++
+ done:
+ 	if (buffer)
+ 		free(buffer);
+-- 
+2.4.0
+
diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/servers/rpcbind/default.nix
index 6eb8a57cab4f..7cb2c5a0c381 100644
--- a/pkgs/servers/rpcbind/default.nix
+++ b/pkgs/servers/rpcbind/default.nix
@@ -10,7 +10,10 @@ in stdenv.mkDerivation rec {
     sha256 = "0yyjzv4161rqxrgjcijkrawnk55rb96ha0pav48s03l2klx855wq";
   };
 
-  patches = [ ./sunrpc.patch ];
+  patches = [
+    ./sunrpc.patch
+    ./0001-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch
+  ];
 
   buildInputs = [ libtirpc ]
              ++ stdenv.lib.optional useSystemd systemd;

From e7ba7fba01bfd3de51c02d75cbd229e25ba36602 Mon Sep 17 00:00:00 2001
From: Mark Laws <mdl@60hz.org>
Date: Mon, 3 Aug 2015 10:04:10 -0700
Subject: [PATCH 693/884] gale: init at 1.1happy

---
 nixos/modules/misc/ids.nix                    |   2 +
 nixos/modules/module-list.nix                 |   1 +
 nixos/modules/services/networking/gale.nix    | 182 ++++++++++
 .../instant-messengers/gale/default.nix       |  31 ++
 .../gale/gale-install.in.patch                | 339 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 6 files changed, 557 insertions(+)
 create mode 100644 nixos/modules/services/networking/gale.nix
 create mode 100644 pkgs/applications/networking/instant-messengers/gale/default.nix
 create mode 100644 pkgs/applications/networking/instant-messengers/gale/gale-install.in.patch

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index f24afccb405a..39ed914994c1 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -244,6 +244,7 @@
       postsrsd = 220;
       opendkim = 221;
       dspam = 222;
+      gale = 223;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -465,6 +466,7 @@
       postsrsd = 220;
       opendkim = 221;
       dspam = 222;
+      gale = 223;
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index b2f08feb1082..d9e8c2da5b32 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -301,6 +301,7 @@
   ./services/networking/firewall.nix
   ./services/networking/flashpolicyd.nix
   ./services/networking/freenet.nix
+  ./services/networking/gale.nix
   ./services/networking/gateone.nix
   ./services/networking/git-daemon.nix
   ./services/networking/gnunet.nix
diff --git a/nixos/modules/services/networking/gale.nix b/nixos/modules/services/networking/gale.nix
new file mode 100644
index 000000000000..3a5d9bd63c7b
--- /dev/null
+++ b/nixos/modules/services/networking/gale.nix
@@ -0,0 +1,182 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.gale;
+  # we convert the path to a string to avoid it being copied to the nix store,
+  # otherwise users could read the private key as all files in the store are
+  # world-readable
+  keyPath = toString cfg.keyPath;
+  # ...but we refer to the pubkey file using a path so that we can ensure the
+  # config gets rebuilt if the public key changes (we can assume the private key
+  # will never change without the public key having changed)
+  gpubFile = cfg.keyPath + "/${cfg.domain}.gpub";
+  home = "/var/lib/gale";
+  keysPrepared = cfg.keyPath != null && lib.pathExists cfg.keyPath;
+in
+{
+  options = {
+    services.gale = {
+      enable = mkEnableOption "the Gale messaging daemon";
+
+      user = mkOption {
+        default = "gale";
+        type = types.str;
+        description = "Username for the Gale daemon.";
+      };
+
+      group = mkOption {
+        default = "gale";
+        type = types.str;
+        description = "Group name for the Gale daemon.";
+      };
+
+      setuidWrapper = mkOption {
+        default = null;
+        description = "Configuration for the Gale gksign setuid wrapper.";
+      };
+
+      domain = mkOption {
+        default = "";
+        type = types.str;
+        description = "Domain name for the Gale system.";
+      };
+
+      keyPath = mkOption {
+        default = null;
+        type = types.nullOr types.path;
+        description = ''
+          Directory containing the key pair for this Gale domain.  The expected
+          filename will be taken from the domain option with ".gpri" and ".gpub"
+          appended.
+        '';
+      };
+
+      extraConfig = mkOption {
+        type = types.lines;
+        default = "";
+        description = ''
+          Additional text to be added to <filename>/etc/gale/conf</filename>.
+        '';
+      };
+    };
+  };
+
+  config = mkMerge [
+    (mkIf cfg.enable {
+       assertions = [{
+         assertion = cfg.domain != "";
+         message = "A domain must be set for Gale.";
+       }];
+
+       warnings = mkIf (!keysPrepared) [
+         "You must run gale-install in order to generate a domain key."
+       ];
+
+       system.activationScripts.gale = mkIf cfg.enable (
+         stringAfter [ "users" "groups" ] ''
+           chmod -R 755 ${home}
+           mkdir -m 0777 -p ${home}/auth/cache
+           mkdir -m 1777 -p ${home}/auth/local # GALE_DOMAIN.gpub
+           mkdir -m 0700 -p ${home}/auth/private # ROOT.gpub
+           mkdir -m 0755 -p ${home}/auth/trusted # ROOT
+           mkdir -m 0700 -p ${home}/.gale
+           mkdir -m 0700 -p ${home}/.gale/auth
+           mkdir -m 0700 -p ${home}/.gale/auth/private # GALE_DOMAIN.gpri
+
+           ln -sf ${pkgs.gale}/etc/gale/auth/trusted/ROOT "${home}/auth/trusted/ROOT"
+           chown -R ${cfg.user}:${cfg.group} ${home}
+         ''
+       );
+
+       environment = {
+         etc = {
+           "gale/auth".source = home + "/auth"; # symlink /var/lib/gale/auth
+           "gale/conf".text = ''
+             GALE_USER ${cfg.user}
+             GALE_DOMAIN ${cfg.domain}
+             ${cfg.extraConfig}
+           '';
+         };
+
+         systemPackages = [ pkgs.gale ];
+       };
+
+       users.extraUsers = [{
+         name = cfg.user;
+         description = "Gale daemon";
+         uid = config.ids.uids.gale;
+         group = cfg.group;
+         home = home;
+         createHome = true;
+       }];
+
+       users.extraGroups = [{
+         name = cfg.group;
+         gid = config.ids.gids.gale;
+       }];
+    })
+    (mkIf (cfg.enable && keysPrepared) {
+       assertions = [
+         {
+           assertion = cfg.keyPath != null
+                    && lib.pathExists (cfg.keyPath + "/${cfg.domain}.gpub");
+           message = "Couldn't find a Gale public key for ${cfg.domain}.";
+         }
+         {
+           assertion = cfg.keyPath != null
+                    && lib.pathExists (cfg.keyPath + "/${cfg.domain}.gpri");
+           message = "Couldn't find a Gale private key for ${cfg.domain}.";
+         }
+       ];
+
+       services.gale.setuidWrapper = {
+         program = "gksign";
+         source = "${pkgs.gale}/bin/gksign";
+         owner = cfg.user;
+         group = cfg.group;
+         setuid = true;
+         setgid = false;
+       };
+
+       security.setuidOwners = [ cfg.setuidWrapper ];
+
+       systemd.services.gale-galed = {
+         description = "Gale messaging daemon";
+         wantedBy = [ "multi-user.target" ];
+         wants = [ "gale-gdomain.service" ];
+         after = [ "network.target" ];
+
+         preStart = ''
+           install -m 0640 ${keyPath}/${cfg.domain}.gpri "${home}/.gale/auth/private/"
+           install -m 0644 ${gpubFile} "${home}/.gale/auth/private/${cfg.domain}.gpub"
+           install -m 0644 ${gpubFile} "${home}/auth/local/${cfg.domain}.gpub"
+           chown -R ${cfg.user}:${cfg.group} ${home}
+         '';
+
+         serviceConfig = {
+           Type = "forking";
+           ExecStart = "@${pkgs.gale}/bin/galed galed";
+           User = cfg.user;
+           Group = cfg.group;
+           PermissionsStartOnly = true;
+         };
+       };
+
+       systemd.services.gale-gdomain = {
+         description = "Gale AKD daemon";
+         wantedBy = [ "multi-user.target" ];
+         requires = [ "gale-galed.service" ];
+         after = [ "gale-galed.service" ];
+
+         serviceConfig = {
+           Type = "forking";
+           ExecStart = "@${pkgs.gale}/bin/gdomain gdomain";
+           User = cfg.user;
+           Group = cfg.group;
+         };
+       };
+    })
+  ];
+}
diff --git a/pkgs/applications/networking/instant-messengers/gale/default.nix b/pkgs/applications/networking/instant-messengers/gale/default.nix
new file mode 100644
index 000000000000..65f6cab6e81c
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/gale/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, adns, boehmgc, openssl, automake, m4, autoconf
+, libtool, pkgconfig }:
+
+stdenv.mkDerivation {
+  name = "gale-1.1happy";
+
+  src = fetchFromGitHub {
+    owner = "grawity";
+    repo = "gale";
+    rev = "b34a67288e8bd6f0b51b60abb704858172a3665c";
+    sha256 = "19mcisxxqx70m059rqwv7wpmp94fgyckzjwywpmdqd7iwvppnsqf";
+  };
+
+  nativeBuildInputs = [ m4 libtool automake autoconf ];
+  buildInputs = [ boehmgc openssl adns pkgconfig ];
+
+  patches = [ ./gale-install.in.patch ];
+
+  preConfigure = ''
+    substituteInPlace configure.ac --replace \$\{sysconfdir\} /etc
+    ./bootstrap
+  '';
+  configureArgs = [ "--sysconfdir=/etc" ];
+
+  meta = with stdenv.lib; {
+    homepage = "http://gale.org/";
+    description = "chat/messaging system (server and client)";
+    platforms = platforms.all;
+    license = licenses.gpl2Plus;
+  };
+}
diff --git a/pkgs/applications/networking/instant-messengers/gale/gale-install.in.patch b/pkgs/applications/networking/instant-messengers/gale/gale-install.in.patch
new file mode 100644
index 000000000000..f9c3e3c55922
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/gale/gale-install.in.patch
@@ -0,0 +1,339 @@
+diff --git a/gale-install.in b/gale-install.in
+index 50e8ad8..eec0ed2 100644
+--- a/gale-install.in
++++ b/gale-install.in
+@@ -29,22 +29,78 @@ testkey_stdin() {
+ 	gkinfo -x 2>/dev/null | qgrep "^Public key: <$1>"
+ }
+ 
+-if [ -n "$GALE_SYS_DIR" ]; then
+-	SYS_DIR="$GALE_SYS_DIR"
+-elif [ -n "$sysconfdir" ]; then
+-	SYS_DIR="$sysconfdir/gale"
++INST_SYS_DIR="$sysconfdir/gale"
++
++if [ `id -u` -eq 0 ]; then
++	is_root=yes
++	SYS_DIR=/etc/gale
++else
++	is_root=no
++	SYS_DIR="$HOME/.gale"
++fi
++
++if [ -f /etc/NIXOS ]; then
++	is_nixos=yes
++else
++	is_nixos=no
++fi
++
++if [ -u /var/setuid-wrappers/gksign ]; then
++	cat <<EOM
++
++Gale appears to have already been set up via the NixOS module system (check
++/etc/nixos/configuration.nix).
++
++EOM
++
++	exit 0
++fi
++
++if [ $is_root = yes ]; then
++	cat <<EOM
++
++You are running gale-install as root, so I'm going to assume you want to set up
++Gale for system-wide use.  Unfortunately, Gale expects to be able to run the
++"gksign" program via setuid, and we can't change gksign's permissions once it's
++already been installed because the Nix store is immutable by design.
++
++EOM
++
++	if [ $is_nixos = no ]; then
++		cat <<EOM
++
++This isn't a NixOS system.  Gale can only be installed for a single user on
++non-NixOS systems.  If you want a system-wide installation, you'll have to
++install Gale the old-fashioned way.  Sorry.
++
++EOM
++
++		exit 1
++	fi
++	cat <<EOM
++
++This script will generate a domain key for you, and after you get it signed, you
++can finish the setup process by configuring Gale via the NixOS module system
++(i.e. /etc/nixos/configuration.nix).
++
++EOM
++
+ else
+-	echo "Error: cannot locate Gale system configuration directory."
+-	exit 1
++	cat <<EOM
++
++Hi.  You are running gale-install as a normal user, so I'm going to assume you
++want to set up Gale for your own (i.e. non-system-wide) use.
++
++EOM
++
+ fi
+ 
+-CONF="$SYS_DIR/conf"
+ umask 022
+-PATH="$bindir:$sbindir:$PATH:/usr/ucb"
++PATH="$bindir:$sbindir:$PATH"
+ export PATH
+ 
+-if [ -f "$CONF" ]; then
+-	exec 3<"$CONF"
++if [ -n "$SYS_DIR" ] && [ -f "$SYS_DIR/conf" ]; then
++	exec 3<"$SYS_DIR/conf"
+ 
+ 	while read var value <&3 ; do
+ 		case "$var" in
+@@ -58,52 +114,14 @@ if [ -f "$CONF" ]; then
+ 	exec 3<&-
+ fi
+ 
+-USER="`whoami`"
+-if [ -z "$USER" ]; then
+-	echo "Error: cannot determine your username."
+-	exit 1
+-fi
+-
+-# -----------------------------------------------------------------------------
+-# check directory structure
+-
+-if [ ! -d "$SYS_DIR" ]; then
+-	echo "Error: Invalid SYS_DIR: \"$SYS_DIR\"."
+-	exit 1
+-fi
+-
+ # -----------------------------------------------------------------------------
+-# get settings for important variables: user, domain, server
++# get settings for important variables: domain, server
+ 
+-[ -n "$CONF_GALE_USER" ] && GALE_USER="$CONF_GALE_USER"
+ [ -n "$CONF_GALE_DOMAIN" ] && GALE_DOMAIN="$CONF_GALE_DOMAIN"
+ [ -n "$CONF_GALE_SERVER" ] && GALE_SERVER="$CONF_GALE_SERVER"
+ 
+-if [ -z "$GALE_USER" ]; then
+-cat << EOM
+-
+-Hi.  You need to denote a user to own the Gale domain secret key.  You must
+-trust this user with Gale authentication for your domain; the "gksign" program
+-will run as this user.  I recommend using a special "gale" user; if you don't
+-have administrative privileges here, you'll probably have to use your own
+-account.  I do not recommend the use of "root".
+-
+-No harm done if you stop this script now to set up such a user.
+-
+-EOM
+-
+-	printf "Enter the Gale username: "
+-	read GALE_USER
+-	if [ -z "$GALE_USER" ]; then
+-		echo "Error: Invalid username or no home dir: \"$GALE_USER\"."
+-		exit 1
+-	fi
+-else
+-	echo "Using \"$GALE_USER\" as the Gale owner."
+-fi
+-
+ if [ -z "$GALE_DOMAIN" ] ; then
+-cat << EOM
++	cat << EOM
+ 
+ You need to identify the name of your Gale domain for two purposes:
+ 
+@@ -140,97 +158,56 @@ else
+ fi
+ 
+ # -----------------------------------------------------------------------------
+-# create configuration file
+-
+-if [ ! -f "$CONF" ]; then
+-cat > "$CONF" <<EOM
+-# $CONF -- created by Gale installer; edit to suit.
+-EOM
++# create configuration file (if this is a single-user setup)
++
++if [ $is_root = no ]; then
++	CONF="$SYS_DIR/conf"
++
++	if [ ! -d "$SYS_DIR" ]; then
++		run mkdir -m 0700 -p "$SYS_DIR"
++		run mkdir -m 0700 -p "$SYS_DIR/auth"
++		run mkdir -m 0755 -p "$SYS_DIR/auth/trusted"
++		run cp -f "$INST_SYS_DIR/auth/trusted/ROOT" "$SYS_DIR/auth/trusted"
++		run mkdir -m 0700 -p "$SYS_DIR/auth/private"
++		run mkdir -p "$SYS_DIR/auth/local" "$SYS_DIR/auth/cache"
++	fi
+ 
+-cat <<EOM
++	if [ ! -f "$CONF" ]; then
++		cat <<EOM
+ 
+ *** Creating "$CONF".
+ Examine and edit this file to your taste and local needs.
+ If you want to recreate it from scratch, remove it and re-run this.
+-EOM
+-fi
+-
+-[ -n "$CONF_GALE_USER" ] || cat >> "$CONF" <<EOM
+ 
+-# The user who owns the domain secret key.  (Used in installation and upgrade)
+-GALE_USER $GALE_USER
+ EOM
+ 
+-[ -n "$CONF_GALE_DOMAIN" ] || cat >> "$CONF" << EOM
++		cat > "$CONF" <<EOF
++# $CONF -- created by Gale installer; edit to suit.
+ 
+ # The authentication domain to use.  (Mandatory)
+ GALE_DOMAIN $GALE_DOMAIN
+-EOM
+-
+-# -----------------------------------------------------------------------------
+-# make gksign setuid
++EOF
+ 
+-gksign="$sbindir/gksign"
+-readlink="`which readlink 2>/dev/null`"
+-[ -x "$readlink" ] && gksignlink="`"$readlink" "$gksign" 2>/dev/null`"
+-[ -f "$gksignlink" ] && gksign="$gksignlink"
+-
+-echo ""
+-if copy chown "$GALE_USER" "$gksign" ; then
+-	:
+-else
+-	echo "*** We need to chown $GALE_USER '$gksign'."
+-	echo "    Please run this script as a user that can do so,"
+-	echo "    or do so yourself and re-run this script."
+-	exit 1
++	fi
+ fi
+-run chmod 4755 "$gksign"
+ 
+-# -----------------------------------------------------------------------------
+-# create a domain, if necessary
++if [ $is_root = no ]; then
++	GALE_SYS_DIR="$SYS_DIR"
++	export GALE_SYS_DIR
+ 
+-echo ""
+-if test -u "$gksign" || copy chmod u+s "$gksign" ; then
+-	:
++	testkey "$GALE_DOMAIN" && exit 0
++	echo "*** You lack a signed key for your domain, \"$GALE_DOMAIN\"."
++	GALE="$SYS_DIR"
+ else
+-	echo "*** We need to chmod u+s '$gksign'."
+-	echo "    Please run this script as a user that can do so,"
+-	echo "    or do so yourself and re-run this script."
+-	exit 1
+-fi
+-
+-testkey "$GALE_DOMAIN" && exit 0
+-echo "*** You lack a signed key for your domain, \"$GALE_DOMAIN\"."
+-
+-if [ "x$GALE_USER" != "x$USER" ]; then
+-cat <<EOM
+-Become user "$GALE_USER" (you are now "$USER") and run this script again
+-to create a new domain; contact your domain administrator if you wish to 
+-become part of an existing domain.
+-EOM
+-	exit 1
+-fi
+-
+-if [ -z "$HOME" ]; then
+-	cd
+-	HOME="`pwd`"
+-	echo "Warning: \$HOME not set, assuming \"$HOME\"."
+-fi
+-
+-GALE="$HOME/.gale"
+-mkdir -p "$GALE"
+-if [ ! -w "$GALE" ]; then
+-	echo "Error: Cannot create \"$GALE\"."
+-	exit 1
++	GALE="`pwd`"
+ fi
+ 
+ unsigned="$GALE/$GALE_DOMAIN.unsigned"
+ signer="`echo "$GALE_DOMAIN" | sed 's%^[^.@:/]*[.@:/]%%'`"
+ [ -z "$signer" ] && signer="ROOT"
+ 
+-if [ -f "$unsigned" ]; then
+-
+-cat << EOM
++if [ $is_root = no ] && [ -f "$unsigned" ]; then
++	cat << EOM
+ 
+ Okay, so we've already been here.  Last time, I created the file
+ "$unsigned" for you to have signed.
+@@ -275,16 +252,12 @@ EOM
+ 		exit 1
+ 	fi
+ 
+-cat << EOM
+-
+-The domain should be properly configured now.  Assuming users can access a
+-version of "gksign" setuid to "$GALE_USER" (this user), they should be
+-able to start running clients and generating IDs for themselves.
++	cat << EOM
+ 
+-The installation process is complete!
++The domain should be properly configured now.  The installation process is
++complete!
+ 
+ EOM
+-
+ 	exit 0
+ fi
+ 
+@@ -300,7 +273,10 @@ printf "Enter the description: "
+ read descr
+ 
+ echo "We will generate the key now.  Have patience."
+-gkgen -r "$GALE/auth/private/$GALE_DOMAIN.gpri" \
++if [ $is_root = no ]; then
++	install_gpri=auth/private/
++fi
++gkgen -r "$GALE/${install_gpri}$GALE_DOMAIN.gpri" \
+       -u "$unsigned" "$GALE_DOMAIN" /"$descr" || exit 1
+ 
+ cat << EOM
+@@ -311,8 +284,29 @@ the owner of the "$signer" domain through appropriate means.
+ Take care to preseve the file's binary data; you may need to uuencode it.
+ 
+ Assuming they trust you with your subdomain, they should pass the key through
+-"gksign" as a filter, returning the signed output to you.  When you have this
+-signed key file available, re-run this script, and we will move on to the
+-next step.
++"gksign" as a filter, returning the signed output to you.
++
++EOM
++
++if [ $is_nixos = yes ]; then
++	cat <<EOM
++
++When you have this signed key file available, you can finish the setup process
++by placing the private key and signed public key in a directory (they will be
++copied) and setting "services.gale.keyPath" in /etc/nixos/configuration.nix.
+ 
+ EOM
++else
++	cat <<EOM
++
++When you have this signed key file available, re-run this script, and we will
++move on to the next step.
++
++*** IMPORTANT ***
++You must set GALE_SYS_DIR="$GALE_SYS_DIR" in your environment before re-running
++this script and before running any Gale programs once setup is finished!  Make
++sure to set it now, and consider setting it via your shell initialization files
++so that you don't forget to do it next login.
++
++EOM
++fi
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8d185f61369a..0775442a8ca7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15380,6 +15380,8 @@ let
 
   gajim = callPackage ../applications/networking/instant-messengers/gajim { };
 
+  gale = callPackage ../applications/networking/instant-messengers/gale { };
+
   gammu = callPackage ../applications/misc/gammu { };
 
   gensgs = callPackage_i686 ../misc/emulators/gens-gs { };

From 552207f5ef690b8424d414914a983076cacdbaa2 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Wed, 13 Jan 2016 12:03:55 -0800
Subject: [PATCH 694/884] package GHC-8.0.1-rc1

---
 pkgs/development/compilers/ghc/8.0.1.nix      | 61 +++++++++++++++++++
 .../configuration-ghc-8.0.x.nix               | 32 ++++++++++
 pkgs/top-level/haskell-packages.nix           |  7 +++
 3 files changed, 100 insertions(+)
 create mode 100644 pkgs/development/compilers/ghc/8.0.1.nix
 create mode 100644 pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix

diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix
new file mode 100644
index 000000000000..9a1fc56dd88f
--- /dev/null
+++ b/pkgs/development/compilers/ghc/8.0.1.nix
@@ -0,0 +1,61 @@
+{ stdenv, fetchurl, fetchpatch, ghc, perl, gmp, ncurses, libiconv, binutils, coreutils
+, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, hscolour
+}:
+
+stdenv.mkDerivation rec {
+  version = "8.0.0.20160111";
+  name = "ghc-${version}";
+
+  src = fetchurl {
+    url = "https://downloads.haskell.org/~ghc/8.0.1-rc1/${name}-src.tar.xz";
+    sha256 = "0y4nha46mw01ysw90kh8szcbsfdc37rqjm7r5fyk6flqwr8b6pvr";
+  };
+
+  patches = [
+    ./dont-pass-linker-flags-via-response-files.patch   # https://github.com/NixOS/nixpkgs/issues/10752
+  ];
+
+  buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour ];
+
+  enableParallelBuilding = true;
+
+  preConfigure = ''
+    sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
+  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+    export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}"
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    export NIX_LDFLAGS+=" -no_dtrace_dof"
+  '';
+
+  configureFlags = [
+    "--with-gcc=${stdenv.cc}/bin/cc"
+    "--with-gmp-includes=${gmp}/include" "--with-gmp-libraries=${gmp}/lib"
+    "--with-curses-includes=${ncurses}/include" "--with-curses-libraries=${ncurses}/lib"
+  ] ++ stdenv.lib.optional stdenv.isDarwin [
+    "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
+  ];
+
+  # required, because otherwise all symbols from HSffi.o are stripped, and
+  # that in turn causes GHCi to abort
+  stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols";
+
+  postInstall = ''
+    # Install the bash completion file.
+    install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc
+
+    # Patch scripts to include "readelf" and "cat" in $PATH.
+    for i in "$out/bin/"*; do
+      test ! -h $i || continue
+      egrep --quiet '^#!' <(head -n 1 $i) || continue
+      sed -i -e '2i export PATH="$PATH:${binutils}/bin:${coreutils}/bin"' $i
+    done
+  '';
+
+  meta = {
+    homepage = "http://haskell.org/ghc";
+    description = "The Glasgow Haskell Compiler";
+    maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ];
+    inherit (ghc.meta) license platforms;
+  };
+
+}
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
new file mode 100644
index 000000000000..049e7151cf0c
--- /dev/null
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -0,0 +1,32 @@
+{ pkgs }:
+
+with import ./lib.nix { inherit pkgs; };
+
+self: super: {
+  # Disable GHC 8.0.x core libraries.
+  array = null;
+  base = null;
+  binary = null;
+  bytestring = null;
+  Cabal = null;
+  containers = null;
+  deepseq = null;
+  directory = null;
+  filepath = null;
+  ghc-boot = null;
+  ghc-prim = null;
+  ghci = null;
+  haskeline = null;
+  hoopl = null;
+  hpc = null;
+  integer-gmp = null;
+  pretty = null;
+  process = null;
+  rts = null;
+  template-haskell = null;
+  terminfo = null;
+  time = null;
+  transformers = null;
+  unix = null;
+  xhtml = null;
+}
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index b00d617666ad..68c303c00b3d 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -46,6 +46,9 @@ rec {
     ghcNokinds = callPackage ../development/compilers/ghc/nokinds.nix ({ inherit (packages.ghc784) ghc alex happy; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
       libiconv = pkgs.darwin.libiconv;
     });
+    ghc801 = callPackage ../development/compilers/ghc/8.0.1.nix {
+      ghc = compiler.ghc7103; inherit (packages.ghc7103) hscolour;
+    };
 
     ghcjs = packages.ghc7102.callPackage ../development/compilers/ghcjs {
       ghc = compiler.ghc7102;
@@ -102,6 +105,10 @@ rec {
       ghc = compiler.ghc7103;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { };
     };
+    ghc801 = callPackage ../development/haskell-modules {
+      ghc = compiler.ghc801;
+      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { };
+    };
     ghcHEAD = callPackage ../development/haskell-modules {
       ghc = compiler.ghcHEAD;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { };

From c6ad4841fd4e068326d9a517bdf010b37294d568 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Wed, 13 Jan 2016 12:04:13 -0800
Subject: [PATCH 695/884] clean up GHC expressions

---
 pkgs/top-level/haskell-packages.nix | 72 ++++++++++++++---------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 68c303c00b3d..130a4e7006ef 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -7,48 +7,48 @@ rec {
   compiler = {
 
     ghc6102Binary = callPackage ../development/compilers/ghc/6.10.2-binary.nix { gmp = pkgs.gmp4; };
-    ghc704Binary = callPackage ../development/compilers/ghc/7.0.4-binary.nix ({ gmp = pkgs.gmp4; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
-      libiconv = pkgs.darwin.libiconv;
-    });
-    ghc742Binary = callPackage ../development/compilers/ghc/7.4.2-binary.nix ({ gmp = pkgs.gmp4; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
-      libiconv = pkgs.darwin.libiconv;
-    });
+    ghc704Binary = callPackage ../development/compilers/ghc/7.0.4-binary.nix {
+      gmp = pkgs.gmp4;
+    };
+    ghc742Binary = callPackage ../development/compilers/ghc/7.4.2-binary.nix {
+      gmp = pkgs.gmp4;
+    };
 
     ghc6104 = callPackage ../development/compilers/ghc/6.10.4.nix { ghc = compiler.ghc6102Binary; };
     ghc6123 = callPackage ../development/compilers/ghc/6.12.3.nix { ghc = compiler.ghc6102Binary; };
-    ghc704 = callPackage ../development/compilers/ghc/7.0.4.nix ({ ghc = compiler.ghc704Binary; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
-      libiconv = pkgs.darwin.libiconv;
-    });
-    ghc722 = callPackage ../development/compilers/ghc/7.2.2.nix ({ ghc = compiler.ghc704Binary; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
-      libiconv = pkgs.darwin.libiconv;
-    });
-    ghc742 = callPackage ../development/compilers/ghc/7.4.2.nix ({ ghc = compiler.ghc704Binary; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
-      libiconv = pkgs.darwin.libiconv;
-    });
-    ghc763 = callPackage ../development/compilers/ghc/7.6.3.nix ({ ghc = compiler.ghc704Binary; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
-      libiconv = pkgs.darwin.libiconv;
-    });
-    ghc783 = callPackage ../development/compilers/ghc/7.8.3.nix ({ ghc = compiler.ghc742Binary; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
-      libiconv = pkgs.darwin.libiconv;
-    });
-    ghc784 = callPackage ../development/compilers/ghc/7.8.4.nix ({ ghc = compiler.ghc742Binary; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
-      libiconv = pkgs.darwin.libiconv;
-    });
-    ghc7102 = callPackage ../development/compilers/ghc/7.10.2.nix ({ ghc = compiler.ghc784; inherit (packages.ghc784) hscolour; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
-      libiconv = pkgs.darwin.libiconv;
-    });
-    ghc7103 = callPackage ../development/compilers/ghc/7.10.3.nix ({ ghc = compiler.ghc784; inherit (packages.ghc784) hscolour; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
-      libiconv = pkgs.darwin.libiconv;
-    });
-    ghcHEAD = callPackage ../development/compilers/ghc/head.nix ({ inherit (packages.ghc784) ghc alex happy; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
-      libiconv = pkgs.darwin.libiconv;
-    });
-    ghcNokinds = callPackage ../development/compilers/ghc/nokinds.nix ({ inherit (packages.ghc784) ghc alex happy; } // stdenv.lib.optionalAttrs stdenv.isDarwin {
-      libiconv = pkgs.darwin.libiconv;
-    });
+    ghc704 = callPackage ../development/compilers/ghc/7.0.4.nix {
+      ghc = compiler.ghc704Binary;
+    };
+    ghc722 = callPackage ../development/compilers/ghc/7.2.2.nix {
+      ghc = compiler.ghc704Binary;
+    };
+    ghc742 = callPackage ../development/compilers/ghc/7.4.2.nix {
+      ghc = compiler.ghc704Binary;
+    };
+    ghc763 = callPackage ../development/compilers/ghc/7.6.3.nix {
+      ghc = compiler.ghc704Binary;
+    };
+    ghc783 = callPackage ../development/compilers/ghc/7.8.3.nix {
+      ghc = compiler.ghc742Binary;
+    };
+    ghc784 = callPackage ../development/compilers/ghc/7.8.4.nix {
+      ghc = compiler.ghc742Binary;
+    };
+    ghc7102 = callPackage ../development/compilers/ghc/7.10.2.nix {
+      ghc = compiler.ghc784; inherit (packages.ghc784) hscolour;
+    };
+    ghc7103 = callPackage ../development/compilers/ghc/7.10.3.nix {
+      ghc = compiler.ghc784; inherit (packages.ghc784) hscolour;
+    };
     ghc801 = callPackage ../development/compilers/ghc/8.0.1.nix {
       ghc = compiler.ghc7103; inherit (packages.ghc7103) hscolour;
     };
+    ghcHEAD = callPackage ../development/compilers/ghc/head.nix {
+      inherit (packages.ghc784) ghc alex happy;
+    };
+    ghcNokinds = callPackage ../development/compilers/ghc/nokinds.nix {
+      inherit (packages.ghc784) ghc alex happy;
+    };
 
     ghcjs = packages.ghc7102.callPackage ../development/compilers/ghcjs {
       ghc = compiler.ghc7102;

From 88f9fb7c21f8dad560a9576f85dff376201d0e20 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Wed, 13 Jan 2016 14:06:53 -0800
Subject: [PATCH 696/884] build jailbreak-cabal on GHC 8.0.x

---
 .../configuration-ghc-8.0.x.nix               | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
index 049e7151cf0c..35710c409c77 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -29,4 +29,26 @@ self: super: {
   transformers = null;
   unix = null;
   xhtml = null;
+
+  Cabal_1_23_0_0 = overrideCabal super.Cabal_1_22_4_0 (drv: {
+    version = "1.23.0.0";
+    src = pkgs.fetchFromGitHub {
+      owner = "haskell";
+      repo = "cabal";
+      rev = "18fcd9c1aaeddd9d10a25e44c0e986c9889f06a7";
+      sha256 = "1bakw7h5qadjhqbkmwijg3588mjnpvdhrn8lqg8wq485cfcv6vn3";
+    };
+    jailbreak = false;
+    doHaddock = false;
+    postUnpack = "sourceRoot+=/Cabal";
+    postPatch = ''
+      setupCompileFlags+=" -DMIN_VERSION_binary_0_8_0=1"
+    '';
+  });
+  jailbreak-cabal = super.jailbreak-cabal.override {
+    Cabal = self.Cabal_1_23_0_0;
+    mkDerivation = drv: self.mkDerivation (drv // {
+      preConfigure = "sed -i -e 's/Cabal == 1.20\\.\\*/Cabal >= 1.23/' jailbreak-cabal.cabal";
+    });
+  };
 }

From db658a6eb592f490f36eafcb5b19cf31dc97b342 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 14 Jan 2016 02:46:23 +0100
Subject: [PATCH 697/884] aircrack-ng: 1.2-beta3 -> 1.2-rc3

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

diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix
index ce2ded24f823..a1ee000c888f 100644
--- a/pkgs/tools/networking/aircrack-ng/default.nix
+++ b/pkgs/tools/networking/aircrack-ng/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libpcap, openssl, zlib, wirelesstools, libnl, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "aircrack-ng-1.2-beta3";
+  name = "aircrack-ng-1.2-rc3";
 
   src = fetchurl {
     url = "http://download.aircrack-ng.org/${name}.tar.gz";
-    sha256 = "13g9xz9djjgfc2xi88vnx7zhgy751hqb3739y7znyihd6q9sw8id";
+    sha256 = "11a53acln0fpar6v75qlybzdg8hdwc9ssd06fxygr47yp755qncf";
   };
 
   buildInputs = [ libpcap openssl zlib libnl pkgconfig ];

From f290a6d026d16b7892a9f93a2e0dbaf15e195532 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 14 Jan 2016 02:48:15 +0100
Subject: [PATCH 698/884] aircrack-ng: fix description typo; co-maintain

---
 pkgs/tools/networking/aircrack-ng/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix
index a1ee000c888f..39ee40994a75 100644
--- a/pkgs/tools/networking/aircrack-ng/default.nix
+++ b/pkgs/tools/networking/aircrack-ng/default.nix
@@ -16,10 +16,10 @@ stdenv.mkDerivation rec {
     '';
 
   meta = with stdenv.lib; {
-    description = "Wireless encryption crackign tools";
+    description = "Wireless encryption cracking tools";
     homepage = http://www.aircrack-ng.org/;
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = [ maintainers.iElectric maintainers.viric maintainers.garbas maintainers.chaoflow ];
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ iElectric viric garbas chaoflow nckx ];
     platforms = platforms.linux;
   };
 }

From a1be498630f5dcaeb45a5e44cc5a5c415db07dd9 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 14 Jan 2016 02:49:47 +0100
Subject: [PATCH 699/884] aircrack-ng: use canonical package name

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8d185f61369a..e6b1c57a1378 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -523,7 +523,7 @@ let
 
   aide = callPackage ../tools/security/aide { };
 
-  aircrackng = callPackage ../tools/networking/aircrack-ng { };
+  aircrack-ng = callPackage ../tools/networking/aircrack-ng { };
 
   airfield = callPackage ../tools/networking/airfield { };
 
@@ -15899,6 +15899,7 @@ aliases = with self; rec {
   saneBackendsGit = sane-backends-git; # added 2016-01-02
   saneFrontends = sane-frontends; # added 2016-01-02
   btrfsProgs = btrfs-progs; # added 2016-01-03
+  aircrackng = aircrack-ng; # added 2016-01-14
 };
 
 tweakAlias = _n: alias: with lib;

From 16782b7fc13e7c5db0d640eee92c464586555e0f Mon Sep 17 00:00:00 2001
From: Louis Taylor <louis@kragniz.eu>
Date: Thu, 14 Jan 2016 06:08:41 +0000
Subject: [PATCH 700/884] ipfs: 0.3.10 ->  0.3.11

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

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 58ffb307895b..49dd78c7c033 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1805,11 +1805,11 @@ let
   };
 
   ipfs = buildFromGitHub{
-    rev = "f9dc4c726b770199f4ee64d97775d5fe8122814e";
-    date   = "2015-12-07";
+    rev = "7070b4d878baad57dcc8da80080dd293aa46cabd";
+    date   = "2016-01-12";
     owner  = "ipfs";
     repo   = "go-ipfs";
-    sha256 = "00p7kv6000bk6lbqqnnf4xy5pmd93fv6fihji3vn7br53645blaa";
+    sha256 = "1b7aimnbz287fy7p27v3qdxnz514r5142v3jihqxanbk9g384gcd";
     disabled = isGo14;
     meta = with stdenv.lib; {
       description = "A global, versioned, peer-to-peer filesystem";

From 3a4aa2a109cfba502880abc35a6f2a52548174e9 Mon Sep 17 00:00:00 2001
From: Tony White <white.tw.tw@gmail.com>
Date: Thu, 14 Jan 2016 06:31:30 +0000
Subject: [PATCH 701/884] tigervnc: prevent nix store collison

- Prevent store collison with the xserver for two files
- Stop gcc from complaining at build time about C and CXX flags
- Enable parallel building for this expression
- Move to the new way of calling Xorg and it's dependencies
---
 pkgs/tools/admin/tigervnc/default.nix | 72 ++++++++++++---------------
 1 file changed, 32 insertions(+), 40 deletions(-)

diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix
index db88f30a205c..d6156ab49099 100644
--- a/pkgs/tools/admin/tigervnc/default.nix
+++ b/pkgs/tools/admin/tigervnc/default.nix
@@ -1,96 +1,86 @@
-{ stdenv, fetchFromGitHub, libX11, libXext, gettext, libICE, libXtst, libXi, libSM, xorgserver
-, autoconf, automake, cvs, libtool, nasm, utilmacros, pixman, xkbcomp, xkeyboard_config
-, fontDirectories, fontutil, libgcrypt, gnutls, pam, flex, bison
-, fixesproto, damageproto, xcmiscproto, bigreqsproto, randrproto, renderproto
-, fontsproto, videoproto, compositeproto, scrnsaverproto, resourceproto
-, libxkbfile, libXfont, libpciaccess, cmake, libjpeg_turbo, libXft, fltk, libXinerama
-, xineramaproto, libXcursor
+{ stdenv, fetchgit, xorg
+, autoconf, automake, cvs, libtool, nasm, pixman, xkeyboard_config
+, fontDirectories, libgcrypt, gnutls, pam, flex, bison, gettext
+, cmake, libjpeg_turbo, fltk
 }:
 
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "tigervnc-${version}";
   version = "1.6.0";
+  name = "tigervnc-${version}";
 
-  src = fetchFromGitHub {
-    owner = "TigerVNC";
-    repo = "tigervnc";
-    rev = "v${version}";
+  src = fetchgit {
+    url = "https://github.com/TigerVNC/tigervnc/";
     sha256 = "1plljv1cxsax88kv52g02n8c1hzwgp6j1p8z1aqhskw36shg4pij";
+    rev = "5a727f25990d05c9a1f85457b45d6aed66409cb3";
   };
 
   inherit fontDirectories;
 
   patchPhase = ''
     sed -i -e 's,$(includedir)/pixman-1,${if stdenv ? cross then pixman.crossDrv else pixman}/include/pixman-1,' unix/xserver/hw/vnc/Makefile.am
-    sed -i -e '/^$pidFile/a$ENV{XKB_BINDIR}="${if stdenv ? cross then xkbcomp.crossDrv else xkbcomp}/bin";' unix/vncserver
+    sed -i -e '/^$pidFile/a$ENV{XKB_BINDIR}="${if stdenv ? cross then xorg.xkbcomp.crossDrv else xorg.xkbcomp}/bin";' unix/vncserver
     sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -xkbdir ${if stdenv ? cross then xkeyboard_config.crossDrv else xkeyboard_config}/etc/X11/xkb";' unix/vncserver
-
     fontPath=
     for i in $fontDirectories; do
       for j in $(find $i -name fonts.dir); do
         addToSearchPathWithCustomDelimiter "," fontPath $(dirname $j)
       done
     done
-
     sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -fp '"$fontPath"'";' unix/vncserver
   '';
 
-  # I don't know why I can't use in the script
-  # this:  ${concatStringsSep " " (map (f: "${f}") xorgserver.patches)}
-  xorgPatches = xorgserver.patches;
-
-  dontUseCmakeBuildDir = "yes";
+  dontUseCmakeBuildDir = true;
 
   postBuild = ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fpermissive -Wno-error=int-to-pointer-cast"
-
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error=int-to-pointer-cast"
+    export CXXFLAGS="$CXXFLAGS -fpermissive"
     # Build Xvnc
-    tar xf ${xorgserver.src}
+    tar xf ${xorg.xorgserver.src}
     cp -R xorg*/* unix/xserver
     pushd unix/xserver
-    for a in $xorgPatches ../xserver116.patch
-    do
-      patch -p1 < $a
-    done
     autoreconf -vfi
-    ./configure $configureFlags --disable-xinerama --disable-xvfb --disable-xnest \
+    ./configure $configureFlags --disable-devel-docs --disable-docs --disable-xinerama --disable-xvfb --disable-xnest \
         --disable-xorg --disable-dmx --disable-dri --disable-dri2 --disable-glx \
         --prefix="$out" --disable-unit-tests \
         --with-xkb-path=${xkeyboard_config}/share/X11/xkb \
-        --with-xkb-bin-directory=${xkbcomp}/bin \
+        --with-xkb-bin-directory=${xorg.xkbcomp}/bin \
         --with-xkb-output=$out/share/X11/xkb/compiled
     make TIGERVNC_SRCDIR=`pwd`/../..
     popd
   '';
-
+  
   postInstall = ''
     pushd unix/xserver
     make TIGERVNC_SRCDIR=`pwd`/../.. install
+    popd
+    rm -f $out/lib/xorg/protocol.txt
   '';
 
   crossAttrs = {
     buildInputs = (map (x : x.crossDrv) (buildInputs ++ [
-      fixesproto damageproto xcmiscproto bigreqsproto randrproto renderproto
-      fontsproto videoproto compositeproto scrnsaverproto resourceproto
-      libxkbfile libXfont libpciaccess xineramaproto
+      xorg.fixesproto xorg.damageproto xorg.xcmiscproto xorg.bigreqsproto xorg.randrproto xorg.renderproto
+      xorg.fontsproto xorg.videoproto xorg.compositeproto xorg.scrnsaverproto xorg.resourceproto
+      xorg.libxkbfile xorg.libXfont xorg.libpciaccess xorg.xineramaproto
     ]));
   };
 
   buildInputs =
-    [ libX11 libXext gettext libICE libXtst libXi libSM libXft
-      nasm libgcrypt gnutls pam pixman libjpeg_turbo fltk xineramaproto
-      libXinerama libXcursor
+    [ xorg.libX11 xorg.libXext gettext xorg.libICE xorg.libXtst xorg.libXi xorg.libSM xorg.libXft
+      nasm libgcrypt gnutls pam pixman libjpeg_turbo fltk xorg.xineramaproto
+      xorg.libXinerama xorg.libXcursor
     ];
 
   nativeBuildInputs =
-    [ autoconf automake cvs utilmacros fontutil libtool flex bison
+    [ autoconf automake cvs xorg.utilmacros xorg.fontutil libtool flex bison
       cmake
     ]
-      ++ xorgserver.nativeBuildInputs;
+      ++ xorg.xorgserver.nativeBuildInputs;
 
-  propagatedNativeBuildInputs = xorgserver.propagatedNativeBuildInputs;
+  propagatedNativeBuildInputs = xorg.xorgserver.propagatedNativeBuildInputs;
+
+  enableParallelBuilding = true;
 
   meta = {
     homepage = http://www.tigervnc.org/;
@@ -98,5 +88,7 @@ stdenv.mkDerivation rec {
     description = "Fork of tightVNC, made in cooperation with VirtualGL";
     maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; linux;
+    # Prevent a store collision.
+    priority = 4;
   };
-}
+}
\ No newline at end of file

From e056b66613078274d36194ebc49285617748ae67 Mon Sep 17 00:00:00 2001
From: Slawomir Gonet <slawek@otwiera.cz>
Date: Wed, 13 Jan 2016 23:50:22 +0100
Subject: [PATCH 702/884] ccl: 1.10 -> 1.11

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

diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix
index 938361146e7a..e5e07705a18b 100644
--- a/pkgs/development/compilers/ccl/default.nix
+++ b/pkgs/development/compilers/ccl/default.nix
@@ -5,7 +5,7 @@ let
     /* TODO: there are also MacOS, FreeBSD and Windows versions */
     x86_64-linux = {
       arch = "linuxx86";
-      sha256 = "04p77n18cw0bc8i66mp2vfrhlliahrx66lm004a3nw3h0mdk0gd8";
+      sha256 = "0d2vhp5n74yhwixnvlsnp7dzaf9aj6zd2894hr2728djyd8x9fx6";
       runtime = "lx86cl64";
       kernel = "linuxx8664";
     };
@@ -17,7 +17,7 @@ let
     };
     armv7l-linux = {
       arch = "linuxarm";
-      sha256 = "0xg9p1q1fpgyfhwjk2hh24vqzddzx5zqff04lycf0vml5qw1gnkv";
+      sha256 = "0k6wxwyg3pmbb5xdkwma0i3rvbjmy3p604g4minjjc1drzsn1i0q";
       runtime = "armcl";
       kernel = "linuxarm";
     };
@@ -30,7 +30,7 @@ assert builtins.hasAttr stdenv.system options;
 
 stdenv.mkDerivation rec {
   name     = "ccl-${version}";
-  version  = "1.10";
+  version  = "1.11";
   revision = "16313";
 
   src = fetchsvn {

From 0eeda4e36fda48ad369e69f8c3b1678c2c46bdd6 Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Thu, 14 Jan 2016 13:54:11 +0900
Subject: [PATCH 703/884] newsbeuter: patch memory leak (close #12374)

vcunat fixed the patch hash.
---
 .../networking/feedreaders/newsbeuter/default.nix        | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/feedreaders/newsbeuter/default.nix b/pkgs/applications/networking/feedreaders/newsbeuter/default.nix
index 8158c458afc7..ec604e9918bf 100644
--- a/pkgs/applications/networking/feedreaders/newsbeuter/default.nix
+++ b/pkgs/applications/networking/feedreaders/newsbeuter/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, sqlite, curl, pkgconfig, libxml2, stfl, json-c-0-11, ncurses
-, gettext, libiconv, makeWrapper, perl }:
+, gettext, libiconv, makeWrapper, perl, fetchpatch }:
 
 stdenv.mkDerivation rec {
   name = "newsbeuter-2.9";
@@ -22,6 +22,13 @@ stdenv.mkDerivation rec {
     export LDFLAGS=-lncursesw
   '';
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/akrennmair/newsbeuter/commit/cdacfbde9fe3ae2489fc96d35dfb7d263ab03f50.patch";
+      sha256 = "1lhvn63cqjpikwsr6zzndb1p5y140vvphlg85fazwx4xpzd856d9";
+    })
+  ];
+
   installFlags = [ "DESTDIR=$(out)" "prefix=" ];
 
   installPhase = stdenv.lib.optionalString stdenv.isDarwin ''

From f917a7f90877332ba5d041bd2be46f0ff24eb76c Mon Sep 17 00:00:00 2001
From: Louis Taylor <louis@kragniz.eu>
Date: Thu, 14 Jan 2016 05:47:51 +0000
Subject: [PATCH 704/884] source-code-pro: use fetchFromGitHub to fix hash

Fixes #12372, Close #12376.
---
 pkgs/data/fonts/source-code-pro/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/data/fonts/source-code-pro/default.nix b/pkgs/data/fonts/source-code-pro/default.nix
index 7348189304fc..aac66188cca7 100644
--- a/pkgs/data/fonts/source-code-pro/default.nix
+++ b/pkgs/data/fonts/source-code-pro/default.nix
@@ -1,13 +1,15 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   name = "source-code-pro-${version}";
   version = "2.010";
-  version_italic = "1.030";
 
-  src = fetchurl {
-    url="https://github.com/adobe-fonts/source-code-pro/archive/${version}R-ro/${version_italic}R-it.tar.gz";
-    sha256="1y44p2i7hd1klq81xbh796y7n4rzjvn37jrqw0nz31k59v8a1r9y";
+  src = fetchFromGitHub {
+    owner = "adobe-fonts";
+    repo = "source-code-pro";
+    rev = "2.010R-ro/1.030R-it";
+    name = "2.010R-ro-1.030R-it";
+    sha256 = "0f40g23lfcajpd5m9r1z7v8x011dsfs6ba7fihjal6yzaf5hb6mh";
   };
 
   phases = "unpackPhase installPhase";

From 31c3d97fff45b6f9b0bbfe2a348cb5b5a0a8991f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 14 Jan 2016 10:42:47 +0100
Subject: [PATCH 705/884] pythonPackages.dyn: init at 1.5.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7818d8e9d515..c724dda77958 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4628,6 +4628,34 @@ in modules // {
     };
   };
 
+  dyn = buildPythonPackage rec {
+    version = "1.5.0";
+    name = "dyn-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/d/dyn/${name}.tar.gz";
+      sha256 = "dc4b4b2a5d9d26f683230fd822641b39494df5fcbfa716281d126ea6425dd4c3";
+    };
+
+    buildInputs = with self; [
+      pytest
+      pytestcov
+      mock
+      pytestpep8
+      pytest_xdist
+      covCore
+      pkgs.glibcLocales
+    ];
+
+    LC_ALL="en_US.UTF-8";
+
+    meta = {
+      description = "Dynect dns lib";
+      homepage = "http://dyn.readthedocs.org/en/latest/intro.html";
+      license = licenses.bsd3;
+    };
+  };
+
   easy-process = buildPythonPackage rec {
     name = "EasyProcess-0.1.9";
 

From 5f3e33b8ec3eee16dbb6c3ec408ce85770930cd5 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 14 Jan 2016 02:28:16 -0800
Subject: [PATCH 706/884] Add binary openjdk 8 build for x86_64-darwin, similar
 to the openjdk 7 build for x86_64-darwin.

---
 .../compilers/openjdk-darwin/8.nix            | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 pkgs/development/compilers/openjdk-darwin/8.nix

diff --git a/pkgs/development/compilers/openjdk-darwin/8.nix b/pkgs/development/compilers/openjdk-darwin/8.nix
new file mode 100644
index 000000000000..bcafca16022e
--- /dev/null
+++ b/pkgs/development/compilers/openjdk-darwin/8.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchurl, unzip, setJavaClassPath }:
+let
+  jdk = stdenv.mkDerivation {
+    name = "zulu1.8.0_66-8.11.0.1";
+
+    src = fetchurl {
+      url = http://cdn.azulsystems.com/zulu/bin/zulu1.8.0_66-8.11.0.1-macosx.zip;
+      sha256 = "0pvbpb3vf0509xm2x1rh0p0w4wmx50zf15604p28z1k8ai1a23sz";
+      curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/zulu-linux/";
+    };
+
+    buildInputs = [ unzip ];
+
+    installPhase = ''
+      mkdir -p $out
+      mv * $out
+
+      # jni.h expects jni_md.h to be in the header search path.
+      ln -s $out/include/darwin/*_md.h $out/include/
+    '';
+
+    preFixup = ''
+      # Propagate the setJavaClassPath setup hook from the JRE so that
+      # any package that depends on the JRE has $CLASSPATH set up
+      # properly.
+      mkdir -p $out/nix-support
+      echo -n "${setJavaClassPath}" > $out/nix-support/propagated-native-build-inputs
+
+      # Set JAVA_HOME automatically.
+      cat <<EOF >> $out/nix-support/setup-hook
+      if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
+      EOF
+    '';
+
+    passthru = {
+      jre = jdk;
+      home = jdk;
+    };
+
+    meta.platforms = stdenv.lib.platforms.darwin;
+
+  };
+in jdk

From 3da892a18e68f49435f8d5d8f791e6665787e84b Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 14 Jan 2016 02:28:16 -0800
Subject: [PATCH 707/884] Add binary openjdk 8 build for x86_64-darwin, similar
 to the openjdk 7 build for x86_64-darwin.

(cherry picked from commit 5f3e33b8ec3eee16dbb6c3ec408ce85770930cd5)
---
 .../compilers/openjdk-darwin/8.nix            | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 pkgs/development/compilers/openjdk-darwin/8.nix

diff --git a/pkgs/development/compilers/openjdk-darwin/8.nix b/pkgs/development/compilers/openjdk-darwin/8.nix
new file mode 100644
index 000000000000..bcafca16022e
--- /dev/null
+++ b/pkgs/development/compilers/openjdk-darwin/8.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchurl, unzip, setJavaClassPath }:
+let
+  jdk = stdenv.mkDerivation {
+    name = "zulu1.8.0_66-8.11.0.1";
+
+    src = fetchurl {
+      url = http://cdn.azulsystems.com/zulu/bin/zulu1.8.0_66-8.11.0.1-macosx.zip;
+      sha256 = "0pvbpb3vf0509xm2x1rh0p0w4wmx50zf15604p28z1k8ai1a23sz";
+      curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/zulu-linux/";
+    };
+
+    buildInputs = [ unzip ];
+
+    installPhase = ''
+      mkdir -p $out
+      mv * $out
+
+      # jni.h expects jni_md.h to be in the header search path.
+      ln -s $out/include/darwin/*_md.h $out/include/
+    '';
+
+    preFixup = ''
+      # Propagate the setJavaClassPath setup hook from the JRE so that
+      # any package that depends on the JRE has $CLASSPATH set up
+      # properly.
+      mkdir -p $out/nix-support
+      echo -n "${setJavaClassPath}" > $out/nix-support/propagated-native-build-inputs
+
+      # Set JAVA_HOME automatically.
+      cat <<EOF >> $out/nix-support/setup-hook
+      if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
+      EOF
+    '';
+
+    passthru = {
+      jre = jdk;
+      home = jdk;
+    };
+
+    meta.platforms = stdenv.lib.platforms.darwin;
+
+  };
+in jdk

From 73359a3cbee0fb7e45fcdb7a13f3cb11a2a6cbef Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 14 Jan 2016 10:31:02 +0000
Subject: [PATCH 708/884] Actually use openjdk8 binary build for x86_64-darwin.

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b80a00b03a05..f009f818e9f4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4235,9 +4235,13 @@ let
         bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "7"; };
       };
 
-  openjdk8 = callPackage ../development/compilers/openjdk/8.nix {
-    bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "8"; };
-  };
+  openjdk8 =
+    if stdenv.isDarwin then
+      callPackage ../development/compilers/openjdk-darwin/8.nix { }
+    else
+      callPackage ../development/compilers/openjdk/8.nix {
+        bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "8"; };
+      };
 
   openjdk = if stdenv.isDarwin then openjdk7 else openjdk8;
 

From e534896c7d46cc4d03b46ed685ff4b672451e2cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 14 Jan 2016 10:11:56 +0100
Subject: [PATCH 709/884] telepathy-qt: disable parallel make

http://hydra.nixos.org/build/30377457/nixlog/1/raw
https://bugs.freedesktop.org/show_bug.cgi?id=93707
---
 pkgs/development/libraries/telepathy/qt/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix
index 1052e92d3807..3b40b7296a78 100644
--- a/pkgs/development/libraries/telepathy/qt/default.nix
+++ b/pkgs/development/libraries/telepathy/qt/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     NIX_CFLAGS_COMPILE+=" `pkg-config --cflags dbus-glib-1`"
   '';
 
-  enableParallelBuilding = true;
+  enableParallelBuilding = false; # missing _gen/future-constants.h
   doCheck = false; # giving up for now
 
   meta = {

From 4e9575c314baab5e45a95785918c721f7fed45e3 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 14 Jan 2016 10:31:02 +0000
Subject: [PATCH 710/884] Actually use openjdk8 binary build for x86_64-darwin.

(cherry picked from commit 73359a3cbee0fb7e45fcdb7a13f3cb11a2a6cbef)
---
 pkgs/top-level/all-packages.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 52ec706ad7ba..87e166140814 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4221,9 +4221,13 @@ let
         bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "7"; };
       };
 
-  openjdk8 = callPackage ../development/compilers/openjdk/8.nix {
-    bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "8"; };
-  };
+  openjdk8 =
+    if stdenv.isDarwin then
+      callPackage ../development/compilers/openjdk-darwin/8.nix { }
+    else
+      callPackage ../development/compilers/openjdk/8.nix {
+        bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "8"; };
+      };
 
   openjdk = if stdenv.isDarwin then openjdk7 else openjdk8;
 

From a81b396a2ef082f51eb7fb63ca24353c289682d8 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 14 Jan 2016 13:55:50 +0300
Subject: [PATCH 711/884] teamviewer: 11.0.52520 -> 11.0.53191

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

diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix
index 2c70d44570cf..dd947d86daf8 100644
--- a/pkgs/applications/networking/remote/teamviewer/default.nix
+++ b/pkgs/applications/networking/remote/teamviewer/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, xdg_utils, pkgs, pkgsi686Linux }:
 
 let
-  version = "11.0.52520";
+  version = "11.0.53191";
 
   ld32 =
     if stdenv.system == "i686-linux" then "${stdenv.cc}/nix-support/dynamic-linker"
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
     # There is a 64-bit package, but it has no differences apart from Debian dependencies.
     # Generic versioned packages (teamviewer_${version}_i386.tar.xz) are not available for some reason.
     url = "http://download.teamviewer.com/download/teamviewer_${version}_i386.deb";
-    sha256 = "1430dimcv69plpj0ad0wsn10k15x9fwlk6fiq7yz51qbcr5l9wk6";
+    sha256 = "1yr4c7d6hymw7kvca2jqxzaz6rw5xr66iby77aknd0v4afh4yzz3";
   };
 
   unpackPhase = ''

From 805d453bc227bd03afffa2feb8ac3accb46700e7 Mon Sep 17 00:00:00 2001
From: Svein Ove Aas <sveina@gmail.com>
Date: Sat, 9 Jan 2016 19:01:51 +0000
Subject: [PATCH 712/884] nvidia: branch update 352.63 -> 358.16 (close #12272)

Tested & reviewed by vcunat:
- the patch seems not needed anymore,
- reflects changes in their build system
  ftp://download.nvidia.com/XFree86/packaging/linux/new-kbuild-for-355/README
---
 pkgs/os-specific/linux/nvidia-x11/builder.sh  | 16 +++++-------
 pkgs/os-specific/linux/nvidia-x11/default.nix | 12 ++++-----
 .../linux/nvidia-x11/nvidia-4.2.patch         | 26 -------------------
 3 files changed, 11 insertions(+), 43 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/nvidia-x11/nvidia-4.2.patch

diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh
index ba65089a4f73..502648c1d513 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh
@@ -21,14 +21,6 @@ buildPhase() {
         unset src # used by the nv makefile
         make SYSSRC=$sysSrc SYSOUT=$sysOut module
 
-        # nvidia no longer provides uvm kernel module for 32-bit archs
-        # http://www.nvidia.com/download/driverResults.aspx/79722/en-us
-        if [[ "$system" = "x86_64-linux" ]]; then
-            cd uvm
-            make SYSSRC=$sysSrc SYSOUT=$sysOut module
-            cd ..
-        fi
-
         cd ..
     fi
 }
@@ -73,8 +65,12 @@ installPhase() {
           ln -srnf "$libname" "$libname_short.2"
       fi
 
-      ln -srnf "$libname" "$libname_short"
-      ln -srnf "$libname" "$libname_short.1"
+      if [[ "$libname" != "$libname_short" ]]; then
+        ln -srnf "$libname" "$libname_short"
+      fi
+      if [[ "$libname" != "$libname_short.1" ]]; then
+        ln -srnf "$libname" "$libname_short.1"
+      fi
     done
 
     #patchelf --set-rpath $out/lib:$glPath $out/lib/libGL.so.*.*
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 09630b402494..fff1135d3118 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -12,7 +12,7 @@ assert (!libsOnly) -> kernel != null;
 
 let
 
-  versionNumber = "352.63";
+  versionNumber = "358.16";
 
   # Policy: use the highest stable version as the default (on our master).
   inherit (stdenv.lib) makeLibraryPath;
@@ -27,18 +27,16 @@ stdenv.mkDerivation {
   src =
     if stdenv.system == "i686-linux" then
       fetchurl {
-        url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
-        sha256 = "0vxrx2hmycvhyp32mapf1vv01ddlghliwsvkhsg29hv3a7fl4i28";
+        url = "http://download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
+        sha256 = "1cc0zsri92nz2mznabfd6pqckm9mlbszmysqqqh3w5mipwn898nk";
       }
     else if stdenv.system == "x86_64-linux" then
       fetchurl {
-        url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run";
-        sha256 = "11dgvsygavdsgbgq87d3d2sj3dc85f2yarr71qczkgiqa030yb1k";
+        url = "http://download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run";
+        sha256 = "1xr16faam2zsx8ajwm9g9302m6qjzyjh1zd56g8jhc8jxg8h43sg";
       }
     else throw "nvidia-x11 does not support platform ${stdenv.system}";
 
-  patches = [ ./nvidia-4.2.patch ];
-
   inherit versionNumber libsOnly;
   inherit (stdenv) system;
 
diff --git a/pkgs/os-specific/linux/nvidia-x11/nvidia-4.2.patch b/pkgs/os-specific/linux/nvidia-x11/nvidia-4.2.patch
deleted file mode 100644
index 412b786179ae..000000000000
--- a/pkgs/os-specific/linux/nvidia-x11/nvidia-4.2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/kernel/nv-frontend.c b/kernel/nv-frontend.c
-index 65bbb1b..be39c8d 100644
---- a/kernel/nv-frontend.c
-+++ b/kernel/nv-frontend.c
-@@ -15,7 +15,7 @@
- #include "nv-frontend.h"
- 
- #if defined(MODULE_LICENSE)
--MODULE_LICENSE("NVIDIA");
-+MODULE_LICENSE("GPL\0NVIDIA");
- #endif
- #if defined(MODULE_INFO)
- MODULE_INFO(supported, "external");
-diff --git a/kernel/nv.c b/kernel/nv.c
-index abe81ed..05945b5 100644
---- a/kernel/nv.c
-+++ b/kernel/nv.c
-@@ -31,7 +31,7 @@
- 
- #if defined(NV_VMWARE) || (NV_BUILD_MODULE_INSTANCES != 0)
- #if defined(MODULE_LICENSE)
--MODULE_LICENSE("NVIDIA");
-+MODULE_LICENSE("GPL\0NVIDIA");
- #endif
- #if defined(MODULE_INFO)
- MODULE_INFO(supported, "external");

From 7fc7502db516a54d8104656401f0c2abf90cf781 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 4 Jan 2016 15:23:47 +0300
Subject: [PATCH 713/884] ioquake3: 1.36 -> 20151228

Renamed from `quake3game`
---
 pkgs/games/quake3/game/botlib.patch   | 51 ---------------------------
 pkgs/games/quake3/game/default.nix    | 43 ----------------------
 pkgs/games/quake3/game/exit.patch     | 12 -------
 pkgs/games/quake3/ioquake/default.nix | 38 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  7 ++--
 5 files changed, 42 insertions(+), 109 deletions(-)
 delete mode 100644 pkgs/games/quake3/game/botlib.patch
 delete mode 100644 pkgs/games/quake3/game/default.nix
 delete mode 100644 pkgs/games/quake3/game/exit.patch
 create mode 100644 pkgs/games/quake3/ioquake/default.nix

diff --git a/pkgs/games/quake3/game/botlib.patch b/pkgs/games/quake3/game/botlib.patch
deleted file mode 100644
index 82e2c7811012..000000000000
--- a/pkgs/games/quake3/game/botlib.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Retrieved from https://bugzilla.icculus.org/show_bug.cgi?id=4331,
-removed path prefix.
-
-  -- nckx <tobias.geerinckx.rice@gmail.com>
-
-PATCH: Bots don't work on 64 bit Intel CPU's
-
-botlib abuses strcpy (source and dest overlap), and the strcpy function for 64
-bit intel CPU's in the latest glibc, does not like this causing the bots to not
-load.
-
-The attached patch fixes this.
-
-Note this patch should be credited to: Andreas Bierfert (andreas.bierfert at
-lowlatency.de)
-
-See: http://bugzilla.redhat.com/show_bug.cgi?id=526338
-
-diff -up quake3-1.36/code/botlib/l_precomp.c~ quake3-1.36/code/botlib/l_precomp.c
---- code/botlib/l_precomp.c~	2009-04-27 08:42:37.000000000 +0200
-+++ code/botlib/l_precomp.c	2009-11-03 21:03:08.000000000 +0100
-@@ -948,7 +948,7 @@ void PC_ConvertPath(char *path)
- 		if ((*ptr == '\\' || *ptr == '/') &&
- 				(*(ptr+1) == '\\' || *(ptr+1) == '/'))
- 		{
--			strcpy(ptr, ptr+1);
-+			memmove(ptr, ptr+1, strlen(ptr));
- 		} //end if
- 		else
- 		{
-diff -up quake3-1.36/code/botlib/l_script.c~ quake3-1.36/code/botlib/l_script.c
---- code/botlib/l_script.c~	2009-04-27 08:42:37.000000000 +0200
-+++ code/botlib/l_script.c	2009-11-03 21:06:11.000000000 +0100
-@@ -1118,7 +1118,7 @@ void StripDoubleQuotes(char *string)
- {
- 	if (*string == '\"')
- 	{
--		strcpy(string, string+1);
-+		memmove(string, string+1, strlen(string));
- 	} //end if
- 	if (string[strlen(string)-1] == '\"')
- 	{
-@@ -1135,7 +1135,7 @@ void StripSingleQuotes(char *string)
- {
- 	if (*string == '\'')
- 	{
--		strcpy(string, string+1);
-+		memmove(string, string+1, strlen(string));
- 	} //end if
- 	if (string[strlen(string)-1] == '\'')
- 	{
diff --git a/pkgs/games/quake3/game/default.nix b/pkgs/games/quake3/game/default.nix
deleted file mode 100644
index 2ad922834d38..000000000000
--- a/pkgs/games/quake3/game/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ lib, stdenv, fetchurl, xlibsWrapper, SDL, mesa, openal, gcc46 }:
-
-stdenv.mkDerivation {
-  name = "ioquake3-1.36";
-
-  src = fetchurl {
-    url = http://ioquake3.org/files/1.36/ioquake3-1.36.tar.bz2; # calls itself "1.34-rc3"
-    sha256 = "008vah60z0n9h1qp373xbqvhwfbyywbbhd1np0h0yw66g0qzchzv";
-  };
-
-  patchFlags = "-p0";
-
-  patches = [
-    # Fix for compiling on gcc 4.2.
-    (fetchurl {
-      url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/games-fps/quake3/files/quake3-1.34_rc3-gcc42.patch?rev=1.1";
-      sha256 = "06c9lxfczcby5q29pim231mr2wdkvbv36xp9zbxp9vk0dfs8rv9x";
-    })
-
-    # Do an exit() instead of _exit().  This is nice for gcov.
-    # Upstream also seems to do this.
-    ./exit.patch
-
-    # No bots on amd64 without this patch.
-    ./botlib.patch
-  ];
-
-  buildInputs = [ xlibsWrapper SDL mesa openal gcc46 ];
-
-  # Fix building on GCC 4.6.
-  NIX_CFLAGS_COMPILE = "-Wno-error";
-
-  preInstall = ''
-    mkdir -p $out/baseq3
-    installTargets=copyfiles
-    installFlags="COPYDIR=$out"
-  '';
-
-  meta = {
-    platforms = lib.platforms.linux;
-    maintainers = [ lib.maintainers.eelco ];
-  };
-}
diff --git a/pkgs/games/quake3/game/exit.patch b/pkgs/games/quake3/game/exit.patch
deleted file mode 100644
index 82785167a782..000000000000
--- a/pkgs/games/quake3/game/exit.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru -x '*~' ioquake3_1.34-rc3-orig//code/unix/unix_main.c ioquake3_1.34-rc3//code/unix/unix_main.c
---- code/unix/unix_main.c	2006-11-28 23:05:25.000000000 +0100
-+++ code/unix/unix_main.c	2011-01-10 12:43:51.000000000 +0100
-@@ -341,7 +341,7 @@
- void Sys_Exit( int ex ) {
-   Sys_ConsoleInputShutdown();
- 
--#ifdef NDEBUG // regular behavior
-+#if 0
- 
-   // We can't do this 
-   //  as long as GL DLL's keep installing with atexit...
diff --git a/pkgs/games/quake3/ioquake/default.nix b/pkgs/games/quake3/ioquake/default.nix
new file mode 100644
index 000000000000..f9f4b21546fa
--- /dev/null
+++ b/pkgs/games/quake3/ioquake/default.nix
@@ -0,0 +1,38 @@
+{ lib, stdenv, fetchgit, xlibsWrapper, SDL2, mesa, openalSoft
+, curl, speex, opusfile, libogg, libopus, libjpeg, mumble, freetype
+}:
+
+stdenv.mkDerivation {
+  name = "ioquake3-git-20151228";
+
+  src = fetchgit {
+    url = "https://github.com/ioquake/ioq3";
+    rev = "fe619680f8fa9794906fc82a9c8c6113770696e6";
+    sha256 = "5462441df63eebee6f8ed19a8326de5f874dad31e124d37f73d3bab1cd656a87";
+  };
+
+  buildInputs = [ xlibsWrapper SDL2 mesa openalSoft curl speex opusfile libogg libopus libjpeg freetype mumble ];
+
+  NIX_CFLAGS_COMPILE = [ "-I${SDL2}/include/SDL2" "-I${opusfile}/include/opus" "-I${libopus}/include/opus" ];
+  NIX_CFLAGS_LINK = [ "-lSDL2" ];
+
+  enableParallelBuilding = true;
+
+  makeFlags = [ "USE_INTERNAL_LIBS=0" "USE_FREETYPE=1" "USE_OPENAL_DLOPEN=0" "USE_CURL_DLOPEN=0" ];
+
+  installTargets = [ "copyfiles" ];
+
+  installFlags = [ "COPYDIR=$(out)" ];
+
+  preInstall = ''
+    mkdir -p $out/baseq3
+  '';
+
+  meta = {
+    homepage = http://ioquake3.org/;
+    description = "First person shooter engine based on the Quake 3: Arena and Quake 3: Team Arena";
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.eelco lib.maintainers.abbradar ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f009f818e9f4..9540c0a99cc0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14257,15 +14257,15 @@ let
   qqwing = callPackage ../games/qqwing { };
 
   quake3demo = callPackage ../games/quake3/wrapper {
-    name = "quake3-demo-${quake3game.name}";
+    name = "quake3-demo-${ioquake3.name}";
     description = "Demo of Quake 3 Arena, a classic first-person shooter";
-    game = quake3game;
+    game = ioquake3;
     paks = [quake3demodata];
   };
 
   quake3demodata = callPackage ../games/quake3/demo { };
 
-  quake3game = callPackage ../games/quake3/game { };
+  ioquake3 = callPackage ../games/quake3/ioquake { };
 
   quantumminigolf = callPackage ../games/quantumminigolf {};
 
@@ -15906,6 +15906,7 @@ aliases = with self; rec {
   saneFrontends = sane-frontends; # added 2016-01-02
   btrfsProgs = btrfs-progs; # added 2016-01-03
   aircrackng = aircrack-ng; # added 2016-01-14
+  quake3game = ioquake3; # added 2016-01-14
 };
 
 tweakAlias = _n: alias: with lib;

From 2852696c2e6339c35e03c8629da15a8547e12368 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 4 Jan 2016 15:26:32 +0300
Subject: [PATCH 714/884] quake3pointrelease: init at 1.32b-3

---
 pkgs/games/quake3/content/pointrelease.nix | 28 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/games/quake3/content/pointrelease.nix

diff --git a/pkgs/games/quake3/content/pointrelease.nix b/pkgs/games/quake3/content/pointrelease.nix
new file mode 100644
index 000000000000..04da5811d99a
--- /dev/null
+++ b/pkgs/games/quake3/content/pointrelease.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl }:
+
+let
+  version = "1.32b-3";
+in stdenv.mkDerivation {
+  name = "quake3-pointrelease-${version}";
+
+  src = fetchurl {
+    url = "http://ftp.gwdg.de/pub/misc/ftp.idsoftware.com/idstuff/quake3/linux/linuxq3apoint-${version}.x86.run";
+    sha256 = "11piyksfqyxwl9mpgbc71w9sacsh4d3cdsgia0cy0dbbap2k4qf3";
+  };
+
+  buildCommand = ''
+    sh $src --tar xf
+
+    mkdir -p $out/baseq3
+    cp baseq3/*.pk3 $out/baseq3
+  '';
+
+  preferLocalBuild = true;
+
+  meta = with stdenv.lib; {
+    description = "Quake 3 Arena point release";
+    license = licenses.unfreeRedistributable;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9540c0a99cc0..655242182f5c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14265,6 +14265,8 @@ let
 
   quake3demodata = callPackage ../games/quake3/demo { };
 
+  quake3pointrelease = callPackage ../games/quake3/content/pointrelease.nix { };
+
   ioquake3 = callPackage ../games/quake3/ioquake { };
 
   quantumminigolf = callPackage ../games/quantumminigolf {};

From 6b447a3c9bbee41389052d6fa9e08a53d8447656 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 4 Jan 2016 15:27:19 +0300
Subject: [PATCH 715/884] quake3demodata: split from point release, cleanup

---
 pkgs/games/quake3/content/demo.nix | 28 ++++++++++++++++++++++++++++
 pkgs/games/quake3/demo/builder.sh  |  9 ---------
 pkgs/games/quake3/demo/default.nix | 24 ------------------------
 pkgs/top-level/all-packages.nix    |  4 ++--
 4 files changed, 30 insertions(+), 35 deletions(-)
 create mode 100644 pkgs/games/quake3/content/demo.nix
 delete mode 100644 pkgs/games/quake3/demo/builder.sh
 delete mode 100644 pkgs/games/quake3/demo/default.nix

diff --git a/pkgs/games/quake3/content/demo.nix b/pkgs/games/quake3/content/demo.nix
new file mode 100644
index 000000000000..2b4e69f0086c
--- /dev/null
+++ b/pkgs/games/quake3/content/demo.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl }:
+
+let
+  version = "1.11-6";
+in stdenv.mkDerivation {
+  name = "quake3-demodata-${version}";
+
+  src = fetchurl {
+    url = "http://ftp.gwdg.de/pub/misc/ftp.idsoftware.com/idstuff/quake3/linux/linuxq3ademo-${version}.x86.gz.sh";
+    sha256 = "1v54a1hx1bczk9hgn9qhx8vixsy7xn7wj2pylhfjsybfkgvf7pk4";
+  };
+
+  buildCommand = ''
+    tail -n +165 $src | tar xfz -
+
+    mkdir -p $out/baseq3
+    cp demoq3/*.pk3 $out/baseq3
+  '';
+
+  preferLocalBuild = true;
+
+  meta = with stdenv.lib; {
+    description = "Quake 3 Arena demo content";
+    license = licenses.unfreeRedistributable;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}
diff --git a/pkgs/games/quake3/demo/builder.sh b/pkgs/games/quake3/demo/builder.sh
deleted file mode 100644
index 40b0a547243b..000000000000
--- a/pkgs/games/quake3/demo/builder.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-source $stdenv/setup
-
-tail -n +165 $demo | tar xvfz -
-chmod -R +w .
-tail -n +175 $update | tar xvfz -
-chmod -R +w .
-
-mkdir -p $out/baseq3
-cp demoq3/*.pk3 baseq3/*.pk3 $out/baseq3
diff --git a/pkgs/games/quake3/demo/default.nix b/pkgs/games/quake3/demo/default.nix
deleted file mode 100644
index a25a7caa8c18..000000000000
--- a/pkgs/games/quake3/demo/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "quake3demo-1.11-6";
-  builder = ./builder.sh;
-
-  # This is needed for pak0.pk3.
-  demo = fetchurl {
-    url = http://tarballs.nixos.org/linuxq3ademo-1.11-6.x86.gz.sh;
-    sha256 = "1v54a1hx1bczk9hgn9qhx8vixsy7xn7wj2pylhfjsybfkgvf7pk4";
-  };
-
-  # This is needed for the additional pak?.pk3 files.
-  update = fetchurl {
-    url = http://tarballs.nixos.org/linuxq3apoint-1.31.x86.run;
-    sha256 = "1kp689452zb8jhd67ghisz2055pqxy9awz4vi0hq5qmp7xrp1x58";
-  };
-
-  # Don't rebuild if the inputs change, since the output is guaranteed
-  # to be this value.
-  outputHashMode = "recursive";
-  outputHashAlgo = "sha256";
-  outputHash = "00453c43a4jnlbm9w9ws1hdi28hkl63xnxbnbqml25h35ckhzs90";
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 655242182f5c..c5e6b1e9a457 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14260,10 +14260,10 @@ let
     name = "quake3-demo-${ioquake3.name}";
     description = "Demo of Quake 3 Arena, a classic first-person shooter";
     game = ioquake3;
-    paks = [quake3demodata];
+    paks = [ quake3pointrelease quake3demodata ];
   };
 
-  quake3demodata = callPackage ../games/quake3/demo { };
+  quake3demodata = callPackage ../games/quake3/content/demo.nix { };
 
   quake3pointrelease = callPackage ../games/quake3/content/pointrelease.nix { };
 

From 5981fc4b6f24f9ffb46558dfee7b12ba2c935935 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 4 Jan 2016 15:36:49 +0300
Subject: [PATCH 716/884] quake3wrapper: split from quake3demo, make a function
 and fix multiple paks

---
 pkgs/games/quake3/wrapper/builder.sh  |  4 ++--
 pkgs/games/quake3/wrapper/default.nix | 14 +++++++++++---
 pkgs/top-level/all-packages.nix       |  7 ++++---
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/pkgs/games/quake3/wrapper/builder.sh b/pkgs/games/quake3/wrapper/builder.sh
index 6b5bd7450c57..d5115baa7e6d 100644
--- a/pkgs/games/quake3/wrapper/builder.sh
+++ b/pkgs/games/quake3/wrapper/builder.sh
@@ -2,8 +2,8 @@ source $stdenv/setup
 
 mkdir -p $out/baseq3
 for i in $paks; do
-    if test -d "$paks/baseq3"; then
-        ln -s $paks/baseq3/* $out/baseq3/
+    if test -d "$i/baseq3"; then
+        ln -s "$i/baseq3"/* $out/baseq3/
     fi
 done
 
diff --git a/pkgs/games/quake3/wrapper/default.nix b/pkgs/games/quake3/wrapper/default.nix
index f9e2e864f197..ae0387ad2900 100644
--- a/pkgs/games/quake3/wrapper/default.nix
+++ b/pkgs/games/quake3/wrapper/default.nix
@@ -1,13 +1,21 @@
-{stdenv, fetchurl, game, paks, mesa, name, description, makeWrapper}:
+{ stdenv, fetchurl, mesa, ioquake3, makeWrapper }:
+
+{ paks, name ? (stdenv.lib.head paks).name, description ? "" }:
 
 stdenv.mkDerivation {
+  name = "${name}-${ioquake3.name}";
+
   builder = ./builder.sh;
 
-  buildInputs = [makeWrapper];
+  nativeBuildInputs = [ makeWrapper ];
   
-  inherit game paks mesa name;
+  inherit paks mesa;
+
+  game = ioquake3;
 
   gcc = stdenv.cc.cc;
+
+  preferLocalBuild = true;
   
   meta = {
     inherit description;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c5e6b1e9a457..8a07b7d2a98e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14256,10 +14256,11 @@ let
 
   qqwing = callPackage ../games/qqwing { };
 
-  quake3demo = callPackage ../games/quake3/wrapper {
-    name = "quake3-demo-${ioquake3.name}";
+  quake3wrapper = callPackage ../games/quake3/wrapper { };
+
+  quake3demo = quake3wrapper {
+    name = "quake3-demo-${lib.getVersion quake3demodata}";
     description = "Demo of Quake 3 Arena, a classic first-person shooter";
-    game = ioquake3;
     paks = [ quake3pointrelease quake3demodata ];
   };
 

From c8b231a40c444f9f0b419f3456fe15ad0b81fd29 Mon Sep 17 00:00:00 2001
From: Jakob Gillich <jakob@gillich.me>
Date: Sat, 9 Jan 2016 05:05:13 +0100
Subject: [PATCH 717/884] w3m: update to actively maintained debian repo

The official repository has last been updated in 2013,
meanwhile there are a lot of issues like non-existant
certificate verification. The debian repository is actively
maintained and already includes most of our custom patches,
so we use it instead.

Fixes #12257, closes #12259.

vcunat appended commit date to version.
---
 .../networking/browsers/w3m/default.nix       | 42 ++++---------------
 1 file changed, 8 insertions(+), 34 deletions(-)

diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix
index 6f37477c1b37..076b3faf11f5 100644
--- a/pkgs/applications/networking/browsers/w3m/default.nix
+++ b/pkgs/applications/networking/browsers/w3m/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, fetchpatch
+{ stdenv, fetchgit, fetchpatch
 , ncurses, boehmgc, gettext, zlib
 , sslSupport ? true, openssl ? null
 , graphicsSupport ? true, imlib2 ? null
 , x11Support ? graphicsSupport, libX11 ? null
 , mouseSupport ? !stdenv.isDarwin, gpm-ncurses ? null
-, perl, man
+, perl, man, pkgconfig
 }:
 
 assert sslSupport -> openssl != null;
@@ -15,11 +15,12 @@ assert mouseSupport -> gpm-ncurses != null;
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "w3m-0.5.3";
+  name = "w3m-0.5.3-2015-12-20";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/w3m/${name}.tar.gz";
-    sha256 = "1qx9f0kprf92r1wxl3sacykla0g04qsi0idypzz24b7xy9ix5579";
+  src = fetchgit {
+    url = "git://anonscm.debian.org/collab-maint/w3m.git";
+    rev = "e0b6e022810271bd0efcd655006389ee3879e94d";
+    sha256 = "1vahm3719hb0m20nc8k88165z35f8b15qasa0whhk78r12bls1q6";
   };
 
   NIX_LDFLAGS = optionalString stdenv.isSunOS "-lsocket -lnsl";
@@ -29,44 +30,17 @@ stdenv.mkDerivation rec {
   PERL = "${perl}/bin/perl";
   MAN = "${man}/bin/man";
 
-  # the Arch patches were pulled from:
-  # https://aur.archlinux.org/cgit/aur.git/?h=w3m-mouse
   patches = [
     ./RAND_egd.libressl.patch
-    (fetchpatch {
-      name = "file_handle.patch";
-      url = "https://aur.archlinux.org/cgit/aur.git/plain/file_handle.patch?h=w3m-mouse&id=5b5f0fbb59f674575e87dd368fed834641c35f03";
-      sha256 = "0kkqm68ig9d658kf1iwa1dwcf651f6dy2j98gplcks1mn3bdlak4";
-    })
-    (fetchpatch {
-      name = "form_unknown.patch";
-      url = "https://aur.archlinux.org/cgit/aur.git/plain/form_unknown.patch?h=w3m-mouse&id=5b5f0fbb59f674575e87dd368fed834641c35f03";
-      sha256 = "1mbfclid3bihb1xv7sxcahprn3slzd6ga8rjzlq4rbq80bl053fw";
-    })
-    (fetchpatch {
-      name = "gc72.patch";
-      url = "https://aur.archlinux.org/cgit/aur.git/plain/gc72.patch?h=w3m-mouse&id=5b5f0fbb59f674575e87dd368fed834641c35f03";
-      sha256 = "1n6anaw17by0s6rn25bwkgj2mck7ffspizpwbijvx1ynk451459a";
-    })
     (fetchpatch {
       name = "https.patch";
       url = "https://aur.archlinux.org/cgit/aur.git/plain/https.patch?h=w3m-mouse&id=5b5f0fbb59f674575e87dd368fed834641c35f03";
       sha256 = "08skvaha1hjyapsh8zw5dgfy433mw2hk7qy9yy9avn8rjqj7kjxk";
     })
-    (fetchpatch {
-      name = "perl.patch";
-      url = "https://aur.archlinux.org/cgit/aur.git/plain/perl.patch?h=w3m-mouse&id=5b5f0fbb59f674575e87dd368fed834641c35f03";
-      sha256 = "15cq7cwh0d2v64i8by44rgxw48156sgh872921hxrqdakr95p3gy";
-    })
-    (fetchpatch {
-      name = "w3m_rgba.patch";
-      url = "https://aur.archlinux.org/cgit/aur.git/plain/w3m_rgba.patch?h=w3m-mouse&id=5b5f0fbb59f674575e87dd368fed834641c35f03";
-      sha256 = "1dhp1p6z621ayyl9zip9w35x2cxyhhj72jv5dvf0zp4rk6cjm781";
-    })
   ] ++ optional (graphicsSupport && !x11Support) [ ./no-x11.patch ]
     ++ optional stdenv.isCygwin ./cygwin.patch;
 
-  buildInputs = [ncurses boehmgc gettext zlib]
+  buildInputs = [ pkgconfig ncurses boehmgc gettext zlib ]
     ++ optional sslSupport openssl
     ++ optional mouseSupport gpm-ncurses
     ++ optional graphicsSupport imlib2

From 8525936f807620e3d98fe4865033bdcd6932a362 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 14 Jan 2016 13:07:56 +0100
Subject: [PATCH 718/884] nixos: Document "jobs" option removal

---
 nixos/doc/manual/release-notes/rl-unstable.xml | 6 ++++++
 nixos/modules/rename.nix                       | 1 +
 2 files changed, 7 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index 9853e7f9d703..48771d8c2251 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -47,6 +47,12 @@ following incompatible changes:</para>
     </para>
   </listitem>
 
+  <listitem>
+    <para><literal>jobs</literal> NixOS option has been removed. It served as
+    compatibility layer between Upstart jobs and SystemD services. All services
+    have been rewritten to use <literal>systemd.services</literal></para>
+  </listitem>
+
   <listitem>
     <para><command>wmiimenu</command> is removed, as it has been
     removed by the developers upstream. Use <command>wimenu</command>
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 491e6fa7d0cd..010d44c40d19 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -26,6 +26,7 @@ with lib;
     (mkRenamedOptionModule [ "services" "sslh" "host" ] [ "services" "sslh" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "statsd" "host" ] [ "services" "statsd" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "subsonic" "host" ] [ "services" "subsonic" "listenAddress" ])
+    (mkRenamedOptionModule [ "jobs" ] [ "systemd" "services" ])
 
     # Old Grub-related options.
     (mkRenamedOptionModule [ "boot" "initrd" "extraKernelModules" ] [ "boot" "initrd" "kernelModules" ])

From 9c67ff9547907876b57ae57d815cd7abd8ea1fd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 14 Jan 2016 13:08:36 +0100
Subject: [PATCH 719/884] atom: 1.3.1 -> 1.3.3

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

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index 13e00754acd3..2cdb232f457a 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -16,11 +16,11 @@ let
   };
 in stdenv.mkDerivation rec {
   name = "atom-${version}";
-  version = "1.3.1";
+  version = "1.3.3";
 
   src = fetchurl {
     url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
-    sha256 = "17q5vrvjsyxcd8favp0sldfvhcwr0ba6ws32df6iv2iyla5h94y1";
+    sha256 = "0ihhhb4cwz5g5cvwykwk8vbsia4n7r3sh167ywi970w21b1czm7r";
     name = "${name}.deb";
   };
 

From 320f1b4e3c9e9fc4dafafa3dc6621ca95a5f86f8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 14 Jan 2016 13:20:49 +0100
Subject: [PATCH 720/884] nix: 1.11pre4345_b8258a4 -> 1.11pre4379_786046c

---
 pkgs/tools/package-management/nix/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 36c075071d61..b7b240780773 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -97,10 +97,10 @@ in rec {
    };
 
    nixUnstable = lib.lowPrio (common rec {
-     name = "nix-1.11pre4345_b8258a4";
+     name = "nix-1.11pre4379_786046c";
      src = fetchurl {
-       url = "http://hydra.nixos.org/build/29615957/download/4/${name}.tar.xz";
-       sha256 = "06944da78e46d8f2cbeeb02c1ab3127a06935e984bcf7a972041c7d91814f0f2";
+       url = "http://hydra.nixos.org/build/30375557/download/4/${name}.tar.xz";
+       sha256 = "ff42c70697fce7ca6eade622a31e5fbe45aed0edf1204fb491b40df207a807d5";
      };
    });
 

From 622eb5f69971d60c43e7bbb00195f5c1b1b41762 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 14 Jan 2016 14:13:51 +0100
Subject: [PATCH 721/884] requireFile: use correct absolute path syntax

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

diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
index 13ed5b3e9961..b7237a1f69c4 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -108,7 +108,7 @@ rec {
         using either
           nix-store --add-fixed ${hashAlgo} ${name_}
         or
-          nix-prefetch-url --type ${hashAlgo} file://path/to/${name_}
+          nix-prefetch-url --type ${hashAlgo} file:///path/to/${name_}
       '';
       hashAlgo = if sha256 != null then "sha256" else "sha1";
       hash = if sha256 != null then sha256 else sha1;

From 174221b744358438fd108f19dfab81a2844be538 Mon Sep 17 00:00:00 2001
From: Nathan Zadoks <nathan@nathan7.eu>
Date: Thu, 14 Jan 2016 14:54:27 +0100
Subject: [PATCH 722/884] go: 1.5.2 -> 1.5.3

This addresses CVE-2015-8618 (a vulnerability in math/big)
This issue can affect RSA computations in crypto/rsa, which is used by
crypto/tls. TLS servers on 32-bit systems could plausibly leak their RSA
private key due to this issue. Other protocol implementations that
create many RSA signatures could also be impacted in the same way.
https://groups.google.com/forum/#!topic/golang-dev/MEATuOi_ei4
---
 pkgs/development/compilers/go/1.5.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/go/1.5.nix b/pkgs/development/compilers/go/1.5.nix
index 32ae3ad0adc4..54c8cf219d5f 100644
--- a/pkgs/development/compilers/go/1.5.nix
+++ b/pkgs/development/compilers/go/1.5.nix
@@ -15,11 +15,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "go-${version}";
-  version = "1.5.2";
+  version = "1.5.3";
 
   src = fetchurl {
     url = "https://github.com/golang/go/archive/go${version}.tar.gz";
-    sha256 = "1ggh5ll774an78yiij6xan67n38zglws0pxj36g0rcg84460h4m4";
+    sha256 = "1n2niq0147pqflqh8j1s5wv8aq3vlh58ni3bp9add261z5q1g50k";
   };
 
   # perl is used for testing go vet

From 9c9a5353f97e17d055a4197d97cc85724059a50b Mon Sep 17 00:00:00 2001
From: Nathan Zadoks <nathan@nathan7.eu>
Date: Thu, 14 Jan 2016 03:40:26 +0100
Subject: [PATCH 723/884] docker: enable journald support

---
 pkgs/applications/virtualization/docker/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 1d9b1737f652..31daedd6d1eb 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchFromGitHub, makeWrapper
 , go, sqlite, iproute, bridge-utils, devicemapper
 , btrfs-progs, iptables, e2fsprogs, xz, utillinux
+, systemd, pkgconfig
 , enableLxc ? false, lxc
 }:
 
@@ -21,11 +22,13 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     makeWrapper go sqlite iproute bridge-utils devicemapper btrfs-progs
-    iptables e2fsprogs
+    iptables e2fsprogs systemd pkgconfig
   ];
 
   dontStrip = true;
 
+  DOCKER_BUILDTAGS = [ "journald" ];
+
   buildPhase = ''
     patchShebangs .
     export AUTO_GOPATH=1

From 1bb965f67b479c5782dd052fdbd118de0df91baf Mon Sep 17 00:00:00 2001
From: Jakob Gillich <jakob@gillich.me>
Date: Thu, 14 Jan 2016 16:39:37 +0100
Subject: [PATCH 724/884] atom: 1.3.3 -> 1.4.0

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

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index 2cdb232f457a..7120b8f43ee9 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -16,11 +16,11 @@ let
   };
 in stdenv.mkDerivation rec {
   name = "atom-${version}";
-  version = "1.3.3";
+  version = "1.4.0";
 
   src = fetchurl {
     url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
-    sha256 = "0ihhhb4cwz5g5cvwykwk8vbsia4n7r3sh167ywi970w21b1czm7r";
+    sha256 = "0dipww58p0sm99jn1ariisha9wsnhl7rnd8achpxqkf4b3vwi5iz";
     name = "${name}.deb";
   };
 

From 2d657729502336bf5c9dc29e123e2d6802f7a6e9 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 14 Jan 2016 16:28:43 +0100
Subject: [PATCH 725/884] openssh: Disable roaming (security fix)

Fixes CVE-2016-0777 and CVE-0216-0778.

Closes #12385.
---
 pkgs/tools/networking/openssh/default.nix     |  2 +-
 .../networking/openssh/disable-roaming.patch  | 51 +++++++++++++++++++
 2 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/networking/openssh/disable-roaming.patch

diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 3a150f19ed23..fecaabe95f94 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
       export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s"
     '';
 
-  patches = [ ./locale_archive.patch ./openssh-6.9p1-security-7.0.patch ]
+  patches = [ ./locale_archive.patch ./openssh-6.9p1-security-7.0.patch ./disable-roaming.patch ]
     ++ optional withGssapiPatches gssapiSrc;
 
   buildInputs = [ zlib openssl libedit pkgconfig pam ]
diff --git a/pkgs/tools/networking/openssh/disable-roaming.patch b/pkgs/tools/networking/openssh/disable-roaming.patch
new file mode 100644
index 000000000000..cd81d52f6c18
--- /dev/null
+++ b/pkgs/tools/networking/openssh/disable-roaming.patch
@@ -0,0 +1,51 @@
+From b842c1891b9979e30a6b53292a236ceb9231be79 Mon Sep 17 00:00:00 2001
+From: Franz Pletz <fpletz@fnordicwalking.de>
+Date: Thu, 14 Jan 2016 16:25:50 +0100
+Subject: [PATCH] Disable roaming, fixes CVE-2016-0777 and CVE-0216-0778
+
+Based on http://ftp.openbsd.org/pub/OpenBSD/patches/5.8/common/010_ssh.patch.sig
+---
+ readconf.c | 5 ++---
+ ssh.c      | 3 ---
+ 2 files changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/readconf.c b/readconf.c
+index db7d0bb..5b03f97 100644
+--- a/readconf.c
++++ b/readconf.c
+@@ -1660,7 +1660,7 @@ initialize_options(Options * options)
+ 	options->tun_remote = -1;
+ 	options->local_command = NULL;
+ 	options->permit_local_command = -1;
+-	options->use_roaming = -1;
++	options->use_roaming = 0;
+ 	options->visual_host_key = -1;
+ 	options->ip_qos_interactive = -1;
+ 	options->ip_qos_bulk = -1;
+@@ -1835,8 +1835,7 @@ fill_default_options(Options * options)
+ 		options->tun_remote = SSH_TUNID_ANY;
+ 	if (options->permit_local_command == -1)
+ 		options->permit_local_command = 0;
+-	if (options->use_roaming == -1)
+-		options->use_roaming = 1;
++	options->use_roaming = 0;
+ 	if (options->visual_host_key == -1)
+ 		options->visual_host_key = 0;
+ 	if (options->ip_qos_interactive == -1)
+diff --git a/ssh.c b/ssh.c
+index 3fd5a94..e8428b5 100644
+--- a/ssh.c
++++ b/ssh.c
+@@ -1931,9 +1931,6 @@ ssh_session2(void)
+ 			fork_postauth();
+ 	}
+ 
+-	if (options.use_roaming)
+-		request_roaming();
+-
+ 	return client_loop(tty_flag, tty_flag ?
+ 	    options.escape_char : SSH_ESCAPECHAR_NONE, id);
+ }
+-- 
+2.7.0
+

From 6401bb1795791ae5843b17dbf9e1d2132ed8fc4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Thu, 14 Jan 2016 17:37:50 +0100
Subject: [PATCH 726/884] mairix: add fix (patch) for big files.

---
 pkgs/tools/text/mairix/default.nix |   4 ++
 pkgs/tools/text/mairix/mmap.patch  | 110 +++++++++++++++++++++++++++++
 2 files changed, 114 insertions(+)
 create mode 100644 pkgs/tools/text/mairix/mmap.patch

diff --git a/pkgs/tools/text/mairix/default.nix b/pkgs/tools/text/mairix/default.nix
index 97fcd0629847..f3fece1f1774 100644
--- a/pkgs/tools/text/mairix/default.nix
+++ b/pkgs/tools/text/mairix/default.nix
@@ -10,6 +10,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ zlib bzip2 bison flex ];
 
+  # https://github.com/rc0/mairix/issues/12
+  patches = [ ./mmap.patch ];
+  patchFlags = "-p2";
+
   meta = {
     homepage = http://www.rc0.org.uk/mairix;
     license = stdenv.lib.licenses.gpl2Plus;
diff --git a/pkgs/tools/text/mairix/mmap.patch b/pkgs/tools/text/mairix/mmap.patch
new file mode 100644
index 000000000000..0d43ac7ce7ae
--- /dev/null
+++ b/pkgs/tools/text/mairix/mmap.patch
@@ -0,0 +1,110 @@
+Fix "Cannot allocate memory" on mmap of files bigger than 2GiB.
+
+https://github.com/rc0/mairix/issues/12
+
+diff -ruN t/mairix-0.22/mairix.h mairix/mairix-0.22/mairix.h
+--- t/mairix-0.22/mairix.h  2010-06-05 14:41:10.000000000 -0700
++++ mairix/mairix-0.22/mairix.h 2015-07-08 13:33:06.678718524 -0700
+@@ -327,8 +327,8 @@
+   DTR8_BAD_ATTACHMENT /* corrupt attachment (e.g. no body part) */
+ };
+ struct rfc822 *data_to_rfc822(struct msg_src *src, char *data, int length, enum data_to_rfc822_error *error);
+-void create_ro_mapping(const char *filename, unsigned char **data, int *len);
+-void free_ro_mapping(unsigned char *data, int len);
++void create_ro_mapping(const char *filename, unsigned char **data, size_t *len);
++void free_ro_mapping(unsigned char *data, size_t len);
+ char *format_msg_src(struct msg_src *src);
+
+ /* In tok.c */
+diff -ruN t/mairix-0.22/mbox.c mairix/mairix-0.22/mbox.c
+--- t/mairix-0.22/mbox.c    2010-06-05 14:41:10.000000000 -0700
++++ mairix/mairix-0.22/mbox.c   2015-07-08 13:32:45.126280861 -0700
+@@ -816,7 +816,7 @@
+         mb->n_old_msgs_valid = mb->n_msgs;
+       } else {
+         unsigned char *va;
+-        int len;
++        size_t len;
+         create_ro_mapping(mb->path, &va, &len);
+         if (va) {
+           rescan_mbox(mb, (char *) va, len);
+@@ -852,7 +852,7 @@
+   int any_new = 0;
+   int N;
+   unsigned char *va;
+-  int valen;
++  size_t valen;
+   enum data_to_rfc822_error error;
+
+   for (i=0; i<db->n_mboxen; i++) {
+diff -ruN t/mairix-0.22/rfc822.c mairix/mairix-0.22/rfc822.c
+--- t/mairix-0.22/rfc822.c  2010-06-05 14:41:10.000000000 -0700
++++ mairix/mairix-0.22/rfc822.c 2015-07-08 13:30:59.388133879 -0700
+@@ -1250,7 +1250,7 @@
+ }
+ #endif /* USE_GZIP_MBOX || USE_BZIP_MBOX */
+
+-void create_ro_mapping(const char *filename, unsigned char **data, int *len)/*{{{*/
++void create_ro_mapping(const char *filename, unsigned char **data, size_t *len)/*{{{*/
+ {
+   struct stat sb;
+   int fd;
+@@ -1371,7 +1371,7 @@
+   data_alloc_type = ALLOC_MMAP;
+ }
+ /*}}}*/
+-void free_ro_mapping(unsigned char *data, int len)/*{{{*/
++void free_ro_mapping(unsigned char *data, size_t len)/*{{{*/
+ {
+   int r;
+
+@@ -1399,7 +1399,7 @@
+ /*}}}*/
+ struct rfc822 *make_rfc822(char *filename)/*{{{*/
+ {
+-  int len;
++  size_t len;
+   unsigned char *data;
+   struct rfc822 *result;
+
+diff -ruN t/mairix-0.22/search.c mairix/mairix-0.22/search.c
+--- t/mairix-0.22/search.c  2010-06-05 14:41:10.000000000 -0700
++++ mairix/mairix-0.22/search.c 2015-07-08 13:32:25.809888610 -0700
+@@ -667,7 +667,7 @@
+ static void append_file_to_mbox(const char *path, FILE *out)/*{{{*/
+ {
+   unsigned char *data;
+-  int len;
++  size_t len;
+   create_ro_mapping(path, &data, &len);
+   if (data) {
+     fprintf(out, "From mairix@mairix Mon Jan  1 12:34:56 1970\n");
+@@ -683,8 +683,8 @@
+
+ static void get_validated_mbox_msg(struct read_db *db, int msg_index,/*{{{*/
+                                    int *mbox_index,
+-                                   unsigned char **mbox_data, int *mbox_len,
+-                                   unsigned char **msg_data,  int *msg_len)
++                                   unsigned char **mbox_data, size_t *mbox_len,
++                                   unsigned char **msg_data,  size_t *msg_len)
+ {
+   /* msg_data==NULL if checksum mismatches */
+   unsigned char *start;
+@@ -715,7 +715,7 @@
+ {
+   /* Need to common up code with try_copy_to_path */
+   unsigned char *mbox_start, *msg_start;
+-  int mbox_len, msg_len;
++  size_t mbox_len, msg_len;
+   int mbox_index;
+
+   get_validated_mbox_msg(db, msg_index, &mbox_index, &mbox_start, &mbox_len, &msg_start, &msg_len);
+@@ -735,7 +735,7 @@
+ static void try_copy_to_path(struct read_db *db, int msg_index, char *target_path)/*{{{*/
+ {
+   unsigned char *data;
+-  int mbox_len, msg_len;
++  size_t mbox_len, msg_len;
+   int mbi;
+   FILE *out;
+   unsigned char *start;

From b4f03263ec00489464ae5d8d04c3f27c42a5ee8e Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 14 Jan 2016 20:47:55 +0100
Subject: [PATCH 727/884] nethogs: 0.8.1-git -> 0.8.1

Also use fetchFromGitHub, use make flags instead of patching Makefile,
and add myself as maintainer since the package is unmaintained.
---
 pkgs/tools/networking/nethogs/default.nix | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/networking/nethogs/default.nix b/pkgs/tools/networking/nethogs/default.nix
index 3b22458ebe3f..c8ff0c7a1609 100644
--- a/pkgs/tools/networking/nethogs/default.nix
+++ b/pkgs/tools/networking/nethogs/default.nix
@@ -1,21 +1,19 @@
-{ stdenv, fetchgit, ncurses, libpcap }:
+{ stdenv, fetchFromGitHub, ncurses, libpcap }:
 
 stdenv.mkDerivation rec {
   name = "nethogs-${version}";
+  version = "0.8.1";
 
-  version = "0.8.1-git";
-
-  src = fetchgit {
-    url = git://github.com/raboof/nethogs.git;
-    rev = "f6f9e890ea731b8acdcb8906642afae4cd96baa8";
-    sha256 = "0dj5sdyxdlssbnjbdf8k7x896m2zgyyg31g12dl5n6irqdrb5scf";
+  src = fetchFromGitHub {
+    owner = "raboof";
+    repo = "nethogs";
+    rev = "v${version}";
+    sha256 = "1phn6i44ysvpl1f54bx4dspy51si8rc2wq6fywi163mi25j355d4";
   };
 
   buildInputs = [ ncurses libpcap ];
 
-  preConfigure = ''
-    substituteInPlace Makefile --replace "prefix := /usr/local" "prefix := $out"
-  '';
+  installFlags = [ "prefix=$(out)" "sbin=$(prefix)/bin" ];
 
   meta = with stdenv.lib; {
     description = "A small 'net top' tool, grouping bandwidth by process";
@@ -31,5 +29,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Plus;
     homepage = http://nethogs.sourceforge.net/;
     platforms = platforms.linux;
+    maintainer = [ maintainers.rycee ];
   };
 }

From 99bf9bf07ab20aececb2a951f770786afcadc1d4 Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@merritt.tech>
Date: Thu, 14 Jan 2016 07:07:13 -0800
Subject: [PATCH 728/884] rebar3-nix-boostrap: init at 0.0.1

---
 .../erlang/rebar3-nix-bootstrap/default.nix   | 22 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/tools/erlang/rebar3-nix-bootstrap/default.nix

diff --git a/pkgs/development/tools/erlang/rebar3-nix-bootstrap/default.nix b/pkgs/development/tools/erlang/rebar3-nix-bootstrap/default.nix
new file mode 100644
index 000000000000..347ec1d8bb68
--- /dev/null
+++ b/pkgs/development/tools/erlang/rebar3-nix-bootstrap/default.nix
@@ -0,0 +1,22 @@
+{stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+    name = "rebar3-nix-bootstrap";
+    version = "0.0.1";
+
+    src = fetchFromGitHub {
+        owner = "erlang-nix";
+        repo = "rebar3-nix-bootstrap";
+        rev = "${version}";
+        sha256 = "0xyj7j59dmxyl5nhhsmb0r1pihmk0s4k02ga1rfgm30rij6n7431";
+    };
+
+    installFlags = "PREFIX=$(out)";
+
+    meta = {
+      description = "Shim command to help bootstrap a rebar3 project on Nix";
+      license = stdenv.lib.licenses.asl20;
+      homepage = "https://github.com/erl-nix/rebar3-nix-bootstrap";
+      maintainers = with stdenv.lib.maintainers; [ ericbmerritt ];
+    };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8a07b7d2a98e..7cf73f4243e0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5095,6 +5095,7 @@ let
 
   rebar = callPackage ../development/tools/build-managers/rebar { };
   rebar3 = callPackage ../development/tools/build-managers/rebar3 { };
+  rebar3-nix-bootstrap = callPackage ../development/tools/erlang/rebar3-nix-bootstrap { };
   fetchHex = callPackage ../development/tools/build-managers/rebar3/fetch-hex.nix { };
 
   erlangPackages = callPackage ../development/erlang-modules { };

From a0309d871cb45edae137b803482eccb039bf97b4 Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@merritt.tech>
Date: Fri, 1 Jan 2016 20:07:46 -0800
Subject: [PATCH 729/884] move callPackage into the export set for 'Erlang'

This allows us to have a callPackages that includes erlang packages
---
 pkgs/development/erlang-modules/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/erlang-modules/default.nix b/pkgs/development/erlang-modules/default.nix
index 84590e12a1cf..d941353f2023 100644
--- a/pkgs/development/erlang-modules/default.nix
+++ b/pkgs/development/erlang-modules/default.nix
@@ -1,9 +1,10 @@
 { pkgs }: #? import <nixpkgs> {} }:
 
 let
-  callPackage = pkgs.lib.callPackageWith (pkgs // self);
 
   self = rec {
+    callPackage = pkgs.lib.callPackageWith (pkgs // self);
+
     buildErlang = callPackage ./build-erlang.nix {};
     buildHex = callPackage ./build-hex.nix {};
 

From 474e4178914719556b7ae9c3ed7084bb82d31b77 Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@merritt.tech>
Date: Sun, 10 Jan 2016 14:48:44 -0800
Subject: [PATCH 730/884] erlang support: allow nix-shell to work correctly

This changes build-hex.nix so that the buildHex and related functions
work correctly in a nix-shell.
---
 pkgs/development/erlang-modules/build-hex.nix | 68 +++++++------------
 .../tools/build-managers/rebar3/default.nix   | 21 +++---
 .../rebar3/registrySnapshot.nix               | 27 ++++++--
 3 files changed, 54 insertions(+), 62 deletions(-)

diff --git a/pkgs/development/erlang-modules/build-hex.nix b/pkgs/development/erlang-modules/build-hex.nix
index 7ba8fab9bd2a..42a4bc9c2380 100644
--- a/pkgs/development/erlang-modules/build-hex.nix
+++ b/pkgs/development/erlang-modules/build-hex.nix
@@ -1,7 +1,9 @@
-{ stdenv, erlang, rebar3, openssl, libyaml, fetchHex, fetchFromGitHub,
+{ stdenv, writeText, erlang, rebar3, openssl, libyaml, fetchHex, fetchFromGitHub,
   rebar3-pc, buildEnv }:
 
-{ name, version, sha256
+{ name, version, sha256 ? false
+, src ? null
+, setupHook ? null
 , hexPkg ? name
 , buildInputs ? [], erlangDeps ? [], pluginDeps ? []
 , postPatch ? ""
@@ -13,64 +15,40 @@ with stdenv.lib;
 
 let
   plugins = pluginDeps ++ (if compilePorts then [rebar3-pc] else []);
-  getDeps = drv: [drv] ++ (map getDeps drv.erlangDeps);
-  recursiveDeps = unique (flatten (map getDeps erlangDeps));
-  recursivePluginsDeps = unique (flatten (map getDeps plugins));
 
-  erlEnv = drv: buildEnv {
-    name = "erlang-env-${drv.name}";
-    paths = [ drv ] ++ recursiveDeps;
-    ignoreCollisions = false;
-    meta = drv.meta;
-  };
 
-  shell = drv: let
-    drvEnv = erlEnv drv;
-  in stdenv.mkDerivation {
-    name = "interactive-shell-${drv.name}";
-    nativeBuildInputs = [ erlang drvEnv ];
-    shellHook = ''
-      export ERL_LIBS="${drvEnv}";
-    '';
-  };
+  shell = drv: stdenv.mkDerivation {
+          name = "interactive-shell-${drv.name}";
+          buildInputs = [ drv ];
+    };
+
   pkg = self: stdenv.mkDerivation (attrs // {
+
     name = "${name}-${version}";
+    inherit version;
 
     buildInputs = buildInputs ++ [ erlang rebar3 openssl libyaml ];
+    propagatedBuildInputs = erlangDeps ++ plugins;
 
-    src = fetchHex {
+    src = if src == null then fetchHex {
       pkg = hexPkg;
       inherit version;
       inherit sha256;
-    };
+    } else src;
+
+    setupHook = if setupHook == null
+    then writeText "setupHook.sh" ''
+       addToSearchPath ERL_LIBS "$1/lib/erlang/lib/"
+    ''
+    else setupHook;
 
     postPatch = ''
       rm -f rebar rebar3
-      if [ -e "src/${name}.app.src" ]; then
-        sed -i -e 's/{ *vsn *,[^}]*}/{vsn, "${version}"}/' "src/${name}.app.src"
-      fi
-
-      ${if compilePorts then ''
-        echo "{plugins, [pc]}." >> rebar.config
-      '' else ''''}
-
-      ${rebar3.setupRegistry}
-
-      ${postPatch}
     '';
 
     configurePhase = ''
       runHook preConfigure
-      ${concatMapStrings (dep: ''
-        header "linking erlang dependency ${dep}"
-        ln -s "${dep}/${dep.name}" "_build/default/lib/${dep.name}"
-        stopNest
-      '') recursiveDeps}
-      ${concatMapStrings (dep: ''
-        header "linking rebar3 plugins ${dep}"
-        ln -s "${dep}/${dep.name}" "_build/default/plugins/${dep.name}"
-        stopNest
-      '') recursivePluginsDeps}
+      rebar3-nix-bootstrap
       runHook postConfigure
     '';
 
@@ -85,11 +63,11 @@ let
 
     installPhase = ''
       runHook preInstall
-      mkdir -p "$out/${name}"
+      mkdir -p "$out/lib/erlang/lib/${name}-${version}"
       for reldir in src ebin priv include; do
         fd="_build/default/lib/${name}/$reldir"
         [ -d "$fd" ] || continue
-        cp -Hrt "$out/${name}" "$fd"
+        cp -Hrt "$out/lib/erlang/lib/${name}-${version}" "$fd"
         success=1
       done
       runHook postInstall
diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix
index c4e256d58737..5ee9ecbcef8b 100644
--- a/pkgs/development/tools/build-managers/rebar3/default.nix
+++ b/pkgs/development/tools/build-managers/rebar3/default.nix
@@ -1,13 +1,11 @@
-{ stdenv, fetchurl, fetchHex, erlang, tree, fetchFromGitHub }:
+{ stdenv, writeText, callPackage, fetchurl,
+  fetchHex, erlang, rebar3-nix-bootstrap, tree, fetchFromGitHub }:
 
 
 let
   version = "3.0.0-beta.4";
-  registrySnapshot = import ./registrySnapshot.nix { inherit fetchFromGitHub; };
-  setupRegistry = ''
-    mkdir -p _build/default/{lib,plugins,packages}/ ./.cache/rebar3/hex/default/
-    zcat ${registrySnapshot}/registry.ets.gz > .cache/rebar3/hex/default/registry
-  '';
+  registrySnapshot = callPackage ./registrySnapshot.nix { };
+
   # TODO: all these below probably should go into nixpkgs.erlangModules.sources.*
   # {erlware_commons,     "0.16.0"},
   erlware_commons = fetchHex {
@@ -73,6 +71,7 @@ let
 in
 stdenv.mkDerivation {
   name = "rebar3-${version}";
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/rebar/rebar3/archive/${version}.tar.gz";
@@ -81,14 +80,14 @@ stdenv.mkDerivation {
 
   patches = [ ./hermetic-bootstrap.patch ];
 
-  buildInputs = [ erlang
-                  tree
-                ];
-  inherit setupRegistry;
+  buildInputs = [ erlang tree  ];
+  propagatedBuildInputs = [ registrySnapshot  rebar3-nix-bootstrap ];
+
 
   postPatch = ''
     echo postPatch
-    ${setupRegistry}
+    rebar3-nix-bootstrap registry-only
+    echo "$ERL_LIBS"
     mkdir -p _build/default/lib/
     cp --no-preserve=mode -R ${erlware_commons} _build/default/lib/erlware_commons
     cp --no-preserve=mode -R ${providers} _build/default/lib/providers
diff --git a/pkgs/development/tools/build-managers/rebar3/registrySnapshot.nix b/pkgs/development/tools/build-managers/rebar3/registrySnapshot.nix
index 8e9c2a292fd3..29d36e3cccc5 100644
--- a/pkgs/development/tools/build-managers/rebar3/registrySnapshot.nix
+++ b/pkgs/development/tools/build-managers/rebar3/registrySnapshot.nix
@@ -1,8 +1,23 @@
-{ fetchFromGitHub }:
+{stdenv, writeText, fetchFromGitHub }:
 
-fetchFromGitHub {
-  owner = "gleber";
-  repo = "hex-pm-registry-snapshots";
-  rev = "329ae2b";
-  sha256 = "1rs3z8psfvy10mzlfvkdzbflgikcnq08r38kfi0f8p5wvi8f8hmh";
+stdenv.mkDerivation rec {
+    name = "hex-registry";
+    rev = "329ae2b";
+    version = "0.0.0+build.${rev}";
+
+    src = fetchFromGitHub {
+        owner = "gleber";
+        repo = "hex-pm-registry-snapshots";
+        inherit rev;
+        sha256 = "1rs3z8psfvy10mzlfvkdzbflgikcnq08r38kfi0f8p5wvi8f8hmh";
+    };
+
+    installPhase = ''
+       mkdir -p "$out/var/hex"
+       zcat "registry.ets.gz" > "$out/var/hex/registry.ets"
+    '';
+
+    setupHook = writeText "setupHook.sh" ''
+        export HEX_REGISTRY_SNAPSHOT="$1/var/hex/registry.ets"
+   '';
 }

From 10fd4dff99d4e8f59d32c1b7f47b778831f9c620 Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@merritt.tech>
Date: Sun, 10 Jan 2016 15:11:07 -0800
Subject: [PATCH 731/884] erlang support: move hex packages to hex namespace

This commit moves all the hex based packages to a single namespace. It
also moves all the packages to a single file.  This is in preparation
for the move to a system to generate the hex packages from the hex
package store.
---
 pkgs/development/erlang-modules/default.nix   | 15 +---
 .../erlang-modules/hex-packages.nix           | 73 +++++++++++++++++++
 .../erlang-modules/hex/esqlite.nix            |  8 --
 .../erlang-modules/hex/goldrush.nix           |  7 --
 .../erlang-modules/hex/ibrowse.nix            |  8 --
 pkgs/development/erlang-modules/hex/jiffy.nix |  8 --
 pkgs/development/erlang-modules/hex/lager.nix |  8 --
 pkgs/development/erlang-modules/hex/meck.nix  | 13 ----
 .../erlang-modules/hex/rebar3-pc.nix          |  7 --
 9 files changed, 76 insertions(+), 71 deletions(-)
 create mode 100644 pkgs/development/erlang-modules/hex-packages.nix
 delete mode 100644 pkgs/development/erlang-modules/hex/esqlite.nix
 delete mode 100644 pkgs/development/erlang-modules/hex/goldrush.nix
 delete mode 100644 pkgs/development/erlang-modules/hex/ibrowse.nix
 delete mode 100644 pkgs/development/erlang-modules/hex/jiffy.nix
 delete mode 100644 pkgs/development/erlang-modules/hex/lager.nix
 delete mode 100644 pkgs/development/erlang-modules/hex/meck.nix
 delete mode 100644 pkgs/development/erlang-modules/hex/rebar3-pc.nix

diff --git a/pkgs/development/erlang-modules/default.nix b/pkgs/development/erlang-modules/default.nix
index d941353f2023..53d54a77a603 100644
--- a/pkgs/development/erlang-modules/default.nix
+++ b/pkgs/development/erlang-modules/default.nix
@@ -1,19 +1,10 @@
 { pkgs }: #? import <nixpkgs> {} }:
 
 let
-
   self = rec {
-    callPackage = pkgs.lib.callPackageWith (pkgs // self);
-
+    hex = import ./hex-packages.nix { callPackage = self.callPackage; };
+    callPackage = pkgs.lib.callPackageWith (pkgs // self // hex);
     buildErlang = callPackage ./build-erlang.nix {};
     buildHex = callPackage ./build-hex.nix {};
-
-    rebar3-pc = callPackage ./hex/rebar3-pc.nix {};
-    esqlite = callPackage ./hex/esqlite.nix {};
-    goldrush = callPackage ./hex/goldrush.nix {};
-    ibrowse = callPackage ./hex/ibrowse.nix {};
-    jiffy = callPackage ./hex/jiffy.nix {};
-    lager = callPackage ./hex/lager.nix {};
-    meck = callPackage ./hex/meck.nix {};
   };
-in self
+in self // self.hex
diff --git a/pkgs/development/erlang-modules/hex-packages.nix b/pkgs/development/erlang-modules/hex-packages.nix
new file mode 100644
index 000000000000..fe260f015aaf
--- /dev/null
+++ b/pkgs/development/erlang-modules/hex-packages.nix
@@ -0,0 +1,73 @@
+/* hex.nix is an auto-generated file -- DO NOT EDIT! */
+{ callPackage }:
+
+let
+  self = rec {
+
+  esqlite = callPackage
+    ({ buildHex, rebar3-pc }:
+     buildHex {
+       name = "esqlite";
+       version = "0.2.1";
+       sha256 = "1296fn1lz4lz4zqzn4dwc3flgkh0i6n4sydg501faabfbv8d3wkr";
+       compilePort = true;
+    }) {};
+
+  ibrowse = callPackage
+    ({ buildHex, meck }:
+      buildHex {
+        name = "ibrowse";
+        version = "4.2.2";
+        sha256 = "1bn0645n95j5zypdsns1w4kgd3q9lz8fj898hg355j5w89scn05q";
+        erlangDeps = [ meck ];
+    }) {};
+
+  meck = callPackage
+    ({ stdenv, buildHex }:
+     buildHex {
+       name = "meck";
+       version = "0.8.3";
+       sha256 = "1dh2rhks1xly4f49x89vbhsk8fgwkx5zqp0n98mnng8rs1rkigak";
+
+       meta = {
+         description = "A mocking framework for Erlang";
+         homepage = "https://github.com/eproxus/meck";
+         license = stdenv.lib.licenses.apsl20;
+      };
+    }) {};
+
+  goldrush = callPackage
+    ({ buildHex, fetchurl }:
+     buildHex {
+       name = "goldrush";
+       version = "0.1.7";
+       sha256 = "1zjgbarclhh10cpgvfxikn9p2ay63rajq96q1sbz9r9w6v6p8jm9";
+    }) {};
+
+  jiffy = callPackage
+    ({ buildHex }:
+     buildHex {
+       name = "jiffy";
+       version = "0.14.5";
+       hexPkg = "barrel_jiffy";
+       sha256 = "0iqz8bp0f672c5rfy5dpw9agv2708wzldd00ngbsffglpinlr1wa";
+     }) {};
+
+  lager = callPackage
+    ({ buildHex, goldrush }:
+     buildHex {
+       name = "lager";
+       version = "3.0.2";
+       sha256 = "0051zj6wfmmvxjn9q0nw8wic13nhbrkyy50cg1lcpdh17qiknzsj";
+       erlangDeps = [ goldrush ];
+    }) {};
+
+  rebar3-pc = callPackage
+    ({ buildHex, goldrush }:
+     buildHex {
+       name = "pc";
+       version = "1.1.0";
+       sha256 = "1br5xfl4b2z70b6a2ccxppn64jvkqgpmy4y9v81kxzb91z0ss9ma";
+    }) {};
+  };
+in self
diff --git a/pkgs/development/erlang-modules/hex/esqlite.nix b/pkgs/development/erlang-modules/hex/esqlite.nix
deleted file mode 100644
index 1fc3a2e91dc6..000000000000
--- a/pkgs/development/erlang-modules/hex/esqlite.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ buildHex, rebar3-pc }:
-
-buildHex {
-  name = "esqlite";
-  version = "0.2.1";
-  sha256 = "1296fn1lz4lz4zqzn4dwc3flgkh0i6n4sydg501faabfbv8d3wkr";
-  compilePorts = true;
-}
diff --git a/pkgs/development/erlang-modules/hex/goldrush.nix b/pkgs/development/erlang-modules/hex/goldrush.nix
deleted file mode 100644
index ddff7f6cc56d..000000000000
--- a/pkgs/development/erlang-modules/hex/goldrush.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ buildHex, fetchurl }:
-
-buildHex {
-  name = "goldrush";
-  version = "0.1.7";
-  sha256 = "1zjgbarclhh10cpgvfxikn9p2ay63rajq96q1sbz9r9w6v6p8jm9";
-}
diff --git a/pkgs/development/erlang-modules/hex/ibrowse.nix b/pkgs/development/erlang-modules/hex/ibrowse.nix
deleted file mode 100644
index 6ed189eb39d2..000000000000
--- a/pkgs/development/erlang-modules/hex/ibrowse.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ buildHex }:
-
-buildHex {
-  name = "ibrowse";
-  version = "4.2.2";
-  sha256 = "1bn0645n95j5zypdsns1w4kgd3q9lz8fj898hg355j5w89scn05q";
-}
-
diff --git a/pkgs/development/erlang-modules/hex/jiffy.nix b/pkgs/development/erlang-modules/hex/jiffy.nix
deleted file mode 100644
index b9f92c888a45..000000000000
--- a/pkgs/development/erlang-modules/hex/jiffy.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ buildHex }:
-
-buildHex {
-  name = "jiffy";
-  version = "0.14.5";
-  hexPkg = "barrel_jiffy";
-  sha256 = "0iqz8bp0f672c5rfy5dpw9agv2708wzldd00ngbsffglpinlr1wa";
-}
diff --git a/pkgs/development/erlang-modules/hex/lager.nix b/pkgs/development/erlang-modules/hex/lager.nix
deleted file mode 100644
index acfefd5757c0..000000000000
--- a/pkgs/development/erlang-modules/hex/lager.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ buildHex, goldrush }:
-
-buildHex {
-  name = "lager";
-  version = "3.0.2";
-  sha256 = "0051zj6wfmmvxjn9q0nw8wic13nhbrkyy50cg1lcpdh17qiknzsj";
-  erlangDeps = [ goldrush ];
-}
diff --git a/pkgs/development/erlang-modules/hex/meck.nix b/pkgs/development/erlang-modules/hex/meck.nix
deleted file mode 100644
index 5af8a15a908d..000000000000
--- a/pkgs/development/erlang-modules/hex/meck.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ stdenv, buildHex }:
-
-buildHex {
-  name = "meck";
-  version = "0.8.3";
-  sha256 = "1dh2rhks1xly4f49x89vbhsk8fgwkx5zqp0n98mnng8rs1rkigak";
-
-  meta = {
-    description = "A mocking framework for Erlang";
-    homepage = "https://github.com/eproxus/meck";
-    license = stdenv.lib.licenses.apsl20;
-  };
-}
diff --git a/pkgs/development/erlang-modules/hex/rebar3-pc.nix b/pkgs/development/erlang-modules/hex/rebar3-pc.nix
deleted file mode 100644
index 5bc45d3e3abf..000000000000
--- a/pkgs/development/erlang-modules/hex/rebar3-pc.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ buildHex, goldrush }:
-
-buildHex {
-  name = "pc";
-  version = "1.1.0";
-  sha256 = "1br5xfl4b2z70b6a2ccxppn64jvkqgpmy4y9v81kxzb91z0ss9ma";
-}

From b509dadbf157316b88641cd5d64a23ab524f486f Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@merritt.tech>
Date: Sun, 10 Jan 2016 15:16:53 -0800
Subject: [PATCH 732/884] erlang support: remove broken buildErlang function

The buildErlang function is broken and and leads Engineers down a wrong
path. For vanilla erlang that doesn't user rebar3, its better to simply
use `stdenv.mkDerivation` along with a set setupHook then the existing
functionality.
---
 .../erlang-modules/build-erlang.nix           | 68 -------------------
 pkgs/development/erlang-modules/default.nix   |  1 -
 2 files changed, 69 deletions(-)
 delete mode 100644 pkgs/development/erlang-modules/build-erlang.nix

diff --git a/pkgs/development/erlang-modules/build-erlang.nix b/pkgs/development/erlang-modules/build-erlang.nix
deleted file mode 100644
index e662166741ac..000000000000
--- a/pkgs/development/erlang-modules/build-erlang.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-# This file is not used not tested at this time, build-hex.nix is the currently
-# main vehicle of bringing Erlang packages in.
-
-{ stdenv, erlang, rebar, openssl, libyaml }:
-
-{ name, version
-, buildInputs ? [], erlangDeps ? []
-, postPatch ? ""
-, meta ? {}
-, ... }@attrs:
-
-with stdenv.lib;
-
-stdenv.mkDerivation (attrs // {
-  name = "${name}-${version}";
-
-  buildInputs = buildInputs ++ [ erlang rebar openssl libyaml ];
-
-  postPatch = ''
-    rm -f rebar
-    if [ -e "src/${name}.app.src" ]; then
-      sed -i -e 's/{ *vsn *,[^}]*}/{vsn, "${version}"}/' "src/${name}.app.src"
-    fi
-    ${postPatch}
-  '';
-
-  configurePhase = let
-    getDeps = drv: [drv] ++ (map getDeps drv.erlangDeps);
-    recursiveDeps = uniqList {
-       inputList = flatten (map getDeps erlangDeps);
-    };
-  in ''
-    runHook preConfigure
-    ${concatMapStrings (dep: ''
-      header "linking erlang dependency ${dep}"
-      mkdir deps
-      ln -s "${dep}" "deps/${dep.packageName}"
-      stopNest
-    '') recursiveDeps}
-    runHook postConfigure
-  '';
-
-  buildPhase = ''
-    runHook preBuild
-    rebar compile
-    runHook postBuild
-  '';
-
-  installPhase = ''
-    runHook preInstall
-    for reldir in src ebin priv include; do
-      [ -e "$reldir" ] || continue
-      mkdir "$out"
-      cp -rt "$out" "$reldir"
-      success=1
-    done
-    runHook postInstall
-  '';
-
-  meta = {
-    inherit (erlang.meta) platforms;
-  } // meta;
-
-  passthru = {
-    packageName = name;
-    inherit erlangDeps;
-  };
-})
diff --git a/pkgs/development/erlang-modules/default.nix b/pkgs/development/erlang-modules/default.nix
index 53d54a77a603..4180ddc81211 100644
--- a/pkgs/development/erlang-modules/default.nix
+++ b/pkgs/development/erlang-modules/default.nix
@@ -4,7 +4,6 @@ let
   self = rec {
     hex = import ./hex-packages.nix { callPackage = self.callPackage; };
     callPackage = pkgs.lib.callPackageWith (pkgs // self // hex);
-    buildErlang = callPackage ./build-erlang.nix {};
     buildHex = callPackage ./build-hex.nix {};
   };
 in self // self.hex

From d541d0e6403e3a11417a729b211eebce22db0c61 Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@merritt.tech>
Date: Sun, 10 Jan 2016 15:25:45 -0800
Subject: [PATCH 733/884] erlang support: seperate hex and rebar3 support

Building Hex packages is a superset of building with rebar3. There is no
need to force folks that use rebar3 but not hex to build with hex. This
commit seperates the rebar3 specific bits and the hex specific bits into
seperate functions that can be used independently.
---
 pkgs/development/erlang-modules/build-hex.nix | 76 +----------------
 .../erlang-modules/build-rebar3.nix           | 82 +++++++++++++++++++
 pkgs/development/erlang-modules/default.nix   |  2 +
 3 files changed, 88 insertions(+), 72 deletions(-)
 create mode 100644 pkgs/development/erlang-modules/build-rebar3.nix

diff --git a/pkgs/development/erlang-modules/build-hex.nix b/pkgs/development/erlang-modules/build-hex.nix
index 42a4bc9c2380..ff6e47e5a805 100644
--- a/pkgs/development/erlang-modules/build-hex.nix
+++ b/pkgs/development/erlang-modules/build-hex.nix
@@ -1,86 +1,18 @@
-{ stdenv, writeText, erlang, rebar3, openssl, libyaml, fetchHex, fetchFromGitHub,
-  rebar3-pc, buildEnv }:
+{ stdenv, buildRebar3, fetchHex }:
 
-{ name, version, sha256 ? false
-, src ? null
-, setupHook ? null
+{ name, version, sha256
 , hexPkg ? name
-, buildInputs ? [], erlangDeps ? [], pluginDeps ? []
-, postPatch ? ""
-, compilePorts ? false
-, meta ? {}
 , ... }@attrs:
 
 with stdenv.lib;
 
 let
-  plugins = pluginDeps ++ (if compilePorts then [rebar3-pc] else []);
+  pkg = self: buildRebar3 (attrs // {
 
-
-  shell = drv: stdenv.mkDerivation {
-          name = "interactive-shell-${drv.name}";
-          buildInputs = [ drv ];
-    };
-
-  pkg = self: stdenv.mkDerivation (attrs // {
-
-    name = "${name}-${version}";
-    inherit version;
-
-    buildInputs = buildInputs ++ [ erlang rebar3 openssl libyaml ];
-    propagatedBuildInputs = erlangDeps ++ plugins;
-
-    src = if src == null then fetchHex {
+    src = fetchHex {
       pkg = hexPkg;
       inherit version;
       inherit sha256;
-    } else src;
-
-    setupHook = if setupHook == null
-    then writeText "setupHook.sh" ''
-       addToSearchPath ERL_LIBS "$1/lib/erlang/lib/"
-    ''
-    else setupHook;
-
-    postPatch = ''
-      rm -f rebar rebar3
-    '';
-
-    configurePhase = ''
-      runHook preConfigure
-      rebar3-nix-bootstrap
-      runHook postConfigure
-    '';
-
-    buildPhase = ''
-      runHook preBuild
-      HOME=. rebar3 compile
-      ${if compilePorts then ''
-        HOME=. rebar3 pc compile
-      '' else ''''}
-      runHook postBuild
-    '';
-
-    installPhase = ''
-      runHook preInstall
-      mkdir -p "$out/lib/erlang/lib/${name}-${version}"
-      for reldir in src ebin priv include; do
-        fd="_build/default/lib/${name}/$reldir"
-        [ -d "$fd" ] || continue
-        cp -Hrt "$out/lib/erlang/lib/${name}-${version}" "$fd"
-        success=1
-      done
-      runHook postInstall
-    '';
-
-    meta = {
-      inherit (erlang.meta) platforms;
-    } // meta;
-
-    passthru = {
-      packageName = name;
-      env = shell self;
-      inherit erlangDeps;
     };
   });
 in
diff --git a/pkgs/development/erlang-modules/build-rebar3.nix b/pkgs/development/erlang-modules/build-rebar3.nix
new file mode 100644
index 000000000000..3600f4aab6e2
--- /dev/null
+++ b/pkgs/development/erlang-modules/build-rebar3.nix
@@ -0,0 +1,82 @@
+{ stdenv, writeText, erlang, rebar3, openssl, libyaml, fetchHex, fetchFromGitHub,
+  rebar3-pc, buildEnv }:
+
+{ name, version
+, src
+, setupHook ? null
+, buildInputs ? [], erlangDeps ? [], pluginDeps ? []
+, postPatch ? ""
+, compilePorts ? false
+, meta ? {}
+, ... }@attrs:
+
+with stdenv.lib;
+
+let
+  plugins = pluginDeps ++ (if compilePorts then [rebar3-pc] else []);
+
+
+  shell = drv: stdenv.mkDerivation {
+          name = "interactive-shell-${drv.name}";
+          buildInputs = [ drv ];
+    };
+
+  pkg = self: stdenv.mkDerivation (attrs // {
+
+    name = "${name}-${version}";
+    inherit version;
+
+    buildInputs = buildInputs ++ [ erlang rebar3 openssl libyaml ];
+    propagatedBuildInputs = erlangDeps ++ plugins;
+
+    inherit src;
+
+    setupHook = if setupHook == null
+    then writeText "setupHook.sh" ''
+       addToSearchPath ERL_LIBS "$1/lib/erlang/lib/"
+    ''
+    else setupHook;
+
+    postPatch = ''
+      rm -f rebar rebar3
+    '';
+
+    configurePhase = ''
+      runHook preConfigure
+      rebar3-nix-bootstrap
+      runHook postConfigure
+    '';
+
+    buildPhase = ''
+      runHook preBuild
+      HOME=. rebar3 compile
+      ${if compilePorts then ''
+        HOME=. rebar3 pc compile
+      '' else ''''}
+      runHook postBuild
+    '';
+
+    installPhase = ''
+      runHook preInstall
+      mkdir -p "$out/lib/erlang/lib/${name}-${version}"
+      for reldir in src ebin priv include; do
+        fd="_build/default/lib/${name}/$reldir"
+        [ -d "$fd" ] || continue
+        cp -Hrt "$out/lib/erlang/lib/${name}-${version}" "$fd"
+        success=1
+      done
+      runHook postInstall
+    '';
+
+    meta = {
+      inherit (erlang.meta) platforms;
+    } // meta;
+
+    passthru = {
+      packageName = name;
+      env = shell self;
+      inherit erlangDeps;
+    };
+  });
+in
+  fix pkg
diff --git a/pkgs/development/erlang-modules/default.nix b/pkgs/development/erlang-modules/default.nix
index 4180ddc81211..fc5e6bad1f64 100644
--- a/pkgs/development/erlang-modules/default.nix
+++ b/pkgs/development/erlang-modules/default.nix
@@ -4,6 +4,8 @@ let
   self = rec {
     hex = import ./hex-packages.nix { callPackage = self.callPackage; };
     callPackage = pkgs.lib.callPackageWith (pkgs // self // hex);
+
+    buildRebar3 = callPackage ./build-rebar3.nix {};
     buildHex = callPackage ./build-hex.nix {};
   };
 in self // self.hex

From b1719f9fcc618ba91c8812b838f5ca4fa12efb7f Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@merritt.tech>
Date: Sat, 9 Jan 2016 15:42:28 -0800
Subject: [PATCH 734/884] erlang support: Add 187 packages pulled from Hex

This commit adds 187 packages from Hex.pm and documents 100 more that
could not be imported for various reasons. The packages where generated
by hex2nix.
---
 .../erlang-modules/build-rebar3.nix           |    4 +-
 pkgs/development/erlang-modules/default.nix   |    4 +-
 .../erlang-modules/hex-packages.nix           | 3854 ++++++++++++++++-
 3 files changed, 3798 insertions(+), 64 deletions(-)

diff --git a/pkgs/development/erlang-modules/build-rebar3.nix b/pkgs/development/erlang-modules/build-rebar3.nix
index 3600f4aab6e2..16e663d14b9a 100644
--- a/pkgs/development/erlang-modules/build-rebar3.nix
+++ b/pkgs/development/erlang-modules/build-rebar3.nix
@@ -1,5 +1,5 @@
 { stdenv, writeText, erlang, rebar3, openssl, libyaml, fetchHex, fetchFromGitHub,
-  rebar3-pc, buildEnv }:
+  pc, buildEnv }:
 
 { name, version
 , src
@@ -13,7 +13,7 @@
 with stdenv.lib;
 
 let
-  plugins = pluginDeps ++ (if compilePorts then [rebar3-pc] else []);
+  plugins = pluginDeps ++ (if compilePorts then [pc] else []);
 
 
   shell = drv: stdenv.mkDerivation {
diff --git a/pkgs/development/erlang-modules/default.nix b/pkgs/development/erlang-modules/default.nix
index fc5e6bad1f64..7f096016ddbd 100644
--- a/pkgs/development/erlang-modules/default.nix
+++ b/pkgs/development/erlang-modules/default.nix
@@ -1,8 +1,8 @@
-{ pkgs }: #? import <nixpkgs> {} }:
+{ stdenv, pkgs }: #? import <nixpkgs> {} }:
 
 let
   self = rec {
-    hex = import ./hex-packages.nix { callPackage = self.callPackage; };
+    hex = import ./hex-packages.nix { stdenv = stdenv; callPackage = self.callPackage; };
     callPackage = pkgs.lib.callPackageWith (pkgs // self // hex);
 
     buildRebar3 = callPackage ./build-rebar3.nix {};
diff --git a/pkgs/development/erlang-modules/hex-packages.nix b/pkgs/development/erlang-modules/hex-packages.nix
index fe260f015aaf..9a165503b796 100644
--- a/pkgs/development/erlang-modules/hex-packages.nix
+++ b/pkgs/development/erlang-modules/hex-packages.nix
@@ -1,73 +1,3807 @@
-/* hex.nix is an auto-generated file -- DO NOT EDIT! */
-{ callPackage }:
+/* hex-packages.nix is an auto-generated file -- DO NOT EDIT!
+*
+* Unbuildable Packages:
+*
+* active_0_9_0
+* conferl_0_0_1
+* db_0_9_0
+* ekstat_0_2_2
+* erltrace_0_1_4
+* escalus_2_6_4
+* fqc_0_1_5
+*  - libsnarlmatch_0_1_5
+*  - rankmatcher_0_1_2
+* fqc_0_1_7
+* hash_ring_ex_1_1_2
+* gpb_3_18_10
+* gpb_3_18_8
+*  - rebar_protobuffs_0_1_0
+* jose_1_4_2
+* jsxn_0_2_1
+* kvs_2_1_0
+* lager_2_1_1
+* - dqe_0_1_22
+* - ensq_0_1_6
+* - eplugin_0_1_4
+* - fifo_utils_0_1_18
+* - lager_watchdog_0_1_10
+* - mdns_client_0_1_7
+* - mdns_client_lib_0_1_33
+* lasp_0_0_3
+* libleofs_0_1_2
+* ezmq_0_2_0
+* mad_0_9_0
+* hackney_1_4_8
+* mmath_0_1_15
+*  - ddb_client_0_1_17
+*    - folsom_ddb_0_1_20
+*  - dproto_0_1_12
+*  - mstore_0_1_9
+* mmath_0_1_16
+* n2o_2_3_0
+* nodefinder_1_4_0
+*  - cloudi_core_1_4_0_rc_4
+*    - cloudi_service_db_cassandra_1_3_3
+*    - cloudi_service_db_elasticsearch_1_3_3
+*    - cloudi_service_db_riak_1_3_3
+* nodefinder_1_5_1
+*   - cloudi_core_1_5_1
+*   - cloudi_service_api_requests_1_5_1
+*   - cloudi_service_db_1_5_1
+*   - cloudi_service_db_cassandra_cql_1_5_1
+*   - cloudi_service_db_couchdb_1_5_1
+*   - cloudi_service_db_http_elli_1_5_1
+*   - cloudi_service_db_memcached_1_5_1
+*   - cloudi_service_db_mysql_1_5_1
+*   - cloudi_service_db_pgsql_1_5_1
+*   - cloudi_service_db_tokyotyrant_1_5_0
+*   - cloudi_service_filesystem_1_5_1
+*   - cloudi_service_http_client_1_5_1
+*   - cloudi_service_http_cowboy_1_5_1
+*   - cloudi_service_http_rest_1_5_1
+*   - cloudi_service_map_reduce_1_5_1
+*   - cloudi_service_monitoring_1_5_1
+*   - cloudi_service_queue_1_5_1
+*   - cloudi_service_quorum_1_5_1
+*   - cloudi_service_router_1_5_1
+*   - cloudi_service_tcp_1_5_1
+*   - cloudi_service_timers_1_5_1
+*   - cloudi_service_udp_1_5_1
+*   - cloudi_service_validate_1_5_1
+*   - cloudi_service_zeromq_1_5_1
+*   - service_1_5_1
+* fast_yaml_1_0_1
+* parse_trans_2_9_0
+* pooler_1_4_0
+* protobuffs_0_8_2
+*   - rebar3_protobuffs_0_2_0
+*   - riak_pb_2_1_0
+*     - riakc_2_1_1
+* locker_1_0_8
+* cowboy_1_0_4
+*  - cet_0_2_0
+* amqp_client_3_5_6
+* rebar3_abnfc_plugin_0_1_0
+* rebar3_eqc_0_0_8
+* rebar3_exunit_0_1_1
+* rebar3_proper_0_5_0
+* rebar3_yang_plugin_0_2_1
+* hackney_1_1_0
+*  - erlastic_search_1_1_1
+* hackney_1_3_1
+*  - craterl_0_2_3
+* hackney_1_3_2
+*  - epubnub_0_1_0
+* cpg_1_4_0
+* cpg_1_5_1
+* uuid_erl_1_4_0
+* uuid_erl_1_5_1
+* ucol_nif_1_1_5
+* katipo_0_2_4
+* xref_runner_0_2_4
+*/
+{ stdenv, callPackage }:
 
 let
   self = rec {
 
-  esqlite = callPackage
-    ({ buildHex, rebar3-pc }:
-     buildHex {
-       name = "esqlite";
-       version = "0.2.1";
-       sha256 = "1296fn1lz4lz4zqzn4dwc3flgkh0i6n4sydg501faabfbv8d3wkr";
-       compilePort = true;
-    }) {};
+    aws_http_0_2_4 = callPackage
+      (
+        {  buildHex, barrel_jiffy_0_14_4, lhttpc_1_3_0 }:
+          buildHex {
+            name = "aws_http";
+            version = "0.2.4";
+            sha256 =
+              "96065da0d348a8e47e01531cfa720615e15a21c1bd4e5c82decf56026cde128f";
 
-  ibrowse = callPackage
-    ({ buildHex, meck }:
-      buildHex {
-        name = "ibrowse";
-        version = "4.2.2";
-        sha256 = "1bn0645n95j5zypdsns1w4kgd3q9lz8fj898hg355j5w89scn05q";
-        erlangDeps = [ meck ];
-    }) {};
+            erlangDeps = [ barrel_jiffy_0_14_4 lhttpc_1_3_0 ];
 
-  meck = callPackage
-    ({ stdenv, buildHex }:
-     buildHex {
-       name = "meck";
-       version = "0.8.3";
-       sha256 = "1dh2rhks1xly4f49x89vbhsk8fgwkx5zqp0n98mnng8rs1rkigak";
+            meta = {
+              description = "Amazon AWS HTTP helpers";
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/anha0825/erl_aws_http";
+            };
+          }
+      ) {};
 
-       meta = {
-         description = "A mocking framework for Erlang";
-         homepage = "https://github.com/eproxus/meck";
-         license = stdenv.lib.licenses.apsl20;
-      };
-    }) {};
+    aws_http = aws_http_0_2_4;
 
-  goldrush = callPackage
-    ({ buildHex, fetchurl }:
-     buildHex {
-       name = "goldrush";
-       version = "0.1.7";
-       sha256 = "1zjgbarclhh10cpgvfxikn9p2ay63rajq96q1sbz9r9w6v6p8jm9";
-    }) {};
+    backoff_1_1_3 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "backoff";
+            version = "1.1.3";
+            sha256 =
+              "30cead738d20e4c8d36cd37857dd5e23aeba57cb868bf64766d47d371422bdff";
 
-  jiffy = callPackage
-    ({ buildHex }:
-     buildHex {
-       name = "jiffy";
-       version = "0.14.5";
-       hexPkg = "barrel_jiffy";
-       sha256 = "0iqz8bp0f672c5rfy5dpw9agv2708wzldd00ngbsffglpinlr1wa";
-     }) {};
+            meta = {
+              description = "Exponential backoffs library";
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ferd/backoff";
+            };
+          }
+      ) {};
 
-  lager = callPackage
-    ({ buildHex, goldrush }:
-     buildHex {
-       name = "lager";
-       version = "3.0.2";
-       sha256 = "0051zj6wfmmvxjn9q0nw8wic13nhbrkyy50cg1lcpdh17qiknzsj";
-       erlangDeps = [ goldrush ];
-    }) {};
+    backoff = backoff_1_1_3;
+
+    barrel_ibrowse_4_2_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "barrel_ibrowse";
+            version = "4.2.0";
+            sha256 =
+              "58bd9e45932c10fd3d0ceb5c4e47952c3243ea300b388192761ac20be197b2ca";
+
+            meta = {
+              description = "Erlang HTTP client application";
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/barrel-db/ibrowse";
+            };
+          }
+      ) {};
+
+    barrel_ibrowse = barrel_ibrowse_4_2_0;
+
+    barrel_jiffy_0_14_4 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "barrel_jiffy";
+            version = "0.14.4";
+            sha256 =
+              "3b730d6a18e988b8411f449bbb5df3637eb7bea864302924581b2391dd6b6e71";
+            compilePort = true;
+
+            meta = {
+              description = "JSON Decoder/Encoder.";
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/barrel-db/jiffy";
+            };
+          }
+      ) {};
+
+    barrel_jiffy_0_14_5 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "barrel_jiffy";
+            version = "0.14.5";
+            sha256 =
+              "8a874c6dbcf439a7d7b300b4463f47e088fd54e2b715ef7261e21807ee421f47";
+            compilePort = true;
+
+            meta = {
+              description = "JSON Decoder/Encoder.";
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/barrel-db/jiffy";
+            };
+          }
+      ) {};
+
+    barrel_jiffy = barrel_jiffy_0_14_5;
+
+    barrel_oauth_1_6_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "barrel_oauth";
+            version = "1.6.0";
+            sha256 =
+              "b2a800b771d45f32a9a55d416054b3bdfab3a925b62e8000f2c08b719390d4dd";
+
+            meta = {
+              description = "An Erlang OAuth 1.0 implementation";
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/barrel-db/erlang-oauth";
+            };
+          }
+      ) {};
+
+    barrel_oauth = barrel_oauth_1_6_0;
+
+    base16_1_0_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "base16";
+            version = "1.0.0";
+            sha256 =
+              "02afd0827e61a7b07093873e063575ca3a2b07520567c7f8cec7c5d42f052d76";
+
+            meta = {
+              description = "Base16 encoding and decoding";
+              license = with stdenv.lib.licenses; [ bsd3 free ];
+              homepage = "https://github.com/goj/base16";
+            };
+          }
+      ) {};
+
+    base16 = base16_1_0_0;
+
+    base64url_0_0_1 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "base64url";
+            version = "0.0.1";
+            sha256 =
+              "fab09b20e3f5db886725544cbcf875b8e73ec93363954eb8a1a9ed834aa8c1f9";
+
+            meta = {
+              description = "URL safe base64-compatible codec";
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/dvv/base64url";
+            };
+          }
+      ) {};
+
+    base64url = base64url_0_0_1;
+
+    bbmustache_1_0_4 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "bbmustache";
+            version = "1.0.4";
+            sha256 =
+              "03b0d47db66e86df993896dce7578d7e4aae5f84636809b45fa8a3e34ee59b12";
+
+            meta = {
+              description =
+                "Binary pattern match Based Mustache template engine for Erlang/OTP";
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/soranoba/bbmustache";
+            };
+          }
+      ) {};
+
+    bbmustache_1_1_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "bbmustache";
+            version = "1.1.0";
+            sha256 =
+              "aa22469836bb8a9928ad741bdd2038d49116228bfbe0c2d6c792e1bdd4b256d9";
+
+            meta = {
+              description =
+                "Binary pattern match Based Mustache template engine for Erlang/OTP";
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/soranoba/bbmustache";
+            };
+          }
+      ) {};
+
+    bbmustache = bbmustache_1_1_0;
+
+    bear_0_8_3 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "bear";
+            version = "0.8.3";
+            sha256 =
+              "0a04ce4702e00e0a43c0fcdd63e38c9c7d64dceb32b27ffed261709e7c3861ad";
+
+            meta = {
+              description = "Statistics functions for Erlang";
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/puzza007/bear";
+            };
+          }
+      ) {};
+
+    bear = bear_0_8_3;
+
+    bstr_0_3_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "bstr";
+            version = "0.3.0";
+            sha256 =
+              "0fb4e05619663d48dabcd21023915741277ba392f2a5710dde7ab6034760284d";
+
+            meta = {
+              description = "Erlang library that uses binaries as strings";
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/jcomellas/bstr";
+            };
+          }
+      ) {};
+
+    bstr = bstr_0_3_0;
+
+    cache_tab_1_0_1 = callPackage
+      (
+        {  buildHex, p1_utils_1_0_1 }:
+          buildHex {
+            name = "cache_tab";
+            version = "1.0.1";
+            sha256 =
+              "717a91101e03535ab65e4a9ce028ae3f0ddfb4ce0fd4144bf8816082c6dc2933";
+
+            erlangDeps = [ p1_utils_1_0_1 ];
+
+            meta = {
+              description = "In-memory cache Erlang / Elixir library";
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/processone/cache_tab";
+            };
+          }
+      ) {};
+
+    cache_tab = cache_tab_1_0_1;
+
+    certifi_0_1_1 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "certifi";
+            version = "0.1.1";
+            sha256 =
+              "e6d1dda48fad1b1c5b454c8402e2ac375ae12bf85a9910decaf791f330a7de29";
+
+            meta = {
+              description = "An OTP library";
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/certifi/erlang-certifi";
+            };
+          }
+      ) {};
+
+    certifi_0_3_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "certifi";
+            version = "0.3.0";
+            sha256 =
+              "42ae85fe91c038a634a5fb8d0c77f4fc581914c508f087c7138e9366a1517f6a";
+
+            meta = {
+              description = "An OTP library";
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/certifi/erlang-certifi";
+            };
+          }
+      ) {};
+
+    certifi = certifi_0_3_0;
+
+    cf_0_1_2 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "cf";
+            version = "0.1.2";
+            sha256 =
+              "c86f56bca74dd3616057b28574d920973fe665ecb064aa458dc6a2447f3f4924";
+
+            meta = {
+              description = "Terminal colour helper";
+              license = stdenv.lib.licenses.mit;
+            };
+          }
+      ) {};
+
+    cf_0_2_1 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "cf";
+            version = "0.2.1";
+            sha256 =
+              "baee9aa7ec2dfa3cb4486b67211177caa293f876780f0b313b45718edef6a0a5";
+
+            meta = {
+              description = "Terminal colour helper";
+              license = stdenv.lib.licenses.mit;
+            };
+          }
+      ) {};
+
+    cf = cf_0_2_1;
+
+    cmark_0_6_2 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "cmark";
+            version = "0.6.2";
+            sha256 =
+              "c17bbc354864cc8dfd352c772eb1655a5c67718c76d76df0aaf6179a833c76ef";
+            compilePort = true;
+
+            meta = {
+              longDescription = ''Elixir NIF for cmark (C), a parser library
+                                following the CommonMark spec, a compatible
+                                implementation of Markdown.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/asaaki/cmark.ex";
+            };
+          }
+      ) {};
+
+    cmark = cmark_0_6_2;
+
+    comeonin_2_0_1 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "comeonin";
+            version = "2.0.1";
+            sha256 =
+              "7f7468625058ab1b817c00efa473d8117b0113a73a429f25cf663d5e2416572f";
+            compilePort = true;
+
+            meta = {
+              description =
+                "Password hashing (bcrypt, pbkdf2_sha512) library for Elixir.";
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/elixircnx/comeonin";
+            };
+          }
+      ) {};
+
+    comeonin = comeonin_2_0_1;
+
+    couchbeam_1_2_1 = callPackage
+      (
+        {  buildHex, hackney_1_4_4, jsx_2_8_0 }:
+          buildHex {
+            name = "couchbeam";
+            version = "1.2.1";
+            sha256 =
+              "ed19f0412aa0539ecf622ac8ade1ca0e316f424e3334ad015a3fb8db19e91194";
+
+            erlangDeps = [ hackney_1_4_4 jsx_2_8_0 ];
+
+            meta = {
+              description = "Erlang CouchDB client";
+              license = stdenv.lib.licenses.free;
+            };
+          }
+      ) {};
+
+    couchbeam = couchbeam_1_2_1;
+
+    cowlib_1_0_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "cowlib";
+            version = "1.0.0";
+            sha256 =
+              "4dacd60356177ec8cf93dbff399de17435b613f3318202614d3d5acbccee1474";
+
+            meta = {
+              description = "Support library for manipulating Web protocols.";
+              license = stdenv.lib.licenses.isc;
+              homepage = "https://github.com/ninenines/cowlib";
+            };
+          }
+      ) {};
+
+    cowlib_1_0_2 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "cowlib";
+            version = "1.0.2";
+            sha256 =
+              "db622da03aa039e6366ab953e31186cc8190d32905e33788a1acb22744e6abd2";
+
+            meta = {
+              description = "Support library for manipulating Web protocols.";
+              license = stdenv.lib.licenses.isc;
+              homepage = "https://github.com/ninenines/cowlib";
+            };
+          }
+      ) {};
+
+    cowlib_1_3_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "cowlib";
+            version = "1.3.0";
+            sha256 =
+              "2b1ac020ec92e7a59cb7322779870c2d3adc7c904ecb3b9fa406f04dc9816b73";
+
+            meta = {
+              description = "Support library for manipulating Web protocols.";
+              license = stdenv.lib.licenses.isc;
+              homepage = "https://github.com/ninenines/cowlib";
+            };
+          }
+      ) {};
+
+    cowlib = cowlib_1_3_0;
+
+    crc_0_3_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "crc";
+            version = "0.3.0";
+            sha256 =
+              "23d7cb6a18cca461f46f5a0f341c74fd0a680cdae62460687f1a24f0a7faabd4";
+
+            meta = {
+              description =
+                "A library used to calculate CRC checksums for binary data";
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/TattdCodeMonkey/crc";
+            };
+          }
+      ) {};
+
+    crc = crc_0_3_0;
+
+    crypto_rsassa_pss_1_0_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "crypto_rsassa_pss";
+            version = "1.0.0";
+            sha256 =
+              "d8f48874dbef940a8954126249499714e702d8ae0a8f23230a6c2f4a92833313";
+
+            meta = {
+              description =
+                "RSASSA-PSS Public Key Cryptographic Signature Algorithm for Erlang";
+              license = stdenv.lib.licenses.free;
+              homepage =
+                "https://github.com/potatosalad/erlang-crypto_rsassa_pss";
+            };
+          }
+      ) {};
+
+    crypto_rsassa_pss = crypto_rsassa_pss_1_0_0;
+
+    cth_readable_1_2_0 = callPackage
+      (
+        {  buildHex, cf_0_2_1 }:
+          buildHex {
+            name = "cth_readable";
+            version = "1.2.0";
+            sha256 =
+              "41dee2a37e0f266c590b3ea9542ca664e84ebc781a3949115eba658afc08026d";
+
+            erlangDeps = [ cf_0_2_1 ];
+
+            meta = {
+              description = "Common Test hooks for more readable logs";
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/ferd/cth_readable";
+            };
+          }
+      ) {};
+
+    cth_readable = cth_readable_1_2_0;
+
+    cucumberl_0_0_6 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "cucumberl";
+            version = "0.0.6";
+            sha256 =
+              "3b9ea813997fd8c1e3d2b004e89288496dc21d2e5027f432e5900569d2c61cf3";
+
+            meta = {
+              description = "A pure-erlang implementation of Cucumber.";
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/ericbmerritt/cucumberl";
+            };
+          }
+      ) {};
+
+    cucumberl = cucumberl_0_0_6;
+
+    denrei_0_2_3 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "denrei";
+            version = "0.2.3";
+            sha256 =
+              "bc0e8cf7e085dda6027df83ef5d63c41b93988bcd7f3db7c68e4dad3cd599744";
+
+            meta = {
+              description = "Denrei - a lightweight Erlang messaging system.";
+              license = stdenv.lib.licenses.mit;
+            };
+          }
+      ) {};
+
+    denrei = denrei_0_2_3;
+
+    detergent_0_3_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "detergent";
+            version = "0.3.0";
+            sha256 =
+              "510cfb5d35b4b344762f074b73c8696b4bdde654ea046b3365cf92760ae33362";
+
+            meta = {
+              description = "An emulsifying Erlang SOAP library";
+              license = with stdenv.lib.licenses; [ unlicense bsd3 ];
+              homepage = "https://github.com/devinus/detergent";
+            };
+          }
+      ) {};
+
+    detergent = detergent_0_3_0;
+
+    dflow_0_1_5 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "dflow";
+            version = "0.1.5";
+            sha256 =
+              "f08e73f22d4c620ef5f358a0b40f8fe3b91219ca3922fbdbe7e42f1cb58f737e";
+
+            meta = {
+              description = "Pipelined flow processing engine";
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/dalmatinerdb/dflow";
+            };
+          }
+      ) {};
+
+    dflow = dflow_0_1_5;
+
+    discount_0_7_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "discount";
+            version = "0.7.0";
+            sha256 =
+              "a37b7890620f93aa2fae06eee364cd906991588bc8897e659f51634179519c97";
+
+            meta = {
+              description = "Elixir NIF for discount, a Markdown parser";
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/asaaki/discount.ex";
+            };
+          }
+      ) {};
+
+    discount = discount_0_7_0;
+
+    dynamic_compile_1_0_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "dynamic_compile";
+            version = "1.0.0";
+            sha256 =
+              "eb73d8e9a6334914f79c15ee8214acad9659c42222d49beda3e8b6f6789a980a";
+
+            meta = {
+              description =
+                "compile and load erlang modules from string input";
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/okeuday/dynamic_compile";
+            };
+          }
+      ) {};
+
+    dynamic_compile = dynamic_compile_1_0_0;
+
+    econfig_0_7_1 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "econfig";
+            version = "0.7.1";
+            sha256 =
+              "b11d68e3d288b5cb4bd34e668e03176c4ea42790c09f1f449cdbd46a649ea7f3";
+
+            meta = {
+              description = "simple Erlang config handler using INI files";
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/benoitc/econfig";
+            };
+          }
+      ) {};
+
+    econfig = econfig_0_7_1;
+
+    edown_0_7_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "edown";
+            version = "0.7.0";
+            sha256 =
+              "6d7365a7854cd724e8d1fd005f5faa4444eae6a87eb6df9b789b6e7f6f09110a";
+
+            meta = {
+              description = "Markdown generated from Edoc.";
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/uwiger/edown";
+            };
+          }
+      ) {};
+
+    edown = edown_0_7_0;
+
+    elixir_ale_0_4_1 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "elixir_ale";
+            version = "0.4.1";
+            sha256 =
+              "2ee5c6989a8005a0ab8f1aea0b4f89b5feae75be78a70bade6627c3624c59c46";
+
+            meta = {
+              description =
+                "Elixir access to hardware I/O interfaces such as GPIO, I2C, and SPI.";
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/fhunleth/elixir_ale";
+            };
+          }
+      ) {};
+
+    elixir_ale = elixir_ale_0_4_1;
+
+    elli_1_0_4 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "elli";
+            version = "1.0.4";
+            sha256 =
+              "87641b9c069b1372dac4e1bdda795076ea3142af78aac0d63896a38079e89e8e";
+
+            meta = {
+              description =
+                "Fast and robust web server for building high-throughput, low-latency apps";
+              license = stdenv.lib.licenses.free;
+            };
+          }
+      ) {};
+
+    elli = elli_1_0_4;
+
+    enotify_0_1_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "enotify";
+            version = "0.1.0";
+            sha256 =
+              "8e48da763ce15bfd75cc857ddfe5011b03189d597f47bcdd8acc6fbbe8e6b6f4";
+            compilePort = true;
+
+            meta = {
+              description = "Filesystem listener";
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/tsloughter/enotify";
+            };
+          }
+      ) {};
+
+    enotify = enotify_0_1_0;
+
+    eper_0_94_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "eper";
+            version = "0.94.0";
+            sha256 =
+              "8d853792fa61a7fd068fe9c113a8a44bc839e11ad70cb8d5d2884566e3bede39";
+
+            meta = {
+              longDescription = ''Erlang Performance and Debugging Tools sherk
+                                - a profiler, similar to Linux oprofile or MacOs
+                                shark gperf - a graphical performance monitor;
+                                shows CPU, memory and network usage dtop -
+                                similar to unix top redbug- similar to the OTP
+                                dbg application, but safer, better etc.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/massemanet/eper";
+            };
+          }
+      ) {};
+
+    eper = eper_0_94_0;
+
+    epgsql_3_1_1 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "epgsql";
+            version = "3.1.1";
+            sha256 =
+              "4b3f478ad090aed7200b2a8c9f2d5ef45c3aaa167be896b5237bba4b40f461d8";
+
+            meta = {
+              description = "PostgreSQL Client";
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/epgsql/epgsql";
+            };
+          }
+      ) {};
+
+    epgsql = epgsql_3_1_1;
+
+    episcina_1_1_0 = callPackage
+      (
+        {  buildHex, gproc_0_3_1 }:
+          buildHex {
+            name = "episcina";
+            version = "1.1.0";
+            sha256 =
+              "16238717bfbc8cb226342f6b098bb1fafb48c7547265a10ad3e6e83899abc46f";
+
+            erlangDeps = [ gproc_0_3_1 ];
+
+            meta = {
+              description = "Erlang Connection Pool";
+              license = stdenv.lib.licenses.free;
+            };
+          }
+      ) {};
+
+    episcina = episcina_1_1_0;
+
+    eql_0_1_2 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "eql";
+            version = "0.1.2";
+            sha256 =
+              "3b1a85c491d44262802058c0de97a2c90678d5d45851b88a076b1a45a8d6d4b3";
+
+            meta = {
+              description = "Erlang with SQL";
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/artemeff/eql";
+            };
+          }
+      ) {};
+
+    eql = eql_0_1_2;
+
+    eredis_1_0_8 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "eredis";
+            version = "1.0.8";
+            sha256 =
+              "f303533e72129b264a2d8217c4ddc977c7527ff4b8a6a55f92f62b7fcc099334";
+
+            meta = {
+              description = "Erlang Redis client";
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/wooga/eredis";
+            };
+          }
+      ) {};
+
+    eredis = eredis_1_0_8;
+
+    erlang_lua_0_1_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "erlang_lua";
+            version = "0.1.0";
+            sha256 =
+              "4376a57f86e43ae1d687dca8b6c7c7f692b95d30091a9550636328358026e6eb";
+            compilePort = true;
+
+            meta = {
+              longDescription = ''Erlang-lua hex package, using Erlang's Port
+                                and C Node to run Lua VM as an external Node'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/rtraschke/erlang-lua";
+            };
+          }
+      ) {};
+
+    erlang_lua = erlang_lua_0_1_0;
+
+    erlang_term_1_4_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "erlang_term";
+            version = "1.4.0";
+            sha256 =
+              "1a4d491dbd13b7a714815af10fc658948a5a440de23755a32b741ca07d8ba592";
+
+            meta = {
+              description = "Provide the in-memory size of Erlang terms";
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/okeuday/erlang_term";
+            };
+          }
+      ) {};
+
+    erlang_term_1_5_1 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "erlang_term";
+            version = "1.5.1";
+            sha256 =
+              "88bae81a80306e82fd3fc43e2d8228049e666f3cfe4627687832cd7edb878e06";
+
+            meta = {
+              description = "Provide the in-memory size of Erlang terms";
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/okeuday/erlang_term";
+            };
+          }
+      ) {};
+
+    erlang_term = erlang_term_1_5_1;
+
+    erlang_version_0_2_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "erlang_version";
+            version = "0.2.0";
+            sha256 =
+              "74daddba65a247ec57913e5de8f243af42bbbc3d6a0c411a1252da81c09ae661";
+
+            meta = {
+              description = "Retrieve Erlang/OTP version like `18.1'";
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/sapporo-beam/erlang_version";
+            };
+          }
+      ) {};
+
+    erlang_version = erlang_version_0_2_0;
+
+    erlaudio_0_2_3 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "erlaudio";
+            version = "0.2.3";
+            sha256 =
+              "cb9efb0ce80faae003ab39f8cc2d3fccbb4bd1c8f5f525aea392f28662517032";
+            compilePort = true;
+
+            meta = {
+              description = "Erlang audio bindings to portaudio";
+              license = stdenv.lib.licenses.apsl20;
+              homepage = "https://github.com/asonge/erlaudio";
+            };
+          }
+      ) {};
+
+    erlaudio = erlaudio_0_2_3;
+
+    erlcloud_0_11_0 = callPackage
+      (
+        {  buildHex, jsx_2_6_2, lhttpc_1_3_0, meck_0_8_3 }:
+          buildHex {
+            name = "erlcloud";
+            version = "0.11.0";
+            sha256 =
+              "ca9876dab57ed8fb5fb75ab6ce11e59a346387d357d7a038a2e18d1d31a30716";
+
+            erlangDeps = [ jsx_2_6_2 lhttpc_1_3_0 meck_0_8_3 ];
+
+            meta = {
+              description = "Cloud Computing library for erlang";
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/gleber/erlcloud";
+            };
+          }
+      ) {};
+
+    erlcloud_0_12_0 = callPackage
+      (
+        {  buildHex, jsx_2_7_2, lhttpc_1_3_0, meck_0_8_3 }:
+          buildHex {
+            name = "erlcloud";
+            version = "0.12.0";
+            sha256 =
+              "2ff2631a4e405a645cedf2713ec66728023e93ac80ed47035554a7d6205d412d";
+
+            erlangDeps = [ jsx_2_7_2 lhttpc_1_3_0 meck_0_8_3 ];
+
+            meta = {
+              description = "Cloud Computing library for erlang";
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/gleber/erlcloud";
+            };
+          }
+      ) {};
+
+    erlcloud = erlcloud_0_12_0;
+
+    erldn_1_0_2 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "erldn";
+            version = "1.0.2";
+            sha256 =
+              "51a721f1aac9c5fcc6abb0fa156a97ac8e033ee7cbee1624345ec6e47dfe0aa0";
+
+            meta = {
+              description = "An edn parser for the Erlang platform.
+";
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/marianoguerra/erldn";
+            };
+          }
+      ) {};
+
+    erldn = erldn_1_0_2;
+
+    erlexec_1_0_1 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "erlexec";
+            version = "1.0.1";
+            sha256 =
+              "eb1e11f16288db4ea35af08503eabf1250d5540c1e8bd35ba04312f5f703e14f";
+            compilePort = true;
+
+            meta = {
+              description = "OS Process Manager";
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/saleyn/erlexec";
+            };
+          }
+      ) {};
+
+    erlexec = erlexec_1_0_1;
+
+    erlsh_0_1_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "erlsh";
+            version = "0.1.0";
+            sha256 =
+              "94ef1492dd59fef211f01ffd40c47b6e51c0f59e2a3d0739366e4890961332d9";
+            compilePort = true;
+
+            meta = {
+              longDescription = ''Family of functions and ports involving
+                                interacting with the system shell, paths and
+                                external programs.'';
+              license = stdenv.lib.licenses.free;
+            };
+          }
+      ) {};
+
+    erlsh = erlsh_0_1_0;
+
+    erlsom_1_2_1 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "erlsom";
+            version = "1.2.1";
+            sha256 =
+              "e8f4d1d83583df7d1db8346aa30b82a6599b93fcc4b2d9165007e02ed40e7cae";
+
+            meta = {
+              description = "erlsom XSD parser";
+              license = stdenv.lib.licenses.free;
+            };
+          }
+      ) {};
+
+    erlsom = erlsom_1_2_1;
+
+    erlware_commons_0_18_0 = callPackage
+      (
+        {  buildHex, cf_0_2_1 }:
+          buildHex {
+            name = "erlware_commons";
+            version = "0.18.0";
+            sha256 =
+              "e71dda7cd5dcf34c9d07255d49c67e1d229dd230c101fdb996820bcdb5b03c49";
+
+            erlangDeps = [ cf_0_2_1 ];
+
+            meta = {
+              description = "Additional standard library for Erlang";
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/erlware/erlware_commons";
+            };
+          }
+      ) {};
+
+    erlware_commons = erlware_commons_0_18_0;
+
+    erlzk_0_6_1 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "erlzk";
+            version = "0.6.1";
+            sha256 =
+              "6bba045ad0b7beb566825b463ada2464929655ce01e291022c1efed81a674759";
+
+            meta = {
+              description = "A Pure Erlang ZooKeeper Client (no C dependency)";
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/huaban/erlzk";
+            };
+          }
+      ) {};
+
+    erlzk = erlzk_0_6_1;
+
+    esel_0_1_2 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "esel";
+            version = "0.1.2";
+            sha256 =
+              "874d1775c86d27d9e88486a37351ffc09f826ef062c8ea211e65d08e103f946c";
+
+            meta = {
+              description = "An wrapper around openssl";
+              license = stdenv.lib.licenses.mit;
+            };
+          }
+      ) {};
+
+    esel = esel_0_1_2;
+
+    esqlite_0_2_1 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "esqlite";
+            version = "0.2.1";
+            sha256 =
+              "79f2d1d05e6e29e50228af794dac8900ce47dd60bc11fbf1279f924f83752689";
+            compilePort = true;
+
+            meta = {
+              description = "A Sqlite3 NIF";
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/mmzeeman/esqlite";
+            };
+          }
+      ) {};
+
+    esqlite = esqlite_0_2_1;
+
+    eunit_formatters_0_3_1 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "eunit_formatters";
+            version = "0.3.1";
+            sha256 =
+              "64a40741429b7aff149c605d5a6135a48046af394a7282074e6003b3b56ae931";
+
+            meta = {
+              description = "Better output for eunit suites";
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/seancribbs/eunit_formatters";
+            };
+          }
+      ) {};
+
+    eunit_formatters = eunit_formatters_0_3_1;
+
+    ex_bitcask_0_1_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "ex_bitcask";
+            version = "0.1.0";
+            sha256 =
+              "dc771229aae3c07c31a5523303f0c4dbe3c700d5025a09dfcca9cc357222c463";
+            compilePort = true;
+
+            meta = {
+              longDescription = ''Elixir wrapper of Basho's Bitcask Key/Value
+                                store. Bitcask as a Log-Structured Hash Table
+                                for Fast Key/Value Data. '';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/JonGretar/ExBitcask";
+            };
+          }
+      ) {};
+
+    ex_bitcask = ex_bitcask_0_1_0;
+
+    exec_1_0_1 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "exec";
+            version = "1.0.1";
+            sha256 =
+              "87c7ef2dea2bb503bb0eec8cb34776172999aecc6e12d90f7629796a7a3ccb1f";
+            compilePort = true;
+
+            meta = {
+              description = "OS Process Manager";
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/saleyn/erlexec";
+            };
+          }
+      ) {};
+
+    exec = exec_1_0_1;
+
+    exmerl_0_1_1 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "exmerl";
+            version = "0.1.1";
+            sha256 =
+              "4bb5d6c1863c5e381b460416c9b517a211db9abd9abf0f32c99b07e128b842aa";
+
+            meta = {
+              description =
+                "An Elixir wrapper for parsing XML through the xmerl_* suite of modules
+";
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/pwoolcoc/exmerl";
+            };
+          }
+      ) {};
+
+    exmerl = exmerl_0_1_1;
+
+    fast_xml_1_1_2 = callPackage
+      (
+        {  buildHex, p1_utils_1_0_1 }:
+          buildHex {
+            name = "fast_xml";
+            version = "1.1.2";
+            sha256 =
+              "becac16805254bc8399558f0eb5d3ed733a1e3c0c511d9c7e95244f43626f9bf";
+            compilePort = true;
+            erlangDeps = [ p1_utils_1_0_1 ];
+
+            meta = {
+              description = "Fast Expat based Erlang XML parsing library";
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/processone/fast_xml";
+            };
+          }
+      ) {};
+
+    fast_xml = fast_xml_1_1_2;
+
+    feeder_2_0_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "feeder";
+            version = "2.0.0";
+            sha256 =
+              "9780c5f032d3480cf7d9fd71d3f0c5f73211e0d3a8d9cdabcb1327b3a4ff758e";
+
+            meta = {
+              description = "Stream parse RSS and Atom formatted XML feeds.
+";
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/michaelnisi/feeder";
+            };
+          }
+      ) {};
+
+    feeder = feeder_2_0_0;
+
+    fn_1_0_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "fn";
+            version = "1.0.0";
+            sha256 =
+              "1433b353c8739bb28ac0d6826c9f6a05033f158e8c8195faf01a863668b3bbc7";
+
+            meta = {
+              description = "More functional Erlang";
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/artemeff/fn";
+            };
+          }
+      ) {};
+
+    fn = fn_1_0_0;
+
+    folsom_0_8_3 = callPackage
+      (
+        {  buildHex, bear_0_8_3 }:
+          buildHex {
+            name = "folsom";
+            version = "0.8.3";
+            sha256 =
+              "afaa1ea4cd2a10a32242ac5d76fa7b17e98d202883859136b791d9a383b26820";
+
+            erlangDeps = [ bear_0_8_3 ];
+
+            meta = {
+              description = "Erlang based metrics system";
+              license = stdenv.lib.licenses.free;
+            };
+          }
+      ) {};
+
+    folsom = folsom_0_8_3;
+
+    folsomite_1_2_8 = callPackage
+      (
+        {  buildHex, folsom_0_8_3 }:
+          buildHex {
+            name = "folsomite";
+            version = "1.2.8";
+            sha256 =
+              "9ce64603cdffb8ad55e950142146b3fe05533020906a81aa9c2f524635d813dc";
+
+            erlangDeps = [ folsom_0_8_3 ];
+
+            meta = {
+              description = "Blow up your Graphite server with Folsom metrics";
+              license = stdenv.lib.licenses.free;
+            };
+          }
+      ) {};
+
+    folsomite = folsomite_1_2_8;
+
+    fs_0_9_2 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "fs";
+            version = "0.9.2";
+            sha256 =
+              "9a00246e8af58cdf465ae7c48fd6fd7ba2e43300413dfcc25447ecd3bf76f0c1";
+            compilePort = true;
+
+            meta = {
+              description = "Erlang FileSystem Listener";
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/synrc/fs";
+            };
+          }
+      ) {};
+
+    fs = fs_0_9_2;
+
+    fuse_2_0_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "fuse";
+            version = "2.0.0";
+            sha256 =
+              "e2c55c0629ce418974165a65b342e54527333303d7e9c1f0493679144c9698cb";
+
+            meta = {
+              description = "A Circuit breaker implementation for Erlang";
+              license = stdenv.lib.licenses.free;
+            };
+          }
+      ) {};
+
+    fuse = fuse_2_0_0;
+
+    gen_listener_tcp_0_3_2 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "gen_listener_tcp";
+            version = "0.3.2";
+            sha256 =
+              "b3c3fbc525ba2b32d947b06811d38470d5b0abe2ca81b623192a71539ed22336";
+
+            meta = {
+              description = "Generic TCP Server";
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/travelping/gen_listener_tcp";
+            };
+          }
+      ) {};
+
+    gen_listener_tcp = gen_listener_tcp_0_3_2;
+
+    gen_smtp_0_9_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "gen_smtp";
+            version = "0.9.0";
+            sha256 =
+              "5a05f23a7cbe0c6242d290b445c6bbc0c287e3d0e09d3fcdc6bcd2c8973b6688";
+
+            meta = {
+              longDescription = ''A generic Erlang SMTP server framework that
+                                can be extended via callback modules in the OTP
+                                style. '';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/Vagabond/gen_smtp";
+            };
+          }
+      ) {};
+
+    gen_smtp = gen_smtp_0_9_0;
+
+    getopt_0_8_2 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "getopt";
+            version = "0.8.2";
+            sha256 =
+              "736e6db3679fbbad46373efb96b69509f8e420281635e9d92989af9f0a0483f7";
+
+            meta = {
+              description = "Command-line options parser for Erlang";
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/jcomellas/getopt";
+            };
+          }
+      ) {};
+
+    getopt = getopt_0_8_2;
+
+    goldrush_0_1_7 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "goldrush";
+            version = "0.1.7";
+            sha256 =
+              "a94a74cd363ce5f4970ed8242c551ec62b71939db1bbfd2e030142cab25a4ffe";
+
+            meta = {
+              description =
+                "Small, Fast event processing and monitoring for Erlang/OTP applications.
+";
+              license = stdenv.lib.licenses.isc;
+              homepage = "https://github.com/DeadZen/goldrush";
+            };
+          }
+      ) {};
+
+    goldrush = goldrush_0_1_7;
+
+    gproc_0_3_1 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "gproc";
+            version = "0.3.1";
+            sha256 =
+              "3c449925a5cbf57cc40d13c6c282bc1080b5ed3bad97e1acdbe969fd63a65fce";
+
+            meta = {
+              longDescription = ''Gproc is a process dictionary for Erlang,
+                                which provides a number of useful features
+                                beyond what the built-in dictionary has: * Use
+                                any term as a process alias * Register a process
+                                under several aliases * Non-unique properties
+                                can be registered simultaneously by many
+                                processes * QLC and match specification
+                                interface for efficient queries on the
+                                dictionary * Await registration, let's you wait
+                                until a process registers itself * Atomically
+                                give away registered names and properties to
+                                another process * Counters, and aggregated
+                                counters, which automatically maintain the total
+                                of all counters with a given name * Global
+                                registry, with all the above functions applied
+                                to a network of nodes'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/uwiger/gproc";
+            };
+          }
+      ) {};
+
+    gproc_0_5_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "gproc";
+            version = "0.5.0";
+            sha256 =
+              "5bc0fa4e999a6665b92ce57a7f12d7e9d1c26bfc39b0f657994be05cd3818b18";
+
+            meta = {
+              longDescription = ''Gproc is a process dictionary for Erlang,
+                                which provides a number of useful features
+                                beyond what the built-in dictionary has: * Use
+                                any term as a process alias * Register a process
+                                under several aliases * Non-unique properties
+                                can be registered simultaneously by many
+                                processes * QLC and match specification
+                                interface for efficient queries on the
+                                dictionary * Await registration, let's you wait
+                                until a process registers itself * Atomically
+                                give away registered names and properties to
+                                another process * Counters, and aggregated
+                                counters, which automatically maintain the total
+                                of all counters with a given name * Global
+                                registry, with all the above functions applied
+                                to a network of nodes'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/uwiger/gproc";
+            };
+          }
+      ) {};
+
+    gproc = gproc_0_5_0;
+
+    gurka_0_1_7 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "gurka";
+            version = "0.1.7";
+            sha256 =
+              "b46c96446f46a53411a3b45d126ec19e724178818206ca1d2dd16abff28df6b5";
+
+            meta = {
+              description = "Erlang implementation of Cucumber";
+              license = stdenv.lib.licenses.mit;
+            };
+          }
+      ) {};
+
+    gurka = gurka_0_1_7;
+
+    hackney_1_4_4 = callPackage
+      (
+        {
+          buildHex,
+          certifi_0_1_1,
+          idna_1_0_2,
+          mimerl_1_0_0,
+          ssl_verify_hostname_1_0_5
+        }:
+          buildHex {
+            name = "hackney";
+            version = "1.4.4";
+            sha256 =
+              "c8ab2436556d6bce7e85a85adec67f6abeb8c7508668a3e29750be3c4bf4e3a8";
+
+            erlangDeps = [
+                           certifi_0_1_1
+                           idna_1_0_2
+                           mimerl_1_0_0
+                           ssl_verify_hostname_1_0_5
+                         ];
+
+            meta = {
+              description = "simple HTTP client";
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/benoitc/hackney";
+            };
+          }
+      ) {};
+
+    hamcrest_0_1_1 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "hamcrest";
+            version = "0.1.1";
+            sha256 =
+              "5207b83e8d3168b9cbbeb3b4c4d83817a38a05f55478510e9c4db83ef83fa0ca";
+
+            meta = {
+              description = "Erlang port of Hamcrest";
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/hyperthunk/hamcrest-erlang";
+            };
+          }
+      ) {};
+
+    hamcrest = hamcrest_0_1_1;
+
+    hlc_2_0_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "hlc";
+            version = "2.0.0";
+            sha256 =
+              "460ac04654e920e068d1fd17aec1f78b1879cc42ac7f3def7497f0d1cc5056ad";
+
+            meta = {
+              description = "hybrid logical clock";
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/barrel-db/hlc";
+            };
+          }
+      ) {};
+
+    hlc = hlc_2_0_0;
+
+    hooks_1_1_1 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "hooks";
+            version = "1.1.1";
+            sha256 =
+              "6834ad3a2a624a5ffd49e9cb146ff49ded423b67f31905b122d24128c72c5c85";
+
+            meta = {
+              description = "generic plugin & hook system";
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/barrel-db/hooks";
+            };
+          }
+      ) {};
+
+    hooks = hooks_1_1_1;
+
+    http_signature_1_1_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "http_signature";
+            version = "1.1.0";
+            sha256 =
+              "3e6036d9c29289ed0e35dd6f41821dec9061ce20aad3c4d35dcbae8c84eb3baa";
+
+            meta = {
+              description =
+                "Erlang and Elixir implementations of Joyent's HTTP Signature Scheme.";
+              license = stdenv.lib.licenses.free;
+              homepage =
+                "https://github.com/potatosalad/erlang-http_signature";
+            };
+          }
+      ) {};
+
+    http_signature = http_signature_1_1_0;
+
+    ibrowse_4_2_2 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "ibrowse";
+            version = "4.2.2";
+            sha256 =
+              "b800cb7442bcc852c6832821e9d0a7098ff626e1415bddaeff4596640b31c0ae";
+
+            meta = {
+              description = "Erlang HTTP client application";
+              license = with stdenv.lib.licenses; [ free bsd3 ];
+              homepage = "https://github.com/cmullaparthi/ibrowse";
+            };
+          }
+      ) {};
+
+    ibrowse = ibrowse_4_2_2;
+
+    idna_1_0_2 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "idna";
+            version = "1.0.2";
+            sha256 =
+              "a5d645e307aa4f67efe31682f720b7eaf431ab148b3d6fb66cbaf6314499610f";
+
+            meta = {
+              description = "A pure Erlang IDNA implementation";
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/benoitc/erlang-idna";
+            };
+          }
+      ) {};
+
+    idna_1_0_3 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "idna";
+            version = "1.0.3";
+            sha256 =
+              "357d489a51112db4f216034406834f9172b3c0ff5a12f83fb28b25ca271541d1";
+
+            meta = {
+              description = "A pure Erlang IDNA implementation";
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/benoitc/erlang-idna";
+            };
+          }
+      ) {};
+
+    idna = idna_1_0_3;
+
+    inaka_aleppo_0_9_5 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "inaka_aleppo";
+            version = "0.9.5";
+            sha256 =
+              "58e65aa708a0aae828ad8072f521edca8ce19fc3373223180a348a27a3722eb4";
+
+            meta = {
+              description = "Aleppo: ALternative Erlang Pre-ProcessOr";
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/inaka/aleppo";
+            };
+          }
+      ) {};
+
+    inaka_aleppo = inaka_aleppo_0_9_5;
+
+    inaka_mixer_0_1_5 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "inaka_mixer";
+            version = "0.1.5";
+            sha256 =
+              "37af35b1c17a94a0cb643cba23cba2ca68d6fe51c3ad8337629d4c3c017cc912";
+
+            meta = {
+              description = "Mix in public functions from external modules";
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/inaka/mixer";
+            };
+          }
+      ) {};
+
+    inaka_mixer = inaka_mixer_0_1_5;
+
+    jc_1_0_4 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "jc";
+            version = "1.0.4";
+            sha256 =
+              "8bcfe202084109fc80fcf521e630466fc53cbb909aff4283bed43252664023df";
+
+            meta = {
+              description = "A simple, distributed, in-memory caching system";
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jr0senblum/jc";
+            };
+          }
+      ) {};
+
+    jc = jc_1_0_4;
+
+    jsone_1_2_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "jsone";
+            version = "1.2.0";
+            sha256 =
+              "a60e74284d3a923cde65c00a39dd4542fd7da7c22e8385c0378ad419c54b2e08";
+
+            meta = {
+              description = "Erlang JSON Library";
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/sile/jsone";
+            };
+          }
+      ) {};
+
+    jsone = jsone_1_2_0;
+
+    jsx_1_4_5 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "jsx";
+            version = "1.4.5";
+            sha256 =
+              "ff5115611c5dd789cebe3addc07d18b86340f701c52ad063caba6fe8da3a489b";
+
+            meta = {
+              longDescription = ''an erlang application for consuming,
+                                producing and manipulating json. inspired by
+                                yajl'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/talentdeficit/jsx";
+            };
+          }
+      ) {};
+
+    jsx_2_2_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "jsx";
+            version = "2.2.0";
+            sha256 =
+              "d0bbc1ef47fd2fed84e28faed66918cf9eceed03b7ded48a23076e716fdbc84f";
+
+            meta = {
+              longDescription = ''an erlang application for consuming,
+                                producing and manipulating json. inspired by
+                                yajl'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/talentdeficit/jsx";
+            };
+          }
+      ) {};
+
+    jsx_2_6_2 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "jsx";
+            version = "2.6.2";
+            sha256 =
+              "6bfccb6461cc3c7d5cc63f3e69ffeb2f1f8de50eca5980065311c056a69a907f";
+
+            meta = {
+              longDescription = ''an erlang application for consuming,
+                                producing and manipulating json. inspired by
+                                yajl'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/talentdeficit/jsx";
+            };
+          }
+      ) {};
+
+    jsx_2_7_1 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "jsx";
+            version = "2.7.1";
+            sha256 =
+              "52d0e8bda0c8624bc59c3119236eb49bb66289702ea3d59ad76fd2a56cdf9089";
+
+            meta = {
+              longDescription = ''an erlang application for consuming,
+                                producing and manipulating json. inspired by
+                                yajl'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/talentdeficit/jsx";
+            };
+          }
+      ) {};
+
+    jsx_2_7_2 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "jsx";
+            version = "2.7.2";
+            sha256 =
+              "36ca4772c09d69efc9e069aec7327cbd57d53d56c9a2777d8fb3bf3c1eab6df3";
+
+            meta = {
+              longDescription = ''an erlang application for consuming,
+                                producing and manipulating json. inspired by
+                                yajl'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/talentdeficit/jsx";
+            };
+          }
+      ) {};
+
+    jsx_2_8_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "jsx";
+            version = "2.8.0";
+            sha256 =
+              "a8ba15d5bac2c48b2be1224a0542ad794538d79e2cc16841a4e24ca75f0f8378";
+
+            meta = {
+              longDescription = ''an erlang application for consuming,
+                                producing and manipulating json. inspired by
+                                yajl'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/talentdeficit/jsx";
+            };
+          }
+      ) {};
+
+    jsx = jsx_2_8_0;
+
+    jsxd_0_1_10 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "jsxd";
+            version = "0.1.10";
+            sha256 =
+              "f71a8238f08a1dee130e8959ff5343524891fa6531392667a5b911cead5f5082";
+
+            meta = {
+              description =
+                "jsx data structire traversing and modification library.";
+              license = stdenv.lib.licenses.cddl;
+              homepage = "https://github.com/Licenser/jsxd";
+            };
+          }
+      ) {};
+
+    jsxd = jsxd_0_1_10;
+
+    jwalk_1_1_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "jwalk";
+            version = "1.1.0";
+            sha256 =
+              "10c150910ba3539583887cb2b5c3f70d602138471e6f6b5c22498aa18ed654e1";
+
+            meta = {
+              longDescription = ''Helper module for working with Erlang
+                                proplist, map, EEP-18 and mochijson-style
+                                representations of JSON'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/jr0senblum/jwalk";
+            };
+          }
+      ) {};
+
+    jwalk = jwalk_1_1_0;
+
+    jwt_0_1_1 = callPackage
+      (
+        {  buildHex, base64url_0_0_1, jsx_2_8_0 }:
+          buildHex {
+            name = "jwt";
+            version = "0.1.1";
+            sha256 =
+              "abcff4a2a42af2b7b7bdf55eeb2b73ce2e3bef760750004e74bc5835d64d2188";
+
+            erlangDeps = [ base64url_0_0_1 jsx_2_8_0 ];
+
+            meta = {
+              description = "Erlang JWT library";
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/artemeff/jwt";
+            };
+          }
+      ) {};
+
+    jwt = jwt_0_1_1;
+
+    key2value_1_4_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "key2value";
+            version = "1.4.0";
+            sha256 =
+              "ad63453fcf54ab853581b78c6d2df56be41ea691ba4bc05920264c19f35a0ded";
+
+            meta = {
+              description = "Erlang 2-way Map";
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/okeuday/key2value";
+            };
+          }
+      ) {};
+
+    key2value_1_5_1 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "key2value";
+            version = "1.5.1";
+            sha256 =
+              "2a40464b9f8ef62e8828d869ac8d2bf9135b4956d29ba4eb044e8522b2d35ffa";
+
+            meta = {
+              description = "Erlang 2-way Map";
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/okeuday/key2value";
+            };
+          }
+      ) {};
+
+    key2value = key2value_1_5_1;
+
+    keys1value_1_5_1 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "keys1value";
+            version = "1.5.1";
+            sha256 =
+              "2385132be0903c170fe21e54a0c3e746a604777b66ee458bb6e5f25650d3354f";
+
+            meta = {
+              description = "Erlang Set Associative Map For Key Lists";
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/okeuday/keys1value";
+            };
+          }
+      ) {};
+
+    keys1value = keys1value_1_5_1;
+
+    lager_3_0_1 = callPackage
+      (
+        {  buildHex, goldrush_0_1_7 }:
+          buildHex {
+            name = "lager";
+            version = "3.0.1";
+            sha256 =
+              "d32c9233105b72dc5c1f6a8fe9a33cc205ecccc359c4449950060cee5a329e35";
+
+            erlangDeps = [ goldrush_0_1_7 ];
+
+            meta = {
+              description = "Erlang logging framework";
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/basho/lager";
+            };
+          }
+      ) {};
+
+    lager_3_0_2 = callPackage
+      (
+        {  buildHex, goldrush_0_1_7 }:
+          buildHex {
+            name = "lager";
+            version = "3.0.2";
+            sha256 =
+              "527f3b233e01b6cb68780c14ef675ed08ec02247dc029cacecbb56c78dfca100";
+
+            erlangDeps = [ goldrush_0_1_7 ];
+
+            meta = {
+              description = "Erlang logging framework";
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/basho/lager";
+            };
+          }
+      ) {};
+
+    lager = lager_3_0_2;
+
+
+    lhttpc_1_3_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "lhttpc";
+            version = "1.3.0";
+            sha256 =
+              "ddd2bd4b85159bc987c954b14877168e6a3c3e516105702189776e97c50296a4";
+
+            meta = {
+              description = "Lightweight HTTP/1.1 client";
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/talko/lhttpc";
+            };
+          }
+      ) {};
+
+    lhttpc = lhttpc_1_3_0;
+
+    libsnarlmatch_0_1_7 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "libsnarlmatch";
+            version = "0.1.7";
+            sha256 =
+              "72e9bcf7968e75774393778146ac6596116f1c60136dd607ad249183684ee380";
+
+            meta = {
+              description = "permission matcher library";
+              license = stdenv.lib.licenses.cddl;
+              homepage = "https://github.com/project-fifo/libsnarlmatch";
+            };
+          }
+      ) {};
+
+    libsnarlmatch = libsnarlmatch_0_1_7;
+
+    lru_1_3_1 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "lru";
+            version = "1.3.1";
+            sha256 =
+              "cd6ac15c383d58cd2933df9cb918617b24b12b6e5fb24d94c4c8f200fd93f619";
+
+            meta = {
+              description = "implements a fixed-size LRU cache";
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/barrel-db/erlang-lru";
+            };
+          }
+      ) {};
+
+    lru = lru_1_3_1;
+
+    lz4_0_2_2 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "lz4";
+            version = "0.2.2";
+            sha256 =
+              "a59522221e7cdfe3792bf8b3bb21cfe7ac657790e5826201fa2c5d0bc7484a2d";
+            compilePort = true;
+
+            meta = {
+              description = "LZ4 bindings for Erlang";
+              license = stdenv.lib.licenses.isc;
+              homepage = "https://github.com/szktty/erlang-lz4.git";
+            };
+          }
+      ) {};
+
+    lz4 = lz4_0_2_2;
+
+    mcrypt_0_1_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "mcrypt";
+            version = "0.1.0";
+            sha256 =
+              "508a35ba255190f80309dcabf9c81c88b86b9ec13af180627ad51b8e5cf2a4cd";
+            compilePort = true;
+
+            meta = {
+              description = "NIF wrapper around libmcrypt.";
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/system76/elixir-mcrypt";
+            };
+          }
+      ) {};
+
+    mcrypt = mcrypt_0_1_0;
+
+    mdns_server_0_2_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "mdns_server";
+            version = "0.2.0";
+            sha256 =
+              "bc9465880e15e57033960ab6820258b87134bef69032210c67e53e3718e289d0";
+
+            meta = {
+              description = "mDNS service discovery server";
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/Licenser/erlang-mdns-server";
+            };
+          }
+      ) {};
+
+    mdns_server = mdns_server_0_2_0;
+
+    mdns_server_lib_0_2_3 = callPackage
+      (
+        {  buildHex, lager_3_0_2, mdns_server_0_2_0, ranch_1_1_0 }:
+          buildHex {
+            name = "mdns_server_lib";
+            version = "0.2.3";
+            sha256 =
+              "078775ccea5d768095716ca6bd82f657601203352495d9726f4cc080c8c07695";
+
+            erlangDeps = [ lager_3_0_2 mdns_server_0_2_0 ranch_1_1_0 ];
+
+            meta = {
+              description =
+                "server side for mdns client server implementation";
+              license = stdenv.lib.licenses.cddl;
+              homepage = "https://github.com/Licenser/mdns_server_lib";
+            };
+          }
+      ) {};
+
+    mdns_server_lib = mdns_server_lib_0_2_3;
+
+    meck_0_8_3 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "meck";
+            version = "0.8.3";
+            sha256 =
+              "53bd3873d0193d6b2b4a165cfc4b9ffc3934355c3ba19e88239ef6a027cc02b6";
+
+            meta = {
+              description = "A mocking framework for Erlang";
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/eproxus/meck";
+            };
+          }
+      ) {};
+
+    meck_0_8_4 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "meck";
+            version = "0.8.4";
+            sha256 =
+              "2cdfbd0edd8f62b3d2061efc03c0e490282dd2ea6de44e15d2006e83f4f8eead";
+
+            meta = {
+              description = "A mocking framework for Erlang";
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/eproxus/meck";
+            };
+          }
+      ) {};
+
+    meck = meck_0_8_4;
+
+    metrics_0_2_1 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "metrics";
+            version = "0.2.1";
+            sha256 =
+              "1cccc3534fa5a7861a3dcc0414afba00a616937e82c95d6172a523a5d2e97c03";
+
+            meta = {
+              description =
+                "A generic interface to different metrics systems in Erlang.";
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/benoitc/erlang-metrics";
+            };
+          }
+      ) {};
+
+    metrics = metrics_0_2_1;
+
+    mimerl_1_0_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "mimerl";
+            version = "1.0.0";
+            sha256 =
+              "a30b01104a29bd3a363db8646e4ce0f7980f9ecd23a98707c46c3ced918c41b4";
+
+            meta = {
+              description = "Library to handle mimetypes";
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/benoitc/mimerl";
+            };
+          }
+      ) {};
+
+    mimerl_1_0_2 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "mimerl";
+            version = "1.0.2";
+            sha256 =
+              "7a4c8e1115a2732a67d7624e28cf6c9f30c66711a9e92928e745c255887ba465";
+
+            meta = {
+              description = "Library to handle mimetypes";
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/benoitc/mimerl";
+            };
+          }
+      ) {};
+
+    mimerl_1_1_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "mimerl";
+            version = "1.1.0";
+            sha256 =
+              "def0f1922a5dcdeeee6e4f41139b364e7f0f40239774b528a0986b12bcb42ddc";
+
+            meta = {
+              description = "Library to handle mimetypes";
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/benoitc/mimerl";
+            };
+          }
+      ) {};
+
+    mimerl = mimerl_1_1_0;
+
+    mochiweb_2_12_2 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "mochiweb";
+            version = "2.12.2";
+            sha256 =
+              "d3e681d4054b74a96cf2efcd09e94157ab83a5f55ddc4ce69f90b8144673bd7a";
+
+            meta = {
+              description =
+                "MochiWeb is an Erlang library for building lightweight HTTP servers.
+";
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/mochi/mochiweb";
+            };
+          }
+      ) {};
+
+    mochiweb = mochiweb_2_12_2;
+
+    mtx_1_0_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "mtx";
+            version = "1.0.0";
+            sha256 =
+              "3bdcb209fe3cdfc5a6b5b95f619ecd123b7ee1d9203ace2178c8ff73be5bb90f";
+
+            meta = {
+              description = "Metrics Client";
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/synrc/mtx";
+            };
+          }
+      ) {};
+
+    mtx = mtx_1_0_0;
+
+    nacl_0_3_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "nacl";
+            version = "0.3.0";
+            sha256 =
+              "83a626d0ddd17a9c9528aa57a79e0e19746a42def007bc48c4984f0905098a7b";
+            compilePort = true;
+
+            meta = {
+              description = "Erlang-NaCl hex package";
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/tonyg/erlang-nacl";
+            };
+          }
+      ) {};
+
+    nacl = nacl_0_3_0;
+
+    neotoma_1_7_3 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "neotoma";
+            version = "1.7.3";
+            sha256 =
+              "2da322b9b1567ffa0706a7f30f6bbbde70835ae44a1050615f4b4a3d436e0f28";
+
+            meta = {
+              description = "PEG/Packrat toolkit and parser-generator.";
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/seancribbs/neotoma";
+            };
+          }
+      ) {};
+
+    neotoma = neotoma_1_7_3;
+
+    observer_cli_1_0_3 = callPackage
+      (
+        {  buildHex, recon_2_2_1 }:
+          buildHex {
+            name = "observer_cli";
+            version = "1.0.3";
+            sha256 =
+              "18e5d9aa5412ec063cf9719bcfe73bf990c5fed5c9a3c8422c2b5d9529fc8b0d";
+
+            erlangDeps = [ recon_2_2_1 ];
+
+            meta = {
+              description = "Visualize Erlang Nodes On The Command Line";
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/zhongwencool/observer_cli";
+            };
+          }
+      ) {};
+
+    observer_cli = observer_cli_1_0_3;
+
+    p1_stringprep_1_0_0 = callPackage
+      (
+        {  buildHex, p1_utils_1_0_1 }:
+          buildHex {
+            name = "p1_stringprep";
+            version = "1.0.0";
+            sha256 =
+              "2a9ce90acb64089f0a34cc592690b398830a5b6fd3c8a84689af5d2feb85d876";
+            compilePort = true;
+            erlangDeps = [ p1_utils_1_0_1 ];
+
+            meta = {
+              description = "Fast Stringprep Erlang / Elixir implementation";
+              license = with stdenv.lib.licenses; [ asl20 free ];
+              homepage = "https://github.com/processone/stringprep";
+            };
+          }
+      ) {};
+
+    p1_stringprep = p1_stringprep_1_0_0;
+
+    p1_utils_1_0_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "p1_utils";
+            version = "1.0.0";
+            sha256 =
+              "b2c6316286b071f2f667fb1c59b44fe0c996917515fa93374a4a3264affc5105";
+
+            meta = {
+              description = "Erlang utility modules from ProcessOne";
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/processone/p1_utils";
+            };
+          }
+      ) {};
+
+    p1_utils_1_0_1 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "p1_utils";
+            version = "1.0.1";
+            sha256 =
+              "8e19478439c3ef05229fbd4fb65ff2e4aee02458a9c2b86a103a7f1384b76fdb";
+
+            meta = {
+              description = "Erlang utility modules from ProcessOne";
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/processone/p1_utils";
+            };
+          }
+      ) {};
+
+    p1_utils_1_0_2 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "p1_utils";
+            version = "1.0.2";
+            sha256 =
+              "c4b770fd925f2fc6c301a1e27f1bfb77aff3fff8d0951cc56c06bef9835af918";
+
+            meta = {
+              description = "Erlang utility modules from ProcessOne";
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/processone/p1_utils";
+            };
+          }
+      ) {};
+
+    p1_utils_1_0_3 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "p1_utils";
+            version = "1.0.3";
+            sha256 =
+              "6bf7dc7108eee70e036ea745faf5f55b4354e267f14371ea13338f58ce402d5e";
+
+            meta = {
+              description = "Erlang utility modules from ProcessOne";
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/processone/p1_utils";
+            };
+          }
+      ) {};
+
+    p1_utils = p1_utils_1_0_3;
+
+    p1_xml_1_1_1 = callPackage
+      (
+        {  buildHex, p1_utils_1_0_0 }:
+          buildHex {
+            name = "p1_xml";
+            version = "1.1.1";
+            sha256 =
+              "ab68956163cc5ff8c749c503507a36c543841259e78c58a2bbe0ebe76a0b7ce3";
+            compilePort = true;
+            erlangDeps = [ p1_utils_1_0_0 ];
+
+            meta = {
+              description =
+                "XML parsing library. Now obsolete. Use fast_xml instead";
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/processone/xml";
+            };
+          }
+      ) {};
+
+    p1_xml = p1_xml_1_1_1;
+
+    pc_1_2_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "pc";
+            version = "1.2.0";
+            sha256 =
+              "ef0f59d26a25af0a5247ef1a06d28d8300f8624647b02dc521ac79a7eceb8883";
+
+            meta = {
+              description = "a rebar3 port compiler for native code";
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/blt/port_compiler";
+            };
+          }
+      ) {};
+
+    pc = pc_1_2_0;
+
+    picosat_0_1_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "picosat";
+            version = "0.1.0";
+            sha256 =
+              "d9bfa31240906306a6dae6bdd6fb1cb452e9462a391efa63017b17b2877cab51";
+            compilePort = true;
+
+            meta = {
+              description = "Erlang bindings for PicoSAT";
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/tsloughter/picosat";
+            };
+          }
+      ) {};
+
+    picosat = picosat_0_1_0;
+
+    png_0_1_1 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "png";
+            version = "0.1.1";
+            sha256 =
+              "f8d4a17c118dcc16bb18d0fda6e26947001f9312bc6c061d2236b424fc3dd9ea";
+
+            meta = {
+              longDescription = ''A pure Erlang library for creating PNG
+                                images. It can currently create 8 and 16 bit
+                                RGB, RGB with alpha, indexed, grayscale and
+                                grayscale with alpha images.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/yuce/png";
+            };
+          }
+      ) {};
+
+    png = png_0_1_1;
+
+    poolboy_1_5_1 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "poolboy";
+            version = "1.5.1";
+            sha256 =
+              "8f7168911120e13419e086e78d20e4d1a6776f1eee2411ac9f790af10813389f";
+
+            meta = {
+              description = "A hunky Erlang worker pool factory";
+              license = with stdenv.lib.licenses; [ unlicense asl20 ];
+              homepage = "https://github.com/devinus/poolboy";
+            };
+          }
+      ) {};
+
+    poolboy = poolboy_1_5_1;
+
+    pooler_1_5_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "pooler";
+            version = "1.5.0";
+            sha256 =
+              "f493b4b947967fa4250dd1f96e86a5440ecab51da114d2c256cced58ad991908";
+
+            meta = {
+              description = "An OTP Process Pool Application";
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/seth/pooler";
+            };
+          }
+      ) {};
+
+    pooler = pooler_1_5_0;
+
+    pot_0_9_3 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "pot";
+            version = "0.9.3";
+            sha256 =
+              "752d2605c15605cd455cb3514b1ce329309eb61dfa88397dce49772dac9ad581";
+
+            meta = {
+              description = "One Time Passwords for Erlang";
+              license = stdenv.lib.licenses.free;
+            };
+          }
+      ) {};
+
+    pot = pot_0_9_3;
+
+    pqueue_1_5_1 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "pqueue";
+            version = "1.5.1";
+            sha256 =
+              "7ba01afe6b50ea4b239fa770f9e2c2db4871b3927ac44aea180d1fd52601b317";
+
+            meta = {
+              description = "Erlang Priority Queue Implementation";
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/okeuday/pqueue";
+            };
+          }
+      ) {};
+
+    pqueue = pqueue_1_5_1;
+
+    proper_1_1_1_beta = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "proper";
+            version = "1.1.1-beta";
+            sha256 =
+              "bde5c0fef0f8d804a7c06aab4f293d19f42149e5880b3412b75efa608e86d342";
+
+            meta = {
+              description =
+                "QuickCheck-inspired property-based testing tool for Erlang.";
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/manopapad/proper";
+            };
+          }
+      ) {};
+
+    proper = proper_1_1_1_beta;
+
+    providers_1_6_0 = callPackage
+      (
+        {  buildHex, getopt_0_8_2 }:
+          buildHex {
+            name = "providers";
+            version = "1.6.0";
+            sha256 =
+              "0f6876529a613d34224de8c61d3660388eb981142360f2699486d8536050ce2f";
+
+            erlangDeps = [ getopt_0_8_2 ];
+
+            meta = {
+              description = "Providers provider.";
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/tsloughter/providers";
+            };
+          }
+      ) {};
+
+    providers = providers_1_6_0;
+
+    quickrand_1_5_1 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "quickrand";
+            version = "1.5.1";
+            sha256 =
+              "0b3dcc6ddb23319c1f6a5ed143778864b8ad2f0ebd693a2d121cf5ae0c4db507";
+
+            meta = {
+              longDescription = ''Quick Random Number Generation: Provides a
+                                simple interface to call efficient random number
+                                generation functions based on the context.
+                                Proper random number seeding is enforced.'';
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/okeuday/quickrand";
+            };
+          }
+      ) {};
+
+    quickrand = quickrand_1_5_1;
+
+    quintana_0_2_0 = callPackage
+      (
+        {  buildHex, folsom_0_8_3 }:
+          buildHex {
+            name = "quintana";
+            version = "0.2.0";
+            sha256 =
+              "0646fe332ca3415ca6b0b273b4a5689ec902b9f9004ca62229ded00bd5f64cda";
+
+            erlangDeps = [ folsom_0_8_3 ];
+
+            meta = {
+              description = "Wrapper around some Folsom functions";
+              license = stdenv.lib.licenses.free;
+            };
+          }
+      ) {};
+
+    quintana_0_2_1 = callPackage
+      (
+        {  buildHex, folsom_0_8_3 }:
+          buildHex {
+            name = "quintana";
+            version = "0.2.1";
+            sha256 =
+              "d4683eb33c71f6cab3b17b896b4fa9180f17a0a8b086440bfe0c5675182f0194";
+
+            erlangDeps = [ folsom_0_8_3 ];
+
+            meta = {
+              description = "Wrapper around some Folsom functions";
+              license = stdenv.lib.licenses.free;
+            };
+          }
+      ) {};
+
+    quintana = quintana_0_2_1;
+
+    rabbit_common_3_5_6 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "rabbit_common";
+            version = "3.5.6";
+            sha256 =
+              "9335ab3ebc4e8e140d7bc9b1b0e7ee99c0aa87d0a746b704184121ba35c04f1c";
+
+            meta = {
+              longDescription = ''Includes modules which are a runtime
+                                dependency of the RabbitMQ/AMQP Erlang client
+                                and are common to the RabbitMQ server.'';
+              license = stdenv.lib.licenses.mpl11;
+              homepage = "https://github.com/jbrisbin/rabbit_common";
+            };
+          }
+      ) {};
+
+    rabbit_common = rabbit_common_3_5_6;
+
+    ranch_1_1_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "ranch";
+            version = "1.1.0";
+            sha256 =
+              "98ade939e63e6567da5dec5bc5bd93cbdc53d53f8b1aa998adec60dc4057f048";
+
+            meta = {
+              description = "Socket acceptor pool for TCP protocols.";
+              license = stdenv.lib.licenses.isc;
+              homepage = "https://github.com/ninenines/ranch";
+            };
+          }
+      ) {};
+
+    ranch_1_2_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "ranch";
+            version = "1.2.0";
+            sha256 =
+              "82bbb48cdad151000f7ad600d7a29afd972df409fde600bbc9b1ed4fdc08c399";
+
+            meta = {
+              description = "Socket acceptor pool for TCP protocols.";
+              license = stdenv.lib.licenses.isc;
+              homepage = "https://github.com/ninenines/ranch";
+            };
+          }
+      ) {};
+
+    ranch = ranch_1_2_0;
+
+    ratx_0_1_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "ratx";
+            version = "0.1.0";
+            sha256 =
+              "fbf933ff32fdc127200880f5b567820bf03504ade1bd697ffbc0535dbafc23d6";
+
+            meta = {
+              description =
+                "Rate limiter and overload protection for erlang and elixir applications.
+";
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/liveforeverx/ratx";
+            };
+          }
+      ) {};
+
+    ratx = ratx_0_1_0;
+
+    rebar3_asn1_compiler_1_0_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "rebar3_asn1_compiler";
+            version = "1.0.0";
+            sha256 =
+              "25ec1d5c97393195650ac8c7a06a267a886a1479950ee047c43b5228c07b30b9";
+
+            meta = {
+              description = "Compile ASN.1 modules with Rebar3";
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/pyykkis/rebar3_asn1_compiler";
+            };
+          }
+      ) {};
+
+    rebar3_asn1_compiler = rebar3_asn1_compiler_1_0_0;
+
+    rebar3_auto_0_3_0 = callPackage
+      (
+        {  buildHex, enotify_0_1_0 }:
+          buildHex {
+            name = "rebar3_auto";
+            version = "0.3.0";
+            sha256 =
+              "9fcca62411b0b7680426bd911002c0769690aef3838829583ffa4547fd5038b5";
+
+            erlangDeps = [ enotify_0_1_0 ];
+
+            meta = {
+              description = "Rebar3 plugin for auto compiling on changes";
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/tsloughter/rebar3_auto";
+            };
+          }
+      ) {};
+
+    rebar3_auto = rebar3_auto_0_3_0;
+
+    rebar3_diameter_compiler_0_3_1 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "rebar3_diameter_compiler";
+            version = "0.3.1";
+            sha256 =
+              "c5965e3810ccf9ef9ba9185a81fe569ef6e9f3a9e546e99c5e900736b0c39274";
+
+            meta = {
+              description = "Compile diameter .dia files";
+              license = stdenv.lib.licenses.mit;
+              homepage =
+                "https://github.com/carlosedp/rebar3_diameter_compiler";
+            };
+          }
+      ) {};
+
+    rebar3_diameter_compiler = rebar3_diameter_compiler_0_3_1;
+
+    rebar3_hex_1_12_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "rebar3_hex";
+            version = "1.12.0";
+            sha256 =
+              "45467e93ae8d776c6038fdaeaffbc55d8f2f097f300a54dab9b81c6d1cf21f73";
+
+            meta = {
+              description = "Hex.pm plugin for rebar3";
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/tsloughter/rebar3_hex";
+            };
+          }
+      ) {};
+
+    rebar3_hex = rebar3_hex_1_12_0;
+
+    rebar3_idl_compiler_0_3_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "rebar3_idl_compiler";
+            version = "0.3.0";
+            sha256 =
+              "31ba95205c40b990cb3c49abb397abc47b4d5f9c402db83f9daebbc44e69789d";
+
+            meta = {
+              description = "Rebar3 IDL Compiler";
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/sebastiw/rebar3_idl_compiler";
+            };
+          }
+      ) {};
+
+    rebar3_idl_compiler = rebar3_idl_compiler_0_3_0;
+
+    rebar3_live_0_1_3 = callPackage
+      (
+        {  buildHex, enotify_0_1_0 }:
+          buildHex {
+            name = "rebar3_live";
+            version = "0.1.3";
+            sha256 =
+              "d9ee2ff022fc73ac94f206c13ff8aa7591a536704f49c4cbacabf37d181a4391";
+
+            erlangDeps = [ enotify_0_1_0 ];
+
+            meta = {
+              description = "Rebar3 live plugin";
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/pvmart/rebar3_live";
+            };
+          }
+      ) {};
+
+    rebar3_live = rebar3_live_0_1_3;
+
+    rebar3_neotoma_plugin_0_2_0 = callPackage
+      (
+        {  buildHex, neotoma_1_7_3 }:
+          buildHex {
+            name = "rebar3_neotoma_plugin";
+            version = "0.2.0";
+            sha256 =
+              "c0ebbdb08c017cac90c7d3310a9bd4a5088a46abd4e2fef9e9a9805a657396b8";
+
+            erlangDeps = [ neotoma_1_7_3 ];
+
+            meta = {
+              description = "Neotoma rebar plugin";
+              license = stdenv.lib.licenses.free;
+              homepage =
+                "https://github.com/zamotivator/rebar3_neotoma_plugin";
+            };
+          }
+      ) {};
+
+    rebar3_neotoma_plugin = rebar3_neotoma_plugin_0_2_0;
+
+    rebar3_proper_plugin_0_1_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "rebar3_proper_plugin";
+            version = "0.1.0";
+            sha256 =
+              "7071555afb623e73a2c572de6d4379f9c197b44e68608944eb2835617faed10d";
+
+            meta = {
+              description = "A rebar plugin";
+              license = stdenv.lib.licenses.free;
+            };
+          }
+      ) {};
+
+    rebar3_proper_plugin = rebar3_proper_plugin_0_1_0;
+
+    rebar3_run_0_2_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "rebar3_run";
+            version = "0.2.0";
+            sha256 =
+              "321e0647893957d1bb05a88d940a8a3b9129097d63529e13f815c4857bf29497";
+            compilePort = true;
+
+            meta = {
+              description = "A rebar plugin";
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/tsloughter/rebar3_run";
+            };
+          }
+      ) {};
+
+    rebar3_run = rebar3_run_0_2_0;
+
+    rebar_alias_0_1_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "rebar_alias";
+            version = "0.1.0";
+            sha256 =
+              "59fb42b39964af3a29ebe94c11247f618dd4d5e4e1a69cfaffabbed03ccff70f";
+
+            meta = {
+              description = "A rebar plugin";
+              license = stdenv.lib.licenses.free;
+            };
+          }
+      ) {};
+
+    rebar_alias = rebar_alias_0_1_0;
+
+    rebar_erl_vsn_0_1_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "rebar_erl_vsn";
+            version = "0.1.0";
+            sha256 =
+              "7cf1e2e85a80785a4e4e1529a2c837dbd2d540214cf791214e56f931e5e9865d";
+
+            meta = {
+              description = "defines for erlang versions";
+              license = stdenv.lib.licenses.mit;
+            };
+          }
+      ) {};
+
+    rebar_erl_vsn = rebar_erl_vsn_0_1_0;
+
+    recon_2_2_1 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "recon";
+            version = "2.2.1";
+            sha256 =
+              "6c548ad0f4916495a78977674a251847869f85b5125b7c2a44da3178955adfd1";
+
+            meta = {
+              longDescription = ''Recon wants to be a set of tools usable in
+                                production to diagnose Erlang problems or
+                                inspect production environment safely.'';
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/ferd/recon";
+            };
+          }
+      ) {};
+
+    recon = recon_2_2_1;
+
+    redo_2_0_1 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "redo";
+            version = "2.0.1";
+            sha256 =
+              "f7b2be8c825ec34413c54d8f302cc935ce4ecac8421ae3914c5dadd816dcb1e6";
+
+            meta = {
+              description = "Pipelined Redis Erlang Driver";
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/heroku/redo";
+            };
+          }
+      ) {};
+
+    redo = redo_2_0_1;
+
+    relflow_1_0_4 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "relflow";
+            version = "1.0.4";
+            sha256 =
+              "e6d9652ed7511aea18fa012d5abc19301acd8cbe81a44a159391086a5be12e1f";
+
+            meta = {
+              description = "Rebar3 release workflow plugin";
+              license = stdenv.lib.licenses.free;
+            };
+          }
+      ) {};
+
+    relflow = relflow_1_0_4;
+
+    reltool_util_1_4_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "reltool_util";
+            version = "1.4.0";
+            sha256 =
+              "a625874976fffe8ab56d4b5b7d5fd37620a2692462bbe24ae003ab13052ef0d3";
+
+            meta = {
+              description = "Erlang reltool utility functionality application";
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/okeuday/reltool_util";
+            };
+          }
+      ) {};
+
+    reltool_util_1_5_1 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "reltool_util";
+            version = "1.5.1";
+            sha256 =
+              "746e16871afdcf85d8a115389193c8d660d0df1d26d6ac700590e0ad252646b1";
+
+            meta = {
+              description = "Erlang reltool utility functionality application";
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/okeuday/reltool_util";
+            };
+          }
+      ) {};
+
+    reltool_util = reltool_util_1_5_1;
+
+    relx_3_11_0 = callPackage
+      (
+        {
+          buildHex,
+          bbmustache_1_0_4,
+          cf_0_2_1,
+          erlware_commons_0_18_0,
+          getopt_0_8_2,
+          providers_1_6_0
+        }:
+          buildHex {
+            name = "relx";
+            version = "3.11.0";
+            sha256 =
+              "cf212af96003417ff710e0c9df46034ae14c880a74919df91563e4f149d5c798";
+
+            erlangDeps = [
+                           bbmustache_1_0_4
+                           cf_0_2_1
+                           erlware_commons_0_18_0
+                           getopt_0_8_2
+                           providers_1_6_0
+                         ];
+
+            meta = {
+              description = "Release assembler for Erlang/OTP Releases";
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/erlware/relx";
+            };
+          }
+      ) {};
+
+    relx = relx_3_11_0;
+
+    reup_0_1_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "reup";
+            version = "0.1.0";
+            sha256 =
+              "949a672190119f8b24160167e3685fdd5397474f98dc875ccfd31378ebd68506";
+
+            meta = {
+              description =
+                "dev watcher that auto compiles and reloads modules";
+              license = stdenv.lib.licenses.free;
+            };
+          }
+      ) {};
+
+    reup = reup_0_1_0;
+
+    savory_0_0_2 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "savory";
+            version = "0.0.2";
+            sha256 =
+              "a45ef32a6f45092e1328bc1eb47bda3c8f992afe863aaa73c455f31b0c8591b9";
+
+            meta = {
+              longDescription = ''An Elixir implementation of Freza's salt_nif
+                                which interfaces with libsodium, a wrapper for
+                                the cryptographic primitive libary NaCl. '';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/electricFeel/savory";
+            };
+          }
+      ) {};
+
+    savory = savory_0_0_2;
+
+    sbroker_0_7_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "sbroker";
+            version = "0.7.0";
+            sha256 =
+              "5bc0bfd79896fd5b92072a71fa4a1e120f4110f2cf9562a0b9dd2fcfe9e5cfd2";
+
+            meta = {
+              description =
+                "Process broker for dispatching with backpressure and load shedding";
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/fishcakez/sbroker";
+            };
+          }
+      ) {};
+
+    sbroker = sbroker_0_7_0;
+
+    serial_0_1_2 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "serial";
+            version = "0.1.2";
+            sha256 =
+              "c0aed287f565b7ce1e1091a6a3dd08fd99bf0884c81b53ecf978c502ef652231";
+
+            meta = {
+              description = "Serial communication through Elixir ports";
+              license = stdenv.lib.licenses.isc;
+              homepage = "https://github.com/bitgamma/elixir_serial";
+            };
+          }
+      ) {};
+
+    serial = serial_0_1_2;
+
+    sfmt_0_10_1 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "sfmt";
+            version = "0.10.1";
+            sha256 =
+              "5f9d8206762306743986a3f35602bb40b35bcff68752a8ae12519c0b7c25fab2";
+            compilePort = true;
+
+            meta = {
+              description =
+                "SIMD-oriented Fast Mersenne Twister (SFMT) for Erlang.
+";
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/jj1bdx/sfmt-erlang/";
+            };
+          }
+      ) {};
+
+    sfmt = sfmt_0_10_1;
+
+    sidejob_2_0_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "sidejob";
+            version = "2.0.0";
+            sha256 =
+              "19fea24060a1d0d37e78480fbd79d6b95e07f445aad725f7124a23194641c743";
+
+            meta = {
+              longDescription = ''sidejob is an Erlang library that implements
+                                a parallel, capacity-limited request pool. In
+                                sidejob, these pools are called resources. A
+                                resource is managed by multiple gen_server like
+                                processes which can be sent calls and casts
+                                using sidejob:call or sidejob:cast respectively.
+                                This library was originally written to support
+                                process bounding in Riak using the
+                                sidejob_supervisor behavior. In Riak, this is
+                                used to limit the number of concurrent get/put
+                                FSMs that can be active, failing client requests
+                                with {error, overload} if the limit is ever hit.
+                                The purpose being to provide a fail-safe
+                                mechanism during extreme overload scenarios. '';
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/basho/sidejob";
+            };
+          }
+      ) {};
+
+    sidejob = sidejob_2_0_0;
+
+    siphash_2_1_1 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "siphash";
+            version = "2.1.1";
+            sha256 =
+              "69f2a3b8acac101f7894ea80c15b29dbf7dfa55ea2800731cd5d04621cc22eee";
+            compilePort = true;
+
+            meta = {
+              description = "Elixir implementation of the SipHash hash family";
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/zackehh/siphash-elixir";
+            };
+          }
+      ) {};
+
+    siphash = siphash_2_1_1;
+
+    slp_0_0_2 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "slp";
+            version = "0.0.2";
+            sha256 =
+              "27e5f7330c7ce631f16e3ec5781b31cbb2247d2bcdeab1e979a66dcc4397bd77";
+
+            meta = {
+              longDescription = ''An Elixir application for using the Service
+                                Location Protocol. SLP is a commonly used
+                                service discovery protocol.'';
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/stuart/elixir_slp";
+            };
+          }
+      ) {};
+
+    slp = slp_0_0_2;
+
+    smurf_0_1_3 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "smurf";
+            version = "0.1.3";
+            sha256 =
+              "5ed8e18ec8eea0647e7e938ce15cc76e59497d0a259cea15124520a48f0d6be6";
+
+            meta = {
+              description = "SMF interfacing library for erlang";
+              license = stdenv.lib.licenses.cddl;
+              homepage = "https://github.com/project-fifo/smurf";
+            };
+          }
+      ) {};
+
+    smurf = smurf_0_1_3;
+
+    snappy_1_1_1 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "snappy";
+            version = "1.1.1";
+            sha256 =
+              "7faed3ec6bcac363c2a6f09b4f000a12c8166b42b3bf70228d532f8afcfbcb6a";
+            compilePort = true;
+
+            meta = {
+              description =
+                "snappy compressor/decompressor Erlang NIF wrapper";
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/barrel-db/snappy";
+            };
+          }
+      ) {};
+
+    snappy = snappy_1_1_1;
+
+    ssl_verify_hostname_1_0_5 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "ssl_verify_hostname";
+            version = "1.0.5";
+            sha256 =
+              "f2cb11e6144e10ab39d1e14bf9fb2437b690979c70bf5428e9dc4bfaf1dfeabf";
+
+            meta = {
+              description = "Hostname verification library for Erlang";
+              license = stdenv.lib.licenses.mit;
+              homepage =
+                "https://github.com/deadtrickster/ssl_verify_hostname.erl";
+            };
+          }
+      ) {};
+
+    ssl_verify_hostname_1_0_6 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "ssl_verify_hostname";
+            version = "1.0.6";
+            sha256 =
+              "72b2fc8a8e23d77eed4441137fefa491bbf4a6dc52e9c0045f3f8e92e66243b5";
+
+            meta = {
+              description = "Hostname verification library for Erlang";
+              license = stdenv.lib.licenses.mit;
+              homepage =
+                "https://github.com/deadtrickster/ssl_verify_hostname.erl";
+            };
+          }
+      ) {};
+
+    ssl_verify_hostname = ssl_verify_hostname_1_0_6;
+
+    strftimerl_0_1_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "strftimerl";
+            version = "0.1.0";
+            sha256 =
+              "8c372b282b31f3de24ed1281d4974087421fc44a27d0f31b285ad97a9e6bb616";
+
+            meta = {
+              description = "strftime formatting in erlang";
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/gmr/strftimerl";
+            };
+          }
+      ) {};
+
+    strftimerl = strftimerl_0_1_0;
+
+    supool_1_5_1 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "supool";
+            version = "1.5.1";
+            sha256 =
+              "c191d63ff19ae177bf4cfba02303ae4552d8b48ec4133e24053e037513dfae09";
+
+            meta = {
+              description = "Erlang Process Pool as a Supervisor";
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/okeuday/supool";
+            };
+          }
+      ) {};
+
+    supool = supool_1_5_1;
+
+    syslog_1_0_2 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "syslog";
+            version = "1.0.2";
+            sha256 =
+              "ca158a84afe482f77cb4668383a6108f1e9190fcdf3035858f426b91b2021bf6";
+            compilePort = true;
+
+            meta = {
+              description =
+                "Erlang port driver for interacting with syslog via syslog";
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/Vagabond/erlang-syslog";
+            };
+          }
+      ) {};
+
+    syslog = syslog_1_0_2;
+
+    tea_crypto_1_0_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "tea_crypto";
+            version = "1.0.0";
+            sha256 =
+              "0e7e60d0afe79f0624faa8a358a3a00c912cfa548f3632383927abca4db29cc6";
+
+            meta = {
+              description = "A TEA implementation in Erlang.
+";
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/keichan34/tea_crypto";
+            };
+          }
+      ) {};
+
+    tea_crypto = tea_crypto_1_0_0;
+
+    termcap_0_1_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "termcap";
+            version = "0.1.0";
+            sha256 =
+              "8c5167d68759bd1cd020eeaf5fd94153430fd19fa5a5fdeeb0b3129f0aba2a21";
+
+            meta = {
+              description = "Pure erlang termcap library";
+              license = stdenv.lib.licenses.mit;
+            };
+          }
+      ) {};
+
+    termcap = termcap_0_1_0;
+
+    tinymt_0_2_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "tinymt";
+            version = "0.2.0";
+            sha256 =
+              "1ab2b2bd4e02ccf3f83ca6b2429c41110adaf2068c727d37a2e27a0207eccfe0";
+
+            meta = {
+              description = "Tiny Mersenne Twister (TinyMT) for Erlang
+";
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/jj1bdx/tinymt-erlang/";
+            };
+          }
+      ) {};
+
+    tinymt = tinymt_0_2_0;
+
+    trie_1_5_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "trie";
+            version = "1.5.0";
+            sha256 =
+              "613981536e33f58d92e44bd31801376f71deee0e57c63372fe8ab5fbbc37f7dc";
+
+            meta = {
+              description = "Erlang Trie Implementation";
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/okeuday/trie";
+            };
+          }
+      ) {};
+
+    trie_1_5_1 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "trie";
+            version = "1.5.1";
+            sha256 =
+              "4b845dccfca8962b90584e98d270e2ff43e2e181bb046c4aae0e0f457679f98d";
+
+            meta = {
+              description = "Erlang Trie Implementation";
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/okeuday/trie";
+            };
+          }
+      ) {};
+
+    trie = trie_1_5_1;
+
+    tsuru_1_0_2 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "tsuru";
+            version = "1.0.2";
+            sha256 =
+              "b586ad8d47799a086e4225494f5e3cf4e306ca255a173a4b48fe51d542cefb6b";
+
+            meta = {
+              description =
+                "A collection of useful tools for Erlang applications";
+              license = stdenv.lib.licenses.mit;
+            };
+          }
+      ) {};
+
+    tsuru = tsuru_1_0_2;
+
+    ui_0_1_1 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "ui";
+            version = "0.1.1";
+            sha256 =
+              "492da59ca39055c0dfc794a2ebd564adb9ed635402c7b46659981f32aa9d94c1";
+
+            meta = {
+              description = "An OTP application";
+              license = stdenv.lib.licenses.free;
+            };
+          }
+      ) {};
+
+    ui = ui_0_1_1;
+
+    uri_0_1_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "uri";
+            version = "0.1.0";
+            sha256 =
+              "3833c3b5745fc0822df86c3a3591219048026fea8a535223b440d26029218996";
+
+            meta = {
+              description = "URI Parsing/Encoding Library";
+              license = stdenv.lib.licenses.free;
+            };
+          }
+      ) {};
+
+    uri = uri_0_1_0;
+
+    varpool_1_5_1 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "varpool";
+            version = "1.5.1";
+            sha256 =
+              "ff6059bdcd0efad606e8c54ee623cfeaef59778c18e343dd772e84d99d188e26";
+
+            meta = {
+              description = "Erlang Process Pools as a Local Variable";
+              license = stdenv.lib.licenses.bsd3;
+              homepage = "https://github.com/okeuday/varpool";
+            };
+          }
+      ) {};
+
+    varpool = varpool_1_5_1;
+
+    weber_0_1_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "weber";
+            version = "0.1.0";
+            sha256 =
+              "742c45b3c99e207dd0aeccb818edd2ace4af10699c96fbcee0ce2f692dc5fe12";
+
+            meta = {
+              description = "weber - is Elixir MVC web framework.";
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/elixir-web/weber";
+            };
+          }
+      ) {};
+
+    weber = weber_0_1_0;
+
+    websocket_client_1_1_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "websocket_client";
+            version = "1.1.0";
+            sha256 =
+              "21c3d0df073634f2ca349af5b54a61755d637d6390c34d8d57c064f68ca92acd";
+
+            meta = {
+              description = "Erlang websocket client";
+              license = stdenv.lib.licenses.mit;
+              homepage = "https://github.com/sanmiguel/websocket_client";
+            };
+          }
+      ) {};
+
+    websocket_client = websocket_client_1_1_0;
+
+    worker_pool_1_0_4 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "worker_pool";
+            version = "1.0.4";
+            sha256 =
+              "7854a3b94e9624728db3a0475d00e7d0728adf3bf2ee3802bbf8ca10356d6f64";
+
+            meta = {
+              description = "Erlang Worker Pool";
+              license = stdenv.lib.licenses.free;
+              homepage = "https://github.com/inaka/worker_pool";
+            };
+          }
+      ) {};
+
+    worker_pool = worker_pool_1_0_4;
+
+    wpa_supplicant_0_1_0 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "wpa_supplicant";
+            version = "0.1.0";
+            sha256 =
+              "8a73ca51203401755d42ba636918106540aa3723006dab344dc8a7ec8fa2f3d5";
+
+            meta = {
+              longDescription = ''Elixir interface to the wpa_supplicant
+                                daemon. The wpa_supplicant provides application
+                                support for scanning for access points, managing
+                                Wi-Fi connections, and handling all of the
+                                security and other parameters associated with
+                                Wi-Fi. '';
+              license = with stdenv.lib.licenses; [ asl20 free ];
+              homepage = "https://github.com/fhunleth/wpa_supplicant.ex";
+            };
+          }
+      ) {};
+
+    wpa_supplicant = wpa_supplicant_0_1_0;
+
+    zipper_0_1_4 = callPackage
+      (
+        {  buildHex }:
+          buildHex {
+            name = "zipper";
+            version = "0.1.4";
+            sha256 =
+              "0037f29a5c5a96a9db49e9131f1071a48fcbd5959b74f1d8b6d22945a7ac46b9";
+
+            meta = {
+              description = "Generic Zipper Implementation for Erlang";
+              license = stdenv.lib.licenses.asl20;
+              homepage = "https://github.com/inaka/zipper";
+            };
+          }
+      ) {};
+
+    zipper = zipper_0_1_4;
 
-  rebar3-pc = callPackage
-    ({ buildHex, goldrush }:
-     buildHex {
-       name = "pc";
-       version = "1.1.0";
-       sha256 = "1br5xfl4b2z70b6a2ccxppn64jvkqgpmy4y9v81kxzb91z0ss9ma";
-    }) {};
   };
 in self

From 4ed5836dd3c6e60d6931350cfb6cb85d514c52b0 Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@merritt.tech>
Date: Sun, 10 Jan 2016 17:51:23 -0800
Subject: [PATCH 735/884] hex2nix: init at 0.0.2

---
 .../tools/erlang/hex2nix/default.nix          | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/tools/erlang/hex2nix/default.nix

diff --git a/pkgs/development/tools/erlang/hex2nix/default.nix b/pkgs/development/tools/erlang/hex2nix/default.nix
new file mode 100644
index 000000000000..8bb8f68e3a42
--- /dev/null
+++ b/pkgs/development/tools/erlang/hex2nix/default.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchFromGitHub, buildRebar3, ibrowse, jsx, erlware_commons, getopt }:
+
+buildRebar3 rec {
+    name = "hex2nix";
+    version = "0.0.2";
+
+    src = fetchFromGitHub {
+         owner = "erlang-nix";
+         repo = "hex2nix";
+         rev = "${version}";
+         sha256 = "18gkq5fkdiwq5zj98cz4kqxbpzjkpqcplpsw987drxwdbvq4hkwm";
+     };
+
+    erlangDeps = [ ibrowse jsx erlware_commons getopt ];
+
+    DEBUG=1;
+
+    installPhase = ''
+      runHook preInstall
+      make PREFIX=$out install
+      runHook postInstall
+    '';
+ }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7cf73f4243e0..0e194ced3374 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5099,6 +5099,7 @@ let
   fetchHex = callPackage ../development/tools/build-managers/rebar3/fetch-hex.nix { };
 
   erlangPackages = callPackage ../development/erlang-modules { };
+  hex2nix = erlangPackages.callPackage ../development/tools/erlang/hex2nix { };
 
   elixir = callPackage ../development/interpreters/elixir { };
 

From ad80ae008a5ad4ff4b569eabba6608aca7acacb4 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 14 Jan 2016 14:50:51 +0100
Subject: [PATCH 736/884] cinnamon: remove dead packages

Broken since April 2014. Never more than a handful of basic
framework packages, had most of its work ahead of it.
Almost immediately abandoned, and the maintainer vanished.

Close #2132.
---
 pkgs/desktops/cinnamon/automount-plugin.patch |  448 --
 .../cinnamon/cinnamon-control-center.nix      |   41 -
 pkgs/desktops/cinnamon/cinnamon-desktop.nix   |   42 -
 pkgs/desktops/cinnamon/cinnamon-session.nix   |   49 -
 .../cinnamon/cinnamon-settings-daemon.nix     |   53 -
 .../cinnamon/cinnamon-translations.nix        |   28 -
 pkgs/desktops/cinnamon/cjs.nix                |   42 -
 pkgs/desktops/cinnamon/dpms.patch             |   30 -
 pkgs/desktops/cinnamon/gtkdoc.patch           |   41 -
 pkgs/desktops/cinnamon/keyboard.patch         | 4729 ---------------
 pkgs/desktops/cinnamon/muffin.nix             |   47 -
 pkgs/desktops/cinnamon/region.patch           | 5314 -----------------
 .../cinnamon/remove-sessionmigration.patch    |   19 -
 pkgs/desktops/cinnamon/systemd-support.patch  |  536 --
 pkgs/desktops/cinnamon/timeout.patch          |   26 -
 pkgs/top-level/all-packages.nix               |   19 -
 16 files changed, 11464 deletions(-)
 delete mode 100644 pkgs/desktops/cinnamon/automount-plugin.patch
 delete mode 100644 pkgs/desktops/cinnamon/cinnamon-control-center.nix
 delete mode 100644 pkgs/desktops/cinnamon/cinnamon-desktop.nix
 delete mode 100644 pkgs/desktops/cinnamon/cinnamon-session.nix
 delete mode 100644 pkgs/desktops/cinnamon/cinnamon-settings-daemon.nix
 delete mode 100644 pkgs/desktops/cinnamon/cinnamon-translations.nix
 delete mode 100644 pkgs/desktops/cinnamon/cjs.nix
 delete mode 100644 pkgs/desktops/cinnamon/dpms.patch
 delete mode 100644 pkgs/desktops/cinnamon/gtkdoc.patch
 delete mode 100644 pkgs/desktops/cinnamon/keyboard.patch
 delete mode 100644 pkgs/desktops/cinnamon/muffin.nix
 delete mode 100644 pkgs/desktops/cinnamon/region.patch
 delete mode 100644 pkgs/desktops/cinnamon/remove-sessionmigration.patch
 delete mode 100644 pkgs/desktops/cinnamon/systemd-support.patch
 delete mode 100644 pkgs/desktops/cinnamon/timeout.patch

diff --git a/pkgs/desktops/cinnamon/automount-plugin.patch b/pkgs/desktops/cinnamon/automount-plugin.patch
deleted file mode 100644
index 3d90da99f088..000000000000
--- a/pkgs/desktops/cinnamon/automount-plugin.patch
+++ /dev/null
@@ -1,448 +0,0 @@
- 
-diff -Naur cinnamon-settings-daemon-2.0.1.orig/data/org.cinnamon.settings-daemon.plugins.gschema.xml.in.in cinnamon-settings-daemon-2.0.1/data/org.cinnamon.settings-daemon.plugins.gschema.xml.in.in
---- cinnamon-settings-daemon-2.0.6.orig/data/org.cinnamon.settings-daemon.plugins.gschema.xml.in.in 2013-11-03 10:50:04.000000000 -0500
-+++ cinnamon-settings-daemon-2.0.6/data/org.cinnamon.settings-daemon.plugins.gschema.xml.in.in  2013-11-05 15:33:21.112912392 -0500
-@@ -2,6 +2,7 @@
-   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.cinnamon.settings-daemon.plugins" path="/org/cinnamon/settings-daemon/plugins/">
-     <child name="a11y-keyboard" schema="org.cinnamon.settings-daemon.plugins.a11y-keyboard"/>
-     <child name="a11y-settings" schema="org.cinnamon.settings-daemon.plugins.a11y-settings"/>
-+    <child name="automount" schema="org.cinnamon.settings-daemon.plugins.automount"/>
-     <child name="clipboard" schema="org.cinnamon.settings-daemon.plugins.clipboard"/>
-     <child name="color" schema="org.cinnamon.settings-daemon.plugins.color"/>
-     <child name="cursor" schema="org.cinnamon.settings-daemon.plugins.cursor"/>
-@@ -42,6 +43,18 @@
-       <_summary>Priority to use for this plugin</_summary>
-       <_description>Priority to use for this plugin in cinnamon-settings-daemon startup queue</_description>
-     </key>
-+  </schema>
-+  <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.cinnamon.settings-daemon.plugins.automount" path="/org/cinnamon/settings-daemon/plugins/automount/">
-+    <key name="active" type="b">
-+      <default>true</default>
-+      <_summary>Activation of this plugin</_summary>
-+      <_description>Whether this plugin would be activated by cinnamon-settings-daemon or not</_description>
-+    </key>
-+    <key name="priority" type="i">
-+      <default>97</default>
-+      <_summary>Priority to use for this plugin</_summary>
-+      <_description>Priority to use for this plugin in cinnamon-settings-daemon startup queue</_description>
-+    </key>
-   </schema>
-   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.cinnamon.settings-daemon.plugins.clipboard" path="/org/cinnamon/settings-daemon/plugins/clipboard/">
-     <key name="active" type="b">
-diff -Naur cinnamon-settings-daemon-2.0.1.orig/plugins/automount/automount.cinnamon-settings-plugin.in cinnamon-settings-daemon-2.0.1/plugins/automount/automount.cinnamon-settings-plugin.in
---- cinnamon-settings-daemon-2.0.1.orig/plugins/automount/automount.cinnamon-settings-plugin.in	1970-01-01 01:00:00.000000000 +0100
-+++ cinnamon-settings-daemon-2.0.1/plugins/automount/automount.cinnamon-settings-plugin.in	2013-10-08 22:35:10.771472456 +0200
-@@ -0,0 +1,8 @@
-+[Cinnamon Settings Plugin]
-+Module=automount
-+IAge=0
-+_Name=Automount
-+_Description=Automounter plugin
-+Authors=Tomas Bzatek
-+Copyright=Copyright © 2010 Red Hat, Inc.
-+Website=
-diff -Naur cinnamon-settings-daemon-2.0.1.orig/plugins/automount/cinnamon-fallback-mount-helper.c cinnamon-settings-daemon-2.0.1/plugins/automount/cinnamon-fallback-mount-helper.c
---- cinnamon-settings-daemon-2.0.1.orig/plugins/automount/cinnamon-fallback-mount-helper.c	2013-10-02 16:13:56.000000000 +0200
-+++ cinnamon-settings-daemon-2.0.1/plugins/automount/cinnamon-fallback-mount-helper.c	1970-01-01 01:00:00.000000000 +0100
-@@ -1,65 +0,0 @@
--/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-- *
-- * Copyright (C) 2010 Red Hat, Inc.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; either version 2 of the License, or
-- * (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA
-- *
-- * Author: Tomas Bzatek <tbzatek@redhat.com>
-- */
--
--#include "config.h"
--
--#include <glib.h>
--#include <glib/gi18n.h>
--#include <unistd.h>
--#include <gtk/gtk.h>
--
--#include "csd-automount-manager.h"
--
--int
--main (int argc,
--      char **argv)
--{
--        GMainLoop *loop;
--        CsdAutomountManager *manager;
--        GError *error = NULL;
--
--        g_type_init ();
--        gtk_init (&argc, &argv);
--
--        bindtextdomain (GETTEXT_PACKAGE, CINNAMON_SETTINGS_LOCALEDIR);
--        bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
--        textdomain (GETTEXT_PACKAGE);
--
--        loop = g_main_loop_new (NULL, FALSE);
--        manager = csd_automount_manager_new ();
--
--        csd_automount_manager_start (manager, &error);
--
--        if (error != NULL) {
--                g_printerr ("Unable to start the mount manager: %s",
--                            error->message);
--
--                g_error_free (error);
--                _exit (1);
--        }
--
--        g_main_loop_run (loop);
--
--        csd_automount_manager_stop (manager);
--        g_main_loop_unref (loop);
--
--        return 0;
--}
-diff -Naur cinnamon-settings-daemon-2.0.1.orig/plugins/automount/cinnamon-fallback-mount-helper.desktop.in.in cinnamon-settings-daemon-2.0.1/plugins/automount/cinnamon-fallback-mount-helper.desktop.in.in
---- cinnamon-settings-daemon-2.0.1.orig/plugins/automount/cinnamon-fallback-mount-helper.desktop.in.in	2013-10-02 16:13:56.000000000 +0200
-+++ cinnamon-settings-daemon-2.0.1/plugins/automount/cinnamon-fallback-mount-helper.desktop.in.in	1970-01-01 01:00:00.000000000 +0100
-@@ -1,12 +0,0 @@
--[Desktop Entry]
--_Name=Mount Helper
--_Comment=Automount and autorun plugged devices
--Exec=@LIBEXECDIR@/cinnamon-fallback-mount-helper
--Icon=drive-optical
--Terminal=false
--Type=Application
--Categories=
--NoDisplay=true
--OnlyShowIn=GNOME;
--X-GNOME-Autostart-Notify=true
--
-diff -Naur cinnamon-settings-daemon-2.0.1.orig/plugins/automount/csd-automount-plugin.c cinnamon-settings-daemon-2.0.1/plugins/automount/csd-automount-plugin.c
---- cinnamon-settings-daemon-2.0.1.orig/plugins/automount/csd-automount-plugin.c	1970-01-01 01:00:00.000000000 +0100
-+++ cinnamon-settings-daemon-2.0.1/plugins/automount/csd-automount-plugin.c	2013-10-08 22:35:10.771472456 +0200
-@@ -0,0 +1,106 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-+ *
-+ * Copyright (C) 2010 Red Hat, Inc.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ * Author: Tomas Bzatek <tbzatek@redhat.com>
-+ */
-+
-+#include "config.h"
-+
-+#include <glib/gi18n-lib.h>
-+#include <gmodule.h>
-+
-+#include "cinnamon-settings-plugin.h"
-+#include "csd-automount-plugin.h"
-+#include "csd-automount-manager.h"
-+
-+struct CsdAutomountPluginPrivate {
-+        CsdAutomountManager *manager;
-+};
-+
-+#define CSD_AUTOMOUNT_PLUGIN_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), CSD_TYPE_AUTOMOUNT_PLUGIN, CsdAutomountPluginPrivate))
-+
-+CINNAMON_SETTINGS_PLUGIN_REGISTER (CsdAutomountPlugin, csd_automount_plugin)
-+
-+static void
-+csd_automount_plugin_init (CsdAutomountPlugin *plugin)
-+{
-+        plugin->priv = CSD_AUTOMOUNT_PLUGIN_GET_PRIVATE (plugin);
-+
-+        g_debug ("Automount plugin initializing");
-+
-+        plugin->priv->manager = csd_automount_manager_new ();
-+}
-+
-+static void
-+csd_automount_plugin_finalize (GObject *object)
-+{
-+        CsdAutomountPlugin *plugin;
-+
-+        g_return_if_fail (object != NULL);
-+        g_return_if_fail (CSD_IS_AUTOMOUNT_PLUGIN (object));
-+
-+        g_debug ("Automount plugin finalizing");
-+
-+        plugin = CSD_AUTOMOUNT_PLUGIN (object);
-+
-+        g_return_if_fail (plugin->priv != NULL);
-+
-+        if (plugin->priv->manager != NULL) {
-+                g_object_unref (plugin->priv->manager);
-+        }
-+
-+        G_OBJECT_CLASS (csd_automount_plugin_parent_class)->finalize (object);
-+}
-+
-+static void
-+impl_activate (CinnamonSettingsPlugin *plugin)
-+{
-+        gboolean res;
-+        GError  *error;
-+
-+        g_debug ("Activating automount plugin");
-+
-+        error = NULL;
-+        res = csd_automount_manager_start (CSD_AUTOMOUNT_PLUGIN (plugin)->priv->manager, &error);
-+        if (! res) {
-+                g_warning ("Unable to start automount manager: %s", error->message);
-+                g_error_free (error);
-+        }
-+}
-+
-+static void
-+impl_deactivate (CinnamonSettingsPlugin *plugin)
-+{
-+        g_debug ("Deactivating automount plugin");
-+        csd_automount_manager_stop (CSD_AUTOMOUNT_PLUGIN (plugin)->priv->manager);
-+}
-+
-+static void
-+csd_automount_plugin_class_init (CsdAutomountPluginClass *klass)
-+{
-+        GObjectClass             *object_class = G_OBJECT_CLASS (klass);
-+        CinnamonSettingsPluginClass *plugin_class = CINNAMON_SETTINGS_PLUGIN_CLASS (klass);
-+
-+        object_class->finalize = csd_automount_plugin_finalize;
-+
-+        plugin_class->activate = impl_activate;
-+        plugin_class->deactivate = impl_deactivate;
-+
-+        g_type_class_add_private (klass, sizeof (CsdAutomountPluginPrivate));
-+}
-+
-diff -Naur cinnamon-settings-daemon-2.0.1.orig/plugins/automount/csd-automount-plugin.h cinnamon-settings-daemon-2.0.1/plugins/automount/csd-automount-plugin.h
---- cinnamon-settings-daemon-2.0.1.orig/plugins/automount/csd-automount-plugin.h	1970-01-01 01:00:00.000000000 +0100
-+++ cinnamon-settings-daemon-2.0.1/plugins/automount/csd-automount-plugin.h	2013-10-08 22:35:10.771472456 +0200
-@@ -0,0 +1,60 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-+ *
-+ * Copyright (C) 2010 Red Hat, Inc.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ *
-+ * Author: Tomas Bzatek <tbzatek@redhat.com>
-+ */
-+
-+#ifndef __CSD_AUTOMOUNT_PLUGIN_H__
-+#define __CSD_AUTOMOUNT_PLUGIN_H__
-+
-+#include <glib.h>
-+#include <glib-object.h>
-+#include <gmodule.h>
-+
-+#include "cinnamon-settings-plugin.h"
-+
-+G_BEGIN_DECLS
-+
-+#define CSD_TYPE_AUTOMOUNT_PLUGIN                (csd_automount_plugin_get_type ())
-+#define CSD_AUTOMOUNT_PLUGIN(o)                  (G_TYPE_CHECK_INSTANCE_CAST ((o), CSD_TYPE_AUTOMOUNT_PLUGIN, CsdAutomountPlugin))
-+#define CSD_AUTOMOUNT_PLUGIN_CLASS(k)            (G_TYPE_CHECK_CLASS_CAST((k), CSD_TYPE_AUTOMOUNT_PLUGIN, CsdAutomountPluginClass))
-+#define CSD_IS_AUTOMOUNT_PLUGIN(o)               (G_TYPE_CHECK_INSTANCE_TYPE ((o), CSD_TYPE_AUTOMOUNT_PLUGIN))
-+#define CSD_IS_AUTOMOUNT_PLUGIN_CLASS(k)         (G_TYPE_CHECK_CLASS_TYPE ((k), CSD_TYPE_AUTOMOUNT_PLUGIN))
-+#define CSD_AUTOMOUNT_PLUGIN_GET_CLASS(o)        (G_TYPE_INSTANCE_GET_CLASS ((o), CSD_TYPE_AUTOMOUNT_PLUGIN, CsdAutomountPluginClass))
-+
-+typedef struct CsdAutomountPluginPrivate CsdAutomountPluginPrivate;
-+
-+typedef struct
-+{
-+        CinnamonSettingsPlugin           parent;
-+        CsdAutomountPluginPrivate    *priv;
-+} CsdAutomountPlugin;
-+
-+typedef struct
-+{
-+        CinnamonSettingsPluginClass parent_class;
-+} CsdAutomountPluginClass;
-+
-+GType   csd_automount_plugin_get_type             (void) G_GNUC_CONST;
-+
-+/* All the plugins must implement this function */
-+G_MODULE_EXPORT GType register_cinnamon_settings_plugin (GTypeModule *module);
-+
-+G_END_DECLS
-+
-+#endif /* __CSD_AUTOMOUNT_PLUGIN_H__ */
-diff -Naur cinnamon-settings-daemon-2.0.1.orig/plugins/automount/Makefile.am cinnamon-settings-daemon-2.0.1/plugins/automount/Makefile.am
---- cinnamon-settings-daemon-2.0.1.orig/plugins/automount/Makefile.am	2013-10-02 16:13:56.000000000 +0200
-+++ cinnamon-settings-daemon-2.0.1/plugins/automount/Makefile.am	2013-10-08 22:48:19.240865461 +0200
-@@ -1,38 +1,87 @@
--libexec_PROGRAMS = cinnamon-fallback-mount-helper
-+NULL =
- 
--cinnamon_fallback_mount_helper_SOURCES = \
--	cinnamon-fallback-mount-helper.c \
--	csd-automount-manager.c \
--	csd-automount-manager.h \
--	csd-autorun.c \
--	csd-autorun.h
-+plugin_name = automount
- 
--cinnamon_fallback_mount_helper_CPPFLAGS = \
-+libexec_PROGRAMS = csd-test-automount
-+
-+csd_test_automount_SOURCES = 		\
-+	test-automount.c		\
-+	csd-automount-manager.h		\
-+	csd-automount-manager.c		\
-+	csd-autorun.c		\
-+	csd-autorun.h		\
-+	$(NULL)
-+
-+csd_test_automount_CPPFLAGS = \
- 	-I$(top_srcdir)/cinnamon-settings-daemon		\
-+	-I$(top_srcdir)/plugins/common			\
- 	-DCINNAMON_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
- 	$(AM_CPPFLAGS)
- 
--cinnamon_fallback_mount_helper_CFLAGS =	\
-+csd_test_automount_CFLAGS = \
-+	$(PLUGIN_CFLAGS)		\
- 	$(SETTINGS_PLUGIN_CFLAGS)	\
- 	$(SYSTEMD_CFLAGS)		\
- 	$(AUTOMOUNT_CFLAGS)
-+	$(AM_CFLAGS)
-+
-+csd_test_automount_LDADD =			\
-+	$(top_builddir)/cinnamon-settings-daemon/libcsd.la	\
-+	$(SETTINGS_PLUGIN_LIBS)		\
-+	$(SYSTEMD_LIBS)			\
-+	$(AUTOMOUNT_LIBS)		\
-+	$(NULL)
-+
-+plugin_LTLIBRARIES = \
-+	libautomount.la		\
-+	$(NULL)
-+
-+libautomount_la_SOURCES =		\
-+	csd-automount-plugin.h		\
-+	csd-automount-plugin.c		\
-+	csd-automount-manager.h		\
-+	csd-automount-manager.c		\
-+	csd-autorun.c		\
-+	csd-autorun.h		\
-+	$(NULL)
-+
-+libautomount_la_CPPFLAGS = \
-+	-I$(top_srcdir)/cinnamon-settings-daemon		\
-+	-DCINNAMON_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
-+	$(AM_CPPFLAGS)
-+
-+libautomount_la_CFLAGS = \
-+	$(SETTINGS_PLUGIN_CFLAGS)	\
-+	$(SYSTEMD_CFLAGS)		\
-+	$(AUTOMOUNT_CFLAGS)		\
-+	$(AM_CFLAGS)
-+
-+libautomount_la_LDFLAGS =		\
-+	$(CSD_PLUGIN_LDFLAGS)		\
-+	$(NULL)
- 
--cinnamon_fallback_mount_helper_LDADD =	\
-+libautomount_la_LIBADD  =		\
- 	$(SETTINGS_PLUGIN_LIBS)		\
- 	$(SYSTEMD_LIBS)			\
- 	$(AUTOMOUNT_LIBS)		\
--	$(top_builddir)/cinnamon-settings-daemon/libcsd.la
-+	$(NULL)
- 
--autostartdir = $(datadir)/applications
--autostart_in_files = cinnamon-fallback-mount-helper.desktop.in
--autostart_in_in_files = cinnamon-fallback-mount-helper.desktop.in.in
--autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
-+plugin_in_files =		\
-+	automount.cinnamon-settings-plugin.in	\
-+	$(NULL)
- 
--$(autostart_in_files): $(autostart_in_in_files)
--	@sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
-+plugin_DATA = $(plugin_in_files:.cinnamon-settings-plugin.in=.cinnamon-settings-plugin)
- 
--@INTLTOOL_DESKTOP_RULE@
-+EXTRA_DIST = 			\
-+	$(plugin_in_files)	\
-+	$(NULL)
- 
--EXTRA_DIST = $(autostart_in_in_files)
-+CLEANFILES = 			\
-+	$(plugin_DATA)		\
-+	$(NULL)
- 
--CLEANFILES = $(autostart_DATA) $(autostart_in_files)
-+DISTCLEANFILES =		\
-+	$(plugin_DATA)		\
-+	$(NULL)
-+
-+@CSD_INTLTOOL_PLUGIN_RULE@
-diff -Naur cinnamon-settings-daemon-2.0.1.orig/plugins/automount/test-automount.c cinnamon-settings-daemon-2.0.1/plugins/automount/test-automount.c
---- cinnamon-settings-daemon-2.0.1.orig/plugins/automount/test-automount.c	1970-01-01 01:00:00.000000000 +0100
-+++ cinnamon-settings-daemon-2.0.1/plugins/automount/test-automount.c	2013-10-08 22:42:53.759486525 +0200
-@@ -0,0 +1,7 @@
-+#define NEW csd_automount_manager_new
-+#define START csd_automount_manager_start
-+#define STOP csd_automount_manager_stop
-+#define MANAGER CsdAutomountManager
-+#include "csd-automount-manager.h"
-+
-+#include "test-plugin.h"
-diff -Naur cinnamon-settings-daemon-2.0.1.orig/po/POTFILES.in cinnamon-settings-daemon-2.0.1/po/POTFILES.in
---- cinnamon-settings-daemon-2.0.1.orig/po/POTFILES.in	2013-10-02 16:13:56.000000000 +0200
-+++ cinnamon-settings-daemon-2.0.1/po/POTFILES.in	2013-10-08 22:35:10.771472456 +0200
-@@ -18,8 +18,9 @@
- plugins/a11y-keyboard/csd-a11y-preferences-dialog.c
- [type: gettext/glade]plugins/a11y-keyboard/csd-a11y-preferences-dialog.ui
- [type: gettext/ini]plugins/a11y-settings/a11y-settings.cinnamon-settings-plugin.in
--plugins/automount/cinnamon-fallback-mount-helper.desktop.in.in
-+[type: gettext/ini]plugins/automount/automount.cinnamon-settings-plugin.in
- plugins/automount/csd-automount-manager.c
-+plugins/automount/csd-automount-plugin.c
- plugins/automount/csd-autorun.c
- [type: gettext/ini]plugins/background/background.cinnamon-settings-plugin.in
- [type: gettext/ini]plugins/clipboard/clipboard.cinnamon-settings-plugin.in
-diff -Naur cinnamon-settings-daemon-2.0.1.orig/po/POTFILES.skip cinnamon-settings-daemon-2.0.1/po/POTFILES.skip
---- cinnamon-settings-daemon-2.0.1.orig/po/POTFILES.skip	2013-10-02 16:13:56.000000000 +0200
-+++ cinnamon-settings-daemon-2.0.1/po/POTFILES.skip	2013-10-08 22:37:20.224645009 +0200
-@@ -20,6 +20,5 @@
- data/org.cinnamon.settings-daemon.plugins.updates.gschema.xml.in
- data/org.cinnamon.settings-daemon.plugins.xrandr.gschema.xml.in
- data/org.cinnamon.settings-daemon.plugins.xsettings.gschema.xml.in
--plugins/automount/gnome-fallback-mount-helper.desktop.in
- plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in
- plugins/wacom/org.cinnamon.settings-daemon.plugins.wacom.policy.in
diff --git a/pkgs/desktops/cinnamon/cinnamon-control-center.nix b/pkgs/desktops/cinnamon/cinnamon-control-center.nix
deleted file mode 100644
index 97489a7ec087..000000000000
--- a/pkgs/desktops/cinnamon/cinnamon-control-center.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-
-{ stdenv, fetchurl, pkgconfig, autoreconfHook, glib, gettext, gnome_common, cinnamon-desktop, intltool, libxslt, gtk3, libnotify,
-gnome-menus, libxml2, systemd, upower, cinnamon-settings-daemon, colord, polkit, ibus, libcanberra_gtk3, libpulseaudio, isocodes, kerberos,
-libxkbfile}:
-
-let
-  version = "2.0.9";
-in
-stdenv.mkDerivation {
-  name = "cinnamon-control-center-${version}";
-
-  src = fetchurl {
-    url = "http://github.com/linuxmint/cinnamon-control-center/archive/${version}.tar.gz";
-    sha256 = "0kivqdgsf8w257j2ja6fap0dpvljcnb9gphr3knp7y6ma2d1gfv3";
-  };
-
- configureFlags = "--enable-systemd --disable-update-mimedb" ;
-
-  patches = [ ./region.patch];
-
-  buildInputs = [
-    pkgconfig autoreconfHook
-    glib gettext gnome_common
-    intltool libxslt gtk3 cinnamon-desktop
-    libnotify gnome-menus libxml2 systemd
-    upower cinnamon-settings-daemon colord
-    polkit ibus libcanberra_gtk3 libpulseaudio
-    isocodes kerberos libxkbfile ];
-
-  preBuild = "patchShebangs ./scripts";
-
-  meta = {
-    homepage = "http://cinnamon.linuxmint.com";
-    description = "The cinnamon session files" ;
-
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.roelof ];
-
-    broken = true;
-  };
-}
diff --git a/pkgs/desktops/cinnamon/cinnamon-desktop.nix b/pkgs/desktops/cinnamon/cinnamon-desktop.nix
deleted file mode 100644
index 8ead149fc2b1..000000000000
--- a/pkgs/desktops/cinnamon/cinnamon-desktop.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, autoreconfHook, intltool
-, glib, gobjectIntrospection, gdk_pixbuf, gtk3, gnome_common
-, xorg, xkeyboard_config
-}:
-
-let
-  version = "2.0.4";
-in
-stdenv.mkDerivation {
-  name = "cinnamon-desktop-${version}";
-
-  src = fetchurl {
-    url = "http://github.com/linuxmint/cinnamon-desktop/archive/${version}.tar.gz";
-    sha256 = "1cywin712558pv58c0cr73m25hfcv5x8pv5frvqjr9gwr2gpi6h3";
-  };
-
-  NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0";
-
-  buildInputs = with xorg; [
-    pkgconfig autoreconfHook intltool
-    glib gobjectIntrospection gdk_pixbuf gtk3 gnome_common
-    xkeyboard_config libxkbfile libX11 libXrandr libXext
-  ];
-
-  meta = {
-    homepage = "http://cinnamon.linuxmint.com";
-    description = "Library and data for various Cinnamon modules";
-
-    longDescription = ''
-       The libcinnamon-desktop library provides API shared by several applications
-       on the desktop, but that cannot live in the platform for various
-       reasons. There is no API or ABI guarantee, although we are doing our
-       best to provide stability. Documentation for the API is available with
-       gtk-doc.
-    '';
-
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.roelof ];
-
-    broken = true;
-  };
-}
diff --git a/pkgs/desktops/cinnamon/cinnamon-session.nix b/pkgs/desktops/cinnamon/cinnamon-session.nix
deleted file mode 100644
index d84438b7bd14..000000000000
--- a/pkgs/desktops/cinnamon/cinnamon-session.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, autoreconfHook, glib, gettext, gnome_common, gtk3, dbus_glib
-, upower, json_glib,intltool, systemd, hicolor_icon_theme, xorg, makeWrapper, cinnamon-desktop }:
-
-let
-  version = "2.0.6";
-in
-stdenv.mkDerivation {
-  name = "cinnamon-session-${version}";
-
-  src = fetchurl {
-    url = "http://github.com/linuxmint/cinnamon-session/archive/${version}.tar.gz";
-    sha256 = "0rs5w7npj3wf3gkk3sfb83awks2h7vjd6cz8mvfgbh6m3grn66l3";
-  };
-
-
-  configureFlags = "--enable-systemd --disable-gconf" ;
-
-  patches = [ ./remove-sessionmigration.patch ./timeout.patch];
-
-  buildInputs = [
-    pkgconfig autoreconfHook
-    glib gettext gnome_common
-    gtk3 dbus_glib upower json_glib
-    intltool systemd xorg.xtrans
-    makeWrapper
-    cinnamon-desktop /*gschemas*/
-   ];
-
-  preBuild = "patchShebangs ./scripts";
-
-
-  postFixup  = ''
-    rm $out/share/icons/hicolor/icon-theme.cache
-
-    for f in "$out/bin/"*; do
-      wrapProgram "$f" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
-    done
-  '';
-
-  meta = {
-    homepage = "http://cinnamon.linuxmint.com";
-    description = "The cinnamon session files" ;
-
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.roelof ];
-
-    broken = true;
-  };
-}
diff --git a/pkgs/desktops/cinnamon/cinnamon-settings-daemon.nix b/pkgs/desktops/cinnamon/cinnamon-settings-daemon.nix
deleted file mode 100644
index 550a7acaf62e..000000000000
--- a/pkgs/desktops/cinnamon/cinnamon-settings-daemon.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-
-{ stdenv, fetchurl, pkgconfig, autoreconfHook, glib, gettext, gnome_common, cinnamon-desktop, intltool, gtk3,
-libnotify, lcms2, libxklavier, libgnomekbd, libcanberra, libpulseaudio, upower, libcanberra_gtk3, colord,
-systemd, libxslt, docbook_xsl, makeWrapper, gsettings_desktop_schemas}:
-
-let
-  version = "2.0.10";
-in
-stdenv.mkDerivation {
-  name = "cinnamon-settings-daemon-${version}";
-
-  src = fetchurl {
-    url = "http://github.com/linuxmint/cinnamon-settings-daemon/archive/${version}.tar.gz";
-    sha256 = "10r75xsngb7ipv9fy07dyfb256bqybzcxbwny60sgjhrksk3v9mg";
-  };
-
-  NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0";
-
-  configureFlags = "--enable-systemd" ;
-
-  patches = [ ./systemd-support.patch ./automount-plugin.patch ./dpms.patch];
-
-  buildInputs = [
-    pkgconfig autoreconfHook
-    glib gettext gnome_common
-    intltool gtk3 libnotify lcms2
-    libgnomekbd libxklavier colord
-    libcanberra libpulseaudio upower
-    libcanberra_gtk3 cinnamon-desktop
-    systemd libxslt docbook_xsl makeWrapper
-    gsettings_desktop_schemas
-   ];
-
-  preBuild = "patchShebangs ./scripts";
-
-  #ToDo: missing org.cinnamon.gschema.xml, probably not packaged yet
-  postFixup  = ''
-    for f in "$out/libexec/"*; do
-      wrapProgram "$f" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
-    done
-  '';
-
-
-  meta = {
-    homepage = "http://cinnamon.linuxmint.com";
-    description = "The cinnamon session files" ;
-
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.roelof ];
-
-    broken = true;
-  };
-}
diff --git a/pkgs/desktops/cinnamon/cinnamon-translations.nix b/pkgs/desktops/cinnamon/cinnamon-translations.nix
deleted file mode 100644
index 91a7acdef82b..000000000000
--- a/pkgs/desktops/cinnamon/cinnamon-translations.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl }:
-let
-  version = "2.0.3";
-in
-stdenv.mkDerivation {
-  name = "cinnamon-translations-${version}";
-
-  src = fetchurl {
-    url = "http://github.com/linuxmint/cinnamon-translations/archive/${version}.tar.gz";
-    sha256 = "07w3v118xrfp8r4dkbdiyd1vr9ah7f3bm2zw9wag9s8l8x0zfxgc";
-  };
-
-  installPhase =
-    ''
-      mkdir -pv $out/share/cinnamon/locale
-      cp -av "mo-export/"* $out/share/cinnamon/locale/
-    '';
-
-  meta = {
-    homepage = "http://cinnamon.linuxmint.com";
-    description = "Translations files for the Cinnamon desktop" ;
-
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.roelof ];
-
-    broken = true;
-  };
-}
diff --git a/pkgs/desktops/cinnamon/cjs.nix b/pkgs/desktops/cinnamon/cjs.nix
deleted file mode 100644
index 5d5847615653..000000000000
--- a/pkgs/desktops/cinnamon/cjs.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, autoreconfHook, python
-, dbus_glib, cairo, spidermonkey_185, gobjectIntrospection
-}:
-
-let
-  version="2.0.0";
-in
-stdenv.mkDerivation rec {
-  name = "cjs-${version}";
-
-  src = fetchurl {
-    url = "http://github.com/linuxmint/cjs/archive/${version}.tar.gz";
-    sha256 = "16iazd5h2z27v9jxs4a8imwls5c1c690wk7i05r5ds3c3r4nrsig";
-  };
-
-  buildInputs = [
-    pkgconfig autoreconfHook python
-    dbus_glib cairo spidermonkey_185
-    gobjectIntrospection
-  ];
-
-  preBuild = "patchShebangs ./scripts";
-
-  meta = {
-    homepage = "http://cinnamon.linuxmint.com";
-    description = "JavaScript bindings for Cinnamon" ;
-
-    longDescription = ''
-       This module contains JavaScript bindings based on gobject-introspection.
-
-       Because JavaScript is pretty free-form, consistent coding style and unit tests
-       are critical to give it some structure and keep it readable.
-       We propose that all GNOME usage of JavaScript conform to the style guide
-       in doc/Style_Guide.txt to help keep things sane.
-    '';
-
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.roelof ];
-
-    broken = true;
-  };
-}
diff --git a/pkgs/desktops/cinnamon/dpms.patch b/pkgs/desktops/cinnamon/dpms.patch
deleted file mode 100644
index a73f33dc6182..000000000000
--- a/pkgs/desktops/cinnamon/dpms.patch
+++ /dev/null
@@ -1,30 +0,0 @@
- 
--- a/plugins/power/csd-power-manager.c
-+++ b/plugins/power/csd-power-manager.c
-@@ -33,6 +33,8 @@
- #include <libnotify/notify.h>
- #include <canberra-gtk.h>
- 
-+#include <X11/extensions/dpms.h>
-+
- #define GNOME_DESKTOP_USE_UNSTABLE_API
- #include <libcinnamon-desktop/gnome-rr.h>
- 
-@@ -3967,6 +3790,17 @@ csd_power_manager_start (CsdPowerManager
-         /* set the initial dim time that can adapt for the user */
-         refresh_idle_dim_settings (manager);
- 
-+        /* Make sure that Xorg's DPMS extension never gets in our way. The defaults seem to have changed in Xorg 1.14
-+         * being "0" by default to being "600" by default 
-+         * https://bugzilla.gnome.org/show_bug.cgi?id=709114
-+         */
-+        gdk_error_trap_push ();
-+        int dummy;
-+        if (DPMSQueryExtension(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &dummy, &dummy)) {
-+            DPMSSetTimeouts (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), 0, 0, 0);
-+        }
-+        gdk_error_trap_pop_ignored ();
-+
-         manager->priv->xscreensaver_watchdog_timer_id = g_timeout_add_seconds (XSCREENSAVER_WATCHDOG_TIMEOUT,
-                                                                                disable_builtin_screensaver,
-                                                                                NULL);
diff --git a/pkgs/desktops/cinnamon/gtkdoc.patch b/pkgs/desktops/cinnamon/gtkdoc.patch
deleted file mode 100644
index 6398306a76ae..000000000000
--- a/pkgs/desktops/cinnamon/gtkdoc.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/src/meta/prefs.h
-+++ b/src/meta/prefs.h
-@@ -310,13 +310,13 @@ typedef struct
-    */
-   GSList *bindings;
- 
--  /** for keybindings that can have shift or not like Alt+Tab */
-+  /* for keybindings that can have shift or not like Alt+Tab */
-   gboolean      add_shift:1;
- 
--  /** for keybindings that apply only to a window */
-+  /* for keybindings that apply only to a window */
-   gboolean      per_window:1;
- 
--  /** for keybindings not added with meta_display_add_keybinding() */
-+  /* for keybindings not added with meta_display_add_keybinding() */
-   gboolean      builtin:1;
- } MetaKeyPref;
- 
-@@ -339,5 +339,3 @@ CDesktopVisualBellType meta_prefs_get_vi
- MetaPlacementMode meta_prefs_get_placement_mode (void);
- 
- #endif
--
--
---- a/src/core/workspace.c
-+++ b/src/core/workspace.c
-@@ -194,7 +194,7 @@ meta_workspace_new (MetaScreen *screen)
-   return workspace;
- }
- 
--/** Foreach function for workspace_free_struts() */
-+/* Foreach function for workspace_free_struts() */
- static void
- free_this (gpointer candidate, gpointer dummy)
- {
-@@ -1390,4 +1390,3 @@ meta_workspace_get_screen (MetaWorkspace
- {
-   return workspace->screen;
- }
--
diff --git a/pkgs/desktops/cinnamon/keyboard.patch b/pkgs/desktops/cinnamon/keyboard.patch
deleted file mode 100644
index f67d961ff58f..000000000000
--- a/pkgs/desktops/cinnamon/keyboard.patch
+++ /dev/null
@@ -1,4729 +0,0 @@
- 
-diff -uNrp a/cinnamon-settings-daemon/main.c b/cinnamon-settings-daemon/main.c
---- a/cinnamon-settings-daemon/main.c	2013-08-24 18:04:31.000000000 +0100
-+++ b/cinnamon-settings-daemon/main.c	2013-08-25 16:36:02.000000000 +0100
-@@ -319,6 +319,29 @@ set_legacy_ibus_env_vars (GDBusProxy *pr
- }
- #endif
- 
-+static void
-+got_session_proxy (GObject      *source_object,
-+                   GAsyncResult *res,
-+                   gpointer      user_data)
-+{
-+        GDBusProxy *proxy;
-+        GError *error = NULL;
-+
-+        proxy = g_dbus_proxy_new_finish (res, &error);
-+        if (proxy == NULL) {
-+                g_debug ("Could not connect to the Session manager: %s", error->message);
-+                g_error_free (error);
-+        } else {
-+                set_locale (proxy);
-+#ifdef HAVE_IBUS
-+                /* This will register with cinnamon-session after calling Setenv. */
-+                set_legacy_ibus_env_vars (proxy);
-+#else
-+                register_with_gnome_session (proxy);
-+#endif
-+        }
-+}
-+
- static gboolean
- on_term_signal_pipe_closed (GIOChannel *source,
-                             GIOCondition condition,
-@@ -368,6 +391,16 @@ set_session_over_handler (GDBusConnectio
- {
-         g_assert (bus != NULL);
- 
-+        g_dbus_proxy_new (bus,
-+                          G_DBUS_PROXY_FLAGS_NONE,
-+                          NULL,
-+                          GNOME_SESSION_DBUS_NAME,
-+                          GNOME_SESSION_DBUS_OBJECT,
-+                          GNOME_SESSION_DBUS_INTERFACE,
-+                          NULL,
-+                          (GAsyncReadyCallback) got_session_proxy,
-+                          NULL);
-+
-         watch_for_term_signal (manager);
- }
- 
-@@ -390,56 +423,6 @@ name_lost_handler (GDBusConnection *conn
-         gtk_main_quit ();
- }
- 
--static gboolean
--do_register_client (gpointer user_data)
--{
--        GDBusProxy *proxy = (GDBusProxy *) user_data;
--        g_assert (proxy != NULL);
--
--        const char *startup_id = g_getenv ("DESKTOP_AUTOSTART_ID");
--        g_dbus_proxy_call (proxy,
--                           "RegisterClient",
--                           g_variant_new ("(ss)", "cinnamon-settings-daemon", startup_id ? startup_id : ""),
--                           G_DBUS_CALL_FLAGS_NONE,
--                           -1,
--                           NULL,
--                           (GAsyncReadyCallback) on_client_registered,
--                           manager);
--
--        return FALSE;
--}
--
--static void
--queue_register_client (void)
--{
--        GDBusConnection *bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL);
--        if (!bus)
--                return;
--
--        GError *error = NULL;
--        GDBusProxy *proxy = g_dbus_proxy_new_sync (bus,
--                                                   G_DBUS_PROXY_FLAGS_NONE,
--                                                   NULL,
--                                                   GNOME_SESSION_DBUS_NAME,
--                                                   GNOME_SESSION_DBUS_OBJECT,
--                                                   GNOME_SESSION_DBUS_INTERFACE,
--                                                   NULL,
--                                                   &error);
--        g_object_unref (bus);
--
--        if (proxy == NULL) {
--                g_debug ("Could not connect to the Session manager: %s", error->message);
--                g_error_free (error);
--                return;
--        }
--
--        /* Register the daemon with cinnamon-session */
--        g_signal_connect (G_OBJECT (proxy), "g-signal",
--                          G_CALLBACK (on_session_over), NULL);
--
--        g_idle_add_full (G_PRIORITY_DEFAULT, do_register_client, proxy, NULL);
--}
--
- static void
- bus_register (void)
- {
-@@ -541,8 +524,6 @@ main (int argc, char *argv[])
- 
-         notify_init ("cinnamon-settings-daemon");
- 
--        queue_register_client ();
--
-         bus_register ();
- 
-         cinnamon_settings_profile_start ("cinnamon_settings_manager_new");
-diff -uNrp a/configure.ac b/configure.ac
---- a/configure.ac	2013-08-24 18:04:31.000000000 +0100
-+++ b/configure.ac	2013-08-25 16:36:02.000000000 +0100
-@@ -53,6 +53,7 @@ UPOWER_GLIB_REQUIRED_VERSION=0.9.1
- PA_REQUIRED_VERSION=0.9.16
- UPOWER_REQUIRED_VERSION=0.9.11
- GTK_XINPUT_2_3_VERSION=3.7.8
-+IBUS_REQUIRED_VERSION=1.4.2
- 
- #EXTRA_COMPILE_WARNINGS(yes)
- 
-@@ -199,8 +200,21 @@ dnl ------------------------------------
- dnl - Keyboard plugin stuff
- dnl ---------------------------------------------------------------------------
- 
--LIBGNOMEKBD_REQUIRED=2.91.1
--PKG_CHECK_MODULES(KEYBOARD, [libgnomekbdui >= $LIBGNOMEKBD_REQUIRED libgnomekbd >= $LIBGNOMEKBD_REQUIRED libxklavier >= 5.0 kbproto])
-+AC_ARG_ENABLE(ibus,
-+        AS_HELP_STRING([--disable-ibus],
-+                       [Disable IBus support]),
-+        enable_ibus=$enableval,
-+        enable_ibus=yes)
-+
-+if test "x$enable_ibus" = "xyes" ; then
-+        IBUS_MODULE="ibus-1.0 >= $IBUS_REQUIRED_VERSION"
-+        AC_DEFINE(HAVE_IBUS, 1, [Defined if IBus support is enabled])
-+else
-+        IBUS_MODULE=
-+fi
-+AM_CONDITIONAL(HAVE_IBUS, test "x$enable_ibus" == "xyes")
-+
-+PKG_CHECK_MODULES(KEYBOARD, xkbfile $IBUS_MODULE cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION)
- 
- dnl ---------------------------------------------------------------------------
- dnl - Housekeeping plugin stuff
-diff -uNrp a/data/org.cinnamon.settings-daemon.plugins.media-keys.gschema.xml.in.in b/data/org.cinnamon.settings-daemon.plugins.media-keys.gschema.xml.in.in
---- a/data/org.cinnamon.settings-daemon.plugins.media-keys.gschema.xml.in.in	2013-08-24 18:04:31.000000000 +0100
-+++ b/data/org.cinnamon.settings-daemon.plugins.media-keys.gschema.xml.in.in	2013-08-25 16:36:02.000000000 +0100
-@@ -175,6 +175,15 @@
-       <_summary>Magnifier zoom out</_summary>
-       <_description>Binding for the magnifier to zoom out</_description>
-     </key>
-+    <key name="switch-input-source" type="s">
-+      <default>''</default>
-+      <_summary>Switch input source</_summary>
-+      <_description>Binding to select the next input source</_description>
-+    </key>
-+    <key name="switch-input-source-backward" type="s">
-+      <default>''</default>
-+      <_summary>Switch input source backward</_summary>
-+      <_description>Binding to select the previous input source</_description>
-+    </key>
-   </schema>
--
--</schemalist>
-+</schemalist>
-\ No newline at end of file
-diff -uNrp a/plugins/keyboard/csd-keyboard-manager.c b/plugins/keyboard/csd-keyboard-manager.c
---- a/plugins/keyboard/csd-keyboard-manager.c	2013-08-24 18:04:31.000000000 +0100
-+++ b/plugins/keyboard/csd-keyboard-manager.c	2013-08-25 16:36:02.000000000 +0100
-@@ -40,19 +40,22 @@
- 
- #include <X11/XKBlib.h>
- #include <X11/keysym.h>
-+#include <X11/extensions/XKBrules.h>
-+
-+#define GNOME_DESKTOP_USE_UNSTABLE_API
-+#include <libcinnamon-desktop/gnome-xkb-info.h>
-+
-+#ifdef HAVE_IBUS
-+#include <ibus.h>
-+#endif
- 
- #include "cinnamon-settings-profile.h"
- #include "csd-keyboard-manager.h"
-+#include "csd-input-helper.h"
- #include "csd-enums.h"
- 
--#include "csd-keyboard-xkb.h"
--
- #define CSD_KEYBOARD_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CSD_TYPE_KEYBOARD_MANAGER, CsdKeyboardManagerPrivate))
- 
--#ifndef HOST_NAME_MAX
--#  define HOST_NAME_MAX 255
--#endif
--
- #define CSD_KEYBOARD_DIR "org.cinnamon.settings-daemon.peripherals.keyboard"
- 
- #define KEY_REPEAT         "repeat"
-@@ -60,6 +63,7 @@
- #define KEY_INTERVAL       "repeat-interval"
- #define KEY_DELAY          "delay"
- #define KEY_CLICK_VOLUME   "click-volume"
-+#define KEY_REMEMBER_NUMLOCK_STATE "remember-numlock-state"
- #define KEY_NUMLOCK_STATE  "numlock-state"
- 
- #define KEY_BELL_VOLUME    "bell-volume"
-@@ -67,27 +71,560 @@
- #define KEY_BELL_DURATION  "bell-duration"
- #define KEY_BELL_MODE      "bell-mode"
- 
--#define LIBGNOMEKBD_KEYBOARD_DIR "org.gnome.libgnomekbd.keyboard"
--#define LIBGNOMEKBD_KEY_LAYOUTS  "layouts"
-+#define KEY_SWITCHER "input-sources-switcher"
-+
-+#define GNOME_DESKTOP_INTERFACE_DIR "org.cinnamon.desktop.interface"
-+
-+#define KEY_GTK_IM_MODULE    "gtk-im-module"
-+#define GTK_IM_MODULE_SIMPLE "gtk-im-context-simple"
-+#define GTK_IM_MODULE_IBUS   "ibus"
-+
-+#define GNOME_DESKTOP_INPUT_SOURCES_DIR "org.cinnamon.desktop.input-sources"
-+
-+#define KEY_CURRENT_INPUT_SOURCE "current"
-+#define KEY_INPUT_SOURCES        "sources"
-+#define KEY_KEYBOARD_OPTIONS     "xkb-options"
-+
-+#define INPUT_SOURCE_TYPE_XKB  "xkb"
-+#define INPUT_SOURCE_TYPE_IBUS "ibus"
-+
-+#define DEFAULT_LANGUAGE "en_US"
- 
- struct CsdKeyboardManagerPrivate
- {
- 	guint      start_idle_id;
-         GSettings *settings;
--        GSettings *libgnomekbd_settings;
--        gboolean   have_xkb;
-+        GSettings *input_sources_settings;
-+        GSettings *interface_settings;
-+        GnomeXkbInfo *xkb_info;
-+#ifdef HAVE_IBUS
-+        IBusBus   *ibus;
-+        GHashTable *ibus_engines;
-+        GHashTable *ibus_xkb_engines;
-+        GCancellable *ibus_cancellable;
-+        gboolean session_is_fallback;
-+#endif
-         gint       xkb_event_base;
-         CsdNumLockState old_state;
-+        GdkDeviceManager *device_manager;
-+        guint device_added_id;
-+        guint device_removed_id;
-+
-+        gboolean input_sources_switcher_spawned;
-+        GPid input_sources_switcher_pid;
- };
- 
- static void     csd_keyboard_manager_class_init  (CsdKeyboardManagerClass *klass);
- static void     csd_keyboard_manager_init        (CsdKeyboardManager      *keyboard_manager);
- static void     csd_keyboard_manager_finalize    (GObject                 *object);
-+static gboolean apply_input_sources_settings     (GSettings               *settings,
-+                                                  gpointer                 keys,
-+                                                  gint                     n_keys,
-+                                                  CsdKeyboardManager      *manager);
-+static void     set_gtk_im_module                (CsdKeyboardManager      *manager,
-+                                                  const gchar             *new_module);
- 
- G_DEFINE_TYPE (CsdKeyboardManager, csd_keyboard_manager, G_TYPE_OBJECT)
- 
- static gpointer manager_object = NULL;
- 
-+static void
-+init_builder_with_sources (GVariantBuilder *builder,
-+                           GSettings       *settings)
-+{
-+        const gchar *type;
-+        const gchar *id;
-+        GVariantIter iter;
-+        GVariant *sources;
-+
-+        sources = g_settings_get_value (settings, KEY_INPUT_SOURCES);
-+
-+        g_variant_builder_init (builder, G_VARIANT_TYPE ("a(ss)"));
-+
-+        g_variant_iter_init (&iter, sources);
-+        while (g_variant_iter_next (&iter, "(&s&s)", &type, &id))
-+                g_variant_builder_add (builder, "(ss)", type, id);
-+
-+        g_variant_unref (sources);
-+}
-+
-+static gboolean
-+schema_is_installed (const gchar *name)
-+{
-+        const gchar * const *schemas;
-+        const gchar * const *s;
-+
-+        schemas = g_settings_list_schemas ();
-+        for (s = schemas; *s; ++s)
-+                if (g_str_equal (*s, name))
-+                        return TRUE;
-+
-+        return FALSE;
-+}
-+
-+#ifdef HAVE_IBUS
-+static void
-+clear_ibus (CsdKeyboardManager *manager)
-+{
-+        CsdKeyboardManagerPrivate *priv = manager->priv;
-+
-+        g_cancellable_cancel (priv->ibus_cancellable);
-+        g_clear_object (&priv->ibus_cancellable);
-+        g_clear_pointer (&priv->ibus_engines, g_hash_table_destroy);
-+        g_clear_pointer (&priv->ibus_xkb_engines, g_hash_table_destroy);
-+        g_clear_object (&priv->ibus);
-+}
-+
-+static gchar *
-+make_xkb_source_id (const gchar *engine_id)
-+{
-+        gchar *id;
-+        gchar *p;
-+        gint n_colons = 0;
-+
-+        /* engine_id is like "xkb:layout:variant:lang" where
-+         * 'variant' and 'lang' might be empty */
-+
-+        engine_id += 4;
-+
-+        for (p = (gchar *)engine_id; *p; ++p)
-+                if (*p == ':')
-+                        if (++n_colons == 2)
-+                                break;
-+        if (!*p)
-+                return NULL;
-+
-+        id = g_strndup (engine_id, p - engine_id + 1);
-+
-+        id[p - engine_id] = '\0';
-+
-+        /* id is "layout:variant" where 'variant' might be empty */
-+
-+        for (p = id; *p; ++p)
-+                if (*p == ':') {
-+                        if (*(p + 1) == '\0')
-+                                *p = '\0';
-+                        else
-+                                *p = '+';
-+                        break;
-+                }
-+
-+        /* id is "layout+variant" or "layout" */
-+
-+        return id;
-+}
-+
-+static void
-+fetch_ibus_engines_result (GObject            *object,
-+                           GAsyncResult       *result,
-+                           CsdKeyboardManager *manager)
-+{
-+        CsdKeyboardManagerPrivate *priv = manager->priv;
-+        GList *list, *l;
-+        GError *error = NULL;
-+
-+        /* engines shouldn't be there yet */
-+        g_return_if_fail (priv->ibus_engines == NULL);
-+
-+        g_clear_object (&priv->ibus_cancellable);
-+
-+        list = ibus_bus_list_engines_async_finish (priv->ibus,
-+                                                   result,
-+                                                   &error);
-+        if (!list && error) {
-+                if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
-+                        g_warning ("Couldn't finish IBus request: %s", error->message);
-+                g_error_free (error);
-+
-+                clear_ibus (manager);
-+                return;
-+        }
-+
-+        /* Maps IBus engine ids to engine description objects */
-+        priv->ibus_engines = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, g_object_unref);
-+        /* Maps XKB source id strings to engine description objects */
-+        priv->ibus_xkb_engines = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
-+
-+        for (l = list; l; l = l->next) {
-+                IBusEngineDesc *engine = l->data;
-+                const gchar *engine_id = ibus_engine_desc_get_name (engine);
-+
-+                g_hash_table_replace (priv->ibus_engines, (gpointer)engine_id, engine);
-+
-+                if (strncmp ("xkb:", engine_id, 4) == 0) {
-+                        gchar *xkb_source_id = make_xkb_source_id (engine_id);
-+                        if (xkb_source_id)
-+                                g_hash_table_replace (priv->ibus_xkb_engines,
-+                                                      xkb_source_id,
-+                                                      engine);
-+                }
-+        }
-+        g_list_free (list);
-+
-+        apply_input_sources_settings (priv->input_sources_settings, NULL, 0, manager);
-+}
-+
-+static void
-+fetch_ibus_engines (CsdKeyboardManager *manager)
-+{
-+        CsdKeyboardManagerPrivate *priv = manager->priv;
-+
-+        /* engines shouldn't be there yet */
-+        g_return_if_fail (priv->ibus_engines == NULL);
-+        g_return_if_fail (priv->ibus_cancellable == NULL);
-+
-+        priv->ibus_cancellable = g_cancellable_new ();
-+
-+        ibus_bus_list_engines_async (priv->ibus,
-+                                     -1,
-+                                     priv->ibus_cancellable,
-+                                     (GAsyncReadyCallback)fetch_ibus_engines_result,
-+                                     manager);
-+}
-+
-+static void
-+maybe_start_ibus (CsdKeyboardManager *manager,
-+                  GVariant           *sources)
-+{
-+        gboolean need_ibus = FALSE;
-+        GVariantIter iter;
-+        const gchar *type;
-+
-+        if (manager->priv->session_is_fallback)
-+                return;
-+
-+        g_variant_iter_init (&iter, sources);
-+        while (g_variant_iter_next (&iter, "(&s&s)", &type, NULL))
-+                if (g_str_equal (type, INPUT_SOURCE_TYPE_IBUS)) {
-+                        need_ibus = TRUE;
-+                        break;
-+                }
-+
-+        if (!need_ibus)
-+                return;
-+
-+        if (!manager->priv->ibus) {
-+                ibus_init ();
-+                manager->priv->ibus = ibus_bus_new ();
-+                g_signal_connect_swapped (manager->priv->ibus, "connected",
-+                                          G_CALLBACK (fetch_ibus_engines), manager);
-+                g_signal_connect_swapped (manager->priv->ibus, "disconnected",
-+                                          G_CALLBACK (clear_ibus), manager);
-+        }
-+        /* IBus doesn't export API in the session bus. The only thing
-+         * we have there is a well known name which we can use as a
-+         * sure-fire way to activate it. */
-+        g_bus_unwatch_name (g_bus_watch_name (G_BUS_TYPE_SESSION,
-+                                              IBUS_SERVICE_IBUS,
-+                                              G_BUS_NAME_WATCHER_FLAGS_AUTO_START,
-+                                              NULL,
-+                                              NULL,
-+                                              NULL,
-+                                              NULL));
-+}
-+
-+static void
-+got_session_name (GObject            *object,
-+                  GAsyncResult       *res,
-+                  CsdKeyboardManager *manager)
-+{
-+        GVariant *result, *variant;
-+        GDBusConnection *connection = G_DBUS_CONNECTION (object);
-+        CsdKeyboardManagerPrivate *priv = manager->priv;
-+        const gchar *session_name = NULL;
-+        GError *error = NULL;
-+
-+        /* IBus shouldn't have been touched yet */
-+        g_return_if_fail (priv->ibus == NULL);
-+
-+        g_clear_object (&priv->ibus_cancellable);
-+
-+        result = g_dbus_connection_call_finish (connection, res, &error);
-+        if (!result) {
-+                g_warning ("Couldn't get session name: %s", error->message);
-+                g_error_free (error);
-+                goto out;
-+        }
-+
-+        g_variant_get (result, "(v)", &variant);
-+        g_variant_unref (result);
-+
-+        g_variant_get (variant, "&s", &session_name);
-+
-+        if (g_strcmp0 (session_name, "gnome") == 0)
-+                manager->priv->session_is_fallback = FALSE;
-+
-+        g_variant_unref (variant);
-+ out:
-+        apply_input_sources_settings (manager->priv->input_sources_settings, NULL, 0, manager);
-+        g_object_unref (connection);
-+}
-+
-+static void
-+got_bus (GObject            *object,
-+         GAsyncResult       *res,
-+         CsdKeyboardManager *manager)
-+{
-+        GDBusConnection *connection;
-+        CsdKeyboardManagerPrivate *priv = manager->priv;
-+        GError *error = NULL;
-+
-+        /* IBus shouldn't have been touched yet */
-+        g_return_if_fail (priv->ibus == NULL);
-+
-+        g_clear_object (&priv->ibus_cancellable);
-+
-+        connection = g_bus_get_finish (res, &error);
-+        if (!connection) {
-+                g_warning ("Couldn't get session bus: %s", error->message);
-+                g_error_free (error);
-+                apply_input_sources_settings (priv->input_sources_settings, NULL, 0, manager);
-+                return;
-+        }
-+
-+        priv->ibus_cancellable = g_cancellable_new ();
-+
-+        g_dbus_connection_call (connection,
-+                                "org.gnome.SessionManager",
-+                                "/org/gnome/SessionManager",
-+                                "org.freedesktop.DBus.Properties",
-+                                "Get",
-+                                g_variant_new ("(ss)",
-+                                               "org.gnome.SessionManager",
-+                                               "SessionName"),
-+                                NULL,
-+                                G_DBUS_CALL_FLAGS_NONE,
-+                                -1,
-+                                priv->ibus_cancellable,
-+                                (GAsyncReadyCallback)got_session_name,
-+                                manager);
-+}
-+
-+static void
-+set_ibus_engine_finish (GObject            *object,
-+                        GAsyncResult       *res,
-+                        CsdKeyboardManager *manager)
-+{
-+        gboolean result;
-+        IBusBus *ibus = IBUS_BUS (object);
-+        CsdKeyboardManagerPrivate *priv = manager->priv;
-+        GError *error = NULL;
-+
-+        g_clear_object (&priv->ibus_cancellable);
-+
-+        result = ibus_bus_set_global_engine_async_finish (ibus, res, &error);
-+        if (!result) {
-+                if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
-+                        g_warning ("Couldn't set IBus engine: %s", error->message);
-+                g_error_free (error);
-+        }
-+}
-+
-+static void
-+set_ibus_engine (CsdKeyboardManager *manager,
-+                 const gchar        *engine_id)
-+{
-+        CsdKeyboardManagerPrivate *priv = manager->priv;
-+
-+        g_return_if_fail (priv->ibus != NULL);
-+        g_return_if_fail (priv->ibus_engines != NULL);
-+
-+        g_cancellable_cancel (priv->ibus_cancellable);
-+        g_clear_object (&priv->ibus_cancellable);
-+        priv->ibus_cancellable = g_cancellable_new ();
-+
-+        ibus_bus_set_global_engine_async (priv->ibus,
-+                                          engine_id,
-+                                          -1,
-+                                          priv->ibus_cancellable,
-+                                          (GAsyncReadyCallback)set_ibus_engine_finish,
-+                                          manager);
-+}
-+
-+static void
-+set_ibus_xkb_engine (CsdKeyboardManager *manager,
-+                     const gchar        *xkb_id)
-+{
-+        IBusEngineDesc *engine;
-+        CsdKeyboardManagerPrivate *priv = manager->priv;
-+
-+        if (!priv->ibus_xkb_engines)
-+                return;
-+
-+        engine = g_hash_table_lookup (priv->ibus_xkb_engines, xkb_id);
-+        if (!engine)
-+                return;
-+
-+        set_ibus_engine (manager, ibus_engine_desc_get_name (engine));
-+}
-+
-+/* XXX: See upstream bug:
-+ * https://codereview.appspot.com/6586075/ */
-+static gchar *
-+layout_from_ibus_layout (const gchar *ibus_layout)
-+{
-+        const gchar *p;
-+
-+        /* we get something like "layout(variant)[option1,option2]" */
-+
-+        p = ibus_layout;
-+        while (*p) {
-+                if (*p == '(' || *p == '[')
-+                        break;
-+                p += 1;
-+        }
-+
-+        return g_strndup (ibus_layout, p - ibus_layout);
-+}
-+
-+static gchar *
-+variant_from_ibus_layout (const gchar *ibus_layout)
-+{
-+        const gchar *a, *b;
-+
-+        /* we get something like "layout(variant)[option1,option2]" */
-+
-+        a = ibus_layout;
-+        while (*a) {
-+                if (*a == '(')
-+                        break;
-+                a += 1;
-+        }
-+        if (!*a)
-+                return NULL;
-+
-+        a += 1;
-+        b = a;
-+        while (*b) {
-+                if (*b == ')')
-+                        break;
-+                b += 1;
-+        }
-+        if (!*b)
-+                return NULL;
-+
-+        return g_strndup (a, b - a);
-+}
-+
-+static gchar **
-+options_from_ibus_layout (const gchar *ibus_layout)
-+{
-+        const gchar *a, *b;
-+        GPtrArray *opt_array;
-+
-+        /* we get something like "layout(variant)[option1,option2]" */
-+
-+        a = ibus_layout;
-+        while (*a) {
-+                if (*a == '[')
-+                        break;
-+                a += 1;
-+        }
-+        if (!*a)
-+                return NULL;
-+
-+        opt_array = g_ptr_array_new ();
-+
-+        do {
-+                a += 1;
-+                b = a;
-+                while (*b) {
-+                        if (*b == ',' || *b == ']')
-+                                break;
-+                        b += 1;
-+                }
-+                if (!*b)
-+                        goto out;
-+
-+                g_ptr_array_add (opt_array, g_strndup (a, b - a));
-+
-+                a = b;
-+        } while (*a && *a == ',');
-+
-+out:
-+        g_ptr_array_add (opt_array, NULL);
-+        return (gchar **) g_ptr_array_free (opt_array, FALSE);
-+}
-+
-+static const gchar *
-+engine_from_locale (void)
-+{
-+        const gchar *locale;
-+        const gchar *locale_engine[][2] = {
-+                { "as_IN", "m17n:as:phonetic" },
-+                { "bn_IN", "m17n:bn:inscript" },
-+                { "gu_IN", "m17n:gu:inscript" },
-+                { "hi_IN", "m17n:hi:inscript" },
-+                { "ja_JP", "anthy" },
-+                { "kn_IN", "m17n:kn:kgp" },
-+                { "ko_KR", "hangul" },
-+                { "mai_IN", "m17n:mai:inscript" },
-+                { "ml_IN", "m17n:ml:inscript" },
-+                { "mr_IN", "m17n:mr:inscript" },
-+                { "or_IN", "m17n:or:inscript" },
-+                { "pa_IN", "m17n:pa:inscript" },
-+                { "sd_IN", "m17n:sd:inscript" },
-+                { "ta_IN", "m17n:ta:tamil99" },
-+                { "te_IN", "m17n:te:inscript" },
-+                { "zh_CN", "pinyin" },
-+                { "zh_HK", "cangjie3" },
-+                { "zh_TW", "chewing" },
-+        };
-+        gint i;
-+
-+        locale = setlocale (LC_CTYPE, NULL);
-+        if (!locale)
-+                return NULL;
-+
-+        for (i = 0; i < G_N_ELEMENTS (locale_engine); ++i)
-+                if (g_str_has_prefix (locale, locale_engine[i][0]))
-+                        return locale_engine[i][1];
-+
-+        return NULL;
-+}
-+
-+static void
-+add_ibus_sources_from_locale (GSettings *settings)
-+{
-+        const gchar *locale_engine;
-+        GVariantBuilder builder;
-+
-+        locale_engine = engine_from_locale ();
-+        if (!locale_engine)
-+                return;
-+
-+        init_builder_with_sources (&builder, settings);
-+        g_variant_builder_add (&builder, "(ss)", INPUT_SOURCE_TYPE_IBUS, locale_engine);
-+        g_settings_set_value (settings, KEY_INPUT_SOURCES, g_variant_builder_end (&builder));
-+}
-+
-+static void
-+convert_ibus (GSettings *settings)
-+{
-+        GVariantBuilder builder;
-+        GSettings *ibus_settings;
-+        gchar **engines, **e;
-+
-+        if (!schema_is_installed ("org.freedesktop.ibus.general"))
-+                return;
-+
-+        init_builder_with_sources (&builder, settings);
-+
-+        ibus_settings = g_settings_new ("org.freedesktop.ibus.general");
-+        engines = g_settings_get_strv (ibus_settings, "preload-engines");
-+        for (e = engines; *e; ++e) {
-+                if (g_str_has_prefix (*e, "xkb:"))
-+                        continue;
-+                g_variant_builder_add (&builder, "(ss)", INPUT_SOURCE_TYPE_IBUS, *e);
-+        }
-+
-+        g_settings_set_value (settings, KEY_INPUT_SOURCES, g_variant_builder_end (&builder));
-+
-+        g_strfreev (engines);
-+        g_object_unref (ibus_settings);
-+}
-+#endif  /* HAVE_IBUS */
-+
- static gboolean
- xkb_set_keyboard_autorepeat_rate (guint delay, guint interval)
- {
-@@ -97,32 +634,33 @@ xkb_set_keyboard_autorepeat_rate (guint
-                                      interval);
- }
- 
--static void
--numlock_xkb_init (CsdKeyboardManager *manager)
-+static gboolean
-+check_xkb_extension (CsdKeyboardManager *manager)
- {
-         Display *dpy = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
--        gboolean have_xkb;
-         int opcode, error_base, major, minor;
-+        gboolean have_xkb;
- 
-         have_xkb = XkbQueryExtension (dpy,
-                                       &opcode,
-                                       &manager->priv->xkb_event_base,
-                                       &error_base,
-                                       &major,
--                                      &minor)
--                && XkbUseExtension (dpy, &major, &minor);
-+                                      &minor);
-+        return have_xkb;
-+}
- 
--        if (have_xkb) {
--                XkbSelectEventDetails (dpy,
--                                       XkbUseCoreKbd,
--                                       XkbStateNotifyMask,
--                                       XkbModifierLockMask,
--                                       XkbModifierLockMask);
--        } else {
--                g_warning ("XKB extension not available");
--        }
-+static void
-+xkb_init (CsdKeyboardManager *manager)
-+{
-+        Display *dpy;
- 
--        manager->priv->have_xkb = have_xkb;
-+        dpy = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
-+        XkbSelectEventDetails (dpy,
-+                               XkbUseCoreKbd,
-+                               XkbStateNotify,
-+                               XkbModifierLockMask,
-+                               XkbModifierLockMask);
- }
- 
- static unsigned
-@@ -143,19 +681,32 @@ numlock_set_xkb_state (CsdNumLockState n
-         XkbLockModifiers (dpy, XkbUseCoreKbd, num_mask, new_state == CSD_NUM_LOCK_STATE_ON ? num_mask : 0);
- }
- 
-+static const char *
-+num_lock_state_to_string (CsdNumLockState numlock_state)
-+{
-+	switch (numlock_state) {
-+	case CSD_NUM_LOCK_STATE_UNKNOWN:
-+		return "CSD_NUM_LOCK_STATE_UNKNOWN";
-+	case CSD_NUM_LOCK_STATE_ON:
-+		return "CSD_NUM_LOCK_STATE_ON";
-+	case CSD_NUM_LOCK_STATE_OFF:
-+		return "CSD_NUM_LOCK_STATE_OFF";
-+	default:
-+		return "UNKNOWN";
-+	}
-+}
-+
- static GdkFilterReturn
--numlock_xkb_callback (GdkXEvent *xev_,
--                      GdkEvent  *gdkev_,
--                      gpointer   user_data)
-+xkb_events_filter (GdkXEvent *xev_,
-+		   GdkEvent  *gdkev_,
-+		   gpointer   user_data)
- {
-         XEvent *xev = (XEvent *) xev_;
- 	XkbEvent *xkbev = (XkbEvent *) xev;
-         CsdKeyboardManager *manager = (CsdKeyboardManager *) user_data;
- 
--        if (xev->type != manager->priv->xkb_event_base)
--		return GDK_FILTER_CONTINUE;
--
--	if (xkbev->any.xkb_type != XkbStateNotify)
-+        if (xev->type != manager->priv->xkb_event_base ||
-+            xkbev->any.xkb_type != XkbStateNotify)
- 		return GDK_FILTER_CONTINUE;
- 
- 	if (xkbev->state.changed & XkbModifierLockMask) {
-@@ -166,6 +717,9 @@ numlock_xkb_callback (GdkXEvent *xev_,
- 		numlock_state = (num_mask & locked_mods) ? CSD_NUM_LOCK_STATE_ON : CSD_NUM_LOCK_STATE_OFF;
- 
- 		if (numlock_state != manager->priv->old_state) {
-+			g_debug ("New num-lock state '%s' != Old num-lock state '%s'",
-+				 num_lock_state_to_string (numlock_state),
-+				 num_lock_state_to_string (manager->priv->old_state));
- 			g_settings_set_enum (manager->priv->settings,
- 					     KEY_NUMLOCK_STATE,
- 					     numlock_state);
-@@ -177,57 +731,509 @@ numlock_xkb_callback (GdkXEvent *xev_,
- }
- 
- static void
--numlock_install_xkb_callback (CsdKeyboardManager *manager)
-+install_xkb_filter (CsdKeyboardManager *manager)
- {
--        if (!manager->priv->have_xkb)
--                return;
--
-         gdk_window_add_filter (NULL,
--                               numlock_xkb_callback,
-+                               xkb_events_filter,
-                                manager);
- }
- 
--static guint
--_csd_settings_get_uint (GSettings  *settings,
--			const char *key)
-+static void
-+remove_xkb_filter (CsdKeyboardManager *manager)
- {
--	guint value;
-+        gdk_window_remove_filter (NULL,
-+                                  xkb_events_filter,
-+                                  manager);
-+}
- 
--	g_settings_get (settings, key, "u", &value);
--	return value;
-+static void
-+free_xkb_component_names (XkbComponentNamesRec *p)
-+{
-+        g_return_if_fail (p != NULL);
-+
-+        free (p->keymap);
-+        free (p->keycodes);
-+        free (p->types);
-+        free (p->compat);
-+        free (p->symbols);
-+        free (p->geometry);
-+
-+        g_free (p);
-+}
-+
-+static void
-+upload_xkb_description (const gchar          *rules_file_path,
-+                        XkbRF_VarDefsRec     *var_defs,
-+                        XkbComponentNamesRec *comp_names)
-+{
-+        Display *display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
-+        XkbDescRec *xkb_desc;
-+        gchar *rules_file;
-+
-+        /* Upload it to the X server using the same method as setxkbmap */
-+        xkb_desc = XkbGetKeyboardByName (display,
-+                                         XkbUseCoreKbd,
-+                                         comp_names,
-+                                         XkbGBN_AllComponentsMask,
-+                                         XkbGBN_AllComponentsMask &
-+                                         (~XkbGBN_GeometryMask), True);
-+        if (!xkb_desc) {
-+                g_warning ("Couldn't upload new XKB keyboard description");
-+                return;
-+        }
-+
-+        XkbFreeKeyboard (xkb_desc, 0, True);
-+
-+        rules_file = g_path_get_basename (rules_file_path);
-+
-+        if (!XkbRF_SetNamesProp (display, rules_file, var_defs))
-+                g_warning ("Couldn't update the XKB root window property");
-+
-+        g_free (rules_file);
-+}
-+
-+static gchar *
-+language_code_from_locale (const gchar *locale)
-+{
-+        if (!locale || !locale[0] || !locale[1])
-+                return NULL;
-+
-+        if (!locale[2] || locale[2] == '_' || locale[2] == '.')
-+                return g_strndup (locale, 2);
-+
-+        if (!locale[3] || locale[3] == '_' || locale[3] == '.')
-+                return g_strndup (locale, 3);
-+
-+        return NULL;
-+}
-+
-+static gchar *
-+build_xkb_group_string (const gchar *user,
-+                        const gchar *locale,
-+                        const gchar *latin)
-+{
-+        gchar *string;
-+        gsize length = 0;
-+        guint commas = 2;
-+
-+        if (latin)
-+                length += strlen (latin);
-+        else
-+                commas -= 1;
-+
-+        if (locale)
-+                length += strlen (locale);
-+        else
-+                commas -= 1;
-+
-+        length += strlen (user) + commas + 1;
-+
-+        string = malloc (length);
-+
-+        if (locale && latin)
-+                sprintf (string, "%s,%s,%s", user, locale, latin);
-+        else if (locale)
-+                sprintf (string, "%s,%s", user, locale);
-+        else if (latin)
-+                sprintf (string, "%s,%s", user, latin);
-+        else
-+                sprintf (string, "%s", user);
-+
-+        return string;
-+}
-+
-+static gboolean
-+layout_equal (const gchar *layout_a,
-+              const gchar *variant_a,
-+              const gchar *layout_b,
-+              const gchar *variant_b)
-+{
-+        return !g_strcmp0 (layout_a, layout_b) && !g_strcmp0 (variant_a, variant_b);
- }
- 
- static void
--apply_settings (GSettings          *settings,
--                const char         *key,
--                CsdKeyboardManager *manager)
-+replace_layout_and_variant (CsdKeyboardManager *manager,
-+                            XkbRF_VarDefsRec   *xkb_var_defs,
-+                            const gchar        *layout,
-+                            const gchar        *variant)
- {
-+        /* Toolkits need to know about both a latin layout to handle
-+         * accelerators which are usually defined like Ctrl+C and a
-+         * layout with the symbols for the language used in UI strings
-+         * to handle mnemonics like Alt+Ф, so we try to find and add
-+         * them in XKB group slots after the layout which the user
-+         * actually intends to type with. */
-+        const gchar *latin_layout = "us";
-+        const gchar *latin_variant = "";
-+        const gchar *locale_layout = NULL;
-+        const gchar *locale_variant = NULL;
-+        const gchar *locale;
-+        gchar *language;
-+
-+        if (!layout)
-+                return;
-+
-+        if (!variant)
-+                variant = "";
-+
-+        locale = setlocale (LC_MESSAGES, NULL);
-+        /* If LANG is empty, default to en_US */
-+        if (!locale)
-+                language = g_strdup (DEFAULT_LANGUAGE);
-+        else
-+                language = language_code_from_locale (locale);
-+
-+        if (!language)
-+                language = language_code_from_locale (DEFAULT_LANGUAGE);
-+
-+        gnome_xkb_info_get_layout_info_for_language (manager->priv->xkb_info,
-+                                                     language,
-+                                                     NULL,
-+                                                     NULL,
-+                                                     NULL,
-+                                                     &locale_layout,
-+                                                     &locale_variant);
-+        g_free (language);
-+
-+        /* We want to minimize the number of XKB groups if we have
-+         * duplicated layout+variant pairs.
-+         *
-+         * Also, if a layout doesn't have a variant we still have to
-+         * include it in the variants string because the number of
-+         * variants must agree with the number of layouts. For
-+         * instance:
-+         *
-+         * layouts:  "us,ru,us"
-+         * variants: "dvorak,,"
-+         */
-+        if (layout_equal (latin_layout, latin_variant, locale_layout, locale_variant) ||
-+            layout_equal (latin_layout, latin_variant, layout, variant)) {
-+                latin_layout = NULL;
-+                latin_variant = NULL;
-+        }
-+
-+        if (layout_equal (locale_layout, locale_variant, layout, variant)) {
-+                locale_layout = NULL;
-+                locale_variant = NULL;
-+        }
-+
-+        free (xkb_var_defs->layout);
-+        xkb_var_defs->layout = build_xkb_group_string (layout, locale_layout, latin_layout);
-+
-+        free (xkb_var_defs->variant);
-+        xkb_var_defs->variant = build_xkb_group_string (variant, locale_variant, latin_variant);
-+}
-+
-+static gchar *
-+build_xkb_options_string (gchar **options)
-+{
-+        gchar *string;
-+
-+        if (*options) {
-+                gint i;
-+                gsize len;
-+                gchar *ptr;
-+
-+                /* First part, getting length */
-+                len = 1 + strlen (options[0]);
-+                for (i = 1; options[i] != NULL; i++)
-+                        len += strlen (options[i]);
-+                len += (i - 1); /* commas */
-+
-+                /* Second part, building string */
-+                string = malloc (len);
-+                ptr = g_stpcpy (string, *options);
-+                for (i = 1; options[i] != NULL; i++) {
-+                        ptr = g_stpcpy (ptr, ",");
-+                        ptr = g_stpcpy (ptr, options[i]);
-+                }
-+        } else {
-+                string = malloc (1);
-+                *string = '\0';
-+        }
-+
-+        return string;
-+}
-+
-+static gchar **
-+append_options (gchar **a,
-+                gchar **b)
-+{
-+        gchar **c, **p;
-+
-+        if (!a && !b)
-+                return NULL;
-+        else if (!a)
-+                return g_strdupv (b);
-+        else if (!b)
-+                return g_strdupv (a);
-+
-+        c = g_new0 (gchar *, g_strv_length (a) + g_strv_length (b) + 1);
-+        p = c;
-+
-+        while (*a) {
-+                *p = g_strdup (*a);
-+                p += 1;
-+                a += 1;
-+        }
-+        while (*b) {
-+                *p = g_strdup (*b);
-+                p += 1;
-+                b += 1;
-+        }
-+
-+        return c;
-+}
-+
-+static void
-+add_xkb_options (CsdKeyboardManager *manager,
-+                 XkbRF_VarDefsRec   *xkb_var_defs,
-+                 gchar             **extra_options)
-+{
-+        gchar **options;
-+        gchar **settings_options;
-+
-+        settings_options = g_settings_get_strv (manager->priv->input_sources_settings,
-+                                                KEY_KEYBOARD_OPTIONS);
-+        options = append_options (settings_options, extra_options);
-+        g_strfreev (settings_options);
-+
-+        free (xkb_var_defs->options);
-+        xkb_var_defs->options = build_xkb_options_string (options);
-+
-+        g_strfreev (options);
-+}
-+
-+static void
-+apply_xkb_settings (CsdKeyboardManager *manager,
-+                    const gchar        *layout,
-+                    const gchar        *variant,
-+                    gchar             **options)
-+{
-+        XkbRF_RulesRec *xkb_rules;
-+        XkbRF_VarDefsRec *xkb_var_defs;
-+        gchar *rules_file_path;
-+
-+        gnome_xkb_info_get_var_defs (&rules_file_path, &xkb_var_defs);
-+
-+        add_xkb_options (manager, xkb_var_defs, options);
-+        replace_layout_and_variant (manager, xkb_var_defs, layout, variant);
-+
-+        gdk_error_trap_push ();
-+
-+        xkb_rules = XkbRF_Load (rules_file_path, NULL, True, True);
-+        if (xkb_rules) {
-+                XkbComponentNamesRec *xkb_comp_names;
-+                xkb_comp_names = g_new0 (XkbComponentNamesRec, 1);
-+
-+                XkbRF_GetComponents (xkb_rules, xkb_var_defs, xkb_comp_names);
-+                upload_xkb_description (rules_file_path, xkb_var_defs, xkb_comp_names);
-+
-+                free_xkb_component_names (xkb_comp_names);
-+                XkbRF_Free (xkb_rules, True);
-+        } else {
-+                g_warning ("Couldn't load XKB rules");
-+        }
-+
-+        if (gdk_error_trap_pop ())
-+                g_warning ("Error loading XKB rules");
-+
-+        gnome_xkb_info_free_var_defs (xkb_var_defs);
-+        g_free (rules_file_path);
-+}
-+
-+static void
-+set_gtk_im_module (CsdKeyboardManager *manager,
-+                   const gchar        *new_module)
-+{
-+        CsdKeyboardManagerPrivate *priv = manager->priv;
-+        gchar *current_module;
-+
-+        current_module = g_settings_get_string (priv->interface_settings,
-+                                                KEY_GTK_IM_MODULE);
-+        if (!g_str_equal (current_module, new_module))
-+                g_settings_set_string (priv->interface_settings,
-+                                       KEY_GTK_IM_MODULE,
-+                                       new_module);
-+        g_free (current_module);
-+}
-+
-+static gboolean
-+apply_input_sources_settings (GSettings          *settings,
-+                              gpointer            keys,
-+                              gint                n_keys,
-+                              CsdKeyboardManager *manager)
-+{
-+        CsdKeyboardManagerPrivate *priv = manager->priv;
-+        GVariant *sources;
-+        guint current;
-+        guint n_sources;
-+        const gchar *type = NULL;
-+        const gchar *id = NULL;
-+        gchar *layout = NULL;
-+        gchar *variant = NULL;
-+        gchar **options = NULL;
-+
-+        sources = g_settings_get_value (priv->input_sources_settings, KEY_INPUT_SOURCES);
-+        current = g_settings_get_uint (priv->input_sources_settings, KEY_CURRENT_INPUT_SOURCE);
-+        n_sources = g_variant_n_children (sources);
-+
-+        if (n_sources < 1)
-+                goto exit;
-+
-+        if (current >= n_sources) {
-+                g_settings_set_uint (priv->input_sources_settings,
-+                                     KEY_CURRENT_INPUT_SOURCE,
-+                                     n_sources - 1);
-+                goto exit;
-+        }
-+
-+#ifdef HAVE_IBUS
-+        maybe_start_ibus (manager, sources);
-+#endif
-+
-+        g_variant_get_child (sources, current, "(&s&s)", &type, &id);
-+
-+        if (g_str_equal (type, INPUT_SOURCE_TYPE_XKB)) {
-+                const gchar *l, *v;
-+                gnome_xkb_info_get_layout_info (priv->xkb_info, id, NULL, NULL, &l, &v);
-+
-+                layout = g_strdup (l);
-+                variant = g_strdup (v);
-+
-+                if (!layout || !layout[0]) {
-+                        g_warning ("Couldn't find XKB input source '%s'", id);
-+                        goto exit;
-+                }
-+                set_gtk_im_module (manager, GTK_IM_MODULE_SIMPLE);
-+#ifdef HAVE_IBUS
-+                set_ibus_xkb_engine (manager, id);
-+#endif
-+        } else if (g_str_equal (type, INPUT_SOURCE_TYPE_IBUS)) {
-+#ifdef HAVE_IBUS
-+                IBusEngineDesc *engine_desc = NULL;
-+
-+                if (priv->session_is_fallback)
-+                        goto exit;
-+
-+                if (priv->ibus_engines)
-+                        engine_desc = g_hash_table_lookup (priv->ibus_engines, id);
-+                else
-+                        goto exit; /* we'll be called again when ibus is up and running */
-+
-+                if (engine_desc) {
-+                        const gchar *ibus_layout;
-+                        ibus_layout = ibus_engine_desc_get_layout (engine_desc);
-+
-+                        if (ibus_layout) {
-+                                layout = layout_from_ibus_layout (ibus_layout);
-+                                variant = variant_from_ibus_layout (ibus_layout);
-+                                options = options_from_ibus_layout (ibus_layout);
-+                        }
-+                } else {
-+                        g_warning ("Couldn't find IBus input source '%s'", id);
-+                        goto exit;
-+                }
-+
-+                set_gtk_im_module (manager, GTK_IM_MODULE_IBUS);
-+                set_ibus_engine (manager, id);
-+#else
-+                g_warning ("IBus input source type specified but IBus support was not compiled");
-+#endif
-+        } else {
-+                g_warning ("Unknown input source type '%s'", type);
-+        }
-+
-+ exit:
-+        apply_xkb_settings (manager, layout, variant, options);
-+        g_variant_unref (sources);
-+        g_free (layout);
-+        g_free (variant);
-+        g_strfreev (options);
-+        /* Prevent individual "changed" signal invocations since we
-+           don't need them. */
-+        return TRUE;
-+}
-+
-+static void
-+apply_bell (CsdKeyboardManager *manager)
-+{
-+	GSettings       *settings;
-         XKeyboardControl kbdcontrol;
--        gboolean         repeat;
-         gboolean         click;
--        guint            interval;
--        guint            delay;
--        int              click_volume;
-         int              bell_volume;
-         int              bell_pitch;
-         int              bell_duration;
-         CsdBellMode      bell_mode;
--        gboolean         rnumlock;
--
--        if (g_strcmp0 (key, KEY_NUMLOCK_STATE) == 0)
--                return;
-+        int              click_volume;
- 
--        repeat        = g_settings_get_boolean  (settings, KEY_REPEAT);
-+        g_debug ("Applying the bell settings");
-+        settings      = manager->priv->settings;
-         click         = g_settings_get_boolean  (settings, KEY_CLICK);
--        interval      = _csd_settings_get_uint  (settings, KEY_INTERVAL);
--        delay         = _csd_settings_get_uint  (settings, KEY_DELAY);
-         click_volume  = g_settings_get_int   (settings, KEY_CLICK_VOLUME);
-+
-         bell_pitch    = g_settings_get_int   (settings, KEY_BELL_PITCH);
-         bell_duration = g_settings_get_int   (settings, KEY_BELL_DURATION);
- 
-         bell_mode = g_settings_get_enum (settings, KEY_BELL_MODE);
-         bell_volume   = (bell_mode == CSD_BELL_MODE_ON) ? 50 : 0;
- 
-+        /* as percentage from 0..100 inclusive */
-+        if (click_volume < 0) {
-+                click_volume = 0;
-+        } else if (click_volume > 100) {
-+                click_volume = 100;
-+        }
-+        kbdcontrol.key_click_percent = click ? click_volume : 0;
-+        kbdcontrol.bell_percent = bell_volume;
-+        kbdcontrol.bell_pitch = bell_pitch;
-+        kbdcontrol.bell_duration = bell_duration;
-+
-+        gdk_error_trap_push ();
-+        XChangeKeyboardControl (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
-+                                KBKeyClickPercent | KBBellPercent | KBBellPitch | KBBellDuration,
-+                                &kbdcontrol);
-+
-+        XSync (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE);
-+        gdk_error_trap_pop_ignored ();
-+}
-+
-+static void
-+apply_numlock (CsdKeyboardManager *manager)
-+{
-+	GSettings *settings;
-+        gboolean rnumlock;
-+
-+        g_debug ("Applying the num-lock settings");
-+        settings = manager->priv->settings;
-+        rnumlock = g_settings_get_boolean  (settings, KEY_REMEMBER_NUMLOCK_STATE);
-+        manager->priv->old_state = g_settings_get_enum (manager->priv->settings, KEY_NUMLOCK_STATE);
-+
-+        gdk_error_trap_push ();
-+        if (rnumlock) {
-+                g_debug ("Remember num-lock is set, so applying setting '%s'",
-+                         num_lock_state_to_string (manager->priv->old_state));
-+                numlock_set_xkb_state (manager->priv->old_state);
-+        }
-+
-+        XSync (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE);
-+        gdk_error_trap_pop_ignored ();
-+}
-+
-+static void
-+apply_repeat (CsdKeyboardManager *manager)
-+{
-+	GSettings       *settings;
-+        gboolean         repeat;
-+        guint            interval;
-+        guint            delay;
-+
-+        g_debug ("Applying the repeat settings");
-+        settings      = manager->priv->settings;
-+        repeat        = g_settings_get_boolean  (settings, KEY_REPEAT);
-+        interval      = g_settings_get_uint  (settings, KEY_INTERVAL);
-+        delay         = g_settings_get_uint  (settings, KEY_DELAY);
-+
-         gdk_error_trap_push ();
-         if (repeat) {
-                 gboolean rate_set = FALSE;
-@@ -243,124 +1249,319 @@ apply_settings (GSettings          *sett
-                 XAutoRepeatOff (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
-         }
- 
--        /* as percentage from 0..100 inclusive */
--        if (click_volume < 0) {
--                click_volume = 0;
--        } else if (click_volume > 100) {
--                click_volume = 100;
-+        XSync (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE);
-+        gdk_error_trap_pop_ignored ();
-+}
-+
-+static void
-+apply_all_settings (CsdKeyboardManager *manager)
-+{
-+	apply_repeat (manager);
-+	apply_bell (manager);
-+	apply_numlock (manager);
-+}
-+
-+static void
-+set_input_sources_switcher (CsdKeyboardManager *manager,
-+                            gboolean            state)
-+{
-+        if (state) {
-+                GError *error = NULL;
-+                char *args[2];
-+
-+                if (manager->priv->input_sources_switcher_spawned)
-+                        set_input_sources_switcher (manager, FALSE);
-+
-+                args[0] = LIBEXECDIR "/csd-input-sources-switcher";
-+                args[1] = NULL;
-+
-+                g_spawn_async (NULL, args, NULL,
-+                               0, NULL, NULL,
-+                               &manager->priv->input_sources_switcher_pid, &error);
-+
-+                manager->priv->input_sources_switcher_spawned = (error == NULL);
-+
-+                if (error) {
-+                        g_warning ("Couldn't spawn %s: %s", args[0], error->message);
-+                        g_error_free (error);
-+                }
-+        } else if (manager->priv->input_sources_switcher_spawned) {
-+                kill (manager->priv->input_sources_switcher_pid, SIGHUP);
-+                g_spawn_close_pid (manager->priv->input_sources_switcher_pid);
-+                manager->priv->input_sources_switcher_spawned = FALSE;
-         }
--        kbdcontrol.key_click_percent = click ? click_volume : 0;
--        kbdcontrol.bell_percent = bell_volume;
--        kbdcontrol.bell_pitch = bell_pitch;
--        kbdcontrol.bell_duration = bell_duration;
--        XChangeKeyboardControl (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
--                                KBKeyClickPercent | KBBellPercent | KBBellPitch | KBBellDuration,
--                                &kbdcontrol);
-+}
- 
--	if (g_strcmp0 (key, "remember-numlock-state") == 0 || key == NULL) {
--		rnumlock      = g_settings_get_boolean  (settings, "remember-numlock-state");
-+static gboolean
-+enable_switcher (CsdKeyboardManager *manager)
-+{
-+        CsdInputSourcesSwitcher switcher;
- 
--		manager->priv->old_state = g_settings_get_enum (manager->priv->settings, KEY_NUMLOCK_STATE);
-+        switcher = g_settings_get_enum (manager->priv->settings, KEY_SWITCHER);
- 
--		if (manager->priv->have_xkb && rnumlock)
--			numlock_set_xkb_state (manager->priv->old_state);
-+        return switcher != CSD_INPUT_SOURCES_SWITCHER_OFF;
-+}
-+
-+static void
-+settings_changed (GSettings          *settings,
-+                  const char         *key,
-+                  CsdKeyboardManager *manager)
-+{
-+	if (g_strcmp0 (key, KEY_CLICK) == 0||
-+	    g_strcmp0 (key, KEY_CLICK_VOLUME) == 0 ||
-+	    g_strcmp0 (key, KEY_BELL_PITCH) == 0 ||
-+	    g_strcmp0 (key, KEY_BELL_DURATION) == 0 ||
-+	    g_strcmp0 (key, KEY_BELL_MODE) == 0) {
-+		g_debug ("Bell setting '%s' changed, applying bell settings", key);
-+		apply_bell (manager);
-+	} else if (g_strcmp0 (key, KEY_REMEMBER_NUMLOCK_STATE) == 0) {
-+		g_debug ("Remember Num-Lock state '%s' changed, applying num-lock settings", key);
-+		apply_numlock (manager);
-+	} else if (g_strcmp0 (key, KEY_NUMLOCK_STATE) == 0) {
-+		g_debug ("Num-Lock state '%s' changed, will apply at next startup", key);
-+	} else if (g_strcmp0 (key, KEY_REPEAT) == 0 ||
-+		 g_strcmp0 (key, KEY_INTERVAL) == 0 ||
-+		 g_strcmp0 (key, KEY_DELAY) == 0) {
-+		g_debug ("Key repeat setting '%s' changed, applying key repeat settings", key);
-+		apply_repeat (manager);
-+        } else if (g_strcmp0 (key, KEY_SWITCHER) == 0) {
-+                set_input_sources_switcher (manager, enable_switcher (manager));
-+	} else {
-+		g_warning ("Unhandled settings change, key '%s'", key);
- 	}
- 
--        XSync (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE);
--        gdk_error_trap_pop_ignored ();
- }
- 
--void
--csd_keyboard_manager_apply_settings (CsdKeyboardManager *manager)
-+static void
-+device_added_cb (GdkDeviceManager   *device_manager,
-+                 GdkDevice          *device,
-+                 CsdKeyboardManager *manager)
- {
--        apply_settings (manager->priv->settings, NULL, manager);
-+        GdkInputSource source;
-+
-+        source = gdk_device_get_source (device);
-+        if (source == GDK_SOURCE_KEYBOARD) {
-+                g_debug ("New keyboard plugged in, applying all settings");
-+                apply_all_settings (manager);
-+                apply_input_sources_settings (manager->priv->input_sources_settings, NULL, 0, manager);
-+                run_custom_command (device, COMMAND_DEVICE_ADDED);
-+        }
- }
- 
- static void
--apply_libgnomekbd_settings (GSettings          *settings,
--                            const char         *key,
--                            CsdKeyboardManager *manager)
-+device_removed_cb (GdkDeviceManager   *device_manager,
-+                   GdkDevice          *device,
-+                   CsdKeyboardManager *manager)
- {
--        gchar **layouts;
-+        GdkInputSource source;
- 
--        layouts = g_settings_get_strv  (settings, LIBGNOMEKBD_KEY_LAYOUTS);
-+        source = gdk_device_get_source (device);
-+        if (source == GDK_SOURCE_KEYBOARD) {
-+                run_custom_command (device, COMMAND_DEVICE_REMOVED);
-+        }
-+}
- 
--        /* Get accounts daemon */
--        GDBusProxy *proxy = NULL;
--        GDBusProxy *user = NULL;
--        GVariant *variant = NULL;
--        GError *error = NULL;
--        gchar *object_path = NULL;
-+static void
-+set_devicepresence_handler (CsdKeyboardManager *manager)
-+{
-+        GdkDeviceManager *device_manager;
- 
--        proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
--                                               G_DBUS_PROXY_FLAGS_NONE,
--                                               NULL,
--                                               "org.freedesktop.Accounts",
--                                               "/org/freedesktop/Accounts",
--                                               "org.freedesktop.Accounts",
--                                               NULL,
--                                               &error);
-+        device_manager = gdk_display_get_device_manager (gdk_display_get_default ());
- 
--        if (proxy == NULL) {
--                g_warning ("Failed to contact accounts service: %s", error->message);
--                g_error_free (error);
--                goto bail;
-+        manager->priv->device_added_id = g_signal_connect (G_OBJECT (device_manager), "device-added",
-+                                                           G_CALLBACK (device_added_cb), manager);
-+        manager->priv->device_removed_id = g_signal_connect (G_OBJECT (device_manager), "device-removed",
-+                                                             G_CALLBACK (device_removed_cb), manager);
-+        manager->priv->device_manager = device_manager;
-+}
-+
-+static void
-+create_sources_from_current_xkb_config (GSettings *settings)
-+{
-+        GVariantBuilder builder;
-+        XkbRF_VarDefsRec *xkb_var_defs;
-+        gchar *tmp;
-+        gchar **layouts = NULL;
-+        gchar **variants = NULL;
-+        guint i, n;
-+
-+        gnome_xkb_info_get_var_defs (&tmp, &xkb_var_defs);
-+        g_free (tmp);
-+
-+        if (xkb_var_defs->layout)
-+                layouts = g_strsplit (xkb_var_defs->layout, ",", 0);
-+        if (xkb_var_defs->variant)
-+                variants = g_strsplit (xkb_var_defs->variant, ",", 0);
-+
-+        gnome_xkb_info_free_var_defs (xkb_var_defs);
-+
-+        if (!layouts)
-+                goto out;
-+
-+        if (variants && variants[0])
-+                n = MIN (g_strv_length (layouts), g_strv_length (variants));
-+        else
-+                n = g_strv_length (layouts);
-+
-+        g_variant_builder_init (&builder, G_VARIANT_TYPE ("a(ss)"));
-+        for (i = 0; i < n && layouts[i][0]; ++i) {
-+                if (variants && variants[i] && variants[i][0])
-+                        tmp = g_strdup_printf ("%s+%s", layouts[i], variants[i]);
-+                else
-+                        tmp = g_strdup (layouts[i]);
-+
-+                g_variant_builder_add (&builder, "(ss)", INPUT_SOURCE_TYPE_XKB, tmp);
-+                g_free (tmp);
-         }
-+        g_settings_set_value (settings, KEY_INPUT_SOURCES, g_variant_builder_end (&builder));
-+out:
-+        g_strfreev (layouts);
-+        g_strfreev (variants);
-+}
- 
--        variant = g_dbus_proxy_call_sync (proxy,
--                                          "FindUserByName",
--                                          g_variant_new ("(s)", g_get_user_name ()),
--                                          G_DBUS_CALL_FLAGS_NONE,
--                                          -1,
--                                          NULL,
--                                          &error);
-+static void
-+convert_libgnomekbd_options (GSettings *settings)
-+{
-+        GPtrArray *opt_array;
-+        GSettings *libgnomekbd_settings;
-+        gchar **options, **o;
- 
--        if (variant == NULL) {
--                g_warning ("Could not contact accounts service to look up '%s': %s",
--                           g_get_user_name (), error->message);
--                g_error_free (error);
--                goto bail;
-+        if (!schema_is_installed ("org.gnome.libgnomekbd.keyboard"))
-+                return;
-+
-+        opt_array = g_ptr_array_new_with_free_func (g_free);
-+
-+        libgnomekbd_settings = g_settings_new ("org.gnome.libgnomekbd.keyboard");
-+        options = g_settings_get_strv (libgnomekbd_settings, "options");
-+
-+        for (o = options; *o; ++o) {
-+                gchar **strv;
-+
-+                strv = g_strsplit (*o, "\t", 2);
-+                if (strv[0] && strv[1]) {
-+                        /* We don't want the group switcher because
-+                         * it's incompatible with the way we use XKB
-+                         * groups. */
-+                        if (!g_str_has_prefix (strv[1], "grp:"))
-+                                g_ptr_array_add (opt_array, g_strdup (strv[1]));
-+                }
-+                g_strfreev (strv);
-         }
-+        g_ptr_array_add (opt_array, NULL);
- 
--        g_variant_get (variant, "(o)", &object_path);
--        user = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
--                                              G_DBUS_PROXY_FLAGS_NONE,
--                                              NULL,
--                                              "org.freedesktop.Accounts",
--                                              object_path,
--                                              "org.freedesktop.Accounts.User",
--                                              NULL,
--                                              &error);
--        g_free (object_path);
-+        g_settings_set_strv (settings, KEY_KEYBOARD_OPTIONS, (const gchar * const*) opt_array->pdata);
- 
--        if (user == NULL) {
--                g_warning ("Could not create proxy for user '%s': %s",
--                           g_variant_get_string (variant, NULL), error->message);
--                g_error_free (error);
--                goto bail;
-+        g_strfreev (options);
-+        g_object_unref (libgnomekbd_settings);
-+        g_ptr_array_free (opt_array, TRUE);
-+}
-+
-+static void
-+convert_libgnomekbd_layouts (GSettings *settings)
-+{
-+        GVariantBuilder builder;
-+        GSettings *libgnomekbd_settings;
-+        gchar **layouts, **l;
-+
-+        if (!schema_is_installed ("org.gnome.libgnomekbd.keyboard"))
-+                return;
-+
-+        init_builder_with_sources (&builder, settings);
-+
-+        libgnomekbd_settings = g_settings_new ("org.gnome.libgnomekbd.keyboard");
-+        layouts = g_settings_get_strv (libgnomekbd_settings, "layouts");
-+
-+        for (l = layouts; *l; ++l) {
-+                gchar *id;
-+                gchar **strv;
-+
-+                strv = g_strsplit (*l, "\t", 2);
-+                if (strv[0] && !strv[1])
-+                        id = g_strdup (strv[0]);
-+                else if (strv[0] && strv[1])
-+                        id = g_strdup_printf ("%s+%s", strv[0], strv[1]);
-+                else
-+                        id = NULL;
-+
-+                if (id)
-+                        g_variant_builder_add (&builder, "(ss)", INPUT_SOURCE_TYPE_XKB, id);
-+
-+                g_free (id);
-+                g_strfreev (strv);
-         }
--        g_variant_unref (variant);
- 
--        variant = g_dbus_proxy_call_sync (user,
--                                          "SetXKeyboardLayouts",
--                                          g_variant_new ("(^as)", layouts),
--                                          G_DBUS_CALL_FLAGS_NONE,
--                                          -1,
--                                          NULL,
--                                          &error);
-+        g_settings_set_value (settings, KEY_INPUT_SOURCES, g_variant_builder_end (&builder));
-+
-+        g_strfreev (layouts);
-+        g_object_unref (libgnomekbd_settings);
-+}
- 
--        if (variant == NULL) {
--                g_warning ("Failed to set the keyboard layouts: %s", error->message);
-+static void
-+maybe_convert_old_settings (GSettings *settings)
-+{
-+        GVariant *sources;
-+        gchar **options;
-+        gchar *stamp_dir_path = NULL;
-+        gchar *stamp_file_path = NULL;
-+        GError *error = NULL;
-+
-+        stamp_dir_path = g_build_filename (g_get_user_data_dir (), PACKAGE_NAME, NULL);
-+        if (g_mkdir_with_parents (stamp_dir_path, 0755)) {
-+                g_warning ("Failed to create directory %s: %s", stamp_dir_path, g_strerror (errno));
-+                goto out;
-+        }
-+
-+        stamp_file_path = g_build_filename (stamp_dir_path, "input-sources-converted", NULL);
-+        if (g_file_test (stamp_file_path, G_FILE_TEST_EXISTS))
-+                goto out;
-+
-+        sources = g_settings_get_value (settings, KEY_INPUT_SOURCES);
-+        if (g_variant_n_children (sources) < 1) {
-+                convert_libgnomekbd_layouts (settings);
-+#ifdef HAVE_IBUS
-+                convert_ibus (settings);
-+#endif
-+        }
-+        g_variant_unref (sources);
-+
-+        options = g_settings_get_strv (settings, KEY_KEYBOARD_OPTIONS);
-+        if (g_strv_length (options) < 1)
-+                convert_libgnomekbd_options (settings);
-+        g_strfreev (options);
-+
-+        if (!g_file_set_contents (stamp_file_path, "", 0, &error)) {
-+                g_warning ("%s", error->message);
-                 g_error_free (error);
--                goto bail;
-         }
-+out:
-+        g_free (stamp_file_path);
-+        g_free (stamp_dir_path);
-+}
- 
--bail:
--        if (proxy != NULL)
--                g_object_unref (proxy);
--        if (variant != NULL)
--                g_variant_unref (variant);
--        g_strfreev (layouts);
-+static void
-+maybe_create_input_sources (CsdKeyboardManager *manager)
-+{
-+        GSettings *settings;
-+        GVariant *sources;
-+
-+        settings = manager->priv->input_sources_settings;
-+
-+        if (g_getenv ("RUNNING_UNDER_GDM")) {
-+                create_sources_from_current_xkb_config (settings);
-+                return;
-+        }
-+
-+        maybe_convert_old_settings (settings);
-+
-+        /* if we still don't have anything do some educated guesses */
-+        sources = g_settings_get_value (settings, KEY_INPUT_SOURCES);
-+        if (g_variant_n_children (sources) < 1) {
-+                create_sources_from_current_xkb_config (settings);
-+#ifdef HAVE_IBUS
-+                add_ibus_sources_from_locale (settings);
-+#endif
-+        }
-+        g_variant_unref (sources);
- }
- 
- static gboolean
-@@ -370,26 +1571,41 @@ start_keyboard_idle_cb (CsdKeyboardManag
- 
-         g_debug ("Starting keyboard manager");
- 
--        manager->priv->have_xkb = 0;
-         manager->priv->settings = g_settings_new (CSD_KEYBOARD_DIR);
--        manager->priv->libgnomekbd_settings = g_settings_new (LIBGNOMEKBD_KEYBOARD_DIR);
- 
--        /* Essential - xkb initialization should happen before */
--        csd_keyboard_xkb_init (manager);
-+	xkb_init (manager);
- 
--        numlock_xkb_init (manager);
-+	set_devicepresence_handler (manager);
- 
-+        manager->priv->input_sources_settings = g_settings_new (GNOME_DESKTOP_INPUT_SOURCES_DIR);
-+        manager->priv->interface_settings = g_settings_new (GNOME_DESKTOP_INTERFACE_DIR);
-+        manager->priv->xkb_info = gnome_xkb_info_new ();
-+
-+        maybe_create_input_sources (manager);
-+
-+#ifdef HAVE_IBUS
-+        /* We don't want to touch IBus until we are sure this isn't a
-+           fallback session. */
-+        manager->priv->session_is_fallback = TRUE;
-+        manager->priv->ibus_cancellable = g_cancellable_new ();
-+        g_bus_get (G_BUS_TYPE_SESSION,
-+                   manager->priv->ibus_cancellable,
-+                   (GAsyncReadyCallback)got_bus,
-+                   manager);
-+#else
-+        apply_input_sources_settings (manager->priv->input_sources_settings, NULL, 0, manager);
-+#endif
-         /* apply current settings before we install the callback */
--        csd_keyboard_manager_apply_settings (manager);
-+        g_debug ("Started the keyboard plugin, applying all settings");
-+        apply_all_settings (manager);
- 
-         g_signal_connect (G_OBJECT (manager->priv->settings), "changed",
--                          G_CALLBACK (apply_settings), manager);
--
--        apply_libgnomekbd_settings (manager->priv->libgnomekbd_settings, NULL, manager);
--        g_signal_connect (G_OBJECT (manager->priv->libgnomekbd_settings), "changed",
--                          G_CALLBACK (apply_libgnomekbd_settings), manager);
-+                          G_CALLBACK (settings_changed), manager);
-+        g_signal_connect (G_OBJECT (manager->priv->input_sources_settings), "change-event",
-+                          G_CALLBACK (apply_input_sources_settings), manager);
- 
--        numlock_install_xkb_callback (manager);
-+	install_xkb_filter (manager);
-+        set_input_sources_switcher (manager, enable_switcher (manager));
- 
-         cinnamon_settings_profile_end (NULL);
- 
-@@ -404,6 +1620,11 @@ csd_keyboard_manager_start (CsdKeyboardM
- {
-         cinnamon_settings_profile_start (NULL);
- 
-+	if (check_xkb_extension (manager) == FALSE) {
-+		g_debug ("XKB is not supported, not applying any settings");
-+		return TRUE;
-+	}
-+
-         manager->priv->start_idle_id = g_idle_add ((GSourceFunc) start_keyboard_idle_cb, manager);
- 
-         cinnamon_settings_profile_end (NULL);
-@@ -418,37 +1639,24 @@ csd_keyboard_manager_stop (CsdKeyboardMa
- 
-         g_debug ("Stopping keyboard manager");
- 
--        if (p->settings != NULL) {
--                g_object_unref (p->settings);
--                p->settings = NULL;
--        }
-+        g_clear_object (&p->settings);
-+        g_clear_object (&p->input_sources_settings);
-+        g_clear_object (&p->interface_settings);
-+        g_clear_object (&p->xkb_info);
- 
--        if (p->libgnomekbd_settings != NULL) {
--                g_object_unref (p->libgnomekbd_settings);
--                p->libgnomekbd_settings = NULL;
--        }
-+#ifdef HAVE_IBUS
-+        clear_ibus (manager);
-+#endif
- 
--        if (p->have_xkb) {
--                gdk_window_remove_filter (NULL,
--                                          numlock_xkb_callback,
--                                          manager);
-+        if (p->device_manager != NULL) {
-+                g_signal_handler_disconnect (p->device_manager, p->device_added_id);
-+                g_signal_handler_disconnect (p->device_manager, p->device_removed_id);
-+                p->device_manager = NULL;
-         }
- 
--        csd_keyboard_xkb_shutdown ();
--}
--
--static GObject *
--csd_keyboard_manager_constructor (GType                  type,
--                                  guint                  n_construct_properties,
--                                  GObjectConstructParam *construct_properties)
--{
--        CsdKeyboardManager      *keyboard_manager;
--
--        keyboard_manager = CSD_KEYBOARD_MANAGER (G_OBJECT_CLASS (csd_keyboard_manager_parent_class)->constructor (type,
--                                                                                                      n_construct_properties,
--                                                                                                      construct_properties));
-+	remove_xkb_filter (manager);
- 
--        return G_OBJECT (keyboard_manager);
-+        set_input_sources_switcher (manager, FALSE);
- }
- 
- static void
-@@ -456,7 +1664,6 @@ csd_keyboard_manager_class_init (CsdKeyb
- {
-         GObjectClass   *object_class = G_OBJECT_CLASS (klass);
- 
--        object_class->constructor = csd_keyboard_manager_constructor;
-         object_class->finalize = csd_keyboard_manager_finalize;
- 
-         g_type_class_add_private (klass, sizeof (CsdKeyboardManagerPrivate));
-diff -uNrp a/plugins/keyboard/csd-keyboard-manager.h b/plugins/keyboard/csd-keyboard-manager.h
---- a/plugins/keyboard/csd-keyboard-manager.h	2013-08-24 18:04:31.000000000 +0100
-+++ b/plugins/keyboard/csd-keyboard-manager.h	2013-08-25 16:36:02.000000000 +0100
-@@ -51,7 +51,6 @@ CsdKeyboardManager *       csd_keyboard_
- gboolean                csd_keyboard_manager_start               (CsdKeyboardManager *manager,
-                                                                GError         **error);
- void                    csd_keyboard_manager_stop                (CsdKeyboardManager *manager);
--void                    csd_keyboard_manager_apply_settings      (CsdKeyboardManager *manager);
- 
- G_END_DECLS
- 
-diff -uNrp a/plugins/keyboard/csd-keyboard-plugin.h b/plugins/keyboard/csd-keyboard-plugin.h
---- a/plugins/keyboard/csd-keyboard-plugin.h	2013-08-24 18:04:31.000000000 +0100
-+++ b/plugins/keyboard/csd-keyboard-plugin.h	2013-08-25 16:36:02.000000000 +0100
-@@ -52,7 +52,7 @@ typedef struct
- GType   csd_keyboard_plugin_get_type            (void) G_GNUC_CONST;
- 
- /* All the plugins must implement this function */
--G_MODULE_EXPORT GType register_cinnamon_settings_plugin (GTypeModule *module);
-+G_MODULE_EXPORT GType register_gnome_settings_plugin (GTypeModule *module);
- 
- G_END_DECLS
- 
-diff -uNrp a/plugins/keyboard/csd-keyboard-xkb.c b/plugins/keyboard/csd-keyboard-xkb.c
---- a/plugins/keyboard/csd-keyboard-xkb.c	2013-08-24 18:04:31.000000000 +0100
-+++ b/plugins/keyboard/csd-keyboard-xkb.c	1970-01-01 01:00:00.000000000 +0100
-@@ -1,579 +0,0 @@
--/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-- *
-- * Copyright (C) 2001 Udaltsoft
-- *
-- * Written by Sergey V. Oudaltsov <svu@users.sourceforge.net>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; either version 2, or (at your option)
-- * any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 51 Franklin Street - Suite 500, Boston, MA
-- * 02110-1335, USA.
-- */
--
--#include "config.h"
--
--#include <string.h>
--#include <time.h>
--
--#include <glib/gi18n.h>
--#include <gdk/gdk.h>
--#include <gdk/gdkx.h>
--#include <gtk/gtk.h>
--
--#include <libgnomekbd/gkbd-status.h>
--
--#include <libgnomekbd/gkbd-keyboard-drawing.h>
--#include <libgnomekbd/gkbd-desktop-config.h>
--#include <libgnomekbd/gkbd-indicator-config.h>
--#include <libgnomekbd/gkbd-keyboard-config.h>
--#include <libgnomekbd/gkbd-util.h>
--
--#include "csd-keyboard-xkb.h"
--#include "delayed-dialog.h"
--#include "cinnamon-settings-profile.h"
--
--#define SETTINGS_KEYBOARD_DIR "org.cinnamon.settings-daemon.plugins.keyboard"
--
--static CsdKeyboardManager *manager = NULL;
--
--static XklEngine *xkl_engine;
--static XklConfigRegistry *xkl_registry = NULL;
--
--static GkbdDesktopConfig current_config;
--static GkbdKeyboardConfig current_kbd_config;
--
--/* never terminated */
--static GkbdKeyboardConfig initial_sys_kbd_config;
--
--static gboolean inited_ok = FALSE;
--
--static GSettings *settings_desktop = NULL;
--static GSettings *settings_keyboard = NULL;
--
--static PostActivationCallback pa_callback = NULL;
--static void *pa_callback_user_data = NULL;
--
--static GtkStatusIcon *icon = NULL;
--
--static GHashTable *preview_dialogs = NULL;
--
--static void
--activation_error (void)
--{
--	char const *vendor;
--	GtkWidget *dialog;
--
--	vendor =
--	    ServerVendor (GDK_DISPLAY_XDISPLAY
--			  (gdk_display_get_default ()));
--
--	/* VNC viewers will not work, do not barrage them with warnings */
--	if (NULL != vendor && NULL != strstr (vendor, "VNC"))
--		return;
--
--	dialog = gtk_message_dialog_new_with_markup (NULL,
--						     0,
--						     GTK_MESSAGE_ERROR,
--						     GTK_BUTTONS_CLOSE,
--						     _
--						     ("Error activating XKB configuration.\n"
--						      "There can be various reasons for that.\n\n"
--						      "If you report this situation as a bug, include the results of\n"
--						      " • <b>%s</b>\n"
--						      " • <b>%s</b>\n"
--						      " • <b>%s</b>\n"
--						      " • <b>%s</b>"),
--						     "xprop -root | grep XKB",
--						     "gsettings get org.gnome.libgnomekbd.keyboard model",
--						     "gsettings get org.gnome.libgnomekbd.keyboard layouts",
--						     "gsettings get org.gnome.libgnomekbd.keyboard options");
--	g_signal_connect (dialog, "response",
--			  G_CALLBACK (gtk_widget_destroy), NULL);
--	csd_delayed_show_dialog (dialog);
--}
--
--static gboolean
--ensure_xkl_registry (void)
--{
--	if (!xkl_registry) {
--		xkl_registry =
--		    xkl_config_registry_get_instance (xkl_engine);
--		/* load all materials, unconditionally! */
--		if (!xkl_config_registry_load (xkl_registry, TRUE)) {
--			g_object_unref (xkl_registry);
--			xkl_registry = NULL;
--			return FALSE;
--		}
--	}
--
--	return TRUE;
--}
--
--static void
--apply_desktop_settings (void)
--{
--	if (!inited_ok)
--		return;
--
--	csd_keyboard_manager_apply_settings (manager);
--	gkbd_desktop_config_load (&current_config);
--	/* again, probably it would be nice to compare things
--	   before activating them */
--	gkbd_desktop_config_activate (&current_config);
--}
--
--static void
--popup_menu_launch_capplet ()
--{
--	GAppInfo *info;
--	GdkAppLaunchContext *ctx;
--	GError *error = NULL;
--
--	info =
--	    g_app_info_create_from_commandline
--	    ("cinnamon-settings region", NULL, 0, &error);
--
--	if (info != NULL) {
--		ctx =
--		    gdk_display_get_app_launch_context
--		    (gdk_display_get_default ());
--
--		if (g_app_info_launch (info, NULL,
--				   G_APP_LAUNCH_CONTEXT (ctx), &error) == FALSE) {
--			g_warning
--				("Could not execute keyboard properties capplet: [%s]\n",
--				 error->message);
--			g_error_free (error);
--		}
--
--		g_object_unref (info);
--		g_object_unref (ctx);
--	}
--
--}
--
--static void
--show_layout_destroy (GtkWidget * dialog, gint group)
--{
--	g_hash_table_remove (preview_dialogs, GINT_TO_POINTER (group));
--}
--
--static void
--popup_menu_show_layout ()
--{
--	GtkWidget *dialog;
--	XklEngine *engine =
--	    xkl_engine_get_instance (GDK_DISPLAY_XDISPLAY
--				     (gdk_display_get_default ()));
--	XklState *xkl_state = xkl_engine_get_current_state (engine);
--
--	gchar **group_names = gkbd_status_get_group_names ();
--
--	gpointer p = g_hash_table_lookup (preview_dialogs,
--					  GINT_TO_POINTER
--					  (xkl_state->group));
--
--	if (xkl_state->group < 0
--	    || xkl_state->group >= g_strv_length (group_names)) {
--		return;
--	}
--
--	if (p != NULL) {
--		/* existing window */
--		gtk_window_present (GTK_WINDOW (p));
--		return;
--	}
--
--	if (!ensure_xkl_registry ())
--		return;
--
--	dialog = gkbd_keyboard_drawing_dialog_new ();
--	gkbd_keyboard_drawing_dialog_set_group (dialog, xkl_registry, xkl_state->group);
--
--	g_signal_connect (dialog, "destroy",
--			  G_CALLBACK (show_layout_destroy),
--			  GINT_TO_POINTER (xkl_state->group));
--	g_hash_table_insert (preview_dialogs,
--			     GINT_TO_POINTER (xkl_state->group), dialog);
--	gtk_widget_show_all (dialog);
--}
--
--static void
--popup_menu_set_group (gint group_number, gboolean only_menu)
--{
--
--	XklEngine *engine = gkbd_status_get_xkl_engine ();
--
--	XklState *st = xkl_engine_get_current_state(engine);
--	Window cur;
--	st->group = group_number;
--	xkl_engine_allow_one_switch_to_secondary_group (engine);
--	cur = xkl_engine_get_current_window (engine);
--	if (cur != (Window) NULL) {
--		xkl_debug (150, "Enforcing the state %d for window %lx\n",
--			   st->group, cur);
--
--		xkl_engine_save_state (engine,
--				       xkl_engine_get_current_window
--				       (engine), st);
--/*    XSetInputFocus( GDK_DISPLAY(), cur, RevertToNone, CurrentTime );*/
--	} else {
--		xkl_debug (150,
--			   "??? Enforcing the state %d for unknown window\n",
--			   st->group);
--		/* strange situation - bad things can happen */
--	}
--        if (!only_menu)
--        	xkl_engine_lock_group (engine, st->group);
--}
--
--static void
--popup_menu_set_group_cb (GtkMenuItem * item, gpointer param)
--{
--	gint group_number = GPOINTER_TO_INT (param);
--
--	popup_menu_set_group(group_number, FALSE);
--}
--
--
--static GtkMenu *
--create_status_menu (void)
--{
--	GtkMenu *popup_menu = GTK_MENU (gtk_menu_new ());
--	int i = 0;
--
--	GtkMenu *groups_menu = GTK_MENU (gtk_menu_new ());
--	gchar **current_name = gkbd_status_get_group_names ();
--
--	GtkWidget *item = gtk_menu_item_new_with_mnemonic (_("_Layouts"));
--	gtk_widget_show (item);
--	gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item);
--	gtk_menu_item_set_submenu (GTK_MENU_ITEM (item),
--				   GTK_WIDGET (groups_menu));
--
--	item = gtk_menu_item_new_with_mnemonic (_("Show _Keyboard Layout..."));
--	gtk_widget_show (item);
--	g_signal_connect (item, "activate", popup_menu_show_layout, NULL);
--	gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item);
--
--	/* translators note:
--	 * This is the name of the cinnamon-settings "region" panel */
--	item = gtk_menu_item_new_with_mnemonic (_("Region and Language Settings"));
--	gtk_widget_show (item);
--	g_signal_connect (item, "activate", popup_menu_launch_capplet, NULL);
--	gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item);
--
--	for (i = 0; current_name && *current_name; i++, current_name++) {
--
--		gchar *image_file = gkbd_status_get_image_filename (i);
--
--		if (image_file == NULL) {
--			item =
--			    gtk_menu_item_new_with_label (*current_name);
--		} else {
--			GdkPixbuf *pixbuf =
--			    gdk_pixbuf_new_from_file_at_size (image_file,
--							      24, 24,
--							      NULL);
--			GtkWidget *img =
--			    gtk_image_new_from_pixbuf (pixbuf);
--			item =
--			    gtk_image_menu_item_new_with_label
--			    (*current_name);
--			gtk_widget_show (img);
--			gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM
--						       (item), img);
--			gtk_image_menu_item_set_always_show_image
--			    (GTK_IMAGE_MENU_ITEM (item), TRUE);
--			g_free (image_file);
--		}
--		gtk_widget_show (item);
--		gtk_menu_shell_append (GTK_MENU_SHELL (groups_menu), item);
--		g_signal_connect (item, "activate",
--				  G_CALLBACK (popup_menu_set_group_cb),
--				  GINT_TO_POINTER (i));
--	}
--
--	return popup_menu;
--}
--
--static void
--status_icon_popup_menu_cb (GtkStatusIcon * icon, guint button, guint time)
--{
--	GtkMenu *popup_menu = create_status_menu ();
--
--	gtk_menu_popup (popup_menu, NULL, NULL,
--			gtk_status_icon_position_menu,
--			(gpointer) icon, button, time);
--}
--
--static void
--show_hide_icon ()
--{
--	if (g_strv_length (current_kbd_config.layouts_variants) > 1) {
--		if (icon == NULL) {
--			xkl_debug (150, "Creating keyboard status icon\n");
--			icon = gkbd_status_new ();
--			g_signal_connect (icon, "popup-menu",
--					  G_CALLBACK
--					  (status_icon_popup_menu_cb),
--					  NULL);
--
--		}
--	} else {
--		if (icon != NULL) {
--			xkl_debug (150, "Destroying icon\n");
--			g_object_unref (icon);
--			icon = NULL;
--		}
--	}
--}
--
--static gboolean
--try_activating_xkb_config_if_new (GkbdKeyboardConfig *
--				  current_sys_kbd_config)
--{
--	/* Activate - only if different! */
--	if (!gkbd_keyboard_config_equals
--	    (&current_kbd_config, current_sys_kbd_config)) {
--		if (gkbd_keyboard_config_activate (&current_kbd_config)) {
--			if (pa_callback != NULL) {
--				(*pa_callback) (pa_callback_user_data);
--				return TRUE;
--			}
--		} else {
--			return FALSE;
--		}
--	}
--	return TRUE;
--}
--
--static gboolean
--filter_xkb_config (void)
--{
--	XklConfigItem *item;
--	gchar *lname;
--	gchar *vname;
--	gchar **lv;
--	gboolean any_change = FALSE;
--
--	xkl_debug (100, "Filtering configuration against the registry\n");
--	if (!ensure_xkl_registry ())
--		return FALSE;
--
--	lv = current_kbd_config.layouts_variants;
--	item = xkl_config_item_new ();
--	while (*lv) {
--		xkl_debug (100, "Checking [%s]\n", *lv);
--		if (gkbd_keyboard_config_split_items (*lv, &lname, &vname)) {
--			gboolean should_be_dropped = FALSE;
--			g_snprintf (item->name, sizeof (item->name), "%s",
--				    lname);
--			if (!xkl_config_registry_find_layout
--			    (xkl_registry, item)) {
--				xkl_debug (100, "Bad layout [%s]\n",
--					   lname);
--				should_be_dropped = TRUE;
--			} else if (vname) {
--				g_snprintf (item->name,
--					    sizeof (item->name), "%s",
--					    vname);
--				if (!xkl_config_registry_find_variant
--				    (xkl_registry, lname, item)) {
--					xkl_debug (100,
--						   "Bad variant [%s(%s)]\n",
--						   lname, vname);
--					should_be_dropped = TRUE;
--				}
--			}
--			if (should_be_dropped) {
--				gkbd_strv_behead (lv);
--				any_change = TRUE;
--				continue;
--			}
--		}
--		lv++;
--	}
--	g_object_unref (item);
--	return any_change;
--}
--
--static void
--apply_xkb_settings (void)
--{
--	GkbdKeyboardConfig current_sys_kbd_config;
--
--	if (!inited_ok)
--		return;
--
--	gkbd_keyboard_config_init (&current_sys_kbd_config, xkl_engine);
--
--	gkbd_keyboard_config_load (&current_kbd_config,
--				   &initial_sys_kbd_config);
--
--	gkbd_keyboard_config_load_from_x_current (&current_sys_kbd_config,
--						  NULL);
--
--	if (!try_activating_xkb_config_if_new (&current_sys_kbd_config)) {
--		if (filter_xkb_config ()) {
--			if (!try_activating_xkb_config_if_new
--			    (&current_sys_kbd_config)) {
--				g_warning
--				    ("Could not activate the filtered XKB configuration");
--				activation_error ();
--			}
--		} else {
--			g_warning
--			    ("Could not activate the XKB configuration");
--			activation_error ();
--		}
--	} else
--		xkl_debug (100,
--			   "Actual KBD configuration was not changed: redundant notification\n");
--
--	gkbd_keyboard_config_term (&current_sys_kbd_config);
--	show_hide_icon ();
--}
--
--static void
--csd_keyboard_xkb_analyze_sysconfig (void)
--{
--	if (!inited_ok)
--		return;
--
--	gkbd_keyboard_config_init (&initial_sys_kbd_config, xkl_engine);
--	gkbd_keyboard_config_load_from_x_initial (&initial_sys_kbd_config,
--						  NULL);
--}
--
--void
--csd_keyboard_xkb_set_post_activation_callback (PostActivationCallback fun,
--					       void *user_data)
--{
--	pa_callback = fun;
--	pa_callback_user_data = user_data;
--}
--
--static GdkFilterReturn
--csd_keyboard_xkb_evt_filter (GdkXEvent * xev, GdkEvent * event)
--{
--	XEvent *xevent = (XEvent *) xev;
--	xkl_engine_filter_events (xkl_engine, xevent);
--	return GDK_FILTER_CONTINUE;
--}
--
--/* When new Keyboard is plugged in - reload the settings */
--static void
--csd_keyboard_new_device (XklEngine * engine)
--{
--	apply_desktop_settings ();
--	apply_xkb_settings ();
--}
--
--void
--csd_keyboard_xkb_init (CsdKeyboardManager * kbd_manager)
--{
--	Display *display =
--	    GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
--	cinnamon_settings_profile_start (NULL);
--
--	gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
--					   DATADIR G_DIR_SEPARATOR_S
--					   "icons");
--
--	manager = kbd_manager;
--	cinnamon_settings_profile_start ("xkl_engine_get_instance");
--	xkl_engine = xkl_engine_get_instance (display);
--	cinnamon_settings_profile_end ("xkl_engine_get_instance");
--	if (xkl_engine) {
--		inited_ok = TRUE;
--
--		gkbd_desktop_config_init (&current_config, xkl_engine);
--		gkbd_keyboard_config_init (&current_kbd_config,
--					   xkl_engine);
--		xkl_engine_backup_names_prop (xkl_engine);
--		csd_keyboard_xkb_analyze_sysconfig ();
--
--		settings_desktop = g_settings_new (GKBD_DESKTOP_SCHEMA);
--		settings_keyboard = g_settings_new (GKBD_KEYBOARD_SCHEMA);
--		g_signal_connect (settings_desktop, "changed",
--				  (GCallback) apply_desktop_settings,
--				  NULL);
--		g_signal_connect (settings_keyboard, "changed",
--				  (GCallback) apply_xkb_settings, NULL);
--
--		gdk_window_add_filter (NULL, (GdkFilterFunc)
--				       csd_keyboard_xkb_evt_filter, NULL);
--
--		if (xkl_engine_get_features (xkl_engine) &
--		    XKLF_DEVICE_DISCOVERY)
--			g_signal_connect (xkl_engine, "X-new-device",
--					  G_CALLBACK
--					  (csd_keyboard_new_device), NULL);
--
--		cinnamon_settings_profile_start ("xkl_engine_start_listen");
--		xkl_engine_start_listen (xkl_engine,
--					 XKLL_MANAGE_LAYOUTS |
--					 XKLL_MANAGE_WINDOW_STATES);
--		cinnamon_settings_profile_end ("xkl_engine_start_listen");
--
--		cinnamon_settings_profile_start ("apply_desktop_settings");
--		apply_desktop_settings ();
--		cinnamon_settings_profile_end ("apply_desktop_settings");
--		cinnamon_settings_profile_start ("apply_xkb_settings");
--		apply_xkb_settings ();
--		cinnamon_settings_profile_end ("apply_xkb_settings");
--	}
--	preview_dialogs = g_hash_table_new (g_direct_hash, g_direct_equal);
--
--	cinnamon_settings_profile_end (NULL);
--}
--
--void
--csd_keyboard_xkb_shutdown (void)
--{
--	if (!inited_ok)
--		return;
--
--	pa_callback = NULL;
--	pa_callback_user_data = NULL;
--	manager = NULL;
--
--	if (preview_dialogs != NULL)
--		g_hash_table_destroy (preview_dialogs);
--
--	if (!inited_ok)
--		return;
--
--	xkl_engine_stop_listen (xkl_engine,
--				XKLL_MANAGE_LAYOUTS |
--				XKLL_MANAGE_WINDOW_STATES);
--
--	gdk_window_remove_filter (NULL, (GdkFilterFunc)
--				  csd_keyboard_xkb_evt_filter, NULL);
--
--	g_object_unref (settings_desktop);
--	settings_desktop = NULL;
--	g_object_unref (settings_keyboard);
--	settings_keyboard = NULL;
--
--	if (xkl_registry) {
--		g_object_unref (xkl_registry);
--	}
--
--	g_object_unref (xkl_engine);
--
--	xkl_engine = NULL;
--
--	inited_ok = FALSE;
--}
-diff -uNrp a/plugins/keyboard/csd-keyboard-xkb.h b/plugins/keyboard/csd-keyboard-xkb.h
---- a/plugins/keyboard/csd-keyboard-xkb.h	2013-08-24 18:04:31.000000000 +0100
-+++ b/plugins/keyboard/csd-keyboard-xkb.h	1970-01-01 01:00:00.000000000 +0100
-@@ -1,39 +0,0 @@
--/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-- * cinnamon-settings-keyboard-xkb.h
-- *
-- * Copyright (C) 2001 Udaltsoft
-- *
-- * Written by Sergey V. Oudaltsov <svu@users.sourceforge.net>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; either version 2, or (at your option)
-- * any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 51 Franklin Street - Suite 500, Boston, MA
-- * 02110-1335, USA.
-- */
--
--#ifndef __CSD_KEYBOARD_XKB_H
--#define __CSD_KEYBOARD_XKB_H
--
--#include <libxklavier/xklavier.h>
--#include "csd-keyboard-manager.h"
--
--void csd_keyboard_xkb_init (CsdKeyboardManager *manager);
--void csd_keyboard_xkb_shutdown (void);
--
--typedef void (*PostActivationCallback) (void *userData);
--
--void
--csd_keyboard_xkb_set_post_activation_callback (PostActivationCallback fun,
--                                               void                  *userData);
--
--#endif
-diff -uNrp a/plugins/keyboard/delayed-dialog.c b/plugins/keyboard/delayed-dialog.c
---- a/plugins/keyboard/delayed-dialog.c	2013-08-24 18:04:31.000000000 +0100
-+++ b/plugins/keyboard/delayed-dialog.c	1970-01-01 01:00:00.000000000 +0100
-@@ -1,128 +0,0 @@
--/*
-- * Copyright © 2006 Novell, Inc.
-- *
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU General Public License as
-- * published by the Free Software Foundation; either version 2, or (at
-- * your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful, but
-- * WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- * General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 51 Franklin Street - Suite 500, Boston, MA
-- * 02110-1335, USA.
-- */
--
--#include <stdlib.h>
--#include <string.h>
--
--#include <gtk/gtk.h>
--#include <gdk/gdkx.h>
--
--#include "delayed-dialog.h"
--
--static gboolean        delayed_show_timeout (gpointer   data);
--static GdkFilterReturn message_filter       (GdkXEvent *xevent,
--                                             GdkEvent  *event,
--                                             gpointer   data);
--
--static GSList *dialogs = NULL;
--
--/**
-- * csd_delayed_show_dialog:
-- * @dialog: the dialog
-- *
-- * Shows the dialog as with gtk_widget_show(), unless a window manager
-- * hasn't been started yet, in which case it will wait up to 5 seconds
-- * for that to happen before showing the dialog.
-- **/
--void
--csd_delayed_show_dialog (GtkWidget *dialog)
--{
--        GdkDisplay *display = gtk_widget_get_display (dialog);
--        Display *xdisplay = GDK_DISPLAY_XDISPLAY (display);
--        GdkScreen *screen = gtk_widget_get_screen (dialog);
--        char selection_name[10];
--        Atom selection_atom;
--
--        /* We can't use gdk_selection_owner_get() for this, because
--         * it's an unknown out-of-process window.
--         */
--        snprintf (selection_name, sizeof (selection_name), "WM_S%d",
--                  gdk_screen_get_number (screen));
--        selection_atom = XInternAtom (xdisplay, selection_name, True);
--        if (selection_atom &&
--            XGetSelectionOwner (xdisplay, selection_atom) != None) {
--                gtk_widget_show (dialog);
--                return;
--        }
--
--        dialogs = g_slist_prepend (dialogs, dialog);
--
--        gdk_window_add_filter (NULL, message_filter, NULL);
--
--        g_timeout_add (5000, delayed_show_timeout, NULL);
--}
--
--static gboolean
--delayed_show_timeout (gpointer data)
--{
--        GSList *l;
--
--        for (l = dialogs; l; l = l->next)
--                gtk_widget_show (l->data);
--        g_slist_free (dialogs);
--        dialogs = NULL;
--
--        /* FIXME: There's no gdk_display_remove_client_message_filter */
--
--        return FALSE;
--}
--
--static GdkFilterReturn
--message_filter (GdkXEvent *xevent, GdkEvent *event, gpointer data)
--{
--        XClientMessageEvent *evt;
--        char *selection_name;
--        int screen;
--        GSList *l, *next;
--
--        if (((XEvent *)xevent)->type != ClientMessage)
--          return GDK_FILTER_CONTINUE;
--
--        evt = (XClientMessageEvent *)xevent;
--
--        if (evt->message_type != XInternAtom (evt->display, "MANAGER", FALSE))
--          return GDK_FILTER_CONTINUE;
--
--        selection_name = XGetAtomName (evt->display, evt->data.l[1]);
--
--        if (strncmp (selection_name, "WM_S", 4) != 0) {
--                XFree (selection_name);
--                return GDK_FILTER_CONTINUE;
--        }
--
--        screen = atoi (selection_name + 4);
--
--        for (l = dialogs; l; l = next) {
--                GtkWidget *dialog = l->data;
--                next = l->next;
--
--                if (gdk_screen_get_number (gtk_widget_get_screen (dialog)) == screen) {
--                        gtk_widget_show (dialog);
--                        dialogs = g_slist_remove (dialogs, dialog);
--                }
--        }
--
--        if (!dialogs) {
--                gdk_window_remove_filter (NULL, message_filter, NULL);
--        }
--
--        XFree (selection_name);
--
--        return GDK_FILTER_CONTINUE;
--}
-diff -uNrp a/plugins/keyboard/delayed-dialog.h b/plugins/keyboard/delayed-dialog.h
---- a/plugins/keyboard/delayed-dialog.h	2013-08-24 18:04:31.000000000 +0100
-+++ b/plugins/keyboard/delayed-dialog.h	1970-01-01 01:00:00.000000000 +0100
-@@ -1,32 +0,0 @@
--/*
-- * Copyright © 2006 Novell, Inc.
-- *
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU General Public License as
-- * published by the Free Software Foundation; either version 2, or (at
-- * your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful, but
-- * WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- * General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 51 Franklin Street - Suite 500, Boston, MA
-- * 02110-1335, USA.
-- */
--
--
--#ifndef __DELAYED_DIALOG_H
--#define __DELAYED_DIALOG_H
--
--#include <gtk/gtk.h>
--
--G_BEGIN_DECLS
--
--void            csd_delayed_show_dialog (GtkWidget *dialog);
--
--G_END_DECLS
--
--#endif
-diff -uNrp a/plugins/keyboard/gkbd-configuration.c b/plugins/keyboard/gkbd-configuration.c
---- a/plugins/keyboard/gkbd-configuration.c	2013-08-24 18:04:31.000000000 +0100
-+++ b/plugins/keyboard/gkbd-configuration.c	1970-01-01 01:00:00.000000000 +0100
-@@ -1,350 +0,0 @@
--/*
-- * Copyright (C) 2010 Canonical Ltd.
-- * 
-- * Authors: Jan Arne Petersen <jpetersen@openismus.com>
-- * 
-- * Based on gkbd-status.c by Sergey V. Udaltsov <svu@gnome.org>
-- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-- *
-- * This library is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * Lesser General Public License for more details.
-- *
-- * You should have received a copy of the GNU Lesser General Public
-- * License along with this library; if not, write to the
-- * Free Software Foundation, Inc., 51 Franklin Street - Suite 500,
-- * Boston, MA 02110-1335, USA.
-- */
--
--#include <memory.h>
--
--#include <gdk/gdkkeysyms.h>
--#include <gdk/gdkx.h>
--#include <glib/gi18n.h>
--
--#include <libgnomekbd/gkbd-desktop-config.h>
--#include <libgnomekbd/gkbd-indicator-config.h>
--
--#include "gkbd-configuration.h"
--
--struct _GkbdConfigurationPrivate {
--	XklEngine *engine;
--	XklConfigRegistry *registry;
--
--	GkbdDesktopConfig cfg;
--	GkbdIndicatorConfig ind_cfg;
--	GkbdKeyboardConfig kbd_cfg;
--
--	gchar **full_group_names;
--	gchar **short_group_names;
--
--	gulong state_changed_handler;
--	gulong config_changed_handler;
--};
--
--enum {
--	SIGNAL_CHANGED,
--	SIGNAL_GROUP_CHANGED,
--	LAST_SIGNAL
--};
--
--static guint signals[LAST_SIGNAL] = { 0, };
--
--#define GKBD_CONFIGURATION_GET_PRIVATE(o) \
--	(G_TYPE_INSTANCE_GET_PRIVATE ((o), GKBD_TYPE_CONFIGURATION, GkbdConfigurationPrivate))
--
--G_DEFINE_TYPE (GkbdConfiguration, gkbd_configuration, G_TYPE_OBJECT)
--
--/* Should be called once for all widgets */
--static void
--gkbd_configuration_cfg_changed (GSettings *settings,
--				 const char *key,
--				 GkbdConfiguration * configuration)
--{
--	GkbdConfigurationPrivate *priv = configuration->priv;
--
--	xkl_debug (100,
--		   "General configuration changed in GSettings - reiniting...\n");
--	gkbd_desktop_config_load (&priv->cfg);
--	gkbd_desktop_config_activate (&priv->cfg);
--
--	g_signal_emit (configuration,
--		       signals[SIGNAL_CHANGED], 0);
--}
--
--/* Should be called once for all widgets */
--static void
--gkbd_configuration_ind_cfg_changed (GSettings *settings,
--				     const char *key,
--				     GkbdConfiguration * configuration)
--{
--	GkbdConfigurationPrivate *priv = configuration->priv;
--	xkl_debug (100,
--		   "Applet configuration changed in GSettings - reiniting...\n");
--	gkbd_indicator_config_load (&priv->ind_cfg);
--
--	gkbd_indicator_config_free_image_filenames (&priv->ind_cfg);
--	gkbd_indicator_config_load_image_filenames (&priv->ind_cfg,
--						    &priv->kbd_cfg);
--
--	gkbd_indicator_config_activate (&priv->ind_cfg);
--
--	g_signal_emit (configuration,
--		       signals[SIGNAL_CHANGED], 0);
--}
--
--static void
--gkbd_configuration_load_group_names (GkbdConfiguration * configuration,
--				     XklConfigRec * xklrec)
--{
--	GkbdConfigurationPrivate *priv = configuration->priv;
--
--	if (!gkbd_desktop_config_load_group_descriptions (&priv->cfg,
--							  priv->registry,
--							  (const char **) xklrec->layouts,
--							  (const char **) xklrec->variants,
--	     						  &priv->short_group_names,
--							  &priv->full_group_names)) {
--		/* We just populate no short names (remain NULL) - 
--		 * full names are going to be used anyway */
--		gint i, total_groups =
--		    xkl_engine_get_num_groups (priv->engine);
--		xkl_debug (150, "group descriptions loaded: %d!\n",
--			   total_groups);
--		priv->full_group_names =
--		    g_new0 (char *, total_groups + 1);
--
--		if (xkl_engine_get_features (priv->engine) &
--		    XKLF_MULTIPLE_LAYOUTS_SUPPORTED) {
--			for (i = 0; priv->kbd_cfg.layouts_variants[i]; i++) {
--				priv->full_group_names[i] =
--				    g_strdup ((char *) priv->kbd_cfg.layouts_variants[i]);
--			}
--		} else {
--			for (i = total_groups; --i >= 0;) {
--				priv->full_group_names[i] =
--				    g_strdup_printf ("Group %d", i);
--			}
--		}
--	}
--}
--
--/* Should be called once for all widgets */
--static void
--gkbd_configuration_kbd_cfg_callback (XklEngine *engine,
--				     GkbdConfiguration *configuration)
--{
--	GkbdConfigurationPrivate *priv = configuration->priv;
--	XklConfigRec *xklrec = xkl_config_rec_new ();
--	xkl_debug (100,
--		   "XKB configuration changed on X Server - reiniting...\n");
--
--	gkbd_keyboard_config_load_from_x_current (&priv->kbd_cfg,
--						  xklrec);
--
--	gkbd_indicator_config_free_image_filenames (&priv->ind_cfg);
--	gkbd_indicator_config_load_image_filenames (&priv->ind_cfg,
--						    &priv->kbd_cfg);
--
--	g_strfreev (priv->full_group_names);
--	priv->full_group_names = NULL;
--
--	g_strfreev (priv->short_group_names);
--	priv->short_group_names = NULL;
--
--	gkbd_configuration_load_group_names (configuration,
--				 	     xklrec);
--
--	g_signal_emit (configuration,
--		       signals[SIGNAL_CHANGED],
--		       0);
--
--	g_object_unref (G_OBJECT (xklrec));
--}
--
--/* Should be called once for all applets */
--static void
--gkbd_configuration_state_callback (XklEngine * engine,
--				   XklEngineStateChange changeType,
--			    	   gint group, gboolean restore,
--				   GkbdConfiguration * configuration)
--{
--	xkl_debug (150, "group is now %d, restore: %d\n", group, restore);
--
--	if (changeType == GROUP_CHANGED) {
--		g_signal_emit (configuration,
--			       signals[SIGNAL_GROUP_CHANGED], 0,
--			       group);
--	}
--}
--
--static void
--gkbd_configuration_init (GkbdConfiguration *configuration)
--{
--	GkbdConfigurationPrivate *priv;
--	XklConfigRec *xklrec = xkl_config_rec_new ();
--
--	priv = GKBD_CONFIGURATION_GET_PRIVATE (configuration);
--	configuration->priv = priv;
--
--	priv->engine = xkl_engine_get_instance (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
--	if (priv->engine == NULL) {
--		xkl_debug (0, "Libxklavier initialization error");
--		return;
--	}
--
--	priv->state_changed_handler =
--	    g_signal_connect (priv->engine, "X-state-changed",
--			      G_CALLBACK (gkbd_configuration_state_callback),
--			      configuration);
--	priv->config_changed_handler =
--	    g_signal_connect (priv->engine, "X-config-changed",
--			      G_CALLBACK (gkbd_configuration_kbd_cfg_callback),
--			      configuration);
--
--	gkbd_desktop_config_init (&priv->cfg, priv->engine);
--	gkbd_keyboard_config_init (&priv->kbd_cfg, priv->engine);
--	gkbd_indicator_config_init (&priv->ind_cfg, priv->engine);
--
--	gkbd_desktop_config_load (&priv->cfg);
--	gkbd_desktop_config_activate (&priv->cfg);
--
--	priv->registry = xkl_config_registry_get_instance (priv->engine);
--	xkl_config_registry_load (priv->registry,
--				  priv->cfg.load_extra_items);
--
--	gkbd_keyboard_config_load_from_x_current (&priv->kbd_cfg,
--						  xklrec);
--
--	gkbd_indicator_config_load (&priv->ind_cfg);
--
--	gkbd_indicator_config_load_image_filenames (&priv->ind_cfg,
--						    &priv->kbd_cfg);
--
--	gkbd_indicator_config_activate (&priv->ind_cfg);
--
--	gkbd_configuration_load_group_names (configuration,
--					     xklrec);
--	g_object_unref (G_OBJECT (xklrec));
--
--	gkbd_desktop_config_start_listen (&priv->cfg,
--					  G_CALLBACK (gkbd_configuration_cfg_changed),
--					  configuration);
--	gkbd_indicator_config_start_listen (&priv->ind_cfg,
--					    G_CALLBACK (gkbd_configuration_ind_cfg_changed),
--					    configuration);
--	xkl_engine_start_listen (priv->engine,
--				 XKLL_TRACK_KEYBOARD_STATE);
--
--	xkl_debug (100, "Initiating the widget startup process for %p\n",
--		   configuration);
--}
--
--static void
--gkbd_configuration_finalize (GObject * obj)
--{
--	GkbdConfiguration *configuration = GKBD_CONFIGURATION (obj);
--	GkbdConfigurationPrivate *priv = configuration->priv;
--
--	xkl_debug (100,
--		   "Starting the gnome-kbd-configuration widget shutdown process for %p\n",
--		   configuration);
--
--	xkl_engine_stop_listen (priv->engine,
--				XKLL_TRACK_KEYBOARD_STATE);
--
--	gkbd_desktop_config_stop_listen (&priv->cfg);
--	gkbd_indicator_config_stop_listen (&priv->ind_cfg);
--
--	gkbd_indicator_config_term (&priv->ind_cfg);
--	gkbd_keyboard_config_term (&priv->kbd_cfg);
--	gkbd_desktop_config_term (&priv->cfg);
--
--	if (g_signal_handler_is_connected (priv->engine,
--					   priv->state_changed_handler)) {
--		g_signal_handler_disconnect (priv->engine,
--					     priv->state_changed_handler);
--		priv->state_changed_handler = 0;
--	}
--	if (g_signal_handler_is_connected (priv->engine,
--					   priv->config_changed_handler)) {
--		g_signal_handler_disconnect (priv->engine,
--					     priv->config_changed_handler);
--		priv->config_changed_handler = 0;
--	}
--
--	g_object_unref (priv->registry);
--	priv->registry = NULL;
--	g_object_unref (priv->engine);
--	priv->engine = NULL;
--
--	G_OBJECT_CLASS (gkbd_configuration_parent_class)->finalize (obj);
--}
--
--static void
--gkbd_configuration_class_init (GkbdConfigurationClass * klass)
--{
--	GObjectClass *object_class = G_OBJECT_CLASS (klass);
--
--	/* Initing vtable */
--	object_class->finalize = gkbd_configuration_finalize;
--
--	/* Signals */
--	signals[SIGNAL_CHANGED] = g_signal_new ("changed",
--						GKBD_TYPE_CONFIGURATION,
--						G_SIGNAL_RUN_LAST,
--						0,
--						NULL, NULL,
--						g_cclosure_marshal_VOID__VOID,
--						G_TYPE_NONE,
--						0);
--	signals[SIGNAL_GROUP_CHANGED] = g_signal_new ("group-changed",
--						      GKBD_TYPE_CONFIGURATION,
--						      G_SIGNAL_RUN_LAST,
--						      0,
--						      NULL, NULL,
--						      g_cclosure_marshal_VOID__INT,
--						      G_TYPE_NONE,
--						      1,
--						      G_TYPE_INT);
--
--	g_type_class_add_private (klass, sizeof (GkbdConfigurationPrivate));
--}
--
--GkbdConfiguration *
--gkbd_configuration_get (void)
--{
--	static gpointer instance = NULL;
--
--	if (!instance) {
--		instance = g_object_new (GKBD_TYPE_CONFIGURATION, NULL);
--		g_object_add_weak_pointer (instance, &instance);
--	} else {
--		g_object_ref (instance);
--	}
--
--	return instance;
--}
--
--XklEngine *
--gkbd_configuration_get_xkl_engine (GkbdConfiguration *configuration)
--{
--	return configuration->priv->engine;
--}
--
--const char * const *
--gkbd_configuration_get_group_names (GkbdConfiguration *configuration)
--{
--	return configuration->priv->full_group_names;
--}
--
--const char * const *
--gkbd_configuration_get_short_group_names (GkbdConfiguration *configuration)
--{
--	return configuration->priv->short_group_names;
--}
-diff -uNrp a/plugins/keyboard/gkbd-configuration.h b/plugins/keyboard/gkbd-configuration.h
---- a/plugins/keyboard/gkbd-configuration.h	2013-08-24 18:04:31.000000000 +0100
-+++ b/plugins/keyboard/gkbd-configuration.h	1970-01-01 01:00:00.000000000 +0100
-@@ -1,65 +0,0 @@
--/*
-- * Copyright (C) 2010 Canonical Ltd.
-- * 
-- * Authors: Jan Arne Petersen <jpetersen@openismus.com>
-- * 
-- * Based on gkbd-status.h by Sergey V. Udaltsov <svu@gnome.org>
-- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-- *
-- * This library is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * Lesser General Public License for more details.
-- *
-- * You should have received a copy of the GNU Lesser General Public
-- * License along with this library; if not, write to the
-- * Free Software Foundation, Inc., 51 Franklin Street - Suite 500,
-- * Boston, MA 02110-1335, USA.
-- */
--
--#ifndef __GKBD_CONFIGURATION_H__
--#define __GKBD_CONFIGURATION_H__
--
--#include <glib-object.h>
--
--#include <libxklavier/xklavier.h>
--
--G_BEGIN_DECLS
--
--typedef struct _GkbdConfiguration GkbdConfiguration;
--typedef struct _GkbdConfigurationPrivate GkbdConfigurationPrivate;
--typedef struct _GkbdConfigurationClass GkbdConfigurationClass;
--
--#define GKBD_TYPE_CONFIGURATION           (gkbd_configuration_get_type ())
--#define GKBD_CONFIGURATION(obj)           (G_TYPE_CHECK_INSTANCE_CAST ((obj), GKBD_TYPE_CONFIGURATION, GkbdConfiguration))
--#define GKBD_INDCATOR_CLASS(obj)          (G_TYPE_CHECK_CLASS_CAST ((obj), GKBD_TYPE_CONFIGURATION,  GkbdConfigurationClass))
--#define GKBD_IS_CONFIGURATION(obj)        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GKBD_TYPE_CONFIGURATION))
--#define GKBD_IS_CONFIGURATION_CLASS(obj)  (G_TYPE_CHECK_CLASS_TYPE ((obj), GKBD_TYPE_CONFIGURATION))
--#define GKBD_CONFIGURATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GKBD_TYPE_CONFIGURATION, GkbdConfigurationClass))
--
--struct _GkbdConfiguration {
--	GObject parent;
--
--	GkbdConfigurationPrivate *priv;
--};
--
--struct _GkbdConfigurationClass {
--	GObjectClass parent_class;
--};
--
--extern GType gkbd_configuration_get_type (void);
--
--extern GkbdConfiguration *gkbd_configuration_get (void);
--
--extern XklEngine *gkbd_configuration_get_xkl_engine (GkbdConfiguration *configuration);
--
--extern const char * const *gkbd_configuration_get_group_names (GkbdConfiguration *configuration);
--extern const char * const *gkbd_configuration_get_short_group_names (GkbdConfiguration *configuration);
--
--G_END_DECLS
--
--#endif
-diff -uNrp a/plugins/keyboard/.indent.pro b/plugins/keyboard/.indent.pro
---- a/plugins/keyboard/.indent.pro	1970-01-01 01:00:00.000000000 +0100
-+++ b/plugins/keyboard/.indent.pro	2013-08-25 16:36:02.000000000 +0100
-@@ -0,0 +1,2 @@
-+-kr -i8 -pcs -lps -psl
-+
-diff -uNrp a/plugins/keyboard/Makefile.am b/plugins/keyboard/Makefile.am
---- a/plugins/keyboard/Makefile.am	2013-08-24 18:04:31.000000000 +0100
-+++ b/plugins/keyboard/Makefile.am	2013-08-25 16:36:02.000000000 +0100
-@@ -20,25 +20,20 @@ libkeyboard_la_SOURCES = 	\
- 	csd-keyboard-plugin.c	\
- 	csd-keyboard-manager.h	\
- 	csd-keyboard-manager.c	\
--	csd-keyboard-xkb.h	\
--	csd-keyboard-xkb.c	\
--	delayed-dialog.h	\
--	delayed-dialog.c	\
--	gkbd-configuration.c	\
--	gkbd-configuration.h	\
- 	$(NULL)
- 
- libkeyboard_la_CPPFLAGS = \
- 	-I$(top_srcdir)/cinnamon-settings-daemon		\
- 	-I$(top_srcdir)/data				\
-+	-I$(top_srcdir)/plugins/common			\
- 	-DDATADIR=\""$(pkgdatadir)"\"			\
-+	-DLIBEXECDIR=\""$(libexecdir)"\"		\
- 	-DCINNAMON_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
- 	$(AM_CPPFLAGS)
- 
- libkeyboard_la_CFLAGS = \
- 	$(PLUGIN_CFLAGS)		\
- 	$(SETTINGS_PLUGIN_CFLAGS)	\
--	$(APPINDICATOR_CFLAGS)		\
- 	$(KEYBOARD_CFLAGS)		\
- 	$(AM_CFLAGS)
- 
-@@ -46,19 +41,63 @@ libkeyboard_la_LDFLAGS = 	\
- 	$(CSD_PLUGIN_LDFLAGS)	\
- 	$(NULL)
- 
--libkeyboard_la_LIBADD  = 	\
--	$(SETTINGS_PLUGIN_LIBS)	\
--	$(XF86MISC_LIBS)	\
--	$(KEYBOARD_LIBS)	\
--	$(APPINDICATOR_LIBS)	\
-+libkeyboard_la_LIBADD  =				\
-+	$(top_builddir)/plugins/common/libcommon.la	\
-+	$(SETTINGS_PLUGIN_LIBS)				\
-+	$(XF86MISC_LIBS)				\
-+	$(KEYBOARD_LIBS)				\
- 	$(NULL)
- 
-+libexec_PROGRAMS = csd-test-keyboard
-+csd_test_keyboard_SOURCES =	\
-+	test-keyboard.c		\
-+	csd-keyboard-manager.h	\
-+	csd-keyboard-manager.c	\
-+	$(NULL)
-+
-+csd_test_keyboard_CFLAGS = $(libkeyboard_la_CFLAGS)
-+csd_test_keyboard_CPPFLAGS = $(libkeyboard_la_CPPFLAGS)
-+csd_test_keyboard_LDADD = $(libkeyboard_la_LIBADD) $(top_builddir)/cinnamon-settings-daemon/libcsd.la
-+
- plugin_in_files = 		\
- 	keyboard.cinnamon-settings-plugin.in	\
- 	$(NULL)
- 
- plugin_DATA = $(plugin_in_files:.cinnamon-settings-plugin.in=.cinnamon-settings-plugin)
- 
-+if HAVE_IBUS
-+noinst_PROGRAMS = test-keyboard-ibus-utils
-+test_keyboard_ibus_utils_SOURCES = test-keyboard-ibus-utils.c
-+test_keyboard_ibus_utils_CFLAGS = $(libkeyboard_la_CFLAGS)
-+test_keyboard_ibus_utils_CPPFLAGS = $(libkeyboard_la_CPPFLAGS)
-+test_keyboard_ibus_utils_LDADD = $(libkeyboard_la_LIBADD) $(top_builddir)/cinnamon-settings-daemon/libcsd.la
-+
-+check-local: test-keyboard-ibus-utils
-+	$(builddir)/test-keyboard-ibus-utils > /dev/null
-+endif
-+
-+libexec_PROGRAMS += csd-input-sources-switcher
-+
-+csd_input_sources_switcher_SOURCES = 	\
-+	csd-input-sources-switcher.c	\
-+	$(NULL)
-+
-+csd_input_sources_switcher_CPPFLAGS =	\
-+	-I$(top_srcdir)/data		\
-+	-I$(top_srcdir)/plugins/common	\
-+	$(AM_CPPFLAGS)			\
-+	$(NULL)
-+
-+csd_input_sources_switcher_CFLAGS =	\
-+	$(SETTINGS_PLUGIN_CFLAGS)	\
-+	$(AM_CFLAGS)			\
-+	$(NULL)
-+
-+csd_input_sources_switcher_LDADD  = 	\
-+	$(top_builddir)/plugins/common/libcommon.la	\
-+	$(SETTINGS_PLUGIN_LIBS)		\
-+	$(NULL)
-+
- EXTRA_DIST = 			\
- 	$(icons_DATA)		\
- 	$(plugin_in_files)	\
-diff -uNrp a/plugins/keyboard/test-keyboard.c b/plugins/keyboard/test-keyboard.c
---- a/plugins/keyboard/test-keyboard.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/plugins/keyboard/test-keyboard.c	2013-08-25 16:36:02.000000000 +0100
-@@ -0,0 +1,7 @@
-+#define NEW csd_keyboard_manager_new
-+#define START csd_keyboard_manager_start
-+#define STOP csd_keyboard_manager_stop
-+#define MANAGER CsdKeyboardManager
-+#include "csd-keyboard-manager.h"
-+
-+#include "test-plugin.h"
-diff -uNrp a/plugins/keyboard/test-keyboard-ibus-utils.c b/plugins/keyboard/test-keyboard-ibus-utils.c
---- a/plugins/keyboard/test-keyboard-ibus-utils.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/plugins/keyboard/test-keyboard-ibus-utils.c	2013-08-25 16:36:02.000000000 +0100
-@@ -0,0 +1,116 @@
-+#include "csd-keyboard-manager.c"
-+
-+static void
-+test_make_xkb_source_id (void)
-+{
-+        gint i;
-+        const gchar *test_strings[][2] = {
-+                /* input                output */
-+                { "xkb:aa:bb:cc",       "aa+bb" },
-+                { "xkb:aa:bb:",         "aa+bb" },
-+                { "xkb:aa::cc",         "aa" },
-+                { "xkb:aa::",           "aa" },
-+                { "xkb::bb:cc",         "+bb" },
-+                { "xkb::bb:",           "+bb" },
-+                { "xkb:::cc",           "" },
-+                { "xkb:::",             "" },
-+        };
-+
-+        for (i = 0; i < G_N_ELEMENTS (test_strings); ++i)
-+                g_assert_cmpstr (make_xkb_source_id (test_strings[i][0]), ==, test_strings[i][1]);
-+}
-+
-+static void
-+test_layout_from_ibus_layout (void)
-+{
-+        gint i;
-+        const gchar *test_strings[][2] = {
-+                /* input                output */
-+                { "",                   "" },
-+                { "a",                  "a" },
-+                { "a(",                 "a" },
-+                { "a[",                 "a" },
-+        };
-+
-+        for (i = 0; i < G_N_ELEMENTS (test_strings); ++i)
-+                g_assert_cmpstr (layout_from_ibus_layout (test_strings[i][0]), ==, test_strings[i][1]);
-+}
-+
-+static void
-+test_variant_from_ibus_layout (void)
-+{
-+        gint i;
-+        const gchar *test_strings[][2] = {
-+                /* input                output */
-+                { "",                   NULL },
-+                { "a",                  NULL },
-+                { "(",                  NULL },
-+                { "()",                 "" },
-+                { "(b)",                "b" },
-+                { "a(",                 NULL },
-+                { "a()",                "" },
-+                { "a(b)",               "b" },
-+        };
-+
-+        for (i = 0; i < G_N_ELEMENTS (test_strings); ++i)
-+                g_assert_cmpstr (variant_from_ibus_layout (test_strings[i][0]), ==, test_strings[i][1]);
-+}
-+
-+static void
-+test_options_from_ibus_layout (void)
-+{
-+        gint i, j;
-+        gchar *output_0[] = {
-+                NULL
-+        };
-+        gchar *output_1[] = {
-+                "",
-+                NULL
-+        };
-+        gchar *output_2[] = {
-+                "b",
-+                NULL
-+        };
-+        gchar *output_3[] = {
-+                "b", "",
-+                NULL
-+        };
-+        gchar *output_4[] = {
-+                "b", "c",
-+                NULL
-+        };
-+        const gpointer tests[][2] = {
-+                /* input                output */
-+                { "",                   NULL },
-+                { "a",                  NULL },
-+                { "a[",                 output_0 },
-+                { "a[]",                output_1 },
-+                { "a[b]",               output_2 },
-+                { "a[b,]",              output_3 },
-+                { "a[b,c]",             output_4 },
-+        };
-+
-+        for (i = 0; i < G_N_ELEMENTS (tests); ++i) {
-+                if (tests[i][1] == NULL) {
-+                        g_assert (options_from_ibus_layout (tests[i][0]) == NULL);
-+                } else {
-+                        gchar **strv_a = options_from_ibus_layout (tests[i][0]);
-+                        gchar **strv_b = tests[i][1];
-+
-+                        g_assert (g_strv_length (strv_a) == g_strv_length (strv_b));
-+                        for (j = 0; j < g_strv_length (strv_a); ++j)
-+                                g_assert_cmpstr (strv_a[j], ==, strv_b[j]);
-+                }
-+        }
-+}
-+
-+int
-+main (void)
-+{
-+        test_make_xkb_source_id ();
-+        test_layout_from_ibus_layout ();
-+        test_variant_from_ibus_layout ();
-+        test_options_from_ibus_layout ();
-+
-+        return 0;
-+}
-diff -uNrp a/plugins/keyboard/xxx/csd-keyboard-xkb.c b/plugins/keyboard/xxx/csd-keyboard-xkb.c
---- a/plugins/keyboard/xxx/csd-keyboard-xkb.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/plugins/keyboard/xxx/csd-keyboard-xkb.c	2013-08-25 16:36:02.000000000 +0100
-@@ -0,0 +1,579 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-+ *
-+ * Copyright (C) 2001 Udaltsoft
-+ *
-+ * Written by Sergey V. Oudaltsov <svu@users.sourceforge.net>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2, or (at your option)
-+ * any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street - Suite 500, Boston, MA
-+ * 02110-1335, USA.
-+ */
-+
-+#include "config.h"
-+
-+#include <string.h>
-+#include <time.h>
-+
-+#include <glib/gi18n.h>
-+#include <gdk/gdk.h>
-+#include <gdk/gdkx.h>
-+#include <gtk/gtk.h>
-+
-+#include <libgnomekbd/gkbd-status.h>
-+
-+#include <libgnomekbd/gkbd-keyboard-drawing.h>
-+#include <libgnomekbd/gkbd-desktop-config.h>
-+#include <libgnomekbd/gkbd-indicator-config.h>
-+#include <libgnomekbd/gkbd-keyboard-config.h>
-+#include <libgnomekbd/gkbd-util.h>
-+
-+#include "csd-keyboard-xkb.h"
-+#include "delayed-dialog.h"
-+#include "cinnamon-settings-profile.h"
-+
-+#define SETTINGS_KEYBOARD_DIR "org.cinnamon.settings-daemon.plugins.keyboard"
-+
-+static CsdKeyboardManager *manager = NULL;
-+
-+static XklEngine *xkl_engine;
-+static XklConfigRegistry *xkl_registry = NULL;
-+
-+static GkbdDesktopConfig current_config;
-+static GkbdKeyboardConfig current_kbd_config;
-+
-+/* never terminated */
-+static GkbdKeyboardConfig initial_sys_kbd_config;
-+
-+static gboolean inited_ok = FALSE;
-+
-+static GSettings *settings_desktop = NULL;
-+static GSettings *settings_keyboard = NULL;
-+
-+static PostActivationCallback pa_callback = NULL;
-+static void *pa_callback_user_data = NULL;
-+
-+static GtkStatusIcon *icon = NULL;
-+
-+static GHashTable *preview_dialogs = NULL;
-+
-+static void
-+activation_error (void)
-+{
-+	char const *vendor;
-+	GtkWidget *dialog;
-+
-+	vendor =
-+	    ServerVendor (GDK_DISPLAY_XDISPLAY
-+			  (gdk_display_get_default ()));
-+
-+	/* VNC viewers will not work, do not barrage them with warnings */
-+	if (NULL != vendor && NULL != strstr (vendor, "VNC"))
-+		return;
-+
-+	dialog = gtk_message_dialog_new_with_markup (NULL,
-+						     0,
-+						     GTK_MESSAGE_ERROR,
-+						     GTK_BUTTONS_CLOSE,
-+						     _
-+						     ("Error activating XKB configuration.\n"
-+						      "There can be various reasons for that.\n\n"
-+						      "If you report this situation as a bug, include the results of\n"
-+						      " • <b>%s</b>\n"
-+						      " • <b>%s</b>\n"
-+						      " • <b>%s</b>\n"
-+						      " • <b>%s</b>"),
-+						     "xprop -root | grep XKB",
-+						     "gsettings get org.gnome.libgnomekbd.keyboard model",
-+						     "gsettings get org.gnome.libgnomekbd.keyboard layouts",
-+						     "gsettings get org.gnome.libgnomekbd.keyboard options");
-+	g_signal_connect (dialog, "response",
-+			  G_CALLBACK (gtk_widget_destroy), NULL);
-+	csd_delayed_show_dialog (dialog);
-+}
-+
-+static gboolean
-+ensure_xkl_registry (void)
-+{
-+	if (!xkl_registry) {
-+		xkl_registry =
-+		    xkl_config_registry_get_instance (xkl_engine);
-+		/* load all materials, unconditionally! */
-+		if (!xkl_config_registry_load (xkl_registry, TRUE)) {
-+			g_object_unref (xkl_registry);
-+			xkl_registry = NULL;
-+			return FALSE;
-+		}
-+	}
-+
-+	return TRUE;
-+}
-+
-+static void
-+apply_desktop_settings (void)
-+{
-+	if (!inited_ok)
-+		return;
-+
-+	csd_keyboard_manager_apply_settings (manager);
-+	gkbd_desktop_config_load (&current_config);
-+	/* again, probably it would be nice to compare things
-+	   before activating them */
-+	gkbd_desktop_config_activate (&current_config);
-+}
-+
-+static void
-+popup_menu_launch_capplet ()
-+{
-+	GAppInfo *info;
-+	GdkAppLaunchContext *ctx;
-+	GError *error = NULL;
-+
-+	info =
-+	    g_app_info_create_from_commandline
-+	    ("cinnamon-settings region", NULL, 0, &error);
-+
-+	if (info != NULL) {
-+		ctx =
-+		    gdk_display_get_app_launch_context
-+		    (gdk_display_get_default ());
-+
-+		if (g_app_info_launch (info, NULL,
-+				   G_APP_LAUNCH_CONTEXT (ctx), &error) == FALSE) {
-+			g_warning
-+				("Could not execute keyboard properties capplet: [%s]\n",
-+				 error->message);
-+			g_error_free (error);
-+		}
-+
-+		g_object_unref (info);
-+		g_object_unref (ctx);
-+	}
-+
-+}
-+
-+static void
-+show_layout_destroy (GtkWidget * dialog, gint group)
-+{
-+	g_hash_table_remove (preview_dialogs, GINT_TO_POINTER (group));
-+}
-+
-+static void
-+popup_menu_show_layout ()
-+{
-+	GtkWidget *dialog;
-+	XklEngine *engine =
-+	    xkl_engine_get_instance (GDK_DISPLAY_XDISPLAY
-+				     (gdk_display_get_default ()));
-+	XklState *xkl_state = xkl_engine_get_current_state (engine);
-+
-+	gchar **group_names = gkbd_status_get_group_names ();
-+
-+	gpointer p = g_hash_table_lookup (preview_dialogs,
-+					  GINT_TO_POINTER
-+					  (xkl_state->group));
-+
-+	if (xkl_state->group < 0
-+	    || xkl_state->group >= g_strv_length (group_names)) {
-+		return;
-+	}
-+
-+	if (p != NULL) {
-+		/* existing window */
-+		gtk_window_present (GTK_WINDOW (p));
-+		return;
-+	}
-+
-+	if (!ensure_xkl_registry ())
-+		return;
-+
-+	dialog = gkbd_keyboard_drawing_dialog_new ();
-+	gkbd_keyboard_drawing_dialog_set_group (dialog, xkl_registry, xkl_state->group);
-+
-+	g_signal_connect (dialog, "destroy",
-+			  G_CALLBACK (show_layout_destroy),
-+			  GINT_TO_POINTER (xkl_state->group));
-+	g_hash_table_insert (preview_dialogs,
-+			     GINT_TO_POINTER (xkl_state->group), dialog);
-+	gtk_widget_show_all (dialog);
-+}
-+
-+static void
-+popup_menu_set_group (gint group_number, gboolean only_menu)
-+{
-+
-+	XklEngine *engine = gkbd_status_get_xkl_engine ();
-+
-+	XklState *st = xkl_engine_get_current_state(engine);
-+	Window cur;
-+	st->group = group_number;
-+	xkl_engine_allow_one_switch_to_secondary_group (engine);
-+	cur = xkl_engine_get_current_window (engine);
-+	if (cur != (Window) NULL) {
-+		xkl_debug (150, "Enforcing the state %d for window %lx\n",
-+			   st->group, cur);
-+
-+		xkl_engine_save_state (engine,
-+				       xkl_engine_get_current_window
-+				       (engine), st);
-+/*    XSetInputFocus( GDK_DISPLAY(), cur, RevertToNone, CurrentTime );*/
-+	} else {
-+		xkl_debug (150,
-+			   "??? Enforcing the state %d for unknown window\n",
-+			   st->group);
-+		/* strange situation - bad things can happen */
-+	}
-+        if (!only_menu)
-+        	xkl_engine_lock_group (engine, st->group);
-+}
-+
-+static void
-+popup_menu_set_group_cb (GtkMenuItem * item, gpointer param)
-+{
-+	gint group_number = GPOINTER_TO_INT (param);
-+
-+	popup_menu_set_group(group_number, FALSE);
-+}
-+
-+
-+static GtkMenu *
-+create_status_menu (void)
-+{
-+	GtkMenu *popup_menu = GTK_MENU (gtk_menu_new ());
-+	int i = 0;
-+
-+	GtkMenu *groups_menu = GTK_MENU (gtk_menu_new ());
-+	gchar **current_name = gkbd_status_get_group_names ();
-+
-+	GtkWidget *item = gtk_menu_item_new_with_mnemonic (_("_Layouts"));
-+	gtk_widget_show (item);
-+	gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item);
-+	gtk_menu_item_set_submenu (GTK_MENU_ITEM (item),
-+				   GTK_WIDGET (groups_menu));
-+
-+	item = gtk_menu_item_new_with_mnemonic (_("Show _Keyboard Layout..."));
-+	gtk_widget_show (item);
-+	g_signal_connect (item, "activate", popup_menu_show_layout, NULL);
-+	gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item);
-+
-+	/* translators note:
-+	 * This is the name of the cinnamon-settings "region" panel */
-+	item = gtk_menu_item_new_with_mnemonic (_("Region and Language Settings"));
-+	gtk_widget_show (item);
-+	g_signal_connect (item, "activate", popup_menu_launch_capplet, NULL);
-+	gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item);
-+
-+	for (i = 0; current_name && *current_name; i++, current_name++) {
-+
-+		gchar *image_file = gkbd_status_get_image_filename (i);
-+
-+		if (image_file == NULL) {
-+			item =
-+			    gtk_menu_item_new_with_label (*current_name);
-+		} else {
-+			GdkPixbuf *pixbuf =
-+			    gdk_pixbuf_new_from_file_at_size (image_file,
-+							      24, 24,
-+							      NULL);
-+			GtkWidget *img =
-+			    gtk_image_new_from_pixbuf (pixbuf);
-+			item =
-+			    gtk_image_menu_item_new_with_label
-+			    (*current_name);
-+			gtk_widget_show (img);
-+			gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM
-+						       (item), img);
-+			gtk_image_menu_item_set_always_show_image
-+			    (GTK_IMAGE_MENU_ITEM (item), TRUE);
-+			g_free (image_file);
-+		}
-+		gtk_widget_show (item);
-+		gtk_menu_shell_append (GTK_MENU_SHELL (groups_menu), item);
-+		g_signal_connect (item, "activate",
-+				  G_CALLBACK (popup_menu_set_group_cb),
-+				  GINT_TO_POINTER (i));
-+	}
-+
-+	return popup_menu;
-+}
-+
-+static void
-+status_icon_popup_menu_cb (GtkStatusIcon * icon, guint button, guint time)
-+{
-+	GtkMenu *popup_menu = create_status_menu ();
-+
-+	gtk_menu_popup (popup_menu, NULL, NULL,
-+			gtk_status_icon_position_menu,
-+			(gpointer) icon, button, time);
-+}
-+
-+static void
-+show_hide_icon ()
-+{
-+	if (g_strv_length (current_kbd_config.layouts_variants) > 1) {
-+		if (icon == NULL) {
-+			xkl_debug (150, "Creating keyboard status icon\n");
-+			icon = gkbd_status_new ();
-+			g_signal_connect (icon, "popup-menu",
-+					  G_CALLBACK
-+					  (status_icon_popup_menu_cb),
-+					  NULL);
-+
-+		}
-+	} else {
-+		if (icon != NULL) {
-+			xkl_debug (150, "Destroying icon\n");
-+			g_object_unref (icon);
-+			icon = NULL;
-+		}
-+	}
-+}
-+
-+static gboolean
-+try_activating_xkb_config_if_new (GkbdKeyboardConfig *
-+				  current_sys_kbd_config)
-+{
-+	/* Activate - only if different! */
-+	if (!gkbd_keyboard_config_equals
-+	    (&current_kbd_config, current_sys_kbd_config)) {
-+		if (gkbd_keyboard_config_activate (&current_kbd_config)) {
-+			if (pa_callback != NULL) {
-+				(*pa_callback) (pa_callback_user_data);
-+				return TRUE;
-+			}
-+		} else {
-+			return FALSE;
-+		}
-+	}
-+	return TRUE;
-+}
-+
-+static gboolean
-+filter_xkb_config (void)
-+{
-+	XklConfigItem *item;
-+	gchar *lname;
-+	gchar *vname;
-+	gchar **lv;
-+	gboolean any_change = FALSE;
-+
-+	xkl_debug (100, "Filtering configuration against the registry\n");
-+	if (!ensure_xkl_registry ())
-+		return FALSE;
-+
-+	lv = current_kbd_config.layouts_variants;
-+	item = xkl_config_item_new ();
-+	while (*lv) {
-+		xkl_debug (100, "Checking [%s]\n", *lv);
-+		if (gkbd_keyboard_config_split_items (*lv, &lname, &vname)) {
-+			gboolean should_be_dropped = FALSE;
-+			g_snprintf (item->name, sizeof (item->name), "%s",
-+				    lname);
-+			if (!xkl_config_registry_find_layout
-+			    (xkl_registry, item)) {
-+				xkl_debug (100, "Bad layout [%s]\n",
-+					   lname);
-+				should_be_dropped = TRUE;
-+			} else if (vname) {
-+				g_snprintf (item->name,
-+					    sizeof (item->name), "%s",
-+					    vname);
-+				if (!xkl_config_registry_find_variant
-+				    (xkl_registry, lname, item)) {
-+					xkl_debug (100,
-+						   "Bad variant [%s(%s)]\n",
-+						   lname, vname);
-+					should_be_dropped = TRUE;
-+				}
-+			}
-+			if (should_be_dropped) {
-+				gkbd_strv_behead (lv);
-+				any_change = TRUE;
-+				continue;
-+			}
-+		}
-+		lv++;
-+	}
-+	g_object_unref (item);
-+	return any_change;
-+}
-+
-+static void
-+apply_xkb_settings (void)
-+{
-+	GkbdKeyboardConfig current_sys_kbd_config;
-+
-+	if (!inited_ok)
-+		return;
-+
-+	gkbd_keyboard_config_init (&current_sys_kbd_config, xkl_engine);
-+
-+	gkbd_keyboard_config_load (&current_kbd_config,
-+				   &initial_sys_kbd_config);
-+
-+	gkbd_keyboard_config_load_from_x_current (&current_sys_kbd_config,
-+						  NULL);
-+
-+	if (!try_activating_xkb_config_if_new (&current_sys_kbd_config)) {
-+		if (filter_xkb_config ()) {
-+			if (!try_activating_xkb_config_if_new
-+			    (&current_sys_kbd_config)) {
-+				g_warning
-+				    ("Could not activate the filtered XKB configuration");
-+				activation_error ();
-+			}
-+		} else {
-+			g_warning
-+			    ("Could not activate the XKB configuration");
-+			activation_error ();
-+		}
-+	} else
-+		xkl_debug (100,
-+			   "Actual KBD configuration was not changed: redundant notification\n");
-+
-+	gkbd_keyboard_config_term (&current_sys_kbd_config);
-+	show_hide_icon ();
-+}
-+
-+static void
-+csd_keyboard_xkb_analyze_sysconfig (void)
-+{
-+	if (!inited_ok)
-+		return;
-+
-+	gkbd_keyboard_config_init (&initial_sys_kbd_config, xkl_engine);
-+	gkbd_keyboard_config_load_from_x_initial (&initial_sys_kbd_config,
-+						  NULL);
-+}
-+
-+void
-+csd_keyboard_xkb_set_post_activation_callback (PostActivationCallback fun,
-+					       void *user_data)
-+{
-+	pa_callback = fun;
-+	pa_callback_user_data = user_data;
-+}
-+
-+static GdkFilterReturn
-+csd_keyboard_xkb_evt_filter (GdkXEvent * xev, GdkEvent * event)
-+{
-+	XEvent *xevent = (XEvent *) xev;
-+	xkl_engine_filter_events (xkl_engine, xevent);
-+	return GDK_FILTER_CONTINUE;
-+}
-+
-+/* When new Keyboard is plugged in - reload the settings */
-+static void
-+csd_keyboard_new_device (XklEngine * engine)
-+{
-+	apply_desktop_settings ();
-+	apply_xkb_settings ();
-+}
-+
-+void
-+csd_keyboard_xkb_init (CsdKeyboardManager * kbd_manager)
-+{
-+	Display *display =
-+	    GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
-+	cinnamon_settings_profile_start (NULL);
-+
-+	gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
-+					   DATADIR G_DIR_SEPARATOR_S
-+					   "icons");
-+
-+	manager = kbd_manager;
-+	cinnamon_settings_profile_start ("xkl_engine_get_instance");
-+	xkl_engine = xkl_engine_get_instance (display);
-+	cinnamon_settings_profile_end ("xkl_engine_get_instance");
-+	if (xkl_engine) {
-+		inited_ok = TRUE;
-+
-+		gkbd_desktop_config_init (&current_config, xkl_engine);
-+		gkbd_keyboard_config_init (&current_kbd_config,
-+					   xkl_engine);
-+		xkl_engine_backup_names_prop (xkl_engine);
-+		csd_keyboard_xkb_analyze_sysconfig ();
-+
-+		settings_desktop = g_settings_new (GKBD_DESKTOP_SCHEMA);
-+		settings_keyboard = g_settings_new (GKBD_KEYBOARD_SCHEMA);
-+		g_signal_connect (settings_desktop, "changed",
-+				  (GCallback) apply_desktop_settings,
-+				  NULL);
-+		g_signal_connect (settings_keyboard, "changed",
-+				  (GCallback) apply_xkb_settings, NULL);
-+
-+		gdk_window_add_filter (NULL, (GdkFilterFunc)
-+				       csd_keyboard_xkb_evt_filter, NULL);
-+
-+		if (xkl_engine_get_features (xkl_engine) &
-+		    XKLF_DEVICE_DISCOVERY)
-+			g_signal_connect (xkl_engine, "X-new-device",
-+					  G_CALLBACK
-+					  (csd_keyboard_new_device), NULL);
-+
-+		cinnamon_settings_profile_start ("xkl_engine_start_listen");
-+		xkl_engine_start_listen (xkl_engine,
-+					 XKLL_MANAGE_LAYOUTS |
-+					 XKLL_MANAGE_WINDOW_STATES);
-+		cinnamon_settings_profile_end ("xkl_engine_start_listen");
-+
-+		cinnamon_settings_profile_start ("apply_desktop_settings");
-+		apply_desktop_settings ();
-+		cinnamon_settings_profile_end ("apply_desktop_settings");
-+		cinnamon_settings_profile_start ("apply_xkb_settings");
-+		apply_xkb_settings ();
-+		cinnamon_settings_profile_end ("apply_xkb_settings");
-+	}
-+	preview_dialogs = g_hash_table_new (g_direct_hash, g_direct_equal);
-+
-+	cinnamon_settings_profile_end (NULL);
-+}
-+
-+void
-+csd_keyboard_xkb_shutdown (void)
-+{
-+	if (!inited_ok)
-+		return;
-+
-+	pa_callback = NULL;
-+	pa_callback_user_data = NULL;
-+	manager = NULL;
-+
-+	if (preview_dialogs != NULL)
-+		g_hash_table_destroy (preview_dialogs);
-+
-+	if (!inited_ok)
-+		return;
-+
-+	xkl_engine_stop_listen (xkl_engine,
-+				XKLL_MANAGE_LAYOUTS |
-+				XKLL_MANAGE_WINDOW_STATES);
-+
-+	gdk_window_remove_filter (NULL, (GdkFilterFunc)
-+				  csd_keyboard_xkb_evt_filter, NULL);
-+
-+	g_object_unref (settings_desktop);
-+	settings_desktop = NULL;
-+	g_object_unref (settings_keyboard);
-+	settings_keyboard = NULL;
-+
-+	if (xkl_registry) {
-+		g_object_unref (xkl_registry);
-+	}
-+
-+	g_object_unref (xkl_engine);
-+
-+	xkl_engine = NULL;
-+
-+	inited_ok = FALSE;
-+}
-diff -uNrp a/plugins/keyboard/xxx/csd-keyboard-xkb.h b/plugins/keyboard/xxx/csd-keyboard-xkb.h
---- a/plugins/keyboard/xxx/csd-keyboard-xkb.h	1970-01-01 01:00:00.000000000 +0100
-+++ b/plugins/keyboard/xxx/csd-keyboard-xkb.h	2013-08-25 16:36:02.000000000 +0100
-@@ -0,0 +1,39 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-+ * cinnamon-settings-keyboard-xkb.h
-+ *
-+ * Copyright (C) 2001 Udaltsoft
-+ *
-+ * Written by Sergey V. Oudaltsov <svu@users.sourceforge.net>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2, or (at your option)
-+ * any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street - Suite 500, Boston, MA
-+ * 02110-1335, USA.
-+ */
-+
-+#ifndef __CSD_KEYBOARD_XKB_H
-+#define __CSD_KEYBOARD_XKB_H
-+
-+#include <libxklavier/xklavier.h>
-+#include "csd-keyboard-manager.h"
-+
-+void csd_keyboard_xkb_init (CsdKeyboardManager *manager);
-+void csd_keyboard_xkb_shutdown (void);
-+
-+typedef void (*PostActivationCallback) (void *userData);
-+
-+void
-+csd_keyboard_xkb_set_post_activation_callback (PostActivationCallback fun,
-+                                               void                  *userData);
-+
-+#endif
-diff -uNrp a/plugins/keyboard/xxx/delayed-dialog.c b/plugins/keyboard/xxx/delayed-dialog.c
---- a/plugins/keyboard/xxx/delayed-dialog.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/plugins/keyboard/xxx/delayed-dialog.c	2013-08-25 16:36:02.000000000 +0100
-@@ -0,0 +1,128 @@
-+/*
-+ * Copyright © 2006 Novell, Inc.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2, or (at
-+ * your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street - Suite 500, Boston, MA
-+ * 02110-1335, USA.
-+ */
-+
-+#include <stdlib.h>
-+#include <string.h>
-+
-+#include <gtk/gtk.h>
-+#include <gdk/gdkx.h>
-+
-+#include "delayed-dialog.h"
-+
-+static gboolean        delayed_show_timeout (gpointer   data);
-+static GdkFilterReturn message_filter       (GdkXEvent *xevent,
-+                                             GdkEvent  *event,
-+                                             gpointer   data);
-+
-+static GSList *dialogs = NULL;
-+
-+/**
-+ * csd_delayed_show_dialog:
-+ * @dialog: the dialog
-+ *
-+ * Shows the dialog as with gtk_widget_show(), unless a window manager
-+ * hasn't been started yet, in which case it will wait up to 5 seconds
-+ * for that to happen before showing the dialog.
-+ **/
-+void
-+csd_delayed_show_dialog (GtkWidget *dialog)
-+{
-+        GdkDisplay *display = gtk_widget_get_display (dialog);
-+        Display *xdisplay = GDK_DISPLAY_XDISPLAY (display);
-+        GdkScreen *screen = gtk_widget_get_screen (dialog);
-+        char selection_name[10];
-+        Atom selection_atom;
-+
-+        /* We can't use gdk_selection_owner_get() for this, because
-+         * it's an unknown out-of-process window.
-+         */
-+        snprintf (selection_name, sizeof (selection_name), "WM_S%d",
-+                  gdk_screen_get_number (screen));
-+        selection_atom = XInternAtom (xdisplay, selection_name, True);
-+        if (selection_atom &&
-+            XGetSelectionOwner (xdisplay, selection_atom) != None) {
-+                gtk_widget_show (dialog);
-+                return;
-+        }
-+
-+        dialogs = g_slist_prepend (dialogs, dialog);
-+
-+        gdk_window_add_filter (NULL, message_filter, NULL);
-+
-+        g_timeout_add (5000, delayed_show_timeout, NULL);
-+}
-+
-+static gboolean
-+delayed_show_timeout (gpointer data)
-+{
-+        GSList *l;
-+
-+        for (l = dialogs; l; l = l->next)
-+                gtk_widget_show (l->data);
-+        g_slist_free (dialogs);
-+        dialogs = NULL;
-+
-+        /* FIXME: There's no gdk_display_remove_client_message_filter */
-+
-+        return FALSE;
-+}
-+
-+static GdkFilterReturn
-+message_filter (GdkXEvent *xevent, GdkEvent *event, gpointer data)
-+{
-+        XClientMessageEvent *evt;
-+        char *selection_name;
-+        int screen;
-+        GSList *l, *next;
-+
-+        if (((XEvent *)xevent)->type != ClientMessage)
-+          return GDK_FILTER_CONTINUE;
-+
-+        evt = (XClientMessageEvent *)xevent;
-+
-+        if (evt->message_type != XInternAtom (evt->display, "MANAGER", FALSE))
-+          return GDK_FILTER_CONTINUE;
-+
-+        selection_name = XGetAtomName (evt->display, evt->data.l[1]);
-+
-+        if (strncmp (selection_name, "WM_S", 4) != 0) {
-+                XFree (selection_name);
-+                return GDK_FILTER_CONTINUE;
-+        }
-+
-+        screen = atoi (selection_name + 4);
-+
-+        for (l = dialogs; l; l = next) {
-+                GtkWidget *dialog = l->data;
-+                next = l->next;
-+
-+                if (gdk_screen_get_number (gtk_widget_get_screen (dialog)) == screen) {
-+                        gtk_widget_show (dialog);
-+                        dialogs = g_slist_remove (dialogs, dialog);
-+                }
-+        }
-+
-+        if (!dialogs) {
-+                gdk_window_remove_filter (NULL, message_filter, NULL);
-+        }
-+
-+        XFree (selection_name);
-+
-+        return GDK_FILTER_CONTINUE;
-+}
-diff -uNrp a/plugins/keyboard/xxx/delayed-dialog.h b/plugins/keyboard/xxx/delayed-dialog.h
---- a/plugins/keyboard/xxx/delayed-dialog.h	1970-01-01 01:00:00.000000000 +0100
-+++ b/plugins/keyboard/xxx/delayed-dialog.h	2013-08-25 16:36:02.000000000 +0100
-@@ -0,0 +1,32 @@
-+/*
-+ * Copyright © 2006 Novell, Inc.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2, or (at
-+ * your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street - Suite 500, Boston, MA
-+ * 02110-1335, USA.
-+ */
-+
-+
-+#ifndef __DELAYED_DIALOG_H
-+#define __DELAYED_DIALOG_H
-+
-+#include <gtk/gtk.h>
-+
-+G_BEGIN_DECLS
-+
-+void            csd_delayed_show_dialog (GtkWidget *dialog);
-+
-+G_END_DECLS
-+
-+#endif
-diff -uNrp a/plugins/keyboard/xxx/gkbd-configuration.c b/plugins/keyboard/xxx/gkbd-configuration.c
---- a/plugins/keyboard/xxx/gkbd-configuration.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/plugins/keyboard/xxx/gkbd-configuration.c	2013-08-25 16:36:02.000000000 +0100
-@@ -0,0 +1,350 @@
-+/*
-+ * Copyright (C) 2010 Canonical Ltd.
-+ * 
-+ * Authors: Jan Arne Petersen <jpetersen@openismus.com>
-+ * 
-+ * Based on gkbd-status.c by Sergey V. Udaltsov <svu@gnome.org>
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the
-+ * Free Software Foundation, Inc., 51 Franklin Street - Suite 500,
-+ * Boston, MA 02110-1335, USA.
-+ */
-+
-+#include <memory.h>
-+
-+#include <gdk/gdkkeysyms.h>
-+#include <gdk/gdkx.h>
-+#include <glib/gi18n.h>
-+
-+#include <libgnomekbd/gkbd-desktop-config.h>
-+#include <libgnomekbd/gkbd-indicator-config.h>
-+
-+#include "gkbd-configuration.h"
-+
-+struct _GkbdConfigurationPrivate {
-+	XklEngine *engine;
-+	XklConfigRegistry *registry;
-+
-+	GkbdDesktopConfig cfg;
-+	GkbdIndicatorConfig ind_cfg;
-+	GkbdKeyboardConfig kbd_cfg;
-+
-+	gchar **full_group_names;
-+	gchar **short_group_names;
-+
-+	gulong state_changed_handler;
-+	gulong config_changed_handler;
-+};
-+
-+enum {
-+	SIGNAL_CHANGED,
-+	SIGNAL_GROUP_CHANGED,
-+	LAST_SIGNAL
-+};
-+
-+static guint signals[LAST_SIGNAL] = { 0, };
-+
-+#define GKBD_CONFIGURATION_GET_PRIVATE(o) \
-+	(G_TYPE_INSTANCE_GET_PRIVATE ((o), GKBD_TYPE_CONFIGURATION, GkbdConfigurationPrivate))
-+
-+G_DEFINE_TYPE (GkbdConfiguration, gkbd_configuration, G_TYPE_OBJECT)
-+
-+/* Should be called once for all widgets */
-+static void
-+gkbd_configuration_cfg_changed (GSettings *settings,
-+				 const char *key,
-+				 GkbdConfiguration * configuration)
-+{
-+	GkbdConfigurationPrivate *priv = configuration->priv;
-+
-+	xkl_debug (100,
-+		   "General configuration changed in GSettings - reiniting...\n");
-+	gkbd_desktop_config_load (&priv->cfg);
-+	gkbd_desktop_config_activate (&priv->cfg);
-+
-+	g_signal_emit (configuration,
-+		       signals[SIGNAL_CHANGED], 0);
-+}
-+
-+/* Should be called once for all widgets */
-+static void
-+gkbd_configuration_ind_cfg_changed (GSettings *settings,
-+				     const char *key,
-+				     GkbdConfiguration * configuration)
-+{
-+	GkbdConfigurationPrivate *priv = configuration->priv;
-+	xkl_debug (100,
-+		   "Applet configuration changed in GSettings - reiniting...\n");
-+	gkbd_indicator_config_load (&priv->ind_cfg);
-+
-+	gkbd_indicator_config_free_image_filenames (&priv->ind_cfg);
-+	gkbd_indicator_config_load_image_filenames (&priv->ind_cfg,
-+						    &priv->kbd_cfg);
-+
-+	gkbd_indicator_config_activate (&priv->ind_cfg);
-+
-+	g_signal_emit (configuration,
-+		       signals[SIGNAL_CHANGED], 0);
-+}
-+
-+static void
-+gkbd_configuration_load_group_names (GkbdConfiguration * configuration,
-+				     XklConfigRec * xklrec)
-+{
-+	GkbdConfigurationPrivate *priv = configuration->priv;
-+
-+	if (!gkbd_desktop_config_load_group_descriptions (&priv->cfg,
-+							  priv->registry,
-+							  (const char **) xklrec->layouts,
-+							  (const char **) xklrec->variants,
-+	     						  &priv->short_group_names,
-+							  &priv->full_group_names)) {
-+		/* We just populate no short names (remain NULL) - 
-+		 * full names are going to be used anyway */
-+		gint i, total_groups =
-+		    xkl_engine_get_num_groups (priv->engine);
-+		xkl_debug (150, "group descriptions loaded: %d!\n",
-+			   total_groups);
-+		priv->full_group_names =
-+		    g_new0 (char *, total_groups + 1);
-+
-+		if (xkl_engine_get_features (priv->engine) &
-+		    XKLF_MULTIPLE_LAYOUTS_SUPPORTED) {
-+			for (i = 0; priv->kbd_cfg.layouts_variants[i]; i++) {
-+				priv->full_group_names[i] =
-+				    g_strdup ((char *) priv->kbd_cfg.layouts_variants[i]);
-+			}
-+		} else {
-+			for (i = total_groups; --i >= 0;) {
-+				priv->full_group_names[i] =
-+				    g_strdup_printf ("Group %d", i);
-+			}
-+		}
-+	}
-+}
-+
-+/* Should be called once for all widgets */
-+static void
-+gkbd_configuration_kbd_cfg_callback (XklEngine *engine,
-+				     GkbdConfiguration *configuration)
-+{
-+	GkbdConfigurationPrivate *priv = configuration->priv;
-+	XklConfigRec *xklrec = xkl_config_rec_new ();
-+	xkl_debug (100,
-+		   "XKB configuration changed on X Server - reiniting...\n");
-+
-+	gkbd_keyboard_config_load_from_x_current (&priv->kbd_cfg,
-+						  xklrec);
-+
-+	gkbd_indicator_config_free_image_filenames (&priv->ind_cfg);
-+	gkbd_indicator_config_load_image_filenames (&priv->ind_cfg,
-+						    &priv->kbd_cfg);
-+
-+	g_strfreev (priv->full_group_names);
-+	priv->full_group_names = NULL;
-+
-+	g_strfreev (priv->short_group_names);
-+	priv->short_group_names = NULL;
-+
-+	gkbd_configuration_load_group_names (configuration,
-+				 	     xklrec);
-+
-+	g_signal_emit (configuration,
-+		       signals[SIGNAL_CHANGED],
-+		       0);
-+
-+	g_object_unref (G_OBJECT (xklrec));
-+}
-+
-+/* Should be called once for all applets */
-+static void
-+gkbd_configuration_state_callback (XklEngine * engine,
-+				   XklEngineStateChange changeType,
-+			    	   gint group, gboolean restore,
-+				   GkbdConfiguration * configuration)
-+{
-+	xkl_debug (150, "group is now %d, restore: %d\n", group, restore);
-+
-+	if (changeType == GROUP_CHANGED) {
-+		g_signal_emit (configuration,
-+			       signals[SIGNAL_GROUP_CHANGED], 0,
-+			       group);
-+	}
-+}
-+
-+static void
-+gkbd_configuration_init (GkbdConfiguration *configuration)
-+{
-+	GkbdConfigurationPrivate *priv;
-+	XklConfigRec *xklrec = xkl_config_rec_new ();
-+
-+	priv = GKBD_CONFIGURATION_GET_PRIVATE (configuration);
-+	configuration->priv = priv;
-+
-+	priv->engine = xkl_engine_get_instance (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
-+	if (priv->engine == NULL) {
-+		xkl_debug (0, "Libxklavier initialization error");
-+		return;
-+	}
-+
-+	priv->state_changed_handler =
-+	    g_signal_connect (priv->engine, "X-state-changed",
-+			      G_CALLBACK (gkbd_configuration_state_callback),
-+			      configuration);
-+	priv->config_changed_handler =
-+	    g_signal_connect (priv->engine, "X-config-changed",
-+			      G_CALLBACK (gkbd_configuration_kbd_cfg_callback),
-+			      configuration);
-+
-+	gkbd_desktop_config_init (&priv->cfg, priv->engine);
-+	gkbd_keyboard_config_init (&priv->kbd_cfg, priv->engine);
-+	gkbd_indicator_config_init (&priv->ind_cfg, priv->engine);
-+
-+	gkbd_desktop_config_load (&priv->cfg);
-+	gkbd_desktop_config_activate (&priv->cfg);
-+
-+	priv->registry = xkl_config_registry_get_instance (priv->engine);
-+	xkl_config_registry_load (priv->registry,
-+				  priv->cfg.load_extra_items);
-+
-+	gkbd_keyboard_config_load_from_x_current (&priv->kbd_cfg,
-+						  xklrec);
-+
-+	gkbd_indicator_config_load (&priv->ind_cfg);
-+
-+	gkbd_indicator_config_load_image_filenames (&priv->ind_cfg,
-+						    &priv->kbd_cfg);
-+
-+	gkbd_indicator_config_activate (&priv->ind_cfg);
-+
-+	gkbd_configuration_load_group_names (configuration,
-+					     xklrec);
-+	g_object_unref (G_OBJECT (xklrec));
-+
-+	gkbd_desktop_config_start_listen (&priv->cfg,
-+					  G_CALLBACK (gkbd_configuration_cfg_changed),
-+					  configuration);
-+	gkbd_indicator_config_start_listen (&priv->ind_cfg,
-+					    G_CALLBACK (gkbd_configuration_ind_cfg_changed),
-+					    configuration);
-+	xkl_engine_start_listen (priv->engine,
-+				 XKLL_TRACK_KEYBOARD_STATE);
-+
-+	xkl_debug (100, "Initiating the widget startup process for %p\n",
-+		   configuration);
-+}
-+
-+static void
-+gkbd_configuration_finalize (GObject * obj)
-+{
-+	GkbdConfiguration *configuration = GKBD_CONFIGURATION (obj);
-+	GkbdConfigurationPrivate *priv = configuration->priv;
-+
-+	xkl_debug (100,
-+		   "Starting the gnome-kbd-configuration widget shutdown process for %p\n",
-+		   configuration);
-+
-+	xkl_engine_stop_listen (priv->engine,
-+				XKLL_TRACK_KEYBOARD_STATE);
-+
-+	gkbd_desktop_config_stop_listen (&priv->cfg);
-+	gkbd_indicator_config_stop_listen (&priv->ind_cfg);
-+
-+	gkbd_indicator_config_term (&priv->ind_cfg);
-+	gkbd_keyboard_config_term (&priv->kbd_cfg);
-+	gkbd_desktop_config_term (&priv->cfg);
-+
-+	if (g_signal_handler_is_connected (priv->engine,
-+					   priv->state_changed_handler)) {
-+		g_signal_handler_disconnect (priv->engine,
-+					     priv->state_changed_handler);
-+		priv->state_changed_handler = 0;
-+	}
-+	if (g_signal_handler_is_connected (priv->engine,
-+					   priv->config_changed_handler)) {
-+		g_signal_handler_disconnect (priv->engine,
-+					     priv->config_changed_handler);
-+		priv->config_changed_handler = 0;
-+	}
-+
-+	g_object_unref (priv->registry);
-+	priv->registry = NULL;
-+	g_object_unref (priv->engine);
-+	priv->engine = NULL;
-+
-+	G_OBJECT_CLASS (gkbd_configuration_parent_class)->finalize (obj);
-+}
-+
-+static void
-+gkbd_configuration_class_init (GkbdConfigurationClass * klass)
-+{
-+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-+
-+	/* Initing vtable */
-+	object_class->finalize = gkbd_configuration_finalize;
-+
-+	/* Signals */
-+	signals[SIGNAL_CHANGED] = g_signal_new ("changed",
-+						GKBD_TYPE_CONFIGURATION,
-+						G_SIGNAL_RUN_LAST,
-+						0,
-+						NULL, NULL,
-+						g_cclosure_marshal_VOID__VOID,
-+						G_TYPE_NONE,
-+						0);
-+	signals[SIGNAL_GROUP_CHANGED] = g_signal_new ("group-changed",
-+						      GKBD_TYPE_CONFIGURATION,
-+						      G_SIGNAL_RUN_LAST,
-+						      0,
-+						      NULL, NULL,
-+						      g_cclosure_marshal_VOID__INT,
-+						      G_TYPE_NONE,
-+						      1,
-+						      G_TYPE_INT);
-+
-+	g_type_class_add_private (klass, sizeof (GkbdConfigurationPrivate));
-+}
-+
-+GkbdConfiguration *
-+gkbd_configuration_get (void)
-+{
-+	static gpointer instance = NULL;
-+
-+	if (!instance) {
-+		instance = g_object_new (GKBD_TYPE_CONFIGURATION, NULL);
-+		g_object_add_weak_pointer (instance, &instance);
-+	} else {
-+		g_object_ref (instance);
-+	}
-+
-+	return instance;
-+}
-+
-+XklEngine *
-+gkbd_configuration_get_xkl_engine (GkbdConfiguration *configuration)
-+{
-+	return configuration->priv->engine;
-+}
-+
-+const char * const *
-+gkbd_configuration_get_group_names (GkbdConfiguration *configuration)
-+{
-+	return configuration->priv->full_group_names;
-+}
-+
-+const char * const *
-+gkbd_configuration_get_short_group_names (GkbdConfiguration *configuration)
-+{
-+	return configuration->priv->short_group_names;
-+}
-diff -uNrp a/plugins/keyboard/xxx/gkbd-configuration.h b/plugins/keyboard/xxx/gkbd-configuration.h
---- a/plugins/keyboard/xxx/gkbd-configuration.h	1970-01-01 01:00:00.000000000 +0100
-+++ b/plugins/keyboard/xxx/gkbd-configuration.h	2013-08-25 16:36:02.000000000 +0100
-@@ -0,0 +1,65 @@
-+/*
-+ * Copyright (C) 2010 Canonical Ltd.
-+ * 
-+ * Authors: Jan Arne Petersen <jpetersen@openismus.com>
-+ * 
-+ * Based on gkbd-status.h by Sergey V. Udaltsov <svu@gnome.org>
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the
-+ * Free Software Foundation, Inc., 51 Franklin Street - Suite 500,
-+ * Boston, MA 02110-1335, USA.
-+ */
-+
-+#ifndef __GKBD_CONFIGURATION_H__
-+#define __GKBD_CONFIGURATION_H__
-+
-+#include <glib-object.h>
-+
-+#include <libxklavier/xklavier.h>
-+
-+G_BEGIN_DECLS
-+
-+typedef struct _GkbdConfiguration GkbdConfiguration;
-+typedef struct _GkbdConfigurationPrivate GkbdConfigurationPrivate;
-+typedef struct _GkbdConfigurationClass GkbdConfigurationClass;
-+
-+#define GKBD_TYPE_CONFIGURATION           (gkbd_configuration_get_type ())
-+#define GKBD_CONFIGURATION(obj)           (G_TYPE_CHECK_INSTANCE_CAST ((obj), GKBD_TYPE_CONFIGURATION, GkbdConfiguration))
-+#define GKBD_INDCATOR_CLASS(obj)          (G_TYPE_CHECK_CLASS_CAST ((obj), GKBD_TYPE_CONFIGURATION,  GkbdConfigurationClass))
-+#define GKBD_IS_CONFIGURATION(obj)        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GKBD_TYPE_CONFIGURATION))
-+#define GKBD_IS_CONFIGURATION_CLASS(obj)  (G_TYPE_CHECK_CLASS_TYPE ((obj), GKBD_TYPE_CONFIGURATION))
-+#define GKBD_CONFIGURATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GKBD_TYPE_CONFIGURATION, GkbdConfigurationClass))
-+
-+struct _GkbdConfiguration {
-+	GObject parent;
-+
-+	GkbdConfigurationPrivate *priv;
-+};
-+
-+struct _GkbdConfigurationClass {
-+	GObjectClass parent_class;
-+};
-+
-+extern GType gkbd_configuration_get_type (void);
-+
-+extern GkbdConfiguration *gkbd_configuration_get (void);
-+
-+extern XklEngine *gkbd_configuration_get_xkl_engine (GkbdConfiguration *configuration);
-+
-+extern const char * const *gkbd_configuration_get_group_names (GkbdConfiguration *configuration);
-+extern const char * const *gkbd_configuration_get_short_group_names (GkbdConfiguration *configuration);
-+
-+G_END_DECLS
-+
-+#endif
-diff -uNrp a/plugins/media-keys/csd-media-keys-manager.c b/plugins/media-keys/csd-media-keys-manager.c
---- a/plugins/media-keys/csd-media-keys-manager.c	2013-08-24 18:04:31.000000000 +0100
-+++ b/plugins/media-keys/csd-media-keys-manager.c	2013-08-25 16:36:02.000000000 +0100
-@@ -120,6 +120,10 @@ static const gchar kb_introspection_xml[
- #define VOLUME_STEP 6           /* percents for one volume button press */
- #define MAX_VOLUME 65536.0
- 
-+#define GNOME_DESKTOP_INPUT_SOURCES_DIR "org.cinnamon.desktop.input-sources"
-+#define KEY_CURRENT_INPUT_SOURCE "current"
-+#define KEY_INPUT_SOURCES        "sources"
-+
- #define CSD_MEDIA_KEYS_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CSD_TYPE_MEDIA_KEYS_MANAGER, CsdMediaKeysManagerPrivate))
- 
- typedef struct {
-@@ -1750,6 +1754,40 @@ do_keyboard_brightness_action (CsdMediaK
-                            manager);
- }
- 
-+static void
-+do_switch_input_source_action (CsdMediaKeysManager *manager,
-+                               MediaKeyType         type)
-+{
-+        GSettings *settings;
-+        GVariant *sources;
-+        gint i, n;
-+
-+        settings = g_settings_new (GNOME_DESKTOP_INPUT_SOURCES_DIR);
-+        sources = g_settings_get_value (settings, KEY_INPUT_SOURCES);
-+
-+        n = g_variant_n_children (sources);
-+        if (n < 2)
-+                goto out;
-+
-+        i = g_settings_get_uint (settings, KEY_CURRENT_INPUT_SOURCE);
-+
-+        if (type == SWITCH_INPUT_SOURCE_KEY)
-+                i += 1;
-+        else
-+                i -= 1;
-+
-+        if (i < 0)
-+                i = n - 1;
-+        else if (i >= n)
-+                i = 0;
-+
-+        g_settings_set_uint (settings, KEY_CURRENT_INPUT_SOURCE, i);
-+
-+ out:
-+        g_variant_unref (sources);
-+        g_object_unref (settings);
-+}
-+
- static gboolean
- do_action (CsdMediaKeysManager *manager,
-            guint                deviceid,
-@@ -1908,6 +1946,10 @@ do_action (CsdMediaKeysManager *manager,
-         case BATTERY_KEY:
-                 do_execute_desktop (manager, "gnome-power-statistics.desktop", timestamp);
-                 break;
-+        case SWITCH_INPUT_SOURCE_KEY:
-+        case SWITCH_INPUT_SOURCE_BACKWARD_KEY:
-+                do_switch_input_source_action (manager, type);
-+                break;
-         /* Note, no default so compiler catches missing keys */
-         case CUSTOM_KEY:
-                 g_assert_not_reached ();
-diff -uNrp a/plugins/media-keys/shortcuts-list.h b/plugins/media-keys/shortcuts-list.h
---- a/plugins/media-keys/shortcuts-list.h	2013-08-24 18:04:31.000000000 +0100
-+++ b/plugins/media-keys/shortcuts-list.h	2013-08-25 16:36:02.000000000 +0100
-@@ -81,6 +81,8 @@ typedef enum {
-         KEYBOARD_BRIGHTNESS_DOWN_KEY,
-         KEYBOARD_BRIGHTNESS_TOGGLE_KEY,
-         BATTERY_KEY,
-+        SWITCH_INPUT_SOURCE_KEY,
-+        SWITCH_INPUT_SOURCE_BACKWARD_KEY,
-         CUSTOM_KEY
- } MediaKeyType;
- 
-@@ -148,6 +150,9 @@ static struct {
-         { KEYBOARD_BRIGHTNESS_UP_KEY, NULL, "XF86KbdBrightnessUp" },
-         { KEYBOARD_BRIGHTNESS_DOWN_KEY, NULL, "XF86KbdBrightnessDown" },
-         { KEYBOARD_BRIGHTNESS_TOGGLE_KEY, NULL, "XF86KbdLightOnOff" },
-+        { SWITCH_INPUT_SOURCE_KEY, "switch-input-source", NULL },
-+        { SWITCH_INPUT_SOURCE_BACKWARD_KEY, "switch-input-source-backward", NULL },
-+
-         { BATTERY_KEY, NULL, "XF86Battery" },
- };
- 
diff --git a/pkgs/desktops/cinnamon/muffin.nix b/pkgs/desktops/cinnamon/muffin.nix
deleted file mode 100644
index a1fd6b97ac16..000000000000
--- a/pkgs/desktops/cinnamon/muffin.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-
-{ stdenv, fetchurl, pkgconfig, autoreconfHook, glib, gettext, gnome_common, gtk3,intltool,
-cinnamon-desktop, clutter, cogl, zenity, python, gnome_doc_utils, makeWrapper}:
-
-let
-  version = "2.0.5";
-in
-stdenv.mkDerivation {
-  name = "muffin-${version}";
-
-  src = fetchurl {
-    url = "http://github.com/linuxmint/muffin/archive/${version}.tar.gz";
-    sha256 = "1vn7shxwyxsa6dd3zldrnc0095i1y0rq0944n8kak3m85r2pv9c1";
-  };
-
-
-  configureFlags = "--enable-compile-warnings=minium" ;
-
-  patches = [./gtkdoc.patch];
-
-  buildInputs = [
-    pkgconfig autoreconfHook
-    glib gettext gnome_common
-    gtk3 intltool cinnamon-desktop
-    clutter cogl zenity python
-    gnome_doc_utils makeWrapper];
-
-  preBuild = "patchShebangs ./scripts";
-
-
-  postFixup  = ''
-
-    for f in "$out/bin/"*; do
-      wrapProgram "$f" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
-    done
-  '';
-
-  meta = {
-    homepage = "http://cinnamon.linuxmint.com";
-    description = "The cinnamon session files" ;
-
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.roelof ];
-
-    broken = true;
-  };
-}
diff --git a/pkgs/desktops/cinnamon/region.patch b/pkgs/desktops/cinnamon/region.patch
deleted file mode 100644
index 7b8133e820ed..000000000000
--- a/pkgs/desktops/cinnamon/region.patch
+++ /dev/null
@@ -1,5314 +0,0 @@
- 
-diff -uNrp a/configure.ac b/configure.ac
---- a/configure.ac	2013-08-25 14:40:14.000000000 +0100
-+++ b/configure.ac	2013-08-25 16:50:30.000000000 +0100
-@@ -82,6 +82,22 @@ else
-   SYSTEMD=
- fi
- 
-+# IBus support
-+IBUS_REQUIRED_VERSION=1.4.2
-+
-+#AC_ARG_ENABLE(ibus,
-+#        AS_HELP_STRING([--disable-ibus],
-+#                       [Disable IBus support]),
-+#        enable_ibus=$enableval,
-+#        enable_ibus=yes)
-+enable_ibus=yes
-+#if test "x$enable_ibus" = "xyes" ; then
-+IBUS_MODULE="ibus-1.0 >= $IBUS_REQUIRED_VERSION"
-+AC_DEFINE(HAVE_IBUS, 1, [Defined if IBus support is enabled])
-+#else
-+#        IBUS_MODULE=
-+#fi
-+
- dnl ==============================================
- dnl Check that we meet the  dependencies
- dnl ==============================================
-@@ -119,9 +135,10 @@ PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON
- PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1
-                   cinnamon-settings-daemon >= $CSD_REQUIRED_VERSION)
- PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.8)
--PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES libgnomekbd >= 2.91.91
-+PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES
-                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
--                  libxklavier >= 5.1 libgnomekbdui >= 2.91.91)
-+                  cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION
-+                  $IBUS_MODULE)
- PKG_CHECK_MODULES(SCREEN_PANEL, $COMMON_MODULES)
- PKG_CHECK_MODULES(SOUND_PANEL, $COMMON_MODULES libxml-2.0
-                   libcanberra-gtk3 >= $CANBERRA_REQUIRED_VERSION
-diff -uNrp a/panels/region/cc-region-panel.c b/panels/region/cc-region-panel.c
---- a/panels/region/cc-region-panel.c	2013-08-25 14:40:14.000000000 +0100
-+++ b/panels/region/cc-region-panel.c	2013-09-21 13:24:15.329949897 +0100
-@@ -18,17 +18,18 @@
-  * Author: Sergey Udaltsov <svu@gnome.org>
-  *
-  */
--#include "config.h"
-+
- #include "cc-region-panel.h"
-+#include <config.h>
- #include <gtk/gtk.h>
- #include <glib/gi18n-lib.h>
- 
--#include "cinnamon-region-panel-xkb.h"
-+#include "cinnamon-region-panel-input.h"
- #include "cinnamon-region-panel-lang.h"
- #include "cinnamon-region-panel-formats.h"
- #include "cinnamon-region-panel-system.h"
- 
--G_DEFINE_DYNAMIC_TYPE (CcRegionPanel, cc_region_panel, CC_TYPE_PANEL)
-+CC_PANEL_REGISTER (CcRegionPanel, cc_region_panel)
- 
- #define REGION_PANEL_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CC_TYPE_REGION_PANEL, CcRegionPanelPrivate))
- 
-@@ -48,14 +49,6 @@ enum {
- 	SYSTEM_PAGE
- };
- 
--
--static gboolean
--languages_link_cb (GtkButton *button, gpointer user_data)
--{
--    g_spawn_command_line_async ("gnome-language-selector", NULL);
--    return TRUE;
--}
--
- static void
- cc_region_panel_set_page (CcRegionPanel *panel,
- 			  const char    *page)
-@@ -116,13 +109,22 @@ cc_region_panel_finalize (GObject * obje
- 	G_OBJECT_CLASS (cc_region_panel_parent_class)->finalize (object);
- }
- 
-+static const char *
-+cc_region_panel_get_help_uri (CcPanel *panel)
-+{
-+  return "help:gnome-help/prefs-language";
-+}
-+
- static void
- cc_region_panel_class_init (CcRegionPanelClass * klass)
- {
- 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-+	CcPanelClass * panel_class = CC_PANEL_CLASS (klass);
- 
- 	g_type_class_add_private (klass, sizeof (CcRegionPanelPrivate));
- 
-+	panel_class->get_help_uri = cc_region_panel_get_help_uri;
-+
- 	object_class->set_property = cc_region_panel_set_property;
- 	object_class->finalize = cc_region_panel_finalize;
- 
-@@ -130,22 +132,14 @@ cc_region_panel_class_init (CcRegionPane
- }
- 
- static void
--cc_region_panel_class_finalize (CcRegionPanelClass * klass)
--{
--}
--
--static void
- cc_region_panel_init (CcRegionPanel * self)
- {
- 	CcRegionPanelPrivate *priv;
- 	GtkWidget *prefs_widget;
--	const char *desktop;
- 	GError *error = NULL;
- 
- 	priv = self->priv = REGION_PANEL_PRIVATE (self);
- 
--	desktop = g_getenv ("XDG_CURRENT_DESKTOP");
--
- 	priv->builder = gtk_builder_new ();
-     gtk_builder_set_translation_domain (priv->builder, GETTEXT_PACKAGE);
- 	gtk_builder_add_from_file (priv->builder,
-@@ -157,29 +151,16 @@ cc_region_panel_init (CcRegionPanel * se
- 		return;
- 	}
- 
--    prefs_widget = (GtkWidget *) gtk_builder_get_object (priv->builder,
--                                                         "region_notebook");
--
-+	prefs_widget = (GtkWidget *) gtk_builder_get_object (priv->builder,
-+							     "region_notebook");
- 	gtk_widget_set_size_request (GTK_WIDGET (prefs_widget), -1, 400);
- 
- 	gtk_widget_reparent (prefs_widget, GTK_WIDGET (self));
- 
--    setup_xkb_tabs (priv->builder);
--
--    setup_language (priv->builder);
--    setup_formats (priv->builder);
--    setup_system (priv->builder);
--
--        /* set screen link */
--
--    GtkWidget *widget = GTK_WIDGET (gtk_builder_get_object (self->priv->builder,
--                                                            "get_languages_button"));
--
--    gtk_button_set_label (GTK_BUTTON (widget), _("Get more languages..."));
--
--    g_signal_connect (widget, "clicked",
--                      G_CALLBACK (languages_link_cb),
--                      self);
-+        setup_input_tabs (priv->builder, self);
-+	setup_language (priv->builder);
-+	setup_formats (priv->builder);
-+	setup_system (priv->builder);
- }
- 
- void
-@@ -187,6 +168,7 @@ cc_region_panel_register (GIOModule * mo
- {
-     bindtextdomain (GETTEXT_PACKAGE, "/usr/share/cinnamon/locale");
-     bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-+
- 	cc_region_panel_register_type (G_TYPE_MODULE (module));
- 	g_io_extension_point_implement (CC_SHELL_PANEL_EXTENSION_POINT,
- 					CC_TYPE_REGION_PANEL,
-diff -uNrp a/panels/region/cinnamon-region-panel-formats.h b/panels/region/cinnamon-region-panel-formats.h
---- a/panels/region/cinnamon-region-panel-formats.h	2013-08-25 14:40:14.000000000 +0100
-+++ b/panels/region/cinnamon-region-panel-formats.h	2013-09-21 13:24:15.332949789 +0100
-@@ -19,8 +19,8 @@
-  * 02110-1335, USA.
-  */
- 
--#ifndef __GNOME_REGION_PANEL_FORMATS_H
--#define __GNOME_REGION_PANEL_FORMATS_H
-+#ifndef __CINNAMON_REGION_PANEL_FORMATS_H
-+#define __CINNAMON_REGION_PANEL_FORMATS_H
- 
- #include <gtk/gtk.h>
- 
-diff -uNrp a/panels/region/cinnamon-region-panel-input.c b/panels/region/cinnamon-region-panel-input.c
---- a/panels/region/cinnamon-region-panel-input.c	1970-01-01 01:00:00.000000000 +0100
-+++ b/panels/region/cinnamon-region-panel-input.c	2013-09-21 13:24:15.338949572 +0100
-@@ -0,0 +1,1563 @@
-+/*
-+ * Copyright (C) 2011 Red Hat, Inc.
-+ *
-+ * Written by: Matthias Clasen <mclasen@redhat.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2, or (at your option)
-+ * any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street - Suite 500, Boston, MA
-+ * 02110-1335, USA.
-+ */
-+
-+#include <config.h>
-+
-+#include <string.h>
-+
-+#include <glib.h>
-+#include <glib/gi18n.h>
-+#include <gio/gdesktopappinfo.h>
-+
-+#define GNOME_DESKTOP_USE_UNSTABLE_API
-+#include <libcinnamon-desktop/gnome-xkb-info.h>
-+
-+#ifdef HAVE_IBUS
-+#include <ibus.h>
-+#endif
-+
-+#include "gdm-languages.h"
-+#include "cinnamon-region-panel-input.h"
-+
-+#define WID(s) GTK_WIDGET(gtk_builder_get_object (builder, s))
-+
-+#define GNOME_DESKTOP_INPUT_SOURCES_DIR "org.cinnamon.desktop.input-sources"
-+
-+#define KEY_CURRENT_INPUT_SOURCE "current"
-+#define KEY_INPUT_SOURCES        "sources"
-+
-+#define INPUT_SOURCE_TYPE_XKB  "xkb"
-+#define INPUT_SOURCE_TYPE_IBUS "ibus"
-+
-+enum {
-+  NAME_COLUMN,
-+  TYPE_COLUMN,
-+  ID_COLUMN,
-+  SETUP_COLUMN,
-+  N_COLUMNS
-+};
-+
-+static GSettings *input_sources_settings = NULL;
-+static GnomeXkbInfo *xkb_info = NULL;
-+static GtkWidget *input_chooser = NULL; /* weak pointer */
-+
-+#ifdef HAVE_IBUS
-+static IBusBus *ibus = NULL;
-+static GHashTable *ibus_engines = NULL;
-+static GCancellable *ibus_cancellable = NULL;
-+static guint shell_name_watch_id = 0;
-+
-+static const gchar *supported_ibus_engines[] = {
-+  /* Simplified Chinese */
-+  "pinyin",
-+  "bopomofo",
-+  "wubi",
-+  "erbi",
-+  /* Default in Fedora, where ibus-libpinyin replaces ibus-pinyin */
-+  "libpinyin",
-+  "libbopomofo",
-+
-+  /* Traditional Chinese */
-+  /* https://bugzilla.gnome.org/show_bug.cgi?id=680840 */
-+  "chewing",
-+  "cangjie5",
-+  "cangjie3",
-+  "quick5",
-+  "quick3",
-+  "stroke5",
-+
-+  /* Japanese */
-+  "anthy",
-+  "mozc-jp",
-+  "skk",
-+
-+  /* Korean */
-+  "hangul",
-+
-+  /* Thai */
-+  "m17n:th:kesmanee",
-+  "m17n:th:pattachote",
-+  "m17n:th:tis820",
-+
-+  /* Vietnamese */
-+  "m17n:vi:tcvn",
-+  "m17n:vi:telex",
-+  "m17n:vi:viqr",
-+  "m17n:vi:vni",
-+  "Unikey",
-+
-+  /* Sinhala */
-+  "m17n:si:wijesekera",
-+  "m17n:si:phonetic-dynamic",
-+  "m17n:si:trans",
-+  "sayura",
-+
-+  /* Indic */
-+  /* https://fedoraproject.org/wiki/I18N/Indic#Keyboard_Layouts */
-+
-+  /* Assamese */
-+  "m17n:as:phonetic",
-+  "m17n:as:inscript",
-+  "m17n:as:itrans",
-+
-+  /* Bengali */
-+  "m17n:bn:inscript",
-+  "m17n:bn:itrans",
-+  "m17n:bn:probhat",
-+
-+  /* Gujarati */
-+  "m17n:gu:inscript",
-+  "m17n:gu:itrans",
-+  "m17n:gu:phonetic",
-+
-+  /* Hindi */
-+  "m17n:hi:inscript",
-+  "m17n:hi:itrans",
-+  "m17n:hi:phonetic",
-+  "m17n:hi:remington",
-+  "m17n:hi:typewriter",
-+  "m17n:hi:vedmata",
-+
-+  /* Kannada */
-+  "m17n:kn:kgp",
-+  "m17n:kn:inscript",
-+  "m17n:kn:itrans",
-+
-+  /* Kashmiri */
-+  "m17n:ks:inscript",
-+
-+  /* Maithili */
-+  "m17n:mai:inscript",
-+
-+  /* Malayalam */
-+  "m17n:ml:inscript",
-+  "m17n:ml:itrans",
-+  "m17n:ml:mozhi",
-+  "m17n:ml:swanalekha",
-+
-+  /* Marathi */
-+  "m17n:mr:inscript",
-+  "m17n:mr:itrans",
-+  "m17n:mr:phonetic",
-+
-+  /* Nepali */
-+  "m17n:ne:rom",
-+  "m17n:ne:trad",
-+
-+  /* Oriya */
-+  "m17n:or:inscript",
-+  "m17n:or:itrans",
-+  "m17n:or:phonetic",
-+
-+  /* Punjabi */
-+  "m17n:pa:inscript",
-+  "m17n:pa:itrans",
-+  "m17n:pa:phonetic",
-+  "m17n:pa:jhelum",
-+
-+  /* Sanskrit */
-+  "m17n:sa:harvard-kyoto",
-+
-+  /* Sindhi */
-+  "m17n:sd:inscript",
-+
-+  /* Tamil */
-+  "m17n:ta:tamil99",
-+  "m17n:ta:inscript",
-+  "m17n:ta:itrans",
-+  "m17n:ta:phonetic",
-+  "m17n:ta:lk-renganathan",
-+  "m17n:ta:vutam",
-+  "m17n:ta:typewriter",
-+
-+  /* Telugu */
-+  "m17n:te:inscript",
-+  "m17n:te:apple",
-+  "m17n:te:pothana",
-+  "m17n:te:rts",
-+
-+  /* Urdu */
-+  "m17n:ur:phonetic",
-+
-+  /* Inscript2 - https://bugzilla.gnome.org/show_bug.cgi?id=684854 */
-+  "m17n:as:inscript2",
-+  "m17n:bn:inscript2",
-+  "m17n:brx:inscript2-deva",
-+  "m17n:doi:inscript2-deva",
-+  "m17n:gu:inscript2",
-+  "m17n:hi:inscript2",
-+  "m17n:kn:inscript2",
-+  "m17n:kok:inscript2-deva",
-+  "m17n:mai:inscript2",
-+  "m17n:ml:inscript2",
-+  "m17n:mni:inscript2-beng",
-+  "m17n:mni:inscript2-mtei",
-+  "m17n:mr:inscript2",
-+  "m17n:ne:inscript2-deva",
-+  "m17n:or:inscript2",
-+  "m17n:pa:inscript2-guru",
-+  "m17n:sa:inscript2",
-+  "m17n:sat:inscript2-deva",
-+  "m17n:sat:inscript2-olck",
-+  "m17n:sd:inscript2-deva",
-+  "m17n:ta:inscript2",
-+  "m17n:te:inscript2",
-+
-+  /* No corresponding XKB map available for the languages */
-+
-+  /* Chinese Yi */
-+  "m17n:ii:phonetic",
-+
-+  /* Tai-Viet */
-+  "m17n:tai:sonla",
-+
-+  /* Kazakh in Arabic script */
-+  "m17n:kk:arabic",
-+
-+  /* Yiddish */
-+  "m17n:yi:yivo",
-+
-+  /* Canadian Aboriginal languages */
-+  "m17n:ath:phonetic",
-+  "m17n:bla:phonetic",
-+  "m17n:cr:western",
-+  "m17n:iu:phonetic",
-+  "m17n:nsk:phonetic",
-+  "m17n:oj:phonetic",
-+
-+  /* Non-trivial engines, like transliteration-based instead of
-+     keymap-based.  Confirmation needed that the engines below are
-+     actually used by local language users. */
-+
-+  /* Tibetan */
-+  "m17n:bo:ewts",
-+  "m17n:bo:tcrc",
-+  "m17n:bo:wylie",
-+
-+  /* Esperanto */
-+  "m17n:eo:h-f",
-+  "m17n:eo:h",
-+  "m17n:eo:plena",
-+  "m17n:eo:q",
-+  "m17n:eo:vi",
-+  "m17n:eo:x",
-+
-+  /* Amharic */
-+  "m17n:am:sera",
-+
-+  /* Russian */
-+  "m17n:ru:translit",
-+
-+  /* Classical Greek */
-+  "m17n:grc:mizuochi",
-+
-+  /* Lao */
-+  "m17n:lo:lrt",
-+
-+  /* Postfix modifier input methods */
-+  "m17n:da:post",
-+  "m17n:sv:post",
-+  NULL
-+};
-+#endif  /* HAVE_IBUS */
-+
-+static void       populate_model             (GtkListStore  *store,
-+                                              GtkListStore  *active_sources_store);
-+static GtkWidget *input_chooser_new          (GtkWindow     *main_window,
-+                                              GtkListStore  *active_sources);
-+static gboolean   input_chooser_get_selected (GtkWidget     *chooser,
-+                                              GtkTreeModel **model,
-+                                              GtkTreeIter   *iter);
-+static GtkTreeModel *tree_view_get_actual_model (GtkTreeView *tv);
-+
-+static gboolean
-+strv_contains (const gchar * const *strv,
-+               const gchar         *str)
-+{
-+  const gchar * const *p = strv;
-+  for (p = strv; *p; p++)
-+    if (g_strcmp0 (*p, str) == 0)
-+      return TRUE;
-+
-+  return FALSE;
-+}
-+
-+#ifdef HAVE_IBUS
-+static void
-+clear_ibus (void)
-+{
-+  if (shell_name_watch_id > 0)
-+    {
-+      g_bus_unwatch_name (shell_name_watch_id);
-+      shell_name_watch_id = 0;
-+    }
-+  g_cancellable_cancel (ibus_cancellable);
-+  g_clear_object (&ibus_cancellable);
-+  g_clear_pointer (&ibus_engines, g_hash_table_destroy);
-+  g_clear_object (&ibus);
-+}
-+
-+static gchar *
-+engine_get_display_name (IBusEngineDesc *engine_desc)
-+{
-+  const gchar *name;
-+  const gchar *language_code;
-+  const gchar *language;
-+  gchar *display_name;
-+
-+  name = ibus_engine_desc_get_longname (engine_desc);
-+  language_code = ibus_engine_desc_get_language (engine_desc);
-+  language = ibus_get_language_name (language_code);
-+
-+  display_name = g_strdup_printf ("%s (%s)", language, name);
-+
-+  return display_name;
-+}
-+
-+static GDesktopAppInfo *
-+setup_app_info_for_id (const gchar *id)
-+{
-+  GDesktopAppInfo *app_info;
-+  gchar *desktop_file_name;
-+  gchar **strv;
-+
-+  strv = g_strsplit (id, ":", 2);
-+  desktop_file_name = g_strdup_printf ("ibus-setup-%s.desktop", strv[0]);
-+  g_strfreev (strv);
-+
-+  app_info = g_desktop_app_info_new (desktop_file_name);
-+  g_free (desktop_file_name);
-+
-+  return app_info;
-+}
-+
-+static void
-+input_chooser_repopulate (GtkListStore *active_sources_store)
-+{
-+  GtkBuilder *builder;
-+  GtkListStore *model;
-+
-+  if (!input_chooser)
-+    return;
-+
-+  builder = g_object_get_data (G_OBJECT (input_chooser), "builder");
-+  model = GTK_LIST_STORE (gtk_builder_get_object (builder, "input_source_model"));
-+
-+  gtk_list_store_clear (model);
-+  populate_model (model, active_sources_store);
-+}
-+
-+static void
-+update_ibus_active_sources (GtkBuilder *builder)
-+{
-+  GtkTreeView *tv;
-+  GtkTreeModel *model;
-+  GtkTreeIter iter;
-+  gchar *type, *id;
-+  gboolean ret;
-+
-+  tv = GTK_TREE_VIEW (WID ("active_input_sources"));
-+  model = tree_view_get_actual_model (tv);
-+
-+  ret = gtk_tree_model_get_iter_first (model, &iter);
-+  while (ret)
-+    {
-+      gtk_tree_model_get (model, &iter,
-+                          TYPE_COLUMN, &type,
-+                          ID_COLUMN, &id,
-+                          -1);
-+
-+      if (g_str_equal (type, INPUT_SOURCE_TYPE_IBUS))
-+        {
-+          IBusEngineDesc *engine_desc = NULL;
-+          GDesktopAppInfo *app_info = NULL;
-+          gchar *display_name = NULL;
-+
-+          engine_desc = g_hash_table_lookup (ibus_engines, id);
-+          if (engine_desc)
-+            {
-+              display_name = engine_get_display_name (engine_desc);
-+              app_info = setup_app_info_for_id (id);
-+
-+              gtk_list_store_set (GTK_LIST_STORE (model), &iter,
-+                                  NAME_COLUMN, display_name,
-+                                  SETUP_COLUMN, app_info,
-+                                  -1);
-+              g_free (display_name);
-+              if (app_info)
-+                g_object_unref (app_info);
-+            }
-+        }
-+
-+      g_free (type);
-+      g_free (id);
-+
-+      ret = gtk_tree_model_iter_next (model, &iter);
-+    }
-+
-+  input_chooser_repopulate (GTK_LIST_STORE (model));
-+}
-+
-+static void
-+fetch_ibus_engines_result (GObject      *object,
-+                           GAsyncResult *result,
-+                           GtkBuilder   *builder)
-+{
-+  gboolean show_all_sources;
-+  GList *list, *l;
-+  GError *error;
-+
-+  error = NULL;
-+  list = ibus_bus_list_engines_async_finish (ibus, result, &error);
-+
-+  g_clear_object (&ibus_cancellable);
-+
-+  if (!list && error)
-+    {
-+      g_warning ("Couldn't finish IBus request: %s", error->message);
-+      g_error_free (error);
-+      return;
-+    }
-+
-+  show_all_sources = g_settings_get_boolean (input_sources_settings, "show-all-sources");
-+
-+  /* Maps engine ids to engine description objects */
-+  ibus_engines = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, g_object_unref);
-+
-+  for (l = list; l; l = l->next)
-+    {
-+      IBusEngineDesc *engine = l->data;
-+      const gchar *engine_id = ibus_engine_desc_get_name (engine);
-+
-+      if (show_all_sources || strv_contains (supported_ibus_engines, engine_id))
-+        g_hash_table_replace (ibus_engines, (gpointer)engine_id, engine);
-+      else
-+        g_object_unref (engine);
-+    }
-+  g_list_free (list);
-+
-+  update_ibus_active_sources (builder);
-+}
-+
-+static void
-+fetch_ibus_engines (GtkBuilder *builder)
-+{
-+  ibus_cancellable = g_cancellable_new ();
-+
-+  ibus_bus_list_engines_async (ibus,
-+                               -1,
-+                               ibus_cancellable,
-+                               (GAsyncReadyCallback)fetch_ibus_engines_result,
-+                               builder);
-+
-+  /* We've got everything we needed, don't want to be called again. */
-+  g_signal_handlers_disconnect_by_func (ibus, fetch_ibus_engines, builder);
-+}
-+
-+static void
-+maybe_start_ibus (void)
-+{
-+  /* IBus doesn't export API in the session bus. The only thing
-+   * we have there is a well known name which we can use as a
-+   * sure-fire way to activate it. */
-+  g_bus_unwatch_name (g_bus_watch_name (G_BUS_TYPE_SESSION,
-+                                        IBUS_SERVICE_IBUS,
-+                                        G_BUS_NAME_WATCHER_FLAGS_AUTO_START,
-+                                        NULL,
-+                                        NULL,
-+                                        NULL,
-+                                        NULL));
-+}
-+
-+static void
-+on_shell_appeared (GDBusConnection *connection,
-+                   const gchar     *name,
-+                   const gchar     *name_owner,
-+                   gpointer         data)
-+{
-+  GtkBuilder *builder = data;
-+
-+  if (!ibus)
-+    {
-+      ibus = ibus_bus_new ();
-+      if (ibus_bus_is_connected (ibus))
-+        fetch_ibus_engines (builder);
-+      else
-+        g_signal_connect_swapped (ibus, "connected",
-+                                  G_CALLBACK (fetch_ibus_engines), builder);
-+    }
-+  maybe_start_ibus ();
-+}
-+#endif  /* HAVE_IBUS */
-+
-+static gboolean
-+add_source_to_table (GtkTreeModel *model,
-+                     GtkTreePath  *path,
-+                     GtkTreeIter  *iter,
-+                     gpointer      data)
-+{
-+  GHashTable *hash = data;
-+  gchar *type;
-+  gchar *id;
-+
-+  gtk_tree_model_get (model, iter,
-+                      TYPE_COLUMN, &type,
-+                      ID_COLUMN, &id,
-+                      -1);
-+
-+  g_hash_table_add (hash, g_strconcat (type, id, NULL));
-+
-+  g_free (type);
-+  g_free (id);
-+
-+  return FALSE;
-+}
-+
-+static void
-+populate_model (GtkListStore *store,
-+                GtkListStore *active_sources_store)
-+{
-+  GHashTable *active_sources_table;
-+  GtkTreeIter iter;
-+  const gchar *name;
-+  GList *sources, *tmp;
-+  gchar *source_id = NULL;
-+
-+  active_sources_table = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
-+
-+  gtk_tree_model_foreach (GTK_TREE_MODEL (active_sources_store),
-+                          add_source_to_table,
-+                          active_sources_table);
-+
-+  sources = gnome_xkb_info_get_all_layouts (xkb_info);
-+
-+  for (tmp = sources; tmp; tmp = tmp->next)
-+    {
-+      g_free (source_id);
-+      source_id = g_strconcat (INPUT_SOURCE_TYPE_XKB, tmp->data, NULL);
-+
-+      if (g_hash_table_contains (active_sources_table, source_id))
-+        continue;
-+
-+      gnome_xkb_info_get_layout_info (xkb_info, (const gchar *)tmp->data,
-+                                      &name, NULL, NULL, NULL);
-+
-+      gtk_list_store_append (store, &iter);
-+      gtk_list_store_set (store, &iter,
-+                          NAME_COLUMN, name,
-+                          TYPE_COLUMN, INPUT_SOURCE_TYPE_XKB,
-+                          ID_COLUMN, tmp->data,
-+                          -1);
-+    }
-+  g_free (source_id);
-+
-+  g_list_free (sources);
-+
-+#ifdef HAVE_IBUS
-+  if (ibus_engines)
-+    {
-+      gchar *display_name;
-+
-+      sources = g_hash_table_get_keys (ibus_engines);
-+
-+      source_id = NULL;
-+      for (tmp = sources; tmp; tmp = tmp->next)
-+        {
-+          g_free (source_id);
-+          source_id = g_strconcat (INPUT_SOURCE_TYPE_IBUS, tmp->data, NULL);
-+
-+          if (g_hash_table_contains (active_sources_table, source_id))
-+            continue;
-+
-+          display_name = engine_get_display_name (g_hash_table_lookup (ibus_engines, tmp->data));
-+
-+          gtk_list_store_append (store, &iter);
-+          gtk_list_store_set (store, &iter,
-+                              NAME_COLUMN, display_name,
-+                              TYPE_COLUMN, INPUT_SOURCE_TYPE_IBUS,
-+                              ID_COLUMN, tmp->data,
-+                              -1);
-+          g_free (display_name);
-+        }
-+      g_free (source_id);
-+
-+      g_list_free (sources);
-+    }
-+#endif
-+
-+  g_hash_table_destroy (active_sources_table);
-+}
-+
-+static void
-+populate_with_active_sources (GtkListStore *store)
-+{
-+  GVariant *sources;
-+  GVariantIter iter;
-+  const gchar *name;
-+  const gchar *type;
-+  const gchar *id;
-+  gchar *display_name;
-+  GDesktopAppInfo *app_info;
-+  GtkTreeIter tree_iter;
-+
-+  sources = g_settings_get_value (input_sources_settings, KEY_INPUT_SOURCES);
-+
-+  g_variant_iter_init (&iter, sources);
-+  while (g_variant_iter_next (&iter, "(&s&s)", &type, &id))
-+    {
-+      display_name = NULL;
-+      app_info = NULL;
-+
-+      if (g_str_equal (type, INPUT_SOURCE_TYPE_XKB))
-+        {
-+          gnome_xkb_info_get_layout_info (xkb_info, id, &name, NULL, NULL, NULL);
-+          if (!name)
-+            {
-+              g_warning ("Couldn't find XKB input source '%s'", id);
-+              continue;
-+            }
-+          display_name = g_strdup (name);
-+        }
-+      else if (g_str_equal (type, INPUT_SOURCE_TYPE_IBUS))
-+        {
-+#ifdef HAVE_IBUS
-+          IBusEngineDesc *engine_desc = NULL;
-+
-+          if (ibus_engines)
-+            engine_desc = g_hash_table_lookup (ibus_engines, id);
-+
-+          if (engine_desc)
-+            {
-+              display_name = engine_get_display_name (engine_desc);
-+              app_info = setup_app_info_for_id (id);
-+            }
-+#else
-+          g_warning ("IBus input source type specified but IBus support was not compiled");
-+          continue;
-+#endif
-+        }
-+      else
-+        {
-+          g_warning ("Unknown input source type '%s'", type);
-+          continue;
-+        }
-+
-+      gtk_list_store_append (store, &tree_iter);
-+      gtk_list_store_set (store, &tree_iter,
-+                          NAME_COLUMN, display_name,
-+                          TYPE_COLUMN, type,
-+                          ID_COLUMN, id,
-+                          SETUP_COLUMN, app_info,
-+                          -1);
-+      g_free (display_name);
-+      if (app_info)
-+        g_object_unref (app_info);
-+    }
-+
-+  g_variant_unref (sources);
-+}
-+
-+static void
-+update_configuration (GtkTreeModel *model)
-+{
-+  GtkTreeIter iter;
-+  gchar *type;
-+  gchar *id;
-+  GVariantBuilder builder;
-+  GVariant *old_sources;
-+  const gchar *old_current_type;
-+  const gchar *old_current_id;
-+  guint old_current_index;
-+  guint old_n_sources;
-+  guint index;
-+
-+  old_sources = g_settings_get_value (input_sources_settings, KEY_INPUT_SOURCES);
-+  old_current_index = g_settings_get_uint (input_sources_settings, KEY_CURRENT_INPUT_SOURCE);
-+  old_n_sources = g_variant_n_children (old_sources);
-+
-+  if (old_n_sources > 0 && old_current_index < old_n_sources)
-+    {
-+      g_variant_get_child (old_sources,
-+                           old_current_index,
-+                           "(&s&s)",
-+                           &old_current_type,
-+                           &old_current_id);
-+    }
-+  else
-+    {
-+      old_current_type = "";
-+      old_current_id = "";
-+    }
-+
-+  g_variant_builder_init (&builder, G_VARIANT_TYPE ("a(ss)"));
-+  index = 0;
-+  gtk_tree_model_get_iter_first (model, &iter);
-+  do
-+    {
-+      gtk_tree_model_get (model, &iter,
-+                          TYPE_COLUMN, &type,
-+                          ID_COLUMN, &id,
-+                          -1);
-+      if (index != old_current_index &&
-+          g_str_equal (type, old_current_type) &&
-+          g_str_equal (id, old_current_id))
-+        {
-+          g_settings_set_uint (input_sources_settings, KEY_CURRENT_INPUT_SOURCE, index);
-+        }
-+      g_variant_builder_add (&builder, "(ss)", type, id);
-+      g_free (type);
-+      g_free (id);
-+      index += 1;
-+    }
-+  while (gtk_tree_model_iter_next (model, &iter));
-+
-+  g_settings_set_value (input_sources_settings, KEY_INPUT_SOURCES, g_variant_builder_end (&builder));
-+  g_settings_apply (input_sources_settings);
-+
-+  g_variant_unref (old_sources);
-+}
-+
-+static gboolean
-+get_selected_iter (GtkBuilder    *builder,
-+                   GtkTreeModel **model,
-+                   GtkTreeIter   *iter)
-+{
-+  GtkTreeSelection *selection;
-+
-+  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (WID ("active_input_sources")));
-+
-+  return gtk_tree_selection_get_selected (selection, model, iter);
-+}
-+
-+static gint
-+idx_from_model_iter (GtkTreeModel *model,
-+                     GtkTreeIter  *iter)
-+{
-+  GtkTreePath *path;
-+  gint idx;
-+
-+  path = gtk_tree_model_get_path (model, iter);
-+  if (path == NULL)
-+    return -1;
-+
-+  idx = gtk_tree_path_get_indices (path)[0];
-+  gtk_tree_path_free (path);
-+
-+  return idx;
-+}
-+
-+static void
-+update_button_sensitivity (GtkBuilder *builder)
-+{
-+  GtkWidget *remove_button;
-+  GtkWidget *up_button;
-+  GtkWidget *down_button;
-+  GtkWidget *show_button;
-+  GtkWidget *settings_button;
-+  GtkTreeView *tv;
-+  GtkTreeModel *model;
-+  GtkTreeIter iter;
-+  gint n_active;
-+  gint index;
-+  gboolean settings_sensitive;
-+  GDesktopAppInfo *app_info;
-+
-+  remove_button = WID("input_source_remove");
-+  show_button = WID("input_source_show");
-+  up_button = WID("input_source_move_up");
-+  down_button = WID("input_source_move_down");
-+  settings_button = WID("input_source_settings");
-+
-+  tv = GTK_TREE_VIEW (WID ("active_input_sources"));
-+  n_active = gtk_tree_model_iter_n_children (gtk_tree_view_get_model (tv), NULL);
-+
-+  if (get_selected_iter (builder, &model, &iter))
-+    {
-+      index = idx_from_model_iter (model, &iter);
-+      gtk_tree_model_get (model, &iter, SETUP_COLUMN, &app_info, -1);
-+    }
-+  else
-+    {
-+      index = -1;
-+      app_info = NULL;
-+    }
-+
-+  settings_sensitive = (index >= 0 && app_info != NULL);
-+
-+  if (app_info)
-+    g_object_unref (app_info);
-+
-+  gtk_widget_set_sensitive (remove_button, index >= 0 && n_active > 1);
-+  gtk_widget_set_sensitive (show_button, index >= 0);
-+  gtk_widget_set_sensitive (up_button, index > 0);
-+  gtk_widget_set_sensitive (down_button, index >= 0 && index < n_active - 1);
-+  gtk_widget_set_sensitive (settings_button, settings_sensitive);
-+}
-+
-+static void
-+set_selected_path (GtkBuilder  *builder,
-+                   GtkTreePath *path)
-+{
-+  GtkTreeSelection *selection;
-+
-+  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (WID ("active_input_sources")));
-+
-+  gtk_tree_selection_select_path (selection, path);
-+}
-+
-+static GtkTreeModel *
-+tree_view_get_actual_model (GtkTreeView *tv)
-+{
-+  GtkTreeModel *filtered_store;
-+
-+  filtered_store = gtk_tree_view_get_model (tv);
-+
-+  return gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filtered_store));
-+}
-+
-+static void
-+chooser_response (GtkWidget *chooser, gint response_id, gpointer data)
-+{
-+  GtkBuilder *builder = data;
-+
-+  if (response_id == GTK_RESPONSE_OK)
-+    {
-+      GtkTreeModel *model;
-+      GtkTreeIter iter;
-+
-+      if (input_chooser_get_selected (chooser, &model, &iter))
-+        {
-+          GtkTreeView *tv;
-+          GtkListStore *child_model;
-+          GtkTreeIter child_iter, filter_iter;
-+          gchar *name;
-+          gchar *type;
-+          gchar *id;
-+          GDesktopAppInfo *app_info = NULL;
-+
-+          gtk_tree_model_get (model, &iter,
-+                              NAME_COLUMN, &name,
-+                              TYPE_COLUMN, &type,
-+                              ID_COLUMN, &id,
-+                              -1);
-+
-+#ifdef HAVE_IBUS
-+          if (g_str_equal (type, INPUT_SOURCE_TYPE_IBUS))
-+            app_info = setup_app_info_for_id (id);
-+#endif
-+
-+          tv = GTK_TREE_VIEW (WID ("active_input_sources"));
-+          child_model = GTK_LIST_STORE (tree_view_get_actual_model (tv));
-+
-+          gtk_list_store_append (child_model, &child_iter);
-+
-+          gtk_list_store_set (child_model, &child_iter,
-+                              NAME_COLUMN, name,
-+                              TYPE_COLUMN, type,
-+                              ID_COLUMN, id,
-+                              SETUP_COLUMN, app_info,
-+                              -1);
-+          g_free (name);
-+          g_free (type);
-+          g_free (id);
-+          if (app_info)
-+            g_object_unref (app_info);
-+
-+          gtk_tree_model_filter_convert_child_iter_to_iter (GTK_TREE_MODEL_FILTER (gtk_tree_view_get_model (tv)),
-+                                                            &filter_iter,
-+                                                            &child_iter);
-+          gtk_tree_selection_select_iter (gtk_tree_view_get_selection (tv), &filter_iter);
-+
-+          update_button_sensitivity (builder);
-+          update_configuration (GTK_TREE_MODEL (child_model));
-+        }
-+      else
-+        {
-+          g_debug ("nothing selected, nothing added");
-+        }
-+    }
-+
-+  gtk_widget_destroy (GTK_WIDGET (chooser));
-+}
-+
-+static void
-+add_input (GtkButton *button, gpointer data)
-+{
-+  GtkBuilder *builder = data;
-+  GtkWidget *chooser;
-+  GtkWidget *toplevel;
-+  GtkWidget *treeview;
-+  GtkListStore *active_sources;
-+
-+  g_debug ("add an input source");
-+
-+  toplevel = gtk_widget_get_toplevel (WID ("region_notebook"));
-+  treeview = WID ("active_input_sources");
-+  active_sources = GTK_LIST_STORE (tree_view_get_actual_model (GTK_TREE_VIEW (treeview)));
-+
-+  chooser = input_chooser_new (GTK_WINDOW (toplevel), active_sources);
-+  g_signal_connect (chooser, "response",
-+                    G_CALLBACK (chooser_response), builder);
-+}
-+
-+static void
-+remove_selected_input (GtkButton *button, gpointer data)
-+{
-+  GtkBuilder *builder = data;
-+  GtkTreeModel *model;
-+  GtkTreeModel *child_model;
-+  GtkTreeIter iter;
-+  GtkTreeIter child_iter;
-+  GtkTreePath *path;
-+
-+  g_debug ("remove selected input source");
-+
-+  if (get_selected_iter (builder, &model, &iter) == FALSE)
-+    return;
-+
-+  path = gtk_tree_model_get_path (model, &iter);
-+
-+  child_model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (model));
-+  gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (model),
-+                                                    &child_iter,
-+                                                    &iter);
-+  gtk_list_store_remove (GTK_LIST_STORE (child_model), &child_iter);
-+
-+  if (!gtk_tree_model_get_iter (model, &iter, path))
-+    gtk_tree_path_prev (path);
-+
-+  set_selected_path (builder, path);
-+
-+  gtk_tree_path_free (path);
-+
-+  update_button_sensitivity (builder);
-+  update_configuration (child_model);
-+}
-+
-+static void
-+move_selected_input_up (GtkButton *button, gpointer data)
-+{
-+  GtkBuilder *builder = data;
-+  GtkTreeModel *model;
-+  GtkTreeModel *child_model;
-+  GtkTreeIter iter, prev;
-+  GtkTreeIter child_iter, child_prev;
-+  GtkTreePath *path;
-+
-+  g_debug ("move selected input source up");
-+
-+  if (!get_selected_iter (builder, &model, &iter))
-+    return;
-+
-+  prev = iter;
-+  if (!gtk_tree_model_iter_previous (model, &prev))
-+    return;
-+
-+  path = gtk_tree_model_get_path (model, &prev);
-+
-+  child_model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (model));
-+  gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (model),
-+                                                    &child_iter,
-+                                                    &iter);
-+  gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (model),
-+                                                    &child_prev,
-+                                                    &prev);
-+  gtk_list_store_swap (GTK_LIST_STORE (child_model), &child_iter, &child_prev);
-+
-+  set_selected_path (builder, path);
-+  gtk_tree_path_free (path);
-+
-+  update_button_sensitivity (builder);
-+  update_configuration (child_model);
-+}
-+
-+static void
-+move_selected_input_down (GtkButton *button, gpointer data)
-+{
-+  GtkBuilder *builder = data;
-+  GtkTreeModel *model;
-+  GtkTreeModel *child_model;
-+  GtkTreeIter iter, next;
-+  GtkTreeIter child_iter, child_next;
-+  GtkTreePath *path;
-+
-+  g_debug ("move selected input source down");
-+
-+  if (!get_selected_iter (builder, &model, &iter))
-+    return;
-+
-+  next = iter;
-+  if (!gtk_tree_model_iter_next (model, &next))
-+    return;
-+
-+  path = gtk_tree_model_get_path (model, &next);
-+
-+  child_model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (model));
-+  gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (model),
-+                                                    &child_iter,
-+                                                    &iter);
-+  gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (model),
-+                                                    &child_next,
-+                                                    &next);
-+  gtk_list_store_swap (GTK_LIST_STORE (child_model), &child_iter, &child_next);
-+
-+  set_selected_path (builder, path);
-+  gtk_tree_path_free (path);
-+
-+  update_button_sensitivity (builder);
-+  update_configuration (child_model);
-+}
-+
-+static void
-+show_selected_layout (GtkButton *button, gpointer data)
-+{
-+  GtkBuilder *builder = data;
-+  GtkTreeModel *model;
-+  GtkTreeIter iter;
-+  gchar *type;
-+  gchar *id;
-+  gchar *kbd_viewer_args;
-+  const gchar *xkb_layout;
-+  const gchar *xkb_variant;
-+
-+  g_debug ("show selected layout");
-+
-+  if (!get_selected_iter (builder, &model, &iter))
-+    return;
-+
-+  gtk_tree_model_get (model, &iter,
-+                      TYPE_COLUMN, &type,
-+                      ID_COLUMN, &id,
-+                      -1);
-+
-+  if (g_str_equal (type, INPUT_SOURCE_TYPE_XKB))
-+    {
-+      gnome_xkb_info_get_layout_info (xkb_info, id, NULL, NULL, &xkb_layout, &xkb_variant);
-+
-+      if (!xkb_layout || !xkb_layout[0])
-+        {
-+          g_warning ("Couldn't find XKB input source '%s'", id);
-+          goto exit;
-+        }
-+    }
-+  else if (g_str_equal (type, INPUT_SOURCE_TYPE_IBUS))
-+    {
-+#ifdef HAVE_IBUS
-+      IBusEngineDesc *engine_desc = NULL;
-+
-+      if (ibus_engines)
-+        engine_desc = g_hash_table_lookup (ibus_engines, id);
-+
-+      if (engine_desc)
-+        {
-+          xkb_layout = ibus_engine_desc_get_layout (engine_desc);
-+          xkb_variant = "";
-+        }
-+      else
-+        {
-+          g_warning ("Couldn't find IBus input source '%s'", id);
-+          goto exit;
-+        }
-+#else
-+      g_warning ("IBus input source type specified but IBus support was not compiled");
-+      goto exit;
-+#endif
-+    }
-+  else
-+    {
-+      g_warning ("Unknown input source type '%s'", type);
-+      goto exit;
-+    }
-+
-+  if (xkb_variant[0])
-+    kbd_viewer_args = g_strdup_printf ("gkbd-keyboard-display -l \"%s\t%s\"",
-+                                       xkb_layout, xkb_variant);
-+  else
-+    kbd_viewer_args = g_strdup_printf ("gkbd-keyboard-display -l %s",
-+                                       xkb_layout);
-+
-+  g_spawn_command_line_async (kbd_viewer_args, NULL);
-+
-+  g_free (kbd_viewer_args);
-+ exit:
-+  g_free (type);
-+  g_free (id);
-+}
-+
-+static void
-+show_selected_settings (GtkButton *button, gpointer data)
-+{
-+  GtkBuilder *builder = data;
-+  GtkTreeModel *model;
-+  GtkTreeIter iter;
-+  GdkAppLaunchContext *ctx;
-+  GDesktopAppInfo *app_info;
-+  gchar *id;
-+  GError *error = NULL;
-+
-+  g_debug ("show selected layout");
-+
-+  if (!get_selected_iter (builder, &model, &iter))
-+    return;
-+
-+  gtk_tree_model_get (model, &iter, SETUP_COLUMN, &app_info, -1);
-+
-+  if (!app_info)
-+    return;
-+
-+  ctx = gdk_display_get_app_launch_context (gdk_display_get_default ());
-+  gdk_app_launch_context_set_timestamp (ctx, gtk_get_current_event_time ());
-+
-+  gtk_tree_model_get (model, &iter, ID_COLUMN, &id, -1);
-+  g_app_launch_context_setenv (G_APP_LAUNCH_CONTEXT (ctx),
-+                               "IBUS_ENGINE_NAME",
-+                               id);
-+  g_free (id);
-+
-+  if (!g_app_info_launch (G_APP_INFO (app_info), NULL, G_APP_LAUNCH_CONTEXT (ctx), &error))
-+    {
-+      g_warning ("Failed to launch input source setup: %s", error->message);
-+      g_error_free (error);
-+    }
-+
-+  g_object_unref (ctx);
-+  g_object_unref (app_info);
-+}
-+
-+static gboolean
-+go_to_shortcuts (GtkLinkButton *button,
-+                 CcRegionPanel *panel)
-+{
-+    gchar *argv[3];
-+    argv[0] = "cinnamon-settings";
-+    argv[1] = "keyboard";
-+    argv[3] = NULL;
-+    g_spawn_async(NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL);
-+    return TRUE;
-+}
-+
-+static void
-+input_sources_changed (GSettings  *settings,
-+                       gchar      *key,
-+                       GtkBuilder *builder)
-+{
-+  GtkWidget *treeview;
-+  GtkTreeModel *store;
-+  GtkTreePath *path;
-+  GtkTreeIter iter;
-+  GtkTreeModel *model;
-+
-+  treeview = WID("active_input_sources");
-+  store = tree_view_get_actual_model (GTK_TREE_VIEW (treeview));
-+
-+  if (get_selected_iter (builder, &model, &iter))
-+    path = gtk_tree_model_get_path (model, &iter);
-+  else
-+    path = NULL;
-+
-+  gtk_list_store_clear (GTK_LIST_STORE (store));
-+  populate_with_active_sources (GTK_LIST_STORE (store));
-+
-+  if (path)
-+    {
-+      set_selected_path (builder, path);
-+      gtk_tree_path_free (path);
-+    }
-+}
-+
-+static void
-+update_shortcut_label (GtkWidget  *widget,
-+		       const char *value)
-+{
-+  char *text;
-+  guint accel_key, *keycode;
-+  GdkModifierType mods;
-+
-+  if (value == NULL || *value == '\0')
-+    {
-+      gtk_label_set_text (GTK_LABEL (widget), "\342\200\224");
-+      return;
-+    }
-+  gtk_accelerator_parse_with_keycode (value, &accel_key, &keycode, &mods);
-+  if (accel_key == 0 && keycode == NULL && mods == 0)
-+    {
-+      gtk_label_set_text (GTK_LABEL (widget), "\342\200\224");
-+      g_warning ("Failed to parse keyboard shortcut: '%s'", value);
-+      return;
-+    }
-+
-+  text = gtk_accelerator_get_label_with_keycode (gtk_widget_get_display (widget), accel_key, *keycode, mods);
-+  g_free (keycode);
-+  gtk_label_set_text (GTK_LABEL (widget), text);
-+  g_free (text);
-+}
-+
-+static void
-+update_shortcuts (GtkBuilder *builder)
-+{
-+  char *previous, *next;
-+  GSettings *settings;
-+
-+  settings = g_settings_new ("org.cinnamon.settings-daemon.plugins.media-keys");
-+
-+  previous = g_settings_get_string (settings, "switch-input-source-backward");
-+  next = g_settings_get_string (settings, "switch-input-source");
-+
-+  update_shortcut_label (WID ("prev-source-shortcut-label"), previous);
-+  update_shortcut_label (WID ("next-source-shortcut-label"), next);
-+
-+  g_free (previous);
-+  g_free (next);
-+}
-+
-+static gboolean
-+active_sources_visible_func (GtkTreeModel *model,
-+                             GtkTreeIter  *iter,
-+                             gpointer      data)
-+{
-+  gchar *display_name;
-+
-+  gtk_tree_model_get (model, iter, NAME_COLUMN, &display_name, -1);
-+
-+  if (!display_name)
-+    return FALSE;
-+
-+  g_free (display_name);
-+
-+  return TRUE;
-+}
-+
-+void
-+setup_input_tabs (GtkBuilder    *builder,
-+                  CcRegionPanel *panel)
-+{
-+  GtkWidget *treeview;
-+  GtkTreeViewColumn *column;
-+  GtkCellRenderer *cell;
-+  GtkListStore *store;
-+  GtkTreeModel *filtered_store;
-+  GtkTreeSelection *selection;
-+
-+  /* set up the list of active inputs */
-+  treeview = WID("active_input_sources");
-+  column = gtk_tree_view_column_new ();
-+  cell = gtk_cell_renderer_text_new ();
-+  gtk_tree_view_column_pack_start (column, cell, TRUE);
-+  gtk_tree_view_column_add_attribute (column, cell, "text", NAME_COLUMN);
-+  gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column);
-+
-+  store = gtk_list_store_new (N_COLUMNS,
-+                              G_TYPE_STRING,
-+                              G_TYPE_STRING,
-+                              G_TYPE_STRING,
-+                              G_TYPE_DESKTOP_APP_INFO);
-+
-+  gtk_tree_view_set_model (GTK_TREE_VIEW (treeview), GTK_TREE_MODEL (store));
-+
-+  input_sources_settings = g_settings_new (GNOME_DESKTOP_INPUT_SOURCES_DIR);
-+  g_settings_delay (input_sources_settings);
-+  g_object_weak_ref (G_OBJECT (builder), (GWeakNotify) g_object_unref, input_sources_settings);
-+
-+  if (!xkb_info)
-+    xkb_info = gnome_xkb_info_new ();
-+
-+#ifdef HAVE_IBUS
-+  ibus_init ();
-+  shell_name_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION,
-+                                          "org.Cinnamon",
-+                                          G_BUS_NAME_WATCHER_FLAGS_NONE,
-+                                          on_shell_appeared,
-+                                          NULL,
-+                                          builder,
-+                                          NULL);
-+  g_object_weak_ref (G_OBJECT (builder), (GWeakNotify) clear_ibus, NULL);
-+#endif
-+
-+  populate_with_active_sources (store);
-+
-+  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
-+  g_signal_connect_swapped (selection, "changed",
-+                            G_CALLBACK (update_button_sensitivity), builder);
-+
-+  /* Some input source types might have their info loaded
-+   * asynchronously. In that case we don't want to show them
-+   * immediately so we use a filter model on top of the real model
-+   * which mirrors the GSettings key. */
-+  filtered_store = gtk_tree_model_filter_new (GTK_TREE_MODEL (store), NULL);
-+  gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (filtered_store),
-+                                          active_sources_visible_func,
-+                                          NULL,
-+                                          NULL);
-+  gtk_tree_view_set_model (GTK_TREE_VIEW (treeview), filtered_store);
-+
-+  /* set up the buttons */
-+  g_signal_connect (WID("input_source_add"), "clicked",
-+                    G_CALLBACK (add_input), builder);
-+  g_signal_connect (WID("input_source_remove"), "clicked",
-+                    G_CALLBACK (remove_selected_input), builder);
-+  g_signal_connect (WID("input_source_move_up"), "clicked",
-+                    G_CALLBACK (move_selected_input_up), builder);
-+  g_signal_connect (WID("input_source_move_down"), "clicked",
-+                    G_CALLBACK (move_selected_input_down), builder);
-+  g_signal_connect (WID("input_source_show"), "clicked",
-+                    G_CALLBACK (show_selected_layout), builder);
-+  g_signal_connect (WID("input_source_settings"), "clicked",
-+                    G_CALLBACK (show_selected_settings), builder);
-+
-+  /* use an em dash is no shortcut */
-+  update_shortcuts (builder);
-+
-+  g_signal_connect (WID("jump-to-shortcuts"), "activate-link",
-+                    G_CALLBACK (go_to_shortcuts), panel);
-+
-+  g_signal_connect (G_OBJECT (input_sources_settings),
-+                    "changed::" KEY_INPUT_SOURCES,
-+                    G_CALLBACK (input_sources_changed),
-+                    builder);
-+}
-+
-+static void
-+filter_clear (GtkEntry             *entry,
-+              GtkEntryIconPosition  icon_pos,
-+              GdkEvent             *event,
-+              gpointer              user_data)
-+{
-+  gtk_entry_set_text (entry, "");
-+}
-+
-+static gchar **search_pattern_list;
-+
-+static void
-+filter_changed (GtkBuilder *builder)
-+{
-+  GtkTreeModelFilter *filtered_model;
-+  GtkTreeView *tree_view;
-+  GtkTreeSelection *selection;
-+  GtkTreeIter selected_iter;
-+  GtkWidget *filter_entry;
-+  const gchar *pattern;
-+  gchar *upattern;
-+
-+  filter_entry = WID ("input_source_filter");
-+  pattern = gtk_entry_get_text (GTK_ENTRY (filter_entry));
-+  upattern = g_utf8_strup (pattern, -1);
-+  if (!g_strcmp0 (pattern, ""))
-+    g_object_set (G_OBJECT (filter_entry),
-+                  "secondary-icon-name", "edit-find-symbolic",
-+                  "secondary-icon-activatable", FALSE,
-+                  "secondary-icon-sensitive", FALSE,
-+                  NULL);
-+  else
-+    g_object_set (G_OBJECT (filter_entry),
-+                  "secondary-icon-name", "edit-clear-symbolic",
-+                  "secondary-icon-activatable", TRUE,
-+                  "secondary-icon-sensitive", TRUE,
-+                  NULL);
-+
-+  if (search_pattern_list != NULL)
-+    g_strfreev (search_pattern_list);
-+
-+  search_pattern_list = g_strsplit (upattern, " ", -1);
-+  g_free (upattern);
-+
-+  filtered_model = GTK_TREE_MODEL_FILTER (gtk_builder_get_object (builder, "filtered_input_source_model"));
-+  gtk_tree_model_filter_refilter (filtered_model);
-+
-+  tree_view = GTK_TREE_VIEW (WID ("filtered_input_source_list"));
-+  selection = gtk_tree_view_get_selection (tree_view);
-+  if (gtk_tree_selection_get_selected (selection, NULL, &selected_iter))
-+    {
-+      GtkTreePath *path = gtk_tree_model_get_path (GTK_TREE_MODEL (filtered_model),
-+                                                   &selected_iter);
-+      gtk_tree_view_scroll_to_cell (tree_view, path, NULL, TRUE, 0.5, 0.5);
-+      gtk_tree_path_free (path);
-+    }
-+  else
-+    {
-+      GtkTreeIter iter;
-+      if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (filtered_model), &iter))
-+        gtk_tree_selection_select_iter (selection, &iter);
-+    }
-+}
-+
-+static void
-+selection_changed (GtkTreeSelection *selection,
-+                   GtkBuilder       *builder)
-+{
-+  gtk_widget_set_sensitive (WID ("ok-button"),
-+                            gtk_tree_selection_get_selected (selection, NULL, NULL));
-+}
-+
-+static void
-+row_activated (GtkTreeView       *tree_view,
-+               GtkTreePath       *path,
-+               GtkTreeViewColumn *column,
-+               GtkBuilder        *builder)
-+{
-+  GtkWidget *add_button;
-+  GtkWidget *dialog;
-+
-+  add_button = WID ("ok-button");
-+  dialog = WID ("input_source_chooser");
-+  if (gtk_widget_is_sensitive (add_button))
-+    gtk_dialog_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
-+}
-+
-+static void
-+entry_activated (GtkBuilder *builder,
-+                 gpointer    data)
-+{
-+  row_activated (NULL, NULL, NULL, builder);
-+}
-+
-+static gboolean
-+filter_func (GtkTreeModel *model,
-+             GtkTreeIter  *iter,
-+             gpointer      data)
-+{
-+  gchar *name = NULL;
-+  gchar **pattern;
-+  gboolean rv = TRUE;
-+
-+  if (search_pattern_list == NULL || search_pattern_list[0] == NULL)
-+    return TRUE;
-+
-+  gtk_tree_model_get (model, iter,
-+                      NAME_COLUMN, &name,
-+                      -1);
-+
-+  pattern = search_pattern_list;
-+  do {
-+    gboolean is_pattern_found = FALSE;
-+    gchar *udesc = g_utf8_strup (name, -1);
-+    if (udesc != NULL && g_strstr_len (udesc, -1, *pattern))
-+      {
-+        is_pattern_found = TRUE;
-+      }
-+    g_free (udesc);
-+
-+    if (!is_pattern_found)
-+      {
-+        rv = FALSE;
-+        break;
-+      }
-+
-+  } while (*++pattern != NULL);
-+
-+  g_free (name);
-+
-+  return rv;
-+}
-+
-+static GtkWidget *
-+input_chooser_new (GtkWindow    *main_window,
-+                   GtkListStore *active_sources)
-+{
-+  GtkBuilder *builder;
-+  GtkWidget *chooser;
-+  GtkWidget *filtered_list;
-+  GtkWidget *filter_entry;
-+  GtkTreeViewColumn *visible_column;
-+  GtkTreeSelection *selection;
-+  GtkListStore *model;
-+  GtkTreeModelFilter *filtered_model;
-+  GtkTreeIter iter;
-+
-+  builder = gtk_builder_new ();
-+  gtk_builder_set_translation_domain (builder, GETTEXT_PACKAGE);
-+  gtk_builder_add_from_file (builder,
-+                             CINNAMONCC_UI_DIR "/cinnamon-region-panel-input-chooser.ui",
-+                             NULL);
-+  chooser = WID ("input_source_chooser");
-+  input_chooser = chooser;
-+  g_object_add_weak_pointer (G_OBJECT (chooser), (gpointer *) &input_chooser);
-+  g_object_set_data_full (G_OBJECT (chooser), "builder", builder, g_object_unref);
-+
-+  filtered_list = WID ("filtered_input_source_list");
-+  filter_entry = WID ("input_source_filter");
-+
-+  g_object_set_data (G_OBJECT (chooser),
-+                     "filtered_input_source_list", filtered_list);
-+  visible_column =
-+    gtk_tree_view_column_new_with_attributes ("Input Sources",
-+                                              gtk_cell_renderer_text_new (),
-+                                              "text", NAME_COLUMN,
-+                                              NULL);
-+
-+  gtk_window_set_transient_for (GTK_WINDOW (chooser), main_window);
-+
-+  gtk_tree_view_append_column (GTK_TREE_VIEW (filtered_list),
-+                               visible_column);
-+  /* We handle searching ourselves, thank you. */
-+  gtk_tree_view_set_enable_search (GTK_TREE_VIEW (filtered_list), FALSE);
-+  gtk_tree_view_set_search_column (GTK_TREE_VIEW (filtered_list), -1);
-+
-+  g_signal_connect_swapped (G_OBJECT (filter_entry), "activate",
-+                            G_CALLBACK (entry_activated), builder);
-+  g_signal_connect_swapped (G_OBJECT (filter_entry), "notify::text",
-+                            G_CALLBACK (filter_changed), builder);
-+
-+  g_signal_connect (G_OBJECT (filter_entry), "icon-release",
-+                    G_CALLBACK (filter_clear), NULL);
-+
-+  filtered_model = GTK_TREE_MODEL_FILTER (gtk_builder_get_object (builder, "filtered_input_source_model"));
-+  model = GTK_LIST_STORE (gtk_builder_get_object (builder, "input_source_model"));
-+
-+  populate_model (model, active_sources);
-+
-+  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (model),
-+                                        NAME_COLUMN, GTK_SORT_ASCENDING);
-+
-+  gtk_tree_model_filter_set_visible_func (filtered_model,
-+                                          filter_func,
-+                                          NULL, NULL);
-+
-+  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (filtered_list));
-+
-+  g_signal_connect (G_OBJECT (selection), "changed",
-+                    G_CALLBACK (selection_changed), builder);
-+
-+  if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (filtered_model), &iter))
-+    gtk_tree_selection_select_iter (selection, &iter);
-+
-+  g_signal_connect (G_OBJECT (filtered_list), "row-activated",
-+                    G_CALLBACK (row_activated), builder);
-+
-+  gtk_widget_grab_focus (filter_entry);
-+
-+  gtk_widget_show (chooser);
-+
-+  return chooser;
-+}
-+
-+static gboolean
-+input_chooser_get_selected (GtkWidget     *dialog,
-+                            GtkTreeModel **model,
-+                            GtkTreeIter   *iter)
-+{
-+  GtkWidget *tv;
-+  GtkTreeSelection *selection;
-+
-+  tv = g_object_get_data (G_OBJECT (dialog), "filtered_input_source_list");
-+  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tv));
-+
-+  return gtk_tree_selection_get_selected (selection, model, iter);
-+}
-diff -uNrp a/panels/region/cinnamon-region-panel-input-chooser.ui b/panels/region/cinnamon-region-panel-input-chooser.ui
---- a/panels/region/cinnamon-region-panel-input-chooser.ui	1970-01-01 01:00:00.000000000 +0100
-+++ b/panels/region/cinnamon-region-panel-input-chooser.ui	2013-09-21 13:24:15.339949536 +0100
-@@ -0,0 +1,157 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<interface>
-+  <requires lib="gtk+" version="2.16"/>
-+  <object class="GtkListStore" id="input_source_model">
-+    <columns>
-+      <!-- display name -->
-+      <column type="gchararray"/>
-+      <!-- input source type -->
-+      <column type="gchararray"/>
-+      <!-- type specific identifier -->
-+      <column type="gchararray"/>
-+    </columns>
-+  </object>
-+  <object class="GtkTreeModelFilter" id="filtered_input_source_model">
-+    <property name="child_model">input_source_model</property>
-+  </object>
-+  <object class="GtkDialog" id="input_source_chooser">
-+    <property name="visible">False</property>
-+    <property name="can_focus">False</property>
-+    <property name="border_width">5</property>
-+    <property name="title" translatable="yes">Choose an input source</property>
-+    <property name="modal">True</property>
-+    <property name="window_position">center-on-parent</property>
-+    <property name="type_hint">dialog</property>
-+    <child internal-child="vbox">
-+      <object class="GtkBox" id="dialog-vbox3">
-+        <property name="visible">True</property>
-+        <property name="can_focus">False</property>
-+        <property name="orientation">vertical</property>
-+        <property name="spacing">2</property>
-+        <child internal-child="action_area">
-+          <object class="GtkButtonBox" id="hbtnBox">
-+            <property name="visible">True</property>
-+            <property name="can_focus">False</property>
-+            <property name="layout_style">end</property>
-+            <child>
-+              <object class="GtkButton" id="cancel-button">
-+                <property name="label">gtk-cancel</property>
-+                <property name="visible">True</property>
-+                <property name="can_focus">True</property>
-+                <property name="can_default">True</property>
-+                <property name="receives_default">False</property>
-+                <property name="use_action_appearance">False</property>
-+                <property name="use_stock">True</property>
-+              </object>
-+              <packing>
-+                <property name="expand">False</property>
-+                <property name="fill">False</property>
-+                <property name="pack_type">end</property>
-+                <property name="position">1</property>
-+              </packing>
-+            </child>
-+            <child>
-+              <object class="GtkButton" id="ok-button">
-+                <property name="label">gtk-add</property>
-+                <property name="visible">True</property>
-+                <property name="can_focus">True</property>
-+                <property name="can_default">True</property>
-+                <property name="receives_default">False</property>
-+                <property name="use_action_appearance">False</property>
-+                <property name="use_stock">True</property>
-+              </object>
-+              <packing>
-+                <property name="expand">False</property>
-+                <property name="fill">False</property>
-+                <property name="pack_type">end</property>
-+                <property name="position">2</property>
-+              </packing>
-+            </child>
-+          </object>
-+        </child>
-+        <child>
-+          <object class="GtkVBox" id="vbox40">
-+            <property name="visible">True</property>
-+            <property name="can_focus">False</property>
-+            <property name="border_width">5</property>
-+            <property name="spacing">6</property>
-+            <child>
-+              <object class="GtkVBox" id="vbox1">
-+                <property name="visible">True</property>
-+                <property name="can_focus">False</property>
-+                <property name="spacing">6</property>
-+                <child>
-+                  <object class="GtkLabel" id="label1">
-+                    <property name="visible">True</property>
-+                    <property name="can_focus">False</property>
-+                    <property name="xalign">0</property>
-+                    <property name="label" translatable="yes">Select an input source to add</property>
-+                  </object>
-+                  <packing>
-+                    <property name="expand">False</property>
-+                    <property name="fill">False</property>
-+                    <property name="position">0</property>
-+                  </packing>
-+                </child>
-+                <child>
-+                  <object class="GtkScrolledWindow" id="scrolledwindow1">
-+                    <property name="visible">True</property>
-+                    <property name="can_focus">True</property>
-+                    <property name="hscrollbar_policy">never</property>
-+                    <property name="shadow_type">etched-in</property>
-+                    <property name="min_content_width">450</property>
-+                    <property name="min_content_height">250</property>
-+                    <child>
-+                      <object class="GtkTreeView" id="filtered_input_source_list">
-+                        <property name="visible">True</property>
-+                        <property name="can_focus">True</property>
-+                        <property name="model">filtered_input_source_model</property>
-+                        <property name="headers_visible">False</property>
-+                        <property name="search_column">0</property>
-+                      </object>
-+                    </child>
-+                  </object>
-+                  <packing>
-+                    <property name="expand">True</property>
-+                    <property name="fill">True</property>
-+                    <property name="position">1</property>
-+                  </packing>
-+                </child>
-+              </object>
-+              <packing>
-+                <property name="expand">True</property>
-+                <property name="fill">True</property>
-+                <property name="position">0</property>
-+              </packing>
-+            </child>
-+            <child>
-+              <object class="GtkEntry" id="input_source_filter">
-+                <property name="visible">True</property>
-+                <property name="can_focus">True</property>
-+                <property name="invisible_char">•</property>
-+                <property name="secondary-icon-name">edit-find-symbolic</property>
-+                <property name="secondary-icon-activatable">False</property>
-+                <property name="secondary-icon-sensitive">False</property>
-+              </object>
-+              <packing>
-+                <property name="expand">False</property>
-+                <property name="fill">False</property>
-+                <property name="pack_type">end</property>
-+                <property name="position">1</property>
-+              </packing>
-+            </child>
-+          </object>
-+          <packing>
-+            <property name="expand">True</property>
-+            <property name="fill">True</property>
-+            <property name="position">1</property>
-+          </packing>
-+        </child>
-+      </object>
-+    </child>
-+    <action-widgets>
-+      <action-widget response="-5">ok-button</action-widget>
-+      <action-widget response="-6">cancel-button</action-widget>
-+    </action-widgets>
-+  </object>
-+</interface>
-diff -uNrp a/panels/region/cinnamon-region-panel-input.h b/panels/region/cinnamon-region-panel-input.h
---- a/panels/region/cinnamon-region-panel-input.h	1970-01-01 01:00:00.000000000 +0100
-+++ b/panels/region/cinnamon-region-panel-input.h	2013-09-21 13:24:15.339949536 +0100
-@@ -0,0 +1,36 @@
-+/* cinnamon-region-panel-input.h
-+ * Copyright (C) 2011 Red Hat, Inc.
-+ *
-+ * Written by Matthias Clasen
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2, or (at your option)
-+ * any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street - Suite 500, Boston, MA
-+ * 02110-1335, USA.
-+ */
-+
-+#ifndef __CINNAMON_KEYBOARD_PROPERTY_INPUT_H
-+#define __CINNAMON_KEYBOARD_PROPERTY_INPUT_H
-+
-+#include <gtk/gtk.h>
-+
-+#include "cc-region-panel.h"
-+
-+G_BEGIN_DECLS
-+
-+void setup_input_tabs (GtkBuilder    *builder,
-+                       CcRegionPanel *self);
-+
-+G_END_DECLS
-+
-+#endif  /* __CINNAMON_KEYBOARD_PROPERTY_INPUT_H */
-diff -uNrp a/panels/region/cinnamon-region-panel-lang.c b/panels/region/cinnamon-region-panel-lang.c
---- a/panels/region/cinnamon-region-panel-lang.c	2013-08-25 14:40:14.000000000 +0100
-+++ b/panels/region/cinnamon-region-panel-lang.c	2013-09-21 13:24:15.340949500 +0100
-@@ -24,7 +24,7 @@
- #endif
- 
- #include <string.h>
--#include <glib/gi18n-lib.h>
-+#include <glib/gi18n.h>
- 
- #include "cinnamon-region-panel-lang.h"
- #include "cinnamon-region-panel-formats.h"
-diff -uNrp a/panels/region/cinnamon-region-panel-lang.h b/panels/region/cinnamon-region-panel-lang.h
---- a/panels/region/cinnamon-region-panel-lang.h	2013-08-25 14:40:14.000000000 +0100
-+++ b/panels/region/cinnamon-region-panel-lang.h	2013-09-21 13:24:15.340949500 +0100
-@@ -19,8 +19,8 @@
-  * 02110-1335, USA.
-  */
- 
--#ifndef __GNOME_KEYBOARD_PROPERTY_LANG_H
--#define __GNOME_KEYBOARD_PROPERTY_LANG_H
-+#ifndef __CINNAMON_KEYBOARD_PROPERTY_LANG_H
-+#define __CINNAMON_KEYBOARD_PROPERTY_LANG_H
- 
- #include <gtk/gtk.h>
- 
-@@ -29,4 +29,4 @@ G_BEGIN_DECLS
- void setup_language (GtkBuilder *builder);
- 
- G_END_DECLS
--#endif /* __GNOME_KEYBOARD_PROPERTY_LANG_H */
-+#endif /* __CINNAMON_KEYBOARD_PROPERTY_LANG_H */
-diff -uNrp a/panels/region/cinnamon-region-panel-layout-chooser.ui b/panels/region/cinnamon-region-panel-layout-chooser.ui
---- a/panels/region/cinnamon-region-panel-layout-chooser.ui	2013-08-25 14:40:14.000000000 +0100
-+++ b/panels/region/cinnamon-region-panel-layout-chooser.ui	1970-01-01 01:00:00.000000000 +0100
-@@ -1,180 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<interface>
--  <requires lib="gtk+" version="2.16"/>
--  <object class="GtkListStore" id="layout_list_model">
--    <columns>
--      <!-- column-name sort_order -->
--      <column type="gchararray"/>
--      <!-- column-name visible -->
--      <column type="gchararray"/>
--      <!-- column-name xkb_id -->
--      <column type="gchararray"/>
--      <!-- column-name country_desc -->
--      <column type="gchararray"/>
--      <!-- column-name language_desc -->
--      <column type="gchararray"/>
--    </columns>
--  </object>
--  <object class="GtkTreeModelFilter" id="filtered_layout_list_model">
--    <property name="child_model">layout_list_model</property>
--  </object>
--  <object class="GtkDialog" id="xkb_layout_chooser">
--    <property name="visible">False</property>
--    <property name="can_focus">False</property>
--    <property name="border_width">5</property>
--    <property name="title" translatable="yes">Choose a Layout</property>
--    <property name="modal">True</property>
--    <property name="window_position">center-on-parent</property>
--    <property name="type_hint">dialog</property>
--    <child internal-child="vbox">
--      <object class="GtkBox" id="dialog-vbox3">
--        <property name="visible">True</property>
--        <property name="can_focus">False</property>
--        <property name="orientation">vertical</property>
--        <property name="spacing">2</property>
--        <child internal-child="action_area">
--          <object class="GtkButtonBox" id="hbtnBox">
--            <property name="visible">True</property>
--            <property name="can_focus">False</property>
--            <property name="layout_style">end</property>
--            <child>
--              <object class="GtkButton" id="btnPreview">
--                <property name="label" translatable="yes">Preview</property>
--                <property name="visible">True</property>
--                <property name="can_focus">True</property>
--                <property name="receives_default">True</property>
--                <property name="use_action_appearance">False</property>
--              </object>
--              <packing>
--                <property name="expand">False</property>
--                <property name="fill">False</property>
--                <property name="position">0</property>
--                <property name="secondary">True</property>
--              </packing>
--            </child>
--            <child>
--              <object class="GtkButton" id="btnCancel">
--                <property name="label">gtk-cancel</property>
--                <property name="visible">True</property>
--                <property name="can_focus">True</property>
--                <property name="can_default">True</property>
--                <property name="receives_default">False</property>
--                <property name="use_action_appearance">False</property>
--                <property name="use_stock">True</property>
--              </object>
--              <packing>
--                <property name="expand">False</property>
--                <property name="fill">False</property>
--                <property name="pack_type">end</property>
--                <property name="position">1</property>
--              </packing>
--            </child>
--            <child>
--              <object class="GtkButton" id="btnOk">
--                <property name="label">gtk-add</property>
--                <property name="visible">True</property>
--                <property name="can_focus">True</property>
--                <property name="can_default">True</property>
--                <property name="receives_default">False</property>
--                <property name="use_action_appearance">False</property>
--                <property name="use_stock">True</property>
--              </object>
--              <packing>
--                <property name="expand">False</property>
--                <property name="fill">False</property>
--                <property name="pack_type">end</property>
--                <property name="position">2</property>
--              </packing>
--            </child>
--          </object>
--        </child>
--        <child>
--          <object class="GtkVBox" id="vbox40">
--            <property name="visible">True</property>
--            <property name="can_focus">False</property>
--            <property name="border_width">5</property>
--            <property name="spacing">6</property>
--            <child>
--              <object class="GtkVBox" id="vbox1">
--                <property name="visible">True</property>
--                <property name="can_focus">False</property>
--                <property name="spacing">6</property>
--                <child>
--                  <object class="GtkLabel" id="label1">
--                    <property name="visible">True</property>
--                    <property name="can_focus">False</property>
--                    <property name="xalign">0</property>
--                    <property name="label" translatable="yes">Select an input source to add</property>
--                  </object>
--                  <packing>
--                    <property name="expand">False</property>
--                    <property name="fill">False</property>
--                    <property name="position">0</property>
--                  </packing>
--                </child>
--                <child>
--                  <object class="GtkScrolledWindow" id="scrolledwindow1">
--                    <property name="visible">True</property>
--                    <property name="can_focus">True</property>
--                    <property name="hscrollbar_policy">never</property>
--                    <property name="shadow_type">etched-in</property>
--                    <property name="min_content_width">450</property>
--                    <property name="min_content_height">250</property>
--                    <child>
--                      <object class="GtkTreeView" id="xkb_filtered_layouts_list">
--                        <property name="visible">True</property>
--                        <property name="can_focus">True</property>
--                        <property name="model">filtered_layout_list_model</property>
--                        <property name="headers_visible">False</property>
--                        <property name="search_column">0</property>
--                        <child internal-child="selection">
--                          <object class="GtkTreeSelection" id="treeview-selection1"/>
--                        </child>
--                      </object>
--                    </child>
--                  </object>
--                  <packing>
--                    <property name="expand">True</property>
--                    <property name="fill">True</property>
--                    <property name="position">1</property>
--                  </packing>
--                </child>
--              </object>
--              <packing>
--                <property name="expand">True</property>
--                <property name="fill">True</property>
--                <property name="position">0</property>
--              </packing>
--            </child>
--            <child>
--              <object class="GtkEntry" id="xkb_layout_filter">
--                <property name="visible">True</property>
--                <property name="can_focus">True</property>
--                <property name="invisible_char">•</property>
--                <property name="secondary-icon-name">edit-find-symbolic</property>
--                <property name="secondary-icon-activatable">False</property>
--                <property name="secondary-icon-sensitive">False</property>
--              </object>
--              <packing>
--                <property name="expand">False</property>
--                <property name="fill">False</property>
--                <property name="pack_type">end</property>
--                <property name="position">1</property>
--              </packing>
--            </child>
--          </object>
--          <packing>
--            <property name="expand">True</property>
--            <property name="fill">True</property>
--            <property name="position">1</property>
--          </packing>
--        </child>
--      </object>
--    </child>
--    <action-widgets>
--      <action-widget response="1">btnPreview</action-widget>
--      <action-widget response="-5">btnOk</action-widget>
--      <action-widget response="-6">btnCancel</action-widget>
--    </action-widgets>
--  </object>
--</interface>
-diff -uNrp a/panels/region/cinnamon-region-panel-options-dialog.ui b/panels/region/cinnamon-region-panel-options-dialog.ui
---- a/panels/region/cinnamon-region-panel-options-dialog.ui	2013-08-25 14:40:14.000000000 +0100
-+++ b/panels/region/cinnamon-region-panel-options-dialog.ui	1970-01-01 01:00:00.000000000 +0100
-@@ -1,79 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<interface>
--  <requires lib="gtk+" version="2.16"/>
--  <object class="GtkDialog" id="xkb_options_dialog">
--    <property name="can_focus">False</property>
--    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
--    <property name="border_width">5</property>
--    <property name="title" translatable="yes">Keyboard Layout Options</property>
--    <property name="window_position">center-on-parent</property>
--    <property name="default_width">550</property>
--    <property name="default_height">400</property>
--    <property name="type_hint">dialog</property>
--    <child internal-child="vbox">
--      <object class="GtkBox" id="dialog_vbox">
--        <property name="visible">True</property>
--        <property name="can_focus">False</property>
--        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
--        <property name="orientation">vertical</property>
--        <property name="spacing">2</property>
--        <child>
--          <object class="GtkScrolledWindow" id="options_scroll">
--            <property name="visible">True</property>
--            <property name="can_focus">True</property>
--            <property name="border_width">5</property>
--            <property name="shadow_type">out</property>
--            <child>
--              <object class="GtkViewport" id="viewport1">
--                <property name="visible">True</property>
--                <property name="can_focus">False</property>
--                <property name="shadow_type">none</property>
--                <child>
--                  <object class="GtkVBox" id="options_vbox">
--                    <property name="visible">True</property>
--                    <property name="can_focus">False</property>
--                  </object>
--                </child>
--              </object>
--            </child>
--          </object>
--          <packing>
--            <property name="expand">False</property>
--            <property name="fill">True</property>
--            <property name="position">1</property>
--          </packing>
--        </child>
--        <child internal-child="action_area">
--          <object class="GtkButtonBox" id="dialog-action_area4">
--            <property name="visible">True</property>
--            <property name="can_focus">False</property>
--            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
--            <property name="layout_style">end</property>
--            <child>
--              <placeholder/>
--            </child>
--            <child>
--              <object class="GtkButton" id="button2">
--                <property name="label">gtk-close</property>
--                <property name="visible">True</property>
--                <property name="can_focus">True</property>
--                <property name="receives_default">True</property>
--                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
--                <property name="use_action_appearance">False</property>
--                <property name="use_stock">True</property>
--              </object>
--              <packing>
--                <property name="expand">False</property>
--                <property name="fill">False</property>
--                <property name="position">1</property>
--              </packing>
--            </child>
--          </object>
--        </child>
--      </object>
--    </child>
--    <action-widgets>
--      <action-widget response="-7">button2</action-widget>
--    </action-widgets>
--  </object>
--</interface>
-diff -uNrp a/panels/region/cinnamon-region-panel-system.c b/panels/region/cinnamon-region-panel-system.c
---- a/panels/region/cinnamon-region-panel-system.c	2013-08-25 14:40:14.000000000 +0100
-+++ b/panels/region/cinnamon-region-panel-system.c	2013-09-21 13:24:15.342949428 +0100
-@@ -27,15 +27,18 @@
- 
- #include <polkit/polkit.h>
- 
--#include <glib/gi18n-lib.h>
-+#include <glib/gi18n.h>
-+
-+#define GNOME_DESKTOP_USE_UNSTABLE_API
-+#include <libcinnamon-desktop/gnome-xkb-info.h>
- 
--#include <libgnomekbd/gkbd-keyboard-config.h>
- #include "cc-common-language.h"
- #include "gdm-languages.h"
- #include "cinnamon-region-panel-system.h"
--#include "cinnamon-region-panel-xkb.h"
- 
--static GSettings *locale_settings, *xkb_settings;
-+#define WID(s) GTK_WIDGET(gtk_builder_get_object (dialog, s))
-+
-+static GSettings *locale_settings, *input_sources_settings;
- static GDBusProxy *localed_proxy;
- static GPermission *localed_permission;
- 
-@@ -72,13 +75,14 @@ update_copy_button (GtkBuilder *dialog)
- 
-         button = WID ("copy_settings_button");
- 
--        /* If the version of localed doesn't include layouts... */
--        if (system_input_source) {
-+        if (user_input_source && user_input_source[0]) {
-                 layouts_differ = (g_strcmp0 (user_input_source, system_input_source) != 0);
-                 if (layouts_differ == FALSE)
-                         layouts_differ = (g_strcmp0 (user_input_variants, system_input_variants) != 0);
--        } else
-+        } else {
-+                /* Nothing to copy */
-                 layouts_differ = FALSE;
-+        }
- 
-         if (g_strcmp0 (user_lang, system_lang) == 0 &&
-             g_strcmp0 (user_region, system_region) == 0 &&
-@@ -131,61 +135,67 @@ system_update_language (GtkBuilder *dial
- }
- 
- static void
--xkb_settings_changed (GSettings *settings,
--                      const gchar *key,
--                      GtkBuilder *dialog)
-+input_sources_changed (GSettings *settings,
-+                       const gchar *key,
-+                       GtkBuilder *dialog)
- {
--	guint i;
--	GString *disp, *list, *variants;
--	GtkWidget *label;
--	gchar **layouts;
--
--	layouts = g_settings_get_strv (settings, "layouts");
--	if (layouts == NULL)
--		return;
--
--	label = WID ("user_input_source");
--	disp = g_string_new ("");
--	list = g_string_new ("");
--	variants = g_string_new ("");
--
--	for (i = 0; layouts[i]; i++) {
--		gchar *utf_visible;
--		char **split;
--		gchar *layout, *variant;
--
--		utf_visible = xkb_layout_description_utf8 (layouts[i]);
--		if (disp->str[0] != '\0')
--			g_string_append (disp, ", ");
--		g_string_append (disp, utf_visible ? utf_visible : layouts[i]);
--		g_free (utf_visible);
--
--		split = g_strsplit_set (layouts[i], " \t", 2);
--
--		if (split == NULL || split[0] == NULL)
--			continue;
--
--		layout = split[0];
--		variant = split[1];
--
--		if (list->str[0] != '\0')
--			g_string_append (list, ",");
--		g_string_append (list, layout);
--
--		if (variants->str[0] != '\0')
--			g_string_append (variants, ",");
--		g_string_append (variants, variant ? variant : "");
--
--		g_strfreev (split);
--	}
--	g_strfreev (layouts);
-+        GString *disp, *list, *variants;
-+        GtkWidget *label;
-+        GnomeXkbInfo *xkb_info;
-+        GVariantIter iter;
-+        GVariant *sources;
-+        const gchar *type;
-+        const gchar *id;
-+
-+        sources = g_settings_get_value (input_sources_settings, "sources");
-+        xkb_info = gnome_xkb_info_new ();
-+
-+        label = WID ("user_input_source");
-+        disp = g_string_new ("");
-+        list = g_string_new ("");
-+        variants = g_string_new ("");
-+
-+        g_variant_iter_init (&iter, sources);
-+        while (g_variant_iter_next (&iter, "(&s&s)", &type, &id)) {
-+                /* We can't copy non-XKB layouts to the system yet */
-+                if (g_str_equal (type, "xkb")) {
-+                        char **split;
-+                        gchar *layout, *variant;
-+                        const char *name;
-+
-+                        gnome_xkb_info_get_layout_info (xkb_info, id, &name, NULL, NULL, NULL);
-+                        if (disp->str[0] != '\0')
-+                                g_string_append (disp, ", ");
-+                        g_string_append (disp, name);
-+
-+                        split = g_strsplit (id, "+", 2);
-+
-+                        if (split == NULL || split[0] == NULL)
-+                                continue;
-+
-+                        layout = split[0];
-+                        variant = split[1];
-+
-+                        if (list->str[0] != '\0') {
-+                                g_string_append (list, ",");
-+                                g_string_append (variants, ",");
-+                        }
-+                        g_string_append (list, layout);
-+                        g_string_append (variants, variant ? variant : "");
-+
-+                        g_strfreev (split);
-+                }
-+        }
-+        g_variant_unref (sources);
-+        g_object_unref (xkb_info);
- 
-         g_object_set_data_full (G_OBJECT (label), "input_source", g_string_free (list, FALSE), g_free);
-         g_object_set_data_full (G_OBJECT (label), "input_variants", g_string_free (variants, FALSE), g_free);
-+
-         gtk_label_set_text (GTK_LABEL (label), disp->str);
-         g_string_free (disp, TRUE);
- 
--	update_copy_button (dialog);
-+        update_copy_button (dialog);
- }
- 
- static void
-@@ -222,12 +232,13 @@ on_localed_properties_changed (GDBusProx
-                                const gchar **invalidated_properties,
-                                GtkBuilder   *dialog)
- {
--        GVariant *v;
-+        GVariant *v, *w;
-         GtkWidget *label;
--        const char *layout;
-+        GnomeXkbInfo *xkb_info;
-         char **layouts;
-+        char **variants;
-         GString *disp;
--        guint i;
-+        guint i, n;
- 
-         if (invalidated_properties != NULL) {
-                 guint i;
-@@ -236,6 +247,8 @@ on_localed_properties_changed (GDBusProx
-                                 update_property (proxy, "Locale");
-                         else if (g_str_equal (invalidated_properties[i], "X11Layout"))
-                                 update_property (proxy, "X11Layout");
-+                        else if (g_str_equal (invalidated_properties[i], "X11Variant"))
-+                                update_property (proxy, "X11Variant");
-                 }
-         }
- 
-@@ -290,29 +303,56 @@ on_localed_properties_changed (GDBusProx
-         label = WID ("system_input_source");
-         v = g_dbus_proxy_get_cached_property (proxy, "X11Layout");
-         if (v) {
--                layout = g_variant_get_string (v, NULL);
--                g_object_set_data_full (G_OBJECT (label), "input_source", g_strdup (layout), g_free);
--	} else {
-+                layouts = g_strsplit (g_variant_get_string (v, NULL), ",", -1);
-+                g_object_set_data_full (G_OBJECT (label), "input_source",
-+                                        g_variant_dup_string (v, NULL), g_free);
-+                g_variant_unref (v);
-+        } else {
-                 g_object_set_data_full (G_OBJECT (label), "input_source", NULL, g_free);
-                 update_copy_button (dialog);
-                 return;
-         }
- 
--	disp = g_string_new ("");
--	layouts = g_strsplit (layout, ",", -1);
--	for (i = 0; layouts[i]; i++) {
--		gchar *utf_visible;
--
--		utf_visible = xkb_layout_description_utf8 (layouts[i]);
--		if (disp->str[0] != '\0')
--			disp = g_string_append (disp, ", ");
--		disp = g_string_append (disp, utf_visible ? utf_visible : layouts[i]);
--		g_free (utf_visible);
--	}
-+        w = g_dbus_proxy_get_cached_property (proxy, "X11Variant");
-+        if (w) {
-+                variants = g_strsplit (g_variant_get_string (w, NULL), ",", -1);
-+                g_object_set_data_full (G_OBJECT (label), "input_variants",
-+                                        g_variant_dup_string (w, NULL), g_free);
-+                g_variant_unref (w);
-+        } else {
-+                variants = NULL;
-+                g_object_set_data_full (G_OBJECT (label), "input_variants", NULL, g_free);
-+        }
-+
-+        if (variants && variants[0])
-+                n = MIN (g_strv_length (layouts), g_strv_length (variants));
-+        else
-+                n = g_strv_length (layouts);
-+
-+        xkb_info = gnome_xkb_info_new ();
-+        disp = g_string_new ("");
-+        for (i = 0; i < n && layouts[i][0]; i++) {
-+                const char *name;
-+                char *id;
-+
-+                if (variants && variants[i] && variants[i][0])
-+                        id = g_strdup_printf ("%s+%s", layouts[i], variants[i]);
-+                else
-+                        id = g_strdup (layouts[i]);
-+
-+                gnome_xkb_info_get_layout_info (xkb_info, id, &name, NULL, NULL, NULL);
-+                if (disp->str[0] != '\0')
-+                        disp = g_string_append (disp, ", ");
-+                disp = g_string_append (disp, name ? name : id);
-+
-+                g_free (id);
-+        }
-         gtk_label_set_text (GTK_LABEL (label), disp->str);
-         g_string_free (disp, TRUE);
- 
--        g_variant_unref (v);
-+        g_strfreev (variants);
-+        g_strfreev (layouts);
-+        g_object_unref (xkb_info);
- 
-         update_copy_button (dialog);
- }
-@@ -386,6 +426,11 @@ copy_settings (GtkButton *button, GtkBui
-         layout = g_object_get_data (G_OBJECT (label), "input_source");
-         variants = g_object_get_data (G_OBJECT (label), "input_variants");
- 
-+        if (layout == NULL || layout[0] == '\0') {
-+                g_debug ("Not calling SetX11Keyboard, as there are no XKB input sources in the user's settings");
-+                return;
-+        }
-+
-         g_dbus_proxy_call (localed_proxy,
-                            "SetX11Keyboard",
-                            g_variant_new ("(ssssbb)", layout, "", variants ? variants : "", "", TRUE, TRUE),
-@@ -468,10 +513,10 @@ setup_system (GtkBuilder *dialog)
-                           G_CALLBACK (locale_settings_changed), dialog);
-         g_object_weak_ref (G_OBJECT (dialog), (GWeakNotify) g_object_unref, locale_settings);
- 
--	xkb_settings = g_settings_new (GKBD_KEYBOARD_SCHEMA);
--	g_signal_connect (xkb_settings, "changed::layouts",
--			  G_CALLBACK (xkb_settings_changed), dialog);
--	g_object_weak_ref (G_OBJECT (dialog), (GWeakNotify) g_object_unref, xkb_settings);
-+        input_sources_settings = g_settings_new ("org.cinnamon.desktop.input-sources");
-+        g_signal_connect (input_sources_settings, "changed::sources",
-+                          G_CALLBACK (input_sources_changed), dialog);
-+        g_object_weak_ref (G_OBJECT (dialog), (GWeakNotify) g_object_unref, input_sources_settings);
- 
-         /* Display user settings */
-         language = cc_common_language_get_current_language ();
-@@ -480,7 +525,7 @@ setup_system (GtkBuilder *dialog)
- 
-         locale_settings_changed (locale_settings, "region", dialog);
- 
--        xkb_settings_changed (xkb_settings, "layouts", dialog);
-+        input_sources_changed (input_sources_settings, "sources", dialog);
- 
-         bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
-         g_dbus_proxy_new (bus,
-diff -uNrp a/panels/region/cinnamon-region-panel-system.h b/panels/region/cinnamon-region-panel-system.h
---- a/panels/region/cinnamon-region-panel-system.h	2013-08-25 14:40:14.000000000 +0100
-+++ b/panels/region/cinnamon-region-panel-system.h	2013-09-21 13:24:15.342949428 +0100
-@@ -19,8 +19,8 @@
-  * 02110-1335, USA.
-  */
- 
--#ifndef __GNOME_REGION_PANEL_SYSTEM_H
--#define __GNOME_REGION_PANEL_SYSTEM_H
-+#ifndef __CINNAMON_REGION_PANEL_SYSTEM_H
-+#define __CINNAMON_REGION_PANEL_SYSTEM_H
- 
- #include <gtk/gtk.h>
- 
-diff -uNrp a/panels/region/cinnamon-region-panel.ui b/panels/region/cinnamon-region-panel.ui
---- a/panels/region/cinnamon-region-panel.ui	2013-08-25 14:40:14.000000000 +0100
-+++ b/panels/region/cinnamon-region-panel.ui	2013-09-21 13:24:15.347949247 +0100
-@@ -162,27 +162,17 @@
-                             <style>
-                               <class name="inline-toolbar"/>
-                             </style>
-+                            <style>
-+                              <class name="inline-toolbar"/>
-+                            </style>
-                             <child>
-                               <object class="GtkToolButton" id="language_add">
-+                                <property name="use_action_appearance">False</property>
-                                 <property name="visible">True</property>
--                                <property name="can_focus">False</property>
-                                 <property name="label" translatable="yes">Add Language</property>
--                                <property name="use_underline">True</property>
--                                <property name="icon_name">list-add-symbolic</property>
--                              </object>
--                              <packing>
--                                <property name="expand">False</property>
--                                <property name="homogeneous">True</property>
--                              </packing>
--                            </child>
--                            <child>
--                              <object class="GtkToolButton" id="language_remove">
--                                <property name="visible">True</property>
--                                <property name="sensitive">False</property>
-                                 <property name="can_focus">False</property>
--                                <property name="label" translatable="yes">Remove Language</property>
-                                 <property name="use_underline">True</property>
--                                <property name="icon_name">list-remove-symbolic</property>
-+                                <property name="icon_name">list-add-symbolic</property>
-                               </object>
-                               <packing>
-                                 <property name="expand">False</property>
-@@ -198,12 +188,13 @@
-                         </child>
-                         <child>
-                           <object class="GtkVBox" id="vbox3">
--                            <property name="visible">True</property>
-                             <property name="can_focus">False</property>
-                             <child>
-                               <object class="GtkLabel" id="label23">
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">False</property>
-+                                <property name="use_underline">True</property>
-+                                <property name="label" translatable="yes">Add Language</property>
-                               </object>
-                               <packing>
-                                 <property name="expand">True</property>
-@@ -212,23 +203,24 @@
-                               </packing>
-                             </child>
-                             <child>
--                              <object class="GtkButton" id="get_languages_button">
--                                <property name="label" translatable="yes">button</property>
-+                              <object class="GtkLinkButton" id="linkbutton1">
-+                                <property name="label" translatable="yes">Install languages...</property>
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property name="receives_default">True</property>
-+                                <property name="has_tooltip">True</property>
-                               </object>
-                               <packing>
--                                <property name="expand">True</property>
-+                                <property name="expand">False</property>
-                                 <property name="fill">True</property>
--                                <property name="position">13</property>
-+                                <property name="position">1</property>
-                               </packing>
-                             </child>
-                           </object>
-                           <packing>
-                             <property name="expand">False</property>
-                             <property name="fill">True</property>
--                            <property name="position">2</property>
-+                            <property name="position">1</property>
-                           </packing>
-                         </child>
-                       </object>
-@@ -305,19 +297,19 @@
-                         </child>
-                         <child>
-                           <object class="GtkToolbar" id="region-toolbar">
--                            <property name="visible">True</property>
--                            <property name="can_focus">False</property>
-                             <property name="toolbar_style">icons</property>
-                             <property name="show_arrow">False</property>
-                             <property name="icon_size">1</property>
-+                            <property name="visible">True</property>
-                             <style>
-                               <class name="inline-toolbar"/>
-                             </style>
-                             <child>
-                               <object class="GtkToolButton" id="region_add">
-+                                <property name="use_action_appearance">False</property>
-+                                <property name="label" translatable="yes">Add Region</property>
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">False</property>
--                                <property name="label" translatable="yes">Add Region</property>
-                                 <property name="use_underline">True</property>
-                                 <property name="icon_name">list-add-symbolic</property>
-                               </object>
-@@ -328,10 +320,11 @@
-                             </child>
-                             <child>
-                               <object class="GtkToolButton" id="region_remove">
-+                                <property name="use_action_appearance">False</property>
-                                 <property name="visible">True</property>
-+                                <property name="label" translatable="yes">Remove Region</property>
-                                 <property name="sensitive">False</property>
-                                 <property name="can_focus">False</property>
--                                <property name="label" translatable="yes">Remove Region</property>
-                                 <property name="use_underline">True</property>
-                                 <property name="icon_name">list-remove-symbolic</property>
-                               </object>
-@@ -373,18 +366,6 @@
-                                 <property name="n_rows">9</property>
-                                 <property name="n_columns">2</property>
-                                 <child>
--                                  <placeholder/>
--                                </child>
--                                <child>
--                                  <placeholder/>
--                                </child>
--                                <child>
--                                  <placeholder/>
--                                </child>
--                                <child>
--                                  <placeholder/>
--                                </child>
--                                <child>
-                                   <object class="GtkLabel" id="label7">
-                                     <property name="visible">True</property>
-                                     <property name="can_focus">False</property>
-@@ -626,6 +607,12 @@
-                         <property name="height">1</property>
-                       </packing>
-                     </child>
-+                    <child>
-+                      <placeholder/>
-+                    </child>
-+                    <child>
-+                      <placeholder/>
-+                    </child>
-                   </object>
-                   <packing>
-                     <property name="position">1</property>
-@@ -643,36 +630,43 @@
-                   </packing>
-                 </child>
-                 <child>
--                  <object class="GtkVBox" id="vbox1">
-+                  <object class="GtkVBox" id="vbox5">
-                     <property name="visible">True</property>
-                     <property name="can_focus">False</property>
--                    <property name="border_width">10</property>
-+                    <property name="border_width">12</property>
-                     <property name="spacing">12</property>
-                     <child>
--                      <placeholder/>
-+                      <object class="GtkLabel" id="label24">
-+                        <property name="visible">True</property>
-+                        <property name="can_focus">False</property>
-+                        <property name="xalign">0</property>
-+                        <property name="label" translatable="yes">Select keyboards or other input sources</property>
-+                      </object>
-+                      <packing>
-+                        <property name="expand">False</property>
-+                        <property name="fill">False</property>
-+                        <property name="position">0</property>
-+                      </packing>
-                     </child>
-                     <child>
--                      <object class="GtkHBox" id="hbox2">
-+                      <object class="GtkHBox" id="hbox3">
-                         <property name="visible">True</property>
-                         <property name="can_focus">False</property>
-                         <property name="spacing">12</property>
-                         <child>
--                          <object class="GtkVBox" id="vbox7">
-+                          <object class="GtkVBox" id="vbox6">
-                             <property name="visible">True</property>
-                             <property name="can_focus">False</property>
-                             <child>
--                              <object class="GtkScrolledWindow" id="xkb_layouts_swindow">
-+                              <object class="GtkScrolledWindow" id="input_sources_swindow">
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property name="shadow_type">in</property>
-                                 <child>
--                                  <object class="GtkTreeView" id="xkb_layouts_selected">
-+                                  <object class="GtkTreeView" id="active_input_sources">
-                                     <property name="visible">True</property>
-                                     <property name="can_focus">True</property>
-                                     <property name="headers_visible">False</property>
--                                    <child internal-child="selection">
--                                      <object class="GtkTreeSelection" id="treeview-selection1"/>
--                                    </child>
-                                   </object>
-                                 </child>
-                               </object>
-@@ -683,7 +677,7 @@
-                               </packing>
-                             </child>
-                             <child>
--                              <object class="GtkToolbar" id="layouts-toolbar">
-+                              <object class="GtkToolbar" id="input-toolbar">
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">False</property>
-                                 <property name="toolbar_style">icons</property>
-@@ -693,70 +687,166 @@
-                                   <class name="inline-toolbar"/>
-                                 </style>
-                                 <child>
--                                  <object class="GtkToolButton" id="xkb_layouts_add">
-+                                  <object class="GtkToolItem" id="i_s_ar_item">
-                                     <property name="visible">True</property>
--                                    <property name="can_focus">False</property>
--                                    <property name="label" translatable="yes">Add Layout</property>
--                                    <property name="use_underline">True</property>
--                                    <property name="icon_name">list-add-symbolic</property>
-+                                    <child>
-+                                      <object class="GtkBox" id="i_s_ar_box">
-+                                        <property name="visible">True</property>
-+                                        <child>
-+                                           <object class="GtkButton" id="input_source_add">
-+                                             <property name="visible">True</property>
-+                                             <child internal-child="accessible">
-+                                               <object class="AtkObject" id="i_s_a_a11y">
-+                                                 <property name="accessible-name" translatable="yes">Add Input Source</property>
-+                                               </object>
-+                                             </child>
-+                                             <child>
-+                                                <object class="GtkImage" id="i_s_a_image">
-+
-+                                                  <property name="visible">True</property>
-+                                                  <property name="icon-name">list-add-symbolic</property>
-+                                                  <property name="icon-size">1</property>
-+                                                </object>
-+                                             </child>
-+                                           </object>
-+                                        </child>
-+                                        <child>
-+                                           <object class="GtkButton" id="input_source_remove">
-+                                             <property name="visible">True</property>
-+                                             <child internal-child="accessible">
-+                                               <object class="AtkObject" id="i_s_r_a11y">
-+                                                 <property name="accessible-name" translatable="yes">Remove Input Source</property>
-+                                               </object>
-+                                             </child>
-+                                             <child>
-+                                                <object class="GtkImage" id="i_s_r_image">
-+                                                  <property name="visible">True</property>
-+                                                  <property name="icon-name">list-remove-symbolic</property>
-+                                                  <property name="icon-size">1</property>
-+                                                </object>
-+                                             </child>
-+                                           </object>
-+                                        </child>
-+                                      </object>
-+                                    </child>
-                                   </object>
--                                  <packing>
--                                    <property name="expand">False</property>
--                                    <property name="homogeneous">True</property>
--                                  </packing>
-                                 </child>
-+
-                                 <child>
--                                  <object class="GtkToolButton" id="xkb_layouts_remove">
-+                                  <object class="GtkSeparatorToolItem" id="sep1">
-                                     <property name="visible">True</property>
--                                    <property name="can_focus">False</property>
--                                    <property name="label" translatable="yes">Remove Layout</property>
--                                    <property name="use_underline">True</property>
--                                    <property name="icon_name">list-remove-symbolic</property>
-+                                    <property name="draw">False</property>
-                                   </object>
-                                   <packing>
--                                    <property name="expand">False</property>
--                                    <property name="homogeneous">True</property>
-+                                    <property name="expand">True</property>
-                                   </packing>
-                                 </child>
-+
-                                 <child>
--                                  <object class="GtkToolButton" id="xkb_layouts_move_up">
-+                                  <object class="GtkToolItem" id="i_s_ud_item">
-                                     <property name="visible">True</property>
--                                    <property name="can_focus">False</property>
--                                    <property name="label" translatable="yes">Move Up</property>
--                                    <property name="use_underline">True</property>
--                                    <property name="icon_name">go-up-symbolic</property>
-+                                    <child>
-+                                      <object class="GtkBox" id="i_s_ud_box">
-+                                        <property name="visible">True</property>
-+                                        <child>
-+                                           <object class="GtkButton" id="input_source_move_up">
-+                                             <property name="visible">True</property>
-+                                             <child internal-child="accessible">
-+                                               <object class="AtkObject" id="i_s_u_a11y">
-+                                                 <property name="accessible-name" translatable="yes">Move Input Source Up</property>
-+                                               </object>
-+                                             </child>
-+                                             <child>
-+                                                <object class="GtkImage" id="i_s_u_image">
-+
-+                                                  <property name="visible">True</property>
-+                                                  <property name="icon-name">go-up-symbolic</property>
-+                                                  <property name="icon-size">1</property>
-+                                                </object>
-+                                             </child>
-+                                           </object>
-+                                        </child>
-+                                        <child>
-+                                           <object class="GtkButton" id="input_source_move_down">
-+                                             <property name="visible">True</property>
-+                                             <child internal-child="accessible">
-+                                               <object class="AtkObject" id="i_s_d_a11y">
-+                                                 <property name="accessible-name" translatable="yes">Move Input Source Down</property>
-+                                               </object>
-+                                             </child>
-+                                             <child>
-+                                                <object class="GtkImage" id="i_s_d_image">
-+                                                  <property name="visible">True</property>
-+                                                  <property name="icon-name">go-down-symbolic</property>
-+                                                  <property name="icon-size">1</property>
-+                                                </object>
-+                                             </child>
-+                                           </object>
-+                                        </child>
-+                                      </object>
-+                                    </child>
-                                   </object>
--                                  <packing>
--                                    <property name="expand">False</property>
--                                    <property name="homogeneous">True</property>
--                                  </packing>
-                                 </child>
-+
-                                 <child>
--                                  <object class="GtkToolButton" id="xkb_layouts_move_down">
-+                                  <object class="GtkSeparatorToolItem" id="sep2">
-                                     <property name="visible">True</property>
--                                    <property name="can_focus">False</property>
--                                    <property name="label" translatable="yes">Move Down</property>
--                                    <property name="use_underline">True</property>
--                                    <property name="icon_name">go-down-symbolic</property>
-+                                    <property name="draw">False</property>
-+                                    <property name="hexpand">True</property>
-                                   </object>
-                                   <packing>
--                                    <property name="expand">False</property>
--                                    <property name="homogeneous">True</property>
-+                                    <property name="expand">True</property>
-                                   </packing>
-                                 </child>
-+
-                                 <child>
--                                  <object class="GtkToolButton" id="xkb_layouts_show">
-+                                  <object class="GtkToolItem" id="i_s_sp_item">
-                                     <property name="visible">True</property>
--                                    <property name="can_focus">False</property>
--                                    <property name="label" translatable="yes">Preview Layout</property>
--                                    <property name="use_underline">True</property>
--                                    <property name="icon_name">input-keyboard-symbolic</property>
-+                                    <child>
-+                                      <object class="GtkBox" id="i_s_sp_box">
-+                                        <property name="visible">True</property>
-+                                        <child>
-+                                           <object class="GtkButton" id="input_source_settings">
-+                                             <property name="visible">True</property>
-+                                             <child internal-child="accessible">
-+                                               <object class="AtkObject" id="i_s_s_a11y">
-+                                                 <property name="accessible-name" translatable="yes">Input Source Settings</property>
-+                                               </object>
-+                                             </child>
-+                                             <child>
-+                                                <object class="GtkImage" id="i_s_s_image">
-+
-+                                                  <property name="visible">True</property>
-+                                                  <property name="icon_name">preferences-system-symbolic</property>
-+                                                  <property name="icon_size">1</property>
-+                                                  <property name="pixel_size">16</property>
-+                                                </object>
-+                                             </child>
-+                                           </object>
-+                                        </child>
-+                                        <child>
-+                                           <object class="GtkButton" id="input_source_show">
-+                                             <property name="visible">True</property>
-+                                             <child internal-child="accessible">
-+                                               <object class="AtkObject" id="i_s_p_a11y">
-+                                                 <property name="accessible-name" translatable="yes">Show Keyboard Layout</property>
-+                                               </object>
-+                                             </child>
-+                                             <child>
-+                                                <object class="GtkImage" id="i_s_p_image">
-+
-+                                                  <property name="visible">True</property>
-+                                                  <property name="icon_name">input-keyboard-symbolic</property>
-+                                                  <property name="icon-size">1</property>
-+                                                </object>
-+                                             </child>
-+                                           </object>
-+                                        </child>
-+                                      </object>
-+                                    </child>
-                                   </object>
--                                  <packing>
--                                    <property name="expand">False</property>
--                                    <property name="homogeneous">True</property>
--                                  </packing>
-                                 </child>
-+
-                               </object>
-                               <packing>
-                                 <property name="expand">False</property>
-@@ -772,168 +862,111 @@
-                           </packing>
-                         </child>
-                         <child>
--                          <object class="GtkVBox" id="vbox33">
-+                          <object class="GtkFrame" id="frame4">
-                             <property name="visible">True</property>
-                             <property name="can_focus">False</property>
--                            <property name="spacing">12</property>
-+                            <property name="label_xalign">0</property>
-+                            <property name="shadow_type">none</property>
-                             <child>
--                              <object class="GtkVBox" id="vbox34">
-+                              <object class="GtkAlignment" id="alignment3">
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">False</property>
--                                <property name="spacing">6</property>
-+                                <property name="left_padding">12</property>
-                                 <child>
--                                  <object class="GtkRadioButton" id="chk_same_group">
--                                    <property name="label" translatable="yes">Use the same layout for all windows</property>
--                                    <property name="visible">True</property>
--                                    <property name="can_focus">True</property>
--                                    <property name="receives_default">False</property>
--                                    <property name="xalign">0</property>
--                                    <property name="active">True</property>
--                                    <property name="draw_indicator">True</property>
--                                  </object>
--                                  <packing>
--                                    <property name="expand">True</property>
--                                    <property name="fill">True</property>
--                                    <property name="position">0</property>
--                                  </packing>
--                                </child>
--                                <child>
--                                  <object class="GtkRadioButton" id="chk_separate_group_per_window">
--                                    <property name="label" translatable="yes">Allow different layouts for individual windows</property>
--                                    <property name="visible">True</property>
--                                    <property name="can_focus">True</property>
--                                    <property name="receives_default">False</property>
--                                    <property name="xalign">0</property>
--                                    <property name="active">True</property>
--                                    <property name="draw_indicator">True</property>
--                                    <property name="group">chk_same_group</property>
--                                  </object>
--                                  <packing>
--                                    <property name="expand">True</property>
--                                    <property name="fill">True</property>
--                                    <property name="position">1</property>
--                                  </packing>
--                                </child>
--                                <child>
--                                  <object class="GtkAlignment" id="alignment1">
-+                                  <object class="GtkGrid" id="shortcuts-grid">
-                                     <property name="visible">True</property>
-                                     <property name="can_focus">False</property>
--                                    <property name="left_padding">12</property>
-+                                    <property name="margin_top">6</property>
-+                                    <property name="row_spacing">6</property>
-+                                    <property name="column_spacing">6</property>
-                                     <child>
--                                      <object class="GtkVBox" id="vbox4">
-+                                      <object class="GtkLabel" id="prev-source-label">
-                                         <property name="visible">True</property>
-                                         <property name="can_focus">False</property>
--                                        <child>
--                                          <object class="GtkRadioButton" id="chk_new_windows_default_layout">
--                                            <property name="label" translatable="yes">New windows use the default layout</property>
--                                            <property name="visible">True</property>
--                                            <property name="can_focus">True</property>
--                                            <property name="receives_default">False</property>
--                                            <property name="xalign">0</property>
--                                            <property name="active">True</property>
--                                            <property name="draw_indicator">True</property>
--                                          </object>
--                                          <packing>
--                                            <property name="expand">True</property>
--                                            <property name="fill">True</property>
--                                            <property name="position">0</property>
--                                          </packing>
--                                        </child>
--                                        <child>
--                                          <object class="GtkRadioButton" id="chk_new_windows_inherit_layout">
--                                            <property name="label" translatable="yes">New windows use the previous window's layout</property>
--                                            <property name="visible">True</property>
--                                            <property name="can_focus">True</property>
--                                            <property name="receives_default">False</property>
--                                            <property name="xalign">0</property>
--                                            <property name="active">True</property>
--                                            <property name="draw_indicator">True</property>
--                                            <property name="group">chk_new_windows_default_layout</property>
--                                          </object>
--                                          <packing>
--                                            <property name="expand">True</property>
--                                            <property name="fill">True</property>
--                                            <property name="position">1</property>
--                                          </packing>
--                                        </child>
-+                                        <property name="xalign">0</property>
-+                                        <property name="label" translatable="yes">Switch to previous source</property>
-                                       </object>
-+                                      <packing>
-+                                        <property name="left_attach">0</property>
-+                                        <property name="top_attach">0</property>
-+                                        <property name="width">1</property>
-+                                        <property name="height">1</property>
-+                                      </packing>
-+                                    </child>
-+                                    <child>
-+                                      <object class="GtkLabel" id="prev-source-shortcut-label">
-+                                        <property name="visible">True</property>
-+                                        <property name="can_focus">False</property>
-+                                        <property name="halign">end</property>
-+                                        <property name="hexpand">True</property>
-+                                        <property name="label" translatable="yes">Ctrl+Alt+Space</property>
-+                                        <style><class name="dim-label"/></style>
-+                                      </object>
-+                                      <packing>
-+                                        <property name="left_attach">1</property>
-+                                        <property name="top_attach">0</property>
-+                                        <property name="width">1</property>
-+                                        <property name="height">1</property>
-+                                      </packing>
-+                                    </child>
-+                                    <child>
-+                                      <object class="GtkLabel" id="next-source-label">
-+                                        <property name="visible">True</property>
-+                                        <property name="can_focus">False</property>
-+                                        <property name="xalign">0</property>
-+                                        <property name="label" translatable="yes">Switch to next source</property>
-+                                      </object>
-+                                      <packing>
-+                                        <property name="left_attach">0</property>
-+                                        <property name="top_attach">1</property>
-+                                        <property name="width">1</property>
-+                                        <property name="height">1</property>
-+                                      </packing>
-+                                    </child>
-+                                    <child>
-+                                      <object class="GtkLabel" id="next-source-shortcut-label">
-+                                        <property name="visible">True</property>
-+                                        <property name="can_focus">False</property>
-+                                        <property name="halign">end</property>
-+                                        <property name="hexpand">True</property>
-+                                        <property name="label" translatable="yes">Ctrl+Alt+Shift+Space</property>
-+                                        <style><class name="dim-label"/></style>
-+                                      </object>
-+                                      <packing>
-+                                        <property name="left_attach">1</property>
-+                                        <property name="top_attach">1</property>
-+                                        <property name="width">1</property>
-+                                        <property name="height">1</property>
-+                                      </packing>
-+                                    </child>
-+                                    <child>
-+                                      <object class="GtkLinkButton" id="jump-to-shortcuts">
-+                                        <property name="visible">True</property>
-+                                        <property name="can_focus">True</property>
-+                                        <property name="label" translatable="yes">Shortcut Settings</property>
-+                                        <property name="halign">end</property>
-+                                      </object>
-+                                      <packing>
-+                                        <property name="left_attach">1</property>
-+                                        <property name="top_attach">2</property>
-+                                        <property name="width">1</property>
-+                                        <property name="height">1</property>
-+                                      </packing>
-                                     </child>
-                                   </object>
--                                  <packing>
--                                    <property name="expand">True</property>
--                                    <property name="fill">True</property>
--                                    <property name="position">2</property>
--                                  </packing>
-                                 </child>
-                               </object>
--                              <packing>
--                                <property name="expand">False</property>
--                                <property name="fill">False</property>
--                                <property name="position">0</property>
--                              </packing>
--                            </child>
--                            <child>
--                              <object class="GtkLabel" id="label2">
--                                <property name="visible">True</property>
--                                <property name="can_focus">False</property>
--                              </object>
--                              <packing>
--                                <property name="expand">True</property>
--                                <property name="fill">False</property>
--                                <property name="position">1</property>
--                              </packing>
-                             </child>
--                            <child>
--                              <object class="GtkHButtonBox" id="hbuttonbox2">
-+                            <child type="label">
-+                              <object class="GtkLabel" id="shortcuts-frame-label">
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">False</property>
--                                <property name="spacing">6</property>
--                                <property name="layout_style">end</property>
--                                <child>
--                                  <object class="GtkButton" id="xkb_layout_options">
--                                    <property name="label" translatable="yes">_Options...</property>
--                                    <property name="visible">True</property>
--                                    <property name="can_focus">True</property>
--                                    <property name="receives_default">True</property>
--                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
--                                    <property name="has_tooltip">True</property>
--                                    <property name="tooltip_markup" translatable="yes">View and edit keyboard layout options</property>
--                                    <property name="tooltip_text" translatable="yes">View and edit keyboard layout options</property>
--                                    <property name="use_underline">True</property>
--                                  </object>
--                                  <packing>
--                                    <property name="expand">False</property>
--                                    <property name="fill">False</property>
--                                    <property name="position">0</property>
--                                  </packing>
--                                </child>
--                                <child>
--                                  <object class="GtkButton" id="xkb_reset_to_defaults">
--                                    <property name="label" translatable="yes">Reset to De_faults</property>
--                                    <property name="visible">True</property>
--                                    <property name="can_focus">True</property>
--                                    <property name="receives_default">True</property>
--                                    <property name="has_tooltip">True</property>
--                                    <property name="tooltip_markup" translatable="yes">Replace the current keyboard layout settings with the
--default settings</property>
--                                    <property name="tooltip_text" translatable="yes">Replace the current keyboard layout settings with the
--default settings</property>
--                                    <property name="use_underline">True</property>
--                                  </object>
--                                  <packing>
--                                    <property name="expand">False</property>
--                                    <property name="fill">False</property>
--                                    <property name="pack_type">end</property>
--                                    <property name="position">1</property>
--                                    <property name="secondary">True</property>
--                                  </packing>
--                                </child>
-+                                <property name="label" translatable="yes">Shortcuts</property>
-+                                <property name="use_markup">True</property>
-+                                <attributes>
-+                                  <attribute name="weight" value="bold"/>
-+                                </attributes>
-                               </object>
--                              <packing>
--                                <property name="expand">False</property>
--                                <property name="fill">False</property>
--                                <property name="position">2</property>
--                              </packing>
-                             </child>
-                           </object>
-                           <packing>
-@@ -951,17 +984,17 @@ default settings</property>
-                     </child>
-                   </object>
-                   <packing>
--                    <property name="position">2</property>
-+                    <property name="position">3</property>
-                   </packing>
-                 </child>
-                 <child type="tab">
--                  <object class="GtkLabel" id="label46">
-+                  <object class="GtkLabel" id="label13">
-                     <property name="visible">True</property>
-                     <property name="can_focus">False</property>
--                    <property name="label" translatable="yes">Keyboard Layouts</property>
-+                    <property name="label" translatable="yes">Input Sources</property>
-                   </object>
-                   <packing>
--                    <property name="position">2</property>
-+                    <property name="position">3</property>
-                     <property name="tab_fill">False</property>
-                   </packing>
-                 </child>
-@@ -974,9 +1007,6 @@ default settings</property>
-                     <property name="column_spacing">12</property>
-                     <property name="row_spacing">12</property>
-                     <child>
--                      <placeholder/>
--                    </child>
--                    <child>
-                       <object class="GtkLabel" id="system-title">
-                         <property name="visible">True</property>
-                         <property name="can_focus">False</property>
-@@ -1051,6 +1081,7 @@ default settings</property>
-                                 <property name="bottom_attach">2</property>
-                                 <property name="x_padding">3</property>
-                                 <property name="y_padding">3</property>
-+                                <property name="y_options">GTK_FILL</property>
-                               </packing>
-                             </child>
-                             <child>
-@@ -1060,6 +1091,7 @@ default settings</property>
-                                 <property name="xalign">0</property>
-                                 <property name="yalign">0</property>
-                                 <property name="wrap">True</property>
-+                                <property name="width-chars">18</property>
-                               </object>
-                               <packing>
-                                 <property name="left_attach">1</property>
-@@ -1068,6 +1100,7 @@ default settings</property>
-                                 <property name="bottom_attach">2</property>
-                                 <property name="x_padding">3</property>
-                                 <property name="y_padding">3</property>
-+                                <property name="y_options">GTK_FILL</property>
-                               </packing>
-                             </child>
-                             <child>
-@@ -1178,6 +1211,7 @@ default settings</property>
-                                 <property name="bottom_attach">2</property>
-                                 <property name="x_padding">3</property>
-                                 <property name="y_padding">3</property>
-+                                <property name="y_options">GTK_FILL</property>
-                               </packing>
-                             </child>
-                             <child>
-@@ -1187,6 +1221,7 @@ default settings</property>
-                                 <property name="xalign">0</property>
-                                 <property name="yalign">0</property>
-                                 <property name="wrap">True</property>
-+                                <property name="width-chars">18</property>
-                               </object>
-                               <packing>
-                                 <property name="left_attach">1</property>
-@@ -1195,6 +1230,7 @@ default settings</property>
-                                 <property name="bottom_attach">2</property>
-                                 <property name="x_padding">3</property>
-                                 <property name="y_padding">3</property>
-+                                <property name="y_options">GTK_FILL</property>
-                               </packing>
-                             </child>
-                             <child>
-@@ -1254,6 +1290,7 @@ default settings</property>
-                     <child>
-                       <object class="GtkButton" id="copy_settings_button">
-                         <property name="label" translatable="yes">Copy Settings...</property>
-+                        <property name="use_action_appearance">False</property>
-                         <property name="visible">True</property>
-                         <property name="can_focus">True</property>
-                         <property name="receives_default">True</property>
-@@ -1269,9 +1306,12 @@ default settings</property>
-                         <property name="y_padding">3</property>
-                       </packing>
-                     </child>
-+                    <child>
-+                      <placeholder/>
-+                    </child>
-                   </object>
-                   <packing>
--                    <property name="position">3</property>
-+                    <property name="position">4</property>
-                   </packing>
-                 </child>
-                 <child type="tab">
-@@ -1281,7 +1321,7 @@ default settings</property>
-                     <property name="label" translatable="yes">System</property>
-                   </object>
-                   <packing>
--                    <property name="position">3</property>
-+                    <property name="position">4</property>
-                     <property name="tab_fill">False</property>
-                   </packing>
-                 </child>
-@@ -1302,4 +1342,11 @@ default settings</property>
-       </object>
-     </child>
-   </object>
-+  <object class="GtkSizeGroup" id="system-input-source-sizegroup">
-+    <property name="mode">vertical</property>
-+    <widgets>
-+      <widget name="user_input_source"/>
-+      <widget name="system_input_source"/>
-+    </widgets>
-+  </object>
- </interface>
-diff -uNrp a/panels/region/cinnamon-region-panel-xkb.c b/panels/region/cinnamon-region-panel-xkb.c
---- a/panels/region/cinnamon-region-panel-xkb.c	2013-08-25 14:40:14.000000000 +0100
-+++ b/panels/region/cinnamon-region-panel-xkb.c	1970-01-01 01:00:00.000000000 +0100
-@@ -1,190 +0,0 @@
--/* cinnamon-region-panel-xkb.c
-- * Copyright (C) 2003-2007 Sergey V. Udaltsov
-- *
-- * Written by: Sergey V. Udaltsov <svu@gnome.org>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; either version 2, or (at your option)
-- * any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 51 Franklin Street - Suite 500, Boston, MA
-- * 02110-1335, USA.
-- */
--
--#ifdef HAVE_CONFIG_H
--#  include <config.h>
--#endif
--
--#include <string.h>
--#include <gdk/gdkx.h>
--#include <glib/gi18n-lib.h>
--
--#include "cinnamon-region-panel-xkb.h"
--
--#include <libgnomekbd/gkbd-desktop-config.h>
--
--XklEngine *engine;
--XklConfigRegistry *config_registry;
--
--GkbdKeyboardConfig initial_config;
--GkbdDesktopConfig desktop_config;
--
--GSettings *xkb_keyboard_settings;
--GSettings *xkb_desktop_settings;
--
--char *
--xci_desc_to_utf8 (const XklConfigItem * ci)
--{
--	gchar *dd = g_strdup (ci->description);
--	gchar *sd = g_strstrip (dd);
--	gchar *rv = g_strdup (sd[0] == 0 ? ci->name : sd);
--	g_free (dd);
--	return rv;
--}
--
--static void
--cleanup_xkb_tabs (GtkBuilder * dialog,
--		  GObject *where_the_object_wa)
--{
--	gkbd_desktop_config_term (&desktop_config);
--	gkbd_keyboard_config_term (&initial_config);
--	g_object_unref (G_OBJECT (config_registry));
--	config_registry = NULL;
--	/* Don't unref it here, or we'll crash if open the panel again */
--	engine = NULL;
--	g_object_unref (G_OBJECT (xkb_keyboard_settings));
--	g_object_unref (G_OBJECT (xkb_desktop_settings));
--	xkb_keyboard_settings = NULL;
--	xkb_desktop_settings = NULL;
--}
--
--static void
--reset_to_defaults (GtkWidget * button, GtkBuilder * dialog)
--{
--	GkbdKeyboardConfig empty_kbd_config;
--
--	gkbd_keyboard_config_init (&empty_kbd_config, engine);
--	gkbd_keyboard_config_save (&empty_kbd_config);
--	gkbd_keyboard_config_term (&empty_kbd_config);
--
--	g_settings_reset (xkb_desktop_settings,
--			  GKBD_DESKTOP_CONFIG_KEY_DEFAULT_GROUP);
--
--	/* all the rest is g-s-d's business */
--}
--
--static void
--chk_new_windows_inherit_layout_toggled (GtkWidget *
--					chk_new_windows_inherit_layout,
--					GtkBuilder * dialog)
--{
--	xkb_save_default_group (gtk_toggle_button_get_active
--				(GTK_TOGGLE_BUTTON
--				 (chk_new_windows_inherit_layout)) ? -1 :
--				0);
--}
--
--void
--setup_xkb_tabs (GtkBuilder * dialog)
--{
--	GtkWidget *widget;
--	GtkStyleContext *context;
--	GtkWidget *chk_new_windows_inherit_layout;
--
--	chk_new_windows_inherit_layout = WID ("chk_new_windows_inherit_layout");
--
--	xkb_desktop_settings = g_settings_new (GKBD_DESKTOP_SCHEMA);
--	xkb_keyboard_settings = g_settings_new (GKBD_KEYBOARD_SCHEMA);
--
--	engine =
--	    xkl_engine_get_instance (GDK_DISPLAY_XDISPLAY
--				     (gdk_display_get_default ()));
--	config_registry = xkl_config_registry_get_instance (engine);
--
--	gkbd_desktop_config_init (&desktop_config, engine);
--	gkbd_desktop_config_load (&desktop_config);
--
--	xkl_config_registry_load (config_registry,
--				  desktop_config.load_extra_items);
--
--	gkbd_keyboard_config_init (&initial_config, engine);
--	gkbd_keyboard_config_load_from_x_initial (&initial_config, NULL);
--
--	/* Set initial state */
--	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("chk_separate_group_per_window")),
--				      g_settings_get_boolean (xkb_desktop_settings,
--							      GKBD_DESKTOP_CONFIG_KEY_GROUP_PER_WINDOW));
--	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (chk_new_windows_inherit_layout),
--				      xkb_get_default_group () < 0);
--
--	g_settings_bind (xkb_desktop_settings,
--			 GKBD_DESKTOP_CONFIG_KEY_GROUP_PER_WINDOW,
--			 WID ("chk_separate_group_per_window"), "active",
--			 G_SETTINGS_BIND_DEFAULT);
--	g_settings_bind (xkb_desktop_settings,
--			 GKBD_DESKTOP_CONFIG_KEY_GROUP_PER_WINDOW,
--			 WID ("chk_new_windows_inherit_layout"), "sensitive",
--			 G_SETTINGS_BIND_DEFAULT);
--	g_settings_bind (xkb_desktop_settings,
--			 GKBD_DESKTOP_CONFIG_KEY_GROUP_PER_WINDOW,
--			 WID ("chk_new_windows_default_layout"), "sensitive",
--			 G_SETTINGS_BIND_DEFAULT);
--
--	xkb_layouts_prepare_selected_tree (dialog);
--	xkb_layouts_fill_selected_tree (dialog);
--
--	xkb_layouts_register_buttons_handlers (dialog);
--	g_signal_connect (G_OBJECT (WID ("xkb_reset_to_defaults")),
--			  "clicked", G_CALLBACK (reset_to_defaults),
--			  dialog);
--
--	g_signal_connect (G_OBJECT (chk_new_windows_inherit_layout),
--			  "toggled",
--			  G_CALLBACK
--			  (chk_new_windows_inherit_layout_toggled),
--			  dialog);
--
--	g_signal_connect_swapped (G_OBJECT (WID ("xkb_layout_options")),
--				  "clicked",
--				  G_CALLBACK (xkb_options_popup_dialog),
--				  dialog);
--
--	xkb_layouts_register_conf_listener (dialog);
--	xkb_options_register_conf_listener (dialog);
--
--	g_object_weak_ref (G_OBJECT (WID ("region_notebook")),
--			   (GWeakNotify) cleanup_xkb_tabs, dialog);
--
--	enable_disable_restoring (dialog);
--
--	/* Setup junction between toolbar and treeview */
--	widget = WID ("xkb_layouts_swindow");
--	context = gtk_widget_get_style_context (widget);
--	gtk_style_context_set_junction_sides (context, GTK_JUNCTION_BOTTOM);
--	widget = WID ("layouts-toolbar");
--	context = gtk_widget_get_style_context (widget);
--	gtk_style_context_set_junction_sides (context, GTK_JUNCTION_TOP);
--}
--
--void
--enable_disable_restoring (GtkBuilder * dialog)
--{
--	GkbdKeyboardConfig gswic;
--	gboolean enable;
--
--	gkbd_keyboard_config_init (&gswic, engine);
--	gkbd_keyboard_config_load (&gswic, NULL);
--
--	enable = !gkbd_keyboard_config_equals (&gswic, &initial_config);
--
--	gkbd_keyboard_config_term (&gswic);
--	gtk_widget_set_sensitive (WID ("xkb_reset_to_defaults"), enable);
--}
-diff -uNrp a/panels/region/cinnamon-region-panel-xkb.h b/panels/region/cinnamon-region-panel-xkb.h
---- a/panels/region/cinnamon-region-panel-xkb.h	2013-08-25 14:40:14.000000000 +0100
-+++ b/panels/region/cinnamon-region-panel-xkb.h	1970-01-01 01:00:00.000000000 +0100
-@@ -1,96 +0,0 @@
--/* cinnamon-region-panel-xkb.h
-- * Copyright (C) 2003-2007 Sergey V Udaltsov
-- *
-- * Written by Sergey V. Udaltsov <svu@gnome.org>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; either version 2, or (at your option)
-- * any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 51 Franklin Street - Suite 500, Boston, MA
-- * 02110-1335, USA.
-- */
--
--#ifndef __GNOME_KEYBOARD_PROPERTY_XKB_H
--#define __GNOME_KEYBOARD_PROPERTY_XKB_H
--
--#include <gtk/gtk.h>
--
--#include "libgnomekbd/gkbd-keyboard-config.h"
--#include "libgnomekbd/gkbd-util.h"
--
--G_BEGIN_DECLS
--#define CWID(s) GTK_WIDGET (gtk_builder_get_object (chooser_dialog, s))
--#define WID(s) GTK_WIDGET (gtk_builder_get_object (dialog, s))
--extern XklEngine *engine;
--extern XklConfigRegistry *config_registry;
--extern GSettings *xkb_keyboard_settings;
--extern GSettings *xkb_desktop_settings;
--extern GkbdKeyboardConfig initial_config;
--
--extern void setup_xkb_tabs (GtkBuilder * dialog);
--
--extern void xkb_layouts_fill_selected_tree (GtkBuilder * dialog);
--
--extern void xkb_layouts_register_buttons_handlers (GtkBuilder * dialog);
--
--extern void xkb_layouts_register_conf_listener (GtkBuilder * dialog);
--
--extern void xkb_options_register_conf_listener (GtkBuilder * dialog);
--
--extern void xkb_layouts_prepare_selected_tree (GtkBuilder * dialog);
--
--extern void xkb_options_load_options (GtkBuilder * dialog);
--
--extern void xkb_options_popup_dialog (GtkBuilder * dialog);
--
--extern char *xci_desc_to_utf8 (const XklConfigItem * ci);
--
--extern gchar *xkb_layout_description_utf8 (const gchar * visible);
--
--extern void enable_disable_restoring (GtkBuilder * dialog);
--
--extern void preview_toggled (GtkBuilder * dialog, GtkWidget * button);
--
--extern GtkWidget *xkb_layout_choose (GtkBuilder * dialog);
--
--extern void xkb_layout_chooser_response (GtkDialog *dialog, gint response_id);
--
--extern gchar **xkb_layouts_get_selected_list (void);
--
--extern gchar **xkb_options_get_selected_list (void);
--
--#define xkb_layouts_set_selected_list(list) \
--        g_settings_set_strv (xkb_keyboard_settings, \
--                               GKBD_KEYBOARD_CONFIG_KEY_LAYOUTS, \
--                               (const gchar *const*)(list))
--
--#define xkb_options_set_selected_list(list) \
--        g_settings_set_strv (xkb_keyboard_settings, \
--                               GKBD_KEYBOARD_CONFIG_KEY_OPTIONS, \
--                               (const gchar *const*)(list))
--
--extern GtkWidget *xkb_layout_preview_create_widget (GtkBuilder *
--						    chooser_dialog);
--
--extern void xkb_layout_preview_update (GtkBuilder * chooser_dialog);
--
--extern void xkb_layout_preview_set_drawing_layout (GtkWidget * kbdraw,
--						   const gchar * id);
--
--extern gchar *xkb_layout_chooser_get_selected_id (GtkDialog *dialog);
--
--extern void xkb_save_default_group (gint group_no);
--
--extern gint xkb_get_default_group (void);
--
--G_END_DECLS
--#endif				/* __GNOME_KEYBOARD_PROPERTY_XKB_H */
-diff -uNrp a/panels/region/cinnamon-region-panel-xkbltadd.c b/panels/region/cinnamon-region-panel-xkbltadd.c
---- a/panels/region/cinnamon-region-panel-xkbltadd.c	2013-08-25 14:40:14.000000000 +0100
-+++ b/panels/region/cinnamon-region-panel-xkbltadd.c	1970-01-01 01:00:00.000000000 +0100
-@@ -1,495 +0,0 @@
--/* cinnamon-region-panel-xkbltadd.c
-- * Copyright (C) 2007 Sergey V. Udaltsov
-- *
-- * Written by: Sergey V. Udaltsov <svu@gnome.org>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; either version 2, or (at your option)
-- * any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 51 Franklin Street - Suite 500, Boston, MA
-- * 02110-1335, USA.
-- */
--
--#ifdef HAVE_CONFIG_H
--#  include <config.h>
--#endif
--
--#include <string.h>
--
--#include <libgnomekbd/gkbd-keyboard-drawing.h>
--#include <libgnomekbd/gkbd-util.h>
--
--#include "cinnamon-region-panel-xkb.h"
--
--enum {
--	COMBO_BOX_MODEL_COL_SORT,
--	COMBO_BOX_MODEL_COL_VISIBLE,
--	COMBO_BOX_MODEL_COL_XKB_ID,
--	COMBO_BOX_MODEL_COL_COUNTRY_DESC,
--	COMBO_BOX_MODEL_COL_LANGUAGE_DESC
--};
--
--static gchar **search_pattern_list = NULL;
--
--static GtkWidget *preview_dialog = NULL;
--
--static GRegex *left_bracket_regex = NULL;
--
--#define RESPONSE_PREVIEW 1
--
--static void
--xkb_preview_destroy_callback (GtkWidget * widget)
--{
--	preview_dialog = NULL;
--}
--
--static gboolean
--xkb_layout_chooser_selection_dupe (GtkDialog * dialog)
--{
--	gchar *selected_id =
--	    (gchar *) xkb_layout_chooser_get_selected_id (dialog);
--	gchar **layouts_list, **pl;
--	gboolean rv = FALSE;
--	if (selected_id == NULL)
--		return rv;
--	layouts_list = pl = xkb_layouts_get_selected_list ();
--	while (pl && *pl) {
--		if (!g_ascii_strcasecmp (*pl++, selected_id)) {
--			rv = TRUE;
--			break;
--		}
--	}
--	g_strfreev (layouts_list);
--	return rv;
--}
--
--void
--xkb_layout_chooser_response (GtkDialog * dialog, gint response)
--{
--	switch (response)
--	case GTK_RESPONSE_OK:{
--			/* Handled by the main code */
--			break;
--	case RESPONSE_PREVIEW:{
--				gchar *selected_id = (gchar *)
--				    xkb_layout_chooser_get_selected_id
--				    (dialog);
--
--				if (selected_id != NULL) {
--					if (preview_dialog == NULL) {
--						preview_dialog =
--						    gkbd_keyboard_drawing_dialog_new
--						    ();
--						g_signal_connect (G_OBJECT
--								  (preview_dialog),
--								  "destroy",
--								  G_CALLBACK
--								  (xkb_preview_destroy_callback),
--								  NULL);
--						/* Put into the separate group to avoid conflict
--						   with modal parent */
--						gtk_window_group_add_window
--						    (gtk_window_group_new
--						     (),
--						     GTK_WINDOW
--						     (preview_dialog));
--					};
--					gkbd_keyboard_drawing_dialog_set_layout
--					    (preview_dialog,
--					     config_registry, selected_id);
--
--					gtk_widget_show_all
--					    (preview_dialog);
--				}
--			}
--
--			return;
--		}
--	if (preview_dialog != NULL) {
--		gtk_widget_destroy (preview_dialog);
--	}
--	if (search_pattern_list != NULL) {
--		g_strfreev (search_pattern_list);
--		search_pattern_list = NULL;
--	}
--	gtk_widget_destroy (GTK_WIDGET (dialog));
--}
--
--static gchar *
--xkl_create_description_from_list (const XklConfigItem * item,
--				  const XklConfigItem * subitem,
--				  const gchar * prop_name,
--				  const gchar *
--				  (*desc_getter) (const gchar * code))
--{
--	gchar *rv = NULL, *code = NULL;
--	gchar **list = NULL;
--	const gchar *desc;
--
--	if (subitem != NULL)
--		list =
--		    (gchar
--		     **) (g_object_get_data (G_OBJECT (subitem),
--					     prop_name));
--	if (list == NULL || *list == 0)
--		list =
--		    (gchar
--		     **) (g_object_get_data (G_OBJECT (item), prop_name));
--
--	/* First try the parent id as such */
--	desc = desc_getter (item->name);
--	if (desc != NULL) {
--		rv = g_utf8_strup (desc, -1);
--	} else {
--		code = g_utf8_strup (item->name, -1);
--		desc = desc_getter (code);
--		if (desc != NULL) {
--			rv = g_utf8_strup (desc, -1);
--		}
--		g_free (code);
--	}
--
--	if (list == NULL || *list == 0)
--		return rv;
--
--	while (*list != 0) {
--		code = *list++;
--		desc = desc_getter (code);
--		if (desc != NULL) {
--			gchar *udesc = g_utf8_strup (desc, -1);
--			if (rv == NULL) {
--				rv = udesc;
--			} else {
--				gchar *orv = rv;
--				rv = g_strdup_printf ("%s %s", rv, udesc);
--				g_free (orv);
--				g_free (udesc);
--			}
--		}
--	}
--	return rv;
--}
--
--static void
--xkl_layout_add_to_list (XklConfigRegistry * config,
--			const XklConfigItem * item,
--			const XklConfigItem * subitem,
--			GtkBuilder * chooser_dialog)
--{
--	GtkListStore *list_store =
--	    GTK_LIST_STORE (gtk_builder_get_object (chooser_dialog,
--						    "layout_list_model"));
--	GtkTreeIter iter;
--
--	gchar *utf_variant_name =
--	    subitem ?
--	    xkb_layout_description_utf8 (gkbd_keyboard_config_merge_items
--					 (item->name,
--					  subitem->name)) :
--	    xci_desc_to_utf8 (item);
--
--	const gchar *xkb_id =
--	    subitem ? gkbd_keyboard_config_merge_items (item->name,
--							subitem->name) :
--	    item->name;
--
--	gchar *country_desc =
--	    xkl_create_description_from_list (item, subitem,
--					      XCI_PROP_COUNTRY_LIST,
--					      xkl_get_country_name);
--	gchar *language_desc =
--	    xkl_create_description_from_list (item, subitem,
--					      XCI_PROP_LANGUAGE_LIST,
--					      xkl_get_language_name);
--
--	gchar *tmp = utf_variant_name;
--	utf_variant_name =
--	    g_regex_replace_literal (left_bracket_regex, tmp, -1, 0,
--				     "&lt;", 0, NULL);
--	g_free (tmp);
--
--	if (subitem
--	    && g_object_get_data (G_OBJECT (subitem),
--				  XCI_PROP_EXTRA_ITEM)) {
--		gchar *buf =
--		    g_strdup_printf ("<i>%s</i>", utf_variant_name);
--		gtk_list_store_insert_with_values (list_store, &iter, -1,
--						   COMBO_BOX_MODEL_COL_SORT,
--						   utf_variant_name,
--						   COMBO_BOX_MODEL_COL_VISIBLE,
--						   buf,
--						   COMBO_BOX_MODEL_COL_XKB_ID,
--						   xkb_id,
--						   COMBO_BOX_MODEL_COL_COUNTRY_DESC,
--						   country_desc,
--						   COMBO_BOX_MODEL_COL_LANGUAGE_DESC,
--						   language_desc, -1);
--		g_free (buf);
--	} else
--		gtk_list_store_insert_with_values (list_store, &iter,
--						   -1,
--						   COMBO_BOX_MODEL_COL_SORT,
--						   utf_variant_name,
--						   COMBO_BOX_MODEL_COL_VISIBLE,
--						   utf_variant_name,
--						   COMBO_BOX_MODEL_COL_XKB_ID,
--						   xkb_id,
--						   COMBO_BOX_MODEL_COL_COUNTRY_DESC,
--						   country_desc,
--						   COMBO_BOX_MODEL_COL_LANGUAGE_DESC,
--						   language_desc, -1);
--	g_free (utf_variant_name);
--	g_free (country_desc);
--	g_free (language_desc);
--}
--
--static void
--xkb_layout_filter_clear (GtkEntry * entry,
--			 GtkEntryIconPosition icon_pos,
--			 GdkEvent * event, gpointer user_data)
--{
--	gtk_entry_set_text (entry, "");
--}
--
--static void
--xkb_layout_filter_changed (GtkBuilder * chooser_dialog)
--{
--	GtkTreeModelFilter *filtered_model =
--	    GTK_TREE_MODEL_FILTER (gtk_builder_get_object (chooser_dialog,
--							   "filtered_layout_list_model"));
--	GtkWidget *xkb_layout_filter = CWID ("xkb_layout_filter");
--	const gchar *pattern =
--	    gtk_entry_get_text (GTK_ENTRY (xkb_layout_filter));
--	gchar *upattern = g_utf8_strup (pattern, -1);
--
--	if (!g_strcmp0 (pattern, "")) {
--		g_object_set (G_OBJECT (xkb_layout_filter),
--			      "secondary-icon-name", "edit-find-symbolic",
--			      "secondary-icon-activatable", FALSE,
--			      "secondary-icon-sensitive", FALSE, NULL);
--	} else {
--		g_object_set (G_OBJECT (xkb_layout_filter),
--			      "secondary-icon-name", "edit-clear-symbolic",
--			      "secondary-icon-activatable", TRUE,
--			      "secondary-icon-sensitive", TRUE, NULL);
--	}
--
--	if (search_pattern_list != NULL)
--		g_strfreev (search_pattern_list);
--
--	search_pattern_list = g_strsplit (upattern, " ", -1);
--	g_free (upattern);
--
--	gtk_tree_model_filter_refilter (filtered_model);
--}
--
--static void
--xkb_layout_chooser_selection_changed (GtkTreeSelection * selection,
--				      GtkBuilder * chooser_dialog)
--{
--	GList *selected_layouts =
--	    gtk_tree_selection_get_selected_rows (selection, NULL);
--	GtkWidget *add_button = CWID ("btnOk");
--	GtkWidget *preview_button = CWID ("btnPreview");
--	gboolean anything_selected = g_list_length (selected_layouts) == 1;
--	gboolean dupe =
--	    xkb_layout_chooser_selection_dupe (GTK_DIALOG
--					       (CWID
--						("xkb_layout_chooser")));
--
--	gtk_widget_set_sensitive (add_button, anything_selected && !dupe);
--	gtk_widget_set_sensitive (preview_button, anything_selected);
--}
--
--static void
--xkb_layout_chooser_row_activated (GtkTreeView * tree_view,
--				  GtkTreePath * path,
--				  GtkTreeViewColumn * column,
--				  GtkBuilder * chooser_dialog)
--{
--	GtkWidget *add_button = CWID ("btnOk");
--	GtkWidget *dialog = CWID ("xkb_layout_chooser");
--
--	if (gtk_widget_is_sensitive (add_button))
--		gtk_dialog_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
--}
--
--static gboolean
--xkb_filter_layouts (GtkTreeModel * model,
--		    GtkTreeIter * iter, gpointer data)
--{
--	gchar *desc = NULL, *country_desc = NULL, *language_desc =
--	    NULL, **pattern;
--	gboolean rv = TRUE;
--
--	if (search_pattern_list == NULL || search_pattern_list[0] == NULL)
--		return TRUE;
--
--	gtk_tree_model_get (model, iter,
--			    COMBO_BOX_MODEL_COL_SORT, &desc,
--			    COMBO_BOX_MODEL_COL_COUNTRY_DESC,
--			    &country_desc,
--			    COMBO_BOX_MODEL_COL_LANGUAGE_DESC,
--			    &language_desc, -1);
--
--	pattern = search_pattern_list;
--	do {
--		gboolean is_pattern_found = FALSE;
--		gchar *udesc = g_utf8_strup (desc, -1);
--		if (udesc != NULL && g_strstr_len (udesc, -1, *pattern)) {
--			is_pattern_found = TRUE;
--		} else if (country_desc != NULL
--			   && g_strstr_len (country_desc, -1, *pattern)) {
--			is_pattern_found = TRUE;
--		} else if (language_desc != NULL
--			   && g_strstr_len (language_desc, -1, *pattern)) {
--			is_pattern_found = TRUE;
--		}
--		g_free (udesc);
--
--		if (!is_pattern_found) {
--			rv = FALSE;
--			break;
--		}
--
--	} while (*++pattern != NULL);
--
--	g_free (desc);
--	g_free (country_desc);
--	g_free (language_desc);
--	return rv;
--}
--
--GtkWidget *
--xkb_layout_choose (GtkBuilder * dialog)
--{
--	GtkBuilder *chooser_dialog = gtk_builder_new ();
--	GtkWidget *chooser, *xkb_filtered_layouts_list, *xkb_layout_filter;
--	GtkTreeViewColumn *visible_column;
--	GtkTreeSelection *selection;
--	GtkListStore *model;
--	GtkTreeModelFilter *filtered_model;
--    gtk_builder_set_translation_domain (chooser_dialog, GETTEXT_PACKAGE);
--	gtk_builder_add_from_file (chooser_dialog, CINNAMONCC_UI_DIR
--				   "/cinnamon-region-panel-layout-chooser.ui",
--				   NULL);
--	chooser = CWID ("xkb_layout_chooser");
--	xkb_filtered_layouts_list = CWID ("xkb_filtered_layouts_list");
--	xkb_layout_filter = CWID ("xkb_layout_filter");
--
--	g_object_set_data (G_OBJECT (chooser), "xkb_filtered_layouts_list",
--			   xkb_filtered_layouts_list);
--	visible_column =
--	    gtk_tree_view_column_new_with_attributes ("Layout",
--						      gtk_cell_renderer_text_new
--						      (), "markup",
--						      COMBO_BOX_MODEL_COL_VISIBLE,
--						      NULL);
--
--	gtk_window_set_transient_for (GTK_WINDOW (chooser),
--				      GTK_WINDOW
--				      (gtk_widget_get_toplevel
--				       (WID ("region_notebook"))));
--
--	gtk_tree_view_append_column (GTK_TREE_VIEW
--				     (xkb_filtered_layouts_list),
--				     visible_column);
--	g_signal_connect_swapped (G_OBJECT (xkb_layout_filter),
--				  "notify::text",
--				  G_CALLBACK
--				  (xkb_layout_filter_changed),
--				  chooser_dialog);
--
--	g_signal_connect (G_OBJECT (xkb_layout_filter), "icon-release",
--			  G_CALLBACK (xkb_layout_filter_clear), NULL);
--
--	selection =
--	    gtk_tree_view_get_selection (GTK_TREE_VIEW
--					 (xkb_filtered_layouts_list));
--
--	g_signal_connect (G_OBJECT (selection),
--			  "changed",
--			  G_CALLBACK
--			  (xkb_layout_chooser_selection_changed),
--			  chooser_dialog);
--
--	xkb_layout_chooser_selection_changed (selection, chooser_dialog);
--
--	g_signal_connect (G_OBJECT (xkb_filtered_layouts_list),
--			  "row-activated",
--			  G_CALLBACK (xkb_layout_chooser_row_activated),
--			  chooser_dialog);
--
--	filtered_model =
--	    GTK_TREE_MODEL_FILTER (gtk_builder_get_object
--				   (chooser_dialog,
--				    "filtered_layout_list_model"));
--	model =
--	    GTK_LIST_STORE (gtk_builder_get_object
--			    (chooser_dialog, "layout_list_model"));
--
--	left_bracket_regex = g_regex_new ("<", 0, 0, NULL);
--
--	xkl_config_registry_search_by_pattern (config_registry,
--					       NULL,
--					       (TwoConfigItemsProcessFunc)
--					       (xkl_layout_add_to_list),
--					       chooser_dialog);
--
--	g_regex_unref (left_bracket_regex);
--
--	gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (model),
--					      COMBO_BOX_MODEL_COL_SORT,
--					      GTK_SORT_ASCENDING);
--
--	gtk_tree_model_filter_set_visible_func (filtered_model,
--						xkb_filter_layouts,
--						NULL, NULL);
--
--	gtk_widget_grab_focus (xkb_layout_filter);
--
--	gtk_widget_show (chooser);
--
--	return chooser;
--}
--
--gchar *
--xkb_layout_chooser_get_selected_id (GtkDialog * dialog)
--{
--	GtkTreeModel *filtered_list_model;
--	GtkWidget *xkb_filtered_layouts_list =
--	    g_object_get_data (G_OBJECT (dialog),
--			       "xkb_filtered_layouts_list");
--	GtkTreeIter viter;
--	gchar *v_id;
--	GtkTreeSelection *selection =
--	    gtk_tree_view_get_selection (GTK_TREE_VIEW
--					 (xkb_filtered_layouts_list));
--	GList *selected_layouts =
--	    gtk_tree_selection_get_selected_rows (selection,
--						  &filtered_list_model);
--
--	if (g_list_length (selected_layouts) != 1)
--		return NULL;
--
--	gtk_tree_model_get_iter (filtered_list_model,
--				 &viter,
--				 (GtkTreePath *) (selected_layouts->data));
--	g_list_foreach (selected_layouts,
--			(GFunc) gtk_tree_path_free, NULL);
--	g_list_free (selected_layouts);
--
--	gtk_tree_model_get (filtered_list_model, &viter,
--			    COMBO_BOX_MODEL_COL_XKB_ID, &v_id, -1);
--
--	return v_id;
--}
-diff -uNrp a/panels/region/cinnamon-region-panel-xkblt.c b/panels/region/cinnamon-region-panel-xkblt.c
---- a/panels/region/cinnamon-region-panel-xkblt.c	2013-08-25 14:40:14.000000000 +0100
-+++ b/panels/region/cinnamon-region-panel-xkblt.c	1970-01-01 01:00:00.000000000 +0100
-@@ -1,470 +0,0 @@
--/* cinnamon-region-panel-xkblt.c
-- * Copyright (C) 2003-2007 Sergey V. Udaltsov
-- *
-- * Written by: Sergey V. Udaltsov <svu@gnome.org>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; either version 2, or (at your option)
-- * any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 51 Franklin Street - Suite 500, Boston, MA
-- * 02110-1335, USA.
-- */
--
--#ifdef HAVE_CONFIG_H
--#  include <config.h>
--#endif
--
--#include <gdk/gdkx.h>
--#include <glib/gi18n-lib.h>
--
--#include <libgnomekbd/gkbd-desktop-config.h>
--#include <libgnomekbd/gkbd-keyboard-drawing.h>
--
--#include "cinnamon-region-panel-xkb.h"
--
--enum {
--	SEL_LAYOUT_TREE_COL_DESCRIPTION,
--	SEL_LAYOUT_TREE_COL_ID,
--	SEL_LAYOUT_TREE_COL_ENABLED,
--	SEL_LAYOUT_N_COLS
--};
--
--static int idx2select = -1;
--static int max_selected_layouts = -1;
--
--static GtkCellRenderer *text_renderer;
--
--static gboolean disable_buttons_sensibility_update = FALSE;
--
--static gboolean
--get_selected_iter (GtkBuilder    *dialog,
--		   GtkTreeModel **model,
--		   GtkTreeIter   *iter)
--{
--	GtkTreeSelection *selection;
--
--	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (WID ("xkb_layouts_selected")));
--
--	return gtk_tree_selection_get_selected (selection, model, iter);
--}
--
--static void
--set_selected_path (GtkBuilder    *dialog,
--		   GtkTreePath   *path)
--{
--	GtkTreeSelection *selection;
--
--	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (WID ("xkb_layouts_selected")));
--
--	gtk_tree_selection_select_path (selection, path);
--}
--
--static gint
--find_selected_layout_idx (GtkBuilder *dialog)
--{
--	GtkTreeIter selected_iter;
--	GtkTreeModel *model;
--	GtkTreePath *path;
--	gint *indices;
--	gint rv;
--
--	if (!get_selected_iter (dialog, &model, &selected_iter))
--		return -1;
--
--	path = gtk_tree_model_get_path (model, &selected_iter);
--	if (path == NULL)
--		return -1;
--
--	indices = gtk_tree_path_get_indices (path);
--	rv = indices[0];
--	gtk_tree_path_free (path);
--	return rv;
--}
--
--gchar **
--xkb_layouts_get_selected_list (void)
--{
--	gchar **retval;
--
--	retval = g_settings_get_strv (xkb_keyboard_settings,
--				      GKBD_KEYBOARD_CONFIG_KEY_LAYOUTS);
--	if (retval == NULL || retval[0] == NULL) {
--		g_strfreev (retval);
--		retval = g_strdupv (initial_config.layouts_variants);
--	}
--
--	return retval;
--}
--
--gint
--xkb_get_default_group ()
--{
--	return g_settings_get_int (xkb_desktop_settings,
--				   GKBD_DESKTOP_CONFIG_KEY_DEFAULT_GROUP);
--}
--
--void
--xkb_save_default_group (gint default_group)
--{
--	g_settings_set_int (xkb_desktop_settings,
--			    GKBD_DESKTOP_CONFIG_KEY_DEFAULT_GROUP,
--			    default_group);
--}
--
--static void
--xkb_layouts_enable_disable_buttons (GtkBuilder * dialog)
--{
--	GtkWidget *add_layout_btn = WID ("xkb_layouts_add");
--	GtkWidget *show_layout_btn = WID ("xkb_layouts_show");
--	GtkWidget *del_layout_btn = WID ("xkb_layouts_remove");
--	GtkWidget *selected_layouts_tree = WID ("xkb_layouts_selected");
--	GtkWidget *move_up_layout_btn = WID ("xkb_layouts_move_up");
--	GtkWidget *move_down_layout_btn = WID ("xkb_layouts_move_down");
--
--	GtkTreeSelection *s_selection =
--	    gtk_tree_view_get_selection (GTK_TREE_VIEW
--					 (selected_layouts_tree));
--	const int n_selected_selected_layouts =
--	    gtk_tree_selection_count_selected_rows (s_selection);
--	GtkTreeModel *selected_layouts_model = gtk_tree_view_get_model
--	    (GTK_TREE_VIEW (selected_layouts_tree));
--	const int n_selected_layouts =
--	    gtk_tree_model_iter_n_children (selected_layouts_model,
--					    NULL);
--	gint sidx = find_selected_layout_idx (dialog);
--
--	if (disable_buttons_sensibility_update)
--		return;
--
--	gtk_widget_set_sensitive (add_layout_btn,
--				  (n_selected_layouts <
--				   max_selected_layouts
--				   || max_selected_layouts == 0));
--	gtk_widget_set_sensitive (del_layout_btn, (n_selected_layouts > 1)
--				  && (n_selected_selected_layouts > 0));
--	gtk_widget_set_sensitive (show_layout_btn,
--				  (n_selected_selected_layouts > 0));
--	gtk_widget_set_sensitive (move_up_layout_btn, sidx > 0);
--	gtk_widget_set_sensitive (move_down_layout_btn, sidx >= 0
--				  && sidx < (n_selected_layouts - 1));
--}
--
--static void
--update_layouts_list (GtkTreeModel *model,
--		     GtkBuilder   *dialog)
--{
--	gboolean cont;
--	GtkTreeIter iter;
--	GPtrArray *array;
--
--	array = g_ptr_array_new_with_free_func ((GDestroyNotify) g_free);
--	cont = gtk_tree_model_get_iter_first (model, &iter);
--	while (cont) {
--		char *id;
--
--		gtk_tree_model_get (model, &iter,
--				    SEL_LAYOUT_TREE_COL_ID, &id,
--				    -1);
--		g_ptr_array_add (array, id);
--		cont = gtk_tree_model_iter_next (model, &iter);
--	}
--	g_ptr_array_add (array, NULL);
--	xkb_layouts_set_selected_list (array->pdata);
--	g_ptr_array_free (array, TRUE);
--
--	xkb_layouts_enable_disable_buttons (dialog);
--}
--
--static void
--xkb_layouts_drag_end (GtkWidget	     *widget,
--		      GdkDragContext *drag_context,
--		      gpointer	      user_data)
--{
--	update_layouts_list (gtk_tree_view_get_model (GTK_TREE_VIEW (widget)),
--			     GTK_BUILDER (user_data));
--}
--
--void
--xkb_layouts_prepare_selected_tree (GtkBuilder * dialog)
--{
--	GtkListStore *list_store;
--	GtkWidget *tree_view = WID ("xkb_layouts_selected");
--	GtkTreeSelection *selection;
--	GtkTreeViewColumn *desc_column;
--
--	list_store = gtk_list_store_new (SEL_LAYOUT_N_COLS,
--					 G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN);
--
--	text_renderer = GTK_CELL_RENDERER (gtk_cell_renderer_text_new ());
--
--	desc_column =
--	    gtk_tree_view_column_new_with_attributes (_("Layout"),
--						      text_renderer,
--						      "text",
--						      SEL_LAYOUT_TREE_COL_DESCRIPTION,
--						      "sensitive",
--						      SEL_LAYOUT_TREE_COL_ENABLED,
--						      NULL);
--	selection =
--	    gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view));
--
--	gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view),
--				 GTK_TREE_MODEL (list_store));
--
--	gtk_tree_view_column_set_sizing (desc_column,
--					 GTK_TREE_VIEW_COLUMN_AUTOSIZE);
--	gtk_tree_view_column_set_resizable (desc_column, TRUE);
--	gtk_tree_view_column_set_expand (desc_column, TRUE);
--
--	gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view),
--				     desc_column);
--
--	g_signal_connect_swapped (G_OBJECT (selection), "changed",
--				  G_CALLBACK
--				  (xkb_layouts_enable_disable_buttons),
--				  dialog);
--	max_selected_layouts = xkl_engine_get_max_num_groups (engine);
--
--	/* Setting up DnD */
--	gtk_tree_view_set_reorderable (GTK_TREE_VIEW (tree_view), TRUE);
--	g_signal_connect (G_OBJECT (tree_view), "drag-end",
--			  G_CALLBACK (xkb_layouts_drag_end), dialog);
--}
--
--gchar *
--xkb_layout_description_utf8 (const gchar * visible)
--{
--	char *l, *sl, *v, *sv;
--	if (gkbd_keyboard_config_get_descriptions
--	    (config_registry, visible, &sl, &l, &sv, &v))
--		visible =
--		    gkbd_keyboard_config_format_full_description (l, v);
--	return g_strstrip (g_strdup (visible));
--}
--
--void
--xkb_layouts_fill_selected_tree (GtkBuilder * dialog)
--{
--	gchar **layouts = xkb_layouts_get_selected_list ();
--	guint i;
--	GtkListStore *list_store =
--	    GTK_LIST_STORE (gtk_tree_view_get_model
--			    (GTK_TREE_VIEW
--			     (WID ("xkb_layouts_selected"))));
--
--	/* temporarily disable the buttons' status update */
--	disable_buttons_sensibility_update = TRUE;
--
--	gtk_list_store_clear (list_store);
--
--	for (i = 0; layouts != NULL && layouts[i] != NULL; i++) {
--		char *cur_layout = layouts[i];
--		gchar *utf_visible =
--		    xkb_layout_description_utf8 (cur_layout);
--
--		gtk_list_store_insert_with_values (list_store, NULL, G_MAXINT,
--						   SEL_LAYOUT_TREE_COL_DESCRIPTION,
--						   utf_visible,
--						   SEL_LAYOUT_TREE_COL_ID,
--						   cur_layout,
--						   SEL_LAYOUT_TREE_COL_ENABLED,
--						   i < max_selected_layouts, -1);
--		g_free (utf_visible);
--	}
--
--	g_strfreev (layouts);
--
--	/* enable the buttons' status update */
--	disable_buttons_sensibility_update = FALSE;
--
--	if (idx2select != -1) {
--		GtkTreeSelection *selection =
--		    gtk_tree_view_get_selection ((GTK_TREE_VIEW
--						  (WID
--						   ("xkb_layouts_selected"))));
--		GtkTreePath *path =
--		    gtk_tree_path_new_from_indices (idx2select, -1);
--		gtk_tree_selection_select_path (selection, path);
--		gtk_tree_path_free (path);
--		idx2select = -1;
--	} else {
--		/* if there is nothing to select - just enable/disable the buttons,
--		   otherwise it would be done by the selection change */
--		xkb_layouts_enable_disable_buttons (dialog);
--	}
--}
--
--static void
--add_default_switcher_if_necessary ()
--{
--	gchar **layouts_list = xkb_layouts_get_selected_list();
--	gchar **options_list = xkb_options_get_selected_list ();
--	gboolean was_appended;
--
--	options_list =
--	    gkbd_keyboard_config_add_default_switch_option_if_necessary
--	    (layouts_list, options_list, &was_appended);
--	if (was_appended)
--		xkb_options_set_selected_list (options_list);
--	g_strfreev (options_list);
--}
--
--static void
--chooser_response (GtkDialog  *chooser,
--		  int         response_id,
--		  GtkBuilder *dialog)
--{
--	if (response_id == GTK_RESPONSE_OK) {
--		char *id, *name;
--		GtkListStore *list_store;
--
--		list_store = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (WID ("xkb_layouts_selected"))));
--		id = xkb_layout_chooser_get_selected_id (chooser);
--		name = xkb_layout_description_utf8 (id);
--		gtk_list_store_insert_with_values (list_store, NULL, G_MAXINT,
--						   SEL_LAYOUT_TREE_COL_DESCRIPTION, name,
--						   SEL_LAYOUT_TREE_COL_ID, id,
--						   SEL_LAYOUT_TREE_COL_ENABLED, TRUE,
--						   -1);
--		g_free (name);
--		add_default_switcher_if_necessary ();
--		update_layouts_list (GTK_TREE_MODEL (list_store), dialog);
--	}
--
--	xkb_layout_chooser_response (chooser, response_id);
--}
--
--static void
--add_selected_layout (GtkWidget * button, GtkBuilder * dialog)
--{
--	GtkWidget *chooser;
--
--	chooser = xkb_layout_choose (dialog);
--	g_signal_connect (G_OBJECT (chooser), "response",
--			  G_CALLBACK (chooser_response), dialog);
--}
--
--static void
--show_selected_layout (GtkWidget * button, GtkBuilder * dialog)
--{
--	gint idx = find_selected_layout_idx (dialog);
--
--	if (idx != -1) {
--		GtkWidget *parent = WID ("region_notebook");
--		GtkWidget *popup = gkbd_keyboard_drawing_dialog_new ();
--		gkbd_keyboard_drawing_dialog_set_group (popup,
--							config_registry,
--							idx);
--		gtk_window_set_transient_for (GTK_WINDOW (popup),
--					      GTK_WINDOW
--					      (gtk_widget_get_toplevel
--					       (parent)));
--		gtk_widget_show_all (popup);
--	}
--}
--
--static void
--remove_selected_layout (GtkWidget * button, GtkBuilder * dialog)
--{
--	GtkTreeModel *model;
--	GtkTreeIter iter;
--
--	if (get_selected_iter (dialog, &model, &iter) == FALSE)
--		return;
--
--	gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
--	update_layouts_list (model, dialog);
--}
--
--static void
--move_up_selected_layout (GtkWidget * button, GtkBuilder * dialog)
--{
--	GtkTreeModel *model;
--	GtkTreeIter iter, prev;
--	GtkTreePath *path;
--
--	if (get_selected_iter (dialog, &model, &iter) == FALSE)
--		return;
--
--	prev = iter;
--	if (!gtk_tree_model_iter_previous (model, &prev))
--		return;
--
--	path = gtk_tree_model_get_path (model, &prev);
--	
--	gtk_list_store_swap (GTK_LIST_STORE (model), &iter, &prev);
--
--	update_layouts_list (model, dialog);
--	
--	set_selected_path (dialog, path);
--
--	gtk_tree_path_free (path);	
--}
--
--static void
--move_down_selected_layout (GtkWidget * button, GtkBuilder * dialog)
--{
--	GtkTreeModel *model;
--	GtkTreeIter iter, next;
--	GtkTreePath *path;
--
--	if (get_selected_iter (dialog, &model, &iter) == FALSE)
--		return;
--
--	next = iter;
--	if (!gtk_tree_model_iter_next (model, &next))
--		return;
--
--	path = gtk_tree_model_get_path (model, &next);
--
--	gtk_list_store_swap (GTK_LIST_STORE (model), &iter, &next);
--
--	update_layouts_list (model, dialog);
--
--	set_selected_path (dialog, path);
--
--	gtk_tree_path_free (path);	
--}
--
--void
--xkb_layouts_register_buttons_handlers (GtkBuilder * dialog)
--{
--	g_signal_connect (G_OBJECT (WID ("xkb_layouts_add")), "clicked",
--			  G_CALLBACK (add_selected_layout), dialog);
--	g_signal_connect (G_OBJECT (WID ("xkb_layouts_show")), "clicked",
--			  G_CALLBACK (show_selected_layout), dialog);
--	g_signal_connect (G_OBJECT (WID ("xkb_layouts_remove")), "clicked",
--			  G_CALLBACK (remove_selected_layout), dialog);
--	g_signal_connect (G_OBJECT (WID ("xkb_layouts_move_up")),
--			  "clicked", G_CALLBACK (move_up_selected_layout),
--			  dialog);
--	g_signal_connect (G_OBJECT (WID ("xkb_layouts_move_down")),
--			  "clicked",
--			  G_CALLBACK (move_down_selected_layout), dialog);
--}
--
--static void
--xkb_layouts_update_list (GSettings * settings,
--			 gchar * key, GtkBuilder * dialog)
--{
--	if (strcmp (key, GKBD_KEYBOARD_CONFIG_KEY_LAYOUTS) == 0) {
--		xkb_layouts_fill_selected_tree (dialog);
--		enable_disable_restoring (dialog);
--	}
--}
--
--void
--xkb_layouts_register_conf_listener (GtkBuilder * dialog)
--{
--	g_signal_connect (xkb_keyboard_settings, "changed",
--			  G_CALLBACK (xkb_layouts_update_list), dialog);
--}
-diff -uNrp a/panels/region/cinnamon-region-panel-xkbot.c b/panels/region/cinnamon-region-panel-xkbot.c
---- a/panels/region/cinnamon-region-panel-xkbot.c	2013-08-25 14:40:14.000000000 +0100
-+++ b/panels/region/cinnamon-region-panel-xkbot.c	1970-01-01 01:00:00.000000000 +0100
-@@ -1,516 +0,0 @@
--/* cinnamon-region-panel-xkbot.c
-- * Copyright (C) 2003-2007 Sergey V. Udaltsov
-- *
-- * Written by: Sergey V. Udaltsov <svu@gnome.org>
-- *             John Spray <spray_john@users.sourceforge.net>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; either version 2, or (at your option)
-- * any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 51 Franklin Street - Suite 500, Boston, MA
-- * 02110-1335, USA.
-- */
--
--#ifdef HAVE_CONFIG_H
--#  include <config.h>
--#endif
--
--#include <glib/gi18n-lib.h>
--#include <string.h>
--
--#include "cinnamon-region-panel-xkb.h"
--
--static GtkBuilder *chooser_dialog = NULL;
--static const char *current1st_level_id = NULL;
--static GSList *option_checks_list = NULL;
--static GtkWidget *current_none_radio = NULL;
--static GtkWidget *current_expander = NULL;
--static gboolean current_multi_select = FALSE;
--static GSList *current_radio_group = NULL;
--
--#define OPTION_ID_PROP "optionID"
--#define SELCOUNTER_PROP "selectionCounter"
--#define GCONFSTATE_PROP "gconfState"
--#define EXPANDERS_PROP "expandersList"
--
--gchar **
--xkb_options_get_selected_list (void)
--{
--	gchar **retval;
--
--	retval =
--	    g_settings_get_strv (xkb_keyboard_settings,
--				 GKBD_KEYBOARD_CONFIG_KEY_OPTIONS);
--	if (retval == NULL) {
--		retval = g_strdupv (initial_config.options);
--	}
--
--	return retval;
--}
--
--/* Returns the selection counter of the expander (static current_expander) */
--static int
--xkb_options_expander_selcounter_get (void)
--{
--	return
--	    GPOINTER_TO_INT (g_object_get_data
--			     (G_OBJECT (current_expander),
--			      SELCOUNTER_PROP));
--}
--
--/* Increments the selection counter in the expander (static current_expander) 
--   using the value (can be 0)*/
--static void
--xkb_options_expander_selcounter_add (int value)
--{
--	g_object_set_data (G_OBJECT (current_expander), SELCOUNTER_PROP,
--			   GINT_TO_POINTER
--			   (xkb_options_expander_selcounter_get ()
--			    + value));
--}
--
--/* Resets the seletion counter in the expander (static current_expander) */
--static void
--xkb_options_expander_selcounter_reset (void)
--{
--	g_object_set_data (G_OBJECT (current_expander), SELCOUNTER_PROP,
--			   GINT_TO_POINTER (0));
--}
--
--/* Formats the expander (static current_expander), based on the selection counter */
--static void
--xkb_options_expander_highlight (void)
--{
--	char *utf_group_name =
--	    g_object_get_data (G_OBJECT (current_expander),
--			       "utfGroupName");
--	int counter = xkb_options_expander_selcounter_get ();
--	if (utf_group_name != NULL) {
--		gchar *titlemarkup =
--		    g_strconcat (counter >
--				 0 ? "<span weight=\"bold\">" : "<span>",
--				 utf_group_name, "</span>", NULL);
--		gtk_expander_set_label (GTK_EXPANDER (current_expander),
--					titlemarkup);
--		g_free (titlemarkup);
--	}
--}
--
--/* Add optionname from the backend's selection list if it's not
--   already in there. */
--static void
--xkb_options_select (gchar * optionname)
--{
--	gboolean already_selected = FALSE;
--	gchar **options_list;
--	guint i;
--
--	options_list = xkb_options_get_selected_list ();
--	for (i = 0; options_list != NULL && options_list[i] != NULL; i++) {
--		gchar *option = options_list[i];
--		if (!strcmp (option, optionname)) {
--			already_selected = TRUE;
--			break;
--		}
--	}
--
--	if (!already_selected) {
--		options_list =
--		    gkbd_strv_append (options_list, g_strdup (optionname));
--		xkb_options_set_selected_list (options_list);
--	}
--
--	g_strfreev (options_list);
--}
--
--/* Remove all occurences of optionname from the backend's selection list */
--static void
--xkb_options_deselect (gchar * optionname)
--{
--	gchar **options_list = xkb_options_get_selected_list ();
--	if (options_list != NULL) {
--		gchar **option = options_list;
--		while (*option != NULL) {
--			gchar *id = *option;
--			if (!strcmp (id, optionname)) {
--				gkbd_strv_behead (option);
--			} else
--				option++;
--		}
--		xkb_options_set_selected_list (options_list);
--	}
--	g_strfreev (options_list);
--}
--
--/* Return true if optionname describes a string already in the backend's
--   list of selected options */
--static gboolean
--xkb_options_is_selected (gchar * optionname)
--{
--	gboolean retval = FALSE;
--	gchar **options_list = xkb_options_get_selected_list ();
--	if (options_list != NULL) {
--		gchar **option = options_list;
--		while (*option != NULL) {
--			if (!strcmp (*option, optionname)) {
--				retval = TRUE;
--				break;
--			}
--			option++;
--		}
--	}
--	g_strfreev (options_list);
--	return retval;
--}
--
--/* Make sure selected options stay visible when navigating with the keyboard */
--static gboolean
--option_focused_cb (GtkWidget * widget, GdkEventFocus * event,
--		   gpointer data)
--{
--	GtkScrolledWindow *win = GTK_SCROLLED_WINDOW (data);
--	GtkAllocation alloc;
--	GtkAdjustment *adj;
--
--	gtk_widget_get_allocation (widget, &alloc);
--	adj = gtk_scrolled_window_get_vadjustment (win);
--	gtk_adjustment_clamp_page (adj, alloc.y, alloc.y + alloc.height);
--
--	return FALSE;
--}
--
--/* Update xkb backend to reflect the new UI state */
--static void
--option_toggled_cb (GtkWidget * checkbutton, gpointer data)
--{
--	gpointer optionID =
--	    g_object_get_data (G_OBJECT (checkbutton), OPTION_ID_PROP);
--	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbutton)))
--		xkb_options_select (optionID);
--	else
--		xkb_options_deselect (optionID);
--}
--
--/* Add a check_button or radio_button to control a particular option
--   This function makes particular use of the current... variables at
--   the top of this file. */
--static void
--xkb_options_add_option (XklConfigRegistry * config_registry,
--			XklConfigItem * config_item, GtkBuilder * dialog)
--{
--	GtkWidget *option_check;
--	gchar *utf_option_name = xci_desc_to_utf8 (config_item);
--	/* Copy this out because we'll load it into the widget with set_data */
--	gchar *full_option_name =
--	    g_strdup (gkbd_keyboard_config_merge_items
--		      (current1st_level_id, config_item->name));
--	gboolean initial_state;
--
--	if (current_multi_select)
--		option_check =
--		    gtk_check_button_new_with_label (utf_option_name);
--	else {
--		if (current_radio_group == NULL) {
--			/* The first radio in a group is to be "Default", meaning none of
--			   the below options are to be included in the selected list.
--			   This is a HIG-compliant alternative to allowing no
--			   selection in the group. */
--			option_check =
--			    gtk_radio_button_new_with_label
--			    (current_radio_group, _("Default"));
--			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON
--						      (option_check),
--						      TRUE);
--			/* Make option name underscore - 
--			   to enforce its first position in the list */
--			g_object_set_data_full (G_OBJECT (option_check),
--						"utfOptionName",
--						g_strdup (" "), g_free);
--			option_checks_list =
--			    g_slist_append (option_checks_list,
--					    option_check);
--			current_radio_group =
--			    gtk_radio_button_get_group (GTK_RADIO_BUTTON
--							(option_check));
--			current_none_radio = option_check;
--
--			g_signal_connect (option_check, "focus-in-event",
--					  G_CALLBACK (option_focused_cb),
--					  WID ("options_scroll"));
--		}
--		option_check =
--		    gtk_radio_button_new_with_label (current_radio_group,
--						     utf_option_name);
--		current_radio_group =
--		    gtk_radio_button_get_group (GTK_RADIO_BUTTON
--						(option_check));
--		g_object_set_data (G_OBJECT (option_check), "NoneRadio",
--				   current_none_radio);
--	}
--
--	initial_state = xkb_options_is_selected (full_option_name);
--
--	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (option_check),
--				      initial_state);
--
--	g_object_set_data_full (G_OBJECT (option_check), OPTION_ID_PROP,
--				full_option_name, g_free);
--	g_object_set_data_full (G_OBJECT (option_check), "utfOptionName",
--				utf_option_name, g_free);
--
--	g_signal_connect (option_check, "toggled",
--			  G_CALLBACK (option_toggled_cb), NULL);
--
--	option_checks_list =
--	    g_slist_append (option_checks_list, option_check);
--
--	g_signal_connect (option_check, "focus-in-event",
--			  G_CALLBACK (option_focused_cb),
--			  WID ("options_scroll"));
--
--	xkb_options_expander_selcounter_add (initial_state);
--	g_object_set_data (G_OBJECT (option_check), GCONFSTATE_PROP,
--			   GINT_TO_POINTER (initial_state));
--}
--
--static gint
--xkb_option_checks_compare (GtkWidget * chk1, GtkWidget * chk2)
--{
--	const gchar *t1 =
--	    g_object_get_data (G_OBJECT (chk1), "utfOptionName");
--	const gchar *t2 =
--	    g_object_get_data (G_OBJECT (chk2), "utfOptionName");
--	return g_utf8_collate (t1, t2);
--}
--
--/* Add a group of options: create title and layout widgets and then
--   add widgets for all the options in the group. */
--static void
--xkb_options_add_group (XklConfigRegistry * config_registry,
--		       XklConfigItem * config_item, GtkBuilder * dialog)
--{
--	GtkWidget *align, *vbox, *option_check;
--	gboolean allow_multiple_selection =
--	    GPOINTER_TO_INT (g_object_get_data (G_OBJECT (config_item),
--						XCI_PROP_ALLOW_MULTIPLE_SELECTION));
--
--	GSList *expanders_list =
--	    g_object_get_data (G_OBJECT (dialog), EXPANDERS_PROP);
--
--	gchar *utf_group_name = xci_desc_to_utf8 (config_item);
--	gchar *titlemarkup =
--	    g_strconcat ("<span>", utf_group_name, "</span>", NULL);
--
--	current_expander = gtk_expander_new (titlemarkup);
--	gtk_expander_set_use_markup (GTK_EXPANDER (current_expander),
--				     TRUE);
--	g_object_set_data_full (G_OBJECT (current_expander),
--				"utfGroupName", utf_group_name, g_free);
--	g_object_set_data_full (G_OBJECT (current_expander), "groupId",
--				g_strdup (config_item->name), g_free);
--
--	g_free (titlemarkup);
--	align = gtk_alignment_new (0, 0, 1, 1);
--	gtk_alignment_set_padding (GTK_ALIGNMENT (align), 6, 12, 12, 0);
--	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
--	gtk_box_set_homogeneous (GTK_BOX (vbox), TRUE);
--	gtk_container_add (GTK_CONTAINER (align), vbox);
--	gtk_container_add (GTK_CONTAINER (current_expander), align);
--
--	current_multi_select = (gboolean) allow_multiple_selection;
--	current_radio_group = NULL;
--	current1st_level_id = config_item->name;
--
--	option_checks_list = NULL;
--
--	xkl_config_registry_foreach_option (config_registry,
--					    config_item->name,
--					    (ConfigItemProcessFunc)
--					    xkb_options_add_option,
--					    dialog);
--	/* sort it */
--	option_checks_list =
--	    g_slist_sort (option_checks_list,
--			  (GCompareFunc) xkb_option_checks_compare);
--	while (option_checks_list) {
--		option_check = GTK_WIDGET (option_checks_list->data);
--		gtk_box_pack_start (GTK_BOX (vbox), option_check, TRUE,
--				    TRUE, 0);
--		option_checks_list = option_checks_list->next;
--	}
--	/* free it */
--	g_slist_free (option_checks_list);
--	option_checks_list = NULL;
--
--	xkb_options_expander_highlight ();
--
--	expanders_list = g_slist_append (expanders_list, current_expander);
--	g_object_set_data (G_OBJECT (dialog), EXPANDERS_PROP,
--			   expanders_list);
--
--	g_signal_connect (current_expander, "focus-in-event",
--			  G_CALLBACK (option_focused_cb),
--			  WID ("options_scroll"));
--}
--
--static gint
--xkb_options_expanders_compare (GtkWidget * expander1,
--			       GtkWidget * expander2)
--{
--	const gchar *t1 =
--	    g_object_get_data (G_OBJECT (expander1), "utfGroupName");
--	const gchar *t2 =
--	    g_object_get_data (G_OBJECT (expander2), "utfGroupName");
--	return g_utf8_collate (t1, t2);
--}
--
--/* Create widgets to represent the options made available by the backend */
--void
--xkb_options_load_options (GtkBuilder * dialog)
--{
--	GtkWidget *opts_vbox = WID ("options_vbox");
--	GtkWidget *dialog_vbox = WID ("dialog_vbox");
--	GtkWidget *options_scroll = WID ("options_scroll");
--	GtkWidget *expander;
--	GSList *expanders_list;
--
--	current1st_level_id = NULL;
--	current_none_radio = NULL;
--	current_multi_select = FALSE;
--	current_radio_group = NULL;
--
--	/* fill the list */
--	xkl_config_registry_foreach_option_group (config_registry,
--						  (ConfigItemProcessFunc)
--						  xkb_options_add_group,
--						  dialog);
--	/* sort it */
--	expanders_list =
--	    g_object_get_data (G_OBJECT (dialog), EXPANDERS_PROP);
--	expanders_list =
--	    g_slist_sort (expanders_list,
--			  (GCompareFunc) xkb_options_expanders_compare);
--	g_object_set_data (G_OBJECT (dialog), EXPANDERS_PROP,
--			   expanders_list);
--	while (expanders_list) {
--		expander = GTK_WIDGET (expanders_list->data);
--		gtk_box_pack_start (GTK_BOX (opts_vbox), expander, FALSE,
--				    FALSE, 0);
--		expanders_list = expanders_list->next;
--	}
--
--	/* Somewhere in gtk3 the top vbox in dialog is made non-expandable */
--	gtk_box_set_child_packing (GTK_BOX (dialog_vbox), options_scroll,
--				   TRUE, TRUE, 0, GTK_PACK_START);
--	gtk_widget_show_all (dialog_vbox);
--}
--
--static void
--chooser_response_cb (GtkDialog * dialog, gint response, gpointer data)
--{
--	switch (response) {
--	case GTK_RESPONSE_DELETE_EVENT:
--	case GTK_RESPONSE_CLOSE: {
--			/* just cleanup */
--			GSList *expanders_list =
--			    g_object_get_data (G_OBJECT (dialog),
--					       EXPANDERS_PROP);
--			g_object_set_data (G_OBJECT (dialog),
--					   EXPANDERS_PROP, NULL);
--			g_slist_free (expanders_list);
--
--			gtk_widget_destroy (GTK_WIDGET (dialog));
--			chooser_dialog = NULL;
--		}
--		break;
--	}
--}
--
--/* Create popup dialog */
--void
--xkb_options_popup_dialog (GtkBuilder * dialog)
--{
--	GtkWidget *chooser;
--
--	chooser_dialog = gtk_builder_new ();
--    gtk_builder_set_translation_domain (chooser_dialog, GETTEXT_PACKAGE);
--	gtk_builder_add_from_file (chooser_dialog, CINNAMONCC_UI_DIR
--				   "/cinnamon-region-panel-options-dialog.ui",
--				   NULL);
--
--	chooser = CWID ("xkb_options_dialog");
--	gtk_window_set_transient_for (GTK_WINDOW (chooser),
--				      GTK_WINDOW (gtk_widget_get_toplevel (WID ("region_notebook"))));
--	gtk_window_set_modal (GTK_WINDOW (chooser), TRUE);
--	xkb_options_load_options (chooser_dialog);
--
--	g_signal_connect (chooser, "response",
--			  G_CALLBACK (chooser_response_cb), dialog);
--	gtk_widget_show (chooser);
--}
--
--/* Update selected option counters for a group-bound expander */
--static void
--xkb_options_update_option_counters (XklConfigRegistry * config_registry,
--				    XklConfigItem * config_item)
--{
--	gchar *full_option_name =
--	    g_strdup (gkbd_keyboard_config_merge_items
--		      (current1st_level_id, config_item->name));
--	gboolean current_state =
--	    xkb_options_is_selected (full_option_name);
--        g_free (full_option_name);
--
--	xkb_options_expander_selcounter_add (current_state);
--}
--
--/* Respond to a change in the xkb gconf settings */
--static void
--xkb_options_update (GSettings * settings, gchar * key, GtkBuilder * dialog)
--{
--	if (!strcmp (key, GKBD_KEYBOARD_CONFIG_KEY_OPTIONS)) {
--		/* Updating options is handled by gconf notifies for each widget
--		   This is here to avoid calling it N_OPTIONS times for each gconf
--		   change. */
--		enable_disable_restoring (dialog);
--
--		if (chooser_dialog != NULL) {
--			GSList *expanders_list =
--			    g_object_get_data (G_OBJECT (chooser_dialog),
--					       EXPANDERS_PROP);
--			while (expanders_list) {
--				current_expander =
--				    GTK_WIDGET (expanders_list->data);
--				gchar *group_id =
--				    g_object_get_data (G_OBJECT
--						       (current_expander),
--						       "groupId");
--				current1st_level_id = group_id;
--				xkb_options_expander_selcounter_reset ();
--				xkl_config_registry_foreach_option
--				    (config_registry, group_id,
--				     (ConfigItemProcessFunc)
--				     xkb_options_update_option_counters,
--				     current_expander);
--				xkb_options_expander_highlight ();
--				expanders_list = expanders_list->next;
--			}
--		}
--	}
--}
--
--void
--xkb_options_register_conf_listener (GtkBuilder * dialog)
--{
--	g_signal_connect (xkb_keyboard_settings, "changed",
--			  G_CALLBACK (xkb_options_update), dialog);
--}
-diff -uNrp a/panels/region/cinnamon-region-panel-xkbpv.c b/panels/region/cinnamon-region-panel-xkbpv.c
---- a/panels/region/cinnamon-region-panel-xkbpv.c	2013-08-25 14:40:14.000000000 +0100
-+++ b/panels/region/cinnamon-region-panel-xkbpv.c	1970-01-01 01:00:00.000000000 +0100
-@@ -1,120 +0,0 @@
--/* cinnamon-region-panel-xkbpv.c
-- * Copyright (C) 2003-2007 Sergey V. Udaltsov
-- *
-- * Written by: Sergey V. Udaltsov <svu@gnome.org>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; either version 2, or (at your option)
-- * any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 51 Franklin Street - Suite 500, Boston, MA
-- * 02110-1335, USA.
-- */
--
--#ifdef HAVE_CONFIG_H
--#  include <config.h>
--#endif
--
--#include <libgnomekbd/gkbd-keyboard-drawing.h>
--
--#include "cinnamon-region-panel-xkb.h"
--
--#ifdef HAVE_X11_EXTENSIONS_XKB_H
--#include "X11/XKBlib.h"
--/**
-- * BAD STYLE: Taken from xklavier_private_xkb.h
-- * Any ideas on architectural improvements are WELCOME
-- */
--extern gboolean xkl_xkb_config_native_prepare (XklEngine * engine,
--					       const XklConfigRec * data,
--					       XkbComponentNamesPtr
--					       component_names);
--
--extern void xkl_xkb_config_native_cleanup (XklEngine * engine,
--					   XkbComponentNamesPtr
--					   component_names);
--
--/* */
--#endif
--
--static GkbdKeyboardDrawingGroupLevel groupsLevels[] =
--    { {0, 1}, {0, 3}, {0, 0}, {0, 2} };
--static GkbdKeyboardDrawingGroupLevel *pGroupsLevels[] = {
--	groupsLevels, groupsLevels + 1, groupsLevels + 2, groupsLevels + 3
--};
--
--GtkWidget *
--xkb_layout_preview_create_widget (GtkBuilder * chooserDialog)
--{
--	GtkWidget *kbdraw = gkbd_keyboard_drawing_new ();
--
--	gkbd_keyboard_drawing_set_groups_levels (GKBD_KEYBOARD_DRAWING
--						 (kbdraw), pGroupsLevels);
--	return kbdraw;
--}
--
--void
--xkb_layout_preview_set_drawing_layout (GtkWidget * kbdraw,
--				       const gchar * id)
--{
--#ifdef HAVE_X11_EXTENSIONS_XKB_H
--	if (kbdraw != NULL) {
--		if (id != NULL) {
--			XklConfigRec *data;
--			char **p, *layout, *variant;
--			XkbComponentNamesRec component_names;
--
--			data = xkl_config_rec_new ();
--			if (xkl_config_rec_get_from_server (data, engine)) {
--				if ((p = data->layouts) != NULL)
--					g_strfreev (data->layouts);
--
--				if ((p = data->variants) != NULL)
--					g_strfreev (data->variants);
--
--				data->layouts = g_new0 (char *, 2);
--				data->variants = g_new0 (char *, 2);
--				if (gkbd_keyboard_config_split_items
--				    (id, &layout, &variant)
--				    && variant != NULL) {
--					data->layouts[0] =
--					    (layout ==
--					     NULL) ? NULL :
--					    g_strdup (layout);
--					data->variants[0] =
--					    (variant ==
--					     NULL) ? NULL :
--					    g_strdup (variant);
--				} else {
--					data->layouts[0] =
--					    (id ==
--					     NULL) ? NULL : g_strdup (id);
--					data->variants[0] = NULL;
--				}
--
--				if (xkl_xkb_config_native_prepare
--				    (engine, data, &component_names)) {
--					gkbd_keyboard_drawing_set_keyboard
--					    (GKBD_KEYBOARD_DRAWING
--					     (kbdraw), &component_names);
--
--					xkl_xkb_config_native_cleanup
--					    (engine, &component_names);
--				}
--			}
--			g_object_unref (G_OBJECT (data));
--		} else
--			gkbd_keyboard_drawing_set_keyboard
--			    (GKBD_KEYBOARD_DRAWING (kbdraw), NULL);
--
--	}
--#endif
--}
-diff -uNrp a/panels/region/.indent.pro b/panels/region/.indent.pro
---- a/panels/region/.indent.pro	1970-01-01 01:00:00.000000000 +0100
-+++ b/panels/region/.indent.pro	2013-08-25 16:50:30.000000000 +0100
-@@ -0,0 +1,2 @@
-+-kr -i8 -pcs -lps -psl
-+
-diff -uNrp a/panels/region/Makefile.am b/panels/region/Makefile.am
---- a/panels/region/Makefile.am	2013-08-25 14:40:14.000000000 +0100
-+++ b/panels/region/Makefile.am	2013-09-21 13:24:15.347949247 +0100
-@@ -23,12 +23,9 @@ libregion_la_SOURCES =	\
- 	cinnamon-region-panel-lang.h \
- 	cinnamon-region-panel-system.c \
- 	cinnamon-region-panel-system.h \
--	cinnamon-region-panel-xkb.c \
--	cinnamon-region-panel-xkblt.c \
--	cinnamon-region-panel-xkbltadd.c \
--	cinnamon-region-panel-xkbot.c \
--	cinnamon-region-panel-xkbpv.c \
--	cinnamon-region-panel-xkb.h
-+	cinnamon-region-panel-input.c \
-+	cinnamon-region-panel-input.h \
-+	$(NULL)
- 
- libregion_la_LIBADD = $(PANEL_LIBS) $(REGION_PANEL_LIBS) $(builddir)/../common/liblanguage.la
- 
-@@ -39,8 +36,8 @@ libregion_la_LDFLAGS = $(PANEL_LDFLAGS)
- uidir   = $(pkgdatadir)/ui
- ui_DATA = \
- 	cinnamon-region-panel.ui \
--	cinnamon-region-panel-layout-chooser.ui \
--	cinnamon-region-panel-options-dialog.ui
-+	cinnamon-region-panel-input-chooser.ui \
-+	$(NULL)
- 
- desktopdir = $(datadir)/applications
- Desktop_in_files = cinnamon-region-panel.desktop.in
-diff -uNrp a/panels/region/region-module.c b/panels/region/region-module.c
---- a/panels/region/region-module.c	2013-08-25 14:40:14.000000000 +0100
-+++ b/panels/region/region-module.c	2013-09-21 13:24:15.347949247 +0100
-@@ -28,6 +28,7 @@
- void
- g_io_module_load (GIOModule * module)
- {
-+
- 	/* register the panel */
- 	cc_region_panel_register (module);
- }
diff --git a/pkgs/desktops/cinnamon/remove-sessionmigration.patch b/pkgs/desktops/cinnamon/remove-sessionmigration.patch
deleted file mode 100644
index 92e63549d964..000000000000
--- a/pkgs/desktops/cinnamon/remove-sessionmigration.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/cinnamon-session/csm-session-fill.c
-+++ b/cinnamon-session/csm-session-fill.c
-@@ -228,15 +228,6 @@
- load_standard_apps (CsmManager *manager,
-                     GKeyFile   *keyfile)
- {
--        GError *error;
--
--        g_debug ("fill: *** Executing user migration");
--        error = NULL;
--        if(!g_spawn_command_line_sync ("session-migration", NULL, NULL, NULL, &error)) {
--                 g_warning ("Error while executing session-migration: %s", error->message);
--                 g_error_free (error);
--        }
--
-         g_debug ("fill: *** Adding required components");
-         handle_required_components (keyfile, !csm_manager_get_failsafe (manager),
-                                     append_required_components_helper, manager);
-
diff --git a/pkgs/desktops/cinnamon/systemd-support.patch b/pkgs/desktops/cinnamon/systemd-support.patch
deleted file mode 100644
index feceaf05f7b6..000000000000
--- a/pkgs/desktops/cinnamon/systemd-support.patch
+++ /dev/null
@@ -1,536 +0,0 @@
- 
-diff --git a/plugins/media-keys/csd-media-keys-manager.c b/plugins/media-keys/csd-media-keys-manager.c
-index 02930a3..7c1c519 100644
---- a/plugins/media-keys/csd-media-keys-manager.c
-+++ b/plugins/media-keys/csd-media-keys-manager.c
-@@ -39,6 +39,7 @@
- #include <gdk/gdkx.h>
- #include <gtk/gtk.h>
- #include <gio/gdesktopappinfo.h>
-+#include <gio/gunixfdlist.h>
- 
- #ifdef HAVE_GUDEV
- #include <gudev/gudev.h>
-@@ -121,6 +122,10 @@ static const gchar kb_introspection_xml[] =
- #define VOLUME_STEP 5           /* percents for one volume button press */
- #define MAX_VOLUME 65536.0
- 
-+#define SYSTEMD_DBUS_NAME                       "org.freedesktop.login1"
-+#define SYSTEMD_DBUS_PATH                       "/org/freedesktop/login1"
-+#define SYSTEMD_DBUS_INTERFACE                  "org.freedesktop.login1.Manager"
-+
- #define CSD_MEDIA_KEYS_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CSD_TYPE_MEDIA_KEYS_MANAGER, CsdMediaKeysManagerPrivate))
- 
- typedef struct {
-@@ -167,6 +172,10 @@ struct CsdMediaKeysManagerPrivate
-         GDBusProxy      *power_screen_proxy;
-         GDBusProxy      *power_keyboard_proxy;
- 
-+        /* systemd stuff */
-+        GDBusProxy      *logind_proxy;
-+        gint             inhibit_keys_fd;
-+
-         /* Multihead stuff */
-         GdkScreen       *current_screen;
-         GSList          *screens;
-@@ -2213,6 +2222,11 @@ csd_media_keys_manager_stop (CsdMediaKeysManager *manager)
-         }
- #endif /* HAVE_GUDEV */
- 
-+        if (priv->logind_proxy) {
-+                g_object_unref (priv->logind_proxy);
-+                priv->logind_proxy = NULL;
-+        }
-+
-         if (priv->settings) {
-                 g_object_unref (priv->settings);
-                 priv->settings = NULL;
-@@ -2356,9 +2370,85 @@ csd_media_keys_manager_class_init (CsdMediaKeysManagerClass *klass)
- }
- 
- static void
-+inhibit_done (GObject      *source,
-+              GAsyncResult *result,
-+              gpointer      user_data)
-+{
-+        GDBusProxy *proxy = G_DBUS_PROXY (source);
-+        CsdMediaKeysManager *manager = CSD_MEDIA_KEYS_MANAGER (user_data);
-+        GError *error = NULL;
-+        GVariant *res;
-+        GUnixFDList *fd_list = NULL;
-+        gint idx;
-+
-+        res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error);
-+        if (res == NULL) {
-+                g_warning ("Unable to inhibit keypresses: %s", error->message);
-+                g_error_free (error);
-+        } else {
-+                g_variant_get (res, "(h)", &idx);
-+                manager->priv->inhibit_keys_fd = g_unix_fd_list_get (fd_list, idx, &error);
-+                if (manager->priv->inhibit_keys_fd == -1) {
-+                        g_warning ("Failed to receive system inhibitor fd: %s", error->message);
-+                        g_error_free (error);
-+                }
-+                g_debug ("System inhibitor fd is %d", manager->priv->inhibit_keys_fd);
-+                g_object_unref (fd_list);
-+                g_variant_unref (res);
-+        }
-+}
-+
-+static void
- csd_media_keys_manager_init (CsdMediaKeysManager *manager)
- {
-+        GError *error;
-+        GDBusConnection *bus;
-+
-+        error = NULL;
-         manager->priv = CSD_MEDIA_KEYS_MANAGER_GET_PRIVATE (manager);
-+
-+        bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
-+        if (bus == NULL) {
-+                g_warning ("Failed to connect to system bus: %s",
-+                           error->message);
-+                g_error_free (error);
-+                return;
-+        }
-+
-+        manager->priv->logind_proxy =
-+                g_dbus_proxy_new_sync (bus,
-+                                       0,
-+                                       NULL,
-+                                       SYSTEMD_DBUS_NAME,
-+                                       SYSTEMD_DBUS_PATH,
-+                                       SYSTEMD_DBUS_INTERFACE,
-+                                       NULL,
-+                                       &error);
-+
-+        if (manager->priv->logind_proxy == NULL) {
-+                g_warning ("Failed to connect to systemd: %s",
-+                           error->message);
-+                g_error_free (error);
-+        }
-+
-+        g_object_unref (bus);
-+
-+        g_debug ("Adding system inhibitors for power keys");
-+        manager->priv->inhibit_keys_fd = -1;
-+        g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy,
-+                                             "Inhibit",
-+                                             g_variant_new ("(ssss)",
-+                                                            "handle-power-key:handle-suspend-key:handle-hibernate-key",
-+                                                            g_get_user_name (),
-+                                                            "Cinnamon handling keypresses",
-+                                                            "block"),
-+                                             0,
-+                                             G_MAXINT,
-+                                             NULL,
-+                                             NULL,
-+                                             inhibit_done,
-+                                             manager);
-+
- }
- 
- static void
-@@ -2375,6 +2465,8 @@ csd_media_keys_manager_finalize (GObject *object)
- 
-         if (media_keys_manager->priv->start_idle_id != 0)
-                 g_source_remove (media_keys_manager->priv->start_idle_id);
-+        if (media_keys_manager->priv->inhibit_keys_fd != -1)
-+                close (media_keys_manager->priv->inhibit_keys_fd);
- 
-         G_OBJECT_CLASS (csd_media_keys_manager_parent_class)->finalize (object);
- }
-diff --git a/plugins/power/csd-power-manager.c b/plugins/power/csd-power-manager.c
-index b54cb5b..b9c5429 100644
---- a/plugins/power/csd-power-manager.c
-+++ b/plugins/power/csd-power-manager.c
-@@ -32,6 +32,7 @@
- #include <libupower-glib/upower.h>
- #include <libnotify/notify.h>
- #include <canberra-gtk.h>
-+#include <gio/gunixfdlist.h>
- 
- #include <X11/extensions/dpms.h>
- 
-@@ -79,6 +80,10 @@
- #define CSD_POWER_MANAGER_CRITICAL_ALERT_TIMEOUT        5 /* seconds */
- #define CSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT      30 /* seconds */
- 
-+#define SYSTEMD_DBUS_NAME                       "org.freedesktop.login1"
-+#define SYSTEMD_DBUS_PATH                       "/org/freedesktop/login1"
-+#define SYSTEMD_DBUS_INTERFACE                  "org.freedesktop.login1.Manager"
-+
- /* Keep this in sync with gnome-shell */
- #define SCREENSAVER_FADE_TIME                           10 /* seconds */
- 
-@@ -203,6 +208,13 @@ struct CsdPowerManagerPrivate
-         GtkStatusIcon           *status_icon;
-         guint                    xscreensaver_watchdog_timer_id;
-         gboolean                 is_virtual_machine;
-+
-+        /* systemd stuff */
-+        GDBusProxy              *logind_proxy;
-+        gint                     inhibit_lid_switch_fd;
-+        gboolean                 inhibit_lid_switch_taken;
-+        gint                     inhibit_suspend_fd;
-+        gboolean                 inhibit_suspend_taken;
- };
- 
- enum {
-@@ -3350,30 +3362,6 @@ lock_screensaver (CsdPowerManager *manager)
-         if (!do_lock)
-                 return;
- 
--            /* connect to the screensaver first */
--            g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION,
--                                      G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
--                                      NULL,
--                                      GS_DBUS_NAME,
--                                      GS_DBUS_PATH,
--                                      GS_DBUS_INTERFACE,
--                                      NULL,
--                                      sleep_cb_screensaver_proxy_ready_cb,
--                                      manager);
--}
--
--static void
--upower_notify_sleep_cb (UpClient *client,
--                        UpSleepKind sleep_kind,
--                        CsdPowerManager *manager)
--{
--        gboolean do_lock;
--
--        do_lock = g_settings_get_boolean (manager->priv->settings,
--                                          "lock-on-suspend");
--        if (!do_lock)
--                return;
--
-         /* connect to the screensaver first */
-         g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION,
-                                   G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
-@@ -3384,46 +3372,6 @@ upower_notify_sleep_cb (UpClient *client,
-                                   NULL,
-                                   sleep_cb_screensaver_proxy_ready_cb,
-                                   manager);
--
--}
--
--static void
--upower_notify_resume_cb (UpClient *client,
--                         UpSleepKind sleep_kind,
--                         CsdPowerManager *manager)
--{
--        gboolean ret;
--        GError *error = NULL;
--
--        /* this displays the unlock dialogue so the user doesn't have
--         * to move the mouse or press any key before the window comes up */
--        if (manager->priv->screensaver_proxy != NULL) {
--                g_dbus_proxy_call (manager->priv->screensaver_proxy,
--                                   "SimulateUserActivity",
--                                   NULL,
--                                   G_DBUS_CALL_FLAGS_NONE,
--                                   -1, NULL, NULL, NULL);
--        }
--
--        if (manager->priv->screensaver_proxy != NULL) {
--            g_object_unref (manager->priv->screensaver_proxy);
--            manager->priv->screensaver_proxy = NULL;
--        }
--
--        /* close existing notifications on resume, the system power
--         * state is probably different now */
--        notify_close_if_showing (manager->priv->notification_low);
--        notify_close_if_showing (manager->priv->notification_discharging);
--
--        /* ensure we turn the panel back on after resume */
--        ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
--                                             GNOME_RR_DPMS_ON,
--                                             &error);
--        if (!ret) {
--                g_warning ("failed to turn the panel on after resume: %s",
--                           error->message);
--                g_error_free (error);
--        }
- }
- 
- static void
-@@ -3582,6 +3530,219 @@ disable_builtin_screensaver (gpointer unused)
-         return TRUE;
- }
- 
-+static void
-+inhibit_lid_switch_done (GObject      *source,
-+                         GAsyncResult *result,
-+                         gpointer      user_data)
-+{
-+        GDBusProxy *proxy = G_DBUS_PROXY (source);
-+        CsdPowerManager *manager = CSD_POWER_MANAGER (user_data);
-+        GError *error = NULL;
-+        GVariant *res;
-+        GUnixFDList *fd_list = NULL;
-+        gint idx;
-+
-+        res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error);
-+        if (res == NULL) {
-+                g_warning ("Unable to inhibit lid switch: %s", error->message);
-+                g_error_free (error);
-+        } else {
-+                g_variant_get (res, "(h)", &idx);
-+                manager->priv->inhibit_lid_switch_fd = g_unix_fd_list_get (fd_list, idx, &error);
-+                if (manager->priv->inhibit_lid_switch_fd == -1) {
-+                        g_warning ("Failed to receive system inhibitor fd: %s", error->message);
-+                        g_error_free (error);
-+                }
-+                g_debug ("System inhibitor fd is %d", manager->priv->inhibit_lid_switch_fd);
-+                g_object_unref (fd_list);
-+                g_variant_unref (res);
-+        }
-+}
-+
-+static void
-+inhibit_lid_switch (CsdPowerManager *manager)
-+{
-+        GVariant *params;
-+
-+        if (manager->priv->inhibit_lid_switch_taken) {
-+                g_debug ("already inhibited lid-switch");
-+                return;
-+        }
-+        g_debug ("Adding lid switch system inhibitor");
-+        manager->priv->inhibit_lid_switch_taken = TRUE;
-+
-+        params = g_variant_new ("(ssss)",
-+                                "handle-lid-switch",
-+                                g_get_user_name (),
-+                                "Multiple displays attached",
-+                                "block");
-+        g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy,
-+                                             "Inhibit",
-+                                             params,
-+                                             0,
-+                                             G_MAXINT,
-+                                             NULL,
-+                                             NULL,
-+                                             inhibit_lid_switch_done,
-+                                             manager);
-+}
-+
-+static void
-+inhibit_suspend_done (GObject      *source,
-+                      GAsyncResult *result,
-+                      gpointer      user_data)
-+{
-+        GDBusProxy *proxy = G_DBUS_PROXY (source);
-+        CsdPowerManager *manager = CSD_POWER_MANAGER (user_data);
-+        GError *error = NULL;
-+        GVariant *res;
-+        GUnixFDList *fd_list = NULL;
-+        gint idx;
-+
-+        res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error);
-+        if (res == NULL) {
-+                g_warning ("Unable to inhibit suspend: %s", error->message);
-+                g_error_free (error);
-+        } else {
-+                g_variant_get (res, "(h)", &idx);
-+                manager->priv->inhibit_suspend_fd = g_unix_fd_list_get (fd_list, idx, &error);
-+                if (manager->priv->inhibit_suspend_fd == -1) {
-+                        g_warning ("Failed to receive system inhibitor fd: %s", error->message);
-+                        g_error_free (error);
-+                }
-+                g_debug ("System inhibitor fd is %d", manager->priv->inhibit_suspend_fd);
-+                g_object_unref (fd_list);
-+                g_variant_unref (res);
-+        }
-+}
-+
-+/* We take a delay inhibitor here, which causes logind to send a
-+ * PrepareToSleep signal, which gives us a chance to lock the screen
-+ * and do some other preparations.
-+ */
-+static void
-+inhibit_suspend (CsdPowerManager *manager)
-+{
-+        if (manager->priv->inhibit_suspend_taken) {
-+                g_debug ("already inhibited lid-switch");
-+                return;
-+        }
-+        g_debug ("Adding suspend delay inhibitor");
-+        manager->priv->inhibit_suspend_taken = TRUE;
-+        g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy,
-+                                             "Inhibit",
-+                                             g_variant_new ("(ssss)",
-+                                                            "sleep",
-+                                                            g_get_user_name (),
-+                                                            "Cinnamon needs to lock the screen",
-+                                                            "delay"),
-+                                             0,
-+                                             G_MAXINT,
-+                                             NULL,
-+                                             NULL,
-+                                             inhibit_suspend_done,
-+                                             manager);
-+}
-+
-+static void
-+uninhibit_suspend (CsdPowerManager *manager)
-+{
-+        if (manager->priv->inhibit_suspend_fd == -1) {
-+                g_debug ("no suspend delay inhibitor");
-+                return;
-+        }
-+        g_debug ("Removing suspend delay inhibitor");
-+        close (manager->priv->inhibit_suspend_fd);
-+        manager->priv->inhibit_suspend_fd = -1;
-+        manager->priv->inhibit_suspend_taken = FALSE;
-+}
-+
-+static void
-+handle_suspend_actions (CsdPowerManager *manager)
-+{
-+        gboolean do_lock;
-+
-+        do_lock = g_settings_get_boolean (manager->priv->settings,
-+                                          "lock-on-suspend");
-+        if (do_lock)
-+                lock_screensaver (manager);
-+
-+        /* lift the delay inhibit, so logind can proceed */
-+        uninhibit_suspend (manager);
-+}
-+
-+static void
-+handle_resume_actions (CsdPowerManager *manager)
-+{
-+        gboolean ret;
-+        GError *error = NULL;
-+
-+        /* this displays the unlock dialogue so the user doesn't have
-+         * to move the mouse or press any key before the window comes up */
-+        g_dbus_connection_call (manager->priv->connection,
-+                                GS_DBUS_NAME,
-+                                GS_DBUS_PATH,
-+                                GS_DBUS_INTERFACE,
-+                                "SimulateUserActivity",
-+                                NULL, NULL,
-+                                G_DBUS_CALL_FLAGS_NONE, -1,
-+                                NULL, NULL, NULL);
-+
-+        /* close existing notifications on resume, the system power
-+         * state is probably different now */
-+        notify_close_if_showing (manager->priv->notification_low);
-+        notify_close_if_showing (manager->priv->notification_discharging);
-+
-+        /* ensure we turn the panel back on after resume */
-+        ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
-+                                             GNOME_RR_DPMS_ON,
-+                                             &error);
-+        if (!ret) {
-+                g_warning ("failed to turn the panel on after resume: %s",
-+                           error->message);
-+                g_error_free (error);
-+        }
-+
-+        /* set up the delay again */
-+        inhibit_suspend (manager);
-+}
-+
-+static void
-+upower_notify_sleep_cb (UpClient *client,
-+                        UpSleepKind sleep_kind,
-+                        CsdPowerManager *manager)
-+{
-+        handle_suspend_actions (manager);
-+}
-+
-+static void
-+upower_notify_resume_cb (UpClient *client,
-+                         UpSleepKind sleep_kind,
-+                         CsdPowerManager *manager)
-+{
-+        handle_resume_actions (manager);
-+}
-+
-+static void
-+logind_proxy_signal_cb (GDBusProxy  *proxy,
-+                        const gchar *sender_name,
-+                        const gchar *signal_name,
-+                        GVariant    *parameters,
-+                        gpointer     user_data)
-+{
-+        CsdPowerManager *manager = CSD_POWER_MANAGER (user_data);
-+        gboolean is_about_to_suspend;
-+
-+        if (g_strcmp0 (signal_name, "PrepareForSleep") != 0)
-+                return;
-+        g_variant_get (parameters, "(b)", &is_about_to_suspend);
-+        if (is_about_to_suspend) {
-+                handle_suspend_actions (manager);
-+        } else {
-+                handle_resume_actions (manager);
-+        }
-+}
-+
- static gboolean
- is_hardware_a_virtual_machine (void)
- {
-@@ -3647,6 +3808,26 @@ csd_power_manager_start (CsdPowerManager *manager,
-         if (manager->priv->x11_screen == NULL)
-                 return FALSE;
- 
-+        /* Set up the logind proxy */
-+        manager->priv->logind_proxy =
-+                g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
-+                                               0,
-+                                               NULL,
-+                                               SYSTEMD_DBUS_NAME,
-+                                               SYSTEMD_DBUS_PATH,
-+                                               SYSTEMD_DBUS_INTERFACE,
-+                                               NULL,
-+                                               error);
-+        g_signal_connect (manager->priv->logind_proxy, "g-signal",
-+                          G_CALLBACK (logind_proxy_signal_cb),
-+                          manager);
-+
-+        /* Set up a delay inhibitor to be informed about suspend attempts */
-+        inhibit_suspend (manager);
-+
-+        /* Disable logind's lid handling while g-s-d is active */
-+        inhibit_lid_switch (manager);
-+
-         /* track the active session */
-         manager->priv->session = cinnamon_settings_session_new ();
-         g_signal_connect (manager->priv->session, "notify::state",
-@@ -3856,6 +4037,22 @@ csd_power_manager_stop (CsdPowerManager *manager)
-                 manager->priv->up_client = NULL;
-         }
- 
-+        if (manager->priv->inhibit_lid_switch_fd != -1) {
-+                close (manager->priv->inhibit_lid_switch_fd);
-+                manager->priv->inhibit_lid_switch_fd = -1;
-+                manager->priv->inhibit_lid_switch_taken = FALSE;
-+        }
-+        if (manager->priv->inhibit_suspend_fd != -1) {
-+                close (manager->priv->inhibit_suspend_fd);
-+                manager->priv->inhibit_suspend_fd = -1;
-+                manager->priv->inhibit_suspend_taken = FALSE;
-+        }
-+
-+        if (manager->priv->logind_proxy != NULL) {
-+                g_object_unref (manager->priv->logind_proxy);
-+                manager->priv->logind_proxy = NULL;
-+        }
-+
-         if (manager->priv->x11_screen != NULL) {
-                 g_object_unref (manager->priv->x11_screen);
-                 manager->priv->x11_screen = NULL;
-@@ -3928,6 +4125,8 @@ static void
- csd_power_manager_init (CsdPowerManager *manager)
- {
-         manager->priv = CSD_POWER_MANAGER_GET_PRIVATE (manager);
-+        manager->priv->inhibit_lid_switch_fd = -1;
-+        manager->priv->inhibit_suspend_fd = -1;
- }
- 
- static void
diff --git a/pkgs/desktops/cinnamon/timeout.patch b/pkgs/desktops/cinnamon/timeout.patch
deleted file mode 100644
index 59d1f9ab5f37..000000000000
--- a/pkgs/desktops/cinnamon/timeout.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -u -r cinnamon-session-3.4.2/cinnamon-session/csm-session-fill.c cinnamon-session-3.4.2-timeout/cinnamon-session/csm-session-fill.c
---- cinnamon-session-3.4.2/cinnamon-session/csm-session-fill.c	2012-02-02 15:33:01.000000000 +0100
-+++ cinnamon-session-3.4.2-timeout/cinnamon-session/csm-session-fill.c	2012-06-10 02:39:46.184348462 +0200
-@@ -36,7 +36,7 @@
- #define CSM_KEYFILE_DEFAULT_PROVIDER_PREFIX "DefaultProvider"
- 
- /* See https://bugzilla.gnome.org/show_bug.cgi?id=641992 for discussion */
--#define CSM_RUNNABLE_HELPER_TIMEOUT 3000 /* ms */
-+#define CSM_RUNNABLE_HELPER_TIMEOUT 10000 /* ms */
- 
- typedef void (*GsmFillHandleProvider) (const char *provides,
-                                        const char *default_provider,
-diff -u -r cinnamon-session-3.4.2/tools/cinnamon-session-check-accelerated.c 
-cinnamon-session-3.4.2-timeout/tools/cinnamon-session-check-accelerated.c
---- cinnamon-session-3.4.2/tools/cinnamon-session-check-accelerated.c	2011-03-22 21:31:43.000000000 +0100
-+++ cinnamon-session-3.4.2-timeout/tools/cinnamon-session-check-accelerated.c	2012-06-10 02:42:08.013218006 +0200
-@@ -30,7 +30,7 @@
- #include <X11/Xatom.h>
- 
- /* Wait up to this long for a running check to finish */
--#define PROPERTY_CHANGE_TIMEOUT 5000
-+#define PROPERTY_CHANGE_TIMEOUT 12000
- 
- /* Values used for the _GNOME_SESSION_ACCELERATED root window property */
- #define NO_ACCEL            0
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8a07b7d2a98e..e839286b74a1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14491,25 +14491,6 @@ let
 
   ### DESKTOP ENVIRONMENTS
 
-  cinnamon = recurseIntoAttrs rec {
-    callPackage = newScope pkgs.cinnamon;
-    inherit (gnome3) gnome_common libgnomekbd gnome-menus zenity;
-
-    muffin = callPackage ../desktops/cinnamon/muffin.nix { } ;
-
-    cinnamon-control-center = callPackage ../desktops/cinnamon/cinnamon-control-center.nix{ };
-
-    cinnamon-settings-daemon = callPackage ../desktops/cinnamon/cinnamon-settings-daemon.nix{ };
-
-    cinnamon-session = callPackage ../desktops/cinnamon/cinnamon-session.nix{ } ;
-
-    cinnamon-desktop = callPackage ../desktops/cinnamon/cinnamon-desktop.nix { };
-
-    cinnamon-translations = callPackage ../desktops/cinnamon/cinnamon-translations.nix { };
-
-    cjs = callPackage ../desktops/cinnamon/cjs.nix { };
-  };
-
   clearlooks-phenix = callPackage ../misc/themes/gtk3/clearlooks-phenix { };
 
   enlightenment = callPackage ../desktops/enlightenment { };

From a8265ea45875ab926b6178cbe7f083ee8ee5f3b2 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 14 Jan 2016 15:25:11 +0100
Subject: [PATCH 737/884] maintainers: remove roelof

Inactive since April 2014. Vanished from GitHub. Unreachable.
---
 lib/maintainers.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 9a8e1d685ddb..f9dcd5776fa0 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -264,7 +264,6 @@
   robbinch = "Robbin C. <robbinch33@gmail.com>";
   robgssp = "Rob Glossop <robgssp@gmail.com>";
   roconnor = "Russell O'Connor <roconnor@theorem.ca>";
-  roelof = "Roelof Wobben <rwobben@hotmail.com>";
   romildo = "José Romildo Malaquias <malaquias@gmail.com>";
   rszibele = "Richard Szibele <richard_szibele@hotmail.com>";
   rushmorem = "Rushmore Mushambi <rushmore@webenchanter.com>";

From d1232049fb6ff8b2cf0d3e9f8f0df686c5de00d4 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 14 Jan 2016 16:00:09 +0100
Subject: [PATCH 738/884] tkgate 2.x: remove dead package

Broken since April 2014. Homepage leads to an expired domain.
---
 .../science/electronics/tkgate/2.x.nix        | 34 -------------------
 pkgs/top-level/all-packages.nix               |  3 --
 2 files changed, 37 deletions(-)
 delete mode 100644 pkgs/applications/science/electronics/tkgate/2.x.nix

diff --git a/pkgs/applications/science/electronics/tkgate/2.x.nix b/pkgs/applications/science/electronics/tkgate/2.x.nix
deleted file mode 100644
index 108986ddefe4..000000000000
--- a/pkgs/applications/science/electronics/tkgate/2.x.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchurl, tcl, tk, libX11, glibc }:
-
-let
-  libiconvInc = stdenv.lib.optionalString stdenv.isLinux "${glibc}/include";
-  libiconvLib = stdenv.lib.optionalString stdenv.isLinux "${glibc}/lib";
-in
-stdenv.mkDerivation rec {
-  name = "tkgate-2.0-b10";
-
-  src = fetchurl {
-    url = "http://www.tkgate.org/downloads/${name}.tgz";
-    sha256 = "0mr061xcwjmd8nhyjjcw2dzxqi53hv9xym9xsp0cw98knz2skxjf";
-  };
-
-  buildInputs = [ tcl tk libX11 ];
-
-  dontStrip = true;
-
-  patchPhase = ''
-    sed -i configure \
-      -e 's|TKGATE_INCDIRS=.*|TKGATE_INCDIRS="${tcl}/include ${tk}/include ${libiconvInc}"|' \
-      -e 's|TKGATE_LIBDIRS=.*|TKGATE_LIBDIRS="${tcl}/lib ${tk}/lib ${libiconvLib}"|'
-    sed -i options.h \
-      -e 's|.* #define TCL_LIBRARY .*|#define TCL_LIBRARY "${tcl}/${tcl.libdir}"|' \
-      -e 's|.* #define TK_LIBRARY .*|#define TK_LIBRARY "${tk}/lib/${tk.libPrefix}"|'
-  '';
-
-  meta = {
-    description = "Event driven digital circuit simulator with a TCL/TK-based graphical editor";
-    homepage = "http://www.tkgate.org/";
-    license = stdenv.lib.licenses.gpl2Plus;
-    broken = true;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e839286b74a1..3575ca407807 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3491,9 +3491,6 @@ let
 
   tkgate = callPackage ../applications/science/electronics/tkgate/1.x.nix { };
 
-  # The newer package is low-priority because it segfaults at startup.
-  tkgate2 = lowPrio (callPackage ../applications/science/electronics/tkgate/2.x.nix { });
-
   tm = callPackage ../tools/system/tm { };
 
   tradcpp = callPackage ../development/tools/tradcpp { };

From d8fa7f7b06f3a92ca358a31439d6ab27ad3b03ef Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 14 Jan 2016 16:09:11 +0100
Subject: [PATCH 739/884] miniupnpd 1.9.20151212 -> 1.9.20160113

Changes: https://github.com/miniupnp/miniupnp/blob/master/miniupnpd/Changelog.txt
---
 pkgs/tools/networking/miniupnpd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix
index 91306b4ae6da..e88ae7a1403e 100644
--- a/pkgs/tools/networking/miniupnpd/default.nix
+++ b/pkgs/tools/networking/miniupnpd/default.nix
@@ -3,11 +3,11 @@
 assert stdenv.isLinux;
 
 stdenv.mkDerivation rec {
-  name = "miniupnpd-1.9.20151212";
+  name = "miniupnpd-1.9.20160113";
 
   src = fetchurl {
     url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
-    sha256 = "1ay7dw1y5fqgjrqa9s8av8ndmw7wkjm39xnnzzw8pxbv70d6b12j";
+    sha256 = "084ii5vb54rr8sg50cqvsw5rj6linj23p3gnxwfyl100dkkgvcaa";
     name = "${name}.tar.gz";
   };
 

From 5876238d5439d3d1935fc3e80cfe1a21470a20f7 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 14 Jan 2016 23:49:00 +0100
Subject: [PATCH 740/884] eid-mw: 4.1.11 -> 4.1.12

---
 pkgs/tools/security/eid-mw/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix
index eba1bef18704..725242914414 100644
--- a/pkgs/tools/security/eid-mw/default.nix
+++ b/pkgs/tools/security/eid-mw/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchFromGitHub, autoreconfHook, gtk3, nssTools, pcsclite
 , pkgconfig }:
 
-let version = "4.1.11"; in
+let version = "4.1.12"; in
 stdenv.mkDerivation {
   name = "eid-mw-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "09rp4x1vg0j4rb2dl74f8a7szqx73saacjz09jkih1sz6vwi0j0w";
+    sha256 = "12nnzh3idnl5bdjqmm8si5nj7yr42mkxhzq70s760bnfmvbqgbmc";
     rev = "v${version}";
     repo = "eid-mw";
     owner = "Fedict";

From 3b1fe914b9b9e6ade7973812cad2315b60af1115 Mon Sep 17 00:00:00 2001
From: Alexey Shmalko <rasen.dubi@gmail.com>
Date: Thu, 14 Jan 2016 23:51:54 +0200
Subject: [PATCH 741/884] powerline-fonts: Install Terminus font

Patched Terminus font is neither .otf, nor .ttf so it wasn't installed
before.
---
 pkgs/data/fonts/powerline-fonts/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/data/fonts/powerline-fonts/default.nix b/pkgs/data/fonts/powerline-fonts/default.nix
index 3c8d2735a416..63b4ad1ea04a 100644
--- a/pkgs/data/fonts/powerline-fonts/default.nix
+++ b/pkgs/data/fonts/powerline-fonts/default.nix
@@ -19,6 +19,15 @@ stdenv.mkDerivation {
 
       mkdir -p $out/share/fonts/truetype
       cp -v */*.ttf $out/share/fonts/truetype
+
+      mkdir -p $out/share/fonts/bdf
+      cp -v */BDF/*.bdf $out/share/fonts/bdf
+
+      mkdir -p $out/share/fonts/pcf
+      cp -v */PCF/*.pcf.gz $out/share/fonts/pcf
+
+      mkdir -p $out/share/fonts/psf
+      cp -v */PSF/*.psf.gz $out/share/fonts/psf
     '';
 
   meta = with stdenv.lib; {

From dcd428db08c755d31b3bd5af1785459a7f5a9435 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Fri, 15 Jan 2016 03:09:29 +0200
Subject: [PATCH 742/884] azure-cli: init at 0.9.13

---
 .../virtualization/azure-cli/default.nix      |   20 +
 .../azure-cli/node-packages.json              |    1 +
 .../azure-cli/node-packages.nix               | 4965 +++++++++++++++++
 pkgs/top-level/all-packages.nix               |    2 +
 4 files changed, 4988 insertions(+)
 create mode 100644 pkgs/tools/virtualization/azure-cli/default.nix
 create mode 100644 pkgs/tools/virtualization/azure-cli/node-packages.json
 create mode 100644 pkgs/tools/virtualization/azure-cli/node-packages.nix

diff --git a/pkgs/tools/virtualization/azure-cli/default.nix b/pkgs/tools/virtualization/azure-cli/default.nix
new file mode 100644
index 000000000000..10a40e8208c5
--- /dev/null
+++ b/pkgs/tools/virtualization/azure-cli/default.nix
@@ -0,0 +1,20 @@
+{ recurseIntoAttrs, callPackage, nodejs
+}:
+
+let
+  self = (
+    callPackage ../../../top-level/node-packages.nix {
+      inherit nodejs self;
+      generated = callPackage ./node-packages.nix { inherit self; };
+      overrides = {
+        "azure-cli" = { passthru.nodePackages = self; };
+        "easy-table" = {
+            dontMakeSourcesWritable = 1;
+            postUnpack = ''
+                chmod -R 770 "$sourceRoot"
+           '';
+        };
+      };
+    });
+in self.azure-cli
+
diff --git a/pkgs/tools/virtualization/azure-cli/node-packages.json b/pkgs/tools/virtualization/azure-cli/node-packages.json
new file mode 100644
index 000000000000..1e0f658d49c6
--- /dev/null
+++ b/pkgs/tools/virtualization/azure-cli/node-packages.json
@@ -0,0 +1 @@
+[ "azure-cli" ]
diff --git a/pkgs/tools/virtualization/azure-cli/node-packages.nix b/pkgs/tools/virtualization/azure-cli/node-packages.nix
new file mode 100644
index 000000000000..9601e4215abe
--- /dev/null
+++ b/pkgs/tools/virtualization/azure-cli/node-packages.nix
@@ -0,0 +1,4965 @@
+{ self, fetchurl, fetchgit ? null, lib }:
+
+{
+  by-spec."adal-node"."0.1.16" =
+    self.by-version."adal-node"."0.1.16";
+  by-version."adal-node"."0.1.16" = self.buildNodePackage {
+    name = "adal-node-0.1.16";
+    version = "0.1.16";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/adal-node/-/adal-node-0.1.16.tgz";
+      name = "adal-node-0.1.16.tgz";
+      sha1 = "ed205574c05ae93c68f0b59909588242f2c9ccf8";
+    };
+    deps = {
+      "date-utils-1.2.17" = self.by-version."date-utils"."1.2.17";
+      "jws-3.1.0" = self.by-version."jws"."3.1.0";
+      "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1";
+      "request-2.67.0" = self.by-version."request"."2.67.0";
+      "underscore-1.8.3" = self.by-version."underscore"."1.8.3";
+      "xmldom-0.1.20" = self.by-version."xmldom"."0.1.20";
+      "xpath.js-1.0.6" = self.by-version."xpath.js"."1.0.6";
+      "async-1.5.2" = self.by-version."async"."1.5.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."adal-node"."0.1.17" =
+    self.by-version."adal-node"."0.1.17";
+  by-version."adal-node"."0.1.17" = self.buildNodePackage {
+    name = "adal-node-0.1.17";
+    version = "0.1.17";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/adal-node/-/adal-node-0.1.17.tgz";
+      name = "adal-node-0.1.17.tgz";
+      sha1 = "7946eb374c837730bd3cc49b0894928154e505d0";
+    };
+    deps = {
+      "date-utils-1.2.17" = self.by-version."date-utils"."1.2.17";
+      "jws-3.1.0" = self.by-version."jws"."3.1.0";
+      "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1";
+      "request-2.67.0" = self.by-version."request"."2.67.0";
+      "underscore-1.8.3" = self.by-version."underscore"."1.8.3";
+      "xmldom-0.1.20" = self.by-version."xmldom"."0.1.20";
+      "xpath.js-1.0.6" = self.by-version."xpath.js"."1.0.6";
+      "async-1.5.2" = self.by-version."async"."1.5.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."amdefine".">=0.0.4" =
+    self.by-version."amdefine"."1.0.0";
+  by-version."amdefine"."1.0.0" = self.buildNodePackage {
+    name = "amdefine-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz";
+      name = "amdefine-1.0.0.tgz";
+      sha1 = "fd17474700cb5cc9c2b709f0be9d23ce3c198c33";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ansi-regex"."^2.0.0" =
+    self.by-version."ansi-regex"."2.0.0";
+  by-version."ansi-regex"."2.0.0" = self.buildNodePackage {
+    name = "ansi-regex-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz";
+      name = "ansi-regex-2.0.0.tgz";
+      sha1 = "c5061b6e0ef8a81775e50f5d66151bf6bf371107";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ansi-styles"."^2.1.0" =
+    self.by-version."ansi-styles"."2.1.0";
+  by-version."ansi-styles"."2.1.0" = self.buildNodePackage {
+    name = "ansi-styles-2.1.0";
+    version = "2.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz";
+      name = "ansi-styles-2.1.0.tgz";
+      sha1 = "990f747146927b559a932bf92959163d60c0d0e2";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."asn1"."0.1.11" =
+    self.by-version."asn1"."0.1.11";
+  by-version."asn1"."0.1.11" = self.buildNodePackage {
+    name = "asn1-0.1.11";
+    version = "0.1.11";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz";
+      name = "asn1-0.1.11.tgz";
+      sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."asn1".">=0.2.3 <0.3.0" =
+    self.by-version."asn1"."0.2.3";
+  by-version."asn1"."0.2.3" = self.buildNodePackage {
+    name = "asn1-0.2.3";
+    version = "0.2.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz";
+      name = "asn1-0.2.3.tgz";
+      sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."asn1.js"."^2.0.3" =
+    self.by-version."asn1.js"."2.2.1";
+  by-version."asn1.js"."2.2.1" = self.buildNodePackage {
+    name = "asn1.js-2.2.1";
+    version = "2.2.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/asn1.js/-/asn1.js-2.2.1.tgz";
+      name = "asn1.js-2.2.1.tgz";
+      sha1 = "c8ba4dd68e84431288126230cb2045bdfa9fbfe1";
+    };
+    deps = {
+      "bn.js-2.2.0" = self.by-version."bn.js"."2.2.0";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "minimalistic-assert-1.0.0" = self.by-version."minimalistic-assert"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."assert-plus"."0.1.x" =
+    self.by-version."assert-plus"."0.1.5";
+  by-version."assert-plus"."0.1.5" = self.buildNodePackage {
+    name = "assert-plus-0.1.5";
+    version = "0.1.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz";
+      name = "assert-plus-0.1.5.tgz";
+      sha1 = "ee74009413002d84cec7219c6ac811812e723160";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."assert-plus".">=0.2.0 <0.3.0" =
+    self.by-version."assert-plus"."0.2.0";
+  by-version."assert-plus"."0.2.0" = self.buildNodePackage {
+    name = "assert-plus-0.2.0";
+    version = "0.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz";
+      name = "assert-plus-0.2.0.tgz";
+      sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."assert-plus"."^0.1.5" =
+    self.by-version."assert-plus"."0.1.5";
+  by-spec."async"."0.1.x" =
+    self.by-version."async"."0.1.22";
+  by-version."async"."0.1.22" = self.buildNodePackage {
+    name = "async-0.1.22";
+    version = "0.1.22";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/async/-/async-0.1.22.tgz";
+      name = "async-0.1.22.tgz";
+      sha1 = "0fc1aaa088a0e3ef0ebe2d8831bab0dcf8845061";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."async"."0.2.7" =
+    self.by-version."async"."0.2.7";
+  by-version."async"."0.2.7" = self.buildNodePackage {
+    name = "async-0.2.7";
+    version = "0.2.7";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/async/-/async-0.2.7.tgz";
+      name = "async-0.2.7.tgz";
+      sha1 = "44c5ee151aece6c4bf5364cfc7c28fe4e58f18df";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."async"."1.4.2" =
+    self.by-version."async"."1.4.2";
+  by-version."async"."1.4.2" = self.buildNodePackage {
+    name = "async-1.4.2";
+    version = "1.4.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/async/-/async-1.4.2.tgz";
+      name = "async-1.4.2.tgz";
+      sha1 = "6c9edcb11ced4f0dd2f2d40db0d49a109c088aab";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."async".">=0.6.0" =
+    self.by-version."async"."1.5.2";
+  by-version."async"."1.5.2" = self.buildNodePackage {
+    name = "async-1.5.2";
+    version = "1.5.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/async/-/async-1.5.2.tgz";
+      name = "async-1.5.2.tgz";
+      sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."async"."^1.4.0" =
+    self.by-version."async"."1.5.2";
+  by-spec."async"."~0.9.0" =
+    self.by-version."async"."0.9.2";
+  by-version."async"."0.9.2" = self.buildNodePackage {
+    name = "async-0.9.2";
+    version = "0.9.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/async/-/async-0.9.2.tgz";
+      name = "async-0.9.2.tgz";
+      sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."aws-sign2"."~0.5.0" =
+    self.by-version."aws-sign2"."0.5.0";
+  by-version."aws-sign2"."0.5.0" = self.buildNodePackage {
+    name = "aws-sign2-0.5.0";
+    version = "0.5.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz";
+      name = "aws-sign2-0.5.0.tgz";
+      sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."aws-sign2"."~0.6.0" =
+    self.by-version."aws-sign2"."0.6.0";
+  by-version."aws-sign2"."0.6.0" = self.buildNodePackage {
+    name = "aws-sign2-0.6.0";
+    version = "0.6.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz";
+      name = "aws-sign2-0.6.0.tgz";
+      sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."azure-arm-apiapp"."0.1.3" =
+    self.by-version."azure-arm-apiapp"."0.1.3";
+  by-version."azure-arm-apiapp"."0.1.3" = self.buildNodePackage {
+    name = "azure-arm-apiapp-0.1.3";
+    version = "0.1.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/azure-arm-apiapp/-/azure-arm-apiapp-0.1.3.tgz";
+      name = "azure-arm-apiapp-0.1.3.tgz";
+      sha1 = "5fcc896027965655e27b63bfba7c5592db44ee91";
+    };
+    deps = {
+      "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16";
+      "underscore-1.4.4" = self.by-version."underscore"."1.4.4";
+      "moment-2.6.0" = self.by-version."moment"."2.6.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."azure-arm-authorization"."2.0.0" =
+    self.by-version."azure-arm-authorization"."2.0.0";
+  by-version."azure-arm-authorization"."2.0.0" = self.buildNodePackage {
+    name = "azure-arm-authorization-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/azure-arm-authorization/-/azure-arm-authorization-2.0.0.tgz";
+      name = "azure-arm-authorization-2.0.0.tgz";
+      sha1 = "56b558ba43b9cb5657662251dabe3cb34c16c56f";
+    };
+    deps = {
+      "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16";
+      "underscore-1.4.4" = self.by-version."underscore"."1.4.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."azure-arm-commerce"."0.1.1" =
+    self.by-version."azure-arm-commerce"."0.1.1";
+  by-version."azure-arm-commerce"."0.1.1" = self.buildNodePackage {
+    name = "azure-arm-commerce-0.1.1";
+    version = "0.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/azure-arm-commerce/-/azure-arm-commerce-0.1.1.tgz";
+      name = "azure-arm-commerce-0.1.1.tgz";
+      sha1 = "3329693b8aba7d1b84e10ae2655d54262a1f1c59";
+    };
+    deps = {
+      "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."azure-arm-compute"."0.13.0" =
+    self.by-version."azure-arm-compute"."0.13.0";
+  by-version."azure-arm-compute"."0.13.0" = self.buildNodePackage {
+    name = "azure-arm-compute-0.13.0";
+    version = "0.13.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-0.13.0.tgz";
+      name = "azure-arm-compute-0.13.0.tgz";
+      sha1 = "0442a5f9d49d9dea8fc7391a100c916e19e0b1d9";
+    };
+    deps = {
+      "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16";
+      "underscore-1.4.4" = self.by-version."underscore"."1.4.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."azure-arm-datalake-analytics"."0.1.2" =
+    self.by-version."azure-arm-datalake-analytics"."0.1.2";
+  by-version."azure-arm-datalake-analytics"."0.1.2" = self.buildNodePackage {
+    name = "azure-arm-datalake-analytics-0.1.2";
+    version = "0.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/azure-arm-datalake-analytics/-/azure-arm-datalake-analytics-0.1.2.tgz";
+      name = "azure-arm-datalake-analytics-0.1.2.tgz";
+      sha1 = "7b8c26ba3808c220e7c1183f884d72f3e8d915a9";
+    };
+    deps = {
+      "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16";
+      "moment-2.11.1" = self.by-version."moment"."2.11.1";
+      "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
+      "underscore-1.4.4" = self.by-version."underscore"."1.4.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."azure-arm-datalake-store"."0.1.2" =
+    self.by-version."azure-arm-datalake-store"."0.1.2";
+  by-version."azure-arm-datalake-store"."0.1.2" = self.buildNodePackage {
+    name = "azure-arm-datalake-store-0.1.2";
+    version = "0.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/azure-arm-datalake-store/-/azure-arm-datalake-store-0.1.2.tgz";
+      name = "azure-arm-datalake-store-0.1.2.tgz";
+      sha1 = "dc8be199bfa4c8d4b10efe70d35a2414b8eb8d9a";
+    };
+    deps = {
+      "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16";
+      "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
+      "underscore-1.4.4" = self.by-version."underscore"."1.4.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."azure-arm-dns"."0.10.1" =
+    self.by-version."azure-arm-dns"."0.10.1";
+  by-version."azure-arm-dns"."0.10.1" = self.buildNodePackage {
+    name = "azure-arm-dns-0.10.1";
+    version = "0.10.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/azure-arm-dns/-/azure-arm-dns-0.10.1.tgz";
+      name = "azure-arm-dns-0.10.1.tgz";
+      sha1 = "8f6dded24a8b8dbc9b81f6b273970ac8ba2a0c54";
+    };
+    deps = {
+      "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."azure-arm-hdinsight"."0.1.0" =
+    self.by-version."azure-arm-hdinsight"."0.1.0";
+  by-version."azure-arm-hdinsight"."0.1.0" = self.buildNodePackage {
+    name = "azure-arm-hdinsight-0.1.0";
+    version = "0.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/azure-arm-hdinsight/-/azure-arm-hdinsight-0.1.0.tgz";
+      name = "azure-arm-hdinsight-0.1.0.tgz";
+      sha1 = "10243278ae8cca0de0d68a2cbbe0fc9119a859ef";
+    };
+    deps = {
+      "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16";
+      "underscore-1.4.4" = self.by-version."underscore"."1.4.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."azure-arm-hdinsight-jobs"."0.1.0" =
+    self.by-version."azure-arm-hdinsight-jobs"."0.1.0";
+  by-version."azure-arm-hdinsight-jobs"."0.1.0" = self.buildNodePackage {
+    name = "azure-arm-hdinsight-jobs-0.1.0";
+    version = "0.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/azure-arm-hdinsight-jobs/-/azure-arm-hdinsight-jobs-0.1.0.tgz";
+      name = "azure-arm-hdinsight-jobs-0.1.0.tgz";
+      sha1 = "252938f18d4341adf9942261656e791490c3c220";
+    };
+    deps = {
+      "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16";
+      "underscore-1.4.4" = self.by-version."underscore"."1.4.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."azure-arm-insights"."0.10.2" =
+    self.by-version."azure-arm-insights"."0.10.2";
+  by-version."azure-arm-insights"."0.10.2" = self.buildNodePackage {
+    name = "azure-arm-insights-0.10.2";
+    version = "0.10.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/azure-arm-insights/-/azure-arm-insights-0.10.2.tgz";
+      name = "azure-arm-insights-0.10.2.tgz";
+      sha1 = "3aad583c147685e35bc55fd0f013c701882fea42";
+    };
+    deps = {
+      "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16";
+      "moment-2.6.0" = self.by-version."moment"."2.6.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."azure-arm-network"."0.10.6" =
+    self.by-version."azure-arm-network"."0.10.6";
+  by-version."azure-arm-network"."0.10.6" = self.buildNodePackage {
+    name = "azure-arm-network-0.10.6";
+    version = "0.10.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/azure-arm-network/-/azure-arm-network-0.10.6.tgz";
+      name = "azure-arm-network-0.10.6.tgz";
+      sha1 = "d7e77e34fe41007a54154475185ac405e59073b3";
+    };
+    deps = {
+      "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."azure-arm-rediscache"."0.1.0" =
+    self.by-version."azure-arm-rediscache"."0.1.0";
+  by-version."azure-arm-rediscache"."0.1.0" = self.buildNodePackage {
+    name = "azure-arm-rediscache-0.1.0";
+    version = "0.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/azure-arm-rediscache/-/azure-arm-rediscache-0.1.0.tgz";
+      name = "azure-arm-rediscache-0.1.0.tgz";
+      sha1 = "2527ce57541fc5264627f93f62e4ffcfd01df498";
+    };
+    deps = {
+      "ms-rest-1.2.0" = self.by-version."ms-rest"."1.2.0";
+      "ms-rest-azure-1.2.0" = self.by-version."ms-rest-azure"."1.2.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."azure-arm-resource"."0.10.7" =
+    self.by-version."azure-arm-resource"."0.10.7";
+  by-version."azure-arm-resource"."0.10.7" = self.buildNodePackage {
+    name = "azure-arm-resource-0.10.7";
+    version = "0.10.7";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-0.10.7.tgz";
+      name = "azure-arm-resource-0.10.7.tgz";
+      sha1 = "f637acc4c1f1ea17fc52a31164c75f6b4f7c70be";
+    };
+    deps = {
+      "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16";
+      "underscore-1.4.4" = self.by-version."underscore"."1.4.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."azure-arm-storage"."0.11.0" =
+    self.by-version."azure-arm-storage"."0.11.0";
+  by-version."azure-arm-storage"."0.11.0" = self.buildNodePackage {
+    name = "azure-arm-storage-0.11.0";
+    version = "0.11.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/azure-arm-storage/-/azure-arm-storage-0.11.0.tgz";
+      name = "azure-arm-storage-0.11.0.tgz";
+      sha1 = "ba5bc8d616b835ddb6149d462a424d534ac87c95";
+    };
+    deps = {
+      "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."azure-arm-trafficmanager"."0.10.4" =
+    self.by-version."azure-arm-trafficmanager"."0.10.4";
+  by-version."azure-arm-trafficmanager"."0.10.4" = self.buildNodePackage {
+    name = "azure-arm-trafficmanager-0.10.4";
+    version = "0.10.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/azure-arm-trafficmanager/-/azure-arm-trafficmanager-0.10.4.tgz";
+      name = "azure-arm-trafficmanager-0.10.4.tgz";
+      sha1 = "f1a788c3c97c7c6f8d82cef6034bbdbe68bb29e3";
+    };
+    deps = {
+      "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."azure-arm-website"."0.10.0" =
+    self.by-version."azure-arm-website"."0.10.0";
+  by-version."azure-arm-website"."0.10.0" = self.buildNodePackage {
+    name = "azure-arm-website-0.10.0";
+    version = "0.10.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/azure-arm-website/-/azure-arm-website-0.10.0.tgz";
+      name = "azure-arm-website-0.10.0.tgz";
+      sha1 = "610400ecb801bff16b7e2d7c1c6d1fe99c4f9ec9";
+    };
+    deps = {
+      "azure-common-0.9.12" = self.by-version."azure-common"."0.9.12";
+      "underscore-1.4.4" = self.by-version."underscore"."1.4.4";
+      "moment-2.6.0" = self.by-version."moment"."2.6.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."azure-asm-compute"."0.11.0" =
+    self.by-version."azure-asm-compute"."0.11.0";
+  by-version."azure-asm-compute"."0.11.0" = self.buildNodePackage {
+    name = "azure-asm-compute-0.11.0";
+    version = "0.11.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/azure-asm-compute/-/azure-asm-compute-0.11.0.tgz";
+      name = "azure-asm-compute-0.11.0.tgz";
+      sha1 = "348ffae392ac0ce4aade50be99b8c89fd89701a0";
+    };
+    deps = {
+      "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16";
+      "underscore-1.4.4" = self.by-version."underscore"."1.4.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."azure-asm-hdinsight"."0.10.2" =
+    self.by-version."azure-asm-hdinsight"."0.10.2";
+  by-version."azure-asm-hdinsight"."0.10.2" = self.buildNodePackage {
+    name = "azure-asm-hdinsight-0.10.2";
+    version = "0.10.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/azure-asm-hdinsight/-/azure-asm-hdinsight-0.10.2.tgz";
+      name = "azure-asm-hdinsight-0.10.2.tgz";
+      sha1 = "2d11cdaaa073fc38f31c718991d5923fb7259fa0";
+    };
+    deps = {
+      "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16";
+      "underscore-1.4.4" = self.by-version."underscore"."1.4.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."azure-asm-mgmt"."0.10.1" =
+    self.by-version."azure-asm-mgmt"."0.10.1";
+  by-version."azure-asm-mgmt"."0.10.1" = self.buildNodePackage {
+    name = "azure-asm-mgmt-0.10.1";
+    version = "0.10.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/azure-asm-mgmt/-/azure-asm-mgmt-0.10.1.tgz";
+      name = "azure-asm-mgmt-0.10.1.tgz";
+      sha1 = "d0a44b47ccabf338b19d53271675733cfa2d1751";
+    };
+    deps = {
+      "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16";
+      "underscore-1.4.4" = self.by-version."underscore"."1.4.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."azure-asm-network"."0.10.2" =
+    self.by-version."azure-asm-network"."0.10.2";
+  by-version."azure-asm-network"."0.10.2" = self.buildNodePackage {
+    name = "azure-asm-network-0.10.2";
+    version = "0.10.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/azure-asm-network/-/azure-asm-network-0.10.2.tgz";
+      name = "azure-asm-network-0.10.2.tgz";
+      sha1 = "eeeffd4c3f86f67212c995213fe5d5c1ebddc651";
+    };
+    deps = {
+      "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."azure-asm-sb"."0.10.1" =
+    self.by-version."azure-asm-sb"."0.10.1";
+  by-version."azure-asm-sb"."0.10.1" = self.buildNodePackage {
+    name = "azure-asm-sb-0.10.1";
+    version = "0.10.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/azure-asm-sb/-/azure-asm-sb-0.10.1.tgz";
+      name = "azure-asm-sb-0.10.1.tgz";
+      sha1 = "92487b24166041119714f66760ec1f36e8dc7222";
+    };
+    deps = {
+      "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16";
+      "underscore-1.4.4" = self.by-version."underscore"."1.4.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."azure-asm-sql"."0.10.1" =
+    self.by-version."azure-asm-sql"."0.10.1";
+  by-version."azure-asm-sql"."0.10.1" = self.buildNodePackage {
+    name = "azure-asm-sql-0.10.1";
+    version = "0.10.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/azure-asm-sql/-/azure-asm-sql-0.10.1.tgz";
+      name = "azure-asm-sql-0.10.1.tgz";
+      sha1 = "47728df19a6d4f1cc935235c69fa9cf048cc8f42";
+    };
+    deps = {
+      "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16";
+      "underscore-1.4.4" = self.by-version."underscore"."1.4.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."azure-asm-storage"."0.10.1" =
+    self.by-version."azure-asm-storage"."0.10.1";
+  by-version."azure-asm-storage"."0.10.1" = self.buildNodePackage {
+    name = "azure-asm-storage-0.10.1";
+    version = "0.10.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/azure-asm-storage/-/azure-asm-storage-0.10.1.tgz";
+      name = "azure-asm-storage-0.10.1.tgz";
+      sha1 = "878ad15f6daee36e44f30e5cd348fb61a8f14172";
+    };
+    deps = {
+      "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."azure-asm-subscription"."0.10.1" =
+    self.by-version."azure-asm-subscription"."0.10.1";
+  by-version."azure-asm-subscription"."0.10.1" = self.buildNodePackage {
+    name = "azure-asm-subscription-0.10.1";
+    version = "0.10.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/azure-asm-subscription/-/azure-asm-subscription-0.10.1.tgz";
+      name = "azure-asm-subscription-0.10.1.tgz";
+      sha1 = "917a5e87a04b69c0f5c29339fe910bb5e5e7a04c";
+    };
+    deps = {
+      "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."azure-asm-trafficmanager"."0.10.3" =
+    self.by-version."azure-asm-trafficmanager"."0.10.3";
+  by-version."azure-asm-trafficmanager"."0.10.3" = self.buildNodePackage {
+    name = "azure-asm-trafficmanager-0.10.3";
+    version = "0.10.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/azure-asm-trafficmanager/-/azure-asm-trafficmanager-0.10.3.tgz";
+      name = "azure-asm-trafficmanager-0.10.3.tgz";
+      sha1 = "91e2e63d73869090613cd42ee38a3823e55f4447";
+    };
+    deps = {
+      "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."azure-asm-website"."0.10.1" =
+    self.by-version."azure-asm-website"."0.10.1";
+  by-version."azure-asm-website"."0.10.1" = self.buildNodePackage {
+    name = "azure-asm-website-0.10.1";
+    version = "0.10.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/azure-asm-website/-/azure-asm-website-0.10.1.tgz";
+      name = "azure-asm-website-0.10.1.tgz";
+      sha1 = "0b8fabdb460e3b36ee72836d74630cc9685f572e";
+    };
+    deps = {
+      "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16";
+      "underscore-1.4.4" = self.by-version."underscore"."1.4.4";
+      "moment-2.6.0" = self.by-version."moment"."2.6.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."azure-cli"."*" =
+    self.by-version."azure-cli"."0.9.13";
+  by-version."azure-cli"."0.9.13" = self.buildNodePackage {
+    name = "azure-cli-0.9.13";
+    version = "0.9.13";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/azure-cli/-/azure-cli-0.9.13.tgz";
+      name = "azure-cli-0.9.13.tgz";
+      sha1 = "6792c21c0b826d07759e0c7e9b718c291be1381f";
+    };
+    deps = {
+      "adal-node-0.1.17" = self.by-version."adal-node"."0.1.17";
+      "async-1.4.2" = self.by-version."async"."1.4.2";
+      "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16";
+      "azure-arm-apiapp-0.1.3" = self.by-version."azure-arm-apiapp"."0.1.3";
+      "azure-arm-authorization-2.0.0" = self.by-version."azure-arm-authorization"."2.0.0";
+      "azure-arm-commerce-0.1.1" = self.by-version."azure-arm-commerce"."0.1.1";
+      "azure-arm-compute-0.13.0" = self.by-version."azure-arm-compute"."0.13.0";
+      "azure-arm-hdinsight-0.1.0" = self.by-version."azure-arm-hdinsight"."0.1.0";
+      "azure-arm-hdinsight-jobs-0.1.0" = self.by-version."azure-arm-hdinsight-jobs"."0.1.0";
+      "azure-arm-insights-0.10.2" = self.by-version."azure-arm-insights"."0.10.2";
+      "azure-arm-network-0.10.6" = self.by-version."azure-arm-network"."0.10.6";
+      "azure-arm-trafficmanager-0.10.4" = self.by-version."azure-arm-trafficmanager"."0.10.4";
+      "azure-arm-dns-0.10.1" = self.by-version."azure-arm-dns"."0.10.1";
+      "azure-arm-website-0.10.0" = self.by-version."azure-arm-website"."0.10.0";
+      "azure-arm-rediscache-0.1.0" = self.by-version."azure-arm-rediscache"."0.1.0";
+      "azure-arm-datalake-analytics-0.1.2" = self.by-version."azure-arm-datalake-analytics"."0.1.2";
+      "azure-arm-datalake-store-0.1.2" = self.by-version."azure-arm-datalake-store"."0.1.2";
+      "azure-extra-0.1.12" = self.by-version."azure-extra"."0.1.12";
+      "azure-gallery-2.0.0-pre.18" = self.by-version."azure-gallery"."2.0.0-pre.18";
+      "azure-keyvault-0.10.1" = self.by-version."azure-keyvault"."0.10.1";
+      "azure-asm-compute-0.11.0" = self.by-version."azure-asm-compute"."0.11.0";
+      "azure-asm-hdinsight-0.10.2" = self.by-version."azure-asm-hdinsight"."0.10.2";
+      "azure-asm-trafficmanager-0.10.3" = self.by-version."azure-asm-trafficmanager"."0.10.3";
+      "azure-asm-mgmt-0.10.1" = self.by-version."azure-asm-mgmt"."0.10.1";
+      "azure-monitoring-0.10.2" = self.by-version."azure-monitoring"."0.10.2";
+      "azure-asm-network-0.10.2" = self.by-version."azure-asm-network"."0.10.2";
+      "azure-arm-resource-0.10.7" = self.by-version."azure-arm-resource"."0.10.7";
+      "azure-arm-storage-0.11.0" = self.by-version."azure-arm-storage"."0.11.0";
+      "azure-asm-sb-0.10.1" = self.by-version."azure-asm-sb"."0.10.1";
+      "azure-asm-sql-0.10.1" = self.by-version."azure-asm-sql"."0.10.1";
+      "azure-asm-storage-0.10.1" = self.by-version."azure-asm-storage"."0.10.1";
+      "azure-asm-subscription-0.10.1" = self.by-version."azure-asm-subscription"."0.10.1";
+      "azure-asm-website-0.10.1" = self.by-version."azure-asm-website"."0.10.1";
+      "azure-storage-0.6.0" = self.by-version."azure-storage"."0.6.0";
+      "caller-id-0.1.0" = self.by-version."caller-id"."0.1.0";
+      "colors-0.6.2" = self.by-version."colors"."0.6.2";
+      "commander-1.0.4" = self.by-version."commander"."1.0.4";
+      "easy-table-0.0.1" = self.by-version."easy-table"."0.0.1";
+      "event-stream-3.1.5" = self.by-version."event-stream"."3.1.5";
+      "eyes-0.1.8" = self.by-version."eyes"."0.1.8";
+      "github-0.1.6" = self.by-version."github"."0.1.6";
+      "image-size-0.3.5" = self.by-version."image-size"."0.3.5";
+      "js2xmlparser-1.0.0" = self.by-version."js2xmlparser"."1.0.0";
+      "jsrsasign-4.8.2" = self.by-version."jsrsasign"."4.8.2";
+      "jszip-2.5.0" = self.by-version."jszip"."2.5.0";
+      "kuduscript-1.0.6" = self.by-version."kuduscript"."1.0.6";
+      "mime-1.2.11" = self.by-version."mime"."1.2.11";
+      "moment-2.6.0" = self.by-version."moment"."2.6.0";
+      "ms-rest-azure-1.2.0" = self.by-version."ms-rest-azure"."1.2.0";
+      "node-forge-0.6.23" = self.by-version."node-forge"."0.6.23";
+      "node-uuid-1.2.0" = self.by-version."node-uuid"."1.2.0";
+      "number-is-nan-1.0.0" = self.by-version."number-is-nan"."1.0.0";
+      "omelette-0.1.0" = self.by-version."omelette"."0.1.0";
+      "openssl-wrapper-0.2.1" = self.by-version."openssl-wrapper"."0.2.1";
+      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
+      "request-2.52.0" = self.by-version."request"."2.52.0";
+      "ssh-key-to-pem-0.11.0" = self.by-version."ssh-key-to-pem"."0.11.0";
+      "streamline-0.10.17" = self.by-version."streamline"."0.10.17";
+      "streamline-streams-0.1.5" = self.by-version."streamline-streams"."0.1.5";
+      "swagger-schema-official-2.0.0-a33091a" = self.by-version."swagger-schema-official"."2.0.0-a33091a";
+      "through-2.3.4" = self.by-version."through"."2.3.4";
+      "tmp-0.0.25" = self.by-version."tmp"."0.0.25";
+      "tunnel-0.0.2" = self.by-version."tunnel"."0.0.2";
+      "tv4-1.2.7" = self.by-version."tv4"."1.2.7";
+      "underscore-1.4.4" = self.by-version."underscore"."1.4.4";
+      "validator-3.1.0" = self.by-version."validator"."3.1.0";
+      "walk-2.3.9" = self.by-version."walk"."2.3.9";
+      "winston-0.6.2" = self.by-version."winston"."0.6.2";
+      "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2";
+      "xml2js-0.1.14" = self.by-version."xml2js"."0.1.14";
+      "xmlbuilder-0.4.3" = self.by-version."xmlbuilder"."0.4.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "azure-cli" = self.by-version."azure-cli"."0.9.13";
+  by-spec."azure-common"."0.9.12" =
+    self.by-version."azure-common"."0.9.12";
+  by-version."azure-common"."0.9.12" = self.buildNodePackage {
+    name = "azure-common-0.9.12";
+    version = "0.9.12";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/azure-common/-/azure-common-0.9.12.tgz";
+      name = "azure-common-0.9.12.tgz";
+      sha1 = "8ca8167c2dbaa43b61e3caa9c7d98e78908749f6";
+    };
+    deps = {
+      "xml2js-0.2.7" = self.by-version."xml2js"."0.2.7";
+      "xmlbuilder-0.4.3" = self.by-version."xmlbuilder"."0.4.3";
+      "dateformat-1.0.2-1.2.3" = self.by-version."dateformat"."1.0.2-1.2.3";
+      "underscore-1.4.4" = self.by-version."underscore"."1.4.4";
+      "tunnel-0.0.3" = self.by-version."tunnel"."0.0.3";
+      "request-2.45.0" = self.by-version."request"."2.45.0";
+      "validator-3.1.0" = self.by-version."validator"."3.1.0";
+      "envconf-0.0.4" = self.by-version."envconf"."0.0.4";
+      "duplexer-0.1.1" = self.by-version."duplexer"."0.1.1";
+      "through-2.3.8" = self.by-version."through"."2.3.8";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."azure-common"."0.9.16" =
+    self.by-version."azure-common"."0.9.16";
+  by-version."azure-common"."0.9.16" = self.buildNodePackage {
+    name = "azure-common-0.9.16";
+    version = "0.9.16";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/azure-common/-/azure-common-0.9.16.tgz";
+      name = "azure-common-0.9.16.tgz";
+      sha1 = "0158ce02f7341d08f4146e3e232e3c327d10ac6e";
+    };
+    deps = {
+      "xml2js-0.2.7" = self.by-version."xml2js"."0.2.7";
+      "xmlbuilder-0.4.3" = self.by-version."xmlbuilder"."0.4.3";
+      "dateformat-1.0.2-1.2.3" = self.by-version."dateformat"."1.0.2-1.2.3";
+      "underscore-1.4.4" = self.by-version."underscore"."1.4.4";
+      "tunnel-0.0.3" = self.by-version."tunnel"."0.0.3";
+      "request-2.45.0" = self.by-version."request"."2.45.0";
+      "validator-3.22.2" = self.by-version."validator"."3.22.2";
+      "envconf-0.0.4" = self.by-version."envconf"."0.0.4";
+      "duplexer-0.1.1" = self.by-version."duplexer"."0.1.1";
+      "through-2.3.8" = self.by-version."through"."2.3.8";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."azure-common"."^0.9.10" =
+    self.by-version."azure-common"."0.9.16";
+  by-spec."azure-common"."^0.9.13" =
+    self.by-version."azure-common"."0.9.16";
+  by-spec."azure-extra"."0.1.12" =
+    self.by-version."azure-extra"."0.1.12";
+  by-version."azure-extra"."0.1.12" = self.buildNodePackage {
+    name = "azure-extra-0.1.12";
+    version = "0.1.12";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/azure-extra/-/azure-extra-0.1.12.tgz";
+      name = "azure-extra-0.1.12.tgz";
+      sha1 = "78a0c3b65e981df59e23428b56172f6337a8920a";
+    };
+    deps = {
+      "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16";
+      "underscore-1.4.4" = self.by-version."underscore"."1.4.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."azure-gallery"."2.0.0-pre.18" =
+    self.by-version."azure-gallery"."2.0.0-pre.18";
+  by-version."azure-gallery"."2.0.0-pre.18" = self.buildNodePackage {
+    name = "azure-gallery-2.0.0-pre.18";
+    version = "2.0.0-pre.18";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/azure-gallery/-/azure-gallery-2.0.0-pre.18.tgz";
+      name = "azure-gallery-2.0.0-pre.18.tgz";
+      sha1 = "3cd4c5e4e0091551d6a5ee757af2354c8a36b3e6";
+    };
+    deps = {
+      "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16";
+      "underscore-1.4.4" = self.by-version."underscore"."1.4.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."azure-keyvault"."0.10.1" =
+    self.by-version."azure-keyvault"."0.10.1";
+  by-version."azure-keyvault"."0.10.1" = self.buildNodePackage {
+    name = "azure-keyvault-0.10.1";
+    version = "0.10.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/azure-keyvault/-/azure-keyvault-0.10.1.tgz";
+      name = "azure-keyvault-0.10.1.tgz";
+      sha1 = "b3899d04b5115a22b794a9e83f89201a66c83855";
+    };
+    deps = {
+      "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16";
+      "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
+      "underscore-1.4.4" = self.by-version."underscore"."1.4.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."azure-monitoring"."0.10.2" =
+    self.by-version."azure-monitoring"."0.10.2";
+  by-version."azure-monitoring"."0.10.2" = self.buildNodePackage {
+    name = "azure-monitoring-0.10.2";
+    version = "0.10.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/azure-monitoring/-/azure-monitoring-0.10.2.tgz";
+      name = "azure-monitoring-0.10.2.tgz";
+      sha1 = "2b7d493306747b43e4e2dcad44d65328e6c3cf57";
+    };
+    deps = {
+      "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16";
+      "underscore-1.4.4" = self.by-version."underscore"."1.4.4";
+      "moment-2.6.0" = self.by-version."moment"."2.6.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."azure-storage"."0.6.0" =
+    self.by-version."azure-storage"."0.6.0";
+  by-version."azure-storage"."0.6.0" = self.buildNodePackage {
+    name = "azure-storage-0.6.0";
+    version = "0.6.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/azure-storage/-/azure-storage-0.6.0.tgz";
+      name = "azure-storage-0.6.0.tgz";
+      sha1 = "e856c2069d1a9a6926936d70d6854d69230e7b4a";
+    };
+    deps = {
+      "extend-1.2.1" = self.by-version."extend"."1.2.1";
+      "mime-1.2.11" = self.by-version."mime"."1.2.11";
+      "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
+      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
+      "request-2.57.0" = self.by-version."request"."2.57.0";
+      "underscore-1.4.4" = self.by-version."underscore"."1.4.4";
+      "validator-3.22.2" = self.by-version."validator"."3.22.2";
+      "xml2js-0.2.7" = self.by-version."xml2js"."0.2.7";
+      "xmlbuilder-0.4.3" = self.by-version."xmlbuilder"."0.4.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."base64-url"."^1.2.1" =
+    self.by-version."base64-url"."1.2.1";
+  by-version."base64-url"."1.2.1" = self.buildNodePackage {
+    name = "base64-url-1.2.1";
+    version = "1.2.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/base64-url/-/base64-url-1.2.1.tgz";
+      name = "base64-url-1.2.1.tgz";
+      sha1 = "199fd661702a0e7b7dcae6e0698bb089c52f6d78";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."base64url"."~0.0.4" =
+    self.by-version."base64url"."0.0.6";
+  by-version."base64url"."0.0.6" = self.buildNodePackage {
+    name = "base64url-0.0.6";
+    version = "0.0.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/base64url/-/base64url-0.0.6.tgz";
+      name = "base64url-0.0.6.tgz";
+      sha1 = "9597b36b330db1c42477322ea87ea8027499b82b";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."base64url"."~1.0.4" =
+    self.by-version."base64url"."1.0.5";
+  by-version."base64url"."1.0.5" = self.buildNodePackage {
+    name = "base64url-1.0.5";
+    version = "1.0.5";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/base64url/-/base64url-1.0.5.tgz";
+      name = "base64url-1.0.5.tgz";
+      sha1 = "c54bcb4f9a2b7da422bca549e71c1640b533b825";
+    };
+    deps = {
+      "concat-stream-1.4.10" = self.by-version."concat-stream"."1.4.10";
+      "meow-2.0.0" = self.by-version."meow"."2.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."bl"."~0.9.0" =
+    self.by-version."bl"."0.9.4";
+  by-version."bl"."0.9.4" = self.buildNodePackage {
+    name = "bl-0.9.4";
+    version = "0.9.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bl/-/bl-0.9.4.tgz";
+      name = "bl-0.9.4.tgz";
+      sha1 = "4702ddf72fbe0ecd82787c00c113aea1935ad0e7";
+    };
+    deps = {
+      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."bl"."~1.0.0" =
+    self.by-version."bl"."1.0.0";
+  by-version."bl"."1.0.0" = self.buildNodePackage {
+    name = "bl-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bl/-/bl-1.0.0.tgz";
+      name = "bl-1.0.0.tgz";
+      sha1 = "ada9a8a89a6d7ac60862f7dec7db207873e0c3f5";
+    };
+    deps = {
+      "readable-stream-2.0.5" = self.by-version."readable-stream"."2.0.5";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."bluebird"."^2.9.30" =
+    self.by-version."bluebird"."2.10.2";
+  by-version."bluebird"."2.10.2" = self.buildNodePackage {
+    name = "bluebird-2.10.2";
+    version = "2.10.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bluebird/-/bluebird-2.10.2.tgz";
+      name = "bluebird-2.10.2.tgz";
+      sha1 = "024a5517295308857f14f91f1106fc3b555f446b";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."bn.js"."^2.0.0" =
+    self.by-version."bn.js"."2.2.0";
+  by-version."bn.js"."2.2.0" = self.buildNodePackage {
+    name = "bn.js-2.2.0";
+    version = "2.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bn.js/-/bn.js-2.2.0.tgz";
+      name = "bn.js-2.2.0.tgz";
+      sha1 = "12162bc2ae71fc40a5626c33438f3a875cd37625";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."boom"."0.4.x" =
+    self.by-version."boom"."0.4.2";
+  by-version."boom"."0.4.2" = self.buildNodePackage {
+    name = "boom-0.4.2";
+    version = "0.4.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/boom/-/boom-0.4.2.tgz";
+      name = "boom-0.4.2.tgz";
+      sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b";
+    };
+    deps = {
+      "hoek-0.9.1" = self.by-version."hoek"."0.9.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."boom"."2.x.x" =
+    self.by-version."boom"."2.10.1";
+  by-version."boom"."2.10.1" = self.buildNodePackage {
+    name = "boom-2.10.1";
+    version = "2.10.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/boom/-/boom-2.10.1.tgz";
+      name = "boom-2.10.1.tgz";
+      sha1 = "39c8918ceff5799f83f9492a848f625add0c766f";
+    };
+    deps = {
+      "hoek-2.16.3" = self.by-version."hoek"."2.16.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."buffer-equal-constant-time"."^1.0.1" =
+    self.by-version."buffer-equal-constant-time"."1.0.1";
+  by-version."buffer-equal-constant-time"."1.0.1" = self.buildNodePackage {
+    name = "buffer-equal-constant-time-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz";
+      name = "buffer-equal-constant-time-1.0.1.tgz";
+      sha1 = "f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."caller-id"."0.1.x" =
+    self.by-version."caller-id"."0.1.0";
+  by-version."caller-id"."0.1.0" = self.buildNodePackage {
+    name = "caller-id-0.1.0";
+    version = "0.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/caller-id/-/caller-id-0.1.0.tgz";
+      name = "caller-id-0.1.0.tgz";
+      sha1 = "59bdac0893d12c3871408279231f97458364f07b";
+    };
+    deps = {
+      "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."camelcase"."^1.0.1" =
+    self.by-version."camelcase"."1.2.1";
+  by-version."camelcase"."1.2.1" = self.buildNodePackage {
+    name = "camelcase-1.2.1";
+    version = "1.2.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz";
+      name = "camelcase-1.2.1.tgz";
+      sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."camelcase-keys"."^1.0.0" =
+    self.by-version."camelcase-keys"."1.0.0";
+  by-version."camelcase-keys"."1.0.0" = self.buildNodePackage {
+    name = "camelcase-keys-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz";
+      name = "camelcase-keys-1.0.0.tgz";
+      sha1 = "bd1a11bf9b31a1ce493493a930de1a0baf4ad7ec";
+    };
+    deps = {
+      "camelcase-1.2.1" = self.by-version."camelcase"."1.2.1";
+      "map-obj-1.0.1" = self.by-version."map-obj"."1.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."caseless"."~0.10.0" =
+    self.by-version."caseless"."0.10.0";
+  by-version."caseless"."0.10.0" = self.buildNodePackage {
+    name = "caseless-0.10.0";
+    version = "0.10.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/caseless/-/caseless-0.10.0.tgz";
+      name = "caseless-0.10.0.tgz";
+      sha1 = "ed6b2719adcd1fd18f58dc081c0f1a5b43963909";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."caseless"."~0.11.0" =
+    self.by-version."caseless"."0.11.0";
+  by-version."caseless"."0.11.0" = self.buildNodePackage {
+    name = "caseless-0.11.0";
+    version = "0.11.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz";
+      name = "caseless-0.11.0.tgz";
+      sha1 = "715b96ea9841593cc33067923f5ec60ebda4f7d7";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."caseless"."~0.6.0" =
+    self.by-version."caseless"."0.6.0";
+  by-version."caseless"."0.6.0" = self.buildNodePackage {
+    name = "caseless-0.6.0";
+    version = "0.6.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/caseless/-/caseless-0.6.0.tgz";
+      name = "caseless-0.6.0.tgz";
+      sha1 = "8167c1ab8397fb5bb95f96d28e5a81c50f247ac4";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."caseless"."~0.9.0" =
+    self.by-version."caseless"."0.9.0";
+  by-version."caseless"."0.9.0" = self.buildNodePackage {
+    name = "caseless-0.9.0";
+    version = "0.9.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/caseless/-/caseless-0.9.0.tgz";
+      name = "caseless-0.9.0.tgz";
+      sha1 = "b7b65ce6bf1413886539cfd533f0b30effa9cf88";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."chalk"."^1.0.0" =
+    self.by-version."chalk"."1.1.1";
+  by-version."chalk"."1.1.1" = self.buildNodePackage {
+    name = "chalk-1.1.1";
+    version = "1.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz";
+      name = "chalk-1.1.1.tgz";
+      sha1 = "509afb67066e7499f7eb3535c77445772ae2d019";
+    };
+    deps = {
+      "ansi-styles-2.1.0" = self.by-version."ansi-styles"."2.1.0";
+      "escape-string-regexp-1.0.4" = self.by-version."escape-string-regexp"."1.0.4";
+      "has-ansi-2.0.0" = self.by-version."has-ansi"."2.0.0";
+      "strip-ansi-3.0.0" = self.by-version."strip-ansi"."3.0.0";
+      "supports-color-2.0.0" = self.by-version."supports-color"."2.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."chalk"."^1.1.1" =
+    self.by-version."chalk"."1.1.1";
+  by-spec."colors"."0.x.x" =
+    self.by-version."colors"."0.6.2";
+  by-version."colors"."0.6.2" = self.buildNodePackage {
+    name = "colors-0.6.2";
+    version = "0.6.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/colors/-/colors-0.6.2.tgz";
+      name = "colors-0.6.2.tgz";
+      sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."combined-stream"."^1.0.5" =
+    self.by-version."combined-stream"."1.0.5";
+  by-version."combined-stream"."1.0.5" = self.buildNodePackage {
+    name = "combined-stream-1.0.5";
+    version = "1.0.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz";
+      name = "combined-stream-1.0.5.tgz";
+      sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009";
+    };
+    deps = {
+      "delayed-stream-1.0.0" = self.by-version."delayed-stream"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."combined-stream"."~0.0.4" =
+    self.by-version."combined-stream"."0.0.7";
+  by-version."combined-stream"."0.0.7" = self.buildNodePackage {
+    name = "combined-stream-0.0.7";
+    version = "0.0.7";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz";
+      name = "combined-stream-0.0.7.tgz";
+      sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f";
+    };
+    deps = {
+      "delayed-stream-0.0.5" = self.by-version."delayed-stream"."0.0.5";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."combined-stream"."~0.0.5" =
+    self.by-version."combined-stream"."0.0.7";
+  by-spec."combined-stream"."~1.0.1" =
+    self.by-version."combined-stream"."1.0.5";
+  by-spec."combined-stream"."~1.0.5" =
+    self.by-version."combined-stream"."1.0.5";
+  by-spec."commander"."1.0.4" =
+    self.by-version."commander"."1.0.4";
+  by-version."commander"."1.0.4" = self.buildNodePackage {
+    name = "commander-1.0.4";
+    version = "1.0.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/commander/-/commander-1.0.4.tgz";
+      name = "commander-1.0.4.tgz";
+      sha1 = "5edeb1aee23c4fb541a6b70d692abef19669a2d3";
+    };
+    deps = {
+      "keypress-0.1.0" = self.by-version."keypress"."0.1.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."commander"."^2.8.1" =
+    self.by-version."commander"."2.9.0";
+  by-version."commander"."2.9.0" = self.buildNodePackage {
+    name = "commander-2.9.0";
+    version = "2.9.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/commander/-/commander-2.9.0.tgz";
+      name = "commander-2.9.0.tgz";
+      sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4";
+    };
+    deps = {
+      "graceful-readlink-1.0.1" = self.by-version."graceful-readlink"."1.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."commander"."^2.9.0" =
+    self.by-version."commander"."2.9.0";
+  by-spec."commander"."~1.1.1" =
+    self.by-version."commander"."1.1.1";
+  by-version."commander"."1.1.1" = self.buildNodePackage {
+    name = "commander-1.1.1";
+    version = "1.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/commander/-/commander-1.1.1.tgz";
+      name = "commander-1.1.1.tgz";
+      sha1 = "50d1651868ae60eccff0a2d9f34595376bc6b041";
+    };
+    deps = {
+      "keypress-0.1.0" = self.by-version."keypress"."0.1.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."concat-stream"."~1.4.7" =
+    self.by-version."concat-stream"."1.4.10";
+  by-version."concat-stream"."1.4.10" = self.buildNodePackage {
+    name = "concat-stream-1.4.10";
+    version = "1.4.10";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/concat-stream/-/concat-stream-1.4.10.tgz";
+      name = "concat-stream-1.4.10.tgz";
+      sha1 = "acc3bbf5602cb8cc980c6ac840fa7d8603e3ef36";
+    };
+    deps = {
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "typedarray-0.0.6" = self.by-version."typedarray"."0.0.6";
+      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."core-util-is"."~1.0.0" =
+    self.by-version."core-util-is"."1.0.2";
+  by-version."core-util-is"."1.0.2" = self.buildNodePackage {
+    name = "core-util-is-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz";
+      name = "core-util-is-1.0.2.tgz";
+      sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."cryptiles"."0.2.x" =
+    self.by-version."cryptiles"."0.2.2";
+  by-version."cryptiles"."0.2.2" = self.buildNodePackage {
+    name = "cryptiles-0.2.2";
+    version = "0.2.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz";
+      name = "cryptiles-0.2.2.tgz";
+      sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c";
+    };
+    deps = {
+      "boom-0.4.2" = self.by-version."boom"."0.4.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."cryptiles"."2.x.x" =
+    self.by-version."cryptiles"."2.0.5";
+  by-version."cryptiles"."2.0.5" = self.buildNodePackage {
+    name = "cryptiles-2.0.5";
+    version = "2.0.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz";
+      name = "cryptiles-2.0.5.tgz";
+      sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8";
+    };
+    deps = {
+      "boom-2.10.1" = self.by-version."boom"."2.10.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ctype"."0.5.2" =
+    self.by-version."ctype"."0.5.2";
+  by-version."ctype"."0.5.2" = self.buildNodePackage {
+    name = "ctype-0.5.2";
+    version = "0.5.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz";
+      name = "ctype-0.5.2.tgz";
+      sha1 = "fe8091d468a373a0b0c9ff8bbfb3425c00973a1d";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ctype"."0.5.3" =
+    self.by-version."ctype"."0.5.3";
+  by-version."ctype"."0.5.3" = self.buildNodePackage {
+    name = "ctype-0.5.3";
+    version = "0.5.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz";
+      name = "ctype-0.5.3.tgz";
+      sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."cycle"."1.0.x" =
+    self.by-version."cycle"."1.0.3";
+  by-version."cycle"."1.0.3" = self.buildNodePackage {
+    name = "cycle-1.0.3";
+    version = "1.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz";
+      name = "cycle-1.0.3.tgz";
+      sha1 = "21e80b2be8580f98b468f379430662b046c34ad2";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."dashdash".">=1.10.1 <2.0.0" =
+    self.by-version."dashdash"."1.12.1";
+  by-version."dashdash"."1.12.1" = self.buildNodePackage {
+    name = "dashdash-1.12.1";
+    version = "1.12.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/dashdash/-/dashdash-1.12.1.tgz";
+      name = "dashdash-1.12.1.tgz";
+      sha1 = "ed5fd0f9d2dc189e1fbf11e40f6a412167203b6a";
+    };
+    deps = {
+      "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."date-utils"."*" =
+    self.by-version."date-utils"."1.2.17";
+  by-version."date-utils"."1.2.17" = self.buildNodePackage {
+    name = "date-utils-1.2.17";
+    version = "1.2.17";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/date-utils/-/date-utils-1.2.17.tgz";
+      name = "date-utils-1.2.17.tgz";
+      sha1 = "b469652478afc2647917ec1c7c00d9c371f2ad53";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."dateformat"."1.0.2-1.2.3" =
+    self.by-version."dateformat"."1.0.2-1.2.3";
+  by-version."dateformat"."1.0.2-1.2.3" = self.buildNodePackage {
+    name = "dateformat-1.0.2-1.2.3";
+    version = "1.0.2-1.2.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/dateformat/-/dateformat-1.0.2-1.2.3.tgz";
+      name = "dateformat-1.0.2-1.2.3.tgz";
+      sha1 = "b0220c02de98617433b72851cf47de3df2cdbee9";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."debug"."~0.7.2" =
+    self.by-version."debug"."0.7.4";
+  by-version."debug"."0.7.4" = self.buildNodePackage {
+    name = "debug-0.7.4";
+    version = "0.7.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/debug/-/debug-0.7.4.tgz";
+      name = "debug-0.7.4.tgz";
+      sha1 = "06e1ea8082c2cb14e39806e22e2f6f757f92af39";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."delayed-stream"."0.0.5" =
+    self.by-version."delayed-stream"."0.0.5";
+  by-version."delayed-stream"."0.0.5" = self.buildNodePackage {
+    name = "delayed-stream-0.0.5";
+    version = "0.0.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz";
+      name = "delayed-stream-0.0.5.tgz";
+      sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."delayed-stream"."~1.0.0" =
+    self.by-version."delayed-stream"."1.0.0";
+  by-version."delayed-stream"."1.0.0" = self.buildNodePackage {
+    name = "delayed-stream-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz";
+      name = "delayed-stream-1.0.0.tgz";
+      sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."duplexer"."~0.1.1" =
+    self.by-version."duplexer"."0.1.1";
+  by-version."duplexer"."0.1.1" = self.buildNodePackage {
+    name = "duplexer-0.1.1";
+    version = "0.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz";
+      name = "duplexer-0.1.1.tgz";
+      sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."easy-table"."0.0.1" =
+    self.by-version."easy-table"."0.0.1";
+  by-version."easy-table"."0.0.1" = self.buildNodePackage {
+    name = "easy-table-0.0.1";
+    version = "0.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/easy-table/-/easy-table-0.0.1.tgz";
+      name = "easy-table-0.0.1.tgz";
+      sha1 = "dbd809177a1dd7afc06b4849d1ca7eff13e299eb";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ecc-jsbn".">=0.0.1 <1.0.0" =
+    self.by-version."ecc-jsbn"."0.1.1";
+  by-version."ecc-jsbn"."0.1.1" = self.buildNodePackage {
+    name = "ecc-jsbn-0.1.1";
+    version = "0.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz";
+      name = "ecc-jsbn-0.1.1.tgz";
+      sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505";
+    };
+    deps = {
+      "jsbn-0.1.0" = self.by-version."jsbn"."0.1.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ecdsa-sig-formatter"."^1.0.0" =
+    self.by-version."ecdsa-sig-formatter"."1.0.2";
+  by-version."ecdsa-sig-formatter"."1.0.2" = self.buildNodePackage {
+    name = "ecdsa-sig-formatter-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.2.tgz";
+      name = "ecdsa-sig-formatter-1.0.2.tgz";
+      sha1 = "2074b4bd06be5e7479c9f71e73358bc3deea4a9b";
+    };
+    deps = {
+      "asn1.js-2.2.1" = self.by-version."asn1.js"."2.2.1";
+      "base64-url-1.2.1" = self.by-version."base64-url"."1.2.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."envconf"."~0.0.4" =
+    self.by-version."envconf"."0.0.4";
+  by-version."envconf"."0.0.4" = self.buildNodePackage {
+    name = "envconf-0.0.4";
+    version = "0.0.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/envconf/-/envconf-0.0.4.tgz";
+      name = "envconf-0.0.4.tgz";
+      sha1 = "85675afba237c43f98de2d46adc0e532a4dcf48b";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."escape-string-regexp"."^1.0.2" =
+    self.by-version."escape-string-regexp"."1.0.4";
+  by-version."escape-string-regexp"."1.0.4" = self.buildNodePackage {
+    name = "escape-string-regexp-1.0.4";
+    version = "1.0.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.4.tgz";
+      name = "escape-string-regexp-1.0.4.tgz";
+      sha1 = "b85e679b46f72d03fbbe8a3bf7259d535c21b62f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."event-stream"."3.1.5" =
+    self.by-version."event-stream"."3.1.5";
+  by-version."event-stream"."3.1.5" = self.buildNodePackage {
+    name = "event-stream-3.1.5";
+    version = "3.1.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/event-stream/-/event-stream-3.1.5.tgz";
+      name = "event-stream-3.1.5.tgz";
+      sha1 = "6cba5a3ae02a7e4967d65ad04ef12502a2fff66c";
+    };
+    deps = {
+      "through-2.3.8" = self.by-version."through"."2.3.8";
+      "duplexer-0.1.1" = self.by-version."duplexer"."0.1.1";
+      "from-0.1.3" = self.by-version."from"."0.1.3";
+      "map-stream-0.1.0" = self.by-version."map-stream"."0.1.0";
+      "pause-stream-0.0.11" = self.by-version."pause-stream"."0.0.11";
+      "split-0.2.10" = self.by-version."split"."0.2.10";
+      "stream-combiner-0.0.4" = self.by-version."stream-combiner"."0.0.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."extend"."~1.2.1" =
+    self.by-version."extend"."1.2.1";
+  by-version."extend"."1.2.1" = self.buildNodePackage {
+    name = "extend-1.2.1";
+    version = "1.2.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/extend/-/extend-1.2.1.tgz";
+      name = "extend-1.2.1.tgz";
+      sha1 = "a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."extend"."~3.0.0" =
+    self.by-version."extend"."3.0.0";
+  by-version."extend"."3.0.0" = self.buildNodePackage {
+    name = "extend-3.0.0";
+    version = "3.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/extend/-/extend-3.0.0.tgz";
+      name = "extend-3.0.0.tgz";
+      sha1 = "5a474353b9f3353ddd8176dfd37b91c83a46f1d4";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."extsprintf"."1.0.2" =
+    self.by-version."extsprintf"."1.0.2";
+  by-version."extsprintf"."1.0.2" = self.buildNodePackage {
+    name = "extsprintf-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz";
+      name = "extsprintf-1.0.2.tgz";
+      sha1 = "e1080e0658e300b06294990cc70e1502235fd550";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."eyes"."0.1.x" =
+    self.by-version."eyes"."0.1.8";
+  by-version."eyes"."0.1.8" = self.buildNodePackage {
+    name = "eyes-0.1.8";
+    version = "0.1.8";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz";
+      name = "eyes-0.1.8.tgz";
+      sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."eyes"."0.x.x" =
+    self.by-version."eyes"."0.1.8";
+  by-spec."fibers"."^1.0.1" =
+    self.by-version."fibers"."1.0.8";
+  by-version."fibers"."1.0.8" = self.buildNodePackage {
+    name = "fibers-1.0.8";
+    version = "1.0.8";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/fibers/-/fibers-1.0.8.tgz";
+      name = "fibers-1.0.8.tgz";
+      sha1 = "cbffda427c4e588a6f8601c2a07d134b092077f2";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."foreachasync"."^3.0.0" =
+    self.by-version."foreachasync"."3.0.0";
+  by-version."foreachasync"."3.0.0" = self.buildNodePackage {
+    name = "foreachasync-3.0.0";
+    version = "3.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/foreachasync/-/foreachasync-3.0.0.tgz";
+      name = "foreachasync-3.0.0.tgz";
+      sha1 = "5502987dc8714be3392097f32e0071c9dee07cf6";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."forever-agent"."~0.5.0" =
+    self.by-version."forever-agent"."0.5.2";
+  by-version."forever-agent"."0.5.2" = self.buildNodePackage {
+    name = "forever-agent-0.5.2";
+    version = "0.5.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz";
+      name = "forever-agent-0.5.2.tgz";
+      sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."forever-agent"."~0.6.0" =
+    self.by-version."forever-agent"."0.6.1";
+  by-version."forever-agent"."0.6.1" = self.buildNodePackage {
+    name = "forever-agent-0.6.1";
+    version = "0.6.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz";
+      name = "forever-agent-0.6.1.tgz";
+      sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."forever-agent"."~0.6.1" =
+    self.by-version."forever-agent"."0.6.1";
+  by-spec."form-data"."~0.1.0" =
+    self.by-version."form-data"."0.1.4";
+  by-version."form-data"."0.1.4" = self.buildNodePackage {
+    name = "form-data-0.1.4";
+    version = "0.1.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz";
+      name = "form-data-0.1.4.tgz";
+      sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12";
+    };
+    deps = {
+      "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
+      "mime-1.2.11" = self.by-version."mime"."1.2.11";
+      "async-0.9.2" = self.by-version."async"."0.9.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."form-data"."~0.2.0" =
+    self.by-version."form-data"."0.2.0";
+  by-version."form-data"."0.2.0" = self.buildNodePackage {
+    name = "form-data-0.2.0";
+    version = "0.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz";
+      name = "form-data-0.2.0.tgz";
+      sha1 = "26f8bc26da6440e299cbdcfb69035c4f77a6e466";
+    };
+    deps = {
+      "async-0.9.2" = self.by-version."async"."0.9.2";
+      "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
+      "mime-types-2.0.14" = self.by-version."mime-types"."2.0.14";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."form-data"."~1.0.0-rc3" =
+    self.by-version."form-data"."1.0.0-rc3";
+  by-version."form-data"."1.0.0-rc3" = self.buildNodePackage {
+    name = "form-data-1.0.0-rc3";
+    version = "1.0.0-rc3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz";
+      name = "form-data-1.0.0-rc3.tgz";
+      sha1 = "d35bc62e7fbc2937ae78f948aaa0d38d90607577";
+    };
+    deps = {
+      "async-1.5.2" = self.by-version."async"."1.5.2";
+      "combined-stream-1.0.5" = self.by-version."combined-stream"."1.0.5";
+      "mime-types-2.1.9" = self.by-version."mime-types"."2.1.9";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."from"."~0" =
+    self.by-version."from"."0.1.3";
+  by-version."from"."0.1.3" = self.buildNodePackage {
+    name = "from-0.1.3";
+    version = "0.1.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/from/-/from-0.1.3.tgz";
+      name = "from-0.1.3.tgz";
+      sha1 = "ef63ac2062ac32acf7862e0d40b44b896f22f3bc";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."galaxy"."^0.1.11" =
+    self.by-version."galaxy"."0.1.12";
+  by-version."galaxy"."0.1.12" = self.buildNodePackage {
+    name = "galaxy-0.1.12";
+    version = "0.1.12";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/galaxy/-/galaxy-0.1.12.tgz";
+      name = "galaxy-0.1.12.tgz";
+      sha1 = "0c989774f2870c69378aa665648cdc60f343aa53";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."generate-function"."^2.0.0" =
+    self.by-version."generate-function"."2.0.0";
+  by-version."generate-function"."2.0.0" = self.buildNodePackage {
+    name = "generate-function-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz";
+      name = "generate-function-2.0.0.tgz";
+      sha1 = "6858fe7c0969b7d4e9093337647ac79f60dfbe74";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."generate-object-property"."^1.1.0" =
+    self.by-version."generate-object-property"."1.2.0";
+  by-version."generate-object-property"."1.2.0" = self.buildNodePackage {
+    name = "generate-object-property-1.2.0";
+    version = "1.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz";
+      name = "generate-object-property-1.2.0.tgz";
+      sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0";
+    };
+    deps = {
+      "is-property-1.0.2" = self.by-version."is-property"."1.0.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."get-stdin"."^4.0.1" =
+    self.by-version."get-stdin"."4.0.1";
+  by-version."get-stdin"."4.0.1" = self.buildNodePackage {
+    name = "get-stdin-4.0.1";
+    version = "4.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz";
+      name = "get-stdin-4.0.1.tgz";
+      sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."github"."0.1.6" =
+    self.by-version."github"."0.1.6";
+  by-version."github"."0.1.6" = self.buildNodePackage {
+    name = "github-0.1.6";
+    version = "0.1.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/github/-/github-0.1.6.tgz";
+      name = "github-0.1.6.tgz";
+      sha1 = "1344e694f8d20ef9b29bcbfd1ca5eb4f7a287922";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."graceful-readlink".">= 1.0.0" =
+    self.by-version."graceful-readlink"."1.0.1";
+  by-version."graceful-readlink"."1.0.1" = self.buildNodePackage {
+    name = "graceful-readlink-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz";
+      name = "graceful-readlink-1.0.1.tgz";
+      sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."har-validator"."^1.6.1" =
+    self.by-version."har-validator"."1.8.0";
+  by-version."har-validator"."1.8.0" = self.buildNodePackage {
+    name = "har-validator-1.8.0";
+    version = "1.8.0";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz";
+      name = "har-validator-1.8.0.tgz";
+      sha1 = "d83842b0eb4c435960aeb108a067a3aa94c0eeb2";
+    };
+    deps = {
+      "bluebird-2.10.2" = self.by-version."bluebird"."2.10.2";
+      "chalk-1.1.1" = self.by-version."chalk"."1.1.1";
+      "commander-2.9.0" = self.by-version."commander"."2.9.0";
+      "is-my-json-valid-2.12.3" = self.by-version."is-my-json-valid"."2.12.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."har-validator"."~2.0.2" =
+    self.by-version."har-validator"."2.0.3";
+  by-version."har-validator"."2.0.3" = self.buildNodePackage {
+    name = "har-validator-2.0.3";
+    version = "2.0.3";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/har-validator/-/har-validator-2.0.3.tgz";
+      name = "har-validator-2.0.3.tgz";
+      sha1 = "5a9e12564a571cf0b81ef93c2157bd1617168883";
+    };
+    deps = {
+      "chalk-1.1.1" = self.by-version."chalk"."1.1.1";
+      "commander-2.9.0" = self.by-version."commander"."2.9.0";
+      "is-my-json-valid-2.12.3" = self.by-version."is-my-json-valid"."2.12.3";
+      "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."has-ansi"."^2.0.0" =
+    self.by-version."has-ansi"."2.0.0";
+  by-version."has-ansi"."2.0.0" = self.buildNodePackage {
+    name = "has-ansi-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz";
+      name = "has-ansi-2.0.0.tgz";
+      sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91";
+    };
+    deps = {
+      "ansi-regex-2.0.0" = self.by-version."ansi-regex"."2.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."hawk"."1.1.1" =
+    self.by-version."hawk"."1.1.1";
+  by-version."hawk"."1.1.1" = self.buildNodePackage {
+    name = "hawk-1.1.1";
+    version = "1.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz";
+      name = "hawk-1.1.1.tgz";
+      sha1 = "87cd491f9b46e4e2aeaca335416766885d2d1ed9";
+    };
+    deps = {
+      "hoek-0.9.1" = self.by-version."hoek"."0.9.1";
+      "boom-0.4.2" = self.by-version."boom"."0.4.2";
+      "cryptiles-0.2.2" = self.by-version."cryptiles"."0.2.2";
+      "sntp-0.2.4" = self.by-version."sntp"."0.2.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."hawk"."~2.3.0" =
+    self.by-version."hawk"."2.3.1";
+  by-version."hawk"."2.3.1" = self.buildNodePackage {
+    name = "hawk-2.3.1";
+    version = "2.3.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/hawk/-/hawk-2.3.1.tgz";
+      name = "hawk-2.3.1.tgz";
+      sha1 = "1e731ce39447fa1d0f6d707f7bceebec0fd1ec1f";
+    };
+    deps = {
+      "hoek-2.16.3" = self.by-version."hoek"."2.16.3";
+      "boom-2.10.1" = self.by-version."boom"."2.10.1";
+      "cryptiles-2.0.5" = self.by-version."cryptiles"."2.0.5";
+      "sntp-1.0.9" = self.by-version."sntp"."1.0.9";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."hawk"."~3.1.0" =
+    self.by-version."hawk"."3.1.2";
+  by-version."hawk"."3.1.2" = self.buildNodePackage {
+    name = "hawk-3.1.2";
+    version = "3.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/hawk/-/hawk-3.1.2.tgz";
+      name = "hawk-3.1.2.tgz";
+      sha1 = "90c90118886e21975d1ad4ae9b3e284ed19a2de8";
+    };
+    deps = {
+      "hoek-2.16.3" = self.by-version."hoek"."2.16.3";
+      "boom-2.10.1" = self.by-version."boom"."2.10.1";
+      "cryptiles-2.0.5" = self.by-version."cryptiles"."2.0.5";
+      "sntp-1.0.9" = self.by-version."sntp"."1.0.9";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."hoek"."0.9.x" =
+    self.by-version."hoek"."0.9.1";
+  by-version."hoek"."0.9.1" = self.buildNodePackage {
+    name = "hoek-0.9.1";
+    version = "0.9.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz";
+      name = "hoek-0.9.1.tgz";
+      sha1 = "3d322462badf07716ea7eb85baf88079cddce505";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."hoek"."2.x.x" =
+    self.by-version."hoek"."2.16.3";
+  by-version."hoek"."2.16.3" = self.buildNodePackage {
+    name = "hoek-2.16.3";
+    version = "2.16.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz";
+      name = "hoek-2.16.3.tgz";
+      sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."http-signature"."~0.10.0" =
+    self.by-version."http-signature"."0.10.1";
+  by-version."http-signature"."0.10.1" = self.buildNodePackage {
+    name = "http-signature-0.10.1";
+    version = "0.10.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz";
+      name = "http-signature-0.10.1.tgz";
+      sha1 = "4fbdac132559aa8323121e540779c0a012b27e66";
+    };
+    deps = {
+      "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5";
+      "asn1-0.1.11" = self.by-version."asn1"."0.1.11";
+      "ctype-0.5.3" = self.by-version."ctype"."0.5.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."http-signature"."~0.11.0" =
+    self.by-version."http-signature"."0.11.0";
+  by-version."http-signature"."0.11.0" = self.buildNodePackage {
+    name = "http-signature-0.11.0";
+    version = "0.11.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz";
+      name = "http-signature-0.11.0.tgz";
+      sha1 = "1796cf67a001ad5cd6849dca0991485f09089fe6";
+    };
+    deps = {
+      "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5";
+      "asn1-0.1.11" = self.by-version."asn1"."0.1.11";
+      "ctype-0.5.3" = self.by-version."ctype"."0.5.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."http-signature"."~1.1.0" =
+    self.by-version."http-signature"."1.1.0";
+  by-version."http-signature"."1.1.0" = self.buildNodePackage {
+    name = "http-signature-1.1.0";
+    version = "1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/http-signature/-/http-signature-1.1.0.tgz";
+      name = "http-signature-1.1.0.tgz";
+      sha1 = "5d2d7e9b6ef49980ad5b128d8e4ef09a31c90d95";
+    };
+    deps = {
+      "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5";
+      "jsprim-1.2.2" = self.by-version."jsprim"."1.2.2";
+      "sshpk-1.7.2" = self.by-version."sshpk"."1.7.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."image-size"."^0.3.5" =
+    self.by-version."image-size"."0.3.5";
+  by-version."image-size"."0.3.5" = self.buildNodePackage {
+    name = "image-size-0.3.5";
+    version = "0.3.5";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/image-size/-/image-size-0.3.5.tgz";
+      name = "image-size-0.3.5.tgz";
+      sha1 = "83240eab2fb5b00b04aab8c74b0471e9cba7ad8c";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."indent-string"."^1.1.0" =
+    self.by-version."indent-string"."1.2.2";
+  by-version."indent-string"."1.2.2" = self.buildNodePackage {
+    name = "indent-string-1.2.2";
+    version = "1.2.2";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/indent-string/-/indent-string-1.2.2.tgz";
+      name = "indent-string-1.2.2.tgz";
+      sha1 = "db99bcc583eb6abbb1e48dcbb1999a986041cb6b";
+    };
+    deps = {
+      "get-stdin-4.0.1" = self.by-version."get-stdin"."4.0.1";
+      "minimist-1.2.0" = self.by-version."minimist"."1.2.0";
+      "repeating-1.1.3" = self.by-version."repeating"."1.1.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."inherits"."^2.0.1" =
+    self.by-version."inherits"."2.0.1";
+  by-version."inherits"."2.0.1" = self.buildNodePackage {
+    name = "inherits-2.0.1";
+    version = "2.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz";
+      name = "inherits-2.0.1.tgz";
+      sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."inherits"."~2.0.1" =
+    self.by-version."inherits"."2.0.1";
+  by-spec."is-finite"."^1.0.0" =
+    self.by-version."is-finite"."1.0.1";
+  by-version."is-finite"."1.0.1" = self.buildNodePackage {
+    name = "is-finite-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/is-finite/-/is-finite-1.0.1.tgz";
+      name = "is-finite-1.0.1.tgz";
+      sha1 = "6438603eaebe2793948ff4a4262ec8db3d62597b";
+    };
+    deps = {
+      "number-is-nan-1.0.0" = self.by-version."number-is-nan"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."is-my-json-valid"."^2.12.0" =
+    self.by-version."is-my-json-valid"."2.12.3";
+  by-version."is-my-json-valid"."2.12.3" = self.buildNodePackage {
+    name = "is-my-json-valid-2.12.3";
+    version = "2.12.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.3.tgz";
+      name = "is-my-json-valid-2.12.3.tgz";
+      sha1 = "5a39d1d76b2dbb83140bbd157b1d5ee4bdc85ad6";
+    };
+    deps = {
+      "generate-function-2.0.0" = self.by-version."generate-function"."2.0.0";
+      "generate-object-property-1.2.0" = self.by-version."generate-object-property"."1.2.0";
+      "jsonpointer-2.0.0" = self.by-version."jsonpointer"."2.0.0";
+      "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."is-my-json-valid"."^2.12.3" =
+    self.by-version."is-my-json-valid"."2.12.3";
+  by-spec."is-property"."^1.0.0" =
+    self.by-version."is-property"."1.0.2";
+  by-version."is-property"."1.0.2" = self.buildNodePackage {
+    name = "is-property-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz";
+      name = "is-property-1.0.2.tgz";
+      sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."is-typedarray"."~1.0.0" =
+    self.by-version."is-typedarray"."1.0.0";
+  by-version."is-typedarray"."1.0.0" = self.buildNodePackage {
+    name = "is-typedarray-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz";
+      name = "is-typedarray-1.0.0.tgz";
+      sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."isarray"."0.0.1" =
+    self.by-version."isarray"."0.0.1";
+  by-version."isarray"."0.0.1" = self.buildNodePackage {
+    name = "isarray-0.0.1";
+    version = "0.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";
+      name = "isarray-0.0.1.tgz";
+      sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."isstream"."~0.1.1" =
+    self.by-version."isstream"."0.1.2";
+  by-version."isstream"."0.1.2" = self.buildNodePackage {
+    name = "isstream-0.1.2";
+    version = "0.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz";
+      name = "isstream-0.1.2.tgz";
+      sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."isstream"."~0.1.2" =
+    self.by-version."isstream"."0.1.2";
+  by-spec."jodid25519".">=1.0.0 <2.0.0" =
+    self.by-version."jodid25519"."1.0.2";
+  by-version."jodid25519"."1.0.2" = self.buildNodePackage {
+    name = "jodid25519-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz";
+      name = "jodid25519-1.0.2.tgz";
+      sha1 = "06d4912255093419477d425633606e0e90782967";
+    };
+    deps = {
+      "jsbn-0.1.0" = self.by-version."jsbn"."0.1.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."js2xmlparser"."1.0.0" =
+    self.by-version."js2xmlparser"."1.0.0";
+  by-version."js2xmlparser"."1.0.0" = self.buildNodePackage {
+    name = "js2xmlparser-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/js2xmlparser/-/js2xmlparser-1.0.0.tgz";
+      name = "js2xmlparser-1.0.0.tgz";
+      sha1 = "5a170f2e8d6476ce45405e04823242513782fe30";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."jsbn".">=0.1.0 <0.2.0" =
+    self.by-version."jsbn"."0.1.0";
+  by-version."jsbn"."0.1.0" = self.buildNodePackage {
+    name = "jsbn-0.1.0";
+    version = "0.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz";
+      name = "jsbn-0.1.0.tgz";
+      sha1 = "650987da0dd74f4ebf5a11377a2aa2d273e97dfd";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."jsbn"."~0.1.0" =
+    self.by-version."jsbn"."0.1.0";
+  by-spec."json-schema"."0.2.2" =
+    self.by-version."json-schema"."0.2.2";
+  by-version."json-schema"."0.2.2" = self.buildNodePackage {
+    name = "json-schema-0.2.2";
+    version = "0.2.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz";
+      name = "json-schema-0.2.2.tgz";
+      sha1 = "50354f19f603917c695f70b85afa77c3b0f23506";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."json-stringify-safe"."~5.0.0" =
+    self.by-version."json-stringify-safe"."5.0.1";
+  by-version."json-stringify-safe"."5.0.1" = self.buildNodePackage {
+    name = "json-stringify-safe-5.0.1";
+    version = "5.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz";
+      name = "json-stringify-safe-5.0.1.tgz";
+      sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."json-stringify-safe"."~5.0.1" =
+    self.by-version."json-stringify-safe"."5.0.1";
+  by-spec."jsonpointer"."2.0.0" =
+    self.by-version."jsonpointer"."2.0.0";
+  by-version."jsonpointer"."2.0.0" = self.buildNodePackage {
+    name = "jsonpointer-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz";
+      name = "jsonpointer-2.0.0.tgz";
+      sha1 = "3af1dd20fe85463910d469a385e33017d2a030d9";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."jsprim"."^1.2.2" =
+    self.by-version."jsprim"."1.2.2";
+  by-version."jsprim"."1.2.2" = self.buildNodePackage {
+    name = "jsprim-1.2.2";
+    version = "1.2.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jsprim/-/jsprim-1.2.2.tgz";
+      name = "jsprim-1.2.2.tgz";
+      sha1 = "f20c906ac92abd58e3b79ac8bc70a48832512da1";
+    };
+    deps = {
+      "extsprintf-1.0.2" = self.by-version."extsprintf"."1.0.2";
+      "json-schema-0.2.2" = self.by-version."json-schema"."0.2.2";
+      "verror-1.3.6" = self.by-version."verror"."1.3.6";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."jsrsasign"."4.8.2 " =
+    self.by-version."jsrsasign"."4.8.2";
+  by-version."jsrsasign"."4.8.2" = self.buildNodePackage {
+    name = "jsrsasign-4.8.2";
+    version = "4.8.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jsrsasign/-/jsrsasign-4.8.2.tgz";
+      name = "jsrsasign-4.8.2.tgz";
+      sha1 = "bd0a7040d426d7598d6c742ec8f875d0e88644a9";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."jszip"."^2.5.0" =
+    self.by-version."jszip"."2.5.0";
+  by-version."jszip"."2.5.0" = self.buildNodePackage {
+    name = "jszip-2.5.0";
+    version = "2.5.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jszip/-/jszip-2.5.0.tgz";
+      name = "jszip-2.5.0.tgz";
+      sha1 = "7444fd8551ddf3e5da7198fea0c91bc8308cc274";
+    };
+    deps = {
+      "pako-0.2.8" = self.by-version."pako"."0.2.8";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."jwa"."^1.1.0" =
+    self.by-version."jwa"."1.1.1";
+  by-version."jwa"."1.1.1" = self.buildNodePackage {
+    name = "jwa-1.1.1";
+    version = "1.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jwa/-/jwa-1.1.1.tgz";
+      name = "jwa-1.1.1.tgz";
+      sha1 = "b83c05279f0707f55ca5387b7b3f23da9f80195f";
+    };
+    deps = {
+      "base64url-0.0.6" = self.by-version."base64url"."0.0.6";
+      "buffer-equal-constant-time-1.0.1" = self.by-version."buffer-equal-constant-time"."1.0.1";
+      "ecdsa-sig-formatter-1.0.2" = self.by-version."ecdsa-sig-formatter"."1.0.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."jws"."3.x.x" =
+    self.by-version."jws"."3.1.0";
+  by-version."jws"."3.1.0" = self.buildNodePackage {
+    name = "jws-3.1.0";
+    version = "3.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jws/-/jws-3.1.0.tgz";
+      name = "jws-3.1.0.tgz";
+      sha1 = "885a89127d24119a2a93f234ddd492337a7c85a0";
+    };
+    deps = {
+      "base64url-1.0.5" = self.by-version."base64url"."1.0.5";
+      "jwa-1.1.1" = self.by-version."jwa"."1.1.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."keypress"."0.1.x" =
+    self.by-version."keypress"."0.1.0";
+  by-version."keypress"."0.1.0" = self.buildNodePackage {
+    name = "keypress-0.1.0";
+    version = "0.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz";
+      name = "keypress-0.1.0.tgz";
+      sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."kuduscript"."1.0.6" =
+    self.by-version."kuduscript"."1.0.6";
+  by-version."kuduscript"."1.0.6" = self.buildNodePackage {
+    name = "kuduscript-1.0.6";
+    version = "1.0.6";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/kuduscript/-/kuduscript-1.0.6.tgz";
+      name = "kuduscript-1.0.6.tgz";
+      sha1 = "466628f1d4f68d972a28939012e055156bdbcf16";
+    };
+    deps = {
+      "commander-1.1.1" = self.by-version."commander"."1.1.1";
+      "streamline-0.4.11" = self.by-version."streamline"."0.4.11";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."map-obj"."^1.0.0" =
+    self.by-version."map-obj"."1.0.1";
+  by-version."map-obj"."1.0.1" = self.buildNodePackage {
+    name = "map-obj-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz";
+      name = "map-obj-1.0.1.tgz";
+      sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."map-stream"."~0.1.0" =
+    self.by-version."map-stream"."0.1.0";
+  by-version."map-stream"."0.1.0" = self.buildNodePackage {
+    name = "map-stream-0.1.0";
+    version = "0.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz";
+      name = "map-stream-0.1.0.tgz";
+      sha1 = "e56aa94c4c8055a16404a0674b78f215f7c8e194";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."meow"."~2.0.0" =
+    self.by-version."meow"."2.0.0";
+  by-version."meow"."2.0.0" = self.buildNodePackage {
+    name = "meow-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/meow/-/meow-2.0.0.tgz";
+      name = "meow-2.0.0.tgz";
+      sha1 = "8f530a8ecf5d40d3f4b4df93c3472900fba2a8f1";
+    };
+    deps = {
+      "camelcase-keys-1.0.0" = self.by-version."camelcase-keys"."1.0.0";
+      "indent-string-1.2.2" = self.by-version."indent-string"."1.2.2";
+      "minimist-1.2.0" = self.by-version."minimist"."1.2.0";
+      "object-assign-1.0.0" = self.by-version."object-assign"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."mime"."~1.2.11" =
+    self.by-version."mime"."1.2.11";
+  by-version."mime"."1.2.11" = self.buildNodePackage {
+    name = "mime-1.2.11";
+    version = "1.2.11";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz";
+      name = "mime-1.2.11.tgz";
+      sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."mime"."~1.2.4" =
+    self.by-version."mime"."1.2.11";
+  by-spec."mime-db"."~1.12.0" =
+    self.by-version."mime-db"."1.12.0";
+  by-version."mime-db"."1.12.0" = self.buildNodePackage {
+    name = "mime-db-1.12.0";
+    version = "1.12.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz";
+      name = "mime-db-1.12.0.tgz";
+      sha1 = "3d0c63180f458eb10d325aaa37d7c58ae312e9d7";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."mime-db"."~1.21.0" =
+    self.by-version."mime-db"."1.21.0";
+  by-version."mime-db"."1.21.0" = self.buildNodePackage {
+    name = "mime-db-1.21.0";
+    version = "1.21.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mime-db/-/mime-db-1.21.0.tgz";
+      name = "mime-db-1.21.0.tgz";
+      sha1 = "9b5239e3353cf6eb015a00d890261027c36d4bac";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."mime-types"."^2.1.3" =
+    self.by-version."mime-types"."2.1.9";
+  by-version."mime-types"."2.1.9" = self.buildNodePackage {
+    name = "mime-types-2.1.9";
+    version = "2.1.9";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz";
+      name = "mime-types-2.1.9.tgz";
+      sha1 = "dfb396764b5fdf75be34b1f4104bc3687fb635f8";
+    };
+    deps = {
+      "mime-db-1.21.0" = self.by-version."mime-db"."1.21.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."mime-types"."~1.0.1" =
+    self.by-version."mime-types"."1.0.2";
+  by-version."mime-types"."1.0.2" = self.buildNodePackage {
+    name = "mime-types-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz";
+      name = "mime-types-1.0.2.tgz";
+      sha1 = "995ae1392ab8affcbfcb2641dd054e943c0d5dce";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."mime-types"."~2.0.1" =
+    self.by-version."mime-types"."2.0.14";
+  by-version."mime-types"."2.0.14" = self.buildNodePackage {
+    name = "mime-types-2.0.14";
+    version = "2.0.14";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz";
+      name = "mime-types-2.0.14.tgz";
+      sha1 = "310e159db23e077f8bb22b748dabfa4957140aa6";
+    };
+    deps = {
+      "mime-db-1.12.0" = self.by-version."mime-db"."1.12.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."mime-types"."~2.0.3" =
+    self.by-version."mime-types"."2.0.14";
+  by-spec."mime-types"."~2.1.7" =
+    self.by-version."mime-types"."2.1.9";
+  by-spec."minimalistic-assert"."^1.0.0" =
+    self.by-version."minimalistic-assert"."1.0.0";
+  by-version."minimalistic-assert"."1.0.0" = self.buildNodePackage {
+    name = "minimalistic-assert-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz";
+      name = "minimalistic-assert-1.0.0.tgz";
+      sha1 = "702be2dda6b37f4836bcb3f5db56641b64a1d3d3";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."minimist"."^1.1.0" =
+    self.by-version."minimist"."1.2.0";
+  by-version."minimist"."1.2.0" = self.buildNodePackage {
+    name = "minimist-1.2.0";
+    version = "1.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz";
+      name = "minimist-1.2.0.tgz";
+      sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."moment"."2.6.0" =
+    self.by-version."moment"."2.6.0";
+  by-version."moment"."2.6.0" = self.buildNodePackage {
+    name = "moment-2.6.0";
+    version = "2.6.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/moment/-/moment-2.6.0.tgz";
+      name = "moment-2.6.0.tgz";
+      sha1 = "0765b72b841dd213fa91914c0f6765122719f061";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."moment"."^2.6.0" =
+    self.by-version."moment"."2.11.1";
+  by-version."moment"."2.11.1" = self.buildNodePackage {
+    name = "moment-2.11.1";
+    version = "2.11.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/moment/-/moment-2.11.1.tgz";
+      name = "moment-2.11.1.tgz";
+      sha1 = "bf4026413640d1b802467cf353607f8464d6af47";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ms-rest"."1.2.0" =
+    self.by-version."ms-rest"."1.2.0";
+  by-version."ms-rest"."1.2.0" = self.buildNodePackage {
+    name = "ms-rest-1.2.0";
+    version = "1.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ms-rest/-/ms-rest-1.2.0.tgz";
+      name = "ms-rest-1.2.0.tgz";
+      sha1 = "269ad1efe28c3ab92bd3db46c6eefd8740946380";
+    };
+    deps = {
+      "underscore-1.4.4" = self.by-version."underscore"."1.4.4";
+      "tunnel-0.0.3" = self.by-version."tunnel"."0.0.3";
+      "request-2.52.0" = self.by-version."request"."2.52.0";
+      "validator-3.1.0" = self.by-version."validator"."3.1.0";
+      "duplexer-0.1.1" = self.by-version."duplexer"."0.1.1";
+      "through-2.3.8" = self.by-version."through"."2.3.8";
+      "tough-cookie-2.2.1" = self.by-version."tough-cookie"."2.2.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ms-rest-azure"."1.2.0" =
+    self.by-version."ms-rest-azure"."1.2.0";
+  by-version."ms-rest-azure"."1.2.0" = self.buildNodePackage {
+    name = "ms-rest-azure-1.2.0";
+    version = "1.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.2.0.tgz";
+      name = "ms-rest-azure-1.2.0.tgz";
+      sha1 = "5a9e137963d5c7d28f188aa93e5df2e8bc44ca9b";
+    };
+    deps = {
+      "async-0.2.7" = self.by-version."async"."0.2.7";
+      "uuid-2.0.1" = self.by-version."uuid"."2.0.1";
+      "adal-node-0.1.16" = self.by-version."adal-node"."0.1.16";
+      "ms-rest-1.2.0" = self.by-version."ms-rest"."1.2.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."node-forge"."0.6.23" =
+    self.by-version."node-forge"."0.6.23";
+  by-version."node-forge"."0.6.23" = self.buildNodePackage {
+    name = "node-forge-0.6.23";
+    version = "0.6.23";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/node-forge/-/node-forge-0.6.23.tgz";
+      name = "node-forge-0.6.23.tgz";
+      sha1 = "f03cf65ebd5d4d9dd2f7becb57ceaf78ed94a2bf";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."node-uuid"."1.2.0" =
+    self.by-version."node-uuid"."1.2.0";
+  by-version."node-uuid"."1.2.0" = self.buildNodePackage {
+    name = "node-uuid-1.2.0";
+    version = "1.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.2.0.tgz";
+      name = "node-uuid-1.2.0.tgz";
+      sha1 = "81a9fe32934719852499b58b2523d2cd5fdfd65b";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."node-uuid"."1.4.1" =
+    self.by-version."node-uuid"."1.4.1";
+  by-version."node-uuid"."1.4.1" = self.buildNodePackage {
+    name = "node-uuid-1.4.1";
+    version = "1.4.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz";
+      name = "node-uuid-1.4.1.tgz";
+      sha1 = "39aef510e5889a3dca9c895b506c73aae1bac048";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."node-uuid".">= 1.3.3" =
+    self.by-version."node-uuid"."1.4.7";
+  by-version."node-uuid"."1.4.7" = self.buildNodePackage {
+    name = "node-uuid-1.4.7";
+    version = "1.4.7";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz";
+      name = "node-uuid-1.4.7.tgz";
+      sha1 = "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."node-uuid"."^1.4.1" =
+    self.by-version."node-uuid"."1.4.7";
+  by-spec."node-uuid"."~1.4.0" =
+    self.by-version."node-uuid"."1.4.7";
+  by-spec."node-uuid"."~1.4.7" =
+    self.by-version."node-uuid"."1.4.7";
+  by-spec."number-is-nan"."1.0.0" =
+    self.by-version."number-is-nan"."1.0.0";
+  by-version."number-is-nan"."1.0.0" = self.buildNodePackage {
+    name = "number-is-nan-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz";
+      name = "number-is-nan-1.0.0.tgz";
+      sha1 = "c020f529c5282adfdd233d91d4b181c3d686dc4b";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."number-is-nan"."^1.0.0" =
+    self.by-version."number-is-nan"."1.0.0";
+  by-spec."oauth-sign"."~0.4.0" =
+    self.by-version."oauth-sign"."0.4.0";
+  by-version."oauth-sign"."0.4.0" = self.buildNodePackage {
+    name = "oauth-sign-0.4.0";
+    version = "0.4.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.4.0.tgz";
+      name = "oauth-sign-0.4.0.tgz";
+      sha1 = "f22956f31ea7151a821e5f2fb32c113cad8b9f69";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."oauth-sign"."~0.6.0" =
+    self.by-version."oauth-sign"."0.6.0";
+  by-version."oauth-sign"."0.6.0" = self.buildNodePackage {
+    name = "oauth-sign-0.6.0";
+    version = "0.6.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.6.0.tgz";
+      name = "oauth-sign-0.6.0.tgz";
+      sha1 = "7dbeae44f6ca454e1f168451d630746735813ce3";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."oauth-sign"."~0.8.0" =
+    self.by-version."oauth-sign"."0.8.0";
+  by-version."oauth-sign"."0.8.0" = self.buildNodePackage {
+    name = "oauth-sign-0.8.0";
+    version = "0.8.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz";
+      name = "oauth-sign-0.8.0.tgz";
+      sha1 = "938fdc875765ba527137d8aec9d178e24debc553";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."object-assign"."^1.0.0" =
+    self.by-version."object-assign"."1.0.0";
+  by-version."object-assign"."1.0.0" = self.buildNodePackage {
+    name = "object-assign-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/object-assign/-/object-assign-1.0.0.tgz";
+      name = "object-assign-1.0.0.tgz";
+      sha1 = "e65dc8766d3b47b4b8307465c8311da030b070a6";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."omelette"."0.1.0" =
+    self.by-version."omelette"."0.1.0";
+  by-version."omelette"."0.1.0" = self.buildNodePackage {
+    name = "omelette-0.1.0";
+    version = "0.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/omelette/-/omelette-0.1.0.tgz";
+      name = "omelette-0.1.0.tgz";
+      sha1 = "31cc7eb472a513c07483d24d3e1bf164cb0d23b8";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."openssl-wrapper"."0.2.1" =
+    self.by-version."openssl-wrapper"."0.2.1";
+  by-version."openssl-wrapper"."0.2.1" = self.buildNodePackage {
+    name = "openssl-wrapper-0.2.1";
+    version = "0.2.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/openssl-wrapper/-/openssl-wrapper-0.2.1.tgz";
+      name = "openssl-wrapper-0.2.1.tgz";
+      sha1 = "ff2d6552c83bb14437edc0371784704c75289473";
+    };
+    deps = {
+      "debug-0.7.4" = self.by-version."debug"."0.7.4";
+      "q-0.9.7" = self.by-version."q"."0.9.7";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."pako"."~0.2.5" =
+    self.by-version."pako"."0.2.8";
+  by-version."pako"."0.2.8" = self.buildNodePackage {
+    name = "pako-0.2.8";
+    version = "0.2.8";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/pako/-/pako-0.2.8.tgz";
+      name = "pako-0.2.8.tgz";
+      sha1 = "15ad772915362913f20de4a8a164b4aacc6165d6";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."pause-stream"."0.0.11" =
+    self.by-version."pause-stream"."0.0.11";
+  by-version."pause-stream"."0.0.11" = self.buildNodePackage {
+    name = "pause-stream-0.0.11";
+    version = "0.0.11";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz";
+      name = "pause-stream-0.0.11.tgz";
+      sha1 = "fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445";
+    };
+    deps = {
+      "through-2.3.8" = self.by-version."through"."2.3.8";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."pinkie"."^2.0.0" =
+    self.by-version."pinkie"."2.0.1";
+  by-version."pinkie"."2.0.1" = self.buildNodePackage {
+    name = "pinkie-2.0.1";
+    version = "2.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz";
+      name = "pinkie-2.0.1.tgz";
+      sha1 = "4236c86fc29f261c2045bbe81f78cbb2a5e8306c";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."pinkie-promise"."^2.0.0" =
+    self.by-version."pinkie-promise"."2.0.0";
+  by-version."pinkie-promise"."2.0.0" = self.buildNodePackage {
+    name = "pinkie-promise-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz";
+      name = "pinkie-promise-2.0.0.tgz";
+      sha1 = "4c83538de1f6e660c29e0a13446844f7a7e88259";
+    };
+    deps = {
+      "pinkie-2.0.1" = self.by-version."pinkie"."2.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."pkginfo"."0.2.x" =
+    self.by-version."pkginfo"."0.2.3";
+  by-version."pkginfo"."0.2.3" = self.buildNodePackage {
+    name = "pkginfo-0.2.3";
+    version = "0.2.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz";
+      name = "pkginfo-0.2.3.tgz";
+      sha1 = "7239c42a5ef6c30b8f328439d9b9ff71042490f8";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."process-nextick-args"."~1.0.6" =
+    self.by-version."process-nextick-args"."1.0.6";
+  by-version."process-nextick-args"."1.0.6" = self.buildNodePackage {
+    name = "process-nextick-args-1.0.6";
+    version = "1.0.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz";
+      name = "process-nextick-args-1.0.6.tgz";
+      sha1 = "0f96b001cea90b12592ce566edb97ec11e69bd05";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."q"."~0.9.3" =
+    self.by-version."q"."0.9.7";
+  by-version."q"."0.9.7" = self.buildNodePackage {
+    name = "q-0.9.7";
+    version = "0.9.7";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/q/-/q-0.9.7.tgz";
+      name = "q-0.9.7.tgz";
+      sha1 = "4de2e6cb3b29088c9e4cbc03bf9d42fb96ce2f75";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."qs"."~1.2.0" =
+    self.by-version."qs"."1.2.2";
+  by-version."qs"."1.2.2" = self.buildNodePackage {
+    name = "qs-1.2.2";
+    version = "1.2.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/qs/-/qs-1.2.2.tgz";
+      name = "qs-1.2.2.tgz";
+      sha1 = "19b57ff24dc2a99ce1f8bdf6afcda59f8ef61f88";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."qs"."~2.3.1" =
+    self.by-version."qs"."2.3.3";
+  by-version."qs"."2.3.3" = self.buildNodePackage {
+    name = "qs-2.3.3";
+    version = "2.3.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/qs/-/qs-2.3.3.tgz";
+      name = "qs-2.3.3.tgz";
+      sha1 = "e9e85adbe75da0bbe4c8e0476a086290f863b404";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."qs"."~3.1.0" =
+    self.by-version."qs"."3.1.0";
+  by-version."qs"."3.1.0" = self.buildNodePackage {
+    name = "qs-3.1.0";
+    version = "3.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/qs/-/qs-3.1.0.tgz";
+      name = "qs-3.1.0.tgz";
+      sha1 = "d0e9ae745233a12dc43fb4f3055bba446261153c";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."qs"."~5.2.0" =
+    self.by-version."qs"."5.2.0";
+  by-version."qs"."5.2.0" = self.buildNodePackage {
+    name = "qs-5.2.0";
+    version = "5.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/qs/-/qs-5.2.0.tgz";
+      name = "qs-5.2.0.tgz";
+      sha1 = "a9f31142af468cb72b25b30136ba2456834916be";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."readable-stream"."~1.0.0" =
+    self.by-version."readable-stream"."1.0.33";
+  by-version."readable-stream"."1.0.33" = self.buildNodePackage {
+    name = "readable-stream-1.0.33";
+    version = "1.0.33";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz";
+      name = "readable-stream-1.0.33.tgz";
+      sha1 = "3a360dd66c1b1d7fd4705389860eda1d0f61126c";
+    };
+    deps = {
+      "core-util-is-1.0.2" = self.by-version."core-util-is"."1.0.2";
+      "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
+      "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."readable-stream"."~1.0.26" =
+    self.by-version."readable-stream"."1.0.33";
+  by-spec."readable-stream"."~1.1.9" =
+    self.by-version."readable-stream"."1.1.13";
+  by-version."readable-stream"."1.1.13" = self.buildNodePackage {
+    name = "readable-stream-1.1.13";
+    version = "1.1.13";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz";
+      name = "readable-stream-1.1.13.tgz";
+      sha1 = "f6eef764f514c89e2b9e23146a75ba106756d23e";
+    };
+    deps = {
+      "core-util-is-1.0.2" = self.by-version."core-util-is"."1.0.2";
+      "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
+      "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."readable-stream"."~2.0.0" =
+    self.by-version."readable-stream"."2.0.5";
+  by-version."readable-stream"."2.0.5" = self.buildNodePackage {
+    name = "readable-stream-2.0.5";
+    version = "2.0.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/readable-stream/-/readable-stream-2.0.5.tgz";
+      name = "readable-stream-2.0.5.tgz";
+      sha1 = "a2426f8dcd4551c77a33f96edf2886a23c829669";
+    };
+    deps = {
+      "core-util-is-1.0.2" = self.by-version."core-util-is"."1.0.2";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
+      "process-nextick-args-1.0.6" = self.by-version."process-nextick-args"."1.0.6";
+      "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
+      "util-deprecate-1.0.2" = self.by-version."util-deprecate"."1.0.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."repeating"."^1.1.0" =
+    self.by-version."repeating"."1.1.3";
+  by-version."repeating"."1.1.3" = self.buildNodePackage {
+    name = "repeating-1.1.3";
+    version = "1.1.3";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz";
+      name = "repeating-1.1.3.tgz";
+      sha1 = "3d4114218877537494f97f77f9785fab810fa4ac";
+    };
+    deps = {
+      "is-finite-1.0.1" = self.by-version."is-finite"."1.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."request"."2.45.0" =
+    self.by-version."request"."2.45.0";
+  by-version."request"."2.45.0" = self.buildNodePackage {
+    name = "request-2.45.0";
+    version = "2.45.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/request/-/request-2.45.0.tgz";
+      name = "request-2.45.0.tgz";
+      sha1 = "29d713a0a07f17fb2e7b61815d2010681718e93c";
+    };
+    deps = {
+      "bl-0.9.4" = self.by-version."bl"."0.9.4";
+      "caseless-0.6.0" = self.by-version."caseless"."0.6.0";
+      "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
+      "qs-1.2.2" = self.by-version."qs"."1.2.2";
+      "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1";
+      "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2";
+      "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
+      "tunnel-agent-0.4.2" = self.by-version."tunnel-agent"."0.4.2";
+      "form-data-0.1.4" = self.by-version."form-data"."0.1.4";
+    };
+    optionalDependencies = {
+      "tough-cookie-2.2.1" = self.by-version."tough-cookie"."2.2.1";
+      "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1";
+      "oauth-sign-0.4.0" = self.by-version."oauth-sign"."0.4.0";
+      "hawk-1.1.1" = self.by-version."hawk"."1.1.1";
+      "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
+      "stringstream-0.0.5" = self.by-version."stringstream"."0.0.5";
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."request"."2.52.0" =
+    self.by-version."request"."2.52.0";
+  by-version."request"."2.52.0" = self.buildNodePackage {
+    name = "request-2.52.0";
+    version = "2.52.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/request/-/request-2.52.0.tgz";
+      name = "request-2.52.0.tgz";
+      sha1 = "02d82a8adc04dc94a3a79f09fc850ade9aa21e74";
+    };
+    deps = {
+      "bl-0.9.4" = self.by-version."bl"."0.9.4";
+      "caseless-0.9.0" = self.by-version."caseless"."0.9.0";
+      "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
+      "form-data-0.2.0" = self.by-version."form-data"."0.2.0";
+      "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1";
+      "mime-types-2.0.14" = self.by-version."mime-types"."2.0.14";
+      "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
+      "qs-2.3.3" = self.by-version."qs"."2.3.3";
+      "tunnel-agent-0.4.2" = self.by-version."tunnel-agent"."0.4.2";
+      "tough-cookie-2.2.1" = self.by-version."tough-cookie"."2.2.1";
+      "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1";
+      "oauth-sign-0.6.0" = self.by-version."oauth-sign"."0.6.0";
+      "hawk-2.3.1" = self.by-version."hawk"."2.3.1";
+      "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
+      "stringstream-0.0.5" = self.by-version."stringstream"."0.0.5";
+      "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
+      "isstream-0.1.2" = self.by-version."isstream"."0.1.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."request"."2.9.x" =
+    self.by-version."request"."2.9.203";
+  by-version."request"."2.9.203" = self.buildNodePackage {
+    name = "request-2.9.203";
+    version = "2.9.203";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/request/-/request-2.9.203.tgz";
+      name = "request-2.9.203.tgz";
+      sha1 = "6c1711a5407fb94a114219563e44145bcbf4723a";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."request".">= 2.52.0" =
+    self.by-version."request"."2.67.0";
+  by-version."request"."2.67.0" = self.buildNodePackage {
+    name = "request-2.67.0";
+    version = "2.67.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/request/-/request-2.67.0.tgz";
+      name = "request-2.67.0.tgz";
+      sha1 = "8af74780e2bf11ea0ae9aa965c11f11afd272742";
+    };
+    deps = {
+      "bl-1.0.0" = self.by-version."bl"."1.0.0";
+      "caseless-0.11.0" = self.by-version."caseless"."0.11.0";
+      "extend-3.0.0" = self.by-version."extend"."3.0.0";
+      "forever-agent-0.6.1" = self.by-version."forever-agent"."0.6.1";
+      "form-data-1.0.0-rc3" = self.by-version."form-data"."1.0.0-rc3";
+      "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1";
+      "mime-types-2.1.9" = self.by-version."mime-types"."2.1.9";
+      "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
+      "qs-5.2.0" = self.by-version."qs"."5.2.0";
+      "tunnel-agent-0.4.2" = self.by-version."tunnel-agent"."0.4.2";
+      "tough-cookie-2.2.1" = self.by-version."tough-cookie"."2.2.1";
+      "http-signature-1.1.0" = self.by-version."http-signature"."1.1.0";
+      "oauth-sign-0.8.0" = self.by-version."oauth-sign"."0.8.0";
+      "hawk-3.1.2" = self.by-version."hawk"."3.1.2";
+      "aws-sign2-0.6.0" = self.by-version."aws-sign2"."0.6.0";
+      "stringstream-0.0.5" = self.by-version."stringstream"."0.0.5";
+      "combined-stream-1.0.5" = self.by-version."combined-stream"."1.0.5";
+      "isstream-0.1.2" = self.by-version."isstream"."0.1.2";
+      "is-typedarray-1.0.0" = self.by-version."is-typedarray"."1.0.0";
+      "har-validator-2.0.3" = self.by-version."har-validator"."2.0.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."request".">= 2.9.203" =
+    self.by-version."request"."2.67.0";
+  by-spec."request"."~2.57.0" =
+    self.by-version."request"."2.57.0";
+  by-version."request"."2.57.0" = self.buildNodePackage {
+    name = "request-2.57.0";
+    version = "2.57.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/request/-/request-2.57.0.tgz";
+      name = "request-2.57.0.tgz";
+      sha1 = "d445105a42d009b9d724289633b449a6d723d989";
+    };
+    deps = {
+      "bl-0.9.4" = self.by-version."bl"."0.9.4";
+      "caseless-0.10.0" = self.by-version."caseless"."0.10.0";
+      "forever-agent-0.6.1" = self.by-version."forever-agent"."0.6.1";
+      "form-data-0.2.0" = self.by-version."form-data"."0.2.0";
+      "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1";
+      "mime-types-2.0.14" = self.by-version."mime-types"."2.0.14";
+      "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
+      "qs-3.1.0" = self.by-version."qs"."3.1.0";
+      "tunnel-agent-0.4.2" = self.by-version."tunnel-agent"."0.4.2";
+      "tough-cookie-2.2.1" = self.by-version."tough-cookie"."2.2.1";
+      "http-signature-0.11.0" = self.by-version."http-signature"."0.11.0";
+      "oauth-sign-0.8.0" = self.by-version."oauth-sign"."0.8.0";
+      "hawk-2.3.1" = self.by-version."hawk"."2.3.1";
+      "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
+      "stringstream-0.0.5" = self.by-version."stringstream"."0.0.5";
+      "combined-stream-1.0.5" = self.by-version."combined-stream"."1.0.5";
+      "isstream-0.1.2" = self.by-version."isstream"."0.1.2";
+      "har-validator-1.8.0" = self.by-version."har-validator"."1.8.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."sax"."0.5.2" =
+    self.by-version."sax"."0.5.2";
+  by-version."sax"."0.5.2" = self.buildNodePackage {
+    name = "sax-0.5.2";
+    version = "0.5.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sax/-/sax-0.5.2.tgz";
+      name = "sax-0.5.2.tgz";
+      sha1 = "735ffaa39a1cff8ffb9598f0223abdb03a9fb2ea";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."sax".">=0.1.1" =
+    self.by-version."sax"."1.1.4";
+  by-version."sax"."1.1.4" = self.buildNodePackage {
+    name = "sax-1.1.4";
+    version = "1.1.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sax/-/sax-1.1.4.tgz";
+      name = "sax-1.1.4.tgz";
+      sha1 = "74b6d33c9ae1e001510f179a91168588f1aedaa9";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."sntp"."0.2.x" =
+    self.by-version."sntp"."0.2.4";
+  by-version."sntp"."0.2.4" = self.buildNodePackage {
+    name = "sntp-0.2.4";
+    version = "0.2.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz";
+      name = "sntp-0.2.4.tgz";
+      sha1 = "fb885f18b0f3aad189f824862536bceeec750900";
+    };
+    deps = {
+      "hoek-0.9.1" = self.by-version."hoek"."0.9.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."sntp"."1.x.x" =
+    self.by-version."sntp"."1.0.9";
+  by-version."sntp"."1.0.9" = self.buildNodePackage {
+    name = "sntp-1.0.9";
+    version = "1.0.9";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz";
+      name = "sntp-1.0.9.tgz";
+      sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198";
+    };
+    deps = {
+      "hoek-2.16.3" = self.by-version."hoek"."2.16.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."source-map"."~0.1.43" =
+    self.by-version."source-map"."0.1.43";
+  by-version."source-map"."0.1.43" = self.buildNodePackage {
+    name = "source-map-0.1.43";
+    version = "0.1.43";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz";
+      name = "source-map-0.1.43.tgz";
+      sha1 = "c24bc146ca517c1471f5dacbe2571b2b7f9e3346";
+    };
+    deps = {
+      "amdefine-1.0.0" = self.by-version."amdefine"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."split"."0.2" =
+    self.by-version."split"."0.2.10";
+  by-version."split"."0.2.10" = self.buildNodePackage {
+    name = "split-0.2.10";
+    version = "0.2.10";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/split/-/split-0.2.10.tgz";
+      name = "split-0.2.10.tgz";
+      sha1 = "67097c601d697ce1368f418f06cd201cf0521a57";
+    };
+    deps = {
+      "through-2.3.8" = self.by-version."through"."2.3.8";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ssh-key-to-pem"."0.11.0" =
+    self.by-version."ssh-key-to-pem"."0.11.0";
+  by-version."ssh-key-to-pem"."0.11.0" = self.buildNodePackage {
+    name = "ssh-key-to-pem-0.11.0";
+    version = "0.11.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ssh-key-to-pem/-/ssh-key-to-pem-0.11.0.tgz";
+      name = "ssh-key-to-pem-0.11.0.tgz";
+      sha1 = "512675a28f08f1e581779e1989ab1e13effb49e4";
+    };
+    deps = {
+      "asn1-0.1.11" = self.by-version."asn1"."0.1.11";
+      "ctype-0.5.2" = self.by-version."ctype"."0.5.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."sshpk"."^1.7.0" =
+    self.by-version."sshpk"."1.7.2";
+  by-version."sshpk"."1.7.2" = self.buildNodePackage {
+    name = "sshpk-1.7.2";
+    version = "1.7.2";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sshpk/-/sshpk-1.7.2.tgz";
+      name = "sshpk-1.7.2.tgz";
+      sha1 = "e5eb43d0662bd201037327edb8b8f64656aca842";
+    };
+    deps = {
+      "asn1-0.2.3" = self.by-version."asn1"."0.2.3";
+      "assert-plus-0.2.0" = self.by-version."assert-plus"."0.2.0";
+      "dashdash-1.12.1" = self.by-version."dashdash"."1.12.1";
+    };
+    optionalDependencies = {
+      "jsbn-0.1.0" = self.by-version."jsbn"."0.1.0";
+      "tweetnacl-0.13.3" = self.by-version."tweetnacl"."0.13.3";
+      "jodid25519-1.0.2" = self.by-version."jodid25519"."1.0.2";
+      "ecc-jsbn-0.1.1" = self.by-version."ecc-jsbn"."0.1.1";
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."stack-trace"."0.0.x" =
+    self.by-version."stack-trace"."0.0.9";
+  by-version."stack-trace"."0.0.9" = self.buildNodePackage {
+    name = "stack-trace-0.0.9";
+    version = "0.0.9";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz";
+      name = "stack-trace-0.0.9.tgz";
+      sha1 = "a8f6eaeca90674c333e7c43953f275b451510695";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."stack-trace"."~0.0.7" =
+    self.by-version."stack-trace"."0.0.9";
+  by-spec."stream-combiner"."~0.0.4" =
+    self.by-version."stream-combiner"."0.0.4";
+  by-version."stream-combiner"."0.0.4" = self.buildNodePackage {
+    name = "stream-combiner-0.0.4";
+    version = "0.0.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz";
+      name = "stream-combiner-0.0.4.tgz";
+      sha1 = "4d5e433c185261dde623ca3f44c586bcf5c4ad14";
+    };
+    deps = {
+      "duplexer-0.1.1" = self.by-version."duplexer"."0.1.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."streamline"."0.10.17" =
+    self.by-version."streamline"."0.10.17";
+  by-version."streamline"."0.10.17" = self.buildNodePackage {
+    name = "streamline-0.10.17";
+    version = "0.10.17";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/streamline/-/streamline-0.10.17.tgz";
+      name = "streamline-0.10.17.tgz";
+      sha1 = "fa2170da74194dbd0b54f756523f0d0d370426af";
+    };
+    deps = {
+      "source-map-0.1.43" = self.by-version."source-map"."0.1.43";
+    };
+    optionalDependencies = {
+      "fibers-1.0.8" = self.by-version."fibers"."1.0.8";
+      "galaxy-0.1.12" = self.by-version."galaxy"."0.1.12";
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."streamline"."~0.4.10" =
+    self.by-version."streamline"."0.4.11";
+  by-version."streamline"."0.4.11" = self.buildNodePackage {
+    name = "streamline-0.4.11";
+    version = "0.4.11";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/streamline/-/streamline-0.4.11.tgz";
+      name = "streamline-0.4.11.tgz";
+      sha1 = "0e3c4f24a3f052b231b12d5049085a0a099be782";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."streamline-streams"."0.1.5" =
+    self.by-version."streamline-streams"."0.1.5";
+  by-version."streamline-streams"."0.1.5" = self.buildNodePackage {
+    name = "streamline-streams-0.1.5";
+    version = "0.1.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/streamline-streams/-/streamline-streams-0.1.5.tgz";
+      name = "streamline-streams-0.1.5.tgz";
+      sha1 = "5b0ff80cf543f603cc3438ed178ca2aec7899b54";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."string_decoder"."~0.10.x" =
+    self.by-version."string_decoder"."0.10.31";
+  by-version."string_decoder"."0.10.31" = self.buildNodePackage {
+    name = "string_decoder-0.10.31";
+    version = "0.10.31";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz";
+      name = "string_decoder-0.10.31.tgz";
+      sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."stringstream"."~0.0.4" =
+    self.by-version."stringstream"."0.0.5";
+  by-version."stringstream"."0.0.5" = self.buildNodePackage {
+    name = "stringstream-0.0.5";
+    version = "0.0.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz";
+      name = "stringstream-0.0.5.tgz";
+      sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."strip-ansi"."^3.0.0" =
+    self.by-version."strip-ansi"."3.0.0";
+  by-version."strip-ansi"."3.0.0" = self.buildNodePackage {
+    name = "strip-ansi-3.0.0";
+    version = "3.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz";
+      name = "strip-ansi-3.0.0.tgz";
+      sha1 = "7510b665567ca914ccb5d7e072763ac968be3724";
+    };
+    deps = {
+      "ansi-regex-2.0.0" = self.by-version."ansi-regex"."2.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."supports-color"."^2.0.0" =
+    self.by-version."supports-color"."2.0.0";
+  by-version."supports-color"."2.0.0" = self.buildNodePackage {
+    name = "supports-color-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz";
+      name = "supports-color-2.0.0.tgz";
+      sha1 = "535d045ce6b6363fa40117084629995e9df324c7";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."swagger-schema-official"."2.0.0-a33091a" =
+    self.by-version."swagger-schema-official"."2.0.0-a33091a";
+  by-version."swagger-schema-official"."2.0.0-a33091a" = self.buildNodePackage {
+    name = "swagger-schema-official-2.0.0-a33091a";
+    version = "2.0.0-a33091a";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/swagger-schema-official/-/swagger-schema-official-2.0.0-a33091a.tgz";
+      name = "swagger-schema-official-2.0.0-a33091a.tgz";
+      sha1 = "54cd2c83aac5b2203572fcd70e6e092d17b763fd";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."through"."2" =
+    self.by-version."through"."2.3.8";
+  by-version."through"."2.3.8" = self.buildNodePackage {
+    name = "through-2.3.8";
+    version = "2.3.8";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/through/-/through-2.3.8.tgz";
+      name = "through-2.3.8.tgz";
+      sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."through"."2.3.4" =
+    self.by-version."through"."2.3.4";
+  by-version."through"."2.3.4" = self.buildNodePackage {
+    name = "through-2.3.4";
+    version = "2.3.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/through/-/through-2.3.4.tgz";
+      name = "through-2.3.4.tgz";
+      sha1 = "495e40e8d8a8eaebc7c275ea88c2b8fc14c56455";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."through"."~2.3" =
+    self.by-version."through"."2.3.8";
+  by-spec."through"."~2.3.1" =
+    self.by-version."through"."2.3.8";
+  by-spec."through"."~2.3.4" =
+    self.by-version."through"."2.3.8";
+  by-spec."tmp"."0.0.25" =
+    self.by-version."tmp"."0.0.25";
+  by-version."tmp"."0.0.25" = self.buildNodePackage {
+    name = "tmp-0.0.25";
+    version = "0.0.25";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/tmp/-/tmp-0.0.25.tgz";
+      name = "tmp-0.0.25.tgz";
+      sha1 = "b29629768c55f38df0bff33f6dfde052443da27d";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."tough-cookie"."*" =
+    self.by-version."tough-cookie"."2.2.1";
+  by-version."tough-cookie"."2.2.1" = self.buildNodePackage {
+    name = "tough-cookie-2.2.1";
+    version = "2.2.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.1.tgz";
+      name = "tough-cookie-2.2.1.tgz";
+      sha1 = "3b0516b799e70e8164436a1446e7e5877fda118e";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."tough-cookie".">=0.12.0" =
+    self.by-version."tough-cookie"."2.2.1";
+  by-spec."tough-cookie"."~2.2.0" =
+    self.by-version."tough-cookie"."2.2.1";
+  by-spec."tunnel"."0.0.2" =
+    self.by-version."tunnel"."0.0.2";
+  by-version."tunnel"."0.0.2" = self.buildNodePackage {
+    name = "tunnel-0.0.2";
+    version = "0.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/tunnel/-/tunnel-0.0.2.tgz";
+      name = "tunnel-0.0.2.tgz";
+      sha1 = "f23bcd8b7a7b8a864261b2084f66f93193396334";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."tunnel"."~0.0.2" =
+    self.by-version."tunnel"."0.0.3";
+  by-version."tunnel"."0.0.3" = self.buildNodePackage {
+    name = "tunnel-0.0.3";
+    version = "0.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/tunnel/-/tunnel-0.0.3.tgz";
+      name = "tunnel-0.0.3.tgz";
+      sha1 = "e8f988115ca7be9d076c7a1fae4788be708f0cf1";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."tunnel-agent"."~0.4.0" =
+    self.by-version."tunnel-agent"."0.4.2";
+  by-version."tunnel-agent"."0.4.2" = self.buildNodePackage {
+    name = "tunnel-agent-0.4.2";
+    version = "0.4.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.2.tgz";
+      name = "tunnel-agent-0.4.2.tgz";
+      sha1 = "1104e3f36ac87125c287270067d582d18133bfee";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."tunnel-agent"."~0.4.1" =
+    self.by-version."tunnel-agent"."0.4.2";
+  by-spec."tv4"."^1.1.9" =
+    self.by-version."tv4"."1.2.7";
+  by-version."tv4"."1.2.7" = self.buildNodePackage {
+    name = "tv4-1.2.7";
+    version = "1.2.7";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/tv4/-/tv4-1.2.7.tgz";
+      name = "tv4-1.2.7.tgz";
+      sha1 = "bd29389afc73ade49ae5f48142b5d544bf68d120";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."tweetnacl".">=0.13.0 <1.0.0" =
+    self.by-version."tweetnacl"."0.13.3";
+  by-version."tweetnacl"."0.13.3" = self.buildNodePackage {
+    name = "tweetnacl-0.13.3";
+    version = "0.13.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.3.tgz";
+      name = "tweetnacl-0.13.3.tgz";
+      sha1 = "d628b56f3bcc3d5ae74ba9d4c1a704def5ab4b56";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."typedarray"."~0.0.5" =
+    self.by-version."typedarray"."0.0.6";
+  by-version."typedarray"."0.0.6" = self.buildNodePackage {
+    name = "typedarray-0.0.6";
+    version = "0.0.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz";
+      name = "typedarray-0.0.6.tgz";
+      sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."underscore"."1.4.x" =
+    self.by-version."underscore"."1.4.4";
+  by-version."underscore"."1.4.4" = self.buildNodePackage {
+    name = "underscore-1.4.4";
+    version = "1.4.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz";
+      name = "underscore-1.4.4.tgz";
+      sha1 = "61a6a32010622afa07963bf325203cf12239d604";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."underscore".">= 1.3.1" =
+    self.by-version."underscore"."1.8.3";
+  by-version."underscore"."1.8.3" = self.buildNodePackage {
+    name = "underscore-1.8.3";
+    version = "1.8.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz";
+      name = "underscore-1.8.3.tgz";
+      sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."underscore"."~1.4.4" =
+    self.by-version."underscore"."1.4.4";
+  by-spec."util-deprecate"."~1.0.1" =
+    self.by-version."util-deprecate"."1.0.2";
+  by-version."util-deprecate"."1.0.2" = self.buildNodePackage {
+    name = "util-deprecate-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz";
+      name = "util-deprecate-1.0.2.tgz";
+      sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."uuid"."2.0.1" =
+    self.by-version."uuid"."2.0.1";
+  by-version."uuid"."2.0.1" = self.buildNodePackage {
+    name = "uuid-2.0.1";
+    version = "2.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz";
+      name = "uuid-2.0.1.tgz";
+      sha1 = "c2a30dedb3e535d72ccf82e343941a50ba8533ac";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."validator"."~3.1.0" =
+    self.by-version."validator"."3.1.0";
+  by-version."validator"."3.1.0" = self.buildNodePackage {
+    name = "validator-3.1.0";
+    version = "3.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/validator/-/validator-3.1.0.tgz";
+      name = "validator-3.1.0.tgz";
+      sha1 = "2ea1ff7e92254d69367f385f015299e5ead8755b";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."validator"."~3.22.2" =
+    self.by-version."validator"."3.22.2";
+  by-version."validator"."3.22.2" = self.buildNodePackage {
+    name = "validator-3.22.2";
+    version = "3.22.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/validator/-/validator-3.22.2.tgz";
+      name = "validator-3.22.2.tgz";
+      sha1 = "6f297ae67f7f82acc76d0afdb49f18d9a09c18c0";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."verror"."1.3.6" =
+    self.by-version."verror"."1.3.6";
+  by-version."verror"."1.3.6" = self.buildNodePackage {
+    name = "verror-1.3.6";
+    version = "1.3.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/verror/-/verror-1.3.6.tgz";
+      name = "verror-1.3.6.tgz";
+      sha1 = "cff5df12946d297d2baaefaa2689e25be01c005c";
+    };
+    deps = {
+      "extsprintf-1.0.2" = self.by-version."extsprintf"."1.0.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."walk"."^2.3.9" =
+    self.by-version."walk"."2.3.9";
+  by-version."walk"."2.3.9" = self.buildNodePackage {
+    name = "walk-2.3.9";
+    version = "2.3.9";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/walk/-/walk-2.3.9.tgz";
+      name = "walk-2.3.9.tgz";
+      sha1 = "31b4db6678f2ae01c39ea9fb8725a9031e558a7b";
+    };
+    deps = {
+      "foreachasync-3.0.0" = self.by-version."foreachasync"."3.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."winston"."0.6.x" =
+    self.by-version."winston"."0.6.2";
+  by-version."winston"."0.6.2" = self.buildNodePackage {
+    name = "winston-0.6.2";
+    version = "0.6.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/winston/-/winston-0.6.2.tgz";
+      name = "winston-0.6.2.tgz";
+      sha1 = "4144fe2586cdc19a612bf8c035590132c9064bd2";
+    };
+    deps = {
+      "async-0.1.22" = self.by-version."async"."0.1.22";
+      "colors-0.6.2" = self.by-version."colors"."0.6.2";
+      "cycle-1.0.3" = self.by-version."cycle"."1.0.3";
+      "eyes-0.1.8" = self.by-version."eyes"."0.1.8";
+      "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
+      "request-2.9.203" = self.by-version."request"."2.9.203";
+      "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."wordwrap"."0.0.2" =
+    self.by-version."wordwrap"."0.0.2";
+  by-version."wordwrap"."0.0.2" = self.buildNodePackage {
+    name = "wordwrap-0.0.2";
+    version = "0.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz";
+      name = "wordwrap-0.0.2.tgz";
+      sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."xml2js"."0.1.x" =
+    self.by-version."xml2js"."0.1.14";
+  by-version."xml2js"."0.1.14" = self.buildNodePackage {
+    name = "xml2js-0.1.14";
+    version = "0.1.14";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/xml2js/-/xml2js-0.1.14.tgz";
+      name = "xml2js-0.1.14.tgz";
+      sha1 = "5274e67f5a64c5f92974cd85139e0332adc6b90c";
+    };
+    deps = {
+      "sax-1.1.4" = self.by-version."sax"."1.1.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."xml2js"."0.2.7" =
+    self.by-version."xml2js"."0.2.7";
+  by-version."xml2js"."0.2.7" = self.buildNodePackage {
+    name = "xml2js-0.2.7";
+    version = "0.2.7";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/xml2js/-/xml2js-0.2.7.tgz";
+      name = "xml2js-0.2.7.tgz";
+      sha1 = "1838518bb01741cae0878bab4915e494c32306af";
+    };
+    deps = {
+      "sax-0.5.2" = self.by-version."sax"."0.5.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."xmlbuilder"."0.4.3" =
+    self.by-version."xmlbuilder"."0.4.3";
+  by-version."xmlbuilder"."0.4.3" = self.buildNodePackage {
+    name = "xmlbuilder-0.4.3";
+    version = "0.4.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.3.tgz";
+      name = "xmlbuilder-0.4.3.tgz";
+      sha1 = "c4614ba74e0ad196e609c9272cd9e1ddb28a8a58";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."xmlbuilder"."0.4.x" =
+    self.by-version."xmlbuilder"."0.4.3";
+  by-spec."xmldom".">= 0.1.x" =
+    self.by-version."xmldom"."0.1.20";
+  by-version."xmldom"."0.1.20" = self.buildNodePackage {
+    name = "xmldom-0.1.20";
+    version = "0.1.20";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/xmldom/-/xmldom-0.1.20.tgz";
+      name = "xmldom-0.1.20.tgz";
+      sha1 = "a70b6d9035a8b16f89727d4f0dddeba0f4077892";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."xpath.js"."~1.0.5" =
+    self.by-version."xpath.js"."1.0.6";
+  by-version."xpath.js"."1.0.6" = self.buildNodePackage {
+    name = "xpath.js-1.0.6";
+    version = "1.0.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/xpath.js/-/xpath.js-1.0.6.tgz";
+      name = "xpath.js-1.0.6.tgz";
+      sha1 = "fe4b81c1b152ebd8e1395265fedc5b00fca29b90";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."xtend"."^4.0.0" =
+    self.by-version."xtend"."4.0.1";
+  by-version."xtend"."4.0.1" = self.buildNodePackage {
+    name = "xtend-4.0.1";
+    version = "4.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz";
+      name = "xtend-4.0.1.tgz";
+      sha1 = "a5c6d532be656e23db820efb943a1f04998d63af";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aefcbfa910a3..702c79df12b4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -584,6 +584,8 @@ let
 
   awscli = pythonPackages.awscli;
 
+  azure-cli = callPackage ../tools/virtualization/azure-cli { };
+
   ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { };
 
   ec2_ami_tools = callPackage ../tools/virtualization/ec2-ami-tools { };

From 6e7362dc8fa582756c90f230193ae5b17aff5516 Mon Sep 17 00:00:00 2001
From: Eduard Bachmakov <e.bachmakov@gmail.com>
Date: Thu, 14 Jan 2016 20:57:30 -0500
Subject: [PATCH 743/884] dfilemanager: update to git from 2016-01-10

---
 pkgs/applications/misc/dfilemanager/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/dfilemanager/default.nix b/pkgs/applications/misc/dfilemanager/default.nix
index 1891c4f21749..ce35593d91d1 100644
--- a/pkgs/applications/misc/dfilemanager/default.nix
+++ b/pkgs/applications/misc/dfilemanager/default.nix
@@ -1,17 +1,17 @@
 { stdenv, fetchgit, cmake, file, qtbase, qttools, qtx11extras, solid }:
 
 let
-  version = "git-2015-07-25";
+  version = "git-2016-01-10";
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "dfilemanager-${version}";
   src = fetchgit {
     url = "git://git.code.sf.net/p/dfilemanager/code";
-    rev = "99afcde199378eb0d499c49a9e28846c22e27483";
-    sha256 = "1dd21xl24xvxs100j8nzhpaqfqk8srqs92al9c03jmyjlk31s6lf";
+    rev = "2c5078b05e0ad74c037366be1ab3e6a03492bde4";
+    sha256 = "1qwhnlcc2j8sr1f3v63sxs3m7q7w1xy6c2jqsnznjgm23b5h3hxd";
   };
 
-  buildInputs = [ cmake qtbase qttools qtx11extras file solid ];
+  buildInputs = [ cmake qtbase qttools file solid ];
 
   cmakeFlags = "-DQT5BUILD=true";
 

From 8c5ef127f4e5dde957c331010958630931e4b401 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 15 Jan 2016 01:28:52 +0100
Subject: [PATCH 744/884] simp_le: 20151207 -> 2016-01-09; co-maintain

CC maintainer @gebner.
---
 pkgs/tools/admin/simp_le/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix
index 43e361ba6471..f6b352056fa0 100644
--- a/pkgs/tools/admin/simp_le/default.nix
+++ b/pkgs/tools/admin/simp_le/default.nix
@@ -1,22 +1,22 @@
 { stdenv, fetchFromGitHub, pythonPackages }:
 
 pythonPackages.buildPythonPackage rec {
-  name = "simp_le-20151207";
+  name = "simp_le-2016-01-09";
 
   src = fetchFromGitHub {
     owner = "kuba";
     repo = "simp_le";
-    rev = "ac836bc0af988cb14dc0a83dc2039e7fa541b677";
-    sha256 = "0r07mlis81n0pmj74wjcvjpi6i3lkzs6hz8iighhk8yymn1a8rbn";
+    rev = "b9d95e862536d1242e1ca6d7dac5691f32f11373";
+    sha256 = "0l4qs0y4cbih76zrpbkn77xj17iwsm5fi83zc3p048x4hj163805";
   };
 
   propagatedBuildInputs = with pythonPackages; [ acme ];
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/kuba/simp_le;
+    inherit (src.meta) homepage;
     description = "Simple Let's Encrypt client";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ gebner ];
+    maintainers = with maintainers; [ gebner nckx ];
     platforms = platforms.all;
   };
 }

From 82abca9c9baca4c7e52d75721b72ad53a0589619 Mon Sep 17 00:00:00 2001
From: Eduard Bachmakov <e.bachmakov@gmail.com>
Date: Thu, 14 Jan 2016 21:54:11 -0500
Subject: [PATCH 745/884] 3dfsb: mark as broken, remove self from maintainers

---
 pkgs/applications/misc/3dfsb/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/3dfsb/default.nix b/pkgs/applications/misc/3dfsb/default.nix
index fe173b21b571..36f3b17a0a31 100644
--- a/pkgs/applications/misc/3dfsb/default.nix
+++ b/pkgs/applications/misc/3dfsb/default.nix
@@ -4,12 +4,14 @@
 stdenv.mkDerivation {
   name = "3dfsb-1.0";
 
+  broken = true; # segfaults as of this commit
+
   meta = with stdenv.lib; {
     description = "3D File System Browser - cleaned up and improved fork of the old tdfsb which runs on GNU/Linux and should also run on BeOS/Haiku and FreeBSD";
     homepage = "https://github.com/tomvanbraeckel/3dfsb";
     license = licenses.gpl2;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ eduarrrd ];
+    maintainers = with maintainers; [ ];
   };
 
   src = fetchgit {

From f119de4b35ae84e757b31a270e2f0783edc4bd64 Mon Sep 17 00:00:00 2001
From: Eduard Bachmakov <e.bachmakov@gmail.com>
Date: Thu, 14 Jan 2016 22:25:39 -0500
Subject: [PATCH 746/884] pianobar: 2014.09.28 -> 2015.11.22

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

diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/applications/audio/pianobar/default.nix
index b76e1183c0ee..09bb75b2e411 100644
--- a/pkgs/applications/audio/pianobar/default.nix
+++ b/pkgs/applications/audio/pianobar/default.nix
@@ -1,15 +1,15 @@
-{ fetchurl, stdenv, pkgconfig, libao, readline, json_c, libgcrypt, gnutls, libav }:
+{ fetchurl, stdenv, pkgconfig, libao, readline, json_c, libgcrypt, libav, curl }:
 
 stdenv.mkDerivation rec {
-  name = "pianobar-2014.09.28";
+  name = "pianobar-2015.11.22";
 
   src = fetchurl {
     url = "http://6xq.net/projects/pianobar/${name}.tar.bz2";
-    sha256 = "6bd10218ad5d68c4c761e02c729627d2581b4a6db559190e7e52dc5df177e68f";
+    sha256 = "0arjvs31d108l1mn2k2hxbpg3mxs47vqzxm0lzdpfcjvypkckyr3";
   };
 
   buildInputs = [
-    pkgconfig libao json_c libgcrypt gnutls libav
+    pkgconfig libao json_c libgcrypt libav curl
   ];
 
   makeFlags="PREFIX=$(out)";
@@ -17,8 +17,6 @@ stdenv.mkDerivation rec {
   CC = "gcc";
   CFLAGS = "-std=c99";
 
-  configurePhase = "export CC=${CC}";
-
   meta = with stdenv.lib; {
     description = "A console front-end for Pandora.com";
     homepage = "http://6xq.net/projects/pianobar/";

From 123065aa3dd9b582abf7bac6e2ea75a6e35ff1a5 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 15 Jan 2016 04:46:32 +0100
Subject: [PATCH 747/884] git-bz: use callPackage and canonical package name

Don't add a compatibility alias as this package was/is marked as
being broken anyway.
---
 .../version-management/git-and-tools/default.nix            | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 4d3c31b4f914..1bf58195f5eb 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -26,11 +26,7 @@ in
 rec {
 
   # support for bugzilla
-  gitBz = import ./git-bz {
-    inherit fetchgit stdenv makeWrapper python asciidoc xmlto # docbook2x docbook_xsl docbook_xml_dtd_45 libxslt
-      ;
-    inherit (pythonPackages) pysqlite;
-  };
+  git-bz = callPackage ./git-bz { };
 
   git = appendToName "minimal" gitBase;
 

From 36a68c8b6bcfd4be96b044bd99f1cf43e1b22281 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 15 Jan 2016 04:56:45 +0100
Subject: [PATCH 748/884] git-bz: 3.20110902 -> 3.2015-09-08

---
 .../git-and-tools/git-bz/default.nix          | 37 ++++++++++---------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix
index 4015867b0eb5..1ae5579dd8cf 100644
--- a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix
@@ -1,31 +1,34 @@
-{ stdenv, fetchgit, python, asciidoc, xmlto, pysqlite, makeWrapper }:
+{ stdenv, fetchgit
+, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, makeWrapper, xmlto
+, pythonPackages }:
 
-let
-  version = "3.20110902";
-in
+let version = "3.2015-09-08"; in
 stdenv.mkDerivation {
-  name = "git-bz";
+  name = "git-bz-${version}";
 
   src = fetchgit {
+    sha256 = "19d9c81d4eeabe87079d8f60e4cfa7303f776f5a7c9874642cf2bd188851d029";
+    rev = "e17bbae7a2ce454d9f69c32fc40066995d44913d";
     url = "git://git.fishsoup.net/git-bz";
-    rev = "refs/heads/master";
   };
 
-  buildInputs = [
-    makeWrapper python pysqlite # asciidoc xmlto
-  ];
 
-  buildPhase = ''
-    true
-    # make git-bz.1
+  nativeBuildInputs = [
+    asciidoc docbook_xml_dtd_45 docbook_xsl libxslt makeWrapper xmlto
+  ];
+  buildInputs = []
+    ++ (with pythonPackages; [ python pysqlite ]);
+
+  postPatch = ''
+    patchShebangs configure
+
+    # Don't create a .html copy of the man page that isn't installed anyway:
+    substituteInPlace Makefile --replace "git-bz.html" ""
   '';
 
-  installPhase = ''
-    mkdir -p $out
-    mkdir -p $out/bin
-    cp git-bz $out/bin
+  postInstall = ''
     wrapProgram $out/bin/git-bz \
-      --prefix PYTHONPATH : "$(toPythonPath $python):$(toPythonPath $pysqlite)"
+      --prefix PYTHONPATH : "$(toPythonPath "${pythonPackages.pysqlite}")"
   '';
 
   meta = {

From d1440745c6e6f6ee611679dc30b40cb963724427 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 15 Jan 2016 05:21:26 +0100
Subject: [PATCH 749/884] git-bz: meta: un-break; fix licence; maintain

CC @nbp (I assume it was abandoned years ago, apologies otherwise).
---
 .../git-and-tools/git-bz/default.nix              | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix
index 1ae5579dd8cf..4a059367678b 100644
--- a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix
@@ -31,11 +31,9 @@ stdenv.mkDerivation {
       --prefix PYTHONPATH : "$(toPythonPath "${pythonPackages.pysqlite}")"
   '';
 
-  meta = {
-    homepage = "http://git.fishsoup.net/cgit/git-bz/";
-    description = "integration of git with Bugzilla";
-    license = stdenv.lib.licenses.gpl2;
-
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "Bugzilla integration for git";
     longDescription = ''
       git-bz is a tool for integrating the Git command line with the
       Bugzilla bug-tracking system. Operations such as attaching patches to
@@ -49,9 +47,10 @@ stdenv.mkDerivation {
       currently is able to do this for Firefox, Epiphany, Galeon and
       Chromium on Linux.
     '';
+    license = licenses.gpl2Plus;
+    homepage = http://git.fishsoup.net/cgit/git-bz/;
 
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.pierron ];
-    broken = true;
+    mantainers = with maintainers; [ nckx ];
+    platforms = platforms.linux;
   };
 }

From a8f1d40c1f495ef3388b73992d2079c13471b729 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 10 Jan 2016 12:17:39 +0100
Subject: [PATCH 750/884] all-packages: browserWrapper -> browser

- I chose to keep `browser-unwrapped` attributes so that it's much
  easier to override parameters for the browser (through `packageOverrides`).
- Aliases `browserWrapper` are retained for now, as usual.
---
 .../networking/browsers/firefox/default.nix   |  4 +-
 .../networking/irc/chatzilla/default.nix      |  4 +-
 .../interpreters/xulrunner/default.nix        |  6 +-
 pkgs/top-level/all-packages.nix               | 71 ++++++++-----------
 4 files changed, 38 insertions(+), 47 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 80f5e7212c8c..5062688fffee 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -131,13 +131,13 @@ common = { pname, version, sha256 }: stdenv.mkDerivation rec {
 
 in {
 
-  firefox = common {
+  firefox-unwrapped = common {
     pname = "firefox";
     version = "43.0.4";
     sha256 = "0xjs4j26h8fyy8izrcc482vfvgg4gqzap5kh17jfv7flhn9akkvn";
   };
 
-  firefox-esr = common {
+  firefox-esr-unwrapped = common {
     pname = "firefox-esr";
     version = "38.5.2esr";
     sha256 = "0xqirpiys2pgzk9hs4s93svknc0sss8ry60zar7n9jj74cgz590m";
diff --git a/pkgs/applications/networking/irc/chatzilla/default.nix b/pkgs/applications/networking/irc/chatzilla/default.nix
index 765066bb4371..82d9912192ed 100644
--- a/pkgs/applications/networking/irc/chatzilla/default.nix
+++ b/pkgs/applications/networking/irc/chatzilla/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, firefox, makeWrapper }:
+{ stdenv, fetchurl, unzip, firefox-unwrapped, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "chatzilla-0.9.91";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/libexec/chatzilla
     unzip $src -d $out/libexec/chatzilla
 
-    makeWrapper ${firefox}/bin/firefox $out/bin/chatzilla \
+    makeWrapper ${firefox-unwrapped}/bin/firefox $out/bin/chatzilla \
       --add-flags "-app $out/libexec/chatzilla/application.ini"
 
     sed -i $out/libexec/chatzilla/application.ini -e 's/.*MaxVersion.*/MaxVersion=99.*/'
diff --git a/pkgs/development/interpreters/xulrunner/default.nix b/pkgs/development/interpreters/xulrunner/default.nix
index d61b4e5f2f13..459e77467d8e 100644
--- a/pkgs/development/interpreters/xulrunner/default.nix
+++ b/pkgs/development/interpreters/xulrunner/default.nix
@@ -3,18 +3,18 @@
 , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
 , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
 , hunspell, libevent, libstartup_notification, libvpx
-, cairo, gstreamer, gst_plugins_base, icu, firefox
+, cairo, gstreamer, gst_plugins_base, icu, firefox-unwrapped
 , debugBuild ? false
 }:
 
 assert stdenv.cc ? libc && stdenv.cc.libc != null;
 
-let version = firefox.version; in
+let version = firefox-unwrapped.version; in
 
 stdenv.mkDerivation rec {
   name = "xulrunner-${version}";
 
-  src = firefox.src;
+  src = firefox-unwrapped.src;
 
   buildInputs =
     [ pkgconfig gtk perl zip libIDL libjpeg zlib bzip2
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0b7771251bd6..a7c775bff9a3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4194,12 +4194,12 @@ let
 
   icedtea7_web = callPackage ../development/compilers/icedtea-web {
     jdk = jdk7;
-    xulrunner = firefox;
+    xulrunner = firefox-unwrapped;
   };
 
   icedtea8_web = callPackage ../development/compilers/icedtea-web {
     jdk = jdk8;
-    xulrunner = firefox;
+    xulrunner = firefox-unwrapped;
   };
 
   icedtea_web = icedtea8_web;
@@ -11326,13 +11326,8 @@ let
 
   comical = callPackage ../applications/graphics/comical { };
 
-  conkeror = callPackage ../applications/networking/browsers/conkeror { };
-
-  conkerorWrapper = wrapFirefox {
-    browser = conkeror;
-    browserName = "conkeror";
-    desktopName = "Conkeror";
-  };
+  conkeror-unwrapped = callPackage ../applications/networking/browsers/conkeror { };
+  conkeror = wrapFirefox conkeror-unwrapped { };
 
   csdp = callPackage ../applications/science/math/csdp {
     liblapack = liblapackWithoutAtlas;
@@ -11440,11 +11435,8 @@ let
 
   dvd-slideshow = callPackage ../applications/video/dvd-slideshow { };
 
-  dwb = callPackage ../applications/networking/browsers/dwb { dconf = gnome3.dconf; };
-
-  dwbWrapper = wrapFirefox
-    { browser = dwb; browserName = "dwb"; desktopName = "dwb";
-    };
+  dwb-unwrapped = callPackage ../applications/networking/browsers/dwb { dconf = gnome3.dconf; };
+  dwb = wrapFirefox dwb-unwrapped { desktopName = "dwb"; };
 
   dwm = callPackage ../applications/window-managers/dwm {
     patches = config.dwm.patches or [];
@@ -11838,10 +11830,10 @@ let
     inherit (pythonPackages) pysqlite;
     libpng = libpng_apng;
     enableGTK3 = false;
-  }) firefox firefox-esr;
+  }) firefox-unwrapped firefox-esr-unwrapped;
 
-  firefox-wrapper = wrapFirefox { browser = pkgs.firefox; };
-  firefox-esr-wrapper = wrapFirefox { browser = pkgs.firefox-esr; };
+  firefox = wrapFirefox firefox-unwrapped { };
+  firefox-esr = wrapFirefox firefox-esr-unwrapped { };
 
   firefox-bin = callPackage ../applications/networking/browsers/firefox-bin {
     gconf = pkgs.gnome.GConf;
@@ -12033,7 +12025,7 @@ let
 
   gecko_mediaplayer = callPackage ../applications/networking/browsers/mozilla-plugins/gecko-mediaplayer {
     inherit (gnome) GConf;
-    browser = firefox;
+    browser = firefox-unwrapped;
   };
 
   geeqie = callPackage ../applications/graphics/geeqie { };
@@ -12458,12 +12450,10 @@ let
 
   mid2key = callPackage ../applications/audio/mid2key { };
 
-  midori = callPackage ../applications/networking/browsers/midori {
+  midori-unwrapped = callPackage ../applications/networking/browsers/midori {
     webkitgtk = webkitgtk24x;
   };
-
-  midoriWrapper = wrapFirefox
-    { browser = midori; browserName = "midori"; desktopName = "Midori"; };
+  midori = wrapFirefox midori-unwrapped { };
 
   mikmod = callPackage ../applications/audio/mikmod { };
 
@@ -13917,7 +13907,9 @@ let
     pygtk = pyGtkGlade;
   };
 
-  zotero = callPackage ../applications/office/zotero {};
+  zotero = callPackage ../applications/office/zotero {
+    firefox = firefox-unwrapped;
+  };
 
   zscroll = callPackage ../applications/misc/zscroll {};
 
@@ -14657,7 +14649,8 @@ let
             tag = "-client-without-kde";
           });
 
-          rekonq = callPackage ../applications/networking/browsers/rekonq { };
+          rekonq-unwrapped = callPackage ../applications/networking/browsers/rekonq { };
+          rekonq = wrapFirefox rekonq-unwrapped { };
 
           kwebkitpart = callPackage ../applications/networking/browsers/kwebkitpart { };
 
@@ -15670,27 +15663,17 @@ let
     inherit (darwin.apple_sdk.frameworks) Cocoa;
   });
 
-  vimprobable2 = callPackage ../applications/networking/browsers/vimprobable2 {
+  vimprobable2-unwrapped = callPackage ../applications/networking/browsers/vimprobable2 {
     webkit = webkitgtk2;
   };
+  vimprobable2 = wrapFirefox vimprobable2-unwrapped { };
 
-  vimprobable2Wrapper = wrapFirefox
-    { browser = vimprobable2; browserName = "vimprobable2"; desktopName = "Vimprobable2";
-    };
+  inherit (kde4) rekonq;
 
-  rekonqWrapper = wrapFirefox {
-    browser = kde4.rekonq; browserName = "rekonq"; desktopName = "Rekonq";
-  };
-
-  vimb = callPackage ../applications/networking/browsers/vimb {
+  vimb-unwrapped = callPackage ../applications/networking/browsers/vimb {
     webkit = webkitgtk2;
   };
-
-  vimbWrapper = wrapFirefox {
-    browser = vimb;
-    browserName = "vimb";
-    desktopName = "Vimb";
-  };
+  vimb = wrapFirefox vimb-unwrapped { };
 
   vips = callPackage ../tools/graphics/vips { };
   nip2 = callPackage ../tools/graphics/nip2 { };
@@ -15821,12 +15804,16 @@ aliases = with self; rec {
   buildbotSlave = buildbot-slave;  # added 2014-12-09
   cheetahTemplate = pythonPackages.cheetah; # 2015-06-15
   clangAnalyzer = clang-analyzer;  # added 2015-02-20
+  conkerorWrapper = conkeror; # added 2015-01
   cool-old-term = cool-retro-term; # added 2015-01-31
   cupsBjnp = cups-bjnp; # added 2016-01-02
   cv = progress; # added 2015-09-06
+  dwbWrapper = dwb; # added 2015-01
   enblendenfuse = enblend-enfuse;	# 2015-09-30
   exfat-utils = exfat;                  # 2015-09-11
-  firefoxWrapper = firefox-wrapper;
+  firefoxWrapper = firefox;           # 2015-09
+  firefox-wrapper = firefox;          # 2016-01
+  firefox-esr-wrapper = firefox-esr;  # 2016-01
   fuse_exfat = exfat;                   # 2015-09-11
   grantlee5 = qt5.grantlee;  # added 2015-12-19
   gupnptools = gupnp-tools;  # added 2015-12-19
@@ -15838,6 +15825,7 @@ aliases = with self; rec {
   libtidy = html-tidy;  # added 2014-12-21
   lttngTools = lttng-tools;  # added 2014-07-31
   lttngUst = lttng-ust;  # added 2014-07-31
+  midoriWrapper = midori; # added 2015-01
   mlt-qt5 = qt5.mlt;  # added 2015-12-19
   nfsUtils = nfs-utils;  # added 2014-12-06
   phonon_qt5 = qt5.phonon;  # added 2015-12-19
@@ -15852,6 +15840,7 @@ aliases = with self; rec {
   quasselClient_kf5 = kde5.quasselClient; # added 2015-09-30
   qwt6 = qt5.qwt;  # added 2015-12-19
   rdiff_backup = rdiff-backup;  # added 2014-11-23
+  rekonqWrapper = rekonq; # added 2015-01
   rssglx = rss-glx; #added 2015-03-25
   rxvt_unicode_with-plugins = rxvt_unicode-with-plugins; # added 2015-04-02
   signon = qt5.signon;  # added 2015-12-19
@@ -15864,6 +15853,8 @@ aliases = with self; rec {
   xlibs = xorg; # added 2015-09
   youtube-dl = pythonPackages.youtube-dl; # added 2015-06-07
   youtubeDL = youtube-dl;  # added 2014-10-26
+  vimbWrapper = vimb; # added 2015-01
+  vimprobable2Wrapper = vimprobable2; # added 2015-01
   pidginlatexSF = pidginlatex; # added 2014-11-02
   tftp_hpa = tftp-hpa; # added 2015-04-03
   manpages = man-pages; # added 2015-12-06

From 2e78e19de0da98b6ccf099eff82a2f19fe567d1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 10 Jan 2016 14:56:17 +0100
Subject: [PATCH 751/884] firefox: put "unwrapped" into its name

I'm not certain about this, so I'm trying for firefox only.
Rationale: it might be confusing to see two firefox-${version} instances
in logs or paths, so I wanted to differentiate them.
---
 pkgs/applications/networking/browsers/firefox/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 5062688fffee..846c79d0b746 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -19,7 +19,7 @@ assert stdenv.cc ? libc && stdenv.cc.libc != null;
 let
 
 common = { pname, version, sha256 }: stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
+  name = "${pname}-unwrapped-${version}";
 
   src = fetchurl {
     url =

From f50d80f62763b2fd54ac328065dc70980d39bf74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 10 Jan 2016 15:17:33 +0100
Subject: [PATCH 752/884] makeDesktopItem: change `name` of the derivations

The name wasn't suggesting what kind of stuff is in there;
now it's the same as the name of the file that gets generated.
---
 pkgs/build-support/make-desktopitem/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/make-desktopitem/default.nix b/pkgs/build-support/make-desktopitem/default.nix
index d4baf17adf1b..2f6c827d8758 100644
--- a/pkgs/build-support/make-desktopitem/default.nix
+++ b/pkgs/build-support/make-desktopitem/default.nix
@@ -13,10 +13,10 @@
 }:
 
 stdenv.mkDerivation {
-  inherit name;
+  name = "${name}.desktop";
   buildCommand = ''
     mkdir -p $out/share/applications
-    cat > $out/share/applications/$name.desktop <<EOF
+    cat > $out/share/applications/${name}.desktop <<EOF
     [Desktop Entry]
     Type=${type}
     Exec=${exec}

From 5fe68602cccb1e40cf6bc0c404d58b184491c828 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 15 Jan 2016 08:34:26 +0100
Subject: [PATCH 753/884] release notes: document renames of firefox-like
 browsers

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

diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index 9853e7f9d703..45c107597f97 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -24,6 +24,17 @@ nixos.path = ./nixpkgs-unstable-2015-12-06/nixos;
     <xref linkend="module-misc-nixos" /></para>
   </listitem>
 
+  <listitem>
+    <para>Firefox and similar browsers are now <emphasis>wrapped by default</emphasis>.
+    The package and attribute names are plain <literal>firefox</literal>
+    or <literal>midori</literal>, etc.  Backward-compatibility attributes were set up,
+    but note that <command>nix-env -u</command> will <emphasis>not</emphasis> update
+    your current <literal>firefox-with-plugins</literal>;
+    you have to uninstall it and install <literal>firefox</literal> instead.
+    More discussion is <link xlink:href="https://github.com/NixOS/nixpkgs/pull/12299">
+    on the PR</link>.  </para>
+  </listitem>
+
 </itemizedlist>
 
 <para>The following new services were added since the last release:

From 0b4c7d42a87b8fe3028de9ef7790e0564c316a08 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Thu, 14 Jan 2016 11:33:59 +0100
Subject: [PATCH 754/884] pharo-vm: Refactor to introduce new VMs (close
 #12388)

The Pharo community now has a Spur VM: this VM is the only one to
open Pharo50 images.
---
 pkgs/development/pharo/vm/build-vm.nix | 102 +++++++++++++++++++++
 pkgs/development/pharo/vm/default.nix  | 120 +++++--------------------
 pkgs/top-level/all-packages.nix        |   5 +-
 3 files changed, 126 insertions(+), 101 deletions(-)
 create mode 100644 pkgs/development/pharo/vm/build-vm.nix

diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix
new file mode 100644
index 000000000000..b5fa7a97e133
--- /dev/null
+++ b/pkgs/development/pharo/vm/build-vm.nix
@@ -0,0 +1,102 @@
+{ stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, mesa, freetype, xorg, alsaLib, cairo }:
+
+{ name, src, binary-basename, ... }:
+
+stdenv.mkDerivation rec {
+
+  inherit name src binary-basename;
+
+  sources10Zip = fetchurl {
+    url = http://files.pharo.org/sources/PharoV10.sources.zip;
+    sha256 = "0aijhr3w5w3jzmnpl61g6xkwyi2l1mxy0qbvr9k3whz8zlrsijh2";
+  };
+
+  sources20Zip = fetchurl {
+    url = http://files.pharo.org/sources/PharoV20.sources.zip;
+    sha256 = "1xsc0p361pp8iha5zckppw29sbapd706wbvzvgjnkv2n6n1q5gj7";
+  };
+
+  sources30Zip = fetchurl {
+    url = http://files.pharo.org/sources/PharoV30.sources.zip;
+    sha256 = "08d9a7gggwpwgrfbp7iv5896jgqz3vgjfrq19y3jw8k10pva98ak";
+  };
+
+  sources40Zip = fetchurl {
+    url = http://files.pharo.org/sources/PharoV40.sources.zip;
+    sha256 = "1xq1721ql19hpgr8ir372h92q7g8zwd6k921b21dap4wf8djqnpd";
+  };
+
+  # Building
+  preConfigure = ''
+    cd build/
+  '';
+  resources = ./resources;
+  installPhase = ''
+    echo Current directory $(pwd)
+    echo Creating prefix "$prefix"
+    mkdir -p "$prefix/lib/pharo-vm"
+
+    cd ../../results
+
+    mv vm-display-null vm-display-null.so
+    mv vm-display-X11 vm-display-X11.so
+    mv vm-sound-null vm-sound-null.so
+    mv vm-sound-ALSA vm-sound-ALSA.so
+    mv pharo pharo-vm
+
+    cp * "$prefix/lib/pharo-vm"
+
+    cp -R "$resources/"* "$prefix/"
+
+    mkdir $prefix/bin
+
+    chmod u+w $prefix/bin
+    cat > $prefix/bin/${binary-basename}-x <<EOF
+    #!${bash}/bin/bash
+
+    # disable parameter expansion to forward all arguments unprocessed to the VM
+    set -f
+
+    exec $prefix/lib/pharo-vm/pharo-vm "\$@"
+    EOF
+
+    cat > $prefix/bin/${binary-basename}-nox <<EOF
+    #!${bash}/bin/bash
+
+    # disable parameter expansion to forward all arguments unprocessed to the VM
+    set -f
+
+    exec $prefix/lib/pharo-vm/pharo-vm -vm-display-null "\$@"
+    EOF
+
+    chmod +x $prefix/bin/${binary-basename}-x $prefix/bin/${binary-basename}-nox
+
+    unzip ${sources10Zip} -d $prefix/lib/pharo-vm/
+    unzip ${sources20Zip} -d $prefix/lib/pharo-vm/
+    unzip ${sources30Zip} -d $prefix/lib/pharo-vm/
+    unzip ${sources40Zip} -d $prefix/lib/pharo-vm/
+  '';
+
+  buildInputs = [ bash unzip cmake glibc openssl gcc mesa freetype xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo ];
+
+  meta = {
+    description = "Clean and innovative Smalltalk-inspired environment";
+    longDescription = ''
+      Pharo's goal is to deliver a clean, innovative, free open-source
+      Smalltalk-inspired environment. By providing a stable and small core
+      system, excellent dev tools, and maintained releases, Pharo is an
+      attractive platform to build and deploy mission critical applications.
+
+      This package provides the executable VM. You should probably not care
+      about this package (which represents a packaging detail) and have a
+      look at the pharo-vm-core package instead.
+
+      Please fill bug reports on http://bugs.pharo.org under the 'Ubuntu
+      packaging (ppa:pharo/stable)' project.
+    '';
+    homepage = http://pharo.org;
+    license = stdenv.lib.licenses.mit;
+    maintainers = [ stdenv.lib.maintainers.DamienCassou ];
+    platforms = stdenv.lib.platforms.mesaPlatforms;
+  };
+}
diff --git a/pkgs/development/pharo/vm/default.nix b/pkgs/development/pharo/vm/default.nix
index a62088824ff3..f23bb900ae94 100644
--- a/pkgs/development/pharo/vm/default.nix
+++ b/pkgs/development/pharo/vm/default.nix
@@ -1,107 +1,27 @@
-{ stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, mesa, freetype, xorg, alsaLib, cairo }:
+{ stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, mesa, freetype, xorg, alsaLib, cairo } @args:
 
-stdenv.mkDerivation rec {
+rec {
+  pharo-vm-build = import ./build-vm.nix args;
 
-  version = "2015.08.06";
+  base-url = http://files.pharo.org/vm/src/vm-unix-sources/blessed;
 
-  name = "pharo-vm-core-i386-${version}";
-  system = "x86_32-linux";
-  src = fetchurl {
-    url = "http://files.pharo.org/vm/src/vm-unix-sources/blessed/pharo-vm-${version}.tar.bz2";
-    sha256 = "1kmb6phxb94d37awwldwbkj704l6m0c6sv0m54mcz6d4rx41fqgp";
+  pharo-no-spur = pharo-vm-build rec {
+    version = "2015.08.06";
+    name = "pharo-vm-i386-${version}";
+    binary-basename = "pharo-vm";
+    src = fetchurl {
+      url = "$base-url/pharo-vm-${version}.tar.bz2";
+      sha256 = "1kmb6phxb94d37awwldwbkj704l6m0c6sv0m54mcz6d4rx41fqgp";
+    };
   };
 
-  sources10Zip = fetchurl {
-    url = http://files.pharo.org/sources/PharoV10.sources.zip;
-    sha256 = "0aijhr3w5w3jzmnpl61g6xkwyi2l1mxy0qbvr9k3whz8zlrsijh2";
-  };
-
-  sources20Zip = fetchurl {
-    url = http://files.pharo.org/sources/PharoV20.sources.zip;
-    sha256 = "1xsc0p361pp8iha5zckppw29sbapd706wbvzvgjnkv2n6n1q5gj7";
-  };
-
-  sources30Zip = fetchurl {
-    url = http://files.pharo.org/sources/PharoV30.sources.zip;
-    sha256 = "08d9a7gggwpwgrfbp7iv5896jgqz3vgjfrq19y3jw8k10pva98ak";
-  };
-
-  sources40Zip = fetchurl {
-    url = http://files.pharo.org/sources/PharoV40.sources.zip;
-    sha256 = "1xq1721ql19hpgr8ir372h92q7g8zwd6k921b21dap4wf8djqnpd";
-  };
-
-  # Building
-  preConfigure = ''
-    cd build/
-  '';
-  resources = ./resources;
-  installPhase = ''
-    echo Current directory $(pwd)
-    echo Creating prefix "$prefix"
-    mkdir -p "$prefix/lib/pharo-vm"
-
-    cd ../../results
-
-    mv vm-display-null vm-display-null.so
-    mv vm-display-X11 vm-display-X11.so
-    mv vm-sound-null vm-sound-null.so
-    mv vm-sound-ALSA vm-sound-ALSA.so
-    mv pharo pharo-vm
-
-    cp * "$prefix/lib/pharo-vm"
-
-    cp -R "$resources/"* "$prefix/"
-
-    mkdir $prefix/bin
-
-    chmod u+w $prefix/bin
-    cat > $prefix/bin/pharo-vm-x <<EOF
-    #!${bash}/bin/bash
-
-    # disable parameter expansion to forward all arguments unprocessed to the VM
-    set -f
-
-    exec $prefix/lib/pharo-vm/pharo-vm "\$@"
-    EOF
-
-    cat > $prefix/bin/pharo-vm-nox <<EOF
-    #!${bash}/bin/bash
-
-    # disable parameter expansion to forward all arguments unprocessed to the VM
-    set -f
-
-    exec $prefix/lib/pharo-vm/pharo-vm -vm-display-null "\$@"
-    EOF
-
-    chmod +x $prefix/bin/pharo-vm-x $prefix/bin/pharo-vm-nox
-
-    unzip ${sources10Zip} -d $prefix/lib/pharo-vm/
-    unzip ${sources20Zip} -d $prefix/lib/pharo-vm/
-    unzip ${sources30Zip} -d $prefix/lib/pharo-vm/
-    unzip ${sources40Zip} -d $prefix/lib/pharo-vm/
-  '';
-
-  buildInputs = [ bash unzip cmake glibc openssl gcc mesa freetype xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo ];
-
-  meta = {
-    description = "Clean and innovative Smalltalk-inspired environment";
-    longDescription = ''
-      Pharo's goal is to deliver a clean, innovative, free open-source
-      Smalltalk-inspired environment. By providing a stable and small core
-      system, excellent dev tools, and maintained releases, Pharo is an
-      attractive platform to build and deploy mission critical applications.
-
-      This package provides the executable VM. You should probably not care
-      about this package (which represents a packaging detail) and have a
-      look at the pharo-vm-core package instead.
-
-      Please fill bug reports on http://bugs.pharo.org under the 'Ubuntu
-      packaging (ppa:pharo/stable)' project.
-    '';
-    homepage = http://pharo.org;
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.DamienCassou ];
-    platforms = stdenv.lib.platforms.mesaPlatforms;
+  pharo-spur = pharo-vm-build rec {
+    version = "2016.01.14";
+    name = "pharo-vm-spur-i386-${version}";
+    binary-basename = "pharo-spur-vm";
+    src = fetchurl {
+      url = "$base-url/pharo-vm-spur-${version}.tar.bz2";
+      sha256 = "1746kisa3wkhg1kwgjs544s3f17r8h99kr728qc4nk035dxkjfbx";
+    };
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ce78dee166d6..d4f409a8cb94 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5438,7 +5438,10 @@ let
 
   guile-xcb = callPackage ../development/guile-modules/guile-xcb { };
 
-  pharo-vm = callPackage_i686 ../development/pharo/vm { };
+  pharo-vms = callPackage_i686 ../development/pharo/vm { };
+  pharo-vm  = pharo-vms.pharo-no-spur;
+  pharo-vm5 = pharo-vms.pharo-spur;
+
   pharo-launcher = callPackage ../development/pharo/launcher { };
 
   srecord = callPackage ../development/tools/misc/srecord { };

From 6987f87832d28f51f9a519c6daaf709b85f058fc Mon Sep 17 00:00:00 2001
From: Svein Ove Aas <sveina@gmail.com>
Date: Thu, 14 Jan 2016 15:17:48 +0000
Subject: [PATCH 755/884] maintainers: Add Baughn

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

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index f9dcd5776fa0..45e2674cd66a 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -38,6 +38,7 @@
   aycanirican = "Aycan iRiCAN <iricanaycan@gmail.com>";
   badi = "Badi' Abdul-Wahid <abdulwahidc@gmail.com>";
   balajisivaraman = "Balaji Sivaraman<sivaraman.balaji@gmail.com>";
+  Baughn = "Svein Ove Aas <sveina@gmail.com>";
   bbenoist = "Baptist BENOIST <return_0@live.com>";
   bcarrell = "Brandon Carrell <brandoncarrell@gmail.com>";
   bcdarwin = "Ben Darwin <bcdarwin@gmail.com>";

From a28032ed589e16b9779266bed3fafe8a7163f9c7 Mon Sep 17 00:00:00 2001
From: Svein Ove Aas <sveina@gmail.com>
Date: Thu, 14 Jan 2016 15:18:12 +0000
Subject: [PATCH 756/884] iozone: init at 3.434 (close #12387)

vcunat amended some $out/share/ install paths.
---
 .../development/tools/misc/iozone/default.nix | 47 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/development/tools/misc/iozone/default.nix

diff --git a/pkgs/development/tools/misc/iozone/default.nix b/pkgs/development/tools/misc/iozone/default.nix
new file mode 100644
index 000000000000..d51a15bbee97
--- /dev/null
+++ b/pkgs/development/tools/misc/iozone/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchurl }:
+
+let
+  target = if stdenv.system == "i686-linux" then
+    "linux"
+  else if stdenv.system == "x86_64-linux" then
+    "linux-AMD64"
+  else if stdenv.system == "x86_64-darwin" then
+    "macosx"
+  else abort "Platform ${stdenv.system} not yet supported.";
+in
+
+stdenv.mkDerivation rec {
+  name = "iozone-3.434";
+
+  src = fetchurl {
+    url = http://www.iozone.org/src/current/iozone3_434.tar;
+    sha256 = "0aj63mlb91aivz3z71zn8nbwci1pi18qk8zc65dm19cknffqsf1c";
+  };
+
+  license = fetchurl {
+    url = http://www.iozone.org/docs/Iozone_License.txt;
+    sha256 = "1309sl1rqm8p9gll3z8zfygr2pmbcvzw5byf5ba8y12avk735zrv";
+  };
+
+  preBuild = "pushd src/current";
+  postBuild = "popd";
+
+  buildFlags = target;
+
+  installPhase = ''
+    mkdir -p $out/{man,bin,doc}
+    install docs/iozone.1 $out/man/
+    install docs/Iozone_ps.gz $out/doc/
+    install -s src/current/{iozone,fileop,pit_server} $out/bin/
+    # License copy is mandated by the license, but it's not in the tarball.
+    install ${license} $out/doc/Iozone_License.txt
+  '';
+
+  meta = {
+    description = "IOzone Filesystem Benchmark";
+    homepage    = http://www.iozone.org/;
+    license     = stdenv.lib.licenses.unfreeRedistributable;
+    platforms   = ["i686-linux" "x86_64-linux" "x86_64-darwin"];
+    maintainers = [ stdenv.lib.maintainers.Baughn ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d4f409a8cb94..82708cd30e52 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5817,6 +5817,8 @@ let
 
   intel-gpu-tools = callPackage ../development/tools/misc/intel-gpu-tools {};
 
+  iozone = callPackage ../development/tools/misc/iozone { };
+
   ired = callPackage ../development/tools/analysis/radare/ired.nix { };
 
   itstool = callPackage ../development/tools/misc/itstool { };

From 60e17407632ba640c65046051746720711678a84 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 15 Jan 2016 07:13:22 +0100
Subject: [PATCH 757/884] goffice: 0.10.24 -> 0.10.26

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

diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix
index 3aa9c6780604..4b58f3ab2ef4 100644
--- a/pkgs/development/libraries/goffice/default.nix
+++ b/pkgs/development/libraries/goffice/default.nix
@@ -2,11 +2,11 @@
 , libgsf, libxml2, libxslt, cairo, pango, librsvg, libspectre }:
 
 stdenv.mkDerivation rec {
-  name = "goffice-0.10.24";
+  name = "goffice-0.10.26";
 
   src = fetchurl {
     url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz";
-    sha256 = "cda70eab0b0b0e29c3bea09849bcfca0c2ccc20038ee69e7e14cde664484af5a";
+    sha256 = "2b8dd0a0f84ef4f6bd32bfdae2b68caa0e41631026a74d04c4d2266512a744bb";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];

From 32b8d31b3ac6e4727636762b81311b400fc5f6ff Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 15 Jan 2016 07:13:50 +0100
Subject: [PATCH 758/884] gnumeric: 1.12.24 -> 1.12.26

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

diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix
index cddde10f9163..ae7ee63519fb 100644
--- a/pkgs/applications/office/gnumeric/default.nix
+++ b/pkgs/applications/office/gnumeric/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gnumeric-1.12.24";
+  name = "gnumeric-1.12.26";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnumeric/1.12/${name}.tar.xz";
-    sha256 = "0lcm8k0jb8rd5y4ii803f21nv8rx6gc3mmdlrj5h0rkkn9qm57f5";
+    sha256 = "48250718133e998f7b2e73f71be970542e46c9096afb936dbcb152cf5394ee14";
   };
 
   configureFlags = "--disable-component";

From 38226ea4c31d274a4c347d2daad2c48e913c4dcc Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 15 Jan 2016 07:14:20 +0100
Subject: [PATCH 759/884] smtube: add missing build dependency

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

diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix
index bc55f943a889..dd988f79cab0 100644
--- a/pkgs/applications/video/smtube/default.nix
+++ b/pkgs/applications/video/smtube/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qtscript }:
+{ stdenv, fetchurl, qtscript, qtwebkit }:
 
 stdenv.mkDerivation rec {
   version = "15.11.0";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     "PREFIX=$(out)"
   ];
 
-  buildInputs = [ qtscript ];
+  buildInputs = [ qtscript qtwebkit ];
 
   meta = with stdenv.lib; {
     description = "Play and download Youtube videos";

From c169718a6b9bddb6ef91234411c055c9431df208 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 15 Jan 2016 10:23:45 +0100
Subject: [PATCH 760/884] git-bz: fix meta typo

Thanks to @heydojo.
---
 .../version-management/git-and-tools/git-bz/default.nix         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix
index 4a059367678b..d43a49ac7514 100644
--- a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation {
     license = licenses.gpl2Plus;
     homepage = http://git.fishsoup.net/cgit/git-bz/;
 
-    mantainers = with maintainers; [ nckx ];
+    maintainers = with maintainers; [ nckx ];
     platforms = platforms.linux;
   };
 }

From 34fe0833c8ace813dc22e659af6a9a1a52cb36f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 15 Jan 2016 10:25:31 +0100
Subject: [PATCH 761/884] iozone: commit some forgotten fixups (/cc #12387)

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

diff --git a/pkgs/development/tools/misc/iozone/default.nix b/pkgs/development/tools/misc/iozone/default.nix
index d51a15bbee97..ad3a64d22ba5 100644
--- a/pkgs/development/tools/misc/iozone/default.nix
+++ b/pkgs/development/tools/misc/iozone/default.nix
@@ -29,12 +29,12 @@ stdenv.mkDerivation rec {
   buildFlags = target;
 
   installPhase = ''
-    mkdir -p $out/{man,bin,doc}
-    install docs/iozone.1 $out/man/
-    install docs/Iozone_ps.gz $out/doc/
+    mkdir -p $out/{bin,share/doc,share/man/man1}
+    install docs/iozone.1 $out/share/man/man1/
+    install docs/Iozone_ps.gz $out/share/doc/
     install -s src/current/{iozone,fileop,pit_server} $out/bin/
     # License copy is mandated by the license, but it's not in the tarball.
-    install ${license} $out/doc/Iozone_License.txt
+    install ${license} $out/share/doc/Iozone_License.txt
   '';
 
   meta = {

From 9319129e585096ba9fc91cd9142eb398152b0ad0 Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Wed, 13 Jan 2016 19:15:04 +0100
Subject: [PATCH 762/884] ledger-autosync: init at 0.2.3

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0494c97b7e39..abffcf1fb849 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5610,6 +5610,32 @@ in modules // {
     };
   };
 
+  ledger-autosync = buildPythonPackage rec {
+    name = "ledger-autosync-${version}";
+    version = "0.2.3";
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/l/ledger-autosync/ledger-autosync-${version}.tar.gz";
+      sha256 = "f19fa66e656309825887171d84a462e64676b1cc36b62e4dd8679ff63926a469";
+    };
+
+    buildInputs = [
+      self.ofxclient self.mock
+      # Used at runtime to translate ofx entries to the ledger
+      # format. In fact, user could use either ledger or hledger.
+      pkgs.which pkgs.ledger ];
+
+    # Tests are disable since they require hledger and python-ledger
+    doCheck = false;
+
+    meta = {
+      homepage = https://gitlab.com/egh/ledger-autosync;
+      description = "ledger-autosync is a program to pull down transactions from your bank and create ledger transactions for them";
+      license = licenses.gpl3;
+      maintainers = with maintainers; [ lewo ];
+    };
+  };
+
+
   libthumbor = buildPythonPackage rec {
     name = "libthumbor-${version}";
     version = "1.2.0";

From 126d3e144911f6da5a0af45062c70b391e761a0a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 15 Jan 2016 11:46:49 +0100
Subject: [PATCH 763/884] Fix evaluation of "unstable" job

Commit 19f6edbfb805822a533a696cb1f23f55ece30931 made "unstable" depend
on some Darwin jobs, but these didn't exist because of the "= linux"
overrides in release.nix.
---
 pkgs/top-level/release.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 5682b331c927..2be6201ab065 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -117,8 +117,6 @@ let
       gcj = linux;
       ghostscript = linux;
       ghostscriptX = linux;
-      git = linux;
-      gitFull = linux;
       glibc = linux;
       glibcLocales = linux;
       glxinfo = linux;
@@ -162,9 +160,6 @@ let
       mod_python = linux;
       mupen64plus = linux;
       mutt = linux;
-      mysql = linux;
-      mysql51 = linux;
-      mysql55 = linux;
       nano = allBut cygwin;
       ncat = linux;
       netcat = all;
@@ -209,7 +204,6 @@ let
       uae = linux;
       viking = linux;
       vice = linux;
-      vim = linux;
       vimHugeX = linux;
       vncrec = linux;
       vorbisTools = linux;

From 9a07a8505ea666742b0f3161bcf80846fbf22e13 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 15 Jan 2016 14:54:01 +0300
Subject: [PATCH 764/884] steam-runtime-wrapped: add optional override of
 libstdc++

---
 pkgs/games/steam/runtime-wrapped.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix
index 56422deb1dbe..c1c79f8ac43b 100644
--- a/pkgs/games/steam/runtime-wrapped.nix
+++ b/pkgs/games/steam/runtime-wrapped.nix
@@ -1,9 +1,11 @@
-{ stdenv, perl, pkgs, steam-runtime
+{ stdenv, lib, perl, pkgs, steam-runtime
 , nativeOnly ? false
 , runtimeOnly ? false
+, newStdcpp ? false
 }:
 
 assert !(nativeOnly && runtimeOnly);
+assert newStdcpp -> !runtimeOnly;
 
 let 
   runtimePkgs = with pkgs; [
@@ -77,19 +79,18 @@ let
     SDL2_mixer
     gstreamer
     gst_plugins_base
-  ];
+  ] ++ lib.optional (!newStdcpp) gcc48.cc;
 
   overridePkgs = with pkgs; [
-    gcc48.cc # libstdc++
     libpulseaudio
     alsaLib
     openalSoft
-  ];
+  ] ++ lib.optional newStdcpp gcc.cc;
 
   ourRuntime = if runtimeOnly then []
                else if nativeOnly then runtimePkgs ++ overridePkgs
                else overridePkgs;
-  steamRuntime = stdenv.lib.optional (!nativeOnly) steam-runtime;
+  steamRuntime = lib.optional (!nativeOnly) steam-runtime;
 
 in stdenv.mkDerivation rec {
   name = "steam-runtime-wrapped";

From f4d71737a8af1666f13bc25ab999fc7b792f1876 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 15 Jan 2016 14:57:17 +0300
Subject: [PATCH 765/884] steam: propagate runtime-wrapped flags for more
 convenient overrides

---
 pkgs/games/steam/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix
index 64f8cfe2c287..dd02903dcb28 100644
--- a/pkgs/games/steam/default.nix
+++ b/pkgs/games/steam/default.nix
@@ -1,11 +1,17 @@
-{ pkgs, newScope }:
+{ pkgs, newScope
+, nativeOnly ? false
+, runtimeOnly ? false
+, newStdcpp ? false
+}:
 
 let
   callPackage = newScope self;
 
   self = rec {
     steam-runtime = callPackage ./runtime.nix { };
-    steam-runtime-wrapped = callPackage ./runtime-wrapped.nix { };
+    steam-runtime-wrapped = callPackage ./runtime-wrapped.nix {
+      inherit nativeOnly runtimeOnly newStdcpp;
+    };
     steam = callPackage ./steam.nix { };
     steam-chrootenv = callPackage ./chrootenv.nix { };
     steam-fonts = callPackage ./fonts.nix { };

From c29df5f8a7122fbc9411765156ab42c12baadbbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 15 Jan 2016 13:29:21 +0100
Subject: [PATCH 766/884] firefox: fixup ${name} problems introduced in 2e78e19

Fixes #12403. I'm sorry for the problems. Thanks to @mdorman!
---
 pkgs/applications/networking/browsers/firefox/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 846c79d0b746..566247fc0d43 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -83,8 +83,8 @@ common = { pname, version, sha256 }: stdenv.mkDerivation rec {
     ''
       mkdir ../objdir
       cd ../objdir
-      if [ -e ../${name} ]; then
-        configureScript=../${name}/configure
+      if [ -e ../${pname}-${version} ]; then
+        configureScript=../${pname}-${version}/configure
       else
         configureScript=../mozilla-*/configure
       fi
@@ -99,7 +99,7 @@ common = { pname, version, sha256 }: stdenv.mkDerivation rec {
   postInstall =
     ''
       # For grsecurity kernels
-      paxmark m $out/lib/${name}/{firefox,firefox-bin,plugin-container}
+      paxmark m $out/lib/${pname}-${version}/{firefox,firefox-bin,plugin-container}
 
       # Remove SDK cruft. FIXME: move to a separate output?
       rm -rf $out/share/idl $out/include $out/lib/firefox-devel-*

From 6607b72dc00ffc6286e198a3fe0fff7f67f2f965 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 15 Jan 2016 13:48:07 +0100
Subject: [PATCH 767/884] Revert "eigen: 3.2.5 -> 3.3-alpha1" to fix freecad

This reverts commit c8b975388235823322a0962f88f05594229435e3.
Fixes #12401. It wasn't intended to have "alpha" version as default.
---
 pkgs/development/libraries/eigen/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix
index 150b72cf2f55..0e43b9fb6020 100644
--- a/pkgs/development/libraries/eigen/default.nix
+++ b/pkgs/development/libraries/eigen/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, cmake}:
 
 let
-  version = "3.3-alpha1";
+  version = "3.2.5";
 in
 stdenv.mkDerivation {
   name = "eigen-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   src = fetchurl {
     url = "http://bitbucket.org/eigen/eigen/get/${version}.tar.gz";
     name = "eigen-${version}.tar.gz";
-    sha256 = "00vmxz3da76ml3j7s8w8447sdpszx71i3xhnmwivxhpc4smpvz2q";
+    sha256 = "1vjixip19lwfia2bjpjwm09j7l20ry75493i6mjsk9djszj61agi";
   };
   
   nativeBuildInputs = [ cmake ];

From bce59a1a8bb0430533178df080937ce24efe926a Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Fri, 18 Dec 2015 14:07:53 +0100
Subject: [PATCH 768/884] libvirtd service: Move mutable configs to /var

Modifies libvirt package to search for configs in /var/lib and changes
libvirtd service to copy the default configs to the new location.

This enables the user to change e.g. the networking configuration with
virsh or virt-manager and keep those settings.
---
 nixos/modules/virtualisation/libvirtd.nix      | 14 +++++---------
 pkgs/development/libraries/libvirt/default.nix |  4 ++--
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix
index 3668d17ac89b..67fbb8263b05 100644
--- a/nixos/modules/virtualisation/libvirtd.nix
+++ b/nixos/modules/virtualisation/libvirtd.nix
@@ -122,18 +122,14 @@ in
             chmod 755 /var/lib/libvirt
             chmod 755 /var/lib/libvirt/dnsmasq
 
-            # Libvirt unfortunately writes mutable state (such as
-            # runtime changes to VM, network or filter configurations)
-            # to /etc.  So we can't use environment.etc to make the
-            # default network and filter definitions available, since
-            # libvirt will then modify the originals in the Nix store.
-            # So here we copy them instead.  Ugly.
-            for i in $(cd ${pkgs.libvirt}/etc && echo \
+            # Copy default libvirt network config .xml files to /var/lib
+            # Files modified by the user will not be overwritten
+            for i in $(cd ${pkgs.libvirt}/var/lib && echo \
                 libvirt/qemu/networks/*.xml libvirt/qemu/networks/autostart/*.xml \
                 libvirt/nwfilter/*.xml );
             do
-                mkdir -p /etc/$(dirname $i) -m 755
-                cp -fpd ${pkgs.libvirt}/etc/$i /etc/$i
+                mkdir -p /var/lib/$(dirname $i) -m 755
+                cp -npd ${pkgs.libvirt}/var/lib/$i /var/lib/$i
             done
 
             # libvirtd puts the full path of the emulator binary in the machine
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 980bccd39fb9..256d09b0edd5 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--localstatedir=/var"
-    "--sysconfdir=/etc"
+    "--sysconfdir=/var/lib"
     "--with-libpcap"
     "--with-vmware"
     "--with-vbox"
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
 
   installFlags = [
     "localstatedir=$(TMPDIR)/var"
-    "sysconfdir=$(out)/etc"
+    "sysconfdir=$(out)/var/lib"
   ];
 
   postInstall = ''

From df2b9b48cbf8eb765760c699843e43457d844bee Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 15 Jan 2016 14:59:53 +0100
Subject: [PATCH 769/884] elfutils: 163 -> 165

Also, install programs with the "eu-" prefix to prevent collisions
with binutils (as recommended by upstream), enable xz support, and
enable deterministic archives.
---
 .../tools/misc/elfutils/default.nix           | 34 +++++++++----------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix
index 95ccdd89de19..1e073ea8c70f 100644
--- a/pkgs/development/tools/misc/elfutils/default.nix
+++ b/pkgs/development/tools/misc/elfutils/default.nix
@@ -1,30 +1,26 @@
-{stdenv, fetchurl, m4, zlib, bzip2, bison, flex, gettext}:
+{ lib, stdenv, fetchurl, m4, zlib, bzip2, bison, flex, gettext, xz }:
 
 # TODO: Look at the hardcoded paths to kernel, modules etc.
 stdenv.mkDerivation rec {
   name = "elfutils-${version}";
-  version = "0.163";
+  version = "0.165";
 
   src = fetchurl {
-    urls = [
-      "http://fedorahosted.org/releases/e/l/elfutils/${version}/${name}.tar.bz2"
-      "mirror://gentoo/distfiles/${name}.tar.bz2"
-      ];
-    sha256 = "7c774f1eef329309f3b05e730bdac50013155d437518a2ec0e24871d312f2e23";
+    url = "http://fedorahosted.org/releases/e/l/elfutils/${version}/${name}.tar.bz2";
+    sha256 = "0wp91hlh9n0ismikljf63558rzdwim8w1s271grsbaic35vr5z57";
   };
 
-  patches = [
-    (fetchurl {
-      url = "http://fedorahosted.org/releases/e/l/elfutils/${version}/elfutils-portability-${version}.patch";
-      sha256 = "e4e82315dad2efaa4e4476503e7537e01b7c1b1f98a96de4ca1c7fa85f4f1045";
-    }) ];
-
   # We need bzip2 in NativeInputs because otherwise we can't unpack the src,
   # as the host-bzip2 will be in the path.
-  nativeBuildInputs = [m4 bison flex gettext bzip2];
-  buildInputs = [zlib bzip2];
+  nativeBuildInputs = [ m4 bison flex gettext bzip2 ];
+  buildInputs = [ zlib bzip2 xz ];
 
-  configureFlags = "--disable-werror";
+  configureFlags =
+    [ "--program-prefix=eu-" # prevent collisions with binutils
+      "--enable-deterministic-archives"
+    ];
+
+  enableParallelBuilding = true;
 
   crossAttrs = {
 
@@ -67,9 +63,11 @@ stdenv.mkDerivation rec {
     '';
   };
 
-  dontAddDisableDepTrack = true;
-
   meta = {
     homepage = https://fedorahosted.org/elfutils/;
+    description = "A set of utilities to handle ELF objects";
+    platforms = lib.platforms.linux;
+    license = lib.licenses.gpl3;
+    maintainers = lib.maintainers.eelco;
   };
 }

From 7e10bf4327491a6ebccbe1aaa8e6c6c0aca4663a Mon Sep 17 00:00:00 2001
From: roblabla <robinlambertz+dev@gmail.com>
Date: Fri, 8 Jan 2016 15:12:00 +0100
Subject: [PATCH 770/884] matrix-synapse: init at 0.12.0

---
 nixos/modules/misc/ids.nix                    |   2 +
 nixos/modules/module-list.nix                 |   1 +
 .../misc/matrix-synapse-log_config.yaml       |  25 ++
 .../modules/services/misc/matrix-synapse.nix  | 279 ++++++++++++++++++
 pkgs/servers/matrix-synapse/default.nix       |  45 +++
 .../matrix-synapse/matrix-synapse.patch       |  20 ++
 pkgs/top-level/all-packages.nix               |   2 +
 pkgs/top-level/python-packages.nix            | 162 +++++++++-
 8 files changed, 533 insertions(+), 3 deletions(-)
 create mode 100644 nixos/modules/services/misc/matrix-synapse-log_config.yaml
 create mode 100644 nixos/modules/services/misc/matrix-synapse.nix
 create mode 100644 pkgs/servers/matrix-synapse/default.nix
 create mode 100644 pkgs/servers/matrix-synapse/matrix-synapse.patch

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 39ed914994c1..6a3baf98a004 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -245,6 +245,7 @@
       opendkim = 221;
       dspam = 222;
       gale = 223;
+      matrix-synapse = 224;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -467,6 +468,7 @@
       opendkim = 221;
       dspam = 222;
       gale = 223;
+      matrix-synapse = 224;
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index d9e8c2da5b32..4f125b09afbf 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -214,6 +214,7 @@
   ./services/misc/gpsd.nix
   ./services/misc/ihaskell.nix
   ./services/misc/mathics.nix
+  ./services/misc/matrix-synapse.nix
   ./services/misc/mbpfan.nix
   ./services/misc/mediatomb.nix
   ./services/misc/mesos-master.nix
diff --git a/nixos/modules/services/misc/matrix-synapse-log_config.yaml b/nixos/modules/services/misc/matrix-synapse-log_config.yaml
new file mode 100644
index 000000000000..d85bdd1208f9
--- /dev/null
+++ b/nixos/modules/services/misc/matrix-synapse-log_config.yaml
@@ -0,0 +1,25 @@
+version: 1
+
+# In systemd's journal, loglevel is implicitly stored, so let's omit it
+# from the message text.
+formatters:
+    journal_fmt:
+        format: '%(name)s: [%(request)s] %(message)s'
+
+filters:
+    context:
+        (): synapse.util.logcontext.LoggingContextFilter
+        request: ""
+
+handlers:
+    journal:
+        class: systemd.journal.JournalHandler
+        formatter: journal_fmt
+        filters: [context]
+        SYSLOG_IDENTIFIER: synapse
+
+root:
+    level: INFO
+    handlers: [journal]
+
+disable_existing_loggers: False
diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix
new file mode 100644
index 000000000000..27c5a38e6b88
--- /dev/null
+++ b/nixos/modules/services/misc/matrix-synapse.nix
@@ -0,0 +1,279 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.matrix-synapse;
+  logConfigFile = pkgs.writeText "log_config.yaml" cfg.logConfig;
+  configFile = pkgs.writeText "homeserver.yaml" ''
+tls_certificate_path: "${cfg.tls_certificate_path}"
+tls_private_key_path: "${cfg.tls_private_key_path}"
+tls_dh_params_path: "${cfg.tls_dh_params_path}"
+no_tls: ${if cfg.no_tls then "true" else "false"}
+bind_port: ${toString cfg.bind_port}
+unsecure_port: ${toString cfg.unsecure_port}
+bind_host: "${cfg.bind_host}"
+server_name: "${cfg.server_name}"
+pid_file: "/var/run/matrix-synapse.pid"
+web_client: ${if cfg.web_client then "true" else "false"}
+database: {
+  name: "${cfg.database_type}",
+  args: {
+    ${concatStringsSep ",\n    " (
+      mapAttrsToList (n: v: "\"${n}\": ${v}") cfg.database_args
+    )}
+  }
+}
+log_file: "/var/log/matrix-synapse/homeserver.log"
+log_config: "${logConfigFile}"
+media_store_path: "/var/lib/matrix-synapse/media"
+recaptcha_private_key: "${cfg.recaptcha_private_key}"
+recaptcha_public_key: "${cfg.recaptcha_public_key}"
+enable_registration_captcha: ${if cfg.enable_registration_captcha then "true" else "false"}
+turn_uris: ${if (length cfg.turn_uris) == 0 then "[]" else ("\n" + (concatStringsSep "\n" (map (s: "- " + s) cfg.turn_uris)))}
+turn_shared_secret: "${cfg.turn_shared_secret}"
+enable_registration: ${if cfg.enable_registration then "true" else "false"}
+${optionalString (cfg.registration_shared_secret != "") ''
+registration_shared_secret: "${cfg.registration_shared_secret}"
+''}
+enable_metrics: ${if cfg.enable_metrics then "true" else "false"}
+report_stats: ${if cfg.report_stats then "true" else "false"}
+signing_key_path: "/var/lib/matrix-synapse/homeserver.signing.key"
+perspectives:
+  servers: {
+    ${concatStringsSep "},\n" (mapAttrsToList (n: v: ''
+    "${n}": {
+      "verify_keys": {
+        ${concatStringsSep "},\n" (mapAttrsToList (n: v: ''
+        "${n}": {
+          "key": "${v}"
+        }'') v)}
+      }
+    '') cfg.servers)}
+    }
+  }
+${cfg.extraConfig}
+'';
+in {
+  options = {
+    services.matrix-synapse = {
+      enable = mkEnableOption "matrix.org synapse";
+      package = mkOption {
+        type = types.package;
+        default = pkgs.matrix-synapse;
+        description = ''
+          Overridable attribute of the matrix synapse server package to use.
+        '';
+      };
+      no_tls = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Don't bind to the https port
+        '';
+      };
+      tls_certificate_path = mkOption {
+        type = types.path;
+        default = "/var/lib/matrix-synapse/homeserver.tls.crt";
+        description = ''
+          PEM encoded X509 certificate for TLS
+        '';
+      };
+      tls_private_key_path = mkOption {
+        type = types.path;
+        default = "/var/lib/matrix-synapse/homeserver.tls.key";
+        description = ''
+          PEM encoded private key for TLS
+        '';
+      };
+      tls_dh_params_path = mkOption {
+        type = types.path;
+        default = "/var/lib/matrix-synapse/homeserver.tls.dh";
+        description = ''
+          PEM dh parameters for ephemeral keys
+        '';
+      };
+      bind_port = mkOption {
+        type = types.int;
+        default = 8448;
+        description = ''
+          The port to listen for HTTPS requests on.
+          For when matrix traffic is sent directly to synapse.
+        '';
+      };
+      unsecure_port = mkOption {
+        type = types.int;
+        default = 8008;
+        description = ''
+          The port to listen for HTTP requests on.
+          For when matrix traffic passes through loadbalancer that unwraps TLS.
+        '';
+      };
+      bind_host = mkOption {
+        type = types.str;
+        default = "";
+        description = ''
+          Local interface to listen on.
+          The empty string will cause synapse to listen on all interfaces.
+        '';
+      };
+      server_name = mkOption {
+        type = types.str;
+        description = ''
+          The domain name of the server, with optional explicit port.
+          This is used by remote servers to connect to this server,
+          e.g. matrix.org, localhost:8080, etc.
+          This is also the last part of your UserID.
+        '';
+      };
+      web_client = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to serve a web client from the HTTP/HTTPS root resource.
+        '';
+      };
+      database_type = mkOption {
+        type = types.enum [ "sqlite3" "psycopg2" ];
+        default = "sqlite3";
+        description = ''
+          The database engine name. Can be sqlite or psycopg2.
+        '';
+      };
+      database_args = mkOption {
+        type = types.attrs;
+        default = {
+          database = "/var/lib/matrix-synapse/homeserver.db";
+        };
+        description = ''
+          Arguments to pass to the engine.
+        '';
+      };
+      recaptcha_private_key = mkOption {
+        type = types.str;
+        default = "";
+        description = ''
+          This Home Server's ReCAPTCHA private key.
+        '';
+      };
+      recaptcha_public_key = mkOption {
+        type = types.str;
+        default = "";
+        description = ''
+          This Home Server's ReCAPTCHA public key.
+        '';
+      };
+      enable_registration_captcha = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Enables ReCaptcha checks when registering, preventing signup
+          unless a captcha is answered. Requires a valid ReCaptcha
+          public/private key.
+        '';
+      };
+      turn_uris = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        description = ''
+          The public URIs of the TURN server to give to clients
+        '';
+      };
+      turn_shared_secret = mkOption {
+        type = types.str;
+        default = "";
+        description = ''
+          The shared secret used to compute passwords for the TURN server
+        '';
+      };
+      enable_registration = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Enable registration for new users.
+        '';
+      };
+      registration_shared_secret = mkOption {
+        type = types.str;
+        default = "";
+        description = ''
+          If set, allows registration by anyone who also has the shared
+          secret, even if registration is otherwise disabled.
+        '';
+      };
+      enable_metrics = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Enable collection and rendering of performance metrics
+        '';
+      };
+      report_stats = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+        '';
+      };
+      servers = mkOption {
+        type = types.attrs;
+        default = {
+          "matrix.org" = {
+            "ed25519:auto" = "Noi6WqcDj0QmPxCNQqgezwTlBKrfqehY1u2FyWP9uYw";
+          };
+        };
+        description = ''
+          The trusted servers to download signing keys from.
+        '';
+      };
+      extraConfig = mkOption {
+        type = types.lines;
+        default = "";
+        description = ''
+          Extra config options for matrix-synapse.
+        '';
+      };
+      logConfig = mkOption {
+        type = types.lines;
+        default = readFile ./matrix-synapse-log_config.yaml;
+        description = ''
+          A yaml python logging config file
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    users.extraUsers = [
+      { name = "matrix-synapse";
+        group = "matrix-synapse";
+        home = "/var/lib/matrix-synapse";
+        createHome = true;
+        shell = "${pkgs.bash}/bin/bash";
+        uid = config.ids.uids.matrix-synapse;
+      } ];
+
+    users.extraGroups = [
+      { name = "matrix-synapse";
+        gid = config.ids.gids.matrix-synapse;
+      } ];
+
+    systemd.services.matrix-synapse = {
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      preStart = ''
+        mkdir -p /var/lib/matrix-synapse
+        chmod 700 /var/lib/matrix-synapse
+        chown -R matrix-synapse:matrix-synapse /var/lib/matrix-synapse
+        ${cfg.package}/bin/homeserver --config-path ${configFile} --generate-keys
+      '';
+      serviceConfig = {
+        Type = "simple";
+        User = "matrix-synapse";
+        Group = "matrix-synapse";
+        WorkingDirectory = "/var/lib/matrix-synapse";
+        PermissionsStartOnly = true;
+        ExecStart = "${cfg.package}/bin/homeserver --config-path ${configFile}";
+      };
+    };
+  };
+}
diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
new file mode 100644
index 000000000000..66d9e7258f4c
--- /dev/null
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -0,0 +1,45 @@
+{ pkgs, stdenv, buildPythonPackage, pythonPackages, fetchurl, fetchFromGitHub }:
+let
+  matrix-angular-sdk = buildPythonPackage rec {
+    name = "matrix-angular-sdk-${version}";
+    version = "0.6.6";
+
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/m/matrix-angular-sdk/matrix-angular-sdk-${version}.tar.gz";
+      sha256 = "1vknhmibb8gh8lng50va2cdvng5xm7vqv9dl680m3gj38pg0bv8a";
+    };
+  };
+in
+buildPythonPackage rec {
+  name = "matrix-synapse-${version}";
+  version = "0.12.0";
+
+  src = fetchFromGitHub {
+    owner = "matrix-org";
+    repo = "synapse";
+    rev = "f35f8d06ea58e2d0cdccd82924c7a44fd93f4c38";
+    sha256 = "0b0k1am9lh0qglagc06m91qs26ybv37k7wpbg5333x8jaf5d1si4";
+  };
+
+  patches = [ ./matrix-synapse.patch ];
+
+  propagatedBuildInputs = with pythonPackages; [
+    blist canonicaljson daemonize dateutil frozendict pillow pybcrypt pyasn1
+    pydenticon pymacaroons-pynacl pynacl pyopenssl pysaml2 pytz requests2
+    service-identity signedjson systemd twisted15 ujson unpaddedbase64 pyyaml
+    matrix-angular-sdk
+  ];
+
+  # Checks fail because of Tox.
+  doCheck = false;
+
+  buildInputs = with pythonPackages; [
+    mock setuptoolsTrial
+  ];
+
+  meta = {
+    homepage = https://matrix.org;
+    description = "Matrix reference homeserver";
+    license = stdenv.lib.licenses.asl20;
+  };
+}
diff --git a/pkgs/servers/matrix-synapse/matrix-synapse.patch b/pkgs/servers/matrix-synapse/matrix-synapse.patch
new file mode 100644
index 000000000000..a6a393ea56c3
--- /dev/null
+++ b/pkgs/servers/matrix-synapse/matrix-synapse.patch
@@ -0,0 +1,20 @@
+diff --git a/homeserver b/homeserver
+new file mode 120000
+index 0000000..2f1d413
+--- /dev/null
++++ b/homeserver
+@@ -0,0 +1 @@
++synapse/app/homeserver.py
+\ No newline at end of file
+diff --git a/setup.py b/setup.py
+index 9d24761..f3e6a00 100755
+--- a/setup.py
++++ b/setup.py
+@@ -85,6 +85,6 @@ setup(
+     include_package_data=True,
+     zip_safe=False,
+     long_description=long_description,
+-    scripts=["synctl"] + glob.glob("scripts/*"),
++    scripts=["synctl", "homeserver"] + glob.glob("scripts/*"),
+     cmdclass={'test': Tox},
+ )
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 82708cd30e52..761bbed35184 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2076,6 +2076,8 @@ let
 
   makebootfat = callPackage ../tools/misc/makebootfat { };
 
+  matrix-synapse = callPackage ../servers/matrix-synapse { };
+
   memtester = callPackage ../tools/system/memtester { };
 
   minidlna = callPackage ../tools/networking/minidlna { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ec17d9434a07..22324178843e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17823,7 +17823,7 @@ in modules // {
       md5 = "f16f4237c9ee483a0cd13208849d96ad";
     };
 
-    propagatedBuildInputs = with self; [ twisted ];
+    propagatedBuildInputs = with self; [ twisted15 ];
 
     meta = {
       description = "setuptools plug-in that helps run unit tests built with the \"Trial\" framework (from Twisted)";
@@ -17852,11 +17852,11 @@ in modules // {
 
 
   simplejson = buildPythonPackage (rec {
-    name = "simplejson-3.3.0";
+    name = "simplejson-3.8.1";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/s/simplejson/${name}.tar.gz";
-      md5 = "0e29b393bceac8081fa4e93ff9f6a001";
+      sha256 = "14r4l4rcsyf87p2j4ycsbb017n4vzxfmv285rq2gny4w47rwi2j2";
     };
 
     meta = {
@@ -19758,6 +19758,35 @@ in modules // {
     };
   };
 
+  twisted15 = buildPythonPackage rec {
+    disabled = isPy3k;
+
+    name = "Twisted-15.5.0";
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/T/Twisted/${name}.tar.bz2";
+      sha256 = "0zy18lcrris4aaslil5k12i13k56c32hzfdv6h10kbnzl026h158";
+    };
+
+    propagatedBuildInputs = with self; [ zope_interface ];
+
+    # Generate Twisted's plug-in cache.  Twited users must do it as well.  See
+    # http://twistedmatrix.com/documents/current/core/howto/plugin.html#auto3
+    # and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=477103 for
+    # details.
+    postInstall = "$out/bin/twistd --help > /dev/null";
+
+    meta = {
+      homepage = http://twistedmatrix.com/;
+      description = "Twisted, an event-driven networking engine written in Python";
+      longDescription = ''
+        Twisted is an event-driven networking engine written in Python
+        and licensed under the MIT license.
+      '';
+      license = licenses.mit;
+      maintainers = [ ];
+    };
+  };
+
   tzlocal = buildPythonPackage rec {
     name = "tzlocal-1.1.1";
 
@@ -22583,6 +22612,133 @@ in modules // {
     };
   };
 
+  blist = buildPythonPackage rec {
+    name = "blist-${version}";
+    version = "1.3.6";
+    disabled = isPyPy;
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/b/blist/blist-${version}.tar.gz";
+      sha256 = "1hqz9pqbwx0czvq9bjdqjqh5bwfksva1is0anfazig81n18c84is";
+    };
+  };
+
+  canonicaljson = buildPythonPackage rec {
+    name = "canonicaljson-${version}";
+    version = "1.0.0";
+
+    src = pkgs.fetchgit {
+      url = "https://github.com/matrix-org/python-canonicaljson.git";
+      rev = "refs/tags/v${version}";
+      sha256 = "29802d0effacd26ca1d6eccc8d4c7e4f543a194754ba89263861e87f44a83f0c";
+    };
+
+    propagatedBuildInputs = with self; [
+      frozendict simplejson
+    ];
+  };
+
+  daemonize = buildPythonPackage rec {
+    name = "daemonize-${version}";
+    version = "2.4.2";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/d/daemonize/daemonize-${version}.tar.gz";
+      sha256 = "0y139sq657bpzfv6k0aqm4071z4s40i6ybpni9qvngvdcz6r86n2";
+    };
+  };
+
+  frozendict = buildPythonPackage rec {
+    name = "frozendict-${version}";
+    version = "0.5";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/f/frozendict/frozendict-0.5.tar.gz";
+      sha256 = "0m4kg6hbadvf99if78nx01q7qnbyhdw3x4znl5dasgciyi54432n";
+    };
+  };
+
+  pydenticon = buildPythonPackage rec {
+    name = "pydenticon-${version}";
+    version = "0.2";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/p/pydenticon/pydenticon-0.2.tar.gz";
+      sha256 = "035dawcspgjw2rksbnn863s7b0i9ac8cc1nshshvd1l837ir1czp";
+    };
+    propagatedBuildInputs = with self; [
+      pillow mock
+    ];
+  };
+
+  pymacaroons-pynacl = buildPythonPackage rec {
+    name = "pymacaroons-pynacl-${version}";
+    version = "0.9.3";
+
+    src = pkgs.fetchgit {
+      url = "https://github.com/matrix-org/pymacaroons.git";
+      rev = "refs/tags/v${version}";
+      sha256 = "481a486520f5a3ad2761c3cd3954d2b08f456a94fb080aaa4ad1e68ddc705b52";
+    };
+
+    propagatedBuildInputs = with self; [ pynacl six ];
+  };
+
+  pynacl = buildPythonPackage rec {
+    name = "pynacl-${version}";
+    version = "0.3.0";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/P/PyNaCl/PyNaCl-0.3.0.tar.gz";
+      sha256 = "1hknxlp3a3f8njn19w92p8nhzl9jkfwzhv5fmxhmyq2m8hqrfj8j";
+    };
+
+    propagatedBuildInputs = with self; [pkgs.libsodium six cffi pycparser pytest];
+  };
+
+  service-identity = buildPythonPackage rec {
+    name = "service-identity-${version}";
+    version = "14.0.0";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/s/service_identity/service_identity-${version}.tar.gz";
+      sha256 = "0njg9bklkkp4rl2b9vsfh9aasxy3w2dmjkv9cq34jn65lwcs619i";
+    };
+
+    propagatedBuildInputs = with self; [
+      characteristic pyasn1 pyasn1-modules pyopenssl idna
+    ];
+
+    buildInputs = with self; [
+      pytest
+    ];
+  };
+
+  signedjson = buildPythonPackage rec {
+    name = "signedjson-${version}";
+    version = "1.0.0";
+
+    src = pkgs.fetchgit {
+      url = "https://github.com/matrix-org/python-signedjson.git";
+      rev = "refs/tags/v${version}";
+      sha256 = "4ef1c89ea85846632d711a37a2e6aae1348c62b9d62ed0e80428b4a00642e9df";
+    };
+
+    propagatedBuildInputs = with self; [
+      canonicaljson unpaddedbase64 pynacl
+    ];
+  };
+
+  unpaddedbase64 = buildPythonPackage rec {
+    name = "unpaddedbase64-${version}";
+    version = "1.0.1";
+
+    src = pkgs.fetchgit {
+      url = "https://github.com/matrix-org/python-unpaddedbase64.git";
+      rev = "refs/tags/v${version}";
+      sha256 = "f221240a6d414c4244ab906b1dc8983c4d1114acb778cb857f6fc50d710be502";
+    };
+  };
 
 
   thumbor = buildPythonPackage rec {

From 4eb1e346c6bce94ac594152949df02d90aa5d403 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Fri, 15 Jan 2016 15:59:41 +0100
Subject: [PATCH 771/884] Improving the patch for mairix for mbox>2GB.

https://github.com/rc0/mairix/pull/19
---
 pkgs/tools/text/mairix/default.nix |   5 +-
 pkgs/tools/text/mairix/mmap.patch  | 115 +++++++++++++++++++++--------
 2 files changed, 86 insertions(+), 34 deletions(-)

diff --git a/pkgs/tools/text/mairix/default.nix b/pkgs/tools/text/mairix/default.nix
index f3fece1f1774..d8db034f151e 100644
--- a/pkgs/tools/text/mairix/default.nix
+++ b/pkgs/tools/text/mairix/default.nix
@@ -10,9 +10,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ zlib bzip2 bison flex ];
 
-  # https://github.com/rc0/mairix/issues/12
+  # https://github.com/rc0/mairix/pull/19
   patches = [ ./mmap.patch ];
-  patchFlags = "-p2";
+
+  enableParallelBuilding = true;
 
   meta = {
     homepage = http://www.rc0.org.uk/mairix;
diff --git a/pkgs/tools/text/mairix/mmap.patch b/pkgs/tools/text/mairix/mmap.patch
index 0d43ac7ce7ae..241083f2dde5 100644
--- a/pkgs/tools/text/mairix/mmap.patch
+++ b/pkgs/tools/text/mairix/mmap.patch
@@ -1,25 +1,29 @@
-Fix "Cannot allocate memory" on mmap of files bigger than 2GiB.
+Making mairix work with mbox files over 2GB.
 
-https://github.com/rc0/mairix/issues/12
+https://github.com/rc0/mairix/pull/19
 
-diff -ruN t/mairix-0.22/mairix.h mairix/mairix-0.22/mairix.h
---- t/mairix-0.22/mairix.h  2010-06-05 14:41:10.000000000 -0700
-+++ mairix/mairix-0.22/mairix.h 2015-07-08 13:33:06.678718524 -0700
-@@ -327,8 +327,8 @@
+diff --git a/mairix.h b/mairix.h
+index 2480492..cb25824 100644
+--- a/mairix.h
++++ b/mairix.h
+@@ -327,9 +327,9 @@ enum data_to_rfc822_error {
+   DTR8_BAD_HEADERS, /* corrupt headers */
    DTR8_BAD_ATTACHMENT /* corrupt attachment (e.g. no body part) */
  };
- struct rfc822 *data_to_rfc822(struct msg_src *src, char *data, int length, enum data_to_rfc822_error *error);
+-struct rfc822 *data_to_rfc822(struct msg_src *src, char *data, int length, enum data_to_rfc822_error *error);
 -void create_ro_mapping(const char *filename, unsigned char **data, int *len);
 -void free_ro_mapping(unsigned char *data, int len);
++struct rfc822 *data_to_rfc822(struct msg_src *src, char *data, size_t length, enum data_to_rfc822_error *error);
 +void create_ro_mapping(const char *filename, unsigned char **data, size_t *len);
 +void free_ro_mapping(unsigned char *data, size_t len);
  char *format_msg_src(struct msg_src *src);
-
+ 
  /* In tok.c */
-diff -ruN t/mairix-0.22/mbox.c mairix/mairix-0.22/mbox.c
---- t/mairix-0.22/mbox.c    2010-06-05 14:41:10.000000000 -0700
-+++ mairix/mairix-0.22/mbox.c   2015-07-08 13:32:45.126280861 -0700
-@@ -816,7 +816,7 @@
+diff --git a/mbox.c b/mbox.c
+index ebbfa78..396e27d 100644
+--- a/mbox.c
++++ b/mbox.c
+@@ -816,7 +816,7 @@ void build_mbox_lists(struct database *db, const char *folder_base, /*{{{*/
          mb->n_old_msgs_valid = mb->n_msgs;
        } else {
          unsigned char *va;
@@ -28,28 +32,65 @@ diff -ruN t/mairix-0.22/mbox.c mairix/mairix-0.22/mbox.c
          create_ro_mapping(mb->path, &va, &len);
          if (va) {
            rescan_mbox(mb, (char *) va, len);
-@@ -852,7 +852,7 @@
+@@ -852,7 +852,7 @@ int add_mbox_messages(struct database *db)/*{{{*/
    int any_new = 0;
    int N;
    unsigned char *va;
 -  int valen;
 +  size_t valen;
    enum data_to_rfc822_error error;
-
+ 
    for (i=0; i<db->n_mboxen; i++) {
-diff -ruN t/mairix-0.22/rfc822.c mairix/mairix-0.22/rfc822.c
---- t/mairix-0.22/rfc822.c  2010-06-05 14:41:10.000000000 -0700
-+++ mairix/mairix-0.22/rfc822.c 2015-07-08 13:30:59.388133879 -0700
-@@ -1250,7 +1250,7 @@
+diff --git a/reader.c b/reader.c
+index 71ac5bd..18f0108 100644
+--- a/reader.c
++++ b/reader.c
+@@ -81,7 +81,8 @@ static void read_toktable2_db(char *data, struct toktable2_db *toktable, int sta
+ /*}}}*/
+ struct read_db *open_db(char *filename)/*{{{*/
+ {
+-  int fd, len;
++  int fd;
++  size_t len;
+   char *data;
+   struct stat sb;
+   struct read_db *result;
+diff --git a/reader.h b/reader.h
+index 9b5dfa3..d709cc4 100644
+--- a/reader.h
++++ b/reader.h
+@@ -138,7 +138,7 @@ struct toktable2_db {/*{{{*/
+ struct read_db {/*{{{*/
+   /* Raw file parameters, needed later for munmap */
+   char *data;
+-  int len;
++  size_t len;
+ 
+   /* Pathname information */
+   int n_msgs;
+diff --git a/rfc822.c b/rfc822.c
+index b411f85..9c8e1a4 100644
+--- a/rfc822.c
++++ b/rfc822.c
+@@ -990,7 +990,7 @@ static void scan_status_flags(const char *s, struct headers *hdrs)/*{{{*/
+ 
+ /*{{{ data_to_rfc822() */
+ struct rfc822 *data_to_rfc822(struct msg_src *src,
+-    char *data, int length,
++    char *data, size_t length,
+     enum data_to_rfc822_error *error)
+ {
+   struct rfc822 *result;
+@@ -1265,7 +1265,7 @@ static struct ro_mapping *add_ro_cache(const char *filename, int fd, size_t len)
  }
  #endif /* USE_GZIP_MBOX || USE_BZIP_MBOX */
-
+ 
 -void create_ro_mapping(const char *filename, unsigned char **data, int *len)/*{{{*/
 +void create_ro_mapping(const char *filename, unsigned char **data, size_t *len)/*{{{*/
  {
    struct stat sb;
    int fd;
-@@ -1371,7 +1371,7 @@
+@@ -1386,7 +1386,7 @@ comp_error:
    data_alloc_type = ALLOC_MMAP;
  }
  /*}}}*/
@@ -57,8 +98,8 @@ diff -ruN t/mairix-0.22/rfc822.c mairix/mairix-0.22/rfc822.c
 +void free_ro_mapping(unsigned char *data, size_t len)/*{{{*/
  {
    int r;
-
-@@ -1399,7 +1399,7 @@
+ 
+@@ -1414,7 +1414,7 @@ static struct msg_src *setup_msg_src(char *filename)/*{{{*/
  /*}}}*/
  struct rfc822 *make_rfc822(char *filename)/*{{{*/
  {
@@ -66,11 +107,12 @@ diff -ruN t/mairix-0.22/rfc822.c mairix/mairix-0.22/rfc822.c
 +  size_t len;
    unsigned char *data;
    struct rfc822 *result;
-
-diff -ruN t/mairix-0.22/search.c mairix/mairix-0.22/search.c
---- t/mairix-0.22/search.c  2010-06-05 14:41:10.000000000 -0700
-+++ mairix/mairix-0.22/search.c 2015-07-08 13:32:25.809888610 -0700
-@@ -667,7 +667,7 @@
+ 
+diff --git a/search.c b/search.c
+index 18b51ee..97967bc 100644
+--- a/search.c
++++ b/search.c
+@@ -681,7 +681,7 @@ static void mbox_terminate(const unsigned char *data, int len, FILE *out)/*{{{*/
  static void append_file_to_mbox(const char *path, FILE *out)/*{{{*/
  {
    unsigned char *data;
@@ -79,8 +121,8 @@ diff -ruN t/mairix-0.22/search.c mairix/mairix-0.22/search.c
    create_ro_mapping(path, &data, &len);
    if (data) {
      fprintf(out, "From mairix@mairix Mon Jan  1 12:34:56 1970\n");
-@@ -683,8 +683,8 @@
-
+@@ -698,8 +698,8 @@ static int had_failed_checksum;
+ 
  static void get_validated_mbox_msg(struct read_db *db, int msg_index,/*{{{*/
                                     int *mbox_index,
 -                                   unsigned char **mbox_data, int *mbox_len,
@@ -90,16 +132,16 @@ diff -ruN t/mairix-0.22/search.c mairix/mairix-0.22/search.c
  {
    /* msg_data==NULL if checksum mismatches */
    unsigned char *start;
-@@ -715,7 +715,7 @@
+@@ -738,7 +738,7 @@ static void append_mboxmsg_to_mbox(struct read_db *db, int msg_index, FILE *out)
  {
    /* Need to common up code with try_copy_to_path */
    unsigned char *mbox_start, *msg_start;
 -  int mbox_len, msg_len;
 +  size_t mbox_len, msg_len;
    int mbox_index;
-
+ 
    get_validated_mbox_msg(db, msg_index, &mbox_index, &mbox_start, &mbox_len, &msg_start, &msg_len);
-@@ -735,7 +735,7 @@
+@@ -759,7 +759,7 @@ static void append_mboxmsg_to_mbox(struct read_db *db, int msg_index, FILE *out)
  static void try_copy_to_path(struct read_db *db, int msg_index, char *target_path)/*{{{*/
  {
    unsigned char *data;
@@ -108,3 +150,12 @@ diff -ruN t/mairix-0.22/search.c mairix/mairix-0.22/search.c
    int mbi;
    FILE *out;
    unsigned char *start;
+@@ -1214,7 +1214,7 @@ static int do_search(struct read_db *db, char **args, char *output_path, int sho
+                 unsigned int mbix, msgix;
+                 int start, len, after_end;
+                 unsigned char *mbox_start, *msg_start;
+-                int mbox_len, msg_len;
++                size_t mbox_len, msg_len;
+                 int mbox_index;
+ 
+                 start = db->mtime_table[i];

From 5b20713041e33542ba1f5b4c402aa98a111915d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Fri, 15 Jan 2016 16:13:57 +0100
Subject: [PATCH 772/884] inadyn: update to 1.99.15

It fixes a big bug about IP not getting updated.
https://github.com/troglobit/inadyn/issues/107
---
 pkgs/tools/networking/inadyn/default.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix
index 0d9ac7f64756..b63abf1ae332 100644
--- a/pkgs/tools/networking/inadyn/default.nix
+++ b/pkgs/tools/networking/inadyn/default.nix
@@ -1,16 +1,14 @@
-{ stdenv, fetchFromGitHub, gnutls33, autoreconfHook }:
+{ stdenv, fetchurl, gnutls33, autoreconfHook }:
 
 let
-  version = "1.99.13";
+  version = "1.99.15";
 in
 stdenv.mkDerivation {
   name = "inadyn-${version}";
 
-  src = fetchFromGitHub {
-    repo = "inadyn";
-    owner = "troglobit";
-    rev = version;
-    sha256 = "19z8si66b2kwb7y29qpd8y45rhg5wrycwkdgjqqp98sg5yq8p7v0";
+  src = fetchurl {
+    url = "https://github.com/troglobit/inadyn/releases/download/${version}/inadyn-${version}.tar.xz";
+    sha256 = "05f7k9wpr0fn44y0pvdrv8xyilygmq3kjhvrwlj6dgg9ackdhkmm";
   };
 
   preConfigure = ''

From 2fcee55e5fe46c8c4a7aa6bfdab7a9c9188f7a84 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 15 Jan 2016 16:12:05 +0100
Subject: [PATCH 773/884] separateDebugInfo: Create symlinks matching original
 binaries

For instance, a binary like libfoo.so will cause a symlink
lib/debug/libfoo.so.debug -> .build-id/<build-ID>.debug to be
created. This is primarily useful for use with eu-addr2line, if you
know the name of a binary and the relative address, but not the build
ID.
---
 pkgs/build-support/setup-hooks/separate-debug-info.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/build-support/setup-hooks/separate-debug-info.sh b/pkgs/build-support/setup-hooks/separate-debug-info.sh
index dc6de05bb69a..55e3236847df 100644
--- a/pkgs/build-support/setup-hooks/separate-debug-info.sh
+++ b/pkgs/build-support/setup-hooks/separate-debug-info.sh
@@ -32,6 +32,9 @@ _separateDebugInfo() {
         mkdir -p "$dst/${id:0:2}"
         objcopy --only-keep-debug "$i" "$dst/${id:0:2}/${id:2}.debug" --compress-debug-sections
         strip --strip-debug "$i"
+
+        # Also a create a symlink <original-name>.debug.
+        ln -sfn ".build-id/${id:0:2}/${id:2}.debug" "$dst/../$(basename "$i")"
     done
 }
 

From 6a493a2b43741d04e71ddaa2617afb9dca7d9426 Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@merritt.tech>
Date: Sun, 10 Jan 2016 17:51:43 -0800
Subject: [PATCH 774/884] erlang support: Add minimal documentation to nix

This commit adds some very minimial documentation to the Nix
manual. Hopefully, its enough to get someone started and serve as a
first footstep for future documentation writers
---
 doc/erlang-users-guide.xml | 288 +++++++++++++++++++++++++++++++++++++
 doc/manual.xml             |   1 +
 2 files changed, 289 insertions(+)
 create mode 100644 doc/erlang-users-guide.xml

diff --git a/doc/erlang-users-guide.xml b/doc/erlang-users-guide.xml
new file mode 100644
index 000000000000..778d6e709b14
--- /dev/null
+++ b/doc/erlang-users-guide.xml
@@ -0,0 +1,288 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xml:id="users-guide-to-the-erlang-infrastructure">
+
+<title>User's Guide to the Erlang Infrastructure</title>
+
+<section xml:id="how-to-install-erlang-packages">
+  <title>How to install Erlang packages</title>
+  <para>
+    Erlang packages are not registered in the top level simply because
+    they are not relevant to the vast majority of Nix users. They are
+    installable using the <literal>erlangPackages</literal> attribute set.
+
+    You can list the avialable packages in the
+    <literal>erlangPackages</literal> with the following command:
+  </para>
+
+  <programlisting>
+$ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -qaP -A erlangPackages
+erlangPackages.esqlite    esqlite-0.2.1
+erlangPackages.goldrush   goldrush-0.1.7
+erlangPackages.ibrowse    ibrowse-4.2.2
+erlangPackages.jiffy      jiffy-0.14.5
+erlangPackages.lager      lager-3.0.2
+erlangPackages.meck       meck-0.8.3
+erlangPackages.rebar3-pc  pc-1.1.0
+  </programlisting>
+  <para>
+    To install any of those packages into your profile, refer to them by
+    their attribute path (first column):
+  </para>
+  <programlisting>
+$ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA erlangPackages.ibrowse
+  </programlisting>
+  <para>
+    The attribute path of any Erlang packages corresponds to the name
+    of that particular package in Hex or its OTP Application/Release name.
+  </para>
+</section>
+<section xml:id="packaging-erlang-applications">
+  <title>Packaging Erlang Applications</title>
+  <section xml:id="rebar3-packages">
+    <title>Rebar3 Packages</title>
+    <para>
+      There is a Nix functional called
+      <literal>buildRebar3</literal>. We use this function to make a
+      derivation that understands how to build the rebar3 project. For
+      example, the epression we use to build the <link
+      xlink:href="https://github.com/erlang-nix/hex2nix">hex2nix</link>
+      project follows.
+    </para>
+    <programlisting>
+{stdenv, fetchFromGitHub, buildRebar3, ibrowse, jsx, erlware_commons }:
+
+buildRebar3 rec {
+    name = "hex2nix";
+    version = "0.0.1";
+
+    src = fetchFromGitHub {
+        owner = "ericbmerritt";
+        repo = "hex2nix";
+        rev = "${version}";
+        sha256 = "1w7xjidz1l5yjmhlplfx7kphmnpvqm67w99hd2m7kdixwdxq0zqg";
+    };
+
+    erlangDeps = [ ibrowse jsx erlware_commons ];
+}
+    </programlisting>
+    <para>
+      The only visible difference between this derivation and
+      something like <literal>stdenv.mkDerivation</literal> is that we
+      have added <literal>erlangDeps</literal> to the derivation. If
+      you add your Erlang dependencies here they will be correctly
+      handled by the system.
+    </para>
+    <para>
+      If your package needs to compile native code via Rebar's port
+      compilation mechenism. You should add <literal>compilePort =
+      true;</literal> to the derivation.
+    </para>
+  </section>
+
+  <section xml:id="hex-packages">
+    <title>Hex Packages</title>
+    <para>
+      Hex packages are based on Rebar packages. In fact, at the moment
+      we can only compile Hex packages that are buildable with
+      Rebar3. Packages that use Mix and other build systems are not
+      supported. That being said, we know a lot more about Hex and can
+      do more for you.
+    </para>
+    <programlisting>
+{ buildHex }:
+  buildHex {
+    name = "esqlite";
+    version = "0.2.1";
+    sha256 = "1296fn1lz4lz4zqzn4dwc3flgkh0i6n4sydg501faabfbv8d3wkr";
+    compilePort = true;
+}
+    </programlisting>
+    <para>
+      For Hex packages you need to provide the name, the version, and
+      the Sha 256 digest of the package and use
+      <literal>buildHex</literal> to build it. Obviously, the package
+      needs to have already been published to Hex.
+    </para>
+  </section>
+</section>
+<section xml:id="how-to-develop">
+  <title>How to develop</title>
+  <section xml:id="accessing-an-environment">
+    <title>Accessing an Environment</title>
+    <para>
+      Often, all you want to do is be able to access a valid
+      environment that contains a specific package and its
+      dependencies. we can do that with the <literal>env</literal>
+      part of a derivation. For example, lets say we want to access an
+      erlang repl with ibrowse loaded up. We could do the following.
+    </para>
+    <programlisting>
+      ~/w/nixpkgs ❯❯❯ nix-shell -A erlangPackages.ibrowse.env --run "erl"
+      Erlang/OTP 18 [erts-7.0] [source] [64-bit] [smp:4:4] [async-threads:10] [hipe] [kernel-poll:false]
+
+      Eshell V7.0  (abort with ^G)
+      1> m(ibrowse).
+      Module: ibrowse
+      MD5: 3b3e0137d0cbb28070146978a3392945
+      Compiled: January 10 2016, 23:34
+      Object file: /nix/store/g1rlf65rdgjs4abbyj4grp37ry7ywivj-ibrowse-4.2.2/lib/erlang/lib/ibrowse-4.2.2/ebin/ibrowse.beam
+      Compiler options:  [{outdir,"/tmp/nix-build-ibrowse-4.2.2.drv-0/hex-source-ibrowse-4.2.2/_build/default/lib/ibrowse/ebin"},
+      debug_info,debug_info,nowarn_shadow_vars,
+      warn_unused_import,warn_unused_vars,warnings_as_errors,
+      {i,"/tmp/nix-build-ibrowse-4.2.2.drv-0/hex-source-ibrowse-4.2.2/_build/default/lib/ibrowse/include"}]
+      Exports:
+      add_config/1                  send_req_direct/7
+      all_trace_off/0               set_dest/3
+      code_change/3                 set_max_attempts/3
+      get_config_value/1            set_max_pipeline_size/3
+      get_config_value/2            set_max_sessions/3
+      get_metrics/0                 show_dest_status/0
+      get_metrics/2                 show_dest_status/1
+      handle_call/3                 show_dest_status/2
+      handle_cast/2                 spawn_link_worker_process/1
+      handle_info/2                 spawn_link_worker_process/2
+      init/1                        spawn_worker_process/1
+      module_info/0                 spawn_worker_process/2
+      module_info/1                 start/0
+      rescan_config/0               start_link/0
+      rescan_config/1               stop/0
+      send_req/3                    stop_worker_process/1
+      send_req/4                    stream_close/1
+      send_req/5                    stream_next/1
+      send_req/6                    terminate/2
+      send_req_direct/4             trace_off/0
+      send_req_direct/5             trace_off/2
+      send_req_direct/6             trace_on/0
+      trace_on/2
+      ok
+      2>
+    </programlisting>
+    <para>
+      Notice the <literal>-A erlangPackages.ibrowse.env</literal>.That
+      is the key to this functionality.
+    </para>
+  </section>
+  <section xml:id="creating-a-shell">
+    <title>Creating a Shell</title>
+    <para>
+      Getting access to an environment often isn't enough to do real
+      development. Many times we need to create a
+      <literal>shell.nix</literal> file and do our development inside
+      of the environment specified by that file. This file looks a lot
+      like the packageing described above. The main difference is that
+      <literal>src</literal> points to project root and we call the
+      package directly.
+    </para>
+    <programlisting>
+{ pkgs ? import &quot;&lt;nixpkgs&quot;&gt; {} }:
+
+with pkgs;
+
+let
+
+  f = { buildHex, ibrowse, jsx, erlware_commons }:
+      buildHex {
+        name = "hex2nix";
+        version = "0.1.0";
+        src = ./.;
+        erlangDeps = [ ibrowse jsx erlware_commons ];
+      };
+  drv = erlangPackages.callPackage f {};
+
+in
+ drv
+    </programlisting>
+    <section xml:id="building-in-a-shell">
+    <title>Building in a shell</title>
+    <para>
+      Unfortunatly for us users of Nix, Rebar isn't very cooperative
+      with us from the standpoint of building a hermetic
+      environment. When building the rebar3 support we had to do some
+      sneaky things to get it not to go out and pull packages on its
+      own. Also unfortunately, you have to do some of the same things
+      when building a project inside of a Nix shell.
+
+      <orderedlist numeration="arabic">
+        <listitem>
+          <para>Run <literal>rebar3-nix-bootstrap</literal> every time
+          dependencies change</para>
+        </listitem>
+        <listitem>
+          <para>Set Home to the current directory.</para>
+        </listitem>
+      </orderedlist>
+
+      If you do these two things then Rebar will be happy with you. I
+      codify these into a makefile. Forunately, rebar3-nix-bootstrap
+      is idempotent and fairly quick. so you can run it as often as
+      you like.
+    </para>
+    <programlisting>
+# =============================================================================
+# Rules
+# =============================================================================
+.PHONY= all test clean repl shell build test analyze bootstrap
+
+all: test
+
+clean:
+        rm -rf _build
+        rm -rf .cache
+
+repl:
+        nix-shell --run "erl"
+
+shell:
+        nix-shell --run "bash"
+
+bootstrap:
+        nix-shell --pure --run "rebar3-nix-bootstrap"
+
+build: bootstrap
+        nix-shell --pure --run "HOME=$(CURDIR) rebar3 compile"
+
+analyze: bootstrap
+        nix-shell --pure --run "HOME=$(CURDIR) rebar3 do compile,dialyzer"
+
+test: bootstrap
+        nix-shell --pure --run "HOME=$(CURDIR) rebar3 do compile,dialyzer,eunit"
+
+    </programlisting>
+    <para>
+      If you add the <literal>shell.nix</literal> as described and
+      user rebar as follows things should simply work.
+    </para>
+  </section>
+</section>
+</section>
+<section xml:id="generating-packages-from-hex-with-hex2nix">
+  <title>Generating Packages from Hex with Hex2Nix</title>
+  <para>
+    Updating the Hex packages requires the use of the
+    <literal>hex2nix</literal> tool. Given the path to the Erlang
+    modules (usually
+    <literal>pkgs/development/erlang-modules</literal>). It will
+    happily dump a file called
+    <literal>hex-packages.nix</literal>. That file will contain all
+    the packages that use a recognized build system in Hex. However,
+    it can't know whether or not all those packages are buildable.
+    </para>
+    <para>
+      To make life easier for our users, it makes good sense to go
+      ahead and attempt to build all those packages and remove the
+      ones that don't build. To do that, simply run the command (in
+      the root of your <literal>nixpkgs</literal> repository). that follows.
+    </para>
+    <programlisting>
+$ nix-build -A erlangPackages
+    </programlisting>
+    <para>
+      That will build every package in
+      <literal>erlangPackages</literal>. Then you can go through and
+      manually remove the ones that fail. Hopefully, someone will
+      improve <literal>hex2nix</literal> in the future to automate
+      that.
+    </para>
+</section>
+</chapter>
diff --git a/doc/manual.xml b/doc/manual.xml
index b4c35d1a379d..2b4f47aff1c8 100644
--- a/doc/manual.xml
+++ b/doc/manual.xml
@@ -20,6 +20,7 @@
   <xi:include href="coding-conventions.xml" />
   <xi:include href="submitting-changes.xml" />
   <xi:include href="haskell-users-guide.xml" />
+  <xi:include href="erlang-users-guide.xml" />
   <xi:include href="contributing.xml" />
 
 </book>

From acf4bfd585d2a566864dce2a051d2888bd472fa1 Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@merritt.tech>
Date: Sun, 10 Jan 2016 18:39:37 -0800
Subject: [PATCH 775/884] erlang support: overridable allow installPhase

This commit allows the installPhase of buildRebar3 to be overridden by
the user.
---
 pkgs/development/erlang-modules/build-rebar3.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/erlang-modules/build-rebar3.nix b/pkgs/development/erlang-modules/build-rebar3.nix
index 16e663d14b9a..6ad82b62158c 100644
--- a/pkgs/development/erlang-modules/build-rebar3.nix
+++ b/pkgs/development/erlang-modules/build-rebar3.nix
@@ -7,6 +7,7 @@
 , buildInputs ? [], erlangDeps ? [], pluginDeps ? []
 , postPatch ? ""
 , compilePorts ? false
+, installPhase ? null
 , meta ? {}
 , ... }@attrs:
 
@@ -56,7 +57,8 @@ let
       runHook postBuild
     '';
 
-    installPhase = ''
+    installPhase = if installPhase == null
+    then ''
       runHook preInstall
       mkdir -p "$out/lib/erlang/lib/${name}-${version}"
       for reldir in src ebin priv include; do
@@ -66,7 +68,8 @@ let
         success=1
       done
       runHook postInstall
-    '';
+    ''
+    else installPhase;
 
     meta = {
       inherit (erlang.meta) platforms;

From e8933f6a4e53d903520e6e44cd7518997b18e16f Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@merritt.tech>
Date: Fri, 15 Jan 2016 08:16:46 -0800
Subject: [PATCH 776/884] webdriver: init at 0.0.0+build.18.7ceaf1f

---
 pkgs/development/erlang-modules/default.nix   |  3 ++
 .../erlang-modules/webdriver/default.nix      | 40 +++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/development/erlang-modules/webdriver/default.nix

diff --git a/pkgs/development/erlang-modules/default.nix b/pkgs/development/erlang-modules/default.nix
index 7f096016ddbd..f3adf18df0c9 100644
--- a/pkgs/development/erlang-modules/default.nix
+++ b/pkgs/development/erlang-modules/default.nix
@@ -7,5 +7,8 @@ let
 
     buildRebar3 = callPackage ./build-rebar3.nix {};
     buildHex = callPackage ./build-hex.nix {};
+
+    ## Non hex packages
+    webdriver = callPackage ./webdriver {};
   };
 in self // self.hex
diff --git a/pkgs/development/erlang-modules/webdriver/default.nix b/pkgs/development/erlang-modules/webdriver/default.nix
new file mode 100644
index 000000000000..bf84ac286baa
--- /dev/null
+++ b/pkgs/development/erlang-modules/webdriver/default.nix
@@ -0,0 +1,40 @@
+{stdenv, fetchFromGitHub, writeText, erlang }:
+
+let
+  shell = drv: stdenv.mkDerivation {
+          name = "interactive-shell-${drv.name}";
+          buildInputs = [ drv ];
+    };
+
+  pkg = self: stdenv.mkDerivation rec {
+    name = "webdriver";
+    version = "0.0.0+build.18.7ceaf1f";
+
+    src = fetchFromGitHub {
+        owner = "Quviq";
+        repo = "webdrv";
+        rev = "7ceaf1f67d834e841ca0133b4bf899a9fa2db6bb";
+        sha256 = "1pq6pmlr6xb4hv2fvmlrvzd8c70kdcidlgjv4p8n9pwvkif0cb87";
+    };
+
+    setupHook = writeText "setupHook.sh" ''
+       addToSearchPath ERL_LIBS "$1/lib/erlang/lib/"
+    '';
+
+    buildInputs = [ erlang ];
+
+    installFlags = "PREFIX=$(out)/lib/erlang/lib";
+
+    meta = {
+      description = "WebDriver implementation in Erlang";
+      license = stdenv.lib.licenses.mit;
+      homepage = "https://github.com/Quviq/webdrv";
+      maintainers = with stdenv.lib.maintainers; [ ericbmerritt ];
+    };
+
+    passthru = {
+      env = shell self;
+    };
+
+};
+in stdenv.lib.fix pkg

From 7e36514c90ff24e79ec2a4e64388a1f5ba7faf76 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 15 Jan 2016 17:53:42 +0100
Subject: [PATCH 777/884] nixos/postfix: Set type for extraConfig to "lines"

Regression introduced by 3891d3e6541fe588ee2430e7b1bdb8d87d787a53.

Merging multiple options with type "str" won't work and give an
evaluation error. For extra configuration lines in the Postfix config it
really should be "lines", especially because even the description
mentions "extra lines".

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

diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index ab6ad3906000..6c5d7e92702b 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -300,7 +300,7 @@ in
       };
 
       extraConfig = mkOption {
-        type = types.str;
+        type = types.lines;
         default = "";
         description = "
           Extra lines to be added verbatim to the main.cf configuration file.

From d9fa9b1a45f0c8551d8789c8aac86affecab3534 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 15 Jan 2016 12:05:43 -0500
Subject: [PATCH 778/884] Add rt and perl packages it needs

---
 pkgs/servers/rt/default.nix              |  23 +
 pkgs/servers/rt/override-generated.patch |  21 +
 pkgs/top-level/all-packages.nix          |   2 +
 pkgs/top-level/perl-packages.nix         | 596 ++++++++++++++++++++++-
 4 files changed, 634 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/servers/rt/default.nix
 create mode 100644 pkgs/servers/rt/override-generated.patch

diff --git a/pkgs/servers/rt/default.nix b/pkgs/servers/rt/default.nix
new file mode 100644
index 000000000000..7f8c372c3355
--- /dev/null
+++ b/pkgs/servers/rt/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, perl }:
+
+stdenv.mkDerivation rec {
+  name = "rt-4.2.12";
+
+  src = fetchurl {
+    url = "https://download.bestpractical.com/pub/rt/release/${name}.tar.gz";
+
+    sha256 = "0r3jhgfwwhhk654zag42mrai85yrliw9sc0kgabwjvbh173204p2";
+  };
+
+  patches = [ ./override-generated.patch ];
+
+  buildInputs = [ perl ];
+
+  buildPhase = "true";
+
+  installPhase = ''
+    mkdir $out
+    cp -a {bin,docs,etc,lib,sbin,share} $out
+    find $out -name '*.in' -exec rm '{}' \;
+  '';
+}
diff --git a/pkgs/servers/rt/override-generated.patch b/pkgs/servers/rt/override-generated.patch
new file mode 100644
index 000000000000..5727a9b50c58
--- /dev/null
+++ b/pkgs/servers/rt/override-generated.patch
@@ -0,0 +1,21 @@
+commit 7aec1e9478ef679227e759ab9537df7584c6a852
+Author: Shea Levy <shea@shealevy.com>
+Date:   Fri Jan 15 09:09:18 2016 -0500
+
+    Make it possible to override hard-coded paths
+
+diff --git a/lib/RT/Generated.pm.in b/lib/RT/Generated.pm.in
+index 9dcb80b..99b034b 100644
+--- a/lib/RT/Generated.pm.in
++++ b/lib/RT/Generated.pm.in
+@@ -82,4 +82,10 @@ $MasonDataDir = '@MASON_DATA_PATH@';
+ $MasonSessionDir = '@MASON_SESSION_PATH@';
+ 
+ 
++if ( my $override_file = $ENV{RT_PATHS_OVERRIDE} )
++{
++    require "$override_file" || die "Couldn't load paths override file: $@";
++}
++
++
+ 1;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 761bbed35184..5d52c89d0590 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2907,6 +2907,8 @@ let
 
   redmine = callPackage ../applications/version-management/redmine { };
 
+  rt = callPackage ../servers/rt { };
+
   rtmpdump = callPackage ../tools/video/rtmpdump { };
   rtmpdump_gnutls = rtmpdump.override { gnutlsSupport = true; opensslSupport = false; };
 
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 849db4820a8c..501a2d26c4eb 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -180,6 +180,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  ApacheSession = buildPerlPackage {
+    name = "Apache-Session-1.93";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/C/CH/CHORNY/Apache-Session-1.93.tar.gz;
+      sha256 = "8e5a4882ac8ec657d1018d74d3ba37854e2688a41ddd0e1d73955ea59f276e8d";
+    };
+    buildInputs = [ TestDeep TestException ];
+    meta = {
+      description = "A persistence framework for session data";
+      license = "perl";
+    };
+  };
+
   ApacheTest = buildPerlPackage {
     name = "Apache-Test-1.38";
     src = fetchurl {
@@ -727,6 +740,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  CacheSimpleTimedExpiry = buildPerlPackage {
+    name = "Cache-Simple-TimedExpiry-0.27";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/J/JE/JESSE/Cache-Simple-TimedExpiry-0.27.tar.gz;
+      sha256 = "4e78b7e4dd231b5571a48cd0ee1b63953f5e34790c9d020e1595a7c7d0abbe49";
+    };
+    meta = {
+      description = "A lightweight cache with timed expiration";
+      license = "perl";
+    };
+  };
+
   Cairo = buildPerlPackage rec {
     name = "Cairo-1.106";
     src = fetchurl {
@@ -1412,6 +1437,21 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  CGIEmulatePSGI = buildPerlPackage {
+    name = "CGI-Emulate-PSGI-0.21";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/M/MI/MIYAGAWA/CGI-Emulate-PSGI-0.21.tar.gz;
+      sha256 = "06b8f1864101de69b2264ad3c3a2b15333e428cf9f5d17a777cfc61f8c64093f";
+    };
+    buildInputs = [ TestRequires ];
+    propagatedBuildInputs = [ HTTPMessage ];
+    meta = {
+      homepage = https://github.com/tokuhirom/p5-cgi-emulate-psgi;
+      description = "PSGI adapter for CGI";
+      license = "perl";
+    };
+  };
+
   CGIExpand = buildPerlPackage {
     name = "CGI-Expand-2.04";
     src = fetchurl {
@@ -1448,6 +1488,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  CGIPSGI = buildPerlPackage {
+    name = "CGI-PSGI-0.15";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/M/MI/MIYAGAWA/CGI-PSGI-0.15.tar.gz;
+      sha256 = "c50dcb10bf8486a9843baed032ad89d879ff2f41c993342dead62f947a598d91";
+    };
+    meta = {
+      description = "Adapt CGI.pm to the PSGI protocol";
+      license = "perl";
+    };
+  };
+
   CGISession = buildPerlPackage rec {
     name = "CGI-Session-4.48";
     src = fetchurl {
@@ -1545,6 +1597,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  ClassAccessorLite = buildPerlPackage {
+    name = "Class-Accessor-Lite-0.08";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/K/KA/KAZUHO/Class-Accessor-Lite-0.08.tar.gz;
+      sha256 = "75b3b8ec8efe687677b63f0a10eef966e01f60735c56656ce75cbb44caba335a";
+    };
+    meta = {
+      description = "A minimalistic variant of Class::Accessor";
+      license = "perl";
+    };
+  };
+
   ClassAutouse = buildPerlPackage {
     name = "Class-Autouse-1.99_02";
     src = fetchurl {
@@ -1731,6 +1795,19 @@ let self = _self // overrides; _self = with self; {
 
   ClassMOP = Moose;
 
+  ClassReturnValue = buildPerlPackage {
+    name = "Class-ReturnValue-0.55";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/J/JE/JESSE/Class-ReturnValue-0.55.tar.gz;
+      sha256 = "ed3836885d78f734ccd7a98550ec422a616df7c31310c1b7b1f6459f5fb0e4bd";
+    };
+    propagatedBuildInputs = [ DevelStackTrace ];
+    meta = {
+      description = "A smart return value object";
+      license = "perl";
+    };
+  };
+
   ClassSingleton = buildPerlPackage rec {
     name = "Class-Singleton-1.5";
     src = fetchurl {
@@ -2052,6 +2129,20 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  ConvertColor = buildPerlPackage {
+    name = "Convert-Color-0.11";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/P/PE/PEVANS/Convert-Color-0.11.tar.gz;
+      sha256 = "b41217c72931034ba4417d7a9e1e2999f04580d4e6b31c70993fedccc2440d38";
+    };
+    buildInputs = [ TestNumberDelta ];
+    propagatedBuildInputs = [ ListUtilsBy ModulePluggable ];
+    meta = {
+      description = "Color space conversions and named lookups";
+      license = "perl";
+    };
+  };
+
   constant = buildPerlPackage rec {
     name = "constant-1.33";
     src = fetchurl {
@@ -2461,6 +2552,20 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ Clone ];
   };
 
+  CSSSquish = buildPerlPackage {
+    name = "CSS-Squish-0.10";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/T/TS/TSIBLEY/CSS-Squish-0.10.tar.gz;
+      sha256 = "65fc0d69acd1fa33d9a4c3b09cce0fbd737d747b1fcc4e9d87ebd91050cbcb4e";
+    };
+    buildInputs = [ TestLongString ];
+    propagatedBuildInputs = [ URI ];
+    meta = {
+      description = "Compact many CSS files into one big file";
+      license = "unknown";
+    };
+  };
+
   Curses = let version = "1.33"; in buildPerlPackage {
     name = "Curses-${version}";
     src = fetchurl {
@@ -2571,6 +2676,20 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  DataGUID = buildPerlPackage {
+    name = "Data-GUID-0.048";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RJ/RJBS/Data-GUID-0.048.tar.gz;
+      sha256 = "cb263b1e6eeecc5797de6f945d42ace2db26c156172883550b73fa2ecdab29dc";
+    };
+    propagatedBuildInputs = [ DataUUID SubExporter SubInstall ];
+    meta = {
+      homepage = https://github.com/rjbs/Data-GUID;
+      description = "Globally unique identifiers";
+      license = "perl";
+    };
+  };
+
   DataHierarchy = buildPerlPackage {
     name = "Data-Hierarchy-0.34";
     src = fetchurl {
@@ -2580,6 +2699,20 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [TestException];
   };
 
+  DataICal = buildPerlPackage {
+    name = "Data-ICal-0.22";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/A/AL/ALEXMV/Data-ICal-0.22.tar.gz;
+      sha256 = "8ae9d20af244e5a6f606c7325e9d145dd0002676a178357af860a5e156925720";
+    };
+    buildInputs = [ TestLongString TestNoWarnings TestWarn ];
+    propagatedBuildInputs = [ ClassAccessor ClassReturnValue TextvFileasData ];
+    meta = {
+      description = "Generates iCalendar (RFC 2445) calendar files";
+      license = "perl";
+    };
+  };
+
   DataInteger = buildPerlPackage rec {
     name = "Data-Integer-0.005";
     src = fetchurl {
@@ -2731,6 +2864,16 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  DateExtract = buildPerlPackage {
+    name = "Date-Extract-0.05";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/S/SH/SHARYANTO/Date-Extract-0.05.tar.gz;
+      sha256 = "ef866b4d596e976a6f4e4b266a6ad7fe4513fad9ae761d7a9ef66f672695fe6d";
+    };
+    buildInputs = [TestMockTime];
+    propagatedBuildInputs = [DateTimeFormatNatural ClassDataInheritable];
+  };
+
   DateManip = buildPerlPackage rec {
     name = "Date-Manip-6.51";
     src = fetchurl {
@@ -2874,6 +3017,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  DateTimeFormatMail = buildPerlPackage {
+    name = "DateTime-Format-Mail-0.402";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/B/BO/BOOK/DateTime-Format-Mail-0.402.tar.gz;
+      sha256 = "d788c883969e1647ed0524cc130d897276de23eaa3261f3616458ddd3a4a88fb";
+    };
+    propagatedBuildInputs = [ DateTime ParamsValidate ];
+    meta = {
+      description = "Convert between DateTime and RFC2822/822 formats";
+      license = "perl";
+    };
+  };
+
   DateTimeFormatNatural = buildPerlPackage {
     name = "DateTime-Format-Natural-1.03";
     src = fetchurl {
@@ -2940,6 +3096,20 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ DateTime DateTimeFormatBuilder ];
   };
 
+  DateTimeFormatW3CDTF = buildPerlPackage {
+    name = "DateTime-Format-W3CDTF-0.06";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/G/GW/GWILLIAMS/DateTime-Format-W3CDTF-0.06.tar.gz;
+      sha256 = "b9a542bed9c52b0a89dd590a5184e38ee334c824bbe6bac842dd7dd1f88fbd7a";
+    };
+    propagatedBuildInputs = [ DateTime ];
+    meta = {
+      homepage = http://search.cpan.org/dist/DateTime-Format-W3CDTF/;
+      description = "Parse and format W3CDTF datetime strings";
+      license = "perl";
+    };
+  };
+
   DateTimeLocale = buildPerlPackage rec {
     name = "DateTime-Locale-0.92";
     src = fetchurl {
@@ -3268,6 +3438,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  DBIxDBSchema = buildPerlPackage {
+    name = "DBIx-DBSchema-0.45";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/I/IV/IVAN/DBIx-DBSchema-0.45.tar.gz;
+      sha256 = "7a2a978fb6d9feaa3e4b109c71c963b26a008a2d130c5876ecf24c5a72338a1d";
+    };
+    propagatedBuildInputs = [ DBI ];
+    meta = {
+      description = "Unknown";
+      license = "unknown";
+    };
+  };
+
   DBIxHTMLViewLATEST = buildPerlPackage {
     name = "DBIx-HTMLView-LATEST";
     src = fetchurl {
@@ -3277,6 +3460,20 @@ let self = _self // overrides; _self = with self; {
     doCheck = false;
   };
 
+  DBIxSearchBuilder = buildPerlPackage {
+    name = "DBIx-SearchBuilder-1.66";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/A/AL/ALEXMV/DBIx-SearchBuilder-1.66.tar.gz;
+      sha256 = "e2703c3f4b38cf232dec48be98aeab6d2dbee077dcf059369b825629c4be702e";
+    };
+    buildInputs = [ DBDSQLite ];
+    propagatedBuildInputs = [ CacheSimpleTimedExpiry ClassAccessor ClassReturnValue Clone DBI DBIxDBSchema Want ];
+    meta = {
+      description = "Encapsulate SQL queries and rows in simple perl objects";
+      license = "perl";
+    };
+  };
+
   DBIxSimple = buildPerlPackage {
     name = "DBIx-Simple-1.35";
     src = fetchurl {
@@ -3876,6 +4073,20 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  EmailAddressList = buildPerlPackage {
+    name = "Email-Address-List-0.05";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/A/AL/ALEXMV/Email-Address-List-0.05.tar.gz;
+      sha256 = "705c23fc2163c2347ba0aea998450259f7b10577a368c6d310bd4e98b427a033";
+    };
+    buildInputs = [ JSON ];
+    propagatedBuildInputs = [ EmailAddress ];
+    meta = {
+      description = "RFC close address list parsing";
+      license = "perl";
+    };
+  };
+
   EmailDateFormat = buildPerlPackage rec {
     name = "Email-Date-Format-1.005";
     src = fetchurl {
@@ -4006,10 +4217,14 @@ let self = _self // overrides; _self = with self; {
   };
 
   Encode = buildPerlPackage {
-    name = "Encode-2.63";
+    name = "Encode-2.78";
     src = fetchurl {
-      url = mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-2.63.tar.gz;
-      sha256 = "1wrqm6c194l5yjaifc6nxx2b768sph2pv4n86fgh4blls0pvs6z4";
+      url = mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-2.78.tar.gz;
+      sha256 = "1fc8d5c0e75ef85beeac71d1fe4a3bfcb8207755a46b32f783a3a6682672762a";
+    };
+    meta = {
+      description = "Unknown";
+      license = "perl";
     };
   };
 
@@ -4775,6 +4990,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  FileSlurper = buildPerlPackage {
+    name = "File-Slurper-0.008";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/L/LE/LEONT/File-Slurper-0.008.tar.gz;
+      sha256 = "10f685140e2cebdd0381f24b010b028f9ca2574361a78f99f4dfe87af5d5d233";
+    };
+    meta = {
+      description = "A simple, sane and efficient module to slurp a file";
+      license = "perl";
+    };
+  };
+
   FileSlurpTiny = buildPerlPackage rec {
     name = "File-Slurp-Tiny-0.004";
     src = fetchurl {
@@ -5232,6 +5459,47 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  HTMLFormatter = buildPerlModule {
+    name = "HTML-Formatter-2.14";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/N/NI/NIGELM/HTML-Formatter-2.14.tar.gz;
+      sha256 = "d28eeeab48ab5f7bfcc73cc106b0f756073d98d48dfdb91ca2951f832f8e035e";
+    };
+    buildInputs = [ FileSlurper TestCPANMeta TestEOL TestNoTabs perl ];
+    propagatedBuildInputs = [ FontAFM HTMLTree ];
+    meta = {
+      homepage = https://metacpan.org/release/HTML-Formatter;
+      description = "Base class for HTML formatters";
+      license = "perl";
+    };
+  };
+
+  HTMLFormatTextWithLinks = buildPerlPackage {
+    name = "HTML-FormatText-WithLinks-0.15";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/S/ST/STRUAN/HTML-FormatText-WithLinks-0.15.tar.gz;
+      sha256 = "7fcc1ab79eb58fb97d43e5bdd14e21791a250a204998918c62d6a171131833b1";
+    };
+    propagatedBuildInputs = [ HTMLFormatter HTMLTree URI ];
+    meta = {
+      description = "HTML to text conversion with links as footnotes";
+      license = "perl";
+    };
+  };
+
+  HTMLFormatTextWithLinksAndTables = buildPerlPackage {
+    name = "HTML-FormatText-WithLinks-AndTables-0.06";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/D/DA/DALEEVANS/HTML-FormatText-WithLinks-AndTables-0.06.tar.gz;
+      sha256 = "e5b23f0475fb81fd6fed688bb914295a39542b3e5b43c8517494226a52d868fa";
+    };
+    propagatedBuildInputs = [ HTMLFormatTextWithLinks HTMLFormatter HTMLTree ];
+    meta = {
+      description = "Converts HTML to Text with tables intact";
+      license = "perl";
+    };
+  };
+
   HTMLFormFu = buildPerlPackage rec {
     name = "HTML-FormFu-2.01";
     src = fetchurl {
@@ -5283,6 +5551,21 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  HTMLMasonPSGIHandler = buildPerlPackage {
+    name = "HTML-Mason-PSGIHandler-0.53";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RU/RUZ/HTML-Mason-PSGIHandler-0.53.tar.gz;
+      sha256 = "eafd7c7655dfa8261df3446b931a283d30306877b83ac4671c49cff74ea7f00b";
+    };
+    buildInputs = [ Plack ];
+    propagatedBuildInputs = [ CGIPSGI HTMLMason ];
+    meta = {
+      homepage = http://search.cpan.org/dist/HTML-Mason-PSGIHandler/;
+      description = "PSGI handler for HTML::Mason";
+      license = "perl";
+    };
+  };
+
   HTMLParser = buildPerlPackage {
     name = "HTML-Parser-3.71";
     src = fetchurl {
@@ -5296,6 +5579,32 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  HTMLQuoted = buildPerlPackage {
+    name = "HTML-Quoted-0.04";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/T/TS/TSIBLEY/HTML-Quoted-0.04.tar.gz;
+      sha256 = "8b41f313fdc1812f02f6f6c37d58f212c84fdcf7827f7fd4b030907f39dc650c";
+    };
+    propagatedBuildInputs = [ HTMLParser ];
+    meta = {
+      description = "Extract structure of quoted HTML mail message";
+      license = "perl";
+    };
+  };
+
+  HTMLRewriteAttributes = buildPerlPackage {
+    name = "HTML-RewriteAttributes-0.05";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/T/TS/TSIBLEY/HTML-RewriteAttributes-0.05.tar.gz;
+      sha256 = "1808ec7cdf40d2708575fe6155a88f103b17fec77973a5831c2f24c250e7a58c";
+    };
+    propagatedBuildInputs = [ HTMLParser HTMLTagset URI ];
+    meta = {
+      description = "Concise attribute rewriting";
+      license = "perl";
+    };
+  };
+
   HTMLSelectorXPath = buildPerlPackage {
     name = "HTML-Selector-XPath-0.16";
     src = fetchurl {
@@ -6369,13 +6678,29 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [I18NLangTags];
   };
 
-  LocaleMaketextLexicon = buildPerlPackage {
-    name = "Locale-Maketext-Lexicon-0.66";
+  LocaleMaketextFuzzy = buildPerlPackage {
+    name = "Locale-Maketext-Fuzzy-0.11";
     src = fetchurl {
-      url = mirror://cpan/authors/id/A/AU/AUDREYT/Locale-Maketext-Lexicon-0.66.tar.gz;
-      sha256 = "1cd2kbcrlyjcmlr7m8kf94mm1hlr7hpv1r80a596f4ljk81f2nvd";
+      url = mirror://cpan/authors/id/A/AU/AUDREYT/Locale-Maketext-Fuzzy-0.11.tar.gz;
+      sha256 = "3785171ceb78cc7671319a3a6d8ced9b190e097dfcd9b2a9ebc804cd1a282f96";
+    };
+    meta = {
+      description = "Maketext from already interpolated strings";
+      license = "unrestricted";
+    };
+  };
+
+  LocaleMaketextLexicon = buildPerlPackage {
+    name = "Locale-Maketext-Lexicon-1.00";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/D/DR/DRTECH/Locale-Maketext-Lexicon-1.00.tar.gz;
+      sha256 = "b73f6b04a58d3f0e38ebf2115a4c1532f1a4eef6fac5c6a2a449e4e14c1ddc7c";
+    };
+    meta = {
+      homepage = http://search.cpan.org/dist/Locale-Maketext-Lexicon;
+      description = "Use other catalog formats in Maketext";
+      license = "mit";
     };
-    propagatedBuildInputs = [LocaleMaketext];
   };
 
   LocaleMaketextSimple = buildPerlPackage {
@@ -6937,6 +7262,20 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ ProcWaitStat ];
   };
 
+  MIMEtools = buildPerlPackage {
+    name = "MIME-tools-5.507";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/D/DS/DSKOLL/MIME-tools-5.507.tar.gz;
+      sha256 = "2f43683e1d5bed21179207d81c0caf1d5b5d480d018ac812f4ab950879fe7793";
+    };
+    buildInputs = [ TestDeep ];
+    propagatedBuildInputs = [ MailTools ];
+    meta = {
+      description = "Tools to manipulate MIME messages";
+      license = "perl";
+    };
+  };
+
   MIMETypes = buildPerlPackage {
     name = "MIME-Types-2.04";
     src = fetchurl {
@@ -7199,6 +7538,19 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [UNIVERSALrequire];
   };
 
+  ModuleRefresh = buildPerlPackage {
+    name = "Module-Refresh-0.17";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/A/AL/ALEXMV/Module-Refresh-0.17.tar.gz;
+      sha256 = "6b30a6ceddc6512ab4490c16372ecf309a259f2ca147d622e478ac54e08511c3";
+    };
+    buildInputs = [ PathClass ];
+    meta = {
+      description = "Refresh %INC files when updated on disk";
+      license = "perl";
+    };
+  };
+
   ModuleRuntime = buildPerlPackage {
     name = "Module-Runtime-0.014";
     src = fetchurl {
@@ -7280,6 +7632,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  ModuleVersionsReport = buildPerlPackage {
+    name = "Module-Versions-Report-1.06";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/J/JE/JESSE/Module-Versions-Report-1.06.tar.gz;
+      sha256 = "a3261d0d84b17678d8c4fd55eb0f892f5144d81ca53ea9a38d75d1a00ad9796a";
+    };
+    meta = {
+      description = "Report versions of all modules in memory";
+      license = "perl";
+    };
+  };
+
   mod_perl2 = buildPerlPackage {
     name = "mod_perl-2.0.9";
     src = fetchurl {
@@ -8676,6 +9040,20 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  ParallelPrefork = buildPerlPackage {
+    name = "Parallel-Prefork-0.17";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/K/KA/KAZUHO/Parallel-Prefork-0.17.tar.gz;
+      sha256 = "0d81de2632281091bd31297de1906e14cae4e845cf32200953b50406859e763b";
+    };
+    buildInputs = [ TestRequires TestSharedFork ];
+    propagatedBuildInputs = [ ClassAccessorLite ListMoreUtils ProcWait3 ScopeGuard SignalMask ];
+    meta = {
+      description = "A simple prefork server framework";
+      license = "perl";
+    };
+  };
+
   ParamsClassify = buildPerlPackage rec {
     name = "Params-Classify-0.013";
     src = fetchurl {
@@ -9139,6 +9517,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  ProcWait3 = buildPerlPackage {
+    name = "Proc-Wait3-0.05";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/C/CT/CTILMES/Proc-Wait3-0.05.tar.gz;
+      sha256 = "1a907f5db6933dc2939bbfeffe19eeae7ed39ef1b97a2bc9b723f2f25f81caf3";
+    };
+    meta = {
+      description = "Perl extension for wait3 system call";
+      license = "perl";
+    };
+  };
+
   ProcWaitStat = buildPerlPackage rec {
     name = "Proc-WaitStat-1.00";
     src = fetchurl {
@@ -9502,6 +9892,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  RegexpCommonnetCIDR = buildPerlPackage {
+    name = "Regexp-Common-net-CIDR-0.03";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/B/BP/BPS/Regexp-Common-net-CIDR-0.03.tar.gz;
+      sha256 = "39606a57aab20d4f4468300f2ec3fa2ab557fcc9cb7880ec7c6e07d80162da33";
+    };
+    propagatedBuildInputs = [ RegexpCommon ];
+    meta = {
+      license = "perl";
+    };
+  };
+
   RegexpCopy = buildPerlPackage rec {
     name = "Regexp-Copy-0.06";
     src = fetchurl {
@@ -9510,6 +9912,17 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  RegexpIPv6 = buildPerlPackage {
+    name = "Regexp-IPv6-0.03";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/S/SA/SALVA/Regexp-IPv6-0.03.tar.gz;
+      sha256 = "d542d17d75ce93631de8ba2156da0e0b58a755c409cd4a0d27a3873a26712ce2";
+    };
+    meta = {
+      license = "unknown";
+    };
+  };
+
   RegexpParser = buildPerlPackage {
     name = "Regexp-Parser-0.21";
     src = fetchurl {
@@ -9557,6 +9970,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  RoleBasic = buildPerlPackage {
+    name = "Role-Basic-0.13";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/O/OV/OVID/Role-Basic-0.13.tar.gz;
+      sha256 = "38a0959ef9f193ff76e72c325a9e9211bc4868689bd0e2b005778f53f8b6f36a";
+    };
+    meta = {
+      description = "Just roles. Nothing else";
+      license = "perl";
+    };
+  };
+
   RoleHasMessage = buildPerlPackage {
     name = "Role-HasMessage-0.006";
     src = fetchurl {
@@ -9716,6 +10141,20 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  ServerStarter = buildPerlModule {
+    name = "Server-Starter-0.32";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/K/KA/KAZUHO/Server-Starter-0.32.tar.gz;
+      sha256 = "a8ecc19f05f3c3b079e1c7f2c007a6df2b9a2912b9848a8fb51bd78c7b13ac1a";
+    };
+    buildInputs = [ TestRequires TestSharedFork TestTCP ];
+    meta = {
+      homepage = https://github.com/kazuho/p5-Server-Starter;
+      description = "A superdaemon for hot-deploying server programs";
+      license = "perl";
+    };
+  };
+
   SetInfinite = buildPerlPackage {
     name = "Set-Infinite-0.65";
     src = fetchurl {
@@ -9756,6 +10195,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  SignalMask = buildPerlPackage {
+    name = "Signal-Mask-0.008";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/L/LE/LEONT/Signal-Mask-0.008.tar.gz;
+      sha256 = "043d995b6b249d9ebc04c467db31bb7ddc2e55faa08e885bdb050b1f2336b73f";
+    };
+    propagatedBuildInputs = [ IPCSignal ];
+    meta = {
+      description = "Signal masks made easy";
+      license = "perl";
+    };
+  };
+
   SOAPLite = buildPerlPackage {
     name = "SOAP-Lite-1.11";
     src = fetchurl {
@@ -9920,6 +10372,20 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  Starlet = buildPerlPackage {
+    name = "Starlet-0.28";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/K/KA/KAZUHO/Starlet-0.28.tar.gz;
+      sha256 = "245f606cdc8acadbe12e7e56dfa0752a8e8daa9a094373394fc17a45f5dde850";
+    };
+    buildInputs = [ LWP TestTCP ];
+    propagatedBuildInputs = [ ParallelPrefork Plack ServerStarter ];
+    meta = {
+      description = "A simple, high-performance PSGI/Plack HTTP server";
+      license = "perl";
+    };
+  };
+
   Starman = let version = "0.4014"; in buildPerlModule {
     name = "Starman-${version}";
     src = fetchurl {
@@ -10358,6 +10824,18 @@ let self = _self // overrides; _self = with self; {
     doCheck = false;                             # FIXME: 2/293 test failures
   };
 
+  SymbolGlobalName = buildPerlPackage {
+    name = "Symbol-Global-Name-0.05";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/A/AL/ALEXMV/Symbol-Global-Name-0.05.tar.gz;
+      sha256 = "0f7623e9d724760aa64040222da1d82f1188586791329261cc60dad1d60d6a92";
+    };
+    meta = {
+      description = "Finds name and type of a global variable";
+      license = "perl";
+    };
+  };
+
   SymbolUtil = buildPerlPackage {
     name = "Symbol-Util-0.0203";
     src = fetchurl {
@@ -11752,6 +12230,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  TestManifest = buildPerlPackage {
+    name = "Test-Manifest-2.02";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/B/BD/BDFOY/Test-Manifest-2.02.tar.gz;
+      sha256 = "064783ceaf7dd569a5724d40900a3f9d92168ee4c613f7a3cb99a99aa8283396";
+    };
+    meta = {
+      description = "Interact with a t/test_manifest file";
+      license = "perl";
+    };
+  };
+
   TextMarkdown = buildPerlPackage rec {
     name = "Text-Markdown-1.000031";
     src = fetchurl {
@@ -11805,6 +12295,30 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  TestNumberDelta = buildPerlPackage {
+    name = "Test-Number-Delta-1.06";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-Number-Delta-1.06.tar.gz;
+      sha256 = "535430919e6fdf6ce55ff76e9892afccba3b7d4160db45f3ac43b0f92ffcd049";
+    };
+    meta = {
+      homepage = https://github.com/dagolden/Test-Number-Delta;
+      description = "Compare the difference between numbers against a given tolerance";
+      license = "apache";
+    };
+  };
+
+  TextPasswordPronounceable = buildPerlPackage {
+    name = "Text-Password-Pronounceable-0.30";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/T/TS/TSIBLEY/Text-Password-Pronounceable-0.30.tar.gz;
+      sha256 = "c186a50256e0bedfafb17e7ce157e7c52f19503bb79e18ebf06255911f6ead1a";
+    };
+    meta = {
+      license = "perl";
+    };
+  };
+
   TextPDF = buildPerlPackage rec {
     name = "Text-PDF-0.29a";
     src = fetchurl {
@@ -11814,6 +12328,19 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ CompressZlib ];
   };
 
+  TextQuoted = buildPerlPackage {
+    name = "Text-Quoted-2.09";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/A/AL/ALEXMV/Text-Quoted-2.09.tar.gz;
+      sha256 = "446c3e8da7e65f7988cd36e9da1159614eb0b337d6c4c0dec8f6df7673b96c5f";
+    };
+    propagatedBuildInputs = [ TextAutoformat ];
+    meta = {
+      description = "Extract the structure of a quoted mail message";
+      license = "perl";
+    };
+  };
+
   TextRecordParser = buildPerlPackage rec {
     name = "Text-RecordParser-1.6.5";
     src = fetchurl {
@@ -12003,6 +12530,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  TextvFileasData = buildPerlPackage {
+    name = "Text-vFile-asData-0.08";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/R/RC/RCLAMP/Text-vFile-asData-0.08.tar.gz;
+      sha256 = "b291ab5e0f987c5172560a692234711a75e4596d83475f72d01278369532f82a";
+    };
+    propagatedBuildInputs = [ ClassAccessorChained ];
+    meta = {
+      description = "Parse vFile formatted files into data structures";
+      license = "perl";
+    };
+  };
+
   TextWikiFormat = buildPerlPackage {
     name = "Text-WikiFormat-0.81";
     src = fetchurl {
@@ -12016,6 +12556,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  TextWrapper = buildPerlPackage {
+    name = "Text-Wrapper-1.05";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/C/CJ/CJM/Text-Wrapper-1.05.tar.gz;
+      sha256 = "64268e15983a9df47e1d9199a491f394e89f542e54afb33f4b78f3f318e09ab9";
+    };
+    meta = {
+      description = "Word wrap text by breaking long lines";
+      license = "perl";
+    };
+  };
+
   threads = buildPerlPackage rec {
     name = "threads-2.02";
     src = fetchurl {
@@ -12199,6 +12751,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  TimeParseDate = buildPerlPackage {
+    name = "Time-ParseDate-2015.103";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/M/MU/MUIR/modules/Time-ParseDate-2015.103.tar.gz;
+      sha256 = "2c1a06235bf811813caac9eaa9daa71af758667cdf7b082cb59863220fcaeed1";
+    };
+    doCheck = false;
+    meta = {
+      description = "Parse and format time values";
+      license = "unknown";
+    };
+  };
+
   Tk = buildPerlPackage rec {
     name = "Tk-804.032_501";
     src = fetchurl {
@@ -12821,6 +13386,21 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  XMLRSS = buildPerlPackage {
+    name = "XML-RSS-1.57";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/S/SH/SHLOMIF/XML-RSS-1.57.tar.gz;
+      sha256 = "c540a1aa7445bf611635537015590575c90c2b07c19529537677a4bcf3a4e6ae";
+    };
+    buildInputs = [ TestManifest ];
+    propagatedBuildInputs = [ DateTime DateTimeFormatMail DateTimeFormatW3CDTF HTMLParser XMLParser ];
+    meta = {
+      homepage = http://perl-rss.sourceforge.net/;
+      description = "Creates and updates RSS files";
+      license = "perl";
+    };
+  };
+
   XMLSAX = buildPerlPackage {
     name = "XML-SAX-0.96";
     src = fetchurl {

From cdb0db3f31973e86652c0dc8b0f2f4ee32c02e8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 15 Jan 2016 18:01:28 +0100
Subject: [PATCH 779/884] telepathy-qt: fix parallel build by upstream patch

---
 .../libraries/telepathy/qt/default.nix        | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix
index 3b40b7296a78..e404b6ae68ef 100644
--- a/pkgs/development/libraries/telepathy/qt/default.nix
+++ b/pkgs/development/libraries/telepathy/qt/default.nix
@@ -8,12 +8,20 @@ stdenv.mkDerivation rec {
     url = "http://telepathy.freedesktop.org/releases/telepathy-qt/${name}.tar.gz";
     sha256 = "0j7hs055cx5g9chn3b2p0arig70m5g9547qgqvk29kxdyxxxsmqc";
   };
-  patches = [(fetchpatch {
-    name = "gst-1.6.patch";
-    url = "http://cgit.freedesktop.org/telepathy/telepathy-qt/patch"
-      + "/?id=ec4a3d62b68a57254515f01fc5ea3325ffb1dbfb";
-    sha256 = "1rh7n3xyrwpvpa3haqi35qn4mfz4396ha43w4zsqpmcyda9y65v2";
-  })];
+  patches = let
+    mkUrl = hash: "http://cgit.freedesktop.org/telepathy/telepathy-qt/patch/?id=" + hash;
+    in [
+      (fetchpatch {
+        name = "gst-1.6.patch";
+        url = mkUrl "ec4a3d62b68a57254515f01fc5ea3325ffb1dbfb";
+        sha256 = "1rh7n3xyrwpvpa3haqi35qn4mfz4396ha43w4zsqpmcyda9y65v2";
+      })
+      (fetchpatch {
+        name = "parallel-make.patch";
+        url = mkUrl "7389dc990c67d4269f3a79c924c054e87f2e4ac5";
+        sha256 = "0mvdvyy76kpaxacljidf06wd43fr2qripr4mwsakjs3hxb1pkk57";
+      })
+    ];
 
   nativeBuildInputs = [ cmake pkgconfig python ];
   propagatedBuildInputs = [ qtbase dbus_glib telepathy_farstream telepathy_glib pythonDBus ];
@@ -26,7 +34,7 @@ stdenv.mkDerivation rec {
     NIX_CFLAGS_COMPILE+=" `pkg-config --cflags dbus-glib-1`"
   '';
 
-  enableParallelBuilding = false; # missing _gen/future-constants.h
+  enableParallelBuilding = true;
   doCheck = false; # giving up for now
 
   meta = {

From dbfb717f554db773390a52370e97c9443c6e5454 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 15 Jan 2016 18:02:06 +0100
Subject: [PATCH 780/884] telepathy-qt: tiny update 0.9.6 -> 0.9.6.1

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

diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix
index e404b6ae68ef..712493e7c719 100644
--- a/pkgs/development/libraries/telepathy/qt/default.nix
+++ b/pkgs/development/libraries/telepathy/qt/default.nix
@@ -2,11 +2,11 @@
 , telepathy_farstream, telepathy_glib, pythonDBus, fetchpatch }:
 
 stdenv.mkDerivation rec {
-  name = "telepathy-qt-0.9.6";
+  name = "telepathy-qt-0.9.6.1";
 
   src = fetchurl {
     url = "http://telepathy.freedesktop.org/releases/telepathy-qt/${name}.tar.gz";
-    sha256 = "0j7hs055cx5g9chn3b2p0arig70m5g9547qgqvk29kxdyxxxsmqc";
+    sha256 = "1y51c6rxk5qvmab98c8rnmrlyk27hnl248casvbq3cd93sav8vj9";
   };
   patches = let
     mkUrl = hash: "http://cgit.freedesktop.org/telepathy/telepathy-qt/patch/?id=" + hash;
@@ -30,6 +30,8 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = "-DDESIRED_QT_VERSION=${builtins.substring 0 1 qtbase.version}";
 
+  NIX_CFLAGS_COMPILE = [ "-Wno-error=cpp" ]; # remove after the next update
+
   preBuild = ''
     NIX_CFLAGS_COMPILE+=" `pkg-config --cflags dbus-glib-1`"
   '';

From 24a9dcd12f610f7d9309918c00f6ffb58da69dd6 Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@merritt.tech>
Date: Fri, 15 Jan 2016 09:07:06 -0800
Subject: [PATCH 781/884] rebar3: refactor

Move registrySnapshot to the erlang-nix github organization
---
 .../tools/build-managers/rebar3/registrySnapshot.nix            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/rebar3/registrySnapshot.nix b/pkgs/development/tools/build-managers/rebar3/registrySnapshot.nix
index 29d36e3cccc5..378fb382f952 100644
--- a/pkgs/development/tools/build-managers/rebar3/registrySnapshot.nix
+++ b/pkgs/development/tools/build-managers/rebar3/registrySnapshot.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
     version = "0.0.0+build.${rev}";
 
     src = fetchFromGitHub {
-        owner = "gleber";
+        owner = "erlang-nix";
         repo = "hex-pm-registry-snapshots";
         inherit rev;
         sha256 = "1rs3z8psfvy10mzlfvkdzbflgikcnq08r38kfi0f8p5wvi8f8hmh";

From 69c98f75e23393baa419757f903bf690bbebb3dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Fri, 15 Jan 2016 18:18:54 +0100
Subject: [PATCH 782/884] idea: unpin the common builder

---
 pkgs/applications/editors/idea/common.nix  | 71 ++++++++++++++++++
 pkgs/applications/editors/idea/default.nix | 83 +++-------------------
 2 files changed, 81 insertions(+), 73 deletions(-)
 create mode 100644 pkgs/applications/editors/idea/common.nix

diff --git a/pkgs/applications/editors/idea/common.nix b/pkgs/applications/editors/idea/common.nix
new file mode 100644
index 000000000000..96689fa75ad6
--- /dev/null
+++ b/pkgs/applications/editors/idea/common.nix
@@ -0,0 +1,71 @@
+{ stdenv, fetchurl, makeDesktopItem, makeWrapper, patchelf, p7zip
+, coreutils, gnugrep, which, git, python, unzip, androidsdk }:
+
+{ name, product, version, build, src, meta, jdk } @ attrs:
+
+with stdenv.lib;
+
+let loName = toLower product;
+    hiName = toUpper product;
+    execName = concatStringsSep "-" (init (splitString "-" name));
+in
+
+with stdenv; lib.makeOverridable mkDerivation rec {
+  inherit name build src meta;
+  desktopItem = makeDesktopItem {
+    name = execName;
+    exec = execName;
+    comment = lib.replaceChars ["\n"] [" "] meta.longDescription;
+    desktopName = product;
+    genericName = meta.description;
+    categories = "Application;Development;";
+    icon = execName;
+  };
+
+  buildInputs = [ makeWrapper patchelf p7zip unzip ];
+
+  patchPhase = ''
+      get_file_size() {
+        local fname="$1"
+        echo $(ls -l $fname | cut -d ' ' -f5)
+      }
+
+      munge_size_hack() {
+        local fname="$1"
+        local size="$2"
+        strip $fname
+        truncate --size=$size $fname
+      }
+
+      interpreter=$(echo ${stdenv.glibc}/lib/ld-linux*.so.2)
+      if [ "${stdenv.system}" == "x86_64-linux" ]; then
+        target_size=$(get_file_size bin/fsnotifier64)
+        patchelf --set-interpreter "$interpreter" bin/fsnotifier64
+        munge_size_hack bin/fsnotifier64 $target_size
+      else
+        target_size=$(get_file_size bin/fsnotifier)
+        patchelf --set-interpreter "$interpreter" bin/fsnotifier
+        munge_size_hack bin/fsnotifier $target_size
+      fi
+  '';
+
+  installPhase = ''
+    mkdir -p $out/{bin,$name,share/pixmaps,libexec/${name}}
+    cp -a . $out/$name
+    ln -s $out/$name/bin/${loName}.png $out/share/pixmaps/${execName}.png
+    mv bin/fsnotifier* $out/libexec/${name}/.
+
+    jdk=${jdk.home}
+    item=${desktopItem}
+
+    makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${execName}" \
+      --prefix PATH : "$out/libexec/${name}:${jdk}/bin:${coreutils}/bin:${gnugrep}/bin:${which}/bin:${git}/bin" \
+      --set JDK_HOME "$jdk" \
+      --set ${hiName}_JDK "$jdk" \
+      --set ANDROID_JAVA_HOME "$jdk" \
+      --set JAVA_HOME "$jdk"
+
+    ln -s "$item/share/applications" $out/share
+  '';
+
+}
diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index 58e9ab347dfb..c89aaab78ee8 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -1,82 +1,19 @@
-{ stdenv, fetchurl, makeDesktopItem, makeWrapper, patchelf, p7zip, oraclejdk8
-, coreutils, gnugrep, which, git, python, unzip, androidsdk
+{ stdenv, callPackage, fetchurl, makeDesktopItem, makeWrapper, patchelf
+, coreutils, gnugrep, which, git, python, unzip, p7zip
+, androidsdk, jdk, oraclejdk8
 }:
 
 assert stdenv.isLinux;
 
 let
 
-  # After IDEA 15 we can no longer use OpenJDK.
-  # https://youtrack.jetbrains.com/issue/IDEA-147272
-  jdk = oraclejdk8;
-
-  mkIdeaProduct = with stdenv.lib;
-  { name, product, version, build, src, meta }:
-
-  let loName = toLower product;
-      hiName = toUpper product;
-      execName = concatStringsSep "-" (init (splitString "-" name));
-  in
-
-  with stdenv; lib.makeOverridable mkDerivation rec {
-    inherit name build src meta;
-    desktopItem = makeDesktopItem {
-      name = execName;
-      exec = execName;
-      comment = lib.replaceChars ["\n"] [" "] meta.longDescription;
-      desktopName = product;
-      genericName = meta.description;
-      categories = "Application;Development;";
-      icon = execName;
-    };
-
-    buildInputs = [ makeWrapper patchelf p7zip unzip ];
-
-    patchPhase = ''
-        get_file_size() {
-          local fname="$1"
-          echo $(ls -l $fname | cut -d ' ' -f5)
-        }
-
-        munge_size_hack() {
-          local fname="$1"
-          local size="$2"
-          strip $fname
-          truncate --size=$size $fname
-        }
-
-        interpreter=$(echo ${stdenv.glibc}/lib/ld-linux*.so.2)
-        if [ "${stdenv.system}" == "x86_64-linux" ]; then
-          target_size=$(get_file_size bin/fsnotifier64)
-          patchelf --set-interpreter "$interpreter" bin/fsnotifier64
-          munge_size_hack bin/fsnotifier64 $target_size
-        else
-          target_size=$(get_file_size bin/fsnotifier)
-          patchelf --set-interpreter "$interpreter" bin/fsnotifier
-          munge_size_hack bin/fsnotifier $target_size
-        fi
-    '';
-
-    installPhase = ''
-      mkdir -p $out/{bin,$name,share/pixmaps,libexec/${name}}
-      cp -a . $out/$name
-      ln -s $out/$name/bin/${loName}.png $out/share/pixmaps/${execName}.png
-      mv bin/fsnotifier* $out/libexec/${name}/.
-
-      jdk=${jdk.home}
-      item=${desktopItem}
-
-      makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${execName}" \
-        --prefix PATH : "$out/libexec/${name}:${jdk}/bin:${coreutils}/bin:${gnugrep}/bin:${which}/bin:${git}/bin" \
-        --set JDK_HOME "$jdk" \
-        --set ${hiName}_JDK "$jdk" \
-        --set ANDROID_JAVA_HOME "$jdk" \
-        --set JAVA_HOME "$jdk"
-
-      ln -s "$item/share/applications" $out/share
-    '';
-
-  };
+  bnumber = with stdenv.lib; build: last (splitString "-" build);
+  mkIdeaProduct' = callPackage ./common.nix { };
+  mkIdeaProduct = attrs: mkIdeaProduct' ({
+      # After IDEA 15 we can no longer use OpenJDK.
+      # https://youtrack.jetbrains.com/issue/IDEA-147272
+      jdk = if (bnumber attrs.build) < "143" then jdk else oraclejdk8;
+  } // attrs);
 
   buildAndroidStudio = { name, version, build, src, license, description }:
     let drv = (mkIdeaProduct rec {

From d4f9220ed202044c645b97b608d0d0b5088922b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Fri, 15 Jan 2016 18:20:20 +0100
Subject: [PATCH 783/884] idea.idea14-community: init at 14.1.6

---
 pkgs/applications/editors/idea/default.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index c89aaab78ee8..932f31d86509 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -176,6 +176,18 @@ in
     };
   };
 
+  idea14-community = buildIdea rec {
+    name = "idea-community-${version}";
+    version = "14.1.6";
+    build = "IC-141.3056.4";
+    description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
+    license = stdenv.lib.licenses.asl20;
+    src = fetchurl {
+      url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
+      sha256 = "157969b37sbafby1r1gva2xm3a3y0dgj7pisgxmk8k1d5rgncvil";
+    };
+  };
+
   idea-community = buildIdea rec {
     name = "idea-community-${version}";
     version = "15.0.2";

From 340d3088aade8d07a878df68ad519f5f6de56837 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 15 Jan 2016 19:53:49 +0100
Subject: [PATCH 784/884] telepathy-qt: finish the of fix parallel build

Recommended by upstream
https://bugs.freedesktop.org/show_bug.cgi?id=93707#c5
---
 pkgs/development/libraries/telepathy/qt/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix
index 712493e7c719..49745e23fcaf 100644
--- a/pkgs/development/libraries/telepathy/qt/default.nix
+++ b/pkgs/development/libraries/telepathy/qt/default.nix
@@ -17,7 +17,12 @@ stdenv.mkDerivation rec {
         sha256 = "1rh7n3xyrwpvpa3haqi35qn4mfz4396ha43w4zsqpmcyda9y65v2";
       })
       (fetchpatch {
-        name = "parallel-make.patch";
+        name = "parallel-make-1.patch";
+        url = mkUrl "1e1f53e9d91684918c34ec50392f86287e001a1e";
+        sha256 = "1f9nk0bi90armb9zay53c7cz70zcwqqwli7sb9wgw76rmwqhl8qw";
+      })
+      (fetchpatch {
+        name = "parallel-make-2.patch";
         url = mkUrl "7389dc990c67d4269f3a79c924c054e87f2e4ac5";
         sha256 = "0mvdvyy76kpaxacljidf06wd43fr2qripr4mwsakjs3hxb1pkk57";
       })

From 42d4175e4edfc17b75b445bad8d8f8c6822ef36b Mon Sep 17 00:00:00 2001
From: Simon Jagoe <simon@simonjagoe.com>
Date: Fri, 15 Jan 2016 19:32:23 +0200
Subject: [PATCH 785/884] kernel: 4.1.13 -> 4.1.15 (close #12408)

---
 pkgs/os-specific/linux/kernel/linux-4.1.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.1.nix b/pkgs/os-specific/linux/kernel/linux-4.1.nix
index b1878846eb8d..d9efce840fab 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.1.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.1.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.1.13";
+  version = "4.1.15";
   extraMeta.branch = "4.1";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "04xhkqjpb1rfqkq6hxzfma5cr039p1fad2fgims5ns09nvalq6dr";
+    sha256 = "18sr0dl5ax6pcx6nqp9drb4l6a38g07vxihiqpbwb231jv68h8j7";
   };
 
   features.iwlwifi = true;

From 19e5ecfb49a431a1e54cde39817006cf1b828ec9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 12 Jan 2016 15:01:11 +0100
Subject: [PATCH 786/884] hackage-packages.nix: update Haskell package set

This update was generated by hackage2nix v20151217-7-g3384c26 using the following inputs:

  - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/65d4f18f9eb9bc571993cee3d45b863000828912
  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/03c5ce2cbc3e3b9a49135bb8909a486e83879117
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/e72964a5535ea93cb5ce89d4f3bfb39e18b4e1b7
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/23478137ac3c8019f651cc712de54bbcf7c53a3f
---
 .../haskell-modules/configuration-lts-0.0.nix |   12 +
 .../haskell-modules/configuration-lts-0.1.nix |   12 +
 .../haskell-modules/configuration-lts-0.2.nix |   12 +
 .../haskell-modules/configuration-lts-0.3.nix |   12 +
 .../haskell-modules/configuration-lts-0.4.nix |   12 +
 .../haskell-modules/configuration-lts-0.5.nix |   12 +
 .../haskell-modules/configuration-lts-0.6.nix |   12 +
 .../haskell-modules/configuration-lts-0.7.nix |   12 +
 .../haskell-modules/configuration-lts-1.0.nix |   12 +
 .../haskell-modules/configuration-lts-1.1.nix |   12 +
 .../configuration-lts-1.10.nix                |   12 +
 .../configuration-lts-1.11.nix                |   12 +
 .../configuration-lts-1.12.nix                |   12 +
 .../configuration-lts-1.13.nix                |   12 +
 .../configuration-lts-1.14.nix                |   12 +
 .../configuration-lts-1.15.nix                |   12 +
 .../haskell-modules/configuration-lts-1.2.nix |   12 +
 .../haskell-modules/configuration-lts-1.4.nix |   12 +
 .../haskell-modules/configuration-lts-1.5.nix |   12 +
 .../haskell-modules/configuration-lts-1.7.nix |   12 +
 .../haskell-modules/configuration-lts-1.8.nix |   12 +
 .../haskell-modules/configuration-lts-1.9.nix |   12 +
 .../haskell-modules/configuration-lts-2.0.nix |   12 +
 .../haskell-modules/configuration-lts-2.1.nix |   12 +
 .../configuration-lts-2.10.nix                |   12 +
 .../configuration-lts-2.11.nix                |   12 +
 .../configuration-lts-2.12.nix                |   12 +
 .../configuration-lts-2.13.nix                |   12 +
 .../configuration-lts-2.14.nix                |   13 +
 .../configuration-lts-2.15.nix                |   13 +
 .../configuration-lts-2.16.nix                |   13 +
 .../configuration-lts-2.17.nix                |   13 +
 .../configuration-lts-2.18.nix                |   13 +
 .../configuration-lts-2.19.nix                |   13 +
 .../haskell-modules/configuration-lts-2.2.nix |   12 +
 .../configuration-lts-2.20.nix                |   13 +
 .../configuration-lts-2.21.nix                |   13 +
 .../configuration-lts-2.22.nix                |   13 +
 .../haskell-modules/configuration-lts-2.3.nix |   12 +
 .../haskell-modules/configuration-lts-2.4.nix |   12 +
 .../haskell-modules/configuration-lts-2.5.nix |   12 +
 .../haskell-modules/configuration-lts-2.6.nix |   12 +
 .../haskell-modules/configuration-lts-2.7.nix |   12 +
 .../haskell-modules/configuration-lts-2.8.nix |   12 +
 .../haskell-modules/configuration-lts-2.9.nix |   12 +
 .../haskell-modules/configuration-lts-3.0.nix |   15 +
 .../haskell-modules/configuration-lts-3.1.nix |   16 +
 .../configuration-lts-3.10.nix                |   18 +
 .../configuration-lts-3.11.nix                |   18 +
 .../configuration-lts-3.12.nix                |   18 +
 .../configuration-lts-3.13.nix                |   18 +
 .../configuration-lts-3.14.nix                |   18 +
 .../configuration-lts-3.15.nix                |   18 +
 .../configuration-lts-3.16.nix                |   18 +
 .../configuration-lts-3.17.nix                |   18 +
 .../configuration-lts-3.18.nix                |   20 +
 .../configuration-lts-3.19.nix                |   20 +
 .../haskell-modules/configuration-lts-3.2.nix |   17 +
 .../configuration-lts-3.20.nix                |   20 +
 .../configuration-lts-3.21.nix                |   21 +
 .../configuration-lts-3.22.nix                |   21 +
 .../haskell-modules/configuration-lts-3.3.nix |   17 +
 .../haskell-modules/configuration-lts-3.4.nix |   17 +
 .../haskell-modules/configuration-lts-3.5.nix |   17 +
 .../haskell-modules/configuration-lts-3.6.nix |   18 +
 .../haskell-modules/configuration-lts-3.7.nix |   18 +
 .../haskell-modules/configuration-lts-3.8.nix |   18 +
 .../haskell-modules/configuration-lts-3.9.nix |   18 +
 .../haskell-modules/configuration-lts-4.0.nix |   42 +
 .../haskell-modules/configuration-lts-4.1.nix |   43 +
 .../haskell-modules/hackage-packages.nix      | 1796 ++++++++++++++---
 71 files changed, 2566 insertions(+), 281 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
index ec6426e460b5..e0c529234a9c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
@@ -1450,6 +1450,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = doDistribute super."atto-lisp_0_2_2";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_2";
@@ -1688,7 +1689,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = doDistribute super."biophd_0_0_5";
   "biostockholm" = dontDistribute super."biostockholm";
@@ -2751,6 +2754,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3406,6 +3410,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events" = dontDistribute super."ghc-events";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
@@ -4154,6 +4159,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -4203,6 +4209,7 @@ self: super: {
   "hflags" = dontDistribute super."hflags";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = dontDistribute super."hfsevents";
@@ -5464,6 +5471,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "lrucache" = dontDistribute super."lrucache";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
@@ -7298,6 +7307,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_2_1";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
   "shana" = dontDistribute super."shana";
@@ -7570,6 +7580,7 @@ self: super: {
   "splice" = dontDistribute super."splice";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7977,6 +7988,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = dontDistribute super."text-show";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
index aa7063e77cc5..0766842363cb 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
@@ -1450,6 +1450,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = doDistribute super."atto-lisp_0_2_2";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_2";
@@ -1688,7 +1689,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = doDistribute super."biophd_0_0_5";
   "biostockholm" = dontDistribute super."biostockholm";
@@ -2751,6 +2754,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3406,6 +3410,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events" = dontDistribute super."ghc-events";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
@@ -4154,6 +4159,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -4203,6 +4209,7 @@ self: super: {
   "hflags" = dontDistribute super."hflags";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = dontDistribute super."hfsevents";
@@ -5464,6 +5471,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "lrucache" = dontDistribute super."lrucache";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
@@ -7298,6 +7307,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_2_1";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
   "shana" = dontDistribute super."shana";
@@ -7570,6 +7580,7 @@ self: super: {
   "splice" = dontDistribute super."splice";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7977,6 +7988,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = dontDistribute super."text-show";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
index 5c1933f4f10d..96d736894f1e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
@@ -1450,6 +1450,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = doDistribute super."atto-lisp_0_2_2";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_2";
@@ -1688,7 +1689,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = doDistribute super."biophd_0_0_5";
   "biostockholm" = dontDistribute super."biostockholm";
@@ -2751,6 +2754,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3406,6 +3410,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events" = dontDistribute super."ghc-events";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
@@ -4154,6 +4159,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -4203,6 +4209,7 @@ self: super: {
   "hflags" = dontDistribute super."hflags";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = dontDistribute super."hfsevents";
@@ -5464,6 +5471,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "lrucache" = dontDistribute super."lrucache";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
@@ -7298,6 +7307,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_2_1";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
   "shana" = dontDistribute super."shana";
@@ -7570,6 +7580,7 @@ self: super: {
   "splice" = dontDistribute super."splice";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7977,6 +7988,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = dontDistribute super."text-show";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
index 6d8dd5a5f8a3..92a1abc3c4c4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
@@ -1450,6 +1450,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = doDistribute super."atto-lisp_0_2_2";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_2";
@@ -1688,7 +1689,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = doDistribute super."biophd_0_0_5";
   "biostockholm" = dontDistribute super."biostockholm";
@@ -2751,6 +2754,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3406,6 +3410,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events" = dontDistribute super."ghc-events";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
@@ -4154,6 +4159,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -4203,6 +4209,7 @@ self: super: {
   "hflags" = dontDistribute super."hflags";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = dontDistribute super."hfsevents";
@@ -5464,6 +5471,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "lrucache" = dontDistribute super."lrucache";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
@@ -7298,6 +7307,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_2_1";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
   "shana" = dontDistribute super."shana";
@@ -7570,6 +7580,7 @@ self: super: {
   "splice" = dontDistribute super."splice";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7977,6 +7988,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = dontDistribute super."text-show";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
index 7db699bfd0b8..0f20a013d065 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
@@ -1450,6 +1450,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = doDistribute super."atto-lisp_0_2_2";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_2";
@@ -1688,7 +1689,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = doDistribute super."biophd_0_0_5";
   "biostockholm" = dontDistribute super."biostockholm";
@@ -2750,6 +2753,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3405,6 +3409,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events" = dontDistribute super."ghc-events";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
@@ -4151,6 +4156,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -4200,6 +4206,7 @@ self: super: {
   "hflags" = dontDistribute super."hflags";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = dontDistribute super."hfsevents";
@@ -5461,6 +5468,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "lrucache" = dontDistribute super."lrucache";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
@@ -7294,6 +7303,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_2_1";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
   "shana" = dontDistribute super."shana";
@@ -7566,6 +7576,7 @@ self: super: {
   "splice" = dontDistribute super."splice";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7973,6 +7984,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = dontDistribute super."text-show";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
index 0f9edc365292..a304510e1f73 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
@@ -1450,6 +1450,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = doDistribute super."atto-lisp_0_2_2";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_2";
@@ -1688,7 +1689,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = doDistribute super."biophd_0_0_5";
   "biostockholm" = dontDistribute super."biostockholm";
@@ -2750,6 +2753,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3405,6 +3409,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events" = dontDistribute super."ghc-events";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
@@ -4151,6 +4156,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -4200,6 +4206,7 @@ self: super: {
   "hflags" = dontDistribute super."hflags";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = dontDistribute super."hfsevents";
@@ -5461,6 +5468,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "lrucache" = dontDistribute super."lrucache";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
@@ -7294,6 +7303,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_2_1";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
   "shana" = dontDistribute super."shana";
@@ -7566,6 +7576,7 @@ self: super: {
   "splice" = dontDistribute super."splice";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7973,6 +7984,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = dontDistribute super."text-show";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
index 92e938ff7355..f9e3e8315aa6 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
@@ -1448,6 +1448,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = doDistribute super."atto-lisp_0_2_2";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_2";
@@ -1685,7 +1686,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = doDistribute super."biophd_0_0_5";
   "biostockholm" = dontDistribute super."biostockholm";
@@ -2747,6 +2750,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3402,6 +3406,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events" = dontDistribute super."ghc-events";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
@@ -4147,6 +4152,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -4196,6 +4202,7 @@ self: super: {
   "hflags" = dontDistribute super."hflags";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = dontDistribute super."hfsevents";
@@ -5457,6 +5464,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "lrucache" = dontDistribute super."lrucache";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
@@ -7288,6 +7297,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_2_1";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
   "shana" = dontDistribute super."shana";
@@ -7560,6 +7570,7 @@ self: super: {
   "splice" = dontDistribute super."splice";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7967,6 +7978,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = dontDistribute super."text-show";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
index b4f602bb8e50..d5ec95724cbb 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
@@ -1448,6 +1448,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = doDistribute super."atto-lisp_0_2_2";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_2";
@@ -1685,7 +1686,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = doDistribute super."biophd_0_0_5";
   "biostockholm" = dontDistribute super."biostockholm";
@@ -2747,6 +2750,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3402,6 +3406,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events" = dontDistribute super."ghc-events";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
@@ -4147,6 +4152,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -4196,6 +4202,7 @@ self: super: {
   "hflags" = dontDistribute super."hflags";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = dontDistribute super."hfsevents";
@@ -5457,6 +5464,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "lrucache" = dontDistribute super."lrucache";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
@@ -7288,6 +7297,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_2_1";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
   "shana" = dontDistribute super."shana";
@@ -7560,6 +7570,7 @@ self: super: {
   "splice" = dontDistribute super."splice";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7967,6 +7978,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = dontDistribute super."text-show";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
index 7d5fee5db365..12f6bd0801a9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
@@ -1444,6 +1444,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = doDistribute super."atto-lisp_0_2_2";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_2";
@@ -1680,7 +1681,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = doDistribute super."biophd_0_0_5";
   "biostockholm" = dontDistribute super."biostockholm";
@@ -2738,6 +2741,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3392,6 +3396,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events" = dontDistribute super."ghc-events";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
@@ -4137,6 +4142,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -4185,6 +4191,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = dontDistribute super."hfsevents";
@@ -5445,6 +5452,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "lrucache" = dontDistribute super."lrucache";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
@@ -7275,6 +7284,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_2_1";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
   "shana" = dontDistribute super."shana";
@@ -7546,6 +7556,7 @@ self: super: {
   "splice" = dontDistribute super."splice";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7953,6 +7964,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = dontDistribute super."text-show";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
index 764a3ec80978..e3d3824bd86f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
@@ -1444,6 +1444,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = doDistribute super."atto-lisp_0_2_2";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_2";
@@ -1680,7 +1681,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = doDistribute super."biophd_0_0_5";
   "biostockholm" = dontDistribute super."biostockholm";
@@ -2734,6 +2737,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3388,6 +3392,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events" = dontDistribute super."ghc-events";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
@@ -4132,6 +4137,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -4180,6 +4186,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = dontDistribute super."hfsevents";
@@ -5438,6 +5445,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "lrucache" = dontDistribute super."lrucache";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
@@ -7266,6 +7275,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_2_2";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
   "shana" = dontDistribute super."shana";
@@ -7537,6 +7547,7 @@ self: super: {
   "splice" = dontDistribute super."splice";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7941,6 +7952,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = dontDistribute super."text-show";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
index d73babe8172d..c3c7a2c3920c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
@@ -1443,6 +1443,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = doDistribute super."atto-lisp_0_2_2";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_3";
@@ -1679,7 +1680,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = doDistribute super."biophd_0_0_5";
   "biostockholm" = dontDistribute super."biostockholm";
@@ -2730,6 +2733,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3380,6 +3384,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events" = dontDistribute super."ghc-events";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
@@ -4121,6 +4126,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -4169,6 +4175,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = dontDistribute super."hfsevents";
@@ -5420,6 +5427,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "lrucache" = dontDistribute super."lrucache";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
@@ -7243,6 +7252,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_4_1";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
   "shana" = dontDistribute super."shana";
@@ -7513,6 +7523,7 @@ self: super: {
   "splice" = dontDistribute super."splice";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7915,6 +7926,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = dontDistribute super."text-show";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
index 41688f6ab93c..69db1dd89a18 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
@@ -1443,6 +1443,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = doDistribute super."atto-lisp_0_2_2";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_3";
@@ -1679,7 +1680,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = doDistribute super."biophd_0_0_5";
   "biostockholm" = dontDistribute super."biostockholm";
@@ -2730,6 +2733,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3379,6 +3383,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events" = dontDistribute super."ghc-events";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
@@ -4120,6 +4125,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -4168,6 +4174,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = dontDistribute super."hfsevents";
@@ -5416,6 +5423,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "lrucache" = dontDistribute super."lrucache";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
@@ -7239,6 +7248,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_4_1";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
   "shana" = dontDistribute super."shana";
@@ -7509,6 +7519,7 @@ self: super: {
   "splice" = dontDistribute super."splice";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7911,6 +7922,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = dontDistribute super."text-show";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
index a7ba1c33c1f1..49375ee3252d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
@@ -1443,6 +1443,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = doDistribute super."atto-lisp_0_2_2";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_3";
@@ -1679,7 +1680,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = doDistribute super."biophd_0_0_5";
   "biostockholm" = dontDistribute super."biostockholm";
@@ -2730,6 +2733,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3379,6 +3383,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events" = dontDistribute super."ghc-events";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
@@ -4120,6 +4125,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -4167,6 +4173,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = dontDistribute super."hfsevents";
@@ -5415,6 +5422,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "lrucache" = dontDistribute super."lrucache";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
@@ -7238,6 +7247,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_4_1";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
   "shana" = dontDistribute super."shana";
@@ -7507,6 +7517,7 @@ self: super: {
   "splice" = dontDistribute super."splice";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7909,6 +7920,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = dontDistribute super."text-show";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
index 2f1f52358bf9..f58b30b5e57b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
@@ -1443,6 +1443,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = doDistribute super."atto-lisp_0_2_2";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_3";
@@ -1679,7 +1680,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = doDistribute super."biophd_0_0_5";
   "biostockholm" = dontDistribute super."biostockholm";
@@ -2730,6 +2733,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3379,6 +3383,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events" = dontDistribute super."ghc-events";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
@@ -4119,6 +4124,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -4166,6 +4172,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = dontDistribute super."hfsevents";
@@ -5414,6 +5421,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "lrucache" = dontDistribute super."lrucache";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
@@ -7237,6 +7246,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_4_1";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
   "shana" = dontDistribute super."shana";
@@ -7506,6 +7516,7 @@ self: super: {
   "splice" = dontDistribute super."splice";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7907,6 +7918,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = dontDistribute super."text-show";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
index 9bb8c9fa80f9..ad3dbdaf7023 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
@@ -1442,6 +1442,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = doDistribute super."atto-lisp_0_2_2";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_3";
@@ -1677,7 +1678,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = doDistribute super."biophd_0_0_5";
   "biostockholm" = dontDistribute super."biostockholm";
@@ -2727,6 +2730,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3376,6 +3380,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events" = dontDistribute super."ghc-events";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
@@ -4115,6 +4120,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -4162,6 +4168,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = dontDistribute super."hfsevents";
@@ -5409,6 +5416,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "lrucache" = dontDistribute super."lrucache";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
@@ -7229,6 +7238,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_4_1";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
   "shana" = dontDistribute super."shana";
@@ -7498,6 +7508,7 @@ self: super: {
   "splice" = dontDistribute super."splice";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7899,6 +7910,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = dontDistribute super."text-show";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
index b31b68d5242d..e86767c54716 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
@@ -1441,6 +1441,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = doDistribute super."atto-lisp_0_2_2";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_5";
@@ -1676,7 +1677,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = doDistribute super."biophd_0_0_5";
   "biostockholm" = dontDistribute super."biostockholm";
@@ -2723,6 +2726,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3371,6 +3375,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events" = dontDistribute super."ghc-events";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
@@ -4110,6 +4115,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -4157,6 +4163,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = dontDistribute super."hfsevents";
@@ -5404,6 +5411,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "lrucache" = dontDistribute super."lrucache";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
@@ -7220,6 +7229,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_4_1";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
   "shana" = dontDistribute super."shana";
@@ -7489,6 +7499,7 @@ self: super: {
   "splice" = dontDistribute super."splice";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7888,6 +7899,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = dontDistribute super."text-show";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
index 607eb1008846..bc4e352663f0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
@@ -1444,6 +1444,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = doDistribute super."atto-lisp_0_2_2";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_2";
@@ -1680,7 +1681,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = doDistribute super."biophd_0_0_5";
   "biostockholm" = dontDistribute super."biostockholm";
@@ -2732,6 +2735,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3386,6 +3390,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events" = dontDistribute super."ghc-events";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
@@ -4129,6 +4134,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -4177,6 +4183,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = dontDistribute super."hfsevents";
@@ -5435,6 +5442,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "lrucache" = dontDistribute super."lrucache";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
@@ -7260,6 +7269,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_3";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
   "shana" = dontDistribute super."shana";
@@ -7531,6 +7541,7 @@ self: super: {
   "splice" = dontDistribute super."splice";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7935,6 +7946,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = dontDistribute super."text-show";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
index 9ba134d352b4..bc5b41c0c412 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
@@ -1443,6 +1443,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = doDistribute super."atto-lisp_0_2_2";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_2";
@@ -1679,7 +1680,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = doDistribute super."biophd_0_0_5";
   "biostockholm" = dontDistribute super."biostockholm";
@@ -2731,6 +2734,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3384,6 +3388,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events" = dontDistribute super."ghc-events";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
@@ -4126,6 +4131,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -4174,6 +4180,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = dontDistribute super."hfsevents";
@@ -5432,6 +5439,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "lrucache" = dontDistribute super."lrucache";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
@@ -7256,6 +7265,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_4";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
   "shana" = dontDistribute super."shana";
@@ -7527,6 +7537,7 @@ self: super: {
   "splice" = dontDistribute super."splice";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7930,6 +7941,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = dontDistribute super."text-show";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
index 5778c35978e5..928a6bd4bf23 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
@@ -1443,6 +1443,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = doDistribute super."atto-lisp_0_2_2";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_2";
@@ -1679,7 +1680,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = doDistribute super."biophd_0_0_5";
   "biostockholm" = dontDistribute super."biostockholm";
@@ -2730,6 +2733,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3383,6 +3387,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events" = dontDistribute super."ghc-events";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
@@ -4125,6 +4130,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -4173,6 +4179,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = dontDistribute super."hfsevents";
@@ -5431,6 +5438,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "lrucache" = dontDistribute super."lrucache";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
@@ -7255,6 +7264,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_4";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
   "shana" = dontDistribute super."shana";
@@ -7526,6 +7536,7 @@ self: super: {
   "splice" = dontDistribute super."splice";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7929,6 +7940,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = dontDistribute super."text-show";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
index c43310b578c0..b936acf49f65 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
@@ -1443,6 +1443,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = doDistribute super."atto-lisp_0_2_2";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_2";
@@ -1679,7 +1680,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = doDistribute super."biophd_0_0_5";
   "biostockholm" = dontDistribute super."biostockholm";
@@ -2730,6 +2733,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3383,6 +3387,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events" = dontDistribute super."ghc-events";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
@@ -4125,6 +4130,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -4173,6 +4179,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = dontDistribute super."hfsevents";
@@ -5425,6 +5432,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "lrucache" = dontDistribute super."lrucache";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
@@ -7249,6 +7258,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_4";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
   "shana" = dontDistribute super."shana";
@@ -7520,6 +7530,7 @@ self: super: {
   "splice" = dontDistribute super."splice";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7923,6 +7934,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = dontDistribute super."text-show";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
index d811365170b6..fc849b8cb044 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
@@ -1443,6 +1443,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = doDistribute super."atto-lisp_0_2_2";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_2";
@@ -1679,7 +1680,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = doDistribute super."biophd_0_0_5";
   "biostockholm" = dontDistribute super."biostockholm";
@@ -2730,6 +2733,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3381,6 +3385,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events" = dontDistribute super."ghc-events";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
@@ -4122,6 +4127,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -4170,6 +4176,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = dontDistribute super."hfsevents";
@@ -5421,6 +5428,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "lrucache" = dontDistribute super."lrucache";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
@@ -7245,6 +7254,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_4";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
   "shana" = dontDistribute super."shana";
@@ -7516,6 +7526,7 @@ self: super: {
   "splice" = dontDistribute super."splice";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7919,6 +7930,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = dontDistribute super."text-show";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
index fdad5275921e..8dbefa96d0f9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
@@ -1443,6 +1443,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = doDistribute super."atto-lisp_0_2_2";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_3";
@@ -1679,7 +1680,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = doDistribute super."biophd_0_0_5";
   "biostockholm" = dontDistribute super."biostockholm";
@@ -2730,6 +2733,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3380,6 +3384,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events" = dontDistribute super."ghc-events";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
@@ -4121,6 +4126,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -4169,6 +4175,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = dontDistribute super."hfsevents";
@@ -5420,6 +5427,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "lrucache" = dontDistribute super."lrucache";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
@@ -7244,6 +7253,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_4";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
   "shana" = dontDistribute super."shana";
@@ -7515,6 +7525,7 @@ self: super: {
   "splice" = dontDistribute super."splice";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7918,6 +7929,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = dontDistribute super."text-show";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
index 0cfc9b9c9118..0c485b48bcc3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
@@ -1431,6 +1431,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = doDistribute super."atto-lisp_0_2_2";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_5";
@@ -1666,7 +1667,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = doDistribute super."biophd_0_0_5";
   "biostockholm" = dontDistribute super."biostockholm";
@@ -2707,6 +2710,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3351,6 +3355,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events" = dontDistribute super."ghc-events";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
@@ -4086,6 +4091,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -4132,6 +4138,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = dontDistribute super."hfsevents";
@@ -5363,6 +5370,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
   "lss" = dontDistribute super."lss";
@@ -7162,6 +7171,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_4_1";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
@@ -7428,6 +7438,7 @@ self: super: {
   "splice" = dontDistribute super."splice";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7824,6 +7835,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = dontDistribute super."text-show";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
index 155388b3edf7..99cf6f9c3d1a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
@@ -1431,6 +1431,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = doDistribute super."atto-lisp_0_2_2";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_5";
@@ -1666,7 +1667,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = doDistribute super."biophd_0_0_5";
   "biostockholm" = dontDistribute super."biostockholm";
@@ -2706,6 +2709,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3350,6 +3354,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events" = dontDistribute super."ghc-events";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
@@ -4084,6 +4089,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -4130,6 +4136,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = dontDistribute super."hfsevents";
@@ -5361,6 +5368,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
   "lss" = dontDistribute super."lss";
@@ -7160,6 +7169,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_4_1";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
@@ -7426,6 +7436,7 @@ self: super: {
   "splice" = dontDistribute super."splice";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7822,6 +7833,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = dontDistribute super."text-show";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
index c6cf2eb343e5..b886e5a5bdcc 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
@@ -1426,6 +1426,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = doDistribute super."atto-lisp_0_2_2";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_6";
@@ -1657,7 +1658,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = doDistribute super."biophd_0_0_7";
   "biostockholm" = dontDistribute super."biostockholm";
@@ -2691,6 +2694,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3331,6 +3335,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events" = dontDistribute super."ghc-events";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
@@ -4062,6 +4067,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -4108,6 +4114,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = dontDistribute super."hfsevents";
@@ -5329,6 +5336,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
   "lss" = dontDistribute super."lss";
@@ -7116,6 +7125,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_5";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
@@ -7381,6 +7391,7 @@ self: super: {
   "splice" = dontDistribute super."splice";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7769,6 +7780,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = dontDistribute super."text-show";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
index 2d94ce3e02fd..bec0100369f6 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
@@ -1425,6 +1425,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = doDistribute super."atto-lisp_0_2_2";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_6";
@@ -1656,7 +1657,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = doDistribute super."biophd_0_0_7";
   "biostockholm" = dontDistribute super."biostockholm";
@@ -2690,6 +2693,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3330,6 +3334,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events" = dontDistribute super."ghc-events";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
@@ -4059,6 +4064,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -4105,6 +4111,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = dontDistribute super."hfsevents";
@@ -5325,6 +5332,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
   "lss" = dontDistribute super."lss";
@@ -7109,6 +7118,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_5";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
@@ -7374,6 +7384,7 @@ self: super: {
   "splice" = dontDistribute super."splice";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7760,6 +7771,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = dontDistribute super."text-show";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
index 181dc4386197..06724e130f98 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
@@ -1425,6 +1425,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = doDistribute super."atto-lisp_0_2_2";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_6";
@@ -1656,7 +1657,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = doDistribute super."biophd_0_0_7";
   "biostockholm" = dontDistribute super."biostockholm";
@@ -2690,6 +2693,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3330,6 +3334,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events" = dontDistribute super."ghc-events";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
@@ -4059,6 +4064,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -4105,6 +4111,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = dontDistribute super."hfsevents";
@@ -5325,6 +5332,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
   "lss" = dontDistribute super."lss";
@@ -7108,6 +7117,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_5";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
@@ -7373,6 +7383,7 @@ self: super: {
   "splice" = dontDistribute super."splice";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7759,6 +7770,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = dontDistribute super."text-show";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
index 23e09e2751ce..e8434e502b87 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
@@ -1425,6 +1425,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = doDistribute super."atto-lisp_0_2_2";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_6";
@@ -1656,7 +1657,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = doDistribute super."biophd_0_0_7";
   "biostockholm" = dontDistribute super."biostockholm";
@@ -2690,6 +2693,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3330,6 +3334,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events" = dontDistribute super."ghc-events";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
@@ -4058,6 +4063,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -4104,6 +4110,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = dontDistribute super."hfsevents";
@@ -5323,6 +5330,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
   "lss" = dontDistribute super."lss";
@@ -7105,6 +7114,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_5";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
@@ -7370,6 +7380,7 @@ self: super: {
   "splice" = dontDistribute super."splice";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7756,6 +7767,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = dontDistribute super."text-show";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
index e12c4f8b74c3..51efec65a640 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
@@ -1424,6 +1424,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = doDistribute super."atto-lisp_0_2_2";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_6";
@@ -1655,7 +1656,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = doDistribute super."biophd_0_0_7";
   "biostockholm" = dontDistribute super."biostockholm";
@@ -2689,6 +2692,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3328,6 +3332,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events" = dontDistribute super."ghc-events";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
@@ -4056,6 +4061,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -4102,6 +4108,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = dontDistribute super."hfsevents";
@@ -5320,6 +5327,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
   "lss" = dontDistribute super."lss";
@@ -7101,6 +7110,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_5";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
@@ -7365,6 +7375,7 @@ self: super: {
   "splice" = dontDistribute super."splice";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7751,6 +7762,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = dontDistribute super."text-show";
@@ -8312,6 +8324,7 @@ self: super: {
   "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
   "wai-lens" = dontDistribute super."wai-lens";
   "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger" = doDistribute super."wai-logger_2_2_4_1";
   "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
   "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
   "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
index b19efb0c948b..273068268c91 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
@@ -1424,6 +1424,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = doDistribute super."atto-lisp_0_2_2";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_6";
@@ -1655,7 +1656,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = doDistribute super."biophd_0_0_7";
   "biostockholm" = dontDistribute super."biostockholm";
@@ -2689,6 +2692,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3327,6 +3331,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events" = dontDistribute super."ghc-events";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
@@ -4055,6 +4060,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -4101,6 +4107,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = dontDistribute super."hfsevents";
@@ -5319,6 +5326,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
   "lss" = dontDistribute super."lss";
@@ -7097,6 +7106,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_5";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
@@ -7361,6 +7371,7 @@ self: super: {
   "splice" = dontDistribute super."splice";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7746,6 +7757,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = dontDistribute super."text-show";
@@ -8307,6 +8319,7 @@ self: super: {
   "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
   "wai-lens" = dontDistribute super."wai-lens";
   "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger" = doDistribute super."wai-logger_2_2_4_1";
   "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
   "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
   "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
index b92094bd7a40..10bea068c9bd 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
@@ -1423,6 +1423,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = doDistribute super."atto-lisp_0_2_2";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_6";
@@ -1654,7 +1655,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = doDistribute super."biophd_0_0_7";
   "biostockholm" = dontDistribute super."biostockholm";
@@ -2685,6 +2688,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3322,6 +3326,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events" = dontDistribute super."ghc-events";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
@@ -4049,6 +4054,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -4095,6 +4101,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = dontDistribute super."hfsevents";
@@ -5312,6 +5319,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
   "lss" = dontDistribute super."lss";
@@ -7090,6 +7099,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_5";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
@@ -7354,6 +7364,7 @@ self: super: {
   "splice" = dontDistribute super."splice";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7739,6 +7750,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = dontDistribute super."text-show";
@@ -8300,6 +8312,7 @@ self: super: {
   "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
   "wai-lens" = dontDistribute super."wai-lens";
   "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger" = doDistribute super."wai-logger_2_2_4_1";
   "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
   "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
   "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
index 5cc4dee0ed2f..3115030fde51 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
@@ -1422,6 +1422,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = doDistribute super."atto-lisp_0_2_2";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_6";
@@ -1653,7 +1654,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = doDistribute super."biophd_0_0_7";
   "biostockholm" = dontDistribute super."biostockholm";
@@ -2683,6 +2686,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3317,6 +3321,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events" = dontDistribute super."ghc-events";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
@@ -4044,6 +4049,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -4090,6 +4096,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = dontDistribute super."hfsevents";
@@ -5307,6 +5314,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
   "lss" = dontDistribute super."lss";
@@ -7084,6 +7093,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_5";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
@@ -7348,6 +7358,7 @@ self: super: {
   "splice" = dontDistribute super."splice";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7733,6 +7744,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = dontDistribute super."text-show";
@@ -8294,6 +8306,7 @@ self: super: {
   "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
   "wai-lens" = dontDistribute super."wai-lens";
   "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger" = doDistribute super."wai-logger_2_2_4_1";
   "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
   "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
   "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
index bfe463d6ea93..cc9943bb3f99 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
@@ -1422,6 +1422,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = doDistribute super."atto-lisp_0_2_2";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_6";
@@ -1653,7 +1654,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = doDistribute super."biophd_0_0_7";
   "biostockholm" = dontDistribute super."biostockholm";
@@ -2682,6 +2685,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3315,6 +3319,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events" = dontDistribute super."ghc-events";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
@@ -4041,6 +4046,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -4087,6 +4093,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = dontDistribute super."hfsevents";
@@ -5304,6 +5311,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
   "lss" = dontDistribute super."lss";
@@ -7079,6 +7088,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_5";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
@@ -7343,6 +7353,7 @@ self: super: {
   "splice" = dontDistribute super."splice";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7727,6 +7738,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = dontDistribute super."text-show";
@@ -8288,6 +8300,7 @@ self: super: {
   "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
   "wai-lens" = dontDistribute super."wai-lens";
   "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger" = doDistribute super."wai-logger_2_2_4_1";
   "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
   "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
   "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
index 186cf5894879..c7a77a57ceaf 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
@@ -1422,6 +1422,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = doDistribute super."atto-lisp_0_2_2";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_6";
@@ -1653,7 +1654,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = doDistribute super."biophd_0_0_7";
   "biostockholm" = dontDistribute super."biostockholm";
@@ -2682,6 +2685,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3314,6 +3318,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events" = dontDistribute super."ghc-events";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
@@ -4040,6 +4045,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -4086,6 +4092,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = dontDistribute super."hfsevents";
@@ -5303,6 +5310,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
   "lss" = dontDistribute super."lss";
@@ -7076,6 +7085,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_5";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
@@ -7338,6 +7348,7 @@ self: super: {
   "splice" = dontDistribute super."splice";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7722,6 +7733,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = dontDistribute super."text-show";
@@ -8283,6 +8295,7 @@ self: super: {
   "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
   "wai-lens" = dontDistribute super."wai-lens";
   "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger" = doDistribute super."wai-logger_2_2_4_1";
   "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
   "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
   "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
index 43c807311a64..075eaee32182 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
@@ -1430,6 +1430,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = doDistribute super."atto-lisp_0_2_2";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_6";
@@ -1665,7 +1666,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = doDistribute super."biophd_0_0_5";
   "biostockholm" = dontDistribute super."biostockholm";
@@ -2703,6 +2706,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3347,6 +3351,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events" = dontDistribute super."ghc-events";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
@@ -4081,6 +4086,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -4127,6 +4133,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = dontDistribute super."hfsevents";
@@ -5358,6 +5365,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
   "lss" = dontDistribute super."lss";
@@ -7157,6 +7166,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_4_1";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
@@ -7423,6 +7433,7 @@ self: super: {
   "splice" = dontDistribute super."splice";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7819,6 +7830,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = dontDistribute super."text-show";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
index 94540f44ac70..04d474f77cb6 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
@@ -1422,6 +1422,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = doDistribute super."atto-lisp_0_2_2";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_6";
@@ -1653,7 +1654,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = doDistribute super."biophd_0_0_7";
   "biostockholm" = dontDistribute super."biostockholm";
@@ -2681,6 +2684,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3313,6 +3317,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events" = dontDistribute super."ghc-events";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
@@ -4038,6 +4043,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -4084,6 +4090,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = dontDistribute super."hfsevents";
@@ -5301,6 +5308,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
   "lss" = dontDistribute super."lss";
@@ -7073,6 +7082,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_5";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
@@ -7334,6 +7344,7 @@ self: super: {
   "splice" = dontDistribute super."splice";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7718,6 +7729,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = dontDistribute super."text-show";
@@ -8279,6 +8291,7 @@ self: super: {
   "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
   "wai-lens" = dontDistribute super."wai-lens";
   "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger" = doDistribute super."wai-logger_2_2_4_1";
   "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
   "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
   "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
index c6436d1d728a..2764390cc6b5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
@@ -1422,6 +1422,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = doDistribute super."atto-lisp_0_2_2";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_6";
@@ -1653,7 +1654,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = doDistribute super."biophd_0_0_7";
   "biostockholm" = dontDistribute super."biostockholm";
@@ -2681,6 +2684,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3313,6 +3317,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events" = dontDistribute super."ghc-events";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
@@ -4038,6 +4043,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -4084,6 +4090,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = dontDistribute super."hfsevents";
@@ -5300,6 +5307,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
   "lss" = dontDistribute super."lss";
@@ -7071,6 +7080,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_5";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
@@ -7332,6 +7342,7 @@ self: super: {
   "splice" = dontDistribute super."splice";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7716,6 +7727,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = dontDistribute super."text-show";
@@ -8275,6 +8287,7 @@ self: super: {
   "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
   "wai-lens" = dontDistribute super."wai-lens";
   "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger" = doDistribute super."wai-logger_2_2_4_1";
   "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
   "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
   "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
index c35bcbb2cda6..152b518c8cd9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
@@ -1422,6 +1422,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = doDistribute super."atto-lisp_0_2_2";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_6";
@@ -1653,7 +1654,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = doDistribute super."biophd_0_0_7";
   "biostockholm" = dontDistribute super."biostockholm";
@@ -2681,6 +2684,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3313,6 +3317,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events" = dontDistribute super."ghc-events";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
@@ -4038,6 +4043,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -4084,6 +4090,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = dontDistribute super."hfsevents";
@@ -5299,6 +5306,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
   "lss" = dontDistribute super."lss";
@@ -7069,6 +7078,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_5";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
@@ -7330,6 +7340,7 @@ self: super: {
   "splice" = dontDistribute super."splice";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7714,6 +7725,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = dontDistribute super."text-show";
@@ -8273,6 +8285,7 @@ self: super: {
   "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
   "wai-lens" = dontDistribute super."wai-lens";
   "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger" = doDistribute super."wai-logger_2_2_4_1";
   "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
   "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
   "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
index 8e459791eaff..9a801ff3b7d8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
@@ -1430,6 +1430,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = doDistribute super."atto-lisp_0_2_2";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_6";
@@ -1665,7 +1666,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = doDistribute super."biophd_0_0_5";
   "biostockholm" = dontDistribute super."biostockholm";
@@ -2703,6 +2706,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3346,6 +3350,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events" = dontDistribute super."ghc-events";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
@@ -4080,6 +4085,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -4126,6 +4132,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = dontDistribute super."hfsevents";
@@ -5356,6 +5363,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
   "lss" = dontDistribute super."lss";
@@ -7155,6 +7164,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_4_1";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
@@ -7421,6 +7431,7 @@ self: super: {
   "splice" = dontDistribute super."splice";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7817,6 +7828,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = dontDistribute super."text-show";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
index f071eff3e71d..df9d245b5df3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
@@ -1430,6 +1430,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = doDistribute super."atto-lisp_0_2_2";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_6";
@@ -1664,7 +1665,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = doDistribute super."biophd_0_0_5";
   "biostockholm" = dontDistribute super."biostockholm";
@@ -2702,6 +2705,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3345,6 +3349,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events" = dontDistribute super."ghc-events";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
@@ -4079,6 +4084,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -4125,6 +4131,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = dontDistribute super."hfsevents";
@@ -5355,6 +5362,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
   "lss" = dontDistribute super."lss";
@@ -7150,6 +7159,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_4_1";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
@@ -7416,6 +7426,7 @@ self: super: {
   "splice" = dontDistribute super."splice";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7812,6 +7823,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = dontDistribute super."text-show";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
index fc079f4ab454..6c3c7d9c6e5b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
@@ -1430,6 +1430,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = doDistribute super."atto-lisp_0_2_2";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_6";
@@ -1664,7 +1665,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = doDistribute super."biophd_0_0_5";
   "biostockholm" = dontDistribute super."biostockholm";
@@ -2701,6 +2704,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3344,6 +3348,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events" = dontDistribute super."ghc-events";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
@@ -4078,6 +4083,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -4124,6 +4130,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = dontDistribute super."hfsevents";
@@ -5353,6 +5360,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
   "lss" = dontDistribute super."lss";
@@ -7148,6 +7157,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_4_1";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
@@ -7414,6 +7424,7 @@ self: super: {
   "splice" = dontDistribute super."splice";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7809,6 +7820,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = dontDistribute super."text-show";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
index 33d8eac9aa6d..02f08c304f95 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
@@ -1428,6 +1428,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = doDistribute super."atto-lisp_0_2_2";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_6";
@@ -1661,7 +1662,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = doDistribute super."biophd_0_0_5";
   "biostockholm" = dontDistribute super."biostockholm";
@@ -2698,6 +2701,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3341,6 +3345,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events" = dontDistribute super."ghc-events";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
@@ -4073,6 +4078,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -4119,6 +4125,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = dontDistribute super."hfsevents";
@@ -5348,6 +5355,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
   "lss" = dontDistribute super."lss";
@@ -7142,6 +7151,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_4_1";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
@@ -7408,6 +7418,7 @@ self: super: {
   "splice" = dontDistribute super."splice";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7803,6 +7814,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = dontDistribute super."text-show";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
index 5e81a8330834..518bddd264d8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
@@ -1427,6 +1427,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = doDistribute super."atto-lisp_0_2_2";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_6";
@@ -1660,7 +1661,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = doDistribute super."biophd_0_0_5";
   "biostockholm" = dontDistribute super."biostockholm";
@@ -2697,6 +2700,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3340,6 +3344,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events" = dontDistribute super."ghc-events";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
@@ -4072,6 +4077,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -4118,6 +4124,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = dontDistribute super."hfsevents";
@@ -5347,6 +5354,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
   "lss" = dontDistribute super."lss";
@@ -7141,6 +7150,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_4_1";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
@@ -7407,6 +7417,7 @@ self: super: {
   "splice" = dontDistribute super."splice";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7802,6 +7813,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = dontDistribute super."text-show";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
index 9a19550bb8c0..c852d3d09b1b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
@@ -1426,6 +1426,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = doDistribute super."atto-lisp_0_2_2";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_6";
@@ -1659,7 +1660,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = doDistribute super."biophd_0_0_5";
   "biostockholm" = dontDistribute super."biostockholm";
@@ -2696,6 +2699,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3338,6 +3342,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events" = dontDistribute super."ghc-events";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
@@ -4070,6 +4075,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -4116,6 +4122,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = dontDistribute super."hfsevents";
@@ -5344,6 +5351,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
   "lss" = dontDistribute super."lss";
@@ -7137,6 +7146,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_4_1";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
@@ -7402,6 +7412,7 @@ self: super: {
   "splice" = dontDistribute super."splice";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7795,6 +7806,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = dontDistribute super."text-show";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
index 6431dc6acc87..917a6cdc320a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
@@ -1426,6 +1426,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = doDistribute super."atto-lisp_0_2_2";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_6";
@@ -1657,7 +1658,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = doDistribute super."biophd_0_0_7";
   "biostockholm" = dontDistribute super."biostockholm";
@@ -2693,6 +2696,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3333,6 +3337,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events" = dontDistribute super."ghc-events";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
@@ -4064,6 +4069,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -4110,6 +4116,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = dontDistribute super."hfsevents";
@@ -5335,6 +5342,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
   "lss" = dontDistribute super."lss";
@@ -7126,6 +7135,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_5";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
@@ -7391,6 +7401,7 @@ self: super: {
   "splice" = dontDistribute super."splice";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7780,6 +7791,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = dontDistribute super."text-show";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
index 27466c8216cd..0c489242cda8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
@@ -1382,6 +1382,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = dontDistribute super."atto-lisp";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_6";
@@ -1604,7 +1605,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = dontDistribute super."biophd";
   "biosff" = dontDistribute super."biosff";
@@ -2596,6 +2599,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3209,6 +3213,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
   "ghc-events-parallel" = dontDistribute super."ghc-events-parallel";
@@ -3301,6 +3306,7 @@ self: super: {
   "gitlib-s3" = dontDistribute super."gitlib-s3";
   "gitlib-sample" = dontDistribute super."gitlib-sample";
   "gitlib-utils" = dontDistribute super."gitlib-utils";
+  "gitrev" = doDistribute super."gitrev_1_1_0";
   "gitter" = dontDistribute super."gitter";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
@@ -3922,6 +3928,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -3966,6 +3973,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = doDistribute super."hfsevents_0_1_5";
@@ -5136,6 +5144,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
   "lss" = dontDistribute super."lss";
@@ -5480,6 +5490,7 @@ self: super: {
   "multirec" = dontDistribute super."multirec";
   "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver";
   "multirec-binary" = dontDistribute super."multirec-binary";
+  "multiset" = doDistribute super."multiset_0_3_0";
   "multiset-comb" = dontDistribute super."multiset-comb";
   "multisetrewrite" = dontDistribute super."multisetrewrite";
   "multistate" = dontDistribute super."multistate";
@@ -6857,6 +6868,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_5";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
@@ -7118,6 +7130,7 @@ self: super: {
   "splaytree" = dontDistribute super."splaytree";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7490,6 +7503,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = doDistribute super."text-show_2";
@@ -8028,6 +8042,7 @@ self: super: {
   "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
   "wai-lens" = dontDistribute super."wai-lens";
   "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger" = doDistribute super."wai-logger_2_2_4_1";
   "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
   "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
   "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
index 98fb2c84b6ec..e73fd43dbc15 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
@@ -1381,6 +1381,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = dontDistribute super."atto-lisp";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_6";
@@ -1603,7 +1604,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = dontDistribute super."biophd";
   "biosff" = dontDistribute super."biosff";
@@ -2595,6 +2598,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3205,6 +3209,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
   "ghc-events-parallel" = dontDistribute super."ghc-events-parallel";
@@ -3297,6 +3302,7 @@ self: super: {
   "gitlib-s3" = dontDistribute super."gitlib-s3";
   "gitlib-sample" = dontDistribute super."gitlib-sample";
   "gitlib-utils" = dontDistribute super."gitlib-utils";
+  "gitrev" = doDistribute super."gitrev_1_1_0";
   "gitter" = dontDistribute super."gitter";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
@@ -3891,6 +3897,7 @@ self: super: {
   "hdbi-postgresql" = dontDistribute super."hdbi-postgresql";
   "hdbi-sqlite" = dontDistribute super."hdbi-sqlite";
   "hdbi-tests" = dontDistribute super."hdbi-tests";
+  "hdevtools" = doDistribute super."hdevtools_0_1_2_1";
   "hdf" = dontDistribute super."hdf";
   "hdigest" = dontDistribute super."hdigest";
   "hdirect" = dontDistribute super."hdirect";
@@ -3917,6 +3924,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -3961,6 +3969,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = doDistribute super."hfsevents_0_1_5";
@@ -5131,6 +5140,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
   "lss" = dontDistribute super."lss";
@@ -5474,6 +5485,7 @@ self: super: {
   "multirec" = dontDistribute super."multirec";
   "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver";
   "multirec-binary" = dontDistribute super."multirec-binary";
+  "multiset" = doDistribute super."multiset_0_3_0";
   "multiset-comb" = dontDistribute super."multiset-comb";
   "multisetrewrite" = dontDistribute super."multisetrewrite";
   "multistate" = dontDistribute super."multistate";
@@ -6848,6 +6860,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_5";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
@@ -7109,6 +7122,7 @@ self: super: {
   "splaytree" = dontDistribute super."splaytree";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7481,6 +7495,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = doDistribute super."text-show_2";
@@ -8018,6 +8033,7 @@ self: super: {
   "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
   "wai-lens" = dontDistribute super."wai-lens";
   "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger" = doDistribute super."wai-logger_2_2_4_1";
   "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
   "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
   "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
index 2e8107faf592..f87c0808088d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
@@ -1366,6 +1366,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = dontDistribute super."atto-lisp";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_6";
@@ -1587,7 +1588,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = dontDistribute super."biophd";
   "biosff" = dontDistribute super."biosff";
@@ -1844,6 +1847,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
   "cci" = dontDistribute super."cci";
@@ -2558,6 +2562,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3158,6 +3163,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
   "ghc-events-parallel" = dontDistribute super."ghc-events-parallel";
@@ -3247,6 +3253,7 @@ self: super: {
   "gitlib-s3" = dontDistribute super."gitlib-s3";
   "gitlib-sample" = dontDistribute super."gitlib-sample";
   "gitlib-utils" = dontDistribute super."gitlib-utils";
+  "gitrev" = doDistribute super."gitrev_1_1_0";
   "gitter" = dontDistribute super."gitter";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
@@ -3837,6 +3844,7 @@ self: super: {
   "hdbi-postgresql" = dontDistribute super."hdbi-postgresql";
   "hdbi-sqlite" = dontDistribute super."hdbi-sqlite";
   "hdbi-tests" = dontDistribute super."hdbi-tests";
+  "hdevtools" = doDistribute super."hdevtools_0_1_2_1";
   "hdf" = dontDistribute super."hdf";
   "hdigest" = dontDistribute super."hdigest";
   "hdirect" = dontDistribute super."hdirect";
@@ -3863,6 +3871,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -3907,6 +3916,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = doDistribute super."hfsevents_0_1_5";
@@ -5064,6 +5074,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
   "lss" = dontDistribute super."lss";
@@ -5401,6 +5413,7 @@ self: super: {
   "multirec" = dontDistribute super."multirec";
   "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver";
   "multirec-binary" = dontDistribute super."multirec-binary";
+  "multiset" = doDistribute super."multiset_0_3_0";
   "multiset-comb" = dontDistribute super."multiset-comb";
   "multisetrewrite" = dontDistribute super."multisetrewrite";
   "multistate" = dontDistribute super."multistate";
@@ -6459,6 +6472,7 @@ self: super: {
   "restyle" = dontDistribute super."restyle";
   "resumable-exceptions" = dontDistribute super."resumable-exceptions";
   "rethinkdb" = dontDistribute super."rethinkdb";
+  "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_20";
   "rethinkdb-model" = dontDistribute super."rethinkdb-model";
   "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
   "retry" = doDistribute super."retry_0_6";
@@ -6751,6 +6765,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_6";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
@@ -7006,6 +7021,7 @@ self: super: {
   "splaytree" = dontDistribute super."splaytree";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7371,6 +7387,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = doDistribute super."text-show_2";
@@ -7902,6 +7919,7 @@ self: super: {
   "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
   "wai-lens" = dontDistribute super."wai-lens";
   "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger" = doDistribute super."wai-logger_2_2_4_1";
   "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
   "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
   "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
index 6e26abff3382..b3aa1cf0e460 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
@@ -1366,6 +1366,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = dontDistribute super."atto-lisp";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_6";
@@ -1586,7 +1587,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = dontDistribute super."biophd";
   "biosff" = dontDistribute super."biosff";
@@ -1842,6 +1845,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
   "cci" = dontDistribute super."cci";
@@ -2556,6 +2560,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3155,6 +3160,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
   "ghc-events-parallel" = dontDistribute super."ghc-events-parallel";
@@ -3243,6 +3249,7 @@ self: super: {
   "gitlib-s3" = dontDistribute super."gitlib-s3";
   "gitlib-sample" = dontDistribute super."gitlib-sample";
   "gitlib-utils" = dontDistribute super."gitlib-utils";
+  "gitrev" = doDistribute super."gitrev_1_1_0";
   "gitter" = dontDistribute super."gitter";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
@@ -3833,6 +3840,7 @@ self: super: {
   "hdbi-postgresql" = dontDistribute super."hdbi-postgresql";
   "hdbi-sqlite" = dontDistribute super."hdbi-sqlite";
   "hdbi-tests" = dontDistribute super."hdbi-tests";
+  "hdevtools" = doDistribute super."hdevtools_0_1_2_1";
   "hdf" = dontDistribute super."hdf";
   "hdigest" = dontDistribute super."hdigest";
   "hdirect" = dontDistribute super."hdirect";
@@ -3859,6 +3867,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -3903,6 +3912,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = doDistribute super."hfsevents_0_1_5";
@@ -5060,6 +5070,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
   "lss" = dontDistribute super."lss";
@@ -5397,6 +5409,7 @@ self: super: {
   "multirec" = dontDistribute super."multirec";
   "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver";
   "multirec-binary" = dontDistribute super."multirec-binary";
+  "multiset" = doDistribute super."multiset_0_3_0";
   "multiset-comb" = dontDistribute super."multiset-comb";
   "multisetrewrite" = dontDistribute super."multisetrewrite";
   "multistate" = dontDistribute super."multistate";
@@ -6454,6 +6467,7 @@ self: super: {
   "restyle" = dontDistribute super."restyle";
   "resumable-exceptions" = dontDistribute super."resumable-exceptions";
   "rethinkdb" = dontDistribute super."rethinkdb";
+  "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_20";
   "rethinkdb-model" = dontDistribute super."rethinkdb-model";
   "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
   "retry" = doDistribute super."retry_0_6";
@@ -6744,6 +6758,7 @@ self: super: {
   "shake-pack" = dontDistribute super."shake-pack";
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
@@ -6999,6 +7014,7 @@ self: super: {
   "splaytree" = dontDistribute super."splaytree";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7364,6 +7380,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = doDistribute super."text-show_2";
@@ -7895,6 +7912,7 @@ self: super: {
   "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
   "wai-lens" = dontDistribute super."wai-lens";
   "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger" = doDistribute super."wai-logger_2_2_4_1";
   "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
   "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
   "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
index 51c4b7dd7294..0c223f02eff9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
@@ -1365,6 +1365,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = dontDistribute super."atto-lisp";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_6";
@@ -1585,7 +1586,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = dontDistribute super."biophd";
   "biosff" = dontDistribute super."biosff";
@@ -1841,6 +1844,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
   "cci" = dontDistribute super."cci";
@@ -2551,6 +2555,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3150,6 +3155,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
   "ghc-events-parallel" = dontDistribute super."ghc-events-parallel";
@@ -3238,6 +3244,7 @@ self: super: {
   "gitlib-s3" = dontDistribute super."gitlib-s3";
   "gitlib-sample" = dontDistribute super."gitlib-sample";
   "gitlib-utils" = dontDistribute super."gitlib-utils";
+  "gitrev" = doDistribute super."gitrev_1_1_0";
   "gitter" = dontDistribute super."gitter";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
@@ -3827,6 +3834,7 @@ self: super: {
   "hdbi-postgresql" = dontDistribute super."hdbi-postgresql";
   "hdbi-sqlite" = dontDistribute super."hdbi-sqlite";
   "hdbi-tests" = dontDistribute super."hdbi-tests";
+  "hdevtools" = doDistribute super."hdevtools_0_1_2_1";
   "hdf" = dontDistribute super."hdf";
   "hdigest" = dontDistribute super."hdigest";
   "hdirect" = dontDistribute super."hdirect";
@@ -3853,6 +3861,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -3897,6 +3906,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = doDistribute super."hfsevents_0_1_5";
@@ -5054,6 +5064,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
   "lss" = dontDistribute super."lss";
@@ -5391,6 +5403,7 @@ self: super: {
   "multirec" = dontDistribute super."multirec";
   "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver";
   "multirec-binary" = dontDistribute super."multirec-binary";
+  "multiset" = doDistribute super."multiset_0_3_0";
   "multiset-comb" = dontDistribute super."multiset-comb";
   "multisetrewrite" = dontDistribute super."multisetrewrite";
   "multistate" = dontDistribute super."multistate";
@@ -6447,6 +6460,7 @@ self: super: {
   "restyle" = dontDistribute super."restyle";
   "resumable-exceptions" = dontDistribute super."resumable-exceptions";
   "rethinkdb" = dontDistribute super."rethinkdb";
+  "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_20";
   "rethinkdb-model" = dontDistribute super."rethinkdb-model";
   "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
   "retry" = doDistribute super."retry_0_6";
@@ -6737,6 +6751,7 @@ self: super: {
   "shake-pack" = dontDistribute super."shake-pack";
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
@@ -6992,6 +7007,7 @@ self: super: {
   "splaytree" = dontDistribute super."splaytree";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7356,6 +7372,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = doDistribute super."text-show_2";
@@ -7886,6 +7903,7 @@ self: super: {
   "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
   "wai-lens" = dontDistribute super."wai-lens";
   "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger" = doDistribute super."wai-logger_2_2_4_1";
   "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
   "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
   "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
index 3b1134e5819a..44da0e3ef9dc 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
@@ -1365,6 +1365,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = dontDistribute super."atto-lisp";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_6";
@@ -1585,7 +1586,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = dontDistribute super."biophd";
   "biosff" = dontDistribute super."biosff";
@@ -1841,6 +1844,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
   "cci" = dontDistribute super."cci";
@@ -2551,6 +2555,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3150,6 +3155,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
   "ghc-events-parallel" = dontDistribute super."ghc-events-parallel";
@@ -3238,6 +3244,7 @@ self: super: {
   "gitlib-s3" = dontDistribute super."gitlib-s3";
   "gitlib-sample" = dontDistribute super."gitlib-sample";
   "gitlib-utils" = dontDistribute super."gitlib-utils";
+  "gitrev" = doDistribute super."gitrev_1_1_0";
   "gitter" = dontDistribute super."gitter";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
@@ -3827,6 +3834,7 @@ self: super: {
   "hdbi-postgresql" = dontDistribute super."hdbi-postgresql";
   "hdbi-sqlite" = dontDistribute super."hdbi-sqlite";
   "hdbi-tests" = dontDistribute super."hdbi-tests";
+  "hdevtools" = doDistribute super."hdevtools_0_1_2_1";
   "hdf" = dontDistribute super."hdf";
   "hdigest" = dontDistribute super."hdigest";
   "hdirect" = dontDistribute super."hdirect";
@@ -3853,6 +3861,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -3897,6 +3906,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfusion" = dontDistribute super."hfusion";
@@ -5052,6 +5062,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
   "lss" = dontDistribute super."lss";
@@ -5389,6 +5401,7 @@ self: super: {
   "multirec" = dontDistribute super."multirec";
   "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver";
   "multirec-binary" = dontDistribute super."multirec-binary";
+  "multiset" = doDistribute super."multiset_0_3_0";
   "multiset-comb" = dontDistribute super."multiset-comb";
   "multisetrewrite" = dontDistribute super."multisetrewrite";
   "multistate" = dontDistribute super."multistate";
@@ -6444,6 +6457,7 @@ self: super: {
   "restyle" = dontDistribute super."restyle";
   "resumable-exceptions" = dontDistribute super."resumable-exceptions";
   "rethinkdb" = dontDistribute super."rethinkdb";
+  "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_20";
   "rethinkdb-model" = dontDistribute super."rethinkdb-model";
   "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
   "retry" = doDistribute super."retry_0_6";
@@ -6734,6 +6748,7 @@ self: super: {
   "shake-pack" = dontDistribute super."shake-pack";
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
@@ -6989,6 +7004,7 @@ self: super: {
   "splaytree" = dontDistribute super."splaytree";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7352,6 +7368,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = doDistribute super."text-show_2";
@@ -7881,6 +7898,7 @@ self: super: {
   "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
   "wai-lens" = dontDistribute super."wai-lens";
   "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger" = doDistribute super."wai-logger_2_2_4_1";
   "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
   "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
   "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.14.nix b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
index 110e037d766e..9cdaa25b1136 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
@@ -1363,6 +1363,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = dontDistribute super."atto-lisp";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_6";
@@ -1583,7 +1584,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = dontDistribute super."biophd";
   "biosff" = dontDistribute super."biosff";
@@ -1838,6 +1841,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
   "cci" = dontDistribute super."cci";
@@ -2544,6 +2548,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3142,6 +3147,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
   "ghc-events-parallel" = dontDistribute super."ghc-events-parallel";
@@ -3230,6 +3236,7 @@ self: super: {
   "gitlib-s3" = dontDistribute super."gitlib-s3";
   "gitlib-sample" = dontDistribute super."gitlib-sample";
   "gitlib-utils" = dontDistribute super."gitlib-utils";
+  "gitrev" = doDistribute super."gitrev_1_1_0";
   "gitter" = dontDistribute super."gitter";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
@@ -3819,6 +3826,7 @@ self: super: {
   "hdbi-postgresql" = dontDistribute super."hdbi-postgresql";
   "hdbi-sqlite" = dontDistribute super."hdbi-sqlite";
   "hdbi-tests" = dontDistribute super."hdbi-tests";
+  "hdevtools" = doDistribute super."hdevtools_0_1_2_1";
   "hdf" = dontDistribute super."hdf";
   "hdigest" = dontDistribute super."hdigest";
   "hdirect" = dontDistribute super."hdirect";
@@ -3845,6 +3853,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -3889,6 +3898,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfusion" = dontDistribute super."hfusion";
@@ -5043,6 +5053,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
   "lss" = dontDistribute super."lss";
@@ -5378,6 +5390,7 @@ self: super: {
   "multirec" = dontDistribute super."multirec";
   "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver";
   "multirec-binary" = dontDistribute super."multirec-binary";
+  "multiset" = doDistribute super."multiset_0_3_0";
   "multiset-comb" = dontDistribute super."multiset-comb";
   "multisetrewrite" = dontDistribute super."multisetrewrite";
   "multistate" = dontDistribute super."multistate";
@@ -6432,6 +6445,7 @@ self: super: {
   "restyle" = dontDistribute super."restyle";
   "resumable-exceptions" = dontDistribute super."resumable-exceptions";
   "rethinkdb" = dontDistribute super."rethinkdb";
+  "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_20";
   "rethinkdb-model" = dontDistribute super."rethinkdb-model";
   "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
   "retry" = doDistribute super."retry_0_6";
@@ -6722,6 +6736,7 @@ self: super: {
   "shake-pack" = dontDistribute super."shake-pack";
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
@@ -6977,6 +6992,7 @@ self: super: {
   "splaytree" = dontDistribute super."splaytree";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7339,6 +7355,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = doDistribute super."text-show_2";
@@ -7868,6 +7885,7 @@ self: super: {
   "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
   "wai-lens" = dontDistribute super."wai-lens";
   "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger" = doDistribute super."wai-logger_2_2_4_1";
   "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
   "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
   "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.15.nix b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
index 8416bbdd226a..39e1b11b94a5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
@@ -1362,6 +1362,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = dontDistribute super."atto-lisp";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_6";
@@ -1582,7 +1583,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = dontDistribute super."biophd";
   "biosff" = dontDistribute super."biosff";
@@ -1837,6 +1840,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
   "cci" = dontDistribute super."cci";
@@ -2543,6 +2547,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3140,6 +3145,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
   "ghc-events-parallel" = dontDistribute super."ghc-events-parallel";
@@ -3228,6 +3234,7 @@ self: super: {
   "gitlib-s3" = dontDistribute super."gitlib-s3";
   "gitlib-sample" = dontDistribute super."gitlib-sample";
   "gitlib-utils" = dontDistribute super."gitlib-utils";
+  "gitrev" = doDistribute super."gitrev_1_1_0";
   "gitter" = dontDistribute super."gitter";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
@@ -3816,6 +3823,7 @@ self: super: {
   "hdbi-postgresql" = dontDistribute super."hdbi-postgresql";
   "hdbi-sqlite" = dontDistribute super."hdbi-sqlite";
   "hdbi-tests" = dontDistribute super."hdbi-tests";
+  "hdevtools" = doDistribute super."hdevtools_0_1_2_1";
   "hdf" = dontDistribute super."hdf";
   "hdigest" = dontDistribute super."hdigest";
   "hdirect" = dontDistribute super."hdirect";
@@ -3842,6 +3850,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -3886,6 +3895,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfusion" = dontDistribute super."hfusion";
@@ -5038,6 +5048,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
   "lss" = dontDistribute super."lss";
@@ -5373,6 +5385,7 @@ self: super: {
   "multirec" = dontDistribute super."multirec";
   "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver";
   "multirec-binary" = dontDistribute super."multirec-binary";
+  "multiset" = doDistribute super."multiset_0_3_0";
   "multiset-comb" = dontDistribute super."multiset-comb";
   "multisetrewrite" = dontDistribute super."multisetrewrite";
   "multistate" = dontDistribute super."multistate";
@@ -6425,6 +6438,7 @@ self: super: {
   "restyle" = dontDistribute super."restyle";
   "resumable-exceptions" = dontDistribute super."resumable-exceptions";
   "rethinkdb" = dontDistribute super."rethinkdb";
+  "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_20";
   "rethinkdb-model" = dontDistribute super."rethinkdb-model";
   "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
   "retry" = doDistribute super."retry_0_6";
@@ -6714,6 +6728,7 @@ self: super: {
   "shake-pack" = dontDistribute super."shake-pack";
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
@@ -6969,6 +6984,7 @@ self: super: {
   "splaytree" = dontDistribute super."splaytree";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7331,6 +7347,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = doDistribute super."text-show_2";
@@ -7859,6 +7876,7 @@ self: super: {
   "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
   "wai-lens" = dontDistribute super."wai-lens";
   "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger" = doDistribute super."wai-logger_2_2_4_1";
   "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
   "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
   "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.16.nix b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
index c7073f598dbe..374c3e230a6b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
@@ -1361,6 +1361,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = dontDistribute super."atto-lisp";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_6";
@@ -1580,7 +1581,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = dontDistribute super."biophd";
   "biosff" = dontDistribute super."biosff";
@@ -1835,6 +1838,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
   "cci" = dontDistribute super."cci";
@@ -2541,6 +2545,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3137,6 +3142,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
   "ghc-events-parallel" = dontDistribute super."ghc-events-parallel";
@@ -3225,6 +3231,7 @@ self: super: {
   "gitlib-s3" = dontDistribute super."gitlib-s3";
   "gitlib-sample" = dontDistribute super."gitlib-sample";
   "gitlib-utils" = dontDistribute super."gitlib-utils";
+  "gitrev" = doDistribute super."gitrev_1_1_0";
   "gitter" = dontDistribute super."gitter";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
@@ -3812,6 +3819,7 @@ self: super: {
   "hdbi-postgresql" = dontDistribute super."hdbi-postgresql";
   "hdbi-sqlite" = dontDistribute super."hdbi-sqlite";
   "hdbi-tests" = dontDistribute super."hdbi-tests";
+  "hdevtools" = doDistribute super."hdevtools_0_1_2_1";
   "hdf" = dontDistribute super."hdf";
   "hdigest" = dontDistribute super."hdigest";
   "hdirect" = dontDistribute super."hdirect";
@@ -3838,6 +3846,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -3882,6 +3891,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfusion" = dontDistribute super."hfusion";
@@ -5033,6 +5043,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
   "lss" = dontDistribute super."lss";
@@ -5367,6 +5379,7 @@ self: super: {
   "multirec" = dontDistribute super."multirec";
   "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver";
   "multirec-binary" = dontDistribute super."multirec-binary";
+  "multiset" = doDistribute super."multiset_0_3_0";
   "multiset-comb" = dontDistribute super."multiset-comb";
   "multisetrewrite" = dontDistribute super."multisetrewrite";
   "multistate" = dontDistribute super."multistate";
@@ -6416,6 +6429,7 @@ self: super: {
   "restyle" = dontDistribute super."restyle";
   "resumable-exceptions" = dontDistribute super."resumable-exceptions";
   "rethinkdb" = dontDistribute super."rethinkdb";
+  "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_20";
   "rethinkdb-model" = dontDistribute super."rethinkdb-model";
   "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
   "retry" = doDistribute super."retry_0_6";
@@ -6704,6 +6718,7 @@ self: super: {
   "shake-pack" = dontDistribute super."shake-pack";
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
@@ -6959,6 +6974,7 @@ self: super: {
   "splaytree" = dontDistribute super."splaytree";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7318,6 +7334,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = doDistribute super."text-show_2";
@@ -7845,6 +7862,7 @@ self: super: {
   "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
   "wai-lens" = dontDistribute super."wai-lens";
   "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger" = doDistribute super."wai-logger_2_2_4_1";
   "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
   "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
   "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.17.nix b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
index aa4e90d19f20..cfee3d514145 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
@@ -1359,6 +1359,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = dontDistribute super."atto-lisp";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_6";
@@ -1578,7 +1579,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = dontDistribute super."biophd";
   "biosff" = dontDistribute super."biosff";
@@ -1832,6 +1835,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
   "cci" = dontDistribute super."cci";
@@ -2535,6 +2539,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3131,6 +3136,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
   "ghc-events-parallel" = dontDistribute super."ghc-events-parallel";
@@ -3219,6 +3225,7 @@ self: super: {
   "gitlib-s3" = dontDistribute super."gitlib-s3";
   "gitlib-sample" = dontDistribute super."gitlib-sample";
   "gitlib-utils" = dontDistribute super."gitlib-utils";
+  "gitrev" = doDistribute super."gitrev_1_1_0";
   "gitter" = dontDistribute super."gitter";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
@@ -3805,6 +3812,7 @@ self: super: {
   "hdbi-postgresql" = dontDistribute super."hdbi-postgresql";
   "hdbi-sqlite" = dontDistribute super."hdbi-sqlite";
   "hdbi-tests" = dontDistribute super."hdbi-tests";
+  "hdevtools" = doDistribute super."hdevtools_0_1_2_1";
   "hdf" = dontDistribute super."hdf";
   "hdigest" = dontDistribute super."hdigest";
   "hdirect" = dontDistribute super."hdirect";
@@ -3831,6 +3839,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -3875,6 +3884,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfusion" = dontDistribute super."hfusion";
@@ -5024,6 +5034,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
   "lss" = dontDistribute super."lss";
@@ -5357,6 +5369,7 @@ self: super: {
   "multirec" = dontDistribute super."multirec";
   "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver";
   "multirec-binary" = dontDistribute super."multirec-binary";
+  "multiset" = doDistribute super."multiset_0_3_0";
   "multiset-comb" = dontDistribute super."multiset-comb";
   "multisetrewrite" = dontDistribute super."multisetrewrite";
   "multistate" = dontDistribute super."multistate";
@@ -6403,6 +6416,7 @@ self: super: {
   "restyle" = dontDistribute super."restyle";
   "resumable-exceptions" = dontDistribute super."resumable-exceptions";
   "rethinkdb" = dontDistribute super."rethinkdb";
+  "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_20";
   "rethinkdb-model" = dontDistribute super."rethinkdb-model";
   "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
   "retry" = doDistribute super."retry_0_6";
@@ -6691,6 +6705,7 @@ self: super: {
   "shake-pack" = dontDistribute super."shake-pack";
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
@@ -6946,6 +6961,7 @@ self: super: {
   "splaytree" = dontDistribute super."splaytree";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7305,6 +7321,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = doDistribute super."text-show_2";
@@ -7831,6 +7848,7 @@ self: super: {
   "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
   "wai-lens" = dontDistribute super."wai-lens";
   "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger" = doDistribute super."wai-logger_2_2_4_1";
   "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
   "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
   "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.18.nix b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
index a9a4ed101355..35e952623abf 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
@@ -1359,6 +1359,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = dontDistribute super."atto-lisp";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_6";
@@ -1578,7 +1579,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = dontDistribute super."biophd";
   "biosff" = dontDistribute super."biosff";
@@ -1831,6 +1834,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
   "cci" = dontDistribute super."cci";
@@ -2534,6 +2538,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3130,6 +3135,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
   "ghc-events-parallel" = dontDistribute super."ghc-events-parallel";
@@ -3217,6 +3223,7 @@ self: super: {
   "gitlib-s3" = dontDistribute super."gitlib-s3";
   "gitlib-sample" = dontDistribute super."gitlib-sample";
   "gitlib-utils" = dontDistribute super."gitlib-utils";
+  "gitrev" = doDistribute super."gitrev_1_1_0";
   "gitter" = dontDistribute super."gitter";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
@@ -3799,6 +3806,7 @@ self: super: {
   "hdbi-postgresql" = dontDistribute super."hdbi-postgresql";
   "hdbi-sqlite" = dontDistribute super."hdbi-sqlite";
   "hdbi-tests" = dontDistribute super."hdbi-tests";
+  "hdevtools" = doDistribute super."hdevtools_0_1_2_1";
   "hdf" = dontDistribute super."hdf";
   "hdigest" = dontDistribute super."hdigest";
   "hdirect" = dontDistribute super."hdirect";
@@ -3825,6 +3833,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -3869,6 +3878,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfusion" = dontDistribute super."hfusion";
@@ -5014,6 +5024,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
   "lss" = dontDistribute super."lss";
@@ -5245,6 +5257,7 @@ self: super: {
   "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-logger" = doDistribute super."monad-logger_0_3_16";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
   "monad-memo" = dontDistribute super."monad-memo";
@@ -5346,6 +5359,7 @@ self: super: {
   "multirec" = dontDistribute super."multirec";
   "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver";
   "multirec-binary" = dontDistribute super."multirec-binary";
+  "multiset" = doDistribute super."multiset_0_3_0";
   "multiset-comb" = dontDistribute super."multiset-comb";
   "multisetrewrite" = dontDistribute super."multisetrewrite";
   "multistate" = dontDistribute super."multistate";
@@ -6389,6 +6403,7 @@ self: super: {
   "restyle" = dontDistribute super."restyle";
   "resumable-exceptions" = dontDistribute super."resumable-exceptions";
   "rethinkdb" = dontDistribute super."rethinkdb";
+  "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_20";
   "rethinkdb-model" = dontDistribute super."rethinkdb-model";
   "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
   "retry" = doDistribute super."retry_0_6";
@@ -6677,6 +6692,7 @@ self: super: {
   "shake-pack" = dontDistribute super."shake-pack";
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
@@ -6931,6 +6947,7 @@ self: super: {
   "splaytree" = dontDistribute super."splaytree";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7289,6 +7306,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = doDistribute super."text-show_2";
@@ -7813,6 +7831,7 @@ self: super: {
   "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
   "wai-lens" = dontDistribute super."wai-lens";
   "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger" = doDistribute super."wai-logger_2_2_4_1";
   "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
   "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
   "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
@@ -7821,6 +7840,7 @@ self: super: {
   "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis";
   "wai-middleware-catch" = dontDistribute super."wai-middleware-catch";
   "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type";
+  "wai-middleware-crowd" = doDistribute super."wai-middleware-crowd_0_1_3";
   "wai-middleware-etag" = dontDistribute super."wai-middleware-etag";
   "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip";
   "wai-middleware-headers" = dontDistribute super."wai-middleware-headers";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.19.nix b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
index 321d516b14c7..c8c1f4991779 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
@@ -1357,6 +1357,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = dontDistribute super."atto-lisp";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_6";
@@ -1574,7 +1575,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = dontDistribute super."biophd";
   "biosff" = dontDistribute super."biosff";
@@ -1825,6 +1828,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
   "cci" = dontDistribute super."cci";
@@ -2527,6 +2531,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3123,6 +3128,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
   "ghc-events-parallel" = dontDistribute super."ghc-events-parallel";
@@ -3210,6 +3216,7 @@ self: super: {
   "gitlib-s3" = dontDistribute super."gitlib-s3";
   "gitlib-sample" = dontDistribute super."gitlib-sample";
   "gitlib-utils" = dontDistribute super."gitlib-utils";
+  "gitrev" = doDistribute super."gitrev_1_1_0";
   "gitter" = dontDistribute super."gitter";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
@@ -3792,6 +3799,7 @@ self: super: {
   "hdbi-postgresql" = dontDistribute super."hdbi-postgresql";
   "hdbi-sqlite" = dontDistribute super."hdbi-sqlite";
   "hdbi-tests" = dontDistribute super."hdbi-tests";
+  "hdevtools" = doDistribute super."hdevtools_0_1_2_1";
   "hdf" = dontDistribute super."hdf";
   "hdigest" = dontDistribute super."hdigest";
   "hdirect" = dontDistribute super."hdirect";
@@ -3818,6 +3826,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -3862,6 +3871,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfusion" = dontDistribute super."hfusion";
@@ -5002,6 +5012,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
   "lss" = dontDistribute super."lss";
@@ -5233,6 +5245,7 @@ self: super: {
   "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-logger" = doDistribute super."monad-logger_0_3_16";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
   "monad-memo" = dontDistribute super."monad-memo";
@@ -5334,6 +5347,7 @@ self: super: {
   "multirec" = dontDistribute super."multirec";
   "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver";
   "multirec-binary" = dontDistribute super."multirec-binary";
+  "multiset" = doDistribute super."multiset_0_3_0";
   "multiset-comb" = dontDistribute super."multiset-comb";
   "multisetrewrite" = dontDistribute super."multisetrewrite";
   "multistate" = dontDistribute super."multistate";
@@ -6374,6 +6388,7 @@ self: super: {
   "restyle" = dontDistribute super."restyle";
   "resumable-exceptions" = dontDistribute super."resumable-exceptions";
   "rethinkdb" = dontDistribute super."rethinkdb";
+  "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_20";
   "rethinkdb-model" = dontDistribute super."rethinkdb-model";
   "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
   "retry" = doDistribute super."retry_0_6";
@@ -6661,6 +6676,7 @@ self: super: {
   "shake-pack" = dontDistribute super."shake-pack";
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
@@ -6914,6 +6930,7 @@ self: super: {
   "splaytree" = dontDistribute super."splaytree";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7272,6 +7289,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = doDistribute super."text-show_2";
@@ -7796,6 +7814,7 @@ self: super: {
   "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
   "wai-lens" = dontDistribute super."wai-lens";
   "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger" = doDistribute super."wai-logger_2_2_4_1";
   "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
   "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
   "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
@@ -7804,6 +7823,7 @@ self: super: {
   "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis";
   "wai-middleware-catch" = dontDistribute super."wai-middleware-catch";
   "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type";
+  "wai-middleware-crowd" = doDistribute super."wai-middleware-crowd_0_1_3";
   "wai-middleware-etag" = dontDistribute super."wai-middleware-etag";
   "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip";
   "wai-middleware-headers" = dontDistribute super."wai-middleware-headers";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
index 4b36506ba210..e99e8bf87210 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
@@ -1378,6 +1378,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = dontDistribute super."atto-lisp";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_6";
@@ -1600,7 +1601,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = dontDistribute super."biophd";
   "biosff" = dontDistribute super."biosff";
@@ -2591,6 +2594,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3201,6 +3205,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
   "ghc-events-parallel" = dontDistribute super."ghc-events-parallel";
@@ -3292,6 +3297,7 @@ self: super: {
   "gitlib-s3" = dontDistribute super."gitlib-s3";
   "gitlib-sample" = dontDistribute super."gitlib-sample";
   "gitlib-utils" = dontDistribute super."gitlib-utils";
+  "gitrev" = doDistribute super."gitrev_1_1_0";
   "gitter" = dontDistribute super."gitter";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
@@ -3886,6 +3892,7 @@ self: super: {
   "hdbi-postgresql" = dontDistribute super."hdbi-postgresql";
   "hdbi-sqlite" = dontDistribute super."hdbi-sqlite";
   "hdbi-tests" = dontDistribute super."hdbi-tests";
+  "hdevtools" = doDistribute super."hdevtools_0_1_2_1";
   "hdf" = dontDistribute super."hdf";
   "hdigest" = dontDistribute super."hdigest";
   "hdirect" = dontDistribute super."hdirect";
@@ -3912,6 +3919,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -3956,6 +3964,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = doDistribute super."hfsevents_0_1_5";
@@ -5124,6 +5133,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
   "lss" = dontDistribute super."lss";
@@ -5467,6 +5478,7 @@ self: super: {
   "multirec" = dontDistribute super."multirec";
   "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver";
   "multirec-binary" = dontDistribute super."multirec-binary";
+  "multiset" = doDistribute super."multiset_0_3_0";
   "multiset-comb" = dontDistribute super."multiset-comb";
   "multisetrewrite" = dontDistribute super."multisetrewrite";
   "multistate" = dontDistribute super."multistate";
@@ -6543,6 +6555,7 @@ self: super: {
   "restyle" = dontDistribute super."restyle";
   "resumable-exceptions" = dontDistribute super."resumable-exceptions";
   "rethinkdb" = dontDistribute super."rethinkdb";
+  "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_20";
   "rethinkdb-model" = dontDistribute super."rethinkdb-model";
   "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
   "retry" = doDistribute super."retry_0_6";
@@ -6837,6 +6850,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_5";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
@@ -7096,6 +7110,7 @@ self: super: {
   "splaytree" = dontDistribute super."splaytree";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7467,6 +7482,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = doDistribute super."text-show_2";
@@ -8004,6 +8020,7 @@ self: super: {
   "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
   "wai-lens" = dontDistribute super."wai-lens";
   "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger" = doDistribute super."wai-logger_2_2_4_1";
   "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
   "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
   "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.20.nix b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
index 0e18f8f22b29..ed5c831a255f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
@@ -1354,6 +1354,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = dontDistribute super."atto-lisp";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_6";
@@ -1570,7 +1571,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = dontDistribute super."biophd";
   "biosff" = dontDistribute super."biosff";
@@ -1820,6 +1823,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
   "cci" = dontDistribute super."cci";
@@ -2522,6 +2526,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3118,6 +3123,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
   "ghc-events-parallel" = dontDistribute super."ghc-events-parallel";
@@ -3205,6 +3211,7 @@ self: super: {
   "gitlib-s3" = dontDistribute super."gitlib-s3";
   "gitlib-sample" = dontDistribute super."gitlib-sample";
   "gitlib-utils" = dontDistribute super."gitlib-utils";
+  "gitrev" = doDistribute super."gitrev_1_1_0";
   "gitter" = dontDistribute super."gitter";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
@@ -3787,6 +3794,7 @@ self: super: {
   "hdbi-postgresql" = dontDistribute super."hdbi-postgresql";
   "hdbi-sqlite" = dontDistribute super."hdbi-sqlite";
   "hdbi-tests" = dontDistribute super."hdbi-tests";
+  "hdevtools" = doDistribute super."hdevtools_0_1_2_1";
   "hdf" = dontDistribute super."hdf";
   "hdigest" = dontDistribute super."hdigest";
   "hdirect" = dontDistribute super."hdirect";
@@ -3813,6 +3821,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -3857,6 +3866,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfusion" = dontDistribute super."hfusion";
@@ -4995,6 +5005,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
   "lss" = dontDistribute super."lss";
@@ -5226,6 +5238,7 @@ self: super: {
   "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-logger" = doDistribute super."monad-logger_0_3_16";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
   "monad-memo" = dontDistribute super."monad-memo";
@@ -5327,6 +5340,7 @@ self: super: {
   "multirec" = dontDistribute super."multirec";
   "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver";
   "multirec-binary" = dontDistribute super."multirec-binary";
+  "multiset" = doDistribute super."multiset_0_3_0";
   "multiset-comb" = dontDistribute super."multiset-comb";
   "multisetrewrite" = dontDistribute super."multisetrewrite";
   "multistate" = dontDistribute super."multistate";
@@ -6365,6 +6379,7 @@ self: super: {
   "restyle" = dontDistribute super."restyle";
   "resumable-exceptions" = dontDistribute super."resumable-exceptions";
   "rethinkdb" = dontDistribute super."rethinkdb";
+  "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_20";
   "rethinkdb-model" = dontDistribute super."rethinkdb-model";
   "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
   "retry" = doDistribute super."retry_0_6";
@@ -6652,6 +6667,7 @@ self: super: {
   "shake-pack" = dontDistribute super."shake-pack";
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
@@ -6905,6 +6921,7 @@ self: super: {
   "splaytree" = dontDistribute super."splaytree";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7261,6 +7278,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = doDistribute super."text-show_2";
@@ -7785,6 +7803,7 @@ self: super: {
   "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
   "wai-lens" = dontDistribute super."wai-lens";
   "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger" = doDistribute super."wai-logger_2_2_4_1";
   "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
   "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
   "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
@@ -7793,6 +7812,7 @@ self: super: {
   "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis";
   "wai-middleware-catch" = dontDistribute super."wai-middleware-catch";
   "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type";
+  "wai-middleware-crowd" = doDistribute super."wai-middleware-crowd_0_1_3";
   "wai-middleware-etag" = dontDistribute super."wai-middleware-etag";
   "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip";
   "wai-middleware-headers" = dontDistribute super."wai-middleware-headers";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.21.nix b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
index 7749dbd353c8..9f73ebed7945 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
@@ -1353,6 +1353,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = dontDistribute super."atto-lisp";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_6";
@@ -1568,7 +1569,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = dontDistribute super."biophd";
   "biosff" = dontDistribute super."biosff";
@@ -1817,6 +1820,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
   "cci" = dontDistribute super."cci";
@@ -2517,6 +2521,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3111,6 +3116,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
   "ghc-events-parallel" = dontDistribute super."ghc-events-parallel";
@@ -3198,6 +3204,7 @@ self: super: {
   "gitlib-s3" = dontDistribute super."gitlib-s3";
   "gitlib-sample" = dontDistribute super."gitlib-sample";
   "gitlib-utils" = dontDistribute super."gitlib-utils";
+  "gitrev" = doDistribute super."gitrev_1_1_0";
   "gitter" = dontDistribute super."gitter";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
@@ -3779,6 +3786,7 @@ self: super: {
   "hdbi-postgresql" = dontDistribute super."hdbi-postgresql";
   "hdbi-sqlite" = dontDistribute super."hdbi-sqlite";
   "hdbi-tests" = dontDistribute super."hdbi-tests";
+  "hdevtools" = doDistribute super."hdevtools_0_1_2_1";
   "hdf" = dontDistribute super."hdf";
   "hdigest" = dontDistribute super."hdigest";
   "hdirect" = dontDistribute super."hdirect";
@@ -3805,6 +3813,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -3849,6 +3858,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfusion" = dontDistribute super."hfusion";
@@ -4985,6 +4995,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
   "lss" = dontDistribute super."lss";
@@ -5216,6 +5228,7 @@ self: super: {
   "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-logger" = doDistribute super."monad-logger_0_3_16";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
   "monad-memo" = dontDistribute super."monad-memo";
@@ -5316,6 +5329,7 @@ self: super: {
   "multirec" = dontDistribute super."multirec";
   "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver";
   "multirec-binary" = dontDistribute super."multirec-binary";
+  "multiset" = doDistribute super."multiset_0_3_0";
   "multiset-comb" = dontDistribute super."multiset-comb";
   "multisetrewrite" = dontDistribute super."multisetrewrite";
   "multistate" = dontDistribute super."multistate";
@@ -6350,6 +6364,7 @@ self: super: {
   "restyle" = dontDistribute super."restyle";
   "resumable-exceptions" = dontDistribute super."resumable-exceptions";
   "rethinkdb" = dontDistribute super."rethinkdb";
+  "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_20";
   "rethinkdb-model" = dontDistribute super."rethinkdb-model";
   "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
   "retry" = doDistribute super."retry_0_6";
@@ -6628,6 +6643,7 @@ self: super: {
   "shake-pack" = dontDistribute super."shake-pack";
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
@@ -6880,6 +6896,7 @@ self: super: {
   "splaytree" = dontDistribute super."splaytree";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7236,6 +7253,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = doDistribute super."text-show_2";
@@ -7744,6 +7762,7 @@ self: super: {
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
   "wai-dispatch" = dontDistribute super."wai-dispatch";
+  "wai-extra" = doDistribute super."wai-extra_3_0_13_1";
   "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi";
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
@@ -7755,6 +7774,7 @@ self: super: {
   "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
   "wai-lens" = dontDistribute super."wai-lens";
   "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger" = doDistribute super."wai-logger_2_2_4_1";
   "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
   "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
   "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
@@ -7763,6 +7783,7 @@ self: super: {
   "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis";
   "wai-middleware-catch" = dontDistribute super."wai-middleware-catch";
   "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type";
+  "wai-middleware-crowd" = doDistribute super."wai-middleware-crowd_0_1_3";
   "wai-middleware-etag" = dontDistribute super."wai-middleware-etag";
   "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip";
   "wai-middleware-headers" = dontDistribute super."wai-middleware-headers";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.22.nix b/pkgs/development/haskell-modules/configuration-lts-3.22.nix
index d3d69d0ce722..17e32e951cb7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.22.nix
@@ -1353,6 +1353,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = dontDistribute super."atto-lisp";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_6";
@@ -1568,7 +1569,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = dontDistribute super."biophd";
   "biosff" = dontDistribute super."biosff";
@@ -1817,6 +1820,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
   "cci" = dontDistribute super."cci";
@@ -2517,6 +2521,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3109,6 +3114,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
   "ghc-events-parallel" = dontDistribute super."ghc-events-parallel";
@@ -3196,6 +3202,7 @@ self: super: {
   "gitlib-s3" = dontDistribute super."gitlib-s3";
   "gitlib-sample" = dontDistribute super."gitlib-sample";
   "gitlib-utils" = dontDistribute super."gitlib-utils";
+  "gitrev" = doDistribute super."gitrev_1_1_0";
   "gitter" = dontDistribute super."gitter";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
@@ -3777,6 +3784,7 @@ self: super: {
   "hdbi-postgresql" = dontDistribute super."hdbi-postgresql";
   "hdbi-sqlite" = dontDistribute super."hdbi-sqlite";
   "hdbi-tests" = dontDistribute super."hdbi-tests";
+  "hdevtools" = doDistribute super."hdevtools_0_1_2_1";
   "hdf" = dontDistribute super."hdf";
   "hdigest" = dontDistribute super."hdigest";
   "hdirect" = dontDistribute super."hdirect";
@@ -3802,6 +3810,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -3846,6 +3855,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfusion" = dontDistribute super."hfusion";
@@ -4979,6 +4989,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
   "lss" = dontDistribute super."lss";
@@ -5210,6 +5222,7 @@ self: super: {
   "monad-http" = dontDistribute super."monad-http";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-logger" = doDistribute super."monad-logger_0_3_16";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
   "monad-memo" = dontDistribute super."monad-memo";
@@ -5310,6 +5323,7 @@ self: super: {
   "multirec" = dontDistribute super."multirec";
   "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver";
   "multirec-binary" = dontDistribute super."multirec-binary";
+  "multiset" = doDistribute super."multiset_0_3_0";
   "multiset-comb" = dontDistribute super."multiset-comb";
   "multisetrewrite" = dontDistribute super."multisetrewrite";
   "multistate" = dontDistribute super."multistate";
@@ -6344,6 +6358,7 @@ self: super: {
   "restyle" = dontDistribute super."restyle";
   "resumable-exceptions" = dontDistribute super."resumable-exceptions";
   "rethinkdb" = dontDistribute super."rethinkdb";
+  "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_20";
   "rethinkdb-model" = dontDistribute super."rethinkdb-model";
   "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
   "retry" = doDistribute super."retry_0_6";
@@ -6622,6 +6637,7 @@ self: super: {
   "shake-pack" = dontDistribute super."shake-pack";
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
@@ -6874,6 +6890,7 @@ self: super: {
   "splaytree" = dontDistribute super."splaytree";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7230,6 +7247,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = doDistribute super."text-show_2";
@@ -7738,6 +7756,7 @@ self: super: {
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
   "wai-dispatch" = dontDistribute super."wai-dispatch";
+  "wai-extra" = doDistribute super."wai-extra_3_0_13_1";
   "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi";
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
@@ -7749,6 +7768,7 @@ self: super: {
   "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
   "wai-lens" = dontDistribute super."wai-lens";
   "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger" = doDistribute super."wai-logger_2_2_4_1";
   "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
   "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
   "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
@@ -7757,6 +7777,7 @@ self: super: {
   "wai-middleware-caching-redis" = dontDistribute super."wai-middleware-caching-redis";
   "wai-middleware-catch" = dontDistribute super."wai-middleware-catch";
   "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type";
+  "wai-middleware-crowd" = doDistribute super."wai-middleware-crowd_0_1_3";
   "wai-middleware-etag" = dontDistribute super."wai-middleware-etag";
   "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip";
   "wai-middleware-headers" = dontDistribute super."wai-middleware-headers";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
index 015ecca62fe8..e894305643bc 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
@@ -1377,6 +1377,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = dontDistribute super."atto-lisp";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_6";
@@ -1599,7 +1600,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = dontDistribute super."biophd";
   "biosff" = dontDistribute super."biosff";
@@ -2587,6 +2590,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3196,6 +3200,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
   "ghc-events-parallel" = dontDistribute super."ghc-events-parallel";
@@ -3287,6 +3292,7 @@ self: super: {
   "gitlib-s3" = dontDistribute super."gitlib-s3";
   "gitlib-sample" = dontDistribute super."gitlib-sample";
   "gitlib-utils" = dontDistribute super."gitlib-utils";
+  "gitrev" = doDistribute super."gitrev_1_1_0";
   "gitter" = dontDistribute super."gitter";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
@@ -3881,6 +3887,7 @@ self: super: {
   "hdbi-postgresql" = dontDistribute super."hdbi-postgresql";
   "hdbi-sqlite" = dontDistribute super."hdbi-sqlite";
   "hdbi-tests" = dontDistribute super."hdbi-tests";
+  "hdevtools" = doDistribute super."hdevtools_0_1_2_1";
   "hdf" = dontDistribute super."hdf";
   "hdigest" = dontDistribute super."hdigest";
   "hdirect" = dontDistribute super."hdirect";
@@ -3907,6 +3914,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -3951,6 +3959,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = doDistribute super."hfsevents_0_1_5";
@@ -5117,6 +5126,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
   "lss" = dontDistribute super."lss";
@@ -5460,6 +5471,7 @@ self: super: {
   "multirec" = dontDistribute super."multirec";
   "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver";
   "multirec-binary" = dontDistribute super."multirec-binary";
+  "multiset" = doDistribute super."multiset_0_3_0";
   "multiset-comb" = dontDistribute super."multiset-comb";
   "multisetrewrite" = dontDistribute super."multisetrewrite";
   "multistate" = dontDistribute super."multistate";
@@ -6535,6 +6547,7 @@ self: super: {
   "restyle" = dontDistribute super."restyle";
   "resumable-exceptions" = dontDistribute super."resumable-exceptions";
   "rethinkdb" = dontDistribute super."rethinkdb";
+  "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_20";
   "rethinkdb-model" = dontDistribute super."rethinkdb-model";
   "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
   "retry" = doDistribute super."retry_0_6";
@@ -6829,6 +6842,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_5";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
@@ -7087,6 +7101,7 @@ self: super: {
   "splaytree" = dontDistribute super."splaytree";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7457,6 +7472,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = doDistribute super."text-show_2";
@@ -7993,6 +8009,7 @@ self: super: {
   "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
   "wai-lens" = dontDistribute super."wai-lens";
   "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger" = doDistribute super."wai-logger_2_2_4_1";
   "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
   "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
   "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
index c914cd506d41..1f8befa75247 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
@@ -1377,6 +1377,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = dontDistribute super."atto-lisp";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_6";
@@ -1599,7 +1600,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = dontDistribute super."biophd";
   "biosff" = dontDistribute super."biosff";
@@ -2586,6 +2589,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3195,6 +3199,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
   "ghc-events-parallel" = dontDistribute super."ghc-events-parallel";
@@ -3286,6 +3291,7 @@ self: super: {
   "gitlib-s3" = dontDistribute super."gitlib-s3";
   "gitlib-sample" = dontDistribute super."gitlib-sample";
   "gitlib-utils" = dontDistribute super."gitlib-utils";
+  "gitrev" = doDistribute super."gitrev_1_1_0";
   "gitter" = dontDistribute super."gitter";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
@@ -3880,6 +3886,7 @@ self: super: {
   "hdbi-postgresql" = dontDistribute super."hdbi-postgresql";
   "hdbi-sqlite" = dontDistribute super."hdbi-sqlite";
   "hdbi-tests" = dontDistribute super."hdbi-tests";
+  "hdevtools" = doDistribute super."hdevtools_0_1_2_1";
   "hdf" = dontDistribute super."hdf";
   "hdigest" = dontDistribute super."hdigest";
   "hdirect" = dontDistribute super."hdirect";
@@ -3906,6 +3913,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -3950,6 +3958,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = doDistribute super."hfsevents_0_1_5";
@@ -5116,6 +5125,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
   "lss" = dontDistribute super."lss";
@@ -5459,6 +5470,7 @@ self: super: {
   "multirec" = dontDistribute super."multirec";
   "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver";
   "multirec-binary" = dontDistribute super."multirec-binary";
+  "multiset" = doDistribute super."multiset_0_3_0";
   "multiset-comb" = dontDistribute super."multiset-comb";
   "multisetrewrite" = dontDistribute super."multisetrewrite";
   "multistate" = dontDistribute super."multistate";
@@ -6534,6 +6546,7 @@ self: super: {
   "restyle" = dontDistribute super."restyle";
   "resumable-exceptions" = dontDistribute super."resumable-exceptions";
   "rethinkdb" = dontDistribute super."rethinkdb";
+  "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_20";
   "rethinkdb-model" = dontDistribute super."rethinkdb-model";
   "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
   "retry" = doDistribute super."retry_0_6";
@@ -6827,6 +6840,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_5";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
@@ -7085,6 +7099,7 @@ self: super: {
   "splaytree" = dontDistribute super."splaytree";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7454,6 +7469,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = doDistribute super."text-show_2";
@@ -7990,6 +8006,7 @@ self: super: {
   "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
   "wai-lens" = dontDistribute super."wai-lens";
   "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger" = doDistribute super."wai-logger_2_2_4_1";
   "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
   "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
   "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
index 96c247063ecb..b3eb87bc287f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
@@ -1376,6 +1376,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = dontDistribute super."atto-lisp";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_6";
@@ -1598,7 +1599,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = dontDistribute super."biophd";
   "biosff" = dontDistribute super."biosff";
@@ -2583,6 +2586,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3190,6 +3194,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
   "ghc-events-parallel" = dontDistribute super."ghc-events-parallel";
@@ -3281,6 +3286,7 @@ self: super: {
   "gitlib-s3" = dontDistribute super."gitlib-s3";
   "gitlib-sample" = dontDistribute super."gitlib-sample";
   "gitlib-utils" = dontDistribute super."gitlib-utils";
+  "gitrev" = doDistribute super."gitrev_1_1_0";
   "gitter" = dontDistribute super."gitter";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
@@ -3874,6 +3880,7 @@ self: super: {
   "hdbi-postgresql" = dontDistribute super."hdbi-postgresql";
   "hdbi-sqlite" = dontDistribute super."hdbi-sqlite";
   "hdbi-tests" = dontDistribute super."hdbi-tests";
+  "hdevtools" = doDistribute super."hdevtools_0_1_2_1";
   "hdf" = dontDistribute super."hdf";
   "hdigest" = dontDistribute super."hdigest";
   "hdirect" = dontDistribute super."hdirect";
@@ -3900,6 +3907,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -3944,6 +3952,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = doDistribute super."hfsevents_0_1_5";
@@ -5106,6 +5115,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
   "lss" = dontDistribute super."lss";
@@ -5448,6 +5459,7 @@ self: super: {
   "multirec" = dontDistribute super."multirec";
   "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver";
   "multirec-binary" = dontDistribute super."multirec-binary";
+  "multiset" = doDistribute super."multiset_0_3_0";
   "multiset-comb" = dontDistribute super."multiset-comb";
   "multisetrewrite" = dontDistribute super."multisetrewrite";
   "multistate" = dontDistribute super."multistate";
@@ -6519,6 +6531,7 @@ self: super: {
   "restyle" = dontDistribute super."restyle";
   "resumable-exceptions" = dontDistribute super."resumable-exceptions";
   "rethinkdb" = dontDistribute super."rethinkdb";
+  "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_20";
   "rethinkdb-model" = dontDistribute super."rethinkdb-model";
   "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
   "retry" = doDistribute super."retry_0_6";
@@ -6812,6 +6825,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_5";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
@@ -7070,6 +7084,7 @@ self: super: {
   "splaytree" = dontDistribute super."splaytree";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7436,6 +7451,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = doDistribute super."text-show_2";
@@ -7972,6 +7988,7 @@ self: super: {
   "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
   "wai-lens" = dontDistribute super."wai-lens";
   "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger" = doDistribute super."wai-logger_2_2_4_1";
   "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
   "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
   "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
index f24bb137b16e..ea92dcc12866 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
@@ -1375,6 +1375,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = dontDistribute super."atto-lisp";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_6";
@@ -1597,7 +1598,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = dontDistribute super."biophd";
   "biosff" = dontDistribute super."biosff";
@@ -1858,6 +1861,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
   "cci" = dontDistribute super."cci";
@@ -2581,6 +2585,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3187,6 +3192,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
   "ghc-events-parallel" = dontDistribute super."ghc-events-parallel";
@@ -3276,6 +3282,7 @@ self: super: {
   "gitlib-s3" = dontDistribute super."gitlib-s3";
   "gitlib-sample" = dontDistribute super."gitlib-sample";
   "gitlib-utils" = dontDistribute super."gitlib-utils";
+  "gitrev" = doDistribute super."gitrev_1_1_0";
   "gitter" = dontDistribute super."gitter";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
@@ -3869,6 +3876,7 @@ self: super: {
   "hdbi-postgresql" = dontDistribute super."hdbi-postgresql";
   "hdbi-sqlite" = dontDistribute super."hdbi-sqlite";
   "hdbi-tests" = dontDistribute super."hdbi-tests";
+  "hdevtools" = doDistribute super."hdevtools_0_1_2_1";
   "hdf" = dontDistribute super."hdf";
   "hdigest" = dontDistribute super."hdigest";
   "hdirect" = dontDistribute super."hdirect";
@@ -3895,6 +3903,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -3939,6 +3948,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = doDistribute super."hfsevents_0_1_5";
@@ -5097,6 +5107,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
   "lss" = dontDistribute super."lss";
@@ -5438,6 +5450,7 @@ self: super: {
   "multirec" = dontDistribute super."multirec";
   "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver";
   "multirec-binary" = dontDistribute super."multirec-binary";
+  "multiset" = doDistribute super."multiset_0_3_0";
   "multiset-comb" = dontDistribute super."multiset-comb";
   "multisetrewrite" = dontDistribute super."multisetrewrite";
   "multistate" = dontDistribute super."multistate";
@@ -6508,6 +6521,7 @@ self: super: {
   "restyle" = dontDistribute super."restyle";
   "resumable-exceptions" = dontDistribute super."resumable-exceptions";
   "rethinkdb" = dontDistribute super."rethinkdb";
+  "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_20";
   "rethinkdb-model" = dontDistribute super."rethinkdb-model";
   "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
   "retry" = doDistribute super."retry_0_6";
@@ -6801,6 +6815,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_6";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
@@ -7059,6 +7074,7 @@ self: super: {
   "splaytree" = dontDistribute super."splaytree";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7425,6 +7441,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = doDistribute super."text-show_2";
@@ -7959,6 +7976,7 @@ self: super: {
   "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
   "wai-lens" = dontDistribute super."wai-lens";
   "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger" = doDistribute super."wai-logger_2_2_4_1";
   "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
   "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
   "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
index f1980ea5a02c..f397dddbd2c8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
@@ -1372,6 +1372,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = dontDistribute super."atto-lisp";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_6";
@@ -1594,7 +1595,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = dontDistribute super."biophd";
   "biosff" = dontDistribute super."biosff";
@@ -1855,6 +1858,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
   "cci" = dontDistribute super."cci";
@@ -2576,6 +2580,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3181,6 +3186,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
   "ghc-events-parallel" = dontDistribute super."ghc-events-parallel";
@@ -3270,6 +3276,7 @@ self: super: {
   "gitlib-s3" = dontDistribute super."gitlib-s3";
   "gitlib-sample" = dontDistribute super."gitlib-sample";
   "gitlib-utils" = dontDistribute super."gitlib-utils";
+  "gitrev" = doDistribute super."gitrev_1_1_0";
   "gitter" = dontDistribute super."gitter";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
@@ -3861,6 +3868,7 @@ self: super: {
   "hdbi-postgresql" = dontDistribute super."hdbi-postgresql";
   "hdbi-sqlite" = dontDistribute super."hdbi-sqlite";
   "hdbi-tests" = dontDistribute super."hdbi-tests";
+  "hdevtools" = doDistribute super."hdevtools_0_1_2_1";
   "hdf" = dontDistribute super."hdf";
   "hdigest" = dontDistribute super."hdigest";
   "hdirect" = dontDistribute super."hdirect";
@@ -3887,6 +3895,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -3931,6 +3940,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = doDistribute super."hfsevents_0_1_5";
@@ -5088,6 +5098,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
   "lss" = dontDistribute super."lss";
@@ -5428,6 +5440,7 @@ self: super: {
   "multirec" = dontDistribute super."multirec";
   "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver";
   "multirec-binary" = dontDistribute super."multirec-binary";
+  "multiset" = doDistribute super."multiset_0_3_0";
   "multiset-comb" = dontDistribute super."multiset-comb";
   "multisetrewrite" = dontDistribute super."multisetrewrite";
   "multistate" = dontDistribute super."multistate";
@@ -6493,6 +6506,7 @@ self: super: {
   "restyle" = dontDistribute super."restyle";
   "resumable-exceptions" = dontDistribute super."resumable-exceptions";
   "rethinkdb" = dontDistribute super."rethinkdb";
+  "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_20";
   "rethinkdb-model" = dontDistribute super."rethinkdb-model";
   "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
   "retry" = doDistribute super."retry_0_6";
@@ -6786,6 +6800,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_6";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
@@ -7042,6 +7057,7 @@ self: super: {
   "splaytree" = dontDistribute super."splaytree";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7408,6 +7424,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = doDistribute super."text-show_2";
@@ -7941,6 +7958,7 @@ self: super: {
   "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
   "wai-lens" = dontDistribute super."wai-lens";
   "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger" = doDistribute super."wai-logger_2_2_4_1";
   "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
   "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
   "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
index b3a5533e928c..bd1aa12cd704 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
@@ -1372,6 +1372,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = dontDistribute super."atto-lisp";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_6";
@@ -1594,7 +1595,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = dontDistribute super."biophd";
   "biosff" = dontDistribute super."biosff";
@@ -1852,6 +1855,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
   "cci" = dontDistribute super."cci";
@@ -2568,6 +2572,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3173,6 +3178,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
   "ghc-events-parallel" = dontDistribute super."ghc-events-parallel";
@@ -3262,6 +3268,7 @@ self: super: {
   "gitlib-s3" = dontDistribute super."gitlib-s3";
   "gitlib-sample" = dontDistribute super."gitlib-sample";
   "gitlib-utils" = dontDistribute super."gitlib-utils";
+  "gitrev" = doDistribute super."gitrev_1_1_0";
   "gitter" = dontDistribute super."gitter";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
@@ -3853,6 +3860,7 @@ self: super: {
   "hdbi-postgresql" = dontDistribute super."hdbi-postgresql";
   "hdbi-sqlite" = dontDistribute super."hdbi-sqlite";
   "hdbi-tests" = dontDistribute super."hdbi-tests";
+  "hdevtools" = doDistribute super."hdevtools_0_1_2_1";
   "hdf" = dontDistribute super."hdf";
   "hdigest" = dontDistribute super."hdigest";
   "hdirect" = dontDistribute super."hdirect";
@@ -3879,6 +3887,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -3923,6 +3932,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = doDistribute super."hfsevents_0_1_5";
@@ -5080,6 +5090,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
   "lss" = dontDistribute super."lss";
@@ -5418,6 +5430,7 @@ self: super: {
   "multirec" = dontDistribute super."multirec";
   "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver";
   "multirec-binary" = dontDistribute super."multirec-binary";
+  "multiset" = doDistribute super."multiset_0_3_0";
   "multiset-comb" = dontDistribute super."multiset-comb";
   "multisetrewrite" = dontDistribute super."multisetrewrite";
   "multistate" = dontDistribute super."multistate";
@@ -6480,6 +6493,7 @@ self: super: {
   "restyle" = dontDistribute super."restyle";
   "resumable-exceptions" = dontDistribute super."resumable-exceptions";
   "rethinkdb" = dontDistribute super."rethinkdb";
+  "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_20";
   "rethinkdb-model" = dontDistribute super."rethinkdb-model";
   "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
   "retry" = doDistribute super."retry_0_6";
@@ -6773,6 +6787,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_6";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
@@ -7029,6 +7044,7 @@ self: super: {
   "splaytree" = dontDistribute super."splaytree";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7394,6 +7410,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = doDistribute super."text-show_2";
@@ -7927,6 +7944,7 @@ self: super: {
   "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
   "wai-lens" = dontDistribute super."wai-lens";
   "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger" = doDistribute super."wai-logger_2_2_4_1";
   "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
   "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
   "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
index 704d9bc9e2fe..6f61d0b6c841 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
@@ -1370,6 +1370,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = dontDistribute super."atto-lisp";
   "attoparsec" = doDistribute super."attoparsec_0_12_1_6";
@@ -1591,7 +1592,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biophd" = dontDistribute super."biophd";
   "biosff" = dontDistribute super."biosff";
@@ -1848,6 +1851,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
   "cci" = dontDistribute super."cci";
@@ -2563,6 +2567,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -3165,6 +3170,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
   "ghc-events-parallel" = dontDistribute super."ghc-events-parallel";
@@ -3254,6 +3260,7 @@ self: super: {
   "gitlib-s3" = dontDistribute super."gitlib-s3";
   "gitlib-sample" = dontDistribute super."gitlib-sample";
   "gitlib-utils" = dontDistribute super."gitlib-utils";
+  "gitrev" = doDistribute super."gitrev_1_1_0";
   "gitter" = dontDistribute super."gitter";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
@@ -3845,6 +3852,7 @@ self: super: {
   "hdbi-postgresql" = dontDistribute super."hdbi-postgresql";
   "hdbi-sqlite" = dontDistribute super."hdbi-sqlite";
   "hdbi-tests" = dontDistribute super."hdbi-tests";
+  "hdevtools" = doDistribute super."hdevtools_0_1_2_1";
   "hdf" = dontDistribute super."hdf";
   "hdigest" = dontDistribute super."hdigest";
   "hdirect" = dontDistribute super."hdirect";
@@ -3871,6 +3879,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -3915,6 +3924,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfsevents" = doDistribute super."hfsevents_0_1_5";
@@ -5072,6 +5082,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
   "lss" = dontDistribute super."lss";
@@ -5410,6 +5422,7 @@ self: super: {
   "multirec" = dontDistribute super."multirec";
   "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver";
   "multirec-binary" = dontDistribute super."multirec-binary";
+  "multiset" = doDistribute super."multiset_0_3_0";
   "multiset-comb" = dontDistribute super."multiset-comb";
   "multisetrewrite" = dontDistribute super."multisetrewrite";
   "multistate" = dontDistribute super."multistate";
@@ -6471,6 +6484,7 @@ self: super: {
   "restyle" = dontDistribute super."restyle";
   "resumable-exceptions" = dontDistribute super."resumable-exceptions";
   "rethinkdb" = dontDistribute super."rethinkdb";
+  "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_20";
   "rethinkdb-model" = dontDistribute super."rethinkdb-model";
   "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
   "retry" = doDistribute super."retry_0_6";
@@ -6764,6 +6778,7 @@ self: super: {
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
   "shakespeare" = doDistribute super."shakespeare_2_0_6";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
@@ -7020,6 +7035,7 @@ self: super: {
   "splaytree" = dontDistribute super."splaytree";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -7385,6 +7401,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show" = doDistribute super."text-show_2";
@@ -7918,6 +7935,7 @@ self: super: {
   "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
   "wai-lens" = dontDistribute super."wai-lens";
   "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger" = doDistribute super."wai-logger_2_2_4_1";
   "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
   "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
   "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.0.nix b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
index b0fbca2b58e9..beeea76f0398 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
@@ -451,6 +451,7 @@ self: super: {
   "HTTP-Simple" = dontDistribute super."HTTP-Simple";
   "HTab" = dontDistribute super."HTab";
   "HTicTacToe" = dontDistribute super."HTicTacToe";
+  "HUnit" = doDistribute super."HUnit_1_3_0_0";
   "HUnit-Diff" = dontDistribute super."HUnit-Diff";
   "HUnit-Plus" = dontDistribute super."HUnit-Plus";
   "HUnit-approx" = dontDistribute super."HUnit-approx";
@@ -533,6 +534,7 @@ self: super: {
   "InfixApplicative" = dontDistribute super."InfixApplicative";
   "Interpolation" = dontDistribute super."Interpolation";
   "Interpolation-maxs" = dontDistribute super."Interpolation-maxs";
+  "IntervalMap" = doDistribute super."IntervalMap_0_4_1_1";
   "Irc" = dontDistribute super."Irc";
   "IrrHaskell" = dontDistribute super."IrrHaskell";
   "IsNull" = dontDistribute super."IsNull";
@@ -1253,6 +1255,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = dontDistribute super."atto-lisp";
   "attoparsec-arff" = dontDistribute super."attoparsec-arff";
@@ -1455,7 +1458,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biosff" = dontDistribute super."biosff";
   "biostockholm" = dontDistribute super."biostockholm";
@@ -1560,6 +1565,7 @@ self: super: {
   "buster" = dontDistribute super."buster";
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
+  "bustle" = doDistribute super."bustle_0_5_2";
   "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
@@ -1690,6 +1696,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
   "cci" = dontDistribute super."cci";
@@ -1766,7 +1773,13 @@ self: super: {
   "clanki" = dontDistribute super."clanki";
   "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
+  "clash-ghc" = doDistribute super."clash-ghc_0_6_7";
+  "clash-lib" = doDistribute super."clash-lib_0_6_7";
+  "clash-prelude" = doDistribute super."clash-prelude_0_10_4";
   "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck";
+  "clash-systemverilog" = doDistribute super."clash-systemverilog_0_6_3";
+  "clash-verilog" = doDistribute super."clash-verilog_0_6_3";
+  "clash-vhdl" = doDistribute super."clash-vhdl_0_6_4";
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
@@ -1816,6 +1829,7 @@ self: super: {
   "codecov-haskell" = dontDistribute super."codecov-haskell";
   "codemonitor" = dontDistribute super."codemonitor";
   "codepad" = dontDistribute super."codepad";
+  "codex" = doDistribute super."codex_0_4_0_6";
   "codo-notation" = dontDistribute super."codo-notation";
   "cofunctor" = dontDistribute super."cofunctor";
   "cognimeta-utils" = dontDistribute super."cognimeta-utils";
@@ -2344,6 +2358,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -2912,6 +2927,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
   "ghc-events-parallel" = dontDistribute super."ghc-events-parallel";
@@ -2988,6 +3004,7 @@ self: super: {
   "gitlib-s3" = dontDistribute super."gitlib-s3";
   "gitlib-sample" = dontDistribute super."gitlib-sample";
   "gitlib-utils" = dontDistribute super."gitlib-utils";
+  "gitrev" = doDistribute super."gitrev_1_1_0";
   "gitter" = dontDistribute super."gitter";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
@@ -3185,6 +3202,7 @@ self: super: {
   "grm" = dontDistribute super."grm";
   "groundhog-inspector" = dontDistribute super."groundhog-inspector";
   "group-with" = dontDistribute super."group-with";
+  "grouped-list" = doDistribute super."grouped-list_0_2_1_0";
   "groupoid" = dontDistribute super."groupoid";
   "growler" = dontDistribute super."growler";
   "gruff" = dontDistribute super."gruff";
@@ -3499,6 +3517,7 @@ self: super: {
   "hasloGUI" = dontDistribute super."hasloGUI";
   "hasparql-client" = dontDistribute super."hasparql-client";
   "haspell" = dontDistribute super."haspell";
+  "hasql" = doDistribute super."hasql_0_15_1";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = dontDistribute super."hasql-postgres";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -3551,6 +3570,7 @@ self: super: {
   "hdbi-postgresql" = dontDistribute super."hdbi-postgresql";
   "hdbi-sqlite" = dontDistribute super."hdbi-sqlite";
   "hdbi-tests" = dontDistribute super."hdbi-tests";
+  "hdevtools" = doDistribute super."hdevtools_0_1_2_1";
   "hdf" = dontDistribute super."hdf";
   "hdigest" = dontDistribute super."hdigest";
   "hdirect" = dontDistribute super."hdirect";
@@ -3577,6 +3597,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -3621,6 +3642,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfusion" = dontDistribute super."hfusion";
@@ -3741,6 +3763,7 @@ self: super: {
   "hnop" = dontDistribute super."hnop";
   "ho-rewriting" = dontDistribute super."ho-rewriting";
   "hoauth" = dontDistribute super."hoauth";
+  "hoauth2" = doDistribute super."hoauth2_0_5_0";
   "hob" = dontDistribute super."hob";
   "hobbes" = dontDistribute super."hobbes";
   "hobbits" = dontDistribute super."hobbits";
@@ -4039,6 +4062,7 @@ self: super: {
   "huffman" = dontDistribute super."huffman";
   "hugs2yc" = dontDistribute super."hugs2yc";
   "hulk" = dontDistribute super."hulk";
+  "human-readable-duration" = doDistribute super."human-readable-duration_0_1_0_0";
   "hums" = dontDistribute super."hums";
   "hunch" = dontDistribute super."hunch";
   "hunit-gui" = dontDistribute super."hunit-gui";
@@ -4689,6 +4713,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
   "lss" = dontDistribute super."lss";
@@ -4804,6 +4830,7 @@ self: super: {
   "medium-sdk-haskell" = dontDistribute super."medium-sdk-haskell";
   "meep" = dontDistribute super."meep";
   "mega-sdist" = dontDistribute super."mega-sdist";
+  "megaparsec" = doDistribute super."megaparsec_4_2_0";
   "meldable-heap" = dontDistribute super."meldable-heap";
   "melody" = dontDistribute super."melody";
   "memcache" = dontDistribute super."memcache";
@@ -4813,6 +4840,7 @@ self: super: {
   "memexml" = dontDistribute super."memexml";
   "memo-ptr" = dontDistribute super."memo-ptr";
   "memo-sqlite" = dontDistribute super."memo-sqlite";
+  "memory" = doDistribute super."memory_0_10";
   "memscript" = dontDistribute super."memscript";
   "mersenne-random" = dontDistribute super."mersenne-random";
   "messente" = dontDistribute super."messente";
@@ -4904,6 +4932,7 @@ self: super: {
   "monad-gen" = dontDistribute super."monad-gen";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-logger" = doDistribute super."monad-logger_0_3_16";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
   "monad-memo" = dontDistribute super."monad-memo";
@@ -4999,6 +5028,7 @@ self: super: {
   "multirec" = dontDistribute super."multirec";
   "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver";
   "multirec-binary" = dontDistribute super."multirec-binary";
+  "multiset" = doDistribute super."multiset_0_3_0";
   "multiset-comb" = dontDistribute super."multiset-comb";
   "multisetrewrite" = dontDistribute super."multisetrewrite";
   "multistate" = dontDistribute super."multistate";
@@ -5578,6 +5608,7 @@ self: super: {
   "postgresql-error-codes" = dontDistribute super."postgresql-error-codes";
   "postgresql-orm" = dontDistribute super."postgresql-orm";
   "postgresql-query" = dontDistribute super."postgresql-query";
+  "postgresql-schema" = doDistribute super."postgresql-schema_0_1_9";
   "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
@@ -5954,8 +5985,10 @@ self: super: {
   "restricted-workers" = dontDistribute super."restricted-workers";
   "restyle" = dontDistribute super."restyle";
   "resumable-exceptions" = dontDistribute super."resumable-exceptions";
+  "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_20";
   "rethinkdb-model" = dontDistribute super."rethinkdb-model";
   "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
+  "retry" = doDistribute super."retry_0_7_0_1";
   "retryer" = dontDistribute super."retryer";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
@@ -6217,6 +6250,7 @@ self: super: {
   "shake-pack" = dontDistribute super."shake-pack";
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
@@ -6457,6 +6491,7 @@ self: super: {
   "splaytree" = dontDistribute super."splaytree";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -6789,6 +6824,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show-instances" = dontDistribute super."text-show-instances";
@@ -6953,6 +6989,7 @@ self: super: {
   "trivia" = dontDistribute super."trivia";
   "trivial-constraint" = dontDistribute super."trivial-constraint";
   "tropical" = dontDistribute super."tropical";
+  "true-name" = doDistribute super."true-name_0_0_0_2";
   "truelevel" = dontDistribute super."truelevel";
   "trurl" = dontDistribute super."trurl";
   "truthful" = dontDistribute super."truthful";
@@ -7262,6 +7299,7 @@ self: super: {
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
   "wai-dispatch" = dontDistribute super."wai-dispatch";
+  "wai-extra" = doDistribute super."wai-extra_3_0_13_1";
   "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi";
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
@@ -7273,10 +7311,12 @@ self: super: {
   "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
   "wai-lens" = dontDistribute super."wai-lens";
   "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger" = doDistribute super."wai-logger_2_2_4_1";
   "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
   "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
   "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
   "wai-middleware-catch" = dontDistribute super."wai-middleware-catch";
+  "wai-middleware-crowd" = doDistribute super."wai-middleware-crowd_0_1_3";
   "wai-middleware-etag" = dontDistribute super."wai-middleware-etag";
   "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip";
   "wai-middleware-headers" = dontDistribute super."wai-middleware-headers";
@@ -7288,6 +7328,7 @@ self: super: {
   "wai-request-spec" = dontDistribute super."wai-request-spec";
   "wai-responsible" = dontDistribute super."wai-responsible";
   "wai-router" = dontDistribute super."wai-router";
+  "wai-routes" = doDistribute super."wai-routes_0_9_4";
   "wai-session-alt" = dontDistribute super."wai-session-alt";
   "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
   "wai-session-postgresql" = doDistribute super."wai-session-postgresql_0_2_0_3";
@@ -7326,6 +7367,7 @@ self: super: {
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
   "webcrank-wai" = dontDistribute super."webcrank-wai";
+  "webdriver" = doDistribute super."webdriver_0_8_0_4";
   "webdriver-snoy" = dontDistribute super."webdriver-snoy";
   "webfinger-client" = dontDistribute super."webfinger-client";
   "webidl" = dontDistribute super."webidl";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.1.nix b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
index b95fbc7a60af..494b5bf628a7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
@@ -451,6 +451,7 @@ self: super: {
   "HTTP-Simple" = dontDistribute super."HTTP-Simple";
   "HTab" = dontDistribute super."HTab";
   "HTicTacToe" = dontDistribute super."HTicTacToe";
+  "HUnit" = doDistribute super."HUnit_1_3_0_0";
   "HUnit-Diff" = dontDistribute super."HUnit-Diff";
   "HUnit-Plus" = dontDistribute super."HUnit-Plus";
   "HUnit-approx" = dontDistribute super."HUnit-approx";
@@ -532,6 +533,7 @@ self: super: {
   "InfixApplicative" = dontDistribute super."InfixApplicative";
   "Interpolation" = dontDistribute super."Interpolation";
   "Interpolation-maxs" = dontDistribute super."Interpolation-maxs";
+  "IntervalMap" = doDistribute super."IntervalMap_0_4_1_1";
   "Irc" = dontDistribute super."Irc";
   "IrrHaskell" = dontDistribute super."IrrHaskell";
   "IsNull" = dontDistribute super."IsNull";
@@ -1092,6 +1094,7 @@ self: super: {
   "air-spec" = dontDistribute super."air-spec";
   "air-th" = dontDistribute super."air-th";
   "airbrake" = dontDistribute super."airbrake";
+  "airship" = doDistribute super."airship_0_4_2_0";
   "aivika" = dontDistribute super."aivika";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
@@ -1249,6 +1252,7 @@ self: super: {
   "atomic-write" = dontDistribute super."atomic-write";
   "atomo" = dontDistribute super."atomo";
   "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
   "attempt" = dontDistribute super."attempt";
   "atto-lisp" = dontDistribute super."atto-lisp";
   "attoparsec-arff" = dontDistribute super."attoparsec-arff";
@@ -1451,7 +1455,9 @@ self: super: {
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
   "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
   "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
   "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
   "biosff" = dontDistribute super."biosff";
   "biostockholm" = dontDistribute super."biostockholm";
@@ -1556,6 +1562,7 @@ self: super: {
   "buster" = dontDistribute super."buster";
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
+  "bustle" = doDistribute super."bustle_0_5_2";
   "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
@@ -1686,6 +1693,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
   "cci" = dontDistribute super."cci";
@@ -1762,7 +1770,13 @@ self: super: {
   "clanki" = dontDistribute super."clanki";
   "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
+  "clash-ghc" = doDistribute super."clash-ghc_0_6_7";
+  "clash-lib" = doDistribute super."clash-lib_0_6_7";
+  "clash-prelude" = doDistribute super."clash-prelude_0_10_4";
   "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck";
+  "clash-systemverilog" = doDistribute super."clash-systemverilog_0_6_3";
+  "clash-verilog" = doDistribute super."clash-verilog_0_6_3";
+  "clash-vhdl" = doDistribute super."clash-vhdl_0_6_4";
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
@@ -1812,6 +1826,7 @@ self: super: {
   "codecov-haskell" = dontDistribute super."codecov-haskell";
   "codemonitor" = dontDistribute super."codemonitor";
   "codepad" = dontDistribute super."codepad";
+  "codex" = doDistribute super."codex_0_4_0_6";
   "codo-notation" = dontDistribute super."codo-notation";
   "cofunctor" = dontDistribute super."cofunctor";
   "cognimeta-utils" = dontDistribute super."cognimeta-utils";
@@ -2339,6 +2354,7 @@ self: super: {
   "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
   "doctest-prop" = dontDistribute super."doctest-prop";
   "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
   "dom-selector" = dontDistribute super."dom-selector";
   "domain-auth" = dontDistribute super."domain-auth";
   "dominion" = dontDistribute super."dominion";
@@ -2903,6 +2919,7 @@ self: super: {
   "ghc-core" = dontDistribute super."ghc-core";
   "ghc-core-html" = dontDistribute super."ghc-core-html";
   "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
   "ghc-dup" = dontDistribute super."ghc-dup";
   "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
   "ghc-events-parallel" = dontDistribute super."ghc-events-parallel";
@@ -2979,6 +2996,7 @@ self: super: {
   "gitlib-s3" = dontDistribute super."gitlib-s3";
   "gitlib-sample" = dontDistribute super."gitlib-sample";
   "gitlib-utils" = dontDistribute super."gitlib-utils";
+  "gitrev" = doDistribute super."gitrev_1_1_0";
   "gitter" = dontDistribute super."gitter";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
@@ -3176,6 +3194,7 @@ self: super: {
   "grm" = dontDistribute super."grm";
   "groundhog-inspector" = dontDistribute super."groundhog-inspector";
   "group-with" = dontDistribute super."group-with";
+  "grouped-list" = doDistribute super."grouped-list_0_2_1_0";
   "groupoid" = dontDistribute super."groupoid";
   "growler" = dontDistribute super."growler";
   "gruff" = dontDistribute super."gruff";
@@ -3490,6 +3509,7 @@ self: super: {
   "hasloGUI" = dontDistribute super."hasloGUI";
   "hasparql-client" = dontDistribute super."hasparql-client";
   "haspell" = dontDistribute super."haspell";
+  "hasql" = doDistribute super."hasql_0_15_1";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = dontDistribute super."hasql-postgres";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -3542,6 +3562,7 @@ self: super: {
   "hdbi-postgresql" = dontDistribute super."hdbi-postgresql";
   "hdbi-sqlite" = dontDistribute super."hdbi-sqlite";
   "hdbi-tests" = dontDistribute super."hdbi-tests";
+  "hdevtools" = doDistribute super."hdevtools_0_1_2_1";
   "hdf" = dontDistribute super."hdf";
   "hdigest" = dontDistribute super."hdigest";
   "hdirect" = dontDistribute super."hdirect";
@@ -3567,6 +3588,7 @@ self: super: {
   "helics-wai" = dontDistribute super."helics-wai";
   "helisp" = dontDistribute super."helisp";
   "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
   "hell" = dontDistribute super."hell";
   "hellage" = dontDistribute super."hellage";
   "hellnet" = dontDistribute super."hellnet";
@@ -3611,6 +3633,7 @@ self: super: {
   "hfiar" = dontDistribute super."hfiar";
   "hfmt" = dontDistribute super."hfmt";
   "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
   "hfov" = dontDistribute super."hfov";
   "hfractal" = dontDistribute super."hfractal";
   "hfusion" = dontDistribute super."hfusion";
@@ -3731,6 +3754,7 @@ self: super: {
   "hnop" = dontDistribute super."hnop";
   "ho-rewriting" = dontDistribute super."ho-rewriting";
   "hoauth" = dontDistribute super."hoauth";
+  "hoauth2" = doDistribute super."hoauth2_0_5_0";
   "hob" = dontDistribute super."hob";
   "hobbes" = dontDistribute super."hobbes";
   "hobbits" = dontDistribute super."hobbits";
@@ -4029,6 +4053,7 @@ self: super: {
   "huffman" = dontDistribute super."huffman";
   "hugs2yc" = dontDistribute super."hugs2yc";
   "hulk" = dontDistribute super."hulk";
+  "human-readable-duration" = doDistribute super."human-readable-duration_0_1_0_0";
   "hums" = dontDistribute super."hums";
   "hunch" = dontDistribute super."hunch";
   "hunit-gui" = dontDistribute super."hunit-gui";
@@ -4671,6 +4696,8 @@ self: super: {
   "loshadka" = dontDistribute super."loshadka";
   "lostcities" = dontDistribute super."lostcities";
   "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
   "ls-usb" = dontDistribute super."ls-usb";
   "lscabal" = dontDistribute super."lscabal";
   "lss" = dontDistribute super."lss";
@@ -4786,6 +4813,7 @@ self: super: {
   "medium-sdk-haskell" = dontDistribute super."medium-sdk-haskell";
   "meep" = dontDistribute super."meep";
   "mega-sdist" = dontDistribute super."mega-sdist";
+  "megaparsec" = doDistribute super."megaparsec_4_2_0";
   "meldable-heap" = dontDistribute super."meldable-heap";
   "melody" = dontDistribute super."melody";
   "memcache" = dontDistribute super."memcache";
@@ -4795,6 +4823,7 @@ self: super: {
   "memexml" = dontDistribute super."memexml";
   "memo-ptr" = dontDistribute super."memo-ptr";
   "memo-sqlite" = dontDistribute super."memo-sqlite";
+  "memory" = doDistribute super."memory_0_10";
   "memscript" = dontDistribute super."memscript";
   "mersenne-random" = dontDistribute super."mersenne-random";
   "messente" = dontDistribute super."messente";
@@ -4886,6 +4915,7 @@ self: super: {
   "monad-gen" = dontDistribute super."monad-gen";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-logger" = doDistribute super."monad-logger_0_3_16";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
   "monad-memo" = dontDistribute super."monad-memo";
@@ -4981,6 +5011,7 @@ self: super: {
   "multirec" = dontDistribute super."multirec";
   "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver";
   "multirec-binary" = dontDistribute super."multirec-binary";
+  "multiset" = doDistribute super."multiset_0_3_0";
   "multiset-comb" = dontDistribute super."multiset-comb";
   "multisetrewrite" = dontDistribute super."multisetrewrite";
   "multistate" = dontDistribute super."multistate";
@@ -5558,6 +5589,7 @@ self: super: {
   "postgresql-error-codes" = dontDistribute super."postgresql-error-codes";
   "postgresql-orm" = dontDistribute super."postgresql-orm";
   "postgresql-query" = dontDistribute super."postgresql-query";
+  "postgresql-schema" = doDistribute super."postgresql-schema_0_1_9";
   "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
   "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
   "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
@@ -5933,8 +5965,10 @@ self: super: {
   "restricted-workers" = dontDistribute super."restricted-workers";
   "restyle" = dontDistribute super."restyle";
   "resumable-exceptions" = dontDistribute super."resumable-exceptions";
+  "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_20";
   "rethinkdb-model" = dontDistribute super."rethinkdb-model";
   "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
+  "retry" = doDistribute super."retry_0_7_0_1";
   "retryer" = dontDistribute super."retryer";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
@@ -6196,6 +6230,7 @@ self: super: {
   "shake-pack" = dontDistribute super."shake-pack";
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
   "shakespeare-js" = dontDistribute super."shakespeare-js";
@@ -6436,6 +6471,7 @@ self: super: {
   "splaytree" = dontDistribute super."splaytree";
   "spline3" = dontDistribute super."spline3";
   "splines" = dontDistribute super."splines";
+  "split" = doDistribute super."split_0_2_2";
   "split-channel" = dontDistribute super."split-channel";
   "split-record" = dontDistribute super."split-record";
   "split-tchan" = dontDistribute super."split-tchan";
@@ -6768,6 +6804,7 @@ self: super: {
   "text-postgresql" = dontDistribute super."text-postgresql";
   "text-printer" = dontDistribute super."text-printer";
   "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
   "text-register-machine" = dontDistribute super."text-register-machine";
   "text-render" = dontDistribute super."text-render";
   "text-show-instances" = dontDistribute super."text-show-instances";
@@ -6932,6 +6969,7 @@ self: super: {
   "trivia" = dontDistribute super."trivia";
   "trivial-constraint" = dontDistribute super."trivial-constraint";
   "tropical" = dontDistribute super."tropical";
+  "true-name" = doDistribute super."true-name_0_0_0_2";
   "truelevel" = dontDistribute super."truelevel";
   "trurl" = dontDistribute super."trurl";
   "truthful" = dontDistribute super."truthful";
@@ -7240,6 +7278,7 @@ self: super: {
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
   "wai-dispatch" = dontDistribute super."wai-dispatch";
+  "wai-extra" = doDistribute super."wai-extra_3_0_13_1";
   "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi";
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
@@ -7251,10 +7290,12 @@ self: super: {
   "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
   "wai-lens" = dontDistribute super."wai-lens";
   "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger" = doDistribute super."wai-logger_2_2_4_1";
   "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
   "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
   "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
   "wai-middleware-catch" = dontDistribute super."wai-middleware-catch";
+  "wai-middleware-crowd" = doDistribute super."wai-middleware-crowd_0_1_3";
   "wai-middleware-etag" = dontDistribute super."wai-middleware-etag";
   "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip";
   "wai-middleware-headers" = dontDistribute super."wai-middleware-headers";
@@ -7266,6 +7307,7 @@ self: super: {
   "wai-request-spec" = dontDistribute super."wai-request-spec";
   "wai-responsible" = dontDistribute super."wai-responsible";
   "wai-router" = dontDistribute super."wai-router";
+  "wai-routes" = doDistribute super."wai-routes_0_9_4";
   "wai-session-alt" = dontDistribute super."wai-session-alt";
   "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
   "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
@@ -7303,6 +7345,7 @@ self: super: {
   "webcrank" = dontDistribute super."webcrank";
   "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
   "webcrank-wai" = dontDistribute super."webcrank-wai";
+  "webdriver" = doDistribute super."webdriver_0_8_0_4";
   "webdriver-snoy" = dontDistribute super."webdriver-snoy";
   "webfinger-client" = dontDistribute super."webfinger-client";
   "webidl" = dontDistribute super."webidl";
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 80d9a5e83c69..72a545083449 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -2273,8 +2273,8 @@ self: {
     ({ mkDerivation, array, base, containers, mtl, parsec, readline }:
      mkDerivation {
        pname = "CPL";
-       version = "0.0.7";
-       sha256 = "27bf5fc5dbc64f1f739250409350ea21143ee4e40594fe72c32e5cb62dd5a2c2";
+       version = "0.0.8";
+       sha256 = "20d364f60d8250b8a0f07da0864e02815b1527ced1e52b213c5def85339e9438";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -9190,7 +9190,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "HUnit" = callPackage
+  "HUnit_1_3_0_0" = callPackage
     ({ mkDerivation, base, deepseq, filepath }:
      mkDerivation {
        pname = "HUnit";
@@ -9203,9 +9203,10 @@ self: {
        homepage = "http://hunit.sourceforge.net/";
        description = "A unit testing framework for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "HUnit_1_3_1_0" = callPackage
+  "HUnit" = callPackage
     ({ mkDerivation, base, deepseq, filepath }:
      mkDerivation {
        pname = "HUnit";
@@ -9216,7 +9217,6 @@ self: {
        homepage = "http://hunit.sourceforge.net/";
        description = "A unit testing framework for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HUnit-Diff" = callPackage
@@ -11074,7 +11074,7 @@ self: {
        license = "unknown";
      }) {};
 
-  "IntervalMap" = callPackage
+  "IntervalMap_0_4_1_1" = callPackage
     ({ mkDerivation, base, Cabal, containers, deepseq, QuickCheck }:
      mkDerivation {
        pname = "IntervalMap";
@@ -11085,6 +11085,20 @@ self: {
        homepage = "http://www.chr-breitkopf.de/comp/IntervalMap";
        description = "Maps from Intervals to values, with efficient search";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "IntervalMap" = callPackage
+    ({ mkDerivation, base, Cabal, containers, deepseq, QuickCheck }:
+     mkDerivation {
+       pname = "IntervalMap";
+       version = "0.5.0.0";
+       sha256 = "c4d156c11b6433cf3d31204bd0e6d81aafa9bc9cf6c07ea0a6eac874cea13b1d";
+       libraryHaskellDepends = [ base containers deepseq ];
+       testHaskellDepends = [ base Cabal containers deepseq QuickCheck ];
+       homepage = "http://www.chr-breitkopf.de/comp/IntervalMap";
+       description = "Containers for intervals, with efficient search";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "Irc" = callPackage
@@ -11619,6 +11633,8 @@ self: {
        pname = "JuicyPixels-scale-dct";
        version = "0.1.1.0";
        sha256 = "dc7ee68f2e28e2b2344bdaabd5810ebfc15353d4013cd10387289189e8bae9f9";
+       revision = "1";
+       editedCabalFile = "5b187d4f46adbd5ff68ddda4f2f0221370dc3f4f47d7a95f652d147a7bd9f36a";
        libraryHaskellDepends = [
          base base-compat carray fft JuicyPixels
        ];
@@ -15693,6 +15709,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "QuickCheck_2_8_2" = callPackage
+    ({ mkDerivation, base, containers, random, template-haskell
+     , test-framework, tf-random, transformers
+     }:
+     mkDerivation {
+       pname = "QuickCheck";
+       version = "2.8.2";
+       sha256 = "98c64de1e2dbf801c54dcdcb8ddc33b3569e0da38b39d711ee6ac505769926aa";
+       libraryHaskellDepends = [
+         base containers random template-haskell tf-random transformers
+       ];
+       testHaskellDepends = [
+         base containers template-haskell test-framework
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/nick8325/quickcheck";
+       description = "Automatic testing of Haskell programs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "QuickCheck-GenT" = callPackage
     ({ mkDerivation, base, mtl, QuickCheck, random }:
      mkDerivation {
@@ -17187,16 +17224,17 @@ self: {
 
   "ShellCheck" = callPackage
     ({ mkDerivation, base, containers, directory, json, mtl, parsec
-     , QuickCheck, regex-tdfa
+     , process, QuickCheck, regex-tdfa
      }:
      mkDerivation {
        pname = "ShellCheck";
-       version = "0.4.2";
-       sha256 = "26a4a0be02cf2dd443b60e0b4900cbe278c207f6118af6a1d95bee70e02221e3";
+       version = "0.4.3";
+       sha256 = "df71c303c43ae79846c9f9198a4d4ba2c4c2ee4c06974491d7130fcea0b8efdf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base containers directory json mtl parsec QuickCheck regex-tdfa
+         base containers directory json mtl parsec process QuickCheck
+         regex-tdfa
        ];
        executableHaskellDepends = [
          base containers directory json mtl parsec QuickCheck regex-tdfa
@@ -18931,12 +18969,13 @@ self: {
      }) {};
 
   "TypeCompose" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, base-orphans }:
      mkDerivation {
        pname = "TypeCompose";
-       version = "0.9.10";
-       sha256 = "b8775cdd8239bfba32b9cc62abf44124bc39be907b5fa29d19f433e31a6ef4f2";
-       libraryHaskellDepends = [ base ];
+       version = "0.9.11";
+       sha256 = "124c2f9971aa8e45c8cc4f706407f9c28805e63b387400a0b2b9e115aa22044a";
+       libraryHaskellDepends = [ base base-orphans ];
+       jailbreak = true;
        homepage = "https://github.com/conal/TypeCompose";
        description = "Type composition classes & instances";
        license = stdenv.lib.licenses.bsd3;
@@ -22186,6 +22225,8 @@ self: {
        pname = "aeson";
        version = "0.8.0.2";
        sha256 = "0707588dfb5fdfe787eba5b3d5a9950acb224a8dae9dcdcfc9c974ae2b6788d5";
+       revision = "1";
+       editedCabalFile = "8062e672ca956e133718772983f98be0fda9990c431299afab8b4e22703c943c";
        libraryHaskellDepends = [
          attoparsec base bytestring containers deepseq dlist ghc-prim
          hashable mtl scientific syb template-haskell text time
@@ -22213,6 +22254,8 @@ self: {
        pname = "aeson";
        version = "0.10.0.0";
        sha256 = "3fefae24f68fcb47371e8b13664b47f7343e00b21d65efeb6824efe8f21877a6";
+       revision = "1";
+       editedCabalFile = "e0c6473d5afc602a085c78ec97731f29d4c85581f2d4d7df8df251cfae78bd45";
        libraryHaskellDepends = [
          attoparsec base bytestring containers deepseq dlist ghc-prim
          hashable mtl scientific syb template-haskell text time transformers
@@ -22434,6 +22477,8 @@ self: {
        pname = "aeson-extra";
        version = "0.3.0.0";
        sha256 = "b9e54cf293c25bbd5646a777cf71a23c4158b708dd358fe3e705add326d5870f";
+       revision = "1";
+       editedCabalFile = "a6142a2f67fa6c7363339934a13aa920c1b20c5fcd9312932617470fba9b0328";
        libraryHaskellDepends = [
          aeson aeson-compat base base-compat bytestring containers
          exceptions hashable parsec scientific template-haskell text time
@@ -23134,7 +23179,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "airship" = callPackage
+  "airship_0_4_2_0" = callPackage
     ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder
      , bytestring, bytestring-trie, case-insensitive, cryptohash
      , directory, either, filepath, http-date, http-media, http-types
@@ -23162,9 +23207,10 @@ self: {
        homepage = "https://github.com/helium/airship/";
        description = "A Webmachine-inspired HTTP library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "airship_0_4_3_0" = callPackage
+  "airship" = callPackage
     ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder
      , bytestring, bytestring-trie, case-insensitive, cryptohash
      , directory, either, filepath, http-date, http-media, http-types
@@ -23192,7 +23238,6 @@ self: {
        homepage = "https://github.com/helium/airship/";
        description = "A Webmachine-inspired HTTP library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aivika" = callPackage
@@ -30699,6 +30744,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "atrans" = callPackage
+    ({ mkDerivation, base, mtl }:
+     mkDerivation {
+       pname = "atrans";
+       version = "0.1.0.1";
+       sha256 = "84440b6c0a27c656a580df640db912a19eb0fb5aaa09a1437f451b5809ee6035";
+       libraryHaskellDepends = [ base mtl ];
+       homepage = "https://github.com/aphorisme/atrans";
+       description = "A small collection of monad (transformer) instances";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "attempt" = callPackage
     ({ mkDerivation, base, failure }:
      mkDerivation {
@@ -31477,6 +31534,7 @@ self: {
          rethinkdb-client-driver scrypt stm text time unordered-containers
          vector
        ];
+       jailbreak = true;
        description = "empty";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -33058,6 +33116,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "base-compat_0_9_0" = callPackage
+    ({ mkDerivation, base, hspec, QuickCheck, unix }:
+     mkDerivation {
+       pname = "base-compat";
+       version = "0.9.0";
+       sha256 = "8317b62e0655cd0f1ce46856df50ec948d829065e870b8ccf63dc7223c6c04c1";
+       libraryHaskellDepends = [ base unix ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       description = "A compatibility layer for base";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "base-generics" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -33143,6 +33214,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "base-orphans_0_5_0" = callPackage
+    ({ mkDerivation, base, ghc-prim, hspec, QuickCheck }:
+     mkDerivation {
+       pname = "base-orphans";
+       version = "0.5.0";
+       sha256 = "05ea25f680c0acc65a99acbb39413761181b334566c9be1fcac1c1df8a2d6428";
+       libraryHaskellDepends = [ base ghc-prim ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       homepage = "https://github.com/haskell-compat/base-orphans#readme";
+       description = "Backwards-compatible orphan instances for base";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "base-prelude_0_1_6" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -35963,6 +36048,19 @@ self: {
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
+  "bini" = callPackage
+    ({ mkDerivation, base, binary, bytestring }:
+     mkDerivation {
+       pname = "bini";
+       version = "0.1.3";
+       sha256 = "0230985959d9bd82d014ce62e14768cb46cb0b78b77f7ab34d07208976c00981";
+       revision = "1";
+       editedCabalFile = "9ea37e003df728ff0addc67d1ff8d15533a4baa4c525339c4638bad137d6c953";
+       libraryHaskellDepends = [ base binary bytestring ];
+       description = "A collection of various methods for reading and writing bini files";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "bio" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , directory, mtl, old-time, parallel, parsec, process, QuickCheck
@@ -36049,6 +36147,39 @@ self: {
        license = "LGPL";
      }) {};
 
+  "biohazard" = callPackage
+    ({ mkDerivation, aeson, array, async, attoparsec, base, binary
+     , bytestring, bytestring-mmap, containers, deepseq, directory
+     , exceptions, filepath, hashable, iteratee, ListLike
+     , nonlinear-optimization, primitive, random, scientific, stm
+     , template-haskell, text, transformers, unix, unordered-containers
+     , Vec, vector, vector-algorithms, vector-th-unbox, zlib
+     }:
+     mkDerivation {
+       pname = "biohazard";
+       version = "0.6.2";
+       sha256 = "0038256ab3a4072bd542b7fcdcf4a68ee2bd4afce14664bf4c2b3cb04fdef8c2";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson array async attoparsec base binary bytestring bytestring-mmap
+         containers directory exceptions filepath iteratee ListLike
+         primitive random scientific stm template-haskell text transformers
+         unix unordered-containers Vec vector vector-algorithms
+         vector-th-unbox zlib
+       ];
+       executableHaskellDepends = [
+         aeson async base binary bytestring containers deepseq directory
+         exceptions hashable iteratee nonlinear-optimization random text
+         transformers unordered-containers vector vector-algorithms
+         vector-th-unbox
+       ];
+       jailbreak = true;
+       homepage = "http://github.com/udo-stenzel/biohazard";
+       description = "bioinformatics support library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "bioinformatics-toolkit" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bbi, binary, bytestring
      , bytestring-lexing, clustering, colour, conduit, containers
@@ -39089,7 +39220,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "bustle" = callPackage
+  "bustle_0_5_2" = callPackage
     ({ mkDerivation, base, bytestring, cairo, containers, dbus
      , directory, filepath, gio, glib, gtk3, hgettext, HUnit, mtl, pango
      , parsec, pcap, process, QuickCheck, setlocale, test-framework
@@ -39116,7 +39247,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "bustle_0_5_3" = callPackage
+  "bustle" = callPackage
     ({ mkDerivation, base, bytestring, cairo, containers, dbus
      , directory, filepath, gio, glib, gtk3, hgettext, HUnit, mtl, pango
      , parsec, pcap, process, QuickCheck, setlocale, test-framework
@@ -40862,6 +40993,7 @@ self: {
        executableHaskellDepends = [
          base bytestring containers directory HTTP process tar
        ];
+       jailbreak = true;
        homepage = "http://github.com/snoyberg/cabal-nirvana";
        description = "Avoid Cabal dependency hell by constraining to known good versions. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
@@ -41093,6 +41225,7 @@ self: {
          http-conduit http-types network process resourcet shelly
          system-fileio system-filepath tar text transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/yesodweb/cabal-src";
        description = "Alternative install procedure to avoid the diamond dependency issue";
        license = stdenv.lib.licenses.bsd3;
@@ -41118,6 +41251,7 @@ self: {
          http-conduit http-types network process resourcet shelly
          system-fileio system-filepath tar temporary text transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/yesodweb/cabal-src";
        description = "Alternative install procedure to avoid the diamond dependency issue";
        license = stdenv.lib.licenses.bsd3;
@@ -41144,6 +41278,7 @@ self: {
          streaming-commons system-fileio system-filepath tar temporary text
          transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/yesodweb/cabal-src";
        description = "Alternative install procedure to avoid the diamond dependency issue";
        license = stdenv.lib.licenses.bsd3;
@@ -41167,6 +41302,7 @@ self: {
          http-conduit http-types network process resourcet shelly
          system-fileio system-filepath tar text transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/yesodweb/cabal-src";
        description = "Alternative install procedure to avoid the diamond dependency issue";
        license = stdenv.lib.licenses.bsd3;
@@ -43094,7 +43230,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "cayley-client" = callPackage
+  "cayley-client_0_1_4_0" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, exceptions
      , http-client, http-conduit, lens, lens-aeson, mtl, text
      , transformers, unordered-containers, vector
@@ -43111,6 +43247,26 @@ self: {
        homepage = "https://github.com/MichelBoucey/cayley-client";
        description = "A Haskell client for the Cayley graph database";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "cayley-client" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, exceptions
+     , http-client, http-conduit, lens, lens-aeson, mtl, text
+     , transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "cayley-client";
+       version = "0.1.5.0";
+       sha256 = "9ad3361bda007e98dfc9977c81881d2ccfcb7a8bcded8996d6543c3b95b288b5";
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring exceptions http-client
+         http-conduit lens lens-aeson mtl text transformers
+         unordered-containers vector
+       ];
+       homepage = "https://github.com/MichelBoucey/cayley-client";
+       description = "A Haskell client for the Cayley graph database";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "cayley-dickson" = callPackage
@@ -45121,7 +45277,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "clash-ghc" = callPackage
+  "clash-ghc_0_6_7" = callPackage
     ({ mkDerivation, array, base, bifunctors, bytestring, clash-lib
      , clash-prelude, clash-systemverilog, clash-verilog, clash-vhdl
      , containers, directory, filepath, ghc, ghc-typelits-extra
@@ -45145,6 +45301,33 @@ self: {
        homepage = "http://www.clash-lang.org/";
        description = "CAES Language for Synchronous Hardware";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "clash-ghc" = callPackage
+    ({ mkDerivation, array, base, bifunctors, bytestring, clash-lib
+     , clash-prelude, clash-systemverilog, clash-verilog, clash-vhdl
+     , containers, directory, filepath, ghc, ghc-typelits-extra
+     , ghc-typelits-natnormalise, hashable, haskeline, lens, mtl
+     , process, text, transformers, unbound-generics, unix
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "clash-ghc";
+       version = "0.6.8";
+       sha256 = "3d7adf1cb5a895a2240fdd74f94540719cf804a0aa3eb3bfc89ef5b0a8644059";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         array base bifunctors bytestring clash-lib clash-prelude
+         clash-systemverilog clash-verilog clash-vhdl containers directory
+         filepath ghc ghc-typelits-extra ghc-typelits-natnormalise hashable
+         haskeline lens mtl process text transformers unbound-generics unix
+         unordered-containers
+       ];
+       homepage = "http://www.clash-lang.org/";
+       description = "CAES Language for Synchronous Hardware";
+       license = stdenv.lib.licenses.bsd2;
      }) {};
 
   "clash-lib_0_5_10" = callPackage
@@ -45243,7 +45426,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "clash-lib" = callPackage
+  "clash-lib_0_6_7" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude
      , concurrent-supply, containers, deepseq, directory, errors, fgl
      , filepath, hashable, lens, mtl, pretty, process, template-haskell
@@ -45263,6 +45446,29 @@ self: {
        homepage = "http://www.clash-lang.org/";
        description = "CAES Language for Synchronous Hardware - As a Library";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "clash-lib" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude
+     , concurrent-supply, containers, deepseq, directory, errors, fgl
+     , filepath, hashable, lens, mtl, pretty, process, template-haskell
+     , text, time, transformers, unbound-generics, unordered-containers
+     , uu-parsinglib, wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "clash-lib";
+       version = "0.6.8";
+       sha256 = "7582ce8364d2e3d2793555d7a80aa0ab90489cabbe9d8640272f9d95d7abec7d";
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring clash-prelude concurrent-supply
+         containers deepseq directory errors fgl filepath hashable lens mtl
+         pretty process template-haskell text time transformers
+         unbound-generics unordered-containers uu-parsinglib wl-pprint-text
+       ];
+       homepage = "http://www.clash-lang.org/";
+       description = "CAES Language for Synchronous Hardware - As a Library";
+       license = stdenv.lib.licenses.bsd2;
      }) {};
 
   "clash-prelude_0_9_2" = callPackage
@@ -45308,7 +45514,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "clash-prelude" = callPackage
+  "clash-prelude_0_10_4" = callPackage
     ({ mkDerivation, array, base, data-default, doctest, ghc-prim
      , ghc-typelits-extra, ghc-typelits-natnormalise, Glob, integer-gmp
      , lens, QuickCheck, reflection, singletons, template-haskell
@@ -45327,6 +45533,27 @@ self: {
        homepage = "http://www.clash-lang.org/";
        description = "CAES Language for Synchronous Hardware - Prelude library";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "clash-prelude" = callPackage
+    ({ mkDerivation, array, base, data-default, doctest, ghc-prim
+     , ghc-typelits-extra, ghc-typelits-natnormalise, integer-gmp, lens
+     , QuickCheck, reflection, singletons, template-haskell, th-lift
+     }:
+     mkDerivation {
+       pname = "clash-prelude";
+       version = "0.10.5";
+       sha256 = "5a840a84f1ec02f1c2537b4ee9de0a1d98b71c401e4726e298b108a5ccad39fb";
+       libraryHaskellDepends = [
+         array base data-default ghc-prim ghc-typelits-extra
+         ghc-typelits-natnormalise integer-gmp lens QuickCheck reflection
+         singletons template-haskell th-lift
+       ];
+       testHaskellDepends = [ base doctest ];
+       homepage = "http://www.clash-lang.org/";
+       description = "CAES Language for Synchronous Hardware - Prelude library";
+       license = stdenv.lib.licenses.bsd2;
      }) {};
 
   "clash-prelude-quickcheck" = callPackage
@@ -45414,7 +45641,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "clash-systemverilog" = callPackage
+  "clash-systemverilog_0_6_3" = callPackage
     ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl
      , text, unordered-containers, wl-pprint-text
      }:
@@ -45429,6 +45656,24 @@ self: {
        homepage = "http://www.clash-lang.org/";
        description = "CAES Language for Synchronous Hardware - SystemVerilog backend";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "clash-systemverilog" = callPackage
+    ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl
+     , text, unordered-containers, wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "clash-systemverilog";
+       version = "0.6.4";
+       sha256 = "18172fec133b0971b216997e6421ddbb5575431634f5543b17674d7fab2855e5";
+       libraryHaskellDepends = [
+         base clash-lib clash-prelude fgl lens mtl text unordered-containers
+         wl-pprint-text
+       ];
+       homepage = "http://www.clash-lang.org/";
+       description = "CAES Language for Synchronous Hardware - SystemVerilog backend";
+       license = stdenv.lib.licenses.bsd2;
      }) {};
 
   "clash-verilog_0_5_7" = callPackage
@@ -45503,7 +45748,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "clash-verilog" = callPackage
+  "clash-verilog_0_6_3" = callPackage
     ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl
      , text, unordered-containers, wl-pprint-text
      }:
@@ -45518,6 +45763,24 @@ self: {
        homepage = "http://www.clash-lang.org/";
        description = "CAES Language for Synchronous Hardware - Verilog backend";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "clash-verilog" = callPackage
+    ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl
+     , text, unordered-containers, wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "clash-verilog";
+       version = "0.6.4";
+       sha256 = "178fa48768fbdf99f121ee34701431c788451bcb2411cca2156cdf4bedc1b4da";
+       libraryHaskellDepends = [
+         base clash-lib clash-prelude fgl lens mtl text unordered-containers
+         wl-pprint-text
+       ];
+       homepage = "http://www.clash-lang.org/";
+       description = "CAES Language for Synchronous Hardware - Verilog backend";
+       license = stdenv.lib.licenses.bsd2;
      }) {};
 
   "clash-vhdl_0_5_8" = callPackage
@@ -45592,7 +45855,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "clash-vhdl" = callPackage
+  "clash-vhdl_0_6_4" = callPackage
     ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl
      , text, unordered-containers, wl-pprint-text
      }:
@@ -45607,6 +45870,24 @@ self: {
        homepage = "http://www.clash-lang.org/";
        description = "CAES Language for Synchronous Hardware - VHDL backend";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "clash-vhdl" = callPackage
+    ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl
+     , text, unordered-containers, wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "clash-vhdl";
+       version = "0.6.5";
+       sha256 = "a613685f811411452739bd13d6616be1314ec110e0f7b9a2f42e8d07d8c652f5";
+       libraryHaskellDepends = [
+         base clash-lib clash-prelude fgl lens mtl text unordered-containers
+         wl-pprint-text
+       ];
+       homepage = "http://www.clash-lang.org/";
+       description = "CAES Language for Synchronous Hardware - VHDL backend";
+       license = stdenv.lib.licenses.bsd2;
      }) {};
 
   "classify" = callPackage
@@ -47572,7 +47853,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "codex" = callPackage
+  "codex_0_4_0_6" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, cryptohash
      , directory, either, filepath, hackage-db, http-client, lens
      , machines, machines-directory, MissingH, monad-loops, network
@@ -47593,12 +47874,14 @@ self: {
          base bytestring Cabal directory either filepath hackage-db MissingH
          monad-loops network process transformers wreq yaml
        ];
+       jailbreak = true;
        homepage = "http://github.com/aloiscochard/codex";
        description = "A ctags file generator for cabal project dependencies";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "codex_0_4_0_8" = callPackage
+  "codex" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, cryptohash
      , directory, either, filepath, hackage-db, http-client, lens
      , machines, machines-directory, MissingH, monad-loops, network
@@ -47619,11 +47902,9 @@ self: {
          base bytestring Cabal directory either filepath hackage-db MissingH
          monad-loops network process transformers wreq yaml
        ];
-       jailbreak = true;
        homepage = "http://github.com/aloiscochard/codex";
        description = "A ctags file generator for cabal project dependencies";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "codo-notation" = callPackage
@@ -52387,8 +52668,8 @@ self: {
     ({ mkDerivation, array, base, containers, parallel }:
      mkDerivation {
        pname = "cpsa";
-       version = "2.5.3";
-       sha256 = "c7f2d323f0b558e8a39a387f21d7f93b8449f25082d7e8515cc7f805d2a31919";
+       version = "2.5.4";
+       sha256 = "d9b1c49aace29dda1189a711888ca39c6af4ab5adb4798e65a1bef489813449e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ array base containers parallel ];
@@ -56186,8 +56467,8 @@ self: {
     ({ mkDerivation, base, stm, transformers }:
      mkDerivation {
        pname = "data-ref";
-       version = "0.0.1";
-       sha256 = "6669a8b1351f826829a85d9b360bfc5328b316272dacb22f7186ef76824687ed";
+       version = "0.0.1.1";
+       sha256 = "a4dabee83c7419199791d0ebf7870f926b1ca834a361ecfeb3c134f7fa64f268";
        libraryHaskellDepends = [ base stm transformers ];
        homepage = "http://wiki.haskell.org/Mutable_variable";
        description = "Unify STRef and IORef in plain Haskell 98";
@@ -56736,30 +57017,14 @@ self: {
      }) {};
 
   "dawg-ord" = callPackage
-    ({ mkDerivation, base, containers, mtl, transformers, vector }:
-     mkDerivation {
-       pname = "dawg-ord";
-       version = "0.4.0.2";
-       sha256 = "a8f007ba497f5592d4e7a6253dcc7b1ed3c8885ec98506571b3135ac94c9e4be";
-       revision = "1";
-       editedCabalFile = "e855c06865af4ca1c876baf8c89cfe3479efb00501449f2bb717ad749161a638";
-       libraryHaskellDepends = [
-         base containers mtl transformers vector
-       ];
-       homepage = "https://github.com/kawu/dawg-ord";
-       description = "Directed acyclic word graphs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "dawg-ord_0_5_0_0" = callPackage
     ({ mkDerivation, base, containers, HUnit, mtl, smallcheck, tasty
      , tasty-hunit, tasty-quickcheck, tasty-smallcheck, transformers
      , vector
      }:
      mkDerivation {
        pname = "dawg-ord";
-       version = "0.5.0.0";
-       sha256 = "86d9ba955c6c03c5f9916d11d2c886f6ecdeae488dd3759da397efad2d9ab4cc";
+       version = "0.5.0.1";
+       sha256 = "febbe3a465f67931bf1a96069680c862b8cd9a423013f85e21204832626a5dee";
        libraryHaskellDepends = [
          base containers mtl transformers vector
        ];
@@ -56770,7 +57035,6 @@ self: {
        homepage = "https://github.com/kawu/dawg-ord";
        description = "Directed acyclic word graphs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dbcleaner" = callPackage
@@ -56901,6 +57165,32 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "dbus_0_10_12" = callPackage
+    ({ mkDerivation, base, bytestring, cereal, chell, chell-quickcheck
+     , containers, directory, filepath, libxml-sax, network, parsec
+     , process, QuickCheck, random, text, transformers, unix, vector
+     , xml-types
+     }:
+     mkDerivation {
+       pname = "dbus";
+       version = "0.10.12";
+       sha256 = "f6d7b5640eb03e9598e38b1a2b2e7af1e9d357f3f845fc9528f9750965b92d54";
+       libraryHaskellDepends = [
+         base bytestring cereal containers libxml-sax network parsec random
+         text transformers unix vector xml-types
+       ];
+       testHaskellDepends = [
+         base bytestring cereal chell chell-quickcheck containers directory
+         filepath libxml-sax network parsec process QuickCheck random text
+         transformers unix vector xml-types
+       ];
+       doCheck = false;
+       homepage = "https://john-millikin.com/software/haskell-dbus/";
+       description = "A client library for the D-Bus IPC system";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "dbus-client" = callPackage
     ({ mkDerivation, base, containers, dbus-core, monads-tf, text
      , transformers
@@ -59147,14 +59437,13 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-canvas";
-       version = "1.3.0.2";
-       sha256 = "0c5cd38a5a6eb1186ca0188aef79939c94bc8f2f509e536256e5c156e77e74ca";
+       version = "1.3.0.3";
+       sha256 = "de44724fa034506ab8c7cd9e494eea1856f0b6a80226ccd2e58b86dcb00e13c1";
        libraryHaskellDepends = [
          base blank-canvas cmdargs containers data-default-class
          diagrams-core diagrams-lib lens mtl NumInstances
          optparse-applicative statestack text
        ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams/";
        description = "HTML5 canvas backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -59509,6 +59798,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "diagrams-core_1_3_0_5" = callPackage
+    ({ mkDerivation, adjunctions, base, containers, distributive
+     , dual-tree, lens, linear, monoid-extras, mtl, semigroups
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "diagrams-core";
+       version = "1.3.0.5";
+       sha256 = "e898afe6cb88fb8caf9555b700a22021e84783d2cbe825d16cbb8cee461fae8c";
+       libraryHaskellDepends = [
+         adjunctions base containers distributive dual-tree lens linear
+         monoid-extras mtl semigroups unordered-containers
+       ];
+       homepage = "http://projects.haskell.org/diagrams";
+       description = "Core libraries for diagrams EDSL";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "diagrams-graphviz" = callPackage
     ({ mkDerivation, base, containers, diagrams-lib, fgl, graphviz
      , split
@@ -59915,6 +60223,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "diagrams-lib_1_3_0_9" = callPackage
+    ({ mkDerivation, active, adjunctions, array, base, colour
+     , containers, data-default-class, diagrams-core, diagrams-solve
+     , directory, distributive, dual-tree, exceptions, filepath
+     , fingertree, fsnotify, hashable, intervals, JuicyPixels, lens
+     , linear, monoid-extras, mtl, optparse-applicative, process
+     , semigroups, tagged, text, transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "diagrams-lib";
+       version = "1.3.0.9";
+       sha256 = "e908935df463b5caaa203205cc98a9163ce8d346ac9cb8bca6fe49630c536c85";
+       libraryHaskellDepends = [
+         active adjunctions array base colour containers data-default-class
+         diagrams-core diagrams-solve directory distributive dual-tree
+         exceptions filepath fingertree fsnotify hashable intervals
+         JuicyPixels lens linear monoid-extras mtl optparse-applicative
+         process semigroups tagged text transformers unordered-containers
+       ];
+       homepage = "http://projects.haskell.org/diagrams";
+       description = "Embedded domain-specific language for declarative graphics";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "diagrams-pandoc" = callPackage
     ({ mkDerivation, base, diagrams-builder, diagrams-cairo
      , diagrams-lib, directory, filepath, linear, optparse-applicative
@@ -63211,6 +63544,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dom-parser" = callPackage
+    ({ mkDerivation, base, data-default, hspec, lens, mtl, semigroups
+     , shakespeare, text, transformers, xml-conduit
+     }:
+     mkDerivation {
+       pname = "dom-parser";
+       version = "0.0.1";
+       sha256 = "5ade4315c5e59bfbaf1e078a1171c6f3109d4f3bd3c394d7ef923140e253f86b";
+       libraryHaskellDepends = [
+         base lens mtl semigroups shakespeare text transformers xml-conduit
+       ];
+       testHaskellDepends = [
+         base data-default hspec shakespeare text xml-conduit
+       ];
+       homepage = "https://github.com/s9gf4ult/dom-parser";
+       description = "Simple monad for parsing DOM";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "dom-selector" = callPackage
     ({ mkDerivation, base, blaze-html, containers, html-conduit, parsec
      , QuickCheck, template-haskell, text, th-lift, xml-conduit
@@ -63756,8 +64108,8 @@ self: {
      }:
      mkDerivation {
        pname = "drifter";
-       version = "0.2.1";
-       sha256 = "0e7019f08595769149e58e86ce503e636afa52028a68211dd4df1882c03626bd";
+       version = "0.2.2";
+       sha256 = "e47e0ceff7ff4e33c681719c6a1af3052f0c123c847dae2cb1fb73e08d3311e1";
        libraryHaskellDepends = [ base containers fgl text ];
        testHaskellDepends = [
          base tasty tasty-hunit tasty-quickcheck text
@@ -63773,15 +64125,14 @@ self: {
      }:
      mkDerivation {
        pname = "drifter-postgresql";
-       version = "0.0.1";
-       sha256 = "a256bfe89eb0bf8a7191a4a912c77869154fcfb0b178e69804c20036a145f1c7";
+       version = "0.0.2";
+       sha256 = "07fbd1e08b517d2fde939657237c7a05f2b1d1abe276681ab7254b1ab8415190";
        libraryHaskellDepends = [
          base drifter either mtl postgresql-simple time
        ];
        testHaskellDepends = [
          base drifter either postgresql-simple tasty tasty-hunit text
        ];
-       jailbreak = true;
        description = "PostgreSQL support for the drifter schema migration tool";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -66385,6 +66736,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "email-validate_2_2_0" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, ghc-prim, HUnit
+     , QuickCheck, test-framework, test-framework-hunit
+     , test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "email-validate";
+       version = "2.2.0";
+       sha256 = "aa7fd3f02c015bbc4ae67c2f3586f16c757d54a8cf09f7a04e70045828d9cb69";
+       libraryHaskellDepends = [ attoparsec base bytestring ghc-prim ];
+       testHaskellDepends = [
+         base bytestring HUnit QuickCheck test-framework
+         test-framework-hunit test-framework-quickcheck2
+       ];
+       homepage = "http://porg.es/blog/email-address-validation-simpler-faster-more-correct";
+       description = "Validating an email address string against RFC 5322";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "email-validator" = callPackage
     ({ mkDerivation, base, bytestring, cmdargs, directory, dns, doctest
      , email-validate, HUnit, parallel-io, pcre-light, tasty
@@ -67782,6 +68153,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "esqueleto_2_4_2" = callPackage
+    ({ mkDerivation, base, blaze-html, bytestring, conduit, containers
+     , hspec, HUnit, monad-control, monad-logger, persistent
+     , persistent-sqlite, persistent-template, QuickCheck, resourcet
+     , tagged, text, transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "esqueleto";
+       version = "2.4.2";
+       sha256 = "bd5207df73339bf22f426dde9e6945d5a9376a7e12c5a3948291e75d4468174f";
+       libraryHaskellDepends = [
+         base blaze-html bytestring conduit monad-logger persistent
+         resourcet tagged text transformers unordered-containers
+       ];
+       testHaskellDepends = [
+         base conduit containers hspec HUnit monad-control monad-logger
+         persistent persistent-sqlite persistent-template QuickCheck
+         resourcet text transformers
+       ];
+       homepage = "https://github.com/prowdsponsor/esqueleto";
+       description = "Type-safe EDSL for SQL queries on persistent backends";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ess" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -68531,6 +68927,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "exceptions_0_8_1" = callPackage
+    ({ mkDerivation, base, mtl, QuickCheck, stm, template-haskell
+     , test-framework, test-framework-quickcheck2, transformers
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "exceptions";
+       version = "0.8.1";
+       sha256 = "8e2835cf2d6714d3f687e892872519e8ef8e3c51f4048386474ced94dd1bdbb0";
+       libraryHaskellDepends = [
+         base mtl stm template-haskell transformers transformers-compat
+       ];
+       testHaskellDepends = [
+         base mtl QuickCheck stm template-haskell test-framework
+         test-framework-quickcheck2 transformers transformers-compat
+       ];
+       jailbreak = true;
+       homepage = "http://github.com/ekmett/exceptions/";
+       description = "Extensible optionally-pure exceptions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "executable-hash_0_2_0_0" = callPackage
     ({ mkDerivation, base, bytestring, cryptohash, directory
      , executable-path, file-embed, template-haskell
@@ -68755,8 +69174,8 @@ self: {
     ({ mkDerivation, base, compensated, log-domain }:
      mkDerivation {
        pname = "exp-extended";
-       version = "0.1.0.1";
-       sha256 = "a78427101de6fb57975be3310a3c59ba5504c3b5edef6da2b9c89fd0730b0f6d";
+       version = "0.1.1";
+       sha256 = "275f074e88748acd68c0b1aadd8ca56a3cc021c5da5fcdbb68300f18cc532f33";
        libraryHaskellDepends = [ base compensated log-domain ];
        homepage = "http://code.mathr.co.uk/exp-extended";
        description = "floating point with extended exponent range";
@@ -70023,6 +70442,8 @@ self: {
        pname = "fay";
        version = "0.23.1.10";
        sha256 = "600005bf694f64a394934a7dc539b292d928af27f70169a0ac9af0cd8ee0dc76";
+       revision = "2";
+       editedCabalFile = "8cd0961f893a01cb5a6fb6cd4b4928992a1b17dc689adc7a0185c21ab3eb483e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -70039,6 +70460,36 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fay_0_23_1_12" = callPackage
+    ({ mkDerivation, aeson, base, base-compat, bytestring, containers
+     , data-default, data-lens-light, directory, filepath, ghc-paths
+     , haskell-src-exts, language-ecmascript, mtl, mtl-compat
+     , optparse-applicative, process, safe, sourcemap, split, spoon, syb
+     , text, time, transformers, transformers-compat
+     , traverse-with-class, type-eq, uniplate, unordered-containers
+     , utf8-string, vector
+     }:
+     mkDerivation {
+       pname = "fay";
+       version = "0.23.1.12";
+       sha256 = "3d9c0a64f6d30923e2e45f27c043a7fa4f451c676466c8ca5b69a4121462f727";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base base-compat bytestring containers data-default
+         data-lens-light directory filepath ghc-paths haskell-src-exts
+         language-ecmascript mtl mtl-compat process safe sourcemap split
+         spoon syb text time transformers transformers-compat
+         traverse-with-class type-eq uniplate unordered-containers
+         utf8-string vector
+       ];
+       executableHaskellDepends = [ base mtl optparse-applicative split ];
+       homepage = "https://github.com/faylang/fay/wiki";
+       description = "A compiler for Fay, a Haskell subset that compiles to JavaScript";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fay-base_0_19_4_1" = callPackage
     ({ mkDerivation, base, fay }:
      mkDerivation {
@@ -74566,6 +75017,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "free_4_12_2" = callPackage
+    ({ mkDerivation, base, bifunctors, comonad, containers
+     , distributive, exceptions, mtl, prelude-extras, profunctors
+     , semigroupoids, semigroups, template-haskell, transformers
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "free";
+       version = "4.12.2";
+       sha256 = "9b65172e90ff03d4daf1d533ed5e967d8a24286ac5facc1edd05e203fe88461b";
+       libraryHaskellDepends = [
+         base bifunctors comonad containers distributive exceptions mtl
+         prelude-extras profunctors semigroupoids semigroups
+         template-haskell transformers transformers-compat
+       ];
+       homepage = "http://github.com/ekmett/free/";
+       description = "Monads for free";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "free-concurrent" = callPackage
     ({ mkDerivation, base, type-aligned }:
      mkDerivation {
@@ -76958,6 +77430,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "geniplate-mirror_0_7_2" = callPackage
+    ({ mkDerivation, base, mtl, template-haskell }:
+     mkDerivation {
+       pname = "geniplate-mirror";
+       version = "0.7.2";
+       sha256 = "2797766702a57f16739378e6da50e8a074d48318601eb5a3e4528b2819509082";
+       libraryHaskellDepends = [ base mtl template-haskell ];
+       homepage = "https://github.com/danr/geniplate";
+       description = "Use Template Haskell to generate Uniplate-like functions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "geniserver" = callPackage
     ({ mkDerivation, base, bytestring, cmdargs, GenI, http-types, json
      , snap-core, snap-server, text, transformers, utf8-string
@@ -77360,6 +77845,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghc-dump-tree" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, ghc, optparse-applicative
+     , pretty, pretty-show, process, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "ghc-dump-tree";
+       version = "0.2.0.0";
+       sha256 = "2b1cf817fcd1727b029a74d393816da936cb49e9048524dc743afb3d9cc65e5e";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring ghc pretty pretty-show process
+         unordered-containers vector
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring ghc optparse-applicative pretty pretty-show
+         process unordered-containers vector
+       ];
+       homepage = "https://github.com/edsko/ghc-dump-tree";
+       description = "Dump GHC's parsed, renamed, and type checked ASTs";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ghc-dup" = callPackage
     ({ mkDerivation, base, ghc }:
      mkDerivation {
@@ -79056,6 +79564,72 @@ self: {
          inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; 
          inherit (pkgs) which;};
 
+  "git-annex_6_20160114" = callPackage
+    ({ mkDerivation, aeson, async, aws, base, blaze-builder
+     , bloomfilter, bup, byteable, bytestring, case-insensitive
+     , clientsession, concurrent-output, conduit, conduit-extra
+     , containers, crypto-api, cryptonite, curl, data-default, DAV, dbus
+     , directory, dlist, dns, edit-distance, esqueleto, exceptions
+     , fdo-notify, feed, filepath, git, gnupg, gnutls, hinotify
+     , hslogger, http-client, http-conduit, http-types, IfElse, json
+     , lsof, MissingH, monad-control, monad-logger, mtl, network
+     , network-info, network-multicast, network-protocol-xmpp
+     , network-uri, old-locale, openssh, optparse-applicative
+     , path-pieces, perl, persistent, persistent-sqlite
+     , persistent-template, process, QuickCheck, random, regex-tdfa
+     , resourcet, rsync, SafeSemaphore, sandi, securemem, shakespeare
+     , stm, tasty, tasty-hunit, tasty-quickcheck, tasty-rerun
+     , template-haskell, text, time, torrent, transformers, unix
+     , unix-compat, utf8-string, uuid, wai, wai-extra, warp, warp-tls
+     , wget, which, xml-types, yesod, yesod-core, yesod-default
+     , yesod-form, yesod-static
+     }:
+     mkDerivation {
+       pname = "git-annex";
+       version = "6.20160114";
+       sha256 = "671d165f9ea583b9a86060b60741c6aa54dbfde0673a2b278d82d761b7500181";
+       configureFlags = [
+         "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
+         "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3"
+         "-ftahoe" "-ftdfa" "-ftestsuite" "-ftorrentparser" "-fwebapp"
+         "-fwebapp-secure" "-fwebdav" "-fxmpp"
+       ];
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson async aws base blaze-builder bloomfilter byteable bytestring
+         case-insensitive clientsession concurrent-output conduit
+         conduit-extra containers crypto-api cryptonite data-default DAV
+         dbus directory dlist dns edit-distance esqueleto exceptions
+         fdo-notify feed filepath gnutls hinotify hslogger http-client
+         http-conduit http-types IfElse json MissingH monad-control
+         monad-logger mtl network network-info network-multicast
+         network-protocol-xmpp network-uri old-locale optparse-applicative
+         path-pieces persistent persistent-sqlite persistent-template
+         process QuickCheck random regex-tdfa resourcet SafeSemaphore sandi
+         securemem shakespeare stm tasty tasty-hunit tasty-quickcheck
+         tasty-rerun template-haskell text time torrent transformers unix
+         unix-compat utf8-string uuid wai wai-extra warp warp-tls xml-types
+         yesod yesod-core yesod-default yesod-form yesod-static
+       ];
+       executableSystemDepends = [
+         bup curl git gnupg lsof openssh perl rsync wget which
+       ];
+       preConfigure = "export HOME=$TEMPDIR; patchShebangs .";
+       postBuild = "ln -sf dist/build/git-annex/git-annex git-annex";
+       installPhase = "make PREFIX=$out CABAL=./Setup install";
+       checkPhase = "./git-annex test";
+       enableSharedExecutables = false;
+       homepage = "http://git-annex.branchable.com/";
+       description = "manage files with git, without checking their contents into git";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ simons ];
+     }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; 
+         inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; 
+         inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; 
+         inherit (pkgs) which;};
+
   "git-checklist" = callPackage
     ({ mkDerivation, base, directory, filepath, optparse-applicative
      , parsec, pretty, process
@@ -79891,7 +80465,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "gitrev" = callPackage
+  "gitrev_1_1_0" = callPackage
     ({ mkDerivation, base, directory, filepath, process
      , template-haskell
      }:
@@ -79905,9 +80479,10 @@ self: {
        homepage = "https://github.com/acfoltzer/gitrev";
        description = "Compile git revision info into Haskell projects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "gitrev_1_2_0" = callPackage
+  "gitrev" = callPackage
     ({ mkDerivation, base, directory, filepath, process
      , template-haskell
      }:
@@ -79921,7 +80496,6 @@ self: {
        homepage = "https://github.com/acfoltzer/gitrev";
        description = "Compile git revision info into Haskell projects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gitson" = callPackage
@@ -83763,7 +84337,7 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
-  "grouped-list" = callPackage
+  "grouped-list_0_2_1_0" = callPackage
     ({ mkDerivation, base, containers, deepseq, pointed, QuickCheck
      , tasty, tasty-quickcheck
      }:
@@ -83776,9 +84350,10 @@ self: {
        homepage = "https://github.com/Daniel-Diaz/grouped-list/blob/master/README.md";
        description = "Grouped lists. Equal consecutive elements are grouped.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "grouped-list_0_2_1_1" = callPackage
+  "grouped-list" = callPackage
     ({ mkDerivation, base, containers, deepseq, pointed, QuickCheck
      , tasty, tasty-quickcheck
      }:
@@ -83791,7 +84366,6 @@ self: {
        homepage = "https://github.com/Daniel-Diaz/grouped-list/blob/master/README.md";
        description = "Grouped lists. Equal consecutive elements are grouped.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "groupoid" = callPackage
@@ -84283,11 +84857,10 @@ self: {
     ({ mkDerivation, base, glib, gtk, gtk2, x11 }:
      mkDerivation {
        pname = "gtk-traymanager";
-       version = "0.1.5";
-       sha256 = "1582e229aafe22cf5499fe1519e2ff4f49cecbe83a6eb1a8de04f45dd44df443";
+       version = "0.1.6";
+       sha256 = "cb30f5d55430836032abc876706af0a61de996c9e2b5a4b41c029d3149683642";
        libraryHaskellDepends = [ base glib gtk ];
        libraryPkgconfigDepends = [ gtk2 x11 ];
-       jailbreak = true;
        homepage = "http://github.com/travitch/gtk-traymanager";
        description = "A wrapper around the eggtraymanager library for Linux system trays";
        license = stdenv.lib.licenses.lgpl21;
@@ -85224,47 +85797,6 @@ self: {
      }) {};
 
   "hOpenPGP" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
-     , bifunctors, binary, binary-conduit, byteable, bytestring, bzlib
-     , conduit, conduit-extra, containers, crypto-cipher-types
-     , cryptonite, data-default-class, errors, hashable
-     , incremental-parser, ixset-typed, lens, memory, monad-loops
-     , nettle, network, network-uri, newtype, openpgp-asciiarmor
-     , QuickCheck, quickcheck-instances, resourcet, securemem
-     , semigroups, split, tasty, tasty-hunit, tasty-quickcheck, text
-     , time, time-locale-compat, transformers, unordered-containers
-     , wl-pprint-extras, zlib
-     }:
-     mkDerivation {
-       pname = "hOpenPGP";
-       version = "2.3";
-       sha256 = "2f1ff22747fdef1ac87f0dca27af6a632a5e6cac2201f942243a914ea2cb9a6a";
-       libraryHaskellDepends = [
-         aeson attoparsec base base64-bytestring bifunctors binary
-         binary-conduit byteable bytestring bzlib conduit conduit-extra
-         containers crypto-cipher-types cryptonite data-default-class errors
-         hashable incremental-parser ixset-typed lens memory monad-loops
-         nettle network network-uri newtype openpgp-asciiarmor resourcet
-         securemem semigroups split text time time-locale-compat
-         transformers unordered-containers wl-pprint-extras zlib
-       ];
-       testHaskellDepends = [
-         aeson attoparsec base bifunctors binary binary-conduit byteable
-         bytestring bzlib conduit conduit-extra containers
-         crypto-cipher-types cryptonite data-default-class errors hashable
-         incremental-parser ixset-typed lens memory monad-loops nettle
-         network network-uri newtype QuickCheck quickcheck-instances
-         resourcet securemem semigroups split tasty tasty-hunit
-         tasty-quickcheck text time time-locale-compat transformers
-         unordered-containers wl-pprint-extras zlib
-       ];
-       homepage = "http://floss.scru.org/hOpenPGP/";
-       description = "native Haskell implementation of OpenPGP (RFC4880)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "hOpenPGP_2_4" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
      , bifunctors, binary, binary-conduit, byteable, bytestring, bzlib
      , conduit, conduit-extra, containers, crypto-cipher-types
@@ -86240,6 +86772,8 @@ self: {
        pname = "hackage-repo-tool";
        version = "0.1.1";
        sha256 = "23f6c2719d42ce51ae8fe9dc6c8d9c8585265486df81d4ca483b28cc917064f4";
+       revision = "1";
+       editedCabalFile = "0ff107dc07dc9099ef89c1195c1bc26f482ed25bc0d858422ed3c870e7179d0e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -86260,8 +86794,8 @@ self: {
      }:
      mkDerivation {
        pname = "hackage-security";
-       version = "0.5.0.1";
-       sha256 = "84cafa85d8b29eac0fac51f6f03903d217e3f0686b9badea64decb19046cfe9c";
+       version = "0.5.0.2";
+       sha256 = "4135221bb74e899fde71ff5e878d0401b8c274af6ade996ca7ac15d2b77dbd98";
        libraryHaskellDepends = [
          base base64-bytestring bytestring Cabal containers cryptohash
          directory ed25519 filepath ghc-prim mtl network network-uri parsec
@@ -89371,6 +89905,8 @@ self: {
        pname = "hashable";
        version = "1.2.3.3";
        sha256 = "fc923f7d1fdc0062416a61f6ab96b4e1958e1aee1ddf1c71fa2cc6d08154e44e";
+       revision = "2";
+       editedCabalFile = "abaa1b40915bdb6b825db78b8db5d375365c6dc0e0d94cc1e47a20d1aa7b8712";
        libraryHaskellDepends = [
          base bytestring ghc-prim integer-gmp text
        ];
@@ -89383,6 +89919,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hashable_1_2_4_0" = callPackage
+    ({ mkDerivation, base, bytestring, ghc-prim, HUnit, integer-gmp
+     , QuickCheck, random, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, unix
+     }:
+     mkDerivation {
+       pname = "hashable";
+       version = "1.2.4.0";
+       sha256 = "fb9671db0c39cd48d38e2e13e3352e2bf7dfa6341edfe68789a1753d21bb3cf3";
+       libraryHaskellDepends = [
+         base bytestring ghc-prim integer-gmp text
+       ];
+       testHaskellDepends = [
+         base bytestring ghc-prim HUnit QuickCheck random test-framework
+         test-framework-hunit test-framework-quickcheck2 text unix
+       ];
+       homepage = "http://github.com/tibbe/hashable";
+       description = "A class for types that can be converted to a hash value";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hashable-extras_0_2_0_1" = callPackage
     ({ mkDerivation, base, bifunctors, bytestring, directory, doctest
      , filepath, generic-deriving, hashable, transformers
@@ -91021,8 +91579,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-updater";
-       version = "1.2.9";
-       sha256 = "eafc441bad4f15d60c8686c189d6dd49ea9e87bdddf09a24cef2a3eca9eca859";
+       version = "1.2.10";
+       sha256 = "e9712ccaa38bb2ca4242272eee72c72e5b2d0943d7d35c846fccdd89a5428e7d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -92399,7 +92957,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hasql" = callPackage
+  "hasql_0_15_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring
      , contravariant, contravariant-extras, data-default-class, dlist
      , either, hashable, hashtables, loch-th, placeholders
@@ -92428,6 +92986,39 @@ self: {
        homepage = "https://github.com/nikita-volkov/hasql";
        description = "A very efficient PostgreSQL driver and a flexible mapping API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hasql" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring
+     , contravariant, contravariant-extras, data-default-class, dlist
+     , either, hashable, hashtables, loch-th, mtl, placeholders
+     , postgresql-binary, postgresql-libpq, profunctors, QuickCheck
+     , quickcheck-instances, scientific, tasty, tasty-hunit
+     , tasty-quickcheck, tasty-smallcheck, text, time, transformers
+     , uuid, vector
+     }:
+     mkDerivation {
+       pname = "hasql";
+       version = "0.19.3.1";
+       sha256 = "b31e66b2baecbc238e24e0914897bfbb6261124da17efe18e821eb52ec18d6e3";
+       libraryHaskellDepends = [
+         aeson attoparsec base base-prelude bytestring contravariant
+         contravariant-extras data-default-class dlist either hashable
+         hashtables loch-th mtl placeholders postgresql-binary
+         postgresql-libpq profunctors scientific text time transformers uuid
+         vector
+       ];
+       testHaskellDepends = [
+         base base-prelude bytestring contravariant contravariant-extras
+         data-default-class dlist either hashable profunctors QuickCheck
+         quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck
+         tasty-smallcheck text time transformers uuid vector
+       ];
+       doCheck = false;
+       homepage = "https://github.com/nikita-volkov/hasql";
+       description = "A very efficient PostgreSQL driver and a flexible mapping API";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "hasql-backend_0_2_1" = callPackage
@@ -92549,8 +93140,8 @@ self: {
     ({ mkDerivation, base-prelude, hasql, resource-pool, time }:
      mkDerivation {
        pname = "hasql-pool";
-       version = "0.1";
-       sha256 = "be1db9c80ebdaf6f1ef0e75970e28286d435141a515ea6f83742373ffb51e330";
+       version = "0.3";
+       sha256 = "7afb74396758b9df4e5a5c0b2d63de1253e7717011eaea6269f9740423f18428";
        libraryHaskellDepends = [ base-prelude hasql resource-pool time ];
        homepage = "https://github.com/nikita-volkov/hasql-pool";
        description = "A pool of connections for Hasql";
@@ -92897,16 +93488,14 @@ self: {
      }) {};
 
   "hasql-th" = callPackage
-    ({ mkDerivation, attoparsec, base-prelude, bytestring, hasql
-     , hasql-transaction, template-haskell, text
+    ({ mkDerivation, base-prelude, bytestring, template-haskell, text
      }:
      mkDerivation {
        pname = "hasql-th";
-       version = "0.1.0.1";
-       sha256 = "170b6128b06e57675778de8b8ffe29ea0082cb8d2047d67f1fce0a5d0e45c2bf";
+       version = "0.2";
+       sha256 = "c08dab84a62bb5adff1e8f0aa2e0a626d1a8347597ca287deebb12b46602a4e4";
        libraryHaskellDepends = [
-         attoparsec base-prelude bytestring hasql hasql-transaction
-         template-haskell text
+         base-prelude bytestring template-haskell text
        ];
        homepage = "https://github.com/nikita-volkov/hasql-th";
        description = "Template Haskell utilities for Hasql";
@@ -92916,16 +93505,16 @@ self: {
 
   "hasql-transaction" = callPackage
     ({ mkDerivation, base-prelude, bytestring, bytestring-tree-builder
-     , contravariant, contravariant-extras, either, hasql
+     , contravariant, contravariant-extras, either, hasql, mtl
      , postgresql-error-codes, transformers
      }:
      mkDerivation {
        pname = "hasql-transaction";
-       version = "0.3.1";
-       sha256 = "dec9cbb6be2ca68da83af8a512293f6b41ebfc7747cc38105d5aed11625c9037";
+       version = "0.4.2";
+       sha256 = "b8e6e62cae96802c7f74620106d0e7b17b3fdd8ad0b30f58c81f8c8550ddea49";
        libraryHaskellDepends = [
          base-prelude bytestring bytestring-tree-builder contravariant
-         contravariant-extras either hasql postgresql-error-codes
+         contravariant-extras either hasql mtl postgresql-error-codes
          transformers
        ];
        homepage = "https://github.com/nikita-volkov/hasql-transaction";
@@ -93440,6 +94029,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "haxr_3000_11_1_3" = callPackage
+    ({ mkDerivation, array, base, base-compat, base64-bytestring
+     , blaze-builder, bytestring, HaXml, HsOpenSSL, http-streams
+     , http-types, io-streams, mtl, mtl-compat, network, network-uri
+     , old-locale, old-time, template-haskell, time, utf8-string
+     }:
+     mkDerivation {
+       pname = "haxr";
+       version = "3000.11.1.3";
+       sha256 = "99aafefc48dfd49c4d638dd9b049c602aa69cf22eafa8dcbd5c6b1a3a379ad53";
+       libraryHaskellDepends = [
+         array base base-compat base64-bytestring blaze-builder bytestring
+         HaXml HsOpenSSL http-streams http-types io-streams mtl mtl-compat
+         network network-uri old-locale old-time template-haskell time
+         utf8-string
+       ];
+       homepage = "http://www.haskell.org/haskellwiki/HaXR";
+       description = "XML-RPC client and server library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haxr-th" = callPackage
     ({ mkDerivation, base, haxr, template-haskell }:
      mkDerivation {
@@ -94173,7 +94784,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hdevtools" = callPackage
+  "hdevtools_0_1_2_1" = callPackage
     ({ mkDerivation, base, bin-package-db, Cabal, cmdargs, directory
      , filepath, ghc, ghc-paths, network, process, syb, time, unix
      }:
@@ -94190,9 +94801,10 @@ self: {
        homepage = "https://github.com/schell/hdevtools/";
        description = "Persistent GHC powered background server for FAST haskell development tools";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hdevtools_0_1_2_2" = callPackage
+  "hdevtools" = callPackage
     ({ mkDerivation, base, bin-package-db, Cabal, cmdargs, directory
      , filepath, ghc, ghc-paths, network, process, syb, time
      , transformers, unix
@@ -94210,7 +94822,6 @@ self: {
        homepage = "https://github.com/hdevtools/hdevtools/";
        description = "Persistent GHC powered background server for FAST haskell development tools";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hdf" = callPackage
@@ -94916,6 +95527,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "helix" = callPackage
+    ({ mkDerivation, aeson, base, blaze-builder, bytestring
+     , case-insensitive, containers, cookie, data-default-class
+     , filepath, hspec, hspec-wai, hspec-wai-json, http-types
+     , mime-types, monad-loops, mtl, path-pieces, random
+     , template-haskell, text, vault, wai, wai-app-static, wai-extra
+     }:
+     mkDerivation {
+       pname = "helix";
+       version = "0.9.5";
+       sha256 = "20e24be12f0db6cf15ec66d28e20e0a14f1fcba79a728aad3843d48f4f581fab";
+       libraryHaskellDepends = [
+         aeson base blaze-builder bytestring case-insensitive containers
+         cookie data-default-class filepath http-types mime-types
+         monad-loops mtl path-pieces random template-haskell text vault wai
+         wai-app-static wai-extra
+       ];
+       testHaskellDepends = [
+         aeson base hspec hspec-wai hspec-wai-json text wai
+       ];
+       homepage = "https://ajnsit.github.io/helix/";
+       description = "Web development micro framework for haskell with typesafe URLs";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hell" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-extra
      , data-default, directory, filepath, ghc, ghc-paths, haskeline
@@ -95810,6 +96446,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hformat" = callPackage
+    ({ mkDerivation, base, base-unicode-symbols, hspec, text }:
+     mkDerivation {
+       pname = "hformat";
+       version = "0.1.0.0";
+       sha256 = "722f3d6bcf285477c93c68bcf62a23312cc8715d573989d87c8c1a6d0e725323";
+       libraryHaskellDepends = [ base base-unicode-symbols text ];
+       testHaskellDepends = [ base base-unicode-symbols hspec text ];
+       homepage = "http://github.com/mvoidex/hformat";
+       description = "Simple Haskell formatting";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hfov" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -98224,8 +98873,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-ui";
-       version = "0.27.2";
-       sha256 = "aa637d484796eda892cc2e1b1138746ac7c2b4bf0dba0855b257100fe4a2bcba";
+       version = "0.27.3";
+       sha256 = "87dcd09479acc3e84a883d427c988a110451dee75a5e1f1c9d5ea2b34e99c4c1";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -99677,7 +100326,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hoauth2" = callPackage
+  "hoauth2_0_5_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, http-conduit
      , http-types, text, wai, warp
      }:
@@ -99697,6 +100346,29 @@ self: {
        homepage = "https://github.com/freizl/hoauth2";
        description = "hoauth2";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hoauth2" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, http-conduit
+     , http-types, text, wai, warp
+     }:
+     mkDerivation {
+       pname = "hoauth2";
+       version = "0.5.0.1";
+       sha256 = "17766cb63f0f232b6ad21d855e32fa88da7d4f5ae5c545f391c5b92d4cd57468";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring http-conduit http-types text
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring containers http-conduit http-types text wai
+         warp
+       ];
+       homepage = "https://github.com/freizl/hoauth2";
+       description = "Haskell OAuth2 authentication client";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "hoauth2_0_5_1" = callPackage
@@ -103538,40 +104210,42 @@ self: {
      }) {};
 
   "hsdev" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, array, attoparsec, base
-     , bin-package-db, bytestring, Cabal, containers, deepseq, directory
-     , exceptions, filepath, fsnotify, ghc, ghc-mod, ghc-paths
-     , ghc-syb-utils, haddock-api, haskell-src-exts, hdocs, hlint, HTTP
-     , lens, lifted-base, monad-control, monad-loops
-     , MonadCatchIO-transformers, mtl, network, process
-     , regex-pcre-builtin, scientific, simple-log, syb, template-haskell
-     , text, time, transformers, transformers-base, uniplate, unix
+    ({ mkDerivation, aeson, aeson-pretty, array, async, attoparsec
+     , base, bin-package-db, bytestring, Cabal, containers, cpphs
+     , data-default, deepseq, directory, exceptions, filepath, fsnotify
+     , ghc, ghc-mod, ghc-paths, ghc-syb-utils, haddock-api
+     , haskell-src-exts, hdocs, hformat, hlint, HTTP, lens, lifted-base
+     , monad-control, monad-loops, MonadCatchIO-transformers, mtl
+     , network, optparse-applicative, process, regex-pcre-builtin
+     , scientific, simple-log, syb, template-haskell, text, text-region
+     , time, transformers, transformers-base, uniplate, unix
      , unordered-containers, vector
      }:
      mkDerivation {
        pname = "hsdev";
-       version = "0.1.4.3";
-       sha256 = "66c1bf834bfff8030533f056bb57d4fc4a61d1698ea10c217c9841d2b13aa9ad";
-       revision = "1";
-       editedCabalFile = "42abb281e07630ed6ebee4022d6b07fef645d7b2e5c20f36de0d65f96e3ab0d7";
+       version = "0.1.5.2";
+       sha256 = "c60c0ff6283a3b3a043f63598440fe9a577409037bb252481171d1ce839df86f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson aeson-pretty array attoparsec base bin-package-db bytestring
-         Cabal containers deepseq directory exceptions filepath fsnotify ghc
-         ghc-mod ghc-paths ghc-syb-utils haddock-api haskell-src-exts hdocs
-         hlint HTTP lens lifted-base monad-control monad-loops
-         MonadCatchIO-transformers mtl network process regex-pcre-builtin
-         scientific simple-log syb template-haskell text time transformers
+         aeson aeson-pretty array async attoparsec base bin-package-db
+         bytestring Cabal containers cpphs data-default deepseq directory
+         exceptions filepath fsnotify ghc ghc-mod ghc-paths ghc-syb-utils
+         haddock-api haskell-src-exts hdocs hformat hlint HTTP lens
+         lifted-base monad-control monad-loops MonadCatchIO-transformers mtl
+         network optparse-applicative process regex-pcre-builtin scientific
+         simple-log syb template-haskell text text-region time transformers
          transformers-base uniplate unix unordered-containers vector
        ];
        executableHaskellDepends = [
          aeson aeson-pretty base bytestring containers deepseq directory
          exceptions filepath ghc haskell-src-exts lens monad-loops mtl
-         network process text transformers unordered-containers vector
+         network optparse-applicative process text transformers
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         async base containers data-default deepseq hformat lens mtl text
        ];
-       testHaskellDepends = [ base ];
-       jailbreak = true;
        homepage = "https://github.com/mvoidex/hsdev";
        description = "Haskell development library and tool with support of autocompletion, symbol info, go to declaration, find references etc";
        license = stdenv.lib.licenses.bsd3;
@@ -106489,8 +107163,8 @@ self: {
      }) {};
 
   "htar" = callPackage
-    ({ mkDerivation, base, bytestring, bzlib, directory, filepath, tar
-     , time, zlib
+    ({ mkDerivation, base, bytestring, bzlib, directory, filepath
+     , old-locale, tar, time, zlib
      }:
      mkDerivation {
        pname = "htar";
@@ -106499,8 +107173,9 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base bytestring bzlib directory filepath tar time zlib
+         base bytestring bzlib directory filepath old-locale tar time zlib
        ];
+       jailbreak = true;
        description = "Command-line tar archive utility";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -108741,7 +109416,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "http2_1_4_0" = callPackage
+  "http2_1_4_2" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring
      , bytestring-builder, containers, directory, doctest, filepath
      , Glob, hex, hspec, mwc-random, psqueues, stm, text
@@ -108749,8 +109424,8 @@ self: {
      }:
      mkDerivation {
        pname = "http2";
-       version = "1.4.0";
-       sha256 = "26ffd2cb8ec5f44da3ca1c14640a356d55177ecb4e463fa6defef788902c409f";
+       version = "1.4.2";
+       sha256 = "721c4a0e70594e6750cedbaa795b44a0b1f1ea332c4ac5eb453e42464f86e2d9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -109001,7 +109676,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "human-readable-duration" = callPackage
+  "human-readable-duration_0_1_0_0" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "human-readable-duration";
@@ -109011,6 +109686,19 @@ self: {
        homepage = "http://github.com/yogsototh/human-readable-duration#readme";
        description = "Provide duration helper";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "human-readable-duration" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "human-readable-duration";
+       version = "0.2.0.0";
+       sha256 = "4c1959b3014c2e7dcdc754814129e4a3e5f4b5d7eb317f0f315f1d01025d097d";
+       libraryHaskellDepends = [ base ];
+       homepage = "http://github.com/yogsototh/human-readable-duration#readme";
+       description = "Provide duration helper";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "hums" = callPackage
@@ -111462,6 +112150,7 @@ self: {
          haddock-api ide-backend-common mtl process tar temporary text time
          transformers unix unordered-containers zlib
        ];
+       jailbreak = true;
        description = "An IDE backend server";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -111486,6 +112175,7 @@ self: {
          haddock-api ide-backend-common mtl network process tar temporary
          text time transformers unix unordered-containers zlib
        ];
+       jailbreak = true;
        description = "An IDE backend server";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -112339,30 +113029,27 @@ self: {
      }) {};
 
   "imagemagick" = callPackage
-    ({ mkDerivation, base, bytestring, directory, HUnit, imagemagick
+    ({ mkDerivation, base, bytestring, directory, filepath, imagemagick
      , lifted-base, MonadCatchIO-transformers, QuickCheck, resourcet
-     , system-filepath, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, text, transformers, vector
+     , tasty, tasty-hunit, text, transformers, vector
      }:
      mkDerivation {
        pname = "imagemagick";
-       version = "0.0.3.7";
-       sha256 = "e33b0437468e785465852e244c0ec5a1dcebb989d7873e3ddec47167a1fec0f7";
+       version = "0.0.4";
+       sha256 = "0faa50be5db638cdcd51c0e35fd418041204eff0173547a2d076995fa163b82f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring MonadCatchIO-transformers resourcet system-filepath
-         text transformers vector
+         base bytestring filepath MonadCatchIO-transformers resourcet text
+         transformers vector
        ];
        libraryPkgconfigDepends = [ imagemagick ];
        executablePkgconfigDepends = [ imagemagick ];
        testHaskellDepends = [
-         base bytestring directory HUnit lifted-base QuickCheck resourcet
-         system-filepath test-framework test-framework-hunit
-         test-framework-quickcheck2 text transformers vector
+         base bytestring directory filepath lifted-base QuickCheck resourcet
+         tasty tasty-hunit text transformers vector
        ];
        testPkgconfigDepends = [ imagemagick ];
-       jailbreak = true;
        description = "bindings to imagemagick library";
        license = "unknown";
        hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
@@ -112854,9 +113541,11 @@ self: {
        pname = "indentation";
        version = "0.2.1.1";
        sha256 = "72134a7c01812ccadacf1c5db86e40892136e7bf583b85c083b088cec19e65f1";
+       revision = "1";
+       editedCabalFile = "642875a7d7d3b8bd626f1671ff1dad1a8584bfa0fab236e5e404d8b26345317e";
        libraryHaskellDepends = [ base mtl parsec parsers trifecta ];
        testHaskellDepends = [ base parsec tasty tasty-hunit trifecta ];
-       homepage = "https://bitbucket.org/mdmkolbe/indentation";
+       homepage = "https://bitbucket.org/adamsmd/indentation";
        description = "Indentation sensitive parsing combinators for Parsec and Trifecta";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -113361,6 +114050,35 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {inherit (pkgs) gsl; gslcblas = null;};
 
+  "inline-c_0_5_5_2" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring
+     , containers, cryptohash, directory, filepath, gsl, gslcblas
+     , hashable, hspec, mtl, parsec, parsers, QuickCheck, raw-strings-qq
+     , regex-posix, template-haskell, transformers, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "inline-c";
+       version = "0.5.5.2";
+       sha256 = "b1265ed095cc1b832d20e3c30de574817f906534f46660ed2ff55b85b15677d6";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ansi-wl-pprint base binary bytestring containers cryptohash
+         directory filepath hashable mtl parsec parsers QuickCheck
+         template-haskell transformers unordered-containers vector
+       ];
+       executableSystemDepends = [ gsl gslcblas ];
+       testHaskellDepends = [
+         ansi-wl-pprint base containers hashable hspec parsers QuickCheck
+         raw-strings-qq regex-posix template-haskell transformers
+         unordered-containers vector
+       ];
+       description = "Write Haskell source files including C code inline. No FFI required.";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) gsl; gslcblas = null;};
+
   "inline-c-cpp" = callPackage
     ({ mkDerivation, base, inline-c, template-haskell }:
      mkDerivation {
@@ -114382,8 +115100,8 @@ self: {
      }:
      mkDerivation {
        pname = "ipopt-hs";
-       version = "0.5.0.0";
-       sha256 = "2cd1a8c4c7f8bac55384f38ed25397e1ec7702f477f586e89a2ecee5c7b1970d";
+       version = "0.5.1.0";
+       sha256 = "aaf193c06daed43998d4d37f7916d8c1bb73b61e01815755eff61bd2c472344a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -115780,8 +116498,8 @@ self: {
     ({ mkDerivation, base, random-shuffle }:
      mkDerivation {
        pname = "java-poker";
-       version = "0.1.1.0";
-       sha256 = "e8e09b478e518e91a4fe50cdb60161a45c774ff919e95c47527aee6f805f35da";
+       version = "0.1.2.0";
+       sha256 = "031e0b69cb30ac98acfc59b067ccc73fdda6b2abe446f3fc501c56593e83c213";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base random-shuffle ];
@@ -121326,6 +122044,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "language-thrift_0_7_0_0" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, hspec, hspec-discover, lens
+     , parsers, QuickCheck, template-haskell, text, transformers
+     , trifecta, wl-pprint
+     }:
+     mkDerivation {
+       pname = "language-thrift";
+       version = "0.7.0.0";
+       sha256 = "41ebf1f8f630b6add359b648b32c366a85e68007ffd4af6e6649ace2fd3b79ab";
+       libraryHaskellDepends = [
+         ansi-wl-pprint base lens parsers template-haskell text transformers
+         trifecta wl-pprint
+       ];
+       testHaskellDepends = [
+         ansi-wl-pprint base hspec hspec-discover parsers QuickCheck text
+         trifecta wl-pprint
+       ];
+       homepage = "https://github.com/abhinav/language-thrift";
+       description = "Parser and pretty printer for the Thrift IDL format";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "language-typescript" = callPackage
     ({ mkDerivation, base, containers, parsec, pretty }:
      mkDerivation {
@@ -124295,6 +125036,36 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "linear_1_20_4" = callPackage
+    ({ mkDerivation, adjunctions, base, base-orphans, binary, bytes
+     , bytestring, cereal, containers, deepseq, directory, distributive
+     , doctest, filepath, ghc-prim, hashable, HUnit, lens, reflection
+     , semigroupoids, semigroups, simple-reflect, tagged
+     , template-haskell, test-framework, test-framework-hunit
+     , transformers, transformers-compat, unordered-containers, vector
+     , void
+     }:
+     mkDerivation {
+       pname = "linear";
+       version = "1.20.4";
+       sha256 = "7bd91c482611f9b7226ec346a9630d2cf1975672b3a67e1b52ae24cdd039ddd3";
+       libraryHaskellDepends = [
+         adjunctions base base-orphans binary bytes cereal containers
+         deepseq distributive ghc-prim hashable lens reflection
+         semigroupoids semigroups tagged template-haskell transformers
+         transformers-compat unordered-containers vector void
+       ];
+       testHaskellDepends = [
+         base binary bytestring directory doctest filepath HUnit lens
+         simple-reflect test-framework test-framework-hunit
+       ];
+       jailbreak = true;
+       homepage = "http://github.com/ekmett/linear/";
+       description = "Linear Algebra";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "linear-accelerate" = callPackage
     ({ mkDerivation, accelerate, base, lens, linear }:
      mkDerivation {
@@ -126871,6 +127642,45 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "lp-diagrams" = callPackage
+    ({ mkDerivation, base, containers, glpk-hs, graphviz, labeled-tree
+     , lens, mtl, polynomials-bernstein, text, typography-geometry
+     , vector
+     }:
+     mkDerivation {
+       pname = "lp-diagrams";
+       version = "1.0";
+       sha256 = "f10a4e0258fed5fde24a787d248a6e115c912374314f4091f11421500159b6a1";
+       libraryHaskellDepends = [
+         base containers glpk-hs graphviz labeled-tree lens mtl
+         polynomials-bernstein text typography-geometry vector
+       ];
+       description = "An EDSL for diagrams based based on linear constraints";
+       license = stdenv.lib.licenses.agpl3;
+     }) {};
+
+  "lp-diagrams-svg" = callPackage
+    ({ mkDerivation, base, containers, FontyFruity, JuicyPixels, lens
+     , linear, lp-diagrams, lucid-svg, mtl, optparse-applicative
+     , svg-tree, text, vector
+     }:
+     mkDerivation {
+       pname = "lp-diagrams-svg";
+       version = "1.0";
+       sha256 = "05b67150d7f4559f9b6aea62ffa9382551b1fb1ad56cfaf204ff2dc3c7db6325";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers FontyFruity JuicyPixels lens linear lp-diagrams
+         lucid-svg mtl optparse-applicative svg-tree text vector
+       ];
+       executableHaskellDepends = [
+         base containers FontyFruity lens lp-diagrams
+       ];
+       description = "SVG Backend for lp-diagrams";
+       license = stdenv.lib.licenses.agpl3;
+     }) {};
+
   "lrucache" = callPackage
     ({ mkDerivation, base, containers, contravariant }:
      mkDerivation {
@@ -127315,6 +128125,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "luminance_0_9_1_1" = callPackage
+    ({ mkDerivation, base, containers, contravariant, dlist, gl, linear
+     , mtl, resourcet, semigroups, transformers, vector, void
+     }:
+     mkDerivation {
+       pname = "luminance";
+       version = "0.9.1.1";
+       sha256 = "5173588f12ec9949a483db6607cf6583132fb6b958a09c8473e025fa191210c2";
+       libraryHaskellDepends = [
+         base containers contravariant dlist gl linear mtl resourcet
+         semigroups transformers vector void
+       ];
+       homepage = "https://github.com/phaazon/luminance";
+       description = "Type-safe, type-level and stateless graphics framework";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "luminance-samples" = callPackage
     ({ mkDerivation, base, contravariant, GLFW-b, JuicyPixels, linear
      , luminance, mtl, resourcet, transformers
@@ -127752,6 +128580,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "machines_0_6" = callPackage
+    ({ mkDerivation, adjunctions, base, comonad, containers, directory
+     , distributive, doctest, filepath, free, mtl, pointed, profunctors
+     , semigroupoids, semigroups, transformers, transformers-compat
+     , void
+     }:
+     mkDerivation {
+       pname = "machines";
+       version = "0.6";
+       sha256 = "69a54f22a9788e4a7ef2691c49626cd1c22465da2b9f903839d7b20c41eb11f6";
+       libraryHaskellDepends = [
+         adjunctions base comonad containers distributive free mtl pointed
+         profunctors semigroupoids semigroups transformers
+         transformers-compat void
+       ];
+       testHaskellDepends = [ base directory doctest filepath ];
+       homepage = "http://github.com/ekmett/machines/";
+       description = "Networked stream transducers";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "machines-binary" = callPackage
     ({ mkDerivation, base, binary, bytestring, machines }:
      mkDerivation {
@@ -130194,7 +131044,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "megaparsec" = callPackage
+  "megaparsec_4_2_0" = callPackage
     ({ mkDerivation, base, bytestring, HUnit, mtl, QuickCheck
      , test-framework, test-framework-hunit, test-framework-quickcheck2
      , text, transformers
@@ -130211,6 +131061,28 @@ self: {
        homepage = "https://github.com/mrkkrp/megaparsec";
        description = "Monadic parser combinators";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "megaparsec" = callPackage
+    ({ mkDerivation, base, bytestring, HUnit, mtl, QuickCheck
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , text, transformers
+     }:
+     mkDerivation {
+       pname = "megaparsec";
+       version = "4.3.0";
+       sha256 = "2298f02815b1ebbf200817c68c5e7414ef558c70fe64b2ee01fbbe1142d78680";
+       revision = "2";
+       editedCabalFile = "937110189d9bc4843e11cfdf80b4a215845a8c9ecca0fea40a13ad00f6c6c1bc";
+       libraryHaskellDepends = [ base bytestring mtl text transformers ];
+       testHaskellDepends = [
+         base HUnit mtl QuickCheck test-framework test-framework-hunit
+         test-framework-quickcheck2 transformers
+       ];
+       homepage = "https://github.com/mrkkrp/megaparsec";
+       description = "Monadic parser combinators";
+       license = stdenv.lib.licenses.bsd2;
      }) {};
 
   "meldable-heap" = callPackage
@@ -130457,7 +131329,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "memory" = callPackage
+  "memory_0_10" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, ghc-prim, tasty
      , tasty-hunit, tasty-quickcheck
      }:
@@ -130472,6 +131344,22 @@ self: {
        homepage = "https://github.com/vincenthz/hs-memory";
        description = "memory and related abstraction stuff";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "memory" = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, ghc-prim, tasty
+     , tasty-hunit, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "memory";
+       version = "0.11";
+       sha256 = "7b7fa325def957f4cc0a884f7c1e0d549c9329a8d1aa9e1456e37e5aff4e3fa6";
+       libraryHaskellDepends = [ base bytestring deepseq ghc-prim ];
+       testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
+       homepage = "https://github.com/vincenthz/hs-memory";
+       description = "memory and related abstraction stuff";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "memscript" = callPackage
@@ -132889,6 +133777,8 @@ self: {
        pname = "monad-http";
        version = "0.1.0.0";
        sha256 = "a333b087835aa4902d0814e76fe4f32a523092fd7b13526aad415160a8317192";
+       revision = "1";
+       editedCabalFile = "6dc1e9978860f42d76fc6f82d5166c9396ebdb2a555575c589970334200f5ad5";
        libraryHaskellDepends = [
          base base-compat bytestring exceptions http-client http-client-tls
          http-types monad-logger monadcryptorandom MonadRandom mtl text
@@ -133163,7 +134053,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "monad-logger" = callPackage
+  "monad-logger_0_3_16" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, conduit
      , conduit-extra, exceptions, fast-logger, lifted-base
      , monad-control, monad-loops, mtl, resourcet, stm, stm-chans
@@ -133183,6 +134073,29 @@ self: {
        homepage = "https://github.com/kazu-yamamoto/logger";
        description = "A class of monads which can log messages";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "monad-logger" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring, conduit
+     , conduit-extra, exceptions, fast-logger, lifted-base
+     , monad-control, monad-loops, mtl, resourcet, stm, stm-chans
+     , template-haskell, text, transformers, transformers-base
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "monad-logger";
+       version = "0.3.17";
+       sha256 = "25dd1e420c1bbc83b968cac738a08ebc6d708581a6e190f5e61c8de5e698e1ea";
+       libraryHaskellDepends = [
+         base blaze-builder bytestring conduit conduit-extra exceptions
+         fast-logger lifted-base monad-control monad-loops mtl resourcet stm
+         stm-chans template-haskell text transformers transformers-base
+         transformers-compat
+       ];
+       homepage = "https://github.com/kazu-yamamoto/logger";
+       description = "A class of monads which can log messages";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "monad-logger-json" = callPackage
@@ -135852,7 +136765,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "multiset" = callPackage
+  "multiset_0_3_0" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "multiset";
@@ -135861,19 +136774,19 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "The Data.MultiSet container type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "multiset_0_3_1" = callPackage
+  "multiset" = callPackage
     ({ mkDerivation, base, containers, doctest, Glob }:
      mkDerivation {
        pname = "multiset";
-       version = "0.3.1";
-       sha256 = "9303952e410141e93fd301bb5ff0e0951c5d17b0c4bb7c46c03a65b3445d505e";
+       version = "0.3.2";
+       sha256 = "e576efc992d808585a40baeb22dd83e0b42001d79ed13e2085b6eb6d6008a6bb";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base doctest Glob ];
        description = "The Data.MultiSet container type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "multiset-comb" = callPackage
@@ -138110,6 +139023,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) nettle;};
 
+  "nettle_0_2_0" = callPackage
+    ({ mkDerivation, array, base, byteable, bytestring
+     , crypto-cipher-tests, crypto-cipher-types, HUnit, nettle
+     , QuickCheck, securemem, tagged, test-framework
+     , test-framework-hunit, test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "nettle";
+       version = "0.2.0";
+       sha256 = "220184713b802c53ee26783b891a3bbee6c6b2571f798bd6def2496a504e9bde";
+       libraryHaskellDepends = [
+         base byteable bytestring crypto-cipher-types securemem tagged
+       ];
+       libraryPkgconfigDepends = [ nettle ];
+       testHaskellDepends = [
+         array base bytestring crypto-cipher-tests crypto-cipher-types HUnit
+         QuickCheck tagged test-framework test-framework-hunit
+         test-framework-quickcheck2
+       ];
+       homepage = "https://github.com/stbuehler/haskell-nettle";
+       description = "safe nettle binding";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) nettle;};
+
   "nettle-frp" = callPackage
     ({ mkDerivation, base, bimap, binary, bytestring, containers, mtl
      , nettle-openflow, network, network-data, random, time
@@ -139926,6 +140864,7 @@ self: {
          base bytestring containers data-named filepath polysoup tar text
          zlib
        ];
+       jailbreak = true;
        homepage = "https://github.com/kawu/nkjp";
        description = "Manipulating the National Corpus of Polish (NKJP)";
        license = stdenv.lib.licenses.bsd3;
@@ -141910,17 +142849,12 @@ self: {
      }) {};
 
   "opencog-atomspace" = callPackage
-    ({ mkDerivation, atomspace-cwrapper, base, containers, directory
-     , filepath, mtl, template-haskell, transformers
-     }:
+    ({ mkDerivation, atomspace-cwrapper, base, transformers }:
      mkDerivation {
        pname = "opencog-atomspace";
-       version = "0.1.0.2";
-       sha256 = "fc7d96645ef0c14e56ffdbcad9537f0ea766616ac3f1dc105e817a53990a30d1";
-       libraryHaskellDepends = [
-         base containers directory filepath mtl template-haskell
-         transformers
-       ];
+       version = "0.1.0.3";
+       sha256 = "c4848b27f3c2d6f7e2fc22d338a9bc1547c5282d970c0d7d4d83672a948e4dd0";
+       libraryHaskellDepends = [ base transformers ];
        librarySystemDepends = [ atomspace-cwrapper ];
        homepage = "github.com/opencog/atomspace/tree/master/opencog/haskell";
        description = "Haskell Bindings for the AtomSpace";
@@ -144052,29 +144986,29 @@ self: {
        license = "GPL";
      }) {};
 
-  "pandoc_1_16_0_1" = callPackage
+  "pandoc_1_16_0_2" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, array, base
      , base64-bytestring, binary, blaze-html, blaze-markup, bytestring
-     , cmark, containers, data-default, deepseq-generics, Diff
-     , directory, executable-path, extensible-exceptions, filemanip
-     , filepath, ghc-prim, haddock-library, highlighting-kate, hslua
-     , HTTP, http-client, http-client-tls, http-types, HUnit
-     , JuicyPixels, mtl, network, network-uri, old-time, pandoc-types
-     , parsec, process, QuickCheck, random, scientific, SHA, syb
-     , tagsoup, temporary, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, texmath, text, time
-     , unordered-containers, vector, xml, yaml, zip-archive, zlib
+     , cmark, containers, data-default, deepseq, Diff, directory
+     , executable-path, extensible-exceptions, filemanip, filepath
+     , ghc-prim, haddock-library, highlighting-kate, hslua, HTTP
+     , http-client, http-client-tls, http-types, HUnit, JuicyPixels, mtl
+     , network, network-uri, old-time, pandoc-types, parsec, process
+     , QuickCheck, random, scientific, SHA, syb, tagsoup, temporary
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , texmath, text, time, unordered-containers, vector, xml, yaml
+     , zip-archive, zlib
      }:
      mkDerivation {
        pname = "pandoc";
-       version = "1.16.0.1";
-       sha256 = "211bc1a4f1beaaf888d82e4e67414a3984cf494b58be49e157a1c21d9a09db1a";
+       version = "1.16.0.2";
+       sha256 = "f5f3262ef4574a111936fea0118557c523a8b0eaa7fea84b64b377b20a80f348";
        configureFlags = [ "-fhttps" ];
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson array base base64-bytestring binary blaze-html blaze-markup
-         bytestring cmark containers data-default deepseq-generics directory
+         bytestring cmark containers data-default deepseq directory
          extensible-exceptions filemanip filepath ghc-prim haddock-library
          highlighting-kate hslua HTTP http-client http-client-tls http-types
          JuicyPixels mtl network network-uri old-time pandoc-types parsec
@@ -150357,21 +151291,21 @@ self: {
      }) {};
 
   "pipes-websockets" = callPackage
-    ({ mkDerivation, base, QuickCheck, test-framework
-     , test-framework-hunit, test-framework-quickcheck2
+    ({ mkDerivation, base, pipes, pipes-concurrency, text, transformers
+     , websockets
      }:
      mkDerivation {
        pname = "pipes-websockets";
-       version = "0.0.0.0";
-       sha256 = "66c2a883dde7d8a8323f8c17866e86dc9f45971c924df83851065a75c8b9cf9c";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base QuickCheck test-framework test-framework-hunit
-         test-framework-quickcheck2
+       version = "0.1.0.0";
+       sha256 = "b86dcf98d0536c7d6830b64a84d14a89aaa68659abd715b5891e98975de9bac2";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base pipes pipes-concurrency text transformers websockets
        ];
-       jailbreak = true;
-       homepage = "https://github.com/ixmatus/pipes-websockets";
-       description = "Library for using websockets ontop of pipes-network";
+       executableHaskellDepends = [ base ];
+       homepage = "https://github.com/silky/pipes-websockets#readme";
+       description = "WebSockets in the Pipes framework";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -152362,7 +153296,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "postgresql-schema" = callPackage
+  "postgresql-schema_0_1_9" = callPackage
     ({ mkDerivation, base, basic-prelude, optparse-applicative
      , postgresql-simple, shelly, text, time, time-locale-compat
      }:
@@ -152382,6 +153316,29 @@ self: {
        homepage = "https://github.com/mfine/postgresql-schema";
        description = "PostgreSQL Schema Management";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "postgresql-schema" = callPackage
+    ({ mkDerivation, base, basic-prelude, optparse-applicative
+     , postgresql-simple, shelly, text, time, time-locale-compat
+     }:
+     mkDerivation {
+       pname = "postgresql-schema";
+       version = "0.1.10";
+       sha256 = "29307e09916a7fd9aec965ed2f62663e26b5e66b5ab441d3ed52713d551ae27a";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base basic-prelude postgresql-simple shelly text
+       ];
+       executableHaskellDepends = [
+         base basic-prelude optparse-applicative shelly text time
+         time-locale-compat
+       ];
+       homepage = "https://github.com/mfine/postgresql-schema";
+       description = "PostgreSQL Schema Management";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "postgresql-simple_0_4_8_0" = callPackage
@@ -152566,17 +153523,19 @@ self: {
   "postgresql-typed" = callPackage
     ({ mkDerivation, aeson, array, attoparsec, base, binary, bytestring
      , containers, cryptohash, haskell-src-meta, network, old-locale
-     , postgresql-binary, QuickCheck, scientific, template-haskell, text
-     , time, utf8-string, uuid
+     , QuickCheck, scientific, template-haskell, text, time, utf8-string
+     , uuid
      }:
      mkDerivation {
        pname = "postgresql-typed";
        version = "0.4.2.2";
        sha256 = "80b2be671ad75782e19a808cbdecb1e814e2450b7645d2da0280c12802df188c";
+       revision = "1";
+       editedCabalFile = "a774fcb5f4d1cd12b2495cd376a5a010b6c1eac422601bbc4c379b1df99b4f5f";
        libraryHaskellDepends = [
          aeson array attoparsec base binary bytestring containers cryptohash
-         haskell-src-meta network old-locale postgresql-binary scientific
-         template-haskell text time utf8-string uuid
+         haskell-src-meta network old-locale scientific template-haskell
+         text time utf8-string uuid
        ];
        testHaskellDepends = [ base bytestring network QuickCheck time ];
        homepage = "https://github.com/dylex/postgresql-typed";
@@ -154593,8 +155552,8 @@ self: {
      }:
      mkDerivation {
        pname = "propellor";
-       version = "2.15.2";
-       sha256 = "9409e81802e2809f6ce8bbf9b6ce509c9a0e6e2f787349e752beebd910088a0c";
+       version = "2.15.3";
+       sha256 = "8d83603d915fcce9ce109b70bd19499a94a70de6abc2a31ac2ebd892f76af683";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -158224,8 +159183,8 @@ self: {
      }:
      mkDerivation {
        pname = "react-flux";
-       version = "1.0.2";
-       sha256 = "eb5520adb34979a1f8ae7ce11ecc127d3df4ee7e419129c0e2ca2a1c01ef7c21";
+       version = "1.0.3";
+       sha256 = "b30f88e08577f8fd9375fe71d0e3a8dcd4452b5c8e0019d93b6a5146715d3710";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -159107,6 +160066,7 @@ self: {
          QuickCheck random tasty tasty-ant-xml tasty-hunit tasty-quickcheck
          vector
        ];
+       jailbreak = true;
        homepage = "http://github.com/NicolasT/reedsolomon";
        description = "Reed-Solomon Erasure Coding in Haskell";
        license = stdenv.lib.licenses.mit;
@@ -163027,7 +163987,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "rethinkdb-client-driver" = callPackage
+  "rethinkdb-client-driver_0_0_20" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, hashable, hspec
      , hspec-smallcheck, mtl, network, old-locale, scientific
      , smallcheck, template-haskell, text, time, unordered-containers
@@ -163050,6 +164010,33 @@ self: {
        homepage = "https://github.com/wereHamster/rethinkdb-client-driver";
        description = "Client driver for RethinkDB";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "rethinkdb-client-driver" = callPackage
+    ({ mkDerivation, aeson, base, binary, bytestring, containers
+     , hashable, hspec, hspec-smallcheck, mtl, network, old-locale
+     , scientific, smallcheck, template-haskell, text, time
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "rethinkdb-client-driver";
+       version = "0.0.21";
+       sha256 = "27bfbca15e5bff5215deed35c19d2ec17d1c27e9cc6b9fe147e8b9ed50cd76d0";
+       libraryHaskellDepends = [
+         aeson base binary bytestring containers hashable mtl network
+         old-locale scientific template-haskell text time
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         base hspec hspec-smallcheck smallcheck text time
+         unordered-containers vector
+       ];
+       doHaddock = false;
+       doCheck = false;
+       homepage = "https://github.com/wereHamster/rethinkdb-client-driver";
+       description = "Client driver for RethinkDB";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "rethinkdb-model" = callPackage
@@ -163115,7 +164102,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "retry" = callPackage
+  "retry_0_7_0_1" = callPackage
     ({ mkDerivation, base, data-default-class, exceptions, hspec, HUnit
      , QuickCheck, random, stm, time, transformers
      }:
@@ -163135,6 +164122,29 @@ self: {
        homepage = "http://github.com/Soostone/retry";
        description = "Retry combinators for monadic actions that may fail";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "retry" = callPackage
+    ({ mkDerivation, base, data-default-class, exceptions, hspec, HUnit
+     , QuickCheck, random, stm, time, transformers
+     }:
+     mkDerivation {
+       pname = "retry";
+       version = "0.7.1";
+       sha256 = "55900f2b01de0acd83874fc6a986c12f34f31e362cb318e271942418dedef680";
+       libraryHaskellDepends = [
+         base data-default-class exceptions random transformers
+       ];
+       testHaskellDepends = [
+         base data-default-class exceptions hspec HUnit QuickCheck random
+         stm time transformers
+       ];
+       jailbreak = true;
+       doCheck = false;
+       homepage = "http://github.com/Soostone/retry";
+       description = "Retry combinators for monadic actions that may fail";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "retryer" = callPackage
@@ -165720,6 +166730,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "sbv_5_11" = callPackage
+    ({ mkDerivation, array, async, base, base-compat, containers
+     , crackNum, data-binary-ieee754, deepseq, directory, filepath
+     , HUnit, mtl, old-time, pretty, process, QuickCheck, random, syb
+     }:
+     mkDerivation {
+       pname = "sbv";
+       version = "5.11";
+       sha256 = "9ede93f41cdbdfb73638f25eec9c201190d049163ad503202ebefa2d18cfc90d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array async base base-compat containers crackNum
+         data-binary-ieee754 deepseq directory filepath mtl old-time pretty
+         process QuickCheck random syb
+       ];
+       executableHaskellDepends = [
+         base data-binary-ieee754 directory filepath HUnit process syb
+       ];
+       testHaskellDepends = [
+         base data-binary-ieee754 directory filepath HUnit syb
+       ];
+       homepage = "http://leventerkok.github.com/sbv/";
+       description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "sbvPlugin" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, ghc
      , ghc-prim, mtl, process, sbv, tasty, tasty-golden
@@ -166348,6 +167386,8 @@ self: {
        pname = "scientific";
        version = "0.3.4.4";
        sha256 = "f7c81e6ce6bf1161033ad4bc47b5bf164f4404d9df686dd0edadd488db25a519";
+       revision = "1";
+       editedCabalFile = "dd4a9ebfd75c61461e605995131104989a13780c987f3288c64b0a4ec80e08dc";
        libraryHaskellDepends = [
          base binary bytestring containers deepseq ghc-prim hashable
          integer-gmp text vector
@@ -169491,8 +170531,8 @@ self: {
        pname = "servant-yaml";
        version = "0.1.0.0";
        sha256 = "c917d9b046b06a9c4386f743a78142c27cf7f0ec1ad8562770ab9828f2ee3204";
-       revision = "1";
-       editedCabalFile = "b9472e33042ed5317fdf61d3f413ae148e66b3747a20248ba059db75272c57d4";
+       revision = "2";
+       editedCabalFile = "3ef09bca6255336c4a1dfd58b27a0d24957ea31e42d51d3b9334790518818ed0";
        libraryHaskellDepends = [
          base bytestring http-media servant yaml
        ];
@@ -170679,6 +171719,7 @@ self: {
        version = "0.1.2";
        sha256 = "413dc10d9b141ba885b3067b2ab76aee7f2978a930e874885fa0baf3d8b1c247";
        libraryHaskellDepends = [ base bytestring bzlib shake tar ];
+       jailbreak = true;
        homepage = "https://github.com/LukeHoersten/shake-pack";
        description = "Shake File Pack Rule";
        license = stdenv.lib.licenses.bsd3;
@@ -170961,6 +172002,21 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
+  "shakespeare-babel" = callPackage
+    ({ mkDerivation, base, classy-prelude, shakespeare
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "shakespeare-babel";
+       version = "0.1.0.0";
+       sha256 = "a072ca9cf9397f23b74920d395d880108a7268d63a93da3086ed5a40ee0c2035";
+       libraryHaskellDepends = [
+         base classy-prelude shakespeare template-haskell
+       ];
+       description = "compile es2015";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "shakespeare-css" = callPackage
     ({ mkDerivation, base, shakespeare }:
      mkDerivation {
@@ -176639,6 +177695,8 @@ self: {
        pname = "spdx";
        version = "0.2.1.0";
        sha256 = "a7f0d6098e201f5d7b14c13387fe699b9830c95c0192bbd8ceda446a30c980f2";
+       revision = "1";
+       editedCabalFile = "adba306bc3280e794c4f69da6fb87346d53bd5c72bd9940069d68d1fc194ce61";
        libraryHaskellDepends = [ base transformers ];
        testHaskellDepends = [ base tasty tasty-quickcheck ];
        homepage = "https://github.com/phadej/spdx";
@@ -177029,7 +178087,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "split" = callPackage
+  "split_0_2_2" = callPackage
     ({ mkDerivation, base, QuickCheck }:
      mkDerivation {
        pname = "split";
@@ -177041,6 +178099,19 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Combinator library for splitting lists";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "split" = callPackage
+    ({ mkDerivation, base, QuickCheck }:
+     mkDerivation {
+       pname = "split";
+       version = "0.2.3";
+       sha256 = "a6d100e433fa27eda72127475ba9c55481ca4105cfbb6ff55b67023d00ccead9";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base QuickCheck ];
+       description = "Combinator library for splitting lists";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "split-channel" = callPackage
@@ -178364,8 +179435,8 @@ self: {
        pname = "stack";
        version = "1.0.0";
        sha256 = "cd2f606d390fe521b6ba0794de87edcba64c4af66856af09594907c2b4f4751d";
-       revision = "4";
-       editedCabalFile = "f9396c12ec617c8c49730105f6cec3fe14bfa679fbf8ad37fa66b687691733e0";
+       revision = "5";
+       editedCabalFile = "a0067126d4f6e5ed16ca552886c9010f9bc4813b582736313e6d5e78a7ed581c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -184084,8 +185155,8 @@ self: {
      }:
      mkDerivation {
        pname = "taffybar";
-       version = "0.4.5";
-       sha256 = "9cb676fdc80f570b066fe847b3ff459f8f8cea0d651b9d5f0c264e575fc1fc45";
+       version = "0.4.6";
+       sha256 = "620918469d79d33067808114bdf8d4d6f5a5ae6d77ff672a37ea04ecc5e0caf5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -184100,7 +185171,6 @@ self: {
          base dyre filepath gtk safe xdg-basedir
        ];
        executablePkgconfigDepends = [ gtk2 ];
-       jailbreak = true;
        homepage = "http://github.com/travitch/taffybar";
        description = "A desktop bar similar to xmobar, but with more GUI";
        license = stdenv.lib.licenses.bsd3;
@@ -184745,27 +185815,6 @@ self: {
      }) {};
 
   "tar" = callPackage
-    ({ mkDerivation, array, base, bytestring, bytestring-handle
-     , containers, deepseq, directory, filepath, old-time, QuickCheck
-     , tasty, tasty-quickcheck, time
-     }:
-     mkDerivation {
-       pname = "tar";
-       version = "0.4.5.0";
-       sha256 = "2959d7bb5e941969f023ba558e38f1723e72c6883e6eeca459472f42be33f32a";
-       libraryHaskellDepends = [
-         array base bytestring containers deepseq directory filepath time
-       ];
-       testHaskellDepends = [
-         array base bytestring bytestring-handle containers deepseq
-         directory filepath old-time QuickCheck tasty tasty-quickcheck time
-       ];
-       doCheck = false;
-       description = "Reading, writing and manipulating \".tar\" archive files.";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "tar_0_5_0_1" = callPackage
     ({ mkDerivation, array, base, bytestring, bytestring-handle
      , containers, deepseq, directory, filepath, QuickCheck, tasty
      , tasty-quickcheck, time
@@ -184781,9 +185830,9 @@ self: {
          array base bytestring bytestring-handle containers deepseq
          directory filepath QuickCheck tasty tasty-quickcheck time
        ];
+       doCheck = false;
        description = "Reading, writing and manipulating \".tar\" archive files.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tardis" = callPackage
@@ -187579,6 +188628,26 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "text-region" = callPackage
+    ({ mkDerivation, aeson, base, base-unicode-symbols, bytestring
+     , containers, groups, hspec, lens, mtl, text
+     }:
+     mkDerivation {
+       pname = "text-region";
+       version = "0.1.0.0";
+       sha256 = "bf65047a5608e62b55a6a10067068b5ef63675df1b41148ad198f464e8f80673";
+       libraryHaskellDepends = [
+         aeson base base-unicode-symbols bytestring containers groups lens
+         mtl text
+       ];
+       testHaskellDepends = [
+         base base-unicode-symbols containers hspec lens mtl text
+       ];
+       homepage = "https://github.com/mvoidex/text-region";
+       description = "Provides functions to update text region positions according to text edit actions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "text-register-machine" = callPackage
     ({ mkDerivation, base, containers, mtl, vector }:
      mkDerivation {
@@ -189041,11 +190110,11 @@ self: {
      }:
      mkDerivation {
        pname = "tickle";
-       version = "0.0.5";
-       sha256 = "bf8c57ddea14842bc5e5e2099c5fbc8e9c85544f3daad57a33ba1db6fa244102";
+       version = "0.0.6";
+       sha256 = "a5701be4825537d2426f1d84366847b50876087319bdf8df96028b8f874ebba7";
        libraryHaskellDepends = [
-         base bifunctors bytestring lens mtl semigroupoids semigroups
-         transformers validation
+         base bifunctors bytestring filepath lens mtl semigroupoids
+         semigroups transformers validation
        ];
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
@@ -191051,6 +192120,8 @@ self: {
        pname = "transformers";
        version = "0.5.0.0";
        sha256 = "720541fc11ed72737c7059f47836361edb05f6eadcd535fffbee8801f3d03feb";
+       revision = "1";
+       editedCabalFile = "b85ec9307ae228bde57c06b96bf25e4518d22ad40daccf285cf7d1f31c1dc2ab";
        libraryHaskellDepends = [ base ];
        description = "Concrete functor and monad transformers";
        license = stdenv.lib.licenses.bsd3;
@@ -191654,7 +192725,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "true-name" = callPackage
+  "true-name_0_0_0_2" = callPackage
     ({ mkDerivation, base, containers, template-haskell, time }:
      mkDerivation {
        pname = "true-name";
@@ -191665,9 +192736,10 @@ self: {
        homepage = "https://github.com/liyang/true-name";
        description = "Template Haskell hack to violate another module's abstractions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "true-name_0_1_0_0" = callPackage
+  "true-name" = callPackage
     ({ mkDerivation, base, containers, template-haskell, time }:
      mkDerivation {
        pname = "true-name";
@@ -191678,7 +192750,6 @@ self: {
        homepage = "https://github.com/liyang/true-name";
        description = "Template Haskell hack to violate another module's abstractions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "truelevel" = callPackage
@@ -192964,8 +194035,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "type-combinators";
-       version = "0.2.0.0";
-       sha256 = "0b0b07f8ac2bc3237114753f8f9e2d8f41cdc4c97d3bd5cd4725beaaa4b7c99a";
+       version = "0.2.2.0";
+       sha256 = "52688cdc72f387baa0a39ca4e8cb020ec3018fab03c9da25ae1fb9693d32a1d3";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/kylcarte/type-combinators";
        description = "A collection of data types for type-level programming";
@@ -194510,8 +195581,8 @@ self: {
      }:
      mkDerivation {
        pname = "uniform-io";
-       version = "1.1.0.0";
-       sha256 = "6775fa62ca0b1e87e70c6ae468a54486a8a1ca510f0a86de5cc376a39729da9f";
+       version = "1.1.1.0";
+       sha256 = "a731b2c38d988631519f7e7487ed2372337c834e56f827e41ec672a71dbfa5ed";
        libraryHaskellDepends = [
          attoparsec base bytestring data-default-class iproute network
          transformers word8
@@ -195120,6 +196191,8 @@ self: {
        pname = "unordered-containers";
        version = "0.2.5.1";
        sha256 = "6e5878ade3ea65f2a7cb0a1df155f88f7e710d5bb975a5cbf1b45fb8cfee811a";
+       revision = "1";
+       editedCabalFile = "573b8855cce6de6c1f4111933e84375e4afa8a250e3a1c17e2206cb705236d4d";
        libraryHaskellDepends = [ base deepseq hashable ];
        testHaskellDepends = [
          base ChasingBottoms containers hashable HUnit QuickCheck
@@ -195130,6 +196203,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "unordered-containers_0_2_6_0" = callPackage
+    ({ mkDerivation, base, ChasingBottoms, containers, deepseq
+     , hashable, HUnit, QuickCheck, test-framework, test-framework-hunit
+     , test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "unordered-containers";
+       version = "0.2.6.0";
+       sha256 = "5f9fbba5f616344bd3b1b633d45f820cf9c840ad101e1110e698abc77d9de3f3";
+       libraryHaskellDepends = [ base deepseq hashable ];
+       testHaskellDepends = [
+         base ChasingBottoms containers hashable HUnit QuickCheck
+         test-framework test-framework-hunit test-framework-quickcheck2
+       ];
+       homepage = "https://github.com/tibbe/unordered-containers";
+       description = "Efficient hashing-based container types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "unordered-containers-rematch" = callPackage
     ({ mkDerivation, base, hashable, hspec, HUnit, rematch
      , unordered-containers
@@ -199991,7 +201084,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "wai-extra" = callPackage
+  "wai-extra_3_0_13_1" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
      , blaze-builder, bytestring, case-insensitive, containers, cookie
      , data-default-class, deepseq, directory, fast-logger, hspec
@@ -200018,6 +201111,36 @@ self: {
        homepage = "http://github.com/yesodweb/wai";
        description = "Provides some basic WAI handlers and middleware";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "wai-extra" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
+     , blaze-builder, bytestring, case-insensitive, containers, cookie
+     , data-default-class, deepseq, directory, fast-logger, hspec
+     , http-types, HUnit, iproute, lifted-base, network, old-locale
+     , resourcet, streaming-commons, stringsearch, text, time
+     , transformers, unix, unix-compat, vault, void, wai, wai-logger
+     , word8, zlib
+     }:
+     mkDerivation {
+       pname = "wai-extra";
+       version = "3.0.14";
+       sha256 = "63f0df82dcd7c871c458e1ee67aca6d48b8794ff474e6b5e93873d4bbf6f7f2c";
+       libraryHaskellDepends = [
+         aeson ansi-terminal base base64-bytestring blaze-builder bytestring
+         case-insensitive containers cookie data-default-class deepseq
+         directory fast-logger http-types iproute lifted-base network
+         old-locale resourcet streaming-commons stringsearch text time
+         transformers unix unix-compat vault void wai wai-logger word8 zlib
+       ];
+       testHaskellDepends = [
+         base blaze-builder bytestring case-insensitive cookie fast-logger
+         hspec http-types HUnit resourcet text time transformers wai zlib
+       ];
+       homepage = "http://github.com/yesodweb/wai";
+       description = "Provides some basic WAI handlers and middleware";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "wai-frontend-monadcgi" = callPackage
@@ -200301,7 +201424,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "wai-logger" = callPackage
+  "wai-logger_2_2_4_1" = callPackage
     ({ mkDerivation, auto-update, base, blaze-builder, byteorder
      , bytestring, case-insensitive, doctest, easy-file, fast-logger
      , http-types, network, unix, unix-time, wai
@@ -200319,6 +201442,27 @@ self: {
        doCheck = false;
        description = "A logging system for WAI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "wai-logger" = callPackage
+    ({ mkDerivation, auto-update, base, blaze-builder, byteorder
+     , bytestring, case-insensitive, doctest, easy-file, fast-logger
+     , http-types, network, unix, unix-time, wai
+     }:
+     mkDerivation {
+       pname = "wai-logger";
+       version = "2.2.5";
+       sha256 = "678e6fa92d2a8c71182b96e809c69cca4558ddd132ec41bdcf786cf5f1800ba3";
+       libraryHaskellDepends = [
+         auto-update base blaze-builder byteorder bytestring
+         case-insensitive easy-file fast-logger http-types network unix
+         unix-time wai
+       ];
+       testHaskellDepends = [ base doctest ];
+       doCheck = false;
+       description = "A logging system for WAI";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "wai-logger-prefork" = callPackage
@@ -200491,6 +201635,8 @@ self: {
        pname = "wai-middleware-content-type";
        version = "0.2.0";
        sha256 = "d45ace35cf7a7ac92d8bd46b9001d1c237d68a20810634467663779b228f5866";
+       revision = "1";
+       editedCabalFile = "6958bfd062d09a59c33c0d5f0c52356df462bd2185ee8088ac3e8078ffacf692";
        libraryHaskellDepends = [
          aeson base blaze-builder blaze-html bytestring clay exceptions
          hashable http-media http-types lucid mmorph monad-control
@@ -200569,7 +201715,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "wai-middleware-crowd" = callPackage
+  "wai-middleware-crowd_0_1_3" = callPackage
     ({ mkDerivation, authenticate, base, base64-bytestring, binary
      , blaze-builder, bytestring, case-insensitive, clientsession
      , containers, cookie, gitrev, http-client, http-client-tls
@@ -200596,6 +201742,36 @@ self: {
        ];
        description = "Middleware and utilities for using Atlassian Crowd authentication";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "wai-middleware-crowd" = callPackage
+    ({ mkDerivation, authenticate, base, base64-bytestring, binary
+     , blaze-builder, bytestring, case-insensitive, clientsession
+     , containers, cookie, gitrev, http-client, http-client-tls
+     , http-reverse-proxy, http-types, optparse-applicative, resourcet
+     , template-haskell, text, time, transformers, unix-compat, vault
+     , wai, wai-app-static, wai-extra, warp
+     }:
+     mkDerivation {
+       pname = "wai-middleware-crowd";
+       version = "0.1.4";
+       sha256 = "f496aa3581ecb75ec611c50fbbb10b17cbca612c7caba00dfa24191aba1585cb";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         authenticate base base64-bytestring binary blaze-builder bytestring
+         case-insensitive clientsession containers cookie http-client
+         http-client-tls http-types resourcet text time unix-compat vault
+         wai
+       ];
+       executableHaskellDepends = [
+         base bytestring clientsession gitrev http-client http-client-tls
+         http-reverse-proxy http-types optparse-applicative template-haskell
+         text transformers wai wai-app-static wai-extra warp
+       ];
+       description = "Middleware and utilities for using Atlassian Crowd authentication";
+       license = stdenv.lib.licenses.mit;
        hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
@@ -201074,7 +202250,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "wai-routes" = callPackage
+  "wai-routes_0_9_4" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring
      , case-insensitive, containers, cookie, data-default-class
      , filepath, hspec, hspec-wai, hspec-wai-json, http-types
@@ -201097,6 +202273,32 @@ self: {
        homepage = "https://ajnsit.github.io/wai-routes/";
        description = "Typesafe URLs for Wai applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "wai-routes" = callPackage
+    ({ mkDerivation, aeson, base, blaze-builder, bytestring
+     , case-insensitive, containers, cookie, data-default-class
+     , filepath, hspec, hspec-wai, hspec-wai-json, http-types
+     , mime-types, monad-loops, mtl, path-pieces, random
+     , template-haskell, text, vault, wai, wai-app-static, wai-extra
+     }:
+     mkDerivation {
+       pname = "wai-routes";
+       version = "0.9.5";
+       sha256 = "493083791e875fe9adebc12347a28bb2c7d84d808d54cd33ed6aa5fe99ee12c3";
+       libraryHaskellDepends = [
+         aeson base blaze-builder bytestring case-insensitive containers
+         cookie data-default-class filepath http-types mime-types
+         monad-loops mtl path-pieces random template-haskell text vault wai
+         wai-app-static wai-extra
+       ];
+       testHaskellDepends = [
+         aeson base hspec hspec-wai hspec-wai-json text wai
+       ];
+       homepage = "https://ajnsit.github.io/wai-routes/";
+       description = "Typesafe URLs for Wai applications";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "wai-routing_0_12_1" = callPackage
@@ -202346,7 +203548,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "warp_3_2_1" = callPackage
+  "warp_3_2_2" = callPackage
     ({ mkDerivation, array, async, auto-update, base, blaze-builder
      , bytestring, bytestring-builder, case-insensitive, containers
      , directory, doctest, ghc-prim, hashable, hspec, HTTP, http-date
@@ -202356,8 +203558,8 @@ self: {
      }:
      mkDerivation {
        pname = "warp";
-       version = "3.2.1";
-       sha256 = "c04acc6a4933ddba8bfa7a0752848f9b546162944b917fa39c65f82bca11b3a3";
+       version = "3.2.2";
+       sha256 = "c85382d4affc4a3d606de8f72f1031306da2c32f63d0a99deaeb93440e5796e6";
        libraryHaskellDepends = [
          array auto-update base blaze-builder bytestring bytestring-builder
          case-insensitive containers ghc-prim hashable http-date http-types
@@ -203489,7 +204691,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "webdriver" = callPackage
+  "webdriver_0_8_0_4" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
      , bytestring, data-default-class, directory, directory-tree
      , exceptions, filepath, http-client, http-types, lifted-base
@@ -203512,6 +204714,32 @@ self: {
        homepage = "https://github.com/kallisti-dev/hs-webdriver";
        description = "a Haskell client for the Selenium WebDriver protocol";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "webdriver" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
+     , bytestring, data-default-class, directory, directory-tree
+     , exceptions, filepath, http-client, http-types, lifted-base
+     , monad-control, network, network-uri, scientific, temporary, text
+     , time, transformers, transformers-base, unordered-containers
+     , vector, zip-archive
+     }:
+     mkDerivation {
+       pname = "webdriver";
+       version = "0.8.1";
+       sha256 = "74ccd22c1fa6ce713d36997a09dc1c1931732a7f005f35d364600ec09d04933f";
+       libraryHaskellDepends = [
+         aeson attoparsec base base64-bytestring bytestring
+         data-default-class directory directory-tree exceptions filepath
+         http-client http-types lifted-base monad-control network
+         network-uri scientific temporary text time transformers
+         transformers-base unordered-containers vector zip-archive
+       ];
+       doCheck = false;
+       homepage = "https://github.com/kallisti-dev/hs-webdriver";
+       description = "a Haskell client for the Selenium WebDriver protocol";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "webdriver-angular_0_1_7" = callPackage
@@ -211091,6 +212319,7 @@ self: {
          transformers transformers-compat unix-compat unordered-containers
          wai wai-extra warp warp-tls yaml zlib
        ];
+       jailbreak = true;
        homepage = "http://www.yesodweb.com/";
        description = "The yesod helper executable";
        license = stdenv.lib.licenses.mit;
@@ -211125,6 +212354,7 @@ self: {
          transformers transformers-compat unix-compat unordered-containers
          wai wai-extra warp warp-tls yaml zlib
        ];
+       jailbreak = true;
        homepage = "http://www.yesodweb.com/";
        description = "The yesod helper executable";
        license = stdenv.lib.licenses.mit;
@@ -211159,6 +212389,7 @@ self: {
          transformers transformers-compat unix-compat unordered-containers
          wai wai-extra warp warp-tls yaml zlib
        ];
+       jailbreak = true;
        homepage = "http://www.yesodweb.com/";
        description = "The yesod helper executable";
        license = stdenv.lib.licenses.mit;
@@ -211193,6 +212424,7 @@ self: {
          transformers transformers-compat unix-compat unordered-containers
          wai wai-extra warp warp-tls yaml zlib
        ];
+       jailbreak = true;
        homepage = "http://www.yesodweb.com/";
        description = "The yesod helper executable";
        license = stdenv.lib.licenses.mit;
@@ -211227,6 +212459,7 @@ self: {
          transformers transformers-compat unix-compat unordered-containers
          wai wai-extra warp warp-tls yaml zlib
        ];
+       jailbreak = true;
        homepage = "http://www.yesodweb.com/";
        description = "The yesod helper executable";
        license = stdenv.lib.licenses.mit;
@@ -211261,6 +212494,7 @@ self: {
          transformers transformers-compat unix-compat unordered-containers
          wai wai-extra warp warp-tls yaml zlib
        ];
+       jailbreak = true;
        homepage = "http://www.yesodweb.com/";
        description = "The yesod helper executable";
        license = stdenv.lib.licenses.mit;

From 623664daaa96a2366d120f19bbe6e1afee785ad9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 14 Jan 2016 16:30:29 +0100
Subject: [PATCH 787/884] ghc-8.0.1: drop unused docbooc-related build inputs

The documentation is now built via Sphinx (todo).
---
 pkgs/development/compilers/ghc/8.0.1.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix
index 9a1fc56dd88f..7f337c019531 100644
--- a/pkgs/development/compilers/ghc/8.0.1.nix
+++ b/pkgs/development/compilers/ghc/8.0.1.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchpatch, ghc, perl, gmp, ncurses, libiconv, binutils, coreutils
-, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, hscolour
+, hscolour
 }:
 
 stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     ./dont-pass-linker-flags-via-response-files.patch   # https://github.com/NixOS/nixpkgs/issues/10752
   ];
 
-  buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour ];
+  buildInputs = [ ghc perl hscolour ];
 
   enableParallelBuilding = true;
 

From 5cee8ff8097758c03bd2797878a13155de059a61 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 15 Jan 2016 21:35:10 +0100
Subject: [PATCH 788/884] calibre: 2.48.0 -> 2.49.0

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

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index d4786017a473..28e97a930674 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.48.0";
+  version = "2.49.0";
   name = "calibre-${version}";
 
   src = fetchurl {
     url = "http://download.calibre-ebook.com/${version}/${name}.tar.xz";
-    sha256 = "0bjzw806czqxkhq9qqkhff8bhfc428pijkidb1h6gr47jqdp4hpg";
+    sha256 = "0jc476pg07c0nwccprhwgjdlvvb2fdzza9xrjqzc0c42c5v7qzxa";
   };
 
   inherit python;

From edeaa7d26cc555c439638ff4780b782bfa8f311d Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 15 Jan 2016 21:35:29 +0100
Subject: [PATCH 789/884] linuxConsoleTools: 1.4.8 -> 1.4.9

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

diff --git a/pkgs/os-specific/linux/consoletools/default.nix b/pkgs/os-specific/linux/consoletools/default.nix
index 6961768e7d32..0a7997755514 100644
--- a/pkgs/os-specific/linux/consoletools/default.nix
+++ b/pkgs/os-specific/linux/consoletools/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "linuxconsoletools-${version}";
-  version = "1.4.8";
+  version = "1.4.9";
 
   src = fetchurl {
     url = "mirror://sourceforge/linuxconsole/${name}.tar.bz2";
-    sha256 = "0spf9hx48cqx2i46pkz0gbrn7xrk68cw8iyrfbs2b3k0bxcsri13";
+    sha256 = "0rwv2fxn12bblp096m9jy1lhngz26lv6g6zs4cgfg4frikwn977s";
   };
 
   buildInputs = [ SDL ];

From df7139de360b0c152b72a4906a520884a84a37bf Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 15 Jan 2016 21:35:47 +0100
Subject: [PATCH 790/884] hevea: 2.26 -> 2.28

---
 pkgs/tools/typesetting/hevea/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/typesetting/hevea/default.nix b/pkgs/tools/typesetting/hevea/default.nix
index 3343579bbab2..600522d45a26 100644
--- a/pkgs/tools/typesetting/hevea/default.nix
+++ b/pkgs/tools/typesetting/hevea/default.nix
@@ -1,18 +1,16 @@
 { stdenv, fetchurl, ocaml }:
 
 stdenv.mkDerivation rec {
-  name = "hevea-2.26";
+  name = "hevea-2.28";
 
   src = fetchurl {
     url = "http://pauillac.inria.fr/~maranget/hevea/distri/${name}.tar.gz";
-    sha256 = "173v6z2li12pah6315dfpwhqrdljkhsff82gj7sql812zwjkvd2f";
+    sha256 = "14fns13wlnpiv9i05841kvi3cq4b9v2sw5x3ff6ziws28q701qnd";
   };
 
   buildInputs = [ ocaml ];
 
-  configurePhase = ''
-    export makeFlags="PREFIX=$out";
-  '';
+  makeFlags = "PREFIX=$(out)";
 
   meta = with stdenv.lib; {
     description = "A quite complete and fast LATEX to HTML translator";

From 26f221d6b62b24d48f79f22e7f12bb6ff10580da Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 16 Jan 2016 00:31:48 +0200
Subject: [PATCH 791/884] azure-cli: fix dependencies

---
 .../virtualization/azure-cli/default.nix      | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/virtualization/azure-cli/default.nix b/pkgs/tools/virtualization/azure-cli/default.nix
index 10a40e8208c5..049597256a40 100644
--- a/pkgs/tools/virtualization/azure-cli/default.nix
+++ b/pkgs/tools/virtualization/azure-cli/default.nix
@@ -1,4 +1,4 @@
-{ recurseIntoAttrs, callPackage, nodejs
+{ recurseIntoAttrs, callPackage, nodejs, makeWrapper
 }:
 
 let
@@ -7,7 +7,22 @@ let
       inherit nodejs self;
       generated = callPackage ./node-packages.nix { inherit self; };
       overrides = {
-        "azure-cli" = { passthru.nodePackages = self; };
+
+        "azure-cli" =
+        let
+           streamline-streams = self.by-version."streamline-streams"."0.1.5";
+           streamline = self.by-version."streamline"."0.10.17";
+           node-uuid = self.by-version."node-uuid"."1.2.0";
+        in {
+            passthru.nodePackages = self;
+
+            buildInputs = [ makeWrapper ];
+
+            postInstall = ''
+              wrapProgram "$out/bin/azure" \
+                --set NODE_PATH "${streamline-streams}/lib/node_modules:${streamline}/lib/node_modules:${node-uuid}/lib/node_modules"
+            '';
+        };
         "easy-table" = {
             dontMakeSourcesWritable = 1;
             postUnpack = ''

From c4de45b7ca1c129fdf48f713be8aade1b5ab6cc1 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 15 Jan 2016 18:25:16 +0100
Subject: [PATCH 792/884] nixos/tests/quake3: Fix eval due to unfree license

Regression introduced by 6b447a3c9bbee41389052d6fa9e08a53d8447656.

In this commit the Quake 3 demo data now have a meta attribute which
specifies the license as unfreeRedistributable.

While I haven't found anything official about that on the web, let's
just allow it to be used in the test because first of all, we have been
using it for a long time (since 2009, introduced in 497760b) and second,
because it will be quite some effort to rewrite the test with something
like OpenArena (particularily because we need coverage data and need to
use the ioquake3 version plus OpenArena-specific patches).

Tested evaluation on my local system, but the VM test still fails.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/tests/quake3.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/nixos/tests/quake3.nix b/nixos/tests/quake3.nix
index d42f7471c832..81a79b0b3e6d 100644
--- a/nixos/tests/quake3.nix
+++ b/nixos/tests/quake3.nix
@@ -10,6 +10,13 @@ let
       });
     };
 
+  # Only allow the demo data to be used (only if it's unfreeRedistributable).
+  unfreePredicate = pkg: with pkgs.lib; let
+    allowDrvPredicates = [ "quake3-demo" "quake3-pointrelease" ];
+    allowLicenses = [ pkgs.lib.licenses.unfreeRedistributable ];
+  in any (flip hasPrefix pkg.name) allowDrvPredicates &&
+     elem (pkg.meta.license or null) allowLicenses;
+
 in
 
 rec {
@@ -28,6 +35,7 @@ rec {
       hardware.opengl.driSupport = true;
       environment.systemPackages = [ pkgs.quake3demo ];
       nixpkgs.config.packageOverrides = overrides;
+      nixpkgs.config.allowUnfreePredicate = unfreePredicate;
     };
 
   nodes =
@@ -41,6 +49,7 @@ rec {
                 "'+map q3dm7' '+addbot grunt' '+addbot daemia' 2> /tmp/log";
             };
           nixpkgs.config.packageOverrides = overrides;
+          nixpkgs.config.allowUnfreePredicate = unfreePredicate;
           networking.firewall.allowedUDPPorts = [ 27960 ];
         };
 

From 5caa8ab55e21349871ae0b762d5f5cfa63c8a777 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 16 Jan 2016 01:01:28 +0100
Subject: [PATCH 793/884] nixos/tests/quake3: Don't quote +set arguments

With the new upstream Git version of ioquake3 introduced in 7fc7502, the
arguments to the quake3(server) binaries/wrappers may no longer be
passed as full single arguments (like "+set foo bar") but rather as
separate arguments (like "+set" "foo" "bar"), otherwise they will be
completely ignored.

Ran the x86_64-linux test on my machine and it now succeeds.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/tests/quake3.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/tests/quake3.nix b/nixos/tests/quake3.nix
index 81a79b0b3e6d..b8a632c6e14d 100644
--- a/nixos/tests/quake3.nix
+++ b/nixos/tests/quake3.nix
@@ -45,8 +45,8 @@ rec {
         { systemd.services."quake3-server" =
             { wantedBy = [ "multi-user.target" ];
               script =
-                "${pkgs.quake3demo}/bin/quake3-server '+set g_gametype 0' " +
-                "'+map q3dm7' '+addbot grunt' '+addbot daemia' 2> /tmp/log";
+                "${pkgs.quake3demo}/bin/quake3-server +set g_gametype 0 " +
+                "+map q3dm7 +addbot grunt +addbot daemia 2> /tmp/log";
             };
           nixpkgs.config.packageOverrides = overrides;
           nixpkgs.config.allowUnfreePredicate = unfreePredicate;
@@ -65,8 +65,8 @@ rec {
       $client1->waitForX;
       $client2->waitForX;
 
-      $client1->execute("quake3 '+set r_fullscreen 0' '+set name Foo' '+connect server' &");
-      $client2->execute("quake3 '+set r_fullscreen 0' '+set name Bar' '+connect server' &");
+      $client1->execute("quake3 +set r_fullscreen 0 +set name Foo +connect server &");
+      $client2->execute("quake3 +set r_fullscreen 0 +set name Bar +connect server &");
 
       $server->waitUntilSucceeds("grep -q 'Foo.*entered the game' /tmp/log");
       $server->waitUntilSucceeds("grep -q 'Bar.*entered the game' /tmp/log");

From 7a0dbbbe430d92411a4bb1331b233707961bd228 Mon Sep 17 00:00:00 2001
From: Eduard Bachmakov <e.bachmakov@gmail.com>
Date: Fri, 15 Jan 2016 19:19:42 -0500
Subject: [PATCH 794/884] qtcreator: 3.5.1 -> 3.6.0

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

diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix
index c0647a6df4a5..a5dde0a580b5 100644
--- a/pkgs/development/qtcreator/default.nix
+++ b/pkgs/development/qtcreator/default.nix
@@ -6,8 +6,8 @@
 with stdenv.lib;
 
 let
-  baseVersion = "3.5";
-  revision = "1";
+  baseVersion = "3.6";
+  revision = "0";
   version = "${baseVersion}.${revision}";
 in
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.gz";
-    sha256 = "0r9ysq9hzig4ag9m8pcpw1jng2fqqns8zwp0jj893gh8ia0sq9ar";
+    sha256 = "1v0x5asx9fj331jshial97gk7bwlb1a0k05h4zr22gh5cd4i0c5i";
   };
 
   buildInputs = [ makeWrapper qtbase qtscript qtquickcontrols qtdeclarative ];

From 8f793ce6bb050252e92a987cc3c5bd48d5423a42 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 16 Jan 2016 01:37:37 +0100
Subject: [PATCH 795/884] elfutils: Fix header compatibility with glibc 2.21

Regression introduced by df2b9b48cbf8eb765760c699843e43457d844bee.

This breaks the build for ltrace and other programs using libelf,
because the header file relies on features from glibc >= 2.22.

Here is an excerpt from the log output of the configure script from
ltrace:

In file included from ...elfutils-0.165/include/gelf.h:32:0,
                 from conftest.c:57:
...elfutils-0.165/include/libelf.h:280:8: error: unknown type name 'Elf32_Chdr'
 extern Elf32_Chdr *elf32_getchdr (Elf_Scn *__scn);
        ^
...elfutils-0.165/include/libelf.h:281:8: error: unknown type name 'Elf64_Chdr'
 extern Elf64_Chdr *elf64_getchdr (Elf_Scn *__scn);
        ^
In file included from conftest.c:57:0:
...elfutils-0.165/include/gelf.h:89:9: error: unknown type name 'Elf64_Chdr'
 typedef Elf64_Chdr GElf_Chdr;
         ^

The issue has been reported in the Debian bug tracker at
https://bugs.debian.org/810885 and I'm using the patch from Mark
Wielaard that has been posted there which adds compatibility for older
glibc versions.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../tools/misc/elfutils/default.nix           |   2 +
 .../tools/misc/elfutils/glibc-2.21.patch      | 164 ++++++++++++++++++
 2 files changed, 166 insertions(+)
 create mode 100644 pkgs/development/tools/misc/elfutils/glibc-2.21.patch

diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix
index 1e073ea8c70f..0a62859d2075 100644
--- a/pkgs/development/tools/misc/elfutils/default.nix
+++ b/pkgs/development/tools/misc/elfutils/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "0wp91hlh9n0ismikljf63558rzdwim8w1s271grsbaic35vr5z57";
   };
 
+  patches = [ ./glibc-2.21.patch ];
+
   # We need bzip2 in NativeInputs because otherwise we can't unpack the src,
   # as the host-bzip2 will be in the path.
   nativeBuildInputs = [ m4 bison flex gettext bzip2 ];
diff --git a/pkgs/development/tools/misc/elfutils/glibc-2.21.patch b/pkgs/development/tools/misc/elfutils/glibc-2.21.patch
new file mode 100644
index 000000000000..f67632741e51
--- /dev/null
+++ b/pkgs/development/tools/misc/elfutils/glibc-2.21.patch
@@ -0,0 +1,164 @@
+From b9d70fb9fb0bd0bf84eb2302cba1691aea74c42e Mon Sep 17 00:00:00 2001
+From: Mark Wielaard <mjw@redhat.com>
+Date: Wed, 13 Jan 2016 17:16:48 +0100
+Subject: [PATCH] libelf: Add ELF compression types and defines to libelf.h for
+ older glibc.
+
+Older glibc elf.h might not define the new ELF compression defines and
+types. If not just define them in libelf.h directly to make the libelf
+headers work on older glibc systems.
+
+Also include a testcase to check the libelf headers build against the
+system elf.h.
+
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=810885
+
+Signed-off-by: Mark Wielaard <mjw@redhat.com>
+---
+ libelf/ChangeLog               |  5 +++++
+ libelf/libelf.h                | 28 ++++++++++++++++++++++++++++
+ tests/ChangeLog                |  8 ++++++++
+ tests/Makefile.am              |  9 +++++++--
+ tests/system-elf-libelf-test.c | 35 +++++++++++++++++++++++++++++++++++
+ 5 files changed, 83 insertions(+), 2 deletions(-)
+ create mode 100644 tests/system-elf-libelf-test.c
+
+diff --git a/libelf/ChangeLog b/libelf/ChangeLog
+index 3a1fe91..aabf6f6 100644
+--- a/libelf/ChangeLog
++++ b/libelf/ChangeLog
+@@ -1,3 +1,8 @@
++2016-01-13  Mark Wielaard  <mjw@redhat.com>
++
++	* libelf.h: Check SHF_COMPRESSED is defined. If not define it and the
++	associated ELF compression types/defines.
++
+ 2015-11-26  Mark Wielaard  <mjw@redhat.com>
+ 
+ 	* elf_compress.c (__libelf_decompress_elf): New function, extracted
+diff --git a/libelf/libelf.h b/libelf/libelf.h
+index 364e776..c0d6389 100644
+--- a/libelf/libelf.h
++++ b/libelf/libelf.h
+@@ -35,6 +35,34 @@
+ /* Get the ELF types.  */
+ #include <elf.h>
+ 
++#ifndef SHF_COMPRESSED
++ /* Older glibc elf.h might not yet define the ELF compression types.  */
++ #define SHF_COMPRESSED      (1 << 11)  /* Section with compressed data. */
++
++ /* Section compression header.  Used when SHF_COMPRESSED is set.  */
++
++ typedef struct
++ {
++   Elf32_Word   ch_type;        /* Compression format.  */
++   Elf32_Word   ch_size;        /* Uncompressed data size.  */
++   Elf32_Word   ch_addralign;   /* Uncompressed data alignment.  */
++ } Elf32_Chdr;
++
++ typedef struct
++ {
++   Elf64_Word   ch_type;        /* Compression format.  */
++   Elf64_Word   ch_reserved;
++   Elf64_Xword  ch_size;        /* Uncompressed data size.  */
++   Elf64_Xword  ch_addralign;   /* Uncompressed data alignment.  */
++ } Elf64_Chdr;
++
++ /* Legal values for ch_type (compression algorithm).  */
++ #define ELFCOMPRESS_ZLIB       1          /* ZLIB/DEFLATE algorithm.  */
++ #define ELFCOMPRESS_LOOS       0x60000000 /* Start of OS-specific.  */
++ #define ELFCOMPRESS_HIOS       0x6fffffff /* End of OS-specific.  */
++ #define ELFCOMPRESS_LOPROC     0x70000000 /* Start of processor-specific.  */
++ #define ELFCOMPRESS_HIPROC     0x7fffffff /* End of processor-specific.  */
++#endif
+ 
+ /* Known translation types.  */
+ typedef enum
+diff --git a/tests/ChangeLog b/tests/ChangeLog
+index 366aea9..234ae56 100644
+--- a/tests/ChangeLog
++++ b/tests/ChangeLog
+@@ -1,3 +1,11 @@
++2016-01-13  Mark Wielaard  <mjw@redhat.com>
++
++	* system-elf-libelf-test.c: New test.
++	* Makefile.am (TESTS): Add system-elf-libelf-test, if !STANDALONE.
++	(check_PROGRAMS): Likewise.
++	(system_elf_libelf_test_CPPFLAGS): New variable.
++	(system_elf_libelf_test_LDADD): Likewise.
++
+ 2016-01-08  Mark Wielaard  <mjw@redhat.com>
+ 
+ 	* elfputzdata.c (main): Fix parentheses in strncmp test.
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index d09a6d7..7b9e108 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -136,8 +136,8 @@ export ELFUTILS_DISABLE_DEMANGLE = 1
+ endif
+ 
+ if !STANDALONE
+-check_PROGRAMS += msg_tst md5-sha1-test
+-TESTS += msg_tst md5-sha1-test
++check_PROGRAMS += msg_tst md5-sha1-test system-elf-libelf-test
++TESTS += msg_tst md5-sha1-test system-elf-libelf-test
+ endif
+ 
+ if LZMA
+@@ -473,6 +473,11 @@ elfgetzdata_LDADD = $(libelf)
+ elfputzdata_LDADD = $(libelf)
+ zstrptr_LDADD = $(libelf)
+ 
++# We want to test the libelf header against the system elf.h header.
++# Don't include any -I CPPFLAGS.
++system_elf_libelf_test_CPPFLAGS =
++system_elf_libelf_test_LDADD = $(libelf)
++
+ if GCOV
+ check: check-am coverage
+ .PHONY: coverage
+diff --git a/tests/system-elf-libelf-test.c b/tests/system-elf-libelf-test.c
+new file mode 100644
+index 0000000..7dfe498
+--- /dev/null
++++ b/tests/system-elf-libelf-test.c
+@@ -0,0 +1,35 @@
++/* Explicit test compiling with system elf.h header plus libelf header.
++
++   Copyright (C) 2016 Red Hat, Inc.
++   This file is part of elfutils.
++
++   This file is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 3 of the License, or
++   (at your option) any later version.
++
++   elfutils is distributed in the hope that it will be useful, but
++   WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
++
++#include <elf.h>
++#include <stddef.h>
++#include "../libelf/libelf.h"
++
++int
++main (void)
++{
++  /* Trivial test, this is really a compile test anyway.  */
++  if (elf_version (EV_CURRENT) == EV_NONE)
++    return -1;
++
++  /* This will obviously fail. It is just to check that Elf32_Chdr and
++     elf32_getchdr are available (both at compile time and runtime).  */
++  Elf32_Chdr *chdr = elf32_getchdr (NULL);
++
++  return chdr == NULL ? 0 : -1;
++}
+-- 
+1.8.3.1
+

From b3eca61b55de115c124264dc4777a19477462670 Mon Sep 17 00:00:00 2001
From: Louis Taylor <louis@kragniz.eu>
Date: Sat, 16 Jan 2016 03:36:31 +0000
Subject: [PATCH 796/884] terminator: 0.97 -> 0.98

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

diff --git a/pkgs/applications/misc/terminator/default.nix b/pkgs/applications/misc/terminator/default.nix
index c337cd329c92..7ca5f962403c 100644
--- a/pkgs/applications/misc/terminator/default.nix
+++ b/pkgs/applications/misc/terminator/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "terminator-${version}";
-  version = "0.97";
+  version = "0.98";
   
   src = fetchurl {
     url = "https://launchpad.net/terminator/trunk/${version}/+download/${name}.tar.gz";
-    sha256 = "1xykpx10g2zssx0ss6351ca6vmmma7zwxxhjz0fg28ps4dq88cci";
+    sha256 = "1h965z06dsfk38byyhnsrscd9r91qm92ggwgjrh7xminzsgqqv8a";
   };
   
   buildInputs = [

From 4a860b8fbfb264d5a754f59113b23e4093a51b7a Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 16 Jan 2016 04:56:08 +0100
Subject: [PATCH 797/884] copy-com: remove deprecated Nix-specific alias

---
 pkgs/applications/networking/copy-com/default.nix | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/copy-com/default.nix b/pkgs/applications/networking/copy-com/default.nix
index 968218309ed7..0ec2f5ac87a0 100644
--- a/pkgs/applications/networking/copy-com/default.nix
+++ b/pkgs/applications/networking/copy-com/default.nix
@@ -44,25 +44,19 @@ in stdenv.mkDerivation {
       patchelf --set-interpreter ${stdenv.glibc}/lib/${interpreter} "$binary"
     done
 
-    # Older versions of this package happily installed broken copies of
-    # anything other than CopyConsole - which was then also mangled to
-    # copy_console for some reason. Keep backwards compatibility (only
-    # for CopyConsole) for now; the NixOS service is already fixed.
-    ln -sv "$out/bin"/{CopyConsole,copy_console}
-
     RPATH=${libPaths}:$out/${appdir}
     echo "Updating rpaths to $RPATH in:"
     find "$out/${appdir}" -type f -a -perm -0100 \
       -print -exec patchelf --force-rpath --set-rpath "$RPATH" {} \;
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://copy.com;
     description = "Copy.com graphical & command-line clients";
     # Closed Source unfortunately.
-    license = stdenv.lib.licenses.unfree;
-    maintainers = with stdenv.lib.maintainers; [ nathan-gs nckx ];
+    license = licenses.unfree;
+    maintainers = with maintainers; [ nathan-gs nckx ];
     # NOTE: Copy.com itself only works on linux, so this is ok.
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
   };
 }

From 0baa5abb9b9566190a4331e189b512c32d63545c Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Sat, 16 Jan 2016 15:29:32 +0800
Subject: [PATCH 798/884] unrar: 5.2.7 -> 5.3.9

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

diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix
index 8e9d1530cdf4..49638ced16a2 100644
--- a/pkgs/tools/archivers/unrar/default.nix
+++ b/pkgs/tools/archivers/unrar/default.nix
@@ -1,14 +1,14 @@
 {stdenv, fetchurl}:
 
 let
-  version = "5.2.7";
+  version = "5.3.9";
 in
 stdenv.mkDerivation {
   name = "unrar-${version}";
 
   src = fetchurl {
     url = "http://www.rarlab.com/rar/unrarsrc-${version}.tar.gz";
-    sha256 = "1b1ggrqn020pvvh2ia98alqxpl1q3x65cb6zzqwv91rpjiz7a57g";
+    sha256 = "0nsxwg1zp3s34wyjznwmy2cc5929yk7m5smq11cqdb6hmql3fngz";
   };
 
   preBuild = ''

From 60dcdac5c2984d1e3307bb041e981b41d251f16f Mon Sep 17 00:00:00 2001
From: Mate Kovacs <mkovaxx@gmail.com>
Date: Sat, 16 Jan 2016 00:37:19 -0800
Subject: [PATCH 799/884] pythonPackages.pyshp: init at 1.2.3

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7292b8126227..eefdc07d3d84 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15448,6 +15448,24 @@ in modules // {
     };
   };
 
+  pyshp = buildPythonPackage rec {
+    name = "pyshp-${version}";
+    version = "1.2.3";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/p/pyshp/pyshp-${version}.tar.gz";
+      sha256 = "e18cc19659dadc5ddaa891eb780a6958094da0cf105a1efe0f67e75b4fa1cdf9";
+    };
+
+    buildInputs = with self; [ setuptools ];
+
+    meta = {
+      description = "Pure Python read/write support for ESRI Shapefile format";
+      homepage = https://github.com/GeospatialPython/pyshp;
+      license = licenses.mit;
+    };
+  };
+
   pyx = buildPythonPackage rec {
     name = "pyx-${version}";
     version = "0.14.1";

From 59f0090ded45228efe6a548e8f351e8fc8d579a0 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Sun, 3 Jan 2016 00:45:03 +0200
Subject: [PATCH 800/884] rmilter: init at 1.6.7

---
 pkgs/servers/mail/rmilter/default.nix | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/servers/mail/rmilter/default.nix

diff --git a/pkgs/servers/mail/rmilter/default.nix b/pkgs/servers/mail/rmilter/default.nix
new file mode 100644
index 000000000000..45c625466280
--- /dev/null
+++ b/pkgs/servers/mail/rmilter/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchFromGitHub, cmake, bison, flex, openssl, pcre, libmilter, opendkim }:
+
+stdenv.mkDerivation rec {
+  name = "rmilter-${version}";
+  version = "1.6.7";
+  src = fetchFromGitHub {
+    owner = "vstakhov";
+    repo = "rmilter";
+    rev = version;
+    sha256 = "1syviydlv4m1isl0r52sk4s0a75fyk788j1z3yvfzzf1hga333gn";
+  };
+
+  nativeBuildInputs = [ bison cmake flex ];
+  buildInputs = [ libmilter openssl pcre opendkim];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/vstakhov/rmilter";
+    license = licenses.bsd2; 
+    description = "server, used to integrate rspamd and milter compatible MTA, for example postfix or sendmail";
+    maintainer = maintainers.avnik;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5d52c89d0590..2e8e04ab516e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9370,6 +9370,8 @@ let
 
   postsrsd = callPackage ../servers/mail/postsrsd { };
 
+  rmilter = callPackage ../servers/mail/rmilter { };
+
   pshs = callPackage ../servers/http/pshs { };
 
   libpulseaudio = callPackage ../servers/pulseaudio { libOnly = true; };

From 480083922c0218c253353df362ba0f2bd02585b2 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Mon, 11 Jan 2016 22:45:31 +0200
Subject: [PATCH 801/884] rspamd: init at git-2016-01-11

---
 pkgs/servers/mail/rspamd/default.nix | 38 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/servers/mail/rspamd/default.nix

diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix
new file mode 100644
index 000000000000..a3b20820a6e0
--- /dev/null
+++ b/pkgs/servers/mail/rspamd/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, cmake, perl
+ ,file , glib, gmime, libevent, luajit, openssl, pcre, pkgconfig, sqlite }:
+
+let libmagic = file;  # libmagic provided buy file package ATM
+in
+
+stdenv.mkDerivation rec {
+  name = "rspamd-${version}";
+  version = "git-2016-01-16";
+  src = fetchFromGitHub {
+    owner = "vstakhov";
+    repo = "rspamd";
+    rev = "04bfc92c1357c0f908ce9371ab303f8bf57657df";
+    sha256 = "1zip1msjjy5q7jcsn4l0yyg92c3wdsf1v5jv1acglrih8dbfl7zj";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig perl ];
+  buildInputs = [ glib gmime libevent libmagic luajit openssl pcre sqlite];
+
+  postPatch = ''
+    substituteInPlace conf/common.conf --replace "\$CONFDIR/rspamd.conf.local" "/etc/rspamd/rspamd.conf.local"
+    substituteInPlace conf/common.conf --replace "\$CONFDIR/rspamd.conf.local.override" "/etc/rspamd/rspamd.conf.local.override"
+  '';
+
+  cmakeFlags = ''
+    -DDEBIAN_BUILD=ON
+    -DRUNDIR=/var/run/rspamd
+    -DDBDIR=/var/lib/rspamd
+    -DLOGDIR=/var/log/rspamd
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/vstakhov/rspamd";
+    license = licenses.bsd2; 
+    description = "advanced spam filtering system";
+    maintainer = maintainers.avnik;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2e8e04ab516e..ef7a777f3c15 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9372,6 +9372,8 @@ let
 
   rmilter = callPackage ../servers/mail/rmilter { };
 
+  rspamd = callPackage ../servers/mail/rspamd { };
+
   pshs = callPackage ../servers/http/pshs { };
 
   libpulseaudio = callPackage ../servers/pulseaudio { libOnly = true; };

From 14926f08a3d16cc5bb3a2da17ae68a253a4bda64 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Tue, 12 Jan 2016 11:06:46 +0200
Subject: [PATCH 802/884] nixos: Add module for rspamd

---
 nixos/modules/misc/ids.nix             |  2 +
 nixos/modules/module-list.nix          |  1 +
 nixos/modules/services/mail/rspamd.nix | 90 ++++++++++++++++++++++++++
 3 files changed, 93 insertions(+)
 create mode 100644 nixos/modules/services/mail/rspamd.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 6a3baf98a004..93d068418d76 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -246,6 +246,7 @@
       dspam = 222;
       gale = 223;
       matrix-synapse = 224;
+      rspamd = 225;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -469,6 +470,7 @@
       dspam = 222;
       gale = 223;
       matrix-synapse = 224;
+      rspamd = 225;
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 4f125b09afbf..6b3cbcf388b7 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -193,6 +193,7 @@
   ./services/mail/postfix.nix
   ./services/mail/postsrsd.nix
   ./services/mail/spamassassin.nix
+  ./services/mail/rspamd.nix
   ./services/misc/apache-kafka.nix
   ./services/misc/autofs.nix
   ./services/misc/bepasty.nix
diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix
new file mode 100644
index 000000000000..a083f8293243
--- /dev/null
+++ b/nixos/modules/services/mail/rspamd.nix
@@ -0,0 +1,90 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.rspamd;
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.rspamd = {
+
+      enable = mkOption {
+        default = false;
+        description = "Whether to run the rspamd daemon.";
+      };
+
+      debug = mkOption {
+        default = false;
+        description = "Whether to run the rspamd daemon in debug mode.";
+      };
+
+      user = mkOption {
+        type = types.string;
+        default = "rspamd";
+        description = ''
+          User to use when no root privileges are required.
+        '';
+       };
+
+      group = mkOption {
+        type = types.string;
+        default = "rspamd";
+        description = ''
+          Group to use when no root privileges are required.
+        '';
+       };
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    # Allow users to run 'rspamc' and 'rspamadm'.
+    environment.systemPackages = [ pkgs.rspamd ];
+
+    users.extraUsers = singleton {
+      name = cfg.user;
+      description = "rspamd daemon";
+      uid = config.ids.uids.rspamd;
+      group = cfg.group;
+    };
+
+    users.extraGroups = singleton {
+      name = cfg.group;
+      gid = config.ids.gids.spamd;
+    };
+
+    systemd.services.rspamd = {
+      description = "Rspamd Service";
+
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+
+      serviceConfig = {
+        ExecStart = "${pkgs.rspamd}/bin/rspamd ${optionalString cfg.debug "-d"} --user=${cfg.user} --group=${cfg.group} --pid=/run/rspamd.pid -f";
+        RuntimeDirectory = "/var/lib/rspamd";
+        PermissionsStartOnly = true;
+        Restart = "always";
+      };
+
+      preStart = ''
+        ${pkgs.coreutils}/bin/mkdir -p /var/{lib,log}/rspamd
+        ${pkgs.coreutils}/bin/chown ${cfg.user}:${cfg.group} /var/lib/rspamd
+      '';
+
+    };
+
+  };
+
+}

From de8dea482163952169faafc12860717720868820 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Thu, 14 Jan 2016 11:17:27 +0200
Subject: [PATCH 803/884] nixos: add module for rmilter

---
 nixos/modules/misc/ids.nix              |   2 +
 nixos/modules/module-list.nix           |   1 +
 nixos/modules/services/mail/rmilter.nix | 189 ++++++++++++++++++++++++
 3 files changed, 192 insertions(+)
 create mode 100644 nixos/modules/services/mail/rmilter.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 93d068418d76..064b4cbc4b33 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -247,6 +247,7 @@
       gale = 223;
       matrix-synapse = 224;
       rspamd = 225;
+      rmilter = 226;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -471,6 +472,7 @@
       gale = 223;
       matrix-synapse = 224;
       rspamd = 225;
+      rmilter = 226;
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 6b3cbcf388b7..2ff61877c23d 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -194,6 +194,7 @@
   ./services/mail/postsrsd.nix
   ./services/mail/spamassassin.nix
   ./services/mail/rspamd.nix
+  ./services/mail/rmilter.nix
   ./services/misc/apache-kafka.nix
   ./services/misc/autofs.nix
   ./services/misc/bepasty.nix
diff --git a/nixos/modules/services/mail/rmilter.nix b/nixos/modules/services/mail/rmilter.nix
new file mode 100644
index 000000000000..a6e2a9fc7808
--- /dev/null
+++ b/nixos/modules/services/mail/rmilter.nix
@@ -0,0 +1,189 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  rspamdCfg = config.services.rspamd;
+  cfg = config.services.rmilter;
+
+  rmilterConf = ''
+pidfile = /run/rmilter/rmilter.pid;
+bind_socket = ${cfg.bindSocket};
+tempdir = /tmp;
+
+  '' + (with cfg.rspamd; if enable then ''
+spamd {
+        servers = ${concatStringsSep ", " servers};
+        connect_timeout = 1s;
+        results_timeout = 20s;
+        error_time = 10;
+        dead_time = 300;
+        maxerrors = 10;
+        reject_message = "${rejectMessage}";
+        ${optionalString (length whitelist != 0)  "whitelist = ${concatStringsSep ", " whitelist};"}
+
+        # rspamd_metric - metric for using with rspamd
+        # Default: "default"
+        rspamd_metric = "default";
+        ${extraConfig}
+};
+    '' else "") + cfg.extraConfig;
+
+  rmilterConfigFile = pkgs.writeText "rmilter.conf" rmilterConf;
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.rmilter = {
+
+      enable = mkOption {
+        default = cfg.rspamd.enable;
+        description = "Whether to run the rmilter daemon.";
+      };
+
+      debug = mkOption {
+        default = false;
+        description = "Whether to run the rmilter daemon in debug mode.";
+      };
+
+      user = mkOption {
+        type = types.string;
+        default = "rmilter";
+        description = ''
+          User to use when no root privileges are required.
+        '';
+       };
+
+      group = mkOption {
+        type = types.string;
+        default = "rmilter";
+        description = ''
+          Group to use when no root privileges are required.
+        '';
+       };
+
+      bindSocket =  mkOption {
+        type = types.string;
+        default = "unix:/run/rmilter/rmilter.sock";
+        description = "Socket to listed for MTA requests";
+        example = ''
+            "unix:/run/rmilter/rmilter.sock" or
+            "inet:11990@127.0.0.1"
+          '';
+      };
+
+      rspamd = {
+        enable = mkOption {
+          default = rspamdCfg.enable;
+          description = "Whether to use rspamd to filter mails";
+        };
+
+        servers = mkOption {
+          type = types.listOf types.str;
+          default = ["r:0.0.0.0:11333"];
+          description = ''
+            Spamd socket definitions.
+            Is server name is prefixed with r: it is rspamd server.
+          '';
+        };
+
+        whitelist = mkOption {
+          type = types.listOf types.str;
+          default = [ ];
+          description = "list of ips or nets that should be not checked with spamd";
+        };
+
+        rejectMessage = mkOption {
+          type = types.str;
+          default = "Spam message rejected; If this is not spam contact abuse";
+          description = "reject message for spam";
+        };
+
+        extraConfig = mkOption {
+          type = types.lines;
+          default = "";
+          description = "Custom snippet to append to end of `spamd' section";
+        };
+      };
+
+      extraConfig = mkOption {
+        type = types.lines;
+        default = "";
+        description = "Custom snippet to append to rmilter config";
+      };
+
+      postfix = {
+        enable = mkOption {
+          type = types.bool;
+          default = false;
+          description = "Add rmilter to postfix main.conf";
+        };
+
+        configFragment = mkOption {
+          type = types.str;
+          description = "Addon to postfix configuration";
+          default = ''
+smtpd_milters = ${cfg.bindSocket}
+# or for TCP socket
+# # smtpd_milters = inet:localhost:9900
+milter_protocol = 6
+milter_mail_macros = i {mail_addr} {client_addr} {client_name} {auth_authen}
+# skip mail without checks if milter will die
+milter_default_action = accept
+          '';
+        };
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    users.extraUsers = singleton {
+      name = cfg.user;
+      description = "rspamd daemon";
+      uid = config.ids.uids.rmilter;
+      group = cfg.group;
+    };
+
+    users.extraGroups = singleton {
+      name = cfg.group;
+      gid = config.ids.gids.rmilter;
+    };
+
+    systemd.services.rmilter = {
+      description = "Rmilter Service";
+
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+
+      serviceConfig = {
+        ExecStart = "${pkgs.rmilter}/bin/rmilter ${optionalString cfg.debug "-d"} -n -c ${rmilterConfigFile}";
+        User = cfg.user;
+        Group = cfg.group;
+        PermissionsStartOnly = true;
+        Restart = "always";
+      };
+
+      preStart = ''
+        ${pkgs.coreutils}/bin/mkdir -p /run/rmilter
+        ${pkgs.coreutils}/bin/chown ${cfg.user}:${cfg.group} /run/rmilter
+      '';
+
+    };
+
+    services.postfix.extraConfig = optionalString cfg.postfix.enable cfg.postfix.configFragment;
+
+  };
+
+}

From 1e0434ebe0cf438cbe0230769ea18e324ccf35d8 Mon Sep 17 00:00:00 2001
From: Slawomir Gonet <slawek@otwiera.cz>
Date: Sat, 16 Jan 2016 15:08:19 +0100
Subject: [PATCH 804/884] 0ad: 0.18 -> 0.19

---
 pkgs/games/0ad/data.nix    |  2 +-
 pkgs/games/0ad/default.nix | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/games/0ad/data.nix b/pkgs/games/0ad/data.nix
index ea9951e33393..f2f5a9e9b212 100644
--- a/pkgs/games/0ad/data.nix
+++ b/pkgs/games/0ad/data.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://releases.wildfiregames.com/0ad-${version}-${releaseType}-unix-data.tar.xz";
-    sha256 = "0i5cf4n9qhzbi6hvw5lxapind24qpqfq6p5lrhx8gb25p670g95i";
+    sha256 = "0f406ynz2fbg3hwavh52xh4f7kqm4mzhz59kkvb6dpsax5agalwk";
   };
 
   patchPhase = ''
diff --git a/pkgs/games/0ad/default.nix b/pkgs/games/0ad/default.nix
index 7ffa44c1fe46..e2897c5253cb 100644
--- a/pkgs/games/0ad/default.nix
+++ b/pkgs/games/0ad/default.nix
@@ -1,7 +1,7 @@
 { stdenv, callPackage, fetchurl, python27
 , pkgconfig, spidermonkey_31, boost, icu, libxml2, libpng
 , libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc
-, openal, mesa, xproto, libX11, libXcursor, nspr, SDL
+, openal, mesa, xproto, libX11, libXcursor, nspr, SDL, SDL2
 , gloox, nvidia-texture-tools
 , withEditor ? true, wxGTK ? null
 }:
@@ -9,7 +9,7 @@
 assert withEditor -> wxGTK != null;
 
 let
-  version = "0.0.18";
+  version = "0.0.19";
 
   releaseType = "alpha";
 
@@ -25,20 +25,22 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://releases.wildfiregames.com/0ad-${version}-${releaseType}-unix-build.tar.xz";
-    sha256 = "15q3mv5k3lqzf0wrby2r93fs194ym13790i68q8azscs4v9h8bxx";
+    sha256 = "1cwvhg30i6axm7y5b62qyjwf1j8gwa5fgc13xsga3gzdphmjchrd";
   };
 
   buildInputs = [
     zeroadData python27 pkgconfig spidermonkey_31 boost icu
     libxml2 libpng libjpeg zlib curl libogg libvorbis enet
     miniupnpc openal mesa xproto libX11 libXcursor nspr
-    SDL gloox nvidia-texture-tools
+    SDL SDL2 gloox nvidia-texture-tools
   ] ++ stdenv.lib.optional withEditor wxGTK;
 
   NIX_CFLAGS_COMPILE = [
     "-I${xproto}/include/X11"
     "-I${libX11}/include/X11"
     "-I${libXcursor}/include/X11"
+    "-I${SDL}/include/SDL"
+    "-I${SDL2}/include/SDL2"
   ];
 
   patchPhase = ''

From 2077895251e7780d4a6ff9e89ae23989d1713c50 Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Sat, 16 Jan 2016 15:34:29 +0100
Subject: [PATCH 805/884] aria2: 1.19.2 -> 1.19.3

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

diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix
index 77226ae0be90..09e4531d9259 100644
--- a/pkgs/tools/networking/aria2/default.nix
+++ b/pkgs/tools/networking/aria2/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "aria2-${version}";
-  version = "1.19.2";
+  version = "1.19.3";
 
   src = fetchurl {
     url = "https://github.com/tatsuhiro-t/aria2/releases/download/release-${version}/${name}.tar.xz";
-    sha256 = "0gnm1b7yp5q6fcajz1ln2f1rv64p6dv0nz9bcwpqrkcmsinlh19n";
+    sha256 = "1qwr4al6wlh5f558r0mr1hvdnf7d8ss6qwqn2361k99phk1cdg3a";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 1bac185dae4e4b788c91e0bc917ea7a7646d1b7f Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 16 Jan 2016 15:56:00 +0100
Subject: [PATCH 806/884] openttd: Add OpenGFX, OpenSFX, OpenMSX

Closes #12400.
---
 pkgs/games/openttd/default.nix | 41 +++++++++++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix
index 97b6be9be2ec..65fab09d04dd 100644
--- a/pkgs/games/openttd/default.nix
+++ b/pkgs/games/openttd/default.nix
@@ -1,5 +1,24 @@
-{ stdenv, fetchurl, pkgconfig, SDL, libpng, zlib, xz, freetype, fontconfig }:
+{ stdenv, fetchurl, fetchzip, pkgconfig, SDL, libpng, zlib, xz, freetype, fontconfig
+, withOpenGFX ? true, withOpenSFX ? true, withOpenMSX ? true
+}:
 
+let
+  opengfx = fetchzip {
+    url = "http://binaries.openttd.org/extra/opengfx/0.5.2/opengfx-0.5.2-all.zip";
+    sha256 = "1sjzwl8wfdj0izlx2qdq15bqiy1vzq7gq7drydfwwryk173ig5sa";
+  };
+
+  opensfx = fetchzip {
+    url = "http://binaries.openttd.org/extra/opensfx/0.2.3/opensfx-0.2.3-all.zip";
+    sha256 = "1bb167kszdd6dqbcdjrxxwab6b7y7jilhzi3qijdhprpm5gf1lp3";
+  };
+
+  openmsx = fetchzip {
+    url = "http://binaries.openttd.org/extra/openmsx/0.3.1/openmsx-0.3.1-all.zip";
+    sha256 = "0qnmfzz0v8vxrrvxnm7szphrlrlvhkwn3y92b4iy0b4b6yam0yd4";
+  };
+
+in
 stdenv.mkDerivation rec {
   name = "openttd-${version}";
   version = "1.5.3";
@@ -9,7 +28,9 @@ stdenv.mkDerivation rec {
     sha256 = "0qxss5rxzac94z5k16xv84ll0n163sphs88xkgv3z7vwramagffq";
   };
 
-  buildInputs = [ SDL libpng pkgconfig xz zlib freetype fontconfig ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ SDL libpng xz zlib freetype fontconfig ];
+
   prefixKey = "--prefix-dir=";
 
   configureFlags = [
@@ -21,6 +42,20 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     mv $out/games/ $out/bin
+
+    ${stdenv.lib.optionalString withOpenGFX ''
+      cp ${opengfx}/* $out/share/games/openttd/baseset
+    ''}
+
+    mkdir -p $out/share/games/openttd/data
+
+    ${stdenv.lib.optionalString withOpenSFX ''
+      cp ${opensfx}/*.{obs,cat} $out/share/games/openttd/data
+    ''}
+
+    ${stdenv.lib.optionalString withOpenMSX ''
+      cp ${openmsx}/*.{obm,mid} $out/share/games/openttd/data
+    ''}
   '';
 
   meta = {
@@ -38,6 +73,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.openttd.org/;
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ jcumming the-kenny ];
+    maintainers = with stdenv.lib.maintainers; [ jcumming the-kenny fpletz ];
   };
 }

From 9ed945784630b5c3cfcae5fdba04c88fb4286a60 Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Sat, 16 Jan 2016 16:03:18 +0100
Subject: [PATCH 807/884] lemonbar: 1.1 -> 1.2pre

'bar' has been officially renamed 'lemonbar'.
Last release (1.1) is almost a year old, but some bugfixes and new features are available in the repository, let's include them in the derivation.
---
 .../window-managers/bar/default.nix           | 25 -----------------
 .../window-managers/lemonbar/default.nix      | 27 +++++++++++++++++++
 .../window-managers/{bar => lemonbar}/xft.nix |  0
 pkgs/top-level/all-packages.nix               | 10 ++++---
 4 files changed, 33 insertions(+), 29 deletions(-)
 delete mode 100644 pkgs/applications/window-managers/bar/default.nix
 create mode 100644 pkgs/applications/window-managers/lemonbar/default.nix
 rename pkgs/applications/window-managers/{bar => lemonbar}/xft.nix (100%)

diff --git a/pkgs/applications/window-managers/bar/default.nix b/pkgs/applications/window-managers/bar/default.nix
deleted file mode 100644
index 964390d3b59b..000000000000
--- a/pkgs/applications/window-managers/bar/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl, perl, libxcb }:
-
-let
-  version = "1.1";
-in
-  stdenv.mkDerivation rec {
-    name = "bar-${version}";
-  
-    src = fetchurl {
-      url = "https://github.com/LemonBoy/bar/archive/v${version}.tar.gz";
-      sha256 = "171ciw676cvj80zzbqfbg9nwix36zph0683zmqf279q9b9bmayan";
-    };
-  
-    buildInputs = [ libxcb perl ];
-  
-    prePatch = ''sed -i "s@/usr@$out@" Makefile'';
-  
-    meta = {
-      description = "A lightweight xcb based bar";
-      homepage = https://github.com/LemonBoy/bar;
-      maintainers = [ stdenv.lib.maintainers.meisternu ];
-      license = "Custom";   
-      platforms = stdenv.lib.platforms.linux;
-    };
-}
diff --git a/pkgs/applications/window-managers/lemonbar/default.nix b/pkgs/applications/window-managers/lemonbar/default.nix
new file mode 100644
index 000000000000..042abf09dad2
--- /dev/null
+++ b/pkgs/applications/window-managers/lemonbar/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, perl, libxcb }:
+
+let
+  version = "1.2pre";
+in
+  stdenv.mkDerivation rec {
+    name = "lemonbar-${version}";
+  
+    src = fetchFromGitHub {
+      owner = "LemonBoy";
+      repo = "bar";
+      rev = "61985278f2af1e4e85d63a696ffedc5616b06bc0";
+      sha256 = "0a8djlayimjdg5fj50lpifsv6gkb577bca68wmk9wg9y9n27pgay";
+    };
+  
+    buildInputs = [ libxcb perl ];
+  
+    prePatch = ''sed -i "s@/usr@$out@" Makefile'';
+  
+    meta = with stdenv.lib; {
+      description = "A lightweight xcb based bar";
+      homepage = https://github.com/LemonBoy/bar;
+      maintainers = [ maintainers.meisternu ];
+      license = "Custom";   
+      platforms = platforms.linux;
+    };
+}
diff --git a/pkgs/applications/window-managers/bar/xft.nix b/pkgs/applications/window-managers/lemonbar/xft.nix
similarity index 100%
rename from pkgs/applications/window-managers/bar/xft.nix
rename to pkgs/applications/window-managers/lemonbar/xft.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5d52c89d0590..72a3aee6c23d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11153,10 +11153,6 @@ let
 
   bandwidth = callPackage ../tools/misc/bandwidth { };
 
-  bar = callPackage ../applications/window-managers/bar { };
-
-  bar-xft = callPackage ../applications/window-managers/bar/xft.nix { };
-
   baresip = callPackage ../applications/networking/instant-messengers/baresip {
     ffmpeg = ffmpeg_1;
   };
@@ -12340,6 +12336,10 @@ let
     inherit (gnome) libglade;
   };
 
+  lemonbar = callPackage ../applications/window-managers/lemonbar { };
+
+  lemonbar-xft = callPackage ../applications/window-managers/lemonbar/xft.nix { };
+
   leo-editor = callPackage ../applications/editors/leo-editor { };
 
   libowfat = callPackage ../development/libraries/libowfat { };
@@ -15799,6 +15799,8 @@ aliases = with self; rec {
   adobeReader = adobe-reader;
   arduino_core = arduino-core;  # added 2015-02-04
   asciidocFull = asciidoc-full;  # added 2014-06-22
+  bar = lemonbar;  # added 2015-01-16
+  bar-xft = lemonbar-xft;  # added 2015-01-16
   bridge_utils = bridge-utils;  # added 2015-02-20
   buildbotSlave = buildbot-slave;  # added 2014-12-09
   cheetahTemplate = pythonPackages.cheetah; # 2015-06-15

From a3e3b7636341b512819c3dba0b9fa6e5651efd4a Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Sat, 16 Jan 2016 16:35:07 +0100
Subject: [PATCH 808/884] nginxModules.lua: 0.9.19 -> 0.10.0

---
 pkgs/servers/http/nginx/modules.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix
index 00b3c6a9d6a4..d0d587eb0410 100644
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/pkgs/servers/http/nginx/modules.nix
@@ -71,8 +71,8 @@
     src = fetchFromGitHub {
       owner = "openresty";
       repo = "lua-nginx-module";
-      rev = "v0.9.19";
-      sha256 = "13h58rzdfhc5kc4xqwrd2p34rgnwim4hikq923cnfz1p2bvlddrf";
+      rev = "v0.10.0";
+      sha256 = "0isdqrnjhfy4zlydj4csf91i9184ykazyah3i63jfrmmarxr5li1";
     };
     inputs = [ pkgs.luajit ];
     preConfigure = ''

From ed83b8a61ce2ee61d82f58f068045fafd24cb2fc Mon Sep 17 00:00:00 2001
From: makefu <makefu@syntax-fehler.de>
Date: Tue, 12 Jan 2016 08:38:03 +0100
Subject: [PATCH 809/884] programs.zsh: allow override of history defaults

---
 nixos/modules/programs/zsh/zsh.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix
index dae7e446b4cf..b51104c16fa9 100644
--- a/nixos/modules/programs/zsh/zsh.nix
+++ b/nixos/modules/programs/zsh/zsh.nix
@@ -98,18 +98,18 @@ in
       loginShellInit = cfge.loginShellInit;
 
       interactiveShellInit = ''
-        ${cfge.interactiveShellInit}
-
-        ${cfg.promptInit}
-        ${zshAliases}
-
-        # Some sane history defaults
+        # history defaults
         export SAVEHIST=2000
         export HISTSIZE=2000
         export HISTFILE=$HOME/.zsh_history
 
         setopt HIST_IGNORE_DUPS SHARE_HISTORY HIST_FCNTL_LOCK
 
+        ${cfge.interactiveShellInit}
+
+        ${cfg.promptInit}
+        ${zshAliases}
+
         # Tell zsh how to find installed completions
         for p in ''${(z)NIX_PROFILES}; do
           fpath+=($p/share/zsh/site-functions $p/share/zsh/$ZSH_VERSION/functions)

From 3ec7fa20fbe0acb0c7249593f2f051b9defc7778 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 16 Jan 2016 17:40:19 +0100
Subject: [PATCH 810/884] Improve GHC 8.0.x package set configuration.

---
 .../configuration-ghc-8.0.x.nix               | 29 +++++++++----------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
index 35710c409c77..e4bc4e5d734e 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -3,6 +3,10 @@
 with import ./lib.nix { inherit pkgs; };
 
 self: super: {
+
+  # Suitable LLVM version.
+  llvmPackages = pkgs.llvmPackages_35;
+
   # Disable GHC 8.0.x core libraries.
   array = null;
   base = null;
@@ -30,25 +34,18 @@ self: super: {
   unix = null;
   xhtml = null;
 
-  Cabal_1_23_0_0 = overrideCabal super.Cabal_1_22_4_0 (drv: {
-    version = "1.23.0.0";
-    src = pkgs.fetchFromGitHub {
-      owner = "haskell";
-      repo = "cabal";
-      rev = "18fcd9c1aaeddd9d10a25e44c0e986c9889f06a7";
-      sha256 = "1bakw7h5qadjhqbkmwijg3588mjnpvdhrn8lqg8wq485cfcv6vn3";
-    };
-    jailbreak = false;
-    doHaddock = false;
-    postUnpack = "sourceRoot+=/Cabal";
-    postPatch = ''
-      setupCompileFlags+=" -DMIN_VERSION_binary_0_8_0=1"
-    '';
-  });
+  # jailbreak-cabal can use the native Cabal library.
   jailbreak-cabal = super.jailbreak-cabal.override {
-    Cabal = self.Cabal_1_23_0_0;
+    Cabal = null;
     mkDerivation = drv: self.mkDerivation (drv // {
       preConfigure = "sed -i -e 's/Cabal == 1.20\\.\\*/Cabal >= 1.23/' jailbreak-cabal.cabal";
     });
   };
+
+  # Older versions of QuickCheck don't support our version of Template Haskell.
+  QuickCheck = self.QuickCheck_2_8_2;
+
+  # https://github.com/hspec/HUnit/issues/7
+  HUnit = dontCheck super.HUnit;
+
 }

From 6c6bf8790dedf7ec82b78ace0a480fe5e80ddb5f Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Sat, 16 Jan 2016 18:30:11 +0100
Subject: [PATCH 811/884] pharo-launcher: 0.2.8 -> 0.2.9

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

diff --git a/pkgs/development/pharo/launcher/default.nix b/pkgs/development/pharo/launcher/default.nix
index 4c46a9d13b43..6e6722a804f5 100644
--- a/pkgs/development/pharo/launcher/default.nix
+++ b/pkgs/development/pharo/launcher/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, bash, pharo-vm, unzip, makeDesktopItem }:
 
 stdenv.mkDerivation rec {
-  version = "0.2.8-2015.08.08";
+  version = "0.2.9-2016.01.14";
   name = "pharo-launcher-${version}";
   src = fetchurl {
     url = "http://files.pharo.org/platform/launcher/blessed/PharoLauncher-user-${version}.zip";
-    sha256 = "1cpjihdkywlqvjsvrpkkx7fx14wxi6yhymmayjbl0l7bpci0l7qm";
+    sha256 = "0lzdnaw7l1rrzbrq53xsy38aiz6id5x7s78ds1dhb31vqc241yy8";
   };
 
   executable-name = "pharo-launcher";

From 0692c6a96d415d9e7cf300b7c19640c2aa1efc9c Mon Sep 17 00:00:00 2001
From: Gleb Peregud <gleber.p@gmail.com>
Date: Sat, 16 Jan 2016 18:53:48 +0100
Subject: [PATCH 812/884] Make rebar3-nix-bootstrap depend on erlang.

This fixes patchShebangs ability to properly fix up path to escript
binary.
---
 .../development/tools/erlang/rebar3-nix-bootstrap/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/erlang/rebar3-nix-bootstrap/default.nix b/pkgs/development/tools/erlang/rebar3-nix-bootstrap/default.nix
index 347ec1d8bb68..b32d196272b7 100644
--- a/pkgs/development/tools/erlang/rebar3-nix-bootstrap/default.nix
+++ b/pkgs/development/tools/erlang/rebar3-nix-bootstrap/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub }:
+{stdenv, fetchFromGitHub, erlang }:
 
 stdenv.mkDerivation rec {
     name = "rebar3-nix-bootstrap";
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
         sha256 = "0xyj7j59dmxyl5nhhsmb0r1pihmk0s4k02ga1rfgm30rij6n7431";
     };
 
+    buildInputs = [ erlang ];
+
     installFlags = "PREFIX=$(out)";
 
     meta = {

From 4fafd77f7e4b83588f88e34e68fd524ef6358525 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Sat, 16 Jan 2016 18:08:07 +0000
Subject: [PATCH 813/884] disnix: propagate ejabberd username to the activation
 module

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

diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix
index 469a2a7ce3b4..218802e0cf00 100644
--- a/nixos/modules/services/misc/disnix.nix
+++ b/nixos/modules/services/misc/disnix.nix
@@ -110,6 +110,7 @@ in
         // optionalAttrs (config.services.mysql.enable) { mysqlPort = config.services.mysql.port; }
         // optionalAttrs (config.services.tomcat.enable) { tomcatPort = 8080; }
         // optionalAttrs (config.services.svnserve.enable) { svnBaseDir = config.services.svnserve.svnBaseDir; }
+        // optionalAttrs (config.services.ejabberd.enable) { ejabberdUser = config.services.ejabberd.user; }
         // optionalAttrs (cfg.publishInfrastructure.enableAuthentication) (
           optionalAttrs (config.services.mysql.enable) { mysqlUsername = "root"; mysqlPassword = readFile config.services.mysql.rootPassword; })
         )

From ea5910a859de9fc161fb0f1fffceff455e5312d5 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 16 Jan 2016 20:14:49 +0100
Subject: [PATCH 814/884] vimPlugins.youcompleteme: patch default python path

---
 pkgs/misc/vim-plugins/default.nix                               | 2 ++
 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 14be330b79bc..470c1960c7ca 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -890,6 +890,8 @@ rec {
 
     buildPhase = ''
       patchShebangs .
+      substituteInPlace plugin/youcompleteme.vim \
+        --replace "'ycm_path_to_python_interpreter', '''" "'ycm_path_to_python_interpreter', '${python}/bin/python'"
 
       mkdir build
       pushd build
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme
index 625dfcb4f3ee..e498eef8c0b5 100644
--- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme
+++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme
@@ -6,6 +6,8 @@
 
     buildPhase = ''
       patchShebangs .
+      substituteInPlace plugin/youcompleteme.vim \
+        --replace "'ycm_path_to_python_interpreter', '''" "'ycm_path_to_python_interpreter', '${python}/bin/python'"
 
       mkdir build
       pushd build

From edaf46fb64e158d4db546e41700485631df70647 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sat, 16 Jan 2016 14:53:56 -0500
Subject: [PATCH 815/884] stdenv-darwin: add parent attribute to bootstrap

This makes it far easier than before to hit/test early stages of the
stdenv bootstrap.
---
 pkgs/stdenv/darwin/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index f2a482e3db2e..c0c19a64c3c7 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -95,7 +95,7 @@ in rec {
         stdenvSandboxProfile = binShClosure + libSystemProfile;
         extraSandboxProfile  = binShClosure + libSystemProfile;
 
-        extraAttrs = { inherit platform; };
+        extraAttrs = { inherit platform; parent = last; };
         overrides  = pkgs: (overrides pkgs) // { fetchurl = thisStdenv.fetchurlBoot; };
       };
 
@@ -290,6 +290,7 @@ in rec {
       inherit platform bootstrapTools;
       libc         = pkgs.darwin.Libsystem;
       shellPackage = pkgs.bash;
+      parent       = stage4;
     };
 
     allowedRequisites = (with pkgs; [

From 6fc61a173e9048072bb99f8682e7b6aeb76bdd3f Mon Sep 17 00:00:00 2001
From: Henry Till <henrytill@gmail.com>
Date: Sat, 16 Jan 2016 15:57:02 -0500
Subject: [PATCH 816/884] racket: add parameter to enable building docs

---
 pkgs/development/interpreters/racket/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index 8aa75829554c..2fd53d0ebc88 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -3,6 +3,7 @@
 , glib, gmp, gtk, libffi, libjpeg, libpng
 , libtool, mpfr, openssl, pango, poppler
 , readline, sqlite
+, disableDocs ? true
 }:
 
 let
@@ -50,7 +51,8 @@ stdenv.mkDerivation rec {
     cd src/build
   '';
 
-  configureFlags = [ "--enable-shared" "--enable-lt=${libtool}/bin/libtool" "--disable-docs"];
+  configureFlags = [ "--enable-shared" "--enable-lt=${libtool}/bin/libtool" ]
+                   ++ stdenv.lib.optional disableDocs [ "--disable-docs" ];
 
   configureScript = "../configure";
 

From 00f394e2a9caab2f80b1afd6bde64d65e3ba1db7 Mon Sep 17 00:00:00 2001
From: Henry Till <henrytill@gmail.com>
Date: Sat, 16 Jan 2016 15:57:23 -0500
Subject: [PATCH 817/884] racket: 6.2.1 -> 6.3

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

diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index 2fd53d0ebc88..129c0ac60774 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -32,11 +32,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "racket-${version}";
-  version = "6.2.1";
+  version = "6.3";
 
   src = fetchurl {
     url = "http://mirror.racket-lang.org/installers/${version}/${name}-src.tgz";
-    sha256 = "0555j63k7fs10iv0icmivlxpzgp6s7gwcbfddmbwxlf2rk80qhq0";
+    sha256 = "0f21vnads6wsrzimfja969gf3pkl60s0rdfrjf9s70lcy9x0jz4i";
   };
 
   FONTCONFIG_FILE = fontsConf;

From 36057827f67665490f2f2a56ac3eec1fd645040d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 15 Jan 2016 17:36:42 +0100
Subject: [PATCH 818/884] requireFile: remove colon from the url for easier
 copy/paste

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

diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
index b7237a1f69c4..134ef48ad061 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -104,7 +104,7 @@ rec {
       if message != null then message
       else ''
         Unfortunately, we may not download file ${name_} automatically.
-        Please, go to ${url}, download it yourself, and add it to the Nix store
+        Please, go to ${url} to download it yourself, and add it to the Nix store
         using either
           nix-store --add-fixed ${hashAlgo} ${name_}
         or

From 75284b09e16f3168abc5273a9ed28d1fb4b33adf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 16 Jan 2016 21:55:29 +0100
Subject: [PATCH 819/884] Fix ISO building from a channel

Building config.system.build.isoImage would fail with the following
error using the channel:

  ln: failed to create symbolic link
'/nix/store/zz0hzi5imrg4927v6f8mv281qs6v6pbq-nixos-16.03pre69762.e916273/nixos/nixpkgs/.': File exists

The fix skips symlink as it already exists if the channel
nixpkgs copy is used.

Fixes #10367
---
 nixos/modules/installer/cd-dvd/channel.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/installer/cd-dvd/channel.nix b/nixos/modules/installer/cd-dvd/channel.nix
index ea7e3e16b8df..1e5e2b2615c8 100644
--- a/nixos/modules/installer/cd-dvd/channel.nix
+++ b/nixos/modules/installer/cd-dvd/channel.nix
@@ -17,7 +17,9 @@ let
       mkdir -p $out
       cp -prd ${pkgs.path} $out/nixos
       chmod -R u+w $out/nixos
-      ln -s . $out/nixos/nixpkgs
+      if [ ! -e $out/nixos/nixpkgs ]; then
+        ln -s . $out/nixos/nixpkgs
+      fi
       rm -rf $out/nixos/.git
       echo -n ${config.system.nixosVersionSuffix} > $out/nixos/.version-suffix
     '';

From 5be28250cbe7bafbfaa14c6f40fd61356f4e07b6 Mon Sep 17 00:00:00 2001
From: Louis Taylor <louis@kragniz.eu>
Date: Sat, 16 Jan 2016 21:17:35 +0000
Subject: [PATCH 820/884] pythonPackages.mezzanine: disable pypy

Closes #12405.
---
 pkgs/top-level/python-packages.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7818d8e9d515..c00f285aee54 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10479,6 +10479,8 @@ in modules // {
       sha256 = "1cd7d3dji8q4mvcnf9asxn8j109pd5g5d5shr6xvn0iwr35qprgi";
     };
 
+    disabled = isPyPy;
+
     buildInputs = with self; [ pyflakes pep8 ];
     propagatedBuildInputs = with self; [
       django_1_6 filebrowser_safe grappelli_safe bleach tzlocal beautifulsoup4

From 889936791de3180291a5d7bd44e58615ddbf538f Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <michiel@staff.isoc.nl>
Date: Sat, 16 Jan 2016 23:45:40 +0100
Subject: [PATCH 821/884] lpod: init -> 1.1.5

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 662ff4d83860..06408cdce3cb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5524,6 +5524,28 @@ in modules // {
     propagatedBuildInputs = with self; [ logilab_common ];
   };
 
+  lpod = buildPythonPackage rec {
+    version = "1.1.5";
+    name = "python-lpod-${version}";
+    # lpod library currently does not support Python 3.x
+    disabled = isPy3k;
+
+    propagatedBuildInputs = with self; [ ];
+
+    src = pkgs.fetchFromGitHub {
+      owner = "lpod";
+      repo = "lpod-python";
+      rev = "v${version}";
+      sha256 = "1g909li511jkpcl26j1dzg8gn1ipkc374sh8vv54dx30sl0xfqxf";
+    };
+
+    meta = {
+      homepage = https://github.com/lpod/lpod-python/;
+      description = "Library implementing the ISO/IEC 26300 OpenDocument Format standard (ODF) ";
+      license = licenses.gpl3;
+    };
+  };
+
   mailchimp = buildPythonPackage rec {
     version = "2.0.9";
     name = "mailchimp-${version}";

From 36c430de12ed21d407a13c6922268cf17bc73368 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sun, 17 Jan 2016 09:29:05 +0100
Subject: [PATCH 822/884] lean: 20150821 -> 20160117

---
 pkgs/applications/science/logic/lean/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix
index 5a4e2cbbc055..995c43efe3ba 100644
--- a/pkgs/applications/science/logic/lean/default.nix
+++ b/pkgs/applications/science/logic/lean/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "lean-${version}";
-  version = "20150821";
+  version = "20160117";
 
   src = fetchFromGitHub {
     owner  = "leanprover";
     repo   = "lean";
-    rev    = "453bd2341dac51e50d9bff07d5ff6c9c3fb3ba0b";
-    sha256 = "1hmga5my123sra873iyqc7drj4skny4hnhsasaxjkmmdhmj1zpka";
+    rev    = "b2554dcb8f45899ccce84f226cd67b6460442930";
+    sha256 = "1gr024bly92kdjky5qvcm96gn86ijakziiyrsz91h643n1iyxhms";
   };
 
   buildInputs = [ gmp mpfr luajit boost cmake python gperftools ninja ];

From 8a26d9b84f566b5ead7744f425f4e5f41865a060 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sun, 17 Jan 2016 09:29:18 +0100
Subject: [PATCH 823/884] lean: add wrapper for linja

---
 pkgs/applications/science/logic/lean/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix
index 995c43efe3ba..92c306c40827 100644
--- a/pkgs/applications/science/logic/lean/default.nix
+++ b/pkgs/applications/science/logic/lean/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, gmp, mpfr, luajit, boost, python
-, gperftools, ninja }:
+, gperftools, ninja, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "lean-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "1gr024bly92kdjky5qvcm96gn86ijakziiyrsz91h643n1iyxhms";
   };
 
-  buildInputs = [ gmp mpfr luajit boost cmake python gperftools ninja ];
+  buildInputs = [ gmp mpfr luajit boost cmake python gperftools ninja makeWrapper ];
   enableParallelBuilding = true;
 
   preConfigure = ''
@@ -22,6 +22,10 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ];
 
+  postInstall = ''
+    wrapProgram $out/bin/linja --prefix PATH : $out/bin:${ninja}/bin
+  '';
+
   meta = {
     description = "Automatic and interactive theorem prover";
     homepage    = "http://leanprover.github.io";

From 85628148de308b96744986f44ef0d05807125082 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 17 Jan 2016 09:56:32 +0100
Subject: [PATCH 824/884] ffmpeg(-2.8): security update to fix #12437

2.8.5 is claimed to fix CVE-2016-{1897,1898}.
---
 pkgs/development/libraries/ffmpeg-full/default.nix | 4 ++--
 pkgs/development/libraries/ffmpeg/2.8.nix          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index fadb3feb4cc0..eed6a3bc763c 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -235,11 +235,11 @@ assert x11grabExtlib -> libX11 != null && libXv != null;
 
 stdenv.mkDerivation rec {
   name = "ffmpeg-full-${version}";
-  version = "2.8.1";
+  version = "2.8.5";
 
   src = fetchurl {
     url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.bz2";
-    sha256 = "1qk6g2h993i0wgs9d2p3ahdc5bqr03mp74bk6r1zj6pfinr5mvg2";
+    sha256 = "0nk1j3i7qc1k3dygpq74pxq382vqg9kaf2hxl9jfw8rkad8rjv9v";
   };
 
   patchPhase = ''patchShebangs .'';
diff --git a/pkgs/development/libraries/ffmpeg/2.8.nix b/pkgs/development/libraries/ffmpeg/2.8.nix
index e585ea14997f..2f911b26ca19 100644
--- a/pkgs/development/libraries/ffmpeg/2.8.nix
+++ b/pkgs/development/libraries/ffmpeg/2.8.nix
@@ -1,7 +1,7 @@
 { callPackage, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "${branch}.1";
+  version = "${branch}.5";
   branch = "2.8";
-  sha256 = "1qk6g2h993i0wgs9d2p3ahdc5bqr03mp74bk6r1zj6pfinr5mvg2";
+  sha256 = "0nk1j3i7qc1k3dygpq74pxq382vqg9kaf2hxl9jfw8rkad8rjv9v";
 })

From 0b7e17e5a5b68744d75fec121db77468fe4c2c5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 17 Jan 2016 10:24:06 +0100
Subject: [PATCH 825/884] audacity: apply Arch patch to avoid vulnerable ffmpeg

Now it builds with the latest branch. /cc #12437.
---
 pkgs/applications/audio/audacity/default.nix | 8 +++++++-
 pkgs/top-level/all-packages.nix              | 4 +---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix
index 8b15fea8b866..627d68525b9b 100644
--- a/pkgs/applications/audio/audacity/default.nix
+++ b/pkgs/applications/audio/audacity/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, wxGTK, pkgconfig, gettext, gtk, glib, zlib, perl, intltool,
-  libogg, libvorbis, libmad, alsaLib, libsndfile, soxr, flac, lame,
+  libogg, libvorbis, libmad, alsaLib, libsndfile, soxr, flac, lame, fetchpatch,
   expat, libid3tag, ffmpeg, soundtouch /*, portaudio - given up fighting their portaudio.patch */
   }:
 
@@ -11,6 +11,12 @@ stdenv.mkDerivation rec {
     url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz";
     sha256 = "15c5ff7ac1c0b19b08f4bdcb0f4988743da2f9ed3fab41d6f07600e67cb9ddb6";
   };
+  patches = [(fetchpatch {
+    name = "new-ffmpeg.patch";
+    url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk"
+      + "/audacity-ffmpeg.patch?h=packages/audacity&id=0c1e35798d4d70692";
+    sha256 = "19fr674mw844zmkp1476yigkcnmb6zyn78av64ccdwi3p68i00rf";
+  })];
 
   preConfigure = /* we prefer system-wide libs */ ''
     mv lib-src lib-src-rm
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2ec43e10306e..0ceeea9ac64c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11099,9 +11099,7 @@ let
 
   audacious = callPackage ../applications/audio/audacious { };
 
-  audacity = callPackage ../applications/audio/audacity {
-    ffmpeg = ffmpeg_2_2;
-  };
+  audacity = callPackage ../applications/audio/audacity { };
 
   audio-recorder = callPackage ../applications/audio/audio-recorder { };
 

From 545444cd19f5ad60041886b01f194f8cb2f1d989 Mon Sep 17 00:00:00 2001
From: Mathieu Boespflug <m@tweag.io>
Date: Sun, 17 Jan 2016 11:06:03 +0100
Subject: [PATCH 826/884] R: add a new `enableStrictBarrier` package option.

This option compiles R with --enable-strict-barrier. Doing so is
enables extra memory diagnostics in R that very useful for debugging
memory leak or memory protections issues in extensions to R written in
C, or for any apps embedding R (e.g. Haskell aps embedding R via
HaskellR).
---
 pkgs/applications/science/math/R/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index edbf8a843a5a..e7a195659491 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -3,6 +3,7 @@
 , less, texinfo, graphviz, icu, pkgconfig, bison, imake, which, jdk, openblas
 , curl, Cocoa, Foundation, cf-private, libobjc, tzdata
 , withRecommendedPackages ? true
+, enableStrictBarrier ? false
 }:
 
 stdenv.mkDerivation rec {
@@ -39,6 +40,7 @@ stdenv.mkDerivation rec {
       --with-system-pcre
       --with-system-xz
       --with-ICU
+      ${stdenv.lib.optionalString enableStrictBarrier "--enable-strict-barrier"}
       --enable-R-shlib
       AR=$(type -p ar)
       AWK=$(type -p gawk)

From dd4dd8c87a4b77ba278bb9b531c1daf352a77aaa Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Sun, 17 Jan 2016 11:22:10 +0100
Subject: [PATCH 827/884] conky: 1.10.0 -> 1.10.1

---
 pkgs/os-specific/linux/conky/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix
index 97eab37e4e1e..8943f3276d79 100644
--- a/pkgs/os-specific/linux/conky/default.nix
+++ b/pkgs/os-specific/linux/conky/default.nix
@@ -61,13 +61,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "conky-${version}";
-  version = "1.10.0";
+  version = "1.10.1";
 
   src = fetchFromGitHub {
     owner = "brndnmtthws";
     repo = "conky";
     rev = "v${version}";
-    sha256 = "00vyrf72l54j3majqmn6vykqvvb15vygsaby644nsb5vpma6b1cn";
+    sha256 = "0k93nqx8mxz2z84zzwpwfp7v7dwxwg1di1a2yb137lk7l157azw6";
   };
 
   postPatch = ''
@@ -81,6 +81,7 @@ stdenv.mkDerivation rec {
       --replace "http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl" "${docbook_xsl}/xml/xsl/docbook/html/docbook.xsl"
     substituteInPlace doc/docs.xml \
       --replace "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" "${docbook_xml_dtd_44}/xml/dtd/docbook/docbookx.dtd"
+    substituteInPlace cmake/Conky.cmake --replace "#set(RELEASE true)" "set(RELEASE true)"
   '';
 
   NIX_LDFLAGS = "-lgcc_s";

From 0dc1bc4aee1f6eb64160113c28cda1622760a2b8 Mon Sep 17 00:00:00 2001
From: Svein Ove Aas <svein.ove@aas.no>
Date: Sun, 17 Jan 2016 04:05:39 +0000
Subject: [PATCH 828/884] fgallery: 1.7 -> 1.8

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

diff --git a/pkgs/tools/graphics/fgallery/default.nix b/pkgs/tools/graphics/fgallery/default.nix
index 4b0531aa1ced..6b8de80ee70e 100644
--- a/pkgs/tools/graphics/fgallery/default.nix
+++ b/pkgs/tools/graphics/fgallery/default.nix
@@ -11,11 +11,11 @@
 #   fatal("cannot run \"facedetect\" (see http://www.thregr.org/~wavexx/hacks/facedetect/)");
 
 stdenv.mkDerivation rec {
-  name = "fgallery-1.7";
+  name = "fgallery-1.8";
 
   src = fetchurl {
     url = "http://www.thregr.org/~wavexx/software/fgallery/releases/${name}.zip";
-    sha256 = "1iix6p8viwnsq3zn9vg99sx20nmgk2p5als3j1lk914nz3anvai4";
+    sha256 = "1n237sk7fm4yrpn69qaz9fwbjl6i94y664q7d16bhngrcil3bq1d";
   };
 
   buildInputs = [ unzip makeWrapper perl ImageExifTool JSON ];

From 4a097fdc3fa41d5213421041910692734b5cea19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 17 Jan 2016 11:44:16 +0100
Subject: [PATCH 829/884] ffmpeg-2.2: remove this vulnerable branch

Upstream doesn't maintain it anymore and it's unused in nixpkgs.
/cc #12437.
---
 pkgs/development/libraries/ffmpeg/2.2.nix | 7 -------
 pkgs/top-level/all-packages.nix           | 3 ---
 2 files changed, 10 deletions(-)
 delete mode 100644 pkgs/development/libraries/ffmpeg/2.2.nix

diff --git a/pkgs/development/libraries/ffmpeg/2.2.nix b/pkgs/development/libraries/ffmpeg/2.2.nix
deleted file mode 100644
index fbbb75cb8320..000000000000
--- a/pkgs/development/libraries/ffmpeg/2.2.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ callPackage, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "${branch}.15";
-  branch = "2.2";
-  sha256 = "1s2mf1lvvwj6vkbp0wdr21xki864xsfi1rsjaa67q5m9dx4rrnr4";
-})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0ceeea9ac64c..4a1285875bc9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6408,9 +6408,6 @@ let
   ffmpeg_1_2 = callPackage ../development/libraries/ffmpeg/1.2.nix {
     inherit (darwin.apple_sdk.frameworks) Cocoa;
   };
-  ffmpeg_2_2 = callPackage ../development/libraries/ffmpeg/2.2.nix {
-    inherit (darwin.apple_sdk.frameworks) Cocoa;
-  };
   ffmpeg_2_8 = callPackage ../development/libraries/ffmpeg/2.8.nix {
     inherit (darwin.apple_sdk.frameworks) Cocoa;
   };

From 1c4666409cfc726c62b22f6eccbc00f9515f83c1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 15 Jan 2016 22:30:49 +0100
Subject: [PATCH 830/884] hackage-packages.nix: update Haskell package set

This update was generated by hackage2nix v20151217-9-geddefc2 using the following inputs:

  - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/3a04b0b2d4ed8e895e538e9b8f395b3c6ae4db60
  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/e505b113f6eed7cc2682269767c6599904138a32
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/e72964a5535ea93cb5ce89d4f3bfb39e18b4e1b7
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/14a3a2d00efd5d46196dd8fce8c0565cb439c913
---
 .../haskell-modules/configuration-lts-0.0.nix |    3 +
 .../haskell-modules/configuration-lts-0.1.nix |    3 +
 .../haskell-modules/configuration-lts-0.2.nix |    3 +
 .../haskell-modules/configuration-lts-0.3.nix |    3 +
 .../haskell-modules/configuration-lts-0.4.nix |    3 +
 .../haskell-modules/configuration-lts-0.5.nix |    3 +
 .../haskell-modules/configuration-lts-0.6.nix |    3 +
 .../haskell-modules/configuration-lts-0.7.nix |    3 +
 .../haskell-modules/configuration-lts-1.0.nix |    3 +
 .../haskell-modules/configuration-lts-1.1.nix |    3 +
 .../configuration-lts-1.10.nix                |    3 +
 .../configuration-lts-1.11.nix                |    3 +
 .../configuration-lts-1.12.nix                |    3 +
 .../configuration-lts-1.13.nix                |    3 +
 .../configuration-lts-1.14.nix                |    3 +
 .../configuration-lts-1.15.nix                |    3 +
 .../haskell-modules/configuration-lts-1.2.nix |    3 +
 .../haskell-modules/configuration-lts-1.4.nix |    3 +
 .../haskell-modules/configuration-lts-1.5.nix |    3 +
 .../haskell-modules/configuration-lts-1.7.nix |    3 +
 .../haskell-modules/configuration-lts-1.8.nix |    3 +
 .../haskell-modules/configuration-lts-1.9.nix |    3 +
 .../haskell-modules/configuration-lts-2.0.nix |    4 +
 .../haskell-modules/configuration-lts-2.1.nix |    4 +
 .../configuration-lts-2.10.nix                |    4 +
 .../configuration-lts-2.11.nix                |    4 +
 .../configuration-lts-2.12.nix                |    4 +
 .../configuration-lts-2.13.nix                |    4 +
 .../configuration-lts-2.14.nix                |    4 +
 .../configuration-lts-2.15.nix                |    4 +
 .../configuration-lts-2.16.nix                |    5 +
 .../configuration-lts-2.17.nix                |    5 +
 .../configuration-lts-2.18.nix                |    5 +
 .../configuration-lts-2.19.nix                |    5 +
 .../haskell-modules/configuration-lts-2.2.nix |    4 +
 .../configuration-lts-2.20.nix                |    5 +
 .../configuration-lts-2.21.nix                |    5 +
 .../configuration-lts-2.22.nix                |    5 +
 .../haskell-modules/configuration-lts-2.3.nix |    4 +
 .../haskell-modules/configuration-lts-2.4.nix |    4 +
 .../haskell-modules/configuration-lts-2.5.nix |    4 +
 .../haskell-modules/configuration-lts-2.6.nix |    4 +
 .../haskell-modules/configuration-lts-2.7.nix |    4 +
 .../haskell-modules/configuration-lts-2.8.nix |    4 +
 .../haskell-modules/configuration-lts-2.9.nix |    4 +
 .../haskell-modules/configuration-lts-3.0.nix |    8 +
 .../haskell-modules/configuration-lts-3.1.nix |    8 +
 .../configuration-lts-3.10.nix                |   10 +
 .../configuration-lts-3.11.nix                |   10 +
 .../configuration-lts-3.12.nix                |   10 +
 .../configuration-lts-3.13.nix                |   10 +
 .../configuration-lts-3.14.nix                |   11 +
 .../configuration-lts-3.15.nix                |   11 +
 .../configuration-lts-3.16.nix                |   11 +
 .../configuration-lts-3.17.nix                |   11 +
 .../configuration-lts-3.18.nix                |   11 +
 .../configuration-lts-3.19.nix                |   11 +
 .../haskell-modules/configuration-lts-3.2.nix |    8 +
 .../configuration-lts-3.20.nix                |   11 +
 .../configuration-lts-3.21.nix                |   11 +
 .../configuration-lts-3.22.nix                |   11 +
 .../haskell-modules/configuration-lts-3.3.nix |    8 +
 .../haskell-modules/configuration-lts-3.4.nix |    8 +
 .../haskell-modules/configuration-lts-3.5.nix |    8 +
 .../haskell-modules/configuration-lts-3.6.nix |    8 +
 .../haskell-modules/configuration-lts-3.7.nix |    9 +
 .../haskell-modules/configuration-lts-3.8.nix |    9 +
 .../haskell-modules/configuration-lts-3.9.nix |   10 +
 .../haskell-modules/configuration-lts-4.0.nix |   20 +
 .../haskell-modules/configuration-lts-4.1.nix |   20 +
 .../haskell-modules/hackage-packages.nix      | 1113 +++++++++++++++--
 71 files changed, 1435 insertions(+), 106 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
index e0c529234a9c..43a49c4da4ef 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
@@ -2241,6 +2241,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -3202,6 +3203,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -7942,6 +7944,7 @@ self: super: {
   "termination-combinators" = dontDistribute super."termination-combinators";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework" = doDistribute super."test-framework_0_8_0_3";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
index 0766842363cb..0b06311a9801 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
@@ -2241,6 +2241,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -3202,6 +3203,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -7942,6 +7944,7 @@ self: super: {
   "termination-combinators" = dontDistribute super."termination-combinators";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework" = doDistribute super."test-framework_0_8_0_3";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
index 96d736894f1e..1d59562cc850 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
@@ -2241,6 +2241,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -3202,6 +3203,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -7942,6 +7944,7 @@ self: super: {
   "termination-combinators" = dontDistribute super."termination-combinators";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework" = doDistribute super."test-framework_0_8_0_3";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
index 92a1abc3c4c4..0cb0c6e68f11 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
@@ -2241,6 +2241,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -3202,6 +3203,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -7942,6 +7944,7 @@ self: super: {
   "termination-combinators" = dontDistribute super."termination-combinators";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework" = doDistribute super."test-framework_0_8_0_3";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
index 0f20a013d065..22c6d25ab42c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
@@ -2241,6 +2241,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -3201,6 +3202,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -7938,6 +7940,7 @@ self: super: {
   "termination-combinators" = dontDistribute super."termination-combinators";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework" = doDistribute super."test-framework_0_8_0_3";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
index a304510e1f73..8c2d85f2499d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
@@ -2241,6 +2241,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -3201,6 +3202,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -7938,6 +7940,7 @@ self: super: {
   "termination-combinators" = dontDistribute super."termination-combinators";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework" = doDistribute super."test-framework_0_8_1_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
index f9e3e8315aa6..71b640e0c70f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
@@ -2238,6 +2238,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -3198,6 +3199,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -7932,6 +7934,7 @@ self: super: {
   "termination-combinators" = dontDistribute super."termination-combinators";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework" = doDistribute super."test-framework_0_8_1_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
index d5ec95724cbb..c1ac7b7a6866 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
@@ -2238,6 +2238,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -3198,6 +3199,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -7932,6 +7934,7 @@ self: super: {
   "termination-combinators" = dontDistribute super."termination-combinators";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework" = doDistribute super."test-framework_0_8_1_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
index 12f6bd0801a9..b6218ae4ab28 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
@@ -2230,6 +2230,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -3188,6 +3189,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -7918,6 +7920,7 @@ self: super: {
   "termination-combinators" = dontDistribute super."termination-combinators";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework" = doDistribute super."test-framework_0_8_1_0";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
index e3d3824bd86f..c86e0ee5569a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
@@ -2228,6 +2228,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -3184,6 +3185,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -7908,6 +7910,7 @@ self: super: {
   "termination-combinators" = dontDistribute super."termination-combinators";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
index c3c7a2c3920c..b74623b09d7e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
@@ -2225,6 +2225,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -3177,6 +3178,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -7882,6 +7884,7 @@ self: super: {
   "termination-combinators" = dontDistribute super."termination-combinators";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
index 69db1dd89a18..79ab2e6f67fb 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
@@ -2225,6 +2225,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -3176,6 +3177,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -7878,6 +7880,7 @@ self: super: {
   "termination-combinators" = dontDistribute super."termination-combinators";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
index 49375ee3252d..be460c8f810c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
@@ -2225,6 +2225,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -3176,6 +3177,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -7876,6 +7878,7 @@ self: super: {
   "termination-combinators" = dontDistribute super."termination-combinators";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
index f58b30b5e57b..610bba03009c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
@@ -2225,6 +2225,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -3176,6 +3177,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -7874,6 +7876,7 @@ self: super: {
   "termination-combinators" = dontDistribute super."termination-combinators";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
index ad3dbdaf7023..2d8fb74ed501 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
@@ -2223,6 +2223,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -3173,6 +3174,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -7866,6 +7868,7 @@ self: super: {
   "termination-combinators" = dontDistribute super."termination-combinators";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
index e86767c54716..f4f7b038eef7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
@@ -2220,6 +2220,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -3168,6 +3169,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -7855,6 +7857,7 @@ self: super: {
   "termination-combinators" = dontDistribute super."termination-combinators";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
index bc4e352663f0..c386c5791a7a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
@@ -2227,6 +2227,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -3182,6 +3183,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -7902,6 +7904,7 @@ self: super: {
   "termination-combinators" = dontDistribute super."termination-combinators";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
index bc5b41c0c412..883954c95755 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
@@ -2226,6 +2226,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -3180,6 +3181,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -7897,6 +7899,7 @@ self: super: {
   "termination-combinators" = dontDistribute super."termination-combinators";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
index 928a6bd4bf23..8410cc120120 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
@@ -2225,6 +2225,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -3179,6 +3180,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -7896,6 +7898,7 @@ self: super: {
   "termination-combinators" = dontDistribute super."termination-combinators";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
index b936acf49f65..36c41b867d86 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
@@ -2225,6 +2225,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -3179,6 +3180,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -7890,6 +7892,7 @@ self: super: {
   "termination-combinators" = dontDistribute super."termination-combinators";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
index fc849b8cb044..6348ae3020db 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
@@ -2225,6 +2225,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -3177,6 +3178,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -7886,6 +7888,7 @@ self: super: {
   "termination-combinators" = dontDistribute super."termination-combinators";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
index 8dbefa96d0f9..d8a3baeb71fd 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
@@ -2225,6 +2225,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -3177,6 +3178,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -7885,6 +7887,7 @@ self: super: {
   "termination-combinators" = dontDistribute super."termination-combinators";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
index 0c485b48bcc3..6fabd0b50d9f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
@@ -2207,6 +2207,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -2958,6 +2959,7 @@ self: super: {
   "exception-mtl" = doDistribute super."exception-mtl_0_3_0_5";
   "exception-transformers" = doDistribute super."exception-transformers_0_3_0_4";
   "exceptional" = dontDistribute super."exceptional";
+  "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "executable-hash" = doDistribute super."executable-hash_0_2_0_0";
   "exhaustive" = dontDistribute super."exhaustive";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
@@ -3150,6 +3152,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -7791,6 +7794,7 @@ self: super: {
   "termination-combinators" = dontDistribute super."termination-combinators";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
index 99cf6f9c3d1a..a960694c520e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
@@ -2206,6 +2206,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -2957,6 +2958,7 @@ self: super: {
   "exception-mtl" = doDistribute super."exception-mtl_0_3_0_5";
   "exception-transformers" = doDistribute super."exception-transformers_0_3_0_4";
   "exceptional" = dontDistribute super."exceptional";
+  "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "executable-hash" = doDistribute super."executable-hash_0_2_0_0";
   "exhaustive" = dontDistribute super."exhaustive";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
@@ -3149,6 +3151,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -7789,6 +7792,7 @@ self: super: {
   "termination-combinators" = dontDistribute super."termination-combinators";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
index b886e5a5bdcc..a27fd4535ee1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
@@ -2193,6 +2193,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -2940,6 +2941,7 @@ self: super: {
   "exception-mtl" = doDistribute super."exception-mtl_0_3_0_5";
   "exception-transformers" = doDistribute super."exception-transformers_0_3_0_4";
   "exceptional" = dontDistribute super."exceptional";
+  "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "executable-hash" = doDistribute super."executable-hash_0_2_0_0";
   "exhaustive" = dontDistribute super."exhaustive";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
@@ -3130,6 +3132,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -7736,6 +7739,7 @@ self: super: {
   "termination-combinators" = dontDistribute super."termination-combinators";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
index bec0100369f6..2bc005894d8b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
@@ -2192,6 +2192,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -2939,6 +2940,7 @@ self: super: {
   "exception-mtl" = doDistribute super."exception-mtl_0_3_0_5";
   "exception-transformers" = doDistribute super."exception-transformers_0_3_0_4";
   "exceptional" = dontDistribute super."exceptional";
+  "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "executable-hash" = doDistribute super."executable-hash_0_2_0_0";
   "exhaustive" = dontDistribute super."exhaustive";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
@@ -3129,6 +3131,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -7727,6 +7730,7 @@ self: super: {
   "termination-combinators" = dontDistribute super."termination-combinators";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
index 06724e130f98..e8bb7cb15839 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
@@ -2192,6 +2192,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -2939,6 +2940,7 @@ self: super: {
   "exception-mtl" = doDistribute super."exception-mtl_0_3_0_5";
   "exception-transformers" = doDistribute super."exception-transformers_0_3_0_4";
   "exceptional" = dontDistribute super."exceptional";
+  "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "executable-hash" = doDistribute super."executable-hash_0_2_0_0";
   "exhaustive" = dontDistribute super."exhaustive";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
@@ -3129,6 +3131,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -7726,6 +7729,7 @@ self: super: {
   "termination-combinators" = dontDistribute super."termination-combinators";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
index e8434e502b87..6391bc0180e9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
@@ -2192,6 +2192,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -2939,6 +2940,7 @@ self: super: {
   "exception-mtl" = doDistribute super."exception-mtl_0_3_0_5";
   "exception-transformers" = doDistribute super."exception-transformers_0_3_0_4";
   "exceptional" = dontDistribute super."exceptional";
+  "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "executable-hash" = doDistribute super."executable-hash_0_2_0_0";
   "exhaustive" = dontDistribute super."exhaustive";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
@@ -3129,6 +3131,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -7723,6 +7726,7 @@ self: super: {
   "termination-combinators" = dontDistribute super."termination-combinators";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
index 51efec65a640..19f39ecba303 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
@@ -2191,6 +2191,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -2938,6 +2939,7 @@ self: super: {
   "exception-mtl" = doDistribute super."exception-mtl_0_3_0_5";
   "exception-transformers" = doDistribute super."exception-transformers_0_3_0_4";
   "exceptional" = dontDistribute super."exceptional";
+  "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "executable-hash" = doDistribute super."executable-hash_0_2_0_0";
   "exhaustive" = dontDistribute super."exhaustive";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
@@ -3127,6 +3129,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -7718,6 +7721,7 @@ self: super: {
   "termination-combinators" = dontDistribute super."termination-combinators";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
index 273068268c91..9efae29b78d6 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
@@ -2191,6 +2191,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -2937,6 +2938,7 @@ self: super: {
   "exception-mtl" = doDistribute super."exception-mtl_0_3_0_5";
   "exception-transformers" = doDistribute super."exception-transformers_0_3_0_4";
   "exceptional" = dontDistribute super."exceptional";
+  "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "executable-hash" = doDistribute super."executable-hash_0_2_0_0";
   "exhaustive" = dontDistribute super."exhaustive";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
@@ -3126,6 +3128,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -7713,6 +7716,7 @@ self: super: {
   "termination-combinators" = dontDistribute super."termination-combinators";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
index 10bea068c9bd..51e0764f82f0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
@@ -2189,6 +2189,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -2933,6 +2934,7 @@ self: super: {
   "exception-mtl" = doDistribute super."exception-mtl_0_3_0_5";
   "exception-transformers" = doDistribute super."exception-transformers_0_3_0_4";
   "exceptional" = dontDistribute super."exceptional";
+  "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "executable-hash" = doDistribute super."executable-hash_0_2_0_0";
   "exhaustive" = dontDistribute super."exhaustive";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
@@ -3121,6 +3123,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -3852,6 +3855,7 @@ self: super: {
   "hascat-setup" = dontDistribute super."hascat-setup";
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
+  "hashable" = doDistribute super."hashable_1_2_3_3";
   "hashable-extras" = doDistribute super."hashable-extras_0_2_1";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
@@ -7706,6 +7710,7 @@ self: super: {
   "termination-combinators" = dontDistribute super."termination-combinators";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
index 3115030fde51..4ab2085f1bc7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
@@ -2187,6 +2187,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -2931,6 +2932,7 @@ self: super: {
   "exception-mtl" = doDistribute super."exception-mtl_0_3_0_5";
   "exception-transformers" = doDistribute super."exception-transformers_0_3_0_4";
   "exceptional" = dontDistribute super."exceptional";
+  "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "exhaustive" = dontDistribute super."exhaustive";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
@@ -3117,6 +3119,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -3847,6 +3850,7 @@ self: super: {
   "hascat-setup" = dontDistribute super."hascat-setup";
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
+  "hashable" = doDistribute super."hashable_1_2_3_3";
   "hashable-extras" = doDistribute super."hashable-extras_0_2_1";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
@@ -7700,6 +7704,7 @@ self: super: {
   "termination-combinators" = dontDistribute super."termination-combinators";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
index cc9943bb3f99..71ad819477a1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
@@ -2186,6 +2186,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -2929,6 +2930,7 @@ self: super: {
   "exception-mtl" = doDistribute super."exception-mtl_0_3_0_5";
   "exception-transformers" = doDistribute super."exception-transformers_0_3_0_4";
   "exceptional" = dontDistribute super."exceptional";
+  "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "exhaustive" = dontDistribute super."exhaustive";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
@@ -3115,6 +3117,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -3845,6 +3848,7 @@ self: super: {
   "hascat-setup" = dontDistribute super."hascat-setup";
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
+  "hashable" = doDistribute super."hashable_1_2_3_3";
   "hashable-extras" = doDistribute super."hashable-extras_0_2_1";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
@@ -7694,6 +7698,7 @@ self: super: {
   "termination-combinators" = dontDistribute super."termination-combinators";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
index c7a77a57ceaf..80547ee44ab8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
@@ -2186,6 +2186,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -2929,6 +2930,7 @@ self: super: {
   "exception-mtl" = doDistribute super."exception-mtl_0_3_0_5";
   "exception-transformers" = doDistribute super."exception-transformers_0_3_0_4";
   "exceptional" = dontDistribute super."exceptional";
+  "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "exhaustive" = dontDistribute super."exhaustive";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
@@ -3115,6 +3117,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -3844,6 +3847,7 @@ self: super: {
   "hascat-setup" = dontDistribute super."hascat-setup";
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
+  "hashable" = doDistribute super."hashable_1_2_3_3";
   "hashable-extras" = doDistribute super."hashable-extras_0_2_1";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
@@ -7689,6 +7693,7 @@ self: super: {
   "termination-combinators" = dontDistribute super."termination-combinators";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
index 075eaee32182..f465fc7d0e07 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
@@ -2203,6 +2203,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -2954,6 +2955,7 @@ self: super: {
   "exception-mtl" = doDistribute super."exception-mtl_0_3_0_5";
   "exception-transformers" = doDistribute super."exception-transformers_0_3_0_4";
   "exceptional" = dontDistribute super."exceptional";
+  "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "executable-hash" = doDistribute super."executable-hash_0_2_0_0";
   "exhaustive" = dontDistribute super."exhaustive";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
@@ -3146,6 +3148,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -7786,6 +7789,7 @@ self: super: {
   "termination-combinators" = dontDistribute super."termination-combinators";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
index 04d474f77cb6..4564473ba135 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
@@ -2185,6 +2185,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -2928,6 +2929,7 @@ self: super: {
   "exception-mtl" = doDistribute super."exception-mtl_0_3_0_5";
   "exception-transformers" = doDistribute super."exception-transformers_0_3_0_4";
   "exceptional" = dontDistribute super."exceptional";
+  "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "exhaustive" = dontDistribute super."exhaustive";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
@@ -3114,6 +3116,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -3843,6 +3846,7 @@ self: super: {
   "hascat-setup" = dontDistribute super."hascat-setup";
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
+  "hashable" = doDistribute super."hashable_1_2_3_3";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -7685,6 +7689,7 @@ self: super: {
   "termination-combinators" = dontDistribute super."termination-combinators";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
index 2764390cc6b5..22d82a721f20 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
@@ -2185,6 +2185,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -2928,6 +2929,7 @@ self: super: {
   "exception-mtl" = doDistribute super."exception-mtl_0_3_0_5";
   "exception-transformers" = doDistribute super."exception-transformers_0_3_0_4";
   "exceptional" = dontDistribute super."exceptional";
+  "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "exhaustive" = dontDistribute super."exhaustive";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
@@ -3114,6 +3116,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -3843,6 +3846,7 @@ self: super: {
   "hascat-setup" = dontDistribute super."hascat-setup";
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
+  "hashable" = doDistribute super."hashable_1_2_3_3";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -7683,6 +7687,7 @@ self: super: {
   "termination-combinators" = dontDistribute super."termination-combinators";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
index 152b518c8cd9..2d29666323aa 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
@@ -2185,6 +2185,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -2928,6 +2929,7 @@ self: super: {
   "exception-mtl" = doDistribute super."exception-mtl_0_3_0_5";
   "exception-transformers" = doDistribute super."exception-transformers_0_3_0_4";
   "exceptional" = dontDistribute super."exceptional";
+  "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "exhaustive" = dontDistribute super."exhaustive";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
@@ -3114,6 +3116,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -3843,6 +3846,7 @@ self: super: {
   "hascat-setup" = dontDistribute super."hascat-setup";
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
+  "hashable" = doDistribute super."hashable_1_2_3_3";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -7681,6 +7685,7 @@ self: super: {
   "termination-combinators" = dontDistribute super."termination-combinators";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
index 9a801ff3b7d8..9ce164f18aea 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
@@ -2203,6 +2203,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -2954,6 +2955,7 @@ self: super: {
   "exception-mtl" = doDistribute super."exception-mtl_0_3_0_5";
   "exception-transformers" = doDistribute super."exception-transformers_0_3_0_4";
   "exceptional" = dontDistribute super."exceptional";
+  "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "executable-hash" = doDistribute super."executable-hash_0_2_0_0";
   "exhaustive" = dontDistribute super."exhaustive";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
@@ -3145,6 +3147,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -7784,6 +7787,7 @@ self: super: {
   "termination-combinators" = dontDistribute super."termination-combinators";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
index df9d245b5df3..9f312a971328 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
@@ -2202,6 +2202,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -2953,6 +2954,7 @@ self: super: {
   "exception-mtl" = doDistribute super."exception-mtl_0_3_0_5";
   "exception-transformers" = doDistribute super."exception-transformers_0_3_0_4";
   "exceptional" = dontDistribute super."exceptional";
+  "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "executable-hash" = doDistribute super."executable-hash_0_2_0_0";
   "exhaustive" = dontDistribute super."exhaustive";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
@@ -3144,6 +3146,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -7779,6 +7782,7 @@ self: super: {
   "termination-combinators" = dontDistribute super."termination-combinators";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
index 6c3c7d9c6e5b..72c3763423fe 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
@@ -2202,6 +2202,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -2952,6 +2953,7 @@ self: super: {
   "exception-mtl" = doDistribute super."exception-mtl_0_3_0_5";
   "exception-transformers" = doDistribute super."exception-transformers_0_3_0_4";
   "exceptional" = dontDistribute super."exceptional";
+  "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "executable-hash" = doDistribute super."executable-hash_0_2_0_0";
   "exhaustive" = dontDistribute super."exhaustive";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
@@ -3143,6 +3145,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -7776,6 +7779,7 @@ self: super: {
   "termination-combinators" = dontDistribute super."termination-combinators";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
index 02f08c304f95..6a7f7dbb61cf 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
@@ -2199,6 +2199,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -2949,6 +2950,7 @@ self: super: {
   "exception-mtl" = doDistribute super."exception-mtl_0_3_0_5";
   "exception-transformers" = doDistribute super."exception-transformers_0_3_0_4";
   "exceptional" = dontDistribute super."exceptional";
+  "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "executable-hash" = doDistribute super."executable-hash_0_2_0_0";
   "exhaustive" = dontDistribute super."exhaustive";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
@@ -3140,6 +3142,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -7770,6 +7773,7 @@ self: super: {
   "termination-combinators" = dontDistribute super."termination-combinators";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
index 518bddd264d8..75470676e94e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
@@ -2198,6 +2198,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -2948,6 +2949,7 @@ self: super: {
   "exception-mtl" = doDistribute super."exception-mtl_0_3_0_5";
   "exception-transformers" = doDistribute super."exception-transformers_0_3_0_4";
   "exceptional" = dontDistribute super."exceptional";
+  "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "executable-hash" = doDistribute super."executable-hash_0_2_0_0";
   "exhaustive" = dontDistribute super."exhaustive";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
@@ -3139,6 +3141,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -7769,6 +7772,7 @@ self: super: {
   "termination-combinators" = dontDistribute super."termination-combinators";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
index c852d3d09b1b..2c63de232a5a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
@@ -2197,6 +2197,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -2947,6 +2948,7 @@ self: super: {
   "exception-mtl" = doDistribute super."exception-mtl_0_3_0_5";
   "exception-transformers" = doDistribute super."exception-transformers_0_3_0_4";
   "exceptional" = dontDistribute super."exceptional";
+  "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "executable-hash" = doDistribute super."executable-hash_0_2_0_0";
   "exhaustive" = dontDistribute super."exhaustive";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
@@ -3137,6 +3139,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -7762,6 +7765,7 @@ self: super: {
   "termination-combinators" = dontDistribute super."termination-combinators";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
index 917a6cdc320a..ecaa05257910 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
@@ -2194,6 +2194,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -2942,6 +2943,7 @@ self: super: {
   "exception-mtl" = doDistribute super."exception-mtl_0_3_0_5";
   "exception-transformers" = doDistribute super."exception-transformers_0_3_0_4";
   "exceptional" = dontDistribute super."exceptional";
+  "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "executable-hash" = doDistribute super."executable-hash_0_2_0_0";
   "exhaustive" = dontDistribute super."exhaustive";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
@@ -3132,6 +3134,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -7747,6 +7750,7 @@ self: super: {
   "termination-combinators" = dontDistribute super."termination-combinators";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
index 0c489242cda8..e81f80f76ff5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
@@ -2116,6 +2116,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -2803,6 +2804,7 @@ self: super: {
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
   "ert" = dontDistribute super."ert";
   "esotericbot" = dontDistribute super."esotericbot";
+  "esqueleto" = doDistribute super."esqueleto_2_4_1";
   "ess" = dontDistribute super."ess";
   "estimator" = dontDistribute super."estimator";
   "estimators" = dontDistribute super."estimators";
@@ -2835,6 +2837,7 @@ self: super: {
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
   "exception-transformers" = doDistribute super."exception-transformers_0_4_0_1";
+  "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "exhaustive" = doDistribute super."exhaustive_1_1_1";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
@@ -3013,6 +3016,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -3066,6 +3070,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "free" = doDistribute super."free_4_12_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
   "free-game" = dontDistribute super."free-game";
@@ -3191,6 +3196,7 @@ self: super: {
   "geniconvert" = dontDistribute super."geniconvert";
   "genifunctors" = dontDistribute super."genifunctors";
   "geniplate" = dontDistribute super."geniplate";
+  "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_1";
   "geniserver" = dontDistribute super."geniserver";
   "genprog" = dontDistribute super."genprog";
   "gentlemark" = dontDistribute super."gentlemark";
@@ -3730,6 +3736,7 @@ self: super: {
   "hascat-setup" = dontDistribute super."hascat-setup";
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
+  "hashable" = doDistribute super."hashable_1_2_3_3";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -7460,6 +7467,7 @@ self: super: {
   "terminfo" = doDistribute super."terminfo_0_4_0_1";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
index e73fd43dbc15..63c55b1c0239 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
@@ -2115,6 +2115,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -2802,6 +2803,7 @@ self: super: {
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
   "ert" = dontDistribute super."ert";
   "esotericbot" = dontDistribute super."esotericbot";
+  "esqueleto" = doDistribute super."esqueleto_2_4_1";
   "ess" = dontDistribute super."ess";
   "estimator" = dontDistribute super."estimator";
   "estimators" = dontDistribute super."estimators";
@@ -2834,6 +2836,7 @@ self: super: {
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
   "exception-transformers" = doDistribute super."exception-transformers_0_4_0_1";
+  "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "exhaustive" = doDistribute super."exhaustive_1_1_1";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
@@ -3009,6 +3012,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -3062,6 +3066,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "free" = doDistribute super."free_4_12_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
   "free-game" = dontDistribute super."free-game";
@@ -3187,6 +3192,7 @@ self: super: {
   "geniconvert" = dontDistribute super."geniconvert";
   "genifunctors" = dontDistribute super."genifunctors";
   "geniplate" = dontDistribute super."geniplate";
+  "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_1";
   "geniserver" = dontDistribute super."geniserver";
   "genprog" = dontDistribute super."genprog";
   "gentlemark" = dontDistribute super."gentlemark";
@@ -3726,6 +3732,7 @@ self: super: {
   "hascat-setup" = dontDistribute super."hascat-setup";
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
+  "hashable" = doDistribute super."hashable_1_2_3_3";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -7452,6 +7459,7 @@ self: super: {
   "terminfo" = doDistribute super."terminfo_0_4_0_1";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
index f87c0808088d..2e42946cd2ad 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
@@ -2092,6 +2092,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -2371,6 +2372,7 @@ self: super: {
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
   "dbmigrations" = dontDistribute super."dbmigrations";
+  "dbus" = doDistribute super."dbus_0_10_11";
   "dbus-client" = dontDistribute super."dbus-client";
   "dbus-core" = dontDistribute super."dbus-core";
   "dbus-qq" = dontDistribute super."dbus-qq";
@@ -2764,6 +2766,7 @@ self: super: {
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
   "ert" = dontDistribute super."ert";
   "esotericbot" = dontDistribute super."esotericbot";
+  "esqueleto" = doDistribute super."esqueleto_2_4_1";
   "ess" = dontDistribute super."ess";
   "estimator" = dontDistribute super."estimator";
   "estimators" = dontDistribute super."estimators";
@@ -2794,6 +2797,7 @@ self: super: {
   "exception-mailer" = dontDistribute super."exception-mailer";
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
+  "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "exhaustive" = doDistribute super."exhaustive_1_1_1";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
@@ -2965,6 +2969,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -3016,6 +3021,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "free" = doDistribute super."free_4_12_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
   "free-game" = dontDistribute super."free-game";
@@ -3141,6 +3147,7 @@ self: super: {
   "geniconvert" = dontDistribute super."geniconvert";
   "genifunctors" = dontDistribute super."genifunctors";
   "geniplate" = dontDistribute super."geniplate";
+  "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_1";
   "geniserver" = dontDistribute super."geniserver";
   "genprog" = dontDistribute super."genprog";
   "gentlemark" = dontDistribute super."gentlemark";
@@ -3676,6 +3683,7 @@ self: super: {
   "hascat-setup" = dontDistribute super."hascat-setup";
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
+  "hashable" = doDistribute super."hashable_1_2_3_3";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -3812,6 +3820,7 @@ self: super: {
   "haxl-amazonka" = dontDistribute super."haxl-amazonka";
   "haxl-facebook" = dontDistribute super."haxl-facebook";
   "haxparse" = dontDistribute super."haxparse";
+  "haxr" = doDistribute super."haxr_3000_11_1_2";
   "haxr-th" = dontDistribute super."haxr-th";
   "haxy" = dontDistribute super."haxy";
   "hayland" = dontDistribute super."hayland";
@@ -7345,6 +7354,7 @@ self: super: {
   "terminfo" = doDistribute super."terminfo_0_4_0_1";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
index b3aa1cf0e460..d80c005eb5d3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
@@ -2090,6 +2090,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -2369,6 +2370,7 @@ self: super: {
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
   "dbmigrations" = dontDistribute super."dbmigrations";
+  "dbus" = doDistribute super."dbus_0_10_11";
   "dbus-client" = dontDistribute super."dbus-client";
   "dbus-core" = dontDistribute super."dbus-core";
   "dbus-qq" = dontDistribute super."dbus-qq";
@@ -2762,6 +2764,7 @@ self: super: {
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
   "ert" = dontDistribute super."ert";
   "esotericbot" = dontDistribute super."esotericbot";
+  "esqueleto" = doDistribute super."esqueleto_2_4_1";
   "ess" = dontDistribute super."ess";
   "estimator" = dontDistribute super."estimator";
   "estimators" = dontDistribute super."estimators";
@@ -2792,6 +2795,7 @@ self: super: {
   "exception-mailer" = dontDistribute super."exception-mailer";
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
+  "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
   "exinst" = dontDistribute super."exinst";
@@ -2962,6 +2966,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -3013,6 +3018,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "free" = doDistribute super."free_4_12_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
   "free-game" = dontDistribute super."free-game";
@@ -3138,6 +3144,7 @@ self: super: {
   "geniconvert" = dontDistribute super."geniconvert";
   "genifunctors" = dontDistribute super."genifunctors";
   "geniplate" = dontDistribute super."geniplate";
+  "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_1";
   "geniserver" = dontDistribute super."geniserver";
   "genprog" = dontDistribute super."genprog";
   "gentlemark" = dontDistribute super."gentlemark";
@@ -3672,6 +3679,7 @@ self: super: {
   "hascat-setup" = dontDistribute super."hascat-setup";
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
+  "hashable" = doDistribute super."hashable_1_2_3_3";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -3808,6 +3816,7 @@ self: super: {
   "haxl-amazonka" = dontDistribute super."haxl-amazonka";
   "haxl-facebook" = dontDistribute super."haxl-facebook";
   "haxparse" = dontDistribute super."haxparse";
+  "haxr" = doDistribute super."haxr_3000_11_1_2";
   "haxr-th" = dontDistribute super."haxr-th";
   "haxy" = dontDistribute super."haxy";
   "hayland" = dontDistribute super."hayland";
@@ -7338,6 +7347,7 @@ self: super: {
   "terminfo" = doDistribute super."terminfo_0_4_0_1";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
index 0c223f02eff9..e0f180cdc612 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
@@ -2085,6 +2085,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -2364,6 +2365,7 @@ self: super: {
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
   "dbmigrations" = dontDistribute super."dbmigrations";
+  "dbus" = doDistribute super."dbus_0_10_11";
   "dbus-client" = dontDistribute super."dbus-client";
   "dbus-core" = dontDistribute super."dbus-core";
   "dbus-qq" = dontDistribute super."dbus-qq";
@@ -2757,6 +2759,7 @@ self: super: {
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
   "ert" = dontDistribute super."ert";
   "esotericbot" = dontDistribute super."esotericbot";
+  "esqueleto" = doDistribute super."esqueleto_2_4_1";
   "ess" = dontDistribute super."ess";
   "estimator" = dontDistribute super."estimator";
   "estimators" = dontDistribute super."estimators";
@@ -2787,6 +2790,7 @@ self: super: {
   "exception-mailer" = dontDistribute super."exception-mailer";
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
+  "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
   "exinst" = dontDistribute super."exinst";
@@ -2957,6 +2961,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -3008,6 +3013,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "free" = doDistribute super."free_4_12_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
   "free-game" = dontDistribute super."free-game";
@@ -3133,6 +3139,7 @@ self: super: {
   "geniconvert" = dontDistribute super."geniconvert";
   "genifunctors" = dontDistribute super."genifunctors";
   "geniplate" = dontDistribute super."geniplate";
+  "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_1";
   "geniserver" = dontDistribute super."geniserver";
   "genprog" = dontDistribute super."genprog";
   "gentlemark" = dontDistribute super."gentlemark";
@@ -3666,6 +3673,7 @@ self: super: {
   "hascat-setup" = dontDistribute super."hascat-setup";
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
+  "hashable" = doDistribute super."hashable_1_2_3_3";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -3802,6 +3810,7 @@ self: super: {
   "haxl-amazonka" = dontDistribute super."haxl-amazonka";
   "haxl-facebook" = dontDistribute super."haxl-facebook";
   "haxparse" = dontDistribute super."haxparse";
+  "haxr" = doDistribute super."haxr_3000_11_1_2";
   "haxr-th" = dontDistribute super."haxr-th";
   "haxy" = dontDistribute super."haxy";
   "hayland" = dontDistribute super."hayland";
@@ -7330,6 +7339,7 @@ self: super: {
   "terminfo" = doDistribute super."terminfo_0_4_0_1";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
index 44da0e3ef9dc..f77465dd8e89 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
@@ -2085,6 +2085,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -2364,6 +2365,7 @@ self: super: {
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
   "dbmigrations" = dontDistribute super."dbmigrations";
+  "dbus" = doDistribute super."dbus_0_10_11";
   "dbus-client" = dontDistribute super."dbus-client";
   "dbus-core" = dontDistribute super."dbus-core";
   "dbus-qq" = dontDistribute super."dbus-qq";
@@ -2757,6 +2759,7 @@ self: super: {
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
   "ert" = dontDistribute super."ert";
   "esotericbot" = dontDistribute super."esotericbot";
+  "esqueleto" = doDistribute super."esqueleto_2_4_1";
   "ess" = dontDistribute super."ess";
   "estimator" = dontDistribute super."estimator";
   "estimators" = dontDistribute super."estimators";
@@ -2787,6 +2790,7 @@ self: super: {
   "exception-mailer" = dontDistribute super."exception-mailer";
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
+  "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
   "exinst" = dontDistribute super."exinst";
@@ -2957,6 +2961,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -3008,6 +3013,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "free" = doDistribute super."free_4_12_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
   "free-game" = dontDistribute super."free-game";
@@ -3133,6 +3139,7 @@ self: super: {
   "geniconvert" = dontDistribute super."geniconvert";
   "genifunctors" = dontDistribute super."genifunctors";
   "geniplate" = dontDistribute super."geniplate";
+  "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_1";
   "geniserver" = dontDistribute super."geniserver";
   "genprog" = dontDistribute super."genprog";
   "gentlemark" = dontDistribute super."gentlemark";
@@ -3666,6 +3673,7 @@ self: super: {
   "hascat-setup" = dontDistribute super."hascat-setup";
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
+  "hashable" = doDistribute super."hashable_1_2_3_3";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -3802,6 +3810,7 @@ self: super: {
   "haxl-amazonka" = dontDistribute super."haxl-amazonka";
   "haxl-facebook" = dontDistribute super."haxl-facebook";
   "haxparse" = dontDistribute super."haxparse";
+  "haxr" = doDistribute super."haxr_3000_11_1_2";
   "haxr-th" = dontDistribute super."haxr-th";
   "haxy" = dontDistribute super."haxy";
   "hayland" = dontDistribute super."hayland";
@@ -7326,6 +7335,7 @@ self: super: {
   "terminfo" = doDistribute super."terminfo_0_4_0_1";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.14.nix b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
index 9cdaa25b1136..c825eb20d7ce 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
@@ -2082,6 +2082,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -2360,6 +2361,7 @@ self: super: {
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
   "dbmigrations" = dontDistribute super."dbmigrations";
+  "dbus" = doDistribute super."dbus_0_10_11";
   "dbus-client" = dontDistribute super."dbus-client";
   "dbus-core" = dontDistribute super."dbus-core";
   "dbus-qq" = dontDistribute super."dbus-qq";
@@ -2450,6 +2452,7 @@ self: super: {
   "dia-functions" = dontDistribute super."dia-functions";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_0";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
+  "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-gtk" = dontDistribute super."diagrams-gtk";
   "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_7";
@@ -2749,6 +2752,7 @@ self: super: {
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
   "ert" = dontDistribute super."ert";
   "esotericbot" = dontDistribute super."esotericbot";
+  "esqueleto" = doDistribute super."esqueleto_2_4_1";
   "ess" = dontDistribute super."ess";
   "estimator" = dontDistribute super."estimator";
   "estimators" = dontDistribute super."estimators";
@@ -2779,6 +2783,7 @@ self: super: {
   "exception-mailer" = dontDistribute super."exception-mailer";
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
+  "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
   "exinst" = dontDistribute super."exinst";
@@ -2949,6 +2954,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -3000,6 +3006,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "free" = doDistribute super."free_4_12_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
   "free-game" = dontDistribute super."free-game";
@@ -3125,6 +3132,7 @@ self: super: {
   "geniconvert" = dontDistribute super."geniconvert";
   "genifunctors" = dontDistribute super."genifunctors";
   "geniplate" = dontDistribute super."geniplate";
+  "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_1";
   "geniserver" = dontDistribute super."geniserver";
   "genprog" = dontDistribute super."genprog";
   "gentlemark" = dontDistribute super."gentlemark";
@@ -3658,6 +3666,7 @@ self: super: {
   "hascat-setup" = dontDistribute super."hascat-setup";
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
+  "hashable" = doDistribute super."hashable_1_2_3_3";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -3794,6 +3803,7 @@ self: super: {
   "haxl-amazonka" = dontDistribute super."haxl-amazonka";
   "haxl-facebook" = dontDistribute super."haxl-facebook";
   "haxparse" = dontDistribute super."haxparse";
+  "haxr" = doDistribute super."haxr_3000_11_1_2";
   "haxr-th" = dontDistribute super."haxr-th";
   "haxy" = dontDistribute super."haxy";
   "hayland" = dontDistribute super."hayland";
@@ -7313,6 +7323,7 @@ self: super: {
   "terminfo" = doDistribute super."terminfo_0_4_0_1";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.15.nix b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
index 39e1b11b94a5..196ce6307915 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
@@ -2081,6 +2081,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -2359,6 +2360,7 @@ self: super: {
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
   "dbmigrations" = dontDistribute super."dbmigrations";
+  "dbus" = doDistribute super."dbus_0_10_11";
   "dbus-client" = dontDistribute super."dbus-client";
   "dbus-core" = dontDistribute super."dbus-core";
   "dbus-qq" = dontDistribute super."dbus-qq";
@@ -2449,6 +2451,7 @@ self: super: {
   "dia-functions" = dontDistribute super."dia-functions";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_0";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
+  "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-gtk" = dontDistribute super."diagrams-gtk";
   "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_7";
@@ -2748,6 +2751,7 @@ self: super: {
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
   "ert" = dontDistribute super."ert";
   "esotericbot" = dontDistribute super."esotericbot";
+  "esqueleto" = doDistribute super."esqueleto_2_4_1";
   "ess" = dontDistribute super."ess";
   "estimator" = dontDistribute super."estimator";
   "estimators" = dontDistribute super."estimators";
@@ -2778,6 +2782,7 @@ self: super: {
   "exception-mailer" = dontDistribute super."exception-mailer";
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
+  "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
   "exinst" = dontDistribute super."exinst";
@@ -2948,6 +2953,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -2999,6 +3005,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "free" = doDistribute super."free_4_12_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
   "free-game" = dontDistribute super."free-game";
@@ -3123,6 +3130,7 @@ self: super: {
   "geniconvert" = dontDistribute super."geniconvert";
   "genifunctors" = dontDistribute super."genifunctors";
   "geniplate" = dontDistribute super."geniplate";
+  "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_1";
   "geniserver" = dontDistribute super."geniserver";
   "genprog" = dontDistribute super."genprog";
   "gentlemark" = dontDistribute super."gentlemark";
@@ -3656,6 +3664,7 @@ self: super: {
   "hascat-setup" = dontDistribute super."hascat-setup";
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
+  "hashable" = doDistribute super."hashable_1_2_3_3";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -3791,6 +3800,7 @@ self: super: {
   "haxl-amazonka" = dontDistribute super."haxl-amazonka";
   "haxl-facebook" = dontDistribute super."haxl-facebook";
   "haxparse" = dontDistribute super."haxparse";
+  "haxr" = doDistribute super."haxr_3000_11_1_2";
   "haxr-th" = dontDistribute super."haxr-th";
   "haxy" = dontDistribute super."haxy";
   "hayland" = dontDistribute super."hayland";
@@ -7305,6 +7315,7 @@ self: super: {
   "terminfo" = doDistribute super."terminfo_0_4_0_1";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.16.nix b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
index 374c3e230a6b..61f0822da0d9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
@@ -2079,6 +2079,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -2357,6 +2358,7 @@ self: super: {
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
   "dbmigrations" = dontDistribute super."dbmigrations";
+  "dbus" = doDistribute super."dbus_0_10_11";
   "dbus-client" = dontDistribute super."dbus-client";
   "dbus-core" = dontDistribute super."dbus-core";
   "dbus-qq" = dontDistribute super."dbus-qq";
@@ -2447,6 +2449,7 @@ self: super: {
   "dia-functions" = dontDistribute super."dia-functions";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_0";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
+  "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-gtk" = dontDistribute super."diagrams-gtk";
   "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_7";
@@ -2746,6 +2749,7 @@ self: super: {
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
   "ert" = dontDistribute super."ert";
   "esotericbot" = dontDistribute super."esotericbot";
+  "esqueleto" = doDistribute super."esqueleto_2_4_1";
   "ess" = dontDistribute super."ess";
   "estimator" = dontDistribute super."estimator";
   "estimators" = dontDistribute super."estimators";
@@ -2775,6 +2779,7 @@ self: super: {
   "exception-mailer" = dontDistribute super."exception-mailer";
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
+  "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
   "exinst" = dontDistribute super."exinst";
@@ -2945,6 +2950,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -2996,6 +3002,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "free" = doDistribute super."free_4_12_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
   "free-game" = dontDistribute super."free-game";
@@ -3120,6 +3127,7 @@ self: super: {
   "geniconvert" = dontDistribute super."geniconvert";
   "genifunctors" = dontDistribute super."genifunctors";
   "geniplate" = dontDistribute super."geniplate";
+  "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_1";
   "geniserver" = dontDistribute super."geniserver";
   "genprog" = dontDistribute super."genprog";
   "gentlemark" = dontDistribute super."gentlemark";
@@ -3652,6 +3660,7 @@ self: super: {
   "hascat-setup" = dontDistribute super."hascat-setup";
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
+  "hashable" = doDistribute super."hashable_1_2_3_3";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -3787,6 +3796,7 @@ self: super: {
   "haxl-amazonka" = dontDistribute super."haxl-amazonka";
   "haxl-facebook" = dontDistribute super."haxl-facebook";
   "haxparse" = dontDistribute super."haxparse";
+  "haxr" = doDistribute super."haxr_3000_11_1_2";
   "haxr-th" = dontDistribute super."haxr-th";
   "haxy" = dontDistribute super."haxy";
   "hayland" = dontDistribute super."hayland";
@@ -7292,6 +7302,7 @@ self: super: {
   "terminfo" = doDistribute super."terminfo_0_4_0_1";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.17.nix b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
index cfee3d514145..2fe2d0755b03 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
@@ -2074,6 +2074,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -2352,6 +2353,7 @@ self: super: {
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
   "dbmigrations" = dontDistribute super."dbmigrations";
+  "dbus" = doDistribute super."dbus_0_10_11";
   "dbus-client" = dontDistribute super."dbus-client";
   "dbus-core" = dontDistribute super."dbus-core";
   "dbus-qq" = dontDistribute super."dbus-qq";
@@ -2441,6 +2443,7 @@ self: super: {
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
+  "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-gtk" = dontDistribute super."diagrams-gtk";
   "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_7";
@@ -2740,6 +2743,7 @@ self: super: {
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
   "ert" = dontDistribute super."ert";
   "esotericbot" = dontDistribute super."esotericbot";
+  "esqueleto" = doDistribute super."esqueleto_2_4_1";
   "ess" = dontDistribute super."ess";
   "estimator" = dontDistribute super."estimator";
   "estimators" = dontDistribute super."estimators";
@@ -2769,6 +2773,7 @@ self: super: {
   "exception-mailer" = dontDistribute super."exception-mailer";
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
+  "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
   "exinst" = dontDistribute super."exinst";
@@ -2939,6 +2944,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -2990,6 +2996,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "free" = doDistribute super."free_4_12_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
   "free-game" = dontDistribute super."free-game";
@@ -3114,6 +3121,7 @@ self: super: {
   "geniconvert" = dontDistribute super."geniconvert";
   "genifunctors" = dontDistribute super."genifunctors";
   "geniplate" = dontDistribute super."geniplate";
+  "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_1";
   "geniserver" = dontDistribute super."geniserver";
   "genprog" = dontDistribute super."genprog";
   "gentlemark" = dontDistribute super."gentlemark";
@@ -3645,6 +3653,7 @@ self: super: {
   "hascat-setup" = dontDistribute super."hascat-setup";
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
+  "hashable" = doDistribute super."hashable_1_2_3_3";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -3780,6 +3789,7 @@ self: super: {
   "haxl-amazonka" = dontDistribute super."haxl-amazonka";
   "haxl-facebook" = dontDistribute super."haxl-facebook";
   "haxparse" = dontDistribute super."haxparse";
+  "haxr" = doDistribute super."haxr_3000_11_1_2";
   "haxr-th" = dontDistribute super."haxr-th";
   "haxy" = dontDistribute super."haxy";
   "hayland" = dontDistribute super."hayland";
@@ -7279,6 +7289,7 @@ self: super: {
   "terminfo" = doDistribute super."terminfo_0_4_0_1";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.18.nix b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
index 35e952623abf..478bbdcfa283 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
@@ -2073,6 +2073,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -2351,6 +2352,7 @@ self: super: {
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
   "dbmigrations" = dontDistribute super."dbmigrations";
+  "dbus" = doDistribute super."dbus_0_10_11";
   "dbus-client" = dontDistribute super."dbus-client";
   "dbus-core" = dontDistribute super."dbus-core";
   "dbus-qq" = dontDistribute super."dbus-qq";
@@ -2440,6 +2442,7 @@ self: super: {
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
+  "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-gtk" = dontDistribute super."diagrams-gtk";
   "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_7";
@@ -2739,6 +2742,7 @@ self: super: {
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
   "ert" = dontDistribute super."ert";
   "esotericbot" = dontDistribute super."esotericbot";
+  "esqueleto" = doDistribute super."esqueleto_2_4_1";
   "ess" = dontDistribute super."ess";
   "estimator" = dontDistribute super."estimator";
   "estimators" = dontDistribute super."estimators";
@@ -2768,6 +2772,7 @@ self: super: {
   "exception-mailer" = dontDistribute super."exception-mailer";
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
+  "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
   "exinst" = dontDistribute super."exinst";
@@ -2938,6 +2943,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -2989,6 +2995,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "free" = doDistribute super."free_4_12_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
   "free-game" = dontDistribute super."free-game";
@@ -3113,6 +3120,7 @@ self: super: {
   "geniconvert" = dontDistribute super."geniconvert";
   "genifunctors" = dontDistribute super."genifunctors";
   "geniplate" = dontDistribute super."geniplate";
+  "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_1";
   "geniserver" = dontDistribute super."geniserver";
   "genprog" = dontDistribute super."genprog";
   "gentlemark" = dontDistribute super."gentlemark";
@@ -3640,6 +3648,7 @@ self: super: {
   "hascat-setup" = dontDistribute super."hascat-setup";
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
+  "hashable" = doDistribute super."hashable_1_2_3_3";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -3774,6 +3783,7 @@ self: super: {
   "haxl-amazonka" = dontDistribute super."haxl-amazonka";
   "haxl-facebook" = dontDistribute super."haxl-facebook";
   "haxparse" = dontDistribute super."haxparse";
+  "haxr" = doDistribute super."haxr_3000_11_1_2";
   "haxr-th" = dontDistribute super."haxr-th";
   "haxy" = dontDistribute super."haxy";
   "hayland" = dontDistribute super."hayland";
@@ -7265,6 +7275,7 @@ self: super: {
   "terminfo" = doDistribute super."terminfo_0_4_0_1";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.19.nix b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
index c8c1f4991779..2aee00860bc5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
@@ -2066,6 +2066,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -2344,6 +2345,7 @@ self: super: {
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
   "dbmigrations" = dontDistribute super."dbmigrations";
+  "dbus" = doDistribute super."dbus_0_10_11";
   "dbus-client" = dontDistribute super."dbus-client";
   "dbus-core" = dontDistribute super."dbus-core";
   "dbus-qq" = dontDistribute super."dbus-qq";
@@ -2433,6 +2435,7 @@ self: super: {
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
+  "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-gtk" = dontDistribute super."diagrams-gtk";
   "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_7";
@@ -2732,6 +2735,7 @@ self: super: {
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
   "ert" = dontDistribute super."ert";
   "esotericbot" = dontDistribute super."esotericbot";
+  "esqueleto" = doDistribute super."esqueleto_2_4_1";
   "ess" = dontDistribute super."ess";
   "estimator" = dontDistribute super."estimator";
   "estimators" = dontDistribute super."estimators";
@@ -2761,6 +2765,7 @@ self: super: {
   "exception-mailer" = dontDistribute super."exception-mailer";
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
+  "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
   "exinst" = dontDistribute super."exinst";
@@ -2931,6 +2936,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -2982,6 +2988,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "free" = doDistribute super."free_4_12_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
   "free-game" = dontDistribute super."free-game";
@@ -3106,6 +3113,7 @@ self: super: {
   "geniconvert" = dontDistribute super."geniconvert";
   "genifunctors" = dontDistribute super."genifunctors";
   "geniplate" = dontDistribute super."geniplate";
+  "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_1";
   "geniserver" = dontDistribute super."geniserver";
   "genprog" = dontDistribute super."genprog";
   "gentlemark" = dontDistribute super."gentlemark";
@@ -3633,6 +3641,7 @@ self: super: {
   "hascat-setup" = dontDistribute super."hascat-setup";
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
+  "hashable" = doDistribute super."hashable_1_2_3_3";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -3767,6 +3776,7 @@ self: super: {
   "haxl-amazonka" = dontDistribute super."haxl-amazonka";
   "haxl-facebook" = dontDistribute super."haxl-facebook";
   "haxparse" = dontDistribute super."haxparse";
+  "haxr" = doDistribute super."haxr_3000_11_1_2";
   "haxr-th" = dontDistribute super."haxr-th";
   "haxy" = dontDistribute super."haxy";
   "hayland" = dontDistribute super."hayland";
@@ -7248,6 +7258,7 @@ self: super: {
   "terminfo" = doDistribute super."terminfo_0_4_0_2";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
index e99e8bf87210..27ea82620b70 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
@@ -2112,6 +2112,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -2798,6 +2799,7 @@ self: super: {
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
   "ert" = dontDistribute super."ert";
   "esotericbot" = dontDistribute super."esotericbot";
+  "esqueleto" = doDistribute super."esqueleto_2_4_1";
   "ess" = dontDistribute super."ess";
   "estimator" = dontDistribute super."estimator";
   "estimators" = dontDistribute super."estimators";
@@ -2830,6 +2832,7 @@ self: super: {
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
   "exception-transformers" = doDistribute super."exception-transformers_0_4_0_1";
+  "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "exhaustive" = doDistribute super."exhaustive_1_1_1";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
@@ -3005,6 +3008,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -3058,6 +3062,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "free" = doDistribute super."free_4_12_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
   "free-game" = dontDistribute super."free-game";
@@ -3183,6 +3188,7 @@ self: super: {
   "geniconvert" = dontDistribute super."geniconvert";
   "genifunctors" = dontDistribute super."genifunctors";
   "geniplate" = dontDistribute super."geniplate";
+  "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_1";
   "geniserver" = dontDistribute super."geniserver";
   "genprog" = dontDistribute super."genprog";
   "gentlemark" = dontDistribute super."gentlemark";
@@ -3721,6 +3727,7 @@ self: super: {
   "hascat-setup" = dontDistribute super."hascat-setup";
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
+  "hashable" = doDistribute super."hashable_1_2_3_3";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -7439,6 +7446,7 @@ self: super: {
   "terminfo" = doDistribute super."terminfo_0_4_0_1";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.20.nix b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
index ed5c831a255f..b310053158ea 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
@@ -2061,6 +2061,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -2339,6 +2340,7 @@ self: super: {
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
   "dbmigrations" = dontDistribute super."dbmigrations";
+  "dbus" = doDistribute super."dbus_0_10_11";
   "dbus-client" = dontDistribute super."dbus-client";
   "dbus-core" = dontDistribute super."dbus-core";
   "dbus-qq" = dontDistribute super."dbus-qq";
@@ -2428,6 +2430,7 @@ self: super: {
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
+  "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-gtk" = dontDistribute super."diagrams-gtk";
   "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_7";
@@ -2727,6 +2730,7 @@ self: super: {
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
   "ert" = dontDistribute super."ert";
   "esotericbot" = dontDistribute super."esotericbot";
+  "esqueleto" = doDistribute super."esqueleto_2_4_1";
   "ess" = dontDistribute super."ess";
   "estimator" = dontDistribute super."estimator";
   "estimators" = dontDistribute super."estimators";
@@ -2756,6 +2760,7 @@ self: super: {
   "exception-mailer" = dontDistribute super."exception-mailer";
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
+  "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
   "exinst" = dontDistribute super."exinst";
@@ -2926,6 +2931,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -2977,6 +2983,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "free" = doDistribute super."free_4_12_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
   "free-game" = dontDistribute super."free-game";
@@ -3101,6 +3108,7 @@ self: super: {
   "geniconvert" = dontDistribute super."geniconvert";
   "genifunctors" = dontDistribute super."genifunctors";
   "geniplate" = dontDistribute super."geniplate";
+  "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_1";
   "geniserver" = dontDistribute super."geniserver";
   "genprog" = dontDistribute super."genprog";
   "gentlemark" = dontDistribute super."gentlemark";
@@ -3628,6 +3636,7 @@ self: super: {
   "hascat-setup" = dontDistribute super."hascat-setup";
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
+  "hashable" = doDistribute super."hashable_1_2_3_3";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -3762,6 +3771,7 @@ self: super: {
   "haxl-amazonka" = dontDistribute super."haxl-amazonka";
   "haxl-facebook" = dontDistribute super."haxl-facebook";
   "haxparse" = dontDistribute super."haxparse";
+  "haxr" = doDistribute super."haxr_3000_11_1_2";
   "haxr-th" = dontDistribute super."haxr-th";
   "haxy" = dontDistribute super."haxy";
   "hayland" = dontDistribute super."hayland";
@@ -7238,6 +7248,7 @@ self: super: {
   "terminfo" = doDistribute super."terminfo_0_4_0_2";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.21.nix b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
index 9f73ebed7945..24b1a57b29b7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
@@ -2056,6 +2056,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -2334,6 +2335,7 @@ self: super: {
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
   "dbmigrations" = dontDistribute super."dbmigrations";
+  "dbus" = doDistribute super."dbus_0_10_11";
   "dbus-client" = dontDistribute super."dbus-client";
   "dbus-core" = dontDistribute super."dbus-core";
   "dbus-qq" = dontDistribute super."dbus-qq";
@@ -2423,6 +2425,7 @@ self: super: {
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
+  "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-gtk" = dontDistribute super."diagrams-gtk";
   "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_7";
@@ -2722,6 +2725,7 @@ self: super: {
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
   "ert" = dontDistribute super."ert";
   "esotericbot" = dontDistribute super."esotericbot";
+  "esqueleto" = doDistribute super."esqueleto_2_4_1";
   "ess" = dontDistribute super."ess";
   "estimator" = dontDistribute super."estimator";
   "estimators" = dontDistribute super."estimators";
@@ -2751,6 +2755,7 @@ self: super: {
   "exception-mailer" = dontDistribute super."exception-mailer";
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
+  "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
   "exinst" = dontDistribute super."exinst";
@@ -2919,6 +2924,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -2970,6 +2976,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "free" = doDistribute super."free_4_12_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
   "free-game" = dontDistribute super."free-game";
@@ -3094,6 +3101,7 @@ self: super: {
   "geniconvert" = dontDistribute super."geniconvert";
   "genifunctors" = dontDistribute super."genifunctors";
   "geniplate" = dontDistribute super."geniplate";
+  "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_1";
   "geniserver" = dontDistribute super."geniserver";
   "genprog" = dontDistribute super."genprog";
   "gentlemark" = dontDistribute super."gentlemark";
@@ -3620,6 +3628,7 @@ self: super: {
   "hascat-setup" = dontDistribute super."hascat-setup";
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
+  "hashable" = doDistribute super."hashable_1_2_3_3";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -3754,6 +3763,7 @@ self: super: {
   "haxl-amazonka" = dontDistribute super."haxl-amazonka";
   "haxl-facebook" = dontDistribute super."haxl-facebook";
   "haxparse" = dontDistribute super."haxparse";
+  "haxr" = doDistribute super."haxr_3000_11_1_2";
   "haxr-th" = dontDistribute super."haxr-th";
   "haxy" = dontDistribute super."haxy";
   "hayland" = dontDistribute super."hayland";
@@ -7213,6 +7223,7 @@ self: super: {
   "terminfo" = doDistribute super."terminfo_0_4_0_2";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.22.nix b/pkgs/development/haskell-modules/configuration-lts-3.22.nix
index 17e32e951cb7..43b306a20fe9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.22.nix
@@ -2056,6 +2056,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -2334,6 +2335,7 @@ self: super: {
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
   "dbmigrations" = dontDistribute super."dbmigrations";
+  "dbus" = doDistribute super."dbus_0_10_11";
   "dbus-client" = dontDistribute super."dbus-client";
   "dbus-core" = dontDistribute super."dbus-core";
   "dbus-qq" = dontDistribute super."dbus-qq";
@@ -2423,6 +2425,7 @@ self: super: {
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
+  "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-gtk" = dontDistribute super."diagrams-gtk";
   "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_7";
@@ -2722,6 +2725,7 @@ self: super: {
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
   "ert" = dontDistribute super."ert";
   "esotericbot" = dontDistribute super."esotericbot";
+  "esqueleto" = doDistribute super."esqueleto_2_4_1";
   "ess" = dontDistribute super."ess";
   "estimator" = dontDistribute super."estimator";
   "estimators" = dontDistribute super."estimators";
@@ -2751,6 +2755,7 @@ self: super: {
   "exception-mailer" = dontDistribute super."exception-mailer";
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
+  "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
   "exinst" = dontDistribute super."exinst";
@@ -2917,6 +2922,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -2968,6 +2974,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "free" = doDistribute super."free_4_12_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
   "free-game" = dontDistribute super."free-game";
@@ -3092,6 +3099,7 @@ self: super: {
   "geniconvert" = dontDistribute super."geniconvert";
   "genifunctors" = dontDistribute super."genifunctors";
   "geniplate" = dontDistribute super."geniplate";
+  "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_1";
   "geniserver" = dontDistribute super."geniserver";
   "genprog" = dontDistribute super."genprog";
   "gentlemark" = dontDistribute super."gentlemark";
@@ -3618,6 +3626,7 @@ self: super: {
   "hascat-setup" = dontDistribute super."hascat-setup";
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
+  "hashable" = doDistribute super."hashable_1_2_3_3";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -3752,6 +3761,7 @@ self: super: {
   "haxl-amazonka" = dontDistribute super."haxl-amazonka";
   "haxl-facebook" = dontDistribute super."haxl-facebook";
   "haxparse" = dontDistribute super."haxparse";
+  "haxr" = doDistribute super."haxr_3000_11_1_2";
   "haxr-th" = dontDistribute super."haxr-th";
   "haxy" = dontDistribute super."haxy";
   "hayland" = dontDistribute super."hayland";
@@ -7207,6 +7217,7 @@ self: super: {
   "terminfo" = doDistribute super."terminfo_0_4_0_2";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
index e894305643bc..285564af2495 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
@@ -2110,6 +2110,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -2794,6 +2795,7 @@ self: super: {
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
   "ert" = dontDistribute super."ert";
   "esotericbot" = dontDistribute super."esotericbot";
+  "esqueleto" = doDistribute super."esqueleto_2_4_1";
   "ess" = dontDistribute super."ess";
   "estimator" = dontDistribute super."estimator";
   "estimators" = dontDistribute super."estimators";
@@ -2826,6 +2828,7 @@ self: super: {
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
   "exception-transformers" = doDistribute super."exception-transformers_0_4_0_1";
+  "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "exhaustive" = doDistribute super."exhaustive_1_1_1";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
@@ -3000,6 +3003,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -3053,6 +3057,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "free" = doDistribute super."free_4_12_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
   "free-game" = dontDistribute super."free-game";
@@ -3178,6 +3183,7 @@ self: super: {
   "geniconvert" = dontDistribute super."geniconvert";
   "genifunctors" = dontDistribute super."genifunctors";
   "geniplate" = dontDistribute super."geniplate";
+  "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_1";
   "geniserver" = dontDistribute super."geniserver";
   "genprog" = dontDistribute super."genprog";
   "gentlemark" = dontDistribute super."gentlemark";
@@ -3716,6 +3722,7 @@ self: super: {
   "hascat-setup" = dontDistribute super."hascat-setup";
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
+  "hashable" = doDistribute super."hashable_1_2_3_3";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -7429,6 +7436,7 @@ self: super: {
   "terminfo" = doDistribute super."terminfo_0_4_0_1";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
index 1f8befa75247..eccead0048d6 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
@@ -2109,6 +2109,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -2793,6 +2794,7 @@ self: super: {
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
   "ert" = dontDistribute super."ert";
   "esotericbot" = dontDistribute super."esotericbot";
+  "esqueleto" = doDistribute super."esqueleto_2_4_1";
   "ess" = dontDistribute super."ess";
   "estimator" = dontDistribute super."estimator";
   "estimators" = dontDistribute super."estimators";
@@ -2825,6 +2827,7 @@ self: super: {
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
   "exception-transformers" = doDistribute super."exception-transformers_0_4_0_1";
+  "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "exhaustive" = doDistribute super."exhaustive_1_1_1";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
@@ -2999,6 +3002,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -3052,6 +3056,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "free" = doDistribute super."free_4_12_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
   "free-game" = dontDistribute super."free-game";
@@ -3177,6 +3182,7 @@ self: super: {
   "geniconvert" = dontDistribute super."geniconvert";
   "genifunctors" = dontDistribute super."genifunctors";
   "geniplate" = dontDistribute super."geniplate";
+  "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_1";
   "geniserver" = dontDistribute super."geniserver";
   "genprog" = dontDistribute super."genprog";
   "gentlemark" = dontDistribute super."gentlemark";
@@ -3715,6 +3721,7 @@ self: super: {
   "hascat-setup" = dontDistribute super."hascat-setup";
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
+  "hashable" = doDistribute super."hashable_1_2_3_3";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -7426,6 +7433,7 @@ self: super: {
   "terminfo" = doDistribute super."terminfo_0_4_0_1";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
index b3eb87bc287f..46addfdb0a8a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
@@ -2107,6 +2107,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -2790,6 +2791,7 @@ self: super: {
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
   "ert" = dontDistribute super."ert";
   "esotericbot" = dontDistribute super."esotericbot";
+  "esqueleto" = doDistribute super."esqueleto_2_4_1";
   "ess" = dontDistribute super."ess";
   "estimator" = dontDistribute super."estimator";
   "estimators" = dontDistribute super."estimators";
@@ -2822,6 +2824,7 @@ self: super: {
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
   "exception-transformers" = doDistribute super."exception-transformers_0_4_0_1";
+  "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "exhaustive" = doDistribute super."exhaustive_1_1_1";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
@@ -2994,6 +2997,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -3047,6 +3051,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "free" = doDistribute super."free_4_12_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
   "free-game" = dontDistribute super."free-game";
@@ -3172,6 +3177,7 @@ self: super: {
   "geniconvert" = dontDistribute super."geniconvert";
   "genifunctors" = dontDistribute super."genifunctors";
   "geniplate" = dontDistribute super."geniplate";
+  "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_1";
   "geniserver" = dontDistribute super."geniserver";
   "genprog" = dontDistribute super."genprog";
   "gentlemark" = dontDistribute super."gentlemark";
@@ -3710,6 +3716,7 @@ self: super: {
   "hascat-setup" = dontDistribute super."hascat-setup";
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
+  "hashable" = doDistribute super."hashable_1_2_3_3";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -7409,6 +7416,7 @@ self: super: {
   "terminfo" = doDistribute super."terminfo_0_4_0_1";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
index ea92dcc12866..9e490a7387c7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
@@ -2106,6 +2106,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -2789,6 +2790,7 @@ self: super: {
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
   "ert" = dontDistribute super."ert";
   "esotericbot" = dontDistribute super."esotericbot";
+  "esqueleto" = doDistribute super."esqueleto_2_4_1";
   "ess" = dontDistribute super."ess";
   "estimator" = dontDistribute super."estimator";
   "estimators" = dontDistribute super."estimators";
@@ -2821,6 +2823,7 @@ self: super: {
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
   "exception-transformers" = doDistribute super."exception-transformers_0_4_0_1";
+  "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "exhaustive" = doDistribute super."exhaustive_1_1_1";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
@@ -2993,6 +2996,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -3045,6 +3049,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "free" = doDistribute super."free_4_12_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
   "free-game" = dontDistribute super."free-game";
@@ -3170,6 +3175,7 @@ self: super: {
   "geniconvert" = dontDistribute super."geniconvert";
   "genifunctors" = dontDistribute super."genifunctors";
   "geniplate" = dontDistribute super."geniplate";
+  "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_1";
   "geniserver" = dontDistribute super."geniserver";
   "genprog" = dontDistribute super."genprog";
   "gentlemark" = dontDistribute super."gentlemark";
@@ -3706,6 +3712,7 @@ self: super: {
   "hascat-setup" = dontDistribute super."hascat-setup";
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
+  "hashable" = doDistribute super."hashable_1_2_3_3";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -7399,6 +7406,7 @@ self: super: {
   "terminfo" = doDistribute super."terminfo_0_4_0_1";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
index f397dddbd2c8..4dea3fcf33ac 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
@@ -2103,6 +2103,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -2784,6 +2785,7 @@ self: super: {
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
   "ert" = dontDistribute super."ert";
   "esotericbot" = dontDistribute super."esotericbot";
+  "esqueleto" = doDistribute super."esqueleto_2_4_1";
   "ess" = dontDistribute super."ess";
   "estimator" = dontDistribute super."estimator";
   "estimators" = dontDistribute super."estimators";
@@ -2816,6 +2818,7 @@ self: super: {
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
   "exception-transformers" = doDistribute super."exception-transformers_0_4_0_1";
+  "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "exhaustive" = doDistribute super."exhaustive_1_1_1";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
@@ -2988,6 +2991,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -3039,6 +3043,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "free" = doDistribute super."free_4_12_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
   "free-game" = dontDistribute super."free-game";
@@ -3164,6 +3169,7 @@ self: super: {
   "geniconvert" = dontDistribute super."geniconvert";
   "genifunctors" = dontDistribute super."genifunctors";
   "geniplate" = dontDistribute super."geniplate";
+  "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_1";
   "geniserver" = dontDistribute super."geniserver";
   "genprog" = dontDistribute super."genprog";
   "gentlemark" = dontDistribute super."gentlemark";
@@ -3700,6 +3706,7 @@ self: super: {
   "hascat-setup" = dontDistribute super."hascat-setup";
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
+  "hashable" = doDistribute super."hashable_1_2_3_3";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -3836,6 +3843,7 @@ self: super: {
   "haxl-amazonka" = dontDistribute super."haxl-amazonka";
   "haxl-facebook" = dontDistribute super."haxl-facebook";
   "haxparse" = dontDistribute super."haxparse";
+  "haxr" = doDistribute super."haxr_3000_11_1_2";
   "haxr-th" = dontDistribute super."haxr-th";
   "haxy" = dontDistribute super."haxy";
   "hayland" = dontDistribute super."hayland";
@@ -7382,6 +7390,7 @@ self: super: {
   "terminfo" = doDistribute super."terminfo_0_4_0_1";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
index bd1aa12cd704..150196e22deb 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
@@ -2100,6 +2100,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -2776,6 +2777,7 @@ self: super: {
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
   "ert" = dontDistribute super."ert";
   "esotericbot" = dontDistribute super."esotericbot";
+  "esqueleto" = doDistribute super."esqueleto_2_4_1";
   "ess" = dontDistribute super."ess";
   "estimator" = dontDistribute super."estimator";
   "estimators" = dontDistribute super."estimators";
@@ -2808,6 +2810,7 @@ self: super: {
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
   "exception-transformers" = doDistribute super."exception-transformers_0_4_0_1";
+  "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "exhaustive" = doDistribute super."exhaustive_1_1_1";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
@@ -2980,6 +2983,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -3031,6 +3035,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "free" = doDistribute super."free_4_12_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
   "free-game" = dontDistribute super."free-game";
@@ -3156,6 +3161,7 @@ self: super: {
   "geniconvert" = dontDistribute super."geniconvert";
   "genifunctors" = dontDistribute super."genifunctors";
   "geniplate" = dontDistribute super."geniplate";
+  "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_1";
   "geniserver" = dontDistribute super."geniserver";
   "genprog" = dontDistribute super."genprog";
   "gentlemark" = dontDistribute super."gentlemark";
@@ -3692,6 +3698,7 @@ self: super: {
   "hascat-setup" = dontDistribute super."hascat-setup";
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
+  "hashable" = doDistribute super."hashable_1_2_3_3";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -3828,6 +3835,7 @@ self: super: {
   "haxl-amazonka" = dontDistribute super."haxl-amazonka";
   "haxl-facebook" = dontDistribute super."haxl-facebook";
   "haxparse" = dontDistribute super."haxparse";
+  "haxr" = doDistribute super."haxr_3000_11_1_2";
   "haxr-th" = dontDistribute super."haxr-th";
   "haxy" = dontDistribute super."haxy";
   "hayland" = dontDistribute super."hayland";
@@ -7368,6 +7376,7 @@ self: super: {
   "terminfo" = doDistribute super."terminfo_0_4_0_1";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
index 6f61d0b6c841..6cfc9e6a4dc7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
@@ -2096,6 +2096,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -2375,6 +2376,7 @@ self: super: {
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
   "dbmigrations" = dontDistribute super."dbmigrations";
+  "dbus" = doDistribute super."dbus_0_10_11";
   "dbus-client" = dontDistribute super."dbus-client";
   "dbus-core" = dontDistribute super."dbus-core";
   "dbus-qq" = dontDistribute super."dbus-qq";
@@ -2770,6 +2772,7 @@ self: super: {
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
   "ert" = dontDistribute super."ert";
   "esotericbot" = dontDistribute super."esotericbot";
+  "esqueleto" = doDistribute super."esqueleto_2_4_1";
   "ess" = dontDistribute super."ess";
   "estimator" = dontDistribute super."estimator";
   "estimators" = dontDistribute super."estimators";
@@ -2801,6 +2804,7 @@ self: super: {
   "exception-mailer" = dontDistribute super."exception-mailer";
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
+  "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "exhaustive" = doDistribute super."exhaustive_1_1_1";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
@@ -2972,6 +2976,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -3023,6 +3028,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "free" = doDistribute super."free_4_12_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
   "free-game" = dontDistribute super."free-game";
@@ -3148,6 +3154,7 @@ self: super: {
   "geniconvert" = dontDistribute super."geniconvert";
   "genifunctors" = dontDistribute super."genifunctors";
   "geniplate" = dontDistribute super."geniplate";
+  "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_1";
   "geniserver" = dontDistribute super."geniserver";
   "genprog" = dontDistribute super."genprog";
   "gentlemark" = dontDistribute super."gentlemark";
@@ -3684,6 +3691,7 @@ self: super: {
   "hascat-setup" = dontDistribute super."hascat-setup";
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
+  "hashable" = doDistribute super."hashable_1_2_3_3";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -3820,6 +3828,7 @@ self: super: {
   "haxl-amazonka" = dontDistribute super."haxl-amazonka";
   "haxl-facebook" = dontDistribute super."haxl-facebook";
   "haxparse" = dontDistribute super."haxparse";
+  "haxr" = doDistribute super."haxr_3000_11_1_2";
   "haxr-th" = dontDistribute super."haxr-th";
   "haxy" = dontDistribute super."haxy";
   "hayland" = dontDistribute super."hayland";
@@ -7359,6 +7368,7 @@ self: super: {
   "terminfo" = doDistribute super."terminfo_0_4_0_1";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.0.nix b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
index beeea76f0398..dcc4f2a695c1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
@@ -1541,6 +1541,7 @@ self: super: {
   "breakout" = dontDistribute super."breakout";
   "breve" = dontDistribute super."breve";
   "brians-brain" = dontDistribute super."brians-brain";
+  "brick" = doDistribute super."brick_0_3_1";
   "brillig" = dontDistribute super."brillig";
   "broccoli" = dontDistribute super."broccoli";
   "broker-haskell" = dontDistribute super."broker-haskell";
@@ -1918,6 +1919,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -2186,6 +2188,7 @@ self: super: {
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
+  "dbus" = doDistribute super."dbus_0_10_11";
   "dbus-client" = dontDistribute super."dbus-client";
   "dbus-core" = dontDistribute super."dbus-core";
   "dbus-qq" = dontDistribute super."dbus-qq";
@@ -2269,9 +2272,11 @@ self: super: {
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
+  "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-gtk" = dontDistribute super."diagrams-gtk";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-lib" = doDistribute super."diagrams-lib_1_3_0_8";
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
@@ -2552,6 +2557,7 @@ self: super: {
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
   "ert" = dontDistribute super."ert";
   "esotericbot" = dontDistribute super."esotericbot";
+  "esqueleto" = doDistribute super."esqueleto_2_4_1";
   "ess" = dontDistribute super."ess";
   "estimator" = dontDistribute super."estimator";
   "estimators" = dontDistribute super."estimators";
@@ -2578,6 +2584,7 @@ self: super: {
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
   "exception-mtl" = dontDistribute super."exception-mtl";
+  "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
   "exinst" = dontDistribute super."exinst";
@@ -2635,6 +2642,7 @@ self: super: {
   "fastedit" = dontDistribute super."fastedit";
   "fastirc" = dontDistribute super."fastirc";
   "fault-tree" = dontDistribute super."fault-tree";
+  "fay" = doDistribute super."fay_0_23_1_10";
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
@@ -2739,6 +2747,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -2787,6 +2796,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "free" = doDistribute super."free_4_12_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
   "free-game" = dontDistribute super."free-game";
@@ -2906,6 +2916,7 @@ self: super: {
   "geniconvert" = dontDistribute super."geniconvert";
   "genifunctors" = dontDistribute super."genifunctors";
   "geniplate" = dontDistribute super."geniplate";
+  "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_1";
   "geniserver" = dontDistribute super."geniserver";
   "genprog" = dontDistribute super."genprog";
   "gentlemark" = dontDistribute super."gentlemark";
@@ -2979,6 +2990,7 @@ self: super: {
   "ginsu" = dontDistribute super."ginsu";
   "gist" = dontDistribute super."gist";
   "git-all" = dontDistribute super."git-all";
+  "git-annex" = doDistribute super."git-annex_5_20151218";
   "git-checklist" = dontDistribute super."git-checklist";
   "git-date" = dontDistribute super."git-date";
   "git-embed" = dontDistribute super."git-embed";
@@ -3368,6 +3380,7 @@ self: super: {
   "happs-tutorial" = dontDistribute super."happs-tutorial";
   "happstack" = dontDistribute super."happstack";
   "happstack-auth" = dontDistribute super."happstack-auth";
+  "happstack-authenticate" = doDistribute super."happstack-authenticate_2_3_2";
   "happstack-contrib" = dontDistribute super."happstack-contrib";
   "happstack-data" = dontDistribute super."happstack-data";
   "happstack-dlg" = dontDistribute super."happstack-dlg";
@@ -3408,6 +3421,7 @@ self: super: {
   "hascat-setup" = dontDistribute super."hascat-setup";
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
+  "hashable" = doDistribute super."hashable_1_2_3_3";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
@@ -3538,6 +3552,7 @@ self: super: {
   "haxl-amazonka" = dontDistribute super."haxl-amazonka";
   "haxl-facebook" = dontDistribute super."haxl-facebook";
   "haxparse" = dontDistribute super."haxparse";
+  "haxr" = doDistribute super."haxr_3000_11_1_2";
   "haxr-th" = dontDistribute super."haxr-th";
   "haxy" = dontDistribute super."haxy";
   "hayland" = dontDistribute super."hayland";
@@ -4200,6 +4215,7 @@ self: super: {
   "inilist" = dontDistribute super."inilist";
   "inject" = dontDistribute super."inject";
   "inject-function" = dontDistribute super."inject-function";
+  "inline-c" = doDistribute super."inline-c_0_5_5_1";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
@@ -4492,6 +4508,7 @@ self: super: {
   "language-slice" = dontDistribute super."language-slice";
   "language-spelling" = dontDistribute super."language-spelling";
   "language-sqlite" = dontDistribute super."language-sqlite";
+  "language-thrift" = doDistribute super."language-thrift_0_6_2_0";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
   "lat" = dontDistribute super."lat";
@@ -4730,6 +4747,7 @@ self: super: {
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
   "luka" = dontDistribute super."luka";
+  "luminance" = doDistribute super."luminance_0_9_1";
   "lushtags" = dontDistribute super."lushtags";
   "luthor" = dontDistribute super."luthor";
   "lvish" = dontDistribute super."lvish";
@@ -6114,6 +6132,7 @@ self: super: {
   "satchmo-minisat" = dontDistribute super."satchmo-minisat";
   "satchmo-toysat" = dontDistribute super."satchmo-toysat";
   "sbp" = dontDistribute super."sbp";
+  "sbv" = doDistribute super."sbv_5_9";
   "sbvPlugin" = dontDistribute super."sbvPlugin";
   "sc3-rdu" = dontDistribute super."sc3-rdu";
   "scalable-server" = dontDistribute super."scalable-server";
@@ -6785,6 +6804,7 @@ self: super: {
   "terminfo" = doDistribute super."terminfo_0_4_0_2";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.1.nix b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
index 494b5bf628a7..22c9cb7b2f6b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
@@ -1538,6 +1538,7 @@ self: super: {
   "breakout" = dontDistribute super."breakout";
   "breve" = dontDistribute super."breve";
   "brians-brain" = dontDistribute super."brians-brain";
+  "brick" = doDistribute super."brick_0_3_1";
   "brillig" = dontDistribute super."brillig";
   "broccoli" = dontDistribute super."broccoli";
   "broker-haskell" = dontDistribute super."broker-haskell";
@@ -1915,6 +1916,7 @@ self: super: {
   "configifier" = dontDistribute super."configifier";
   "configuration" = dontDistribute super."configuration";
   "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
   "confsolve" = dontDistribute super."confsolve";
   "congruence-relation" = dontDistribute super."congruence-relation";
   "conjugateGradient" = dontDistribute super."conjugateGradient";
@@ -2183,6 +2185,7 @@ self: super: {
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
+  "dbus" = doDistribute super."dbus_0_10_11";
   "dbus-client" = dontDistribute super."dbus-client";
   "dbus-core" = dontDistribute super."dbus-core";
   "dbus-qq" = dontDistribute super."dbus-qq";
@@ -2266,9 +2269,11 @@ self: super: {
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
+  "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-gtk" = dontDistribute super."diagrams-gtk";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-lib" = doDistribute super."diagrams-lib_1_3_0_8";
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
@@ -2546,6 +2551,7 @@ self: super: {
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
   "ert" = dontDistribute super."ert";
   "esotericbot" = dontDistribute super."esotericbot";
+  "esqueleto" = doDistribute super."esqueleto_2_4_1";
   "ess" = dontDistribute super."ess";
   "estimator" = dontDistribute super."estimator";
   "estimators" = dontDistribute super."estimators";
@@ -2572,6 +2578,7 @@ self: super: {
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
   "exception-mtl" = dontDistribute super."exception-mtl";
+  "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
   "exinst" = dontDistribute super."exinst";
@@ -2628,6 +2635,7 @@ self: super: {
   "fastedit" = dontDistribute super."fastedit";
   "fastirc" = dontDistribute super."fastirc";
   "fault-tree" = dontDistribute super."fault-tree";
+  "fay" = doDistribute super."fay_0_23_1_10";
   "fay-geoposition" = dontDistribute super."fay-geoposition";
   "fay-hsx" = dontDistribute super."fay-hsx";
   "fay-ref" = dontDistribute super."fay-ref";
@@ -2731,6 +2739,7 @@ self: super: {
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
@@ -2779,6 +2788,7 @@ self: super: {
   "frame" = dontDistribute super."frame";
   "frame-markdown" = dontDistribute super."frame-markdown";
   "franchise" = dontDistribute super."franchise";
+  "free" = doDistribute super."free_4_12_1";
   "free-concurrent" = dontDistribute super."free-concurrent";
   "free-functors" = dontDistribute super."free-functors";
   "free-game" = dontDistribute super."free-game";
@@ -2898,6 +2908,7 @@ self: super: {
   "geniconvert" = dontDistribute super."geniconvert";
   "genifunctors" = dontDistribute super."genifunctors";
   "geniplate" = dontDistribute super."geniplate";
+  "geniplate-mirror" = doDistribute super."geniplate-mirror_0_7_1";
   "geniserver" = dontDistribute super."geniserver";
   "genprog" = dontDistribute super."genprog";
   "gentlemark" = dontDistribute super."gentlemark";
@@ -2971,6 +2982,7 @@ self: super: {
   "ginsu" = dontDistribute super."ginsu";
   "gist" = dontDistribute super."gist";
   "git-all" = dontDistribute super."git-all";
+  "git-annex" = doDistribute super."git-annex_5_20151218";
   "git-checklist" = dontDistribute super."git-checklist";
   "git-date" = dontDistribute super."git-date";
   "git-embed" = dontDistribute super."git-embed";
@@ -3360,6 +3372,7 @@ self: super: {
   "happs-tutorial" = dontDistribute super."happs-tutorial";
   "happstack" = dontDistribute super."happstack";
   "happstack-auth" = dontDistribute super."happstack-auth";
+  "happstack-authenticate" = doDistribute super."happstack-authenticate_2_3_2";
   "happstack-contrib" = dontDistribute super."happstack-contrib";
   "happstack-data" = dontDistribute super."happstack-data";
   "happstack-dlg" = dontDistribute super."happstack-dlg";
@@ -3400,6 +3413,7 @@ self: super: {
   "hascat-setup" = dontDistribute super."hascat-setup";
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
+  "hashable" = doDistribute super."hashable_1_2_3_3";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
@@ -3530,6 +3544,7 @@ self: super: {
   "haxl-amazonka" = dontDistribute super."haxl-amazonka";
   "haxl-facebook" = dontDistribute super."haxl-facebook";
   "haxparse" = dontDistribute super."haxparse";
+  "haxr" = doDistribute super."haxr_3000_11_1_2";
   "haxr-th" = dontDistribute super."haxr-th";
   "haxy" = dontDistribute super."haxy";
   "hayland" = dontDistribute super."hayland";
@@ -4187,6 +4202,7 @@ self: super: {
   "inilist" = dontDistribute super."inilist";
   "inject" = dontDistribute super."inject";
   "inject-function" = dontDistribute super."inject-function";
+  "inline-c" = doDistribute super."inline-c_0_5_5_1";
   "inline-c-win32" = dontDistribute super."inline-c-win32";
   "inline-r" = dontDistribute super."inline-r";
   "inquire" = dontDistribute super."inquire";
@@ -4478,6 +4494,7 @@ self: super: {
   "language-slice" = dontDistribute super."language-slice";
   "language-spelling" = dontDistribute super."language-spelling";
   "language-sqlite" = dontDistribute super."language-sqlite";
+  "language-thrift" = doDistribute super."language-thrift_0_6_2_0";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
   "lat" = dontDistribute super."lat";
@@ -4713,6 +4730,7 @@ self: super: {
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
   "luka" = dontDistribute super."luka";
+  "luminance" = doDistribute super."luminance_0_9_1";
   "lushtags" = dontDistribute super."lushtags";
   "luthor" = dontDistribute super."luthor";
   "lvish" = dontDistribute super."lvish";
@@ -6094,6 +6112,7 @@ self: super: {
   "satchmo-minisat" = dontDistribute super."satchmo-minisat";
   "satchmo-toysat" = dontDistribute super."satchmo-toysat";
   "sbp" = dontDistribute super."sbp";
+  "sbv" = doDistribute super."sbv_5_9";
   "sbvPlugin" = dontDistribute super."sbvPlugin";
   "sc3-rdu" = dontDistribute super."sc3-rdu";
   "scalable-server" = dontDistribute super."scalable-server";
@@ -6765,6 +6784,7 @@ self: super: {
   "terminfo" = doDistribute super."terminfo_0_4_0_2";
   "terminfo-hs" = dontDistribute super."terminfo-hs";
   "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
   "terrahs" = dontDistribute super."terrahs";
   "tersmu" = dontDistribute super."tersmu";
   "test-framework-doctest" = dontDistribute super."test-framework-doctest";
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 72a545083449..e24b039d786b 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -776,6 +776,8 @@ self: {
        pname = "Agda";
        version = "2.4.2.5";
        sha256 = "959658a372d93b735d92191b372d221461026c98de4f92e56d198b576dfb67ee";
+       revision = "1";
+       editedCabalFile = "85d09d8a607a351be092c5e168c35b8c303b20765ceb0f01cd34956c44ba7f5a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -7713,8 +7715,8 @@ self: {
     ({ mkDerivation, array, base, X11 }:
      mkDerivation {
        pname = "HGL";
-       version = "3.2.0.5";
-       sha256 = "8b97240ff97d3e5eda09d8ceead6e6d7315e444bdbbfd3b9a260942e5e770d7d";
+       version = "3.2.2";
+       sha256 = "16a355c102ba057b8c9df363bfc65f6cf24a2d3fd9296cae911ab68eef0d762a";
        libraryHaskellDepends = [ array base X11 ];
        description = "A simple graphics library based on X11 or Win32";
        license = stdenv.lib.licenses.bsd3;
@@ -9103,7 +9105,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "HTTP_4000_3_1" = callPackage
+  "HTTP_4000_3_2" = callPackage
     ({ mkDerivation, array, base, bytestring, case-insensitive, conduit
      , conduit-extra, deepseq, http-types, httpd-shed, HUnit, mtl
      , network, network-uri, parsec, pureMD5, split, test-framework
@@ -9111,8 +9113,8 @@ self: {
      }:
      mkDerivation {
        pname = "HTTP";
-       version = "4000.3.1";
-       sha256 = "0223366708cb318767d2dce84a5f923c5fbfe88d7c4c4f30ad7b824d4e98215c";
+       version = "4000.3.2";
+       sha256 = "15ee93db252703f87c114bf848eda04ed0c8e3d7411aeb9dc911201aa4f756ae";
        libraryHaskellDepends = [
          array base bytestring mtl network network-uri parsec time
        ];
@@ -13315,6 +13317,22 @@ self: {
        license = "unknown";
      }) {};
 
+  "MonadRandom_0_4_2_1" = callPackage
+    ({ mkDerivation, base, mtl, random, transformers
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "MonadRandom";
+       version = "0.4.2.1";
+       sha256 = "635871e4f20bb01c6476a0361cc7069b6242d86c87524b0b8b3fad60ebf1fa6d";
+       libraryHaskellDepends = [
+         base mtl random transformers transformers-compat
+       ];
+       description = "Random-number generation monad";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "MonadRandomLazy" = callPackage
     ({ mkDerivation, base, MonadRandom, mtl, random }:
      mkDerivation {
@@ -18108,6 +18126,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "StateVar_1_1_0_3" = callPackage
+    ({ mkDerivation, base, stm, transformers }:
+     mkDerivation {
+       pname = "StateVar";
+       version = "1.1.0.3";
+       sha256 = "b494e6895185826cef9c67be54bb73beb2b76ad69a963c5d7e83da59dc0eac2f";
+       libraryHaskellDepends = [ base stm transformers ];
+       homepage = "https://github.com/haskell-opengl/StateVar";
+       description = "State variables";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "StateVar-transformer" = callPackage
     ({ mkDerivation, base, mtl, transformers }:
      mkDerivation {
@@ -22116,6 +22147,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "adjunctions_4_3" = callPackage
+    ({ mkDerivation, array, base, comonad, containers, contravariant
+     , distributive, free, mtl, profunctors, semigroupoids, semigroups
+     , tagged, transformers, transformers-compat, void
+     }:
+     mkDerivation {
+       pname = "adjunctions";
+       version = "4.3";
+       sha256 = "b948a14fafe8857f451ae3e474f5264c907b5a2d841d52bf78249ae4749c3ecc";
+       libraryHaskellDepends = [
+         array base comonad containers contravariant distributive free mtl
+         profunctors semigroupoids semigroups tagged transformers
+         transformers-compat void
+       ];
+       homepage = "http://github.com/ekmett/adjunctions/";
+       description = "Adjunctions and representable functors";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "adobe-swatch-exchange" = callPackage
     ({ mkDerivation, base, binary, bytestring, data-binary-ieee754
      , language-css, mtl, pretty
@@ -34403,6 +34454,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bifunctors_5_2" = callPackage
+    ({ mkDerivation, base, comonad, containers, hspec, QuickCheck
+     , semigroups, tagged, template-haskell, transformers
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "bifunctors";
+       version = "5.2";
+       sha256 = "46e173dac5863a7b8404b44ab1ead2de94e743d24a2de571ff086cfb8748de14";
+       libraryHaskellDepends = [
+         base comonad containers semigroups tagged template-haskell
+         transformers
+       ];
+       testHaskellDepends = [
+         base hspec QuickCheck transformers transformers-compat
+       ];
+       homepage = "http://github.com/ekmett/bifunctors/";
+       description = "Bifunctors";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "bighugethesaurus" = callPackage
     ({ mkDerivation, base, HTTP, split }:
      mkDerivation {
@@ -34722,8 +34795,8 @@ self: {
     ({ mkDerivation, base, binary }:
      mkDerivation {
        pname = "binary-enum";
-       version = "0.1.0.0";
-       sha256 = "9d35688cc9b761993567385230fa5514b6e7ff2ef06da0fa421a8689e05553f7";
+       version = "0.1.2.0";
+       sha256 = "15e7d259293db928980579cc8898dc6d545ffeaa5be97635cb93bb65a6a68688";
        libraryHaskellDepends = [ base binary ];
        homepage = "https://github.com/tolysz/binary-enum";
        description = "Simple wrappers around enum types";
@@ -37026,6 +37099,7 @@ self: {
        testHaskellDepends = [
          base containers directory process shake stm text time unix vector
        ];
+       doCheck = false;
        homepage = "https://github.com/ku-fpg/blank-canvas/wiki";
        description = "HTML5 Canvas Graphics Library";
        license = stdenv.lib.licenses.bsd3;
@@ -38552,7 +38626,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "brick" = callPackage
+  "brick_0_3_1" = callPackage
     ({ mkDerivation, base, containers, contravariant, data-default
      , deepseq, lens, template-haskell, text, text-zipper, transformers
      , vector, vty
@@ -38573,17 +38647,18 @@ self: {
        homepage = "https://github.com/jtdaugherty/brick/";
        description = "A declarative terminal user interface library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "brick_0_4" = callPackage
+  "brick" = callPackage
     ({ mkDerivation, base, containers, contravariant, data-default
      , deepseq, lens, template-haskell, text, text-zipper, transformers
      , vector, vty
      }:
      mkDerivation {
        pname = "brick";
-       version = "0.4";
-       sha256 = "138fbf408e26ad7cf0dbc9a490e79965a84a9dbd33fa2016791ae295f08f3526";
+       version = "0.4.1";
+       sha256 = "bea0df7fdcb476fc955f7301e77bfb8845008ab0e36cab2c2dcc1cf679a4595d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -38596,7 +38671,6 @@ self: {
        homepage = "https://github.com/jtdaugherty/brick/";
        description = "A declarative terminal user interface library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "brillig" = callPackage
@@ -39223,8 +39297,8 @@ self: {
   "bustle_0_5_2" = callPackage
     ({ mkDerivation, base, bytestring, cairo, containers, dbus
      , directory, filepath, gio, glib, gtk3, hgettext, HUnit, mtl, pango
-     , parsec, pcap, process, QuickCheck, setlocale, test-framework
-     , test-framework-hunit, text, time
+     , parsec, pcap, process, QuickCheck, setlocale, system-glib
+     , test-framework, test-framework-hunit, text, time
      }:
      mkDerivation {
        pname = "bustle";
@@ -39232,6 +39306,7 @@ self: {
        sha256 = "659d75f91d2d08447bce484a8176f6a2cc94cc10a2d732b7e733e4312a527e90";
        isLibrary = false;
        isExecutable = true;
+       libraryPkgconfigDepends = [ system-glib ];
        executableHaskellDepends = [
          base bytestring cairo containers dbus directory filepath gio glib
          gtk3 hgettext mtl pango parsec pcap process setlocale text time
@@ -39245,13 +39320,13 @@ self: {
        description = "Draw sequence diagrams of D-Bus traffic";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+     }) {system-glib = pkgs.glib;};
 
   "bustle" = callPackage
     ({ mkDerivation, base, bytestring, cairo, containers, dbus
      , directory, filepath, gio, glib, gtk3, hgettext, HUnit, mtl, pango
-     , parsec, pcap, process, QuickCheck, setlocale, test-framework
-     , test-framework-hunit, text, time
+     , parsec, pcap, process, QuickCheck, setlocale, system-glib
+     , test-framework, test-framework-hunit, text, time
      }:
      mkDerivation {
        pname = "bustle";
@@ -39259,6 +39334,7 @@ self: {
        sha256 = "9e525611cfb0c0715969b0ea77c2f63aaf7bc6ad70c9cf889a1655b66c0c24fd";
        isLibrary = false;
        isExecutable = true;
+       libraryPkgconfigDepends = [ system-glib ];
        executableHaskellDepends = [
          base bytestring cairo containers dbus directory filepath gio glib
          gtk3 hgettext mtl pango parsec pcap process setlocale text time
@@ -39272,7 +39348,7 @@ self: {
        description = "Draw sequence diagrams of D-Bus traffic";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+     }) {system-glib = pkgs.glib;};
 
   "butterflies" = callPackage
     ({ mkDerivation, base, bytestring, gl-capture, GLUT, OpenGLRaw
@@ -39490,6 +39566,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bytes_0_15_2" = callPackage
+    ({ mkDerivation, base, binary, bytestring, cereal, containers
+     , directory, doctest, filepath, hashable, mtl, scientific, text
+     , time, transformers, transformers-compat, unordered-containers
+     , void
+     }:
+     mkDerivation {
+       pname = "bytes";
+       version = "0.15.2";
+       sha256 = "0bfaaf70154d3622be1ee620dd75e9c93cf4d4a21544d83f281d01439f261f34";
+       libraryHaskellDepends = [
+         base binary bytestring cereal containers hashable mtl scientific
+         text time transformers transformers-compat unordered-containers
+         void
+       ];
+       testHaskellDepends = [ base directory doctest filepath ];
+       homepage = "https://github.com/ekmett/bytes";
+       description = "Sharing code for serialization between binary and cereal";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "byteset" = callPackage
     ({ mkDerivation, base, binary }:
      mkDerivation {
@@ -48591,6 +48689,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "comonad_5" = callPackage
+    ({ mkDerivation, base, containers, contravariant, directory
+     , distributive, doctest, filepath, semigroups, tagged, transformers
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "comonad";
+       version = "5";
+       sha256 = "78e5b19da5b701d14ceb2ca19191cc6205b2024ff2f71b754f5e949faa19cb2a";
+       libraryHaskellDepends = [
+         base containers contravariant distributive semigroups tagged
+         transformers transformers-compat
+       ];
+       testHaskellDepends = [ base directory doctest filepath ];
+       homepage = "http://github.com/ekmett/comonad/";
+       description = "Comonads";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "comonad-extras" = callPackage
     ({ mkDerivation, array, base, comonad, containers, distributive
      , semigroupoids, transformers
@@ -49516,6 +49634,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "concurrent-supply_0_1_8" = callPackage
+    ({ mkDerivation, base, containers, ghc-prim, hashable }:
+     mkDerivation {
+       pname = "concurrent-supply";
+       version = "0.1.8";
+       sha256 = "ccf827dcd221298ae93fad6021c63a06707456de0671706b44f1f2fed867f21f";
+       libraryHaskellDepends = [ base ghc-prim hashable ];
+       testHaskellDepends = [ base containers ];
+       homepage = "http://github.com/ekmett/concurrent-supply/";
+       description = "A fast concurrent unique identifier supply with a pure API";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "concurrent-utilities" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -50606,6 +50738,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "configurator-export" = callPackage
+    ({ mkDerivation, base, configurator, pretty, semigroups, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "configurator-export";
+       version = "0.1.0.0";
+       sha256 = "8efbda4c0e912ebf834099667b8df8e260fbeb35e765de00a5bbf9498c7eeb92";
+       libraryHaskellDepends = [
+         base configurator pretty semigroups text unordered-containers
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "http://github.com/mstksg/configurator-export";
+       description = "Pretty printer and exporter for configurations from the \"configurator\" library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "confsolve" = callPackage
     ({ mkDerivation, attoparsec, base, cmdargs, process, system-fileio
      , system-filepath, text, time, unordered-containers
@@ -50916,6 +51065,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "constraints_0_8" = callPackage
+    ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, mtl
+     , transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "constraints";
+       version = "0.8";
+       sha256 = "4cd08765345a151f21a0a4c5ef0a85661f4e53ffe807a623d5502d9ed3ae1588";
+       libraryHaskellDepends = [
+         base binary deepseq ghc-prim hashable mtl transformers
+         transformers-compat
+       ];
+       homepage = "http://github.com/ekmett/constraints/";
+       description = "Constraint manipulation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "constructible" = callPackage
     ({ mkDerivation, arithmoi, base, binary-search, complex-generic }:
      mkDerivation {
@@ -51391,6 +51558,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "contravariant_1_4" = callPackage
+    ({ mkDerivation, base, semigroups, StateVar, transformers
+     , transformers-compat, void
+     }:
+     mkDerivation {
+       pname = "contravariant";
+       version = "1.4";
+       sha256 = "e1666df1373ed784baa7d1e8e963bbc2d1f3c391578ac550ae74e7399173ee84";
+       libraryHaskellDepends = [
+         base semigroups StateVar transformers transformers-compat void
+       ];
+       homepage = "http://github.com/ekmett/contravariant/";
+       description = "Contravariant functors";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "contravariant-extras" = callPackage
     ({ mkDerivation, base, base-prelude, contravariant
      , template-haskell, tuple-th
@@ -55147,26 +55331,28 @@ self: {
     ({ mkDerivation, array, attoparsec, base, base16-bytestring, binary
      , bytestring, cmdargs, containers, cryptohash, curl, data-ordlist
      , directory, filepath, FindBin, hashable, haskeline, html, HTTP
-     , HUnit, mmap, mtl, network, network-uri, old-locale, old-time
-     , parsec, process, QuickCheck, random, regex-applicative
-     , regex-compat-tdfa, sandi, shelly, split, tar, terminfo
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , text, time, transformers, transformers-compat, unix, unix-compat
-     , utf8-string, vector, zip-archive, zlib
+     , HUnit, mmap, mtl, network, network-uri, old-time, parsec, process
+     , QuickCheck, random, regex-applicative, regex-compat-tdfa, sandi
+     , shelly, split, tar, terminfo, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, text, time
+     , transformers, transformers-compat, unix, unix-compat, utf8-string
+     , vector, zip-archive, zlib
      }:
      mkDerivation {
        pname = "darcs";
        version = "2.10.2";
        sha256 = "6337d3fac04711fa2ef5813558b409c59166c5599b0c9d68c418d21cdccfb327";
+       revision = "1";
+       editedCabalFile = "ef15936009bbe7f50614dfc66bcb182d28129b353e312e82ae301b0517af24fe";
        configureFlags = [ "-fforce-char8-encoding" "-flibrary" ];
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          array attoparsec base base16-bytestring binary bytestring
          containers cryptohash data-ordlist directory filepath hashable
-         haskeline html HTTP mmap mtl network network-uri old-locale
-         old-time parsec process random regex-applicative regex-compat-tdfa
-         sandi tar terminfo text time transformers transformers-compat unix
+         haskeline html HTTP mmap mtl network network-uri old-time parsec
+         process random regex-applicative regex-compat-tdfa sandi tar
+         terminfo text time transformers transformers-compat unix
          unix-compat utf8-string vector zip-archive zlib
        ];
        librarySystemDepends = [ curl ];
@@ -55178,7 +55364,6 @@ self: {
          test-framework-hunit test-framework-quickcheck2 text unix-compat
          zip-archive zlib
        ];
-       jailbreak = true;
        postInstall = ''
          mkdir -p $out/etc/bash_completion.d
          mv contrib/darcs_completion $out/etc/bash_completion.d/darcs
@@ -57140,7 +57325,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "dbus" = callPackage
+  "dbus_0_10_11" = callPackage
     ({ mkDerivation, base, bytestring, cereal, chell, chell-quickcheck
      , containers, directory, filepath, libxml-sax, network, parsec
      , process, QuickCheck, random, text, transformers, unix, vector
@@ -57163,9 +57348,10 @@ self: {
        homepage = "https://john-millikin.com/software/haskell-dbus/";
        description = "A client library for the D-Bus IPC system";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "dbus_0_10_12" = callPackage
+  "dbus" = callPackage
     ({ mkDerivation, base, bytestring, cereal, chell, chell-quickcheck
      , containers, directory, filepath, libxml-sax, network, parsec
      , process, QuickCheck, random, text, transformers, unix, vector
@@ -57188,7 +57374,6 @@ self: {
        homepage = "https://john-millikin.com/software/haskell-dbus/";
        description = "A client library for the D-Bus IPC system";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dbus-client" = callPackage
@@ -59223,6 +59408,35 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "diagrams-builder_0_7_2_2" = callPackage
+    ({ mkDerivation, base, base-orphans, bytestring, cmdargs
+     , diagrams-cairo, diagrams-lib, diagrams-postscript
+     , diagrams-rasterific, diagrams-svg, directory, exceptions
+     , filepath, hashable, haskell-src-exts, hint, JuicyPixels, lens
+     , lucid-svg, mtl, split, transformers
+     }:
+     mkDerivation {
+       pname = "diagrams-builder";
+       version = "0.7.2.2";
+       sha256 = "f489b766b89a70700d213df0270e4962e0597928c339e41e02d6b90c9d32567d";
+       configureFlags = [ "-fcairo" "-fps" "-frasterific" "-fsvg" ];
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base base-orphans cmdargs diagrams-lib directory exceptions
+         filepath hashable haskell-src-exts hint lens mtl split transformers
+       ];
+       executableHaskellDepends = [
+         base bytestring cmdargs diagrams-cairo diagrams-lib
+         diagrams-postscript diagrams-rasterific diagrams-svg directory
+         filepath JuicyPixels lens lucid-svg
+       ];
+       homepage = "http://projects.haskell.org/diagrams";
+       description = "hint-based build service for the diagrams graphics EDSL";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "diagrams-cairo_1_2_0_4" = callPackage
     ({ mkDerivation, base, bytestring, cairo, colour, containers
      , data-default-class, diagrams-core, diagrams-lib, directory
@@ -59780,7 +59994,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "diagrams-core" = callPackage
+  "diagrams-core_1_3_0_4" = callPackage
     ({ mkDerivation, adjunctions, base, containers, distributive
      , dual-tree, lens, linear, monoid-extras, mtl, semigroups
      , unordered-containers
@@ -59796,9 +60010,10 @@ self: {
        homepage = "http://projects.haskell.org/diagrams";
        description = "Core libraries for diagrams EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "diagrams-core_1_3_0_5" = callPackage
+  "diagrams-core" = callPackage
     ({ mkDerivation, adjunctions, base, containers, distributive
      , dual-tree, lens, linear, monoid-extras, mtl, semigroups
      , unordered-containers
@@ -59814,7 +60029,6 @@ self: {
        homepage = "http://projects.haskell.org/diagrams";
        description = "Core libraries for diagrams EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-graphviz" = callPackage
@@ -60199,7 +60413,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "diagrams-lib" = callPackage
+  "diagrams-lib_1_3_0_8" = callPackage
     ({ mkDerivation, active, adjunctions, array, base, colour
      , containers, data-default-class, diagrams-core, diagrams-solve
      , directory, distributive, dual-tree, exceptions, filepath
@@ -60221,9 +60435,10 @@ self: {
        homepage = "http://projects.haskell.org/diagrams";
        description = "Embedded domain-specific language for declarative graphics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "diagrams-lib_1_3_0_9" = callPackage
+  "diagrams-lib" = callPackage
     ({ mkDerivation, active, adjunctions, array, base, colour
      , containers, data-default-class, diagrams-core, diagrams-solve
      , directory, distributive, dual-tree, exceptions, filepath
@@ -60245,7 +60460,6 @@ self: {
        homepage = "http://projects.haskell.org/diagrams";
        description = "Embedded domain-specific language for declarative graphics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-pandoc" = callPackage
@@ -61891,18 +62105,18 @@ self: {
 
   "discrimination" = callPackage
     ({ mkDerivation, array, base, containers, contravariant, deepseq
-     , ghc-prim, primitive, profunctors, promises, semigroups
-     , transformers, vector, void
+     , ghc-prim, hashable, primitive, profunctors, promises, semigroups
+     , transformers, transformers-compat, vector, void
      }:
      mkDerivation {
        pname = "discrimination";
-       version = "0.1";
-       sha256 = "818e170c2cbd1447e3d1552bc59d5c1a995ffbf690246ab2863f302c3dbcad85";
+       version = "0.2.1";
+       sha256 = "b431a43f635af98df8677a44c0e76726b95d12ea338e47db248aa3bbc3be2ccf";
        libraryHaskellDepends = [
-         array base containers contravariant deepseq ghc-prim primitive
-         profunctors promises semigroups transformers vector void
+         array base containers contravariant deepseq ghc-prim hashable
+         primitive profunctors promises semigroups transformers
+         transformers-compat vector void
        ];
-       jailbreak = true;
        homepage = "http://github.com/ekmett/discrimination/";
        description = "Fast generic linear-time sorting, joins and container construction";
        license = stdenv.lib.licenses.bsd3;
@@ -62855,6 +63069,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "distributive_0_5_0_2" = callPackage
+    ({ mkDerivation, base, base-orphans, directory, doctest, filepath
+     , tagged, transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "distributive";
+       version = "0.5.0.2";
+       sha256 = "f884996f491fe5b275b7dda2cebdadfecea0d7788a142546e0271e9575cc1609";
+       libraryHaskellDepends = [
+         base base-orphans tagged transformers transformers-compat
+       ];
+       testHaskellDepends = [ base directory doctest filepath ];
+       jailbreak = true;
+       homepage = "http://github.com/ekmett/distributive/";
+       description = "Distributive functors -- Dual to Traversable";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "diversity_0_7_1_1" = callPackage
     ({ mkDerivation, base, containers, data-ordlist, fasta
      , math-functions, MonadRandom, optparse-applicative, parsec, pipes
@@ -64133,6 +64366,7 @@ self: {
        testHaskellDepends = [
          base drifter either postgresql-simple tasty tasty-hunit text
        ];
+       doCheck = false;
        description = "PostgreSQL support for the drifter schema migration tool";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -65549,6 +65783,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "effect-handlers_0_1_0_7" = callPackage
+    ({ mkDerivation, base, free, hspec, hspec-discover, HUnit
+     , kan-extensions, mtl, QuickCheck
+     }:
+     mkDerivation {
+       pname = "effect-handlers";
+       version = "0.1.0.7";
+       sha256 = "42649d2d1b02759e4c455cf36eb968a1496b8de83a3ffbeb1e1d7e6a9efa41f5";
+       libraryHaskellDepends = [ base free kan-extensions mtl ];
+       testHaskellDepends = [
+         base hspec hspec-discover HUnit QuickCheck
+       ];
+       homepage = "https://github.com/edofic/effect-handlers";
+       description = "A library for writing extensible algebraic effects and handlers. Similar to extensible-effects but with deep handlers.";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "effect-monad" = callPackage
     ({ mkDerivation, base, ghc-prim, type-level-sets }:
      mkDerivation {
@@ -67892,6 +68144,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "errors_2_1_1" = callPackage
+    ({ mkDerivation, base, safe, transformers, transformers-compat
+     , unexceptionalio
+     }:
+     mkDerivation {
+       pname = "errors";
+       version = "2.1.1";
+       sha256 = "28002b14fd33135870ed8fad398aeef3c43f1cfb2501ad2e4d9d72f0a3bf19d3";
+       libraryHaskellDepends = [
+         base safe transformers transformers-compat unexceptionalio
+       ];
+       description = "Simplified error-handling";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ersatz_0_2_6_1" = callPackage
     ({ mkDerivation, array, base, blaze-builder, blaze-textual
      , bytestring, containers, data-default, data-reify, directory
@@ -68129,7 +68397,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "esqueleto" = callPackage
+  "esqueleto_2_4_1" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, conduit, containers
      , hspec, HUnit, monad-control, monad-logger, persistent
      , persistent-sqlite, persistent-template, QuickCheck, resourcet
@@ -68151,9 +68419,10 @@ self: {
        homepage = "https://github.com/prowdsponsor/esqueleto";
        description = "Type-safe EDSL for SQL queries on persistent backends";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "esqueleto_2_4_2" = callPackage
+  "esqueleto" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, conduit, containers
      , hspec, HUnit, monad-control, monad-logger, persistent
      , persistent-sqlite, persistent-template, QuickCheck, resourcet
@@ -68175,7 +68444,6 @@ self: {
        homepage = "https://github.com/prowdsponsor/esqueleto";
        description = "Type-safe EDSL for SQL queries on persistent backends";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ess" = callPackage
@@ -68905,7 +69173,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "exceptions" = callPackage
+  "exceptions_0_8_0_2" = callPackage
     ({ mkDerivation, base, mtl, QuickCheck, stm, test-framework
      , test-framework-quickcheck2, transformers, transformers-compat
      }:
@@ -68925,9 +69193,10 @@ self: {
        homepage = "http://github.com/ekmett/exceptions/";
        description = "Extensible optionally-pure exceptions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "exceptions_0_8_1" = callPackage
+  "exceptions" = callPackage
     ({ mkDerivation, base, mtl, QuickCheck, stm, template-haskell
      , test-framework, test-framework-quickcheck2, transformers
      , transformers-compat
@@ -68944,6 +69213,28 @@ self: {
          test-framework-quickcheck2 transformers transformers-compat
        ];
        jailbreak = true;
+       doCheck = false;
+       homepage = "http://github.com/ekmett/exceptions/";
+       description = "Extensible optionally-pure exceptions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "exceptions_0_8_2_1" = callPackage
+    ({ mkDerivation, base, mtl, QuickCheck, stm, template-haskell
+     , test-framework, test-framework-quickcheck2, transformers
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "exceptions";
+       version = "0.8.2.1";
+       sha256 = "c435877ff2f04a1855e50c78bbcbf8c89f3dc42837e440956500599f6d851035";
+       libraryHaskellDepends = [
+         base mtl stm template-haskell transformers transformers-compat
+       ];
+       testHaskellDepends = [
+         base mtl QuickCheck stm template-haskell test-framework
+         test-framework-quickcheck2 transformers transformers-compat
+       ];
        homepage = "http://github.com/ekmett/exceptions/";
        description = "Extensible optionally-pure exceptions";
        license = stdenv.lib.licenses.bsd3;
@@ -70429,7 +70720,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "fay" = callPackage
+  "fay_0_23_1_10" = callPackage
     ({ mkDerivation, aeson, base, base-compat, bytestring, containers
      , data-default, data-lens-light, directory, filepath, ghc-paths
      , haskell-src-exts, language-ecmascript, mtl, mtl-compat
@@ -70458,9 +70749,10 @@ self: {
        homepage = "https://github.com/faylang/fay/wiki";
        description = "A compiler for Fay, a Haskell subset that compiles to JavaScript";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "fay_0_23_1_12" = callPackage
+  "fay" = callPackage
     ({ mkDerivation, aeson, base, base-compat, bytestring, containers
      , data-default, data-lens-light, directory, filepath, ghc-paths
      , haskell-src-exts, language-ecmascript, mtl, mtl-compat
@@ -70487,7 +70779,6 @@ self: {
        homepage = "https://github.com/faylang/fay/wiki";
        description = "A compiler for Fay, a Haskell subset that compiles to JavaScript";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fay-base_0_19_4_1" = callPackage
@@ -73565,8 +73856,8 @@ self: {
      }:
      mkDerivation {
        pname = "fltkhs";
-       version = "0.3.0.1";
-       sha256 = "121f25a6cc82de7edc7718b4a244803b0a71973784b5a8e01680aabacdc0ad43";
+       version = "0.4.0.0";
+       sha256 = "7e975cca6e57dc947abdc776a90fb94cee9f30fc8a0f395570c9665d23e53644";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring ];
@@ -73583,8 +73874,8 @@ self: {
     ({ mkDerivation, base, bytestring, fltkhs }:
      mkDerivation {
        pname = "fltkhs-fluid-examples";
-       version = "0.0.0.2";
-       sha256 = "1152b9d4e25df28011abd695fa066a798b11839c34d31eb5ccd2820587eaa3b7";
+       version = "0.0.0.3";
+       sha256 = "29d569819feafbe4aa9deb6c78a2e3189780e1cbb4aa350a3e32aa18b6435bf0";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base bytestring fltkhs ];
@@ -73593,6 +73884,21 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "fltkhs-hello-world" = callPackage
+    ({ mkDerivation, base, fltkhs }:
+     mkDerivation {
+       pname = "fltkhs-hello-world";
+       version = "0.0.0.2";
+       sha256 = "c7f8e729ba129ba983624da2d8696629c3e476b80ae5ea76a28e1a37ceedade1";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base fltkhs ];
+       homepage = "http://github.com/deech/fltkhs-hello-world";
+       description = "Fltkhs template project";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fluent-logger" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, cereal
      , cereal-conduit, conduit, conduit-extra, containers, exceptions
@@ -73903,6 +74209,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "foldl_1_1_3" = callPackage
+    ({ mkDerivation, base, bytestring, comonad, containers, mwc-random
+     , primitive, profunctors, text, transformers, vector
+     }:
+     mkDerivation {
+       pname = "foldl";
+       version = "1.1.3";
+       sha256 = "af81eb42e6530f6f0ba992965c337d89483d755b50c7c94b12325dd793435474";
+       libraryHaskellDepends = [
+         base bytestring comonad containers mwc-random primitive profunctors
+         text transformers vector
+       ];
+       description = "Composable, streaming, and efficient left folds";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "foldl-incremental" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, foldl
      , histogram-fill, mwc-random, pipes, QuickCheck, tasty
@@ -74999,7 +75322,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "free" = callPackage
+  "free_4_12_1" = callPackage
     ({ mkDerivation, base, bifunctors, comonad, distributive
      , exceptions, mtl, prelude-extras, profunctors, semigroupoids
      , semigroups, template-haskell, transformers
@@ -75015,9 +75338,10 @@ self: {
        homepage = "http://github.com/ekmett/free/";
        description = "Monads for free";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "free_4_12_2" = callPackage
+  "free" = callPackage
     ({ mkDerivation, base, bifunctors, comonad, containers
      , distributive, exceptions, mtl, prelude-extras, profunctors
      , semigroupoids, semigroups, template-haskell, transformers
@@ -75035,6 +75359,26 @@ self: {
        homepage = "http://github.com/ekmett/free/";
        description = "Monads for free";
        license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "free_4_12_4" = callPackage
+    ({ mkDerivation, base, bifunctors, comonad, containers
+     , distributive, exceptions, mtl, prelude-extras, profunctors
+     , semigroupoids, semigroups, template-haskell, transformers
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "free";
+       version = "4.12.4";
+       sha256 = "c9fe45aae387855626ecb5a0fea6afdb207143cb00af3b1f715d1032d2d08784";
+       libraryHaskellDepends = [
+         base bifunctors comonad containers distributive exceptions mtl
+         prelude-extras profunctors semigroupoids semigroups
+         template-haskell transformers transformers-compat
+       ];
+       homepage = "http://github.com/ekmett/free/";
+       description = "Monads for free";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -77418,7 +77762,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "geniplate-mirror" = callPackage
+  "geniplate-mirror_0_7_1" = callPackage
     ({ mkDerivation, base, mtl, template-haskell }:
      mkDerivation {
        pname = "geniplate-mirror";
@@ -77428,9 +77772,10 @@ self: {
        homepage = "https://github.com/danr/geniplate";
        description = "Use Template Haskell to generate Uniplate-like functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "geniplate-mirror_0_7_2" = callPackage
+  "geniplate-mirror" = callPackage
     ({ mkDerivation, base, mtl, template-haskell }:
      mkDerivation {
        pname = "geniplate-mirror";
@@ -77440,7 +77785,6 @@ self: {
        homepage = "https://github.com/danr/geniplate";
        description = "Use Template Haskell to generate Uniplate-like functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "geniserver" = callPackage
@@ -79486,7 +79830,7 @@ self: {
        jailbreak = true;
        preConfigure = "export HOME=$TEMPDIR; patchShebangs .";
        postBuild = "ln -sf dist/build/git-annex/git-annex git-annex";
-       installPhase = "make PREFIX=$out CABAL=./Setup install";
+       installPhase = "make PREFIX=$out CABAL=./Setup BUILDER=./Setup install";
        checkPhase = "./git-annex test";
        enableSharedExecutables = false;
        homepage = "http://git-annex.branchable.com/";
@@ -79499,7 +79843,7 @@ self: {
          inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; 
          inherit (pkgs) which;};
 
-  "git-annex" = callPackage
+  "git-annex_5_20151218" = callPackage
     ({ mkDerivation, aeson, async, aws, base, blaze-builder
      , bloomfilter, bup, byteable, bytestring, case-insensitive
      , clientsession, concurrent-output, conduit, conduit-extra
@@ -79552,19 +79896,20 @@ self: {
        ];
        preConfigure = "export HOME=$TEMPDIR; patchShebangs .";
        postBuild = "ln -sf dist/build/git-annex/git-annex git-annex";
-       installPhase = "make PREFIX=$out CABAL=./Setup install";
+       installPhase = "make PREFIX=$out CABAL=./Setup BUILDER=./Setup install";
        checkPhase = "./git-annex test";
        enableSharedExecutables = false;
        homepage = "http://git-annex.branchable.com/";
        description = "manage files with git, without checking their contents into git";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; 
          inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; 
          inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; 
          inherit (pkgs) which;};
 
-  "git-annex_6_20160114" = callPackage
+  "git-annex" = callPackage
     ({ mkDerivation, aeson, async, aws, base, blaze-builder
      , bloomfilter, bup, byteable, bytestring, case-insensitive
      , clientsession, concurrent-output, conduit, conduit-extra
@@ -79617,13 +79962,12 @@ self: {
        ];
        preConfigure = "export HOME=$TEMPDIR; patchShebangs .";
        postBuild = "ln -sf dist/build/git-annex/git-annex git-annex";
-       installPhase = "make PREFIX=$out CABAL=./Setup install";
+       installPhase = "make PREFIX=$out CABAL=./Setup BUILDER=./Setup install";
        checkPhase = "./git-annex test";
        enableSharedExecutables = false;
        homepage = "http://git-annex.branchable.com/";
        description = "manage files with git, without checking their contents into git";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; 
          inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; 
@@ -80669,6 +81013,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) mesa;};
 
+  "gl_0_7_8" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath, fixed, half
+     , hxt, mesa, split, transformers
+     }:
+     mkDerivation {
+       pname = "gl";
+       version = "0.7.8";
+       sha256 = "4ee12e21d759399f56932a14d5aa7e4266c387fa834103680011a0914b9e8db6";
+       libraryHaskellDepends = [
+         base containers directory filepath fixed half hxt split
+         transformers
+       ];
+       librarySystemDepends = [ mesa ];
+       description = "Complete OpenGL raw bindings";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) mesa;};
+
   "gl-capture" = callPackage
     ({ mkDerivation, base, bytestring, OpenGL }:
      mkDerivation {
@@ -83727,6 +84089,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "graphs_0_7" = callPackage
+    ({ mkDerivation, array, base, containers, transformers
+     , transformers-compat, void
+     }:
+     mkDerivation {
+       pname = "graphs";
+       version = "0.7";
+       sha256 = "eea656ac6092eac99bafc0b7817efa34529b895408fc1267a5b573fb332f6f4c";
+       libraryHaskellDepends = [
+         array base containers transformers transformers-compat void
+       ];
+       homepage = "http://github.com/ekmett/graphs";
+       description = "A simple monadic graph library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "graphtype" = callPackage
     ({ mkDerivation, base, containers, dotgen, haskell-src-exts
      , haskell98, uniplate
@@ -86640,10 +87019,8 @@ self: {
      }:
      mkDerivation {
        pname = "hackage-diff";
-       version = "0.1.0.0";
-       sha256 = "bf8010479ba75032c6750444edc7979a65c6ce4c919a629562ddd81aa03aac4d";
-       revision = "1";
-       editedCabalFile = "eddc65fed41375eaa4ce2aa729bd35364d558d7e33b23fcafca58dd6ce3cff1c";
+       version = "0.1.0.1";
+       sha256 = "251410eafa7672c817ef5b697798770b37795e9699e42059aeba9e4b82b4d002";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -88232,6 +88609,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "half_0_2_2_3" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "half";
+       version = "0.2.2.3";
+       sha256 = "85c244c80d1c889a3d79073a6f5a99d9e769dbe3c574ca11d992b2b4f7599a5c";
+       libraryHaskellDepends = [ base ];
+       homepage = "http://github.com/ekmett/half";
+       description = "Half-precision floating-point";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "halfs" = callPackage
     ({ mkDerivation, array, base, bytestring, cereal, containers
      , directory, filepath, fingertree, HFuse, mtl, QuickCheck, random
@@ -88785,7 +89175,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "happstack-authenticate" = callPackage
+  "happstack-authenticate_2_3_2" = callPackage
     ({ mkDerivation, acid-state, aeson, authenticate, base
      , base64-bytestring, boomerang, bytestring, containers
      , data-default, email-validate, filepath, happstack-hsp
@@ -88812,6 +89202,36 @@ self: {
        homepage = "http://www.happstack.com/";
        description = "Happstack Authentication Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "happstack-authenticate" = callPackage
+    ({ mkDerivation, acid-state, aeson, authenticate, base
+     , base64-bytestring, boomerang, bytestring, containers
+     , data-default, email-validate, filepath, happstack-hsp
+     , happstack-jmacro, happstack-server, hsp, hsx-jmacro, hsx2hs
+     , http-conduit, http-types, ixset-typed, jmacro, jwt, lens
+     , mime-mail, mtl, pwstore-purehaskell, random, safecopy
+     , shakespeare, text, time, unordered-containers, userid, web-routes
+     , web-routes-boomerang, web-routes-happstack, web-routes-hsp
+     , web-routes-th
+     }:
+     mkDerivation {
+       pname = "happstack-authenticate";
+       version = "2.3.3";
+       sha256 = "e8bd1802370ad1d6f3099eb1a6ab4310a52aaaac1a7b0644d574dc71ee7c55d0";
+       libraryHaskellDepends = [
+         acid-state aeson authenticate base base64-bytestring boomerang
+         bytestring containers data-default email-validate filepath
+         happstack-hsp happstack-jmacro happstack-server hsp hsx-jmacro
+         hsx2hs http-conduit http-types ixset-typed jmacro jwt lens
+         mime-mail mtl pwstore-purehaskell random safecopy shakespeare text
+         time unordered-containers userid web-routes web-routes-boomerang
+         web-routes-happstack web-routes-hsp web-routes-th
+       ];
+       homepage = "http://www.happstack.com/";
+       description = "Happstack Authentication Library";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "happstack-clientsession" = callPackage
@@ -89896,7 +90316,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hashable" = callPackage
+  "hashable_1_2_3_3" = callPackage
     ({ mkDerivation, base, bytestring, ghc-prim, HUnit, integer-gmp
      , QuickCheck, random, test-framework, test-framework-hunit
      , test-framework-quickcheck2, text, unix
@@ -89917,9 +90337,10 @@ self: {
        homepage = "http://github.com/tibbe/hashable";
        description = "A class for types that can be converted to a hash value";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hashable_1_2_4_0" = callPackage
+  "hashable" = callPackage
     ({ mkDerivation, base, bytestring, ghc-prim, HUnit, integer-gmp
      , QuickCheck, random, test-framework, test-framework-hunit
      , test-framework-quickcheck2, text, unix
@@ -89938,7 +90359,6 @@ self: {
        homepage = "http://github.com/tibbe/hashable";
        description = "A class for types that can be converted to a hash value";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hashable-extras_0_2_0_1" = callPackage
@@ -89998,6 +90418,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hashable-extras_0_2_3" = callPackage
+    ({ mkDerivation, base, bifunctors, bytestring, directory, doctest
+     , filepath, hashable, transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "hashable-extras";
+       version = "0.2.3";
+       sha256 = "03e0303a50e265d8682402152c90e199d0f4685a1e553bf20a380652d6f06b6a";
+       libraryHaskellDepends = [
+         base bifunctors bytestring hashable transformers
+         transformers-compat
+       ];
+       testHaskellDepends = [ base directory doctest filepath ];
+       homepage = "http://github.com/analytics/hashable-extras/";
+       description = "Higher-rank Hashable";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hashable-generics" = callPackage
     ({ mkDerivation, base, ghc-prim, hashable, QuickCheck
      , test-framework, test-framework-quickcheck2
@@ -92053,8 +92492,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskellscrabble";
-       version = "1.3.3";
-       sha256 = "3de776ff49e739f760ac37d296e4f0f5e9857624a454ca0cc18f85ae4ddbd01f";
+       version = "1.4.3";
+       sha256 = "73b49427676a19a55bc8c86deee8b1864cdbd39f15b74d811d7b8cc8ac1f3d9b";
        libraryHaskellDepends = [
          array arrows base containers errors listsafe mtl parsec QuickCheck
          random safe semigroups split transformers unordered-containers
@@ -94008,7 +94447,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "haxr" = callPackage
+  "haxr_3000_11_1_2" = callPackage
     ({ mkDerivation, array, base, base-compat, base64-bytestring
      , blaze-builder, bytestring, HaXml, HsOpenSSL, http-streams
      , http-types, io-streams, mtl, mtl-compat, network, network-uri
@@ -94027,9 +94466,10 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/HaXR";
        description = "XML-RPC client and server library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "haxr_3000_11_1_3" = callPackage
+  "haxr" = callPackage
     ({ mkDerivation, array, base, base-compat, base64-bytestring
      , blaze-builder, bytestring, HaXml, HsOpenSSL, http-streams
      , http-types, io-streams, mtl, mtl-compat, network, network-uri
@@ -94048,7 +94488,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/HaXR";
        description = "XML-RPC client and server library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haxr-th" = callPackage
@@ -95117,6 +95556,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "heaps_0_3_3" = callPackage
+    ({ mkDerivation, base, directory, doctest, filepath }:
+     mkDerivation {
+       pname = "heaps";
+       version = "0.3.3";
+       sha256 = "04e358d3e6d8ca7786749b6d3945e18159506f8b21ca48b1913c771dcaae1537";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base directory doctest filepath ];
+       jailbreak = true;
+       homepage = "http://github.com/ekmett/heaps/";
+       description = "Asymptotically optimal Brodal/Okasaki heaps";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "heapsort" = callPackage
     ({ mkDerivation, array, base, QuickCheck }:
      mkDerivation {
@@ -105399,6 +105853,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hspec_2_2_2" = callPackage
+    ({ mkDerivation, base, directory, hspec-core, hspec-discover
+     , hspec-expectations, hspec-meta, HUnit, QuickCheck, stringbuilder
+     , transformers
+     }:
+     mkDerivation {
+       pname = "hspec";
+       version = "2.2.2";
+       sha256 = "91310e6feb10c31b23ec2739422f8ed25ed43bc606bd355cb034a66bb297c9d9";
+       libraryHaskellDepends = [
+         base hspec-core hspec-discover hspec-expectations HUnit QuickCheck
+         transformers
+       ];
+       testHaskellDepends = [
+         base directory hspec-core hspec-meta stringbuilder
+       ];
+       jailbreak = true;
+       homepage = "http://hspec.github.io/";
+       description = "A Testing Framework for Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hspec-attoparsec" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, hspec
      , hspec-expectations, text
@@ -105665,6 +106142,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hspec-core_2_2_2" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, deepseq
+     , hspec-expectations, hspec-meta, HUnit, process, QuickCheck
+     , quickcheck-io, random, setenv, silently, tf-random, time
+     , transformers
+     }:
+     mkDerivation {
+       pname = "hspec-core";
+       version = "2.2.2";
+       sha256 = "01344835b8de81371087d187dbdb1011eea2c7e41132ed4edad643136d464398";
+       libraryHaskellDepends = [
+         ansi-terminal async base deepseq hspec-expectations HUnit
+         QuickCheck quickcheck-io random setenv tf-random time transformers
+       ];
+       testHaskellDepends = [
+         ansi-terminal async base deepseq hspec-expectations hspec-meta
+         HUnit process QuickCheck quickcheck-io random setenv silently
+         tf-random time transformers
+       ];
+       homepage = "http://hspec.github.io/";
+       description = "A Testing Framework for Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hspec-discover_2_1_2" = callPackage
     ({ mkDerivation, base, directory, filepath, hspec-meta }:
      mkDerivation {
@@ -105801,6 +106303,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hspec-discover_2_2_2" = callPackage
+    ({ mkDerivation, base, directory, filepath, hspec-meta }:
+     mkDerivation {
+       pname = "hspec-discover";
+       version = "2.2.2";
+       sha256 = "4279c668ee8b537ad8192db47ba4a2c30fd49a90f6f5858bd7d2c835e752e81f";
+       isLibrary = true;
+       isExecutable = true;
+       executableHaskellDepends = [ base directory filepath ];
+       testHaskellDepends = [ base directory filepath hspec-meta ];
+       doHaddock = false;
+       homepage = "http://hspec.github.io/";
+       description = "Automatically discover and run Hspec tests";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hspec-expectations_0_6_1" = callPackage
     ({ mkDerivation, base, hspec, HUnit, markdown-unlit, silently }:
      mkDerivation {
@@ -106049,6 +106568,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hspec-meta_2_2_1" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, deepseq, directory
+     , filepath, hspec-expectations, HUnit, QuickCheck, quickcheck-io
+     , random, setenv, time, transformers
+     }:
+     mkDerivation {
+       pname = "hspec-meta";
+       version = "2.2.1";
+       sha256 = "aa7b54c33cad9842783035d1a5cddbbbc3d556c8b2c8f6d0e6bfd3177b9e37d4";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ansi-terminal async base deepseq hspec-expectations HUnit
+         QuickCheck quickcheck-io random setenv time transformers
+       ];
+       executableHaskellDepends = [ base directory filepath ];
+       homepage = "http://hspec.github.io/";
+       description = "A version of Hspec which is used to test Hspec itself";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hspec-monad-control" = callPackage
     ({ mkDerivation, base, hspec-core, monad-control, transformers
      , transformers-base
@@ -114022,7 +114563,7 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
-  "inline-c" = callPackage
+  "inline-c_0_5_5_1" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring
      , containers, cryptohash, directory, filepath, gsl, gslcblas
      , hashable, hspec, mtl, parsec, parsers, QuickCheck, raw-strings-qq
@@ -114048,9 +114589,10 @@ self: {
        ];
        description = "Write Haskell source files including C code inline. No FFI required.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gsl; gslcblas = null;};
 
-  "inline-c_0_5_5_2" = callPackage
+  "inline-c" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring
      , containers, cryptohash, directory, filepath, gsl, gslcblas
      , hashable, hspec, mtl, parsec, parsers, QuickCheck, raw-strings-qq
@@ -114076,7 +114618,6 @@ self: {
        ];
        description = "Write Haskell source files including C code inline. No FFI required.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gsl; gslcblas = null;};
 
   "inline-c-cpp" = callPackage
@@ -114632,6 +115173,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "intervals_0_7_2" = callPackage
+    ({ mkDerivation, array, base, directory, distributive, doctest
+     , filepath, ghc-prim, QuickCheck, template-haskell
+     }:
+     mkDerivation {
+       pname = "intervals";
+       version = "0.7.2";
+       sha256 = "0dd04a7dfd0ac6b364c66b78dafa48739c5116253078d4023e104f5e99d5fe28";
+       libraryHaskellDepends = [ array base distributive ghc-prim ];
+       testHaskellDepends = [
+         base directory doctest filepath QuickCheck template-haskell
+       ];
+       homepage = "http://github.com/ekmett/intervals";
+       description = "Interval Arithmetic";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "intricacy" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , cryptohash, directory, filepath, hscurses, mtl, network-fancy
@@ -118424,6 +118983,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "kan-extensions_5_0_1" = callPackage
+    ({ mkDerivation, adjunctions, array, base, comonad, containers
+     , contravariant, distributive, free, mtl, semigroupoids, tagged
+     , transformers
+     }:
+     mkDerivation {
+       pname = "kan-extensions";
+       version = "5.0.1";
+       sha256 = "01de9fe57064a125ecb1d1161519df27043c2058ca246bbd5cd2d73c899ba0e2";
+       libraryHaskellDepends = [
+         adjunctions array base comonad containers contravariant
+         distributive free mtl semigroupoids tagged transformers
+       ];
+       homepage = "http://github.com/ekmett/kan-extensions/";
+       description = "Kan extensions, Kan lifts, various forms of the Yoneda lemma, and (co)density (co)monads";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "kangaroo" = callPackage
     ({ mkDerivation, array, base }:
      mkDerivation {
@@ -118465,6 +119043,8 @@ self: {
        pname = "kansas-comet";
        version = "0.4";
        sha256 = "1f1a4565f2e955b8947bafcb9611789b0ccdf9efdfed8aaa2a2aa162a07339e1";
+       revision = "1";
+       editedCabalFile = "6f3238173ad5a0fbdd82c2b73e96b4c43f17fa45f76f7249e6e925ed7eef9a97";
        libraryHaskellDepends = [
          aeson base containers data-default-class scotty stm text time
          transformers unordered-containers
@@ -119474,6 +120054,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "keys_3_11" = callPackage
+    ({ mkDerivation, array, base, comonad, containers, free, hashable
+     , semigroupoids, semigroups, transformers, transformers-compat
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "keys";
+       version = "3.11";
+       sha256 = "0cf397b7e6eb8cda930a02118c0bf262f9ef80c5a2f91822238b7778042cc4b2";
+       libraryHaskellDepends = [
+         array base comonad containers free hashable semigroupoids
+         semigroups transformers transformers-compat unordered-containers
+       ];
+       homepage = "http://github.com/ekmett/keys/";
+       description = "Keyed functors and containers";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "keystore" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, ansi-wl-pprint, api-tools
      , asn1-encoding, asn1-types, base, base64-bytestring, byteable
@@ -122021,7 +122620,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "language-thrift" = callPackage
+  "language-thrift_0_6_2_0" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, hspec, hspec-discover, lens
      , parsers, QuickCheck, template-haskell, text, transformers
      , trifecta, wl-pprint
@@ -122044,7 +122643,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "language-thrift_0_7_0_0" = callPackage
+  "language-thrift" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, hspec, hspec-discover, lens
      , parsers, QuickCheck, template-haskell, text, transformers
      , trifecta, wl-pprint
@@ -123055,6 +123654,42 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lens_4_13_1" = callPackage
+    ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring
+     , comonad, containers, contravariant, deepseq, directory
+     , distributive, doctest, exceptions, filepath, free
+     , generic-deriving, ghc-prim, hashable, hlint, HUnit
+     , kan-extensions, mtl, nats, parallel, profunctors, QuickCheck
+     , reflection, semigroupoids, semigroups, simple-reflect, tagged
+     , template-haskell, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, test-framework-th, text, transformers
+     , transformers-compat, unordered-containers, vector, void
+     }:
+     mkDerivation {
+       pname = "lens";
+       version = "4.13.1";
+       sha256 = "987137d11f189e08ceeb0e2e5c047c1456ad666642974067d2d8e11309ef6b7b";
+       libraryHaskellDepends = [
+         array base base-orphans bifunctors bytestring comonad containers
+         contravariant distributive exceptions filepath free ghc-prim
+         hashable kan-extensions mtl parallel profunctors reflection
+         semigroupoids semigroups tagged template-haskell text transformers
+         transformers-compat unordered-containers vector void
+       ];
+       testHaskellDepends = [
+         base bytestring containers deepseq directory doctest filepath
+         generic-deriving hlint HUnit mtl nats parallel QuickCheck
+         semigroups simple-reflect test-framework test-framework-hunit
+         test-framework-quickcheck2 test-framework-th text transformers
+         unordered-containers vector
+       ];
+       jailbreak = true;
+       homepage = "http://github.com/ekmett/lens/";
+       description = "Lenses, Folds and Traversals";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lens-action_0_1_0_1" = callPackage
     ({ mkDerivation, base, comonad, contravariant, directory, doctest
      , filepath, lens, mtl, profunctors, semigroupoids, semigroups
@@ -128108,7 +128743,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {objc = null;};
 
-  "luminance" = callPackage
+  "luminance_0_9_1" = callPackage
     ({ mkDerivation, base, containers, contravariant, dlist, gl, linear
      , mtl, resourcet, semigroups, transformers, vector, void
      }:
@@ -128123,9 +128758,10 @@ self: {
        homepage = "https://github.com/phaazon/luminance";
        description = "Type-safe, type-level and stateless graphics framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "luminance_0_9_1_1" = callPackage
+  "luminance" = callPackage
     ({ mkDerivation, base, containers, contravariant, dlist, gl, linear
      , mtl, resourcet, semigroups, transformers, vector, void
      }:
@@ -128140,6 +128776,23 @@ self: {
        homepage = "https://github.com/phaazon/luminance";
        description = "Type-safe, type-level and stateless graphics framework";
        license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "luminance_0_9_1_2" = callPackage
+    ({ mkDerivation, base, containers, contravariant, dlist, gl, linear
+     , mtl, resourcet, semigroups, transformers, vector, void
+     }:
+     mkDerivation {
+       pname = "luminance";
+       version = "0.9.1.2";
+       sha256 = "fd9d9b75c8bfff765eafc10023a709f10027928ea300932b82762e4543c10d5f";
+       libraryHaskellDepends = [
+         base containers contravariant dlist gl linear mtl resourcet
+         semigroups transformers vector void
+       ];
+       homepage = "https://github.com/phaazon/luminance";
+       description = "Type-safe, type-level and stateless graphics framework";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -128163,6 +128816,26 @@ self: {
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
+  "luminance-samples_0_9_1" = callPackage
+    ({ mkDerivation, base, contravariant, GLFW-b, JuicyPixels, linear
+     , luminance, mtl, resourcet, transformers
+     }:
+     mkDerivation {
+       pname = "luminance-samples";
+       version = "0.9.1";
+       sha256 = "e3c67132470eb7e5f9b16c291dd686c5e281a25e66dd2e8ffc307230897895f7";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base contravariant GLFW-b JuicyPixels linear luminance mtl
+         resourcet transformers
+       ];
+       homepage = "https://github.com/phaazon/luminance-samples";
+       description = "Luminance samples";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lushtags" = callPackage
     ({ mkDerivation, base, haskell-src-exts, text, vector }:
      mkDerivation {
@@ -131288,6 +131961,8 @@ self: {
        pname = "memoize";
        version = "0.7";
        sha256 = "04dbd6e367132c477342a3a7271438a9d2ec55cd433e1d01807a6091934d11eb";
+       revision = "1";
+       editedCabalFile = "4dccaf9fbeff4ff6207a78541ec3a6592db9c732fc65aa8bef1c5d8ff9c1f9f2";
        libraryHaskellDepends = [ base template-haskell ];
        description = "A memoization library";
        license = stdenv.lib.licenses.bsd3;
@@ -133138,6 +133813,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "mmorph_1_0_5" = callPackage
+    ({ mkDerivation, base, transformers }:
+     mkDerivation {
+       pname = "mmorph";
+       version = "1.0.5";
+       sha256 = "6ae92f8c9e0aa767ecce520833ac46d3cf293931050650dc8896be16fb16da9d";
+       libraryHaskellDepends = [ base transformers ];
+       description = "Monad morphisms";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mmtl" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -134406,6 +135093,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "monad-products_4_0_1" = callPackage
+    ({ mkDerivation, base, semigroupoids }:
+     mkDerivation {
+       pname = "monad-products";
+       version = "4.0.1";
+       sha256 = "02bfe1db2ae1a5cff19f73736a219605b1f0649f6af44ca848d09160a7946cea";
+       libraryHaskellDepends = [ base semigroupoids ];
+       homepage = "http://github.com/ekmett/monad-products";
+       description = "Monad products";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monad-ran" = callPackage
     ({ mkDerivation, base, ghc-prim, mtl }:
      mkDerivation {
@@ -134760,6 +135460,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "monadic-arrays_0_2_2" = callPackage
+    ({ mkDerivation, array, base, stm, transformers
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "monadic-arrays";
+       version = "0.2.2";
+       sha256 = "667714c6100272b48c4377cf2e2984b67a4445521a2a2e9c37539128c7e276a0";
+       libraryHaskellDepends = [
+         array base stm transformers transformers-compat
+       ];
+       homepage = "http://github.com/ekmett/monadic-arrays/";
+       description = "Boxed and unboxed arrays for monad transformers";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monadiccp" = callPackage
     ({ mkDerivation, base, containers, mtl, parsec, pretty, random }:
      mkDerivation {
@@ -152076,6 +152793,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pointed_5" = callPackage
+    ({ mkDerivation, base, comonad, containers, data-default-class
+     , hashable, kan-extensions, semigroupoids, semigroups, stm, tagged
+     , transformers, transformers-compat, unordered-containers
+     }:
+     mkDerivation {
+       pname = "pointed";
+       version = "5";
+       sha256 = "8906b8af5125ab3376794a290c5484dbec5a35d0bd0a57e94392ec0e12535d17";
+       libraryHaskellDepends = [
+         base comonad containers data-default-class hashable kan-extensions
+         semigroupoids semigroups stm tagged transformers
+         transformers-compat unordered-containers
+       ];
+       jailbreak = true;
+       homepage = "http://github.com/ekmett/pointed/";
+       description = "Pointed and copointed data";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pointedlist" = callPackage
     ({ mkDerivation, base, binary }:
      mkDerivation {
@@ -154117,6 +154855,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "prelude-extras_0_4_0_3" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "prelude-extras";
+       version = "0.4.0.3";
+       sha256 = "09bb087f0870a353ec1e7e1a08017b9a766d430d956afb88ca000a6a876bf877";
+       libraryHaskellDepends = [ base ];
+       homepage = "http://github.com/ekmett/prelude-extras";
+       description = "Higher order versions of Prelude classes";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "prelude-generalize" = callPackage
     ({ mkDerivation, base, comonad, logict, transformers }:
      mkDerivation {
@@ -154782,6 +155533,8 @@ self: {
        pname = "process-extras";
        version = "0.3.3.4";
        sha256 = "77d550a6aa270e41f55193025201f70410b8728028c72450837e329e3f3dd8b2";
+       revision = "1";
+       editedCabalFile = "2ab4fd50b430fda365a8d22012f2ad28ce27a96346c5ff7f7683bb5cbc85e761";
        libraryHaskellDepends = [
          base bytestring deepseq ListLike process text
        ];
@@ -154798,6 +155551,8 @@ self: {
        pname = "process-extras";
        version = "0.3.3.5";
        sha256 = "da546fabdb83755618cdd10cbe6510d995d1834a130a1d0342856fd80fd9dea1";
+       revision = "1";
+       editedCabalFile = "beaa9e19a781212403fe07d03b9aabf7d2ef482d9b7e9c51c1f2e8a1efb7e7a0";
        libraryHaskellDepends = [
          base bytestring deepseq ListLike process text
        ];
@@ -154806,6 +155561,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "process-extras_0_3_3_6" = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, ListLike, process, text
+     }:
+     mkDerivation {
+       pname = "process-extras";
+       version = "0.3.3.6";
+       sha256 = "a1638f8bf59873a271f86a948f9355a55f6f84bc580e7a0e673ca250ed966ed1";
+       revision = "1";
+       editedCabalFile = "b04a582a1803030f005ac9bc2f82f3eca132ce1a51661613a2986435bf7259ad";
+       libraryHaskellDepends = [
+         base bytestring deepseq ListLike process text
+       ];
+       homepage = "https://github.com/seereason/process-extras";
+       description = "Process extras";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "process-iterio" = callPackage
     ({ mkDerivation, base, bytestring, cpphs, iterIO, process
      , transformers
@@ -155231,6 +156004,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "profunctors_5_2" = callPackage
+    ({ mkDerivation, base, base-orphans, bifunctors, comonad
+     , contravariant, distributive, tagged, transformers
+     }:
+     mkDerivation {
+       pname = "profunctors";
+       version = "5.2";
+       sha256 = "87a7e25c4745ea8ff479dd1212ec2e57710abb3d3dd30f948fa16be1d3ee05a4";
+       libraryHaskellDepends = [
+         base base-orphans bifunctors comonad contravariant distributive
+         tagged transformers
+       ];
+       jailbreak = true;
+       homepage = "http://github.com/ekmett/profunctors/";
+       description = "Profunctors";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "progress" = callPackage
     ({ mkDerivation, base, time }:
      mkDerivation {
@@ -155506,8 +156298,8 @@ self: {
     ({ mkDerivation, base, primitive }:
      mkDerivation {
        pname = "promises";
-       version = "0.2";
-       sha256 = "501daa14749b03ca3150946323cc111c1b260e48c43f9da0cbdb8de4e4ffec39";
+       version = "0.3";
+       sha256 = "bf7c901915c122e7ab270f4c90cf02e83a703bf78f246948dc2452dcd294f260";
        libraryHaskellDepends = [ base primitive ];
        homepage = "http://github.com/ekmett/promises/";
        description = "Lazy demand-driven promises";
@@ -157615,6 +158407,8 @@ self: {
        pname = "quickcheck-instances";
        version = "0.3.11";
        sha256 = "02962005e51d77b84e94dd0a8f3f1be89af6e8099d25e6c0bf417f364c323a10";
+       revision = "1";
+       editedCabalFile = "b87744a86ad200cf18eb3df19a1729cd93df3e87eea5e861881135e03d9c4f4c";
        libraryHaskellDepends = [
          array base bytestring containers hashable old-time QuickCheck text
          time unordered-containers
@@ -162427,6 +163221,26 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "resolve-trivial-conflicts_0_3_2_2" = callPackage
+    ({ mkDerivation, ansi-terminal, base, base-compat, Diff, directory
+     , filepath, mtl, optparse-applicative, process, unix
+     }:
+     mkDerivation {
+       pname = "resolve-trivial-conflicts";
+       version = "0.3.2.2";
+       sha256 = "2d68535d32943a6640845c86de751ab5185c687a2604c3435e4d757a2a263c1b";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         ansi-terminal base base-compat Diff directory filepath mtl
+         optparse-applicative process unix
+       ];
+       homepage = "https://github.com/ElastiLotem/resolve-trivial-conflicts";
+       description = "Remove trivial conflict markers in a git repository";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "resource-effect" = callPackage
     ({ mkDerivation, base, containers, extensible-effects, HUnit, mtl
      , QuickCheck, test-framework, test-framework-hunit
@@ -166703,7 +167517,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "sbv" = callPackage
+  "sbv_5_9" = callPackage
     ({ mkDerivation, array, async, base, base-compat, containers
      , crackNum, data-binary-ieee754, deepseq, directory, filepath
      , HUnit, mtl, old-time, pretty, process, QuickCheck, random, syb
@@ -166728,9 +167542,10 @@ self: {
        homepage = "http://leventerkok.github.com/sbv/";
        description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "sbv_5_11" = callPackage
+  "sbv" = callPackage
     ({ mkDerivation, array, async, base, base-compat, containers
      , crackNum, data-binary-ieee754, deepseq, directory, filepath
      , HUnit, mtl, old-time, pretty, process, QuickCheck, random, syb
@@ -166755,7 +167570,6 @@ self: {
        homepage = "http://leventerkok.github.com/sbv/";
        description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sbvPlugin" = callPackage
@@ -168744,6 +169558,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "semigroupoids_5_0_1" = callPackage
+    ({ mkDerivation, base, base-orphans, bifunctors, comonad
+     , containers, contravariant, directory, distributive, doctest
+     , filepath, semigroups, tagged, transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "semigroupoids";
+       version = "5.0.1";
+       sha256 = "0ce989b8b0dc02ebe9aa19c47982a6bc802b8dc973c39c7ac40ea7a21cdbd616";
+       revision = "1";
+       editedCabalFile = "94d9167b701f148cb429e6746dd2bbb3b6559521b7fc2e98ce47339ad09af9f2";
+       libraryHaskellDepends = [
+         base base-orphans bifunctors comonad containers contravariant
+         distributive semigroups tagged transformers transformers-compat
+       ];
+       testHaskellDepends = [ base directory doctest filepath ];
+       homepage = "http://github.com/ekmett/semigroupoids";
+       description = "Semigroupoids: Category sans id";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "semigroupoids-syntax" = callPackage
     ({ mkDerivation, base, comonad, containers, contravariant
      , directory, distributive, doctest, filepath, QuickCheck
@@ -170866,8 +171702,8 @@ self: {
     ({ mkDerivation, base, containers, utility-ht }:
      mkDerivation {
        pname = "set-cover";
-       version = "0.0.5";
-       sha256 = "a3a4b4f2099780fe5652036346d7dae2bf1db4a56e77e663ca6964312dec7c99";
+       version = "0.0.6";
+       sha256 = "6b1554247fda64306c4d47957b00794e06e0744f9996d287dbdb6612774179f9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers utility-ht ];
@@ -171093,8 +171929,8 @@ self: {
      }:
      mkDerivation {
        pname = "sexp-grammar";
-       version = "1.0.0";
-       sha256 = "e90495a6fd7993cd4f943a5a9e2759304a9f055a8cea0c2bc2f94645bc150a1e";
+       version = "1.1.0";
+       sha256 = "e784db96a9fdcf1fe5f48adfc62e8b4ef9795bf4558769c149f244ed5ef9415c";
        libraryHaskellDepends = [
          array base containers mtl scientific semigroups split stack-prism
          template-haskell text wl-pprint-text
@@ -172389,6 +173225,8 @@ self: {
        pname = "shelltestrunner";
        version = "1.3.5";
        sha256 = "4265eb9cc87c352655099da26f49fb7829f5163edd03a20105b7a25609d3a829";
+       revision = "1";
+       editedCabalFile = "4ccce28f099594a89bbb8ff9c8f6408955b4be02a01eb2d552e1ce7165dce3aa";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -172396,7 +173234,6 @@ self: {
          pretty-show process regex-tdfa safe test-framework
          test-framework-hunit utf8-string
        ];
-       jailbreak = true;
        homepage = "http://joyful.com/shelltestrunner";
        description = "A tool for testing command-line programs";
        license = "GPL";
@@ -172905,8 +173742,8 @@ self: {
      }:
      mkDerivation {
        pname = "sign";
-       version = "0.4.2";
-       sha256 = "2ce6cc3b2803f11ad03abaf5ca0b11b37aa131f3867d8f3a741f0b9b51d67659";
+       version = "0.4.3";
+       sha256 = "77855b6953a17cdba1459efc5241b7174cd628629583245ced96684dfd1f7544";
        libraryHaskellDepends = [
          base containers deepseq hashable lattices universe-base
        ];
@@ -177817,6 +178654,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "speculation_1_5_0_3" = callPackage
+    ({ mkDerivation, base, ghc-prim, stm, transformers }:
+     mkDerivation {
+       pname = "speculation";
+       version = "1.5.0.3";
+       sha256 = "73bf641a87e0d28a2ba233922db936e0776c3dc24ed421f6f963f015e2eb4d3f";
+       libraryHaskellDepends = [ base ghc-prim stm transformers ];
+       homepage = "http://github.com/ekmett/speculation";
+       description = "A framework for safe, programmable, speculative parallelism";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "speculation-transformers" = callPackage
     ({ mkDerivation, speculation }:
      mkDerivation {
@@ -179435,8 +180285,8 @@ self: {
        pname = "stack";
        version = "1.0.0";
        sha256 = "cd2f606d390fe521b6ba0794de87edcba64c4af66856af09594907c2b4f4751d";
-       revision = "5";
-       editedCabalFile = "a0067126d4f6e5ed16ca552886c9010f9bc4813b582736313e6d5e78a7ed581c";
+       revision = "6";
+       editedCabalFile = "d2de14a5f76d0d1b7ff78d1a7647a429e4151ffdda57fa3b061a0c5641272931";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -186820,6 +187670,27 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "tellbot_0_6_0_11" = callPackage
+    ({ mkDerivation, base, bifunctors, bytestring, containers
+     , http-conduit, mtl, network, regex-pcre, split, tagsoup, text
+     , time, transformers
+     }:
+     mkDerivation {
+       pname = "tellbot";
+       version = "0.6.0.11";
+       sha256 = "0589e73acc704ef0b38e59b98caba0faba9aef9802672f50efc1fcb7c0287c9f";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bifunctors bytestring containers http-conduit mtl network
+         regex-pcre split tagsoup text time transformers
+       ];
+       homepage = "https://github.com/phaazon/tellbot";
+       description = "IRC tellbot";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "template" = callPackage
     ({ mkDerivation, base, mtl, text }:
      mkDerivation {
@@ -187311,6 +188182,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "terntup" = callPackage
+    ({ mkDerivation, base, HUnit, QuickCheck, test-framework
+     , test-framework-hunit, test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "terntup";
+       version = "0.0.1";
+       sha256 = "ffbb4c7dd4ccf56628360671a31745125a52f8131254fc98f2041e32bbe93ff7";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base HUnit QuickCheck test-framework test-framework-hunit
+         test-framework-quickcheck2
+       ];
+       description = "a ternary library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "terrahs" = callPackage
     ({ mkDerivation, base, haskell98, old-time, terralib4c, translib }:
      mkDerivation {
@@ -192114,14 +193002,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "transformers_0_5_0_0" = callPackage
+  "transformers_0_5_0_2" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "transformers";
-       version = "0.5.0.0";
-       sha256 = "720541fc11ed72737c7059f47836361edb05f6eadcd535fffbee8801f3d03feb";
-       revision = "1";
-       editedCabalFile = "b85ec9307ae228bde57c06b96bf25e4518d22ad40daccf285cf7d1f31c1dc2ab";
+       version = "0.5.0.2";
+       sha256 = "3fb9c00cae4b0531a05d29c8d21de775352b97c8ab1091f35e9acdbee28facc6";
        libraryHaskellDepends = [ base ];
        description = "Concrete functor and monad transformers";
        license = stdenv.lib.licenses.bsd3;
@@ -192219,6 +193105,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "transformers-compat_0_5_1_4" = callPackage
+    ({ mkDerivation, base, ghc-prim, transformers }:
+     mkDerivation {
+       pname = "transformers-compat";
+       version = "0.5.1.4";
+       sha256 = "d881ef4ec164b631591b222efe7ff555af6d5397c9d86475b309ba9402a8ca9f";
+       libraryHaskellDepends = [ base ghc-prim transformers ];
+       homepage = "http://github.com/ekmett/transformers-compat/";
+       description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms.";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "transformers-compose" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
@@ -195667,6 +196566,8 @@ self: {
        pname = "unique";
        version = "0";
        sha256 = "e3fb171b7b1787683863934df0fc082fb47c0da6972bb1839c2ee8ceb64a0a90";
+       revision = "1";
+       editedCabalFile = "68933757e4bd3e7f53f226bd344f8ee980e86fe74eed20fa19edb5867c51035f";
        libraryHaskellDepends = [ base ghc-prim hashable ];
        homepage = "http://github.com/ekmett/unique/";
        description = "Fully concurrent unique identifiers";

From d3d0978abff4c95027e7c7cdf7ede7476accb26e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 16 Jan 2016 17:47:19 +0100
Subject: [PATCH 831/884] darcs: remove obsolete overrides

---
 pkgs/development/haskell-modules/configuration-common.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index f826b0a4b079..e562d910f8f6 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -180,11 +180,8 @@ self: super: {
   wai-test = dontHaddock super.wai-test;
   zlib-conduit = dontHaddock super.zlib-conduit;
 
-  # Jailbreak doesn't get the job done because the Cabal file uses conditionals a lot.
-  darcs = (overrideCabal super.darcs (drv: {
-    doCheck = false;            # The test suite won't even start.
-    postPatch = "sed -i -e 's|attoparsec .*,|attoparsec,|' -e 's|vector .*,|vector,|' darcs.cabal";
-  }));
+  # The test suite won't even start.
+  darcs = dontCheck super.darcs;
 
   # https://github.com/massysett/rainbox/issues/1
   rainbox = dontCheck super.rainbox;

From 1c74ad9f04a03bdf5f2c28caa8e01d9127ba10c5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 17 Jan 2016 10:50:29 +0100
Subject: [PATCH 832/884] haskell-transformers-compat: use latest version when
 building with GHC 8.0.x.

---
 pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
index e4bc4e5d734e..cc5034008bb6 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -45,6 +45,9 @@ self: super: {
   # Older versions of QuickCheck don't support our version of Template Haskell.
   QuickCheck = self.QuickCheck_2_8_2;
 
+  # Older versions don't support our version of transformers.
+  transformers-compat = self.transformers-compat_0_5_1_4;
+
   # https://github.com/hspec/HUnit/issues/7
   HUnit = dontCheck super.HUnit;
 

From 9815d92d913963f9d516f6a6397ad34fa5cf6711 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 17 Jan 2016 10:54:04 +0100
Subject: [PATCH 833/884] haskell-generic-builder: GHC 8.0.x wants
 --disable-profiling instead of --disable-executable-profiling

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

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 8e2a61806022..ad820012bd1a 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -88,7 +88,7 @@ let
     (optionalString useCpphs "--with-cpphs=${cpphs}/bin/cpphs --ghc-options=-cpp --ghc-options=-pgmP${cpphs}/bin/cpphs --ghc-options=-optP--cpp")
     (enableFeature enableSplitObjs "split-objs")
     (enableFeature enableLibraryProfiling "library-profiling")
-    (enableFeature enableExecutableProfiling "executable-profiling")
+    (enableFeature enableExecutableProfiling (if versionOlder ghc.version "8" then "executable-profiling" else "profiling"))
     (enableFeature enableSharedLibraries "shared")
     (optionalString (isGhcjs || versionOlder "7" ghc.version) (enableFeature enableStaticLibraries "library-vanilla"))
     (optionalString (isGhcjs || versionOlder "7.4" ghc.version) (enableFeature enableSharedExecutables "executable-dynamic"))

From f62bcff14d166c24652290468b4b2f599c530c6a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 16 Jan 2016 16:52:10 +0100
Subject: [PATCH 834/884] configuration-hackage2nix.yaml: update list of broken
 packages

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

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index cbf95632479c..89cc68e584f2 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -3951,3 +3951,4 @@ dont-distribute-packages:
   zsh-battery:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ztail:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Zwaluw:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fltkhs-hello-world:                           [ i686-linux, x86_64-linux, x86_64-darwin ]

From a3e7adf509a77b1c177bf69a9d04662ae4d9db7b Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 17 Jan 2016 12:34:54 +0100
Subject: [PATCH 835/884] nixos/plex: fix service startup, see #12422

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

diff --git a/nixos/modules/services/misc/plex.nix b/nixos/modules/services/misc/plex.nix
index b9a58c0c5d50..fb62351365ed 100644
--- a/nixos/modules/services/misc/plex.nix
+++ b/nixos/modules/services/misc/plex.nix
@@ -75,7 +75,7 @@ in
       preStart = ''
         test -d "${cfg.dataDir}" || {
           echo "Creating initial Plex data directory in \"${cfg.dataDir}\"."
-          mkdir -p "${cfg.dataDir}"
+          mkdir -p "${cfg.dataDir}/Plex Media Server"
           chown -R ${cfg.user}:${cfg.group} "${cfg.dataDir}"
         }
 

From 93279824861d6a8eab9babab04dec503c854225e Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Sun, 17 Jan 2016 13:04:54 +0100
Subject: [PATCH 836/884] Add volume and cd events to acpid configuration

---
 nixos/modules/services/hardware/acpid.nix | 93 ++++++++++++++++++++++-
 1 file changed, 92 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/hardware/acpid.nix b/nixos/modules/services/hardware/acpid.nix
index e3421899d36e..48b2b6be09ed 100644
--- a/nixos/modules/services/hardware/acpid.nix
+++ b/nixos/modules/services/hardware/acpid.nix
@@ -20,7 +20,7 @@ let
       }
     '';
 
-  events = [powerEvent lidEvent acEvent];
+  events = [powerEvent lidEvent acEvent muteEvent volumeDownEvent volumeUpEvent cdPlayEvent cdNextEvent cdPrevEvent];
 
   # Called when the power button is pressed.
   powerEvent =
@@ -55,6 +55,61 @@ let
         '';
     };
 
+  muteEvent = {
+    name = "mute";
+    event = "button/mute.*";
+    action = ''
+      #! ${pkgs.bash}/bin/sh
+      ${config.services.acpid.muteCommands}
+    '';
+  };
+
+  volumeDownEvent = {
+    name = "volume-down";
+    event = "button/volumedown.*";
+    action = ''
+      #! ${pkgs.bash}/bin/sh
+      ${config.services.acpid.volumeDownEventCommands}
+    '';
+  };
+
+  volumeUpEvent = {
+    name = "volume-up";
+    event = "button/volumeup.*";
+    action = ''
+      #! ${pkgs.bash}/bin/sh
+      ${config.services.acpid.volumeUpEventCommands}
+    '';
+  };
+
+  cdPlayEvent = {
+    name = "cd-play";
+    event = "cd/play.*";
+    action = ''
+      #! ${pkgs.bash}/bin/sh
+      ${config.services.acpid.cdPlayEventCommands}
+    '';
+  };
+
+  cdNextEvent = {
+    name = "cd-next";
+    event = "cd/next.*";
+    action = ''
+      #! ${pkgs.bash}/bin/sh
+      ${config.services.acpid.cdNextEventCommands}
+    '';
+  };
+
+  cdPrevEvent = {
+    name = "cd-prev";
+    event = "cd/prev.*";
+    action = ''
+      #! ${pkgs.bash}/bin/sh
+      ${config.services.acpid.cdPrevEventCommands}
+    '';
+  };
+
+
 in
 
 {
@@ -89,6 +144,42 @@ in
         description = "Shell commands to execute on an ac_adapter.* event.";
       };
 
+      muteCommands = mkOption {
+        type = types.lines;
+        default = "";
+        description = "Shell commands to execute on an button/mute.* event.";
+      };
+
+      volumeDownEventCommands = mkOption {
+        type = types.lines;
+        default = "";
+        description = "Shell commands to execute on an button/volumedown.* event.";
+      };
+
+      volumeUpEventCommands = mkOption {
+        type = types.lines;
+        default = "";
+        description = "Shell commands to execute on an button/volumeup.* event.";
+      };
+
+      cdPlayEventCommands = mkOption {
+        type = types.lines;
+        default = "";
+        description = "Shell commands to execute on an cd/play.* event.";
+      };
+
+      cdNextEventCommands = mkOption {
+        type = types.lines;
+        default = "";
+        description = "Shell commands to execute on an cd/next.* event.";
+      };
+
+      cdPrevEventCommands = mkOption {
+        type = types.lines;
+        default = "";
+        description = "Shell commands to execute on an cd/prev.* event.";
+      };
+
     };
 
   };

From 8bc95895e11d3ebd1b9c3d76ba95622d09779b03 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 17 Jan 2016 15:00:41 +0300
Subject: [PATCH 837/884] openmpi: remove enableStatic while it's still hot

Eelco showed alternative way of building static libraries via
stdenv adapter in a conversation several days ago and expressed
concern about adding new enableStatic flags.
---
 pkgs/development/libraries/openmpi/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix
index 194a794235ab..1862e633ad50 100644
--- a/pkgs/development/libraries/openmpi/default.nix
+++ b/pkgs/development/libraries/openmpi/default.nix
@@ -5,9 +5,6 @@
 
 # Pass PATH/LD_LIBRARY_PATH to point to current mpirun by default
 , enablePrefix ? false
-
-# Build static libraries
-, enableStatic ? false
 }:
 
 with stdenv.lib;
@@ -30,7 +27,6 @@ in stdenv.mkDerivation rec {
   configureFlags = []
     ++ optional enableSGE "--with-sge"
     ++ optional enablePrefix "--enable-mpirun-prefix-by-default"
-    ++ optional enableStatic "--enable-static"
     ;
 
   enableParallelBuilding = true;

From 67a61addf4d7ba22c916c655f4682f067045e137 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 17 Jan 2016 14:06:15 +0100
Subject: [PATCH 838/884] abduco: 0.4 -> 0.5

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

diff --git a/pkgs/tools/misc/abduco/default.nix b/pkgs/tools/misc/abduco/default.nix
index c9c526bc520f..d8f53a032af8 100644
--- a/pkgs/tools/misc/abduco/default.nix
+++ b/pkgs/tools/misc/abduco/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-    name = "abduco-0.4";
+    name = "abduco-0.5";
 
     meta = {
         homepage = http://brain-dump.org/projects/abduco;
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
     src = fetchurl {
         url = "http://www.brain-dump.org/projects/abduco/${name}.tar.gz";
-        sha256 = "1fxwg2s5w183p0rwzsxizy9jdnilv5qqs647l3wl3khny6fp58xx";
+        sha256 = "11phry5wnvwm9ckij5gxbrjfgdz3x38vpnm505q5ldc88im248mz";
     };
 
     configFile = optionalString (conf!=null) (writeText "config.def.h" conf);

From 5dbf70b92489387e4d86919139b64b9dab0c40e0 Mon Sep 17 00:00:00 2001
From: Slawomir Gonet <slawek@otwiera.cz>
Date: Sun, 17 Jan 2016 14:15:59 +0100
Subject: [PATCH 839/884] 0ad: binary renamed from 'pyrogenesis' to '0ad'

---
 pkgs/games/0ad/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/0ad/default.nix b/pkgs/games/0ad/default.nix
index e2897c5253cb..f9eb90f34f8c 100644
--- a/pkgs/games/0ad/default.nix
+++ b/pkgs/games/0ad/default.nix
@@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     # Copy executables.
     mkdir -p "$out"/bin
-    cp binaries/system/pyrogenesis "$out"/bin/
+    cp binaries/system/pyrogenesis "$out"/bin/0ad
     ((${ toString withEditor })) && cp binaries/system/ActorEditor "$out"/bin/
 
     # Copy l10n data.

From a0c40bfcffcc533f3ec6c7b34edf79a055e496d8 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 17 Jan 2016 14:56:12 +0100
Subject: [PATCH 840/884] python-radicale: 1.0.1 -> 1.1.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 76fd2950ad6e..de970ba58694 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6537,11 +6537,11 @@ in modules // {
   radicale = buildPythonPackage rec {
     name = "radicale-${version}";
     namePrefix = "";
-    version = "1.0.1";
+    version = "1.1.1";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/R/Radicale/Radicale-${version}.tar.gz";
-      sha256 = "0q0vxqg32lp9bzbqn06x7igwq3a9hcmpspvj3icyf0rlg786i2p1";
+      sha256 = "1c5lv8qca21mndkx350wxv34qypqh6gb4rhzms4anr642clq3jg2";
     };
 
     propagatedBuildInputs = with self; [
@@ -6550,7 +6550,7 @@ in modules // {
       sqlalchemy
     ];
 
-    doCheck = false;
+    doCheck = true;
 
     meta = {
       homepage = http://www.radicale.org/;

From 3a14a5b37584f1ae418697b933f3d3c48a480fb6 Mon Sep 17 00:00:00 2001
From: Matthew O'Gorman <mog@rldn.net>
Date: Sat, 16 Jan 2016 20:46:17 -0500
Subject: [PATCH 841/884] sopel: init at 6.1.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bcf84f13cd80..1ce7f1acb062 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17996,6 +17996,26 @@ in modules // {
     };
   };
 
+  sopel = buildPythonPackage rec {
+    name = "sopel-6.1.1";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/s/sopel/${name}.tar.gz";
+      sha256 = "0nr2a88bkxg2593dd947qkh96g8j32q7pl7x9zvx4158h4bgx99y";
+    };
+
+    propagatedBuildInputs = with self; [ praw xmltodict pytz pyenchant pygeoip ];
+
+    disabled = isPyPy || isPy26 || isPy27;
+
+    meta = {
+      description = "Simple and extensible IRC bot";
+      homepage = "http://sopel.chat";
+      license = licenses.efl20;
+      maintainers = with maintainers; [ mog ];
+    };
+  };
+
   stevedore = buildPythonPackage rec {
     name = "stevedore-1.7.0";
 

From 6f94a131e8a781fc3aa681b2953a7a44a5faf535 Mon Sep 17 00:00:00 2001
From: Louis Taylor <louis@kragniz.eu>
Date: Sun, 17 Jan 2016 16:30:42 +0000
Subject: [PATCH 842/884] pythonPackages.binaryornot: init at 0.4.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b9e1112e762b..91a617e5bd27 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1923,6 +1923,27 @@ in modules // {
   };
 
 
+  binaryornot = buildPythonPackage rec {
+    name = "binaryornot-${version}";
+    version = "0.4.0";
+
+    src = pkgs.fetchurl {
+      url ="https://pypi.python.org/packages/source/b/binaryornot/${name}.tar.gz";
+      sha256 = "1j4f51dxic39mdwf6alj7gd769wy6mhk916v031wjali51xkh3xb";
+    };
+
+    buildInputs = with self; [ hypothesis sqlite3 ];
+
+    propagatedBuildInputs = with self; [ chardet ];
+
+    meta = {
+      homepage = https://github.com/audreyr/binaryornot;
+      description = "Ultra-lightweight pure Python package to check if a file is binary or text";
+      license = licenses.bsd3;
+    };
+  };
+
+
   bitbucket_api = buildPythonPackage rec {
     name = "bitbucket-api-0.4.4";
 

From 84c8763a1763b5aef93f73aef67e59f6189f1436 Mon Sep 17 00:00:00 2001
From: Louis Taylor <louis@kragniz.eu>
Date: Sun, 17 Jan 2016 16:30:52 +0000
Subject: [PATCH 843/884] pythonPackages.whichcraft: init at 0.1.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 91a617e5bd27..bd8d9b554862 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21716,6 +21716,24 @@ in modules // {
     };
   };
 
+
+  whichcraft = buildPythonPackage rec {
+    name = "whichcraft-${version}";
+    version = "0.1.1";
+
+    src = pkgs.fetchurl {
+      url = "https://github.com/pydanny/whichcraft/archive/${version}.tar.gz";
+      sha256 = "1xqp66knzlb01k30qic40vzwl51jmlsb8r96iv60m2ca6623abbv";
+    };
+
+    meta = {
+      homepage = https://github.com/pydanny/whichcraft;
+      description = "Cross-platform cross-python shutil.which functionality";
+      license = licenses.bsd3;
+    };
+  };
+
+
   whisper = buildPythonPackage rec {
     name = "whisper-${version}";
     version = "0.9.12";

From d0db3c2d52e754205008c9b19d9a0e66e5a24b7b Mon Sep 17 00:00:00 2001
From: Louis Taylor <louis@kragniz.eu>
Date: Sun, 17 Jan 2016 16:30:57 +0000
Subject: [PATCH 844/884] pythonPackages.future: 0.14.3 -> 0.15.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bd8d9b554862..7168f3c3294c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8549,12 +8549,12 @@ in modules // {
   };
 
   future = buildPythonPackage rec {
-    version = "0.14.3";
+    version = "0.15.2";
     name = "future-${version}";
 
     src = pkgs.fetchurl {
       url = "http://github.com/PythonCharmers/python-future/archive/v${version}.tar.gz";
-      sha256 = "0hgp9kq7h4ipw8ax5xvvkyh3bkqw361d3rndvb9xix01h9j9mi3p";
+      sha256 = "0vm61j5br6jiry6pgcxnwvxhki8ksnirp7k9mcbmxmgib3r60xd3";
     };
 
     propagatedBuildInputs = with self; optionals isPy26 [ importlib argparse ];

From a5846c6c51d43b2e956dcf9f77451aaf590f3def Mon Sep 17 00:00:00 2001
From: Louis Taylor <louis@kragniz.eu>
Date: Sun, 17 Jan 2016 16:31:05 +0000
Subject: [PATCH 845/884] pythonPackages.ruamel_yaml: init at 0.10.13

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7168f3c3294c..50c1dd190f3c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17544,6 +17544,24 @@ in modules // {
     };
   };
 
+  ruamel_yaml = buildPythonPackage rec {
+    name = "ruamel.yaml-${version}";
+    version = "0.10.13";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/r/ruamel.yaml/${name}.tar.gz";
+      sha256 = "0r9mn5lm9dcxpy0wpn18cp7i5hkvjvknv3dxg8d9ca6km39m4asn";
+    };
+
+    propagatedBuildInputs = with self; [ ruamel_base ruamel_ordereddict ];
+
+    meta = {
+      description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order";
+      homepage = https://bitbucket.org/ruamel/yaml;
+      license = licenses.mit;
+    };
+  };
+
   runsnakerun = buildPythonPackage rec {
     name = "runsnakerun-2.0.4";
 

From 96bb93a5a1218e5a267110ebbe13760b423a6b31 Mon Sep 17 00:00:00 2001
From: Louis Taylor <louis@kragniz.eu>
Date: Sun, 17 Jan 2016 16:31:10 +0000
Subject: [PATCH 846/884] pythonPackages.ruamel_ordereddict: init at 0.4.9

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 50c1dd190f3c..81fe952a92cd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17544,6 +17544,23 @@ in modules // {
     };
   };
 
+  ruamel_ordereddict = buildPythonPackage rec {
+    name = "ruamel.ordereddict-${version}";
+    version = "0.4.9";
+    disabled = isPy3k || isPyPy;
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/r/ruamel.ordereddict/${name}.tar.gz";
+      sha256 = "1xmkl8v9l9inm2pyxgc1fm5005yxm7fkd5gv74q7lj1iy5qc8n3h";
+    };
+
+    meta = {
+      description = "a version of dict that keeps keys in insertion resp. sorted order";
+      homepage = https://bitbucket.org/ruamel/ordereddict;
+      license = licenses.mit;
+    };
+  };
+
   ruamel_yaml = buildPythonPackage rec {
     name = "ruamel.yaml-${version}";
     version = "0.10.13";

From ff5c859460ed5d81885aa42a69136e34e879fc45 Mon Sep 17 00:00:00 2001
From: Louis Taylor <louis@kragniz.eu>
Date: Sun, 17 Jan 2016 16:31:17 +0000
Subject: [PATCH 847/884] pythonPackages.ruamel_base: init at 1.0.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 81fe952a92cd..a0d07451299d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17544,6 +17544,22 @@ in modules // {
     };
   };
 
+  ruamel_base = buildPythonPackage rec {
+    name = "ruamel.base-${version}";
+    version = "1.0.0";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/r/ruamel.base/${name}.tar.gz";
+      sha256 = "1wswxrn4givsm917mfl39rafgadimf1sldpbjdjws00g1wx36hf0";
+    };
+
+    meta = {
+      description = "common routines for ruamel packages";
+      homepage = https://bitbucket.org/ruamel/base;
+      license = licenses.mit;
+    };
+  };
+
   ruamel_ordereddict = buildPythonPackage rec {
     name = "ruamel.ordereddict-${version}";
     version = "0.4.9";

From 9fa25759cc5b3d2eeaed7c24d2ce60e619ddba00 Mon Sep 17 00:00:00 2001
From: Louis Taylor <louis@kragniz.eu>
Date: Sun, 17 Jan 2016 16:31:22 +0000
Subject: [PATCH 848/884] pythonPackages.chardet: 2.1.1 -> 2.3.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a0d07451299d..7b92c9146fa8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7244,11 +7244,11 @@ in modules // {
   };
 
   chardet = buildPythonPackage rec {
-    name = "chardet-2.1.1";
+    name = "chardet-2.3.0";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/c/chardet/${name}.tar.gz";
-      md5 = "295367fd210d20f3febda615a88e1ef0";
+      md5 = "25274d664ccb5130adae08047416e1a8";
     };
 
     meta = {

From b0ca115059e971d56187a9975ddf09fe54ad1300 Mon Sep 17 00:00:00 2001
From: Louis Taylor <louis@kragniz.eu>
Date: Sun, 17 Jan 2016 16:31:28 +0000
Subject: [PATCH 849/884] pythonPackages.chardet: update homepage

---
 pkgs/top-level/python-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7b92c9146fa8..7d32e2701cca 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7252,7 +7252,7 @@ in modules // {
     };
 
     meta = {
-      homepage = https://github.com/erikrose/chardet;
+      homepage = https://github.com/chardet/chardet;
       description = "Universal encoding detector";
       license = licenses.lgpl2;
       maintainers = with maintainers; [ iElectric ];

From fb9052c098ffe8d6cab71e441ee8601540e826e7 Mon Sep 17 00:00:00 2001
From: Louis Taylor <louis@kragniz.eu>
Date: Sun, 17 Jan 2016 16:31:36 +0000
Subject: [PATCH 850/884] cookiecutter: init at 1.3.0

---
 pkgs/top-level/all-packages.nix    |  2 ++
 pkgs/top-level/python-packages.nix | 24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0ceeea9ac64c..8f5d0016ce7a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5619,6 +5619,8 @@ let
 
   complexity = callPackage ../development/tools/misc/complexity { };
 
+  cookiecutter = pythonPackages.cookiecutter;
+
   ctags = callPackage ../development/tools/misc/ctags { };
 
   ctagsWrapped = callPackage ../development/tools/misc/ctags/wrapped.nix {};
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7d32e2701cca..c7ec3ac2cb11 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3151,6 +3151,30 @@ in modules // {
     };
   };
 
+  cookiecutter = buildPythonPackage rec {
+    version = "1.3.0";
+    name = "cookiecutter-${version}";
+
+    # dependency problems, next release of cookiecutter should unblock these
+    disabled = isPy3k || isPyPy;
+
+    src = pkgs.fetchurl {
+      url = "https://github.com/audreyr/cookiecutter/archive/${version}.tar.gz";
+      sha256 = "1vchjvh7591nczz2zz55aghk9mhpm6kqgm62d05d4mjrx9xjkdcg";
+    };
+
+    buildInputs = with self; [ itsdangerous  ];
+    propagatedBuildInputs = with self; [
+          jinja2 future binaryornot click whichcraft ruamel_yaml ];
+
+    meta = {
+      homepage = https://github.com/audreyr/cookiecutter;
+      description = "A command-line utility that creates projects from project templates";
+      license = licenses.bsd3;
+      maintainers = with maintainers; [ kragniz ];
+    };
+  };
+
   cookies = buildPythonPackage rec {
     name = "cookies-2.2.1";
 

From 641a951c614cf8ef91e0fb1c856896dace313a77 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Sun, 17 Jan 2016 17:54:33 +0100
Subject: [PATCH 851/884] i18n: Fix vconsole colorscheme generation

Close #12442.
abbradar: remove trailing spaces.
---
 nixos/modules/tasks/kbd.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/tasks/kbd.nix b/nixos/modules/tasks/kbd.nix
index e36e9f85f1e3..e1574fa68ad9 100644
--- a/nixos/modules/tasks/kbd.nix
+++ b/nixos/modules/tasks/kbd.nix
@@ -5,13 +5,13 @@ with lib;
 let
 
   makeColor = n: value: "COLOR_${toString n}=${value}";
+  colors = concatImapStringsSep "\n" makeColor config.i18n.consoleColors;
 
-  vconsoleConf = pkgs.writeText "vconsole.conf"
-    ''
-      KEYMAP=${config.i18n.consoleKeyMap}
-      FONT=${config.i18n.consoleFont}
-    '' + concatImapStringsSep "\n" makeColor config.i18n.consoleColors;
-
+  vconsoleConf = pkgs.writeText "vconsole.conf" ''
+    KEYMAP=${config.i18n.consoleKeyMap}
+    FONT=${config.i18n.consoleFont}
+    ${colors}
+  '';
 in
 
 {

From 656acf3719e1d6d910761c4b1e050ac0fae46629 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 17 Jan 2016 16:12:27 +0000
Subject: [PATCH 852/884] mates: remove package

see #11926 for context

closes #11926
---
 pkgs/tools/misc/mates/default.nix | 24 ------------------------
 pkgs/top-level/all-packages.nix   |  2 --
 2 files changed, 26 deletions(-)
 delete mode 100644 pkgs/tools/misc/mates/default.nix

diff --git a/pkgs/tools/misc/mates/default.nix b/pkgs/tools/misc/mates/default.nix
deleted file mode 100644
index 952bd1a2b7d9..000000000000
--- a/pkgs/tools/misc/mates/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchFromGitHub, rustPlatform }:
-
-with rustPlatform;
-
-buildRustPackage rec {
-  name = "mates-${version}";
-  version = "0.1.0";
-
-  depsSha256 = "03mqw9zs3hbsgz8m3qbrbbcg2q47nldfx280dyv0ivfksnlc7lyc";
-
-  src = fetchFromGitHub {
-    owner = "untitaker";
-    repo = "mates";
-    rev = "${version}";
-    sha256 = "00dpl7vh2byb4v94zxjbcqj7jnq65vcbrlpkxrrii0ip13dr69pw";
-  };
-
-  meta = with stdenv.lib; {
-    description = "Very simple commandline addressbook";
-    homepage = https://github.com/untitaker/mates.rs;
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ maintainers.DamienCassou ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f3276406e076..42999213eb0e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2248,8 +2248,6 @@ let
 
   man_db = callPackage ../tools/misc/man-db { };
 
-  mates = callPackage ../tools/misc/mates { };
-
   mawk = callPackage ../tools/text/mawk { };
 
   mbox = callPackage ../tools/security/mbox { };

From ae5ef2b00955a8b8cbcc93a6682a8275c4d5e52c Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sat, 26 Dec 2015 23:23:04 +0100
Subject: [PATCH 853/884] pygraphviz: init at 1.3

changes by @globin:
1.2 -> 1.3
correct license information

Signed-off-by: Robin Gloster <mail@glob.in>
---
 pkgs/top-level/python-packages.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e93373fe45aa..48c3d3d148e5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11228,6 +11228,25 @@ in modules // {
     };
   };
 
+  pygraphviz = buildPythonPackage rec {
+    version = "1.3";
+    name = "pygraphviz-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://github.com/pygraphviz/pygraphviz/archive/${name}.tar.gz";
+      sha256 = "1fhn123hy4qj0zmmmbx0q0r4hwikay13yirsp74niiw5d52y7ib8";
+    };
+
+    propagatedBuildInputs = [ pkgs.graphviz pkgs.pkgconfig ];
+
+    meta = {
+      description = "Python interface to Graphviz graph drawing package";
+      homepage = https://github.com/pygraphviz/pygraphviz;
+      license = licenses.bsd3;
+      maintainers = with maintainers; [ matthiasbeyer ];
+    };
+  };
+
   pymysql = buildPythonPackage rec {
     name = "pymysql-${version}";
     version = "0.6.6";

From a04a7272aa38ada45e694281071b720d4abbd0df Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Sun, 17 Jan 2016 19:34:55 +0100
Subject: [PATCH 854/884] Add missing 'type', 'defaultText' and
 'literalExample' in module definitions

- add missing types in module definitions
- add missing 'defaultText' in module definitions
- wrap example with 'literalExample' where necessary in module definitions
---
 nixos/modules/config/ldap.nix                 |  1 +
 nixos/modules/config/pulseaudio.nix           |  1 +
 nixos/modules/config/shells-environment.nix   |  1 +
 nixos/modules/config/unix-odbc-drivers.nix    |  5 ++-
 nixos/modules/misc/crashdump.nix              |  1 +
 nixos/modules/misc/nixos.nix                  |  4 +-
 nixos/modules/programs/ssh.nix                | 24 +++++++-----
 nixos/modules/services/audio/liquidsoap.nix   |  2 +-
 nixos/modules/services/backup/bacula.nix      |  4 +-
 nixos/modules/services/backup/rsnapshot.nix   |  1 +
 .../jenkins/default.nix                       |  1 +
 .../jenkins/job-builder.nix                   |  2 +-
 nixos/modules/services/databases/couchdb.nix  |  1 +
 nixos/modules/services/databases/firebird.nix |  1 +
 nixos/modules/services/databases/hbase.nix    |  1 +
 nixos/modules/services/databases/influxdb.nix |  1 +
 nixos/modules/services/databases/mongodb.nix  |  1 +
 nixos/modules/services/databases/neo4j.nix    |  1 +
 nixos/modules/services/databases/openldap.nix | 30 +++++++-------
 nixos/modules/services/databases/opentsdb.nix |  1 +
 nixos/modules/services/databases/redis.nix    |  1 +
 nixos/modules/services/hardware/freefall.nix  |  1 +
 nixos/modules/services/hardware/upower.nix    |  1 +
 nixos/modules/services/logging/logrotate.nix  |  1 +
 nixos/modules/services/logging/logstash.nix   |  3 +-
 nixos/modules/services/logging/syslog-ng.nix  |  1 +
 nixos/modules/services/mail/dovecot.nix       |  3 +-
 nixos/modules/services/misc/apache-kafka.nix  |  3 +-
 nixos/modules/services/misc/autofs.nix        |  3 +-
 nixos/modules/services/misc/cgminer.nix       |  1 +
 nixos/modules/services/misc/confd.nix         |  1 +
 nixos/modules/services/misc/etcd.nix          | 10 ++---
 nixos/modules/services/misc/felix.nix         |  2 +
 nixos/modules/services/misc/gitit.nix         |  1 +
 nixos/modules/services/misc/ihaskell.nix      |  1 +
 nixos/modules/services/misc/mbpfan.nix        |  2 +
 nixos/modules/services/misc/nix-daemon.nix    |  1 +
 nixos/modules/services/misc/rippled.nix       |  7 ++--
 nixos/modules/services/monitoring/bosun.nix   |  1 +
 nixos/modules/services/monitoring/grafana.nix |  1 +
 .../modules/services/monitoring/graphite.nix  |  7 ++--
 .../modules/services/monitoring/heapster.nix  |  1 +
 nixos/modules/services/monitoring/munin.nix   | 18 ++-------
 nixos/modules/services/monitoring/nagios.nix  |  6 +++
 .../services/monitoring/scollector.nix        |  3 +-
 .../services/network-filesystems/samba.nix    |  3 +-
 nixos/modules/services/networking/bind.nix    |  2 +
 nixos/modules/services/networking/consul.nix  |  1 +
 .../modules/services/networking/firewall.nix  |  3 +-
 .../modules/services/networking/lambdabot.nix |  1 +
 .../services/networking/networkmanager.nix    |  2 +-
 nixos/modules/services/networking/ngircd.nix  |  1 +
 nixos/modules/services/networking/skydns.nix  |  1 +
 .../services/networking/supplicant.nix        |  2 +-
 .../modules/services/networking/syncthing.nix |  1 +
 nixos/modules/services/networking/tinc.nix    |  2 +
 nixos/modules/services/networking/vsftpd.nix  |  2 +
 .../modules/services/search/elasticsearch.nix |  1 +
 nixos/modules/services/search/kibana.nix      |  1 +
 nixos/modules/services/search/solr.nix        |  2 +
 .../web-servers/apache-httpd/default.nix      |  4 +-
 .../services/web-servers/nginx/default.nix    |  1 +
 nixos/modules/services/web-servers/phpfpm.nix |  2 +
 nixos/modules/services/web-servers/tomcat.nix |  5 +++
 .../modules/services/web-servers/winstone.nix |  1 +
 nixos/modules/services/web-servers/zope2.nix  | 39 ++++++++++---------
 .../services/x11/desktop-managers/gnome3.nix  |  1 +
 .../services/x11/desktop-managers/kde4.nix    |  1 +
 .../display-managers/lightdm-greeters/gtk.nix |  6 ++-
 .../services/x11/display-managers/lightdm.nix |  3 +-
 .../services/x11/display-managers/slim.nix    |  4 ++
 nixos/modules/services/x11/redshift.nix       |  1 +
 .../services/x11/window-managers/xmonad.nix   |  1 +
 nixos/modules/system/activation/top-level.nix |  2 +-
 nixos/modules/system/boot/kernel.nix          |  3 +-
 .../modules/system/boot/loader/grub/grub.nix  |  1 +
 .../modules/system/boot/loader/grub/ipxe.nix  |  2 +-
 nixos/modules/system/boot/luksroot.nix        |  2 +-
 nixos/modules/system/boot/systemd.nix         |  1 +
 nixos/modules/tasks/network-interfaces.nix    |  2 +
 nixos/modules/virtualisation/openvswitch.nix  |  1 +
 81 files changed, 175 insertions(+), 97 deletions(-)

diff --git a/nixos/modules/config/ldap.nix b/nixos/modules/config/ldap.nix
index c87996df8855..a6657768e061 100644
--- a/nixos/modules/config/ldap.nix
+++ b/nixos/modules/config/ldap.nix
@@ -57,6 +57,7 @@ in
     users.ldap = {
 
       enable = mkOption {
+        type = types.bool;
         default = false;
         description = "Whether to enable authentication against an LDAP server.";
       };
diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix
index 2ebc61260558..179e826ba059 100644
--- a/nixos/modules/config/pulseaudio.nix
+++ b/nixos/modules/config/pulseaudio.nix
@@ -99,6 +99,7 @@ in {
       package = mkOption {
         type = types.package;
         default = pulseaudioLight;
+        defaultText = "pkgs.pulseaudioLight";
         example = literalExample "pkgs.pulseaudioFull";
         description = ''
           The PulseAudio derivation to use.  This can be used to enable
diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix
index d0243f9775c5..9642981803bf 100644
--- a/nixos/modules/config/shells-environment.nix
+++ b/nixos/modules/config/shells-environment.nix
@@ -119,6 +119,7 @@ in
 
     environment.binsh = mkOption {
       default = "${config.system.build.binsh}/bin/sh";
+      defaultText = "\${config.system.build.binsh}/bin/sh";
       example = literalExample ''
         "''${pkgs.dash}/bin/dash"
       '';
diff --git a/nixos/modules/config/unix-odbc-drivers.nix b/nixos/modules/config/unix-odbc-drivers.nix
index 98929392acec..eea6477fff23 100644
--- a/nixos/modules/config/unix-odbc-drivers.nix
+++ b/nixos/modules/config/unix-odbc-drivers.nix
@@ -10,8 +10,9 @@ with lib;
 
   options = {
     environment.unixODBCDrivers = mkOption {
+      type = types.listOf types.package;
       default = [];
-      example = literalExample "map (x : x.ini) (with pkgs.unixODBCDrivers; [ mysql psql psqlng ] )";
+      example = literalExample "with pkgs.unixODBCDrivers; [ mysql psql psqlng ]";
       description = ''
         Specifies Unix ODBC drivers to be registered in
         <filename>/etc/odbcinst.ini</filename>.  You may also want to
@@ -26,7 +27,7 @@ with lib;
   config = mkIf (config.environment.unixODBCDrivers != []) {
 
     environment.etc."odbcinst.ini".text =
-      let inis = config.environment.unixODBCDrivers;
+      let inis = map (x : x.ini) config.environment.unixODBCDrivers;
       in lib.concatStringsSep "\n" inis;
 
   };
diff --git a/nixos/modules/misc/crashdump.nix b/nixos/modules/misc/crashdump.nix
index 773b5ac9da3e..5ef4b7781bd0 100644
--- a/nixos/modules/misc/crashdump.nix
+++ b/nixos/modules/misc/crashdump.nix
@@ -24,6 +24,7 @@ in
           '';
         };
         kernelPackages = mkOption {
+          type = types.package;
           default = pkgs.linuxPackages;
           # We don't want to evaluate all of linuxPackages for the manual
           # - some of it might not even evaluate correctly.
diff --git a/nixos/modules/misc/nixos.nix b/nixos/modules/misc/nixos.nix
index 356129211d06..84365b640a48 100644
--- a/nixos/modules/misc/nixos.nix
+++ b/nixos/modules/misc/nixos.nix
@@ -37,8 +37,8 @@ with lib;
 
     nixos.extraModules = mkOption {
       default = [];
-      example = literalExample "mkIf config.services.openssh.enable [ ./sshd-config.nix ]";
-      type = types.listOf types.unspecified;
+      example = literalExample "[ ./sshd-config.nix ]";
+      type = types.listOf (types.either (types.submodule ({...}:{options={};})) types.path);
       description = ''
         Define additional modules which would be loaded to evaluate the
         configuration.
diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index 87a7bac208b7..260888be485f 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -93,7 +93,9 @@ in
       };
 
       package = mkOption {
+        type = types.package;
         default = pkgs.openssh;
+        defaultText = "pkgs.openssh";
         description = ''
           The package used for the openssh client and daemon.
         '';
@@ -142,16 +144,18 @@ in
         description = ''
           The set of system-wide known SSH hosts.
         '';
-        example = [
-          {
-            hostNames = [ "myhost" "myhost.mydomain.com" "10.10.1.4" ];
-            publicKeyFile = literalExample "./pubkeys/myhost_ssh_host_dsa_key.pub";
-          }
-          {
-            hostNames = [ "myhost2" ];
-            publicKeyFile = literalExample "./pubkeys/myhost2_ssh_host_dsa_key.pub";
-          }
-        ];
+        example = literalExample ''
+          [
+            {
+              hostNames = [ "myhost" "myhost.mydomain.com" "10.10.1.4" ];
+              publicKeyFile = "./pubkeys/myhost_ssh_host_dsa_key.pub";
+            }
+            {
+              hostNames = [ "myhost2" ];
+              publicKeyFile = "./pubkeys/myhost2_ssh_host_dsa_key.pub";
+            }
+          ]
+        '';
       };
 
     };
diff --git a/nixos/modules/services/audio/liquidsoap.nix b/nixos/modules/services/audio/liquidsoap.nix
index bf67d2399ebb..1c19ed36bdc7 100644
--- a/nixos/modules/services/audio/liquidsoap.nix
+++ b/nixos/modules/services/audio/liquidsoap.nix
@@ -46,7 +46,7 @@ in
       example = {
         myStream1 = literalExample "\"/etc/liquidsoap/myStream1.liq\"";
         myStream2 = literalExample "./myStream2.liq";
-        myStream3 = literalExample "\"out(playlist(\"/srv/music/\"))\"";
+        myStream3 = literalExample "\"out(playlist(\\\"/srv/music/\\\"))\"";
       };
 
       type = types.attrsOf (types.either types.path types.str);
diff --git a/nixos/modules/services/backup/bacula.nix b/nixos/modules/services/backup/bacula.nix
index 69f3c3f8a758..8a26aae75fe9 100644
--- a/nixos/modules/services/backup/bacula.nix
+++ b/nixos/modules/services/backup/bacula.nix
@@ -207,7 +207,7 @@ in {
         description = ''
           Extra configuration to be passed in Client directive.
         '';
-        example = literalExample ''
+        example = ''
           Maximum Concurrent Jobs = 20;
           Heartbeat Interval = 30;
         '';
@@ -218,7 +218,7 @@ in {
         description = ''
           Extra configuration to be passed in Messages directive.
         '';
-        example = literalExample ''
+        example = ''
           console = all
         '';
       };
diff --git a/nixos/modules/services/backup/rsnapshot.nix b/nixos/modules/services/backup/rsnapshot.nix
index fb25bd9dd1e8..96657cf17fc5 100644
--- a/nixos/modules/services/backup/rsnapshot.nix
+++ b/nixos/modules/services/backup/rsnapshot.nix
@@ -43,6 +43,7 @@ in
       package = mkOption {
         type = types.package;
         default = pkgs.rsnapshot;
+        defaultText = "pkgs.rsnapshot";
         example = literalExample "pkgs.rsnapshotGit";
         description = ''
           RSnapshot package to use.
diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix
index d571aa3e199d..d6ae4b45ceef 100644
--- a/nixos/modules/services/continuous-integration/jenkins/default.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/default.nix
@@ -80,6 +80,7 @@ in {
 
       packages = mkOption {
         default = [ pkgs.stdenv pkgs.git pkgs.jdk config.programs.ssh.package pkgs.nix ];
+        defaultText = "[ pkgs.stdenv pkgs.git pkgs.jdk config.programs.ssh.package pkgs.nix ]";
         type = types.listOf types.package;
         description = ''
           Packages to add to PATH for the jenkins process.
diff --git a/nixos/modules/services/continuous-integration/jenkins/job-builder.nix b/nixos/modules/services/continuous-integration/jenkins/job-builder.nix
index 702d452279f8..7b1fe6269fe9 100644
--- a/nixos/modules/services/continuous-integration/jenkins/job-builder.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/job-builder.nix
@@ -74,7 +74,7 @@ in {
                 ];
               };
             }
-          ];
+          ]
         '';
         description = ''
           Job descriptions for Jenkins Job Builder in Nix format.
diff --git a/nixos/modules/services/databases/couchdb.nix b/nixos/modules/services/databases/couchdb.nix
index 2b1d07c355ef..ae0589b399e0 100644
--- a/nixos/modules/services/databases/couchdb.nix
+++ b/nixos/modules/services/databases/couchdb.nix
@@ -38,6 +38,7 @@ in {
       package = mkOption {
         type = types.package;
         default = pkgs.couchdb;
+        defaultText = "pkgs.couchdb";
         example = literalExample "pkgs.couchdb";
         description = ''
           CouchDB package to use.
diff --git a/nixos/modules/services/databases/firebird.nix b/nixos/modules/services/databases/firebird.nix
index c874b218a5e7..b9f66612d4eb 100644
--- a/nixos/modules/services/databases/firebird.nix
+++ b/nixos/modules/services/databases/firebird.nix
@@ -49,6 +49,7 @@ in
 
       package = mkOption {
         default = pkgs.firebirdSuper;
+        defaultText = "pkgs.firebirdSuper";
         type = types.package;
         /*
           Example: <code>package = pkgs.firebirdSuper.override { icu =
diff --git a/nixos/modules/services/databases/hbase.nix b/nixos/modules/services/databases/hbase.nix
index ccfabc9de0b5..629d02209a9c 100644
--- a/nixos/modules/services/databases/hbase.nix
+++ b/nixos/modules/services/databases/hbase.nix
@@ -44,6 +44,7 @@ in {
       package = mkOption {
         type = types.package;
         default = pkgs.hbase;
+        defaultText = "pkgs.hbase";
         example = literalExample "pkgs.hbase";
         description = ''
           HBase package to use.
diff --git a/nixos/modules/services/databases/influxdb.nix b/nixos/modules/services/databases/influxdb.nix
index 8d63f14c67b5..e2268bd556ef 100644
--- a/nixos/modules/services/databases/influxdb.nix
+++ b/nixos/modules/services/databases/influxdb.nix
@@ -120,6 +120,7 @@ in
 
       package = mkOption {
         default = pkgs.influxdb;
+        defaultText = "pkgs.influxdb";
         description = "Which influxdb derivation to use";
         type = types.package;
       };
diff --git a/nixos/modules/services/databases/mongodb.nix b/nixos/modules/services/databases/mongodb.nix
index 14ffdad9217d..ef9bc46e4a0e 100644
--- a/nixos/modules/services/databases/mongodb.nix
+++ b/nixos/modules/services/databases/mongodb.nix
@@ -41,6 +41,7 @@ in
 
       package = mkOption {
         default = pkgs.mongodb;
+        defaultText = "pkgs.mongodb";
         type = types.package;
         description = "
           Which MongoDB derivation to use.
diff --git a/nixos/modules/services/databases/neo4j.nix b/nixos/modules/services/databases/neo4j.nix
index 1413839ce220..41b960685906 100644
--- a/nixos/modules/services/databases/neo4j.nix
+++ b/nixos/modules/services/databases/neo4j.nix
@@ -49,6 +49,7 @@ in {
     package = mkOption {
       description = "Neo4j package to use.";
       default = pkgs.neo4j;
+      defaultText = "pkgs.neo4j";
       type = types.package;
     };
 
diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix
index 29bdb2017523..6fd901a00559 100644
--- a/nixos/modules/services/databases/openldap.nix
+++ b/nixos/modules/services/databases/openldap.nix
@@ -25,22 +25,7 @@ in
         description = "
           Whether to enable the ldap server.
         ";
-        example = literalExample ''
-          openldap.enable = true;
-          openldap.extraConfig = '''
-            include ''${pkgs.openldap}/etc/openldap/schema/core.schema
-            include ''${pkgs.openldap}/etc/openldap/schema/cosine.schema
-            include ''${pkgs.openldap}/etc/openldap/schema/inetorgperson.schema
-            include ''${pkgs.openldap}/etc/openldap/schema/nis.schema
-
-            database bdb 
-            suffix dc=example,dc=org 
-            rootdn cn=admin,dc=example,dc=org 
-            # NOTE: change after first start
-            rootpw secret
-            directory /var/db/openldap
-          ''';
-        '';
+        example = true;
       };
 
       user = mkOption {
@@ -67,6 +52,19 @@ in
         description = "
           sldapd.conf configuration
         ";
+        example = ''
+            include ''${pkgs.openldap}/etc/openldap/schema/core.schema
+            include ''${pkgs.openldap}/etc/openldap/schema/cosine.schema
+            include ''${pkgs.openldap}/etc/openldap/schema/inetorgperson.schema
+            include ''${pkgs.openldap}/etc/openldap/schema/nis.schema
+
+            database bdb 
+            suffix dc=example,dc=org 
+            rootdn cn=admin,dc=example,dc=org 
+            # NOTE: change after first start
+            rootpw secret
+            directory /var/db/openldap
+          '';
       };
     };
 
diff --git a/nixos/modules/services/databases/opentsdb.nix b/nixos/modules/services/databases/opentsdb.nix
index 0e73d4aca0e6..489cdcffe658 100644
--- a/nixos/modules/services/databases/opentsdb.nix
+++ b/nixos/modules/services/databases/opentsdb.nix
@@ -26,6 +26,7 @@ in {
       package = mkOption {
         type = types.package;
         default = pkgs.opentsdb;
+        defaultText = "pkgs.opentsdb";
         example = literalExample "pkgs.opentsdb";
         description = ''
           OpenTSDB package to use.
diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix
index f2612d0b43b9..6323d2c8ce4e 100644
--- a/nixos/modules/services/databases/redis.nix
+++ b/nixos/modules/services/databases/redis.nix
@@ -46,6 +46,7 @@ in
       package = mkOption {
         type = types.package;
         default = pkgs.redis;
+        defaultText = "pkgs.redis";
         description = "Which Redis derivation to use.";
       };
 
diff --git a/nixos/modules/services/hardware/freefall.nix b/nixos/modules/services/hardware/freefall.nix
index 2be339766069..066ccaa4d7cf 100644
--- a/nixos/modules/services/hardware/freefall.nix
+++ b/nixos/modules/services/hardware/freefall.nix
@@ -21,6 +21,7 @@ in {
     package = mkOption {
       type = types.package;
       default = pkgs.freefall;
+      defaultText = "pkgs.freefall";
       description = ''
         freefall derivation to use.
       '';
diff --git a/nixos/modules/services/hardware/upower.nix b/nixos/modules/services/hardware/upower.nix
index 0b6a101efa0b..739d76fbf1f5 100644
--- a/nixos/modules/services/hardware/upower.nix
+++ b/nixos/modules/services/hardware/upower.nix
@@ -27,6 +27,7 @@ in
       package = mkOption {
         type = types.package;
         default = pkgs.upower;
+        defaultText = "pkgs.upower";
         example = lib.literalExample "pkgs.upower";
         description = ''
           Which upower package to use.
diff --git a/nixos/modules/services/logging/logrotate.nix b/nixos/modules/services/logging/logrotate.nix
index 0186452de95e..fdd9f0f3e5c2 100644
--- a/nixos/modules/services/logging/logrotate.nix
+++ b/nixos/modules/services/logging/logrotate.nix
@@ -13,6 +13,7 @@ in
   options = {
     services.logrotate = {
       enable = mkOption {
+        type = lib.types.bool;
         default = false;
         description = ''
           Enable the logrotate cron job
diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix
index 3a798c6f3724..e019e6c3f237 100644
--- a/nixos/modules/services/logging/logstash.nix
+++ b/nixos/modules/services/logging/logstash.nix
@@ -33,6 +33,7 @@ in
       package = mkOption {
         type = types.package;
         default = pkgs.logstash;
+        defaultText = "pkgs.logstash";
         example = literalExample "pkgs.logstash";
         description = "Logstash package to use.";
       };
@@ -84,7 +85,7 @@ in
         type = types.lines;
         default = ''stdin { type => "example" }'';
         description = "Logstash input configuration.";
-        example = literalExample ''
+        example = ''
           # Read from journal
           pipe {
             command => "''${pkgs.systemd}/bin/journalctl -f -o json"
diff --git a/nixos/modules/services/logging/syslog-ng.nix b/nixos/modules/services/logging/syslog-ng.nix
index 2bf6d1ff7904..21be286a6e98 100644
--- a/nixos/modules/services/logging/syslog-ng.nix
+++ b/nixos/modules/services/logging/syslog-ng.nix
@@ -39,6 +39,7 @@ in {
       package = mkOption {
         type = types.package;
         default = pkgs.syslogng;
+        defaultText = "pkgs.syslogng";
         description = ''
           The package providing syslog-ng binaries.
         '';
diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index 7ca4faae5d4f..36bdcaca47a3 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -90,6 +90,7 @@ in
     package = mkOption {
       type = types.package;
       default = pkgs.dovecot22;
+      defaultText = "pkgs.dovecot22";
       description = "Dovecot package to use.";
     };
 
@@ -131,7 +132,7 @@ in
     modules = mkOption {
       type = types.listOf types.package;
       default = [];
-      example = [ pkgs.dovecot_pigeonhole ];
+      example = literalExample "[ pkgs.dovecot_pigeonhole ]";
       description = ''
         Symlinks the contents of lib/dovecot of every given package into
         /var/lib/dovecot/modules. This will make the given modules available
diff --git a/nixos/modules/services/misc/apache-kafka.nix b/nixos/modules/services/misc/apache-kafka.nix
index f6198e03bae5..88ce8b5a23fc 100644
--- a/nixos/modules/services/misc/apache-kafka.nix
+++ b/nixos/modules/services/misc/apache-kafka.nix
@@ -118,9 +118,8 @@ in {
 
     package = mkOption {
       description = "The kafka package to use";
-
       default = pkgs.apacheKafka;
-
+      defaultText = "pkgs.apacheKafka";
       type = types.package;
     };
 
diff --git a/nixos/modules/services/misc/autofs.nix b/nixos/modules/services/misc/autofs.nix
index b4dae79cf8a9..3a95e9228200 100644
--- a/nixos/modules/services/misc/autofs.nix
+++ b/nixos/modules/services/misc/autofs.nix
@@ -27,8 +27,9 @@ in
       };
 
       autoMaster = mkOption {
+        type = types.str;
         example = literalExample ''
-          autoMaster = let
+          let
             mapConf = pkgs.writeText "auto" '''
              kernel    -ro,soft,intr       ftp.kernel.org:/pub/linux
              boot      -fstype=ext2        :/dev/hda1
diff --git a/nixos/modules/services/misc/cgminer.nix b/nixos/modules/services/misc/cgminer.nix
index 8f25df809cd6..868dc87f7238 100644
--- a/nixos/modules/services/misc/cgminer.nix
+++ b/nixos/modules/services/misc/cgminer.nix
@@ -41,6 +41,7 @@ in
 
       package = mkOption {
         default = pkgs.cgminer;
+        defaultText = "pkgs.cgminer";
         description = "Which cgminer derivation to use.";
         type = types.package;
       };
diff --git a/nixos/modules/services/misc/confd.nix b/nixos/modules/services/misc/confd.nix
index 50532a8a16fb..c0fbf06e6c4c 100644
--- a/nixos/modules/services/misc/confd.nix
+++ b/nixos/modules/services/misc/confd.nix
@@ -64,6 +64,7 @@ in {
     package = mkOption {
       description = "Confd package to use.";
       default = pkgs.confd;
+      defaultText = "pkgs.confd";
       type = types.package;
     };
   };
diff --git a/nixos/modules/services/misc/etcd.nix b/nixos/modules/services/misc/etcd.nix
index e1839b936f01..b3354e330962 100644
--- a/nixos/modules/services/misc/etcd.nix
+++ b/nixos/modules/services/misc/etcd.nix
@@ -77,11 +77,11 @@ in {
       default = {};
       example = literalExample ''
         {
-          "CORS": "*",
-          "NAME": "default-name",
-          "MAX_RESULT_BUFFER": "1024",
-          "MAX_CLUSTER_SIZE": "9",
-          "MAX_RETRY_ATTEMPTS": "3"
+          "CORS" = "*";
+          "NAME" = "default-name";
+          "MAX_RESULT_BUFFER" = "1024";
+          "MAX_CLUSTER_SIZE" = "9";
+          "MAX_RETRY_ATTEMPTS" = "3";
         }
       '';
     };
diff --git a/nixos/modules/services/misc/felix.nix b/nixos/modules/services/misc/felix.nix
index 08a8581711f9..d6ad9dcaebc2 100644
--- a/nixos/modules/services/misc/felix.nix
+++ b/nixos/modules/services/misc/felix.nix
@@ -23,7 +23,9 @@ in
       };
 
       bundles = mkOption {
+        type = types.listOf types.package;
         default = [ pkgs.felix_remoteshell ];
+        defaultText = "[ pkgs.felix_remoteshell ]";
         description = "List of bundles that should be activated on startup";
       };
 
diff --git a/nixos/modules/services/misc/gitit.nix b/nixos/modules/services/misc/gitit.nix
index befd8c628f16..ab4d385ba165 100644
--- a/nixos/modules/services/misc/gitit.nix
+++ b/nixos/modules/services/misc/gitit.nix
@@ -35,6 +35,7 @@ let
       };
 
       haskellPackages = mkOption {
+        type = types.attrsOf types.package;
         default = pkgs.haskellPackages;
         defaultText = "pkgs.haskellPackages";
         example = literalExample "pkgs.haskell.packages.ghc784";
diff --git a/nixos/modules/services/misc/ihaskell.nix b/nixos/modules/services/misc/ihaskell.nix
index 13c41466eab2..1927922909ee 100644
--- a/nixos/modules/services/misc/ihaskell.nix
+++ b/nixos/modules/services/misc/ihaskell.nix
@@ -22,6 +22,7 @@ in
       };
 
       haskellPackages = mkOption {
+        type = types.attrsOf types.package;
         default = pkgs.haskellPackages;
         defaultText = "pkgs.haskellPackages";
         example = literalExample "pkgs.haskell.packages.ghc784";
diff --git a/nixos/modules/services/misc/mbpfan.nix b/nixos/modules/services/misc/mbpfan.nix
index 3fb5f684b761..972d8b572d36 100644
--- a/nixos/modules/services/misc/mbpfan.nix
+++ b/nixos/modules/services/misc/mbpfan.nix
@@ -17,7 +17,9 @@ in {
     };
 
     package = mkOption {
+      type = types.package;
       default = pkgs.mbpfan;
+      defaultText = "pkgs.mbpfan";
       description = ''
         The package used for the mbpfan daemon.
       '';
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 4aed91c34978..da03eb17e302 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -66,6 +66,7 @@ in
       package = mkOption {
         type = types.package;
         default = pkgs.nix;
+        defaultText = "pkgs.nix";
         description = ''
           This option specifies the Nix package instance to use throughout the system.
         '';
diff --git a/nixos/modules/services/misc/rippled.nix b/nixos/modules/services/misc/rippled.nix
index d940c1bc900e..c6b67e8498ca 100644
--- a/nixos/modules/services/misc/rippled.nix
+++ b/nixos/modules/services/misc/rippled.nix
@@ -208,6 +208,7 @@ in
 	description = "Which rippled package to use.";
 	type = types.package;
 	default = pkgs.rippled;
+	defaultText = "pkgs.rippled";
       };
 
       ports = mkOption {
@@ -238,7 +239,7 @@ in
       nodeDb = mkOption {
 	description = "Rippled main database options.";
 	type = types.nullOr types.optionSet;
-	options = [dbOptions];
+	options = dbOptions;
 	default = {
 	  type = "rocksdb";
 	  extraOpts = ''
@@ -254,14 +255,14 @@ in
       tempDb = mkOption {
 	description = "Rippled temporary database options.";
 	type = types.nullOr types.optionSet;
-	options = [dbOptions];
+	options = dbOptions;
 	default = null;
       };
 
       importDb = mkOption {
 	description = "Settings for performing a one-time import.";
 	type = types.nullOr types.optionSet;
-	options = [dbOptions];
+	options = dbOptions;
 	default = null;
       };
 
diff --git a/nixos/modules/services/monitoring/bosun.nix b/nixos/modules/services/monitoring/bosun.nix
index 214a19d9483f..46273fc12187 100644
--- a/nixos/modules/services/monitoring/bosun.nix
+++ b/nixos/modules/services/monitoring/bosun.nix
@@ -33,6 +33,7 @@ in {
       package = mkOption {
         type = types.package;
         default = pkgs.bosun;
+        defaultText = "pkgs.bosun";
         example = literalExample "pkgs.bosun";
         description = ''
           bosun binary to use.
diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix
index 6053990e8d3b..0b49038dd273 100644
--- a/nixos/modules/services/monitoring/grafana.nix
+++ b/nixos/modules/services/monitoring/grafana.nix
@@ -93,6 +93,7 @@ in {
     package = mkOption {
       description = "Package to use.";
       default = pkgs.grafana;
+      defaultText = "pkgs.grafana";
       type = types.package;
     };
 
diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix
index 731e5fae9e9d..976fd253a7cd 100644
--- a/nixos/modules/services/monitoring/graphite.nix
+++ b/nixos/modules/services/monitoring/graphite.nix
@@ -108,7 +108,7 @@ in {
       finders = mkOption {
         description = "List of finder plugins to load.";
         default = [];
-        example = [ pkgs.python27Packages.graphite_influxdb ];
+        example = literalExample "[ pkgs.python27Packages.graphite_influxdb ]";
         type = types.listOf types.package;
       };
 
@@ -136,6 +136,7 @@ in {
       package = mkOption {
         description = "Package to use for graphite api.";
         default = pkgs.python27Packages.graphite_api;
+        defaultText = "pkgs.python27Packages.graphite_api";
         type = types.package;
       };
 
@@ -146,7 +147,7 @@ in {
             directories:
                 - ${dataDir}/whisper
         '';
-        example = literalExample ''
+        example = ''
           allowed_origins:
             - dashboard.example.com
           cheat_times: true
@@ -350,7 +351,7 @@ in {
               critical: 200
               name: Test
         '';
-        example = literalExample ''
+        example = ''
           pushbullet_key: pushbullet_api_key
           alerts:
             - target: stats.seatgeek.app.deal_quality.venue_info_cache.hit
diff --git a/nixos/modules/services/monitoring/heapster.nix b/nixos/modules/services/monitoring/heapster.nix
index 74b8c9ccd3ed..deee64aa41ea 100644
--- a/nixos/modules/services/monitoring/heapster.nix
+++ b/nixos/modules/services/monitoring/heapster.nix
@@ -33,6 +33,7 @@ in {
     package = mkOption {
       description = "Package to use by heapster";
       default = pkgs.heapster;
+      defaultText = "pkgs.heapster";
       type = types.package;
     };
   };
diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix
index 31afa859e256..aaa041ad4cd6 100644
--- a/nixos/modules/services/monitoring/munin.nix
+++ b/nixos/modules/services/monitoring/munin.nix
@@ -122,21 +122,6 @@ in
           HTML output is in <filename>/var/www/munin/</filename>, configure your
           favourite webserver to serve static files.
         '';
-        example = literalExample ''
-          services = {
-             munin-node.enable = true;
-             munin-cron = {
-               enable = true;
-               hosts = '''
-                 [''${config.networking.hostName}]
-                 address localhost
-               ''';
-               extraGlobalConfig = '''
-                 contact.email.command mail -s "Munin notification for ''${var:host}" someone@example.com
-               ''';
-             };
-          };
-        '';
       };
 
       extraGlobalConfig = mkOption {
@@ -147,6 +132,9 @@ in
           Useful to setup notifications, see
           <link xlink:href='http://munin-monitoring.org/wiki/HowToContact' />
         '';
+        example = ''
+          contact.email.command mail -s "Munin notification for ''${var:host}" someone@example.com
+        '';
       };
 
       hosts = mkOption {
diff --git a/nixos/modules/services/monitoring/nagios.nix b/nixos/modules/services/monitoring/nagios.nix
index c1f7ba0eca74..f2f7710de9e7 100644
--- a/nixos/modules/services/monitoring/nagios.nix
+++ b/nixos/modules/services/monitoring/nagios.nix
@@ -94,7 +94,9 @@ in
       };
 
       plugins = mkOption {
+        type = types.listOf types.package;
         default = [pkgs.nagiosPluginsOfficial pkgs.ssmtp];
+        defaultText = "[pkgs.nagiosPluginsOfficial pkgs.ssmtp]";
         description = "
           Packages to be added to the Nagios <envar>PATH</envar>.
           Typically used to add plugins, but can be anything.
@@ -102,14 +104,18 @@ in
       };
 
       mainConfigFile = mkOption {
+        type = types.package;
         default = nagiosCfgFile;
+        defaultText = "nagiosCfgFile";
         description = "
           Derivation for the main configuration file of Nagios.
         ";
       };
 
       cgiConfigFile = mkOption {
+        type = types.package;
         default = nagiosCGICfgFile;
+        defaultText = "nagiosCGICfgFile";
         description = "
           Derivation for the configuration file of Nagios CGI scripts
           that can be used in web servers for running the Nagios web interface.
diff --git a/nixos/modules/services/monitoring/scollector.nix b/nixos/modules/services/monitoring/scollector.nix
index 8b97daf8881a..1e397435e600 100644
--- a/nixos/modules/services/monitoring/scollector.nix
+++ b/nixos/modules/services/monitoring/scollector.nix
@@ -43,6 +43,7 @@ in {
       package = mkOption {
         type = types.package;
         default = pkgs.scollector;
+        defaultText = "pkgs.scollector";
         example = literalExample "pkgs.scollector";
         description = ''
           scollector binary to use.
@@ -77,7 +78,7 @@ in {
       collectors = mkOption {
         type = with types; attrsOf (listOf path);
         default = {};
-        example = literalExample "{ 0 = [ \"\${postgresStats}/bin/collect-stats\" ]; }";
+        example = literalExample "{ \"0\" = [ \"\${postgresStats}/bin/collect-stats\" ]; }";
         description = ''
           An attribute set mapping the frequency of collection to a list of
           binaries that should be executed at that frequency. You can use "0"
diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix
index 72e9b6144d4b..576e5c9e87a3 100644
--- a/nixos/modules/services/network-filesystems/samba.nix
+++ b/nixos/modules/services/network-filesystems/samba.nix
@@ -85,7 +85,8 @@ in
       package = mkOption {
         type = types.package;
         default = pkgs.samba;
-        example = pkgs.samba4;
+        defaultText = "pkgs.samba";
+        example = literalExample "pkgs.samba4";
         description = ''
           Defines which package should be used for the samba server.
         '';
diff --git a/nixos/modules/services/networking/bind.nix b/nixos/modules/services/networking/bind.nix
index dc11524ffeb8..b9e0eecf417d 100644
--- a/nixos/modules/services/networking/bind.nix
+++ b/nixos/modules/services/networking/bind.nix
@@ -120,7 +120,9 @@ in
       };
 
       configFile = mkOption {
+        type = types.path;
         default = confFile;
+        defaultText = "confFile";
         description = "
           Overridable config file to use for named. By default, that
           generated by nixos.
diff --git a/nixos/modules/services/networking/consul.nix b/nixos/modules/services/networking/consul.nix
index 7337eb873c77..58dad56014b0 100644
--- a/nixos/modules/services/networking/consul.nix
+++ b/nixos/modules/services/networking/consul.nix
@@ -118,6 +118,7 @@ in
         package = mkOption {
           description = "Package to use for consul-alerts.";
           default = pkgs.consul-alerts;
+          defaultText = "pkgs.consul-alerts";
           type = types.package;
         };
 
diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix
index a61f0250ef8b..e11fe072be65 100644
--- a/nixos/modules/services/networking/firewall.nix
+++ b/nixos/modules/services/networking/firewall.nix
@@ -421,8 +421,9 @@ in
     };
 
     networking.firewall.extraPackages = mkOption {
+      type = types.listOf types.package;
       default = [ ];
-      example = [ pkgs.ipset ];
+      example = literalExample "[ pkgs.ipset ]";
       description =
         ''
           Additional packages to be included in the environment of the system
diff --git a/nixos/modules/services/networking/lambdabot.nix b/nixos/modules/services/networking/lambdabot.nix
index 4ef7c7c9ab63..5a61a9f96782 100644
--- a/nixos/modules/services/networking/lambdabot.nix
+++ b/nixos/modules/services/networking/lambdabot.nix
@@ -27,6 +27,7 @@ in
       package = mkOption {
         type = types.package;
         default = pkgs.lambdabot;
+        defaultText = "pkgs.lambdabot";
         description = "Used lambdabot package";
       };
 
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index 8ab4cfcc114a..01c05fb4a245 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -110,7 +110,7 @@ in {
 
       # Ugly hack for using the correct gnome3 packageSet
       basePackages = mkOption {
-        type = types.attrsOf types.path;
+        type = types.attrsOf types.package;
         default = { inherit networkmanager modemmanager wpa_supplicant
                             networkmanager_openvpn networkmanager_vpnc
                             networkmanager_openconnect
diff --git a/nixos/modules/services/networking/ngircd.nix b/nixos/modules/services/networking/ngircd.nix
index 49e5f3559803..6a5290ffdee2 100644
--- a/nixos/modules/services/networking/ngircd.nix
+++ b/nixos/modules/services/networking/ngircd.nix
@@ -34,6 +34,7 @@ in {
         type = types.package;
 
         default = pkgs.ngircd;
+        defaultText = "pkgs.ngircd";
       };
     };
   };
diff --git a/nixos/modules/services/networking/skydns.nix b/nixos/modules/services/networking/skydns.nix
index f5eb452fec62..39ebaa45a794 100644
--- a/nixos/modules/services/networking/skydns.nix
+++ b/nixos/modules/services/networking/skydns.nix
@@ -56,6 +56,7 @@ in {
 
     package = mkOption {
       default = pkgs.skydns;
+      defaultText = "pkgs.skydns";
       type = types.package;
       description = "Skydns package to use.";
     };
diff --git a/nixos/modules/services/networking/supplicant.nix b/nixos/modules/services/networking/supplicant.nix
index 502a0468787f..16c4ee7e33bb 100644
--- a/nixos/modules/services/networking/supplicant.nix
+++ b/nixos/modules/services/networking/supplicant.nix
@@ -115,7 +115,7 @@ in
 
           path = mkOption {
             type = types.path;
-            example = "/etc/wpa_supplicant.conf";
+            example = literalExample "/etc/wpa_supplicant.conf";
             description = ''
               External <literal>wpa_supplicant.conf</literal> configuration file.
               The configuration options defined declaratively within <literal>networking.supplicant</literal> have
diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix
index 56c384731c61..f5d5e1d25561 100644
--- a/nixos/modules/services/networking/syncthing.nix
+++ b/nixos/modules/services/networking/syncthing.nix
@@ -43,6 +43,7 @@ in
       package = mkOption {
         type = types.package;
         default = pkgs.syncthing;
+        defaultText = "pkgs.syncthing";
         example = literalExample "pkgs.syncthing";
         description = ''
           Syncthing package to use.
diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix
index 828bbe130e67..34f4f6b37b60 100644
--- a/nixos/modules/services/networking/tinc.nix
+++ b/nixos/modules/services/networking/tinc.nix
@@ -87,7 +87,9 @@ in
           };
 
           package = mkOption {
+            type = types.package;
             default = pkgs.tinc_pre;
+            defaultText = "pkgs.tinc_pre";
             description = ''
               The package to use for the tinc daemon's binary.
             '';
diff --git a/nixos/modules/services/networking/vsftpd.nix b/nixos/modules/services/networking/vsftpd.nix
index 447149552f48..e7301e9ef5f5 100644
--- a/nixos/modules/services/networking/vsftpd.nix
+++ b/nixos/modules/services/networking/vsftpd.nix
@@ -120,7 +120,9 @@ in
       };
 
       userlistFile = mkOption {
+        type = types.path;
         default = pkgs.writeText "userlist" (concatMapStrings (x: "${x}\n") cfg.userlist);
+        defaultText = "pkgs.writeText \"userlist\" (concatMapStrings (x: \"\${x}\n\") cfg.userlist)";
         description = ''
           Newline separated list of names to be allowed/denied if <option>userlistEnable</option>
           is <literal>true</literal>. Meaning see <option>userlistDeny</option>.
diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix
index b3f0a5251d71..ea0cf1dcd78f 100644
--- a/nixos/modules/services/search/elasticsearch.nix
+++ b/nixos/modules/services/search/elasticsearch.nix
@@ -40,6 +40,7 @@ in {
     package = mkOption {
       description = "Elasticsearch package to use.";
       default = pkgs.elasticsearch;
+      defaultText = "pkgs.elasticsearch";
       type = types.package;
     };
 
diff --git a/nixos/modules/services/search/kibana.nix b/nixos/modules/services/search/kibana.nix
index f9071ef66e72..4263ed22a8db 100644
--- a/nixos/modules/services/search/kibana.nix
+++ b/nixos/modules/services/search/kibana.nix
@@ -127,6 +127,7 @@ in {
     package = mkOption {
       description = "Kibana package to use";
       default = pkgs.kibana;
+      defaultText = "pkgs.kibana";
       type = types.package;
     };
 
diff --git a/nixos/modules/services/search/solr.nix b/nixos/modules/services/search/solr.nix
index 7886d1e2e8e6..33d74e897237 100644
--- a/nixos/modules/services/search/solr.nix
+++ b/nixos/modules/services/search/solr.nix
@@ -45,6 +45,7 @@ in {
       javaPackage = mkOption {
         type = types.package;
         default = pkgs.jre;
+        defaultText = "pkgs.jre";
         description = ''
           Which Java derivation to use for running solr.
         '';
@@ -53,6 +54,7 @@ in {
       solrPackage = mkOption {
         type = types.package;
         default = pkgs.solr;
+        defaultText = "pkgs.solr";
         description = ''
           Which solr derivation to use for running solr.
         '';
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index 7350a6a68c70..739181d861b2 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -429,6 +429,7 @@ in
       package = mkOption {
         type = types.package;
         default = pkgs.apacheHttpd;
+        defaultText = "pkgs.apacheHttpd";
         description = ''
           Overridable attribute of the Apache HTTP Server package to use.
         '';
@@ -437,7 +438,8 @@ in
       configFile = mkOption {
         type = types.path;
         default = confFile;
-        example = literalExample ''pkgs.writeText "httpd.conf" "# my custom config file ...";'';
+        defaultText = "confFile";
+        example = literalExample ''pkgs.writeText "httpd.conf" "# my custom config file ..."'';
         description = ''
           Override the configuration file used by Apache. By default,
           NixOS generates one automatically.
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 25816446e999..27a33f33ff93 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -34,6 +34,7 @@ in
 
       package = mkOption {
         default = pkgs.nginx;
+        defaultText = "pkgs.nginx";
         type = types.package;
         description = "
           Nginx package to use.
diff --git a/nixos/modules/services/web-servers/phpfpm.nix b/nixos/modules/services/web-servers/phpfpm.nix
index 82398948bfaa..bdd41ed702b5 100644
--- a/nixos/modules/services/web-servers/phpfpm.nix
+++ b/nixos/modules/services/web-servers/phpfpm.nix
@@ -36,7 +36,9 @@ in {
       };
 
       phpPackage = mkOption {
+        type = types.package;
         default = pkgs.php;
+        defaultText = "pkgs.php";
         description = ''
           The PHP package to use for running the FPM service.
         '';
diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix
index 6abd6dfb306b..c3be20b41e29 100644
--- a/nixos/modules/services/web-servers/tomcat.nix
+++ b/nixos/modules/services/web-servers/tomcat.nix
@@ -24,6 +24,7 @@ in
       package = mkOption {
         type = types.package;
         default = pkgs.tomcat7;
+        defaultText = "pkgs.tomcat7";
         example = lib.literalExample "pkgs.tomcat8";
         description = ''
           Which tomcat package to use.
@@ -72,7 +73,9 @@ in
       };
 
       webapps = mkOption {
+        type = types.listOf types.package;
         default = [ tomcat ];
+        defaultText = "[ tomcat ]";
         description = "List containing WAR files or directories with WAR files which are web applications to be deployed on Tomcat";
       };
 
@@ -87,7 +90,9 @@ in
       };
 
       jdk = mkOption {
+        type = types.package;
         default = pkgs.jdk;
+        defaultText = "pkgs.jdk";
         description = "Which JDK to use.";
       };
 
diff --git a/nixos/modules/services/web-servers/winstone.nix b/nixos/modules/services/web-servers/winstone.nix
index eed16a64f2a8..6dab467b35ef 100644
--- a/nixos/modules/services/web-servers/winstone.nix
+++ b/nixos/modules/services/web-servers/winstone.nix
@@ -31,6 +31,7 @@ let
       javaPackage = mkOption {
         type = types.package;
         default = pkgs.jre;
+        defaultText = "pkgs.jre";
         description = ''
           Which Java derivation to use for running Winstone.
         '';
diff --git a/nixos/modules/services/web-servers/zope2.nix b/nixos/modules/services/web-servers/zope2.nix
index bbe4d10f83d0..ef3cffd582ee 100644
--- a/nixos/modules/services/web-servers/zope2.nix
+++ b/nixos/modules/services/web-servers/zope2.nix
@@ -75,25 +75,26 @@ in
     services.zope2.instances = mkOption {
       default = {};
       type = types.loaOf types.optionSet;
-      example = {
-        plone01 = {
-          http_address = "127.0.0.1:8080";
-          extra =
-            ''
-            <zodb_db main>
-              mount-point /
-              cache-size 30000
-              <blobstorage>
-                  blob-dir /var/lib/zope2/plone01/blobstorage
-                  <filestorage>
-                  path /var/lib/zope2/plone01/filestorage/Data.fs
-                  </filestorage>
-              </blobstorage>
-            </zodb_db>
-            '';
-
-        };
-      };
+      example = literalExample ''
+        {
+          plone01 = {
+            http_address = "127.0.0.1:8080";
+            extra =
+              '''
+              <zodb_db main>
+                mount-point /
+                cache-size 30000
+                <blobstorage>
+                    blob-dir /var/lib/zope2/plone01/blobstorage
+                    <filestorage>
+                    path /var/lib/zope2/plone01/filestorage/Data.fs
+                    </filestorage>
+                </blobstorage>
+              </zodb_db>
+              ''';
+          };
+        }
+      '';
       description = "zope2 instances to be created automaticaly by the system.";
       options = [ zope2Opts ];
     };
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index c1e14e45d759..be2411b3c7ff 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -62,6 +62,7 @@ in {
     };
 
     environment.gnome3.packageSet = mkOption {
+      type = types.nullOr types.package;
       default = null;
       example = literalExample "pkgs.gnome3_16";
       description = "Which GNOME 3 package set to use.";
diff --git a/nixos/modules/services/x11/desktop-managers/kde4.nix b/nixos/modules/services/x11/desktop-managers/kde4.nix
index 21b6243ba188..29cca248cde3 100644
--- a/nixos/modules/services/x11/desktop-managers/kde4.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde4.nix
@@ -66,6 +66,7 @@ in
       kdeWorkspacePackage = mkOption {
         internal = true;
         default = pkgs.kde4.kde_workspace;
+        defaultText = "pkgs.kde4.kde_workspace";
         type = types.package;
         description = "Custom kde-workspace, used for NixOS rebranding.";
       };
diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
index ebcceabc785b..f5b6c20c5a05 100644
--- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
@@ -67,8 +67,9 @@ in
       theme = {
 
         package = mkOption {
-          type = types.path;
+          type = types.package;
           default = pkgs.gnome3.gnome_themes_standard;
+          defaultText = "pkgs.gnome3.gnome_themes_standard";
           description = ''
             The package path that contains the theme given in the name option.
           '';
@@ -87,8 +88,9 @@ in
       iconTheme = {
 
         package = mkOption {
-          type = types.path;
+          type = types.package;
           default = pkgs.gnome3.defaultIconTheme;
+          defaultText = "pkgs.gnome3.defaultIconTheme";
           description = ''
             The package path that contains the icon theme given in the name option.
           '';
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index ded694d90d50..9460395f86d6 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -69,7 +69,7 @@ in
 
       greeter =  {
         package = mkOption {
-          type = types.path;
+          type = types.package;
           description = ''
             The LightDM greeter to login via. The package should be a directory
             containing a .desktop file matching the name in the 'name' option.
@@ -86,6 +86,7 @@ in
       };
 
       background = mkOption {
+        type = types.path;
         description = ''
           The background image or color to use.
         '';
diff --git a/nixos/modules/services/x11/display-managers/slim.nix b/nixos/modules/services/x11/display-managers/slim.nix
index e3db0230d3b7..ce44c9f54a31 100644
--- a/nixos/modules/services/x11/display-managers/slim.nix
+++ b/nixos/modules/services/x11/display-managers/slim.nix
@@ -61,6 +61,10 @@ in
           url = "https://github.com/jagajaga/nixos-slim-theme/archive/2.0.tar.gz";
           sha256 = "0lldizhigx7bjhxkipii87y432hlf5wdvamnfxrryf9z7zkfypc8";
         };
+        defaultText = ''pkgs.fetchurl {
+          url = "https://github.com/jagajaga/nixos-slim-theme/archive/2.0.tar.gz";
+          sha256 = "0lldizhigx7bjhxkipii87y432hlf5wdvamnfxrryf9z7zkfypc8";
+        }'';
         example = literalExample ''
           pkgs.fetchurl {
             url = "mirror://sourceforge/slim.berlios/slim-wave.tar.gz";
diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix
index 6614be261e50..4318a17a4fa5 100644
--- a/nixos/modules/services/x11/redshift.nix
+++ b/nixos/modules/services/x11/redshift.nix
@@ -76,6 +76,7 @@ in {
     package = mkOption {
       type = types.package;
       default = pkgs.redshift;
+      defaultText = "pkgs.redshift";
       description = ''
         redshift derivation to use.
       '';
diff --git a/nixos/modules/services/x11/window-managers/xmonad.nix b/nixos/modules/services/x11/window-managers/xmonad.nix
index 6af88d4f645b..588696dac15c 100644
--- a/nixos/modules/services/x11/window-managers/xmonad.nix
+++ b/nixos/modules/services/x11/window-managers/xmonad.nix
@@ -16,6 +16,7 @@ in
     services.xserver.windowManager.xmonad = {
       enable = mkEnableOption "xmonad";
       haskellPackages = mkOption {
+        type = lib.types.packageSet;
         default = pkgs.haskellPackages;
         defaultText = "pkgs.haskellPackages";
         example = literalExample "pkgs.haskell.packages.ghc784";
diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index 1c242c88863d..d66580b7b9be 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -205,7 +205,7 @@ in
 
     system.replaceRuntimeDependencies = mkOption {
       default = [];
-      example = lib.literalExample "[ ({ original = pkgs.openssl; replacement = pkgs.callPackage /path/to/openssl { ... }; }) ]";
+      example = lib.literalExample "[ ({ original = pkgs.openssl; replacement = pkgs.callPackage /path/to/openssl { }; }) ]";
       type = types.listOf (types.submodule (
         { options, ... }: {
           options.original = mkOption {
diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index bef18fc8771b..03de445d7822 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -20,6 +20,7 @@ in
   options = {
 
     boot.kernelPackages = mkOption {
+      type = types.packageSet;
       default = pkgs.linuxPackages;
       # We don't want to evaluate all of linuxPackages for the manual
       # - some of it might not even evaluate correctly.
@@ -63,7 +64,7 @@ in
     };
 
     boot.extraModulePackages = mkOption {
-      type = types.listOf types.path;
+      type = types.listOf types.package;
       default = [];
       example = literalExample "[ pkgs.linuxPackages.nvidia_x11 ]";
       description = "A list of additional packages supplying kernel modules.";
diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index c2bf5764804c..d9f6f51f13a2 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -251,6 +251,7 @@ in
       };
 
       extraFiles = mkOption {
+        type = types.attrsOf types.path;
         default = {};
         example = literalExample ''
           { "memtest.bin" = "''${pkgs.memtest86plus}/memtest.bin"; }
diff --git a/nixos/modules/system/boot/loader/grub/ipxe.nix b/nixos/modules/system/boot/loader/grub/ipxe.nix
index 9b5097a4cfd9..249c2761934d 100644
--- a/nixos/modules/system/boot/loader/grub/ipxe.nix
+++ b/nixos/modules/system/boot/loader/grub/ipxe.nix
@@ -39,7 +39,7 @@ in
               dhcp
               chain http://boot.ipxe.org/demo/boot.php
             ''';
-          };
+          }
         '';
       };
     };
diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index 763703205630..59bff5472e84 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -229,7 +229,7 @@ in
 
     boot.initrd.luks.devices = mkOption {
       default = [ ];
-      example = [ { name = "luksroot"; device = "/dev/sda3"; preLVM = true; } ];
+      example = literalExample ''[ { name = "luksroot"; device = "/dev/sda3"; preLVM = true; } ]'';
       description = ''
         The list of devices that should be decrypted using LUKS before trying to mount the
         root partition. This works for both LVM-over-LUKS and LUKS-over-LVM setups.
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 0fc8491cdf8f..211e0423216e 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -374,6 +374,7 @@ in
 
     systemd.package = mkOption {
       default = pkgs.systemd;
+      defaultText = "pkgs.systemd";
       type = types.package;
       description = "The systemd package.";
     };
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index ee21d735f959..e72c0f8956ed 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -355,6 +355,7 @@ in
     };
 
     networking.nameservers = mkOption {
+      type = types.listOf types.str;
       default = [];
       example = ["130.161.158.4" "130.161.33.17"];
       description = ''
@@ -390,6 +391,7 @@ in
     };
 
     networking.localCommands = mkOption {
+      type = types.str;
       default = "";
       example = "text=anything; echo You can put $text here.";
       description = ''
diff --git a/nixos/modules/virtualisation/openvswitch.nix b/nixos/modules/virtualisation/openvswitch.nix
index a0231315236c..4218a3840fc1 100644
--- a/nixos/modules/virtualisation/openvswitch.nix
+++ b/nixos/modules/virtualisation/openvswitch.nix
@@ -31,6 +31,7 @@ in {
     package = mkOption {
       type = types.package;
       default = pkgs.openvswitch;
+      defaultText = "pkgs.openvswitch";
       description = ''
         Open vSwitch package to use.
       '';

From ebd1a4ca9f66c369ff4c475cfa4329110a73ac18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christopher=20L=C3=BCbbemeier?=
 <christopher.luebbemeier@gmail.com>
Date: Wed, 6 Jan 2016 23:28:11 +0100
Subject: [PATCH 855/884] spotify: 0.9.17.1 -> 1.0.19.106

changes by @globin:
used wrapper instead of propagatedUserEnvPkgs for zenity

closes #12191

Signed-off-by: Robin Gloster <mail@glob.in>
---
 pkgs/applications/audio/spotify/default.nix | 48 ++++++---------
 pkgs/applications/audio/spotify/preload.c   | 66 ---------------------
 2 files changed, 19 insertions(+), 95 deletions(-)
 delete mode 100644 pkgs/applications/audio/spotify/preload.c

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 81c2ee59bc53..cdfbf2f2b4c7 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -1,18 +1,18 @@
-{ fetchurl, stdenv, dpkg, xorg, qt4, alsaLib, makeWrapper, openssl_1_0_1, freetype
+{ fetchurl, stdenv, dpkg, xorg, alsaLib, makeWrapper, openssl_1_0_1, freetype
 , glib, pango, cairo, atk, gdk_pixbuf, gtk, cups, nspr, nss, libpng, GConf
-, libgcrypt, chromium, udev, fontconfig
-, dbus, expat, ffmpeg_0_10 }:
+, libgcrypt, udev, fontconfig, dbus, expat, ffmpeg_0_10, curl, zlib, gnome }:
 
 assert stdenv.system == "x86_64-linux";
 
 let
-  version = "0.9.17.1.g9b85d43.7";
+  version = "1.0.19.106.gb8a7150f";
 
   deps = [
     alsaLib
     atk
     cairo
     cups
+    curl
     dbus
     expat
     ffmpeg_0_10
@@ -26,19 +26,20 @@ let
     libpng
     nss
     pango
-    qt4
     stdenv.cc.cc
     udev
     xorg.libX11
     xorg.libXcomposite
+    xorg.libXcursor
     xorg.libXdamage
     xorg.libXext
     xorg.libXfixes
     xorg.libXi
     xorg.libXrandr
     xorg.libXrender
-    xorg.libXrender
     xorg.libXScrnSaver
+    xorg.libXtst
+    zlib
   ];
 
 in
@@ -48,8 +49,8 @@ stdenv.mkDerivation {
 
   src =
     fetchurl {
-      url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}-1_amd64.deb";
-      sha256 = "0x87q7gd2997sgppsm4lmdiz1cm11x5vnd5c34nqb5d4ry5qfyki";
+      url = "http://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb";
+      sha256 = "be6b99329bb2fccdc9d77bc949dd463576fdb40db7f56195b4284bd348c470be";
     };
 
   buildInputs = [ dpkg makeWrapper ];
@@ -61,8 +62,8 @@ stdenv.mkDerivation {
       libdir=$out/lib/spotify
       mkdir -p $libdir
       dpkg-deb -x $src $out
-      mv $out/opt/spotify/* $out/
-      rm -rf $out/usr $out/opt
+      mv $out/usr/* $out/
+      rm -rf $out/usr
 
       # Work around Spotify referring to a specific minor version of
       # OpenSSL.
@@ -72,33 +73,22 @@ stdenv.mkDerivation {
       ln -s ${nspr}/lib/libnspr4.so $libdir/libnspr4.so
       ln -s ${nspr}/lib/libplc4.so $libdir/libplc4.so
 
-      mkdir -p $out/bin
-
-      rpath="$out/spotify-client/Data:$libdir:$out/spotify-client:${stdenv.cc.cc}/lib64"
-
-      ln -s $out/spotify-client/spotify $out/bin/spotify
+      rpath="$out/share/spotify:$libdir"
 
       patchelf \
         --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-        --set-rpath $rpath $out/spotify-client/spotify
+        --set-rpath $rpath $out/share/spotify/spotify
 
-      patchelf \
-        --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-        --set-rpath $rpath $out/spotify-client/Data/SpotifyHelper
-
-      preload=$out/libexec/spotify/libpreload.so
       librarypath="${stdenv.lib.makeLibraryPath deps}:$libdir"
-      mkdir -p $out/libexec/spotify
-      gcc -shared ${./preload.c} -o $preload -ldl -DOUT=\"$out\" -fPIC
-
-      wrapProgram $out/bin/spotify --set LD_PRELOAD $preload --prefix LD_LIBRARY_PATH : "$librarypath"
-      wrapProgram $out/spotify-client/Data/SpotifyHelper --set LD_PRELOAD $preload --prefix LD_LIBRARY_PATH : "$librarypath"
+      wrapProgram $out/share/spotify/spotify \
+        --prefix LD_LIBRARY_PATH : "$librarypath" \
+        --prefix PATH : "${gnome.zenity}/bin"
 
       # Desktop file
       mkdir -p "$out/share/applications/"
-      cp "$out/spotify-client/spotify.desktop" "$out/share/applications/"
-      sed -i "s|Icon=.*|Icon=$out/spotify-client/Icons/spotify-linux-512.png|" "$out/share/applications/spotify.desktop"
-    ''; # */
+      cp "$out/share/spotify/spotify.desktop" "$out/share/applications/"
+      sed -i "s|Icon=.*|Icon=$out/share/spotify/Icons/spotify-linux-512.png|" "$out/share/applications/spotify.desktop"
+    '';
 
   dontStrip = true;
   dontPatchELF = true;
diff --git a/pkgs/applications/audio/spotify/preload.c b/pkgs/applications/audio/spotify/preload.c
deleted file mode 100644
index 42d482c21e43..000000000000
--- a/pkgs/applications/audio/spotify/preload.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/* Spotify looks for its theme data in /usr/share/spotify/theme.  This
-   LD_PRELOAD library intercepts open() and stat() calls to redirect
-   them to the corresponding location in $out. */
-
-#define _GNU_SOURCE
-#include <stdio.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <dlfcn.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <limits.h>
-
-char themeDir [] = "/usr/share/spotify/theme";
-char realThemeDir [] = OUT "/share/spotify/theme";
-
-const char * rewrite(const char * path, char * buf)
-{
-    if (strncmp(path, themeDir, sizeof(themeDir) - 1) != 0) return path;
-    if (snprintf(buf, PATH_MAX, "%s%s", realThemeDir, path + sizeof(themeDir) - 1) >= PATH_MAX)
-        abort();
-    return buf;
-}
-
-int open(const char *path, int flags, ...)
-{
-    char buf[PATH_MAX];
-    int (*_open) (const char *, int, mode_t) = dlsym(RTLD_NEXT, "open");
-    mode_t mode = 0;
-    if (flags & O_CREAT) {
-        va_list ap;
-        va_start(ap, flags);
-        mode = va_arg(ap, mode_t);
-        va_end(ap);
-    }
-    return _open(rewrite(path, buf), flags, mode);
-}
-
-int open64(const char *path, int flags, ...)
-{
-    char buf[PATH_MAX];
-    int (*_open64) (const char *, int, mode_t) = dlsym(RTLD_NEXT, "open64");
-    mode_t mode = 0;
-    if (flags & O_CREAT) {
-        va_list ap;
-        va_start(ap, flags);
-        mode = va_arg(ap, mode_t);
-        va_end(ap);
-    }
-    return _open64(rewrite(path, buf), flags, mode);
-}
-
-int __xstat64(int ver, const char *path, struct stat64 *st)
-{
-    char buf[PATH_MAX];
-    int (*___xstat64) (int ver, const char *, struct stat64 *) = dlsym(RTLD_NEXT, "__xstat64");
-    return ___xstat64(ver, rewrite(path, buf), st);
-}
-
-int access(const char *path, int mode)
-{
-    char buf[PATH_MAX];
-    int (*_access) (const char *path, int mode) = dlsym(RTLD_NEXT, "access");
-    return _access(rewrite(path, buf), mode);
-}

From 4d43687fc1d8e52ca5dfbec3191a724660194c41 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 17 Jan 2016 21:16:33 +0300
Subject: [PATCH 856/884] python-axolotl-curve25519: init at 0.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 48c3d3d148e5..5194f359e9c5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6347,6 +6347,24 @@ in modules // {
     };
   };
 
+  python-axolotl-curve25519 = buildPythonPackage rec {
+    name = "python-axolotl-curve25519-${version}";
+    version = "0.1";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/p/python-axolotl-curve25519/${name}.tar.gz";
+      sha256 = "1h1rsdr7m8lvgxwrwng7qv0xxmyc9k0q7g9nbcr6ks2ipyjzcnf5";
+    };
+
+    meta = {
+      homepage = https://github.com/tgalal/python-axolotl;
+      description = "Curve25519 with ed25519 signatures";
+      maintainers = with maintainers; [ abbradar ];
+      license = licenses.gpl3;
+      platform = platforms.all;
+    };
+  };
+
   pypolicyd-spf = buildPythonPackage rec {
     name = "pypolicyd-spf-${version}";
     majorVersion = "1.3";

From 49363a40ba7109438fee4042bc54f81c2f72035a Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 17 Jan 2016 21:17:37 +0300
Subject: [PATCH 857/884] python-axolotl: init at 0.1.7

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5194f359e9c5..d866a6a98487 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6347,6 +6347,26 @@ in modules // {
     };
   };
 
+  python-axolotl = buildPythonPackage rec {
+    name = "python-axolotl-${version}";
+    version = "0.1.7";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/p/python-axolotl/${name}.tar.gz";
+      sha256 = "1i3id1mjl67n4sca31s5zwq96kswgsi6lga6np83ayb45rxggvhx";
+    };
+
+    propagatedBuildInputs = with self; [ python-axolotl-curve25519 protobuf pycrypto ];
+
+    meta = {
+      homepage = https://github.com/tgalal/python-axolotl;
+      description = "Python port of libaxolotl-android";
+      maintainers = with maintainers; [ abbradar ];
+      license = licenses.gpl3;
+      platform = platforms.all;
+    };
+  };
+
   python-axolotl-curve25519 = buildPythonPackage rec {
     name = "python-axolotl-curve25519-${version}";
     version = "0.1";

From 00eeae1179eb86445f5f6812349dfd120d230118 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 17 Jan 2016 21:17:47 +0300
Subject: [PATCH 858/884] gajim: add extraPythonPackages option

For exampole, this allows to add python-axolotl to PYTHONPATH,
which is needed for OMEMO OTR messaging plugin.
---
 .../networking/instant-messengers/gajim/default.nix           | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index 7312b45828cb..fa61876bf161 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -7,6 +7,7 @@
 , enableRST ? true
 , enableSpelling ? true, gtkspell ? null
 , enableNotifications ? false
+, extraPythonPackages ? pkgs: []
 }:
 
 assert enableJingle -> farstream != null && gst_plugins_bad != null
@@ -61,7 +62,8 @@ stdenv.mkDerivation rec {
   ] ++ optionals enableJingle [ farstream gst_plugins_bad libnice ]
     ++ optional enableE2E pythonPackages.pycrypto
     ++ optional enableRST pythonPackages.docutils
-    ++ optional enableNotifications pythonPackages.notify;
+    ++ optional enableNotifications pythonPackages.notify
+    ++ extraPythonPackages pythonPackages;
 
   postInstall = ''
     install -m 644 -t "$out/share/gajim/icons/hicolor" \

From 4a0692a5fb9dc38b49deeda174c37a0864e052f3 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 17 Jan 2016 19:49:38 +0000
Subject: [PATCH 859/884] types: remove references to new packageSet

Reverts part of a04a7272aa38ada45e694281071b720d4abbd0df

packageSet is slated to be introduced in #11866 but currently causes
evalation errors.

/cc @ts468
---
 nixos/modules/services/x11/window-managers/xmonad.nix | 1 -
 nixos/modules/system/boot/kernel.nix                  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/nixos/modules/services/x11/window-managers/xmonad.nix b/nixos/modules/services/x11/window-managers/xmonad.nix
index 588696dac15c..6af88d4f645b 100644
--- a/nixos/modules/services/x11/window-managers/xmonad.nix
+++ b/nixos/modules/services/x11/window-managers/xmonad.nix
@@ -16,7 +16,6 @@ in
     services.xserver.windowManager.xmonad = {
       enable = mkEnableOption "xmonad";
       haskellPackages = mkOption {
-        type = lib.types.packageSet;
         default = pkgs.haskellPackages;
         defaultText = "pkgs.haskellPackages";
         example = literalExample "pkgs.haskell.packages.ghc784";
diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index 03de445d7822..6bc046d02611 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -20,7 +20,6 @@ in
   options = {
 
     boot.kernelPackages = mkOption {
-      type = types.packageSet;
       default = pkgs.linuxPackages;
       # We don't want to evaluate all of linuxPackages for the manual
       # - some of it might not even evaluate correctly.

From 9e8eba48ab46ecff67dfb27571b9adb0e2602f15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 17 Jan 2016 21:14:49 +0100
Subject: [PATCH 860/884] xorg.xorgserver: wrap Xvfb with required flags

---
 nixos/modules/services/x11/terminal-server.nix | 15 +--------------
 pkgs/servers/x11/xorg/overrides.nix            |  4 ++++
 pkgs/tools/X11/xpra/default.nix                |  4 ----
 pkgs/tools/X11/xpra/gtk3.nix                   |  4 ----
 4 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/nixos/modules/services/x11/terminal-server.nix b/nixos/modules/services/x11/terminal-server.nix
index a036e085b0bf..4d5dbd604159 100644
--- a/nixos/modules/services/x11/terminal-server.nix
+++ b/nixos/modules/services/x11/terminal-server.nix
@@ -9,19 +9,6 @@
 
 with lib;
 
-let
-
-  # Wrap Xvfb to set some flags/variables.
-  xvfbWrapper = pkgs.writeScriptBin "Xvfb"
-    ''
-      #! ${pkgs.stdenv.shell}
-      export XKB_BINDIR=${pkgs.xorg.xkbcomp}/bin
-      export XORG_DRI_DRIVER_PATH=${pkgs.mesa}/lib/dri
-      exec ${pkgs.xorg.xorgserver}/bin/Xvfb "$@" -xkbdir ${pkgs.xkeyboard_config}/etc/X11/xkb
-    '';
-
-in
-
 {
 
   config = {
@@ -54,7 +41,7 @@ in
       { description = "Terminal Server";
 
         path =
-          [ xvfbWrapper pkgs.gawk pkgs.which pkgs.openssl pkgs.xorg.xauth
+          [ pkgs.xorgserver pkgs.gawk pkgs.which pkgs.openssl pkgs.xorg.xauth
             pkgs.nettools pkgs.shadow pkgs.procps pkgs.utillinux pkgs.bash
           ];
 
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index d6e18254760f..7bd179067cd0 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -325,6 +325,10 @@ in
           wrapProgram $out/bin/Xephyr \
             --set XKB_BINDIR "${xorg.xkbcomp}/bin" \
             --add-flags "-xkbdir ${xorg.xkeyboardconfig}/share/X11/xkb"
+          wrapProgram $out/bin/Xvfb \
+            --set XKB_BINDIR "${xorg.xkbcomp}/bin" \
+            --set XORG_DRI_DRIVER_PATH ${args.mesa}/lib/dri \
+            --add-flags "-xkbdir ${xorg.xkeyboardconfig}/share/X11/xkb"
         '';
         passthru.version = version; # needed by virtualbox guest additions
       } else {
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index b1fdd96adb5d..c5b8db591c4c 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -33,10 +33,6 @@ buildPythonPackage rec {
     pillow pygtk pygobject
   ];
 
-  postPatch = ''
-    sed -i 's|DEFAULT_XVFB_COMMAND = "Xvfb|DEFAULT_XVFB_COMMAND = "Xvfb -xkbdir ${xkeyboard_config}/etc/X11/xkb|' xpra/platform/features.py
-  '';
-
   preBuild = ''
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0) $(pkg-config --cflags pygtk-2.0) $(pkg-config --cflags xtst)"
   '';
diff --git a/pkgs/tools/X11/xpra/gtk3.nix b/pkgs/tools/X11/xpra/gtk3.nix
index 04bcd1195147..6e485dc0a052 100644
--- a/pkgs/tools/X11/xpra/gtk3.nix
+++ b/pkgs/tools/X11/xpra/gtk3.nix
@@ -33,10 +33,6 @@ buildPythonPackage rec {
     pygobject3 pycairo cython
   ];
 
-  postPatch = ''
-    sed -i 's|DEFAULT_XVFB_COMMAND = "Xvfb|DEFAULT_XVFB_COMMAND = "Xvfb -xkbdir ${xkeyboard_config}/etc/X11/xkb|' xpra/platform/features.py
-  '';
-
   preBuild = ''
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-3.0) $(pkg-config --cflags xtst)"
   '';

From 0ef8fa011f6a16ee1bf33ed5b7ce386290ec91df Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 17 Jan 2016 21:45:43 +0100
Subject: [PATCH 861/884] sshuttle: 0.74 -> 0.76
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

And back to fetchurl we go:

  “LookupError: setuptools-scm was unable to detect version for
   '/tmp/nix-build-.../sshuttle-v0.76-src'. Make sure you're not
   using GitHub's tarballs (or similar ones), as those don't
   contain the necessary metadata. Use PyPI's tarballs instead.”
---
 pkgs/tools/security/sshuttle/default.nix | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix
index 831a815e787b..62d3d2613cc1 100644
--- a/pkgs/tools/security/sshuttle/default.nix
+++ b/pkgs/tools/security/sshuttle/default.nix
@@ -1,21 +1,19 @@
-{ stdenv, pythonPackages, fetchFromGitHub, makeWrapper, pandoc
+{ stdenv, pythonPackages, fetchurl, makeWrapper, pandoc
 , coreutils, iptables, nettools, openssh, procps }:
   
 pythonPackages.buildPythonPackage rec {
-  version = "0.74";
+  version = "0.76";
   name = "sshuttle-${version}";
 
-  src = fetchFromGitHub {
-    sha256 = "1mx440wb1clis97nvgx67am9qssa3v11nb9irjzhnx44ygadhfcp";
-    rev = "v${version}";
-    repo = "sshuttle";
-    owner = "sshuttle";
+  src = fetchurl {
+    sha256 = "1q0hr0vhdvv23cw5dqndsmf61283mvs6b14662ci00xj6zp5v48b";
+    url = "https://pypi.python.org/packages/source/s/sshuttle/${name}.tar.gz";
   };
 
   patches = [ ./sudo.patch ];
 
   propagatedBuildInputs = with pythonPackages; [ PyXAPI mock pytest ];
-  nativeBuildInputs = [ makeWrapper pandoc ];
+  nativeBuildInputs = [ makeWrapper pandoc pythonPackages.setuptools_scm ];
   buildInputs =
     [ coreutils openssh ] ++
     stdenv.lib.optionals stdenv.isLinux [ iptables nettools procps ];
@@ -29,7 +27,7 @@ pythonPackages.buildPythonPackage rec {
   
   meta = with stdenv.lib; {
     inherit version;
-    inherit (src.meta) homepage;
+    homepage = https://github.com/sshuttle/sshuttle/;
     description = "Transparent proxy server that works as a poor man's VPN";
     longDescription = ''
       Forward connections over SSH, without requiring administrator access to the

From ceaec1a10810cacc70c9ddc8871db75b391b27f0 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 17 Jan 2016 21:59:22 +0100
Subject: [PATCH 862/884] minidb: init at 2.0.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d866a6a98487..b407561f56ac 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3542,6 +3542,22 @@ in modules // {
     };
   };
 
+  minidb = buildPythonPackage rec {
+    name = "minidb-2.0.1";
+
+    src = pkgs.fetchurl {
+      url = "https://thp.io/2010/minidb/${name}.tar.gz";
+      sha256 = "1x958zr9jc26vaqij451qb9m2l7apcpz34ir9fwfjg4fwv24z2dy";
+    };
+
+    meta = {
+      description = "A simple SQLite3-based store for Python objects";
+      homepage = https://thp.io/2010/minidb/;
+      license = stdenv.lib.licenses.isc;
+      maintainers = [ stdenv.lib.maintainers.tv ];
+    };
+  };
+
   mixpanel = buildPythonPackage rec {
     version = "4.0.2";
     name = "mixpanel-${version}";

From ed4373e8b7f4572556596954ec4c3819c521b77e Mon Sep 17 00:00:00 2001
From: Gleb Peregud <gleber.p@gmail.com>
Date: Sun, 17 Jan 2016 21:00:12 +0100
Subject: [PATCH 863/884] Pass buildPlugins to rebar3-nix-bootstrap.

To successfully build rebar packages, it needs to be provided with
rebar3 plugins used to build it. This change passes them to env
variable. From there rebar3-nix-bootstrap takes them and symlinks into
_build/default/plugins.
---
 pkgs/development/erlang-modules/build-rebar3.nix      | 11 +++++++----
 .../tools/build-managers/rebar3/default.nix           |  3 +--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/erlang-modules/build-rebar3.nix b/pkgs/development/erlang-modules/build-rebar3.nix
index 6ad82b62158c..8033d6c838ee 100644
--- a/pkgs/development/erlang-modules/build-rebar3.nix
+++ b/pkgs/development/erlang-modules/build-rebar3.nix
@@ -4,7 +4,7 @@
 { name, version
 , src
 , setupHook ? null
-, buildInputs ? [], erlangDeps ? [], pluginDeps ? []
+, buildInputs ? [], erlangDeps ? [], buildPlugins ? []
 , postPatch ? ""
 , compilePorts ? false
 , installPhase ? null
@@ -14,8 +14,7 @@
 with stdenv.lib;
 
 let
-  plugins = pluginDeps ++ (if compilePorts then [pc] else []);
-
+  ownPlugins = buildPlugins ++ (if compilePorts then [pc] else []);
 
   shell = drv: stdenv.mkDerivation {
           name = "interactive-shell-${drv.name}";
@@ -28,7 +27,11 @@ let
     inherit version;
 
     buildInputs = buildInputs ++ [ erlang rebar3 openssl libyaml ];
-    propagatedBuildInputs = erlangDeps ++ plugins;
+    propagatedBuildInputs = unique (erlangDeps ++ ownPlugins);
+
+    # The following are used by rebar3-nix-bootstrap
+    inherit compilePorts;
+    buildPlugins = ownPlugins;
 
     inherit src;
 
diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix
index 5ee9ecbcef8b..dccb67efaf4c 100644
--- a/pkgs/development/tools/build-managers/rebar3/default.nix
+++ b/pkgs/development/tools/build-managers/rebar3/default.nix
@@ -81,8 +81,7 @@ stdenv.mkDerivation {
   patches = [ ./hermetic-bootstrap.patch ];
 
   buildInputs = [ erlang tree  ];
-  propagatedBuildInputs = [ registrySnapshot  rebar3-nix-bootstrap ];
-
+  propagatedBuildInputs = [ registrySnapshot rebar3-nix-bootstrap ];
 
   postPatch = ''
     echo postPatch

From 180655290da0fc565df216b1869e558e8ea2096a Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 17 Jan 2016 22:00:39 +0100
Subject: [PATCH 864/884] urlwatch: 1.18 -> 2.0

---
 pkgs/tools/networking/urlwatch/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix
index bd580d28320b..ef420961a1f3 100644
--- a/pkgs/tools/networking/urlwatch/default.nix
+++ b/pkgs/tools/networking/urlwatch/default.nix
@@ -1,16 +1,18 @@
 { stdenv, fetchurl, python3Packages }:
 
 python3Packages.buildPythonPackage rec {
-  name = "urlwatch-1.18";
+  name = "urlwatch-2.0";
 
   src = fetchurl {
     url = "http://thp.io/2008/urlwatch/${name}.tar.gz";
-    sha256 = "090qfgx249ks7103sap6w47f8302ix2k46wxhfssxwsqcqdl25vb";
+    sha256 = "0j38qzw4jxw41vnnpi6j851hqpv8d6p1cbni6cv8r2vqf5307s3b";
   };
 
-  patchPhase = ''
-    ./convert-to-python3.sh
-  '';
+  propagatedBuildInputs = with python3Packages; [
+    keyring
+    minidb
+    pyyaml
+  ];
 
   postFixup = ''
     wrapProgram "$out/bin/urlwatch" --prefix "PYTHONPATH" : "$PYTHONPATH"

From cd11d91f0af434c61f44f4f18f16523936b30241 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 17 Jan 2016 22:01:42 +0000
Subject: [PATCH 865/884] jobs -> systemd.services

missed an override
---
 nixos/modules/installer/cd-dvd/system-tarball-pc.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/installer/cd-dvd/system-tarball-pc.nix b/nixos/modules/installer/cd-dvd/system-tarball-pc.nix
index 1156003d3f47..5da5df81ede1 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball-pc.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball-pc.nix
@@ -109,7 +109,7 @@ in
   # not be started by default on the installation CD because the
   # default root password is empty.
   services.openssh.enable = true;
-  jobs.openssh.startOn = lib.mkOverride 50 "";
+  systemd.services.openssh.wantedBy = lib.mkOverride 50 [];
 
   # To be able to use the systemTarball to catch troubles.
   boot.crashDump = {

From a80a07865db43750175e24f3b6d33be505bbe1f6 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 17 Jan 2016 21:52:40 +0000
Subject: [PATCH 866/884] rustRegistry: 2015-12-23 -> 2016-01-17

---
 pkgs/top-level/rust-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix
index 1f43751bc737..1cc2692b9d50 100644
--- a/pkgs/top-level/rust-packages.nix
+++ b/pkgs/top-level/rust-packages.nix
@@ -7,15 +7,15 @@
 { runCommand, fetchFromGitHub, git }:
 
 let
-  version = "2015-12-23";
-  rev = "0fd482d73d5a13fd49a36d2940ad7a069a6fc049";
+  version = "2016-01-17";
+  rev = "4d434405cd956c3c5476171bdc7e6dbe5c8ff209";
 
   src = fetchFromGitHub {
       inherit rev;
 
       owner = "rust-lang";
       repo = "crates.io-index";
-      sha256 = "18g69d7npky31rbd4bfcps9180bhfnddg2vhp9w1w0smvgzmg0i3";
+      sha256 = "12y6kbgx1kh04lhwxvxqs2jkhnfa9hkgdjxhzlqs3gjcybsdkdhj";
   };
 
 in

From ba4b4752f2545a1648c36076ba9908d0ce83a814 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 17 Jan 2016 21:53:12 +0000
Subject: [PATCH 867/884] racerRust: 1.0.0 -> 1.1.0

---
 pkgs/development/tools/rust/racer/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix
index 463f57f5e75c..0f5caa40e738 100644
--- a/pkgs/development/tools/rust/racer/default.nix
+++ b/pkgs/development/tools/rust/racer/default.nix
@@ -4,15 +4,15 @@ with rustPlatform;
 
 buildRustPackage rec {
   name = "racer-${version}";
-  version = "1.0.0";
+  version = "1.1.0";
   src = fetchFromGitHub {
     owner = "phildawes";
     repo = "racer";
     rev = "v${version}";
-    sha256 = "1b6829nqx0sqw1akcid61izw8mah1dfx2nxldkmmg4scnydhvw1l";
+    sha256 = "1y6xzavxm5bnqcnnz0mbnf2491m2kksp36yx3kd5mxyly33482y7";
   };
 
-  depsSha256 = "1hfqr1kidl77lq3djbhfn37whvv6k0hg9g5gcnl6pgl6kn669hdc";
+  depsSha256 = "1r2fxirkc0y6g7aas65n3yg1f2lf3kypnjr2v20p5np2lvla6djj";
 
   buildInputs = [ makeWrapper ];
 
@@ -24,8 +24,6 @@ buildRustPackage rec {
     mkdir -p $out/bin
     cp -p target/release/racer $out/bin/
     wrapProgram $out/bin/racer --set RUST_SRC_PATH "${rustc.src}/src"
-    install -d $out/share/emacs/site-lisp
-    install "editors/emacs/"*.el $out/share/emacs/site-lisp
   '';
 
   meta = with stdenv.lib; {

From 0f107fcb67c50c1d8c908a69fa442604f48b82ba Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 17 Jan 2016 23:57:23 +0100
Subject: [PATCH 868/884] 3dfsb: Remove package

Package is broken, old and not easily fixable.

See #12397.
---
 pkgs/applications/misc/3dfsb/default.nix | 34 ------------------------
 pkgs/top-level/all-packages.nix          |  4 ---
 2 files changed, 38 deletions(-)
 delete mode 100644 pkgs/applications/misc/3dfsb/default.nix

diff --git a/pkgs/applications/misc/3dfsb/default.nix b/pkgs/applications/misc/3dfsb/default.nix
deleted file mode 100644
index 36f3b17a0a31..000000000000
--- a/pkgs/applications/misc/3dfsb/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, makeWrapper, glibc, fetchgit, pkgconfig, SDL, SDL_image, SDL_stretch,
-  mesa, mesa_glu, freeglut, gst_all_1, gtk2, file, imagemagick }:
-
-stdenv.mkDerivation {
-  name = "3dfsb-1.0";
-
-  broken = true; # segfaults as of this commit
-
-  meta = with stdenv.lib; {
-    description = "3D File System Browser - cleaned up and improved fork of the old tdfsb which runs on GNU/Linux and should also run on BeOS/Haiku and FreeBSD";
-    homepage = "https://github.com/tomvanbraeckel/3dfsb";
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
-  };
-
-  src = fetchgit {
-    url = "git://github.com/tomvanbraeckel/3dfsb.git";
-    rev = "a69a9dfad42acbe2816328d11b58b65f4186c4c5";
-    sha256 = "191ndg4vfanjfx4qh186sszyy4pphx3l41rchins9mg8y5rm5ffp";
-  };
-
-  buildInputs = with gst_all_1; [ makeWrapper glibc pkgconfig SDL SDL_image SDL_stretch mesa_glu freeglut gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav gtk2 file imagemagick ];
-
-  buildPhase = "sh ./compile.sh";
-  dontStrip = true;
-
-  installPhase = "mkdir -p $out/bin/ && cp 3dfsb $out/bin/";
-
-  preFixup = ''
-    wrapProgram $out/bin/3dfsb \
-     --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
-    '';
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 42999213eb0e..a0bf41a3daac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -475,10 +475,6 @@ let
 
   _9pfs = callPackage ../tools/filesystems/9pfs { };
 
-  "3dfsb" = callPackage ../applications/misc/3dfsb {
-    glibc = glibc.override { debugSymbols = true; };
-  };
-
   a2ps = callPackage ../tools/text/a2ps { };
 
   abduco = callPackage ../tools/misc/abduco { };

From 1d8313042da7906f9166ef839ce024062fce3e83 Mon Sep 17 00:00:00 2001
From: Yacine Hmito <yacine.hmito@gmail.com>
Date: Mon, 18 Jan 2016 00:42:54 +0100
Subject: [PATCH 869/884] Renamed subdirectories in Android SKD's build-tools

Nix unzips the different components of the Android SDK one by one.
It followed the directory structure of complete packages released for
mainstream OS but the names of the directories in build-tools doesn't
match those.
As a result, some programs assuming the usual directory structure and
naming conventions broke (in my case it is a gradle plugin).
This is a fix. It may introduce a regression if some programs rely on
the current behavior.
---
 pkgs/development/mobile/androidenv/androidsdk.nix  | 2 +-
 pkgs/development/mobile/androidenv/build-tools.nix | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix
index 02c1546ace7b..01ba759f4f69 100644
--- a/pkgs/development/mobile/androidenv/androidsdk.nix
+++ b/pkgs/development/mobile/androidenv/androidsdk.nix
@@ -219,7 +219,7 @@ stdenv.mkDerivation rec {
         fi
     done
 
-    for i in $out/libexec/android-sdk-*/build-tools/android-*/*
+    for i in $out/libexec/android-sdk-*/build-tools/*/*
     do
         if [ ! -d $i ] && [ -x $i ]
         then
diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix
index 1b49c8f6fc4e..2918acd8c15e 100644
--- a/pkgs/development/mobile/androidenv/build-tools.nix
+++ b/pkgs/development/mobile/androidenv/build-tools.nix
@@ -18,10 +18,11 @@ stdenv.mkDerivation rec {
     mkdir -p $out/build-tools
     cd $out/build-tools
     unzip $src
+    mv android-* ${version}
     
     ${stdenv.lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux")
       ''
-        cd android-*
+        cd ${version}
         
         # Patch the interpreter
         for i in aapt aidl bcc_compat dexdump llvm-rs-cc

From 6f640acfba8116c2b9a330b05f79ced6eef485cd Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 17 Jan 2016 23:20:52 +0100
Subject: [PATCH 870/884] ms-sys: 2.5.1 -> 2.5.2; maintain

Changes:
  - Added german man page,
  - added support for Grub2 and Grub4Dos MBR,
  - added support for KolibriOS MBR and FAT32 boot record,
  - added support for ReactOS MBR, FAT32 and FAT16 BR,
  - added support for Rufus MBR,
  - added experimental support for large sectors ( > 512),
  - now possible to alter OEM ID of FAT and NTFS boot records.
  - now possible to alter Windows Disk Signature in MBR.
---
 pkgs/tools/misc/ms-sys/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/ms-sys/default.nix b/pkgs/tools/misc/ms-sys/default.nix
index 376d0ea6ad5c..81a6026b4ca2 100644
--- a/pkgs/tools/misc/ms-sys/default.nix
+++ b/pkgs/tools/misc/ms-sys/default.nix
@@ -1,22 +1,25 @@
 { stdenv, fetchurl, gettext }:
 
-let version = "2.5.1"; in
+let version = "2.5.2"; in
 stdenv.mkDerivation rec {
   name = "ms-sys-${version}";
  
   src = fetchurl {
     url = "mirror://sourceforge/ms-sys/${name}.tar.gz";
-    sha256 = "1vw8yvcqb6iccs4x7rgk09mqrazkalmpxxxsxmvxn32jzdzl5b26";
+    sha256 = "0c7ld5pglcacnrvy2gzzg1ny1jyknlj9iz1mvadq3hn8ai1d83px";
   };
 
   buildInputs = [ gettext ];
 
+  enableParallelBuilding = true;
+
   makeFlags = [ "PREFIX=$(out)" ];
 
-  meta = {
+  meta = with stdenv.lib; {
     inherit version;
-    homepage = http://ms-sys.sourceforge.net/;
-    license = stdenv.lib.licenses.gpl2;
     description = "A program for writing Microsoft compatible boot records";
+    homepage = http://ms-sys.sourceforge.net/;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ nckx ];
   };
 }

From f0cc8f9ec5d9709131fba0554101e63ac1874034 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 17 Jan 2016 23:46:23 +0100
Subject: [PATCH 871/884] 4suite: remove dead package

Project abandoned in 2006. Broken since June 2014.
---
 .../python-modules/4suite/default.nix          | 18 ------------------
 pkgs/top-level/all-packages.nix                |  2 --
 pkgs/top-level/python-packages.nix             |  2 --
 3 files changed, 22 deletions(-)
 delete mode 100644 pkgs/development/python-modules/4suite/default.nix

diff --git a/pkgs/development/python-modules/4suite/default.nix b/pkgs/development/python-modules/4suite/default.nix
deleted file mode 100644
index 94eec40d51fb..000000000000
--- a/pkgs/development/python-modules/4suite/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{stdenv, fetchurl, python}:
-
-stdenv.mkDerivation rec {
-  version = "1.0.2";
-  name = "4suite-${version}";
-  src = fetchurl {
-    url = "mirror://sourceforge/foursuite/4Suite-XML-${version}.tar.bz2";
-    sha256 = "0g5cyqxhhiqnvqk457k8sb97r18pwgx6gff18q5296xd3zf4cias";
-  };
-  buildInputs = [python];
-  buildPhase = "true";
-  installPhase = "python ./setup.py install --prefix=$out";
-
-  # None of the tools installed to bin/ work. They all throw an exception
-  # similar to this:
-  #   ImportError: No module named Ft.Xml.XPath._4xpath
-  meta.broken = true;
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a0bf41a3daac..4c8cc009b0f1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9022,8 +9022,6 @@ let
     self = pypyPackages;
   });
 
-  foursuite = pythonPackages.foursuite;
-
   bsddb3 = pythonPackages.bsddb3;
 
   ecdsa = pythonPackages.ecdsa;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b407561f56ac..88b0eda1a077 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8558,8 +8558,6 @@ in modules // {
     };
   });
 
-  foursuite = callPackage ../development/python-modules/4suite {};
-
   fs = buildPythonPackage rec {
     name = "fs-0.5.0";
 

From 7f2d6d8ee60ee6ed1f39deb91d71c38bf583fc4a Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 17 Jan 2016 23:47:25 +0100
Subject: [PATCH 872/884] ms-sys: correct licence

---
 pkgs/tools/misc/ms-sys/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/ms-sys/default.nix b/pkgs/tools/misc/ms-sys/default.nix
index 81a6026b4ca2..f9512b09ce66 100644
--- a/pkgs/tools/misc/ms-sys/default.nix
+++ b/pkgs/tools/misc/ms-sys/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     inherit version;
     description = "A program for writing Microsoft compatible boot records";
     homepage = http://ms-sys.sourceforge.net/;
-    license = licenses.gpl2;
+    license = licenses.gpl2Plus;
     maintainers = with maintainers; [ nckx ];
   };
 }

From e66965fdee1cd52bb368739c68268af9498e663f Mon Sep 17 00:00:00 2001
From: William Casarin <bill@casarin.me>
Date: Sun, 17 Jan 2016 16:50:10 -0800
Subject: [PATCH 873/884] terra: init at git-2016-01-06

---
 pkgs/development/compilers/terra/default.nix | 42 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  6 +++
 2 files changed, 48 insertions(+)
 create mode 100644 pkgs/development/compilers/terra/default.nix

diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix
new file mode 100644
index 000000000000..3586e4c32e5f
--- /dev/null
+++ b/pkgs/development/compilers/terra/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, lua, fetchFromGitHub, fetchurl, which, llvm, clang, ncurses }:
+
+let luajitArchive = "LuaJIT-2.0.4.tar.gz";
+    luajitSrc = fetchurl {
+      url = "http://luajit.org/download/${luajitArchive}";
+      sha256 = "0zc0y7p6nx1c0pp4nhgbdgjljpfxsb5kgwp4ysz22l1p2bms83v2";
+    };
+in stdenv.mkDerivation rec {
+  name = "terra-git-${version}";
+  version = "2016-01-06";
+
+  src = fetchFromGitHub {
+    owner = "zdevito";
+    repo = "terra";
+    rev = "914cb98b8adcd50b2ec8205ef5d6914d3547e281";
+    sha256 = "1q0dm9gkx2lh2d2sfgly6j5nw32qigmlj3phdvjp26bz99cvxq46";
+  };
+
+  patchPhase = ''
+    substituteInPlace Makefile --replace \
+      '-lcurses' '-lncurses'
+  '';
+
+  configurePhase = ''
+    mkdir -p build
+    cp ${luajitSrc} build/${luajitArchive}
+  '';
+
+  installPhase = ''
+    mkdir -p $out
+    cp -r "release/"* $out
+  '';
+
+  buildInputs = [ which lua llvm clang ncurses ];
+
+  meta = with stdenv.lib; {
+    inherit (src.meta) homepage;
+    description = "A low-level counterpart to Lua";
+    maintainers = with maintainers; [ jb55 ];
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4c8cc009b0f1..1b4a0ee76051 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4966,6 +4966,12 @@ let
 
   tbb = callPackage ../development/libraries/tbb { };
 
+  terra = callPackage ../development/compilers/terra {
+    llvm = llvmPackages_35.llvm.override { enableSharedLibraries = false; };
+    clang = clang_35;
+    lua = lua5_1;
+  };
+
   teyjus = callPackage ../development/compilers/teyjus {
     omake = omake_rc1;
   };

From ebad3ffeb4fd1d34c80bab5f7632b61147a7c439 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 18 Jan 2016 02:46:23 +0100
Subject: [PATCH 874/884] tldr: 1.0 -> 1.1.0; maintain

---
 pkgs/tools/misc/tldr/default.nix | 36 +++++++++++++++-----------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/pkgs/tools/misc/tldr/default.nix b/pkgs/tools/misc/tldr/default.nix
index 49c2736095e4..f6ba3d171006 100644
--- a/pkgs/tools/misc/tldr/default.nix
+++ b/pkgs/tools/misc/tldr/default.nix
@@ -1,30 +1,15 @@
-{stdenv, clang, fetchurl, curl}:
+{ stdenv, fetchurl, clang, curl, libzip }:
 
-with stdenv.lib;
-
-let version = "1.0"; in
+let version = "1.1.0"; in
 stdenv.mkDerivation {
   name = "tldr-${version}";
 
   src = fetchurl {
     url = "https://github.com/tldr-pages/tldr-cpp-client/archive/v${version}.tar.gz";
-    sha256 = "11k2pc4vfhx9q3cfd1145sdwhis9g0zhw4qnrv7s7mqnslzrrkgw";
+    sha256 = "0f2ijx17hv64w6zrv0vhj1j1jikzsj42657510vxcqqr8zanzlpf";
   };
 
-  meta = {
-    inherit version;
-    description = "Simplified and community-driven man pages";
-    longDescription = ''
-      tldr pages gives common use cases for commands, so you don't need to hunt through a man page for the correct flags.
-    '';
-    homepage = http://tldr-pages.github.io;
-    license = licenses.mit;
-    maintainers = [maintainers.taeer];
-    platforms = platforms.linux;
-
-  };
-
-  buildInputs = [curl clang];
+  buildInputs = [ curl clang libzip ];
 
   preBuild = ''
     cd src
@@ -34,4 +19,17 @@ stdenv.mkDerivation {
     install -d $prefix/bin
     install tldr $prefix/bin
   '';
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "Simplified and community-driven man pages";
+    longDescription = ''
+      tldr pages gives common use cases for commands, so you don't need to hunt
+      through a man page for the correct flags.
+    '';
+    homepage = http://tldr-pages.github.io;
+    license = licenses.mit;
+    maintainers = with maintainers; [ taeer nckx ];
+    platforms = platforms.linux;
+  };
 }

From 907481aca8f6a452766f5af53d5616c3ec9f4d49 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 18 Jan 2016 02:51:17 +0100
Subject: [PATCH 875/884] hack-font: 2.018 -> 2.019

---
 pkgs/data/fonts/hack/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/hack/default.nix b/pkgs/data/fonts/hack/default.nix
index 011d75557169..0b793d53fe6f 100644
--- a/pkgs/data/fonts/hack/default.nix
+++ b/pkgs/data/fonts/hack/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, unzip }:
 
-let version = "2.018"; in
+let version = "2.019"; in
 stdenv.mkDerivation {
   name = "hack-font-${version}";
 
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     version_ = with stdenv.lib;
       concatStringsSep "_" (splitString "." version);
   in fetchurl {
-    sha256 = "0k1k6pi9znrdc8a4kv0gkdnyzi2w932m2zi27dvb1ignn7lzmfkx";
+    sha256 = "0fhrl7y5z3d5fkiycbsi621f8nzfnpz8khxpd6hkc1hrg7nzmrk4";
     url = "https://github.com/chrissimpkins/Hack/releases/download/v${version}/Hack-v${version_}-ttf.zip";
   };
 

From 8b57eb8f17698b595f83fc5d19d7096792f31f89 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 18 Jan 2016 03:04:54 +0100
Subject: [PATCH 876/884] tldr: use fetchFromGitHub; pkgconfig

pkgconfig is unrelated, but trivial (removes a harmless but
distracting error message) and doesn't warrant its own commit.
---
 pkgs/tools/misc/tldr/default.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/misc/tldr/default.nix b/pkgs/tools/misc/tldr/default.nix
index f6ba3d171006..46dbc2a2a224 100644
--- a/pkgs/tools/misc/tldr/default.nix
+++ b/pkgs/tools/misc/tldr/default.nix
@@ -1,23 +1,25 @@
-{ stdenv, fetchurl, clang, curl, libzip }:
+{ stdenv, fetchFromGitHub, clang, curl, libzip, pkgconfig }:
 
 let version = "1.1.0"; in
 stdenv.mkDerivation {
   name = "tldr-${version}";
 
-  src = fetchurl {
-    url = "https://github.com/tldr-pages/tldr-cpp-client/archive/v${version}.tar.gz";
-    sha256 = "0f2ijx17hv64w6zrv0vhj1j1jikzsj42657510vxcqqr8zanzlpf";
+  src = fetchFromGitHub {
+    sha256 = "0hxkrzp5njhy7c19v8i3svcb148f1jni7dlv36gc1nmcrz5izsiz";
+    rev = "v${version}";
+    repo = "tldr-cpp-client";
+    owner = "tldr-pages";
   };
 
   buildInputs = [ curl clang libzip ];
+  nativeBuildInputs = [ pkgconfig ];
 
-  preBuild = ''
+  preConfigure = ''
     cd src
   '';
 
   installPhase = ''
-    install -d $prefix/bin
-    install tldr $prefix/bin
+    install -Dm755 {.,$out/bin}/tldr
   '';
 
   meta = with stdenv.lib; {

From 38c77bb72c9aec6f9e8ecb06a56032692de42e0c Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 18 Jan 2016 03:21:15 +0100
Subject: [PATCH 877/884] chromium: Do not rely on import-from-derivation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This has been introduced by me in 690a845 and discovered by @vcunat in
his comment over at:

https://github.com/NixOS/nixpkgs/commit/690a845de93a49e85480ad5fae492fa14658ce85#commitcomment-14209868

It's really a bit ugly to have builds running during evaluation, but
back when I made that commit the reason was to avoid having to shell
quote the hell out of it (see the comment in mkPluginInfo for the
reason).

Now we propagate plugin flags and environment variables as a list of
arguments in a plain file that's appended verbatim to makeWrapper, so
it shouldn't do any builds anymore during instantiation.

I have tested this with both just WideVine and just Flash enabled as
well as both in combination and none of the plugins and the output seems
correct. However I didn't test to run Chromium with the new
implementation.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Reported-by: Vladimír Čunát <vcunat@gmail.com>
---
 .../networking/browsers/chromium/default.nix  | 11 ++-
 .../networking/browsers/chromium/plugins.nix  | 71 ++++++++++++-------
 2 files changed, 48 insertions(+), 34 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index bf870e144e56..c0c5e485e59c 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -64,20 +64,17 @@ let
 in stdenv.mkDerivation {
   name = "chromium${suffix}-${chromium.browser.version}";
 
-  buildInputs = [ makeWrapper ] ++ chromium.plugins.enabledPlugins;
+  buildInputs = [ makeWrapper ];
 
   buildCommand = let
     browserBinary = "${chromium.browser}/libexec/chromium/chromium";
-    mkEnvVar = key: val: "--set '${key}' '${val}'";
-    envVars = chromium.plugins.settings.envVars or {};
-    flags = chromium.plugins.settings.flags or [];
+    getWrapperFlags = plugin: "$(< \"${plugin}/nix-support/wrapper-flags\")";
   in with stdenv.lib; ''
     mkdir -p "$out/bin" "$out/share/applications"
 
     ln -s "${chromium.browser}/share" "$out/share"
-    makeWrapper "${browserBinary}" "$out/bin/chromium" \
-      ${concatStrings (mapAttrsToList mkEnvVar envVars)} \
-      --add-flags "${concatStringsSep " " flags}"
+    eval makeWrapper "${browserBinary}" "$out/bin/chromium" \
+      ${concatMapStringsSep " " getWrapperFlags chromium.plugins.enabled}
 
     ln -s "$out/bin/chromium" "$out/bin/chromium-browser"
     ln -s "${chromium.browser}/share/icons" "$out/share/icons"
diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index 0b0e5bd08382..dda976905610 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -8,6 +8,34 @@
 with stdenv.lib;
 
 let
+  # Generate a shell fragment that emits flags appended to the
+  # final makeWrapper call for wrapping the browser's main binary.
+  #
+  # Note that this is shell-escaped so that only the variable specified
+  # by the "output" attribute is substituted.
+  mkPluginInfo = { output ? "out", allowedVars ? [ output ]
+                 , flags ? [], envVars ? {}
+                 }: let
+    shSearch = ["'"] ++ map (var: "\$${var}") allowedVars;
+    shReplace = ["'\\''"] ++ map (var: "'\"\${${var}}\"'") allowedVars;
+    # We need to triple-escape "val":
+    #  * First because makeWrapper doesn't do any quoting of its arguments by
+    #    itself.
+    #  * Second because it's passed to the makeWrapper call separated by IFS but
+    #    not by the _real_ arguments, for example the Widevine plugin flags
+    #    contain spaces, so they would end up as separate arguments.
+    #  * Third in order to be correctly quoted for the "echo" call below.
+    shEsc = val: "'${replaceStrings ["'"] ["'\\''"] val}'";
+    mkSh = val: "'${replaceStrings shSearch shReplace (shEsc val)}'";
+    mkFlag = flag: ["--add-flags" (shEsc flag)];
+    mkEnvVar = key: val: ["--set" (shEsc key) (shEsc val)];
+    envList = mapAttrsToList mkEnvVar envVars;
+    quoted = map mkSh (flatten ((map mkFlag flags) ++ envList));
+  in ''
+    mkdir -p "''$${output}/nix-support"
+    echo ${toString quoted} > "''$${output}/nix-support/wrapper-flags"
+  '';
+
   plugins = stdenv.mkDerivation {
     name = "chromium-binary-plugins";
 
@@ -61,40 +89,29 @@ let
 
       install -vD PepperFlash/libpepflashplayer.so \
         "$flash/lib/libpepflashplayer.so"
-      mkdir -p "$flash/nix-support"
-      cat > "$flash/nix-support/chromium-plugin.nix" <<NIXOUT
-        { flags = [
-            "--ppapi-flash-path='$flash/lib/libpepflashplayer.so'"
-            "--ppapi-flash-version=$flashVersion"
-          ];
-        }
-      NIXOUT
+
+      ${mkPluginInfo {
+        output = "flash";
+        allowedVars = [ "flash" "flashVersion" ];
+        flags = [
+          "--ppapi-flash-path=$flash/lib/libpepflashplayer.so"
+          "--ppapi-flash-version=$flashVersion"
+        ];
+      }}
 
       install -vD libwidevinecdm.so \
         "$widevine/lib/libwidevinecdm.so"
       install -vD libwidevinecdmadapter.so \
         "$widevine/lib/libwidevinecdmadapter.so"
-      mkdir -p "$widevine/nix-support"
-      cat > "$widevine/nix-support/chromium-plugin.nix" <<NIXOUT
-        { flags = [ "--register-pepper-plugins='${wvModule}${wvInfo}'" ];
-          envVars.NIX_CHROMIUM_PLUGIN_PATH_WIDEVINE = "$widevine/lib";
-        }
-      NIXOUT
+
+      ${mkPluginInfo {
+        output = "widevine";
+        flags = [ "--register-pepper-plugins=${wvModule}${wvInfo}" ];
+        envVars.NIX_CHROMIUM_PLUGIN_PATH_WIDEVINE = "$widevine/lib";
+      }}
     '';
 
-    passthru = let
-      enabledPlugins = optional enablePepperFlash plugins.flash
+    passthru.enabled = optional enablePepperFlash plugins.flash
                     ++ optional enableWideVine    plugins.widevine;
-      getNix = plugin: import "${plugin}/nix-support/chromium-plugin.nix";
-      mergeAttrsets = let
-        f = v: if all isAttrs v then mergeAttrsets v
-          else if all isList  v then concatLists   v
-          else if tail v == []  then head          v
-          else head (tail v);
-      in fold (l: r: zipAttrsWith (_: f) [ l r ]) {};
-    in {
-      inherit enabledPlugins;
-      settings = mergeAttrsets (map getNix enabledPlugins);
-    };
   };
 in plugins

From 85dd89f6eb02aacdde2932652c628b06f8e562da Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 18 Jan 2016 03:33:02 +0100
Subject: [PATCH 878/884] chromium: Remove myself from maintainers

Working on Chromium really drives me nuts due to its build time, also I
really don't have quite a lot of time these days to properly maintain it
anymore.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/networking/browsers/chromium/browser.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index c1f2cbbce4d5..2fb33fda6105 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -34,7 +34,7 @@ mkChromiumDerivation (base: rec {
   meta = {
     description = "An open source web browser from Google";
     homepage = http://www.chromium.org/;
-    maintainers = with maintainers; [ chaoflow aszlig ];
+    maintainers = with maintainers; [ chaoflow ];
     license = licenses.bsd3;
     platforms = platforms.linux;
   };

From bcd31d0acba04aad033eea10477aa42446600014 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 9 Dec 2015 19:17:30 +0100
Subject: [PATCH 879/884] mdadm: 3.3 -> 3.3.4

Okay, this update is a bit more tricky and the patch I've included is
not very nice to be honest.

So the patch causes "mdadm --udev-rules" to search for the right store
path using /proc/self/exec. This has the disadvantage that we could end
up having /run/current-system/bin/mdadm in the rule file.

But on the other hand, when we're on NixOS, we don't need to use that
command *at*all*, so we should be safe.

The patch also sets BINDIR to /sbin, which causes the included rule and
systemd files to not work out of the box on NixOS. But we have a
substituteInPlace where we do rewrite /sbin/mdadm to the right store
path in our udev rule generator, so that shouldn't be an issue.

I've tested this using the mdraid installer test and it succeeded.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/os-specific/linux/mdadm/default.nix      |  10 +-
 .../linux/mdadm/no-self-references.patch      | 130 ++++++++++++++++++
 2 files changed, 136 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/os-specific/linux/mdadm/no-self-references.patch

diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix
index 042c2225ff3a..10b580edceac 100644
--- a/pkgs/os-specific/linux/mdadm/default.nix
+++ b/pkgs/os-specific/linux/mdadm/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, groff }:
 
 stdenv.mkDerivation rec {
-  name = "mdadm-3.3";
+  name = "mdadm-3.3.4";
 
   # WARNING -- WARNING -- WARNING -- WARNING -- WARNING -- WARNING -- WARNING
   #  Do NOT update this if you're not ABSOLUTELY certain that it will work.
@@ -13,10 +13,12 @@ stdenv.mkDerivation rec {
   #   https://github.com/NixOS/nixpkgs/pull/6006
   # WARNING -- WARNING -- WARNING -- WARNING -- WARNING -- WARNING -- WARNING
   src = fetchurl {
-    url = "mirror://kernel/linux/utils/raid/mdadm/${name}.tar.bz2";
-    sha256 = "0igdqflihiq1dp5qlypzw0xfl44f4n3bckl7r2x2wfgkplcfa1ww";
+    url = "mirror://kernel/linux/utils/raid/mdadm/${name}.tar.xz";
+    sha256 = "0s6a4bq7v7zxiqzv6wn06fv9f6g502dp047lj471jwxq0r9z9rca";
   };
 
+  patches = [ ./no-self-references.patch ];
+
   nativeBuildInputs = [ groff ];
 
   # Attempt removing if building with gcc5 when updating
@@ -28,7 +30,7 @@ stdenv.mkDerivation rec {
   # /dev/.mdadm/map as a fallback).
   preBuild =
     ''
-      makeFlagsArray=(INSTALL=install BINDIR=$out/sbin MANDIR=$out/share/man RUN_DIR=/dev/.mdadm)
+      makeFlagsArray=(NIXOS=1 INSTALL=install INSTALL_BINDIR=$out/sbin MANDIR=$out/share/man RUN_DIR=/dev/.mdadm)
       if [[ -n "$crossConfig" ]]; then
         makeFlagsArray+=(CROSS_COMPILE=$crossConfig-)
       fi
diff --git a/pkgs/os-specific/linux/mdadm/no-self-references.patch b/pkgs/os-specific/linux/mdadm/no-self-references.patch
new file mode 100644
index 000000000000..cf0366e52d11
--- /dev/null
+++ b/pkgs/os-specific/linux/mdadm/no-self-references.patch
@@ -0,0 +1,130 @@
+diff --git a/Makefile b/Makefile
+index d82e30f..d231cf9 100644
+--- a/Makefile
++++ b/Makefile
+@@ -51,6 +51,9 @@ endif
+ ifdef DEBIAN
+ CPPFLAGS += -DDEBIAN
+ endif
++ifdef NIXOS
++CPPFLAGS += -DNIXOS
++endif
+ ifdef DEFAULT_OLD_METADATA
+  CPPFLAGS += -DDEFAULT_OLD_METADATA
+  DEFAULT_METADATA=0.90
+@@ -105,6 +108,7 @@ endif
+ INSTALL = /usr/bin/install
+ DESTDIR =
+ BINDIR  = /sbin
++INSTALL_BINDIR = ${BINDIR}
+ MANDIR  = /usr/share/man
+ MAN4DIR = $(MANDIR)/man4
+ MAN5DIR = $(MANDIR)/man5
+@@ -259,20 +263,20 @@ sha1.o : sha1.c sha1.h md5.h
+ 	$(CC) $(CFLAGS) -DHAVE_STDINT_H -o sha1.o -c sha1.c
+ 
+ install : mdadm mdmon install-man install-udev
+-	$(INSTALL) -D $(STRIP) -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm
+-	$(INSTALL) -D $(STRIP) -m 755 mdmon $(DESTDIR)$(BINDIR)/mdmon
++	$(INSTALL) -D $(STRIP) -m 755 mdadm $(DESTDIR)$(INSTALL_BINDIR)/mdadm
++	$(INSTALL) -D $(STRIP) -m 755 mdmon $(DESTDIR)$(INSTALL_BINDIR)/mdmon
+ 
+ install-static : mdadm.static install-man
+-	$(INSTALL) -D $(STRIP) -m 755 mdadm.static $(DESTDIR)$(BINDIR)/mdadm
++	$(INSTALL) -D $(STRIP) -m 755 mdadm.static $(DESTDIR)$(INSTALL_BINDIR)/mdadm
+ 
+ install-tcc : mdadm.tcc install-man
+-	$(INSTALL) -D $(STRIP) -m 755 mdadm.tcc $(DESTDIR)$(BINDIR)/mdadm
++	$(INSTALL) -D $(STRIP) -m 755 mdadm.tcc $(DESTDIR)$(INSTALL_BINDIR)/mdadm
+ 
+ install-uclibc : mdadm.uclibc install-man
+-	$(INSTALL) -D $(STRIP) -m 755 mdadm.uclibc $(DESTDIR)$(BINDIR)/mdadm
++	$(INSTALL) -D $(STRIP) -m 755 mdadm.uclibc $(DESTDIR)$(INSTALL_BINDIR)/mdadm
+ 
+ install-klibc : mdadm.klibc install-man
+-	$(INSTALL) -D $(STRIP) -m 755 mdadm.klibc $(DESTDIR)$(BINDIR)/mdadm
++	$(INSTALL) -D $(STRIP) -m 755 mdadm.klibc $(DESTDIR)$(INSTALL_BINDIR)/mdadm
+ 
+ install-man: mdadm.8 md.4 mdadm.conf.5 mdmon.8
+ 	$(INSTALL) -D -m 644 mdadm.8 $(DESTDIR)$(MAN8DIR)/mdadm.8
+@@ -305,7 +309,7 @@ install-systemd: systemd/mdmon@.service
+ 	if [ -f /etc/SuSE-release -o -n "$(SUSE)" ] ;then $(INSTALL) -D -m 755 systemd/SUSE-mdadm_env.sh $(DESTDIR)$(SYSTEMD_DIR)/../scripts/mdadm_env.sh ;fi
+ 
+ uninstall:
+-	rm -f $(DESTDIR)$(MAN8DIR)/mdadm.8 $(DESTDIR)$(MAN8DIR)/mdmon.8 $(DESTDIR)$(MAN4DIR)/md.4 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5 $(DESTDIR)$(BINDIR)/mdadm
++	rm -f $(DESTDIR)$(MAN8DIR)/mdadm.8 $(DESTDIR)$(MAN8DIR)/mdmon.8 $(DESTDIR)$(MAN4DIR)/md.4 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5 $(DESTDIR)$(INSTALL_BINDIR)/mdadm
+ 
+ test: mdadm mdmon test_stripe swap_super raid6check
+ 	@echo "Please run './test' as root"
+diff --git a/policy.c b/policy.c
+index 064d349..6b2f2b1 100644
+--- a/policy.c
++++ b/policy.c
+@@ -796,12 +796,39 @@ char *find_rule(struct rule *rule, char *rule_type)
+ #define UDEV_RULE_FORMAT \
+ "ACTION==\"add\", SUBSYSTEM==\"block\", " \
+ "ENV{DEVTYPE}==\"%s\", ENV{ID_PATH}==\"%s\", " \
+-"RUN+=\"" BINDIR "/mdadm --incremental $env{DEVNAME}\"\n"
++"RUN+=\"%s/mdadm --incremental $env{DEVNAME}\"\n"
+ 
+ #define UDEV_RULE_FORMAT_NOTYPE \
+ "ACTION==\"add\", SUBSYSTEM==\"block\", " \
+ "ENV{ID_PATH}==\"%s\", " \
+-"RUN+=\"" BINDIR "/mdadm --incremental $env{DEVNAME}\"\n"
++"RUN+=\"%s/mdadm --incremental $env{DEVNAME}\"\n"
++
++#ifdef NIXOS
++const char *get_mdadm_bindir(void)
++{
++	static char *bindir = NULL;
++	if (bindir != NULL) {
++		return bindir;
++	} else {
++		int len;
++		bindir = xmalloc(1025);
++		len = readlink("/proc/self/exe", bindir, 1024);
++		if (len > 0) {
++			char *basename;
++			if ((basename = strrchr(bindir, '/')) != NULL)
++				*basename = '\0';
++			else
++				*(bindir + len) = '\0';
++		} else {
++			*bindir = '\0';
++		}
++		return bindir;
++	}
++}
++#define SELF get_mdadm_bindir()
++#else
++#define SELF BINDIR
++#endif
+ 
+ /* Write rule in the rule file. Use format from UDEV_RULE_FORMAT */
+ int write_rule(struct rule *rule, int fd, int force_part)
+@@ -815,9 +842,9 @@ int write_rule(struct rule *rule, int fd, int force_part)
+ 	if (force_part)
+ 		typ = type_part;
+ 	if (typ)
+-		snprintf(line, sizeof(line) - 1, UDEV_RULE_FORMAT, typ, pth);
++		snprintf(line, sizeof(line) - 1, UDEV_RULE_FORMAT, typ, pth, SELF);
+ 	else
+-		snprintf(line, sizeof(line) - 1, UDEV_RULE_FORMAT_NOTYPE, pth);
++		snprintf(line, sizeof(line) - 1, UDEV_RULE_FORMAT_NOTYPE, pth, SELF);
+ 	return write(fd, line, strlen(line)) == (int)strlen(line);
+ }
+ 
+diff --git a/util.c b/util.c
+index cc98d3b..1ada2f4 100644
+--- a/util.c
++++ b/util.c
+@@ -1700,7 +1700,9 @@ int start_mdmon(char *devnm)
+ 	char pathbuf[1024];
+ 	char *paths[4] = {
+ 		pathbuf,
++#ifndef NIXOS
+ 		BINDIR "/mdmon",
++#endif
+ 		"./mdmon",
+ 		NULL
+ 	};

From 5e227e6f1d047822972fa75c1b913aaa82e5de1f Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 9 Dec 2015 20:02:37 +0100
Subject: [PATCH 880/884] mdadm: Clean up package expression.

Let's use makeFlags directly instead of stitching together a
makeFlagsArray in preBuild.

This should make the expression much more readable and clean.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/os-specific/linux/mdadm/default.nix | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix
index 10b580edceac..e7ed190c0c5b 100644
--- a/pkgs/os-specific/linux/mdadm/default.nix
+++ b/pkgs/os-specific/linux/mdadm/default.nix
@@ -19,22 +19,21 @@ stdenv.mkDerivation rec {
 
   patches = [ ./no-self-references.patch ];
 
+  makeFlags = [
+    "NIXOS=1" "INSTALL=install" "INSTALL_BINDIR=$(out)/sbin"
+    "MANDIR=$(out)/share/man" "RUN_DIR=/dev/.mdadm"
+  ] ++ stdenv.lib.optionals (stdenv ? cross) [
+    "CROSS_COMPILE=${stdenv.cross.config}-"
+  ];
+
   nativeBuildInputs = [ groff ];
 
   # Attempt removing if building with gcc5 when updating
   NIX_CFLAGS_COMPILE = "-std=gnu89";
 
-  preConfigure = "sed -e 's@/lib/udev@\${out}/lib/udev@' -e 's@ -Werror @ @' -i Makefile";
-
-  # Force mdadm to use /var/run/mdadm.map for its map file (or
-  # /dev/.mdadm/map as a fallback).
-  preBuild =
-    ''
-      makeFlagsArray=(NIXOS=1 INSTALL=install INSTALL_BINDIR=$out/sbin MANDIR=$out/share/man RUN_DIR=/dev/.mdadm)
-      if [[ -n "$crossConfig" ]]; then
-        makeFlagsArray+=(CROSS_COMPILE=$crossConfig-)
-      fi
-    '';
+  preConfigure = ''
+    sed -e 's@/lib/udev@''${out}/lib/udev@' -e 's@ -Werror @ @' -i Makefile
+  '';
 
   meta = {
     description = "Programs for managing RAID arrays under Linux";

From 011c149ed5e5a336c3039f0b9d4303020cff1d86 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 9 Dec 2015 20:25:40 +0100
Subject: [PATCH 881/884] mdadm: Set allowedReferences to only include libc.

The updates we had in the past (7719f7f and 1faf610) broke the mdadm
installer test and systems in the wild using mdraid because newer mdadm
versions contained a self-referenc to its own store path.

Instead of putting a big warning about updating in the package
expression, let's just add allowedReferences so the build immediately
fails if there is a self-reference.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/os-specific/linux/mdadm/default.nix | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix
index e7ed190c0c5b..dc1697b9e9b2 100644
--- a/pkgs/os-specific/linux/mdadm/default.nix
+++ b/pkgs/os-specific/linux/mdadm/default.nix
@@ -3,20 +3,15 @@
 stdenv.mkDerivation rec {
   name = "mdadm-3.3.4";
 
-  # WARNING -- WARNING -- WARNING -- WARNING -- WARNING -- WARNING -- WARNING
-  #  Do NOT update this if you're not ABSOLUTELY certain that it will work.
-  #  Please check the update using the NixOS VM test, BEFORE pushing:
-  #    nix-build nixos/release.nix -A tests.installer.swraid.x86_64-linux
-  # Discussion:
-  #   https://github.com/NixOS/nixpkgs/commit/7719f7f
-  #   https://github.com/NixOS/nixpkgs/commit/666cf99
-  #   https://github.com/NixOS/nixpkgs/pull/6006
-  # WARNING -- WARNING -- WARNING -- WARNING -- WARNING -- WARNING -- WARNING
   src = fetchurl {
     url = "mirror://kernel/linux/utils/raid/mdadm/${name}.tar.xz";
     sha256 = "0s6a4bq7v7zxiqzv6wn06fv9f6g502dp047lj471jwxq0r9z9rca";
   };
 
+  # This is to avoid self-references, which causes the initrd to explode
+  # in size and in turn prevents mdraid systems from booting.
+  allowedReferences = [ stdenv.glibc ];
+
   patches = [ ./no-self-references.patch ];
 
   makeFlags = [

From 34dc7fe49f3266042e8a1986410e98f3b874c6c2 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 18 Jan 2016 04:25:43 +0100
Subject: [PATCH 882/884] simple-scan: 3.19.3 -> 3.19.4

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

diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix
index 3fe8c06ca630..a2b7fd77337b 100644
--- a/pkgs/applications/graphics/simple-scan/default.nix
+++ b/pkgs/applications/graphics/simple-scan/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool
 , libusb1, libxml2, pkgconfig, sane-backends, vala, wrapGAppsHook }:
 
-let version = "3.19.3"; in
+let version = "3.19.4"; in
 stdenv.mkDerivation rec {
   name = "simple-scan-${version}";
 
   src = fetchurl {
-    sha256 = "0il7ikd5hj9mgzrivm01g572g9101w8la58h3hjyakwcfw3jp976";
+    sha256 = "1v9sify1s38qd5sfg26m7sdg9bkrfmai2nijs4wzah7xa9p23c83";
     url = "https://launchpad.net/simple-scan/3.19/${version}/+download/${name}.tar.xz";
   };
 

From f3ae60295f55f3e4ef61449cd9a1875a9dd8f24b Mon Sep 17 00:00:00 2001
From: Eduard Bachmakov <e.bachmakov@gmail.com>
Date: Sun, 17 Jan 2016 22:42:02 -0500
Subject: [PATCH 883/884] pshs: 0.2.6 -> 0.3

---
 pkgs/servers/http/pshs/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/http/pshs/default.nix b/pkgs/servers/http/pshs/default.nix
index 141f58417fb6..b9a42b4a5f61 100644
--- a/pkgs/servers/http/pshs/default.nix
+++ b/pkgs/servers/http/pshs/default.nix
@@ -1,19 +1,18 @@
-{ stdenv, fetchurl, pkgconfig, libevent, file, qrencode }:
+{ stdenv, fetchurl, pkgconfig, libevent, file, qrencode, miniupnpc }:
 
 let
-  version = "0.2.6";
+  version = "0.3";
 in stdenv.mkDerivation {
   name = "pshs-${version}";
 
   src = fetchurl {
     url = "https://www.bitbucket.org/mgorny/pshs/downloads/pshs-${version}.tar.bz2";
-    sha256 = "0n8l5sjnwjqjmw0jzg3hb93n6npg2wahmdg1zrpsw8fyh9ggjg4g";
+    sha256 = "0qvy1m9jmbjhbihs1qr9nasbaajl3n0x8bgz1vw9xvpkqymx5i63";
   };
 
-  buildInputs = [ pkgconfig libevent file qrencode ];
+  buildInputs = [ pkgconfig libevent file qrencode miniupnpc ];
 
-  # TODO: enable ssl once dependencies
-  # (libssl libcrypto libevent >= 2.1 libevent_openssl) can be met
+  # SSL requires libevent at 2.1 with ssl support
   configureFlags = "--disable-ssl";
 
   meta = {

From 53b389327e34de319dc0dbda2b6bcab1a69db69d Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 17 Jan 2016 23:04:40 +0000
Subject: [PATCH 884/884] refactor to use autoreconfHook where possible

Close #12446.
---
 .../audio/freewheeling/default.nix            |  6 ++----
 .../applications/audio/ladspa-plugins/git.nix | 10 +++------
 .../editors/emacs-modes/emacs-w3m/default.nix | 13 ++++++------
 .../graphics/solvespace/default.nix           | 20 ++++--------------
 pkgs/applications/misc/evtest/default.nix     |  6 ++----
 .../misc/mysql-workbench/default.nix          | 12 ++++-------
 pkgs/applications/misc/rofi/default.nix       |  8 ++-----
 .../pidgin-plugins/tox-prpl/default.nix       |  7 ++-----
 .../science/astronomy/celestia/default.nix    | 21 ++++++++-----------
 .../virtualization/open-vm-tools/default.nix  |  9 ++++----
 .../libraries/cloog-ppl/default.nix           | 11 +++-------
 pkgs/development/libraries/dbus/default.nix   | 11 +++++-----
 .../development/libraries/dotconf/default.nix |  6 ++----
 .../libraries/funambol/default.nix            | 12 ++---------
 pkgs/development/libraries/hivex/default.nix  |  8 ++-----
 .../development/libraries/libgksu/default.nix |  7 +++----
 .../libraries/libguestfs/default.nix          |  8 ++-----
 .../libraries/libivykis/default.nix           |  6 ++----
 pkgs/development/libraries/libpst/default.nix |  8 ++-----
 pkgs/development/libraries/librdf/default.nix | 14 ++++---------
 .../libraries/libtoxcore/new-api/default.nix  |  9 ++------
 .../libraries/libtoxcore/old-api/default.nix  |  8 ++-----
 .../development/libraries/minizip/default.nix |  9 +++-----
 .../libraries/pkcs11helper/default.nix        |  8 +++----
 .../libraries/spice-gtk/default.nix           | 12 ++++++-----
 pkgs/development/libraries/tremor/default.nix |  7 +++----
 pkgs/games/rili/default.nix                   | 17 +++++++--------
 pkgs/misc/emulators/vice/default.nix          | 20 +++++++++---------
 pkgs/misc/screensavers/alock/default.nix      |  5 ++---
 .../linux/xf86-input-mtrack/default.nix       | 10 ++-------
 .../linux/xf86-video-nested/default.nix       |  7 +++----
 pkgs/servers/nosql/hyperdex/busybee.nix       |  9 +++-----
 pkgs/servers/nosql/hyperdex/default.nix       | 11 ++++------
 pkgs/servers/nosql/hyperdex/hyperleveldb.nix  |  6 +++---
 pkgs/servers/nosql/hyperdex/libe.nix          |  6 +++---
 pkgs/servers/nosql/hyperdex/libmacaroons.nix  | 10 ++++-----
 pkgs/servers/nosql/hyperdex/libpo6.nix        |  6 +++---
 pkgs/servers/nosql/hyperdex/replicant.nix     | 10 ++++-----
 pkgs/servers/shellinabox/default.nix          |  5 ++---
 pkgs/tools/archivers/runzip/default.nix       | 17 +++++++--------
 pkgs/tools/misc/grub/default.nix              | 11 +++-------
 pkgs/tools/misc/mdbtools/git.nix              | 19 +++++++++--------
 pkgs/tools/misc/riemann-c-client/default.nix  |  7 ++-----
 pkgs/tools/misc/xclip/default.nix             |  8 +++----
 pkgs/tools/networking/biosdevname/default.nix | 18 ++++++----------
 pkgs/tools/networking/driftnet/default.nix    | 11 ++++++----
 pkgs/tools/networking/mu/default.nix          | 14 +++++--------
 pkgs/tools/networking/par2cmdline/default.nix |  6 ++----
 pkgs/tools/text/recode/default.nix            | 10 +++------
 pkgs/top-level/all-packages.nix               |  9 ++------
 50 files changed, 188 insertions(+), 320 deletions(-)

diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix
index 63917cac6c09..f7330ee12f91 100644
--- a/pkgs/applications/audio/freewheeling/default.nix
+++ b/pkgs/applications/audio/freewheeling/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchsvn, pkgconfig, autoconf, automake, gnutls33, freetype
+{ stdenv, fetchsvn, pkgconfig, autoreconfHook, gnutls33, freetype
 , SDL, SDL_gfx, SDL_ttf, liblo, libxml2, alsaLib, libjack2, libvorbis
 , libsndfile, libogg
 }:
@@ -13,12 +13,10 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [
-    pkgconfig autoconf automake gnutls33 freetype SDL SDL_gfx SDL_ttf
+    pkgconfig autoreconfHook gnutls33 freetype SDL SDL_gfx SDL_ttf
     liblo libxml2 libjack2 alsaLib libvorbis libsndfile libogg
   ];
 
-  preConfigure = "autoreconf -vfi";
-
   patches = [ ./am_path_sdl.patch ./xml.patch ];
 
   meta = {
diff --git a/pkgs/applications/audio/ladspa-plugins/git.nix b/pkgs/applications/audio/ladspa-plugins/git.nix
index e9ab932a88e4..e022a35f5c64 100644
--- a/pkgs/applications/audio/ladspa-plugins/git.nix
+++ b/pkgs/applications/audio/ladspa-plugins/git.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchgit, automake, autoreconfHook, fftw, gettext, ladspaH, libxml2, pkgconfig, perl, perlPackages }:
+{ stdenv, fetchgit, autoreconfHook, automake, fftw, ladspaH, libxml2, pkgconfig
+, perl, perlPackages }:
 
 stdenv.mkDerivation {
   name = "swh-plugins-git-2015-03-04";
@@ -9,7 +10,7 @@ stdenv.mkDerivation {
     sha256 = "7d9aa13a064903b330bd52e35c1f810f1c8a253ea5eb4e5a3a69a051af03150e";
   };
 
-  buildInputs = [ automake autoreconfHook fftw gettext ladspaH libxml2 pkgconfig perl perlPackages.XMLParser ];
+  buildInputs = [ autoreconfHook fftw ladspaH libxml2 pkgconfig perl perlPackages.XMLParser ];
 
   patchPhase = ''
     patchShebangs .
@@ -17,11 +18,6 @@ stdenv.mkDerivation {
     cp ${automake}/share/automake-*/mkinstalldirs .
   '';
 
-  configurePhase = ''
-    autoreconf -i
-    ./configure --prefix=$out
-  '';
-
   meta = with stdenv.lib; {
     homepage = http://plugin.org.uk/;
     description = "LADSPA format audio plugins";
diff --git a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
index 26f313f038df..d72ab12b580d 100644
--- a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
+++ b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
@@ -1,4 +1,4 @@
-{ fetchcvs, stdenv, emacs, w3m, imagemagick, texinfo, autoconf }:
+{ fetchcvs, stdenv, emacs, w3m, imagemagick, texinfo, autoreconfHook }:
 
 let date = "2013-03-21"; in
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "1lmcj8rf83w13q8q68hh7sa1abc2m6j2zmfska92xdp7hslhdgc5";
   };
 
-  buildInputs = [ emacs w3m texinfo autoconf ];
+  buildInputs = [ emacs w3m texinfo autoreconfHook ];
 
   # XXX: Should we do the same for xpdf/evince, gv, gs, etc.?
   patchPhase = ''
@@ -26,11 +26,10 @@ stdenv.mkDerivation rec {
             s|(w3m-which-command "identify")|"${imagemagick}/bin/identify"|g'
   '';
 
-  configurePhase = ''
-    autoreconf -vfi && \
-    ./configure --prefix="$out" --with-lispdir="$out/share/emacs/site-lisp" \
-                --with-icondir="$out/share/emacs/site-lisp/images/w3m"
-  '';
+  configureFlags = [
+    "--with-lispdir=$out/share/emacs/site-lisp"
+    "--with-icondir=$out/share/emacs/site-lisp/images/w3m"
+  ];
 
   postInstall = ''
     cd "$out/share/emacs/site-lisp"
diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix
index 67513bcf9230..069eea3b521b 100644
--- a/pkgs/applications/graphics/solvespace/default.nix
+++ b/pkgs/applications/graphics/solvespace/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchgit,autoconf, automake, gcc, fltk13
-, libjpeg, libpng, libtool, mesa, pkgconfig }:
+{ stdenv, fetchgit, autoreconfHook, fltk13
+, libjpeg, libpng, mesa, pkgconfig }:
 
 stdenv.mkDerivation {
   name = "solvespace-2.0";
@@ -14,27 +14,15 @@ stdenv.mkDerivation {
   dontBuild = true;
   enableParallelBuilding = false;
 
-  buildInputs = [        
-    autoconf
-    automake
-    gcc
+  buildInputs = [
+    autoreconfHook
     fltk13
     libjpeg
     libpng
-    libtool
     mesa
     pkgconfig
-    stdenv
   ];
 
-  preConfigure = ''
-    aclocal
-    libtoolize
-    
-    autoreconf -i
-    automake --add-missing
-  '';
-
   meta = {
     description = "A parametric 3d CAD program";
     license = stdenv.lib.licenses.gpl3;
diff --git a/pkgs/applications/misc/evtest/default.nix b/pkgs/applications/misc/evtest/default.nix
index bccfd95e32bf..330970b498ba 100644
--- a/pkgs/applications/misc/evtest/default.nix
+++ b/pkgs/applications/misc/evtest/default.nix
@@ -1,11 +1,9 @@
-{ stdenv, fetchgit, autoconf, automake, pkgconfig, libxml2 }:
+{ stdenv, fetchgit, autoreconfHook, automake, pkgconfig, libxml2 }:
 
 stdenv.mkDerivation rec {
   name = "evtest-1.32";
 
-  preConfigure = "autoreconf -iv";
-
-  buildInputs = [ autoconf automake pkgconfig libxml2 ];
+  buildInputs = [ autoreconfHook pkgconfig libxml2 ];
 
   src = fetchgit {
     url = "git://anongit.freedesktop.org/evtest";
diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix
index eddf9b8ac717..16a20015c629 100644
--- a/pkgs/applications/misc/mysql-workbench/default.nix
+++ b/pkgs/applications/misc/mysql-workbench/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, makeWrapper, autoconf, automake, boost, file, gettext
+{ stdenv, fetchurl, makeWrapper, autoreconfHook, boost, file
 , glib, glibc, libgnome_keyring, gnome_keyring, gtk, gtkmm, intltool
 , libctemplate, libglade
 , libiodbc
-, libgnome, libsigcxx, libtool, libuuid, libxml2, libzip, lua, mesa, mysql
+, libgnome, libsigcxx, libuuid, libxml2, libzip, lua, mesa, mysql
 , pango, paramiko, pcre, pexpect, pkgconfig, pycrypto, python, sqlite, sudo
 }:
 
@@ -16,18 +16,14 @@ stdenv.mkDerivation rec {
     sha256 = "1343fn3msdxqfpxw0kgm0mdx5r7g9ra1cpc8p2xhl7kz2pmqp4p6";
   };
 
-  buildInputs = [ autoconf automake boost file gettext glib glibc libgnome_keyring gtk gtkmm intltool
-    libctemplate libglade libgnome libiodbc libsigcxx libtool libuuid libxml2 libzip lua makeWrapper mesa
+  buildInputs = [ autoreconfHook boost file glib glibc libgnome_keyring gtk gtkmm intltool
+    libctemplate libglade libgnome libiodbc libsigcxx libuuid libxml2 libzip lua makeWrapper mesa
     mysql.lib paramiko pcre pexpect pkgconfig pycrypto python sqlite ];
 
   preConfigure = ''
     substituteInPlace $(pwd)/frontend/linux/workbench/mysql-workbench.in --replace "catchsegv" "${glibc}/bin/catchsegv"
   '';
 
-  postConfigure = ''
-    autoreconf -fi
-  '';
-
   postInstall = ''
     patchShebangs $out/share/mysql-workbench/extras/build_freetds.sh
 
diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix
index 6d8edec91031..9f11a141ff43 100644
--- a/pkgs/applications/misc/rofi/default.nix
+++ b/pkgs/applications/misc/rofi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoconf, automake, pkgconfig
+{ stdenv, fetchurl, autoreconfHook, pkgconfig
 , libX11, libXinerama, pango, cairo
 , libstartup_notification, i3Support ? false, i3
 }:
@@ -12,14 +12,10 @@ stdenv.mkDerivation rec {
     sha256 = "112fgx2awsw1xf1983bmy3jvs33qwyi8qj7j59jqc4gx07nv1rp5";
   };
 
-  buildInputs = [ autoconf automake pkgconfig libX11 libXinerama pango
+  buildInputs = [ autoreconfHook pkgconfig libX11 libXinerama pango
                   cairo libstartup_notification
                 ] ++ stdenv.lib.optional i3Support i3;
 
-  preConfigure = ''
-    autoreconf -vif
-  '';
-
   meta = {
       description = "Window switcher, run dialog and dmenu replacement";
       homepage = https://davedavenport.github.io/rofi;
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix
index 7cfa12eccb4d..367c837228a7 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix
@@ -1,5 +1,4 @@
-{ stdenv, fetchFromGitHub, libtoxcore, pidgin, autoconf, automake, libtool
-, libsodium } :
+{ stdenv, fetchFromGitHub, libtoxcore, pidgin, autoreconfHook, libsodium }:
 
 let
   version = "dd181722ea";
@@ -17,11 +16,9 @@ stdenv.mkDerivation rec {
 
   NIX_LDFLAGS = "-lssp -lsodium";
 
-  preConfigure = "autoreconf -vfi";
-
   postInstall = "mv $out/lib/purple-2 $out/lib/pidgin";
 
-  buildInputs = [ libtoxcore pidgin autoconf automake libtool libsodium ];
+  buildInputs = [ libtoxcore pidgin autoreconfHook libsodium ];
 
   meta = {
     homepage = http://tox.dhs.org/;
diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix
index d4da5c113c99..86b0ffbcf24c 100644
--- a/pkgs/applications/science/astronomy/celestia/default.nix
+++ b/pkgs/applications/science/astronomy/celestia/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, freeglut, gtk2, gtkglext, libjpeg_turbo, libtheora, libXmu
-, lua, mesa, pkgconfig, perl, automake, autoconf, libtool, gettext, glib, cairo
+, lua, mesa, pkgconfig, perl, autoreconfHook, glib, cairo
 , pango, gdk_pixbuf, atk
 }:
 
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ freeglut gtk2 gtkglext libjpeg_turbo libtheora libXmu mesa pkgconfig lua
-    perl automake autoconf libtool gettext ];
+    perl autoreconfHook ];
 
   patchPhase = ''
     patch -Np0 -i "${gcc46Patch}"
@@ -53,18 +53,15 @@ stdenv.mkDerivation {
     patch -Np2 -i "${libpng16Patch}"
     patch -Np1 -i "${linkingPatch}"
     patch -Np1 -i "${gcc47Patch}"
-    autoreconf
-    configureFlagsArray=(
-      --with-gtk
-      --with-lua=${lua}
-      CPPFLAGS="-DNDEBUG"
-      CFLAGS="-O2 -fsigned-char"
-      CXXFLAGS="-O2 -fsigned-char"
-      GTK_CFLAGS="-I${gtk2}/include/gtk-2.0 -I${gtk2}/lib/gtk-2.0/include -I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${cairo}/include/cairo -I${pango}/include/pango-1.0 -I${gdk_pixbuf}/include/gdk-pixbuf-2.0 -I${atk}/include/atk-1.0 -I${gtkglext}/include/gtkglext-1.0 -I${gtkglext}/lib/gtkglext-1.0/include"
-      GTK_LIBS="-lgtk-x11-2.0 -lgtkglext-x11-1.0 -lcairo -lgdk_pixbuf-2.0 -lpango-1.0 -lgobject-2.0"
-    )
   '';
 
+  configureFlags = "--with-gtk --with-lua=${lua}";
+  CPPFLAGS = "-DNDEBUG";
+  CFLAGS = "-O2 -fsigned-char";
+  CXXFLAGS = "-O2 -fsigned-char";
+  GTK_CFLAGS = "-I${gtk2}/include/gtk-2.0 -I${gtk2}/lib/gtk-2.0/include -I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${cairo}/include/cairo -I${pango}/include/pango-1.0 -I${gdk_pixbuf}/include/gdk-pixbuf-2.0 -I${atk}/include/atk-1.0 -I${gtkglext}/include/gtkglext-1.0 -I${gtkglext}/lib/gtkglext-1.0/include";
+  GTK_LIBS = "-lgtk-x11-2.0 -lgtkglext-x11-1.0 -lcairo -lgdk_pixbuf-2.0 -lpango-1.0 -lgobject-2.0";
+
   installPhase = ''make MKDIR_P="mkdir -p" install'';
 
   enableParallelBuilding = true;
diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix
index e8c6b39f4933..1cd33e8b97a5 100644
--- a/pkgs/applications/virtualization/open-vm-tools/default.nix
+++ b/pkgs/applications/virtualization/open-vm-tools/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, lib, fetchurl, makeWrapper, autoconf, automake,
-  libmspack, openssl, pam, xercesc, icu, libdnet, procps, 
+{ stdenv, lib, fetchurl, makeWrapper, autoreconfHook,
+  libmspack, openssl, pam, xercesc, icu, libdnet, procps,
   xlibsWrapper, libXinerama, libXi, libXrender, libXrandr, libXtst,
   pkgconfig, glib, gtk, gtkmm }:
 
@@ -16,8 +16,8 @@ in stdenv.mkDerivation {
     sha256 = "15lwayrz9bpx4z12fj616hsn25m997y72licwwz7kms4sx9ssip1";
   };
 
-  buildInputs = 
-    [ autoconf automake makeWrapper libmspack openssl pam xercesc icu libdnet procps
+  buildInputs =
+    [ autoreconfHook makeWrapper libmspack openssl pam xercesc icu libdnet procps
       pkgconfig glib gtk gtkmm xlibsWrapper libXinerama libXi libXrender libXrandr libXtst ];
 
   patchPhase = ''
@@ -28,7 +28,6 @@ in stdenv.mkDerivation {
 
   patches = [ ./recognize_nixos.patch ];
 
-  preConfigure = "autoreconf";
   configureFlags = "--without-kernel-modules --without-xmlsecurity";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/cloog-ppl/default.nix b/pkgs/development/libraries/cloog-ppl/default.nix
index 6f730d4821e2..2c49e0363589 100644
--- a/pkgs/development/libraries/cloog-ppl/default.nix
+++ b/pkgs/development/libraries/cloog-ppl/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, ppl, autoconf, automake, libtool }:
+{ fetchurl, stdenv, ppl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "cloog-ppl-0.15.11";
@@ -10,19 +10,14 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ ppl ];
 
-  nativeBuildInputs = [ automake autoconf libtool ];
+  nativeBuildInputs = [ autoreconfHook ];
 
   patches = [ ./fix-ppl-version.patch ];
 
   configureFlags = "--with-ppl=${ppl}";
 
-  preConfigure = ''
+  preAutoreconf = ''
     touch NEWS ChangeLog AUTHORS
-    ${libtool}/bin/libtoolize -c --force
-    ${automake}/bin/aclocal
-    ${automake}/bin/automake --add-missing
-    ${automake}/bin/automake -a -c --foreign
-    ${autoconf}/bin/autoreconf
   '';
 
   crossAttrs = {
diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index 97eecf78a1a1..7f5e2f6311b2 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, autoconf, automake, libtool
+{ stdenv, fetchurl, pkgconfig, autoreconfHook
 , expat, systemd, glib, dbus_glib, python
 , libX11 ? null, libICE ? null, libSM ? null, x11Support ? (stdenv.isLinux || stdenv.isDarwin) }:
 
@@ -46,14 +46,15 @@ let
           done
         '';
 
-    nativeBuildInputs = [ pkgconfig ];
+    nativeBuildInputs = [ pkgconfig autoreconfHook ];
     propagatedBuildInputs = [ expat ];
-    buildInputs = [ autoconf automake libtool ]; # ToDo: optional selinux?
+
+    preAutoreconf = ''
+      substituteInPlace tools/Makefile.am --replace 'install-localstatelibDATA:' 'disabled:'
+    '';
 
     preConfigure = ''
       patchShebangs .
-      substituteInPlace tools/Makefile.am --replace 'install-localstatelibDATA:' 'disabled:'
-      autoreconf -fi
     '';
 
     configureFlags = [
diff --git a/pkgs/development/libraries/dotconf/default.nix b/pkgs/development/libraries/dotconf/default.nix
index 74e4b6c5666d..f44a4a37fa71 100644
--- a/pkgs/development/libraries/dotconf/default.nix
+++ b/pkgs/development/libraries/dotconf/default.nix
@@ -1,4 +1,4 @@
-{ fetchFromGitHub, stdenv, autoconf, automake, libtool }:
+{ fetchFromGitHub, stdenv, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "dotconf-" + version;
@@ -11,9 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1sc95hw5k2xagpafny0v35filmcn05k1ds5ghkldfpf6xw4hakp7";
   };
 
-  buildInputs = [ autoconf automake libtool ];
-
-  preConfigure = "autoreconf --install";
+  buildInputs = [ autoreconfHook ];
 
   meta = with stdenv.lib; {
     description = "A configuration parser library";
diff --git a/pkgs/development/libraries/funambol/default.nix b/pkgs/development/libraries/funambol/default.nix
index 98049e0ca35a..1fc2b21b5e59 100644
--- a/pkgs/development/libraries/funambol/default.nix
+++ b/pkgs/development/libraries/funambol/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zlib, curl, automake, libtool, autoconf, unzip }:
+{ stdenv, fetchurl, zlib, curl, autoreconfHook, unzip }:
 
 stdenv.mkDerivation rec {
   name = "funambol-client-cpp-9.0.0";
@@ -10,17 +10,9 @@ stdenv.mkDerivation rec {
 
   postUnpack = ''sourceRoot+="/sdk/cpp/build/autotools"'';
 
-  # Upstream guys forgotten to run autoreconf...
-  preConfigure=''
-    libtoolize -c -f
-    aclocal
-    autoheader
-    automake -a -c -f --add-missing
-    autoconf -f'';
-
   propagatedBuildInputs = [ zlib curl ];
 
-  nativeBuildInputs = [ automake libtool autoconf unzip ];
+  nativeBuildInputs = [ autoreconfHook unzip ];
 
   meta = {
     description = "SyncML client sdk by Funambol project";
diff --git a/pkgs/development/libraries/hivex/default.nix b/pkgs/development/libraries/hivex/default.nix
index e048b07a1da1..76836b69d2a8 100644
--- a/pkgs/development/libraries/hivex/default.nix
+++ b/pkgs/development/libraries/hivex/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, automake, autoconf, libtool, makeWrapper
+{ stdenv, fetchurl, pkgconfig, autoreconfHook, makeWrapper
 , perl, libxml2, IOStringy }:
 
 stdenv.mkDerivation rec {
@@ -13,14 +13,10 @@ stdenv.mkDerivation rec {
   patches = [ ./hivex-syms.patch ];
 
   buildInputs = [
-    pkgconfig automake autoconf libtool makeWrapper
+    pkgconfig autoreconfHook makeWrapper
     perl libxml2 IOStringy
   ];
 
-  preConfigure = ''
-    AUTOPOINT=true autoreconf --verbose --install 
-  '';
-
   postInstall = ''
     for bin in $out/bin/*; do
       wrapProgram "$bin" --prefix "PATH" : "$out/bin"
diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix
index 7bf1d7cdc713..521e780a9200 100644
--- a/pkgs/development/libraries/libgksu/default.nix
+++ b/pkgs/development/libraries/libgksu/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, makeWrapper, gtk, gnome, gnome3,
-  libstartup_notification, libgtop, perl, perlXMLParser, autoconf,
-  automake, libtool, intltool, gtk_doc, docbook_xsl, xauth, sudo
+  libstartup_notification, libgtop, perl, perlXMLParser,
+  autoreconfHook, intltool, gtk_doc, docbook_xsl, xauth, sudo
 }:
 
 stdenv.mkDerivation rec {
@@ -52,13 +52,12 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     intltoolize --force --copy --automake
-    autoreconf -vfi
   '';
 
   buildInputs = [
     pkgconfig makeWrapper gtk gnome.GConf libstartup_notification
     gnome3.libgnome_keyring libgtop gnome.libglade perl perlXMLParser
-    autoconf automake libtool intltool gtk_doc docbook_xsl
+    autoreconfHook intltool gtk_doc docbook_xsl
   ];
 
   preFixup = ''
diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix
index 003c1cf3432c..2e3307b54bf5 100644
--- a/pkgs/development/libraries/libguestfs/default.nix
+++ b/pkgs/development/libraries/libguestfs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, autoconf, automake, libtool, makeWrapper
+{ stdenv, fetchurl, pkgconfig, autoreconfHook, makeWrapper
 , ncurses, cpio, gperf, perl, cdrkit, flex, bison, qemu, pcre, augeas, libxml2
 , acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex
 , gmp, readline, file, libintlperl, GetoptLong, SysVirt, numactl, xen }:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    makeWrapper pkgconfig autoconf automake libtool ncurses cpio gperf perl
+    makeWrapper pkgconfig autoreconfHook ncurses cpio gperf perl
     cdrkit flex bison qemu pcre augeas libxml2 acl libcap libcap_ng libconfig
     systemd fuse yajl libvirt gmp readline file hivex libintlperl GetoptLong
     SysVirt numactl xen
@@ -28,10 +28,6 @@ stdenv.mkDerivation rec {
   patches = [ ./libguestfs-syms.patch ];
   NIX_CFLAGS_COMPILE="-I${libxml2}/include/libxml2/";
 
-  preConfigure = ''
-    AUTOPOINT=true LIBTOOLIZE=true autoreconf --verbose --install
-  '';
-
   postInstall = ''
     for bin in $out/bin/*; do
       wrapProgram "$bin" \
diff --git a/pkgs/development/libraries/libivykis/default.nix b/pkgs/development/libraries/libivykis/default.nix
index 3ebfb5d8cfcf..8e2a659b3f09 100644
--- a/pkgs/development/libraries/libivykis/default.nix
+++ b/pkgs/development/libraries/libivykis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, file, protobufc }:
+{ stdenv, fetchurl, autoreconfHook, pkgconfig, file, protobufc }:
 
 stdenv.mkDerivation rec {
   name = "libivykis-${version}";
@@ -10,9 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "11d7sjbhcll932rlvx9sf3vk60b5bazmjf4vlr4qd9cz0cashizz";
   };
 
-  buildInputs = [ autoconf automake libtool pkgconfig file protobufc ];
-
-  preConfigure = "autoreconf -i";
+  buildInputs = [ autoreconfHook pkgconfig file protobufc ];
 
   meta = with stdenv.lib; {
     description = ''
diff --git a/pkgs/development/libraries/libpst/default.nix b/pkgs/development/libraries/libpst/default.nix
index 8fa781c4fdad..78c65d03bfd1 100644
--- a/pkgs/development/libraries/libpst/default.nix
+++ b/pkgs/development/libraries/libpst/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoconf, automake, libtool, boost, python, libgsf,
+{ stdenv, fetchurl, autoreconfHook, boost, python, libgsf,
   pkgconfig, bzip2, xmlto, gettext, imagemagick, doxygen }:
 
 stdenv.mkDerivation rec {
@@ -9,13 +9,9 @@ stdenv.mkDerivation rec {
       sha256 = "0qih919zk40japs4mpiaw5vyr2bvwz60sjf23gixd5vvzc32cljz";
     };
 
-  buildInputs = [ autoconf automake libtool boost python libgsf pkgconfig bzip2
+  buildInputs = [ autoreconfHook boost python libgsf pkgconfig bzip2
 		  xmlto gettext imagemagick doxygen ];
 
-  preConfigure = ''
-    autoreconf -v -f -i
-  '';
-
   doCheck = true;
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/librdf/default.nix b/pkgs/development/libraries/librdf/default.nix
index 58ff77480b63..886663101586 100644
--- a/pkgs/development/libraries/librdf/default.nix
+++ b/pkgs/development/libraries/librdf/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, libtool, automake, autoconf
-, librdf_raptor, librdf_raptor2, ladspaH, openssl, zlib #, swh_lv2
+{ stdenv, fetchurl, pkgconfig, autoreconfHook
+, librdf_raptor2, ladspaH, openssl, zlib
 }:
 
 stdenv.mkDerivation rec {
@@ -11,19 +11,13 @@ stdenv.mkDerivation rec {
     sha256 = "18p2flb2sv2hq6w2qkd29z9c7knnwqr3f12i2srshlzx6vwkm05s";
   };
 
+  preAutoreconf = "rm m4/*";
   postPatch = "sed -i -e 's:usr/local:usr:' examples/{instances,remove}_test.c";
 
-  preConfigure = "rm m4/* && autoreconf -if";
-
-  buildInputs = [
-    pkgconfig libtool automake autoconf ladspaH openssl zlib /*swh_lv2*/
-    #librdf_raptor 
-  ];
+  buildInputs = [ pkgconfig autoreconfHook ladspaH openssl zlib ];
 
   propagatedBuildInputs = [ librdf_raptor2 ];
 
-  #doCheck = true; # would need swh_lv2 and some path patching
-
   meta = {
     description = "Lightweight RDF library with special support for LADSPA plugins";
     homepage = http://sourceforge.net/projects/lrdf/;
diff --git a/pkgs/development/libraries/libtoxcore/new-api/default.nix b/pkgs/development/libraries/libtoxcore/new-api/default.nix
index b0e3a09c0b48..d9c543efd6c3 100644
--- a/pkgs/development/libraries/libtoxcore/new-api/default.nix
+++ b/pkgs/development/libraries/libtoxcore/new-api/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoconf, libtool, automake, libsodium, ncurses, libopus
+{ stdenv, fetchFromGitHub, autoreconfHook, libsodium, ncurses, libopus
 , libvpx, check, libconfig, pkgconfig }:
 
 stdenv.mkDerivation rec {
@@ -22,10 +22,6 @@ stdenv.mkDerivation rec {
       auto_tests/tox_test.c
   '';
 
-  preConfigure = ''
-    autoreconf -i
-  '';
-
   configureFlags = [
     "--with-libsodium-headers=${libsodium}/include"
     "--with-libsodium-libs=${libsodium}/lib"
@@ -34,8 +30,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    autoconf libtool automake libsodium ncurses
-    check libconfig pkgconfig
+    autoreconfHook libsodium ncurses check libconfig pkgconfig
   ] ++ stdenv.lib.optionals (!stdenv.isArm) [
     libopus
   ];
diff --git a/pkgs/development/libraries/libtoxcore/old-api/default.nix b/pkgs/development/libraries/libtoxcore/old-api/default.nix
index 3ff2e1ad285d..471fafdad38b 100644
--- a/pkgs/development/libraries/libtoxcore/old-api/default.nix
+++ b/pkgs/development/libraries/libtoxcore/old-api/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoconf, libtool, automake, libsodium, ncurses, libopus
+{ stdenv, fetchFromGitHub, autoreconfHook, libsodium, ncurses, libopus
 , libvpx, check, libconfig, pkgconfig }:
 
 let
@@ -26,10 +26,6 @@ stdenv.mkDerivation rec {
       auto_tests/tox_test.c
   '';
 
-  preConfigure = ''
-    autoreconf -i
-  '';
-
   configureFlags = [
     "--with-libsodium-headers=${libsodium}/include"
     "--with-libsodium-libs=${libsodium}/lib"
@@ -38,7 +34,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    autoconf libtool automake libsodium ncurses
+    autoreconfHook libsodium ncurses
     check libconfig pkgconfig
   ] ++ stdenv.lib.optionals (!stdenv.isArm) [
     libopus
diff --git a/pkgs/development/libraries/minizip/default.nix b/pkgs/development/libraries/minizip/default.nix
index b71920446e4c..22657cf38993 100644
--- a/pkgs/development/libraries/minizip/default.nix
+++ b/pkgs/development/libraries/minizip/default.nix
@@ -1,14 +1,11 @@
-{ stdenv, zlib, autoconf, automake, libtool }:
+{ stdenv, zlib, autoreconfHook }:
 
 stdenv.mkDerivation {
   name = "minizip-${zlib.version}";
   inherit (zlib) src;
 
-  nativeBuildInputs = [ autoconf automake libtool ];
+  nativeBuildInputs = [ autoreconfHook ];
   buildInputs = [ zlib ];
 
-  preConfigure = ''
-    cd contrib/minizip
-    autoreconf -vfi
-  '';
+  sourceRoot = "zlib-${zlib.version}/contrib/minizip";
 }
diff --git a/pkgs/development/libraries/pkcs11helper/default.nix b/pkgs/development/libraries/pkcs11helper/default.nix
index c4f0ad16fb76..4092783b0c9b 100644
--- a/pkgs/development/libraries/pkcs11helper/default.nix
+++ b/pkgs/development/libraries/pkcs11helper/default.nix
@@ -1,20 +1,18 @@
-{ stdenv, fetchurl, pkgconfig, openssl, autoconf, automake, libtool }:
+{ stdenv, fetchurl, pkgconfig, openssl, autoreconfHook }:
 
 let
   rev = "5d412bad60";
 in
 stdenv.mkDerivation rec {
   name = "pkcs11-helper-20121123-${rev}";
-  
+
   src = fetchurl {
     url = "https://github.com/alonbl/pkcs11-helper/tarball/${rev}";
     name = "${name}.tar.gz";
     sha256 = "1mih6mha39yr5s5m18lg4854qc105asgnwmjw7f95kgmzni62kxp";
   };
 
-  preConfigure = "autoreconf -vfi";
-  
-  buildInputs = [ pkgconfig openssl autoconf automake libtool ];
+  buildInputs = [ pkgconfig openssl autoreconfHook ];
 
   meta = with stdenv.lib; {
     homepage = https://www.opensc-project.org/opensc/wiki/pkcs11-helper;
diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix
index 99f699e301cf..0ef024424b25 100644
--- a/pkgs/development/libraries/spice-gtk/default.nix
+++ b/pkgs/development/libraries/spice-gtk/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, gtk, spice_protocol, intltool, celt_0_5_1
 , openssl, libpulseaudio, pixman, gobjectIntrospection, libjpeg_turbo, zlib
-, cyrus_sasl, python, pygtk, autoconf, automake, libtool, usbredir, libsoup
+, cyrus_sasl, python, pygtk, autoreconfHook, usbredir, libsoup
 , gtk3, enableGTK3 ? false }:
 
 with stdenv.lib;
@@ -18,14 +18,16 @@ stdenv.mkDerivation rec {
     libjpeg_turbo zlib cyrus_sasl python pygtk usbredir
   ] ++ (if enableGTK3 then [ gtk3 ] else [ gtk ]);
 
-  nativeBuildInputs = [ pkgconfig intltool libtool libsoup autoconf automake ];
+  nativeBuildInputs = [ pkgconfig intltool libsoup autoreconfHook ];
 
   NIX_CFLAGS_COMPILE = "-fno-stack-protector";
 
-  preConfigure = ''
+  preAutoreconf = ''
     substituteInPlace src/Makefile.am \
-      --replace '=codegendir pygtk-2.0' '=codegendir pygobject-2.0'
-    autoreconf -v --force --install
+          --replace '=codegendir pygtk-2.0' '=codegendir pygobject-2.0'
+  '';
+
+  preConfigure = ''
     intltoolize -f
   '';
 
diff --git a/pkgs/development/libraries/tremor/default.nix b/pkgs/development/libraries/tremor/default.nix
index c8eb6e3bdab9..aa4a5578691b 100644
--- a/pkgs/development/libraries/tremor/default.nix
+++ b/pkgs/development/libraries/tremor/default.nix
@@ -1,19 +1,18 @@
-{ stdenv, fetchsvn, autoconf, automake, libtool, pkgconfig, libogg }:
+{ stdenv, fetchsvn, autoreconfHook, pkgconfig, libogg }:
 
 stdenv.mkDerivation rec {
   name = "tremor-svn-${src.rev}";
-  
+
   src = fetchsvn {
     url = http://svn.xiph.org/trunk/Tremor;
     rev = "17866";
     sha256 = "161411cbefa1527da7a8fc087e78d8e21d19143d3a6eb42fb281e5026aad7568";
   };
 
-  nativeBuildInputs = [ autoconf automake libtool pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
   propagatedBuildInputs = [ libogg ];
 
   preConfigure = ''
-    autoreconf -vfi
     sed -i /XIPH_PATH_OGG/d configure
   '';
 
diff --git a/pkgs/games/rili/default.nix b/pkgs/games/rili/default.nix
index fbf47653af99..7d1273328453 100644
--- a/pkgs/games/rili/default.nix
+++ b/pkgs/games/rili/default.nix
@@ -1,8 +1,8 @@
-{stdenv, fetchurl, SDL_mixer, SDL, autoconf, automake}:
+{ stdenv, fetchurl, SDL_mixer, SDL, autoreconfHook }:
 
 stdenv.mkDerivation {
-  name = "ri_li-2.0.1"; 
-  
+  name = "ri_li-2.0.1";
+
   src = fetchurl {
     url = mirror://sourceforge/ri-li/Ri-li-2.0.1.tar.bz2;
     sha256 = "f71ccc20c37c601358d963e087ac0d524de8c68e96df09c3aac1ae65edd38dbd";
@@ -10,13 +10,10 @@ stdenv.mkDerivation {
 
   patches = [ ./moderinze_cpp.patch ];
 
-  preConfigure = ''
-    export CPPFLAGS="-I${SDL}/include -I${SDL}/include/SDL -I${SDL_mixer}/include"
-    autoreconf -i
-  '';
-  
-  buildInputs = [SDL SDL_mixer autoconf automake];
-  
+  CPPFLAGS = "-I${SDL}/include -I${SDL}/include/SDL -I${SDL_mixer}/include";
+
+  buildInputs = [ SDL SDL_mixer autoreconfHook ];
+
   meta = {
     homepage = http://ri-li.sourceforge.net;
     license = stdenv.lib.licenses.gpl2Plus;
diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/misc/emulators/vice/default.nix
index b869143ff1cc..143c23ee86c4 100644
--- a/pkgs/misc/emulators/vice/default.nix
+++ b/pkgs/misc/emulators/vice/default.nix
@@ -1,17 +1,19 @@
-{ stdenv, fetchurl, perl, gettext, libpng, giflib, libjpeg, alsaLib, readline, mesa, libX11
-, pkgconfig, gtk, SDL, autoconf, automake, makeDesktopItem
+{ stdenv, fetchurl, perl, libpng, giflib, libjpeg, alsaLib, readline, mesa, libX11
+, pkgconfig, gtk, SDL, autoreconfHook, makeDesktopItem
 }:
 
 stdenv.mkDerivation rec {
   name = "vice-2.2";
+
   src = fetchurl {
     url = http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.2.tar.gz;
     sha256 = "0l8mp9ybx494fdqgr1ps4x3c3qzms4yyg4hzcn3ihzy92zw1nn2x";
   };
-  buildInputs = [ perl gettext libpng giflib libjpeg alsaLib readline mesa
-                  pkgconfig gtk SDL autoconf automake ];
+
+  buildInputs = [ perl libpng giflib libjpeg alsaLib readline mesa
+                  pkgconfig gtk SDL autoreconfHook ];
   configureFlags = "--with-sdl --enable-fullscreen --enable-gnomeui";
-  
+
   desktopItem = makeDesktopItem {
     name = "vice";
     exec = "x64";
@@ -23,18 +25,16 @@ stdenv.mkDerivation rec {
 
   patchPhase = ''
     # Disable font-cache update
-    
     sed -i -e "s|install: install-data-am|install-no: install-data-am|" data/fonts/Makefile.am
-    autoreconf -f -i
   '';
-  
+
   NIX_LDFLAGS = "-lX11 -L${libX11}/lib";
-  
+
   postInstall = ''
     mkdir -p $out/share/applications
     cp ${desktopItem}/share/applications/* $out/share/applications
   '';
-  
+
   meta = {
     description = "Commodore 64, 128 and other emulators";
     homepage = http://www.viceteam.org;
diff --git a/pkgs/misc/screensavers/alock/default.nix b/pkgs/misc/screensavers/alock/default.nix
index 9083a90f6f51..51674f5dd86c 100644
--- a/pkgs/misc/screensavers/alock/default.nix
+++ b/pkgs/misc/screensavers/alock/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, pkgconfig, autoconf, automake
+{ stdenv, fetchgit, pkgconfig, autoreconfHook
 , libX11, pam, libgcrypt, libXrender, imlib2 }:
 
 stdenv.mkDerivation rec {
@@ -11,7 +11,6 @@ stdenv.mkDerivation rec {
     sha256 = "c1f00bf90c966b2b76e00061cc4b54a3c0bc6547e788731ab694b43f55a216ab";
   };
 
-  preConfigure = "autoreconf -fvi";
   configureFlags = [
     "--enable-pam"
     "--enable-hash"
@@ -19,7 +18,7 @@ stdenv.mkDerivation rec {
     "--enable-imlib2"
   ];
   buildInputs = [
-    pkgconfig autoconf automake libX11
+    pkgconfig autoreconfHook libX11
     pam libgcrypt libXrender imlib2
   ];
 
diff --git a/pkgs/os-specific/linux/xf86-input-mtrack/default.nix b/pkgs/os-specific/linux/xf86-input-mtrack/default.nix
index a4fd00e4911b..ac7e782444f5 100644
--- a/pkgs/os-specific/linux/xf86-input-mtrack/default.nix
+++ b/pkgs/os-specific/linux/xf86-input-mtrack/default.nix
@@ -1,34 +1,28 @@
 {
   stdenv
 , fetchurl
-, autoconf
-, automake
 , utilmacros
 , pkgconfig
-, libtool
 , mtdev
 , xorgserver
 , xproto
 , inputproto
 , pixman
+, autoreconfHook
 }:
 
 stdenv.mkDerivation {
   name = "xf86-input-mtrack-0.3.0";
 
-  preConfigure = "autoreconf -vfi";
-
   buildInputs = [
-    autoconf
-    automake
     utilmacros
     pkgconfig
-    libtool
     mtdev
     xorgserver
     xproto
     inputproto
     pixman
+    autoreconfHook
   ];
 
   CFLAGS = "-I${pixman}/include/pixman-1";
diff --git a/pkgs/os-specific/linux/xf86-video-nested/default.nix b/pkgs/os-specific/linux/xf86-video-nested/default.nix
index 0d0639390a73..0f9e0591a060 100644
--- a/pkgs/os-specific/linux/xf86-video-nested/default.nix
+++ b/pkgs/os-specific/linux/xf86-video-nested/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchgit, autoconf, automake, fontsproto, libX11, libXext
-, libtool, pixman, pkgconfig, renderproto, utilmacros, xorgserver
+{ stdenv, fetchgit, autoreconfHook, fontsproto, libX11, libXext
+, pixman, pkgconfig, renderproto, utilmacros, xorgserver
 }:
 
 stdenv.mkDerivation {
@@ -12,13 +12,12 @@ stdenv.mkDerivation {
   };
 
   buildInputs =
-    [ autoconf automake fontsproto libX11 libXext libtool pixman
+    [ autoreconfHook fontsproto libX11 libXext pixman
       pkgconfig renderproto utilmacros xorgserver
     ];
 
 
   configurePhase = ''
-    autoreconf -fvi
     ./configure --prefix=$out CFLAGS="-I${pixman}/include/pixman-1"
   '';
 
diff --git a/pkgs/servers/nosql/hyperdex/busybee.nix b/pkgs/servers/nosql/hyperdex/busybee.nix
index 653c74bdabe4..e71fb608260d 100644
--- a/pkgs/servers/nosql/hyperdex/busybee.nix
+++ b/pkgs/servers/nosql/hyperdex/busybee.nix
@@ -1,5 +1,4 @@
-{ stdenv, fetchurl, unzip, autoconf, automake, libtool,
-  libpo6, libe, pkgconfig }:
+{ stdenv, fetchurl, unzip, autoreconfHook, libpo6, libe, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "busybee-${version}";
@@ -9,16 +8,14 @@ stdenv.mkDerivation rec {
     url = "https://github.com/rescrv/busybee/archive/releases/${version}.zip";
     sha256 = "0b51h1kmkf0s3d9y7wjqgp1pk1rk9i7n8bcgyj01kflzdgafbl0b";
   };
+
   buildInputs = [
-    autoconf
-    automake
+    autoreconfHook
     libe
     libpo6
-    libtool
     pkgconfig
     unzip
   ];
-  preConfigure = "autoreconf -i";
 
   meta = with stdenv.lib; {
     description = "A high-performance messaging layer";
diff --git a/pkgs/servers/nosql/hyperdex/default.nix b/pkgs/servers/nosql/hyperdex/default.nix
index 3986e49c4bcf..c375fb29626a 100644
--- a/pkgs/servers/nosql/hyperdex/default.nix
+++ b/pkgs/servers/nosql/hyperdex/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, makeWrapper, unzip, autoconf, automake, libtool,
-  python, libsodium, pkgconfig, popt, glog, xz, json_c, gperf, yacc,
-  flex, pandoc, help2man, autoconf-archive, callPackage }:
+{ stdenv, fetchurl, makeWrapper, unzip, autoreconfHook, autoconf-archive
+, python, libsodium, pkgconfig, popt, glog, xz, json_c, gperf, yacc
+, flex, pandoc, help2man, callPackage }:
 
 assert stdenv.isLinux;
 
@@ -25,9 +25,8 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    autoconf
+    autoreconfHook
     autoconf-archive
-    automake
     busybee
     glog
     hyperleveldb
@@ -35,7 +34,6 @@ stdenv.mkDerivation rec {
     libe
     libmacaroons
     libpo6
-    libtool
     pkgconfig
     popt
     python
@@ -47,7 +45,6 @@ stdenv.mkDerivation rec {
     help2man
     pandoc
   ];
-  preConfigure = "autoreconf -fi";
 
   meta = with stdenv.lib; {
     description = "A scalable, searchable key-value store";
diff --git a/pkgs/servers/nosql/hyperdex/hyperleveldb.nix b/pkgs/servers/nosql/hyperdex/hyperleveldb.nix
index f57bbe4f4d24..1e3c3afe234e 100644
--- a/pkgs/servers/nosql/hyperdex/hyperleveldb.nix
+++ b/pkgs/servers/nosql/hyperdex/hyperleveldb.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, autoconf, automake, libtool }:
+{ stdenv, fetchurl, unzip, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "hyperleveldb-${version}";
@@ -8,8 +8,8 @@ stdenv.mkDerivation rec {
     url = "https://github.com/rescrv/HyperLevelDB/archive/releases/${version}.zip";
     sha256 = "0m5fwl9sc7c6m2zm3zjlxxg7f602gnaryikxgflahhdccdvvr56y";
   };
-  buildInputs = [ unzip autoconf automake libtool ];
-  preConfigure = "autoreconf -i";
+
+  buildInputs = [ unzip autoreconfHook ];
 
   meta = with stdenv.lib; {
     description = ''A fork of LevelDB intended to meet the needs of
diff --git a/pkgs/servers/nosql/hyperdex/libe.nix b/pkgs/servers/nosql/hyperdex/libe.nix
index f7e0d834bb44..dfce4c34a114 100644
--- a/pkgs/servers/nosql/hyperdex/libe.nix
+++ b/pkgs/servers/nosql/hyperdex/libe.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, autoconf, automake, libtool, libpo6, pkgconfig }:
+{ stdenv, fetchurl, unzip, autoreconfHook, libpo6, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "libe-${version}";
@@ -8,8 +8,8 @@ stdenv.mkDerivation rec {
     url = "https://github.com/rescrv/e/archive/releases/${version}.zip";
     sha256 = "18xm0hcnqdf0ipfn19jrgzqsxij5xjbbnihhzc57n4v7yfdca1w3";
   };
-  buildInputs = [ unzip autoconf automake libtool libpo6 pkgconfig ];
-  preConfigure = "autoreconf -i";
+
+  buildInputs = [ unzip autoreconfHook libpo6 pkgconfig ];
 
   meta = with stdenv.lib; {
     description = "Library containing high-performance datastructures and utilities for C++";
diff --git a/pkgs/servers/nosql/hyperdex/libmacaroons.nix b/pkgs/servers/nosql/hyperdex/libmacaroons.nix
index 719b18db8681..016ee704e58c 100644
--- a/pkgs/servers/nosql/hyperdex/libmacaroons.nix
+++ b/pkgs/servers/nosql/hyperdex/libmacaroons.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, unzip, autoconf, automake, libtool, 
-  pkgconfig, libsodium, python }:
+{ stdenv, fetchurl, unzip, autoreconfHook, pkgconfig, libsodium, python }:
+
 stdenv.mkDerivation rec {
   name = "libmacaroons-${version}";
   version = "0.3.0";
@@ -8,9 +8,9 @@ stdenv.mkDerivation rec {
     url = "https://github.com/rescrv/libmacaroons/archive/releases/${version}.zip";
     sha256 = "18c44424jri0p5la6jgrnlz5p937hk7ws2mldhzjwisqyf5qld43";
   };
-  buildInputs = [ unzip autoconf automake libtool python libsodium pkgconfig ];
-  preConfigure = "autoreconf -i";
-  
+
+  buildInputs = [ unzip autoreconfHook python libsodium pkgconfig ];
+
   meta = with stdenv.lib; {
     description = ''Macaroons are flexible authorization credentials that
         support decentralized delegation, attenuation, and verification.'';
diff --git a/pkgs/servers/nosql/hyperdex/libpo6.nix b/pkgs/servers/nosql/hyperdex/libpo6.nix
index fa68020b539c..70e46f453471 100644
--- a/pkgs/servers/nosql/hyperdex/libpo6.nix
+++ b/pkgs/servers/nosql/hyperdex/libpo6.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, autoconf, automake, libtool }:
+{ stdenv, fetchurl, unzip, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "libpo6-${version}";
@@ -8,8 +8,8 @@ stdenv.mkDerivation rec {
     url = "https://github.com/rescrv/po6/archive/releases/${version}.zip";
     sha256 = "17grzkh6aw1f68qvkhivbb6vwbm6jd41ysbfn88pypf5lczxrxly";
   };
-  buildInputs = [ unzip autoconf automake libtool ];
-  preConfigure = "autoreconf -i";
+
+  buildInputs = [ unzip autoreconfHook ];
 
   meta = with stdenv.lib; {
     description = "POSIX wrappers for C++";
diff --git a/pkgs/servers/nosql/hyperdex/replicant.nix b/pkgs/servers/nosql/hyperdex/replicant.nix
index f2df744e35f1..43c86e6c0c9a 100644
--- a/pkgs/servers/nosql/hyperdex/replicant.nix
+++ b/pkgs/servers/nosql/hyperdex/replicant.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, autoconf, automake, libtool, glog,
+{ stdenv, fetchurl, unzip, autoreconfHook, glog,
   hyperleveldb, libe, pkgconfig, popt, libpo6, busybee }:
 
 stdenv.mkDerivation rec {
@@ -9,21 +9,19 @@ stdenv.mkDerivation rec {
     url = "https://github.com/rescrv/Replicant/archive/releases/${version}.zip";
     sha256 = "1q3pdq2ndpj70yd1578bn4grlrp77gl8hv2fz34jpx34qmlalda4";
   };
+
   buildInputs = [
-    autoconf
-    automake
+    autoreconfHook
     busybee
     glog
     hyperleveldb
     libe
     libpo6
-    libtool
     pkgconfig
     popt
     unzip
   ];
-  preConfigure = "autoreconf -i";
-  
+
   meta = with stdenv.lib; {
     description = "A system for maintaining replicated state machines";
     homepage = https://github.com/rescrv/Replicant;
diff --git a/pkgs/servers/shellinabox/default.nix b/pkgs/servers/shellinabox/default.nix
index ed859ac344b8..0a651762f185 100644
--- a/pkgs/servers/shellinabox/default.nix
+++ b/pkgs/servers/shellinabox/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pam, openssl, openssh, shadow, makeWrapper }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pam, openssl, openssh, shadow, makeWrapper }:
 
 stdenv.mkDerivation rec {
   version = "2.19";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   patches = [ ./shellinabox-minus.patch ];
 
-  buildInputs = [ autoconf automake libtool pam openssl openssh makeWrapper];
+  buildInputs = [ autoreconfHook pam openssl openssh makeWrapper ];
 
   # Disable GSSAPIAuthentication errors. Also, paths in certain source files are
   # hardcoded. Replace the hardcoded paths with correct paths.
@@ -23,7 +23,6 @@ stdenv.mkDerivation rec {
     substituteInPlace ./shellinabox/service.c --replace "/bin/login" "${shadow}/bin/login"
     substituteInPlace ./shellinabox/launcher.c --replace "/bin/login" "${shadow}/bin/login"
     substituteInPlace ./libhttp/ssl.c --replace "/usr/bin" "${openssl}/bin"
-    autoreconf -vfi
   '';
 
   postInstall = ''
diff --git a/pkgs/tools/archivers/runzip/default.nix b/pkgs/tools/archivers/runzip/default.nix
index 9b2fd0eda594..1ed453f0d4f8 100644
--- a/pkgs/tools/archivers/runzip/default.nix
+++ b/pkgs/tools/archivers/runzip/default.nix
@@ -1,21 +1,20 @@
-{stdenv, fetchFromGitHub, libzip, autoconf, automake, libtool, m4}:
+{ stdenv, fetchFromGitHub, libzip, autoreconfHook }:
+
 stdenv.mkDerivation rec {
-  baseName = "runzip";
   version = "1.4";
-  name = "${baseName}-${version}";
-  buildInputs = [libzip autoconf automake libtool m4];
+  name = "runzip-${version}";
+
+  buildInputs = [ libzip autoreconfHook ];
+
   src = fetchFromGitHub {
     owner = "vlm";
     repo = "zip-fix-filename-encoding";
     rev = "v${version}";
     sha256 = "0l5zbb5hswxczigvyal877j0aiq3fc01j3gv88bvy7ikyvw3lc07";
   };
-  preConfigure = ''
-    autoreconf -iv
-  '';
+
   meta = {
-    inherit version;
-    description = ''A tool to convert filename encoding inside a ZIP archive'';
+    description = "A tool to convert filename encoding inside a ZIP archive";
     license = stdenv.lib.licenses.bsd2 ;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix
index cb561e8172fe..d6534fc5ee61 100644
--- a/pkgs/tools/misc/grub/default.nix
+++ b/pkgs/tools/misc/grub/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, autoconf, automake, texinfo, buggyBiosCDSupport ? true}:
+{stdenv, fetchurl, autoreconfHook, texinfo, buggyBiosCDSupport ? true}:
 
 stdenv.mkDerivation {
   name = "grub-0.97-patch-1.12";
@@ -33,8 +33,8 @@ stdenv.mkDerivation {
 
   ] ++ (stdenv.lib.optional buggyBiosCDSupport ./buggybios.patch);
 
-  # Autoconf/automake required for the splashimage patch.
-  buildInputs = [autoconf automake texinfo];
+  # autoreconfHook required for the splashimage patch.
+  buildInputs = [ autoreconfHook texinfo ];
 
   prePatch = ''
     unpackFile $gentooPatches
@@ -45,11 +45,6 @@ stdenv.mkDerivation {
     done
   '';
 
-  preConfigure = ''
-    autoreconf
-    automake --add-missing
-  '';
-
   passthru.grubTarget = "";
 
   meta = {
diff --git a/pkgs/tools/misc/mdbtools/git.nix b/pkgs/tools/misc/mdbtools/git.nix
index 8cf5e5e9a38d..777fc7bfd16d 100644
--- a/pkgs/tools/misc/mdbtools/git.nix
+++ b/pkgs/tools/misc/mdbtools/git.nix
@@ -1,6 +1,5 @@
-{ stdenv, fetchurl, fetchgit, glib, readline, bison, flex, pkgconfig,
-  libiconv, autoconf, automake, libtool, which, txt2man, gnome_doc_utils,
-  scrollkeeper}:
+{ stdenv, fetchgit, glib, readline, bison, flex, pkgconfig,
+  libiconv, autoreconfHook, which, txt2man, gnome_doc_utils, scrollkeeper }:
 
 stdenv.mkDerivation {
   name = "mdbtools-git-2014-07-25";
@@ -12,16 +11,18 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [
-    glib readline bison flex pkgconfig autoconf automake
-    libtool which txt2man gnome_doc_utils scrollkeeper libiconv
+    glib readline bison flex autoreconfHook pkgconfig which txt2man
+    gnome_doc_utils scrollkeeper libiconv
   ];
 
+  preAutoreconf = ''
+    sed -e '/ENABLE_GTK_DOC/aAM_CONDITIONAL(HAVE_GNOME_DOC_UTILS, test x$enable_gtk_doc = xyes)' \
+        -e  '/ENABLE_GTK_DOC/aAM_CONDITIONAL(ENABLE_SK, test x$enable_scrollkeeper = xyes)' \
+        -i configure.ac
+  '';
+
   preConfigure = ''
     sed -e 's@static \(GHashTable [*]mdb_backends;\)@\1@' -i src/libmdb/backend.c
-    sed -e '/ENABLE_GTK_DOC/aAM_CONDITIONAL(HAVE_GNOME_DOC_UTILS, test x$enable_gtk_doc = xyes)' \
-    -e  '/ENABLE_GTK_DOC/aAM_CONDITIONAL(ENABLE_SK, test x$enable_scrollkeeper = xyes)'          \
-    -i configure.ac
-    autoreconf -i -f
   '';
 
   meta = {
diff --git a/pkgs/tools/misc/riemann-c-client/default.nix b/pkgs/tools/misc/riemann-c-client/default.nix
index 5dde592aade2..eb8e17a86938 100644
--- a/pkgs/tools/misc/riemann-c-client/default.nix
+++ b/pkgs/tools/misc/riemann-c-client/default.nix
@@ -1,5 +1,4 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, file
-, protobufc }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, file , protobufc }:
 
 stdenv.mkDerivation rec {
   name = "riemann-c-client-${version}";
@@ -13,9 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "0jc2bbw7sp2gr4cswx78srs0p1kp81prcarq4ivqpfw4bmzg6xg4";
   };
 
-  buildInputs = [ autoconf automake libtool pkgconfig file protobufc ];
-
-  preConfigure = "autoreconf -i";
+  buildInputs = [ autoreconfHook pkgconfig file protobufc ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/algernon/riemann-c-client;
diff --git a/pkgs/tools/misc/xclip/default.nix b/pkgs/tools/misc/xclip/default.nix
index 3f616fdad681..e0ad4bbab5fd 100644
--- a/pkgs/tools/misc/xclip/default.nix
+++ b/pkgs/tools/misc/xclip/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchsvn, xlibsWrapper, libXmu, autoconf, automake, libtool }:
+{ stdenv, fetchsvn, xlibsWrapper, libXmu, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   # The last release from 2012, 0.12, lacks '-targets'
@@ -9,11 +9,9 @@ stdenv.mkDerivation rec {
     sha256 = "0d6r38xas5l79l700sdm14l41vvjqhah613367ha8kcvx54zkddz";
   };
 
-  preConfigure = "autoreconf -vfi";
+  buildInputs = [ xlibsWrapper libXmu autoreconfHook ];
 
-  buildInputs = [ xlibsWrapper libXmu autoconf automake libtool ];
-
-  meta = { 
+  meta = {
     description = "Tool to access the X clipboard from a console application";
     homepage = http://sourceforge.net/projects/xclip/;
     license = stdenv.lib.licenses.gpl2;
diff --git a/pkgs/tools/networking/biosdevname/default.nix b/pkgs/tools/networking/biosdevname/default.nix
index 86fe18e01583..f39f37453551 100644
--- a/pkgs/tools/networking/biosdevname/default.nix
+++ b/pkgs/tools/networking/biosdevname/default.nix
@@ -1,10 +1,9 @@
-{stdenv, fetchgit, automake, autoconf, zlib, pciutils}:
-let
-  version = "0.6.1";
-in
-stdenv.mkDerivation {
+{ stdenv, fetchgit, autoreconfHook, zlib, pciutils }:
+
+stdenv.mkDerivation rec {
   name = "biosdevname-${version}";
-  
+  version = "0.6.1";
+
   src = fetchgit {
     url = git://linux.dell.com/biosdevname.git;
     rev = "refs/tags/v${version}";
@@ -12,16 +11,11 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [
-    automake
-    autoconf
+    autoreconfHook
     zlib
     pciutils
   ];
 
-  preConfigure = ''
-    autoreconf -i
-  '';
-
   # Don't install /lib/udev/rules.d/*-biosdevname.rules
   patches = [ ./makefile.patch ];
 
diff --git a/pkgs/tools/networking/driftnet/default.nix b/pkgs/tools/networking/driftnet/default.nix
index 83a26f98d8b6..6666612419d9 100644
--- a/pkgs/tools/networking/driftnet/default.nix
+++ b/pkgs/tools/networking/driftnet/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, lib, fetchFromGitHub, autoconf, automake, libpcap, libjpeg, libungif, libpng, giflib, glib, gtk2, cairo, pango, gdk_pixbuf, atk, pkgconfig }:
+{ stdenv, lib, fetchFromGitHub, libpcap, libjpeg , libungif, libpng
+, giflib, glib, gtk2, cairo, pango, gdk_pixbuf, atk
+, pkgconfig, autoreconfHook }:
 
 with lib;
 
@@ -6,9 +8,10 @@ stdenv.mkDerivation rec {
   name = "driftnet-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "8d47fd563a06122d4a6f9b9b9d27ba3d635148c0";
 
-  buildInputs = [ autoconf automake pkgconfig libpcap libjpeg libungif libpng giflib glib gtk2 glib cairo pango gdk_pixbuf atk ];
-
-  preConfigure = "autoreconf -fi";
+  buildInputs = [
+    pkgconfig libpcap libjpeg libungif libpng giflib
+    glib gtk2 glib cairo pango gdk_pixbuf atk autoreconfHook
+  ];
 
   src = fetchFromGitHub {
     inherit rev;
diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix
index 1191129894c1..77ef86baec36 100644
--- a/pkgs/tools/networking/mu/default.nix
+++ b/pkgs/tools/networking/mu/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, sqlite, pkgconfig, autoconf, automake
+{ fetchurl, stdenv, sqlite, pkgconfig, autoreconfHook
 , xapian, glib, gmime, texinfo , emacs, guile
 , gtk3, webkit, libsoup, icu, withMug ? false /* doesn't build with current gtk3 */ }:
 
@@ -11,14 +11,10 @@ stdenv.mkDerivation rec {
     sha256 = "0wj33pma8xgjvn2akk7khzbycwn4c9sshxvzdph9dnpy7gyqxj51";
   };
 
-  buildInputs =
-    [ sqlite pkgconfig autoconf automake xapian
-      glib gmime texinfo emacs guile libsoup icu ]
-    ++ stdenv.lib.optionals withMug [ gtk3 webkit ];
-
-  preConfigure = ''
-    autoreconf -i
-  '';
+  buildInputs = [
+    sqlite pkgconfig xapian glib gmime texinfo emacs guile libsoup icu
+    autoreconfHook
+  ] ++ stdenv.lib.optionals withMug [ gtk3 webkit ];
 
   preBuild = ''
     # Fix mu4e-builddir (set it to $out)
diff --git a/pkgs/tools/networking/par2cmdline/default.nix b/pkgs/tools/networking/par2cmdline/default.nix
index 68f1f7632971..94b9f3bdc7c2 100644
--- a/pkgs/tools/networking/par2cmdline/default.nix
+++ b/pkgs/tools/networking/par2cmdline/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchzip, autoconf, automake}:
+{ stdenv, fetchzip, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name    = "par2cmdline-${version}";
@@ -9,9 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0maywssv468ia7rf8jyq4axwahgli3nfykl7x3zip503psywjj8a";
   };
 
-  buildInputs = [ autoconf automake ];
-
-  preConfigure = "autoreconf";
+  buildInputs = [ autoreconfHook ];
 
   meta = {
     homepage = https://github.com/BlackIkeEagle/par2cmdline;
diff --git a/pkgs/tools/text/recode/default.nix b/pkgs/tools/text/recode/default.nix
index 004a93f6ebdd..4ea2631bcb72 100644
--- a/pkgs/tools/text/recode/default.nix
+++ b/pkgs/tools/text/recode/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python, perl, autoconf, automake, libtool, intltool, flex,
+{ stdenv, fetchFromGitHub, python, perl, intltool, flex, autoreconfHook,
 texinfo, libiconv }:
 
 stdenv.mkDerivation rec {
@@ -11,17 +11,13 @@ stdenv.mkDerivation rec {
     sha256 = "06vyjqaraamcc5vka66mlvxj27ihccqc74aymv2wn8nphr2rhh03";
   };
 
-  nativeBuildInputs = [ python perl autoconf automake libtool intltool flex texinfo
-  libiconv ];
+  nativeBuildInputs = [ python perl intltool flex texinfo autoreconfHook libiconv ];
 
-  preConfigure = ''
+  preAutoreconf = ''
     # fix build with new automake, https://bugs.gentoo.org/show_bug.cgi?id=419455
-    #rm acinclude.m4
     substituteInPlace Makefile.am --replace "ACLOCAL = ./aclocal.sh @ACLOCAL@" ""
     sed -i '/^AM_C_PROTOTYPES/d' configure.ac
     substituteInPlace src/Makefile.am --replace "ansi2knr" ""
-
-    autoreconf -fi
   ''
   + stdenv.lib.optionalString stdenv.isDarwin ''
     export LDFLAGS=-lintl
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b9962f495d19..ba7420d14d31 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1750,7 +1750,6 @@ let
 
   grub = callPackage_i686 ../tools/misc/grub {
     buggyBiosCDSupport = config.grub.buggyBiosCDSupport or true;
-    automake = automake112x; # fails with 13 and 14
   };
 
   trustedGrub = callPackage_i686 ../tools/misc/grub/trusted.nix { };
@@ -2635,9 +2634,7 @@ let
 
   paper-gtk-theme = callPackage ../misc/themes/gtk3/paper-gtk-theme { };
 
-  par2cmdline = callPackage ../tools/networking/par2cmdline {
-    automake = automake112x; # fails with 14
-  };
+  par2cmdline = callPackage ../tools/networking/par2cmdline { };
 
   parallel = callPackage ../tools/misc/parallel { };
 
@@ -13027,9 +13024,7 @@ let
 
   rkt = callPackage ../applications/virtualization/rkt { };
 
-  rofi = callPackage ../applications/misc/rofi {
-    automake = automake114x;
-  };
+  rofi = callPackage ../applications/misc/rofi { };
 
   rofi-pass = callPackage ../tools/security/pass/rofi-pass.nix { };